Check for bad combination of ffmpeg and libtheora to abort with an error, see bug #142250.

Package-Manager: portage-2.1.1_pre4-r2

3 files changed, 31 insertions, 14 deletions

diff --git a/media-plugins/vdr-softdevice/ChangeLog b/media-plugins/vdr-softdevice/ChangeLog
index 6da88626c909..bb4fd200a4a3 100644
--- a/media-plugins/vdr-softdevice/ChangeLog
+++ b/media-plugins/vdr-softdevice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-softdevice
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.11 2006/07/31 12:18:06 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.12 2006/08/03 09:08:57 zzam Exp $
+
+  03 Aug 2006; Matthias Schwarzott <zzam@gentoo.org>
+  vdr-softdevice-0.2.3.20060511-r7.ebuild:
+  Check for bad combination of ffmpeg and libtheora to abort with an error,
+  see bug #142250.
 
   31 Jul 2006; Matthias Schwarzott <zzam@gentoo.org> metadata.xml:
   changed maintainance to VDR-Project
diff --git a/media-plugins/vdr-softdevice/Manifest b/media-plugins/vdr-softdevice/Manifest
index 4f48552694ef..2955189906ad 100644
--- a/media-plugins/vdr-softdevice/Manifest
+++ b/media-plugins/vdr-softdevice/Manifest
@@ -42,14 +42,14 @@ MD5 4708f556a9bfa9207c43c6359190e3e1 files/vdr-softdevice-0.2.3a-Makefile.diff 9
 RMD160 f53d9a9d7b6f816f32b9bed2106f47701d199feb files/vdr-softdevice-0.2.3a-Makefile.diff 950
 SHA256 cb0cc884b706d01c74f2c5baef1cdd795ddfc27e4d8ca30bd96df75b6b40455e files/vdr-softdevice-0.2.3a-Makefile.diff 950
 DIST vdr-softdevice-0.2.3a.tgz 133780 RMD160 d97d7a1bbe4a3b325041bbe0e7ef23740f8121b1 SHA1 13f0b16b4bbde1c10b3dc31c075f43e8ca6eeb5d SHA256 bbf05254ce6f0559ce6aeed055272ba6fb207ba443a49926b91506e9de69ab92
-EBUILD vdr-softdevice-0.2.3.20060511-r7.ebuild 2625 RMD160 baaf2ff0d6d212f6204c64ffaba53fb35430e92a SHA1 dd5e6a36bf6dfb2ed2882993b81ee07f7287a625 SHA256 35483e789c7b00393940114fe429b6e176999df61532d25083d0a6e5ddcbf598
-MD5 a37cd248ce190602797d0fa891f5d21f vdr-softdevice-0.2.3.20060511-r7.ebuild 2625
-RMD160 baaf2ff0d6d212f6204c64ffaba53fb35430e92a vdr-softdevice-0.2.3.20060511-r7.ebuild 2625
-SHA256 35483e789c7b00393940114fe429b6e176999df61532d25083d0a6e5ddcbf598 vdr-softdevice-0.2.3.20060511-r7.ebuild 2625
-MISC ChangeLog 3011 RMD160 d58b0c482eb917c796d20a8a5898f118d8f6a6aa SHA1 64b319bbc4f9220e3484a9e7d4e9a784ee6a976b SHA256 d4fcdcaf872a83ad7a47bd41b8dc9fbad5987531e36347b6a500d5789d6d3ff9
-MD5 3adbe0b9470db0d8bed7a707c1f2ea1f ChangeLog 3011
-RMD160 d58b0c482eb917c796d20a8a5898f118d8f6a6aa ChangeLog 3011
-SHA256 d4fcdcaf872a83ad7a47bd41b8dc9fbad5987531e36347b6a500d5789d6d3ff9 ChangeLog 3011
+EBUILD vdr-softdevice-0.2.3.20060511-r7.ebuild 3132 RMD160 dd33bb128f3e97162f2b25b0916494c9648379a8 SHA1 8898872fe036f8a00b348bd8406417a2c7a19e85 SHA256 df5fa3f943bfa81b3edeff163e4360225856102fc39fca91dc9749241f5c006b
+MD5 f7aafb7e48aeb48694798cfabfee3c27 vdr-softdevice-0.2.3.20060511-r7.ebuild 3132
+RMD160 dd33bb128f3e97162f2b25b0916494c9648379a8 vdr-softdevice-0.2.3.20060511-r7.ebuild 3132
+SHA256 df5fa3f943bfa81b3edeff163e4360225856102fc39fca91dc9749241f5c006b vdr-softdevice-0.2.3.20060511-r7.ebuild 3132
+MISC ChangeLog 3203 RMD160 ab38dc5522463d31453440d99b2360d7f577b57a SHA1 b69b26324dc3be9e66715bc0e4c37b2416d3520e SHA256 aa4882f41d2d1f85bb4237d7ceb032a59084a5880bd54d5390f96a1cb37c55ed
+MD5 ba7630cb7adf4efa8606380cafbcb78e ChangeLog 3203
+RMD160 ab38dc5522463d31453440d99b2360d7f577b57a ChangeLog 3203
+SHA256 aa4882f41d2d1f85bb4237d7ceb032a59084a5880bd54d5390f96a1cb37c55ed ChangeLog 3203
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
 MD5 e0c01eee6ee7e11d5d597aee9f9a2852 metadata.xml 298
 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf metadata.xml 298
