Added vdr-setup as PDEPEND to guarantee it gets installed when associated use-flag is set.

svn path=/testing/; revision=261

7 files changed, 45 insertions, 24 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index bc22b38..8bce167 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 Jul 2007; Matthias Schwarzott <zzam@gentoo.org> vdr-1.4.6-r1.ebuild,
+  vdr-1.4.7.ebuild, vdr-1.4.7-r1.ebuild, vdr-1.4.7-r2.ebuild,
+  vdr-1.4.7-r3.ebuild:
+  Added vdr-setup as PDEPEND to guarantee it gets installed when associated
+  use-flag is set.
+
   05 Jul 2007; Matthias Schwarzott <zzam@gentoo.org> +vdr-1.4.7-r3.ebuild,
   +files/extensions-patch-32-plugin-link-error.diff:
   Added patch to let vdr start, even if one plugin has linking problems.
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 02a42d6..5f0d566 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -19,30 +19,30 @@ DIST VDR-Extensions-Patch-32.tar.bz2 217019 RMD160 43ec5662a51885589ecc37594b380
 DIST gentoo-vdr-patchset-1.4.6-2.tar.bz2 201820 RMD160 792eabb16b460c1d7377595aea2046d72207a370 SHA1 2eced5dc3a032dc42b9632ba85767fd047ceabf2 SHA256 2c934f234cdcfb8c0649e1f9a698061df7b233429f6fae80096c5048f0cff7c7
 DIST vdr-1.4.6.tar.bz2 561236 RMD160 e8d5498b6935e67941bc10be46a0f3fa9ea7aa9d SHA1 084c6c937aa64fd3339f87d3f56b53fa701b0d28 SHA256 06dea8e028480fa59f04976db83beacd75592835d89058dd5206f4191d315c9c
 DIST vdr-1.4.7.tar.bz2 560888 RMD160 0e7a0d1cf133ee5e168afb6e2374e2ee6c229fcf SHA1 11e8976b3480a0c9cf2b2aec88c329e9bb0f701b SHA256 9e9f3687efc135d890cf8d70068221e661fea21d1efd7d8dc74bc4e810d4a464
