Cleaned up ebuild. Readd keywords which were improperly removed during a version bump. Removing old versions.

(Portage version: 2.0.51.19)

7 files changed, 20 insertions, 142 deletions

diff --git a/media-libs/libquicktime/ChangeLog b/media-libs/libquicktime/ChangeLog
index 60063be7199c..58973fb67e5f 100644
--- a/media-libs/libquicktime/ChangeLog
+++ b/media-libs/libquicktime/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libquicktime
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.30 2005/03/12 18:44:38 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.31 2005/04/05 20:43:28 eradicator Exp $
+
+  05 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -libquicktime-0.9.2_pre1.ebuild, libquicktime-0.9.2.ebuild,
+  -libquicktime-0.9.3.ebuild, libquicktime-0.9.4.ebuild:
+  Cleaned up ebuild. Readd keywords which were improperly removed during a
+  version bump. Removing old versions.
 
 *libquicktime-0.9.4 (12 Mar 2005)
 
diff --git a/media-libs/libquicktime/files/digest-libquicktime-0.9.2_pre1 b/media-libs/libquicktime/files/digest-libquicktime-0.9.2_pre1
deleted file mode 100644
index 4ce40f61f53a..000000000000
--- a/media-libs/libquicktime/files/digest-libquicktime-0.9.2_pre1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e7a8112a3a7dab3d365f084106050eff libquicktime-0.9.2pre1.tar.gz 637186
diff --git a/media-libs/libquicktime/files/digest-libquicktime-0.9.3 b/media-libs/libquicktime/files/digest-libquicktime-0.9.3
deleted file mode 100644
index f5ba64364075..000000000000
--- a/media-libs/libquicktime/files/digest-libquicktime-0.9.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 38d9dbe8a75ea0be13ffa16b858502ae libquicktime-0.9.3.tar.gz 755988
diff --git a/media-libs/libquicktime/libquicktime-0.9.2.ebuild b/media-libs/libquicktime/libquicktime-0.9.2.ebuild
index e988afaa40dd..82b96cd6e7de 100644
--- a/media-libs/libquicktime/libquicktime-0.9.2.ebuild
+++ b/media-libs/libquicktime/libquicktime-0.9.2.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/libquicktime/libquicktime-0.9.2.ebuild,v 1.16 2005/02/06 17:26:08 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-0.9.2.ebuild,v 1.17 2005/04/05 20:43:28 eradicator Exp $
 
 inherit libtool eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 alpha ppc amd64 sparc ia64"
+KEYWORDS="x86 alpha ppc amd64 sparc ia64"
 
 IUSE="gtk jpeg mmx oggvorbis png"
 
