Split DEPEND vars.

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

4 files changed, 21 insertions, 26 deletions

diff --git a/net-ftp/tftp-hpa/ChangeLog b/net-ftp/tftp-hpa/ChangeLog
index 49626068b570..5c76e68df3cd 100644
--- a/net-ftp/tftp-hpa/ChangeLog
+++ b/net-ftp/tftp-hpa/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/tftp-hpa
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/ChangeLog,v 1.44 2009/08/15 23:59:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/ChangeLog,v 1.45 2009/08/16 00:02:55 vapier Exp $
+
+  16 Aug 2009; Mike Frysinger <vapier@gentoo.org> tftp-hpa-0.49-r1.ebuild,
+  tftp-hpa-5.0.ebuild:
+  Split DEPEND vars.
 
 *tftp-hpa-5.0 (15 Aug 2009)
 
diff --git a/net-ftp/tftp-hpa/Manifest b/net-ftp/tftp-hpa/Manifest
index 5cac689915b1..9a33969246fe 100644
--- a/net-ftp/tftp-hpa/Manifest
+++ b/net-ftp/tftp-hpa/Manifest
@@ -1,29 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX in.tftpd.confd 145 RMD160 64fd029d121406e492b92b28b1bf227c3c81ce7a SHA1 5b3af114a9a8462995dd3d71164a3b8f29f230a1 SHA256 750212e6c8e58bb799f0b49d39527ffceb595d26d24852f3f3bacedac38ea65f
 AUX in.tftpd.confd-0.44 576 RMD160 718a437e2d44c1594ef359784fde89d0367c2a47 SHA1 e4a051f435f56007b9efb4173e2d272b12442436 SHA256 55e67f871f070db2b7fa1428dabf55777ca87fecdbba7fa3b03e63c63734f977
 AUX in.tftpd.rc6 443 RMD160 e4a8d822b24cb9cf73b6e9601fcc58d40a203cb9 SHA1 7929ceb89811558576c7a9a4a4bb6d11bbd3c833 SHA256 3bceb3446bbebfae60d5276a2481c4311270d2e33c46e73a8bea66e330244ae0
-AUX tftp-hpa-0.45-parallel.patch 274 RMD160 820293e71296bc165102904b091d07fa4a952808 SHA1 1fcd581016a11320b79bc78dab7cf76210f2c82e SHA256 c735db3d37fe9cbde80d5d34e717200035c3a399ec46595399fe2894b2ec3f5e
-DIST tftp-hpa-0.40.1.tar.bz2 81835 RMD160 82dd5590ecba0929697fa3d3e37d2fc098d199cb SHA1 5c44589ab7ccc265bf69a5677a97ce1b7823ed90 SHA256 2c0c274f904a34cd93676e59eb83ae86ed535c27f6ee967c11542ec302d346d1
-DIST tftp-hpa-0.40.tar.bz2 82442 RMD160 09faa3d5b9579dc4a975aae7c717e4afdcaa06dc SHA1 4a65efd21847ed11b8c10ac9b3f5e0184a87da05 SHA256 c2e234731fd1aa34483cf71fb5151aa1a59f427196fc94273e1fc026b12beeb9
-DIST tftp-hpa-0.45.tar.bz2 83335 RMD160 2ad15d451501443f47c4f72f7dbf4d9fe96396eb SHA1 d44fc6e6ea9b65b0807dc13081d73b353c1b141f SHA256 8ccad375ab1444bd4685947f5763e88eae09cc924c4bf3220f6686e9f7b27edd
-DIST tftp-hpa-0.48.tar.bz2 83818 RMD160 dee1fc57d23768fcf0ac62daf5363b84506b8806 SHA1 f0c9f8d2bd5d1c026de98f51c0c007eb97d33ffc SHA256 12b41855c7317e753955c18e24e7b6f4328ae1540efc8b342c9d561bb2c56d29
 DIST tftp-hpa-0.49.tar.bz2 91829 RMD160 d3a9a18f4b41dfd006c90b94b64a6473f577a7ed SHA1 28349027d7b672855414d5b8a6d45c8936e7c54d SHA256 9055064ea0aea223e82e99cbdead970dc46fa9456c91a7b3d6c0b37b62b6dd8c
 DIST tftp-hpa-5.0.tar.bz2 93039 RMD160 fbafc398b40098343b9e9e82badcfe6bd0eb3932 SHA1 7f541f085a4af5a87bf86a249421b13a30150597 SHA256 96309871519efcab829fdfcc1cca546d772ed6a0e214c9e99e77ca7aea29f734
-EBUILD tftp-hpa-0.40-r1.ebuild 1022 RMD160 34c7cef982c7758dc497b0fd61cae1529f2a2b84 SHA1 af0441fb5af929daaf9648c236635708c403ee5c SHA256 f161f2a0f9ed8c95360abc48b1b496462fd264dfc118d373f9b09bbbab7a614d
-EBUILD tftp-hpa-0.40.1.ebuild 1022 RMD160 b4818a6693fcc92ecb3f2b5d1368e69510a5903b SHA1 12524ef642fd83d2f0581e9cbadaa4419ffb9af8 SHA256 630384d398895c6e18179f9fe70f10694dcc6c0b49f4591c58d462bd5175a9c5
-EBUILD tftp-hpa-0.45-r1.ebuild 1327 RMD160 b963dafa9caabff4cd5175f9dcfbe0bab59bd94e SHA1 54aa9196e8e58ecbfc73b7d77b3ca69261f69b4c SHA256 2b12470c63fc0172ea84187137173d9fca05c212004aa918b25475dac7f30064
-EBUILD tftp-hpa-0.45.ebuild 1324 RMD160 f4390cb45311df61e1f75fdab61cafd6e7c8781c SHA1 bb23cf1a0fa289e9378364c37699b04e84e69d8b SHA256 2457c751f03dcd2311fb188f8759ad16b1ae8a5857673b934755a74d2613ec56
-EBUILD tftp-hpa-0.48.ebuild 1210 RMD160 f57d4ee7979740dcb8681d75b7580781bc70d772 SHA1 5cddf0cefadd724ef89e70c13bdf606d2899fe6f SHA256 184f7a0e89df36197be3f92df099f74a6b7028a5d10647415f1bfc5574ed13d8
-EBUILD tftp-hpa-0.49-r1.ebuild 1241 RMD160 bc4f3ed23012de5094e40deb211782af3411ccee SHA1 284a0c9ec7c5297a3a54d547a78338f66d91c06d SHA256 7a51955b26deb05c1201c83441b45b59706d8e8e9fab39dcb448b5edddec74bb
-EBUILD tftp-hpa-5.0.ebuild 1091 RMD160 a4d4812e0c3634c9f4d8c15d178303f9ea19b689 SHA1 12545c3e1b5232cb39d8839d70e336de78a60caf SHA256 5192d6b670bd988ec0cceaa5cba2e1629d463e7a1eb5018b8339c33d6c951f53
-MISC ChangeLog 8227 RMD160 2078768051ac1f9599a5f1365ee1d43d711001dd SHA1 a762d4d8798dd2fdf140a4f607d77d723c9d8b1f SHA256 3d3644136fe5c79a5fdaf6fb76e05f4ab998afa1549d1094372f9a09057bcb28
+EBUILD tftp-hpa-0.49-r1.ebuild 1262 RMD160 4bd00d30d631bdadeb5a7c3b0adc2d2014b2ffe0 SHA1 d76041f6f370f1cb24260ff99a3fce9c39f40d27 SHA256 77f251e8b81fc5ffa235926f9f3a129e34e015828187f0c95ded2f2670c1c2bb
+EBUILD tftp-hpa-5.0.ebuild 1112 RMD160 c037ac2ae85d5bd6b4f564fa11a57213e42b5df8 SHA1 8a4b7951d920a008a56e4c107efc08440814ac18 SHA256 637d2efb4edc168bf909e5b905d345926fbe5d1e9bf3c3559c33f823a1f304b8
+MISC ChangeLog 8347 RMD160 50287b3cdfc9d476d43deee5d3d5f8fbc69cab9f SHA1 ef9cd124aa358078e934432d1ed071c364574edb SHA256 eb4f87bb599ba2a43ea7e805872d969850c669a33f000b1fefd3b5482199fd91
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.12 (GNU/Linux)
 
