From 2450a9c1505647cfcf71b5f798829b9699615bb5 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Fri, 21 May 2010 14:00:06 +0000 Subject: [PATCH] Version Bump, remove python which is only needed for the restricted test Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- sci-libs/gerris/ChangeLog | 8 ++- sci-libs/gerris/Manifest | 13 +++-- .../files/gerris-20100519-autotools.patch | 47 +++++++++++++++++ sci-libs/gerris/gerris-20100114.ebuild | 3 +- sci-libs/gerris/gerris-20100519.ebuild | 50 +++++++++++++++++++ 5 files changed, 113 insertions(+), 8 deletions(-) create mode 100644 sci-libs/gerris/files/gerris-20100519-autotools.patch create mode 100644 sci-libs/gerris/gerris-20100519.ebuild diff --git a/sci-libs/gerris/ChangeLog b/sci-libs/gerris/ChangeLog index 8912addee3f3..bb9caa45cf90 100644 --- a/sci-libs/gerris/ChangeLog +++ b/sci-libs/gerris/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-libs/gerris # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/gerris/ChangeLog,v 1.9 2010/01/15 18:19:13 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gerris/ChangeLog,v 1.10 2010/05/21 14:00:06 jlec Exp $ + +*gerris-20100519 (21 May 2010) + + 21 May 2010; Justin Lecher gerris-20100114.ebuild, + +gerris-20100519.ebuild, +files/gerris-20100519-autotools.patch: + Version Bump, remove python which is only needed for the restricted test *gerris-20100114 (15 Jan 2010) diff --git a/sci-libs/gerris/Manifest b/sci-libs/gerris/Manifest index 0eda685de849..beb04538909c 100644 --- a/sci-libs/gerris/Manifest +++ b/sci-libs/gerris/Manifest @@ -3,20 +3,23 @@ Hash: SHA1 AUX gerris-20080929-as-needed.patch 1009 RMD160 b8a5e8e03bf37c8932134f6135dc3161cb6b5916 SHA1 e8a6842275ab3725880ae8d3516ec55195538c40 SHA256 4bc0ac9603a066ba9cdcf27652f3e99050eae4ac620c95fba9510b8a725d9630 AUX gerris-20100114-autotools.patch 1878 RMD160 c064d151d09d7755ad6cb22542727aa167eb6ace SHA1 db4eb6a27d83adf27ed5363698a67568caded977 SHA256 1cee4a3a22ad689f087a9ba8aab5bdb75b6eae6ff2fb194abdde207d960f7d5e +AUX gerris-20100519-autotools.patch 1414 RMD160 28193985d701ad70726fca7acece4e0eb68f7c8b SHA1 45816aca0a51f40a30f05013393a7b4cf7e283bb SHA256 bd758909b58ca74def5f9f962afddf4db0edb4ed68c16abdf2e12dfa9a3ee4dd DIST gerris-0.8.0.tar.gz 4112581 RMD160 e4b510d17016a880837af6045e2259ef43b3f415 SHA1 c064479c3aafb442db8b93bf17f8b6216af4aeda SHA256 e3b9dd58fb6242d18740ecce3cb8eb9f6c79d61f5412869a2ce0a95c6ca76b91 DIST gerris-0.9.2.tar.gz 4180547 RMD160 fdc3cee4a1c3154e60785e5d317a808d0f5cbdd6 SHA1 e56b888169703e9e8d174f188eac491f43a16acf SHA256 ab605863bc2ce872c03f1f88fd4de4d7782f49734f2fe9c01bfbbfd16b68069d DIST gerris-20080929.tar.gz 1590928 RMD160 460cdd272db2ff68489af54ce3ccaffd98e4c028 SHA1 a51f64f4a21e89d9fa3f4b3c39d2c5099250a401 SHA256 f828178578873ce4baf6e1e809be48e3dcd21fdd156276dbd816dc947401a064 DIST gerris-20100114.tar.gz 1254202 RMD160 5434166aecf730db92ef865e9144a5fe14c813af SHA1 6ef5dda357eb04703843a52dc817aaa3b20e03e5 SHA256 0907736096a7e99b2e1b720b9f18e4b46c0c646109c94bdd69adb064e1e8d6cc +DIST gerris-20100519.tar.gz 1285580 RMD160 6e9ea7938629842b45ca02a729cc3474b38588b4 SHA1 e2df6e87d55d445fc5fa7dbf95d148b854f7c338 SHA256 110f3cbc27d5f599467a1795dcb98a41814a3598402a0aebe8f0836b1aaa39c1 EBUILD gerris-0.8.0.ebuild 1346 RMD160 962b82fa484301edfdc47107d08d966b722ed44b SHA1 bd665abfcd22e716c63c94ad5ff6e6ee3dd54b74 SHA256 99feeb045954e1f986d760adca274be835823f262c75f859911c8b4cd371d23f EBUILD gerris-0.9.2.ebuild 1347 RMD160 3dbf6f650fc3d48aa9c3e0f1246ade2e3cb6c3ef SHA1 0fca1678e51dc0ebf511c6e7452f932c36a9a243 SHA256 c7971d6186bf0a9c16f9804a60d5c8576ba062296e6aea9acedce29525c02a88 EBUILD gerris-20080929.ebuild 1137 RMD160 ad81736d47b7baa67a5e0a40ac65d04a63a6b962 SHA1 85369a08a5e69d367270f336fb501d64d54954d6 SHA256 77e605c25af9b1c439bb4dd7ca3b2e1300ea1dd03b06b9c437788072e67d77ce -EBUILD gerris-20100114.ebuild 1121 RMD160 b861616a607f05c22eb110472d8e3bea625ba26d SHA1 1d345bde2582839907e4121c911d2ffb123f87e4 SHA256 5bc80a7c5779c03eb753268887227d53aaaab2b7e110ef27111d28aa1d7b08d0 -MISC ChangeLog 1791 RMD160 13c904f8688da27f5dd8bf3978f23bc5a28b49c6 SHA1 ebc8aa428a6fe11a23e0c19a64bd204cd8430589 SHA256 5e180e2a4ddb75eccf5924e235d3d877e3edf9452bd4a6e5df04f74efc858224 +EBUILD gerris-20100114.ebuild 1100 RMD160 fbae2e31e5296a6b843aa2879ed334e5c994729c SHA1 5d1f83096798b08a5e4e53d90ec8c3f0252c483b SHA256 9fe74383d86c1b3ddf74b67237e0fa4fa49d9444bbf2e6018736ec12e922c289 +EBUILD gerris-20100519.ebuild 1101 RMD160 329aea18cfc03733d3c320b2ce29d7e95fa34506 SHA1 c0386d23d16e781fdb91f76b07d2bc50389c852b SHA256 2f4248412d5303e3697c955814b25c8df6389aac8dbcb49bd1c83b6b23c8ddd2 +MISC ChangeLog 2034 RMD160 c172e18c1b1bf326e7772a81649ac5969dd30482 SHA1 ed16602a268b689316dafb994847ac05747d2c06 SHA256 b82c01349cd1acc09bc1722d22217c890ea032fe48288d39d0cd8f34732f8c95 MISC metadata.xml 514 RMD160 0c853b66917ab677c419c46d0e3623ca33b201c7 SHA1 3eccff835a7411ac4d74b0af6949394e993900c0 SHA256 b6db9441b7de5977b57b1c386daa1ee14ab5cddced2fae81f5d2d9de3d3bb26a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAktQuikACgkQ1ycZbhPLE2D9uwCfSn3O+9ZmbDDppjuEpcZXXA88 -9C4AoKc0jhGuqMVpaJKRmYxsMYRw+dfz -=5CtQ +iEYEARECAAYFAkv2kesACgkQgAnW8HDreRb7qACghIeg3gAyIlEH9L6Mvy7MP4K8 +3twAn2VAj2pAyTLv1sCaK33WLyvi3Gpo +=303f -----END PGP SIGNATURE----- diff --git a/sci-libs/gerris/files/gerris-20100519-autotools.patch b/sci-libs/gerris/files/gerris-20100519-autotools.patch new file mode 100644 index 000000000000..2bab3f3a2d07 --- /dev/null +++ b/sci-libs/gerris/files/gerris-20100519-autotools.patch @@ -0,0 +1,47 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index 8b07f68..678ebbd 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -2,9 +2,7 @@ + + AUTOMAKE_OPTIONS = 1.6 + +-AM_CPPFLAGS = -DGFS_MODULES_DIR=\"$(libdir)/gerris\" +- +-INCLUDES = -I$(top_srcdir) -I$(includedir) \ ++AM_CPPFLAGS = -DGFS_MODULES_DIR=\"$(libdir)/gerris\" \ + -DG_LOG_DOMAIN=\"Gfs\" $(GTS_CFLAGS) + + bin_SCRIPTS = gfs-config +@@ -114,12 +112,14 @@ libgfs3D_la_LDFLAGS = $(NO_UNDEFINED)\ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)\ + -release $(LT_RELEASE) -export-dynamic + libgfs3D_la_SOURCES = $(SRC) ++libgfs3D_la_LIBADD = $(GTS_LIBS) + + libgfs2D_la_LDFLAGS = $(NO_UNDEFINED)\ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)\ + -release $(LT_RELEASE) -export-dynamic + libgfs2D_la_SOURCES = $(SRC) +-libgfs2D_la_CFLAGS = $(AM_CFLAGS) -DFTT_2D=1 ++libgfs2D_la_CPPFLAGS = $(AM_CPPFLAGS) -DFTT_2D=1 ++libgfs2D_la_LIBADD = $(GTS_LIBS) + + CLEANFILES = $(BUILT_SOURCES) + +@@ -131,12 +131,12 @@ EXTRA_DIST = \ + bin_PROGRAMS = gerris2D gerris3D + + gerris2D_SOURCES = gerris.c +-gerris2D_CFLAGS = $(AM_CFLAGS) -DFTT_2D=1 +-gerris2D_LDADD = $(GFS2D_LIBS) ++gerris2D_CPPFLAGS = $(AM_CPPFLAGS) -DFTT_2D=1 ++gerris2D_LDADD = libgfs2D.la + gerris2D_DEPENDENCIES = libgfs2D.la + + gerris3D_SOURCES = gerris.c +-gerris3D_LDADD = $(GFS3D_LIBS) ++gerris3D_LDADD = libgfs3D.la + gerris3D_DEPENDENCIES = libgfs3D.la + + if DARCS_CONTROLLED diff --git a/sci-libs/gerris/gerris-20100114.ebuild b/sci-libs/gerris/gerris-20100114.ebuild index 0a15b6ab93ed..fd7013cc89f7 100644 --- a/sci-libs/gerris/gerris-20100114.ebuild +++ b/sci-libs/gerris/gerris-20100114.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/gerris/gerris-20100114.ebuild,v 1.1 2010/01/15 18:19:13 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gerris/gerris-20100114.ebuild,v 1.2 2010/05/21 14:00:06 jlec Exp $ EAPI=2 inherit autotools eutils @@ -19,7 +19,6 @@ RDEPEND=">=dev-libs/glib-2.4.0 sci-libs/gsl sci-libs/gts sci-libs/proj - dev-lang/python mpi? ( virtual/mpi )" DEPEND="${RDEPEND} dev-util/pkgconfig" diff --git a/sci-libs/gerris/gerris-20100519.ebuild b/sci-libs/gerris/gerris-20100519.ebuild new file mode 100644 index 000000000000..c8d8001bc29f --- /dev/null +++ b/sci-libs/gerris/gerris-20100519.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gerris/gerris-20100519.ebuild,v 1.1 2010/05/21 14:00:06 jlec Exp $ + +EAPI=2 + +inherit autotools eutils + +DESCRIPTION="The Gerris Flow Solver" +LICENSE="GPL-2" +HOMEPAGE="http://gfs.sourceforge.net/" +SRC_URI="mirror://sourceforge/gfs/${P}.tar.gz" + +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="examples mpi" + +RDEPEND=">=dev-libs/glib-2.4.0 + sci-libs/netcdf + sci-libs/gsl + sci-libs/gts + sci-libs/proj + mpi? ( virtual/mpi )" +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +# test assume it is installed +RESTRICT="test" + +S="${WORKDIR}"/${PN}-snapshot-100519 + +src_prepare() { + epatch "${FILESDIR}"/${P}-autotools.patch + eautoreconf +} + +src_configure() { + econf $(use_enable mpi) +} + +src_install() { + emake DESTDIR="${D}" install || die "emake nstall failed" + dodoc AUTHORS ChangeLog NEWS README THANKS TODO + + if use examples; then + insinto /usr/share/doc/${PF}/examples + rm -f doc/examples/*.pyc || die "Failed to remove python object" + doins -r doc/examples/* || die + fi +} -- 2.26.2