4 files changed, 30 insertions, 151 deletions
diff --git a/media-video/transcode/ChangeLog b/media-video/transcode/ChangeLog
index 8b6d15bd96b1..e7a349797363 100644
--- a/media-video/transcode/ChangeLog
+++ b/media-video/transcode/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/transcode
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.301 2012/05/05 08:58:57 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.302 2012/05/17 08:42:48 scarabeus Exp $
+
+  17 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> -transcode-1.1.5-r2.ebuild,
+  transcode-1.1.7.ebuild:
+  Stable on sparc as the 1.1.5 is not buildable at all. So worst case is that
+  state wont change for them. Bug#395729.
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> transcode-1.1.5-r2.ebuild,
   transcode-1.1.7.ebuild:
diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest
index 305f090858b6..7ea2351db77d 100644
--- a/media-video/transcode/Manifest
+++ b/media-video/transcode/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX transcode-1.0.6-imagemagick.patch 672 RMD160 2d1ab8cf8ca9846c8ca5de24033b358985050f85 SHA1 e2e2890f9217c068755d094fd1f656d8c344a69c SHA256 bd4d8aa5577fabac5becb03539db1e547e72cd2e4748cd53c62e8032acaf41ac
 AUX transcode-1.1.4-x264.patch 1837 RMD160 6ec8925ca714f688df06f5df229c741ca2076708 SHA1 6f54bbebc996e4576e31f16d22863f23de2ce2d9 SHA256 f1746212a2b2f2bfc01cce0e26c83c2392dbd776878a76e627f7ec809f5da0a9
 AUX transcode-1.1.5-ffmpeg.patch 6128 RMD160 7c21b8daf99b599f0b3005cd2b08ae5c894c4552 SHA1 2d3bb4486394ee55540e772f134e193874e5c2b4 SHA256 a0246b84d12d289a940468a289ad5471c29d7a35c8317293a0dc0c7428445487
@@ -5,9 +8,24 @@ AUX transcode-1.1.5-jpeg-7.patch 460 RMD160 2e5f96ff0700890814e1af2338fe0d7dde14
 AUX transcode-1.1.5-mpa.patch 583 RMD160 6500b698ff0f46e2eeae47acd1d4e4c4c2f1cd4d SHA1 6f45d9167c3aa15a83cb29545749f55eb1f1e5a2 SHA256 9b31976d3104e024c3fd339d501575c48d3cbadc99bb3121e5934d48bc6fc193
 AUX transcode-1.1.7-ffmpeg-0.10.patch 402 RMD160 bf22b44f38e3191d24c9483c9d354b57e06ac8ea SHA1 3b1590f30f8f32350444f668584ec31be6e8e614 SHA256 5df30ce0bdaee1d61a5dd94d242ce010dc043305553519a1532c33b2628ec308
 AUX transcode-1.1.7-ffmpeg.patch 2274 RMD160 9873bd9a8ba3336948336a508551ca3dd0ceaabd SHA1 cc81c190db51d8a64623e2eea3b327ec7eb7ec57 SHA256 443776bbc3497e1f256eb74c19bcda293cfd751776817bafc1ca89ff510e3b61
-DIST transcode-1.1.5.tar.bz2 2123207 RMD160 fdc441190110a4ae4a54a4e2abd307db7f0111aa SHA1 48c36e06ca0cd1cdc1a9c6a241e231f896eefd26 SHA256 7e01665079eef81625c4761cc5c08a3b53b97de90fb0728d64f5a86a3bc59009
 DIST transcode-1.1.7.tar.bz2 2183627 RMD160 faa854acbbfd52faaa216505176f94d756d77841 SHA1 e35df68b960eb56ef0a59a4cdbed1491be56aee6 SHA256 1e4e72d8e0dd62a80b8dd90699f5ca64c9b0cb37a5c9325c184166a9654f0a92