-iEYEARECAAYFAkqHS8kACgkQlPl3HsVfCDrEdwCfZKgnNTB0CbNPOJ+EGSy0SJ8E
-skAAn2IfKlNOCWFm+7qAiL318+A2NYob
-=gGpz
+iEUEARECAAYFAkqHTLUACgkQlPl3HsVfCDpUMACcDvONqcICmQyAzpgpHZ/eMJ9G
+nA0Alj6pHTti3UbGl9HYAQ/nYReHHh8=
+=hDVG
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/tftp-hpa/tftp-hpa-0.49-r1.ebuild b/net-ftp/tftp-hpa/tftp-hpa-0.49-r1.ebuild
index a7e15d0137e4..c9fd870ecd5d 100644
--- a/net-ftp/tftp-hpa/tftp-hpa-0.49-r1.ebuild
+++ b/net-ftp/tftp-hpa/tftp-hpa-0.49-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/tftp-hpa-0.49-r1.ebuild,v 1.8 2009/03/18 18:06:20 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/tftp-hpa-0.49-r1.ebuild,v 1.9 2009/08/16 00:02:55 vapier Exp $
 
 DESCRIPTION="port of the OpenBSD TFTP server"
 HOMEPAGE="http://www.kernel.org/pub/software/network/tftp/"
@@ -11,10 +11,11 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="ipv6 readline selinux tcpd"
 
-DEPEND="readline? ( sys-libs/readline )
-	tcpd? ( sys-apps/tcp-wrappers )
-	selinux? ( sec-policy/selinux-tftpd )
+RDEPEND="selinux? ( sec-policy/selinux-tftpd )
 	!virtual/tftp"
+DEPEND="${RDEPEND}
+	readline? ( sys-libs/readline )
+	tcpd? ( sys-apps/tcp-wrappers )"
 PROVIDE="virtual/tftp"
 
 src_compile() {
diff --git a/net-ftp/tftp-hpa/tftp-hpa-5.0.ebuild b/net-ftp/tftp-hpa/tftp-hpa-5.0.ebuild
index 25ab6d5ba011..df2079c385e0 100644
--- a/net-ftp/tftp-hpa/tftp-hpa-5.0.ebuild
+++ b/net-ftp/tftp-hpa/tftp-hpa-5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/tftp-hpa-5.0.ebuild,v 1.1 2009/08/15 23:59:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/tftp-hpa-5.0.ebuild,v 1.2 2009/08/16 00:02:55 vapier Exp $
 
 DESCRIPTION="port of the OpenBSD TFTP server"
 HOMEPAGE="http://www.kernel.org/pub/software/network/tftp/"
@@ -11,10 +11,11 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="ipv6 readline selinux tcpd"
 
-DEPEND="readline? ( sys-libs/readline )
-	tcpd? ( sys-apps/tcp-wrappers )
-	selinux? ( sec-policy/selinux-tftpd )
+RDEPEND="selinux? ( sec-policy/selinux-tftpd )
 	!virtual/tftp"
+DEPEND="${RDEPEND}
+	readline? ( sys-libs/readline )
+	tcpd? ( sys-apps/tcp-wrappers )"
 PROVIDE="virtual/tftp"
 
 src_compile() {