Importing the ebuilds from my overlay, fixing some bugs (#152124, a stripping bug; noone reported yet); also introduction a new USE flag, that adds/removes the graphviz dependency.

Package-Manager: portage-2.1.2.1

13 files changed, 366 insertions, 11 deletions

diff --git a/dev-util/quilt/ChangeLog b/dev-util/quilt/ChangeLog
index 7a499477b62c..4c74c541eff3 100644
--- a/dev-util/quilt/ChangeLog
+++ b/dev-util/quilt/ChangeLog
@@ -1,6 +1,20 @@
 # 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.20 2007/02/22 02:25:15 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/quilt/ChangeLog,v 1.21 2007/03/07 11:02:29 phreak Exp $
+
+*quilt-0.46 (07 Mar 2007)
+*quilt-0.45-r1 (07 Mar 2007)
+*quilt-0.42-r1 (07 Mar 2007)
+
+  07 Mar 2007; Christian Heim <phreak@gentoo.org>
+  +files/quilt-0.42-no-graphviz.patch,
+  +files/quilt-0.42-prevent-stripping.patch,
+  +files/quilt-0.45-no-graphviz.patch, +files/quilt-0.46-no-graphviz.patch,
+  metadata.xml, +quilt-0.42-r1.ebuild, +quilt-0.45-r1.ebuild,
+  +quilt-0.46.ebuild:
+  Importing the ebuilds from my overlay, fixing some bugs (#152124, a
+  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:
   Transition to Manifest2.
diff --git a/dev-util/quilt/Manifest b/dev-util/quilt/Manifest
index 56d687cceff3..8020b755c453 100644
--- a/dev-util/quilt/Manifest
+++ b/dev-util/quilt/Manifest
@@ -1,7 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX quilt-0.42-no-graphviz.patch 977 RMD160 98f354290550ee2fa9d8631695d8fbb93173bc1e SHA1 097575bb252a3d94a704029d37b8532088fcdedc SHA256 b6befc22843c6d5bb82e56a12967649856895b504a0df9cbf81e413d1250a7fe
+MD5 07915f9bc2ae2326434fc8b22cca9891 files/quilt-0.42-no-graphviz.patch 977
+RMD160 98f354290550ee2fa9d8631695d8fbb93173bc1e files/quilt-0.42-no-graphviz.patch 977
+SHA256 b6befc22843c6d5bb82e56a12967649856895b504a0df9cbf81e413d1250a7fe files/quilt-0.42-no-graphviz.patch 977
+AUX quilt-0.42-prevent-stripping.patch 516 RMD160 134e82f7d19d91e0a252690b98271dd6040a6e16 SHA1 4b44988197f939885885975a6390046152d77eef SHA256 a98a07afeb6fce3db1bc2623403f4eceb9a164ed35f5a4755907d430852fd957
+MD5 11cc8fa578062cd0578b2d4cb4e69619 files/quilt-0.42-prevent-stripping.patch 516
+RMD160 134e82f7d19d91e0a252690b98271dd6040a6e16 files/quilt-0.42-prevent-stripping.patch 516
+SHA256 a98a07afeb6fce3db1bc2623403f4eceb9a164ed35f5a4755907d430852fd957 files/quilt-0.42-prevent-stripping.patch 516
+AUX quilt-0.45-no-graphviz.patch 1598 RMD160 48a217ebc3ad4513527293e9d2c7a41af4e0a25a SHA1 bcc4646be996e993b624e85835036a3e6c6cc8d4 SHA256 59a918e0cc46db9bc4cd268963b010dd5eb6e5e1e081bc3d51dffb756b4bd0d4
+MD5 bd857ebe5a0fa42282a73d9958d1ea74 files/quilt-0.45-no-graphviz.patch 1598
+RMD160 48a217ebc3ad4513527293e9d2c7a41af4e0a25a files/quilt-0.45-no-graphviz.patch 1598
+SHA256 59a918e0cc46db9bc4cd268963b010dd5eb6e5e1e081bc3d51dffb756b4bd0d4 files/quilt-0.45-no-graphviz.patch 1598
+AUX quilt-0.46-no-graphviz.patch 1598 RMD160 b4c2e0de0309c13f7b17faa375b023b0082650e9 SHA1 3cced5b65d8b7888eddaa698249ce035e75b2909 SHA256 d7858941e34bd101b178594ee00b8092c1ca2fed46b4b089ce014ca4adf17b8a
+MD5 c259fa80cd7ca544228ee5497d20a625 files/quilt-0.46-no-graphviz.patch 1598
+RMD160 b4c2e0de0309c13f7b17faa375b023b0082650e9 files/quilt-0.46-no-graphviz.patch 1598
+SHA256 d7858941e34bd101b178594ee00b8092c1ca2fed46b4b089ce014ca4adf17b8a files/quilt-0.46-no-graphviz.patch 1598
 DIST quilt-0.32.tar.gz 284294 RMD160 91c09d5edbd6ae564d0151d9387d168ca8cd675b SHA1 624e644effb837f0d4071e30740b2c7d54dd6355 SHA256 b9dfc26d059f566ef27fab5c4827d2cc9028a9415e2a20542fd25f5e3ea0aca7
 DIST quilt-0.42.tar.gz 355294 RMD160 f8a2e9fce3e7170f499082f754cc9e2d99023f0b SHA1 0ef01517e21f7798cbbd5fa1937155ed2160a3b2 SHA256 a31f72d390c4abeebbd22ec6b79bed2090677908eeb946d3a1d4aa9c0d81b1fe
 DIST quilt-0.44.tar.gz 397241 RMD160 f4659a1beea0c9235abf90800ea8034772517789 SHA1 a678225ebb21cd06b44fa2e18ed424ba6de7f561 SHA256 67b6c9117bf435fac115992367b26951be894018866d6bdde39ca8e0d0c48bf2
 DIST quilt-0.45.tar.gz 399440 RMD160 d3a7f919a348e3de68b9c805acd4bf15ebbdc747 SHA1 35a08648b7bd9b16383b50f2ebc83caa4de51ad7 SHA256 de7290f334baf631a14d031df304ee94cfb550aa69e7512aa589d21c2381c7d8
+DIST quilt-0.46.tar.gz 403984 RMD160 508d6b4f8c1283b20acf8a757d4b3dfc3b8a7961 SHA1 9344c1289f262053beb0196645b41ea5d9cda597 SHA256 47bf030565bb462840db694acc183273455714028c74974c5b3a3bd4ad29ad89
 DIST quilt_0.39.orig.tar.gz 325861 RMD160 815c1180f50291bf6a61a33defc2ebd7bb130938 SHA1 4ba844ffedcfddca50eed35c5f194c23efd684a6 SHA256 220b99f068398794da1319e7747a47f75ef0e573c1fe970f423a3e96a511bd0f
 DIST quilt_0.40.orig.tar.gz 334556 RMD160 3416a29384a9831e9d9a2c856a4ff3fe1ec6edf5 SHA1 05dc92cd47b52bb905e6f24d9e8e00bc9946e242 SHA256 c8f4efa48b225be583f9ffd197a033bfe47cdafca54281eea84301ca90b090bb
 EBUILD quilt-0.32-r1.ebuild 773 RMD160 4927fad9cff85de9e9686bb28ea62b79b9379bcf SHA1 7a98d84c5296cf4f39bf9ee5ea9dc791b6050ce4 SHA256 62e02b332f15658437c16579de365762b0f11d4a29bd6e2c4b3c82eaf6813579
@@ -16,6 +36,10 @@ EBUILD quilt-0.40.ebuild 1044 RMD160 0b026678a324090566de2fb7e0c793b45fa29a79 SH
 MD5 a7c2b62f6fc8f321e8b2c7869034b3ee quilt-0.40.ebuild 1044
 RMD160 0b026678a324090566de2fb7e0c793b45fa29a79 quilt-0.40.ebuild 1044
 SHA256 5a3c4f392fbc1e34e5330bba57e3e5cdee0f5ed9c667ee06c72800b3ddc2e4b2 quilt-0.40.ebuild 1044
+EBUILD quilt-0.42-r1.ebuild 1408 RMD160 ce773f4ad205a85ed9ddef5f916068d809f959ad SHA1 bfaa6cbd054c6be96adde6bc4f8702aebf85c0f0 SHA256 2c1cbf0b115aabee57f9c857e369fddb26c5c21d050c4a10d264c493e7536452
+MD5 96f5265a7b8dbad21d33e6bab33d36fe quilt-0.42-r1.ebuild 1408
+RMD160 ce773f4ad205a85ed9ddef5f916068d809f959ad quilt-0.42-r1.ebuild 1408
+SHA256 2c1cbf0b115aabee57f9c857e369fddb26c5c21d050c4a10d264c493e7536452 quilt-0.42-r1.ebuild 1408
 EBUILD quilt-0.42.ebuild 1057 RMD160 5bfa3b9be3d6f2bf30965fc1fc8830f7f2c93f57 SHA1 d343a8ad0e484783b6935cbcbad4f8cb4e1a5c5e SHA256 2dc603007ee334e3354d34c549cbe317a04149548b7d0ddf80806f58b47d4197
 MD5 8719a9e10b412054b2d4d6fa155ddcdc quilt-0.42.ebuild 1057
 RMD160 5bfa3b9be3d6f2bf30965fc1fc8830f7f2c93f57 quilt-0.42.ebuild 1057
@@ -24,18 +48,26 @@ 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 1301 RMD160 43a486f5f7bc257b5ee44882113d3f5e5f7e75cb SHA1 0a8fcab4957e3e5c71ed3488183efbb035b63b23 SHA256 0883c8f8a2638dc5b2be3ca03947d1d662efbf01d7efdab7a4e87133b0284118
+MD5 145f9dce040264cb776f1f2279643159 quilt-0.45-r1.ebuild 1301
+RMD160 43a486f5f7bc257b5ee44882113d3f5e5f7e75cb quilt-0.45-r1.ebuild 1301
+SHA256 0883c8f8a2638dc5b2be3ca03947d1d662efbf01d7efdab7a4e87133b0284118 quilt-0.45-r1.ebuild 1301
 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
-MISC ChangeLog 2613 RMD160 7abf216e2fb49b5151d7966227bdd1c20021127c SHA1 555f40f418414a72d4b47a4077480b71febabcf5 SHA256 e4c19b65f7bd2695b1c303b5c0b62bba94805cc8ebc670ecf6a5a58a911887b7
-MD5 c92424c998712d8990e3bd32838d23f5 ChangeLog 2613
-RMD160 7abf216e2fb49b5151d7966227bdd1c20021127c ChangeLog 2613
-SHA256 e4c19b65f7bd2695b1c303b5c0b62bba94805cc8ebc670ecf6a5a58a911887b7 ChangeLog 2613
-MISC metadata.xml 256 RMD160 0805676e1413cbeffc592da939e70ffc982af07a SHA1 7c3119193090c0782f03cd76c85059744574e5ba SHA256 e2a4d2ecf6b3094e4157dfc8f3dec38d5eab7b3730cf409690a2ca4591174c06
-MD5 fa9f0ec1a9f013df4ca78764a473a250 metadata.xml 256
-RMD160 0805676e1413cbeffc592da939e70ffc982af07a metadata.xml 256
-SHA256 e2a4d2ecf6b3094e4157dfc8f3dec38d5eab7b3730cf409690a2ca4591174c06 metadata.xml 256
+EBUILD quilt-0.46.ebuild 1342 RMD160 34c59a083a3cdb0b692d290dca5a404e112a5750 SHA1 7be0389310bfe40ad77034731ac9ac6ae7da5a72 SHA256 5c56b5a7130d2ea1a8fcb2bf0b0f9473485ac8157850ea8649b97bbbbab23f49
+MD5 9b60011facbe070a63ccb6abc031c6aa quilt-0.46.ebuild 1342
+RMD160 34c59a083a3cdb0b692d290dca5a404e112a5750 quilt-0.46.ebuild 1342
+SHA256 5c56b5a7130d2ea1a8fcb2bf0b0f9473485ac8157850ea8649b97bbbbab23f49 quilt-0.46.ebuild 1342
+MISC ChangeLog 3181 RMD160 2b9988a2eb53c5b503ab5dcffb4d9c75978552cc SHA1 aade01bfa559d1dbc44ab2fbae740dad99f4666f SHA256 dc67622902ddaae6276fbead24319ccec1f8eed85a7fa6dcb5748edbe7a9abef
+MD5 71ddbbb975870b6dee2170b9b932db64 ChangeLog 3181
+RMD160 2b9988a2eb53c5b503ab5dcffb4d9c75978552cc ChangeLog 3181
+SHA256 dc67622902ddaae6276fbead24319ccec1f8eed85a7fa6dcb5748edbe7a9abef ChangeLog 3181
+MISC metadata.xml 257 RMD160 4f6a61aaf6aa2d57445909d3a02cc1ffc86bdd3d SHA1 aac29356d72f481ae94920a4a4a690c99ceb9d60 SHA256 4f5bc21a55c0bcb67aa5514a443a6ec7361e2a12e7e1349987c6358e044b3850
+MD5 fe48f88f699c35afb20b2666ffdf2225 metadata.xml 257
+RMD160 4f6a61aaf6aa2d57445909d3a02cc1ffc86bdd3d metadata.xml 257
+SHA256 4f5bc21a55c0bcb67aa5514a443a6ec7361e2a12e7e1349987c6358e044b3850 metadata.xml 257
 MD5 273b7c4f856046f3096cfb95c1d62ab0 files/digest-quilt-0.32-r1 232
 RMD160 9c30eea26c62adfe6a6ca5c2fdee223338b194bb files/digest-quilt-0.32-r1 232
 SHA256 f2553fb47fbb647785cae48d8708b1037c637ad5c1bd515dae3d298bfa4fa02f files/digest-quilt-0.32-r1 232
@@ -48,9 +80,25 @@ SHA256 471e11d6c8347042340399d29f5f3ed42140a2db608e8ee2dc3c6d0362f4f2fa files/di
 MD5 ede7dbd008c7539c4943fb71ef980488 files/digest-quilt-0.42 232
 RMD160 6d51c014c30d5af0049c20f075a457b6fce87390 files/digest-quilt-0.42 232
 SHA256 228496d09fc28aa951ad957cd34bea2315b755902d040b62fe386af33f1abf1a files/digest-quilt-0.42 232
+MD5 ede7dbd008c7539c4943fb71ef980488 files/digest-quilt-0.42-r1 232
+RMD160 6d51c014c30d5af0049c20f075a457b6fce87390 files/digest-quilt-0.42-r1 232
+SHA256 228496d09fc28aa951ad957cd34bea2315b755902d040b62fe386af33f1abf1a files/digest-quilt-0.42-r1 232
 MD5 9dbdca39563ecb4befa5768ffe2da5db files/digest-quilt-0.44 232
 RMD160 1ce9058fe5d94d4ae29a1597d1958a0f46b7bf75 files/digest-quilt-0.44 232
 SHA256 d54e1200f42832d54dbdbdb3b14464e2c7c1586e46ebba66f71d8a14be429cb5 files/digest-quilt-0.44 232
 MD5 8e252869c78d6d99da5be4f88c9c6340 files/digest-quilt-0.45 232
 RMD160 d069f00672027b258f52aa64d199ebe4676bcede files/digest-quilt-0.45 232
 SHA256 2b570e6116cc6d6dd78861815a7c15a6b01be64ed04a70f8db9a9577c2b638a8 files/digest-quilt-0.45 232
+MD5 8e252869c78d6d99da5be4f88c9c6340 files/digest-quilt-0.45-r1 232
+RMD160 d069f00672027b258f52aa64d199ebe4676bcede files/digest-quilt-0.45-r1 232
+SHA256 2b570e6116cc6d6dd78861815a7c15a6b01be64ed04a70f8db9a9577c2b638a8 files/digest-quilt-0.45-r1 232
+MD5 7842f2ac55c0631520a340c64e7a97ea files/digest-quilt-0.46 232
+RMD160 20071dbee2802529b10c101802e09dc9db4edd97 files/digest-quilt-0.46 232
+SHA256 c2b63dd87c22a4eb5c19b91d7e3911e6198da8116bead15361bea197d05c39c5 files/digest-quilt-0.46 232
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF7pvUyuNVb5qfaOYRAtpXAKC95Po0J6Zsby2EP9l4pbfIjvk27ACdGiA1
+o4XT90OslfIkTqpYCsKLRI4=
+=JM67
+-----END PGP SIGNATURE-----
diff --git a/dev-util/quilt/files/digest-quilt-0.42-r1 b/dev-util/quilt/files/digest-quilt-0.42-r1
new file mode 100644
index 000000000000..e15184a42a71
--- /dev/null
+++ b/dev-util/quilt/files/digest-quilt-0.42-r1
@@ -0,0 +1,3 @@
+MD5 c07d43f24f4a473cab4519732647086b quilt-0.42.tar.gz 355294
+RMD160 f8a2e9fce3e7170f499082f754cc9e2d99023f0b quilt-0.42.tar.gz 355294
+SHA256 a31f72d390c4abeebbd22ec6b79bed2090677908eeb946d3a1d4aa9c0d81b1fe quilt-0.42.tar.gz 355294
diff --git a/dev-util/quilt/files/digest-quilt-0.45-r1 b/dev-util/quilt/files/digest-quilt-0.45-r1
new file mode 100644
index 000000000000..4d749db5cfa2
--- /dev/null
+++ b/dev-util/quilt/files/digest-quilt-0.45-r1
@@ -0,0 +1,3 @@
+MD5 5f8dd5a041ca7c700b16620228f922aa quilt-0.45.tar.gz 399440
+RMD160 d3a7f919a348e3de68b9c805acd4bf15ebbdc747 quilt-0.45.tar.gz 399440
+SHA256 de7290f334baf631a14d031df304ee94cfb550aa69e7512aa589d21c2381c7d8 quilt-0.45.tar.gz 399440
diff --git a/dev-util/quilt/files/digest-quilt-0.46 b/dev-util/quilt/files/digest-quilt-0.46
new file mode 100644
index 000000000000..b019ec292553
--- /dev/null
+++ b/dev-util/quilt/files/digest-quilt-0.46
@@ -0,0 +1,3 @@
+MD5 4508546d1ed0257ef7c128b6121b7208 quilt-0.46.tar.gz 403984
+RMD160 508d6b4f8c1283b20acf8a757d4b3dfc3b8a7961 quilt-0.46.tar.gz 403984
+SHA256 47bf030565bb462840db694acc183273455714028c74974c5b3a3bd4ad29ad89 quilt-0.46.tar.gz 403984
diff --git a/dev-util/quilt/files/quilt-0.42-no-graphviz.patch b/dev-util/quilt/files/quilt-0.42-no-graphviz.patch
new file mode 100644
index 000000000000..707fc291d5e2
--- /dev/null
+++ b/dev-util/quilt/files/quilt-0.42-no-graphviz.patch
@@ -0,0 +1,28 @@
+Index: quilt-0.42/Makefile.in
+===================================================================
+--- quilt-0.42.orig/Makefile.in
++++ quilt-0.42/Makefile.in
+@@ -62,8 +62,7 @@ QUILT :=	$(QUILT_IN)
+ SRC +=		$(QUILT_SRC:%=quilt/%)
+ DIRT +=		$(QUILT_IN:%=quilt/%)
+ 
+-SCRIPTS_IN :=	patchfns parse-patch inspect dependency-graph edmail \
+-		remove-trailing-ws
++SCRIPTS_IN :=	patchfns parse-patch inspect edmail remove-trailing-ws
+ SCRIPTS_SRC :=	$(SCRIPTS_IN:%=%.in)
+ SCRIPTS :=	$(SCRIPTS_IN)
+ SRC +=		$(SCRIPTS_SRC:%=scripts/%)
+Index: quilt-0.42/bash_completion
+===================================================================
+--- quilt-0.42.orig/bash_completion
++++ quilt-0.42/bash_completion
+@@ -178,9 +178,6 @@ _quilt_completion()
+ 	fork)
+ 	  COMPREPLY=( )
+ 	  ;;
+-	graph)
+-	   COMPREPLY=( $( compgen -W "-h --all --reduce --lines --edge-labels $(quilt applied)" -- $cur ) )
+-	   ;;
+ 	grep)
+ 	   _longopt grep
+ 	   COMPREPLY=( ${COMPREPLY[@]:-} $( compgen -W "-h" -- $cur ) )
diff --git a/dev-util/quilt/files/quilt-0.42-prevent-stripping.patch b/dev-util/quilt/files/quilt-0.42-prevent-stripping.patch
new file mode 100644
index 000000000000..1f981977300e
--- /dev/null
+++ b/dev-util/quilt/files/quilt-0.42-prevent-stripping.patch
@@ -0,0 +1,13 @@
+Index: quilt-0.42/Makefile.in
+===================================================================
+--- quilt-0.42.orig/Makefile.in
++++ quilt-0.42/Makefile.in
+@@ -235,7 +235,7 @@ install : scripts
+ 	@INSTALL@ -m 644 scripts/patchfns $(BUILD_ROOT)$(SCRIPTS_DIR)
+ 
+ 	@INSTALL@ -d $(BUILD_ROOT)$(LIB_DIR)
+-	@INSTALL@ -m 755 -s $(LIB:%=lib/%) $(BUILD_ROOT)$(LIB_DIR)/
++	@INSTALL@ -m 755 $(LIB:%=lib/%) $(BUILD_ROOT)$(LIB_DIR)/
+ 
+ 	@INSTALL@ -d $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/
+ 	@INSTALL@ -m 644 doc/README \
diff --git a/dev-util/quilt/files/quilt-0.45-no-graphviz.patch b/dev-util/quilt/files/quilt-0.45-no-graphviz.patch
new file mode 100644
index 000000000000..1654b103b752
--- /dev/null
+++ b/dev-util/quilt/files/quilt-0.45-no-graphviz.patch
@@ -0,0 +1,45 @@
+diff -Nupr quilt-0.45.orig/Makefile.in quilt-0.45/Makefile.in
+--- quilt-0.45.orig/Makefile.in	2006-03-25 13:07:26.000000000 +0100
++++ quilt-0.45/Makefile.in	2006-12-27 15:18:36.000000000 +0100
+@@ -80,8 +80,7 @@ QUILT :=	$(QUILT_IN)
+ SRC +=		$(QUILT_SRC:%=quilt/%)
+ DIRT +=		$(QUILT_IN:%=quilt/%)
+ 
+-SCRIPTS_IN :=	patchfns parse-patch inspect dependency-graph edmail	\
+-		remove-trailing-ws
++SCRIPTS_IN :=	patchfns parse-patch inspect edmail remove-trailing-ws
+ 
+ SCRIPTS_SRC :=	$(SCRIPTS_IN:%=%.in)
+ SCRIPTS :=	$(SCRIPTS_IN)
+diff -Nupr quilt-0.45.orig/bash_completion quilt-0.45/bash_completion
+--- quilt-0.45.orig/bash_completion	2006-02-03 08:38:15.000000000 +0100
++++ quilt-0.45/bash_completion	2006-12-27 15:17:58.000000000 +0100
+@@ -95,7 +95,7 @@ _quilt_completion()
+     prev=${COMP_WORDS[COMP_CWORD-1]}
+ 
+     # quilt sub commands 
+-    cmds='add annotate applied delete diff edit files fold fork graph \
++    cmds='add annotate applied delete diff edit files fold fork \
+           grep header import mail new next patches pop previous push refresh \
+ 	  remove rename series setup snapshot top unapplied'
+ 
+@@ -188,19 +188,6 @@ _quilt_completion()
+ 	        ;;
+ 	   esac
+ 	   ;;
+-	graph)
+-	   case $prev in
+-	     -T)
+-	     	COMPREPLY=( $( compgen -W "ps" -- $cur ) )
+-		;;
+-	     --edge-labels)
+-	        COMPREPLY=( $( compgen -W "files" -- $cur ) )
+-		;;
+-	     *)
+-		COMPREPLY=( $( compgen -W "-T -h --all --reduce --lines --edge-labels $(quilt applied)" -- $cur ) )
+-		;;
+-	   esac
+-	   ;;
+ 	grep)
+ 	   _longopt grep
+ 	   COMPREPLY=( ${COMPREPLY[@]:-} $( compgen -W "-h" -- $cur ) )
diff --git a/dev-util/quilt/files/quilt-0.46-no-graphviz.patch b/dev-util/quilt/files/quilt-0.46-no-graphviz.patch
new file mode 100644
index 000000000000..cdc1dffd65b7
--- /dev/null
+++ b/dev-util/quilt/files/quilt-0.46-no-graphviz.patch
@@ -0,0 +1,45 @@
+diff -Nurp quilt-0.46.orig/Makefile.in quilt-0.46/Makefile.in
+--- quilt-0.46.orig/Makefile.in	2006-10-11 14:36:10.000000000 +0200
++++ quilt-0.46/Makefile.in	2006-12-27 15:26:38.000000000 +0100
+@@ -81,8 +81,7 @@ QUILT :=	$(QUILT_IN)
+ SRC +=		$(QUILT_SRC:%=quilt/%)
+ DIRT +=		$(QUILT_IN:%=quilt/%)
+ 
+-SCRIPTS_IN :=	patchfns parse-patch inspect dependency-graph edmail	\
+-		remove-trailing-ws
++SCRIPTS_IN :=	patchfns parse-patch inspect edmail remove-trailing-ws
+ 
+ SCRIPTS_SRC :=	$(SCRIPTS_IN:%=%.in)
+ SCRIPTS :=	$(SCRIPTS_IN)
+diff -Nurp quilt-0.46.orig/bash_completion quilt-0.46/bash_completion
+--- quilt-0.46.orig/bash_completion	2006-02-03 08:38:15.000000000 +0100
++++ quilt-0.46/bash_completion	2006-12-27 15:26:38.000000000 +0100
+@@ -95,7 +95,7 @@ _quilt_completion()
+     prev=${COMP_WORDS[COMP_CWORD-1]}
+ 
+     # quilt sub commands 
+-    cmds='add annotate applied delete diff edit files fold fork graph \
++    cmds='add annotate applied delete diff edit files fold fork \
+           grep header import mail new next patches pop previous push refresh \
+ 	  remove rename series setup snapshot top unapplied'
+ 
+@@ -188,19 +188,6 @@ _quilt_completion()
+ 	        ;;
+ 	   esac
+ 	   ;;
+-	graph)
+-	   case $prev in
+-	     -T)
+-	     	COMPREPLY=( $( compgen -W "ps" -- $cur ) )
+-		;;
+-	     --edge-labels)
+-	        COMPREPLY=( $( compgen -W "files" -- $cur ) )
+-		;;
+-	     *)
+-		COMPREPLY=( $( compgen -W "-T -h --all --reduce --lines --edge-labels $(quilt applied)" -- $cur ) )
+-		;;
+-	   esac
+-	   ;;
+ 	grep)
+ 	   _longopt grep
+ 	   COMPREPLY=( ${COMPREPLY[@]:-} $( compgen -W "-h" -- $cur ) )
diff --git a/dev-util/quilt/metadata.xml b/dev-util/quilt/metadata.xml
index 7bf3a5fd1e07..34444dc20cdb 100644
--- a/dev-util/quilt/metadata.xml
+++ b/dev-util/quilt/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>dev-tools</herd>
 	<maintainer>
