Fixed compilation errors with gcc-3.4. Thanks to Bjarke Istrup Pedersen <Bjarke.ip@tekpunkt.dk> in bug #61223. Don't install ABOUT-NLS, COPYING and INSTALL doc files.

7 files changed, 77 insertions, 13 deletions

diff --git a/media-sound/orpheus/ChangeLog b/media-sound/orpheus/ChangeLog
index f753f714697f..fc0182b855ec 100644
--- a/media-sound/orpheus/ChangeLog
+++ b/media-sound/orpheus/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/orpheus
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/orpheus/ChangeLog,v 1.9 2004/06/25 00:16:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/orpheus/ChangeLog,v 1.10 2004/09/04 01:10:35 swegener Exp $
+
+  04 Sep 2004; Sven Wegener <swegener@gentoo.org> +files/1.5-gcc34.patch,
+  orpheus-1.2.ebuild, orpheus-1.3.ebuild, orpheus-1.4.ebuild,
+  orpheus-1.5.ebuild:
+  Fixed compilation errors with gcc-3.4. Thanks to Bjarke Istrup Pedersen
+  <Bjarke.ip@tekpunkt.dk> in bug #61223. Don't install ABOUT-NLS, COPYING and
+  INSTALL doc files.
 
   07 Jun 2004; Aron Griffis <agriffis@gentoo.org> orpheus-1.2.ebuild,
   orpheus-1.3.ebuild, orpheus-1.4.ebuild, orpheus-1.5.ebuild:
diff --git a/media-sound/orpheus/Manifest b/media-sound/orpheus/Manifest
index 4076ac9c6431..59e50b35fd98 100644
--- a/media-sound/orpheus/Manifest
+++ b/media-sound/orpheus/Manifest
@@ -1,10 +1,21 @@
-MD5 40761cd568efdb9b44de119f75b2e1e3 orpheus-1.3.ebuild 1282
-MD5 245abb6228031e868efbb8d42d7bfbee orpheus-1.5.ebuild 1269
-MD5 837a6340802ea540c2b538cee88d0ce2 orpheus-1.2.ebuild 1282
-MD5 668c8c74bf58d2e6a63d7f4c2930d529 ChangeLog 1319
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b4d3d353414fde0aff6aab1ea0f66a20 ChangeLog 1652
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 80bf1c43f2df027560f216d2e15c2389 orpheus-1.4.ebuild 1269
+MD5 a0234d6e132353bdb3c20ea0828e2541 orpheus-1.2.ebuild 1256
+MD5 b095bac98e3f2b630ced9f4aa7eecbb0 orpheus-1.3.ebuild 1256
+MD5 0569cb148a03eb4b544bc0e8fd0cc66c orpheus-1.4.ebuild 1243
+MD5 d71eae2abffbce97224e628d9b6a03c2 orpheus-1.5.ebuild 1333
 MD5 fb24e10c417c43c6d78d208574f36979 files/digest-orpheus-1.2 63
 MD5 23ce16fe49a7f4f015d46bd86ce7edf2 files/digest-orpheus-1.3 63
 MD5 3146a03673af811a8055cc38753d273a files/digest-orpheus-1.4 63
 MD5 fa0df30aebd90a38b5816d42237e0372 files/digest-orpheus-1.5 63
