No longer install vdr-setup file, but PDEPEND on vdr-setup-0.3.1-r1 as keywords allow.

Package-Manager: portage-2.1.3_rc9

4 files changed, 25 insertions, 26 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index d431d4a4a133..9ad3a793e496 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/vdr
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.83 2007/07/30 11:00:46 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.84 2007/07/30 15:44:38 zzam Exp $
+
+  30 Jul 2007; Matthias Schwarzott <zzam@gentoo.org> vdr-1.4.4_p3.ebuild,
+  vdr-1.4.6.ebuild:
+  No longer install vdr-setup file, but PDEPEND on vdr-setup-0.3.1-r1 as
+  keywords allow.
 
   30 Jul 2007; Matthias Schwarzott <zzam@gentoo.org> vdr-1.3.36-r3.ebuild,
   vdr-1.4.1-r2.ebuild, vdr-1.4.3.ebuild, vdr-1.4.4.ebuild,
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index e78d74314470..7d657ef7deac 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -47,22 +47,22 @@ EBUILD vdr-1.4.4.ebuild 4989 RMD160 8cab0cbe1603f9e2aca2c15716e13b19b7501f53 SHA
 MD5 d33bc5fe786c4a50972e9aaccc80217f vdr-1.4.4.ebuild 4989
 RMD160 8cab0cbe1603f9e2aca2c15716e13b19b7501f53 vdr-1.4.4.ebuild 4989
 SHA256 aab41a9a9eae81d354c84188388671d38d70d79906b4572ff5574329e5b539d4 vdr-1.4.4.ebuild 4989
-EBUILD vdr-1.4.4_p3.ebuild 5320 RMD160 8f9af007b020fd6d43c2db433742d7371d582802 SHA1 65081efd434b2e9903a3245476c1a3e046fe3e2f SHA256 c9b061e7a491e47ee6996cd07f48a61014875fdecbdaab54f1e87614f2f23e46
-MD5 516c949d44a64303dcaec2641f141c95 vdr-1.4.4_p3.ebuild 5320
-RMD160 8f9af007b020fd6d43c2db433742d7371d582802 vdr-1.4.4_p3.ebuild 5320
-SHA256 c9b061e7a491e47ee6996cd07f48a61014875fdecbdaab54f1e87614f2f23e46 vdr-1.4.4_p3.ebuild 5320
+EBUILD vdr-1.4.4_p3.ebuild 5238 RMD160 91bcfc20c9fcc4cd7bfa43c71c76e7f5fc6d4602 SHA1 c0a5f9863a6c1e55b61ef4000a00dd553b5885d9 SHA256 e9340e96442d780fc40522c70252e68ba0f570a8c9be430792e73af5a664b24d
+MD5 35f983f30aadd0eda7affbf7ae33dddc vdr-1.4.4_p3.ebuild 5238
+RMD160 91bcfc20c9fcc4cd7bfa43c71c76e7f5fc6d4602 vdr-1.4.4_p3.ebuild 5238
+SHA256 e9340e96442d780fc40522c70252e68ba0f570a8c9be430792e73af5a664b24d vdr-1.4.4_p3.ebuild 5238
 EBUILD vdr-1.4.5.ebuild 5316 RMD160 a34b9e94bea6016802b3bded0c7ffde2b7da4133 SHA1 e4eee926716f6dbaa60f5a7f0a6d29bcc8cfff83 SHA256 acfdd9f3bb238f64f521939d87b41ed984245fb0a6049c30967d2333a675a7c3
 MD5 a36cc1d155479bf037c329156ef490b5 vdr-1.4.5.ebuild 5316
 RMD160 a34b9e94bea6016802b3bded0c7ffde2b7da4133 vdr-1.4.5.ebuild 5316
 SHA256 acfdd9f3bb238f64f521939d87b41ed984245fb0a6049c30967d2333a675a7c3 vdr-1.4.5.ebuild 5316
