(QA) RESTRICT clean up.

Package-Manager: portage-2.1.3_rc6

4 files changed, 27 insertions, 29 deletions

diff --git a/sci-chemistry/ccp4/ChangeLog b/sci-chemistry/ccp4/ChangeLog
index 6bc3e41c9af0..dcd91e235302 100644
--- a/sci-chemistry/ccp4/ChangeLog
+++ b/sci-chemistry/ccp4/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/ccp4
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ChangeLog,v 1.11 2007/04/07 08:31:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ChangeLog,v 1.12 2007/07/02 03:02:23 peper Exp $
+
+  02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org> ccp4-6.0.1-r1.ebuild,
+  ccp4-6.0.2.ebuild:
+  (QA) RESTRICT clean up.
 
   07 Apr 2007; Mike Frysinger <vapier@gentoo.org> ccp4-6.0.1-r1.ebuild,
   ccp4-6.0.2.ebuild:
diff --git a/sci-chemistry/ccp4/Manifest b/sci-chemistry/ccp4/Manifest
index db4d4209a629..a2891c7ee732 100644
--- a/sci-chemistry/ccp4/Manifest
+++ b/sci-chemistry/ccp4/Manifest
@@ -71,18 +71,18 @@ DIST refmac5.tcl-r1.39.2.3-r1.42.diff 2464 RMD160 fca236184597ab86fc9ac7333834e6
 DIST rotmat.f-17July2006.diff 1002 RMD160 59cc822edbdc73b24e51cff013c71e4d68927979 SHA1 31fed5d06e8c8afc719f74d50acb0e833b893202 SHA256 1ee4f3288dba6404d59f51b9f9e1b4475413f7e40991204ab39474ee559605b1
 DIST sc.f-r1.9-r1.9.2.1.diff 8783 RMD160 815d25cff0fa76f73dc43da9757ad753ec392f9c SHA1 f55e2e8c84ec8cd3b94cb703b50abff625e3a7fb SHA256 418feea2ccf0014c3c2c83ab9460873114057480fd2a1dcabe305a1b956ad86b
 DIST setup.fh-r1.5-r1.5.2.1.diff 1317 RMD160 45a16b00792706553e7bf23a2f54415cd5ee1b43 SHA1 2a7417cf998b5e9fcac3b3b8a2deb05627d29d1a SHA256 637564c5723fb7de04d3a06817eec704ac708b74264716905690250e42aed146
-EBUILD ccp4-6.0.1-r1.ebuild 13942 RMD160 997765e9977dfb850b4d40ce5e967f9b7e99e82c SHA1 787e60971ee9926f8211058f1962c8c3bc93ecb7 SHA256 eb6b65a52180eabcaaa8927e99347e7bd62227b9f615270bc03777d3fdc46920
-MD5 97b04da2cb34ea8f7e2d251e771b1cdf ccp4-6.0.1-r1.ebuild 13942
-RMD160 997765e9977dfb850b4d40ce5e967f9b7e99e82c ccp4-6.0.1-r1.ebuild 13942
-SHA256 eb6b65a52180eabcaaa8927e99347e7bd62227b9f615270bc03777d3fdc46920 ccp4-6.0.1-r1.ebuild 13942
-EBUILD ccp4-6.0.2.ebuild 13415 RMD160 b7dacf8e5466af6617ca105ff2e0ed43a8ae10eb SHA1 aa6777252c628a63c26eb73e39ad2243f87ad265 SHA256 86aaa59521e0fb1c6bf8b434fa4cd7cc1039bc1ddad0c3cd57b97e8c73670dde
-MD5 e81c46c469388e7feead8bcbe7d9b3e3 ccp4-6.0.2.ebuild 13415
-RMD160 b7dacf8e5466af6617ca105ff2e0ed43a8ae10eb ccp4-6.0.2.ebuild 13415
-SHA256 86aaa59521e0fb1c6bf8b434fa4cd7cc1039bc1ddad0c3cd57b97e8c73670dde ccp4-6.0.2.ebuild 13415
-MISC ChangeLog 2626 RMD160 f2eb0fbd036233df75b657bda08b254e97997d9f SHA1 3cca34e1ea5a0a39967f1edc3f5e9f7aeef8a600 SHA256 3f8232cb39ba58f357009e3310c76fb9cda2fe66a35fc66c61312d7e76e1f0a6
-MD5 8e7e5f0325f2d6accceeae35c06cc624 ChangeLog 2626
-RMD160 f2eb0fbd036233df75b657bda08b254e97997d9f ChangeLog 2626
-SHA256 3f8232cb39ba58f357009e3310c76fb9cda2fe66a35fc66c61312d7e76e1f0a6 ChangeLog 2626
+EBUILD ccp4-6.0.1-r1.ebuild 13796 RMD160 189dc49a7b4b3913db354c65404909240dacc275 SHA1 d29bce23cecfb20715da0bb574047e35247379c6 SHA256 633d178877f12af42ef58f399956e90ba546ff9667683afb97fc5e170ff54010
+MD5 53f01dbb7baceedca71bfd90b545cffc ccp4-6.0.1-r1.ebuild 13796
+RMD160 189dc49a7b4b3913db354c65404909240dacc275 ccp4-6.0.1-r1.ebuild 13796
+SHA256 633d178877f12af42ef58f399956e90ba546ff9667683afb97fc5e170ff54010 ccp4-6.0.1-r1.ebuild 13796
+EBUILD ccp4-6.0.2.ebuild 13269 RMD160 f580f5638c18e71e37a30b9e6a0a2c86cc8d86f9 SHA1 46948a540366a9e24b4ed1dc0208ee2813b4b183 SHA256 37588a973a1ad55f20d3f2a2adb29158a7ca301ccd38cad02a1488f490f70074
+MD5 af86eee0d4970b38658fc4912f83dd2c ccp4-6.0.2.ebuild 13269
+RMD160 f580f5638c18e71e37a30b9e6a0a2c86cc8d86f9 ccp4-6.0.2.ebuild 13269
+SHA256 37588a973a1ad55f20d3f2a2adb29158a7ca301ccd38cad02a1488f490f70074 ccp4-6.0.2.ebuild 13269
+MISC ChangeLog 2748 RMD160 c359e1d715b73c0188f2dea49646bfe9fcf60f3e SHA1 4d232cd147aa3036966b4b7c1b6ea541154b0271 SHA256 da9ee4b882c6d6d2587f43037e08fe0706f07cd502ea428839a23cfaec2ef283
+MD5 97d352731386dd94a103a991d4780868 ChangeLog 2748
+RMD160 c359e1d715b73c0188f2dea49646bfe9fcf60f3e ChangeLog 2748
+SHA256 da9ee4b882c6d6d2587f43037e08fe0706f07cd502ea428839a23cfaec2ef283 ChangeLog 2748
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
 MD5 43628e9f5743b5c3b018a82669a76bc7 metadata.xml 166
 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 metadata.xml 166
