Fix installation Problem of missing libmmdb, reported by dberkholz on irc

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/sci-libs/ccp4-libs/ChangeLog b/sci-libs/ccp4-libs/ChangeLog
index 2161040bd0fd4a7da81da04248c9cd15de253137..1bd9056376eb3ed76076d7153abeac94774a818f 100644 (file)
--- a/sci-libs/ccp4-libs/ChangeLog
+++ b/sci-libs/ccp4-libs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/ccp4-libs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ChangeLog,v 1.8 2010/06/30 18:44:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ChangeLog,v 1.9 2010/07/02 20:09:50 jlec Exp $
+
+  02 Jul 2010; Justin Lecher <jlec@gentoo.org>
+  files/6.1.3-dont-build-mmdb.patch:
+  Fix installation Problem of missing libmmdb
 
   30 Jun 2010; Justin Lecher <jlec@gentoo.org> -files/6.1.3-destdir.patch,
   ccp4-libs-6.1.3-r3.ebuild:

diff --git a/sci-libs/ccp4-libs/Manifest b/sci-libs/ccp4-libs/Manifest
index d11343c2ae8a8a666b25cdb769521a5ee1ac572c..d82ea0295c50cf1c856eaf61d2ac1a34e47c4d86 100644 (file)
--- a/sci-libs/ccp4-libs/Manifest
+++ b/sci-libs/ccp4-libs/Manifest
@@ -3,7 +3,7 @@ Hash: SHA1
 
 AUX 6.0.2-ppc-double-define-gerror.patch 424 RMD160 4f012233446fffa61e8d775a19a0dacea4ae2234 SHA1 209fa1bdf1e59b4055177e343b69e487d9183fb3 SHA256 09c2c1e0176bee94673b21609b2b00118b2bb4f5942f3feb35c64c61c99ebc61
 AUX 6.1.3-ccif-shared.patch 1668 RMD160 803687b13dbe93aaeed8264a73dfe7303b5fcdfb SHA1 3d833aefea874c08e61140613b0a5c75a90e0382 SHA256 57c201ee81e3fd95f174fecfd810ddf12509f0c2bfb1b2f317f893561eb60e3f
-AUX 6.1.3-dont-build-mmdb.patch 324 RMD160 b9ad1f72415d7a95fba58d07440c19c78062ddb6 SHA1 4d53ff4106b4ff216def790177801f1c50da8cce SHA256 06d4bf3ee012e123f141e8dcaf1abffd9b0fbee9720f8c490d78dabe9e944f66
+AUX 6.1.3-dont-build-mmdb.patch 749 RMD160 2f4b04d07095d464f00522a935cb93c2dae40f4c SHA1 5b82f59ce190cb82601b7af55083b1a5689c9ae0 SHA256 cf73ff7c361ba7ed3e3084a4c298a1e45307a8b0ac7e2704628f3e0f345a9bde
 AUX 6.1.3-dont-make-dirs-in-configure.patch 2866 RMD160 ba49e45ab609a42a2d93b96f55af913bf9625610 SHA1 36c9329c3768c08687ef062c9ab649d32833b422 SHA256 1b5997f17526a4fd60ffa9eccf4b765aadf3a78c9394657000e0454f364240ca
 AUX 6.1.3-glibc2.10.patch 1018 RMD160 577ee4a6174df36bb8bac82738523f5c757df4b9 SHA1 48ad6d0d024c43d64277e4decba420d51e75a510 SHA256 d2a2ddf2a66738d94723b50797e279f64c8e057a3e584e33f9eb9c8d7ea0e532
 AUX 6.1.3-link-proberly.patch 8282 RMD160 c45d3d1931e6a083c0c96b819aff3f67873659b8 SHA1 b1be6f1f7162616a60f3e12fe02dbe4dd426e990 SHA256 f6623dfb0d270e5fbffe03f95b23c967ec8da34b3d0a1c5262941979a965f9ea
