Version bump and remove old. Update to EAPI 4, add static-libs USE flag, and remove unneeded m4 script removal line.

(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)

4 files changed, 17 insertions, 132 deletions

diff --git a/media-libs/libsndfile/ChangeLog b/media-libs/libsndfile/ChangeLog
index a3f780f2d39a..6ca091430690 100644
--- a/media-libs/libsndfile/ChangeLog
+++ b/media-libs/libsndfile/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/libsndfile
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/ChangeLog,v 1.121 2011/03/23 21:13:33 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/ChangeLog,v 1.122 2011/03/24 08:09:37 radhermit Exp $
+
+*libsndfile-1.0.24 (24 Mar 2011)
+
+  24 Mar 2011; Tim Harder <radhermit@gentoo.org> -libsndfile-1.0.21.ebuild,
+  -libsndfile-1.0.21-r1.ebuild, -libsndfile-1.0.22.ebuild,
+  +libsndfile-1.0.24.ebuild:
+  Version bump and remove old. Update to EAPI 4, add static-libs USE flag, and
+  remove unneeded m4 script removal line.
 
   23 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> libsndfile-1.0.23.ebuild:
   ppc/ppc64 stable wrt #355361
diff --git a/media-libs/libsndfile/libsndfile-1.0.21-r1.ebuild b/media-libs/libsndfile/libsndfile-1.0.21-r1.ebuild
deleted file mode 100644
index 951324357caf..000000000000
--- a/media-libs/libsndfile/libsndfile-1.0.21-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.21-r1.ebuild,v 1.1 2010/09/05 09:26:49 ssuominen Exp $
-
-inherit eutils libtool 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.1_rc1 )
-	alsa? ( media-libs/alsa-lib )
-	sqlite? ( >=dev-db/sqlite-3.2 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	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_compile() {
-	econf $(use_enable sqlite) \
-		$(use_enable alsa) \
-		$(use_enable !minimal external-libs) \
-		--disable-octave \
-		--disable-gcc-werror \
-		--disable-gcc-pipe \
-		--disable-dependency-tracking
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" htmldocdir="/usr/share/doc/${PF}/html" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/media-libs/libsndfile/libsndfile-1.0.21.ebuild b/media-libs/libsndfile/libsndfile-1.0.21.ebuild
deleted file mode 100644
index e57cf8f7c362..000000000000
--- a/media-libs/libsndfile/libsndfile-1.0.21.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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.21.ebuild,v 1.8 2010/06/12 12:08:21 ssuominen Exp $
-
-inherit eutils libtool autotools flag-o-matic
-
-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.1_rc1 )
-	alsa? ( media-libs/alsa-lib )
-	sqlite? ( >=dev-db/sqlite-3.2 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	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_compile() {
-	append-lfs-flags
-
-	econf $(use_enable sqlite) \
-		$(use_enable alsa) \
-		$(use_enable !minimal external-libs) \
-		--disable-octave \
-		--disable-gcc-werror \
-		--disable-gcc-pipe \
-		--disable-dependency-tracking
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" htmldocdir="/usr/share/doc/${PF}/html" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/media-libs/libsndfile/libsndfile-1.0.22.ebuild b/media-libs/libsndfile/libsndfile-1.0.24.ebuild
index 07d507820ee1..6bf77b01f6ef 100644
--- a/media-libs/libsndfile/libsndfile-1.0.22.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.24.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.24.ebuild,v 1.1 2011/03/24 08:09:37 radhermit Exp $
 
-EAPI=3
+EAPI=4
 inherit eutils autotools
 
 MY_P=${P/_pre/pre}
@@ -18,7 +18,7 @@ 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"
+IUSE="alsa minimal sqlite static-libs"
 
 RDEPEND="!minimal? ( >=media-libs/flac-1.2.1
 		>=media-libs/libogg-1.1.3
@@ -36,23 +36,22 @@ src_prepare() {
 
 	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 static-libs static) \
 		$(use_enable alsa) \
 		$(use_enable !minimal external-libs) \
+		htmldocdir=/usr/share/doc/${PF}/html \
 		--disable-octave \
 		--disable-gcc-werror \
-		--disable-gcc-pipe \
-		--disable-dependency-tracking
+		--disable-gcc-pipe
 }
 
 src_install() {
-	emake DESTDIR="${D}" htmldocdir="/usr/share/doc/${PF}/html" install || die "emake install failed"
+	emake DESTDIR="${D}" htmldocdir="/usr/share/doc/${PF}/html" install
 	dodoc AUTHORS ChangeLog NEWS README
 }