Prevent people from doing stupid things wrt #310741

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

8 files changed, 28 insertions, 38 deletions

diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index cbea9c3d1030..c608a1f3ee5f 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX vdr-1.4.7-gcc-4.3.diff 622 RMD160 cf470a13aed458c749b7753c30f62e1159f3782e SHA1 886b4a80a30b1854540a20d309bb7fc8a8137cff SHA256 f37eb867b24a02064c33647f0cc1d1c24f3544e6b7d9d6030634d71f699fbdeb
 AUX vdr-1.4.7-makefile-destdir.diff 1554 RMD160 642ff610a1667d39b55736a6a702eba6e2eba4cf SHA1 f773f63d7aebc59133e4accd36c87bf6feefb189 SHA256 e926ca80b87585d59698c05b48b0464e4e72913c4adfbb912541ebacf58d3d25
 AUX vdr-1.4.7-makefile-install-header.diff 1001 RMD160 82aeac50445709f79da2e2536b9441d8dd24370f SHA1 7c195bad6928429fa198bf1788c523b3be837812 SHA256 12411dc054993209967d6e09677733430f3b3d963f565debdaae087bbc89e961
@@ -23,19 +20,12 @@ 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-2.diff 17906 RMD160 256e6e0544f7a50eac07f91fd7c0664853e4396c SHA1 63f3b25d337b7bdd6eaf5257df78a3042d09d936 SHA256 54e74a40864666c5f92933beaa3935e260de4fd356bb64604af7ce5fd8c7a0ef
 DIST vdr-1.6.0.tar.bz2 593172 RMD160 b190901fcaa5507be37547dfd5cba10887316b09 SHA1 203a03ce4a39e8c70e0a64d7d94b7f5f17f03e7d SHA256 9993a6c20b35f19d46f63c13f2f5fc71036d27ee09bcf9c7e57474ba3b2cb8e6
