From e8dd1dbc67151f09574a355fafe3fd0cca451797 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Tue, 3 Dec 2013 10:46:35 +0100 Subject: sci-libs/matc: Fix version; force execution of all phases; Fix LICENSE Package-Manager: portage-2.2.7 Signed-off-by: Justin Lecher --- sci-libs/matc/ChangeLog | 5 +++ sci-libs/matc/Manifest | 4 +- sci-libs/matc/files/matc-5.4.1-shared.patch | 32 -------------- sci-libs/matc/files/matc-6.0_p4651-shared.patch | 32 ++++++++++++++ sci-libs/matc/matc-5.4.1.ebuild | 45 ------------------- sci-libs/matc/matc-6.0_p4651.ebuild | 45 +++++++++++++++++++ sci-libs/matc/matc-9999.ebuild | 4 +- .../elmer-elmergrid-5.4.1-r1.ebuild | 51 ---------------------- .../elmer-elmergrid/elmer-elmergrid-5.4.1.ebuild | 51 ++++++++++++++++++++++ 9 files changed, 137 insertions(+), 132 deletions(-) delete mode 100644 sci-libs/matc/files/matc-5.4.1-shared.patch create mode 100644 sci-libs/matc/files/matc-6.0_p4651-shared.patch delete mode 100644 sci-libs/matc/matc-5.4.1.ebuild create mode 100644 sci-libs/matc/matc-6.0_p4651.ebuild delete mode 100644 sci-misc/elmer-elmergrid/elmer-elmergrid-5.4.1-r1.ebuild create mode 100644 sci-misc/elmer-elmergrid/elmer-elmergrid-5.4.1.ebuild diff --git a/sci-libs/matc/ChangeLog b/sci-libs/matc/ChangeLog index 57a996682..37a972540 100644 --- a/sci-libs/matc/ChangeLog +++ b/sci-libs/matc/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 03 Dec 2013; Justin Lecher -matc-5.4.1.ebuild, + +matc-6.0_p4651.ebuild, matc-9999.ebuild, -files/matc-5.4.1-shared.patch, + +files/matc-6.0_p4651-shared.patch: + Fix version; force execution of all phases; Fix LICENSE + *matc-5.4.1 (03 Dec 2013) 03 Dec 2013; Justin Lecher +matc-5.4.1.ebuild, diff --git a/sci-libs/matc/Manifest b/sci-libs/matc/Manifest index 655a2f536..f4abaedf9 100644 --- a/sci-libs/matc/Manifest +++ b/sci-libs/matc/Manifest @@ -1,2 +1,2 @@ -DIST MATCManual.pdf 82375 SHA256 980aa7a081f964522287124db71850f2a5cfa727ae594839df1e29cbeac27744 SHA512 e6ac437bc1c6c8c71224a6668c5da32d37f9b9f39ee5a899519913cb6aad74d88833d94e7522674b8d134de78ced8f2cb8c5316a0d1b317cf4ad8604b3a06cc6 WHIRLPOOL 6f700fa7126208d7b44613a8cc5e8f9921f93aca235629415205315b0fbd4f7815720d711e94b829c925c5d0663bf805311f8c8648a141eb3968839f1f786958 -DIST matc-5.4.1.tar.gz 192174 SHA256 8a4f3597509fc2de2c8777786923ea04eb08f2038d56d530ce556fbdc70d0faa SHA512 c7a0949d6ed53535062472991ae64a32fd509a8810e900d327e833567f3697c81d6bcbcc9a3422183cae3b3b0edf9930647b8b738c5b654f1926a35bf3ac166c WHIRLPOOL acd4f86b2c2700c2206b673b728696aa1ad876c91b4e2a2d4919819c4d77e415021eb162f22707f215cd1ed2b2afd8f817dc094ec022e440943b2d49a144357f +DIST MATCManual.pdf 82222 SHA256 a32d6201021d988242e7ab193c865c1aef3e51b7c7a509978edd9360dcef7c52 SHA512 7703f05a9d23b683e9a7030fbbad0b5438de5dbfb22479a2c070e02830ef233697ea2d1f67efbdd958ada537388f1b3449dd2e73a2bd86c66338636cef0c4ea1 WHIRLPOOL 72aca6508a12cc4370e996caf60b61740ecd4aa7eab460d601cfcf5d6a0ee11a3556ef7637c85a6a747cc3d6529c5ac514f95510813720dd093054af48346893 +DIST matc-6.0_p4651.tar.gz 203543 SHA256 e49d5599231ee68f4b0e46a75d4cb2c476eab5608b881b7741aed9b125f92f8d SHA512 1675c880929031caaceb67091903ae306db30810847886fb1f56cb4c0f5e05ee4a9a11eaed8f29d3fbca4bf222268fe62ffddabc62a3b08322c362dd9ce566e0 WHIRLPOOL 73de50b2ee9cd9183b503eedc51a3cfa06eeb9e99fa3929ee610a5fc0be9a3ebb9c963553986f00e9ef9ce1f4d3ce5a17c6be9205d0eff080c4ab7240cfc0816 diff --git a/sci-libs/matc/files/matc-5.4.1-shared.patch b/sci-libs/matc/files/matc-5.4.1-shared.patch deleted file mode 100644 index a2287dabb..000000000 --- a/sci-libs/matc/files/matc-5.4.1-shared.patch +++ /dev/null @@ -1,32 +0,0 @@ - configure.in | 2 +- - src/Makefile.am | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/configure.in b/configure.in -index 3e5cd27..1d8b065 100755 ---- a/configure.in -+++ b/configure.in -@@ -4,7 +4,7 @@ dnl TODO: get fortran name mangling sceme and use it in the fortran api (spfortr - dnl using the convenience macros provided by automake - - AC_INIT(src/eig.c) -- -+LT_INIT - AC_CANONICAL_HOST - AC_CANONICAL_TARGET - -diff --git a/src/Makefile.am b/src/Makefile.am -index 2e39c11..e10a91d 100755 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -45,7 +45,7 @@ matc_SOURCES = main.c - - endif - --matc_LDADD = libmatc.a -+matc_LDADD = libmatc.la - --lib_LIBRARIES = libmatc.a --libmatc_a_SOURCES = $(COMMON_SRCS) -+lib_LTLIBRARIES = libmatc.la -+libmatc_la_SOURCES = $(COMMON_SRCS) diff --git a/sci-libs/matc/files/matc-6.0_p4651-shared.patch b/sci-libs/matc/files/matc-6.0_p4651-shared.patch new file mode 100644 index 000000000..a2287dabb --- /dev/null +++ b/sci-libs/matc/files/matc-6.0_p4651-shared.patch @@ -0,0 +1,32 @@ + configure.in | 2 +- + src/Makefile.am | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/configure.in b/configure.in +index 3e5cd27..1d8b065 100755 +--- a/configure.in ++++ b/configure.in +@@ -4,7 +4,7 @@ dnl TODO: get fortran name mangling sceme and use it in the fortran api (spfortr + dnl using the convenience macros provided by automake + + AC_INIT(src/eig.c) +- ++LT_INIT + AC_CANONICAL_HOST + AC_CANONICAL_TARGET + +diff --git a/src/Makefile.am b/src/Makefile.am +index 2e39c11..e10a91d 100755 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -45,7 +45,7 @@ matc_SOURCES = main.c + + endif + +-matc_LDADD = libmatc.a ++matc_LDADD = libmatc.la + +-lib_LIBRARIES = libmatc.a +-libmatc_a_SOURCES = $(COMMON_SRCS) ++lib_LTLIBRARIES = libmatc.la ++libmatc_la_SOURCES = $(COMMON_SRCS) diff --git a/sci-libs/matc/matc-5.4.1.ebuild b/sci-libs/matc/matc-5.4.1.ebuild deleted file mode 100644 index 077ea63bc..000000000 --- a/sci-libs/matc/matc-5.4.1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# 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 - -ELMER_ROOT="elmerfem" -MY_PN=${PN/elmer-/} - -DESCRIPTION="Finite element programs, libraries, and visualization tools - math C library" -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 - doc? ( http://www.nic.funet.fi/pub/sci/physics/elmer/doc/MATCManual.pdf )" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc debug static-libs" - -RDEPEND=" - sys-libs/ncurses - sys-libs/readline" -DEPEND="${RDEPEND}" - -S="${WORKDIR}"/${PN} - -PATCHES=( "${FILESDIR}"/${P}-shared.patch ) - -src_configure() { - local myeconfargs=( - --enable-shared - $(use_with debug) - ) - autotools-utils_src_configure -} - -src_install() { - use doc && DOCS=( "${DISTDIR}"/MATCManual.pdf ) - autotools-utils_src_install -} diff --git a/sci-libs/matc/matc-6.0_p4651.ebuild b/sci-libs/matc/matc-6.0_p4651.ebuild new file mode 100644 index 000000000..429713797 --- /dev/null +++ b/sci-libs/matc/matc-6.0_p4651.ebuild @@ -0,0 +1,45 @@ +# 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 + +ELMER_ROOT="elmerfem" +MY_PN=${PN/elmer-/} + +DESCRIPTION="Finite element programs, libraries, and visualization tools - math C library" +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 + doc? ( http://www.nic.funet.fi/pub/sci/physics/elmer/doc/MATCManual.pdf )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc debug static-libs" + +RDEPEND=" + sys-libs/ncurses + sys-libs/readline" +DEPEND="${RDEPEND}" + +S="${WORKDIR}"/${PN} + +PATCHES=( "${FILESDIR}"/${P}-shared.patch ) + +src_configure() { + local myeconfargs=( + --enable-shared + $(use_with debug) + ) + autotools-utils_src_configure +} + +src_install() { + use doc && DOCS=( "${DISTDIR}"/MATCManual.pdf ) + autotools-utils_src_install +} diff --git a/sci-libs/matc/matc-9999.ebuild b/sci-libs/matc/matc-9999.ebuild index 265e19a46..b3a34abb1 100644 --- a/sci-libs/matc/matc-9999.ebuild +++ b/sci-libs/matc/matc-9999.ebuild @@ -17,7 +17,7 @@ SRC_URI="doc? ( http://www.nic.funet.fi/pub/sci/physics/elmer/doc/MATCManual.pdf ESVN_REPO_URI="https://elmerfem.svn.sourceforge.net/svnroot/elmerfem/trunk/${MY_PN}" ESVN_PROJECT="${MY_PN}" -LICENSE="LGPL-2.1" +LICENSE="GPL-2" SLOT="0" KEYWORDS="" IUSE="doc debug static-libs" @@ -29,7 +29,7 @@ DEPEND="${RDEPEND}" S="${WORKDIR}"/${PN} -PATCHES=( "${FILESDIR}"/${PN}-5.4.1-shared.patch ) +PATCHES=( "${FILESDIR}"/${PN}-6.0_p4651-shared.patch ) src_prepare() { subversion_src_prepare diff --git a/sci-misc/elmer-elmergrid/elmer-elmergrid-5.4.1-r1.ebuild b/sci-misc/elmer-elmergrid/elmer-elmergrid-5.4.1-r1.ebuild deleted file mode 100644 index 1e1bd6f8c..000000000 --- a/sci-misc/elmer-elmergrid/elmer-elmergrid-5.4.1-r1.ebuild +++ /dev/null @@ -1,51 +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, elmergrid" -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="debug" -DEPEND="sci-libs/matc - sys-libs/glibc" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${PV}/elmergrid" - -src_unpack() { - unpack ${A} - cd "${S}" - # configure must be executable - chmod +x configure - eautoreconf -} - -src_compile() { - cd "${S}" - local myconf - export FC="gfortran" - export F77="gfortran" - use debug && - myconf="${myconf} --with-debug" || - myconf="${myconf} --without-debug" - myconf="$myconf --with-matc" - econf $myconf || die "econf failed" - emake || die "emake failed" -} - - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" -} diff --git a/sci-misc/elmer-elmergrid/elmer-elmergrid-5.4.1.ebuild b/sci-misc/elmer-elmergrid/elmer-elmergrid-5.4.1.ebuild new file mode 100644 index 000000000..1e1bd6f8c --- /dev/null +++ b/sci-misc/elmer-elmergrid/elmer-elmergrid-5.4.1.ebuild @@ -0,0 +1,51 @@ +# 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, elmergrid" +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="debug" +DEPEND="sci-libs/matc + sys-libs/glibc" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${PV}/elmergrid" + +src_unpack() { + unpack ${A} + cd "${S}" + # configure must be executable + chmod +x configure + eautoreconf +} + +src_compile() { + cd "${S}" + local myconf + export FC="gfortran" + export F77="gfortran" + use debug && + myconf="${myconf} --with-debug" || + myconf="${myconf} --without-debug" + myconf="$myconf --with-matc" + econf $myconf || die "econf failed" + emake || die "emake failed" +} + + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" +} -- cgit v1.2.3-65-gdbad