-EBUILD transcode-1.1.5-r2.ebuild 4065 RMD160 1952172107124dd66365485922e1abe3576ea14b SHA1 e5a44fa208baaf68b73f1b09c2d6ea0bcf76cfae SHA256 a3eb0cbe5fd5dfa11cd9cdff16167f04e2659dcc4cbd38481b06b179d1cdf7ce
-EBUILD transcode-1.1.7.ebuild 3144 RMD160 02e35d392c92c22be14b85ea4facb27d80d66521 SHA1 d320ca9b31479b38548bf26964a085272c97062f SHA256 66e8b04b9777aa455432e8e532d0ed34504cb420e0303ef26c347d1cbc31c014
-MISC ChangeLog 49923 RMD160 b1da41e24e0dfce2b5767cfc2855a7c99011d56f SHA1 e4c7d1fb10eb7929fdcddd3408cf67faef1a0f69 SHA256 6395e4671f9821399b4ed83119bfa39c4aca8ed1f1a4cf2e357a7fa120ee01c4
+EBUILD transcode-1.1.7.ebuild 3146 RMD160 dcfafea6f3951c6cec1573a073e2f059a08f38b7 SHA1 fa39d9a4e43f843e56d000ba5bc8c6e3c0ede2c5 SHA256 b385bcc5568d0deaefef40c959c3953d7b348192c00d8f5620674ed11135f999
+MISC ChangeLog 50156 RMD160 e624836526507e9307db60dfd68f4a08ae665cb7 SHA1 375e04e7829021bb992c33b8fa8c545659aedbb8 SHA256 1dcd476fc30fee243cd41e382ef36fd5b4f4d3bc484325b2f1bf81b11d5cf4b7
 MISC metadata.xml 529 RMD160 c52a55dcb8ffedb63e2ddbc99d4bf959f9772550 SHA1 f26965716f7025486b78a2c953efd9180ed82fb5 SHA256 58d8afd76de3ea91e1967cd96c24957e2ca06226222b81226e6b6ac55ce5f209
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPtLqNAAoJEOSiRoyO7jvoyWwP/RUiDn7DsBanCRYcTo0XFhRl
+u9+fZJwuDFgpPpXqBkHySZLwN0k5ey6epDuY7ZyZoIJqDX2gPhcba6ebWSK3AkJ0
+Sur7oJhh7djzfP+fnPAEIUXtGH6oTEFdH2MqQXBbh3Tn7BIgLwoa7ut4w8kty3F4
+dzQCS1BcSRmvxh51QzotjfC9nbcLvjMnSJPE4dX+SME4oZegJCfRDALrmoPbr0E2
+939Ws6AUarEUOClsrXhRYdyFvHnPaQKTwhVMTGn5IerHnP1GpcwYxYyIm+vOs07n
+NOP+s55+i8/Kb/2/9Cqk8Kv52EuvSPDxZQW2/BDjfq/J3QryYOOkbRUIq3MeOxem
+fy1IAYEp6VzqJ+mqylJhH+NkJGToXRKaEDN/MrejSJIx9TPTDwL//XebuPmGOAP2
+SKLByjZxYGK0kJ71oGq0+sR0fOGVjmNVOupzNqByr3raUppPTw6cTUFmfVmIOi1w
+RV98t7loCOwu61pFsyjdXt8NMFYSjkGmyzHvOmR4WaNEG8yRCA7v4Zho71W4iXtF
+hpcVAdNE/ZcgH3GbUBWGObHFEtsd4f91hOQpSxQ4hx7Y4SjCrB3OGaeHuQDP5ToB
+2X3E7ioTzZcnu1bOeQUEPMifCMED2qdO/CVKS8bruHqH6I5myizcQv94ao9HPsCL
+DaDjvu662PRRT+7meM2n
+=XyWo
+-----END PGP SIGNATURE-----
diff --git a/media-video/transcode/transcode-1.1.5-r2.ebuild b/media-video/transcode/transcode-1.1.5-r2.ebuild
deleted file mode 100644
index e5c6e1bd0ee0..000000000000
--- a/media-video/transcode/transcode-1.1.5-r2.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.1.5-r2.ebuild,v 1.13 2012/05/05 08:58:57 jdhore Exp $
-
-EAPI=2
-
-WANT_AUTOCONF="2.5"
-WANT_AUTOMAKE="1.10"
-
-inherit libtool flag-o-matic eutils multilib autotools
-
-MY_P=${P/_}
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="video stream processing tool"
-HOMEPAGE="http://tcforge.berlios.de/"
-SRC_URI="mirror://berlios/tcforge/${MY_P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-IUSE="X 3dnow a52 aac alsa altivec dv dvd iconv imagemagick jpeg lzo mjpeg mp3 mpeg mmx nuv ogg oss postproc quicktime sdl sse sse2 theora truetype v4l vorbis x264 xml xvid"
-
-RDEPEND="aac? ( media-libs/faac )
-	a52? ( media-libs/a52dec )
-	alsa? ( media-libs/alsa-lib )
-	dv? ( media-libs/libdv )
-	dvd? ( media-libs/libdvdread )
-	mjpeg? ( media-video/mjpegtools )
-	lzo? ( >=dev-libs/lzo-2 )
-	imagemagick? ( media-gfx/imagemagick )
-	mp3? ( media-sound/lame )
-	sdl? ( >=media-libs/libsdl-1.2.5[X] )
-	quicktime? ( >=media-libs/libquicktime-1.0.0 )
-	vorbis? ( media-libs/libvorbis )
-	ogg? ( media-libs/libogg )
-	theora? ( media-libs/libtheora )
-	jpeg? ( virtual/jpeg )
-	truetype? ( >=media-libs/freetype-2 )
-	virtual/ffmpeg
-	virtual/libiconv
-	postproc? ( media-video/ffmpeg )
-	mpeg? ( media-libs/libmpeg2 )
-	x264? ( media-libs/x264 )
-	xml? ( dev-libs/libxml2 )
-	xvid? ( media-libs/xvid )
-	X? ( x11-libs/libXpm
-		x11-libs/libXaw
-		x11-libs/libXv )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	v4l? ( >=sys-kernel/linux-headers-2.6.11 )"
-
-# Notify the user that some useflag have been forced on
-tc_use_force() {
-	use $1 && use !$2 && ewarn "USE=$1 requires $2, $2 will be enabled."
-}
-
-# Use when $2 depends strictly on $3
-# if use $1 then enable $2 and $3, otherwise disable $2
-tc_use_enable_force() {
-	if use $1 ; then
-		echo "--enable-$2 --enable-$3"
-	else
-		echo "--disable-$2"
-	fi
-}
-
-pkg_setup() {
-	tc_use_force sse mmx
-	tc_use_force 3dnow mmx
-	tc_use_force sse2 mmx
-	tc_use_force sse2 sse
-}
-
-src_prepare() {
-	sed -i -e "s:\$(datadir)/doc/transcode:\$(datadir)/doc/${PF}:" \
-		"${S}"/Makefile.am "${S}"/docs/Makefile.am "${S}"/docs/html/Makefile.am \
-		"${S}"/docs/pvm3/Makefile.am "${S}"/docs/tech/html/Makefile.am \
-		"${S}"/docs/tech/Makefile.am
-
-	epatch "${FILESDIR}"/${P}-jpeg-7.patch
-	epatch "${FILESDIR}"/${P}-mpa.patch
-	epatch "${FILESDIR}"/${P}-ffmpeg.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	# NuppelVideo is supported only on x86 platform yet
-	# TODO: mask nuv useflag for all other arches
-	# TODO: watch tcrequant for change. It's currently enabled with --enable-deprecated.
-	use x86 && myconf="${myconf} $(use_enable nuv)"
-	myconf="${myconf} \
-		$(use_enable mmx) \
-		$(use_enable 3dnow) \
-		$(use_enable sse) \
-		$(use_enable sse2) \
-		$(use_enable altivec) \
-		$(use_enable v4l) \
-		$(use_enable alsa) \
-		$(use_enable oss) \
-		$(use_enable truetype freetype2) \
-		$(use_enable mp3 lame) \
-		$(use_enable x264) \
-		$(use_enable xvid) \
-		$(use_enable ogg) \
-		$(use_enable vorbis) \
-		$(use_enable theora) \
-		$(use_enable dvd libdvdread) \
-		$(use_enable dv libdv) \
-		$(use_enable quicktime libquicktime) \
-		$(use_enable imagemagick) \
-		$(use_enable postproc libpostproc) \
-		$(use_enable lzo) \
-		$(use_enable a52) \
-		$(use_enable aac faac) \
-		$(use_enable xml libxml2) \
-		$(use_enable mpeg libmpeg2) \
-		$(use_enable mpeg libmpeg2convert) \
-		$(use_enable mjpeg mjpegtools) \
-		$(use_enable sdl) \
-		$(use_enable jpeg libjpeg) \
-		$(use_enable iconv) \
-		$(use_with X x) \
-		--enable-deprecated \
-		--enable-experimental \
-		--with-mod-path=/usr/$(get_libdir)/transcode \
-		$(tc_use_enable_force sse sse mmx) \
-		$(tc_use_enable_force 3dnow 3dnow mmx) \
-		$(tc_use_enable_force sse2 sse2 mmx) \
-		$(tc_use_enable_force sse2 sse2 sse) \
-		"
-
-	econf ${myconf} || die "econf failed"
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
-	rm -fr "${D}/usr/share/doc/transcode"
-
-	dodoc AUTHORS ChangeLog README TODO STYLE
-	dodoc docs/*
-	dohtml docs/html/*
-}
diff --git a/media-video/transcode/transcode-1.1.7.ebuild b/media-video/transcode/transcode-1.1.7.ebuild
index 9a49494447c2..1e86f3635f04 100644
--- a/media-video/transcode/transcode-1.1.7.ebuild
+++ b/media-video/transcode/transcode-1.1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.1.7.ebuild,v 1.10 2012/05/05 08:58:57 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.1.7.ebuild,v 1.11 2012/05/17 08:42:48 scarabeus Exp $
 
 EAPI=4
 inherit eutils libtool multilib
@@ -11,7 +11,7 @@ SRC_URI="mirror://bitbucket/france/${PN}-tcforge/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE="3dnow a52 aac alsa altivec dv dvd +iconv imagemagick jpeg lzo mjpeg mmx mp3 mpeg nuv ogg oss pic postproc quicktime sdl sse sse2 theora truetype v4l vorbis X x264 xml xvid"
 
 RDEPEND="