7 files changed, 13 insertions, 91 deletions
diff --git a/media-libs/libtheora/ChangeLog b/media-libs/libtheora/ChangeLog
index e1be51dc840c..78bfcd8ef1c7 100644
--- a/media-libs/libtheora/ChangeLog
+++ b/media-libs/libtheora/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libtheora
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/ChangeLog,v 1.25 2005/02/28 21:58:13 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/ChangeLog,v 1.26 2005/05/05 13:01:54 luckyduck Exp $
+
+  05 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -libtheora-1.0_alpha2.ebuild, -libtheora-1.0_alpha2-r1.ebuild,
+  libtheora-1.0_alpha4.ebuild:
+  stable on amd64 and x86
 
   28 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
   libtheora-1.0_alpha4.ebuild:
diff --git a/media-libs/libtheora/Manifest b/media-libs/libtheora/Manifest
index 4e0794d57b65..056ae6b477b7 100644
--- a/media-libs/libtheora/Manifest
+++ b/media-libs/libtheora/Manifest
@@ -1,20 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5bd0f9925de9b1c3c8d24864e585e95b ChangeLog 3182
-MD5 c0f2735e4500394caa3395eadb9e77cd libtheora-1.0_alpha2-r1.ebuild 835
-MD5 1bda603a66c9a018d9c926099761b3c5 libtheora-1.0_alpha2.ebuild 744
+MD5 60d7a87f21c3b12863be1de61a38ce13 libtheora-1.0_alpha4.ebuild 1180
 MD5 5cd390daa69c4b3a98e62c4d7e975e71 libtheora-1.0_alpha3.ebuild 920
-MD5 65c361e2643fbd86b0c1011a608852bb libtheora-1.0_alpha4.ebuild 1127
+MD5 0136881948f56a0ada5f59ee6eeb2ec0 ChangeLog 3357
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
-MD5 43363432588af784deac91552ac3a636 files/digest-libtheora-1.0_alpha2 71
-MD5 43363432588af784deac91552ac3a636 files/digest-libtheora-1.0_alpha2-r1 71
 MD5 a9f9ea68a0659a1bd63f423e5028d5bf files/digest-libtheora-1.0_alpha3 72
 MD5 f828864823910f80ec4368be981c0a61 files/digest-libtheora-1.0_alpha4 73
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCI5Q3ArHZZzCEUG0RAnrTAJ47n0n3y8nkub3IOH7kvN83cFEktwCfRLH2
-eeHTXfhv0W8wFgcvkk10B7Y=
-=zEDI
------END PGP SIGNATURE-----
diff --git a/media-libs/libtheora/files/digest-libtheora-1.0_alpha2 b/media-libs/libtheora/files/digest-libtheora-1.0_alpha2
deleted file mode 100644
index 81900a4bd049..000000000000
--- a/media-libs/libtheora/files/digest-libtheora-1.0_alpha2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8fdeb6fabc7c67598b1031e0a3cb73dd libtheora-1.0alpha2.tar.gz 281921
diff --git a/media-libs/libtheora/files/digest-libtheora-1.0_alpha2-r1 b/media-libs/libtheora/files/digest-libtheora-1.0_alpha2-r1
deleted file mode 100644
index 81900a4bd049..000000000000
--- a/media-libs/libtheora/files/digest-libtheora-1.0_alpha2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8fdeb6fabc7c67598b1031e0a3cb73dd libtheora-1.0alpha2.tar.gz 281921
diff --git a/media-libs/libtheora/libtheora-1.0_alpha2-r1.ebuild b/media-libs/libtheora/libtheora-1.0_alpha2-r1.ebuild
deleted file mode 100644
index 9afcb269ec3d..000000000000
--- a/media-libs/libtheora/libtheora-1.0_alpha2-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/libtheora-1.0_alpha2-r1.ebuild,v 1.3 2005/01/01 05:56:40 chriswhite Exp $
-
-DESCRIPTION="The Theora Video Compression Codec"
-HOMEPAGE="http://www.theora.org/"
-SRC_URI="http://www.theora.org/files/${P/_}.tar.gz
-		http://download.videolan.org/pub/videolan/vlc/0.7.0/contrib/${P/_}.tar.gz"
-
-LICENSE="xiph"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE=""
-
-DEPEND="media-libs/libsdl
-	>=media-libs/libogg-1.1.0
-	>=media-libs/libvorbis-1.0.1"
-
-S=${WORKDIR}/${P/_}
-
-src_compile() {
-	econf --enable-shared || die
-
-	cd ${S}/lib
-	emake || die
-}
-
-src_install() {
-	cd ${S}/lib
-	make DESTDIR=${D} install || die
-
-	cd ${S}/include
-	make DESTDIR=${D} install || die
-
-	cd ${S}
-	dodoc README
-}
diff --git a/media-libs/libtheora/libtheora-1.0_alpha2.ebuild b/media-libs/libtheora/libtheora-1.0_alpha2.ebuild
deleted file mode 100644
index 10c9d7ba7e57..000000000000
--- a/media-libs/libtheora/libtheora-1.0_alpha2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/libtheora-1.0_alpha2.ebuild,v 1.5 2005/01/01 05:56:40 chriswhite Exp $
-
-DESCRIPTION="The Theora Video Compression Codec"
-HOMEPAGE="http://www.theora.org/"
-SRC_URI="http://www.theora.org/files/${P/_}.tar.gz
-		http://download.videolan.org/pub/videolan/vlc/0.7.0/contrib/${P/_}.tar.gz"
-
-LICENSE="xiph"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE=""
-
-DEPEND="media-libs/libsdl
-	>=media-libs/libogg-1.1.0
-	>=media-libs/libvorbis-1.0.1"
-
-S=${WORKDIR}/${P/_}
-
-src_compile() {
-	econf --enable-shared || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc README
-}
diff --git a/media-libs/libtheora/libtheora-1.0_alpha4.ebuild b/media-libs/libtheora/libtheora-1.0_alpha4.ebuild
index a73668ac8b1d..c91d8633b5f1 100644
--- a/media-libs/libtheora/libtheora-1.0_alpha4.ebuild
+++ b/media-libs/libtheora/libtheora-1.0_alpha4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/libtheora-1.0_alpha4.ebuild,v 1.6 2005/02/28 21:58:13 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/libtheora-1.0_alpha4.ebuild,v 1.7 2005/05/05 13:01:54 luckyduck Exp $
 inherit flag-o-matic
 
 DESCRIPTION="The Theora Video Compression Codec"
@@ -9,7 +9,7 @@ SRC_URI="http://downloads.xiph.org/releases/theora/${P/_}.tar.bz2"
 
 LICENSE="xiph"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~sparc x86"
 IUSE="encode doc"
 
 RDEPEND=">=media-libs/libogg-1.1.0
@@ -34,15 +34,15 @@ src_compile() {
 
 	econf \
 		$(use_enable encode) \
-		--enable-shared --disable-dependency-tracking || die
-	emake || die
+		--enable-shared --disable-dependency-tracking || die "configure failed"
+	emake || die "make failed"
 }
 
 src_install() {
 	make \
 		DESTDIR=${D} \
 		docdir=usr/share/doc/${PF} \
-		install || die
+		install || die "make install failed"
 
 	dodoc README
 }