Fix DEPEND and RDEPEND. Move unifdef to be only DEPEND, Bug #221531.

Package-Manager: portage-2.1.5_rc10

8 files changed, 56 insertions, 45 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index 689233e9458a..137729d104b4 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/vdr
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.112 2008/04/23 16:33:42 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.113 2008/05/12 17:15:34 zzam Exp $
+
+  12 May 2008; Matthias Schwarzott <zzam@gentoo.org> vdr-1.4.6.ebuild,
+  vdr-1.4.7-r10.ebuild, vdr-1.6.0.ebuild, vdr-1.6.0-r1.ebuild,
+  vdr-1.6.0-r2.ebuild, vdr-1.6.0_p1.ebuild:
+  Fix DEPEND and RDEPEND. Move unifdef to be only DEPEND, Bug #221531.
 
   23 Apr 2008; Matthias Schwarzott <zzam@gentoo.org> vdr-1.4.6.ebuild,
   vdr-1.4.7-r10.ebuild, vdr-1.6.0.ebuild, vdr-1.6.0-r1.ebuild,
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 671f2c8d8e59..8bf196254463 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -18,18 +18,18 @@ DIST vdr-1.4.7.tar.bz2 560888 RMD160 0e7a0d1cf133ee5e168afb6e2374e2ee6c229fcf SH
 DIST vdr-1.6.0-1.diff 6750 RMD160 8fcb1557d50b6d70d8791f7a67c96b4c12b1067a SHA1 68a4a9aab1e5179b5d9725481e09bc1213d1aff2 SHA256 82fc1f30f8b13568478e51c57d117d8c1c8c644aee9416a3c80f76b6a5b209eb
 DIST vdr-1.6.0.tar.bz2 593172 RMD160 b190901fcaa5507be37547dfd5cba10887316b09 SHA1 203a03ce4a39e8c70e0a64d7d94b7f5f17f03e7d SHA256 9993a6c20b35f19d46f63c13f2f5fc71036d27ee09bcf9c7e57474ba3b2cb8e6
 DIST vdr-extensions-patch-55-atsc.tar.bz2 32793 RMD160 685d9e7a9409a2465e7d8bad3e9a9e72b56f9411 SHA1 68aed71209630ef69b0be0e16a927076b375f3fc SHA256 7889817f005f9640946b4909763e1598f54897152be36064d817fbcab94dac3f
