Dropped divx4linux dependency, added missing glib-1.2 dependency, make sure it is being compiled with the right compiler (for distcc or crosscompiling). Removed old ebuilds, this moves ~sparc to 1.x series as 2.x requires nasm.

(Portage version: 2.0.53_rc5)

8 files changed, 24 insertions, 111 deletions

diff --git a/media-libs/quicktime4linux/ChangeLog b/media-libs/quicktime4linux/ChangeLog
index 93e23f0c1137..847910410c46 100644
--- a/media-libs/quicktime4linux/ChangeLog
+++ b/media-libs/quicktime4linux/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/quicktime4linux
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/quicktime4linux/ChangeLog,v 1.26 2005/05/15 02:25:09 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/quicktime4linux/ChangeLog,v 1.27 2005/10/14 12:39:01 flameeyes Exp $
+
+*quicktime4linux-2.0.4-r1 (14 Oct 2005)
+
+  14 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -quicktime4linux-2.0.0.ebuild, -quicktime4linux-2.0.0-r1.ebuild,
+  -quicktime4linux-2.0.4.ebuild, +quicktime4linux-2.0.4-r1.ebuild:
+  Dropped divx4linux dependency, added missing glib-1.2 dependency, make sure
+  it is being compiled with the right compiler (for distcc or crosscompiling).
+  Removed old ebuilds, this moves ~sparc to 1.x series as 2.x requires nasm.
 
   15 May 2005; Diego Pettenò <flameeyes@gentoo.org>
   quicktime4linux-2.0.0-r1.ebuild, quicktime4linux-2.0.4.ebuild:
diff --git a/media-libs/quicktime4linux/Manifest b/media-libs/quicktime4linux/Manifest
index b0946654f1b8..360dd6a5d783 100644
--- a/media-libs/quicktime4linux/Manifest
+++ b/media-libs/quicktime4linux/Manifest
@@ -1,10 +1,4 @@
 MD5 a451e6f3919219d88e226b25f7f88a42 ChangeLog 4555
-MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
-MD5 6a2c20038939155bde70d0bda698b9c8 quicktime4linux-1.5.5-r1.ebuild 983
-MD5 ff99d415c5017af8ef79964c77b2e319 quicktime4linux-1.6.2.ebuild 1201
-MD5 f8ef5ec417726adb9cded3fd79b7e89c quicktime4linux-2.0.0-r1.ebuild 1461
-MD5 c58a7ff56454d9fd628c3a824144d123 quicktime4linux-2.0.0.ebuild 924
-MD5 28e567638af9808bc83dce5e27b8a10f quicktime4linux-2.0.4.ebuild 1319
 MD5 cff036b41967a42ea65b3eef0002f4a0 files/2.0.0-gentoo-libmpeg3.patch 663
 MD5 20c7d429ba0312f794acf28415a87403 files/2.0.4-external-libs.patch 2226
 MD5 d174f89f47c93a15f31744ff3c78e270 files/digest-quicktime4linux-1.5.5-r1 149
@@ -12,3 +6,11 @@ MD5 7ba7a569ff1c1d5d53285361ed6c5413 files/digest-quicktime4linux-1.6.2 154
 MD5 05a81d2da899448b5ec3b5bbf23b6f2d files/digest-quicktime4linux-2.0.0 79
 MD5 d4ca2cbd6ad27b322e4fe55691deb764 files/digest-quicktime4linux-2.0.0-r1 155
 MD5 9b609bee6de30124e7d091979bc123c6 files/digest-quicktime4linux-2.0.4 79
