From: "Justin Lecher" <jlec@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/sci:master commit in: sci-misc/elmer-front/files/, sci-misc/elmer-front/
Date: Tue, 3 Dec 2013 14:53:03 +0000 (UTC) [thread overview]
Message-ID: <1386072376.720da90372cf45e272f8c6f49532909e7e08103a.jlec@gentoo> (raw)
commit: 720da90372cf45e272f8c6f49532909e7e08103a
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 3 12:06:16 2013 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Dec 3 12:06:16 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=720da903
sci-misc/elmer-front: Bump EAPI; fix DESCRIPTION; drop keywords from live ebuild; use correct phase functions; simplify configure; link against external metis
Package-Manager: portage-2.2.7
---
sci-misc/elmer-front/ChangeLog | 14 ++++++
sci-misc/elmer-front/elmer-front-5.4.1-r1.ebuild | 56 ----------------------
sci-misc/elmer-front/elmer-front-6.0_p4651.ebuild | 44 +++++++++++++++++
sci-misc/elmer-front/elmer-front-9999.ebuild | 53 ++++++++++----------
.../elmer-front-6.0_p4651-out-of-source.patch | 30 ++++++++++++
.../files/elmer-front-6.0_p4651-tcltk8.6.patch | 55 +++++++++++++++++++++
.../files/elmer-front-6.0_p4651-underlinking.patch | 16 +++++++
sci-misc/elmer-front/metadata.xml | 5 ++
8 files changed, 189 insertions(+), 84 deletions(-)
diff --git a/sci-misc/elmer-front/ChangeLog b/sci-misc/elmer-front/ChangeLog
new file mode 100644
index 0000000..7186253
--- /dev/null
+++ b/sci-misc/elmer-front/ChangeLog
@@ -0,0 +1,14 @@
+# ChangeLog for sci-misc/elmer-front
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*elmer-front-6.0_p4651 (03 Dec 2013)
+
+ 03 Dec 2013; Justin Lecher <jlec@gentoo.org> -elmer-front-5.4.1-r1.ebuild,
+ +elmer-front-6.0_p4651.ebuild, elmer-front-9999.ebuild,
+ +files/elmer-front-6.0_p4651-out-of-source.patch,
+ +files/elmer-front-6.0_p4651-tcltk8.6.patch,
+ +files/elmer-front-6.0_p4651-underlinking.patch, +metadata.xml:
+ Bump EAPI; fix DESCRIPTION; drop keywords from live ebuild; use correct phase
+ functions; simplify configure; link against external metis
+
diff --git a/sci-misc/elmer-front/elmer-front-5.4.1-r1.ebuild b/sci-misc/elmer-front/elmer-front-5.4.1-r1.ebuild
deleted file mode 100644
index b2b98f7..0000000
--- a/sci-misc/elmer-front/elmer-front-5.4.1-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-
-inherit autotools eutils
-
-ELMER_ROOT="elmerfem"
-MY_PN=${PN/elmer-/}
-
-DESCRIPTION="Elmer is a collection of finite element programs, libraries, and visualization tools, elmer frontend"
-HOMEPAGE="http://www.csc.fi/english/pages/elmer"
-SRC_URI="http://elmerfem.svn.sourceforge.net/viewvc/${ELMER_ROOT}/release/${PV}/${MY_PN}/?view=tar -> ${P}.tar.gz"
-RESTRICT="mirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="X debug"
-DEPEND="=dev-lang/tcl-8.4*
- =dev-lang/tk-8.4*
- sci-libs/matc
- sci-libs/elmer-eio
- virtual/opengl"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PV}/front"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- # configure must be executable
- chmod +x configure
- epatch ${FILESDIR}/elmer-front-Makefile-install.patch
- eautoreconf
-}
-
-src_compile() {
- cd "${S}"
- local myconf
- export FC="gfortran"
- export F77="gfortran"
- myconf="${myconf} --with-eioc --with-matc --with-tcltk"
- use debug &&
- myconf="${myconf} --with-debug" ||
- myconf="${myconf} --without-debug"
- econf $myconf \
- $(use_with X x) \
- || die "econf failed"
- emake || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
-}
diff --git a/sci-misc/elmer-front/elmer-front-6.0_p4651.ebuild b/sci-misc/elmer-front/elmer-front-6.0_p4651.ebuild
new file mode 100644
index 0000000..871d33b
--- /dev/null
+++ b/sci-misc/elmer-front/elmer-front-6.0_p4651.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils multilib
+
+ELMER_ROOT="elmerfem"
+MY_PN=${PN/elmer-/}
+
+DESCRIPTION="Finite element programs, libraries, and visualization tools - elmer frontend"
+HOMEPAGE="http://www.csc.fi/english/pages/elmer"
+SRC_URI="http://elmerfem.svn.sourceforge.net/viewvc/${ELMER_ROOT}/release/${PV%_p*}/${MY_PN}/?view=tar&pathrev=4651 -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-lang/tcl
+ dev-lang/tk
+ sci-libs/matc
+ sci-libs/elmer-eio
+ virtual/opengl"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/front/front
+
+PATCHES=(
+ "${FILESDIR}"/${P}-tcltk8.6.patch
+ "${FILESDIR}"/${P}-underlinking.patch
+ "${FILESDIR}"/${P}-out-of-source.patch
+)
+
+src_configure() {
+ local myeconfargs=(
+ --with-eioc --with-matc --with-tcltk --with-x
+ )
+ autotools-utils_src_configure
+}
diff --git a/sci-misc/elmer-front/elmer-front-9999.ebuild b/sci-misc/elmer-front/elmer-front-9999.ebuild
index 0548410..7754b8a 100644
--- a/sci-misc/elmer-front/elmer-front-9999.ebuild
+++ b/sci-misc/elmer-front/elmer-front-9999.ebuild
@@ -1,54 +1,51 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="4"
+EAPI=5
-inherit autotools eutils subversion
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils multilib subversion
ELMER_ROOT="elmerfem"
MY_PN=${PN/elmer-/}
-DESCRIPTION="Elmer is a collection of finite element programs, libraries, and visualization tools, elmer frontend"
+DESCRIPTION="Finite element programs, libraries, and visualization tools - elmer frontend"
HOMEPAGE="http://www.csc.fi/english/pages/elmer"
-#SRC_URI="http://elmerfem.svn.sourceforge.net/viewvc/${ELMER_ROOT}/release/${PV}/${MY_PN}/?view=tar -> ${P}.tar.gz"
SRC_URI=""
-RESTRICT="mirror"
ESVN_REPO_URI="https://elmerfem.svn.sourceforge.net/svnroot/elmerfem/trunk/${MY_PN}"
ESVN_PROJECT="${MY_PN}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="X debug"
-DEPEND="dev-lang/tcl
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="
+ dev-lang/tcl
dev-lang/tk
sci-libs/matc
sci-libs/elmer-eio
virtual/opengl"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/front"
-S="${WORKDIR}/${PV}/front"
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.0_p4651-tcltk8.6.patch
+ "${FILESDIR}"/${PN}-6.0_p4651-underlinking.patch
+ "${FILESDIR}"/${PN}-6.0_p4651-out-of-source.patch
+)
src_prepare() {
- #unpack ${A}
- cd "${S}"
- # configure must be executable
- #chmod +x configure
- epatch ${FILESDIR}/elmer-front-Makefile-install.patch
- eautoreconf
+ subversion_src_prepare
+ autotools-utils_src_prepare
}
src_configure() {
- cd "${S}"
- local myconf
- export FC="gfortran"
- export F77="gfortran"
- myconf="${myconf} --with-eioc --with-matc --with-tcltk"
- use debug &&
- myconf="${myconf} --with-debug" ||
- myconf="${myconf} --without-debug"
- econf $myconf \
- $(use_with X x) \
- || die "econf failed"
+ local myeconfargs=(
+ --with-eioc --with-matc --with-tcltk --with-x
+ )
+ autotools-utils_src_configure
}
diff --git a/sci-misc/elmer-front/files/elmer-front-6.0_p4651-out-of-source.patch b/sci-misc/elmer-front/files/elmer-front-6.0_p4651-out-of-source.patch
new file mode 100644
index 0000000..872c03f
--- /dev/null
+++ b/sci-misc/elmer-front/files/elmer-front-6.0_p4651-out-of-source.patch
@@ -0,0 +1,30 @@
+ src/Makefile.am | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+old mode 100755
+new mode 100644
+index 894a547..dc7c77b
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -87,15 +87,16 @@ endif
+ ElmerFront_LDADD = -lX11
+
+ install-data-local:
+- @echo "Installing tcl scripts to ${prefix}/share/elmerfront/tcl"
++ @echo "Installing tcl scripts to ${DESTDIR}${prefix}/share/elmerfront/tcl"
+
+ mkdir -p "$(DESTDIR)${prefix}/share/elmerfront/tcl"
+- cp -r ./tcl/* "$(DESTDIR)${prefix}/share/elmerfront/tcl"
++ cp -r "${srcdir}"/tcl/* "$(DESTDIR)${prefix}/share/elmerfront/tcl"
++ cp -r "${builddir}"/tcl/* "$(DESTDIR)${prefix}/share/elmerfront/tcl"
+ rm -rf `find $(DESTDIR)$(prefix)/share/elmerfront/tcl -name .svn`
+
+- @echo "Installing *.edf *.rgb to ${prefix}/share/elmerfront/lib"
++ @echo "Installing *.edf *.rgb to ${DESTDIR}${prefix}/share/elmerfront/lib"
+ mkdir -p "$(DESTDIR)${prefix}/share/elmerfront/lib"
+- cp -r ./lib/* "$(DESTDIR)${prefix}/share/elmerfront/lib"
++ cp -r "${srcdir}"/lib/* "$(DESTDIR)${prefix}/share/elmerfront/lib"
+ rm -rf `find $(DESTDIR)$(prefix)/share/elmerfront/lib -name .svn`
+
+
diff --git a/sci-misc/elmer-front/files/elmer-front-6.0_p4651-tcltk8.6.patch b/sci-misc/elmer-front/files/elmer-front-6.0_p4651-tcltk8.6.patch
new file mode 100644
index 0000000..7fa7605
--- /dev/null
+++ b/sci-misc/elmer-front/files/elmer-front-6.0_p4651-tcltk8.6.patch
@@ -0,0 +1,55 @@
+ src/ecif_userinterface_TCL.cpp | 18 +++++++++++++++++-
+ 1 file changed, 17 insertions(+), 1 deletion(-)
+
+diff --git a/src/ecif_userinterface_TCL.cpp b/src/ecif_userinterface_TCL.cpp
+index 7f581a8..53e0432 100644
+--- a/src/ecif_userinterface_TCL.cpp
++++ b/src/ecif_userinterface_TCL.cpp
+@@ -622,7 +622,11 @@ UserInterface_TCL::createTclEnvironment(Hinst application)
+
+ // *** Invoke application-specific initialization.
+ if (My_Tcl_AppInit(interp) != TCL_OK) {
++#if TCL_MAJOR_VERSION <=8 && TCL_MINOR_VERSION < 6
+ WishPanic("My_Tcl_AppInit failed: %s\n", interp->result);
++#else
++ WishPanic("My_Tcl_AppInit failed: %s\n", Tcl_GetStringResult(interp));
++#endif
+ }
+
+ // Result value is the Tcl interpreter
+@@ -4685,11 +4689,19 @@ UserInterface_TCL::sendCommandToGui(Tcl_Interp* interp, const char* cmd, const c
+ Tcl_DStringFree( &dstring );
+ }
+
++#if TCL_MAJOR_VERSION <=8 && TCL_MINOR_VERSION < 6
+ if (interp->result[0] != '\0') {
++#else
++ if (Tcl_GetStringResult(interp)[0] != '\0') {
++#endif
+
+ char err_buf[256];
+ err_buf[255] = '\0';
++#if TCL_MAJOR_VERSION <=8 && TCL_MINOR_VERSION < 6
+ strncpy(err_buf, interp->result, 255);
++#else
++ strncpy(err_buf, Tcl_GetStringResult(interp), 255);
++#endif
+
+ char cmd_buf[256];
+ cmd_buf[255] = '\0';
+@@ -5350,10 +5362,14 @@ UserInterface_TCL::start(int argc, char** argv)
+ //--If we can't load the script (= start CONTROL-SIDE interpreter)
+ if (code != TCL_OK) {
+
+- char* p = (char *)Tcl_GetVar(theInterp, "errorInfo", glob_flag);
++ const char* p = (const char *)Tcl_GetVar(theInterp, "errorInfo", glob_flag);
+
+ if ((p == NULL) || (*p == '\0')) {
++#if TCL_MAJOR_VERSION <=8 && TCL_MINOR_VERSION < 6
+ p = theInterp->result;
++#else
++ p = Tcl_GetStringResult(theInterp);
++#endif
+ }
+
+ ((ofstream*)debugFile)->open("ElmerFront.log", ios::out);
diff --git a/sci-misc/elmer-front/files/elmer-front-6.0_p4651-underlinking.patch b/sci-misc/elmer-front/files/elmer-front-6.0_p4651-underlinking.patch
new file mode 100644
index 0000000..b370ed4
--- /dev/null
+++ b/sci-misc/elmer-front/files/elmer-front-6.0_p4651-underlinking.patch
@@ -0,0 +1,16 @@
+ src/Makefile.am | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 01e3e48..894a547 100755
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -84,6 +84,8 @@ ElmerFront_SOURCES = $(COMMON_SRCS)
+
+ endif
+
++ElmerFront_LDADD = -lX11
++
+ install-data-local:
+ @echo "Installing tcl scripts to ${prefix}/share/elmerfront/tcl"
+
diff --git a/sci-misc/elmer-front/metadata.xml b/sci-misc/elmer-front/metadata.xml
new file mode 100644
index 0000000..897aa2e
--- /dev/null
+++ b/sci-misc/elmer-front/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci</herd>
+</pkgmetadata>
reply other threads:[~2013-12-03 14:53 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1386072376.720da90372cf45e272f8c6f49532909e7e08103a.jlec@gentoo \
--to=jlec@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox