fixed build_with_use jpeg depend on media-libs/gd, reported by magicteddy@vdrportal.de; cleanup

Package-Manager: portage-2.1.3.9

5 files changed, 29 insertions, 150 deletions

diff --git a/media-plugins/vdr-burn/ChangeLog b/media-plugins/vdr-burn/ChangeLog
index c45c2a3d10a0..6633aa6d4859 100644
--- a/media-plugins/vdr-burn/ChangeLog
+++ b/media-plugins/vdr-burn/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-burn
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/ChangeLog,v 1.24 2007/06/30 17:19:43 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/ChangeLog,v 1.25 2007/09/27 21:31:09 hd_brummy Exp $
+
+  27 Sep 2007; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -vdr-burn-0.1.0_pre21-r2.ebuild, vdr-burn-0.1.0_pre21-r3.ebuild:
+  fixed build_with_use jpeg depend on media-libs/gd, reported by
+  magicteddy@vdrportal.de; cleanup
 
 *vdr-burn-0.1.0_pre21-r3 (30 Jun 2007)
 
diff --git a/media-plugins/vdr-burn/Manifest b/media-plugins/vdr-burn/Manifest
index abc5e9614463..fc81609c9a5a 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
 MD5 a03e85c9fa5a76dda4619392266e4d30 files/0.1.0_pre21/charset-vdr-1.5.diff 517
 RMD160 b7ae6632050b62bd132d4c36beb7377d3e1a02d9 files/0.1.0_pre21/charset-vdr-1.5.diff 517
@@ -72,18 +75,14 @@ EBUILD vdr-burn-0.0.9-r3.ebuild 2226 RMD160 3fc4715848ba849b3c3a384c56c64fafd0e1
 MD5 2c85caf03abfd7378c7c1d4ae2da304b vdr-burn-0.0.9-r3.ebuild 2226
 RMD160 3fc4715848ba849b3c3a384c56c64fafd0e1cca7 vdr-burn-0.0.9-r3.ebuild 2226
 SHA256 feea1e1bfc527e0d6d8da1c3e1e85b67df93c27bde2b876b019414817fdcdb07 vdr-burn-0.0.9-r3.ebuild 2226
