It helps not to forget upload also patch.

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

4 files changed, 44 insertions, 55 deletions

diff --git a/media-sound/sooperlooper/Manifest b/media-sound/sooperlooper/Manifest
index d3b582a44c8e..6493b633fc90 100644
--- a/media-sound/sooperlooper/Manifest
+++ b/media-sound/sooperlooper/Manifest
@@ -1,9 +1,8 @@
 AUX sooperlooper-1.6.10-asneeded.patch 1136 RMD160 ebb75a51bf4d3e2abc4f202d038d690ad85406c9 SHA1 3982ce41683c8d199bf5e64a18ad695c42c457b3 SHA256 6b083f5e5a849a66ed7affe545064e73263ede2abfae23034de8e93e1fb87f1c
+AUX sooperlooper-1.6.13_p2-const.patch 1236 RMD160 6c70623024ae33e61c0128ecf3a84addf3d993fd SHA1 b6bc3f24a82fae8f63598f7a601a8b863741e652 SHA256 7caccee449103f2310f4aa7f3c350109bd8ed9eb929a67a71f7bc1ab7c3a974b
 AUX sooperlooper-1.6.5-cxxflags.patch 478 RMD160 8063a9dc4ea164d7152882ce0219312f0f8e9bca SHA1 2548ed0c528503b9613e261e6f364ecbc29e3137 SHA256 da1d4d770c47cac3d49c37eda5837ec0543b8b93e92414d71c18f1bbe42d0af9
-DIST sooperlooper-1.6.10.tar.gz 690937 RMD160 18a983a247960aa79755ca74a239f30e1b838e21 SHA1 de97f2f31d85826a4bd2aa00c5a564981bb59d28 SHA256 a981d25e3963097e09c142cba8afc3ad01a7a79df4e6c30c7b86466fd97b154d
 DIST sooperlooper-1.6.13-2.tar.gz 699229 RMD160 ee4e1c8cdfba2e5b19db2b05e59efacef2e7eba3 SHA1 ed6704b1cf06290b8031566b0322336a0b8ed5fa SHA256 6b1611e8bc0c56d04efcdd8e2157645c515b609838bc8244380be0bf83652def
 DIST sooperlooper-1.6.5-m4.tar.bz2 1463 RMD160 6855f9b4a53f4cf591f321545e4b750a70896cda SHA1 8e9735044ff05319eed85d0a62bcf093720d5ac1 SHA256 ee8e3084c3d3d4db29f3d7b4dde0d260b9dfb72be8c9362c7fd711fb7784e0bb
-EBUILD sooperlooper-1.6.10.ebuild 1298 RMD160 9edd08a7a559363fdba1798d7192ae1d6194a139 SHA1 6933f04556468781339825ff9575556f37bf9f7f SHA256 9e8c832d9b501ad768de238938d3c87099cb0443fa41ed0d2e34c58d471f9c91
-EBUILD sooperlooper-1.6.13_p2.ebuild 1280 RMD160 c9f6f3dd6dc7699c34d753d4ed55a8b34820e987 SHA1 132e2f84c56c31bb59d42abe319f55ea27c610e4 SHA256 810fa6ebc9a59e8f71a536792e795fb9473e3be69abbdff4d66e7d754fc7c600
+EBUILD sooperlooper-1.6.13_p2.ebuild 1363 RMD160 2f213e062dd5452f781ffe79d219d52e885f04ff SHA1 cd1544c26269961b53107e175fd55e8faf65e038 SHA256 97cca322ef1fb5a8445f4a672618f148cfa80a42dfbc6be2fa233052227ffbaa
 MISC ChangeLog 3326 RMD160 a758289e101d1b9fed912937e7daba56a35dfce8 SHA1 ebb6a80123e4eba3a8268534ab51f27736d2feea SHA256 dc52de54e8a62a770c39d8dd2e72553d2cf3388a6f89774b347faa832ad9ba87
 MISC metadata.xml 227 RMD160 db91bfb1298cfaa0069ba0d53f7d8f2791f7d344 SHA1 51ff8c11f7cb3c6b7a97ff2c24af697f1f5ac2ca SHA256 0f8c8d5cb2453a9adf2c7c88c98e613ef02ca8640ecc46379fe9a5e50f7bff7b
