Changed vorbis-switch to enable, to prevent clash with vorbis-path.

Package-Manager: portage-2.1.2_rc3-r4

diff --git a/media-libs/libquicktime/ChangeLog b/media-libs/libquicktime/ChangeLog
index f6d7e7f91b9e71b65433d4a92fe84dfe4b8569d1..99d1f55dc05939097028afbb4d8251d43fda1184 100644 (file)
--- a/media-libs/libquicktime/ChangeLog
+++ b/media-libs/libquicktime/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libquicktime
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.70 2006/12/13 19:01:29 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.71 2006/12/13 19:31:17 zzam Exp $
+
+  13 Dec 2006; Matthias Schwarzott <zzam@gentoo.org>
+  files/libquicktime-0.9.10-automagic-deps.patch,
+  libquicktime-0.9.10.ebuild:
+  Changed vorbis-switch to enable, to prevent clash with vorbis-path.
 
   13 Dec 2006; Matthias Schwarzott <zzam@gentoo.org>
   +files/libquicktime-0.9.10-automagic-deps.patch,

diff --git a/media-libs/libquicktime/Manifest b/media-libs/libquicktime/Manifest
index d2671e65782bf0f05f8bada9a18a0eefcf9f65d1..880d94105702bb2e578aec8373331edb91f91eb6 100644 (file)
--- a/media-libs/libquicktime/Manifest
+++ b/media-libs/libquicktime/Manifest
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX libquicktime-0.9.10-automagic-deps.patch 5601 RMD160 3c7bfdf73d93b6ff34b36eb6ffe58a883c0f213e SHA1 88d4e0d78fc335c6be120cfd360750d1cd1d1646 SHA256 a64735885ef344f034d33729507e5371451544ff3efd71dc213811d79dff1bff
-MD5 aba947dfc2bb2d98ffc8a5a32f4ce530 files/libquicktime-0.9.10-automagic-deps.patch 5601
-RMD160 3c7bfdf73d93b6ff34b36eb6ffe58a883c0f213e files/libquicktime-0.9.10-automagic-deps.patch 5601
-SHA256 a64735885ef344f034d33729507e5371451544ff3efd71dc213811d79dff1bff files/libquicktime-0.9.10-automagic-deps.patch 5601
+AUX libquicktime-0.9.10-automagic-deps.patch 5600 RMD160 4d053d087a2ff1c848e16a2194cfead8e311a663 SHA1 961e3b296bbf6ec8cea28f5369f60a71e53f4a3a SHA256 56378365bc55f1c340b3fe7cd6b15ada2676350da7652323eb024b7a5ad78c13
+MD5 0c2c476d2734a9d88441525666571c50 files/libquicktime-0.9.10-automagic-deps.patch 5600
+RMD160 4d053d087a2ff1c848e16a2194cfead8e311a663 files/libquicktime-0.9.10-automagic-deps.patch 5600
+SHA256 56378365bc55f1c340b3fe7cd6b15ada2676350da7652323eb024b7a5ad78c13 files/libquicktime-0.9.10-automagic-deps.patch 5600
 AUX libquicktime-0.9.10-x264.patch 3129 RMD160 8327bf88fecddc902dd45ec029150852696d3d04 SHA1 39a9d9f66431f7c2ae1b8a33631f4c0c49d1d6ce SHA256 7a3cea6e1409836b9b932de7ef7f4418f8f4a517b38d74e6b0d509b0cab8b2cb
 MD5 1e837d815e6d6222aab3dc809387dc70 files/libquicktime-0.9.10-x264.patch 3129
 RMD160 8327bf88fecddc902dd45ec029150852696d3d04 files/libquicktime-0.9.10-x264.patch 3129
@@ -35,10 +35,10 @@ DIST libquicktime-0.9.4.tar.gz 782651 RMD160 93a8098770a860cba31d71f876b782c2a7b
 DIST libquicktime-0.9.7.tar.gz 765719 RMD160 a886cbc714306d94977616de7221a19298fa251d SHA1 93346b8a9a411a4bdf97283fbf3ac8ed52252c73 SHA256 43b3b1b3a4ca24c2017f1fa0470425e522b59346b74203b39f9991f6a7b6085e
 DIST libquicktime-0.9.9.tar.gz 926280 RMD160 c345f54d949f29a9f5be42ca5fbdc80be781a3d4 SHA1 6221879c61bda6a695ffbc46c85e39db1b3ded65 SHA256 b92f08e8e9a9e4be36dd5cdd4b1c5d31f0cc821569623b2f5f79b3e7ba8ed3da
 DIST libquicktime-m4-1.tar.bz2 3622 RMD160 443f8d30c2022a9a3bc897f0c3e69c5964cc08dd SHA1 1ca6cf448f497fc23c82cb5ece7b1acc839d35c7 SHA256 db15fd86bd78d5396b0e2c71e6f8e786e01526bb1fa4c09311c7997b15494137
