Clean up unpack/patch process.

Package-Manager: portage-2.1.1_pre1-r5

3 files changed, 36 insertions, 33 deletions

diff --git a/net-dns/djbdns/ChangeLog b/net-dns/djbdns/ChangeLog
index ef46f7a8449b..362b002ac6bc 100644
--- a/net-dns/djbdns/ChangeLog
+++ b/net-dns/djbdns/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-dns/djbdns
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/ChangeLog,v 1.80 2006/04/30 04:20:01 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/ChangeLog,v 1.81 2006/06/30 00:59:55 robbat2 Exp $
+
+  30 Jun 2006; Robin H. Johnson <robbat2@gentoo.org> djbdns-1.05-r17.ebuild:
+  Clean up unpack/patch process.
 
   30 Apr 2006; Michael Hanselmann <hansmi@gentoo.org>
   -djbdns-1.05-r14.ebuild, -djbdns-1.05-r16.ebuild:
diff --git a/net-dns/djbdns/Manifest b/net-dns/djbdns/Manifest
index 0b4f2e3fbc16..a47465a25fa7 100644
--- a/net-dns/djbdns/Manifest
+++ b/net-dns/djbdns/Manifest
@@ -1,59 +1,59 @@
-AUX 1.05-errno.patch 238 RMD160 b479d8c16dd8fe7206cba19125dd8866c2584301 SHA1 f23206f3ffc1a8aa6768fdb2ef588012c17eaa79 SHA256 40e01efac08e95bf87b46e2d86378b0a60c234c64080b7f42039178ac6de61af size 238
+AUX 1.05-errno.patch 238 RMD160 b479d8c16dd8fe7206cba19125dd8866c2584301 SHA1 f23206f3ffc1a8aa6768fdb2ef588012c17eaa79 SHA256 40e01efac08e95bf87b46e2d86378b0a60c234c64080b7f42039178ac6de61af
 MD5 188096855028696985f1b9d839d1643f files/1.05-errno.patch 238
 RMD160 b479d8c16dd8fe7206cba19125dd8866c2584301 files/1.05-errno.patch 238
 SHA256 40e01efac08e95bf87b46e2d86378b0a60c234c64080b7f42039178ac6de61af files/1.05-errno.patch 238
-AUX djbdns-setup 11152 RMD160 6de107a57748468996c2d7b5ed00641abf51d67e SHA1 dc9b478709699ce66b64f82f0f1fd1749af2f58a SHA256 f9cac2b3050ce0869afdb1f27af9690fd5fb4817acad1144d8b879233d979713 size 11152
+AUX djbdns-setup 11152 RMD160 6de107a57748468996c2d7b5ed00641abf51d67e SHA1 dc9b478709699ce66b64f82f0f1fd1749af2f58a SHA256 f9cac2b3050ce0869afdb1f27af9690fd5fb4817acad1144d8b879233d979713
 MD5 e978c483e32ec53b3eb8a2b703c89d6d files/djbdns-setup 11152
 RMD160 6de107a57748468996c2d7b5ed00641abf51d67e files/djbdns-setup 11152
 SHA256 f9cac2b3050ce0869afdb1f27af9690fd5fb4817acad1144d8b879233d979713 files/djbdns-setup 11152
-AUX djbdns-setup-r17 10881 RMD160 eabdbfd226d6ee4172e55a62beed77bb68aa222c SHA1 f056a51a5f511c54b98536c238eff8c1fecb5755 SHA256 33c64d8341ea868e124e7fe0da6a8f9ba6fc799a79584e002a82c572921ed5e4 size 10881
+AUX djbdns-setup-r17 10881 RMD160 eabdbfd226d6ee4172e55a62beed77bb68aa222c SHA1 f056a51a5f511c54b98536c238eff8c1fecb5755 SHA256 33c64d8341ea868e124e7fe0da6a8f9ba6fc799a79584e002a82c572921ed5e4
 MD5 357468f880552fcc6ead17d99cefb3ea files/djbdns-setup-r17 10881
 RMD160 eabdbfd226d6ee4172e55a62beed77bb68aa222c files/djbdns-setup-r17 10881
 SHA256 33c64d8341ea868e124e7fe0da6a8f9ba6fc799a79584e002a82c572921ed5e4 files/djbdns-setup-r17 10881
