Fix installation Problem of missing with missing libccif

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

4 files changed, 21 insertions, 20 deletions

diff --git a/sci-libs/ccp4-libs/ChangeLog b/sci-libs/ccp4-libs/ChangeLog
index 1bd9056376eb..55f0f291a2b7 100644
--- 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.9 2010/07/02 20:09:50 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ChangeLog,v 1.10 2010/07/03 08:06:25 jlec Exp $
+
+  03 Jul 2010; Justin Lecher <jlec@gentoo.org> files/6.1.3-noinstall.patch,
+  ccp4-libs-6.1.3-r3.ebuild:
+  Fix installation Problem of missing with missing libccif
 
   02 Jul 2010; Justin Lecher <jlec@gentoo.org>
   files/6.1.3-dont-build-mmdb.patch:
diff --git a/sci-libs/ccp4-libs/Manifest b/sci-libs/ccp4-libs/Manifest
index d82ea0295c50..6e0abe8a7bcf 100644
--- a/sci-libs/ccp4-libs/Manifest
+++ b/sci-libs/ccp4-libs/Manifest
@@ -7,19 +7,19 @@ AUX 6.1.3-dont-build-mmdb.patch 749 RMD160 2f4b04d07095d464f00522a935cb93c2dae40
 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
-AUX 6.1.3-noinstall.patch 5226 RMD160 6ddeaefd702fc64256f761dd9b832a1e9686a2f3 SHA1 4416be1663dceedb1d1cf511c39c706ecb8f787c SHA256 2a4a57db992ad19329ac0531ef34599c58cfcba618d92448366e84bb395a8bde
+AUX 6.1.3-noinstall.patch 5107 RMD160 aa46bf2511627656aebdf9b7da864fde1ae8956f SHA1 4bdf82c46b917c73dd36ceddc1a40ce1f32164f1 SHA256 01c3a769e4dbbbad0f5a5ce6452fe12fee464f0aa3e981c06a0c2fd2bc20b61c
 AUX 6.1.3-unbundle-libs.patch 9063 RMD160 326af0e6990134546fb2607dae707b94d4588149 SHA1 ef929532e45c12fb168e5fca4eb7fa8c857c376a SHA256 7e5fc919b5204e2d9141f7715afdd8a8b4e3e2a96e2bf95aa00fbd56046f1aa4
 DIST ccp4-6.1.3-core-src.tar.gz 242134076 RMD160 e9b7deb0766fb95d5e8946881f20e086f0896fe9 SHA1 ee5ada892694db5dc9b2d7d2330b4ac694f56580 SHA256 1e529c660e7f390ec0feca9d45caa00a2813d23156c10a2747c427117293c324
 EBUILD ccp4-libs-6.1.3-r1.ebuild 6141 RMD160 7b49aedef260644eb31dc5581bffa58f2b452479 SHA1 70c015dc857ee9afc19bdfb8189bcae3c1f57e61 SHA256 54c6997a9ef747c29ae6e1497e83c1f2465ecb9c75cdb73b578caeb89b17dabf
 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-r3.ebuild 6485 RMD160 4f151bb9dcac5d9fb1308a685cfd9984244b3ff7 SHA1 a0a7e865553705105f1bfa1fff0ec2fd3b31801d SHA256 63716440b502f9129e171f55749a2d695de755c02050b4a95b3a15b209c9199e
 EBUILD ccp4-libs-6.1.3.ebuild 5892 RMD160 2fb6d639e3201775ba15ed8a27586b69be7707c7 SHA1 c7240c3c925042c04fd112402ac09607ae6448cf SHA256 9fe3acab2d6f59161772fcac0cf45e2150372d3cbb38f7edfafe2d6f47ab5fb8
-MISC ChangeLog 1667 RMD160 ce4f9326c9b8a816d5e38bcc28b6d4d89cc771a2 SHA1 e933b6555fe5d6973ff702b90f79072830f280df SHA256 f7c93f6fba81344e1131eb43c26a750cbe0a2b0c479df652f1680f1b12809b45
+MISC ChangeLog 1833 RMD160 8772b7982ca4e74ccc6e988bda5f1c7de8b2a882 SHA1 29b31a840cc4fb611362314b9bcb15eff1304206 SHA256 d256cfdcdcc67e030a4a0b74a73e66d37cefc5c0a59edc4b102731c35a1cb17f
 MISC metadata.xml 306 RMD160 57ba72f54388a666851bda87e52d313d618084e3 SHA1 7d2f57cb3f35eb6d4567b211e01251b5945d4eb2 SHA256 af351be5ead71b377b6fa2fa118fb9aee74129afdc19f736b41596d3033106aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwuR5QACgkQgAnW8HDreRY+WgCbBmKk6UQJjtuR52IBUaVi23GN
-H/QAnilPLGTKMsmS1RWB4UQkXfCp6unw
-=jhdF
+iEYEARECAAYFAkwu74cACgkQgAnW8HDreRZ7ogCfVl01+pkstM8ahNiYAszRIGNM
+BcsAoIvjXWlPuHFUEYztYooc27GXt0cG
+=Nph7
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r3.ebuild b/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r3.ebuild
index f803da80de02..c3983f55be80 100644
--- a/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r3.ebuild
+++ b/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r3.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/ccp4-libs/ccp4-libs-6.1.3-r3.ebuild,v 1.2 2010/06/30 18:44:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r3.ebuild,v 1.3 2010/07/03 08:06:25 jlec Exp $
 
 EAPI="3"
 