@@ -94,9 +94,9 @@ MD5 4197e0ed0288c715e184aa7df8a4dbd6 files/digest-ccp4-6.0.2 265
 RMD160 b7b82a63b44e956b19cd49241a49565cac594d25 files/digest-ccp4-6.0.2 265
 SHA256 a9d7f019b604fd193ac9797e76d5c3058771a16866134bdbe9b94ca137405946 files/digest-ccp4-6.0.2 265
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGF1cO8bi6rjpTunYRArOiAJ43243HlCEQjvpPcAjBbdBi95VkoQCgojOF
-urm3TjL0o9vNb7ymFpE8OlI=
-=KMOH
+iD8DBQFGiGrAppoStNGKGywRAjgHAKCM4aTgQS1dKy3UDPUsbeLUMGAN5wCfYGZg
+2AlTP97QUOWC6TsvO92tgG4=
+=icR5
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild b/sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild
index 3b167a274f1a..c267a96041bb 100644
--- a/sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild
+++ b/sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild,v 1.5 2007/04/07 08:31:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ccp4-6.0.1-r1.ebuild,v 1.6 2007/07/02 03:02:23 peper Exp $
 
 inherit fortran eutils gnuconfig toolchain-funcs
 
@@ -36,7 +36,7 @@ PATCH12=( src
 
 DESCRIPTION="Protein X-ray crystallography toolkit"
 HOMEPAGE="http://www.ccp4.ac.uk/"
-RESTRICT="mirror stricter"
+RESTRICT="mirror"
 SRC_URI="${SRC}/${PV}/packed/${P}-core-src.tar.gz"
 for i in $(seq $PATCH_TOT); do
 	NAME="PATCH${i}[1]"
@@ -72,8 +72,6 @@ RDEPEND="X? (
 		sci-libs/mccp4
 		|| ( app-shells/tcsh app-shells/csh )
 		!app-office/sc"
-# >=sys-apps/portage-2.1.1_pre1 for RESTRICT=stricter
-# Otherwise portage dies instead of fixing RPATHs
 DEPEND="${RDEPEND}
 		X? (
 			|| (
@@ -84,8 +82,7 @@ DEPEND="${RDEPEND}
 				)
 				virtual/x11
 			)
-		)
-		>=sys-apps/portage-2.1.1_pre1"
+		)"
 
 S="${WORKDIR}/${PN}-${PV}"
 
diff --git a/sci-chemistry/ccp4/ccp4-6.0.2.ebuild b/sci-chemistry/ccp4/ccp4-6.0.2.ebuild
index 7541be357821..84ff513c56fd 100644
--- a/sci-chemistry/ccp4/ccp4-6.0.2.ebuild
+++ b/sci-chemistry/ccp4/ccp4-6.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ccp4-6.0.2.ebuild,v 1.4 2007/04/07 08:31:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ccp4-6.0.2.ebuild,v 1.5 2007/07/02 03:02:23 peper Exp $
 
 inherit fortran eutils gnuconfig toolchain-funcs
 
@@ -16,7 +16,7 @@ PATCH_TOT="0"
 
 DESCRIPTION="Protein X-ray crystallography toolkit"
 HOMEPAGE="http://www.ccp4.ac.uk/"
-RESTRICT="mirror stricter"
+RESTRICT="mirror"
 SRC_URI="${SRC}/${PV}/source/${P}-core-src.tar.gz"
 for i in $(seq $PATCH_TOT); do
 	NAME="PATCH${i}[1]"
@@ -47,15 +47,12 @@ RDEPEND="X? (
 		sci-libs/mccp4
 		|| ( app-shells/tcsh app-shells/csh )
 		!app-office/sc"
-# >=sys-apps/portage-2.1.1_pre1 for RESTRICT=stricter
-# Otherwise portage dies instead of fixing RPATHs
 DEPEND="${RDEPEND}
 		X? (
 				x11-misc/imake
 				x11-proto/inputproto
 				x11-proto/xextproto
-		)
-		>=sys-apps/portage-2.1.1_pre1"
+		)"
 
 S="${WORKDIR}/${PN}-${PV}"