Added check for ogg flag on media-libs/flac, to be more informative (see bug #113763).

Package-Manager: portage-2.0.53

3 files changed, 35 insertions, 12 deletions

diff --git a/media-sound/vorbis-tools/ChangeLog b/media-sound/vorbis-tools/ChangeLog
index 16335b61c97f..752de8fab44f 100644
--- a/media-sound/vorbis-tools/ChangeLog
+++ b/media-sound/vorbis-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/vorbis-tools
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/ChangeLog,v 1.34 2005/10/07 22:47:16 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/ChangeLog,v 1.35 2005/12/02 12:38:11 flameeyes Exp $
+
+  02 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+  vorbis-tools-1.1.1-r1.ebuild:
+  Added check for ogg flag on media-libs/flac, to be more informative (see bug
+  #113763).
 
 *vorbis-tools-1.1.1-r1 (07 Oct 2005)
 
diff --git a/media-sound/vorbis-tools/Manifest b/media-sound/vorbis-tools/Manifest
index 94999b247b12..d01f7cd57d1c 100644
--- a/media-sound/vorbis-tools/Manifest
+++ b/media-sound/vorbis-tools/Manifest
@@ -1,13 +1,23 @@
-MD5 1d1e99776588d7a4c2d006ded8dec7d4 vorbis-tools-1.1.1.ebuild 1347
-MD5 a73db00f1c3bc8ab60df4554fd605bfa vorbis-tools-1.0-r2.ebuild 871
-MD5 b6ec8c81a83937fa8b02b1faf9295fec vorbis-tools-1.0.1-r1.ebuild 1390
-MD5 fc4dd983169635156724e2383d3dfc1d vorbis-tools-1.1.1-r1.ebuild 1304
-MD5 a35ae258cf35c9e2362031ceb36def90 ChangeLog 4708
-MD5 08f7faecc3e956ee8567026b16977ce3 vorbis-tools-1.0.1.ebuild 1300
-MD5 527dcfe3ce0f0b53c6b6aa8b82eb930c metadata.xml 252
-MD5 fe964c53d3bcfcd7ddece26fa6ea9a3e files/digest-vorbis-tools-1.0.1 70
-MD5 c6c7f9c0dab0b7b1372a866773587178 files/digest-vorbis-tools-1.1.1 70
-MD5 bc135048b370b69a479ec79194774283 files/vorbis-tools-1.0.1-largefile.patch 458
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b6b19cfe9428d8358e840198c2f27ddd ChangeLog 4888
 MD5 59ac94a6db4621c0ebd90d8b8fe8d9c0 files/digest-vorbis-tools-1.0-r2 68
+MD5 fe964c53d3bcfcd7ddece26fa6ea9a3e files/digest-vorbis-tools-1.0.1 70
 MD5 fe964c53d3bcfcd7ddece26fa6ea9a3e files/digest-vorbis-tools-1.0.1-r1 70
+MD5 c6c7f9c0dab0b7b1372a866773587178 files/digest-vorbis-tools-1.1.1 70
 MD5 c6c7f9c0dab0b7b1372a866773587178 files/digest-vorbis-tools-1.1.1-r1 70
+MD5 bc135048b370b69a479ec79194774283 files/vorbis-tools-1.0.1-largefile.patch 458
+MD5 527dcfe3ce0f0b53c6b6aa8b82eb930c metadata.xml 252
+MD5 a73db00f1c3bc8ab60df4554fd605bfa vorbis-tools-1.0-r2.ebuild 871
+MD5 b6ec8c81a83937fa8b02b1faf9295fec vorbis-tools-1.0.1-r1.ebuild 1390
+MD5 08f7faecc3e956ee8567026b16977ce3 vorbis-tools-1.0.1.ebuild 1300
+MD5 5bc842bd8c99c5dc191591637e198cb1 vorbis-tools-1.1.1-r1.ebuild 1544
+MD5 1d1e99776588d7a4c2d006ded8dec7d4 vorbis-tools-1.1.1.ebuild 1347
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDkEBIAiZjviIA2XgRAo+JAKCr+ZaUUz/RzDjZkEP6rEAA90fTKACg9OM6
+Zvk/4tIawP74AlOli74kkDo=
+=p/EB
+-----END PGP SIGNATURE-----
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.1.1-r1.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.1.1-r1.ebuild
index ca96ee5a54ba..e5a6aad41a9e 100644
--- a/media-sound/vorbis-tools/vorbis-tools-1.1.1-r1.ebuild
+++ b/media-sound/vorbis-tools/vorbis-tools-1.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/vorbis-tools-1.1.1-r1.ebuild,v 1.1 2005/10/07 22:47:16 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/vorbis-tools-1.1.1-r1.ebuild,v 1.2 2005/12/02 12:38:11 flameeyes Exp $
 
 IUSE="nls flac speex"
 
@@ -23,6 +23,14 @@ RDEPEND=">=media-libs/libvorbis-1.0.1
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
+pkg_setup() {
+	if use flac && ! built_with_use media-libs/flac ogg; then
+		eerror "To be able to play OggFlac files you need to build"
+		eerror "media-libs/flac with +ogg, to build libOggFLAC."
+		die "Missing libOggFLAC library."
+	fi
+}
+
 src_compile() {
 	use hppa && [ "`gcc-fullversion`" == "3.3.2" ] && replace-flags -march=2.0 -march=1.0
 	local myconf