Version bump for bug 181185.

(Portage version: 2.1.2.9)

9 files changed, 31 insertions, 165 deletions

diff --git a/media-plugins/swh-plugins/ChangeLog b/media-plugins/swh-plugins/ChangeLog
index 03b17c449f1c..46f53537bc38 100644
--- a/media-plugins/swh-plugins/ChangeLog
+++ b/media-plugins/swh-plugins/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-plugins/swh-plugins
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/swh-plugins/ChangeLog,v 1.31 2007/02/22 02:30:16 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/swh-plugins/ChangeLog,v 1.32 2007/06/16 14:28:18 drac Exp $
+
+*swh-plugins-0.4.15 (16 Jun 2007)
+
+  16 Jun 2007; Samuli Suominen <drac@gentoo.org>
+  -files/swh-plugins-0.4.3-compile.patch,
+  -files/swh-plugins-0.4.3-ppc.patch, -files/swh-plugins-quickfixes.patch,
+  -swh-plugins-0.4.11.ebuild, -swh-plugins-0.4.13.ebuild,
+  +swh-plugins-0.4.15.ebuild:
+  Version bump for bug 181185.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/media-plugins/swh-plugins/files/digest-swh-plugins-0.4.11 b/media-plugins/swh-plugins/files/digest-swh-plugins-0.4.11
deleted file mode 100644
index 321793266d30..000000000000
--- a/media-plugins/swh-plugins/files/digest-swh-plugins-0.4.11
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 eaee4b55be1d370014d5ee728bbf1c52 swh-plugins-0.4.11.tar.gz 894727
-RMD160 00dae584505facab6ae999c57d5ce796223a29fa swh-plugins-0.4.11.tar.gz 894727
-SHA256 bc5cf9bd2e048878c55362e47661fd1d8f10d1fefeacc4bfcc26b1d43c43efe0 swh-plugins-0.4.11.tar.gz 894727
diff --git a/media-plugins/swh-plugins/files/digest-swh-plugins-0.4.13 b/media-plugins/swh-plugins/files/digest-swh-plugins-0.4.13
deleted file mode 100644
index 94223892a195..000000000000
--- a/media-plugins/swh-plugins/files/digest-swh-plugins-0.4.13
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 83fc4f1ec9e6c7e0632b1b1d95717060 swh-plugins-0.4.13.tar.gz 896693
-RMD160 76f6dec074c1bd5e32122a0eba920ffff5f0ef04 swh-plugins-0.4.13.tar.gz 896693
-SHA256 760f6d59b0ba59ea6098943dc493ceb9b5252d7575f8c72896a58882dc854d4f swh-plugins-0.4.13.tar.gz 896693
diff --git a/media-plugins/swh-plugins/files/digest-swh-plugins-0.4.15 b/media-plugins/swh-plugins/files/digest-swh-plugins-0.4.15
new file mode 100644
index 000000000000..6f48259063f7
--- /dev/null
+++ b/media-plugins/swh-plugins/files/digest-swh-plugins-0.4.15
@@ -0,0 +1,3 @@
+MD5 2fbdccef2462ea553901acd429fa3573 swh-plugins-0.4.15.tar.gz 1051623
+RMD160 7b84a6b6269227a8c9b7091b3f3f08b5df3cb60d swh-plugins-0.4.15.tar.gz 1051623
+SHA256 d05ee8a4f4d92e828412bce3449a034f6ef16bb630eaf60f8fe4e15a89168640 swh-plugins-0.4.15.tar.gz 1051623
diff --git a/media-plugins/swh-plugins/files/swh-plugins-0.4.3-compile.patch b/media-plugins/swh-plugins/files/swh-plugins-0.4.3-compile.patch
deleted file mode 100644
index 787ee3c0404c..000000000000
--- a/media-plugins/swh-plugins/files/swh-plugins-0.4.3-compile.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- swh-plugins-0.4.3-orig/delay_1898.xml	2004-06-23 23:06:32.673601008 +0200
-+++ swh-plugins-0.4.3/delay_1898.xml	2004-06-23 23:08:48.793907576 +0200
-@@ -81,7 +81,7 @@
- 
-           for (i=0; i<to_process; i++) {
-             float read = *(readptr++);
--            *(writeptr++) = *(in++);
-+            *(writeptr++) = in[i];
- 	    buffer_write(out[i], read);
-           }
- 
-@@ -103,7 +103,7 @@
-           read_phase = write_phase - (long)delay_samples;
- 
-           read = buffer[read_phase & buffer_mask];
--          buffer[write_phase & buffer_mask] = *(in++);
-+          buffer[write_phase & buffer_mask] = in[i];
- 	  buffer_write(out[i], read);
-         }
- 
-@@ -199,7 +199,7 @@
-           read = LIN_INTERP (frac,
-                                  buffer[(read_phase-1) & buffer_mask],
-                                  buffer[read_phase & buffer_mask]);
--          buffer[write_phase & buffer_mask] = *(in++);
-+          buffer[write_phase & buffer_mask] = in[i];
- 	  buffer_write(out[i], read);
-           write_phase++;
-         }
-@@ -219,7 +219,7 @@
-           read = LIN_INTERP (frac,
-                              buffer[(read_phase-1) & buffer_mask],
-                              buffer[read_phase & buffer_mask]); 
--          buffer[write_phase & buffer_mask] = *(in++);
-+          buffer[write_phase & buffer_mask] = in[i];
- 	  buffer_write(out[i], read);
-         }
- 
-@@ -316,7 +316,7 @@
-                                           buffer[read_phase & buffer_mask], 
-                                           buffer[(read_phase+1) & buffer_mask], 
-                                           buffer[(read_phase+2) & buffer_mask]);
--          buffer[write_phase++ & buffer_mask] = *(in++);
-+          buffer[write_phase++ & buffer_mask] = in[i];
- 	  buffer_write(out[i], read);
-         }
-       } else {
-@@ -337,7 +337,7 @@
-                               buffer[read_phase & buffer_mask], 
-                               buffer[(read_phase+1) & buffer_mask], 
-                               buffer[(read_phase+2) & buffer_mask]);
--          buffer[write_phase & buffer_mask] = *(in++);
-+          buffer[write_phase & buffer_mask] = in[i];
- 	  buffer_write(out[i], read);
-         }
- 
diff --git a/media-plugins/swh-plugins/files/swh-plugins-0.4.3-ppc.patch b/media-plugins/swh-plugins/files/swh-plugins-0.4.3-ppc.patch
deleted file mode 100644
index 1b056330e454..000000000000
--- a/media-plugins/swh-plugins/files/swh-plugins-0.4.3-ppc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- swh-plugins-0.4.3-orig/gverb/gverb-test.c.orig	2004-06-29 18:11:36.491890744 +0200
-+++ swh-plugins-0.4.3/gverb/gverb-test.c	2004-06-29 18:13:19.357252832 +0200
-@@ -7,7 +7,13 @@
- 
- void run(const char *desc);
- 
-+#ifdef __i386__
- #define rdtscll(val) __asm__ __volatile__("rdtsc" : "=A" (val))
-+#elif __powerpc__
-+#define rdtscll(val) __asm__ __volatile__("mftb %0" : "=r" (val))
-+#else
-+#error Implement rdtscll for your architecture
-+#endif
- #define SIZE 48000
- 
- float in[SIZE], out[2][SIZE];
diff --git a/media-plugins/swh-plugins/files/swh-plugins-quickfixes.patch b/media-plugins/swh-plugins/files/swh-plugins-quickfixes.patch
deleted file mode 100644
index 0492598f7ece..000000000000
--- a/media-plugins/swh-plugins/files/swh-plugins-quickfixes.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- swh-plugins-0.2.8/configure.in	2002-07-19 15:37:35.000000000 +0200
-+++ swh-plugins-0.2.8-quickfix/configure.in	2002-10-21 18:43:38.000000000 +0200
-@@ -12,7 +12,6 @@
- AC_LANG_C
- AC_PROG_CC
- AC_REQUIRE_CPP
--AC_CHECK_HEADER(ladspa.h, [], [AC_MSG_ERROR([Cannot find ladspa.h, please install the LADSPA_SDK, or put ladspa.h somewhere it can be found]);])
- 
- CFLAGS="-lm"
- 
---- swh-plugins-0.2.8/Makefile.am	2002-07-18 17:59:18.000000000 +0200
-+++ swh-plugins-0.2.8-quickfix/Makefile.am	2002-10-21 18:42:18.000000000 +0200
-@@ -28,7 +28,7 @@
- EXTRA_DIST = *.xml *.c *.h *.dtd *.pl *.css impulses/*.h
- LINK = ld -shared -Bsymbolic -lc -lm -o $@
- pkgbin_PROGRAMS = $(SOBS)
--pkgbindir = /usr/local/lib/ladspa
-+pkgbindir = /usr/lib/ladspa
- DESTDIR = $(INSTALL_ROOT)
- DISTFN = $(distdir)
- 
---- swh-plugins-0.2.8/Makefile.in	2002-07-19 15:37:52.000000000 +0200
-+++ swh-plugins-0.2.8-quickfix/Makefile.in	2002-10-21 18:42:45.000000000 +0200
-@@ -104,7 +104,7 @@
- EXTRA_DIST = *.xml *.c *.h *.dtd *.pl *.css impulses/*.h
- LINK = ld -shared -Bsymbolic -lc -lm -o $@
- pkgbin_PROGRAMS = $(SOBS)
--pkgbindir = /usr/local/lib/ladspa
-+pkgbindir = /usr/lib/ladspa
- DESTDIR = $(INSTALL_ROOT)
- DISTFN = $(distdir)
- 
diff --git a/media-plugins/swh-plugins/swh-plugins-0.4.11.ebuild b/media-plugins/swh-plugins/swh-plugins-0.4.11.ebuild
deleted file mode 100644
index bd3c47a72201..000000000000
--- a/media-plugins/swh-plugins/swh-plugins-0.4.11.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/swh-plugins/swh-plugins-0.4.11.ebuild,v 1.5 2005/09/04 00:04:01 flameeyes Exp $
-
-inherit flag-o-matic eutils
-
-IUSE=""
-DESCRIPTION="Large collection of LADSPA audio plugins/effects"
-HOMEPAGE="http://plugin.org.uk"
-SRC_URI="http://plugin.org.uk/releases/${PV}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc x86"
-
-DEPEND="media-libs/ladspa-sdk
-	sci-libs/fftw
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A} || die
-
-	use amd64 && append-flags -fPIC
-	use ppc && append-flags -fPIC
-
-	cd ${S}
-	sed -i '/MACHINE=/s/.*/MACHINE=""/' configure
-}
-
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog README TODO || die
-}
-
-pkg_postinst() {
-	ewarn "WARNING: You have to be careful when using the"
-	ewarn "swh plugins. Be sure to lower your sound volume"
-	ewarn "and then play around a bit with the plugins so"
-	ewarn "you get a feeling for it. Otherwise your speakers"
-	ewarn "won't like that."
-}
diff --git a/media-plugins/swh-plugins/swh-plugins-0.4.13.ebuild b/media-plugins/swh-plugins/swh-plugins-0.4.15.ebuild
index 896a1fce620f..b805bb7a9926 100644
--- a/media-plugins/swh-plugins/swh-plugins-0.4.13.ebuild
+++ b/media-plugins/swh-plugins/swh-plugins-0.4.15.ebuild
@@ -1,44 +1,50 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/swh-plugins/swh-plugins-0.4.13.ebuild,v 1.3 2005/09/04 00:04:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/swh-plugins/swh-plugins-0.4.15.ebuild,v 1.1 2007/06/16 14:28:18 drac Exp $
 
 inherit flag-o-matic eutils
 