-AUX dnscache-setup 6007 RMD160 d5a29943ac29d84a8c83308a497721010ab017bc SHA1 764e3dbecca295c307589c3141fc24c3ff0bc5a5 SHA256 5a69f71468172e9e9636f1cb22e08718a084daa0f31953aae604539d66a2603e size 6007
+AUX dnscache-setup 6007 RMD160 d5a29943ac29d84a8c83308a497721010ab017bc SHA1 764e3dbecca295c307589c3141fc24c3ff0bc5a5 SHA256 5a69f71468172e9e9636f1cb22e08718a084daa0f31953aae604539d66a2603e
 MD5 2804eedf8bf07dacf67d094c5122c723 files/dnscache-setup 6007
 RMD160 d5a29943ac29d84a8c83308a497721010ab017bc files/dnscache-setup 6007
 SHA256 5a69f71468172e9e9636f1cb22e08718a084daa0f31953aae604539d66a2603e files/dnscache-setup 6007
-AUX dnsroots.patch 349 RMD160 c3be22070645e27a8c16e9f1dd268963b749c5f7 SHA1 f09404a752062956319b4ebb6d381588df467eba SHA256 99e8ef90a20f66fedf903aa13e3f5360010cf11c27c59dc53b967f02ffe06114 size 349
+AUX dnsroots.patch 349 RMD160 c3be22070645e27a8c16e9f1dd268963b749c5f7 SHA1 f09404a752062956319b4ebb6d381588df467eba SHA256 99e8ef90a20f66fedf903aa13e3f5360010cf11c27c59dc53b967f02ffe06114
 MD5 dfd675b2775efcbb604413a84db8bf1a files/dnsroots.patch 349
 RMD160 c3be22070645e27a8c16e9f1dd268963b749c5f7 files/dnsroots.patch 349
 SHA256 99e8ef90a20f66fedf903aa13e3f5360010cf11c27c59dc53b967f02ffe06114 files/dnsroots.patch 349
-AUX dnstracesort.patch 327 RMD160 aaa564aa9cb0dcad4ebb64121c82bf50fda64254 SHA1 cf8b7825d826bfd3f3314c848a8843c2a5a70ae3 SHA256 f1d83e1365f68571fa4e007d5219720f8d65eb3730040a087fceb0ce2d8806bf size 327
+AUX dnstracesort.patch 327 RMD160 aaa564aa9cb0dcad4ebb64121c82bf50fda64254 SHA1 cf8b7825d826bfd3f3314c848a8843c2a5a70ae3 SHA256 f1d83e1365f68571fa4e007d5219720f8d65eb3730040a087fceb0ce2d8806bf
 MD5 6fe7f473233f1c86b76261afd8345bf0 files/dnstracesort.patch 327
 RMD160 aaa564aa9cb0dcad4ebb64121c82bf50fda64254 files/dnstracesort.patch 327
 SHA256 f1d83e1365f68571fa4e007d5219720f8d65eb3730040a087fceb0ce2d8806bf files/dnstracesort.patch 327
-AUX fwdzone-fix.patch 438 RMD160 c7a6e0072f565b2dda7aa57aae02930b621bea71 SHA1 35280a09915c929827dbd2cf45a9334649326c48 SHA256 e9da00cbce418fe2afabebca6b28a220b4fd034deaeb98bd66fa31b4d24189d4 size 438
+AUX fwdzone-fix.patch 438 RMD160 c7a6e0072f565b2dda7aa57aae02930b621bea71 SHA1 35280a09915c929827dbd2cf45a9334649326c48 SHA256 e9da00cbce418fe2afabebca6b28a220b4fd034deaeb98bd66fa31b4d24189d4
 MD5 46e046747b9dd8a0a1300a52c142f423 files/fwdzone-fix.patch 438
 RMD160 c7a6e0072f565b2dda7aa57aae02930b621bea71 files/fwdzone-fix.patch 438
 SHA256 e9da00cbce418fe2afabebca6b28a220b4fd034deaeb98bd66fa31b4d24189d4 files/fwdzone-fix.patch 438
