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

(Portage version: 2.1.3.9)

4 files changed, 10 insertions, 135 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/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