+MD5 adffbe5fcc0f119e137add4474562ed4 files/1.5-gcc34.patch 1442
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBORilI1lqEGTUzyQRAkqQAKDLATIDjVWBHo+5Ix/o0jG174Ay8gCgwOro
+UOx04rX7wd3nlekYqGQIJL4=
+=Z6+/
+-----END PGP SIGNATURE-----
diff --git a/media-sound/orpheus/files/1.5-gcc34.patch b/media-sound/orpheus/files/1.5-gcc34.patch
new file mode 100644
index 000000000000..ba6c7f5af4bd
--- /dev/null
+++ b/media-sound/orpheus/files/1.5-gcc34.patch
@@ -0,0 +1,41 @@
+diff -Naur old/src/mixerctl.cc new/src/mixerctl.cc
+--- old/src/mixerctl.cc	2004-09-04 02:44:12.797543753 +0200
++++ new/src/mixerctl.cc	2004-09-04 02:44:47.889365170 +0200
+@@ -50,7 +50,7 @@
+ 
+     if((fd = ::open(devname.c_str(), O_RDWR)) != -1) {
+ 	if(ioctl(fd, SOUND_MIXER_READ_DEVMASK, &devmask) != -1) {
+-	    for(ct = ctVolume; ct != channeltype_end; (int) ct += 1) {
++	    for(ct = ctVolume; ct != channeltype_end; ct = (mixerctl::channeltype) (ct + 1)) {
+ 		if((1 << (int) ct) & devmask) {
+ 		    channels.insert(ct);
+ 		}
+diff -Naur old/src/uitext.cc new/src/uitext.cc
+--- old/src/uitext.cc	2004-09-04 01:48:30.955457434 +0200
++++ new/src/uitext.cc	2004-09-04 02:42:30.689719181 +0200
+@@ -577,14 +577,14 @@
+ 			autosavepl = !autosavepl;
+ 			break;
+ 		    case 41:
+-			if(++((int) playmode) == PlayMode_size)
++			if(((int) playmode + 1) == PlayMode_size)
+ 			    playmode = Normal;
+ 			break;
+ 		    case 42:
+ 			autoplay = !autoplay;
+ 			break;
+ 		    case 43:
+-			if(++((int) sortorder) == SortOrder_size)
++			if(((int) sortorder + 1) == SortOrder_size)
+ 			    sortorder = byFileName;
+ 			break;
+ 		    case 44:
+@@ -719,7 +719,7 @@
+     while(!finished) {
+ 	m.clear();
+ 
+-	for(ct = mixerctl::ctVolume; ct != mixerctl::channeltype_end; (int) ct += 1) {
++	for(ct = mixerctl::ctVolume; ct != mixerctl::channeltype_end; ct = (mixerctl::channeltype) (ct + 1)) {
+ 	    if(chavail.count(ct)) {
+ 		val = mix.readlevel(ct);
+ 		if(val >= 0) {
diff --git a/media-sound/orpheus/orpheus-1.2.ebuild b/media-sound/orpheus/orpheus-1.2.ebuild
index e90d99eea337..937d0620d358 100644
--- a/media-sound/orpheus/orpheus-1.2.ebuild
+++ b/media-sound/orpheus/orpheus-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/orpheus/orpheus-1.2.ebuild,v 1.5 2004/06/25 00:16:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/orpheus/orpheus-1.2.ebuild,v 1.6 2004/09/04 01:10:35 swegener Exp $
 
 DESCRIPTION="Command line MP3 player."
 HOMEPAGE="http://konst.org.ua/en/orpheus"
@@ -43,5 +43,5 @@ src_compile() {
 
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
+	dodoc AUTHORS ChangeLog NEWS README TODO
 }
diff --git a/media-sound/orpheus/orpheus-1.3.ebuild b/media-sound/orpheus/orpheus-1.3.ebuild
index 59001f4d1d33..eed72482ed08 100644
--- a/media-sound/orpheus/orpheus-1.3.ebuild
+++ b/media-sound/orpheus/orpheus-1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/orpheus/orpheus-1.3.ebuild,v 1.4 2004/06/25 00:16:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/orpheus/orpheus-1.3.ebuild,v 1.5 2004/09/04 01:10:35 swegener Exp $
 
 DESCRIPTION="Command line MP3 player."
 HOMEPAGE="http://konst.org.ua/en/orpheus"
@@ -43,5 +43,5 @@ src_compile() {
 
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
+	dodoc AUTHORS ChangeLog NEWS README TODO
 }
diff --git a/media-sound/orpheus/orpheus-1.4.ebuild b/media-sound/orpheus/orpheus-1.4.ebuild
index 1da00899bee6..0e94ca6ac1f5 100644
--- a/media-sound/orpheus/orpheus-1.4.ebuild
+++ b/media-sound/orpheus/orpheus-1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/orpheus/orpheus-1.4.ebuild,v 1.5 2004/06/25 00:16:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/orpheus/orpheus-1.4.ebuild,v 1.6 2004/09/04 01:10:35 swegener Exp $
 
 DESCRIPTION="Command line MP3 player."
 HOMEPAGE="http://konst.org.ua/en/orpheus"
@@ -43,5 +43,5 @@ src_compile() {
 
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
+	dodoc AUTHORS ChangeLog NEWS README TODO
 }
diff --git a/media-sound/orpheus/orpheus-1.5.ebuild b/media-sound/orpheus/orpheus-1.5.ebuild
index f340a0d946a6..aed5e799c241 100644
--- a/media-sound/orpheus/orpheus-1.5.ebuild
+++ b/media-sound/orpheus/orpheus-1.5.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-sound/orpheus/orpheus-1.5.ebuild,v 1.4 2004/06/25 00:16:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/orpheus/orpheus-1.5.ebuild,v 1.5 2004/09/04 01:10:35 swegener Exp $
+
+inherit eutils
 
 DESCRIPTION="Command line MP3 player."
 HOMEPAGE="http://konst.org.ua/en/orpheus"
@@ -20,6 +22,9 @@ DEPEND=">=sys-libs/ncurses-5.2
 
 src_unpack() {
 	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PV}-gcc34.patch
 
 	#if use nas; then
 	#	cd src