-AUX headtail.patch 1781 RMD160 0e6e1458839ae324a5c36f816529eb2eaf1df78b SHA1 3d0e230adb013d88881dbf4abc055ef63a41fb78 SHA256 ae61cc6759d4cf26eeae02a75b67cb2cb410effb18cd96b9ba20375919116526 size 1781
+AUX headtail.patch 1781 RMD160 0e6e1458839ae324a5c36f816529eb2eaf1df78b SHA1 3d0e230adb013d88881dbf4abc055ef63a41fb78 SHA256 ae61cc6759d4cf26eeae02a75b67cb2cb410effb18cd96b9ba20375919116526
 MD5 625d040d68fa3f87d67688c0e15eb2f4 files/headtail.patch 1781
 RMD160 0e6e1458839ae324a5c36f816529eb2eaf1df78b files/headtail.patch 1781
 SHA256 ae61cc6759d4cf26eeae02a75b67cb2cb410effb18cd96b9ba20375919116526 files/headtail.patch 1781
-AUX tinydns-setup 3206 RMD160 16679596e3902c8eda4c9605b0fef6e778cdee63 SHA1 e222c22f924882a3b2d496f7d8fbdf61eb4eb0e8 SHA256 73c0610f15e9bbec1998d10eafe4222277eb8cbaf0c58e802f998e9f7b25bbea size 3206
+AUX tinydns-setup 3206 RMD160 16679596e3902c8eda4c9605b0fef6e778cdee63 SHA1 e222c22f924882a3b2d496f7d8fbdf61eb4eb0e8 SHA256 73c0610f15e9bbec1998d10eafe4222277eb8cbaf0c58e802f998e9f7b25bbea
 MD5 d1844f9853a9bb56738a6a0eb6e04de4 files/tinydns-setup 3206
 RMD160 16679596e3902c8eda4c9605b0fef6e778cdee63 files/tinydns-setup 3206
 SHA256 73c0610f15e9bbec1998d10eafe4222277eb8cbaf0c58e802f998e9f7b25bbea files/tinydns-setup 3206
-DIST djbdns-1.0.5-datadir.patch 2918 RMD160 95ca3f4dc00d2a3f86948b1582d2cd0c92f35a5d SHA256 b6913a52720a60d87956bb5f798ef42cffa754e3e6b9c7e0fb9e0f00dd3ce18f size 2918
-DIST djbdns-1.04-fwdzone.patch 6479 RMD160 99dc685d2f8ec7d7fccafc003cd406e6ec59419d SHA256 6a77f613e2df6fe51d99bce8a5c092ddedf6eb4205b5e8222a998951448562c9 size 6479
-DIST djbdns-1.05-multi_tinydns_data.patch 1616 RMD160 805af99dab036084489c066747f2b42de2e747ce SHA256 6137e58853e3686576095c26498db3a23b03c59edf9791a97d1aaea0844d0093 size 1616
-DIST djbdns-1.05-multiip.diff 5522 RMD160 2c60f2fbed9410106ead6b007897c34690a5072f SHA256 115a66dcfd8d5e7daa095eb2643f33628d495d3da798ffd0ab1a96f001c3f294 size 5522
-DIST djbdns-1.05-test23.diff.bz2 18480 RMD160 33037f2a41abb49c305f3efec4402c6965c8b8b8 SHA256 e702f47b4a4c77fe5cec474a8219a072cfaaee07282650b7e0dd322ed82e8f33 size 18480
-DIST djbdns-1.05.tar.gz 85648 RMD160 a832cbfd93e4ccec6a565492a4ee0b3c1b4b68ed SHA256 3ccd826a02f3cde39be088e1fc6aed9fd57756b8f970de5dc99fcd2d92536b48 size 85648
-DIST dnscache-cname-handling.patch 7569 RMD160 481243ff63c79488cc971128d7cf1d40c9b8ebc8 SHA256 41899b9991e457681adb1ef03675ad8a56e8c8d5d755bb8995e6448f793f2b43 size 7569
-DIST dnscache-multiple-ip.patch 7601 RMD160 5061d1c545f66efe9cf2158e6edda613dce79f8e SHA256 793847ed60043407e5dd60e2db0a078d9b444b8a6ac24bb0cf4a56177dcc78a3 size 7601
-DIST round-robin.patch 3239 RMD160 e3a4e5b9965cf10adf91e2be931372f19ecc0bd6 SHA256 fbc1473e54df406105aa8f2a47e794abed6d2810402415a8b9ca0f7dde278f5f size 3239
-DIST tinydns-alias-chain-truncation.patch 1994 RMD160 dc3f6da0ed12f7eed39e776a61b2ea8ee6b78556 SHA256 d05af61040451fda1cb2110166c8fdf6244452fe6a2ff38c648a9d695d40f3cb size 1994
-DIST tinydns-data-semantic-error.patch 5096 RMD160 a57c1a3262f5b71ca7b0fdfdb644cbb9a92abb8a SHA256 7df84f315df230c8951ce0b577c90a8f5d2cd98cc7e6ef820b4e48ff30c12d40 size 5096
-EBUILD djbdns-1.05-r17.ebuild 5048 RMD160 8abd348584f2d6ac8715bb669c797636cb87ea23 SHA1 bdbe10aaf33e30ef115fe4d3ea96164cff609c1b SHA256 68676b9a7612ed76308b5b80616ae549c0a23fdbb2a16b9e39c8d7b5e3fb8585 size 5048
-MD5 c967cf9596922dc984ec94b6ca4abd2c djbdns-1.05-r17.ebuild 5048
-RMD160 8abd348584f2d6ac8715bb669c797636cb87ea23 djbdns-1.05-r17.ebuild 5048
-SHA256 68676b9a7612ed76308b5b80616ae549c0a23fdbb2a16b9e39c8d7b5e3fb8585 djbdns-1.05-r17.ebuild 5048
-MISC ChangeLog 13818 RMD160 3dc832b6000338b1a3f4d05513a03b2791b31869 SHA1 19cfe4059d374426894a99dd2a185052e4f617d3 SHA256 246d84fdf9fc126214ff82af8ede8b17e4e8a17ac68b58ee8f7b648901c236f7 size 13818
-MD5 d2a6cfea730a7701fb513369bc06db11 ChangeLog 13818
-RMD160 3dc832b6000338b1a3f4d05513a03b2791b31869 ChangeLog 13818
-SHA256 246d84fdf9fc126214ff82af8ede8b17e4e8a17ac68b58ee8f7b648901c236f7 ChangeLog 13818
-MISC metadata.xml 254 RMD160 e81ca3ce54d13af0e64f9667b84832764b9d6cb7 SHA1 2e282dc077a0668723c3985a957325baaab313dd SHA256 9fed9bb1854d7d47ee1f1d7719bd888fefc543ab0549b05a81f7b9edd28840b5 size 254
+DIST djbdns-1.0.5-datadir.patch 2918 RMD160 95ca3f4dc00d2a3f86948b1582d2cd0c92f35a5d SHA256 b6913a52720a60d87956bb5f798ef42cffa754e3e6b9c7e0fb9e0f00dd3ce18f
+DIST djbdns-1.04-fwdzone.patch 6479 RMD160 99dc685d2f8ec7d7fccafc003cd406e6ec59419d SHA256 6a77f613e2df6fe51d99bce8a5c092ddedf6eb4205b5e8222a998951448562c9
+DIST djbdns-1.05-multi_tinydns_data.patch 1616 RMD160 805af99dab036084489c066747f2b42de2e747ce SHA256 6137e58853e3686576095c26498db3a23b03c59edf9791a97d1aaea0844d0093
+DIST djbdns-1.05-multiip.diff 5522 RMD160 2c60f2fbed9410106ead6b007897c34690a5072f SHA256 115a66dcfd8d5e7daa095eb2643f33628d495d3da798ffd0ab1a96f001c3f294
+DIST djbdns-1.05-test23.diff.bz2 18480 RMD160 33037f2a41abb49c305f3efec4402c6965c8b8b8 SHA256 e702f47b4a4c77fe5cec474a8219a072cfaaee07282650b7e0dd322ed82e8f33
+DIST djbdns-1.05.tar.gz 85648 RMD160 a832cbfd93e4ccec6a565492a4ee0b3c1b4b68ed SHA256 3ccd826a02f3cde39be088e1fc6aed9fd57756b8f970de5dc99fcd2d92536b48
+DIST dnscache-cname-handling.patch 7569 RMD160 481243ff63c79488cc971128d7cf1d40c9b8ebc8 SHA256 41899b9991e457681adb1ef03675ad8a56e8c8d5d755bb8995e6448f793f2b43
+DIST dnscache-multiple-ip.patch 7601 RMD160 5061d1c545f66efe9cf2158e6edda613dce79f8e SHA256 793847ed60043407e5dd60e2db0a078d9b444b8a6ac24bb0cf4a56177dcc78a3
+DIST round-robin.patch 3239 RMD160 e3a4e5b9965cf10adf91e2be931372f19ecc0bd6 SHA256 fbc1473e54df406105aa8f2a47e794abed6d2810402415a8b9ca0f7dde278f5f
+DIST tinydns-alias-chain-truncation.patch 1994 RMD160 dc3f6da0ed12f7eed39e776a61b2ea8ee6b78556 SHA256 d05af61040451fda1cb2110166c8fdf6244452fe6a2ff38c648a9d695d40f3cb
+DIST tinydns-data-semantic-error.patch 5096 RMD160 a57c1a3262f5b71ca7b0fdfdb644cbb9a92abb8a SHA256 7df84f315df230c8951ce0b577c90a8f5d2cd98cc7e6ef820b4e48ff30c12d40
+EBUILD djbdns-1.05-r17.ebuild 5062 RMD160 81ab6d257aa79ae38808dbc520c8fdf6f9a6ad7c SHA1 c96928cec215168b8c54c73c2cb2c6593b17e8c7 SHA256 bffa7c1d951cffaddc0f9a45617530be758bc42bdd6c64734cd6d8db2089c96c
+MD5 681e2277895aea9a7d571ccd56472639 djbdns-1.05-r17.ebuild 5062
+RMD160 81ab6d257aa79ae38808dbc520c8fdf6f9a6ad7c djbdns-1.05-r17.ebuild 5062
+SHA256 bffa7c1d951cffaddc0f9a45617530be758bc42bdd6c64734cd6d8db2089c96c djbdns-1.05-r17.ebuild 5062
+MISC ChangeLog 13930 RMD160 9042f196a1924d429ce859b74be719effa2b0fb6 SHA1 be8dd5d26e04a22a81c403f76a9560db9522885d SHA256 f19c64894f685a9bfe7b3e6dabd18d9e816f5e49a5f16ee418729187b1c91cd1
+MD5 4e518400390d92156281b5a563e221fc ChangeLog 13930
+RMD160 9042f196a1924d429ce859b74be719effa2b0fb6 ChangeLog 13930
+SHA256 f19c64894f685a9bfe7b3e6dabd18d9e816f5e49a5f16ee418729187b1c91cd1 ChangeLog 13930
+MISC metadata.xml 254 RMD160 e81ca3ce54d13af0e64f9667b84832764b9d6cb7 SHA1 2e282dc077a0668723c3985a957325baaab313dd SHA256 9fed9bb1854d7d47ee1f1d7719bd888fefc543ab0549b05a81f7b9edd28840b5
 MD5 126c0768ab916bb5855092f1b55413ab metadata.xml 254
 RMD160 e81ca3ce54d13af0e64f9667b84832764b9d6cb7 metadata.xml 254
 SHA256 9fed9bb1854d7d47ee1f1d7719bd888fefc543ab0549b05a81f7b9edd28840b5 metadata.xml 254