-EBUILD vdr-1.4.6.ebuild 5779 RMD160 1344cd325a3eec25bd9f74241baff02891e7306e SHA1 65514d0d63fc8694cea6d3d1d1cedc7476806130 SHA256 ba9d672998d30472f00f81c074069ac1e8c4721d4b1951deb937f0c553390a6f
-EBUILD vdr-1.4.7-r10.ebuild 9255 RMD160 79c37e1b5da499e5e7505048545d52cb4f0dc33f SHA1 4ab08319a26bdf4f8ce1c1e3eed7d265334a5aba SHA256 70d668c24471b4267149f966a688907ab356d12e0cb6df0b9afe9acca34dc23b
-EBUILD vdr-1.6.0-r1.ebuild 9502 RMD160 9c7645b726aa5ee51fe2c220711e7608f8d5d149 SHA1 74e2d56399c59650e80c3ff3a9d7c6464bda1f82 SHA256 a7689207956488e2bb9b8c2c9e0e32fb2a647390688e3573af95c55985e61bcb
-EBUILD vdr-1.6.0-r2.ebuild 9664 RMD160 f14ca0b18e840a25fde1e0fe1cb000ae0e2dffb9 SHA1 d06660f9ecccab1975b3ce64018099430a6528a7 SHA256 70d919c68dc66cd616c8ef07a328227be2a9e377006f4d70aa39e2d61c0a3e93
-EBUILD vdr-1.6.0.ebuild 9598 RMD160 cb18fe765b67cb7bd8f8adc7bb415b0404bcdcc6 SHA1 38f88aa0199003d0e0cc39a55cb2dfd22af59b3f SHA256 a773af10851bb0300a4ac51222e44705c4d694455819106ff3a0028b67a08c52
-EBUILD vdr-1.6.0_p1.ebuild 9879 RMD160 ac930f339dd7f9addb8ec682a59b05210cfecd60 SHA1 d697839e9d7d192de99ad401f5e76ab4de66365a SHA256 3e0e2005185700b93b9b548cb2e2a238e9a7cb2ae3886effc3a2daa900c70143
-MISC ChangeLog 19502 RMD160 35a8ed331cb06a9655a61e141510ed1c9740fd65 SHA1 8b7ea851b510825c2231f29b327ebf871d97fe48 SHA256 8f3e18a3d052707c42a60bb7b1dae981befd83134b8733a8838d9e7f35456576
+EBUILD vdr-1.4.6.ebuild 5806 RMD160 811c6325a8aee53529233eeda3500f54f485b2ab SHA1 06039327640a87fb67b20cc391f60adc4adb3ea5 SHA256 1b81be2fa4c5249f3a89bc55759777fa6db60eeb37a1a83b1e7e9007bce7e6fa
+EBUILD vdr-1.4.7-r10.ebuild 9281 RMD160 e9ecf199b46c4d07c84419618be6fae12e7230d3 SHA1 10ef5bbb120e99e66ace273010d1c302d6d001c0 SHA256 311bcc559fe102783fc2b4b8512c8596b72fd76b03844ddd4dd09226269d59e7
+EBUILD vdr-1.6.0-r1.ebuild 9528 RMD160 fe112640959a65ac03d4c6dfb8c997d8c801d4b6 SHA1 03eef553ceaf22cae3d1a2ce2fcb9adf12c6c326 SHA256 5f0bf32b2e7639efd8fe916728da6c7dab190314f96284d1d0360fa073abe5fd
+EBUILD vdr-1.6.0-r2.ebuild 9690 RMD160 f50872ec88c43d03add7028f067c2a23eba66e27 SHA1 77f6927fc5e4f791d6d545c8ad843978aa2322e7 SHA256 4e2f721da1a196350d410395eacb77c3baefea0a715dda4d6631fccdce2197f6
+EBUILD vdr-1.6.0.ebuild 9624 RMD160 46fc0f889f4369cac352bb3bc30bf3618799e6fd SHA1 7275ec338849605943aa393360e4fd0ce4d18a16 SHA256 71a4e1552c900780cea557a22c2c9c810dc0ee958d5cecb6c7271e678e1f9a49
+EBUILD vdr-1.6.0_p1.ebuild 9905 RMD160 6566842fb116bb3bea2ee1dac9ea5bfebc7b74ba SHA1 e7b18a242cf769a0b9adec3af72c7cf26e3cfc8b SHA256 33196e53d47b388c9203186e70e16b655a4c587eeef9e4b0785f67468c3fdd23
+MISC ChangeLog 19752 RMD160 de67586805eba522b0f47a20c7643b9a06db4ba8 SHA1 3d0a8afb3fa3156bc453b52268c345da1702f501 SHA256 052bb4b24e211e4d7567008fc5f19974ec69680f527f734d3d447fa1bc266512
 MISC metadata.xml 257 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 SHA1 d2419394e7d5c7463d7dea33e9190ebd57484531 SHA256 0dd45fbbaf1c6173535e371e3ff8a3faa41f3f89123ac9dffe338998599ebe26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgPZPIACgkQt2vP6XvVdOfxbwCfaRPUOI6Q68fWgyP8Vh6OvDF0
-e4YAoMZNHuGSGkw1iNA+ATIkJ8Srl3As
-=Njnl
+iEYEARECAAYFAkgoe0EACgkQt2vP6XvVdOebsQCcCx5Avj6eYZtun5Ns6rAcTokL
+UOUAoOHEdTHILR8nXx7PtctHxC4Pkb74
+=G50z
 -----END PGP SIGNATURE-----
