diff options
author | Matthias Schwarzott <zzam@gentoo.org> | 2008-10-02 18:37:32 +0000 |
---|---|---|
committer | Matthias Schwarzott <zzam@gentoo.org> | 2008-10-02 18:37:32 +0000 |
commit | f48d0b0d9de020fdaa25a45c60e39ae553dcdd8d (patch) | |
tree | 865c95f38579232a8b5e52c975457d22db25724c /media-plugins/vdr-burn | |
parent | remove old (diff) | |
download | gentoo-2-f48d0b0d9de020fdaa25a45c60e39ae553dcdd8d.tar.gz gentoo-2-f48d0b0d9de020fdaa25a45c60e39ae553dcdd8d.tar.bz2 gentoo-2-f48d0b0d9de020fdaa25a45c60e39ae553dcdd8d.zip |
Add a check for mjpegtools compiled with png use-flag, thanks to Harald Gutmann. Let pkg_setup not abort on first failed check, but after reporting all errors.
(Portage version: 2.2_rc11/cvs/Linux 2.6.25-tuxonice-r6 i686)
Diffstat (limited to 'media-plugins/vdr-burn')
-rw-r--r-- | media-plugins/vdr-burn/ChangeLog | 8 | ||||
-rw-r--r-- | media-plugins/vdr-burn/vdr-burn-0.1.0_pre21-r4.ebuild | 20 |
2 files changed, 24 insertions, 4 deletions
diff --git a/media-plugins/vdr-burn/ChangeLog b/media-plugins/vdr-burn/ChangeLog index 6c91ec528a90..d3aa244d5e8d 100644 --- a/media-plugins/vdr-burn/ChangeLog +++ b/media-plugins/vdr-burn/ChangeLog @@ -1,6 +1,12 @@ # 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.30 2008/08/01 19:27:50 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/ChangeLog,v 1.31 2008/10/02 18:37:32 zzam Exp $ + + 02 Oct 2008; Matthias Schwarzott <zzam@gentoo.org> + vdr-burn-0.1.0_pre21-r4.ebuild: + Add a check for mjpegtools compiled with png use-flag, thanks to Harald + Gutmann. Let pkg_setup not abort on first failed check, but after + reporting all errors. 01 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml: add GLEP 56 USE flag desc from use.local.desc diff --git a/media-plugins/vdr-burn/vdr-burn-0.1.0_pre21-r4.ebuild b/media-plugins/vdr-burn/vdr-burn-0.1.0_pre21-r4.ebuild index 69a2a57b37dc..48c0d6584b65 100644 --- a/media-plugins/vdr-burn/vdr-burn-0.1.0_pre21-r4.ebuild +++ b/media-plugins/vdr-burn/vdr-burn-0.1.0_pre21-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 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-r4.ebuild,v 1.2 2008/06/15 20:04:10 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/vdr-burn-0.1.0_pre21-r4.ebuild,v 1.3 2008/10/02 18:37:32 zzam Exp $ inherit vdr-plugin eutils @@ -48,21 +48,35 @@ 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 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 + error=1 fi if ! built_with_use media-libs/gd png truetype jpeg ; then echo eerror "Please recompile media-libs/gd with" eerror "USE=\"png truetype jpeg\"" - die "media-libs/gd need png jpeg and truetype support" + echo + error=1 + fi + + if ! built_with_use media-video/mjpegtools png ; then + echo + eerror "Please recompile media-video/mjpegtools with" + eerror "USE=\"png\"" + echo + error=1 + fi + + if [[ $error != 0 ]]; then + die "Requirements not satisfied" fi vdr-plugin_pkg_setup |