Fix for compilation with gcc3.3. Closes bug #40568.

5 files changed, 14 insertions, 35 deletions

diff --git a/media-plugins/xmms-shell/ChangeLog b/media-plugins/xmms-shell/ChangeLog
index ca8fb4bae961..a2726b2fb8f0 100644
--- a/media-plugins/xmms-shell/ChangeLog
+++ b/media-plugins/xmms-shell/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/xmms-shell
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-shell/ChangeLog,v 1.6 2004/02/04 08:42:37 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-shell/ChangeLog,v 1.7 2004/02/08 10:58:06 eradicator Exp $
+
+  08 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-shell-0.99.3-r1.ebuild, xmms-shell-0.99.3.ebuild:
+  Fix for compilation with gcc3.3.  Closes bug #40568.
 
 *xmms-shell-0.99.3-r1 (04 Feb 2004)
 
diff --git a/media-plugins/xmms-shell/Manifest b/media-plugins/xmms-shell/Manifest
index a383d11d51fe..715cbffd5c91 100644
--- a/media-plugins/xmms-shell/Manifest
+++ b/media-plugins/xmms-shell/Manifest
@@ -1,9 +1,7 @@
-MD5 fe14a2173ef25234eb720df4c67c74fa xmms-shell-0.99.3.ebuild 762
 MD5 f20f05902899d88553f554f111a0de5b xmms-shell-0.99.0-r1.ebuild 785
-MD5 203767c696e49d6d20172a5fe2e67472 ChangeLog 1669
+MD5 ef63a8560ec5adf46a2bb5e48fa8f9d3 ChangeLog 1839
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 579d110658fb0359ab56430bc3c55d59 xmms-shell-0.99.3-r1.ebuild 1034
-MD5 79d46e1306a0de2e2888d27be745a4f6 files/digest-xmms-shell-0.99.3 68
+MD5 8fd58abdf7c905f8238c024fb252a422 xmms-shell-0.99.3-r1.ebuild 1226
 MD5 f8b236d54106a623e0cf91e802d2af27 files/digest-xmms-shell-0.99.0-r1 68
 MD5 79d46e1306a0de2e2888d27be745a4f6 files/digest-xmms-shell-0.99.3-r1 68
 MD5 30d875b5125e84fce576af17cc7ad83c files/xmms-shell-readline.patch 280
diff --git a/media-plugins/xmms-shell/files/digest-xmms-shell-0.99.3 b/media-plugins/xmms-shell/files/digest-xmms-shell-0.99.3
deleted file mode 100644
index 3302688d80d5..000000000000
--- a/media-plugins/xmms-shell/files/digest-xmms-shell-0.99.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7c59ff584ae146282259fd6cdc8fe669 xmms-shell-0.99.3.tar.gz 59940
diff --git a/media-plugins/xmms-shell/xmms-shell-0.99.3-r1.ebuild b/media-plugins/xmms-shell/xmms-shell-0.99.3-r1.ebuild
index 99260ecb63a1..08f687a5410f 100644
--- a/media-plugins/xmms-shell/xmms-shell-0.99.3-r1.ebuild
+++ b/media-plugins/xmms-shell/xmms-shell-0.99.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-shell/xmms-shell-0.99.3-r1.ebuild,v 1.1 2004/02/04 08:42:37 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-shell/xmms-shell-0.99.3-r1.ebuild,v 1.2 2004/02/08 10:58:06 eradicator Exp $
 
 S=${WORKDIR}/${P}
 
@@ -17,6 +17,8 @@ RDEPEND=">=media-sound/xmms-1.2.7
 	readline? ( >=sys-libs/readline-4.1 )"
 
 DEPEND="${RDEPEND}
+	sys-apps/sed
+	sys-devel/automake
 	sys-devel/autoconf"
 
 src_unpack() {
@@ -32,6 +34,10 @@ src_unpack() {
 	aclocal
 	automake --gnu --include-deps Makefile
 	autoconf
+
+	# Fix compilation in gcc3.3
+	mv ${S}/src/getline.cc ${S}/src/getline.cc.orig
+	sed 's/<string>/<string.h>/' < ${S}/src/getline.cc.orig > ${S}/src/getline.cc
 }
 
 src_compile() {
diff --git a/media-plugins/xmms-shell/xmms-shell-0.99.3.ebuild b/media-plugins/xmms-shell/xmms-shell-0.99.3.ebuild
deleted file mode 100644
index 309d8b1aa4ab..000000000000
--- a/media-plugins/xmms-shell/xmms-shell-0.99.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-shell/xmms-shell-0.99.3.ebuild,v 1.1 2003/06/21 01:39:08 jje Exp $
-
-S=${WORKDIR}/${P}
-
-DESCRIPTION="simple utility to control XMMS externally"
-SRC_URI="mirror://sourceforge/xmms-shell/${P}.tar.gz"
-HOMEPAGE="http://www.loganh.com/xmms-shell/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-IUSE="readline"
-
-DEPEND=">=media-sound/xmms-1.2.7
-	readline? ( >=sys-libs/readline-4.1 )"
-
-src_compile() {
-	econf `use_with readline` || die "Configuration failed."
-	emake || die "Make failed."
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "Install failed."
-	dodoc AUTHORS ChangeLog INSTALL README
-}
-