@@ -14,12 +14,12 @@ EBUILD ccp4-libs-6.1.3-r1.ebuild 6141 RMD160 7b49aedef260644eb31dc5581bffa58f2b4
 EBUILD ccp4-libs-6.1.3-r2.ebuild 6141 RMD160 3b629dbda585d8391e64701fab362df0edaf4ebd SHA1 e367891a27dd68f6cc6f70f34516d80795e3623b SHA256 356863aa6ef2ed260fc57d00e95929442a816da11c93f8d1477907ba90ac73c6
 EBUILD ccp4-libs-6.1.3-r3.ebuild 6473 RMD160 9cd71214121c06ddf5a2c0fbf8da37fbe1040005 SHA1 05b324f0974c6a73a6be898514a82701394a14ae SHA256 6161a83b3cc2ec86946287406d250a92050bf34a8a99c71e544fc68e55b9c2b6
 EBUILD ccp4-libs-6.1.3.ebuild 5892 RMD160 2fb6d639e3201775ba15ed8a27586b69be7707c7 SHA1 c7240c3c925042c04fd112402ac09607ae6448cf SHA256 9fe3acab2d6f59161772fcac0cf45e2150372d3cbb38f7edfafe2d6f47ab5fb8
-MISC ChangeLog 1536 RMD160 9e291c21d4b3512d83bd1a768726ffbd51850ea7 SHA1 5ee45ef8f965f4f884bb6e74fe6b649cfa3b3b30 SHA256 6083af5ec04f3ccf8d6f140cfe27a0f2b2bdba273409ca1d1b1414e05decaed9
+MISC ChangeLog 1667 RMD160 ce4f9326c9b8a816d5e38bcc28b6d4d89cc771a2 SHA1 e933b6555fe5d6973ff702b90f79072830f280df SHA256 f7c93f6fba81344e1131eb43c26a750cbe0a2b0c479df652f1680f1b12809b45
 MISC metadata.xml 306 RMD160 57ba72f54388a666851bda87e52d313d618084e3 SHA1 7d2f57cb3f35eb6d4567b211e01251b5945d4eb2 SHA256 af351be5ead71b377b6fa2fa118fb9aee74129afdc19f736b41596d3033106aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwrkLAACgkQgAnW8HDreRbQPQCfUjiIW7NtrK51u9keYw05hiW5
-nRwAoK6guhb9fFbKTd8ipu9PVvmOKKaJ
-=R55t
+iEYEARECAAYFAkwuR5QACgkQgAnW8HDreRY+WgCbBmKk6UQJjtuR52IBUaVi23GN
+H/QAnilPLGTKMsmS1RWB4UQkXfCp6unw
+=jhdF
 -----END PGP SIGNATURE-----

diff --git a/sci-libs/ccp4-libs/files/6.1.3-dont-build-mmdb.patch b/sci-libs/ccp4-libs/files/6.1.3-dont-build-mmdb.patch
index ac52001245e68cbab4ed3fa97607009f1e306ee6..b3147ad81bbfae4a4e4b7e11d09afca424da79d2 100644 (file)
--- a/sci-libs/ccp4-libs/files/6.1.3-dont-build-mmdb.patch
+++ b/sci-libs/ccp4-libs/files/6.1.3-dont-build-mmdb.patch
@@ -1,6 +1,8 @@
---- lib/src/Makefile.in        2009-06-18 15:44:08.000000000 +0200
-+++ lib/src/Makefile.in.new    2009-08-11 11:58:25.000000000 +0200
-@@ -176,7 +176,7 @@
+diff --git a/lib/src/Makefile.in b/lib/src/Makefile.in
+index c23f488..b32dd1e 100755
+--- a/lib/src/Makefile.in
++++ b/lib/src/Makefile.in
+@@ -176,7 +176,7 @@ $(mmdbsrcdir)/mmdb_sbase0.h    $(mmdbsrcdir)/hybrid_36.h
  
  ##### Makefile targets ######
  
@@ -9,3 +11,14 @@
  # maybe create shared library
        $(SHARE_LIB)
  
+@@ -717,10 +717,8 @@ uninstall-mmdbHEADERS:
+       done
+ 
+ install : all install-ccp4HEADERS install-mmdbHEADERS
+-      $(INSTALL_DATA) `pwd`/$(LMMDB) $(libdir)/$(LMMDB)
+       $(INSTALL_DATA) `pwd`/$(LC) $(libdir)/$(LC)
+       $(INSTALL_DATA) `pwd`/$(LF) $(libdir)/$(LF)
+-      $(RANLIB) $(libdir)/$(LMMDB)
+       $(RANLIB) $(libdir)/$(LC)
+       $(RANLIB) $(libdir)/$(LF)
+       $(SHARE_INST)