Version bump with path to fix configure's AC_ARG_ENABLE handling. Thanks to Richard Ash for reporting in bug #127307.

Package-Manager: portage-2.1_pre6-r6

5 files changed, 221 insertions, 8 deletions

diff --git a/media-libs/libsndfile/ChangeLog b/media-libs/libsndfile/ChangeLog
index c2b5c769ba34..800273ae9d9d 100644
--- a/media-libs/libsndfile/ChangeLog
+++ b/media-libs/libsndfile/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libsndfile
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/ChangeLog,v 1.47 2006/03/07 11:18:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/ChangeLog,v 1.48 2006/03/25 02:08:24 flameeyes Exp $
+
+*libsndfile-1.0.15 (25 Mar 2006)
+
+  25 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/libsndfile-1.0.15-ac-arg-fixes.patch, +libsndfile-1.0.15.ebuild:
+  Version bump with path to fix configure's AC_ARG_ENABLE handling. Thanks to
+  Richard Ash for reporting in bug #127307.
 
   07 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
   libsndfile-1.0.5.ebuild, libsndfile-1.0.9.ebuild,
diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index ff315e6cc879..c90b2d38317b 100644
--- a/media-libs/libsndfile/Manifest
+++ b/media-libs/libsndfile/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 e9632fd4e1380e26b80c844b709d0aab ChangeLog 6534
-RMD160 cf9ef28337b7c039da05236cd152278a77b8b625 ChangeLog 6534
-SHA256 6f8ba8dec9481e05250c7a5d1ae3f8cff754854f62ba12394e8ab36b72aeb812 ChangeLog 6534
+MD5 d73f96856ca6e511f808ff5962d6a198 ChangeLog 6818
+RMD160 b1f2257304a1d4a016c53cb1da250171baa9ff0a ChangeLog 6818
+SHA256 c3902cef283adf5bb2f9174948ae19c852fcc5761aafb7ffe602c0e85758ff11 ChangeLog 6818
 MD5 a2f27725a7da73281e185f3fed80c16c files/digest-libsndfile-1.0.10 69
 RMD160 81d53cb19062fd02be4845e87b8c17492b27044e files/digest-libsndfile-1.0.10 69
 SHA256 903184505dd735141eeb064549bd1b274b2dd7d8c3153bd26557ea3f1d6a9b82 files/digest-libsndfile-1.0.10 69
@@ -13,6 +13,9 @@ SHA256 5b00f4d405b448157b19f0f207783938af917852a324384348cfa3367e6b995a files/di
 MD5 9e77b0bf2411d3be746027a39b01c99f files/digest-libsndfile-1.0.12-r1 69
 RMD160 6d5d7f25d7f78ce0b8381826ce926fd4079824f9 files/digest-libsndfile-1.0.12-r1 69
 SHA256 d6e2050d621e720ab80565b5a3b83f99763e28b6e0094b2a507ab41530bd5c33 files/digest-libsndfile-1.0.12-r1 69
+MD5 b4f52a0e6196a55ac5ff6a7ba4849798 files/digest-libsndfile-1.0.15 253
+RMD160 1762a3aa8ce63036d058a3550a2189542144325d files/digest-libsndfile-1.0.15 253
+SHA256 cdc7451086200791ca63f0ea5cccf974a38afb2997576108c323f8c5d989ab01 files/digest-libsndfile-1.0.15 253
 MD5 69310df3755bad8a23a2dd9de6425318 files/digest-libsndfile-1.0.5 68
 RMD160 584f28508538f7f25f9ade43132bd083ea811a7c files/digest-libsndfile-1.0.5 68
 SHA256 de049fccaa0c29ed0da5dea144ad1f5a3cd53ff78bd89de2bb1a560dbbeaf915 files/digest-libsndfile-1.0.5 68
@@ -22,6 +25,9 @@ SHA256 bfb6013e4aa640f9e26bb4a2df7ca39d6c4a57c3bf2607873ff6cefddc53e2fb files/di
 MD5 a0be4d04e2184eeab1d268871505fe80 files/libsndfile-1.0.12-flac.patch 1188
 RMD160 15594ad59acc1b7be8ef0b1aa90f1d9b38f6f613 files/libsndfile-1.0.12-flac.patch 1188
 SHA256 ec8242128e27f5a3921c8361d4579250888ff06fd13342d384a2e7897ec9de51 files/libsndfile-1.0.12-flac.patch 1188
