Fixing up FEATURES=test, backporting vapier's changes to quilt-0.45-r1.

Package-Manager: portage-2.1.2.5

4 files changed, 35 insertions, 30 deletions

diff --git a/dev-util/quilt/ChangeLog b/dev-util/quilt/ChangeLog
index cc06b15bfa94..dd60d25041c7 100644
--- a/dev-util/quilt/ChangeLog
+++ b/dev-util/quilt/ChangeLog
@@ -1,8 +1,12 @@
 # ChangeLog for dev-util/quilt
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/quilt/ChangeLog,v 1.23 2007/03/12 19:02:59 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/quilt/ChangeLog,v 1.24 2007/05/01 07:44:03 phreak Exp $
 
-  12 Mar 2007; Raúl Porcel <armin76@gentoo.org> quilt-0.45-r1.ebuild:
+  01 May 2007; Christian Heim <phreak@gentoo.org> quilt-0.45-r1.ebuild,
+  quilt-0.46.ebuild:
+  Fixing up FEATURES=test, backporting vapier's changes to quilt-0.45-r1.
+
+  12 Mar 2007; Raúl Porcel <armin76@gentoo.org> quilt-0.45-r1.ebuild:
   x86 stable
 
   07 Mar 2007; Christian Heim <phreak@gentoo.org> quilt-0.42-r1.ebuild,
@@ -23,7 +27,7 @@
   stripping bug; noone reported yet); also introduction a new USE flag, that
   adds/removes the graphviz dependency.
 
-  22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
+  22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
 
   08 Dec 2006; Luca Barbato <lu_zero@gentoo.org> quilt-0.45.ebuild:
diff --git a/dev-util/quilt/Manifest b/dev-util/quilt/Manifest
index 6074c5b46e1b..656666391026 100644
--- a/dev-util/quilt/Manifest
+++ b/dev-util/quilt/Manifest
@@ -48,22 +48,22 @@ EBUILD quilt-0.44.ebuild 1061 RMD160 ffa87097e2138653299da6a0b6134ba860a7536a SH
 MD5 764be052b1618fc4291d10b33e4ff7e8 quilt-0.44.ebuild 1061
 RMD160 ffa87097e2138653299da6a0b6134ba860a7536a quilt-0.44.ebuild 1061
 SHA256 42ba030871dfb9c25b6df8a387749c0568067d0afc2299eda8b55a69e2edd848 quilt-0.44.ebuild 1061
-EBUILD quilt-0.45-r1.ebuild 1303 RMD160 76f584a0677173a159a87638eb1c2fbb8cd299b0 SHA1 c11f043ee7be3686f3806b5bc07ce420d1719821 SHA256 d25b7ea4a1a6b9fcfc064fe703bb4a80b445848ee9f01d6c13a1ac1b9673d50c
-MD5 d2aa709bd359bdf8914010a7d6edc510 quilt-0.45-r1.ebuild 1303
-RMD160 76f584a0677173a159a87638eb1c2fbb8cd299b0 quilt-0.45-r1.ebuild 1303
-SHA256 d25b7ea4a1a6b9fcfc064fe703bb4a80b445848ee9f01d6c13a1ac1b9673d50c quilt-0.45-r1.ebuild 1303
+EBUILD quilt-0.45-r1.ebuild 1343 RMD160 0a238a147dd4b73c9250ef0daa625a52220ceaab SHA1 52c27c0db029e5328cef96103530f7e2af755c7b SHA256 6c755defb34f0f035c91eed30c7d8ad605a81d0dfa57d8a71af4d2b1ee68b36b
+MD5 e2842095f7dbeeb264219412a67d6a00 quilt-0.45-r1.ebuild 1343
+RMD160 0a238a147dd4b73c9250ef0daa625a52220ceaab quilt-0.45-r1.ebuild 1343
+SHA256 6c755defb34f0f035c91eed30c7d8ad605a81d0dfa57d8a71af4d2b1ee68b36b quilt-0.45-r1.ebuild 1343
 EBUILD quilt-0.45.ebuild 1066 RMD160 7f5712f3855480af65432888a33e71fb70bc0fbb SHA1 436ffec60a6e51fc727369704c4f8b7bf5d61925 SHA256 38faf80328fe19203778c6cff75a036b07f6fa2b25e4c966b379b323ab276f51
 MD5 385482d89be86458b0adb3c8d479b802 quilt-0.45.ebuild 1066
 RMD160 7f5712f3855480af65432888a33e71fb70bc0fbb quilt-0.45.ebuild 1066
 SHA256 38faf80328fe19203778c6cff75a036b07f6fa2b25e4c966b379b323ab276f51 quilt-0.45.ebuild 1066
