summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2008-10-02 18:37:32 +0000
committerMatthias Schwarzott <zzam@gentoo.org>2008-10-02 18:37:32 +0000
commitb1b4890f08924906417d978271997e04f866b98b (patch)
treec1147ad36495eb6ae7f94df12574bcfd0f68e58e /media-plugins
parentremove old (diff)
downloadhistorical-b1b4890f08924906417d978271997e04f866b98b.tar.gz
historical-b1b4890f08924906417d978271997e04f866b98b.tar.bz2
historical-b1b4890f08924906417d978271997e04f866b98b.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.
Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.25-tuxonice-r6 i686
Diffstat (limited to 'media-plugins')
-rw-r--r--media-plugins/vdr-burn/ChangeLog8
-rw-r--r--media-plugins/vdr-burn/Manifest10
-rw-r--r--media-plugins/vdr-burn/vdr-burn-0.1.0_pre21-r4.ebuild20
3 files changed, 29 insertions, 9 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/Manifest b/media-plugins/vdr-burn/Manifest
index f5ba9c03b36a..34ea48a2e48e 100644
--- a/media-plugins/vdr-burn/Manifest
+++ b/media-plugins/vdr-burn/Manifest
@@ -22,13 +22,13 @@ DIST vdr-burn-0.0.009.tgz 422213 RMD160 c7c1427fca58498388ea90075aaa144d0f92cb8b
DIST vdr-burn-0.1.0-pre21.tgz 257165 RMD160 a1c838c698c71b4be626ec5e1bd089a1655f68c4 SHA1 06f441b8641636a2a0a143d4c8006333eec39398 SHA256 43bdcb6d52fc01f56cb36e865f2ed98f7a05d689c565b18de20a0a6830a68159
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 3500 RMD160 4792d2a6a54703d58452c8d3ee26575e2065d5b5 SHA1 70a6f65f00c81974266a56a83202067c9ab60a99 SHA256 5002b2519d851fbc7bf1769bcadee037b629d73a12e307867c2309ce0bea6695
-MISC ChangeLog 5627 RMD160 71ecc41f63ee634cd462fca9efd6de0151f699c0 SHA1 d5fbdd9c84d30d6bd68e057474a6420870406c00 SHA256 636717c8fac0ac0001b304ef200712b1d5a7bd2fca8e63df531c330c38f81d19
+EBUILD vdr-burn-0.1.0_pre21-r4.ebuild 3658 RMD160 0c1c5413038a71ea1b01ebad78e2eeec3bf6cfa2 SHA1 0d34d36594759e8565eff096a6c44dfca931b85d SHA256 9f5188fb742c5d93ea786aaff46a8fb807847ba641d37c8625f44099c92a31cc
+MISC ChangeLog 5879 RMD160 e50625e907d63a12ec309e85f195d0877e223eba SHA1 0366d71a940232df3ee9a371d7d6883bebe80eaf SHA256 5a7a98113dfc47f56df29ab4d41937ab9101607e8c03119a059369811a24ce8a
MISC metadata.xml 451 RMD160 3e1513e64344669532732f16a2893878b2c60d38 SHA1 726331222f87de37d6bec9b4d83ef45c024e41a6 SHA256 17e6e4ae11581ce983dd1ee2e9dd3fbba30b27ded1102fc4c2b340dfd366afea
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
-iEYEARECAAYFAkiTY7sACgkQoeSe8B0zEfwaOQCeImvt+Yf4m2mCD9uv41IIY+WV
-6h4AoIhylOD9tXVUHjvaTrEFunhgiQV6
-=hl86
+iEYEARECAAYFAkjlFPEACgkQt2vP6XvVdOcZdwCfdfBtyGqSN4lg6fkLWc3F+P0R
+0REAn25AksY1GUXr/QhRzZoDEYOdHhrY
+=yF2h
-----END PGP SIGNATURE-----
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