diff options
| author |   Justin Lecher (jlec) <jlec@j-schmitz.net> | 2009-05-20 14:35:55 +0200 |
|---|---|---|
| committer | Justin Lecher (jlec) <jlec@j-schmitz.net> | 2009-05-20 14:35:55 +0200 |
| commit | c06920240d493f9ee9b9f138bde669cd57c4d0c0 (patch) | |
| tree | 6082751804e68836adaa0a6cb9d0a0b10c93b809 /sci-libs | |
| parent | clipper-config changes included (diff) | |
| download | sci-c06920240d493f9ee9b9f138bde669cd57c4d0c0.tar.gz sci-c06920240d493f9ee9b9f138bde669cd57c4d0c0.tar.bz2 sci-c06920240d493f9ee9b9f138bde669cd57c4d0c0.zip | |
fixed a typo in clipper-config and migrated frem sed to patch
Diffstat (limited to 'sci-libs')
| -rw-r--r-- | sci-libs/clipper/ChangeLog | 7 | ||||
| -rw-r--r-- | sci-libs/clipper/Manifest | 3 | ||||
| -rw-r--r-- | sci-libs/clipper/clipper-20090210-r2.ebuild (renamed from sci-libs/clipper/clipper-20090210-r1.ebuild) | 8 | ||||
| -rw-r--r-- | sci-libs/clipper/files/20081201-typo.patch | 18 |
4 files changed, 29 insertions, 7 deletions
diff --git a/sci-libs/clipper/ChangeLog b/sci-libs/clipper/ChangeLog index 2d8dbb2ee..080b9f504 100644 --- a/sci-libs/clipper/ChangeLog +++ b/sci-libs/clipper/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/sci-libs/clipper/ChangeLog,v 1.3 2007/12/19 18:43:12 dberkholz Exp $ +*clipper-20090210-r2 (20 May 2009) + + 20 May 2009; Justin Lecher (jlec) <jlec@j-schmitz.net> + +files/20081201-typo.patch, -clipper-20090210-r1.ebuild, + +clipper-20090210-r2.ebuild: + fixed a typo in clipper-config and migrated frem sed to patch + *clipper-20090210-r1 (19 May 2009) 19 May 2009; Justin Lecher (jlec) <jlec@j-schmitz.net> diff --git a/sci-libs/clipper/Manifest b/sci-libs/clipper/Manifest index 68fce6fee..c2bba6b30 100644 --- a/sci-libs/clipper/Manifest +++ b/sci-libs/clipper/Manifest @@ -1,6 +1,7 @@ AUX 20081201-as-needed.patch 3487 RMD160 698e9a72306643e49d6a7165bd3afbbba2ab5d9d SHA1 6ddead8d6c2e45b16bb45d756fce7fc67dd49ac9 SHA256 4fba3f3cd7a0c48c8ce6cc80bd77d4ef4870e6f642f3ea6ff470f0f49809ae56 +AUX 20081201-typo.patch 915 RMD160 4e1eeb005a7100596428154d0cb74b1958c164fb SHA1 a077543e0360efa17fe0d99dd37b1b52ca2926de SHA256 f72b79d8e7678f03ed684821a99ed8ed8f15f2ef7ca621c1fbdde9e8c370bd0d DIST clipper-2.1-090210-ac.tar.gz 967967 RMD160 e806be6f28cf2422225037ab01eff0a0f6a381e6 SHA1 0c2ae5ed2336a8fc39e29f094b37fdf87a8173ad SHA256 aafe5a838587b90bf463c3a5d291d4419c3b358927e3e845b44aafcf0856d97e -EBUILD clipper-20090210-r1.ebuild 1495 RMD160 caed50ded8afcf56e0212e8f80d6fe1ed8d1dc4c SHA1 78d09a7d75bc939d1cd97fa598d21f3fec01b75d SHA256 d670f176e86dde7a175905526a2fa4d4810c80ae33624e7e31e12ca385f244ef +EBUILD clipper-20090210-r1.ebuild 1447 RMD160 7c409e5555b82bbdb415b778ad519e9f16124e2a SHA1 97aad8411f6769f983ed218c8e92a89c0164dcca SHA256 2caf6169e0b9c36493d1b8140618de6af88886db27dfddb6bcb57ee5200f17dc EBUILD clipper-20090210.ebuild 1409 RMD160 40572993a0260d26692f2fbb7b0b70b54d83e915 SHA1 3785c82baf33765b3eb129d4a467b3842ca5a477 SHA256 3eb05ff167984f35aa6bff906a80a23ab8157f418282ad4a30a8c2fc2e4273a8 MISC ChangeLog 1090 RMD160 25e1b048601c001264855ce0e4b42a9dfb180261 SHA1 e2d3cb0e229cfe9dba4d7f4b4e809c0b1d8fd33a SHA256 3d8ff922af8abb04facc1b64f0c907f203fc780ec8b9a349c20b9bb6f0fe1eb6 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852 diff --git a/sci-libs/clipper/clipper-20090210-r1.ebuild b/sci-libs/clipper/clipper-20090210-r2.ebuild index a83ff0e68..a91002bd3 100644 --- a/sci-libs/clipper/clipper-20090210-r1.ebuild +++ b/sci-libs/clipper/clipper-20090210-r2.ebuild @@ -23,7 +23,8 @@ src_unpack() { # ccp4 provides these, and more. sed -i -e "s:examples::g" "${S}"/Makefile.am - epatch "${FILESDIR}"/20081201-as-needed.patch + epatch "${FILESDIR}"/20081201-as-needed.patch \ + "${FILESDIR}"/20081201-typo.patch AT_M4DIR="config" eautoreconf } @@ -51,10 +52,5 @@ src_compile() { } src_install() { - sed \ - -e 's:@MCCP4_CXXFLAGS@::g' \ - -e 's:@CCTBX_LIBS@::g' \ - -i clipper-config - emake DESTDIR="${D}" install || die } diff --git a/sci-libs/clipper/files/20081201-typo.patch b/sci-libs/clipper/files/20081201-typo.patch new file mode 100644 index 000000000..c52256670 --- /dev/null +++ b/sci-libs/clipper/files/20081201-typo.patch @@ -0,0 +1,18 @@ +--- clipper-config.in 2009-02-10 18:42:47.000000000 +0100 ++++ clipper-config.in.new 2009-05-20 14:30:52.000000000 +0200 +@@ -79,13 +79,13 @@ + + if test "$echo_cflags" = "yes" ; then + # and include mccp4 cflags? yes +- cflags="-I${includedir} @CCP4_CXXFLAGS@ @MCCP4_CXXFLAGS@ @MMDB_CXXFLAGS@ @FFTW_CXXFLAGS@" ++ cflags="-I${includedir} @CCP4_CXXFLAGS@ @MMDB_CXXFLAGS@ @FFTW_CXXFLAGS@" + echo $cflags + fi + + if test "$echo_libs" = "yes" ; then + # note BOOST_LIBS should be part of CCTBX_LIBS +- libs="-lclipper-minimol -lclipper-mmdb -lclipper-cns -lclipper-cif -lclipper-c ontrib -lclipper-ccp4 -lclipper-phs -lclipper-core @CCP4_LIBS@ @MMDB_LIBS@ @FFTW_LIBS@ @CCTBX_LIBS@" ++ libs="-lclipper-minimol -lclipper-mmdb -lclipper-cns -lclipper-cif -lclipper-contrib -lclipper-ccp4 -lclipper-phs -lclipper-core @CCP4_LIBS@ @MMDB_LIBS@ @FFTW_LIBS@" + if test "${libdir}" != "/usr/lib" ; then + echo -L${libdir} $libs + else |