Switch to eapi2 so the built_with_use can be replaced by a proper use-depend. Also add DEPEND to RDEPEND as that seems to be missing.

Package-Manager: portage-2.1.6.7/cvs/Linux i686

4 files changed, 153 insertions, 9 deletions

diff --git a/media-plugins/vdr-burn/ChangeLog b/media-plugins/vdr-burn/ChangeLog
index 54da3948e3dd..080474295542 100644
--- a/media-plugins/vdr-burn/ChangeLog
+++ b/media-plugins/vdr-burn/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/vdr-burn
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/ChangeLog,v 1.33 2008/11/17 20:44:09 flameeyes Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/ChangeLog,v 1.34 2009/02/24 00:30:07 zzam Exp $
+
+*vdr-burn-0.1.0_pre21-r5 (24 Feb 2009)
+
+  24 Feb 2009; Matthias Schwarzott <zzam@gentoo.org>
+  +vdr-burn-0.1.0_pre21-r5.ebuild:
+  Switch to eapi2 so the built_with_use can be replaced by a proper
+  use-depend. Also add DEPEND to RDEPEND as that seems to be missing.
 
   17 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
   files/vdr-burn-0.0.9_vdr-1.3.47-compile.diff:
diff --git a/media-plugins/vdr-burn/Manifest b/media-plugins/vdr-burn/Manifest
index 7ab615bd6641..a0d1ce06ad44 100644
--- a/media-plugins/vdr-burn/Manifest
+++ b/media-plugins/vdr-burn/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.1.0_pre21/charset-vdr-1.5.diff 517 RMD160 b7ae6632050b62bd132d4c36beb7377d3e1a02d9 SHA1 25a0297f4167274fd3016f007c153043f1d7fcf7 SHA256 71f6871b026d50eea98d54f46a7262dc357682796eab7b4ef44d4d700d951cbe
 AUX 0.1.0_pre21/confd 739 RMD160 f260dddcd9806e00baa09790e31e4accd3259f20 SHA1 1eb4fd5cb403a3edc407bf549f39a547bee18200 SHA256 81dc2df24b8658230f38af8055e5aab7dbf284390f21e091463721370c074d2c
 AUX 0.1.0_pre21/i18n.diff 657 RMD160 d6fd4a6d2b1ed28929dccb6b8b3220334f18cf69 SHA1 190d361973ff0b722208225bd8c60d8c94d87ad9 SHA256 996708c07789a7157b04afc2942e57dd6cfc2f912d473d660038377db7c0bab4
@@ -20,5 +23,13 @@ DIST vdr-burn-0.1.0-pre21.tgz 257165 RMD160 a1c838c698c71b4be626ec5e1bd089a1655f
 EBUILD vdr-burn-0.0.9-r2.ebuild 2230 RMD160 0992aa723e49b88f652a5fa90243d41e572ffef9 SHA1 a84c4e2855cb55821f881507c7c09f389660da51 SHA256 72ff4232dc5a336468707f7f514f0d70593738da369226dea4dde39493126ca6
 EBUILD vdr-burn-0.0.9-r3.ebuild 2241 RMD160 d3143e4e288682a612eb401ca9452124fde628f2 SHA1 f5f62cdf345df19612033cf0112494268ad85fe0 SHA256 d4d2d8b8d04a6dd163b3d5ea5a65b394d7385890e88f346018e7c022953d23fa
 EBUILD vdr-burn-0.1.0_pre21-r4.ebuild 3681 RMD160 9a2bcb44169a5bb0827c3c2d54018a10ff759760 SHA1 6699fd22f64448c3b6610c956deb33583e1e7fe1 SHA256 bd9613a03c27223aebc05390b419c35676fdbbb5fa98b11549278b2542fc80ac
