Buildsystem fix, #319347

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

5 files changed, 41 insertions, 26 deletions

diff --git a/sci-chemistry/balbes/ChangeLog b/sci-chemistry/balbes/ChangeLog
index 0ec1bf5aaccb..92a402a02452 100644
--- a/sci-chemistry/balbes/ChangeLog
+++ b/sci-chemistry/balbes/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-chemistry/balbes
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/balbes/ChangeLog,v 1.3 2010/04/22 19:53:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/balbes/ChangeLog,v 1.4 2010/05/12 10:29:35 jlec Exp $
+
+*balbes-1.0.0_p100317-r1 (12 May 2010)
+
+  12 May 2010; Justin Lecher <jlec@gentoo.org>
+  -files/1.0.0_p100317-ldflags.patch, -balbes-1.0.0_p100317.ebuild,
+  +files/1.0.0_p100317-makefile.patch, +balbes-1.0.0_p100317-r1.ebuild:
+  Buildsystem fix, #319347
 
   22 Apr 2010; Justin Lecher <jlec@gentoo.org> balbes-1.0.0_p100317.ebuild:
   Fixes for Python ABIs
diff --git a/sci-chemistry/balbes/Manifest b/sci-chemistry/balbes/Manifest
index aa58178bc92b..3fec35b6873c 100644
--- a/sci-chemistry/balbes/Manifest
+++ b/sci-chemistry/balbes/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 1.0.0_p100317-ldflags.patch 4625 RMD160 4fbb03a04e537d6f718fce4ca071e690df86aead SHA1 6edda34cad028233d0aadd57c4e174e51846a88c SHA256 5a7381573dbb548444f706c6b647e71a85728c5d40e03210a659d3abe90705b4
+AUX 1.0.0_p100317-makefile.patch 5150 RMD160 c2f167b02a475543cec7fd67d95a0fff563dede3 SHA1 4139dcaf29c46eff7be3a3b3e9af253e97be8ce3 SHA256 e25ec095918f38c99972896a48db6a0b0b1df36ba0a7a337acae7aa9c46bbbda
 DIST balbes-1.0.0_p100317.tar.gz 506464 RMD160 5fbb018b33d539734b5421951178c62847f58acf SHA1 a6907d1762c12c63f71bfb9fbb9d601d4271cda6 SHA256 c5bf6c2086e1a3d7d380e5501c0cffdb91cbf77c74d2951dd345273f21921d0c
 DIST ccp4-6.1.3-core-src.tar.gz 242134076 RMD160 e9b7deb0766fb95d5e8946881f20e086f0896fe9 SHA1 ee5ada892694db5dc9b2d7d2330b4ac694f56580 SHA256 1e529c660e7f390ec0feca9d45caa00a2813d23156c10a2747c427117293c324
-EBUILD balbes-1.0.0_p100317.ebuild 1767 RMD160 7dd7d796f98927f248be30f764db40f41145fbda SHA1 0b19e9fc43dbf3eeaec77bbdc92b32e20c7add8f SHA256 d62a1d8edc108c3ede5921fed3060c4cdbbe13c4a57b852a9fa123b021c7e8b5
-MISC ChangeLog 627 RMD160 4ce2566ce96cb72fe855bc5abf6969ab19a6707c SHA1 979f287140434665c187e3d2828d84027f60cf46 SHA256 9f9bba90ee692de6d721fea8734803f6917b024606f73d66a46dffdb37ac13aa
+EBUILD balbes-1.0.0_p100317-r1.ebuild 1432 RMD160 1641b4555f5a52be933ca7cb18d9b2fbde808bde SHA1 b32b945949abe2d4293c39399558a1d3c5045e08 SHA256 c3947cd1b66ec2119b963f825a607fb0e317a6dee203c7ac3354251d5c0f9fda
+MISC ChangeLog 882 RMD160 109deaaf691be16b9eb393a0ed32043e1e75c26e SHA1 44f3485650d9ad13710f0d7e6cec12c8a4593d49 SHA256 375211ce11354d0693873d19205289f145f62fcb3e4e1b3f31dc4acc8cb7a10e
 MISC metadata.xml 699 RMD160 964f68eb52b2551c0632c527b35db898b874c5dd SHA1 341a49a79324f693a523d85647bf7b44a6e24908 SHA256 0b4c1aed85a6a421f6e2ec9e74213c2461c47286a61858001f8779b1803698d6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkvQqUgACgkQgAnW8HDreRYAIgCff3/smX87IqFFB5Om08qgnKYW
-VWgAoJrQn20w092RNz7dAs1rGJZ86p1J
-=QJQt
+iEYEARECAAYFAkvqgxUACgkQgAnW8HDreRacwwCeL6DHCjVy9R2bWmXKywY53cKI
+bpoAoMMnVxQyoozNpFUFm80fMa0d0vVK
+=9tWy
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/balbes/balbes-1.0.0_p100317.ebuild b/sci-chemistry/balbes/balbes-1.0.0_p100317-r1.ebuild
index a12f835f00af..4fac8c89ae70 100644
--- a/sci-chemistry/balbes/balbes-1.0.0_p100317.ebuild
+++ b/sci-chemistry/balbes/balbes-1.0.0_p100317-r1.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/balbes/balbes-1.0.0_p100317.ebuild,v 1.3 2010/04/22 19:53:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/balbes/balbes-1.0.0_p100317-r1.ebuild,v 1.1 2010/05/12 10:29:36 jlec Exp $
 
 EAPI="3"
 