-EBUILD vdr-burn-0.1.0_pre21-r2.ebuild 3334 RMD160 41cf3acf5b6a2036e28400a466bf9e0649c1d7ab SHA1 c9bea02c93ad8b9b0ea80bf1f630a9d34de815d0 SHA256 1788f578da40061802c681cfb2b6492790e2d7df7be9794e42c972ca800fc2f5
-MD5 0fdd275ca81e9e1866546049484caca5 vdr-burn-0.1.0_pre21-r2.ebuild 3334
-RMD160 41cf3acf5b6a2036e28400a466bf9e0649c1d7ab vdr-burn-0.1.0_pre21-r2.ebuild 3334
-SHA256 1788f578da40061802c681cfb2b6492790e2d7df7be9794e42c972ca800fc2f5 vdr-burn-0.1.0_pre21-r2.ebuild 3334
-EBUILD vdr-burn-0.1.0_pre21-r3.ebuild 3402 RMD160 a8ed8c7c010d7562017e299052d8e023ee969f56 SHA1 83441c04197fa919c64e5a1727cdc81b765955ca SHA256 852d332a9667cfe59dcb7c91b73f2f6918d639346d7d14eed5a9a9cf4490f050
-MD5 5248262fdba208ffca41c5ae9f0836ad vdr-burn-0.1.0_pre21-r3.ebuild 3402
-RMD160 a8ed8c7c010d7562017e299052d8e023ee969f56 vdr-burn-0.1.0_pre21-r3.ebuild 3402
-SHA256 852d332a9667cfe59dcb7c91b73f2f6918d639346d7d14eed5a9a9cf4490f050 vdr-burn-0.1.0_pre21-r3.ebuild 3402
-MISC ChangeLog 4391 RMD160 2fa3ef38b624ac02c1560e8918264c8a6ff0e05f SHA1 43119fec4812e094331b28415dada6bcbf88bf1d SHA256 33fa3a81f89504fe7397e0c607a0f8b583a2c186abf5ce81d47dd0cd32cfa598
-MD5 4cc8094ce71cdbcb7352cab100c03f18 ChangeLog 4391
-RMD160 2fa3ef38b624ac02c1560e8918264c8a6ff0e05f ChangeLog 4391
-SHA256 33fa3a81f89504fe7397e0c607a0f8b583a2c186abf5ce81d47dd0cd32cfa598 ChangeLog 4391
+EBUILD vdr-burn-0.1.0_pre21-r3.ebuild 3422 RMD160 5282cf1958d84719d6acfc50c16568826a1aed8a SHA1 ecba96029de7a0820f482ac9041324704be5ce81 SHA256 952873929d88c900f87c485504e1f26b7dd97c4e922ebd8f08dca37bb8846086
+MD5 dc8d86bc0f8f24b6c51edd0f0dabe7e5 vdr-burn-0.1.0_pre21-r3.ebuild 3422
+RMD160 5282cf1958d84719d6acfc50c16568826a1aed8a vdr-burn-0.1.0_pre21-r3.ebuild 3422
+SHA256 952873929d88c900f87c485504e1f26b7dd97c4e922ebd8f08dca37bb8846086 vdr-burn-0.1.0_pre21-r3.ebuild 3422
+MISC ChangeLog 4619 RMD160 ccac26ba7dbb27256fee7dba3e6e69f43d86d5cc SHA1 c4082c60e628ffbe075da24a86c376f71b3b4c8e SHA256 885ae6e13877ddbb37bbbdef2083d93e176262e1cb3a82b07f7539e46f3fe302
+MD5 947e0a8d7c8c4ad11f92e21fd05ef1c6 ChangeLog 4619
+RMD160 ccac26ba7dbb27256fee7dba3e6e69f43d86d5cc ChangeLog 4619
+SHA256 885ae6e13877ddbb37bbbdef2083d93e176262e1cb3a82b07f7539e46f3fe302 ChangeLog 4619
 MISC metadata.xml 350 RMD160 d0b901374bdc1a0891427d10fc60e9105b91e9d7 SHA1 5c83b2fadb6e91b9b019c2c8bd2e4bbd4d324cbd SHA256 900ccfedc8cb763645f7677742bc2ab59d09a332e465875fd1faf4912c13b171
 MD5 35e2c1345c89be1c7032114adeb7ad39 metadata.xml 350
 RMD160 d0b901374bdc1a0891427d10fc60e9105b91e9d7 metadata.xml 350
@@ -94,9 +93,14 @@ SHA256 2e4b89253892bff360cbd57dce405b726c05c88da6d249201c187be75522a255 files/di
 MD5 485d933c3b404fa4dc7cca5c74651c97 files/digest-vdr-burn-0.0.9-r3 241
 RMD160 39bee176fa2404ebdabae76bf6db485d04d49245 files/digest-vdr-burn-0.0.9-r3 241
 SHA256 2e4b89253892bff360cbd57dce405b726c05c88da6d249201c187be75522a255 files/digest-vdr-burn-0.0.9-r3 241
-MD5 0d4f65205f442134f526b2c5483606ae files/digest-vdr-burn-0.1.0_pre21-r2 253
-RMD160 e5b38fe9e276199f66befaea27dbbce1afa28a4c files/digest-vdr-burn-0.1.0_pre21-r2 253
-SHA256 bca1dc80cfd0435e9a670c4b83329893a8a28a9e54105a1b1ab6c674679fe07c files/digest-vdr-burn-0.1.0_pre21-r2 253
 MD5 0d4f65205f442134f526b2c5483606ae files/digest-vdr-burn-0.1.0_pre21-r3 253
 RMD160 e5b38fe9e276199f66befaea27dbbce1afa28a4c files/digest-vdr-burn-0.1.0_pre21-r3 253
 SHA256 bca1dc80cfd0435e9a670c4b83329893a8a28a9e54105a1b1ab6c674679fe07c files/digest-vdr-burn-0.1.0_pre21-r3 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