-		<email>ka0ttic@gentoo.org</email>
-		<name>Aaron Walker</name>
+		<email>phreak@gentoo.org</email>
+		<name>Christian Heim</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/quilt/quilt-0.42-r1.ebuild b/dev-util/quilt/quilt-0.42-r1.ebuild
new file mode 100644
index 000000000000..e5929c661be0
--- /dev/null
+++ b/dev-util/quilt/quilt-0.42-r1.ebuild
@@ -0,0 +1,52 @@
+# 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.42-r1.ebuild,v 1.1 2007/03/07 11:02:29 phreak Exp $
+
+inherit bash-completion eutils
+
+DESCRIPTION="quilt patch manager"
+HOMEPAGE="http://savannah.nongnu.org/projects/quilt"
+SRC_URI="http://savannah.nongnu.org/download/quilt/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="graphviz"
+
+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() {
+	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."
+	echo
+	epause
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# quilt-0.4.2 prestrips the libraries. Prevent it!
+	epatch "${FILESDIR}"/${P}-prevent-stripping.patch
+
+	# Add support for a "no-graphviz" version
+	use graphviz || epatch "${FILESDIR}"/${P}-no-graphviz.patch
+}
+
+src_install() {
+	make BUILD_ROOT="${D}" install || die "make install failed"
+
+	rm -rf "${D}"/usr/share/doc/${P}
+	dodoc AUTHORS TODO quilt.changes doc/README doc/README.MAIL \
+		doc/quilt.pdf doc/sample.quiltrc
+
+	rm -rf "${D}"/etc/bash_completion.d
+	dobashcompletion bash_completion
+}
diff --git a/dev-util/quilt/quilt-0.45-r1.ebuild b/dev-util/quilt/quilt-0.45-r1.ebuild
new file mode 100644
index 000000000000..f272f5afc90d
--- /dev/null
+++ b/dev-util/quilt/quilt-0.45-r1.ebuild
@@ -0,0 +1,49 @@
+# 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.1 2007/03/07 11:02:29 phreak Exp $
+
+inherit bash-completion eutils
+
+DESCRIPTION="quilt patch manager"
+HOMEPAGE="http://savannah.nongnu.org/projects/quilt"
+SRC_URI="http://savannah.nongnu.org/download/quilt/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ppc ppc64 ~x86"
+IUSE="graphviz"
+
+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() {
+	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."
+	echo
+	epause
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Add support for USE=graphviz
+	use graphviz || epatch "${FILESDIR}/${P}-no-graphviz.patch"
+}
+
+src_install() {
+	make BUILD_ROOT="${D}" install || die "make install failed"
+
+	rm -rf ${D}/usr/share/doc/${P}
+	dodoc AUTHORS BUGS TODO quilt.changes doc/README doc/README.MAIL \
+		doc/quilt.pdf doc/sample.quiltrc
+
+	rm -rf ${D}/etc/bash_completion.d
+	dobashcompletion bash_completion
+}
diff --git a/dev-util/quilt/quilt-0.46.ebuild b/dev-util/quilt/quilt-0.46.ebuild
new file mode 100644
index 000000000000..95d30e864cab
--- /dev/null
+++ b/dev-util/quilt/quilt-0.46.ebuild
@@ -0,0 +1,52 @@
+# 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.1 2007/03/07 11:02:29 phreak Exp $
+
+inherit bash-completion eutils
+
+DESCRIPTION="quilt patch manager"
+HOMEPAGE="http://savannah.nongnu.org/projects/quilt"
+SRC_URI="http://savannah.nongnu.org/download/quilt/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="graphviz"
+
+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() {
+	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."
+	echo
+	epause
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Add support for USE=graphviz
+	use graphviz || epatch "${FILESDIR}/${P}-no-graphviz.patch"
+}
+
+src_install() {
+	make BUILD_ROOT="${D}" install || die "make install failed"
+
+	rm -rf "${D}"/usr/share/doc/${P}
+	dodoc AUTHORS TODO quilt.changes doc/README doc/README.MAIL \
+		doc/quilt.pdf
+
+	rm -rf "${D}"/etc/bash_completion.d
+	dobashcompletion bash_completion
+
+	# Remove the compat symlinks
+	rm -rf "${D}"/usr/share/quilt/compat
+}