diff --git a/media-video/vdr/vdr-1.4.6.ebuild b/media-video/vdr/vdr-1.4.6.ebuild
index 048dbf938ba4..6cb50af6b1b4 100644
--- a/media-video/vdr/vdr-1.4.6.ebuild
+++ b/media-video/vdr/vdr-1.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.6.ebuild,v 1.9 2008/04/23 16:33:42 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.6.ebuild,v 1.10 2008/05/12 17:15:34 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -23,12 +23,13 @@ KEYWORDS="~amd64 ~ppc x86"
 SLOT="0"
 LICENSE="GPL-2"
 
-DEPEND="media-libs/jpeg
-	sys-apps/gawk
-	media-tv/linuxtv-dvb-headers
+COMMON_DEPEND="media-libs/jpeg
 	sys-libs/libcap"
 
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+	media-tv/linuxtv-dvb-headers"
+
+RDEPEND="${COMMON_DEPEND}
 	dev-lang/perl
 	|| ( >=media-tv/gentoo-vdr-scripts-0.4.2 media-tv/vdrplugin-rebuild )
 	>=media-tv/gentoo-vdr-scripts-0.3.5"
diff --git a/media-video/vdr/vdr-1.4.7-r10.ebuild b/media-video/vdr/vdr-1.4.7-r10.ebuild
index 726a06fa4965..17d1bcb9fd2e 100644
--- a/media-video/vdr/vdr-1.4.7-r10.ebuild
+++ b/media-video/vdr/vdr-1.4.7-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r10.ebuild,v 1.5 2008/04/23 16:33:42 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r10.ebuild,v 1.6 2008/05/12 17:15:34 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -31,13 +31,14 @@ KEYWORDS="~amd64 ~ppc x86"
 SLOT="0"
 LICENSE="GPL-2"
 
-DEPEND="media-libs/jpeg
-	sys-apps/gawk
+COMMON_DEPEND="media-libs/jpeg
+	sys-libs/libcap"
+
+DEPEND="${COMMON_DEPEND}
 	media-tv/linuxtv-dvb-headers
-	sys-libs/libcap
 	dev-util/unifdef"
 
-RDEPEND="${DEPEND}
+RDEPEND="${COMMON_DEPEND}
 	dev-lang/perl
 	|| ( >=media-tv/gentoo-vdr-scripts-0.4.2 media-tv/vdrplugin-rebuild )
 	>=media-tv/gentoo-vdr-scripts-0.3.5"
diff --git a/media-video/vdr/vdr-1.6.0-r1.ebuild b/media-video/vdr/vdr-1.6.0-r1.ebuild
index b3e2cc6130bc..fc030f2e61d4 100644
--- a/media-video/vdr/vdr-1.6.0-r1.ebuild
+++ b/media-video/vdr/vdr-1.6.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0-r1.ebuild,v 1.2 2008/04/23 16:33:42 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0-r1.ebuild,v 1.3 2008/05/12 17:15:34 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -30,16 +30,17 @@ KEYWORDS="~amd64 ~ppc ~x86"
 SLOT="0"
 LICENSE="GPL-2"
 
-DEPEND="media-libs/jpeg
-	sys-apps/gawk
-	media-tv/linuxtv-dvb-headers
+COMMON_DEPEND="media-libs/jpeg
 	sys-libs/libcap
 	>=media-libs/fontconfig-2.4.2
 	>=media-libs/freetype-2
-	dev-util/unifdef
 	sys-devel/gettext"
 
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+	media-tv/linuxtv-dvb-headers
+	dev-util/unifdef"
+
+RDEPEND="${COMMON_DEPEND}
 	dev-lang/perl
 	>=media-tv/gentoo-vdr-scripts-0.4.2
 	media-fonts/corefonts"