-EBUILD vdr-1.4.6.ebuild 5888 RMD160 d4438c111df6e3d6d6afafd54c72d837e5574347 SHA1 86ec59cdbc2c69c07ae7f142f3b264844d7f40af SHA256 5a0e6fbf37980ccd40ead0d0fe93e864f8d15774d6f55816f24b37b391077ddc
-EBUILD vdr-1.4.7-r10.ebuild 9420 RMD160 d1420a4a5da6b864560a32555f5272fdbf6db193 SHA1 cd481563c8e32e759d40f6e3d47b37f0c707d6d6 SHA256 0f3ea1dca8d5d6f587bc5f451f90a1a4ef94c46ce8efad87dd06cfb16f2c2c0e
-EBUILD vdr-1.4.7-r11.ebuild 9472 RMD160 a1183129589e1a1260c7994130421d0214421ca9 SHA1 5cfa7654eb6844de6bc7be5d5eeaab1ce5e0f954 SHA256 7d55e527280256fd83ef784b2eb22a37962932dd6802212154dcb68058bd41ad
-EBUILD vdr-1.4.7-r12.ebuild 9630 RMD160 34acd8479cd62519e6c4092fe70a690e24b1af4e SHA1 4b637a5e905bad736f16cbab9acc938082b38d80 SHA256 61f03da6218a068ceeff0bb1faf7e23f75564076e4c39f518454f140e7cc908e
-EBUILD vdr-1.6.0_p2-r2.ebuild 11529 RMD160 97a16220c33fe0e8786bb2547ce678bf3a21b0f7 SHA1 4bcc396625a292dcaae2f8716de5a24330bb8e04 SHA256 2ea4a74fd67d462cfbf63dd901a4f9e0791f39228087f8559fab26a93e243afb
-EBUILD vdr-1.6.0_p2-r3.ebuild 11590 RMD160 2efb4b2a7899fb1ca30cb555fc411157796e9a10 SHA1 dc8456c9425d6d2e8b8bb0e283ea63cf62526225 SHA256 d0bdbaf64d2a97c17f21c853425412195a1b9f79f7e2b68735e255ddab91a4b3
-EBUILD vdr-1.6.0_p2.ebuild 10882 RMD160 0a09a740472edb7e25be527cc6a2ec791b608387 SHA1 b160342d1d09a10f06d917bc4a85068638b63007 SHA256 a6e60eddcc2e70f7e4c4bc40ed7b1e9bec026568dd68c396d83d2fa82ce918be
+EBUILD vdr-1.4.6.ebuild 5897 RMD160 c94abc7d4e0f2d4d35c4a3540f459cdd4b5198e7 SHA1 ba100d911e56908d0b9d123b12deaea3ffaab409 SHA256 6b91a15e832ecfd6684231c092ba1da4a19f1294029cbc44ae050fb06df968e5
+EBUILD vdr-1.4.7-r10.ebuild 9429 RMD160 0016b1d2174576f9bcb0c80bd14403ac1994f5d4 SHA1 44322ae57f103279022cbb09068b5bcdcaa3d60f SHA256 63f1f78b5db6021440bebaade3332e7e6006188050fa89f26fea579ff32d11b9
+EBUILD vdr-1.4.7-r11.ebuild 9481 RMD160 5abb5f58160b0fa9ebc42063bf12ed579e677c76 SHA1 fe5c69b56a6f3c3235085a87f50fa072231ba48b SHA256 2e0e272ed2497b44e7f93c490d5739e19fc887e3913eb73d3a977f2f324bfaa7
+EBUILD vdr-1.4.7-r12.ebuild 9639 RMD160 ea3fefd98da3f668a4dc1dc453ab16233586e0fd SHA1 8038915e55b851d290c048c6dd8e7ecd1dc15910 SHA256 7870bb516958041d4e6dc8b1940d185d92df2ecb1a8154c717f4629139c1793d
+EBUILD vdr-1.6.0_p2-r2.ebuild 11538 RMD160 990935c4a3a8716206a21c2deaf4308a6d2b14f3 SHA1 fa1ac2fdf09deb8f6078e35eac95b39cc1dbbb1d SHA256 e913f095794b5adb23343b9534a79da7d4794365eeddfc54d7da916ecc674381
+EBUILD vdr-1.6.0_p2-r3.ebuild 11599 RMD160 18e4a4d11f192c631eb2f973dd7293068f7dd6f9 SHA1 09a31cd3d784d940d91a288515204315294d99f6 SHA256 468abd3bdbc4049347892d3d7310abea3300f5c39ee0d7b706b1e6a5d9c4e997
+EBUILD vdr-1.6.0_p2.ebuild 10892 RMD160 4ee3554a42f205ac8ca0036a24dfbf1bbecf674b SHA1 48bd89a553b2075a9bc73e13ef8af612a7afa4ff SHA256 e62600b52ebbeab0fecd2b40e243e5274956d27acf6bbd8184b84c62b7265ffa
 MISC ChangeLog 24496 RMD160 b5e8ccb77715d9210128bc27e210f1b0935ee357 SHA1 98d5769ebdb0cb1542c6fb3396013d279c65eac8 SHA256 7f6dfe140fa2e1d067e2d57d3bfa23bc7d7cdee40a877b77f8a9c02776e500da
 MISC metadata.xml 5397 RMD160 854794df314a24ce5c1f08c5731682fdcb668be0 SHA1 15acf882a2ba20406a94144eede03cfe2877018d SHA256 f15b57b9dc4ad15ff9601b842f03c4998bf639a4d44b93105d579eb2be92c7ba
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrSLEoACgkQt2vP6XvVdOd53gCaAsLfLXOoLTlRFK6m+1176i36
-yswAoIEZGdrF/ljVaV2BdQrfTr9/J4GF
-=L33b
------END PGP SIGNATURE-----
diff --git a/media-video/vdr/vdr-1.4.6.ebuild b/media-video/vdr/vdr-1.4.6.ebuild
index c607a4a9e948..7084680f7ae9 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-2009 Gentoo Foundation
+# Copyright 1999-2010 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.14 2009/10/11 19:04:35 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.6.ebuild,v 1.15 2010/03/22 16:35:00 ssuominen Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -23,7 +23,7 @@ KEYWORDS="~amd64 ~ppc x86"
 SLOT="0"
 LICENSE="GPL-2"
 
-COMMON_DEPEND="media-libs/jpeg
+COMMON_DEPEND=">=media-libs/jpeg-8
 	sys-libs/libcap"
 
 DEPEND="${COMMON_DEPEND}
diff --git a/media-video/vdr/vdr-1.4.7-r10.ebuild b/media-video/vdr/vdr-1.4.7-r10.ebuild
index 72f9f96acb93..4ce726b8ea30 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-2009 Gentoo Foundation
+# Copyright 1999-2010 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.12 2009/10/11 19:04:35 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r10.ebuild,v 1.13 2010/03/22 16:35:00 ssuominen Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -31,7 +31,7 @@ KEYWORDS="~amd64 ~ppc x86"
 SLOT="0"
 LICENSE="GPL-2"
 