-EBUILD vdr-1.4.6-r1.ebuild 5512 RMD160 508901bc228f718eedf6b1df646193c3d434f1b2 SHA1 8de037709c255e1ac9b787c230b1433c7f3cee5c SHA256 4b973c9464b16f70b2f6923c8f7b68153f34432df3fccc2eceec23a028149ba5
-MD5 054498b845c0f3e12035b833f13875c9 vdr-1.4.6-r1.ebuild 5512
-RMD160 508901bc228f718eedf6b1df646193c3d434f1b2 vdr-1.4.6-r1.ebuild 5512
-SHA256 4b973c9464b16f70b2f6923c8f7b68153f34432df3fccc2eceec23a028149ba5 vdr-1.4.6-r1.ebuild 5512
-EBUILD vdr-1.4.7-r1.ebuild 8453 RMD160 50ddaff9af6bf4f10d46fc9ae1e3bf741b027fd3 SHA1 c9a621481e1d43318f0801991194aa793361fc2d SHA256 10c49d536bd4821ae7aa1cc692fca17b32e884f16c2dd8716513fc8143e31a23
-MD5 22ab59a6d871147846229d9d29a70731 vdr-1.4.7-r1.ebuild 8453
-RMD160 50ddaff9af6bf4f10d46fc9ae1e3bf741b027fd3 vdr-1.4.7-r1.ebuild 8453
-SHA256 10c49d536bd4821ae7aa1cc692fca17b32e884f16c2dd8716513fc8143e31a23 vdr-1.4.7-r1.ebuild 8453
-EBUILD vdr-1.4.7-r2.ebuild 8777 RMD160 fa3cd4d6e7f1d421323002dbc67c4992b1017457 SHA1 4dbcf2eb19dabe09f692e6ceb3ccacc2f6b818e9 SHA256 b57a0e5011f8e86f79798e20112f2b4054a61dd0833ce8959e47f3407242a219
-MD5 fc1dd911b323d6f3ed8cadebeed050a5 vdr-1.4.7-r2.ebuild 8777
-RMD160 fa3cd4d6e7f1d421323002dbc67c4992b1017457 vdr-1.4.7-r2.ebuild 8777
-SHA256 b57a0e5011f8e86f79798e20112f2b4054a61dd0833ce8959e47f3407242a219 vdr-1.4.7-r2.ebuild 8777
-EBUILD vdr-1.4.7-r3.ebuild 8842 RMD160 1c23a27245486e98c872ccb3fc8c19fad9d11d3c SHA1 ccffcbf41fc59c059f8aaf00ac06647051ab0e7f SHA256 65e3200b171fbfcecfc00620ffa556d20c8a08853c4b1c2e2eef35bc3fa6757e
-MD5 ae67b28c75e1657a92bfd6fc5faaf4d9 vdr-1.4.7-r3.ebuild 8842
-RMD160 1c23a27245486e98c872ccb3fc8c19fad9d11d3c vdr-1.4.7-r3.ebuild 8842
-SHA256 65e3200b171fbfcecfc00620ffa556d20c8a08853c4b1c2e2eef35bc3fa6757e vdr-1.4.7-r3.ebuild 8842
-EBUILD vdr-1.4.7.ebuild 8181 RMD160 c0418af29c01587062cb9d741a64f3089bec0c7b SHA1 000c44840da3bf7e392924601d7ec170b25f9938 SHA256 f958d2a335c646b3ba25bd09b7f5a132003c416537191eb1a15c3a95a92f8231
-MD5 e03929c6ddf4bfefc259250968f3b38d vdr-1.4.7.ebuild 8181
-RMD160 c0418af29c01587062cb9d741a64f3089bec0c7b vdr-1.4.7.ebuild 8181
-SHA256 f958d2a335c646b3ba25bd09b7f5a132003c416537191eb1a15c3a95a92f8231 vdr-1.4.7.ebuild 8181
-MISC ChangeLog 2624 RMD160 bed123e7918abba11772394e1cc8b5047f1b15f6 SHA1 9c071baa472b559bb92e8a0ccf9aae6fcaf0099e SHA256 1514cb8348ad46e7a6c74cbbad8a7e1098c49de21d525f4de70e2e790fe43702
-MD5 8140daaf71844077306e13e89db984ed ChangeLog 2624
-RMD160 bed123e7918abba11772394e1cc8b5047f1b15f6 ChangeLog 2624
-SHA256 1514cb8348ad46e7a6c74cbbad8a7e1098c49de21d525f4de70e2e790fe43702 ChangeLog 2624
+EBUILD vdr-1.4.6-r1.ebuild 5631 RMD160 3453e95425d4829458db35ba4519c79013361cae SHA1 95ef06599cfa54a5e130f033ef218886524270c8 SHA256 57d215e817b0cd261d35249bfe2dea45ba4ef77fd4810c50ce0617f85a9fd735
+MD5 cf9eab4d8e929e604b2009725fbc0f2a vdr-1.4.6-r1.ebuild 5631
+RMD160 3453e95425d4829458db35ba4519c79013361cae vdr-1.4.6-r1.ebuild 5631
+SHA256 57d215e817b0cd261d35249bfe2dea45ba4ef77fd4810c50ce0617f85a9fd735 vdr-1.4.6-r1.ebuild 5631
+EBUILD vdr-1.4.7-r1.ebuild 8565 RMD160 535878bfaf0d2334ab1574c3df8a97111cf477a4 SHA1 6da24f7b54241b42cd20bea1f140fb5d8517def4 SHA256 16bb69b1a1f71038dc5a558dfd8588d207c0595c7dce7ec52fd1ee254b7285ad
+MD5 74e5e16844494e2d315f0206e72e5552 vdr-1.4.7-r1.ebuild 8565
+RMD160 535878bfaf0d2334ab1574c3df8a97111cf477a4 vdr-1.4.7-r1.ebuild 8565
+SHA256 16bb69b1a1f71038dc5a558dfd8588d207c0595c7dce7ec52fd1ee254b7285ad vdr-1.4.7-r1.ebuild 8565
+EBUILD vdr-1.4.7-r2.ebuild 8889 RMD160 e04f35a77c31232c1ed6a8f5125910a6852452d3 SHA1 5ef6a3c8ad5ba7104506c29c126cf0f34af1a934 SHA256 d9a30d8b5dd91d2ab714feb765e22240a39e7d11208cd2aeb1bcedc598e02d1f
+MD5 d252e5fbaf07634ce11f059841223c79 vdr-1.4.7-r2.ebuild 8889
+RMD160 e04f35a77c31232c1ed6a8f5125910a6852452d3 vdr-1.4.7-r2.ebuild 8889
+SHA256 d9a30d8b5dd91d2ab714feb765e22240a39e7d11208cd2aeb1bcedc598e02d1f vdr-1.4.7-r2.ebuild 8889
+EBUILD vdr-1.4.7-r3.ebuild 8954 RMD160 f892fd117eab5eaf99d8ca6409f32589a392efe5 SHA1 0ceacd58575dd6d3f6b642c78271b47774f9ce5a SHA256 73a694210be8110c576ce8fe8aafa034dc3f416eb597b6f11716bc3c0cb2b95a
+MD5 3770d83e23f6f7de82a4e9bb23a6b7a1 vdr-1.4.7-r3.ebuild 8954
+RMD160 f892fd117eab5eaf99d8ca6409f32589a392efe5 vdr-1.4.7-r3.ebuild 8954
+SHA256 73a694210be8110c576ce8fe8aafa034dc3f416eb597b6f11716bc3c0cb2b95a vdr-1.4.7-r3.ebuild 8954
+EBUILD vdr-1.4.7.ebuild 8293 RMD160 d5255a3b7b9c8319c4fbfe7a29b386c72deefb88 SHA1 07c30bc0649f7753a0b7f8d6a7c031d9ff5f3b73 SHA256 6efd551608677257ac28306249ace71e5e498a41a8fed1aa04700ba5637488fa
+MD5 9aac40b9447d4b2f0b06df7775ea46dc vdr-1.4.7.ebuild 8293
+RMD160 d5255a3b7b9c8319c4fbfe7a29b386c72deefb88 vdr-1.4.7.ebuild 8293
+SHA256 6efd551608677257ac28306249ace71e5e498a41a8fed1aa04700ba5637488fa vdr-1.4.7.ebuild 8293
+MISC ChangeLog 2879 RMD160 aa57fd3b46fc2be368e83635dda9ab604438655c SHA1 7f534993b3fb340ec1ccdf2cb23efcede2e75d2a SHA256 458da674054ab014ee7b50e99cd4e42f751fa1136d6378b628c53791c33404fc
+MD5 8c14902ab0a9d1e68dcbd70d2816dd49 ChangeLog 2879
+RMD160 aa57fd3b46fc2be368e83635dda9ab604438655c ChangeLog 2879
+SHA256 458da674054ab014ee7b50e99cd4e42f751fa1136d6378b628c53791c33404fc ChangeLog 2879
 MISC metadata.xml 257 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 SHA1 d2419394e7d5c7463d7dea33e9190ebd57484531 SHA256 0dd45fbbaf1c6173535e371e3ff8a3faa41f3f89123ac9dffe338998599ebe26
 MD5 116de98355049ce943c3b6fedc00b4a3 metadata.xml 257
 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 metadata.xml 257