-EBUILD libquicktime-0.9.10.ebuild 2991 RMD160 b86c7ae459c714da92a3f33773ab27ef5d833acb SHA1 df522b80566f0dbb2fcd3aaa46f193c46a6416eb SHA256 49e0fb339c3caf16c09e52295f194ca8cd88867f720ebaa35e1f53633a06abad
-MD5 7793a59764aeec3e336bb1e3232df02e libquicktime-0.9.10.ebuild 2991
-RMD160 b86c7ae459c714da92a3f33773ab27ef5d833acb libquicktime-0.9.10.ebuild 2991
-SHA256 49e0fb339c3caf16c09e52295f194ca8cd88867f720ebaa35e1f53633a06abad libquicktime-0.9.10.ebuild 2991
+EBUILD libquicktime-0.9.10.ebuild 2993 RMD160 6634de8b0424edebdd1a25910e5a87cc9d898116 SHA1 d890a5c89565e50d9d8a8470e509cf88588b1cbe SHA256 31f75680d3338c871a6c40ab56003b52fd629480a13c4b2c615f2393605fd6b0
+MD5 3f1b92a374f0ed08ed9606cae1ca3cd1 libquicktime-0.9.10.ebuild 2993
+RMD160 6634de8b0424edebdd1a25910e5a87cc9d898116 libquicktime-0.9.10.ebuild 2993
+SHA256 31f75680d3338c871a6c40ab56003b52fd629480a13c4b2c615f2393605fd6b0 libquicktime-0.9.10.ebuild 2993
 EBUILD libquicktime-0.9.2.ebuild 1566 RMD160 1bce5fe7dfcec05aa53f213c7c4caf42daf06275 SHA1 46fd5023f254793e029f4dd8f1bbe844849407ac SHA256 89d34c1ccfe6f9aeed1ff7206b3fca953dc50e877adacac056f59ac0148e54ee
 MD5 9a1d33daffe2ec7e701e22c08d8f0820 libquicktime-0.9.2.ebuild 1566
 RMD160 1bce5fe7dfcec05aa53f213c7c4caf42daf06275 libquicktime-0.9.2.ebuild 1566
@@ -59,10 +59,10 @@ EBUILD libquicktime-0.9.9.ebuild 2110 RMD160 27ef01ce6c2bad88ff93a4a3d1475b1fd2a
 MD5 3b460eb1e8ae72fb1e5f516fffe4d478 libquicktime-0.9.9.ebuild 2110
 RMD160 27ef01ce6c2bad88ff93a4a3d1475b1fd2ad32da libquicktime-0.9.9.ebuild 2110
 SHA256 293e07ef09deacee6aa9f6d7fc237ab879bf11ec0c65ad5fbf7d83f1831778fc libquicktime-0.9.9.ebuild 2110
-MISC ChangeLog 11242 RMD160 8266509fa405b882a3343374fac52ef7e02d9c67 SHA1 dbd5b8886cb0c8592960fa255f01d8c0600bcd09 SHA256 b832c8ebc4abb58e6501342f04292781ca450ca538a0ce5f73038d050d776236
-MD5 6d16d94eea0f270914dd67e7c7732476 ChangeLog 11242
-RMD160 8266509fa405b882a3343374fac52ef7e02d9c67 ChangeLog 11242
-SHA256 b832c8ebc4abb58e6501342f04292781ca450ca538a0ce5f73038d050d776236 ChangeLog 11242
+MISC ChangeLog 11446 RMD160 e359be4bed2b403b6d3c91079df1a85dc9825623 SHA1 fbffe4a384629832317cf98c550c9b06d4e55eb3 SHA256 8dd72bc35fb615d5db09180d2a4616af6b30064fe5d3ca16406113e36cec900b
+MD5 4385399527ff4ca0002d408a6605427c ChangeLog 11446
+RMD160 e359be4bed2b403b6d3c91079df1a85dc9825623 ChangeLog 11446
+SHA256 8dd72bc35fb615d5db09180d2a4616af6b30064fe5d3ca16406113e36cec900b ChangeLog 11446
 MISC metadata.xml 251 RMD160 11462994b78856883a805c72334300d07101713d SHA1 a8362b29138cd87a592947af33840bf3210cfc59 SHA256 0e151c0a2781f2632c75a2f2c3b1a8d187aed329467472236c65627a7e0ba42f
 MD5 955f56e990f8c32d705708b4cc4db089 metadata.xml 251
 RMD160 11462994b78856883a805c72334300d07101713d metadata.xml 251
