Version bump.

(Portage version: 2.1.5_rc4)

6 files changed, 21 insertions, 182 deletions

diff --git a/media-libs/libtheora/ChangeLog b/media-libs/libtheora/ChangeLog
index c54e19d6603a..88252298360f 100644
--- a/media-libs/libtheora/ChangeLog
+++ b/media-libs/libtheora/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/libtheora
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/ChangeLog,v 1.71 2008/04/03 18:27:35 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/ChangeLog,v 1.72 2008/04/17 11:27:38 drac Exp $
+
+*libtheora-1.0_beta3 (17 Apr 2008)
+
+  17 Apr 2008; Samuli Suominen <drac@gentoo.org>
+  -files/libtheora-1.0alpha7-nocomments.patch, -libtheora-1.0_alpha7.ebuild,
+  -libtheora-1.0_alpha7-r1.ebuild, -libtheora-1.0_beta2.ebuild,
+  +libtheora-1.0_beta3.ebuild:
+  Version bump.
 
   03 Apr 2008; Peter Volkov <pva@gentoo.org> libtheora-1.0_alpha6-r1.ebuild,
   libtheora-1.0_beta2-r1.ebuild:
diff --git a/media-libs/libtheora/files/libtheora-1.0alpha7-nocomments.patch b/media-libs/libtheora/files/libtheora-1.0alpha7-nocomments.patch
deleted file mode 100644
index ef2f54f050c7..000000000000
--- a/media-libs/libtheora/files/libtheora-1.0alpha7-nocomments.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: libtheora-1.0alpha7/lib/toplevel.c
-===================================================================
---- libtheora-1.0alpha7.orig/lib/toplevel.c
-+++ libtheora-1.0alpha7/lib/toplevel.c
-@@ -182,6 +182,7 @@ static int _theora_unpack_comment(theora
- 
-   _tp_readlsbint(opb,(long *) &tc->comments);
-   if(tc->comments<0)goto parse_err;
-+  if(tc->comments==0)goto nocomments;
-   tc->user_comments=_ogg_calloc(tc->comments,sizeof(*tc->user_comments));
-   tc->comment_lengths=_ogg_calloc(tc->comments,sizeof(*tc->comment_lengths));
-   for(i=0;i<tc->comments;i++){
-@@ -192,6 +193,8 @@ static int _theora_unpack_comment(theora
-     tc->user_comments[i][len]='\0';
-     tc->comment_lengths[i]=len;
-   }
-+
-+nocomments:
-   return(0);
- 
- parse_err:
-Index: libtheora-1.0alpha7/lib/comment.c
-===================================================================
---- libtheora-1.0alpha7.orig/lib/comment.c
-+++ libtheora-1.0alpha7/lib/comment.c
-@@ -99,9 +99,11 @@ int theora_comment_query_count(theora_co
- void theora_comment_clear(theora_comment *tc){
-   if(tc){
-     long i;
--    for(i=0;i<tc->comments;i++)
--      if(tc->user_comments[i])_ogg_free(tc->user_comments[i]);
--    if(tc->user_comments)_ogg_free(tc->user_comments);
-+    if (tc->user_comments) {
-+      for(i=0;i<tc->comments;i++)
-+	if(tc->user_comments[i])_ogg_free(tc->user_comments[i]);
-+      _ogg_free(tc->user_comments);
-+    }
-     if(tc->comment_lengths)_ogg_free(tc->comment_lengths);
-     if(tc->vendor)_ogg_free(tc->vendor);
-     memset(tc,0,sizeof(*tc));
diff --git a/media-libs/libtheora/libtheora-1.0_alpha6-r1.ebuild b/media-libs/libtheora/libtheora-1.0_alpha6-r1.ebuild
index c23e0927a3e1..dd9d510cf21e 100644
--- a/media-libs/libtheora/libtheora-1.0_alpha6-r1.ebuild
+++ b/media-libs/libtheora/libtheora-1.0_alpha6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/libtheora-1.0_alpha6-r1.ebuild,v 1.14 2008/04/03 18:27:35 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/libtheora-1.0_alpha6-r1.ebuild,v 1.15 2008/04/17 11:27:38 drac Exp $
 
 WANT_AUTOMAKE=1.9
 WANT_AUTOCONF=2.5
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="arm sh"
 IUSE="encode doc examples"
 
 RDEPEND=">=media-libs/libogg-1.1.0
diff --git a/media-libs/libtheora/libtheora-1.0_alpha7-r1.ebuild b/media-libs/libtheora/libtheora-1.0_alpha7-r1.ebuild
deleted file mode 100644
index 4e92387890d9..000000000000
--- a/media-libs/libtheora/libtheora-1.0_alpha7-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/libtheora-1.0_alpha7-r1.ebuild,v 1.1 2007/06/04 16:05:29 lu_zero Exp $
-
-inherit flag-o-matic libtool
-
-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"
-IUSE="encode doc examples"
-
-RDEPEND=">=media-libs/libogg-1.1.0
-	encode? ( >=media-libs/libvorbis-1.0.1 )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-S=${WORKDIR}/${P/_}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e 's:SUBDIRS = .*:SUBDIRS = lib include doc:' Makefile.in
-
-	elibtoolize
-
-	epatch "${FILESDIR}/${P/_}-nocomments.patch"
-
-	if use examples; then
-		# This creates a clean copy of examples sources
-		cp -R "${S}/examples" "${WORKDIR}"
-		rm -f "${WORKDIR}/examples/Makefile"*
-	fi
-}
-
-src_compile() {
-	# bug #75403, -O3 needs to be filtered to -O2
-	replace-flags -O3 -O2
-
-	use doc || export ac_cv_prog_HAVE_DOXYGEN="false"
-
-	econf \
-		$(use_enable encode) \
-		--enable-shared \
-		--disable-dependency-tracking \
-		|| die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	emake -j1 \
-		DESTDIR="${D}" \
-		docdir="usr/share/doc/${PF}" \
-		install || die "make install failed"
-
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples"
-		doins "${WORKDIR}/examples/"*
-	fi
-
-	dodoc README
-}
diff --git a/media-libs/libtheora/libtheora-1.0_alpha7.ebuild b/media-libs/libtheora/libtheora-1.0_alpha7.ebuild
deleted file mode 100644
index b416f6b24269..000000000000
--- a/media-libs/libtheora/libtheora-1.0_alpha7.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/libtheora-1.0_alpha7.ebuild,v 1.7 2007/03/10 20:27:33 beandog Exp $
-
-inherit flag-o-matic libtool
-
-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"
-IUSE="encode doc examples"
-
-RDEPEND=">=media-libs/libogg-1.1.0
-	encode? ( >=media-libs/libvorbis-1.0.1 )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-S=${WORKDIR}/${P/_}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e 's:SUBDIRS = .*:SUBDIRS = lib include doc:' Makefile.in
-
-	elibtoolize
-
-	if use examples; then
-		# This creates a clean copy of examples sources
-		cp -R "${S}/examples" "${WORKDIR}"
-		rm -f "${WORKDIR}/examples/Makefile"*
-	fi
-}
-
-src_compile() {
-	# bug #75403, -O3 needs to be filtered to -O2
-	replace-flags -O3 -O2
-
-	use doc || export ac_cv_prog_HAVE_DOXYGEN="false"
-
-	econf \
-		$(use_enable encode) \
-		--enable-shared \
-		--disable-dependency-tracking \
-		|| die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	emake -j1 \
-		DESTDIR="${D}" \
-		docdir="usr/share/doc/${PF}" \
-		install || die "make install failed"
-
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples"
-		doins "${WORKDIR}/examples/"*
-	fi
-
-	dodoc README
-}
diff --git a/media-libs/libtheora/libtheora-1.0_beta2.ebuild b/media-libs/libtheora/libtheora-1.0_beta3.ebuild
index 0c7f1a3afdea..da08fa8c01e9 100644
--- a/media-libs/libtheora/libtheora-1.0_beta2.ebuild
+++ b/media-libs/libtheora/libtheora-1.0_beta3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/libtheora-1.0_beta2.ebuild,v 1.2 2007/11/25 21:12:14 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/libtheora-1.0_beta3.ebuild,v 1.1 2008/04/17 11:27:38 drac Exp $
 
-inherit autotools eutils
+inherit autotools eutils toolchain-funcs flag-o-matic
 
 DESCRIPTION="The Theora Video Compression Codec"
 HOMEPAGE="http://www.theora.org"
@@ -10,11 +10,11 @@ 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"
-IUSE="doc encode examples pic"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc encode examples"
 
-RDEPEND=">=media-libs/libogg-1.1
-	encode? ( >=media-libs/libvorbis-1.0.1 )"
+RDEPEND="media-libs/libogg
+	encode? ( media-libs/libvorbis )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	dev-util/pkgconfig"
@@ -24,18 +24,17 @@ S=${WORKDIR}/${P/_}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-flags.patch
+	epatch "${FILESDIR}"/${PN}-1.0_beta2-flags.patch
 	AT_M4DIR="m4" eautoreconf
 }
 
 src_compile() {
-	local myconf
+	use x86 && filter-flags -fforce-addr -frename-registers #200549
 
-	use pic && myconf="--disable-asm"
 	use doc || export ac_cv_prog_HAVE_DOXYGEN="false"
 
 	econf --disable-dependency-tracking --disable-examples \
-		--disable-sdltest $(use_enable encode) ${myconf}
+		--disable-sdltest $(use_enable encode)
 
 	emake || die "emake failed."
 }