Fixed multilib bugs; keyworded ~amd64, bug #209304

(Portage version: 2.1.4.4)

4 files changed, 43 insertions, 10 deletions

diff --git a/dev-libs/stfl/ChangeLog b/dev-libs/stfl/ChangeLog
index dbb27a5f25ca..24a12a14b99b 100644
--- a/dev-libs/stfl/ChangeLog
+++ b/dev-libs/stfl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/stfl
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/stfl/ChangeLog,v 1.15 2008/05/30 06:35:33 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/stfl/ChangeLog,v 1.16 2008/06/22 17:30:49 gentoofan23 Exp $
+
+  22 Jun 2008; Thomas Anderson <gentoofan23@gentoo.org>
+  +files/stfl-0.18-multilib.patch, stfl-0.18.ebuild:
+  Fixed multilib bugs; keyworded ~amd64, bug #209304
 
   30 May 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing Andrej Kacian (Ticho) from metadata.xml (as per #59986). Assigning
diff --git a/dev-libs/stfl/files/stfl-0.18-multilib.patch b/dev-libs/stfl/files/stfl-0.18-multilib.patch
new file mode 100644
index 000000000000..967df86e2020
--- /dev/null
+++ b/dev-libs/stfl/files/stfl-0.18-multilib.patch
@@ -0,0 +1,28 @@
+diff -aur stfl-0.18-orig/python/Makefile.snippet stfl-0.18/python/Makefile.snippet
+--- stfl-0.18-orig/python/Makefile.snippet	2007-09-03 12:13:04.000000000 -0400
++++ stfl-0.18/python/Makefile.snippet	2008-06-22 13:13:13.000000000 -0400
+@@ -33,7 +33,8 @@
+ 
+ install_python: python/_stfl.so python/stfl.py python/stfl.pyc
+ 	mkdir -p $(DESTDIR)$(prefix)/lib/python$(PYTHON_VERSION)/lib-dynload/
+-	cp python/_stfl.so $(DESTDIR)$(prefix)/lib/python$(PYTHON_VERSION)/lib-dynload/
++	[ ! -d $(DESTDIR)$(prefix)/$(LIBDIR)/python$(PYTHON_VERSION)/lib-dynload/ ] && mkdir -p $(DESTDIR)$(prefix)/$(LIBDIR)/python$(PYTHON_VERSION)/lib-dynload/
++	cp python/_stfl.so $(DESTDIR)$(prefix)/$(LIBDIR)/python$(PYTHON_VERSION)/lib-dynload/
+ 	cp python/stfl.pyc $(DESTDIR)$(prefix)/lib/python$(PYTHON_VERSION)/
+ 	cp python/stfl.py $(DESTDIR)$(prefix)/lib/python$(PYTHON_VERSION)/
+ 
+diff -aur stfl-0.18-orig/ruby/Makefile.snippet stfl-0.18/ruby/Makefile.snippet
+--- stfl-0.18-orig/ruby/Makefile.snippet	2007-09-03 12:13:04.000000000 -0400
++++ stfl-0.18/ruby/Makefile.snippet	2008-06-22 13:15:16.000000000 -0400
+@@ -25,9 +25,9 @@
+ 
+ ruby/build_ok: libstfl.a stfl.h ruby/stfl.i swig/*.i
+ 	cd ruby && swig -ruby stfl.i && ruby extconf.rb
+-	$(MAKE) -C ruby clean && $(MAKE) -C ruby LIBS+="../libstfl.a -lncursesw" CFLAGS+="-pthread -I.." DLDFLAGS+="-pthread" DESTDIR=$(DESTDIR) prefix=$(prefix) sitedir=$(prefix)/lib/ruby
++	$(MAKE) -C ruby clean && $(MAKE) -C ruby LIBS+="../libstfl.a -lncursesw" CFLAGS+="-pthread -I.." DLDFLAGS+="-pthread" DESTDIR=$(DESTDIR) prefix=$(prefix) sitedir=$(prefix)/$(LIBDIR)/ruby
+ 	touch ruby/build_ok
+ 
+ install_ruby: ruby/build_ok
+-	$(MAKE) -C ruby DESTDIR=$(DESTDIR) prefix=$(prefix) sitedir='$(DESTDIR)$(prefix)/lib/ruby' install
++	$(MAKE) -C ruby DESTDIR=$(DESTDIR) prefix=$(prefix) sitedir='$(DESTDIR)$(prefix)/$(LIBDIR)/ruby' install
+ 
diff --git a/dev-libs/stfl/stfl-0.17.ebuild b/dev-libs/stfl/stfl-0.17.ebuild
index b6e4f7d772d1..3ccce1794250 100644
--- a/dev-libs/stfl/stfl-0.17.ebuild
+++ b/dev-libs/stfl/stfl-0.17.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/stfl/stfl-0.17.ebuild,v 1.3 2007/12/27 12:50:07 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/stfl/stfl-0.17.ebuild,v 1.4 2008/06/22 17:30:49 gentoofan23 Exp $
 
 inherit perl-module toolchain-funcs eutils
 
@@ -23,7 +23,7 @@ RDEPEND="sys-libs/ncurses
 		ruby? ( dev-lang/ruby )"
 
 src_unpack() {
-	unpack "${A}"
+	unpack ${A}
 	cd "${S}"
 	sed -i \
 		-e "s!-Os -ggdb!!" \
diff --git a/dev-libs/stfl/stfl-0.18.ebuild b/dev-libs/stfl/stfl-0.18.ebuild
index 2d485fd1f942..7b94b2c14f45 100644
--- a/dev-libs/stfl/stfl-0.18.ebuild
+++ b/dev-libs/stfl/stfl-0.18.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/stfl/stfl-0.18.ebuild,v 1.1 2007/12/27 12:47:51 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/stfl/stfl-0.18.ebuild,v 1.2 2008/06/22 17:30:49 gentoofan23 Exp $
 
-inherit perl-module toolchain-funcs eutils
+inherit perl-module toolchain-funcs eutils multilib
 
 DESCRIPTION="A library which implements a curses-based widget set for text terminals"
 HOMEPAGE="http://www.clifford.at/stfl/"
@@ -10,7 +10,7 @@ SRC_URI="http://www.clifford.at/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 
 IUSE="examples perl ruby"
 
@@ -23,13 +23,14 @@ RDEPEND="sys-libs/ncurses
 		ruby? ( dev-lang/ruby )"
 
 src_unpack() {
-	unpack "${A}"
+	unpack ${A}
 	cd "${S}"
 	sed -i \
 		-e "s!-Os -ggdb!!" \
 		-e "s!^all:.*!all: libstfl.a!" \
 		Makefile
 
+	epatch "${FILESDIR}/${P}-multilib.patch"
 	sed -i -e "s:/usr/lib/python2.4:${D}/usr/lib/python2.4:" \
 		python/Makefile.snippet
 
@@ -56,7 +57,7 @@ src_install() {
 	local exdir="/usr/share/doc/${PF}/examples"
 
 	dodir /usr/lib/python2.4/lib-dynload
-	emake -j1 prefix="/usr" DESTDIR="${D}" install || die "make install failed"
+	emake -j1 prefix="/usr" DESTDIR="${D}" LIBDIR="$(get_libdir)" install || die "make install failed"
 
 	dodoc README