Version bump, minor bug fixes. Bump libvorbis dependency, remove unused libtool eclass, update to EAPI=3, use src_prepare instead of src_unpack, and use src_configure instead of src_compile.

Package-Manager: portage-2.2_rc88/cvs/Linux x86_64

3 files changed, 83 insertions, 2 deletions

diff --git a/media-libs/libsndfile/ChangeLog b/media-libs/libsndfile/ChangeLog
index be2bca033151..d29499cde0c8 100644
--- a/media-libs/libsndfile/ChangeLog
+++ b/media-libs/libsndfile/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libsndfile
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/ChangeLog,v 1.114 2010/09/05 09:26:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/ChangeLog,v 1.115 2010/10/05 18:28:51 radhermit Exp $
+
+*libsndfile-1.0.22 (05 Oct 2010)
+
+  05 Oct 2010; Tim Harder <radhermit@gentoo.org> +libsndfile-1.0.22.ebuild:
+  Version bump, minor bug fixes. Bump libvorbis dependency, remove unused
+  libtool eclass, update to EAPI=3, use src_prepare instead of src_unpack,
+  and use src_configure instead of src_compile.
 
 *libsndfile-1.0.21-r1 (05 Sep 2010)
 
diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index 72fcfae4ee5e..86710e55db8f 100644
--- a/media-libs/libsndfile/Manifest
+++ b/media-libs/libsndfile/Manifest
@@ -1,6 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libsndfile-1.0.17-regtests-need-sqlite.patch 894 RMD160 a36d14dc91a8768386f414cbfe8b0cc53de938c3 SHA1 522d55e46ef6c83a158fb026d5f37f63b78438ad SHA256 c53026864c6a05b1ccc8b12e7af895f5d0e2d3a00335fd9f49ed7cc9aecece73
 DIST libsndfile-1.0.21.tar.gz 1014722 RMD160 3f4d3472aebf24b02c2ce3f370023f50096c1fbd SHA1 136845a8bb5679e033f8f53fb98ddeb5ee8f1d97 SHA256 7e9083a2551ff347276d82cdb61f2b4f9cd137c0b76433800e991583ded8ea67
+DIST libsndfile-1.0.22.tar.gz 1030467 RMD160 fbe5105bf8815d526bb18ca42645b03b20916149 SHA1 2bf823dcacf8ee78c56b8a877672753ee24d9d3b SHA256 1c85fa5bd32a6304811397f2d366aecc335278ce6430a008dd4982113de83883
 EBUILD libsndfile-1.0.21-r1.ebuild 1673 RMD160 33a49378fa703f7e36a6f7823fdef3b5ac39f8b2 SHA1 4834517de9e63a82557e3b925ebb2bacebce428a SHA256 d91f82b782cb43904198b6b2d98953d853a4efab67f319c6bf300ca3c8cc7bf0
 EBUILD libsndfile-1.0.21.ebuild 1692 RMD160 31116e4c259a97bbc1e9a8308d42120efc224d0e SHA1 bbf597fb2fc4aff00d28b827d47785a5dd6f5592 SHA256 5cd4367e16f48de467a5a7fff18ee4abc00f082934dd25fbb538dc23612abb24
-MISC ChangeLog 16872 RMD160 8cd7852d9e9848f1078bfef16ba475037c2d95a3 SHA1 948ad44ae0f39ac5cf04f9212f664e1f52a91ac9 SHA256 63102c41e9a564786c4591086b69931153c08e6a09421137c421cce829759f21
+EBUILD libsndfile-1.0.22.ebuild 1615 RMD160 e21f5592ca050797e20943d2dcb34596265b23ef SHA1 36f75f7ec2c9214bb69132976047903636522893 SHA256 c22cd57f0a4d8efd5c7d6fea37e65b721f2713dd4f29e9ad8f2d8c3bf7168940
+MISC ChangeLog 17180 RMD160 99af9d68332a42cd39f0f21942d908e9babf7b2d SHA1 04cd4b6c7d2dbaf836a2de352411d1762adda982 SHA256 4179d1cbcfc1a7429f8cc9b97335366ee31e9bfddad4951651c3881b6daf0d15
 MISC metadata.xml 159 RMD160 568344dc99ebe68c2e2d43d268d186757532144d SHA1 3f9589301dbaa4363c56de0f309cf792d8c38b63 SHA256 eb5b8cfa9aed067cd72d6439beac2dd0abdba30248f27e4b337012b493a18369
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQEcBAEBAgAGBQJMq25tAAoJEEqz6FtPBkyjqfIH/27l39x/Z91u2ZIozzb3euXn
+BnY0lnRY6LGPz9yW1WUlB7nUOn0ZZoBInpkzr+s7hNEMpUE8iKaSwFo6VepRKNfm
+MJYkal+8ww/1RJbJybH0Me0OY2G0giNb9K8RPZonjx2YWoG5LPuws8MD0pmY8Due
+pkDrLUUy1mBQKzFsFXb6XOgQvz1j2yyIOLATatqunIkZPfa+BTmjFtjv1Ag05/n6
+/Ye5PWsigrzyHUv6S/1AM3deOpG5lw2sOEkkt7dUkoBgWgzqw71RVPTa5+ID7HRs
+k9bCWyjCfaAoaOLdvOsUKeBbDP8XlRVMgawsyT6VsRTDgf4MtTmLIgYDOGc7KOM=
+=70h2
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libsndfile/libsndfile-1.0.22.ebuild b/media-libs/libsndfile/libsndfile-1.0.22.ebuild
new file mode 100644
index 000000000000..07d507820ee1
--- /dev/null
+++ b/media-libs/libsndfile/libsndfile-1.0.22.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.22.ebuild,v 1.1 2010/10/05 18:28:51 radhermit Exp $
+
+EAPI=3
+inherit eutils autotools
+
+MY_P=${P/_pre/pre}
+
+DESCRIPTION="A C library for reading and writing files containing sampled sound"
+HOMEPAGE="http://www.mega-nerd.com/libsndfile"
+if [[ "${MY_P}" == "${P}" ]]; then
+	SRC_URI="http://www.mega-nerd.com/libsndfile/files/${P}.tar.gz"
+else
+	SRC_URI="http://www.mega-nerd.com/tmp/${MY_P}b.tar.gz"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="alsa minimal sqlite"
+
+RDEPEND="!minimal? ( >=media-libs/flac-1.2.1
+		>=media-libs/libogg-1.1.3
+		>=media-libs/libvorbis-1.2.3 )
+	alsa? ( media-libs/alsa-lib )
+	sqlite? ( >=dev-db/sqlite-3.2 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	sed -i -e "s/noinst_PROGRAMS/check_PROGRAMS/" "${S}/tests/Makefile.am" \
+		"${S}/examples/Makefile.am" || die "sed failed"
+
+	epatch "${FILESDIR}"/${PN}-1.0.17-regtests-need-sqlite.patch
+
+	rm M4/libtool.m4 M4/lt*.m4 || die "rm failed"
+
+	AT_M4DIR=M4 eautoreconf
+	epunt_cxx
+}
+
+src_configure() {
+	econf $(use_enable sqlite) \
+		$(use_enable alsa) \
+		$(use_enable !minimal external-libs) \
+		--disable-octave \
+		--disable-gcc-werror \
+		--disable-gcc-pipe \
+		--disable-dependency-tracking
+}
+
+src_install() {
+	emake DESTDIR="${D}" htmldocdir="/usr/share/doc/${PF}/html" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog NEWS README
+}