Added amd64 and gcc34 patches.

6 files changed, 106 insertions, 2 deletions

diff --git a/media-sound/musicman/ChangeLog b/media-sound/musicman/ChangeLog
index 763d5a1e2a47..f2f93086cce4 100644
--- a/media-sound/musicman/ChangeLog
+++ b/media-sound/musicman/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/musicman
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musicman/ChangeLog,v 1.1 2004/07/07 21:20:18 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musicman/ChangeLog,v 1.2 2004/07/07 22:55:31 fvdpol Exp $
+
+  08 Jul 2004; Frank van de Pol <fvdpol@gentoo.org> :
+  Added amd64 and gcc34 patches.
 
   07 Jul 2004; Frank van de Pol <fvdpol@gentoo.org> :
   New ebuild submitted by Daniel Rendall <gentoo@danielrendall.co.uk>. Closes
diff --git a/media-sound/musicman/Manifest b/media-sound/musicman/Manifest
index 049ce945e23a..75dbc683c5d8 100644
--- a/media-sound/musicman/Manifest
+++ b/media-sound/musicman/Manifest
@@ -1,4 +1,8 @@
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 e1511e9fb2770a375fcec18ae5f382ee musicman-0.11.ebuild 1008
-MD5 ec30691c4a4b6b315656038cdc45e9f3 ChangeLog 360
+MD5 2ee1f302ec8cb658005bb52b6d96f41c ChangeLog 448
+MD5 7d441ac7beeb50608309e1d1230760c4 musicman-0.11-r1.ebuild 905
 MD5 a58a50415fde57a82addf30f60a148b0 files/digest-musicman-0.11 66
+MD5 4892a92b0613b41678edd70a8a159c73 files/musicman-0.11-amd64.patch 1545
+MD5 ff2d1e9a961983e13704bcffb9510e4a files/musicman-0.11-gcc34.patch 1055
+MD5 a58a50415fde57a82addf30f60a148b0 files/digest-musicman-0.11-r1 66
diff --git a/media-sound/musicman/files/digest-musicman-0.11-r1 b/media-sound/musicman/files/digest-musicman-0.11-r1
new file mode 100644
index 000000000000..ae32d97cb99f
--- /dev/null
+++ b/media-sound/musicman/files/digest-musicman-0.11-r1
@@ -0,0 +1 @@
+MD5 d5173a90c28d770acbfaf101629d8e6c musicman-0.11.tar.gz 1445222
diff --git a/media-sound/musicman/files/musicman-0.11-amd64.patch b/media-sound/musicman/files/musicman-0.11-amd64.patch
new file mode 100644
index 000000000000..286588a377c3
--- /dev/null
+++ b/media-sound/musicman/files/musicman-0.11-amd64.patch
@@ -0,0 +1,35 @@
+diff -ur musicman-orig/musicman/Makefile.in musicman/musicman/Makefile.in
+--- musicman-orig/musicman/Makefile.in	2004-07-07 23:44:30.716251088 +0200
++++ musicman/musicman/Makefile.in	2004-07-07 23:41:52.214347040 +0200
+@@ -312,7 +312,7 @@
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) -fPIC $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+diff -ur musicman-orig/musicman/kcmmusicman/Makefile.in musicman/musicman/kcmmusicman/Makefile.in
+--- musicman-orig/musicman/kcmmusicman/Makefile.in	2004-07-07 23:44:31.811084648 +0200
++++ musicman/musicman/kcmmusicman/Makefile.in	2004-07-07 23:39:34.050351160 +0200
+@@ -285,7 +285,7 @@
+ #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) -fPIC $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+--- musicman-orig/admin/acinclude.m4.in	2004-07-08 00:20:08.385276000 +0200
++++ musicman/admin/acinclude.m4.in	2004-07-08 00:41:30.770323840 +0200
+@@ -2774,7 +2774,7 @@
+      LDFLAGS=""
+   fi
+ 
+-  CXXFLAGS=" $CXXFLAGS"
++  CXXFLAGS=" $CXXFLAGS -fPIC"
+ 
+   AC_PROG_CXX
+ 
diff --git a/media-sound/musicman/files/musicman-0.11-gcc34.patch b/media-sound/musicman/files/musicman-0.11-gcc34.patch
new file mode 100644
index 000000000000..65e3f9431f33
--- /dev/null
+++ b/media-sound/musicman/files/musicman-0.11-gcc34.patch
@@ -0,0 +1,24 @@
+diff -ur musicman-orig/musicman/kcmmusicman/mmconfig.cpp musicman/musicman/kcmmusicman/mmconfig.cpp
+--- musicman-orig/musicman/kcmmusicman/mmconfig.cpp	2004-07-07 23:28:20.057813600 +0200
++++ musicman/musicman/kcmmusicman/mmconfig.cpp	2004-07-07 23:29:14.285569728 +0200
+@@ -34,7 +34,7 @@
+ 
+ 
+ typedef KGenericFactory<MMConfig, QWidget> KDEDFactory;
+-K_EXPORT_COMPONENT_FACTORY( kcm_musicman, KDEDFactory( "kcmmusicman" ) );
++K_EXPORT_COMPONENT_FACTORY( kcm_musicman, KDEDFactory( "kcmmusicman" ) )
+ 
+ 
+ 
+diff -ur musicman-orig/musicman/musicman.cpp musicman/musicman/musicman.cpp
+--- musicman-orig/musicman/musicman.cpp	2004-07-07 23:28:20.052814360 +0200
++++ musicman/musicman/musicman.cpp	2004-07-07 23:43:00.788922120 +0200
+@@ -40,7 +40,7 @@
+ 
+ 
+ typedef KGenericFactory<MusicMan, KonqPopupMenu> MusicManFactory;
+-K_EXPORT_COMPONENT_FACTORY( libmusicman, MusicManFactory("musicman") );
++K_EXPORT_COMPONENT_FACTORY( libmusicman, MusicManFactory("musicman") )
+ 
+ 
+ MusicMan::MusicMan(KonqPopupMenu *popupmenu,const char *name,const QStringList &list) :
diff --git a/media-sound/musicman/musicman-0.11-r1.ebuild b/media-sound/musicman/musicman-0.11-r1.ebuild
new file mode 100644
index 000000000000..696fa6e86168
--- /dev/null
+++ b/media-sound/musicman/musicman-0.11-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musicman/musicman-0.11-r1.ebuild,v 1.1 2004/07/07 22:55:31 fvdpol Exp $
+
+inherit eutils kde
+
+DESCRIPTION="A Konqueror plugin for manipulating ID3 tags in MP3 files"
+HOMEPAGE="http://musicman.sourceforge.net/"
+SRC_URI="mirror://sourceforge/musicman/${P}.tar.gz"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+DEPEND=">=kde-base/kdebase-3.2.1 \
+	>=media-libs/jpeg-6b-r3 \
+	>=app-admin/fam-2.7.0 \
+	>=media-libs/libart_lgpl-2.3.16"
+
+# The tar.gz doesn't create a musicman-0.11 directory
+S="${WORKDIR}/musicman"
+
+src_unpack() {
+	unpack ${A}
+
+	epatch ${FILESDIR}/${P}-gcc34.patch
+	epatch ${FILESDIR}/${P}-amd64.patch
+}
+
+src_install() {
+	make \
+		prefix=${D}/usr \
+		mandir=${D}/usr/share/man \
+		infodir=${D}/usr/share/info \
+		install || die
+}