Small cleanup for #261608

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 123 insertions, 5 deletions

diff --git a/media-video/transcode/ChangeLog b/media-video/transcode/ChangeLog
index 80107f3d79b0..2608ab706fa1 100644
--- a/media-video/transcode/ChangeLog
+++ b/media-video/transcode/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/transcode
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.250 2009/03/07 13:31:15 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.251 2009/03/08 00:24:44 patrick Exp $
+
+*transcode-1.1.1-r2 (08 Mar 2009)
+
+  08 Mar 2009; Patrick Lauer <patrick@gentoo.org> transcode-1.1.1-r1.ebuild,
+  +transcode-1.1.1-r2.ebuild:
+  Small cleanup for #261608
 
 *transcode-1.1.1-r1 (07 Mar 2009)
 
diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest
index c9c9b3904883..92afac000f2d 100644
--- a/media-video/transcode/Manifest
+++ b/media-video/transcode/Manifest
@@ -4,7 +4,8 @@ DIST transcode-1.0.7rc1.tar.bz2 1938133 RMD160 73f4aa12710c2f763c64f63a1f20c2d6b
 DIST transcode-1.1.1.tar.bz2 2117411 RMD160 57179861d27324d1d49125509d0a2bbc3d20cb3e SHA1 c9e6f6d0314cff0893372fd2ecad53f70526a2d2 SHA256 98538fa0bcaccc431ebf40b50a7975cf3d8178c3aab2d5a8fd80544d2387896e
 EBUILD transcode-1.0.7.ebuild 3926 RMD160 91b149d4f6cbd429fc4f21a1d58e793adfbfde00 SHA1 415d7112dced63e399d683f99c953c8d23e76c9a SHA256 2618ad87a3db7f71b6f89d45141cf5d2661ac846c0c8ab36d5357b5c9b29bd20
 EBUILD transcode-1.0.7_rc1.ebuild 3932 RMD160 e6c6d36a92ccc897be7ca14be3ae87df21ddf52a SHA1 572c8a482f28a2179ba71cf26a8cf5fc860cab22 SHA256 bdb305700d28136f5c6ed1a840dba17d0f8a8d0a3eaf57d7ccfeaeb87de14aa4
-EBUILD transcode-1.1.1-r1.ebuild 3587 RMD160 cde10f3084825b9a2b132c98952ed7fb784e238e SHA1 524a8884c0397c699527615209f831cf5809b5de SHA256 052578afd07eff01825a0714e451f1e9f22e62b4be9461f0d6d204d0c4dcca39
+EBUILD transcode-1.1.1-r1.ebuild 3582 RMD160 94dfd31ae64b821e9f57b8288c46c9bffb32df34 SHA1 28fd5b832aef918e0c44c08258a316e0db99657c SHA256 8a8c38dea7f0cf50f909c3f5f7c2723a9ea2e14f65de61c18bce8e912e9d26fb
+EBUILD transcode-1.1.1-r2.ebuild 3287 RMD160 26788fe71c4080f634536b65b97b2340ed34adbb SHA1 b4e9ae0602a0a5fe021a31ab321d5d26f3d3d4b8 SHA256 35737bed95d37ad3307418c38e15a0cb204bab41cc9c04b2063451161a420067
 EBUILD transcode-1.1.1.ebuild 3561 RMD160 751606a452692dc6a36acbdc821f9c75f62e3d6b SHA1 0d047a210cd56455f95dfa5c876f3d752999d05f SHA256 ed4febbe5572df11f0ab38cb37b8b8727a71cae367fab7d32963a74b40deca99
-MISC ChangeLog 42227 RMD160 3e72889c591d7d9fa539056de2847b26928feb17 SHA1 ee9d053319d6eed425a22161aa1c194a0b03ac82 SHA256 6b227c009884a8cf6e6b4c107d13df0ca41bb5b39c008e589514c12480b58078
+MISC ChangeLog 42398 RMD160 45377051fc47039ff0faff6e41a062c8776cd563 SHA1 93c3460f5c4e58bcb5f90c5fd260f9d51d0e2635 SHA256 0c718ccd5404760092809daead9a1a300e0f4c997fbb93008b7ab2e7d72988fc
 MISC metadata.xml 645 RMD160 73b9c254a56c875542316ae2e672cd822e796083 SHA1 ae717e64c138b5c9692760911e8325fdeb3f7584 SHA256 31d2bc07b4751ed99dd1378a429d7d2cadac64ba89be6c1eda268e2e874dc41c