diff --git a/net-dns/djbdns/djbdns-1.05-r17.ebuild b/net-dns/djbdns/djbdns-1.05-r17.ebuild
index 8d1c0022c43d..9991fb45931e 100644
--- a/net-dns/djbdns/djbdns-1.05-r17.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r17.ebuild,v 1.9 2006/04/30 00:30:51 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r17.ebuild,v 1.10 2006/06/30 00:59:55 robbat2 Exp $
 
 IUSE="aliaschain cnamefix doc fwdzone ipv6 \
 	multipleip roundrobin semanticfix static selinux \
@@ -41,7 +41,7 @@ RDEPEND=">=sys-process/daemontools-0.70
 	selinux? ( sec-policy/selinux-djbdns )"
 
 src_unpack() {
-	unpack ${A}
+	unpack ${P}.tar.gz
 	cd ${S}
 
 	use ipv6 && use cnamefix && \
@@ -97,7 +97,7 @@ src_unpack() {
 		      "be compiled without IPv6 support."
 		cp -pR ${S} ${S}-noipv6
 		# Careful -- >=test21 of the ipv6 patch includes the errno patch
-		epatch ${WORKDIR}/${P}-${IPV6_PATCH}.diff
+		epatch ${DISTDIR}/${P}-${IPV6_PATCH}.diff.bz2
 		cd ${S}-noipv6
 	fi