From ff36112fd3f7dde3c91f13c7107179ba95ccc1ee Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Wed, 16 Jun 2010 08:45:25 +0000 Subject: [PATCH] Fix regressions from last version Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- sci-chemistry/ccp4-apps/ChangeLog | 8 +++++++- sci-chemistry/ccp4-apps/Manifest | 10 +++++----- ....3-r3.ebuild => ccp4-apps-6.1.3-r4.ebuild} | 19 ++++++++++--------- 3 files changed, 22 insertions(+), 15 deletions(-) rename sci-chemistry/ccp4-apps/{ccp4-apps-6.1.3-r3.ebuild => ccp4-apps-6.1.3-r4.ebuild} (95%) diff --git a/sci-chemistry/ccp4-apps/ChangeLog b/sci-chemistry/ccp4-apps/ChangeLog index 3d761c75a4de..b80bd4068dc1 100644 --- a/sci-chemistry/ccp4-apps/ChangeLog +++ b/sci-chemistry/ccp4-apps/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-chemistry/ccp4-apps # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ChangeLog,v 1.12 2010/06/15 13:53:33 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ChangeLog,v 1.13 2010/06/16 08:45:25 jlec Exp $ + +*ccp4-apps-6.1.3-r4 (16 Jun 2010) + + 16 Jun 2010; Justin Lecher -ccp4-apps-6.1.3-r3.ebuild, + +ccp4-apps-6.1.3-r4.ebuild: + Fix regressions from last version 15 Jun 2010; Justin Lecher ccp4-apps-6.1.3-r3.ebuild: keyworded for linux prefix diff --git a/sci-chemistry/ccp4-apps/Manifest b/sci-chemistry/ccp4-apps/Manifest index 54202513bdcf..42008cf7429e 100644 --- a/sci-chemistry/ccp4-apps/Manifest +++ b/sci-chemistry/ccp4-apps/Manifest @@ -22,13 +22,13 @@ DIST 6.1.3-oasis4.0.patch.bz2 946 RMD160 b448376114ba41e6999d533929fdb79812476f8 DIST ccp4-6.1.3-core-src.tar.gz 242134076 RMD160 e9b7deb0766fb95d5e8946881f20e086f0896fe9 SHA1 ee5ada892694db5dc9b2d7d2330b4ac694f56580 SHA256 1e529c660e7f390ec0feca9d45caa00a2813d23156c10a2747c427117293c324 EBUILD ccp4-apps-6.1.3-r1.ebuild 12077 RMD160 3d378a420a0924c020340e62af29cd7b4e12fef8 SHA1 c615a6d1b72e32225a6843578aac5f54d19b253b SHA256 f2964d988ffb23733719b52ee00f421e512a19f8a5d2adff34490aac3ebfbf16 EBUILD ccp4-apps-6.1.3-r2.ebuild 12075 RMD160 b55f145ec0b0f52dd30538545b96ffc39e0f9b4b SHA1 96f9ffd1e81547bced1efe0dcf32ae341882ec7d SHA256 2a8379f47a680aac5404f26a2981fe5dec577d3fd699e7e3368d622401142f10 -EBUILD ccp4-apps-6.1.3-r3.ebuild 12682 RMD160 a0cb2e7b03a62403706d8d961c0bb189512e9349 SHA1 4c3f8fd3569e23ceaa8e65ed1091f042df14743f SHA256 23dd67e003c2051479df6a4ad57d267795ec58bea4ee982589b6c684958d2dec -MISC ChangeLog 2297 RMD160 7061bf90520d706bf774d39213aaeb3fd4e6a6f7 SHA1 bb88d47b970107acb6386bf89c7db859d3478e2d SHA256 19cf55ec0ad81b4476de7fa146c616bd813ea700cc26cb1630562cd9f11002bc +EBUILD ccp4-apps-6.1.3-r4.ebuild 12738 RMD160 ea30ebfee58da1dfc4e7fef11cd7dd24c921efad SHA1 224b607c25c68df270c39489997a523ba6bff5c9 SHA256 4e3244279b144ae1c28abda22143d66bf835c4864ad757464937b796cac4def6 +MISC ChangeLog 2474 RMD160 120c4cfd7352318f52275b5dd778440e627a902f SHA1 926699c62277c074619d1be8328b0cb36df5335f SHA256 cb12c0ea6b06e401b408f725b6766279fcb9005d765b10de85fac42a43e694eb MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkwXtQYACgkQgAnW8HDreRbmxgCgoGsvG7YkfMNekukWx/2Qsw8A -KYwAn3q0gysOrWEwj0kaCHcrQmt9NdYV -=mHNh +iEYEARECAAYFAkwYjysACgkQgAnW8HDreRYSpACdFUrWR51k3D69iANeSHHxoLv1 +5OIAn2JufQYyXNgiZKlkoaAlqFei2kC4 +=OV8R -----END PGP SIGNATURE----- diff --git a/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r3.ebuild b/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r4.ebuild similarity index 95% rename from sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r3.ebuild rename to sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r4.ebuild index 3bde3ec3454a..64782cf643a0 100644 --- a/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r3.ebuild +++ b/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r4.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-chemistry/ccp4-apps/ccp4-apps-6.1.3-r3.ebuild,v 1.5 2010/06/15 17:14:39 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r4.ebuild,v 1.1 2010/06/16 08:45:25 jlec Exp $ EAPI="3" @@ -69,7 +69,7 @@ TKDEPS=" SCILIBS=" ~sci-libs/ccp4-libs-${PV} - !<=sci-libs/ccp4-libs-${PV}-r1 + >=sci-libs/ccp4-libs-${PV}-r2 sci-libs/clipper =sci-libs/fftw-2* sci-libs/mmdb @@ -183,10 +183,10 @@ src_prepare() { -e '/^SUBDIRS/s:libxml2 gc7.0::g' \ Makefile.am sed -i \ - -e '/^rappermc_LDADD/s:../gc7.0/libgc.la ../libxml2/libxml2.la:-lgc -lxml2:g' \ + -e '/^rapper_LDADD/s:../gc7.0/libgc.la ../libxml2/libxml2.la:-lgc -lxml2:g' \ LOOP/Makefile.am sed -i \ - -e '/^INCLUDES/s:-I../gc7.0/include -I../libxml2/include:-I${EPREFIX}/usr/include/gc -I${EPREFIX}/usr/include/libxml2:g' \ + -e "/^INCLUDES/s:-I../gc7.0/include -I../libxml2/include:-I${EPREFIX}/usr/include/gc -I${EPREFIX}/usr/include/libxml2:g" \ LOOP/Makefile.am eautoreconf popd 2>/dev/null @@ -274,6 +274,7 @@ src_configure() { pushd src/clipper_progs 2>/dev/null econf \ --prefix="${S}" \ + --bindir="${ED}"/usr/libexec/ccp4/bin \ --with-ccp4="${S}" \ --with-clipper="${EPREFIX}"/usr \ --with-fftw="${EPREFIX}"/usr \ @@ -310,7 +311,7 @@ src_install() { # We do this manually, since disabling the clipper libraries also # disables the clipper programs pushd "${S}"/src/clipper_progs 2>/dev/null - emake install || die + emake install || die popd 2>/dev/null einstall || die "install failed" @@ -394,8 +395,8 @@ src_install() { mv "${S}"/manual/README "${S}"/manual/README-manual dodoc manual/* README CHANGES doc/* examples/README || die - rm "${D}"/usr/share/doc/${PF}/GNUmakefile.* - rm "${D}"/usr/share/doc/${PF}/COPYING.* + rm "${ED}"/usr/share/doc/${PF}/GNUmakefile.* + rm "${ED}"/usr/share/doc/${PF}/COPYING.* dohtml -r "${S}"/html/* @@ -418,8 +419,8 @@ src_install() { done fi # Needed for ccp4i docs to work - dosym ../../share/doc/${PF}/examples /usr/$(get_libdir)/ccp4/examples - dosym ../../share/doc/${PF}/html /usr/$(get_libdir)/ccp4/html + dosym ../../share/doc/${PF}/examples /usr/$(get_libdir)/ccp4/examples || die + dosym ../../share/doc/${PF}/html /usr/$(get_libdir)/ccp4/html || die # Fix overlaps with other packages rm -f "${ED}"/usr/share/man/man1/rasmol.1* "${ED}"/usr/lib/font84.dat || die -- 2.26.2