diff --git a/media-video/transcode/transcode-1.1.1-r1.ebuild b/media-video/transcode/transcode-1.1.1-r1.ebuild
index 32cc4e98033e..cae11f24c4e4 100644
--- a/media-video/transcode/transcode-1.1.1-r1.ebuild
+++ b/media-video/transcode/transcode-1.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.1.1-r1.ebuild,v 1.1 2009/03/07 13:31:15 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.1.1-r1.ebuild,v 1.2 2009/03/08 00:24:44 patrick Exp $
 
 EAPI="2"
 
@@ -17,7 +17,7 @@ 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 dvdread iconv imagemagick jpeg lzo mjpeg mp3 mmx nuv ogg oss postproc quicktime sdl sse sse2 theora truetype v4l2 vorbis x264 xvid xml"
+IUSE="X 3dnow a52 aac alsa altivec dv dvdread iconv imagemagick jpeg lzo mjpeg mp3 mmx nuv ogg oss postproc quicktime sdl sse sse2 theora truetype v4l2 vorbis x264 xml"
 
 RDEPEND="a52? ( media-libs/a52dec )
 	alsa? ( media-libs/alsa-lib )
diff --git a/media-video/transcode/transcode-1.1.1-r2.ebuild b/media-video/transcode/transcode-1.1.1-r2.ebuild
new file mode 100644
index 000000000000..e1406eff3c26
--- /dev/null
+++ b/media-video/transcode/transcode-1.1.1-r2.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.1.1-r2.ebuild,v 1.1 2009/03/08 00:24:44 patrick 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://www.transcoding.org/cgi-bin/transcode"
+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 dvdread iconv imagemagick jpeg lzo mjpeg mp3 mmx nuv ogg oss postproc quicktime sdl sse sse2 theora truetype v4l2 vorbis x264 xml"
+
+RDEPEND="a52? ( media-libs/a52dec )
+	alsa? ( media-libs/alsa-lib )
+	dv? ( media-libs/libdv )
+	dvdread? ( media-libs/libdvdread )
+	mjpeg? ( media-video/mjpegtools )
+	lzo? ( >=dev-libs/lzo-2 )
+	imagemagick? ( media-gfx/imagemagick )
+	mp3? ( media-sound/lame )
+	sdl? ( media-libs/libsdl[X] )
+	quicktime? ( >=media-libs/libquicktime-1.0.0 )
+	vorbis? ( media-libs/libvorbis )
+	ogg? ( media-libs/libogg )
+	theora? ( media-libs/libtheora )
+	jpeg? ( media-libs/jpeg )
+	truetype? ( >=media-libs/freetype-2 )
+	>=media-video/ffmpeg-0.4.9_p20081014
+	|| ( sys-libs/glibc dev-libs/libiconv )
+	media-libs/libmpeg2
+	x264? ( media-libs/x264 )
+	xml? ( dev-libs/libxml2 )
+	X? ( x11-libs/libXpm
+		x11-libs/libXaw
+		x11-libs/libXv )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	v4l2? ( >=sys-kernel/linux-headers-2.6.11 )"
+# Make sure the assembler USE flags are unmasked on amd64
+# Remove this once default-linux/amd64/2006.1 is deprecated
+DEPEND="${DEPEND} amd64? ( >=sys-apps/portage-2.1.2 )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	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
+
+	eautoreconf
+}
+
+src_configure() {
+	# NuppelVideo is supported only on x86 platform yet
+	# TODO: mask nuv useflag for all other arches
+	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 v4l2 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 dvdread 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 mjpeg mjpegtools) \
+		$(use_enable sdl) \
+		$(use_enable jpeg libjpeg) \
+		$(use_enable iconv) \
+		$(use_with X x) \
+		--with-mod-path=/usr/$(get_libdir)/transcode"
+
+	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/*
+}