No longer install vdr-menu.xml to prevent file-collision with vdr-setup.

Package-Manager: portage-2.1.3.12

6 files changed, 36 insertions, 44 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index 4cc2f061fdf0..d44d5e400f1f 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,10 @@
 # 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.90 2007/10/08 14:14:33 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.91 2007/10/08 14:21:10 zzam Exp $
+
+  08 Oct 2007; Matthias Schwarzott <zzam@gentoo.org> vdr-1.4.1-r2.ebuild,
+  vdr-1.4.3.ebuild, vdr-1.4.4.ebuild, vdr-1.4.5.ebuild:
+  No longer install vdr-menu.xml to prevent file-collision with vdr-setup.
 
   08 Oct 2007; Matthias Schwarzott <zzam@gentoo.org> vdr-1.2.6-r1.ebuild,
   vdr-1.3.36-r3.ebuild, vdr-1.4.1-r2.ebuild, vdr-1.4.3.ebuild,
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index ccf873f0d3b7..ae632636290b 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -58,26 +58,26 @@ EBUILD vdr-1.3.36-r3.ebuild 4714 RMD160 2f29951784447f8a1cff9300304695575d5db493
 MD5 e6d9ef6b35cf4f75fad18206d90bb2c7 vdr-1.3.36-r3.ebuild 4714
 RMD160 2f29951784447f8a1cff9300304695575d5db493 vdr-1.3.36-r3.ebuild 4714
 SHA256 8c6cc0d94acd0bbaf4eda8459c46c7c77f5a77a0671e38baef71ba479410fc41 vdr-1.3.36-r3.ebuild 4714
-EBUILD vdr-1.4.1-r2.ebuild 6359 RMD160 aff45aec5ab43444235026b1cf6df58afeafcad5 SHA1 ddfc5bb1c9001f11fa707fc87752ac7ff5bcbe84 SHA256 4e713f9994e7f9ad5a24c6b997ed89691df2b325d25a8398f3f84a8696a59c5a
-MD5 8bc91847914decc9ed7d7d2e0a518c9e vdr-1.4.1-r2.ebuild 6359
-RMD160 aff45aec5ab43444235026b1cf6df58afeafcad5 vdr-1.4.1-r2.ebuild 6359
-SHA256 4e713f9994e7f9ad5a24c6b997ed89691df2b325d25a8398f3f84a8696a59c5a vdr-1.4.1-r2.ebuild 6359
-EBUILD vdr-1.4.3.ebuild 6355 RMD160 f84ef11712b102fa4cc6c0b57d7a40bcdcd74ab1 SHA1 d7c61acb7bd925f310df2272be685012c087754a SHA256 091136ede1675981e715eadb3b356ecb77add7238a5ff09b87d6ed7bbcc2e6b8
-MD5 c210d80a0443c889d092ca39e413bb35 vdr-1.4.3.ebuild 6355
-RMD160 f84ef11712b102fa4cc6c0b57d7a40bcdcd74ab1 vdr-1.4.3.ebuild 6355
-SHA256 091136ede1675981e715eadb3b356ecb77add7238a5ff09b87d6ed7bbcc2e6b8 vdr-1.4.3.ebuild 6355
-EBUILD vdr-1.4.4.ebuild 5011 RMD160 fce1f177a9515c58d3148fcc6a30d395c7be9c40 SHA1 6550f6b74f1f2f9b5b92973185d05f0d421fef5e SHA256 3000749b413383d5190c5de006c08d60406898e86dc5f0f5fa89d9555a167b8d
-MD5 10050fee97dbd334c032c74d45697822 vdr-1.4.4.ebuild 5011
-RMD160 fce1f177a9515c58d3148fcc6a30d395c7be9c40 vdr-1.4.4.ebuild 5011
-SHA256 3000749b413383d5190c5de006c08d60406898e86dc5f0f5fa89d9555a167b8d vdr-1.4.4.ebuild 5011
+EBUILD vdr-1.4.1-r2.ebuild 6275 RMD160 b6b867cb3ccd18d2a7d1357b054f0c3b0dd88da5 SHA1 14e41e63e840bffd2cf6ea993c3561b0cab1b6a6 SHA256 0a6fd45b3fda58cad245665dd399f724d52014b71c54ab09cc324d1190307b90
+MD5 b01cd44242ce64652d009579c80003fa vdr-1.4.1-r2.ebuild 6275
+RMD160 b6b867cb3ccd18d2a7d1357b054f0c3b0dd88da5 vdr-1.4.1-r2.ebuild 6275
+SHA256 0a6fd45b3fda58cad245665dd399f724d52014b71c54ab09cc324d1190307b90 vdr-1.4.1-r2.ebuild 6275
+EBUILD vdr-1.4.3.ebuild 6272 RMD160 23960d732b6f49960426c6a525c6fc6c6e337562 SHA1 89abffd4d7f469e0fb66df08fa396aa0f84c898c SHA256 d84d6fe1073e9b87f0dbf77b4cbee39d04f19463965636c029c1eb48772c0b06
+MD5 b3dc1fe0e767003023bfe3b8b923fd75 vdr-1.4.3.ebuild 6272
+RMD160 23960d732b6f49960426c6a525c6fc6c6e337562 vdr-1.4.3.ebuild 6272
+SHA256 d84d6fe1073e9b87f0dbf77b4cbee39d04f19463965636c029c1eb48772c0b06 vdr-1.4.3.ebuild 6272
+EBUILD vdr-1.4.4.ebuild 4928 RMD160 ededf380dd80b51c1dfe44fd8d47c5a67676dbcd SHA1 ae0f7041240016068fe2d61837df32d609f7d6c9 SHA256 098c5386af6a6cf9212f3f73a84ff240187675994b286d0d685a665960336de7
+MD5 617b53b39f8317b97dda19448b0b2910 vdr-1.4.4.ebuild 4928
+RMD160 ededf380dd80b51c1dfe44fd8d47c5a67676dbcd vdr-1.4.4.ebuild 4928
+SHA256 098c5386af6a6cf9212f3f73a84ff240187675994b286d0d685a665960336de7 vdr-1.4.4.ebuild 4928
 EBUILD vdr-1.4.4_p3.ebuild 5258 RMD160 8aa3d568a63fe84ee7abe3c1d69260e9558d087b SHA1 3f709a82434778488789c1800ae45ee3127ae678 SHA256 3e733d4c1700cff30b70e0ac7602569193892279c89205a9db70ec218b3c753c
 MD5 9163b1bcef0ce01e22b757a236e2c4a8 vdr-1.4.4_p3.ebuild 5258
 RMD160 8aa3d568a63fe84ee7abe3c1d69260e9558d087b vdr-1.4.4_p3.ebuild 5258
 SHA256 3e733d4c1700cff30b70e0ac7602569193892279c89205a9db70ec218b3c753c vdr-1.4.4_p3.ebuild 5258