+
+iD8DBQFG/CFKdn07HTTCgIoRAtG0AJwJU4BmQVJp76Pxq/rBOHWHzo0qNACffISS
+8z+0lcGS2rdzVseeweRBy/4=
+=OS/p
+-----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-burn/files/digest-vdr-burn-0.1.0_pre21-r2 b/media-plugins/vdr-burn/files/digest-vdr-burn-0.1.0_pre21-r2
deleted file mode 100644
index 1c12b83dff38..000000000000
--- a/media-plugins/vdr-burn/files/digest-vdr-burn-0.1.0_pre21-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 11217a15e753b7affaf663a0446e22bb vdr-burn-0.1.0-pre21.tgz 257165
-RMD160 a1c838c698c71b4be626ec5e1bd089a1655f68c4 vdr-burn-0.1.0-pre21.tgz 257165
-SHA256 43bdcb6d52fc01f56cb36e865f2ed98f7a05d689c565b18de20a0a6830a68159 vdr-burn-0.1.0-pre21.tgz 257165
diff --git a/media-plugins/vdr-burn/vdr-burn-0.1.0_pre21-r2.ebuild b/media-plugins/vdr-burn/vdr-burn-0.1.0_pre21-r2.ebuild
deleted file mode 100644
index 70dd6b07fc3b..000000000000
--- a/media-plugins/vdr-burn/vdr-burn-0.1.0_pre21-r2.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2007 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-r2.ebuild,v 1.3 2007/05/08 15:23:12 hd_brummy Exp $
-
-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="~x86 ~amd64"
-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"
-
-DEPEND=">=media-video/vdr-1.4
-		>=dev-libs/libcdio-0.71
-		>=dev-libs/boost-1.32.0
-		media-libs/gd"
-
-RDEPEND=">=media-video/dvdauthor-0.6.10
-		>=media-video/mjpegtools-1.6.2
-		>=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/cdrtools
-		>=app-cdr/dvd+rw-tools-5.21
-		projectx? ( >=media-video/projectx-0.90.4.00-r2 )"
-
-VDR_CONFD_FILE="${FILESDIR}/${PV}/confd"
-VDR_RCADDON_FILE="${FILESDIR}/${PV}/rc-addon.sh"
-
-pkg_setup() {
-
-	if use projectx && [[ ! -d /usr/share/java-config-2 ]] ; then
-		echo
-		eerror "ProjectX need an upgraded version of your Java install"
-		eerror "Please upgrade your Java/Java-config install"
-		einfo "http://www.gentoo.org/proj/en/java/java-upgrade.xml"
-		die "ProjectX need an upgrade of Java/Java-config"
-		echo
-	fi
-
-	if ! built_with_use media-libs/gd png truetype ; then
-		echo
-		eerror "Please recompile media-libs/gd with"
-		eerror "USE=\"png truetype\""
-		die "media-libs/gd need png and truetype support"
-	fi
-
-	vdr-plugin_pkg_setup
-}
-
-src_unpack() {
-	vdr-plugin_src_unpack
-
-	epatch ${FILESDIR}/${PV}/${P}-gentoo.diff
-
-	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
-
-	echo
-	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
-		echo
-		eerror "Please remove the following unneeded file:"
-		einfo "--> /etc/vdr/reccmds/reccmds.burn.conf"
-		echo
-	fi
-}
diff --git a/media-plugins/vdr-burn/vdr-burn-0.1.0_pre21-r3.ebuild b/media-plugins/vdr-burn/vdr-burn-0.1.0_pre21-r3.ebuild
index d6f0d66d0134..c2b0553060f2 100644
--- a/media-plugins/vdr-burn/vdr-burn-0.1.0_pre21-r3.ebuild
+++ b/media-plugins/vdr-burn/vdr-burn-0.1.0_pre21-r3.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-plugins/vdr-burn/vdr-burn-0.1.0_pre21-r3.ebuild,v 1.1 2007/06/30 17:19:43 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/vdr-burn-0.1.0_pre21-r3.ebuild,v 1.2 2007/09/27 21:31:09 hd_brummy Exp $
 
 inherit vdr-plugin eutils
 
@@ -56,11 +56,11 @@ pkg_setup() {
 		echo
 	fi
 
-	if ! built_with_use media-libs/gd png truetype ; then
+	if ! built_with_use media-libs/gd png truetype jpeg ; then
 		echo
 		eerror "Please recompile media-libs/gd with"
-		eerror "USE=\"png truetype\""
-		die "media-libs/gd need png and truetype support"
+		eerror "USE=\"png truetype jpeg\""
+		die "media-libs/gd need png jpeg and truetype support"
 	fi
 
 	vdr-plugin_pkg_setup