@@ -58,9 +58,9 @@ MD5 c7a0fabecfebf2988f2c1552b361c1ae files/digest-vdr-softdevice-0.2.3.20060511-
 RMD160 498e786a7b8110e307aa41c04ed04d88aade4653 files/digest-vdr-softdevice-0.2.3.20060511-r7 256
 SHA256 5d9d302686e0c254357af9482fb419c4510e73882e820f3bfcf76387d49be011 files/digest-vdr-softdevice-0.2.3.20060511-r7 256
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFEzfUEt2vP6XvVdOcRAjGFAJ9NPV8IbSt/GU/G6Gs01hSFnzaHiwCgmEGq
-5ZI1SO0EkjCleine0Fbk1fE=
-=2YXQ
+iD8DBQFE0b00t2vP6XvVdOcRAhEaAJwJlfC9KD3dAPVxdsUSL+DIU9sfYwCgptb/
+c7/fwAnDhK1PdKwQKE+EWW0=
+=OiTF
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.2.3.20060511-r7.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.2.3.20060511-r7.ebuild
index 06f69189134b..05e6668f4bc7 100644
--- a/media-plugins/vdr-softdevice/vdr-softdevice-0.2.3.20060511-r7.ebuild
+++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.2.3.20060511-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.2.3.20060511-r7.ebuild,v 1.2 2006/07/31 12:15:04 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.2.3.20060511-r7.ebuild,v 1.3 2006/08/03 09:08:57 zzam Exp $
 
 inherit vdr-plugin versionator
 
@@ -70,6 +70,18 @@ pkg_setup() {
 		0)	einfo "SHM support will not be compiled." ;;
 		1)	einfo "SHM support will be compiled." ;;
 	esac
+
+	# Check for ffmpeg relying on libtheora without pkg-config-file
+	# Bug #142250
+	if built_with_use media-video/ffmpeg theora	&& \
+		has_version "<media-libs/libtheora/libtheora-1.0_alpha4"; then
+
+			eerror "This package will not work when using ffmpeg with"
+			eerror "USE=\"theora\" combined with media-libs/libtheora"
+			eerror "older than version 1.0_alpha4."
+			eerror "Please update to at least media-libs/libtheora-1.0_alpha4."
+			die "Please update to at least media-libs/libtheora-1.0_alpha4."
+	fi
 }
 
 src_unpack() {