diff --git a/media-video/vdr/vdr-1.4.6-r1.ebuild b/media-video/vdr/vdr-1.4.6-r1.ebuild
index ce06cf3..c6adedb 100644
--- a/media-video/vdr/vdr-1.4.6-r1.ebuild
+++ b/media-video/vdr/vdr-1.4.6-r1.ebuild
@@ -35,6 +35,9 @@ RDEPEND="${DEPEND}
 	media-tv/vdrplugin-rebuild
 	>=media-tv/gentoo-vdr-scripts-0.3.5"
 
+# pull in vdr-setup to get the xml files, else menu will not work
+PDEPEND="setup-plugin? ( media-plugins/vdr-setup )"
+
 # Relevant Pathes for vdr on gentoo
 DVB_DIR=/usr/include
 VDR_INCLUDE_DIR=/usr/include/vdr
diff --git a/media-video/vdr/vdr-1.4.7-r1.ebuild b/media-video/vdr/vdr-1.4.7-r1.ebuild
index 61c31d5..5ead987 100644
--- a/media-video/vdr/vdr-1.4.7-r1.ebuild
+++ b/media-video/vdr/vdr-1.4.7-r1.ebuild
@@ -42,6 +42,9 @@ RDEPEND="${DEPEND}
 	media-tv/vdrplugin-rebuild
 	>=media-tv/gentoo-vdr-scripts-0.3.5"
 
