Fixed multilib bugs; keyworded ~amd64, bug #209304

Package-Manager: portage-2.1.4.4

5 files changed, 50 insertions, 16 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/Manifest b/dev-libs/stfl/Manifest
index 54729923f21e..9880089175cf 100644
--- a/dev-libs/stfl/Manifest
+++ b/dev-libs/stfl/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX stfl-0.18-multilib.patch 1847 RMD160 c8989746d48fe2e93d16985695e1cd438e8447d2 SHA1 b5ba142a95a0bdf3db3118cc52aac334abea25f4 SHA256 8aad0f10508b58509c1b54e26dbc750138d98417a851ce587f14b84c4f0d35f4
 DIST stfl-0.17.tar.gz 38950 RMD160 dc0fe9e1c1600667251069f9396fa044841d2d85 SHA1 315591618c7125daf3263b510e0e48aa82d73711 SHA256 d34fa8297bf15f13c206ef6eb3669cf3718fbcf0cd5abb47f704511c5f30ea7a
 DIST stfl-0.18.tar.gz 39188 RMD160 d3fc37aa7542c7e89d0957f8e25572f94e789b8d SHA1 d8ce5c7290ff438fcabac0fe4de2d54ae4ad5d49 SHA256 2295378d21596eb4aa5c775bfd0385db82825a18f093a9c0ba2a32c03f423832
-EBUILD stfl-0.17.ebuild 1807 RMD160 0137d090326e811ef3d7c6163d1117e3a356cb53 SHA1 270e86903f37cb2d287edd2424c73ca8959358ea SHA256 0b83c32044f07b434a1ac5ae287b4d4f6829ae916e9beb1b4ba8ea2caa2f2f95
-EBUILD stfl-0.18.ebuild 1808 RMD160 450de84bb30e2f0cc348183ee0aee3021589fc50 SHA1 8e257a14d559d8cb1c4a958edc44fb4f1cf3db55 SHA256 3c8e18e96bf46f9497d10292d29d3c4912bf471fa4b38545cbaaea948ba35dc2
-MISC ChangeLog 2433 RMD160 a311e5e372bf455f563219f31a52acc6813876ca SHA1 09a061489474d0d5e866e5d0c0113a11e3b4de0d SHA256 86c25ebef34d3df2698395946f5835110c64224e06b0e830f473248aabe8db05
+EBUILD stfl-0.17.ebuild 1811 RMD160 35c10a60bfb3e28bed8aa14346a6908b449e4773 SHA1 09550a8c5c52ac11fd01432f443317a003f088c6 SHA256 86d005db36cbfc9b63280d70e3d09c02300bd433732a172a4680f4e01b494283
+EBUILD stfl-0.18.ebuild 1893 RMD160 3e9d0b834b8ca7c9b9410e21b9ecd13cabaa426c SHA1 7f8b9067771169248a5c1e86f2b881b30c01d665 SHA256 03498e3fe781c8a985f91daa367a1979bb6388a24d496a16789abaa2e4557037
+MISC ChangeLog 2601 RMD160 ad0b45d637d05ca6a08a8a1e6015fd674e39dc93 SHA1 e76310582459ca504f234c2372c8f1793434bfab SHA256 225d934e2adb70445c697acc51c057e05a6b6c3d415cb9d68c3ae830f55972ff
 MISC metadata.xml 958 RMD160 1a2520070988f4026c3a61ac60d31c8709375d2d SHA1 f09bfa7b0291938d8e340d9e3a737593f195d69a SHA256 635aa2d0f7482a692831381f805e13ce267233bc68c5948cdda675c0b91a9d36
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkg/oDsACgkQyuNVb5qfaOYfNwCfYBm7wG87LVkUYtiulJwx2/gK
-RqsAoKZNyS652RXyXlwYmllIPOtDWvmt
-=ep8O
+iEYEARECAAYFAkhej7wACgkQF6yMcaBxwHnE7QCgk1qOPdJKd7Pc7pAR8QboFinZ
+KFgAniEusBK6PSWC37vaDwzqsQh/cqA9
+=Ybnt
 -----END PGP SIGNATURE-----
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