Build and install png2theora (and other binaries) if USE examples is used.

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

4 files changed, 28 insertions, 70 deletions

diff --git a/media-libs/libtheora/ChangeLog b/media-libs/libtheora/ChangeLog
index da2c27c55c9b..a497173ed33b 100644
--- a/media-libs/libtheora/ChangeLog
+++ b/media-libs/libtheora/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libtheora
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/ChangeLog,v 1.92 2009/06/09 16:55:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/ChangeLog,v 1.93 2009/06/21 03:37:29 ssuominen Exp $
+
+  21 Jun 2009; Samuli Suominen <ssuominen@gentoo.org>
+  libtheora-1.1_alpha2.ebuild:
+  Build and install png2theora (and other binaries) if USE examples is used.
 
 *libtheora-1.1_alpha2 (09 Jun 2009)
 
diff --git a/media-libs/libtheora/Manifest b/media-libs/libtheora/Manifest
index 15742bcb67e9..34cff681bdc4 100644
--- a/media-libs/libtheora/Manifest
+++ b/media-libs/libtheora/Manifest
@@ -1,9 +1,7 @@
 AUX libtheora-1.0_beta2-flags.patch 763 RMD160 eb1d55ab98e5eae570845baf17eb93301271596c SHA1 b79a4338454e832d2b46df55bae1de967919eb24 SHA256 7efb7aec3e472914ffc0facbdc9769e088e5d69e285254d19f353555ca90c7d6
 DIST libtheora-1.0.tar.bz2 1652987 RMD160 f72d0a2ce8475a888ab67fd77b7126d66d537c9b SHA1 02717773001b44f95bc6c23111a89493a4a93f87 SHA256 3ae9df56e8fc75ffe26e63a13cae2ce79d079416175fb0baffe0e2de8dc91a6d
-DIST libtheora-1.1alpha1.tar.bz2 1563454 RMD160 1fcb48651af8dfade9755e7d360588a7360e651a SHA1 0f57662206944377387f35688b9f95055b85fa1e SHA256 33e72b47773b6f9727837853e6f70e7aec31f309ecd988a75cc81403aa0468c1
 DIST libtheora-1.1alpha2.tar.bz2 1594659 RMD160 77cac673ecb5c603488c2e9c1437e185deee1379 SHA1 864872064ea32829f4aff48518248a8e46b16f00 SHA256 79f10524fbd7bde6b6e5cdf77e48c7555cfdc12a72f59d4cab083e290c89d591
 EBUILD libtheora-1.0.ebuild 1537 RMD160 d076ef008dc78358de093ce4f3babf4c18c36725 SHA1 cc08144d9dc1132fd047374f3749b1063eed7da9 SHA256 a91dd0be04c5ab85238518281a3b28c0c581fc1b97c504699690e6e8919e4094