+MD5 f4675c79365596e0b4eba316a2e0e6b3 files/libsndfile-1.0.15-ac-arg-fixes.patch 5233
+RMD160 65d0f2ae82e184a4115096a9b5a1f415d1260f54 files/libsndfile-1.0.15-ac-arg-fixes.patch 5233
+SHA256 df4dc36bdf99076bb73c6c807d9b039c29c48d72d6831a1c8e7eb0818c6a3dc6 files/libsndfile-1.0.15-ac-arg-fixes.patch 5233
 MD5 7d972c325f06f4271f9442f770216150 libsndfile-1.0.10.ebuild 1084
 RMD160 dfafbc9324c9884d04c3d27c83e4f765081e2c55 libsndfile-1.0.10.ebuild 1084
 SHA256 46067a2ed98820bba7b787457669e2770b7f2d223140df3321dc3291344ef938 libsndfile-1.0.10.ebuild 1084
@@ -31,6 +37,9 @@ SHA256 3bd3cb44be2b04edb52d0e44646b2959424410946abc2eb1d5c376893961ddfe libsndfi
 MD5 42701c0eea701bdc7c36959debb638ca libsndfile-1.0.12-r1.ebuild 1289
 RMD160 bc825755bdefd01948ca21d789686d6bd783345d libsndfile-1.0.12-r1.ebuild 1289
 SHA256 ecce28ee05d7090d03bda6dcb15bd9e1185e6727b07db832f26db327b2010ea4 libsndfile-1.0.12-r1.ebuild 1289
+MD5 a3bc4cd6899f7ed0c190c20bdc2a014a libsndfile-1.0.15.ebuild 1421
+RMD160 69c19ca34457bfac5bc3d252a153016ac79fa5e0 libsndfile-1.0.15.ebuild 1421
+SHA256 2721e361ff6fc1351f5f30fcef52781a2ca198c101e79a4990cf9fe2df8cb66d libsndfile-1.0.15.ebuild 1421
 MD5 f774bd46933475adb51cd4c552054887 libsndfile-1.0.5.ebuild 709
 RMD160 bf170e6e0059f1fe25a53b4032d508893b784ab8 libsndfile-1.0.5.ebuild 709
 SHA256 4dd5aab2493b13313e4374d138578219e9eaa69ccf0e1a70e0c92fc79042a0a3 libsndfile-1.0.5.ebuild 709
