From c36d74702d64d2b0e2ecf1ba6f98a7e2101dfdf5 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Wed, 9 Jun 2010 06:37:14 +0000 Subject: [PATCH] removed old version which having problems with PYTHON ABIs stuff Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- sci-chemistry/apbs/ChangeLog | 7 +- sci-chemistry/apbs/Manifest | 15 +-- sci-chemistry/apbs/apbs-1.2.0.ebuild | 96 ------------------ sci-chemistry/apbs/apbs-1.2.1b-r1.ebuild | 97 ------------------- sci-chemistry/apbs/apbs-1.2.1b.ebuild | 97 ------------------- .../apbs/files/apbs-1.2.0-install-fix.patch | 39 -------- 6 files changed, 11 insertions(+), 340 deletions(-) delete mode 100644 sci-chemistry/apbs/apbs-1.2.0.ebuild delete mode 100644 sci-chemistry/apbs/apbs-1.2.1b-r1.ebuild delete mode 100644 sci-chemistry/apbs/apbs-1.2.1b.ebuild delete mode 100644 sci-chemistry/apbs/files/apbs-1.2.0-install-fix.patch diff --git a/sci-chemistry/apbs/ChangeLog b/sci-chemistry/apbs/ChangeLog index 7a4796c22fcf..b487a7b503b1 100644 --- a/sci-chemistry/apbs/ChangeLog +++ b/sci-chemistry/apbs/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-chemistry/apbs # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v 1.30 2010/05/12 13:17:41 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v 1.31 2010/06/09 06:37:14 jlec Exp $ + + 09 Jun 2010; Justin Lecher -apbs-1.2.0.ebuild, + -files/apbs-1.2.0-install-fix.patch, -apbs-1.2.1b.ebuild, + -apbs-1.2.1b-r1.ebuild: + removed old version which having problems with PYTHON ABIs stuff 12 May 2010; Justin Lecher (jlec) apbs-1.2.1b-r3.ebuild: diff --git a/sci-chemistry/apbs/Manifest b/sci-chemistry/apbs/Manifest index ea6ecfac7cad..baa0299b9359 100644 --- a/sci-chemistry/apbs/Manifest +++ b/sci-chemistry/apbs/Manifest @@ -6,25 +6,20 @@ AUX apbs-1.0.0-install-fix.patch 890 RMD160 64e4d2247e23fd4d67b43ae91e1470d4cd2b AUX apbs-1.0.0-libmaloc-noinstall.patch 2230 RMD160 983d431fbe8af9aab163f3160521339fa0fc68d9 SHA1 9d5f2685d78c73f404899eca24cee4d1e5cb140d SHA256 729b836d5539a3c6328905c5e69403fd9386eb85199eb5702c90b5ec88bc5ef0 AUX apbs-1.0.0-openmpi.patch 1458 RMD160 27e786dcb212348e14400442d11543038a1015b4 SHA1 40e45496d78c72a8b9169af623924ee74c5ff2a5 SHA256 ab2e1303c3bdcfc78c11b13ea2f99c4a8e81cb6d6f89c008815ecc20150863bf AUX apbs-1.2.0-contrib.patch 382 RMD160 4c0c75e57fb6a0c298606d87785a5b9daa8db457 SHA1 653295c9ff7ac075613dd82ce332b41b0e2ea37e SHA256 0b2a1c518c66de6010954f101c1622cfd570bbfcc4774d98607174e57e67f1b3 -AUX apbs-1.2.0-install-fix.patch 1417 RMD160 4dbf96c23c2c2b150d48dc2983c293aac8be5492 SHA1 591339b9f994ee3853f6f6c38ab2cb4a280d3216 SHA256 cb805d3b12b7457c9c9a28277159516b5ea3724b6c5647b567c9683865a160b8 AUX apbs-1.2.0-link.patch 1716 RMD160 904e7123d32f628171aa728a761c9d7fd95e967d SHA1 63265d0c7c636749292d90efe6a989e7e48251b6 SHA256 37faa758d6439f22853aa9d4524e3e8770437d3986e00649a193b0a97f369bba AUX apbs-1.2.1b-autoconf-2.64.patch 952 RMD160 80ed2f351c52764b1c3221b4f5f0e152652c8637 SHA1 dbe725035299182efe82d6ab4a8dcb721601592c SHA256 d9855b84b5b3ca404c463ad9ada7d75d7076d11a929b53bd61f42ed427be9984 AUX apbs-1.2.1b-install-fix.patch 1467 RMD160 0ed57415822554b888f642b4e3afb296418ead1e SHA1 b7de15116e16c440c7b689182fa465c55fb4a628 SHA256 f67dfdbdff6f89c616c01890efcb059e104be94a33bc8a538275fa4360831d9f AUX apbs-1.2.1b-openmp.patch 1431 RMD160 d72a7dad56c1d2ce4e13c4eb03b2cb5e58ebcdf0 SHA1 94ca5f758749c3d71ab783041624256b8d4e8092 SHA256 ae6ba8acc1de36372e3e2af00bac23beca6354cbfbcf2140d9c65bf8e2c3bff6 DIST apbs-1.0.0-source.tar.gz 11541303 RMD160 1eeb79f93a591835281bf8395308cddc065dac93 SHA1 fbcfe664defb09165e0eae3ff913a9d5a17cb27e SHA256 bd3803183ffb2bede9fca242d5432acb60b3cb8668eeccdbbced69aaf7a57604 -DIST apbs-1.2-source.tar.gz 10593537 RMD160 62cb82da9ca5276c3d7127a4d1f9737747dac315 SHA1 43e766a8c6166288c25229e0615a72dca5e8a3b5 SHA256 b8b74d80f8b4e553cd2e51727efc79436152cd4f5e02be076e7cdf994aa5424e DIST apbs-1.2.1b-source.tar.gz 40647966 RMD160 4ba1f72a7f9adcf7b283dc18743488143025b398 SHA1 dc3e6933a987ff9fdf88db510db79b3dacb100d6 SHA256 7d088def1ed7689127eb64014ea44069b9d7bfc995941fe5800ff753d48c87be EBUILD apbs-1.0.0-r1.ebuild 1995 RMD160 0efbe531fe27749a65a23d17958c411bcd15ad74 SHA1 9ff5761e0d8d01cdb49518cdf5d3372977c0f9ad SHA256 34b2bd026da29cec1224c91d9b4c86bdac3bec95747e167b2127aa329de2f4b2 -EBUILD apbs-1.2.0.ebuild 2514 RMD160 860994d50bc8a5d1657a5f3f6fa0dfef3c1e76e4 SHA1 d917e489ecc0e245e02796097a6aef07617e73ff SHA256 4f4229963c163b60012c091e84cf456a1215680358e3852174f2a972554546bf -EBUILD apbs-1.2.1b-r1.ebuild 2666 RMD160 147ace2cedc979ae431e0e2e83ace236c320c7a0 SHA1 7889ebff83224c531315123dae972d3e503270bf SHA256 c9b404e8870a7461b38139785f62a05db8227464fc6b6bd918467655ed959b8e EBUILD apbs-1.2.1b-r3.ebuild 3447 RMD160 779c3a7076ae8d907b6076ff14538d6aad5eb753 SHA1 92911c7a777bbfddd709d5dd2ad58b415b56f30d SHA256 ac3222c4c52f9bb2c66cf11f76180a9cc93863a1d8c21a6a2dfcf6d34203ea74 -EBUILD apbs-1.2.1b.ebuild 2583 RMD160 03d49d8d7d7a5a7ab71164e40bdde4a0c3e8632e SHA1 7712bc2d3faed84eb914d7466769be38076d11ed SHA256 9fa004e87205630e756762a82e6f6ffa969d77970aab2210b9688a8a295ef2a7 -MISC ChangeLog 5202 RMD160 6a788f62d8f810f76159aa1e7406c8acde6eee7c SHA1 c3c6f659033e558707e0a6dd5cbdccd5347a5f9b SHA256 711d1dde674183e109f18ac74e6ecc47607f5d6c7d9ea313f6e8db00ee4c5308 +MISC ChangeLog 5423 RMD160 c0a79801a7d9dbe0b2c4cd65a7386f169fe6062b SHA1 3a8c3e878710f92b351cd0c891b2a8c2c5dda1e2 SHA256 96d9312e020742d808b06d0954ac901fea98dce6555b29b1aae2cc9af5216b4d MISC metadata.xml 547 RMD160 7df9b626591272a0875025ac69614734ebeaa886 SHA1 7fb86e4654460def273914edb38551efbee4facc SHA256 49c4f98a836f53297ed0efc680613a595f149b92a864ed3e7e329f93ea17116f -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) +Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkvqqusACgkQgAnW8HDreRb+DQCdHLkdIMc1iB8Kq6ZabqTVpb6h -jxEAnjcnjEI8aU0H3IjuII4T/v4sMUg4 -=Duhb +iEYEARECAAYFAkwPNp8ACgkQgAnW8HDreRZJrgCfQ5+X/0aGjP9e43K9gT59k6Zt +d5AAoLn+udD4hVej+eVQmmwlRWlEyoEJ +=eQT+ -----END PGP SIGNATURE----- diff --git a/sci-chemistry/apbs/apbs-1.2.0.ebuild b/sci-chemistry/apbs/apbs-1.2.0.ebuild deleted file mode 100644 index 55c69b2aac41..000000000000 --- a/sci-chemistry/apbs/apbs-1.2.0.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.2.0.ebuild,v 1.1 2009/11/03 05:30:06 markusle Exp $ - -EAPI="2" - -inherit eutils fortran autotools python versionator flag-o-matic - -MY_PV=$(get_version_component_range 1-2) -MY_P="${PN}-${MY_PV}-source" -S="${WORKDIR}"/"${MY_P}" - -DESCRIPTION=" Software for evaluating the electrostatic properties of nanoscale biomolecular systems" -LICENSE="BSD" -HOMEPAGE="http://apbs.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" - -SLOT="0" -IUSE="arpack blas doc mpi python openmp" -KEYWORDS="~x86 ~amd64 ~ppc" - -DEPEND="dev-libs/maloc[mpi=] - blas? ( virtual/blas ) - python? ( dev-lang/python ) - sys-libs/readline - arpack? ( sci-libs/arpack ) - mpi? ( virtual/mpi )" -RDEPEND="${DEPEND}" - -FORTRAN="g77 gfortran ifc" - -src_prepare() { - python_version - - epatch "${FILESDIR}"/${P}-install-fix.patch - epatch "${FILESDIR}"/${P}-contrib.patch - epatch "${FILESDIR}"/${P}-link.patch - sed "s:GENTOO_PKG_NAME:${PN}:g" \ - -i Makefile.am || die "Cannot correct package name" - eautoreconf -} - -src_configure() { - local myconf="--docdir=/usr/share/doc/${PF}" - use blas && myconf="${myconf} --with-blas=-lblas" - use arpack && myconf="${myconf} --with-arpack=/usr/$(get_libdir)" - - # check which mpi version is installed and tell configure - if use mpi; then - export CC="/usr/bin/mpicc" - export F77="/usr/bin/mpif77" - - if has_version sys-cluster/mpich; then - myconf="${myconf} --with-mpich=/usr" - elif has_version sys-cluster/mpich2; then - myconf="${myconf} --with-mpich2=/usr" - elif has_version sys-cluster/lam-mpi; then - myconf="${myconf} --with-lam=/usr" - elif has_version sys-cluster/openmpi; then - myconf="${myconf} --with-openmpi=/usr" - fi - fi || die "Failed to select proper mpi implementation" - - # apbs' configure's openmp detection is broken; we'll - # work around this until it is fixed - if use openmp; then - append-flags -fopenmp - else - myconf="${myconf} --disable-openmp" - fi - - econf $(use_enable python) \ - --disable-maloc-rebuild \ - ${myconf} || die "configure failed" -} - -src_compile() { - emake -j1 || die "make failed" -} - -src_test() { - cd examples && make test \ - || die "Tests failed" -} - -src_install() { - emake -j1 DESTDIR="${D}" install \ - || die "make install failed" - - dodoc AUTHORS INSTALL README NEWS ChangeLog \ - || die "Failed to install docs" - - if use doc; then - dohtml -r doc/* || die "Failed to install html docs" - fi -} diff --git a/sci-chemistry/apbs/apbs-1.2.1b-r1.ebuild b/sci-chemistry/apbs/apbs-1.2.1b-r1.ebuild deleted file mode 100644 index 6d7a0849f8fd..000000000000 --- a/sci-chemistry/apbs/apbs-1.2.1b-r1.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.2.1b-r1.ebuild,v 1.1 2010/02/20 09:33:57 jlec Exp $ - -EAPI="3" - -PYTHON_DEPEND="2" - -inherit eutils fortran autotools python versionator flag-o-matic - -MY_PV=$(get_version_component_range 1-3) -MY_P="${PN}-${MY_PV}" -S="${WORKDIR}"/"${MY_P}-source" - -DESCRIPTION=" Software for evaluating the electrostatic properties of nanoscale biomolecular systems" -LICENSE="BSD" -HOMEPAGE="http://apbs.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}-source.tar.gz" - -SLOT="0" -IUSE="arpack blas doc mpi python openmp" -KEYWORDS="~x86 ~amd64 ~ppc ~amd64-linux ~x86-linux" - -DEPEND="dev-libs/maloc[mpi=] - blas? ( virtual/blas ) - python? ( dev-lang/python ) - sys-libs/readline - arpack? ( sci-libs/arpack ) - mpi? ( virtual/mpi )" -RDEPEND="${DEPEND}" - -FORTRAN="g77 gfortran ifc" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.2.0-install-fix.patch - epatch "${FILESDIR}"/${PN}-1.2.0-contrib.patch - epatch "${FILESDIR}"/${PN}-1.2.0-link.patch - epatch "${FILESDIR}"/${P}-autoconf-2.64.patch - sed "s:GENTOO_PKG_NAME:${PN}:g" \ - -i Makefile.am || die "Cannot correct package name" - eautoreconf -} - -src_configure() { - local myconf="--docdir=${EPREFIX}/usr/share/doc/${PF}" - use blas && myconf="${myconf} --with-blas=-lblas" - use arpack && myconf="${myconf} --with-arpack=${EPREFIX}/usr/$(get_libdir)" - - # check which mpi version is installed and tell configure - if use mpi; then - export CC="${EPREFIX}/usr/bin/mpicc" - export F77="${EPREFIX}/usr/bin/mpif77" - - if has_version sys-cluster/mpich; then - myconf="${myconf} --with-mpich=${EPREFIX}/usr" - elif has_version sys-cluster/mpich2; then - myconf="${myconf} --with-mpich2=${EPREFIX}/usr" - elif has_version sys-cluster/lam-mpi; then - myconf="${myconf} --with-lam=${EPREFIX}/usr" - elif has_version sys-cluster/openmpi; then - myconf="${myconf} --with-openmpi=${EPREFIX}/usr" - fi - fi || die "Failed to select proper mpi implementation" - - # apbs' configure's openmp detection is broken; we'll - # work around this until it is fixed - if use openmp; then - append-flags -fopenmp - else - myconf="${myconf} --disable-openmp" - fi - - econf $(use_enable python) \ - --disable-maloc-rebuild \ - ${myconf} -} - -src_compile() { - emake -j1 || die "make failed" -} - -src_test() { - cd examples && make test \ - || die "Tests failed" -} - -src_install() { - emake -j1 DESTDIR="${D}" install \ - || die "make install failed" - - dodoc AUTHORS INSTALL README NEWS ChangeLog \ - || die "Failed to install docs" - - if use doc; then - dohtml -r doc/* || die "Failed to install html docs" - fi -} diff --git a/sci-chemistry/apbs/apbs-1.2.1b.ebuild b/sci-chemistry/apbs/apbs-1.2.1b.ebuild deleted file mode 100644 index 5941a7f8d10c..000000000000 --- a/sci-chemistry/apbs/apbs-1.2.1b.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.2.1b.ebuild,v 1.3 2010/02/20 09:33:57 jlec Exp $ - -EAPI="2" - -inherit eutils fortran autotools python versionator flag-o-matic - -MY_PV=$(get_version_component_range 1-3) -MY_P="${PN}-${MY_PV}" -S="${WORKDIR}"/"${MY_P}-source" - -DESCRIPTION=" Software for evaluating the electrostatic properties of nanoscale biomolecular systems" -LICENSE="BSD" -HOMEPAGE="http://apbs.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}-source.tar.gz" - -SLOT="0" -IUSE="arpack blas doc mpi python openmp" -KEYWORDS="~x86 ~amd64 ~ppc" - -DEPEND="dev-libs/maloc[mpi=] - blas? ( virtual/blas ) - python? ( dev-lang/python ) - sys-libs/readline - arpack? ( sci-libs/arpack ) - mpi? ( virtual/mpi )" -RDEPEND="${DEPEND}" - -FORTRAN="g77 gfortran ifc" - -src_prepare() { - python_version - - epatch "${FILESDIR}"/${PN}-1.2.0-install-fix.patch - epatch "${FILESDIR}"/${PN}-1.2.0-contrib.patch - epatch "${FILESDIR}"/${PN}-1.2.0-link.patch - epatch "${FILESDIR}"/${P}-autoconf-2.64.patch - sed "s:GENTOO_PKG_NAME:${PN}:g" \ - -i Makefile.am || die "Cannot correct package name" - eautoreconf -} - -src_configure() { - local myconf="--docdir=/usr/share/doc/${PF}" - use blas && myconf="${myconf} --with-blas=-lblas" - use arpack && myconf="${myconf} --with-arpack=/usr/$(get_libdir)" - - # check which mpi version is installed and tell configure - if use mpi; then - export CC="/usr/bin/mpicc" - export F77="/usr/bin/mpif77" - - if has_version sys-cluster/mpich; then - myconf="${myconf} --with-mpich=/usr" - elif has_version sys-cluster/mpich2; then - myconf="${myconf} --with-mpich2=/usr" - elif has_version sys-cluster/lam-mpi; then - myconf="${myconf} --with-lam=/usr" - elif has_version sys-cluster/openmpi; then - myconf="${myconf} --with-openmpi=/usr" - fi - fi || die "Failed to select proper mpi implementation" - - # apbs' configure's openmp detection is broken; we'll - # work around this until it is fixed - if use openmp; then - append-flags -fopenmp - else - myconf="${myconf} --disable-openmp" - fi - - econf $(use_enable python) \ - --disable-maloc-rebuild \ - ${myconf} || die "configure failed" -} - -src_compile() { - emake -j1 || die "make failed" -} - -src_test() { - cd examples && make test \ - || die "Tests failed" -} - -src_install() { - emake -j1 DESTDIR="${D}" install \ - || die "make install failed" - - dodoc AUTHORS INSTALL README NEWS ChangeLog \ - || die "Failed to install docs" - - if use doc; then - dohtml -r doc/* || die "Failed to install html docs" - fi -} diff --git a/sci-chemistry/apbs/files/apbs-1.2.0-install-fix.patch b/sci-chemistry/apbs/files/apbs-1.2.0-install-fix.patch deleted file mode 100644 index 1d6f130a522a..000000000000 --- a/sci-chemistry/apbs/files/apbs-1.2.0-install-fix.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -Naur apbs-1.2-source/Makefile.am apbs-1.2-source.new/Makefile.am ---- apbs-1.2-source/Makefile.am 2009-10-14 13:20:55.000000000 -0400 -+++ apbs-1.2-source.new/Makefile.am 2009-11-02 23:31:41.000000000 -0500 -@@ -28,10 +28,19 @@ - -rm -f ./bin/apbs - - install-data-local: -- mkdir -p ${prefix}/share -- -cp -rf examples ${prefix}/share -- -cp -rf doc ${prefix}/share -- -cp -rf tools ${prefix}/share -+ mkdir -p $(DESTDIR)${prefix}/share/GENTOO_PKG_NAME/examples -+ mkdir -p $(DESTDIR)${prefix}/share/GENTOO_PKG_NAME/tools -+ -rm -f doc/LICENSE.txt -+ -rm -f tools/manip/*.pyc -+ -rm -f tools/**/*.o -+ -rm -f tools/**/Makefile* -+ -rm -f tools/**/**/*.o -+ -rm -f tools/**/**/Makefile* -+ -rm -f tools/Makefile* -+ -rm -f examples/Makefile* -+ -rm -f examples/**/Makefile* -+ -cp -rf examples $(DESTDIR)${prefix}/share/GENTOO_PKG_NAME/ -+ -cp -rf tools $(DESTDIR)${prefix}/share/GENTOO_PKG_NAME/ - - test: - cd examples; make test -diff -Naur apbs-1.2-source/bin/Makefile.am apbs-1.2-source.new/bin/Makefile.am ---- apbs-1.2-source/bin/Makefile.am 2009-10-14 13:20:48.000000000 -0400 -+++ apbs-1.2-source.new/bin/Makefile.am 2009-11-02 23:31:15.000000000 -0500 -@@ -40,6 +40,4 @@ - include_HEADERS = routines.h - - install-data-local: -- -cp -p ${top_apbsdir}/bin/ApbsClient.py ${prefix}/bin -- -chmod 755 ${prefix}/bin/ApbsClient.py -- -rm -f ${prefix}/bin/wsdl2py -\ No newline at end of file -+ -rm -f $(DESTDIR)${prefix}/bin/wsdl2py -- 2.26.2