-IUSE=""
 DESCRIPTION="Large collection of LADSPA audio plugins/effects"
 HOMEPAGE="http://plugin.org.uk"
 SRC_URI="http://plugin.org.uk/releases/${PV}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos"
+KEYWORDS="~amd64 ~ppc ~ppc-macos ~x86"
+IUSE="3dnow nls sse"
 
 DEPEND="media-libs/ladspa-sdk
 	dev-util/pkgconfig
-	sci-libs/fftw
+	>=sci-libs/fftw-3
 	>=sys-apps/sed-4"
 
 src_unpack() {
-	unpack ${A} || die
+	unpack ${A}
 
 	use amd64 && append-flags -fPIC
 	use ppc && append-flags -fPIC
 	use ppc-macos && append-flags -fPIC
 	use ppc-macos && append-ldflags -lintl -lsystem -lm
 
-	cd ${S}
-	sed -i '/MACHINE=/s/.*/MACHINE=""/' configure
+	cd "${S}"
+	sed -i -e '/MACHINE=/s/.*/MACHINE=""/' configure
+	sed -i -r  "s/(^plugindir.*)(lib)/\1$(get_libdir)/g" Makefile.in
 }
 
 src_compile() {
 	use ppc-macos && myconf="${myconf} --enable-darwin"
-	econf ${myconf} || die "configure failed"
-	make || die "make failed"
+	econf ${myconf} \
+		$(use_enable sse) \
+		$(use_enable 3dnow) \
+		$(use_enable nls) \
+		--enable-fast-install \
+		--disable-dependency-tracking
+	emake || die "emake failed."
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog README TODO || die
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS ChangeLog README TODO
 }
 
 pkg_postinst() {