@@ -167,8 +167,8 @@ src_configure() {
 	# Fix linking
 #	$(tc-getCC) ${userldflags} -shared -Wl,-soname,libmmdb.so -o libmmdb.so \${MMDBOBJS} $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}') -lm -lstdc++ && \
 	export SHARE_LIB="\
-		$(tc-getCC) ${userldflags} -shared -Wl,-soname,libccp4c.so -o libccp4c.so \${CORELIBOBJS} \${CGENERALOBJS} \${CUCOBJS} \${CMTZOBJS} \${CMAPOBJS} \${CSYMOBJS} -L.. -lccif $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}') -lm && \
-		${FORTRANC} ${userldflags} -shared -Wl,-soname,libccp4f.so -o libccp4f.so \${FORTRANLOBJS} \${FINTERFACEOBJS} -L.. -lccif -L. -lccp4c -lmmdb $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}') -lstdc++ -lgfortran -lm"
+		$(tc-getCC) ${userldflags} -shared -Wl,-soname,libccp4c.so -o libccp4c.so \${CORELIBOBJS} \${CGENERALOBJS} \${CUCOBJS} \${CMTZOBJS} \${CMAPOBJS} \${CSYMOBJS} -L../ccif/ -lccif $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}') -lm && \
+		${FORTRANC} ${userldflags} -shared -Wl,-soname,libccp4f.so -o libccp4f.so \${FORTRANLOBJS} \${FINTERFACEOBJS} -L../ccif/ -lccif -L. -lccp4c -lmmdb $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}') -lstdc++ -lgfortran -lm"
 
 	# Can't use econf, configure rejects unknown options like --prefix
 	./configure \
diff --git a/sci-libs/ccp4-libs/files/6.1.3-noinstall.patch b/sci-libs/ccp4-libs/files/6.1.3-noinstall.patch
index bfb526c35661..37bf77c27796 100644
--- a/sci-libs/ccp4-libs/files/6.1.3-noinstall.patch
+++ b/sci-libs/ccp4-libs/files/6.1.3-noinstall.patch
@@ -74,7 +74,7 @@ index 975f1d9..75eda9f 100755
  
  uninstall :
 diff --git a/lib/data/Makefile.in b/lib/data/Makefile.in
-index cc25c5c..7445ca5 100755
+index cc25c5c..f51ccbe 100755
 --- a/lib/data/Makefile.in
 +++ b/lib/data/Makefile.in
 @@ -30,9 +30,9 @@ font84.dat : fontpack $(srcdir)/font84.ascii
@@ -82,15 +82,16 @@ index cc25c5c..7445ca5 100755
  install : all 
  	-rm -f font84.dat
 -	test -f font84.ascii || $(LNS) $(srcdir)/font84.ascii .
-+	test -f font84.ascii || $(LNS) $(DESTIDIR)/$(srcdir)/font84.ascii .
- 	./fontpack
+-	./fontpack
 -	$(INSTALL) `pwd`/font84.dat $(libdir)/font84.dat 
++	test -f font84.ascii || $(LNS) $(DESTDIR)/$(srcdir)/font84.ascii .
++	LD_LIBRARY_PATH="../src:../ccif" ./fontpack
 +	$(INSTALL) `pwd`/font84.dat $(DESTDIR)/$(libdir)/font84.dat 
  
  uninstall :
  	-rm -f $(libdir)/font84.dat
 diff --git a/lib/src/Makefile.in b/lib/src/Makefile.in
-index c23f488..3a611f1 100755
+index b32dd1e..cfa8852 100755
 --- a/lib/src/Makefile.in
 +++ b/lib/src/Makefile.in
 @@ -685,7 +685,7 @@ testlib : $(srcdir)/testlib.f  $(LF)
@@ -102,18 +103,14 @@ index c23f488..3a611f1 100755
  	@list='$(ccp4_HEADERS)'; for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
  	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-@@ -716,13 +716,11 @@ uninstall-mmdbHEADERS:
- 	  rm -f $(DESTDIR)$(includedir)/mmdb/$$f; \
+@@ -717,10 +717,10 @@ uninstall-mmdbHEADERS:
  	done
  
--install : all install-ccp4HEADERS install-mmdbHEADERS
--	$(INSTALL_DATA) `pwd`/$(LMMDB) $(libdir)/$(LMMDB)
+ install : all install-ccp4HEADERS install-mmdbHEADERS
 -	$(INSTALL_DATA) `pwd`/$(LC) $(libdir)/$(LC)
 -	$(INSTALL_DATA) `pwd`/$(LF) $(libdir)/$(LF)
--	$(RANLIB) $(libdir)/$(LMMDB)
 -	$(RANLIB) $(libdir)/$(LC)
 -	$(RANLIB) $(libdir)/$(LF)
-+install : all install-ccp4HEADERS
 +	$(RANLIB) $(LC)
 +	$(RANLIB) $(LF)
 +	$(INSTALL_DATA) `pwd`/$(LC) $(DESTDIR)/$(libdir)/$(LC)