Version bump and cleanup.

10 files changed, 37 insertions, 69 deletions

diff --git a/media-libs/libsndfile/ChangeLog b/media-libs/libsndfile/ChangeLog
index fb3978f68e84..1a33a14210ab 100644
--- a/media-libs/libsndfile/ChangeLog
+++ b/media-libs/libsndfile/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/libsndfile
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/ChangeLog,v 1.32 2004/11/04 01:41:03 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/ChangeLog,v 1.33 2004/11/17 22:06:33 eradicator Exp $
+
+*libsndfile-1.0.11 (17 Nov 2004)
+
+  17 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -libsndfile-0.0.28.ebuild, libsndfile-1.0.10.ebuild,
+  +libsndfile-1.0.11.ebuild, -libsndfile-1.0.4.ebuild,
+  -libsndfile-1.0.6.ebuild:
+  Version bump and cleanup.
 
   03 Nov 2004; Stephen P. Becker <geoman@gentoo.org>
   libsndfile-1.0.10.ebuild:
diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index a7692a2db0f9..e55353a1b0de 100644
--- a/media-libs/libsndfile/Manifest
+++ b/media-libs/libsndfile/Manifest
@@ -1,14 +1,16 @@
-MD5 811cbe86740934522c0228b48160c8e2 ChangeLog 4151
 MD5 3132e3af358172fca59a56eb14d5c402 libsndfile-0.0.28.ebuild 638
-MD5 bdc9d03c6957ce30deb1d3f5eb813ea5 libsndfile-1.0.9.ebuild 667
 MD5 c2cc6df21cfd8a2515ff05bf933a4e55 libsndfile-1.0.4.ebuild 733
 MD5 c8cfd1feb2e32ebf6eb3d85ece5eea74 libsndfile-1.0.5.ebuild 646
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 fcd5f5ae5d16d6d5e714bfb1ddfdd6dc libsndfile-1.0.6.ebuild 655
-MD5 eca2c84978e206c137e7ea4ce73f69a9 libsndfile-1.0.10.ebuild 1095
+MD5 bdc9d03c6957ce30deb1d3f5eb813ea5 libsndfile-1.0.9.ebuild 667
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 811cbe86740934522c0228b48160c8e2 ChangeLog 4151
+MD5 1b7e92cc4a3294ea4ba3cb7550f15051 libsndfile-1.0.10.ebuild 1080
+MD5 2d318cf38a0d283b9f0464c3e3edf5d9 libsndfile-1.0.11.ebuild 994
 MD5 776bde0b41c60522e27abf9bc701d3a1 files/digest-libsndfile-0.0.28 69
-MD5 741beed3c7e02485d6a453ebefaa6f69 files/digest-libsndfile-1.0.9 68
-MD5 a2f27725a7da73281e185f3fed80c16c files/digest-libsndfile-1.0.10 69
 MD5 c2cceb29cedeaf6cbce0b1e4a0f73230 files/digest-libsndfile-1.0.4 68
 MD5 69310df3755bad8a23a2dd9de6425318 files/digest-libsndfile-1.0.5 68
 MD5 7931c8cccdc385415334ebbbf48b99ee files/digest-libsndfile-1.0.6 68