-COMMON_DEPEND="media-libs/jpeg
+COMMON_DEPEND=">=media-libs/jpeg-8
 	sys-libs/libcap"
 
 DEPEND="${COMMON_DEPEND}
diff --git a/media-video/vdr/vdr-1.4.7-r11.ebuild b/media-video/vdr/vdr-1.4.7-r11.ebuild
index 7f6f45acd5f2..9a630922d085 100644
--- a/media-video/vdr/vdr-1.4.7-r11.ebuild
+++ b/media-video/vdr/vdr-1.4.7-r11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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-r11.ebuild,v 1.6 2009/10/11 19:04:35 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r11.ebuild,v 1.7 2010/03/22 16:35:00 ssuominen Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -31,7 +31,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 SLOT="0"
 LICENSE="GPL-2"
 
-COMMON_DEPEND="media-libs/jpeg
+COMMON_DEPEND=">=media-libs/jpeg-8
 	sys-libs/libcap"
 
 DEPEND="${COMMON_DEPEND}
diff --git a/media-video/vdr/vdr-1.4.7-r12.ebuild b/media-video/vdr/vdr-1.4.7-r12.ebuild
index 4c2ac264839d..ade15a123561 100644
--- a/media-video/vdr/vdr-1.4.7-r12.ebuild
+++ b/media-video/vdr/vdr-1.4.7-r12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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-r12.ebuild,v 1.7 2009/10/11 19:04:35 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r12.ebuild,v 1.8 2010/03/22 16:35:00 ssuominen Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -31,7 +31,7 @@ KEYWORDS="~amd64 ~ppc x86"
 SLOT="0"
 LICENSE="GPL-2"
 
-COMMON_DEPEND="media-libs/jpeg
+COMMON_DEPEND=">=media-libs/jpeg-8
 	sys-libs/libcap"
 
 DEPEND="${COMMON_DEPEND}
diff --git a/media-video/vdr/vdr-1.6.0_p2-r2.ebuild b/media-video/vdr/vdr-1.6.0_p2-r2.ebuild
index 19203e4eb782..5de3fe50b707 100644
--- a/media-video/vdr/vdr-1.6.0_p2-r2.ebuild
+++ b/media-video/vdr/vdr-1.6.0_p2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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_p2-r2.ebuild,v 1.7 2009/10/11 19:04:35 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r2.ebuild,v 1.8 2010/03/22 16:35:00 ssuominen Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -42,7 +42,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 SLOT="0"
 LICENSE="GPL-2"
 
-COMMON_DEPEND="media-libs/jpeg
+COMMON_DEPEND=">=media-libs/jpeg-8
 	sys-libs/libcap
 	>=media-libs/fontconfig-2.4.2
 	>=media-libs/freetype-2
diff --git a/media-video/vdr/vdr-1.6.0_p2-r3.ebuild b/media-video/vdr/vdr-1.6.0_p2-r3.ebuild
index b20109f5c280..68261014d240 100644
--- a/media-video/vdr/vdr-1.6.0_p2-r3.ebuild
+++ b/media-video/vdr/vdr-1.6.0_p2-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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_p2-r3.ebuild,v 1.5 2009/10/11 19:04:35 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r3.ebuild,v 1.6 2010/03/22 16:35:00 ssuominen Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -42,7 +42,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 SLOT="0"
 LICENSE="GPL-2"
 
-COMMON_DEPEND="media-libs/jpeg
+COMMON_DEPEND=">=media-libs/jpeg-8
 	sys-libs/libcap
 	>=media-libs/fontconfig-2.4.2
 	>=media-libs/freetype-2
diff --git a/media-video/vdr/vdr-1.6.0_p2.ebuild b/media-video/vdr/vdr-1.6.0_p2.ebuild
index 86fd538b6075..aa3a3b1e48a2 100644
--- a/media-video/vdr/vdr-1.6.0_p2.ebuild
+++ b/media-video/vdr/vdr-1.6.0_p2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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_p2.ebuild,v 1.9 2009/10/11 19:04:35 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2.ebuild,v 1.10 2010/03/22 16:35:00 ssuominen Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -36,7 +36,7 @@ KEYWORDS="~amd64 ~ppc x86"
 SLOT="0"
 LICENSE="GPL-2"
 
-COMMON_DEPEND="media-libs/jpeg
+COMMON_DEPEND=">=media-libs/jpeg-8
 	sys-libs/libcap
 	>=media-libs/fontconfig-2.4.2
 	>=media-libs/freetype-2