-EBUILD vdr-1.4.6.ebuild 5508 RMD160 8365c47e0fb65ce27ab7943417219177edbcc5f6 SHA1 2d82d30084600b113ba72d39c59added661914f2 SHA256 ccb40c28cb69e3644e4e171cdbcd9c3bbb4466d9f4dc0ef1bff444ae7f5a0c28
-MD5 488701deab20d9d2a33d88d69c7c4e22 vdr-1.4.6.ebuild 5508
-RMD160 8365c47e0fb65ce27ab7943417219177edbcc5f6 vdr-1.4.6.ebuild 5508
-SHA256 ccb40c28cb69e3644e4e171cdbcd9c3bbb4466d9f4dc0ef1bff444ae7f5a0c28 vdr-1.4.6.ebuild 5508
-MISC ChangeLog 13797 RMD160 f1f071bbfcd34000fb14b88d64fd0a8498c96c05 SHA1 f67b38365975e112c3920601f9d37e9c58964c83 SHA256 e76dac6f03e5b2e4dad19233716ee7d8f4f3ee66b30665e33e9bd924bd4a76a0
-MD5 b5f96d866fa211dc3b94f2d14d2fb2d2 ChangeLog 13797
-RMD160 f1f071bbfcd34000fb14b88d64fd0a8498c96c05 ChangeLog 13797
-SHA256 e76dac6f03e5b2e4dad19233716ee7d8f4f3ee66b30665e33e9bd924bd4a76a0 ChangeLog 13797
+EBUILD vdr-1.4.6.ebuild 5426 RMD160 81cdbc356738f7e59e5fc38c71428688939c92be SHA1 2b239fc81967a41ca96b1d0a6a7b33620a1098b9 SHA256 5de4c759c2029266e81208be30792e4970c45a03defc238f98ce0d2d54bdfb0c
+MD5 80cb883cd20e1637f67b527030a2c5af vdr-1.4.6.ebuild 5426
+RMD160 81cdbc356738f7e59e5fc38c71428688939c92be vdr-1.4.6.ebuild 5426
+SHA256 5de4c759c2029266e81208be30792e4970c45a03defc238f98ce0d2d54bdfb0c vdr-1.4.6.ebuild 5426
+MISC ChangeLog 13983 RMD160 1053211192978ab5caf2a37d42113f5b1be07d4d SHA1 376bed0c523a66f9f255a523e0aa1b05a248ab51 SHA256 fcafbacd41b45cf82d453d09238514b2c0160d6cf98fd05145ae52d56b732326
+MD5 aa42ff63d76c42bb83a8483123dfbf22 ChangeLog 13983
+RMD160 1053211192978ab5caf2a37d42113f5b1be07d4d ChangeLog 13983
+SHA256 fcafbacd41b45cf82d453d09238514b2c0160d6cf98fd05145ae52d56b732326 ChangeLog 13983
 MISC metadata.xml 257 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 SHA1 d2419394e7d5c7463d7dea33e9190ebd57484531 SHA256 0dd45fbbaf1c6173535e371e3ff8a3faa41f3f89123ac9dffe338998599ebe26
 MD5 116de98355049ce943c3b6fedc00b4a3 metadata.xml 257
 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 metadata.xml 257
@@ -94,7 +94,7 @@ SHA256 d1d7fcbddfa936238c4122254896089d7625a87aebb558897107dfcd1be0e400 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGrcTpt2vP6XvVdOcRAu3ZAKDQCNMU++HI7YgPWVel5sFMV/laBQCgrdFE
-bPcOrEKSGR2wT9NAuzCL9SM=
-=v428
+iD8DBQFGrgdtt2vP6XvVdOcRAtVoAJ9GJP+JG7g2CzSVpfB/0Hb+/tvVrACgoBOX
+eFi64td3SU7XvidweiHRzjc=
+=Fe+T
 -----END PGP SIGNATURE-----
diff --git a/media-video/vdr/vdr-1.4.4_p3.ebuild b/media-video/vdr/vdr-1.4.4_p3.ebuild
index 8f9d8754dd10..c4f9aba44cbe 100644
--- a/media-video/vdr/vdr-1.4.4_p3.ebuild
+++ b/media-video/vdr/vdr-1.4.4_p3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.4_p3.ebuild,v 1.7 2007/07/30 11:00:46 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.4_p3.ebuild,v 1.8 2007/07/30 15:44:38 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -34,7 +34,7 @@ RDEPEND="${DEPEND}
 	>=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 )"
+PDEPEND="setup-plugin? ( >=media-plugins/vdr-setup-0.3.1-r1 )"
 
 # Relevant Pathes for vdr on gentoo
 DVB_DIR=/usr/include
@@ -170,9 +170,6 @@ src_install() {
 	if use setup-plugin; then
 		insinto /usr/share/vdr/setup
 		doins ${S}/menu.c
-
-		insinto /etc/vdr/plugins/setup
-		newins ${FILESDIR}/vdr-setup-menu-0.2.3.xml vdr-menu.xml
 	fi
 	chown -R vdr:vdr ${D}/${CONF_DIR}
 }
diff --git a/media-video/vdr/vdr-1.4.6.ebuild b/media-video/vdr/vdr-1.4.6.ebuild
index b10d4890c135..1cbb92ff8c4f 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-2007 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.4 2007/07/30 11:00:46 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.6.ebuild,v 1.5 2007/07/30 15:44:38 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -34,7 +34,7 @@ RDEPEND="${DEPEND}
 	>=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 )"
+PDEPEND="setup-plugin? ( >=media-plugins/vdr-setup-0.3.1-r1 )"
 
 # Relevant Pathes for vdr on gentoo
 DVB_DIR=/usr/include
@@ -170,9 +170,6 @@ src_install() {
 	if use setup-plugin; then
 		insinto /usr/share/vdr/setup
 		doins ${S}/menu.c
-
-		insinto /etc/vdr/plugins/setup
-		newins ${FILESDIR}/vdr-setup-menu-0.2.3.xml vdr-menu.xml
 	fi
 	chown -R vdr:vdr ${D}/${CONF_DIR}
 }