-EBUILD libtheora-1.1_alpha1.ebuild 1482 RMD160 3cdfd5e3d89891300ea7948dce7b79a222f25383 SHA1 312d4ab1ac98f72aec2834594d1f188b4b53b738 SHA256 7f5b0bf07c621d2e0f776ef6d97615001fad11c8f67858d19e941bdbd711c6e7
-EBUILD libtheora-1.1_alpha2.ebuild 1482 RMD160 cb26490d870a61d830f3564483217d3349f016b0 SHA1 077080d67dadde3f0d33da945625940b9f02d763 SHA256 59134800aa055bd403833d12fa28d69b9da12dba349e596a9b255da053d372ea
-MISC ChangeLog 13222 RMD160 52a0ed1202e3551ee62955b185b9b39e8340f3a0 SHA1 d86fc27938007b7b4f9b3cc1228423dbdb6da8c6 SHA256 08f831d0121cd24ebe729238d60798a825b5466e43e6419d990bbbe28b1c7454
+EBUILD libtheora-1.1_alpha2.ebuild 1762 RMD160 39aa0023fc18663e1be71b61b0c9fa7274c403a1 SHA1 d0f90639157c52c34ac6e0ee14764ac4fdf40936 SHA256 60459fc8469a7f4660a8ef1c02718c654f8bdb829d30ea7526167e98c7ad324b
+MISC ChangeLog 13385 RMD160 f1ad77b67f3c73d5922b3975493f0b3c1b2b3c08 SHA1 f124b3682ce067ac5ea5c46dc165a1ef7e59cdff SHA256 a71e43d59e85ffa542b4e308393b9f2e5b22a309ec0020b4165ed70846aaf5ea
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
diff --git a/media-libs/libtheora/libtheora-1.1_alpha1.ebuild b/media-libs/libtheora/libtheora-1.1_alpha1.ebuild
deleted file mode 100644
index 48532cdcfe99..000000000000
--- a/media-libs/libtheora/libtheora-1.1_alpha1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/libtheora-1.1_alpha1.ebuild,v 1.1 2009/05/07 08:38:39 ssuominen Exp $
-
-EAPI=2
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="The Theora Video Compression Codec"
-HOMEPAGE="http://www.theora.org"
-SRC_URI="http://downloads.xiph.org/releases/theora/${P/_}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc encode examples"
-
-RDEPEND="media-libs/libogg
-	encode? ( media-libs/libvorbis )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	dev-util/pkgconfig"
-
-VARTEXFONTS=${T}/fonts
-S=${WORKDIR}/${P/_}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0_beta2-flags.patch
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_configure() {
-	use x86 && filter-flags -fforce-addr -frename-registers #200549
-	use doc || export ac_cv_prog_HAVE_DOXYGEN="false"
-
-	# Don't build specs even with doc enabled, just a few people would need
-	# it and causes sandbox violations.
-	export ac_cv_prog_HAVE_PDFLATEX="false"
-
-	econf \
-		--disable-dependency-tracking \
-		--disable-sdltest \
-		$(use_enable encode) \
-		--disable-examples
-}
-
-src_install() {
-	emake DESTDIR="${D}" docdir=/usr/share/doc/${PF} \
-		install || die "emake install failed"
-	dodoc AUTHORS CHANGES README
-	prepalldocs
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.[ch]
-	fi
-}
diff --git a/media-libs/libtheora/libtheora-1.1_alpha2.ebuild b/media-libs/libtheora/libtheora-1.1_alpha2.ebuild
index e299888123a2..508f70c75c34 100644
--- a/media-libs/libtheora/libtheora-1.1_alpha2.ebuild
+++ b/media-libs/libtheora/libtheora-1.1_alpha2.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-libs/libtheora/libtheora-1.1_alpha2.ebuild,v 1.1 2009/06/09 16:55:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/libtheora-1.1_alpha2.ebuild,v 1.2 2009/06/21 03:37:29 ssuominen Exp $
 
 EAPI=2
 inherit autotools eutils flag-o-matic
@@ -15,7 +15,10 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-
 IUSE="doc encode examples"
 
 RDEPEND="media-libs/libogg
-	encode? ( media-libs/libvorbis )"
+	encode? ( media-libs/libvorbis )
+	examples? ( media-libs/libpng
+		media-libs/libvorbis
+		media-libs/libsdl )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	dev-util/pkgconfig"
@@ -32,25 +35,34 @@ src_configure() {
 	use x86 && filter-flags -fforce-addr -frename-registers #200549
 	use doc || export ac_cv_prog_HAVE_DOXYGEN="false"
 
-	# Don't build specs even with doc enabled, just a few people would need
-	# it and causes sandbox violations.
-	export ac_cv_prog_HAVE_PDFLATEX="false"
+	local myconf
+	use examples && myconf="--enable-encode"
 
+	# --disable-spec because LaTeX documentation has been prebuilt
 	econf \
 		--disable-dependency-tracking \
-		--disable-sdltest \
+		--disable-spec \
 		$(use_enable encode) \
-		--disable-examples
+		$(use_enable examples) \
+		${myconf}
 }
 
 src_install() {
 	emake DESTDIR="${D}" docdir=/usr/share/doc/${PF} \
 		install || die "emake install failed"
+
 	dodoc AUTHORS CHANGES README
 	prepalldocs
 
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.[ch]
+		if use doc; then
+			insinto /usr/share/doc/${PF}/examples
+			doins examples/*.[ch]
+		fi
+
+		dobin examples/.libs/png2theora || die "dobin failed"
+		for bin in dump_{psnr,video} {encoder,player}_example; do
+			newbin examples/.libs/${bin} theora_${bin} || die "newbin failed"
+		done
 	fi
 }