-EBUILD vdr-1.4.5.ebuild 5338 RMD160 8ffe5b2be4b1d3bf1d470c56b0d25ea16decbea6 SHA1 b953b0e3db82eb1d1ec00bdcf5db37e6bc35ca27 SHA256 b9d73d848fb20cf3e094cb09fab83c961d492e3fb811c891ede7fb7877273d98
-MD5 05f810ab3fee74fb7b5183ea13e870a0 vdr-1.4.5.ebuild 5338
-RMD160 8ffe5b2be4b1d3bf1d470c56b0d25ea16decbea6 vdr-1.4.5.ebuild 5338
-SHA256 b9d73d848fb20cf3e094cb09fab83c961d492e3fb811c891ede7fb7877273d98 vdr-1.4.5.ebuild 5338
+EBUILD vdr-1.4.5.ebuild 5254 RMD160 fecc9baf9cd53033b534f27c5b152f22b8b04de5 SHA1 e73e94a12ea1886a0c39a44cb000b9b1dfbeaac1 SHA256 e0819fffc49854dc2299610a968e161ef2807f71148a44f7495f13d451b497f5
+MD5 1e095d006b2047ce879f3ac266206651 vdr-1.4.5.ebuild 5254
+RMD160 fecc9baf9cd53033b534f27c5b152f22b8b04de5 vdr-1.4.5.ebuild 5254
+SHA256 e0819fffc49854dc2299610a968e161ef2807f71148a44f7495f13d451b497f5 vdr-1.4.5.ebuild 5254
 EBUILD vdr-1.4.6.ebuild 5609 RMD160 1ff37804b45c5c45bc9254621c58868f71405d4a SHA1 a163a0ffb4dc82cbc9dd2bb8b771b9d20b86c518 SHA256 38644284c519f6e978b12637202f2ff09d2aba84e59cca0ae35573dcb0344309
 MD5 a4c274278aaf0deb25735c01303fce54 vdr-1.4.6.ebuild 5609
 RMD160 1ff37804b45c5c45bc9254621c58868f71405d4a vdr-1.4.6.ebuild 5609
@@ -90,10 +90,10 @@ EBUILD vdr-1.4.7-r5.ebuild 8434 RMD160 de025f02abb66b04ec352c4ff0881a6d91c6b075
 MD5 3f6043e05606818e2cecead82893566c vdr-1.4.7-r5.ebuild 8434
 RMD160 de025f02abb66b04ec352c4ff0881a6d91c6b075 vdr-1.4.7-r5.ebuild 8434
 SHA256 9cb2453a4eddedb4c8ea4d0be2970182cda283e0b821b11445d881fbbb92395b vdr-1.4.7-r5.ebuild 8434