+MD5 9b609bee6de30124e7d091979bc123c6 files/digest-quicktime4linux-2.0.4-r1 79
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 6a2c20038939155bde70d0bda698b9c8 quicktime4linux-1.5.5-r1.ebuild 983
+MD5 ff99d415c5017af8ef79964c77b2e319 quicktime4linux-1.6.2.ebuild 1201
+MD5 f8ef5ec417726adb9cded3fd79b7e89c quicktime4linux-2.0.0-r1.ebuild 1461
+MD5 c58a7ff56454d9fd628c3a824144d123 quicktime4linux-2.0.0.ebuild 924
+MD5 b61e0cfb69bde6a5509d4e9512ee23f7 quicktime4linux-2.0.4-r1.ebuild 1287
+MD5 28e567638af9808bc83dce5e27b8a10f quicktime4linux-2.0.4.ebuild 1319
diff --git a/media-libs/quicktime4linux/files/digest-quicktime4linux-2.0.0 b/media-libs/quicktime4linux/files/digest-quicktime4linux-2.0.0
deleted file mode 100644
index 27970acdf25b..000000000000
--- a/media-libs/quicktime4linux/files/digest-quicktime4linux-2.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 14f32cf887f50f8d1dc9dbbc72a1c206 quicktime4linux-2.0.0-src.tar.bz2 3832766
diff --git a/media-libs/quicktime4linux/files/digest-quicktime4linux-2.0.0-r1 b/media-libs/quicktime4linux/files/digest-quicktime4linux-2.0.0-r1
deleted file mode 100644
index ed1a68aa4c67..000000000000
--- a/media-libs/quicktime4linux/files/digest-quicktime4linux-2.0.0-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 14f32cf887f50f8d1dc9dbbc72a1c206 quicktime4linux-2.0.0-src.tar.bz2 3832766
-MD5 a3fcfe7e10df819a5b1791457686cc2f quicktime4linux-patches-3.tar.bz2 1416
diff --git a/media-libs/quicktime4linux/files/digest-quicktime4linux-2.0.4 b/media-libs/quicktime4linux/files/digest-quicktime4linux-2.0.4-r1
index 201cb4fb0c11..201cb4fb0c11 100644
--- a/media-libs/quicktime4linux/files/digest-quicktime4linux-2.0.4
+++ b/media-libs/quicktime4linux/files/digest-quicktime4linux-2.0.4-r1
diff --git a/media-libs/quicktime4linux/quicktime4linux-2.0.0-r1.ebuild b/media-libs/quicktime4linux/quicktime4linux-2.0.0-r1.ebuild
deleted file mode 100644
index b13e10434087..000000000000
--- a/media-libs/quicktime4linux/quicktime4linux-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,55 +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/quicktime4linux/quicktime4linux-2.0.0-r1.ebuild,v 1.11 2005/05/15 02:25:09 flameeyes Exp $
-
-inherit flag-o-matic toolchain-funcs eutils
-
-PATCHLEVEL="3"
-DESCRIPTION="quicktime library for linux"
-HOMEPAGE="http://heroinewarrior.com/quicktime.php3"
-SRC_URI="mirror://sourceforge/heroines/${P}-src.tar.bz2
-	http://digilander.libero.it/dgp85/${PN}-patches-${PATCHLEVEL}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86 -ppc ~amd64"
-IUSE=""
-
-DEPEND="media-libs/jpeg
-	media-libs/libpng
-	>=media-libs/libmpeg3-1.5.1
-	>=media-libs/libdv-0.99
-	>=media-video/ffmpeg-0.4.6
-	>=media-sound/lame-3.93.1
-	>=media-libs/libogg-1.0
-	>=media-libs/libvorbis-1.0
-	x86? ( media-libs/divx4linux )
-	media-libs/a52dec
-	!virtual/quicktime
-	dev-lang/nasm"
-PROVIDE="virtual/quicktime"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	rm -rf decore2 encore2 ffmpeg-0.4.6 jpeg jpeg-mmx-0.1.4 \
-		lame-3.93.1 libdv-0.99 libogg-1.0 libvorbis-1.0
-	ln -s /usr/include jpeg
-
-	[ `gcc-major-version` -eq 2 ] || EPATCH_EXCLUDE="00_all_gcc2.patch"
-	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/${PV}
-}
-
-src_compile() {
-	make MYCFLAGS="${CFLAGS}" || die
-	make util MYCFLAGS="${CFLAGS}" || die
-}
-
-src_install() {
-	dolib.so `uname -m`/libquicktime.so
-	dolib.a  `uname -m`/libquicktime.a
-	insinto /usr/include/quicktime
-	doins *.h
-	dodoc README
-	dohtml -r docs
-}
diff --git a/media-libs/quicktime4linux/quicktime4linux-2.0.0.ebuild b/media-libs/quicktime4linux/quicktime4linux-2.0.0.ebuild
deleted file mode 100644
index a312375839b4..000000000000
--- a/media-libs/quicktime4linux/quicktime4linux-2.0.0.ebuild
+++ /dev/null
@@ -1,40 +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/quicktime4linux/quicktime4linux-2.0.0.ebuild,v 1.8 2005/05/02 08:45:26 flameeyes Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="quicktime library for linux"
-HOMEPAGE="http://heroinewarrior.com/quicktime.php3"
-SRC_URI="mirror://sourceforge/heroines/${P}-src.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86 -ppc ~sparc ~amd64"
-IUSE=""
-
-DEPEND="media-libs/jpeg
-	media-libs/libpng
-	>=media-libs/libmpeg3-1.5.1
-	!media-libs/libquicktime"
-PROVIDE="virtual/quicktime"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-gentoo-libmpeg3.patch
-}
-
-src_compile() {
-	make || die
-	make util || die
-}
-
-src_install() {
-	dolib.so `uname -m`/libquicktime.so
-	dolib.a  `uname -m`/libquicktime.a
-	insinto /usr/include/quicktime
-	doins *.h
-	dodoc README
-	dohtml -r docs
-}
diff --git a/media-libs/quicktime4linux/quicktime4linux-2.0.4.ebuild b/media-libs/quicktime4linux/quicktime4linux-2.0.4-r1.ebuild
index a20dbd7ada80..afbe2edb6807 100644
--- a/media-libs/quicktime4linux/quicktime4linux-2.0.4.ebuild
+++ b/media-libs/quicktime4linux/quicktime4linux-2.0.4-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/quicktime4linux/quicktime4linux-2.0.4.ebuild,v 1.2 2005/05/15 02:25:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/quicktime4linux/quicktime4linux-2.0.4-r1.ebuild,v 1.1 2005/10/14 12:39:01 flameeyes Exp $
 
-inherit flag-o-matic eutils
+inherit flag-o-matic eutils toolchain-funcs
 
 DESCRIPTION="quicktime library for linux"
 HOMEPAGE="http://heroinewarrior.com/quicktime.php3"
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/heroines/${P}-src.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 -ppc ~amd64"
+KEYWORDS="~amd64 -ppc ~x86"
 IUSE=""
 
 DEPEND="media-libs/jpeg
@@ -21,7 +21,7 @@ DEPEND="media-libs/jpeg
 	>=media-sound/lame-3.93.1
 	>=media-libs/libogg-1.0
 	>=media-libs/libvorbis-1.0
-	x86? ( media-libs/divx4linux )
+	=dev-libs/glib-1.2*
 	media-libs/a52dec
 	media-libs/faac
 	media-libs/faad2
@@ -39,8 +39,8 @@ src_unpack() {
 }
 
 src_compile() {
-	make MYCFLAGS="${CFLAGS}" || die
-	make util MYCFLAGS="${CFLAGS}" || die
+	make CC=$(tc-getCC) MYCFLAGS="${CFLAGS}" || die
+	make util CC=$(tc-getCC) MYCFLAGS="${CFLAGS}" || die
 }
 
 src_install() {