@@ -88,7 +88,7 @@ SHA256 6091518a14516ef99b1505679439e1678f35c617d15df3dfc740210c4822f518 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFgE4Vt2vP6XvVdOcRAjSMAJ9FCFyallTZo01nQVrjmF+wWjJJ8wCggZ+Y
-wRzwWiLRhy+DwhesDvOoWJE=
-=hbn8
+iD8DBQFFgFUMt2vP6XvVdOcRAvEHAJ9Bq/YOjarePw89PXbChkaMcbxIHACgsoZd
+FlfrgPt8z1P3LC+h4v7NApg=
+=/b6+
 -----END PGP SIGNATURE-----

diff --git a/media-libs/libquicktime/files/libquicktime-0.9.10-automagic-deps.patch b/media-libs/libquicktime/files/libquicktime-0.9.10-automagic-deps.patch
index 0d748d7e03c926386c64aea71e497d51342f7911..55f7e6e076cadac3051dc01231cc59b1de61360c 100644 (file)
--- a/media-libs/libquicktime/files/libquicktime-0.9.10-automagic-deps.patch
+++ b/media-libs/libquicktime/files/libquicktime-0.9.10-automagic-deps.patch
@@ -1,15 +1,13 @@
 diff -ru libquicktime-0.9.10-orig/configure.ac libquicktime-0.9.10/configure.ac
 --- libquicktime-0.9.10-orig/configure.ac      2006-12-13 17:27:44.000000000 +0100
-+++ libquicktime-0.9.10/configure.ac   2006-12-13 19:53:21.000000000 +0100
-@@ -153,8 +153,12 @@
-  
++++ libquicktime-0.9.10/configure.ac   2006-12-13 20:25:22.000000000 +0100
+@@ -154,7 +154,11 @@
  have_vorbis=false
  AH_TEMPLATE([HAVE_VORBIS], [Vorbis libraries are there])
--  
-+
-+AC_ARG_WITH([vorbis], AS_HELP_STRING([--without-vorbis], [Build without vorbis library (default: test)]))
+   
++AC_ARG_ENABLE([vorbis], AS_HELP_STRING([--disable-vorbis], [Build without vorbis library (default: test)]))
 +
-+if test "x$with_vorbis" != "xno"; then
++if test "x$enable_vorbis" != "xno"; then
  XIPH_PATH_VORBIS(have_vorbis=true)
 +fi
  AM_CONDITIONAL(HAVE_VORBIS, test x$have_vorbis = xtrue)

diff --git a/media-libs/libquicktime/libquicktime-0.9.10.ebuild b/media-libs/libquicktime/libquicktime-0.9.10.ebuild
index 4f052686f2875ec48323548b671a48b8c20f5209..354cc49b7965598754321bc5dd875c481315a6ef 100644 (file)
--- a/media-libs/libquicktime/libquicktime-0.9.10.ebuild
+++ b/media-libs/libquicktime/libquicktime-0.9.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-0.9.10.ebuild,v 1.3 2006/12/13 19:01:29 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-0.9.10.ebuild,v 1.4 2006/12/13 19:31:17 zzam Exp $
 
 WANT_AUTOCONF="latest"
 inherit libtool eutils autotools
@@ -75,7 +75,7 @@ src_compile() {
                $(use_with aac faad2) \
                $(use_with png) \
                $(use_with jpeg) \
-               $(use_with vorbis) \
+               $(use_enable vorbis) \
                $(use_with lame) \
                $(use_with x264) \
                $(use_with ffmpeg) \