diff --git a/media-video/vdr/vdr-1.6.0-r2.ebuild b/media-video/vdr/vdr-1.6.0-r2.ebuild
index a1d82cd88936..6ad1158535d7 100644
--- a/media-video/vdr/vdr-1.6.0-r2.ebuild
+++ b/media-video/vdr/vdr-1.6.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0-r2.ebuild,v 1.4 2008/04/23 16:33:42 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0-r2.ebuild,v 1.5 2008/05/12 17:15:34 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -30,16 +30,17 @@ KEYWORDS="~amd64 ~ppc ~x86"
 SLOT="0"
 LICENSE="GPL-2"
 
-DEPEND="media-libs/jpeg
-	sys-apps/gawk
-	media-tv/linuxtv-dvb-headers
+COMMON_DEPEND="media-libs/jpeg
 	sys-libs/libcap
 	>=media-libs/fontconfig-2.4.2
 	>=media-libs/freetype-2
-	dev-util/unifdef
 	sys-devel/gettext"
 
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+	media-tv/linuxtv-dvb-headers
+	dev-util/unifdef"
+
+RDEPEND="${COMMON_DEPEND}
 	dev-lang/perl
 	>=media-tv/gentoo-vdr-scripts-0.4.2
 	media-fonts/corefonts"
diff --git a/media-video/vdr/vdr-1.6.0.ebuild b/media-video/vdr/vdr-1.6.0.ebuild
index f00baed63ac6..3cd8132720db 100644
--- a/media-video/vdr/vdr-1.6.0.ebuild
+++ b/media-video/vdr/vdr-1.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0.ebuild,v 1.4 2008/04/23 16:33:42 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0.ebuild,v 1.5 2008/05/12 17:15:34 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -30,16 +30,17 @@ KEYWORDS="~amd64 ~ppc ~x86"
 SLOT="0"
 LICENSE="GPL-2"
 
-DEPEND="media-libs/jpeg
-	sys-apps/gawk
-	media-tv/linuxtv-dvb-headers
+COMMON_DEPEND="media-libs/jpeg
 	sys-libs/libcap
 	>=media-libs/fontconfig-2.4.2
 	>=media-libs/freetype-2
-	dev-util/unifdef
 	sys-devel/gettext"
 
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+	media-tv/linuxtv-dvb-headers
+	dev-util/unifdef"
+
+RDEPEND="${COMMON_DEPEND}
 	dev-lang/perl
 	>=media-tv/gentoo-vdr-scripts-0.4.2
 	media-fonts/corefonts"
diff --git a/media-video/vdr/vdr-1.6.0_p1.ebuild b/media-video/vdr/vdr-1.6.0_p1.ebuild
index 5f3fb314a963..fcb893a1cb16 100644
--- a/media-video/vdr/vdr-1.6.0_p1.ebuild
+++ b/media-video/vdr/vdr-1.6.0_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p1.ebuild,v 1.4 2008/04/23 16:33:42 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p1.ebuild,v 1.5 2008/05/12 17:15:34 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -34,16 +34,17 @@ KEYWORDS="~amd64 ~ppc ~x86"
 SLOT="0"
 LICENSE="GPL-2"
 
-DEPEND="media-libs/jpeg
-	sys-apps/gawk
-	media-tv/linuxtv-dvb-headers
+COMMON_DEPEND="media-libs/jpeg
 	sys-libs/libcap
 	>=media-libs/fontconfig-2.4.2
 	>=media-libs/freetype-2
-	dev-util/unifdef
 	sys-devel/gettext"
 
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+	media-tv/linuxtv-dvb-headers
+	dev-util/unifdef"
+
+RDEPEND="${COMMON_DEPEND}
 	dev-lang/perl
 	>=media-tv/gentoo-vdr-scripts-0.4.2
 	media-fonts/corefonts"