-EBUILD quilt-0.46.ebuild 1370 RMD160 344d347d317d755bbbd59d0dea963a26dbf4a6d9 SHA1 fd0d7ec2b65da5721ae2fb5ac3590f45574abde7 SHA256 fe6459622bc8ba1bc2ccd0ced44d4d250a7d480a17e1b780d5f14a0edfe4dd84
-MD5 c0dc1fc2cb804da7079e0a2efeba472b quilt-0.46.ebuild 1370
-RMD160 344d347d317d755bbbd59d0dea963a26dbf4a6d9 quilt-0.46.ebuild 1370
-SHA256 fe6459622bc8ba1bc2ccd0ced44d4d250a7d480a17e1b780d5f14a0edfe4dd84 quilt-0.46.ebuild 1370
-MISC ChangeLog 3427 RMD160 99d191f849621e12a0a27ad03e9473a6017dbde0 SHA1 ce51cc6580dc4e73f8c677c4ba135a1796632939 SHA256 0aa99651bddea45f85c983ced443ddc563d40e8c8fcf79813c2b6c42d329ee2a
-MD5 98aeee335c760bba197cd30884bf0043 ChangeLog 3427
-RMD160 99d191f849621e12a0a27ad03e9473a6017dbde0 ChangeLog 3427
-SHA256 0aa99651bddea45f85c983ced443ddc563d40e8c8fcf79813c2b6c42d329ee2a ChangeLog 3427
+EBUILD quilt-0.46.ebuild 1385 RMD160 39994c65dfe9ec95dd7f424616d72ffe7ad79a66 SHA1 177a947f34c22383c753e7b7a4789e2c4d49aee9 SHA256 b0641f5429c5a00b23b0caaa9bd3d81fc7422a0da26e2a5a9389d97eef31d9c3
+MD5 0f7ff2a831cac91ac7f675c354277fe4 quilt-0.46.ebuild 1385
+RMD160 39994c65dfe9ec95dd7f424616d72ffe7ad79a66 quilt-0.46.ebuild 1385
+SHA256 b0641f5429c5a00b23b0caaa9bd3d81fc7422a0da26e2a5a9389d97eef31d9c3 quilt-0.46.ebuild 1385
+MISC ChangeLog 3598 RMD160 5f5f1d80e861ee6c998a9033a813c989fde9fdd2 SHA1 d303a1f60566c8859e69e874626d3011ea376a31 SHA256 735d3815a86747090fde9a4119fb3f6ccd7b6d04f0e932da09071105bd3e25e5
+MD5 a89485c10ce9982cfaec1dd06c41a3ba ChangeLog 3598
+RMD160 5f5f1d80e861ee6c998a9033a813c989fde9fdd2 ChangeLog 3598
+SHA256 735d3815a86747090fde9a4119fb3f6ccd7b6d04f0e932da09071105bd3e25e5 ChangeLog 3598
 MISC metadata.xml 257 RMD160 4f6a61aaf6aa2d57445909d3a02cc1ffc86bdd3d SHA1 aac29356d72f481ae94920a4a4a690c99ceb9d60 SHA256 4f5bc21a55c0bcb67aa5514a443a6ec7361e2a12e7e1349987c6358e044b3850
 MD5 fe48f88f699c35afb20b2666ffdf2225 metadata.xml 257
 RMD160 4f6a61aaf6aa2d57445909d3a02cc1ffc86bdd3d metadata.xml 257