@@ -41,9 +50,9 @@ MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEDWwVAiZjviIA2XgRAvfxAKC17+PRsGvzdbjWZvlS8DDoUWKOuACg3fF9
-i9B9LYsqqY4+nN9EGBRrcgo=
-=MGB5
+iD8DBQFEJKW2AiZjviIA2XgRAn7/AJ0RgMRKUDBO5ax8Bn584IAmDeDYVACgkC92
+QEQxo1lHnr6eYtUgI7aCCHM=
+=jjbY
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libsndfile/files/digest-libsndfile-1.0.15 b/media-libs/libsndfile/files/digest-libsndfile-1.0.15
new file mode 100644
index 000000000000..c690a215e57c
--- /dev/null
+++ b/media-libs/libsndfile/files/digest-libsndfile-1.0.15
@@ -0,0 +1,3 @@
+MD5 4171faabfad0ce550cbe9bf1b065e976 libsndfile-1.0.15.tar.gz 861709
+RMD160 48576a7769ac64727f93f74ba530d051ac134ff2 libsndfile-1.0.15.tar.gz 861709
+SHA256 e31360cd6d84d5c220c636792700f80d2f55a26db695dce5278722ecb70f938c libsndfile-1.0.15.tar.gz 861709
diff --git a/media-libs/libsndfile/files/libsndfile-1.0.15-ac-arg-fixes.patch b/media-libs/libsndfile/files/libsndfile-1.0.15-ac-arg-fixes.patch
new file mode 100644
index 000000000000..10db37dda280
--- /dev/null
+++ b/media-libs/libsndfile/files/libsndfile-1.0.15-ac-arg-fixes.patch
@@ -0,0 +1,141 @@
+Index: libsndfile-1.0.15/configure.ac
+===================================================================
+--- libsndfile-1.0.15.orig/configure.ac
++++ libsndfile-1.0.15/configure.ac
+@@ -71,46 +71,37 @@ SHLIB_VERSION_ARG=""
+ # Finished checking, handle options.
+ 
+ AC_ARG_ENABLE(experimental,
+-	AC_HELP_STRING([--enable-experimental], [enable experimental code]),
+-	ac_arg_experimental=yes, ac_arg_experimental=no)
++	AC_HELP_STRING([--enable-experimental], [enable experimental code]))
+ 
+ EXPERIMENTAL_CODE=0
+-if test x$ac_arg_experimental = xyes ; then
++if test x$enable_experimental = xyes ; then
+ 	EXPERIMENTAL_CODE=1
+ 	fi
+ AC_DEFINE_UNQUOTED([ENABLE_EXPERIMENTAL_CODE],${EXPERIMENTAL_CODE}, [Set to 1 to enable experimental code.])
+ 
+ AC_ARG_ENABLE(gcc-werror,
+-	AC_HELP_STRING([--enable-gcc-werror], [enable -Werror in all Makefiles]),
+-	ac_arg_gcc_werror=yes, ac_arg_gcc_werror=no)
++	AC_HELP_STRING([--enable-gcc-werror], [enable -Werror in all Makefiles]))
+ 
+ AC_ARG_ENABLE(gcc-pipe,
+-	AC_HELP_STRING([--disable-gcc-pipe], [disable gcc -pipe option]),
+-	ac_arg_gcc_pipe="N", ac_arg_gcc_pipe="Y")
++	AC_HELP_STRING([--disable-gcc-pipe], [disable gcc -pipe option]))
+ 
+ AC_ARG_ENABLE(gcc-opt,
+-	AC_HELP_STRING([--disable-gcc-opt], [disable gcc optimisations]),
+-	ac_arg_gcc_opt="N", ac_arg_gcc_opt="Y")
++	AC_HELP_STRING([--disable-gcc-opt], [disable gcc optimisations]))
+ 
+ AC_ARG_ENABLE(cpu-clip,
+-	AC_HELP_STRING([--disable-cpu-clip], [disable tricky cpu specific clipper]),
+-	ac_arg_cpu_clip="N", ac_arg_cpu_clip="Y")
++	AC_HELP_STRING([--disable-cpu-clip], [disable tricky cpu specific clipper]))
+ 
+ AC_ARG_ENABLE(bow-docs,
+-	AC_HELP_STRING([--enable-bow-docs], [enable black-on-white html docs]),
+-	ac_arg_bow_docs="Y", ac_arg_bow_docs="N")
++	AC_HELP_STRING([--enable-bow-docs], [enable black-on-white html docs]))
+ 
+ AC_ARG_ENABLE(sqlite,
+-	AC_HELP_STRING([--disable-sqlite], [disable use of sqlite]),
+-	ac_arg_enable_sqlite=no, ac_arg_enable_sqlite=yes)
++	AC_HELP_STRING([--disable-sqlite], [disable use of sqlite]))
+ 
+ AC_ARG_ENABLE(flac,
+-	AC_HELP_STRING([--disable-flac], [disable use of FLAC]),
+-	ac_arg_enable_flac=no, ac_arg_enable_flac=yes)
++	AC_HELP_STRING([--disable-flac], [disable use of FLAC]))
+ 
+ AC_ARG_ENABLE(alsa,
+-	AC_HELP_STRING([--disable-alsa], [disable use of ALSA]),
+-	ac_arg_enable_alsa=no, ac_arg_enable_alsa=yes)
++	AC_HELP_STRING([--disable-alsa], [disable use of ALSA]))
+ 
+ #====================================================================================
+ # Check types and their sizes.
+@@ -261,7 +252,7 @@ case "$host_os" in
+ # Check for libsqlite3 (only used in regtest).
+ 
+ ac_cv_sqlite3=no
+-if test x$ac_arg_enable_sqlite = xyes ; then
++if test x$enable_sqlite != xno ; then
+ 	PKG_CHECK_MODULES(SQLITE3, sqlite3 >= 3.2, ac_cv_sqlite3=yes, ac_cv_sqlite3=no)
+ 	fi
+ 
+@@ -276,7 +267,7 @@ AC_DEFINE_UNQUOTED([HAVE_SQLITE3],$HAVE_
+ #====================================================================================
+ # Determine if the processor can do clipping on float to int conversions.
+ 
+-if test x$ac_arg_cpu_clip = "xY" ; then
++if test x$enable_cpu_clip != "xno" ; then
+ 	AC_C_CLIP_MODE
+ else
+ 	echo "checking processor clipping capabilities... disabled"
+@@ -324,7 +315,7 @@ AC_DEFINE_UNQUOTED(USE_WINDOWS_API, ${us
+ 
+ ALSA_LIBS=""
+ 
+-if test x$ac_arg_enable_alsa = xyes ; then
++if test x$enable_alsa != xno ; then
+ 	AC_CHECK_HEADERS(alsa/asoundlib.h)
+ 	if test x$ac_cv_header_alsa_asoundlib_h = xyes ; then
+ 		ALSA_LIBS="-lasound"
+@@ -336,7 +327,7 @@ if test x$ac_arg_enable_alsa = xyes ; th
+ 
+ FLAC_LIBS=""
+ 
+-if test x$ac_arg_enable_flac = xyes ; then
++if test x$enable_flac != xno ; then
+ 	AC_CHECK_HEADERS(FLAC/all.h)
+ 	if test x$ac_cv_header_FLAC_all_h = xyes ; then
+ 		AC_CHECK_LIB(FLAC, FLAC__seekable_stream_encoder_set_tell_callback, HAVE_FLAC_1_1_1="yes")
+@@ -398,7 +389,7 @@ else
+ 	htmldocdir=$prefix/share/doc/libsndfile1-dev/html
+ 	fi
+ 
+-if test x$ac_arg_bow_docs = "xY" ; then
++if test x$enable_bow_docs = "xyes" ; then
+ 	HTML_BGCOLOUR="white"
+ 	HTML_FGCOLOUR="black"
+ else
+@@ -416,14 +407,14 @@ if test x$ac_cv_c_compiler_gnu = xyes ; 
+ 
+ 	AC_ADD_CFLAGS(-Wdeclaration-after-statement)
+ 
+-	if test x$ac_arg_gcc_werror = "xyes" ; then
++	if test x$enable_gcc_werror = "xyes" ; then
+ 		CFLAGS="-Werror $CFLAGS"
+ 		fi
+ 
+ 	CFLAGS="$CFLAGS -Wstrict-prototypes -Wmissing-prototypes -Waggregate-return -Wcast-align -Wcast-qual -Wnested-externs -Wshadow -Wbad-function-cast -Wwrite-strings"
+ 	# -Wpointer-arith -Wundef -Wmissing-declarations -Winline -Wconversion"
+ 
+-	if test "$ac_arg_gcc_opt" = "N" ; then
++	if test "x$enable_gcc_opt" = "xno" ; then
+ 		temp_CFLAGS=`echo $CFLAGS | sed "s/O2/O0/"`
+ 		CFLAGS=$temp_CFLAGS
+ 		AC_MSG_WARN([[*** Compiler optimisations switched off. ***]])
+@@ -450,7 +441,7 @@ if test x$ac_cv_c_compiler_gnu = xyes ; 
+ 		*)
+ 			;;
+ 		esac
+-	if test x$ac_arg_gcc_pipe != "xN" ; then
++	if test x$enable_gcc_pipe != "xno" ; then
+ 	 	CFLAGS="$CFLAGS -pipe"
+ 	 	fi
+ 
+@@ -502,7 +493,7 @@ AC_MSG_RESULT([
+   Configuration summary :
+ 
+     Version : ..................... ${VERSION}
+-    Experimental code : ........... ${ac_arg_experimental}
++    Experimental code : ........... ${enable_experimental:-no}
+ ])
+ 
+ if test x$ac_cv_c_compiler_gnu = xyes ; then
diff --git a/media-libs/libsndfile/libsndfile-1.0.15.ebuild b/media-libs/libsndfile/libsndfile-1.0.15.ebuild
new file mode 100644
index 000000000000..6ab67d3da711
--- /dev/null
+++ b/media-libs/libsndfile/libsndfile-1.0.15.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.15.ebuild,v 1.1 2006/03/25 02:08:24 flameeyes Exp $
+
+inherit eutils libtool autotools
+
+DESCRIPTION="A C library for reading and writing files containing sampled sound"
+HOMEPAGE="http://www.mega-nerd.com/libsndfile/"
+SRC_URI="http://www.mega-nerd.com/libsndfile/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="static sqlite flac alsa"
+RESTRICT="test"
+
+RDEPEND="flac? ( media-libs/flac )
+	alsa? ( media-libs/alsa-lib )
+	sqlite? ( >=dev-db/sqlite-3.2 )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-ac-arg-fixes.patch"
+	eautoreconf
+
+	epunt_cxx
+}
+
+src_compile() {
+	econf \
+		$(use_enable sqlite) \
+		$(use_enable static) \
+		$(use_enable flac) \
+		$(use_enable alsa) \
+		--disable-werror \
+		--disable-gcc-opt \
+		--disable-gcc-pipe \
+		--disable-dependency-tracking \
+		|| die "econf failed"
+
+	# fix this weird doc installation directory libsndfile decides
+	# to something more standard
+	sed -e "s:^htmldocdir.*:htmldocdir = /usr/share/doc/${PF}/html:" -i ${S}/doc/Makefile
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
+}