commit: b82206858b0c9ab584060c5697960bb44b5eefa4
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Sat Jan 30 14:21:40 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sat Jan 30 14:21:40 2021 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=b8220685
sci-misc/elmer-front: remove pack, obsolete
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
sci-misc/elmer-front/elmer-front-6.0_p4651.ebuild | 43 -----------------
sci-misc/elmer-front/elmer-front-9999.ebuild | 50 --------------------
.../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 -------
.../files/elmer-front-Makefile-install.patch | 18 -------
sci-misc/elmer-front/metadata.xml | 11 -----
7 files changed, 223 deletions(-)
diff --git a/sci-misc/elmer-front/elmer-front-6.0_p4651.ebuild
b/sci-misc/elmer-front/elmer-front-6.0_p4651.ebuild
deleted file mode 100644
index 03458dc96..000000000
--- a/sci-misc/elmer-front/elmer-front-6.0_p4651.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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="https://www.csc.fi/web/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:0=
- dev-lang/tk:0=
- sci-misc/elmer-fem
- 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
deleted file mode 100644
index 6bf0cb0cf..000000000
--- a/sci-misc/elmer-front/elmer-front-9999.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils multilib subversion
-
-ELMER_ROOT="elmerfem"
-MY_PN=${PN/elmer-/}
-
-DESCRIPTION="Finite element programs, libraries, and visualization tools -
elmer frontend"
-HOMEPAGE="https://www.csc.fi/web/elmer";
-SRC_URI=""
-ESVN_REPO_URI="https://elmerfem.svn.sourceforge.net/svnroot/elmerfem/trunk/${MY_PN}";
-ESVN_PROJECT="${MY_PN}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="
- dev-lang/tcl:0=
- dev-lang/tk:0=
- sci-misc/elmer-fem
- sci-libs/elmer-eio
- virtual/opengl"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/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() {
- subversion_src_prepare
- autotools-utils_src_prepare
-}
-
-src_configure() {
- 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
deleted file mode 100644
index 872c03f21..000000000
--- a/sci-misc/elmer-front/files/elmer-front-6.0_p4651-out-of-source.patch
+++ /dev/null
@@ -1,30 +0,0 @@
- 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
deleted file mode 100644
index 7fa7605b7..000000000
--- a/sci-misc/elmer-front/files/elmer-front-6.0_p4651-tcltk8.6.patch
+++ /dev/null
@@ -1,55 +0,0 @@
- 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
deleted file mode 100644
index b370ed494..000000000
--- a/sci-misc/elmer-front/files/elmer-front-6.0_p4651-underlinking.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- 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/files/elmer-front-Makefile-install.patch
b/sci-misc/elmer-front/files/elmer-front-Makefile-install.patch
deleted file mode 100644
index 6ecbe6f8e..000000000
--- a/sci-misc/elmer-front/files/elmer-front-Makefile-install.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- front/src/Makefile.am.old 2012-11-12 13:25:34.331046988 +0100
-+++ front/src/Makefile.am 2012-11-12 13:27:36.055100527 +0100
-@@ -85,13 +85,13 @@
- endif
-
- 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"
- 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"
- rm -rf `find $(DESTDIR)$(prefix)/share/elmerfront/lib -name .svn`
diff --git a/sci-misc/elmer-front/metadata.xml
b/sci-misc/elmer-front/metadata.xml
deleted file mode 100644
index 070aa2029..000000000
--- a/sci-misc/elmer-front/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <maintainer type="project">
- <email>[email protected]</email>
- <name>Gentoo Science Project</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">svn</remote-id>
- </upstream>
-</pkgmetadata>