-MISC ChangeLog 6179 RMD160 02180fe3a0e21a8abe3a08de8ad9db70136c83fb SHA1 0c5e6e955d87c7297aba774751c99f89882b955d SHA256 77cf5e64d9e12ca75116344b29bd9c65a894d607dc8db3186b281ef9252ed48b
+EBUILD vdr-burn-0.1.0_pre21-r5.ebuild 3337 RMD160 de0a492ebf0d46918ac49c2e7d644ab489d87d33 SHA1 2ab6cfdc1d8eb6619d4e6ca1000d3603764a9f43 SHA256 1ee37c2c69aea893911ab4dbc17c773e22492ba02b21d2b4fdba78ddf4840ea5
+MISC ChangeLog 6441 RMD160 08c05b381b07758bc4a17abea3556cf46a420ea4 SHA1 bde7d41bb650ca1305d997d11fa329228c6fd93d SHA256 15db2c174efff6af0b0cd1376f29f7f6548aae26ce43d19f76c4af23e7cf304a
 MISC metadata.xml 451 RMD160 3e1513e64344669532732f16a2893878b2c60d38 SHA1 726331222f87de37d6bec9b4d83ef45c024e41a6 SHA256 17e6e4ae11581ce983dd1ee2e9dd3fbba30b27ded1102fc4c2b340dfd366afea
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAkmjP5UACgkQt2vP6XvVdOfBMQCeM6OZjFV+XXdkw/XTVqHxEXFB
+k2YAn2V4ZQxWPaK2qOJr+CZ8nqzg3xxn
+=A8jm
+-----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-burn/vdr-burn-0.1.0_pre21-r5.ebuild b/media-plugins/vdr-burn/vdr-burn-0.1.0_pre21-r5.ebuild
new file mode 100644
index 000000000000..0e5b99051aef
--- /dev/null
+++ b/media-plugins/vdr-burn/vdr-burn-0.1.0_pre21-r5.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/vdr-burn-0.1.0_pre21-r5.ebuild,v 1.1 2009/02/24 00:30:07 zzam Exp $
+
+EAPI="2"
+
+inherit vdr-plugin eutils
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+S="${WORKDIR}/burn-${MY_PV}"
+
+DESCRIPTION="VDR: DVD Burn Plugin"
+HOMEPAGE="http://www.xeatre.de/community/burn"
+SRC_URI="http://www.magoa.net/linux/contrib/${MY_P}.tgz"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="projectx"
+
+PATCHES=("${FILESDIR}/${PV}/i18n.diff"
+	"${FILESDIR}/${PV}/menuburn.diff"
+	"${FILESDIR}/${PV}/menuitems.diff"
+	"${FILESDIR}/${PV}/${P}_setdefaults.diff"
+	"${FILESDIR}/${PV}/${P}-gentoo.diff"
+	"${FILESDIR}/${PV}/requantfactor.diff"
+	"${FILESDIR}/${PV}/charset-vdr-1.5.diff"
+	"${FILESDIR}/${PV}/${P}-gcc43.patch")
+
+DEPEND=">=media-video/vdr-1.4
+		>=dev-libs/libcdio-0.71
+		>=dev-libs/boost-1.32.0
+		media-libs/gd[png,truetype,jpeg]"
+
+RDEPEND="${DEPEND}
+		>=media-video/dvdauthor-0.6.10
+		>=media-video/mjpegtools-1.6.2[png]
+		>=media-video/vdrsync-0.1.3_pre1-r5
+		>=media-video/m2vrequantizer-20060306
+		media-video/transcode
+		media-fonts/ttf-bitstream-vera
+		media-video/vdrtools-genindex
+		virtual/eject
+		virtual/cdrtools
+		>=app-cdr/dvd+rw-tools-5.21
+		projectx? ( >=media-video/projectx-0.90.4.00-r4 )"
+
+VDR_CONFD_FILE="${FILESDIR}/${PV}/confd"
+VDR_RCADDON_FILE="${FILESDIR}/${PV}/rc-addon.sh"
+
+pkg_setup() {
+	local error=0
+
+	if use projectx && [[ ! -d /usr/share/java-config-2 ]] ; then
+		eerror
+		eerror "ProjectX need an upgraded version of your Java install"
+		eerror "Please upgrade your Java/Java-config install"
+		eerror "\thttp://www.gentoo.org/proj/en/java/java-upgrade.xml"
+		eerror
+		die "Requirements not satisfied"
+	fi
+
+	vdr-plugin_pkg_setup
+}
+
+src_prepare() {
+	vdr-plugin_src_prepare
+	sed -i Makefile \
+		-e 's#^TMPDIR = .*$#TMPDIR = /tmp#' \
+		-e 's#^ISODIR=.*$#ISODIR=/var/vdr/video/dvd-images#'
+}
+
+src_install() {
+	vdr-plugin_src_install
+
+	dobin "${S}"/burn-buffers
+	dobin "${S}"/*.sh
+
+	insinto /usr/share/vdr/burn
+	doins "${S}"/burn/menu-silence.mp2
+	newins "${S}"/burn/menu-button.png menu-button-default.png
+	newins "${S}"/burn/menu-bg.png menu-bg-default.png
+	dosym menu-bg-default.png /usr/share/vdr/burn/menu-bg.png
+	dosym menu-button-default.png /usr/share/vdr/burn/menu-button.png
+
+	use projectx && newins "${S}"/burn/ProjectX.ini projectx-vdr.ini
+
+	fowners -R vdr:vdr /usr/share/vdr/burn
+
+	(
+		diropts -ovdr -gvdr
+		keepdir /usr/share/vdr/burn/counters
+	)
+}
+
+pkg_preinst() {
+	if [[ -d ${ROOT}/etc/vdr/plugins/burn && ( ! -L ${ROOT}/etc/vdr/plugins/burn ) ]]; then
+		einfo "Moving /etc/vdr/plugins/burn away"
+		mv "${ROOT}"/etc/vdr/plugins/burn "${ROOT}"/etc/vdr/plugins/burn_old
+	fi
+}
+
+pkg_postinst() {
+
+	local DMH_FILE="${ROOT}/usr/share/vdr/burn/counters/standard"
+	if [[ ! -e "${DMH_FILE}" ]]; then
+		echo 0001 > "${DMH_FILE}"
+		chown vdr:vdr "${DMH_FILE}"
+	fi
+
+	vdr-plugin_pkg_postinst
+
+	einfo
+	einfo "This ebuild comes only with the standard template"
+	einfo "'emerge vdr-burn-templates' for more templates"
+	einfo "To change the templates, use the vdr-image plugin"
+
+	if [[ -e ${ROOT}/etc/vdr/reccmds/reccmds.burn.conf ]]; then
+		eerror
+		eerror "Please remove the following unneeded file:"
+		eerror "\t/etc/vdr/reccmds/reccmds.burn.conf"
+		eerror
+	fi
+}
diff --git a/media-plugins/vdr-iptv/Manifest b/media-plugins/vdr-iptv/Manifest
index ffeba1bfa892..61528218f83f 100644
--- a/media-plugins/vdr-iptv/Manifest
+++ b/media-plugins/vdr-iptv/Manifest
@@ -9,13 +9,13 @@ DIST vdr-iptv-0.2.0.tgz 51154 RMD160 95586ac8e6353da3a017e8606d740aaa800bf616 SH
 EBUILD vdr-iptv-0.0.3.ebuild 627 RMD160 2915fed03a40c2ba631f1c410002b739d4d41e07 SHA1 89b79ef1cfc59838808ad4c46f2209a5acce23e7 SHA256 915c82ec11d686c213ebe0043b3c8e8d6054f9309e8725cb98bf4da099b3d166
 EBUILD vdr-iptv-0.0.6.ebuild 865 RMD160 fa8422775c7e77f8ff6eb8e281aabcf8178311e0 SHA1 4755f997fa40de49fb5742ff554a40042951094b SHA256 55678e90ee683391560f508aee25de901251eb885f349a56203d22b041f023c7
 EBUILD vdr-iptv-0.0.7.ebuild 906 RMD160 3c2b97589027e5fe4345452475ad6939e6cf47dd SHA1 3ca0feb2a3eb07f7e9bed1ffa5b75a64af3a845f SHA256 d717ead14c4b63fe5420dd56e8f1bdb0651d1822acb591b044babe1f70d96218
-EBUILD vdr-iptv-0.2.0.ebuild 862 RMD160 bbb076c7f6dd7308f36a6a34b4f9b655dc84f2a8 SHA1 8583be775e883243efd7a9c7730ae371c4fe2fb1 SHA256 2be58b8f7777aaa8c4b043be6ace68bc1d74cd3153baef37bd0b6b68c2b84b1f
-MISC ChangeLog 961 RMD160 bee9a911f500fe0b04e5c6224c3cd7d55723a38f SHA1 60c4cbf38bf5d2e2870bb9d22671cc6df1d0ca10 SHA256 d4b5c42469de36d1f54e543ff4e3496863acffefd312417ef2b3c99f28bf1f75
+EBUILD vdr-iptv-0.2.0.ebuild 656 RMD160 5d6754e6a2386bd81825a99f46172f1c70b4bb50 SHA1 af6106218cee0398c3c97201c10bebc650cb4ed7 SHA256 bff98244cd58afbc011ac69980806b4543a042d6be46468913b2f1a5318ede79
+MISC ChangeLog 1120 RMD160 06a43421c678eb7207e4e39c3fd548c0f417b014 SHA1 da25aa6a9ecaec689ea653d9586eb7c79c5f39ed SHA256 2ca42fa06e71cb4839db4276a062a0d43914d68dfad357fee50550ac5206ed12
 MISC metadata.xml 251 RMD160 b4bdfc1a9e947ad1d1f76c1942f02057d5cbc993 SHA1 6e174f6e4395999a9dafd53f523e079766c0b094 SHA256 b426b6e6d679a63de74d2c1a21e4da2381fb1b580b0180b041307471d67ab54f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iD8DBQFH75HOt2vP6XvVdOcRAlyCAKCIZ9df3+xIwHubLcB5K5E9PxgFrgCffUCt
-+05m5OJ5b3ncSy0f0bminr8=
-=48t8
+iEYEARECAAYFAkmjQLEACgkQt2vP6XvVdOeMxwCfdEh4/oDokpWZwZ3QnRwwoB9u
+YCYAn2wew6+i4a2waXTUw7Jcrx5QtBhL
+=0ysX
 -----END PGP SIGNATURE-----