Fix pkg-config initialisation when alsa is not used, fix nls build with as-needed on non glibc systems, add missing dep on virtual/libintl for non glibc systems

Package-Manager: portage-2.1.4_rc14

6 files changed, 173 insertions, 10 deletions

diff --git a/media-libs/libquicktime/ChangeLog b/media-libs/libquicktime/ChangeLog
index 70f8d7d982b0..041d43148143 100644
--- a/media-libs/libquicktime/ChangeLog
+++ b/media-libs/libquicktime/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-libs/libquicktime
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.98 2007/12/25 17:19:28 phreak Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.99 2008/01/02 13:59:35 aballier Exp $
+
+*libquicktime-1.0.1-r1 (02 Jan 2008)
+
+  02 Jan 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/libquicktime-1.0.1-nls-asneeded.patch,
+  +files/libquicktime-1.0.1-pkgconfig_init.patch,
+  +libquicktime-1.0.1-r1.ebuild:
+  Fix pkg-config initialisation when alsa is not used, fix nls build with
+  as-needed on non glibc systems, add missing dep on virtual/libintl for non
+  glibc systems
 
   25 Dec 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing zypher from metadata.xml as per #26909.
diff --git a/media-libs/libquicktime/Manifest b/media-libs/libquicktime/Manifest
index 6beca7e34820..33faf450b51c 100644
--- a/media-libs/libquicktime/Manifest
+++ b/media-libs/libquicktime/Manifest
@@ -33,6 +33,14 @@ AUX libquicktime-1.0.0-gtk212.patch 421 RMD160 b621e5111f223f21e2ee2ff191a6e1eb1
 MD5 becd9ebb852c7a4f352881a5e58eef04 files/libquicktime-1.0.0-gtk212.patch 421
 RMD160 b621e5111f223f21e2ee2ff191a6e1eb1a4cf754 files/libquicktime-1.0.0-gtk212.patch 421
 SHA256 3f070708e8acd831acee6f309c6db43c8d4e97104ccc1a658eb8b7e69cc93eb6 files/libquicktime-1.0.0-gtk212.patch 421
+AUX libquicktime-1.0.1-nls-asneeded.patch 483 RMD160 d321fac1c8d135f7b53a4594ab0ee66bf2d45daf SHA1 ab74e83cff27c6d3e3d1ede116d071eaf346e865 SHA256 87a66c03e7cc96173760860da372d8c4109fd557da5809438ce62f2e29bfb920
+MD5 aa3d791648e409d379503dbba2ac1db1 files/libquicktime-1.0.1-nls-asneeded.patch 483
+RMD160 d321fac1c8d135f7b53a4594ab0ee66bf2d45daf files/libquicktime-1.0.1-nls-asneeded.patch 483
+SHA256 87a66c03e7cc96173760860da372d8c4109fd557da5809438ce62f2e29bfb920 files/libquicktime-1.0.1-nls-asneeded.patch 483
+AUX libquicktime-1.0.1-pkgconfig_init.patch 326 RMD160 3fa9fea7fa1e7ac7f3e2d1c1fc5f10f4fd676ff7 SHA1 2e6c1707530b7d5002cc2371f9e1e09b9755f42b SHA256 f9102d4417b3edeb41bf318cf389256274793f68ae22827c9db4c9834af05226
+MD5 4236ae44a6138f87f3f79730f5fe96a9 files/libquicktime-1.0.1-pkgconfig_init.patch 326
+RMD160 3fa9fea7fa1e7ac7f3e2d1c1fc5f10f4fd676ff7 files/libquicktime-1.0.1-pkgconfig_init.patch 326
+SHA256 f9102d4417b3edeb41bf318cf389256274793f68ae22827c9db4c9834af05226 files/libquicktime-1.0.1-pkgconfig_init.patch 326
 DIST libquicktime-0.9.10.tar.gz 851578 RMD160 b29e4fc28ef17406e14e042faa36f673e6a89ca7 SHA1 2df5162df440faeae477d915343ddc9013464a56 SHA256 7b7335721957a2e37dbc427daa2753f1c16b7e7f8877e6e9b629b1dd011d1ecd
 DIST libquicktime-0.9.7.tar.gz 765719 RMD160 a886cbc714306d94977616de7221a19298fa251d SHA1 93346b8a9a411a4bdf97283fbf3ac8ed52252c73 SHA256 43b3b1b3a4ca24c2017f1fa0470425e522b59346b74203b39f9991f6a7b6085e
 DIST libquicktime-1.0.0.tar.gz 998950 RMD160 8f3b2dd22bdff8bc09d33b84164a684581ee8ece SHA1 e76a93ac14e8dfb5ff499301c7c67a99b0c72f79 SHA256 60c478fd81450e18a1fcf1bcee672d5cd04c4ca5871ffb709ef6a635111141a4