+# pull in vdr-setup to get the xml files, else menu will not work
+PDEPEND="setup? ( media-plugins/vdr-setup )"
+
 # Relevant Pathes for vdr on gentoo
 DVB_DIR=/usr/include
 VDR_INCLUDE_DIR=/usr/include/vdr
diff --git a/media-video/vdr/vdr-1.4.7-r2.ebuild b/media-video/vdr/vdr-1.4.7-r2.ebuild
index 6d2757e..d7e8827 100644
--- a/media-video/vdr/vdr-1.4.7-r2.ebuild
+++ b/media-video/vdr/vdr-1.4.7-r2.ebuild
@@ -42,6 +42,9 @@ RDEPEND="${DEPEND}
 	media-tv/vdrplugin-rebuild
 	>=media-tv/gentoo-vdr-scripts-0.3.5"
 
+# pull in vdr-setup to get the xml files, else menu will not work
+PDEPEND="setup? ( media-plugins/vdr-setup )"
+
 # Relevant Pathes for vdr on gentoo
 DVB_DIR=/usr/include
 VDR_INCLUDE_DIR=/usr/include/vdr
diff --git a/media-video/vdr/vdr-1.4.7-r3.ebuild b/media-video/vdr/vdr-1.4.7-r3.ebuild
index 7fe5e4d..0e1602e 100644
--- a/media-video/vdr/vdr-1.4.7-r3.ebuild
+++ b/media-video/vdr/vdr-1.4.7-r3.ebuild
@@ -42,6 +42,9 @@ RDEPEND="${DEPEND}
 	media-tv/vdrplugin-rebuild
 	>=media-tv/gentoo-vdr-scripts-0.3.5"
 
+# pull in vdr-setup to get the xml files, else menu will not work
+PDEPEND="setup? ( media-plugins/vdr-setup )"
+
 # Relevant Pathes for vdr on gentoo
 DVB_DIR=/usr/include
 VDR_INCLUDE_DIR=/usr/include/vdr
diff --git a/media-video/vdr/vdr-1.4.7.ebuild b/media-video/vdr/vdr-1.4.7.ebuild
index 5211fa3..9a41131 100644
--- a/media-video/vdr/vdr-1.4.7.ebuild
+++ b/media-video/vdr/vdr-1.4.7.ebuild
@@ -42,6 +42,9 @@ RDEPEND="${DEPEND}
 	media-tv/vdrplugin-rebuild
 	>=media-tv/gentoo-vdr-scripts-0.3.5"
 
+# pull in vdr-setup to get the xml files, else menu will not work
+PDEPEND="setup? ( media-plugins/vdr-setup )"
+
 # Relevant Pathes for vdr on gentoo
 DVB_DIR=/usr/include
 VDR_INCLUDE_DIR=/usr/include/vdr