@@ -32,6 +32,7 @@ S="${WORKDIR}"/src
 
 pkg_setup() {
 	python_set_active_version 2
+	fortran_pkg_setup
 }
 
 src_unpack() {
@@ -42,21 +43,12 @@ src_unpack() {
 
 src_prepare() {
 	mkdir "${WORKDIR}"/bin || die
-	epatch "${FILESDIR}"/${PV}-ldflags.patch
+	epatch "${FILESDIR}"/${PV}-makefile.patch
 }
 
 src_compile() {
-	# incomplete targets:
-	# dimer_search_db domain_search_db domain align3
-	targets="search_db get_structure_db manage_db search_dm dom2ch
-				save_si get_pdb_list_db update_db
-				update_dom_db bl2mtz check_file_db fobs2cif sol_check
-				get_trns p2s check_cell alt_sg
-				align cell_list create_bins
-				get_pdb_list_db get_ch get_nm get_mod"
 	emake \
-		BLANC_FORT="${FORTRANC} ${FFLAGS}" \
-		${targets} || die
+		BLANC_FORT="${FORTRANC} ${FFLAGS}" || die
 }
 
 src_install() {
diff --git a/sci-chemistry/balbes/files/1.0.0_p100317-ldflags.patch b/sci-chemistry/balbes/files/1.0.0_p100317-makefile.patch
index e1d09b7f3c33..da17240642d7 100644
--- a/sci-chemistry/balbes/files/1.0.0_p100317-ldflags.patch
+++ b/sci-chemistry/balbes/files/1.0.0_p100317-makefile.patch
@@ -1,8 +1,24 @@
 diff --git a/makefile b/makefile
-index baaceb5..139037e 100755
+index baaceb5..85a7baf 100755
 --- a/makefile
 +++ b/makefile
-@@ -201,58 +201,58 @@ save_seg_id.o: save_seg_id.f
+@@ -70,6 +70,15 @@ OBJDB_G =  get_pdb_list.o
+ 
+ #OBJDB_Z =  blanc2mtz.o libutils.o
+ 
++# incomplete targets:
++# dimer_search_db domain_search_db domain align3
++all: search_db get_structure_db manage_db search_dm dom2ch \
++            save_si get_pdb_list_db update_db \
++            update_dom_db bl2mtz check_file_db fobs2cif sol_check \
++            get_trns p2s check_cell alt_sg \
++            align cell_list create_bins \
++            get_pdb_list_db get_ch get_nm get_mod
++
+ search_db: sdb_l
+ 
+ get_structure_db: tdb_l
+@@ -201,58 +210,58 @@ save_seg_id.o: save_seg_id.f
  	$(BLANC_FORT) -c save_seg_id.f 
  
  sdb_l: $(OBJDB_S)
diff --git a/sci-chemistry/ccp4-apps/Manifest b/sci-chemistry/ccp4-apps/Manifest
index 19e2861225aa..9ef4d2686fc8 100644
--- a/sci-chemistry/ccp4-apps/Manifest
+++ b/sci-chemistry/ccp4-apps/Manifest
@@ -21,13 +21,13 @@ AUX 6.1.3-setup.patch 12338 RMD160 2107d599dfe477863710d6b8098b3ca43b8cd22d SHA1
 DIST 6.1.3-oasis4.0.patch.bz2 946 RMD160 b448376114ba41e6999d533929fdb79812476f87 SHA1 7667aca14d28cec01bfa7d2eee9cbce11624f4fa SHA256 12d7c5965e0c46b0f482514d9083d6be94d65eeb14ba29c17d507d5f9669f84b
 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 a00f39bd4b8b0e6f2b614801abb90495c867c12c SHA1 1442d693038b8da3ccfaf33f11e266f90c54fbe6 SHA256 97039b674609109821d3e994c8edc22c6e4f12934a7ce467522faa1f3d690713
-EBUILD ccp4-apps-6.1.3-r2.ebuild 12056 RMD160 7e6161af1c75db56c9707584b74a7ee0f260ce32 SHA1 35ab109b5974d69b2deb0ad5d957a077c0ca072a SHA256 2a0fc76378e1ec7df01b65c54a61acce63c947b7be0236d19299f78cb32c454f
-MISC ChangeLog 1772 RMD160 584c3aa42baa1c8dc25408c67f34706395a21983 SHA1 10daf8e75b640f930c539d636295cb25eed5ffad SHA256 16e14cac30db83750150b442e05c9a9619394e812cdfd320e13d91d1b974778d
+EBUILD ccp4-apps-6.1.3-r2.ebuild 12074 RMD160 aeef82e5c05a7347e531bdbf2279da86ebedc949 SHA1 59f3efdf357dfcf5334f74748ca479672c1d2ce0 SHA256 9b32317814d7b4faa57ebee78309174ee797ee6575423dc9ce5544dd954ab88b
+MISC ChangeLog 1880 RMD160 9510da75b72f5b82422870001eda4656e57bb43c SHA1 df91a85909a0c546b84a72333eda76d186d99a53 SHA256 5de1c19a7abc6742f517c3db75f7e8bf226189abd1add66ea756efa2afdcbe36
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkvUJ5MACgkQgAnW8HDreRahQQCgqNGKzFE/w3+wwyFGxdq3w0FP
-Oa4AoJIfOUd7DqPv5jGhdU6yQ7ZuaHfg
-=8dvN
+iEYEARECAAYFAkvqg6kACgkQgAnW8HDreRZ5VgCgqgUED+h/4D8vxvp8alY2c4l+
+KpwAnidTRvZpTpmcKIXYjen4OBwIXF/Q
+=SVnG
 -----END PGP SIGNATURE-----