@@ -50,14 +58,18 @@ EBUILD libquicktime-1.0.0.ebuild 3077 RMD160 f31b9ef7846af21b23a4265027f0a0fd3b2
 MD5 b07242da306df0e851c1894dea15e199 libquicktime-1.0.0.ebuild 3077
 RMD160 f31b9ef7846af21b23a4265027f0a0fd3b26b9d8 libquicktime-1.0.0.ebuild 3077
 SHA256 9e1c01cde08efb6644da3b7009e61efb4f9394b7d16be6453bf32d49946d47c0 libquicktime-1.0.0.ebuild 3077
+EBUILD libquicktime-1.0.1-r1.ebuild 2874 RMD160 9ba0671f8a61318748b8f1545136ca2edaab3425 SHA1 dca1d2b3d7d6da9bbda44fbb80d20bf48433f433 SHA256 dd5cde535a95f3c85e943a54130462d90a8d3b8a88218b8682d1fd497eb8ee83
+MD5 db69d68ca94c630287d7333f0685929e libquicktime-1.0.1-r1.ebuild 2874
+RMD160 9ba0671f8a61318748b8f1545136ca2edaab3425 libquicktime-1.0.1-r1.ebuild 2874
+SHA256 dd5cde535a95f3c85e943a54130462d90a8d3b8a88218b8682d1fd497eb8ee83 libquicktime-1.0.1-r1.ebuild 2874
 EBUILD libquicktime-1.0.1.ebuild 2529 RMD160 b0f3c4b1d6cd73b62e0492bc4f7b5e7c1aa82344 SHA1 7583a984f0347a1ee32234891525c058ce699bdc SHA256 90a9809b252341592f098401e75194c94add4b0e140abe9ef3dd4151001aa7eb
 MD5 7e6550d68b610a485ac93bebe5ad8930 libquicktime-1.0.1.ebuild 2529
 RMD160 b0f3c4b1d6cd73b62e0492bc4f7b5e7c1aa82344 libquicktime-1.0.1.ebuild 2529
 SHA256 90a9809b252341592f098401e75194c94add4b0e140abe9ef3dd4151001aa7eb libquicktime-1.0.1.ebuild 2529
-MISC ChangeLog 15291 RMD160 38147cd97a87c160b2b46f9d68511bb4df8ab5b0 SHA1 742a282f2976e7a2471dd8ae49e386aee97d28bf SHA256 c836ca9e1c7beca8408bfd08a095f6f925450e33018b439da7f00b01dd557b3f
-MD5 7cdc28f5f247ec17d405d4d61d09bdb0 ChangeLog 15291
-RMD160 38147cd97a87c160b2b46f9d68511bb4df8ab5b0 ChangeLog 15291
-SHA256 c836ca9e1c7beca8408bfd08a095f6f925450e33018b439da7f00b01dd557b3f ChangeLog 15291
+MISC ChangeLog 15682 RMD160 0caf596162aa563f901f040b22f30144556b43ee SHA1 369779bbafc589e10723052cac86cce44854c301 SHA256 d77acac06ca5e2f68c1e746a079e9ed12899c6c9646e48a9f0a8b13ebd985fd9
+MD5 4de427e99f6252c961e0f0d592b9bc24 ChangeLog 15682
+RMD160 0caf596162aa563f901f040b22f30144556b43ee ChangeLog 15682
+SHA256 d77acac06ca5e2f68c1e746a079e9ed12899c6c9646e48a9f0a8b13ebd985fd9 ChangeLog 15682
 MISC metadata.xml 159 RMD160 21717801992314b5fc85dfeb6da77bf71fc54c7e SHA1 26b6ea95dc60c40d9b482830ce7e7c54233a7698 SHA256 38df217d3a650829cd34e6c74bd2710a01751ccd5511b5be296e3f48dd4d81cb
 MD5 dc09902c6f418a17f6b695df093e36c6 metadata.xml 159
 RMD160 21717801992314b5fc85dfeb6da77bf71fc54c7e metadata.xml 159
