added a patch to make compiling possible again. fixes bug #74436.

Package-Manager: portage-2.0.51-r14

5 files changed, 46 insertions, 25 deletions

diff --git a/media-sound/protux/ChangeLog b/media-sound/protux/ChangeLog
index 5f14385a3ae2..382c8528fa9c 100644
--- a/media-sound/protux/ChangeLog
+++ b/media-sound/protux/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/protux
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/protux/ChangeLog,v 1.15 2005/01/13 11:58:26 zypher Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/protux/ChangeLog,v 1.16 2005/01/20 21:37:22 luckyduck Exp $
+
+  20 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> protux-0.20.1.ebuild,
+  protux-0.20.2.ebuild:
+  added a patch to make compiling possible again. fixes bug #74436.
 
   13 Jan 2005; Marc Hildebrand <zypher@gentoo.org> protux-0.20.2.ebuild:
   stable on x86.
diff --git a/media-sound/protux/Manifest b/media-sound/protux/Manifest
index e08c143f1bc5..8b3e83196039 100644
--- a/media-sound/protux/Manifest
+++ b/media-sound/protux/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 443cb532ce17cb9d1458e48b70770ad5 protux-0.20.1.ebuild 846
-MD5 f47dd21a962d6432ea2e6640c69e3f33 ChangeLog 2035
-MD5 e5909577c2df2490d3f92fd14035e7d0 protux-0.20.2.ebuild 875
+MD5 45c5c25a23922d3a67ac6b1136ddf009 protux-0.20.2.ebuild 954
+MD5 11dfe54a44c9191193747c4682a0f5cc protux-0.20.1.ebuild 930
+MD5 970571f3b62b5edd32ada9c1b65968f7 ChangeLog 2205
 MD5 d0d7ea03e238a808414b4426394c100f metadata.xml 221
-MD5 c4d75b6d370a9e848f5dd0e5a87b2d02 files/digest-protux-0.20.2 65
 MD5 2ef4161f2da38462aeb9b3ef66c67442 files/digest-protux-0.20.1 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB5mNoRPjscZbntocRAjPLAJ92Xm5sVeKXSB49Dtt+prwazTqCOwCfe8et
-zaDxH409gJDodQyZjCFlmcY=
-=hwXW
------END PGP SIGNATURE-----
+MD5 c4d75b6d370a9e848f5dd0e5a87b2d02 files/digest-protux-0.20.2 65
+MD5 1cd68658f27d5467ba72e158eaf76083 files/protux-gentoo.patch 468
diff --git a/media-sound/protux/files/protux-gentoo.patch b/media-sound/protux/files/protux-gentoo.patch
new file mode 100644
index 000000000000..28da2507cb4f
--- /dev/null
+++ b/media-sound/protux/files/protux-gentoo.patch
@@ -0,0 +1,12 @@
+diff -urpN src.orig/CursorManager.cc src/CursorManager.cc
+--- src.orig/CursorManager.cc	2005-01-20 21:11:27.732575456 +0100
++++ src/CursorManager.cc	2005-01-20 21:12:08.017451224 +0100
+@@ -209,7 +209,7 @@ void CursorManager::update(int x, int y)
+ 
+ 
+ 
+-inline QString CursorManager::block_to_smpte(long long bpos, int sampleRate)
++QString CursorManager::block_to_smpte(long long bpos, int sampleRate)
+ 	{
+ 	float f =  sampleRate / 30;
+ 	float flo = (float) bpos /  f;
diff --git a/media-sound/protux/protux-0.20.1.ebuild b/media-sound/protux/protux-0.20.1.ebuild
index c04b73f6a86f..ecfa3307276b 100644
--- a/media-sound/protux/protux-0.20.1.ebuild
+++ b/media-sound/protux/protux-0.20.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/protux/protux-0.20.1.ebuild,v 1.4 2004/06/25 00:17:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/protux/protux-0.20.1.ebuild,v 1.5 2005/01/20 21:37:22 luckyduck Exp $
 
-inherit kde-functions
+inherit eutils kde-functions
 
 DESCRIPTION="Professional Audio Tools for GNU/Linux"
 HOMEPAGE="http://www.nongnu.org/protux"
@@ -11,7 +11,7 @@ SRC_URI="http://savannah.nongnu.org/download/protux/${P}.tar.gz"
 IUSE="static"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86"
+KEYWORDS="x86 ~amd64"
 
 DEPEND="virtual/x11
 	>=x11-libs/qt-3
@@ -19,6 +19,13 @@ DEPEND="virtual/x11
 
 set-qtdir 3
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PN}-gentoo.patch
+}
+
 src_compile() {
 	export QT_MOC=${QTDIR}/bin/moc
 	local myconf
@@ -30,5 +37,5 @@ src_compile() {
 
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYRIGHT ChangeLog FAQ README TODO
+	dodoc AUTHORS COPYING ChangeLog README
 }
diff --git a/media-sound/protux/protux-0.20.2.ebuild b/media-sound/protux/protux-0.20.2.ebuild
index 8a7d3bcabd3e..ffc13324621d 100644
--- a/media-sound/protux/protux-0.20.2.ebuild
+++ b/media-sound/protux/protux-0.20.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/protux/protux-0.20.2.ebuild,v 1.4 2005/01/13 11:58:26 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/protux/protux-0.20.2.ebuild,v 1.5 2005/01/20 21:37:22 luckyduck Exp $
 
-inherit kde-functions
+inherit eutils kde-functions
 
 DESCRIPTION="Professional Audio Tools for GNU/Linux"
 HOMEPAGE="http://www.nongnu.org/protux"
@@ -19,6 +19,13 @@ DEPEND="virtual/x11
 
 set-qtdir 3
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PN}-gentoo.patch
+}
+
 src_compile() {
 	export QT_MOC=${QTDIR}/bin/moc
 	local myconf
@@ -30,5 +37,5 @@ src_compile() {
 
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYRIGHT ChangeLog FAQ README TODO
+	dodoc AUTHORS COPYING ChangeLog README
 }