diff --git a/media-libs/libquicktime/libquicktime-0.9.2_pre1.ebuild b/media-libs/libquicktime/libquicktime-0.9.2_pre1.ebuild
deleted file mode 100644
index 17c8d14ab41f..000000000000
--- a/media-libs/libquicktime/libquicktime-0.9.2_pre1.ebuild
+++ /dev/null
@@ -1,64 +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/libquicktime/libquicktime-0.9.2_pre1.ebuild,v 1.22 2005/02/06 17:26:08 corsair Exp $
-
-inherit libtool eutils
-
-MY_P=${P/_/}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="A library based on quicktime4linux with extensions"
-HOMEPAGE="http://libquicktime.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 ~alpha ~ppc"
-
-IUSE="gtk jpeg mmx oggvorbis png"
-
-DEPEND=">=sys-apps/sed-4.0.5
-	media-libs/libdv
-	gtk? ( =x11-libs/gtk+-1.2* )
-	png? ( media-libs/libpng )
-	jpeg? ( media-libs/jpeg )
-	oggvorbis? ( media-libs/libvorbis )
-	!virtual/quicktime"
-PROVIDE="virtual/quicktime"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i "s:\(have_libavcodec=\)true:\1false:g" configure.ac
-
-	# Fix bug 10966 by replacing the x86-centric OPTIMIZE_CFLAGS with
-	# our $CFLAGS
-	if ! use x86; then
-		mv configure.ac configure.ac.old
-		awk -F= '$1=="OPTIMIZE_CFLAGS" { print $1"="cflags; next }
-		         { print }' cflags="$CFLAGS" \
-					 <configure.ac.old >configure.ac || die
-	fi
-}
-
-src_compile() {
-	ebegin "Regenerating configure script..."
-	autoconf
-	eend
-	elibtoolize
-
-	local myconf
-
-	use mmx \
-		&& myconf="${myconf} --enable-mmx" \
-		|| myconf="${myconf} --disable-mmx"
-	use gtk \
-		&& myconf="${myconf} --enable-gtktest" \
-		|| myconf="${myconf} --disable-gtktest"
-
-	econf ${myconf} || die
-	emake -j1 || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-}
diff --git a/media-libs/libquicktime/libquicktime-0.9.3.ebuild b/media-libs/libquicktime/libquicktime-0.9.3.ebuild
deleted file mode 100644
index 0262848fcfd2..000000000000
--- a/media-libs/libquicktime/libquicktime-0.9.3.ebuild
+++ /dev/null
@@ -1,61 +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/libquicktime/libquicktime-0.9.3.ebuild,v 1.3 2005/02/06 17:26:08 corsair Exp $
-
-inherit libtool eutils
-
-DESCRIPTION="A library based on quicktime4linux with extensions"
-HOMEPAGE="http://libquicktime.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-
-IUSE="gtk jpeg mmx oggvorbis png"
-
-DEPEND=">=sys-apps/sed-4.0.5
-	media-libs/libdv
-	gtk? ( =x11-libs/gtk+-1.2* )
-	png? ( media-libs/libpng )
-	jpeg? ( media-libs/jpeg )
-	oggvorbis? ( media-libs/libvorbis )
-	!virtual/quicktime"
-PROVIDE="virtual/quicktime"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i "s:\(have_libavcodec=\)true:\1false:g" configure.ac
-
-	# Fix bug 10966 by replacing the x86-centric OPTIMIZE_CFLAGS with
-	# our $CFLAGS
-	if ! use x86; then
-		mv configure.ac configure.ac.old
-		awk -F= '$1=="OPTIMIZE_CFLAGS" { print $1"="cflags; next }
-		         { print }' cflags="$CFLAGS" \
-					 <configure.ac.old >configure.ac || die
-	fi
-
-#	use amd64 && epatch ${FILESDIR}/${P}-amd64.patch
-}
-
-src_compile() {
-	ebegin "Regenerating configure script..."
-	autoconf
-	eend
-	elibtoolize
-
-	local myconf
-
-	econf \
-		`use_enable mmx` \
-		`use_enable gtk` \
-		${myconf} \
-		|| die
-	emake -j1 || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-}
diff --git a/media-libs/libquicktime/libquicktime-0.9.4.ebuild b/media-libs/libquicktime/libquicktime-0.9.4.ebuild
index 37902a19fe23..6ef6b3332248 100644
--- a/media-libs/libquicktime/libquicktime-0.9.4.ebuild
+++ b/media-libs/libquicktime/libquicktime-0.9.4.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/libquicktime/libquicktime-0.9.4.ebuild,v 1.1 2005/03/12 18:44:38 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-0.9.4.ebuild,v 1.2 2005/04/05 20:43:28 eradicator Exp $
 
 inherit libtool eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~ppc64"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="gtk jpeg mmx oggvorbis png dv ieee1394"
 
@@ -34,22 +34,21 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-cflags.patch
 
 	sed -i "s:\(have_libavcodec=\)true:\1false:g" configure.ac
-}
 
-src_compile() {
 	ebegin "Regenerating configure script..."
-	autoconf
+	autoconf || die
 	eend
+
 	elibtoolize
+}
 
-	local myconf
+src_compile() {
+	econf --enable-shared \
+	      --enable-static \
+	      $(use_enable mmx) \
+	      $(use_enable gtk) \
+	      $(use_enable ieee1394 firewire)
 
-	econf \
-		`use_enable mmx` \
-		`use_enable gtk` \
-		`use_enable ieee1394 firewire` \
-		${myconf} \
-		|| die "./configure failed"
 	emake -j1 || die "make failed"
 }