@@ -74,10 +86,13 @@ SHA256 8eb2659e3a80ba85ad86c26085fbb8f6a640258980249279c99a2ee341443a17 files/di
 MD5 2788a51d6b22e14223ce0c9007081439 files/digest-libquicktime-1.0.1 256
 RMD160 6472bb86431a1ac6289ebe7345821c1a10b77c9c files/digest-libquicktime-1.0.1 256
 SHA256 3bfad54a1b0e72486bae719a6acaf3baf8932543ddb799d354eccaa5065affe2 files/digest-libquicktime-1.0.1 256
+MD5 2788a51d6b22e14223ce0c9007081439 files/digest-libquicktime-1.0.1-r1 256
+RMD160 6472bb86431a1ac6289ebe7345821c1a10b77c9c files/digest-libquicktime-1.0.1-r1 256
+SHA256 3bfad54a1b0e72486bae719a6acaf3baf8932543ddb799d354eccaa5065affe2 files/digest-libquicktime-1.0.1-r1 256
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFHcTulyuNVb5qfaOYRAilHAKCfaCrxdPYJhV4CmwFFA4eTGGgWWQCgzSO5
-f365ssn5/v+iymzZ5Au8bFI=
-=s1/P
+iEYEARECAAYFAkd7mNgACgkQvFcC4BYPU0q5pQCgtrvNJP5veAptOSsxm38Iq0Lt
+GucAoKOFOrV4W1rxoXGzlbGmGxA/WQLN
+=eTok
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libquicktime/files/digest-libquicktime-1.0.1-r1 b/media-libs/libquicktime/files/digest-libquicktime-1.0.1-r1
new file mode 100644
index 000000000000..1a932e42fe39
--- /dev/null
+++ b/media-libs/libquicktime/files/digest-libquicktime-1.0.1-r1
@@ -0,0 +1,3 @@
+MD5 3146ef9f88ea6a887658ceadac317997 libquicktime-1.0.1.tar.gz 995539
+RMD160 18c6349573e5b76dfb671d2813ae68fb877980fa libquicktime-1.0.1.tar.gz 995539
+SHA256 2d1cf4548b1787b23c8405f47f392d3028db074efb605ab990a9e9ede86c7f2d libquicktime-1.0.1.tar.gz 995539
diff --git a/media-libs/libquicktime/files/libquicktime-1.0.1-nls-asneeded.patch b/media-libs/libquicktime/files/libquicktime-1.0.1-nls-asneeded.patch
new file mode 100644
index 000000000000..45af9816659a
--- /dev/null
+++ b/media-libs/libquicktime/files/libquicktime-1.0.1-nls-asneeded.patch
@@ -0,0 +1,13 @@
+Index: libquicktime-1.0.1/src/Makefile.am
+===================================================================
+--- libquicktime-1.0.1.orig/src/Makefile.am
++++ libquicktime-1.0.1/src/Makefile.am
+@@ -7,7 +7,7 @@ AM_CFLAGS = -DLOCALE_DIR=\"$(localedir)\
+ # Library dependencies
+ # Maybe we need zlib to read compressed quicktime headers
+ #
+-libquicktime_la_LIBADD = @ICONV_LIBS@ @LIBINTL@
++libquicktime_la_LIBADD = @ICONV_LIBS@ @LTLIBINTL@
+ 
+ libquicktime_la_LDFLAGS = -export-dynamic
+ 
diff --git a/media-libs/libquicktime/files/libquicktime-1.0.1-pkgconfig_init.patch b/media-libs/libquicktime/files/libquicktime-1.0.1-pkgconfig_init.patch
new file mode 100644
index 000000000000..d85b2e0163e2
--- /dev/null
+++ b/media-libs/libquicktime/files/libquicktime-1.0.1-pkgconfig_init.patch
@@ -0,0 +1,14 @@
+Index: libquicktime-1.0.1/configure.ac
+===================================================================
+--- libquicktime-1.0.1.orig/configure.ac
++++ libquicktime-1.0.1/configure.ac
+@@ -73,6 +73,9 @@ dnl
+ AM_GNU_GETTEXT([external])
+ 
+ 
++PKG_PROG_PKG_CONFIG
++
++
+ dnl This is necessary for libtool assembler support
+ 
+ AS=gcc
diff --git a/media-libs/libquicktime/libquicktime-1.0.1-r1.ebuild b/media-libs/libquicktime/libquicktime-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..88e29ad6396e
--- /dev/null
+++ b/media-libs/libquicktime/libquicktime-1.0.1-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-1.0.1-r1.ebuild,v 1.1 2008/01/02 13:59:35 aballier Exp $
+
+WANT_AUTOMAKE="latest"
+WANT_AUTOCONF="latest"
+inherit libtool eutils autotools
+
+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="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="mmx X opengl dv gtk alsa aac encode png jpeg vorbis lame x264 ffmpeg"
+
+RDEPEND="dv? ( media-libs/libdv )
+	gtk? ( >=x11-libs/gtk+-2.4.0 )
+	aac? (
+		media-libs/faad2
+		encode? ( media-libs/faac )
+	)
+	alsa? ( media-libs/alsa-lib )
+	png? ( media-libs/libpng )
+	jpeg? ( media-libs/jpeg )
+	vorbis? ( media-libs/libvorbis media-libs/libogg )
+	lame? ( media-sound/lame )
+	ffmpeg? ( media-video/ffmpeg )
+	x264? ( >=media-libs/x264-svn-20060810 )
+	X? ( x11-libs/libXaw
+		x11-libs/libXv
+		x11-libs/libXext
+		x11-libs/libX11
+		opengl? ( media-libs/mesa )
+	)
+	virtual/libintl
+	!virtual/quicktime"
+DEPEND="${RDEPEND}
+	X? (
+		x11-proto/videoproto
+		x11-proto/xextproto
+	)
+	dev-util/pkgconfig
+	sys-devel/gettext"
+
+PROVIDE="virtual/quicktime"
+
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-pkgconfig_init.patch"
+	epatch "${FILESDIR}/${P}-nls-asneeded.patch"
+	# Copy config.rapth to avoid failures..
+	cp /usr/share/gettext/config.rpath .
+	AT_M4DIR="m4" eautoreconf
+}
+src_compile() {
+	local MY_OPTS=""
+	if use !encode || use !aac; then
+		MY_OPTS="--without-faac"
+	fi
+
+	econf --enable-shared \
+		--enable-static \
+		--enable-gpl \
+		$(use_enable mmx) \
+		$(use_with X x) \
+		$(use_with gtk) \
+		$(use_with dv libdv) \
+		$(use_with alsa) \
+		$(use_with aac faad2) \
+		$(use_with png libpng) \
+		$(use_with jpeg libjpeg) \
+		$(use vorbis || echo "--without-vorbis") \
+		$(use_with lame) \
+		$(use_with x264) \
+		$(use_with ffmpeg) \
+		$(use_with opengl) \
+		${MY_OPTS} \
+		--without-cpuflags || die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc README TODO ChangeLog
+	# Compatibility with software that uses quicktime prefix, but
+	# don't do that when building for Darwin/MacOS
+	[[ ${CHOST} != *-darwin* ]] && \
+	dosym /usr/include/lqt /usr/include/quicktime
+}
+
+pkg_preinst() {
+	if [[ -d /usr/include/quicktime && ! -L /usr/include/quicktime ]]; then
+		elog "For compatibility with other quicktime libraries, ${PN} was"
+		elog "going to create a /usr/include/quicktime symlink, but for some"
+		elog "reason that is a directory on your system."
+
+		elog "Please check that is empty, and remove it, or submit a bug"
+		elog "telling us which package owns the directory."
+		die "/usr/include/quicktime is a directory."
+	fi
+}