Closing #47975.

3 files changed, 56 insertions, 4 deletions

diff --git a/media-sound/museseq/ChangeLog b/media-sound/museseq/ChangeLog
index 60ca48ca3eac..908dda076347 100644
--- a/media-sound/museseq/ChangeLog
+++ b/media-sound/museseq/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/museseq
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/museseq/ChangeLog,v 1.8 2004/04/01 07:46:26 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/museseq/ChangeLog,v 1.9 2004/04/16 14:27:17 aliz Exp $
+
+  16 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> museseq-0.6.2.ebuild,
+  files/museseq-0.6.2-fPIC.patch:
+  Added amd64 keyword and fixed -fPIC compilation. Closing #47975.
 
   31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> museseq-0.6.2.ebuild:
   Stable x86.
diff --git a/media-sound/museseq/files/museseq-0.6.2-fPIC.patch b/media-sound/museseq/files/museseq-0.6.2-fPIC.patch
new file mode 100644
index 000000000000..53c039495f0c
--- /dev/null
+++ b/media-sound/museseq/files/museseq-0.6.2-fPIC.patch
@@ -0,0 +1,47 @@
+--- widgets/Makefile.in	2004-04-16 13:38:18.525257991 +0000
++++ widgets/Makefile.in	2004-04-16 13:39:12.334069714 +0000
+@@ -765,7 +765,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 
+ .cpp.o:
+-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
++@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -fPIC -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+ @am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+ @am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+ @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+@@ -798,7 +798,7 @@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ xml.o: $(top_srcdir)/xml.cpp
+-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT xml.o -MD -MP -MF "$(DEPDIR)/xml.Tpo" \
++@am__fastdepCXX_TRUE@	if $(CXX) -fPIC $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT xml.o -MD -MP -MF "$(DEPDIR)/xml.Tpo" \
+ @am__fastdepCXX_TRUE@	  -c -o xml.o `test -f '$(top_srcdir)/xml.cpp' || echo '$(srcdir)/'`$(top_srcdir)/xml.cpp; \
+ @am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/xml.Tpo" "$(DEPDIR)/xml.Po"; \
+ @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/xml.Tpo"; exit 1; \
+@@ -831,7 +831,7 @@
+ @am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o xml.lo `test -f '$(top_srcdir)/xml.cpp' || echo '$(srcdir)/'`$(top_srcdir)/xml.cpp
+ 
+ tempo.o: $(top_srcdir)/tempo.cpp
+-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tempo.o -MD -MP -MF "$(DEPDIR)/tempo.Tpo" \
++@am__fastdepCXX_TRUE@	if $(CXX) -fPIC $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tempo.o -MD -MP -MF "$(DEPDIR)/tempo.Tpo" \
+ @am__fastdepCXX_TRUE@	  -c -o tempo.o `test -f '$(top_srcdir)/tempo.cpp' || echo '$(srcdir)/'`$(top_srcdir)/tempo.cpp; \
+ @am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/tempo.Tpo" "$(DEPDIR)/tempo.Po"; \
+ @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/tempo.Tpo"; exit 1; \
+@@ -864,7 +864,7 @@
+ @am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tempo.lo `test -f '$(top_srcdir)/tempo.cpp' || echo '$(srcdir)/'`$(top_srcdir)/tempo.cpp
+ 
+ sig.o: $(top_srcdir)/sig.cpp
+-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sig.o -MD -MP -MF "$(DEPDIR)/sig.Tpo" \
++@am__fastdepCXX_TRUE@	if $(CXX) -fPIC $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sig.o -MD -MP -MF "$(DEPDIR)/sig.Tpo" \
+ @am__fastdepCXX_TRUE@	  -c -o sig.o `test -f '$(top_srcdir)/sig.cpp' || echo '$(srcdir)/'`$(top_srcdir)/sig.cpp; \
+ @am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/sig.Tpo" "$(DEPDIR)/sig.Po"; \
+ @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/sig.Tpo"; exit 1; \
+@@ -897,7 +897,7 @@
+ @am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sig.lo `test -f '$(top_srcdir)/sig.cpp' || echo '$(srcdir)/'`$(top_srcdir)/sig.cpp
+ 
+ pos.o: $(top_srcdir)/pos.cpp
+-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT pos.o -MD -MP -MF "$(DEPDIR)/pos.Tpo" \
++@am__fastdepCXX_TRUE@	if $(CXX) -fPIC $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT pos.o -MD -MP -MF "$(DEPDIR)/pos.Tpo" \
+ @am__fastdepCXX_TRUE@	  -c -o pos.o `test -f '$(top_srcdir)/pos.cpp' || echo '$(srcdir)/'`$(top_srcdir)/pos.cpp; \
+ @am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/pos.Tpo" "$(DEPDIR)/pos.Po"; \
+ @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/pos.Tpo"; exit 1; \
diff --git a/media-sound/museseq/museseq-0.6.2.ebuild b/media-sound/museseq/museseq-0.6.2.ebuild
index adbb23f5f78b..3c1188b561db 100644
--- a/media-sound/museseq/museseq-0.6.2.ebuild
+++ b/media-sound/museseq/museseq-0.6.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/museseq/museseq-0.6.2.ebuild,v 1.7 2004/04/01 07:46:26 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/museseq/museseq-0.6.2.ebuild,v 1.8 2004/04/16 14:27:17 aliz Exp $
 
-inherit virtualx
+inherit virtualx eutils
 
 MY_P=muse-${PV}
 DESCRIPTION="The Linux (midi) MUSic Editor (a sequencer)"
@@ -12,7 +12,7 @@ RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ~amd64"
 
 IUSE="jack fluidsynth ladcca"
 
@@ -30,6 +30,7 @@ src_unpack() {
 	cd ${S}
 	sed -i "s/HAVE_JACK_JACK_H/HAVE_JACK/" widgets/audioconf.cpp
 	sed -i "/#include <alsa\\/asoundlib.h>/i\\#define ALSA_PCM_OLD_HW_PARAMS_API 1\\" driver/alsaaudio.cpp
+	epatch ${FILESDIR}/${P}-fPIC.patch
 }
 
 src_compile() {