amd64 stable, fix multilib issues, bug #213033

(Portage version: 2.1.4.4)

3 files changed, 52 insertions, 3 deletions

diff --git a/media-libs/libkarma/ChangeLog b/media-libs/libkarma/ChangeLog
index b041dd7d9394..001e32509c44 100644
--- a/media-libs/libkarma/ChangeLog
+++ b/media-libs/libkarma/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libkarma
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libkarma/ChangeLog,v 1.9 2008/05/18 16:31:16 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libkarma/ChangeLog,v 1.10 2008/06/22 16:38:05 gentoofan23 Exp $
+
+  22 Jun 2008; Thomas Anderson <gentoofan23@gentoo.org>
+  +files/libkarma-0.1.0-multilib.patch, libkarma-0.1.0.ebuild:
+  amd64 stable, fix multilib issues, bug #213033
 
   18 May 2008; Markus Meier <maekke@gentoo.org> libkarma-0.1.0.ebuild:
   x86 stable, bug #213033
diff --git a/media-libs/libkarma/files/libkarma-0.1.0-multilib.patch b/media-libs/libkarma/files/libkarma-0.1.0-multilib.patch
new file mode 100644
index 000000000000..716f56087762
--- /dev/null
+++ b/media-libs/libkarma/files/libkarma-0.1.0-multilib.patch
@@ -0,0 +1,43 @@
+--- libkarma-0.1.0-orig/src/Makefile	2007-05-15 12:29:02.000000000 -0400
++++ libkarma-0.1.0/src/Makefile	2008-05-28 19:15:24.000000000 -0400
+@@ -6,7 +6,7 @@
+ 	util.c wav.c
+ INST_HEADERS=lkarma.h utf8.h
+ 
+-LIBDIR=../lib
++LIBDIR=../$(_LIBDIR)
+ 
+ CC?=gcc
+ AR?=ar
+@@ -37,15 +37,15 @@
+ default: all
+ 
+ install: shared-lib-stamp static-lib-stamp
+-	../install-sh -m 0755 -d $(DEST)/lib
++	../install-sh -m 0755 -d $(DEST)/$(_LIBDIR)
+ 	../install-sh -m 0755 -d $(DEST)/include
+ 	../install-sh -m 0755 -d $(DEST)/include/libkarma
+-	../install-sh -m 0644 -t $(DEST)/lib/ $(LIBDIR)/$(TARGET).a
+-	../install-sh -m 0755 -t $(PREFIX)/lib/ $(LIBDIR)/$(OUT_VERSION)
+-	$(RM) $(PREFIX)/lib/$(OUT_MAJOR)
+-	$(RM) $(PREFIX)/lib/$(OUT_BASE)
+-	$(LN_S) $(OUT_VERSION) $(PREFIX)/lib/$(OUT_MAJOR)
+-	$(LN_S) $(OUT_VERSION) $(PREFIX)/lib/$(OUT_BASE)
++	../install-sh -m 0644 -t $(DEST)/$(_LIBDIR)/ $(LIBDIR)/$(TARGET).a
++	../install-sh -m 0755 -t $(PREFIX)/$(_LIBDIR)/ $(LIBDIR)/$(OUT_VERSION)
++	$(RM) $(PREFIX)/$(_LIBDIR)/$(OUT_MAJOR)
++	$(RM) $(PREFIX)/$(_LIBDIR)/$(OUT_BASE)
++	$(LN_S) $(OUT_VERSION) $(PREFIX)/$(_LIBDIR)/$(OUT_MAJOR)
++	$(LN_S) $(OUT_VERSION) $(PREFIX)/$(_LIBDIR)/$(OUT_BASE)
+ 	../install-sh -m 0644 -t $(DEST)/include/libkarma/ $(INST_HEADERS)
+ 
+ uninstall:
+--- libkarma-0.1.0-orig/tools/Makefile	2007-05-15 12:29:02.000000000 -0400
++++ libkarma-0.1.0/tools/Makefile	2008-05-28 20:14:23.000000000 -0400
+@@ -1,5 +1,5 @@
+ INCLUDES=-I../src
+-LIBDIR=../lib
++LIBDIR=../$(_LIBDIR)
+ LIBKARMA=$(LIBDIR)/libkarma.a
+ ifeq ($(MAKECMDGOALS),static)
+   LIBKARMA=$(LIBDIR)/libkarma.a
diff --git a/media-libs/libkarma/libkarma-0.1.0.ebuild b/media-libs/libkarma/libkarma-0.1.0.ebuild
index c8c9d1fa2f98..b10becd506d0 100644
--- a/media-libs/libkarma/libkarma-0.1.0.ebuild
+++ b/media-libs/libkarma/libkarma-0.1.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libkarma/libkarma-0.1.0.ebuild,v 1.4 2008/05/18 16:31:16 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libkarma/libkarma-0.1.0.ebuild,v 1.5 2008/06/22 16:38:05 gentoofan23 Exp $
 
-inherit eutils mono
+inherit eutils mono multilib
 
 DESCRIPTION="Support library for using Rio devices with mtp"
 HOMEPAGE="http://www.freakysoft.de/html/libkarma/"
@@ -22,6 +22,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	use !mono && epatch "${FILESDIR}/libkarma-0.0.6-mono.patch"
+	epatch "${FILESDIR}/${P}-multilib.patch"
 }
 
 src_compile() {
@@ -29,5 +30,6 @@ src_compile() {
 }
 
 src_install() {
+	export _LIBDIR=$(get_libdir)
 	emake -j1 PREFIX="${D}/usr" install || die "emake install failed"
 }