+MD5 741beed3c7e02485d6a453ebefaa6f69 files/digest-libsndfile-1.0.9 68
+MD5 a2f27725a7da73281e185f3fed80c16c files/digest-libsndfile-1.0.10 69
+MD5 03568645ed600c683b4289c8a28a3beb files/digest-libsndfile-1.0.11 69
diff --git a/media-libs/libsndfile/files/digest-libsndfile-0.0.28 b/media-libs/libsndfile/files/digest-libsndfile-0.0.28
deleted file mode 100644
index 47bb2e8e6173..000000000000
--- a/media-libs/libsndfile/files/digest-libsndfile-0.0.28
+++ /dev/null
@@ -1 +0,0 @@
-MD5 611bde6c4d774a70d377d7d9da40f8ae libsndfile-0.0.28.tar.gz 400534
diff --git a/media-libs/libsndfile/files/digest-libsndfile-1.0.11 b/media-libs/libsndfile/files/digest-libsndfile-1.0.11
new file mode 100644
index 000000000000..124cc32a41e8
--- /dev/null
+++ b/media-libs/libsndfile/files/digest-libsndfile-1.0.11
@@ -0,0 +1 @@
+MD5 9ec0b3610041423a57387f284849f2fc libsndfile-1.0.11.tar.gz 816107
diff --git a/media-libs/libsndfile/files/digest-libsndfile-1.0.4 b/media-libs/libsndfile/files/digest-libsndfile-1.0.4
deleted file mode 100644
index e643c712b2e3..000000000000
--- a/media-libs/libsndfile/files/digest-libsndfile-1.0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 33929011f48fa2a4b72baf54c69196c5 libsndfile-1.0.4.tar.gz 616271
diff --git a/media-libs/libsndfile/files/digest-libsndfile-1.0.6 b/media-libs/libsndfile/files/digest-libsndfile-1.0.6
deleted file mode 100644
index 611526326899..000000000000
--- a/media-libs/libsndfile/files/digest-libsndfile-1.0.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b41c421d83bd7c214a79f8dde358f2e0 libsndfile-1.0.6.tar.gz 788855
diff --git a/media-libs/libsndfile/libsndfile-0.0.28.ebuild b/media-libs/libsndfile/libsndfile-0.0.28.ebuild
deleted file mode 100644
index 124a302ee9db..000000000000
--- a/media-libs/libsndfile/libsndfile-0.0.28.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/libsndfile-0.0.28.ebuild,v 1.10 2004/07/14 20:16:07 agriffis Exp $
-
-DESCRIPTION="A C library for reading and writing files containing sampled sound"
-HOMEPAGE="http://www.zipworld.com.au/~erikd/libsndfile/"
-SRC_URI="http://www.zipworld.com.au/~erikd/libsndfile/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="x86 ~ppc sparc "
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_install () {
-
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-
-}
diff --git a/media-libs/libsndfile/libsndfile-1.0.10.ebuild b/media-libs/libsndfile/libsndfile-1.0.10.ebuild
index 6b0c3c8c9a52..f5c81f7308b1 100644
--- a/media-libs/libsndfile/libsndfile-1.0.10.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.10.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.10.ebuild,v 1.9 2004/11/08 21:23:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.10.ebuild,v 1.10 2004/11/17 22:06:33 eradicator Exp $
+
+IUSE="static pic"
 
 DESCRIPTION="A C library for reading and writing files containing sampled sound"
 HOMEPAGE="http://www.mega-nerd.com/libsndfile/"
@@ -9,7 +11,6 @@ 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 ~ppc-macos sparc x86"
-IUSE="static pic"
 
 DEPEND="virtual/libc"
 
@@ -27,5 +28,5 @@ src_compile() {
 
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO || die "dodoc failed"
+	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
 }
diff --git a/media-libs/libsndfile/libsndfile-1.0.6.ebuild b/media-libs/libsndfile/libsndfile-1.0.11.ebuild
index b94fed74ca45..a3f121c307ec 100644
--- a/media-libs/libsndfile/libsndfile-1.0.6.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.11.ebuild
@@ -1,19 +1,30 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.6.ebuild,v 1.4 2004/07/01 08:00:52 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.11.ebuild,v 1.1 2004/11/17 22:06:33 eradicator Exp $
+
+IUSE="static"
 
 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"
 
-KEYWORDS="~x86 ~ppc ~alpha ~ia64"
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~sparc ~x86"
 
 DEPEND="virtual/libc"
 
-src_install () {
+src_compile() {
+	econf $(use_enable static) || die "./configure 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"
 }
diff --git a/media-libs/libsndfile/libsndfile-1.0.4.ebuild b/media-libs/libsndfile/libsndfile-1.0.4.ebuild
deleted file mode 100644
index e78994caadfe..000000000000
--- a/media-libs/libsndfile/libsndfile-1.0.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.4.ebuild,v 1.8 2004/07/01 08:00:52 eradicator Exp $
-
-IUSE=""
-
-DESCRIPTION="A C library for reading and writing files containing sampled sound"
-HOMEPAGE="http://www.zipworld.com.au/~erikd/libsndfile/"
-SRC_URI="http://www.zipworld.com.au/~erikd/libsndfile/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="x86 sparc ~ppc amd64"
-
-DEPEND="virtual/libc"
-
-src_compile () {
-
-	econf || die "configure failed"
-
-	make || die "make failed"
-
-}
-
-src_install () {
-
-	einstall || die "make install failed"
-
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-
-}