diff --git a/media-sound/sooperlooper/files/sooperlooper-1.6.13_p2-const.patch b/media-sound/sooperlooper/files/sooperlooper-1.6.13_p2-const.patch
new file mode 100644
index 000000000000..58fe5443221b
--- /dev/null
+++ b/media-sound/sooperlooper/files/sooperlooper-1.6.13_p2-const.patch
@@ -0,0 +1,36 @@
+diff -ru sooperlooper-1.6.13.orig/libs/midi++/midi.cc sooperlooper-1.6.13/libs/midi++/midi.cc
+--- sooperlooper-1.6.13.orig/libs/midi++/midi.cc	2009-03-04 09:28:54.000000000 +0000
++++ sooperlooper-1.6.13/libs/midi++/midi.cc	2009-03-04 09:36:18.000000000 +0000
+@@ -159,7 +159,7 @@
+ MIDI::decode_controller_name (const char *name)
+ 
+ {
+-	char *lparen;
++	const char *lparen;
+ 	size_t len;
+ 
+ 	if ((lparen = strrchr (name, '(')) != 0) {
+diff -ru sooperlooper-1.6.13.orig/libs/pbd/basename.cc sooperlooper-1.6.13/libs/pbd/basename.cc
+--- sooperlooper-1.6.13.orig/libs/pbd/basename.cc	2009-03-04 09:28:54.000000000 +0000
++++ sooperlooper-1.6.13/libs/pbd/basename.cc	2009-03-04 09:29:30.000000000 +0000
+@@ -6,7 +6,7 @@
+ PBD::basename (const char *path)
+ 
+ {
+-	char *slash;
++	const char *slash;
+ 
+ 	if ((slash = strrchr (path, '/')) == 0) {
+ 		return strdup (path);
+diff -ru sooperlooper-1.6.13.orig/libs/pbd/dirname.cc sooperlooper-1.6.13/libs/pbd/dirname.cc
+--- sooperlooper-1.6.13.orig/libs/pbd/dirname.cc	2009-03-04 09:28:54.000000000 +0000
++++ sooperlooper-1.6.13/libs/pbd/dirname.cc	2009-03-04 09:29:24.000000000 +0000
+@@ -9,7 +9,7 @@
+ PBD::dirname (const char *path)
+ 
+ {
+-	char *slash;
++	const char *slash;
+ 	size_t len;
+ 	char *ret;
+ 	
diff --git a/media-sound/sooperlooper/sooperlooper-1.6.10.ebuild b/media-sound/sooperlooper/sooperlooper-1.6.10.ebuild
deleted file mode 100644
index 61323c155f7b..000000000000
--- a/media-sound/sooperlooper/sooperlooper-1.6.10.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sooperlooper/sooperlooper-1.6.10.ebuild,v 1.1 2008/09/02 09:04:23 aballier Exp $
-
-EAPI=1
-
-inherit wxwidgets eutils autotools
-
-DESCRIPTION="Live looping sampler with immediate loop recording"
-HOMEPAGE="http://essej.net/sooperlooper/index.html"
-SRC_URI="http://essej.net/sooperlooper/${P}.tar.gz
-	mirror://gentoo/${PN}-1.6.5-m4.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="media-sound/jack-audio-connection-kit
-	x11-libs/wxGTK:2.8
-	media-libs/liblo
-	dev-libs/libsigc++:1.2
-	media-libs/libsndfile
-	media-libs/libsamplerate
-	dev-libs/libxml2
-	media-libs/rubberband
-	sci-libs/fftw:3.0"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	mv "${WORKDIR}/aclocal" "${S}" || die "failed to move .m4 files"
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-1.6.5-cxxflags.patch"
-	epatch "${FILESDIR}/${P}-asneeded.patch"
-	AT_M4DIR="${S}/aclocal" eautoreconf
-}
-
-src_compile() {
-	WX_GTK_VER="2.8"
-	need-wxwidgets unicode
-	econf --disable-optimize --with-wxconfig-path="${WX_CONFIG}"
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc OSC README
-}
diff --git a/media-sound/sooperlooper/sooperlooper-1.6.13_p2.ebuild b/media-sound/sooperlooper/sooperlooper-1.6.13_p2.ebuild
index 5078753b9e55..fd7055bc2dd8 100644
--- a/media-sound/sooperlooper/sooperlooper-1.6.13_p2.ebuild
+++ b/media-sound/sooperlooper/sooperlooper-1.6.13_p2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sooperlooper/sooperlooper-1.6.13_p2.ebuild,v 1.1 2009/07/19 12:43:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sooperlooper/sooperlooper-1.6.13_p2.ebuild,v 1.2 2009/07/19 12:50:38 ssuominen Exp $
 
 EAPI=2
 inherit autotools eutils wxwidgets
@@ -31,7 +31,11 @@ S=${WORKDIR}/${P/_p*}
 
 src_prepare() {
 	cp -rf "${WORKDIR}"/aclocal "${S}" || die "copying aclocal failed"
-	epatch "${FILESDIR}"/${PN}-1.6.5-cxxflags.patch
+
+	epatch "${FILESDIR}"/${PN}-1.6.5-cxxflags.patch \
+		"${FILESDIR}"/${PN}-1.6.10-asneeded.patch \
+		"${FILESDIR}"/${P}-const.patch
+
 	AT_M4DIR="${S}/aclocal" eautoreconf
 }