-MISC ChangeLog 15146 RMD160 f54002e0aab365a709f5c9be095fb3346155970b SHA1 ec9ca793928bd0659a37140fa0c9b6a19143727a SHA256 c0e992e1ec9b348270b9790c874a8fe1cad49a9463acb2936c28a14cfd15a8e8
-MD5 4b28ae1daf72d35349db84e6fc4b6827 ChangeLog 15146
-RMD160 f54002e0aab365a709f5c9be095fb3346155970b ChangeLog 15146
-SHA256 c0e992e1ec9b348270b9790c874a8fe1cad49a9463acb2936c28a14cfd15a8e8 ChangeLog 15146
+MISC ChangeLog 15352 RMD160 9d3cb8533013aa57e4bdc233f8c4d6e86ac74a5a SHA1 76688b860e28e0738d870547a668803f7e739b60 SHA256 580f6a4e2cd88c356cd37bcaf69291de2155f8bc7d69241a55865f10ae0491e7
+MD5 70891dff1c112c9d36c78829d6a020e1 ChangeLog 15352
+RMD160 9d3cb8533013aa57e4bdc233f8c4d6e86ac74a5a ChangeLog 15352
+SHA256 580f6a4e2cd88c356cd37bcaf69291de2155f8bc7d69241a55865f10ae0491e7 ChangeLog 15352
 MISC metadata.xml 257 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 SHA1 d2419394e7d5c7463d7dea33e9190ebd57484531 SHA256 0dd45fbbaf1c6173535e371e3ff8a3faa41f3f89123ac9dffe338998599ebe26
 MD5 116de98355049ce943c3b6fedc00b4a3 metadata.xml 257
 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 metadata.xml 257
@@ -131,7 +131,7 @@ SHA256 403d97ec261a17d22f71a77e4ded1e941b35dcf36819b9c79a8f5b0c2d98b1c1 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHCjtVt2vP6XvVdOcRAm2TAJ0TGk21v0cmkvhMCm/sUN57I/0K+wCfYhFs
-dQA7OQS2Z9WpfdJ+aL9xxFI=
-=6FLu
+iD8DBQFHCjzet2vP6XvVdOcRApbsAJ9Y/9wnO08a+OUYa2BBYDzfFho2/wCg1Vxy
+Vy4yipuBMyifcqwE+xrk+dk=
+=M2y+
 -----END PGP SIGNATURE-----
diff --git a/media-video/vdr/vdr-1.4.1-r2.ebuild b/media-video/vdr/vdr-1.4.1-r2.ebuild
index 78ffa1806a39..bb9351b3cedd 100644
--- a/media-video/vdr/vdr-1.4.1-r2.ebuild
+++ b/media-video/vdr/vdr-1.4.1-r2.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.1-r2.ebuild,v 1.10 2007/10/08 14:14:33 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.1-r2.ebuild,v 1.11 2007/10/08 14:21:10 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -32,7 +32,7 @@ RDEPEND="${DEPEND}
 	!vanilla? ( >=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
@@ -226,9 +226,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.3.ebuild b/media-video/vdr/vdr-1.4.3.ebuild
index 9da09552d1f5..61367e163474 100644
--- a/media-video/vdr/vdr-1.4.3.ebuild
+++ b/media-video/vdr/vdr-1.4.3.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.3.ebuild,v 1.9 2007/10/08 14:14:33 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.3.ebuild,v 1.10 2007/10/08 14:21:10 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -32,7 +32,7 @@ RDEPEND="${DEPEND}
 	!vanilla? ( >=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
@@ -226,9 +226,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.4.ebuild b/media-video/vdr/vdr-1.4.4.ebuild
index a31c42eaa7b7..7a31dc43b608 100644
--- a/media-video/vdr/vdr-1.4.4.ebuild
+++ b/media-video/vdr/vdr-1.4.4.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.ebuild,v 1.9 2007/10/08 14:14:33 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.4.ebuild,v 1.10 2007/10/08 14:21:10 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -35,7 +35,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
@@ -158,9 +158,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.5.ebuild b/media-video/vdr/vdr-1.4.5.ebuild
index 1fb0add46080..6807278b27e5 100644
--- a/media-video/vdr/vdr-1.4.5.ebuild
+++ b/media-video/vdr/vdr-1.4.5.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.5.ebuild,v 1.8 2007/10/08 14:14:33 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.5.ebuild,v 1.9 2007/10/08 14:21:10 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}
 }