@@ -98,7 +98,7 @@ SHA256 c2b63dd87c22a4eb5c19b91d7e3911e6198da8116bead15361bea197d05c39c5 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGCCd/8bi6rjpTunYRAitgAJ9SxFPoR+1fvU6MUTVhPGm2q6IFGACfTJLQ
-ntHFKYeaYGQY7Q/cVeKXkTg=
-=lBzh
+iD8DBQFGNu/QyuNVb5qfaOYRAlxuAKClG8ltSPXnm/2BfUeM4yPYKqpC+ACfQkDL
+cwALjXWg4U1JeLOZRcTfpdI=
+=DgkX
 -----END PGP SIGNATURE-----
diff --git a/dev-util/quilt/quilt-0.45-r1.ebuild b/dev-util/quilt/quilt-0.45-r1.ebuild
index 9b5ce56267b8..8e5139dda951 100644
--- a/dev-util/quilt/quilt-0.45-r1.ebuild
+++ b/dev-util/quilt/quilt-0.45-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/dev-util/quilt/quilt-0.45-r1.ebuild,v 1.3 2007/03/12 19:02:59 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/quilt/quilt-0.45-r1.ebuild,v 1.4 2007/05/01 07:44:03 phreak Exp $
 
 inherit bash-completion eutils
 
@@ -17,14 +17,11 @@ RDEPEND="sys-apps/ed
 	dev-util/diffstat
 	graphviz? ( media-gfx/graphviz )"
 
-# The tests are somewhat broken while being run from within portage, work fine
-# if you run them manually
-RESTRICT="test"
-
 pkg_setup() {
+	use graphviz && return 0
 	echo
-	elog "If you intend to use the folding functionality (graphical illustration of the patch stack)"
-	elog "then you'll need to remerge this package with USE=graphviz."
+	elog "If you intend to use the folding functionality (graphical illustration of the"
+	elog "patch stack) then you'll need to remerge this package with USE=graphviz."
 	echo
 	epause 5
 }
@@ -35,6 +32,10 @@ src_unpack() {
 
 	# Add support for USE=graphviz
 	use graphviz || epatch "${FILESDIR}/${P}-no-graphviz.patch"
+
+	# Some tests are somewhat broken while being run from within portage, work
+	# fine if you run them manually
+	rm "${S}"/test/delete.test
 }
 
 src_install() {
diff --git a/dev-util/quilt/quilt-0.46.ebuild b/dev-util/quilt/quilt-0.46.ebuild
index 65a7ab9f5567..58c4c6869297 100644
--- a/dev-util/quilt/quilt-0.46.ebuild
+++ b/dev-util/quilt/quilt-0.46.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/dev-util/quilt/quilt-0.46.ebuild,v 1.3 2007/03/26 20:03:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/quilt/quilt-0.46.ebuild,v 1.4 2007/05/01 07:44:03 phreak Exp $
 
 inherit bash-completion eutils
 
@@ -17,10 +17,6 @@ RDEPEND="sys-apps/ed
 	dev-util/diffstat
 	graphviz? ( media-gfx/graphviz )"
 
-# The tests are somewhat broken while being run from within portage, work fine
-# if you run them manually
-RESTRICT="test"
-
 pkg_setup() {
 	use graphviz && return 0
 	echo
@@ -36,6 +32,10 @@ src_unpack() {
 
 	# Add support for USE=graphviz
 	use graphviz || epatch "${FILESDIR}/${P}-no-graphviz.patch"
+
+	# Some tests are somewhat broken while being run from within portage, work
+	# fine if you run them manually
+	rm "${S}"/test/delete.test
 }
 
 src_install() {