Adding ~amd64 and ~ppc keywords wrt bug#93797, excluding some libs that conflict with dvdrip unless the user wants them per use flag

Package-Manager: portage-2.0.53_rc7

3 files changed, 26 insertions, 6 deletions

diff --git a/media-video/transcode/ChangeLog b/media-video/transcode/ChangeLog
index 05627cd1c17d..410e6416ed7c 100644
--- a/media-video/transcode/ChangeLog
+++ b/media-video/transcode/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/transcode
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.135 2006/01/28 17:10:01 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.136 2006/01/30 00:27:54 morfic Exp $
+
+  30 Jan 2006; Daniel Goller <morfic@gentoo.org> transcode-1.0.2-r2.ebuild:
+  Adding ~amd64 and ~ppc keywords wrt bug#93797, excluding two filters that
+  conflict with dvdrip unless the user wants them per use flag
 
   28 Jan 2006; Jason Wever <weeve@gentoo.org> transcode-1.0.2-r2.ebuild:
   Added ~sparc keyword wrt bug #93797.
diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest
index 84189e44ba3b..a5b0bf5821d1 100644
--- a/media-video/transcode/Manifest
+++ b/media-video/transcode/Manifest
@@ -1,4 +1,7 @@
-MD5 411e86f066a6d1f0609494a9ae9979c3 ChangeLog 25061
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 346eb809071c79beb027fc9678dc768c ChangeLog 25278
 MD5 8e1251c76b508dfdfe0e4f0c0b166540 files/digest-transcode-0.6.14-r2 144
 MD5 03b7d892f34025e0c5854e0977b5fb49 files/digest-transcode-0.6.14-r3 144
 MD5 2ee1936ab9b228cc4350881352426bd8 files/digest-transcode-1.0.2-r1 68
@@ -9,4 +12,11 @@ MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 MD5 78dd013b06017dffa629d94d27c361fb transcode-0.6.14-r2.ebuild 3995
 MD5 13d0c52e74628292c83986d79e87223d transcode-0.6.14-r3.ebuild 3569
 MD5 b15cb6b73f828461bd418ff5faf8194c transcode-1.0.2-r1.ebuild 3789
-MD5 de26ef15e734bbbfcad96a2470e62377 transcode-1.0.2-r2.ebuild 3881
+MD5 a45d12c57aa8182054a4b7255b5bd157 transcode-1.0.2-r2.ebuild 4121
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFD3WDG/aM9DdBw91cRAuiGAJ9sJap4O2+zkobTkfO4QtjAIEfjBgCfVtWK
+Cr8ejS1E33Csbtkfe1MiMYE=
+=yArS
+-----END PGP SIGNATURE-----
diff --git a/media-video/transcode/transcode-1.0.2-r2.ebuild b/media-video/transcode/transcode-1.0.2-r2.ebuild
index 65fe3a4a9b53..657ad030d778 100644
--- a/media-video/transcode/transcode-1.0.2-r2.ebuild
+++ b/media-video/transcode/transcode-1.0.2-r2.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-video/transcode/transcode-1.0.2-r2.ebuild,v 1.2 2006/01/28 17:10:01 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.0.2-r2.ebuild,v 1.3 2006/01/30 00:27:54 morfic Exp $
 
 inherit libtool flag-o-matic eutils multilib autotools
 
@@ -13,8 +13,8 @@ SRC_URI="mirror://transcode/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc64 ~sparc"
-IUSE="X 3dnow a52 altivec dv dvdread mp3 fame truetype gtk imagemagick jpeg
+KEYWORDS="~ppc ~amd64 ~ppc64 ~sparc"
+IUSE="X 3dnow a52 altivec dv dvdread extrafilters mp3 fame truetype gtk imagemagick jpeg
 lzo mjpeg mpeg mmx network ogg vorbis quicktime sdl sse sse2 theora v4l2
 xvid xml2 ffmpeg"
 
@@ -137,5 +137,11 @@ src_compile() {
 src_install () {
 	make DESTDIR=${D} install || die
 
+	#do not install the filters that make dvdrip hang unless we ask for them
+	if ! use extrafilters ; then
+	rm ${D}/usr/$(get_libdir)/transcode/filter_logo.*
+	rm ${D}/usr/$(get_libdir)/transcode/filter_compare.*
+	fi
+
 	dodoc AUTHORS ChangeLog README TODO
 }