Link ruby lib against shared lib.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

diff --git a/dev-libs/stfl/ChangeLog b/dev-libs/stfl/ChangeLog
index 8cc10047f5307b52385d809d2d9d478ee9552133..69bba7c392ee28c5a97584e31af68dbef14f9c37 100644 (file)
--- a/dev-libs/stfl/ChangeLog
+++ b/dev-libs/stfl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/stfl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/stfl/ChangeLog,v 1.34 2012/01/11 12:43:35 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/stfl/ChangeLog,v 1.35 2012/01/11 14:02:00 radhermit Exp $
+
+  11 Jan 2012; Tim Harder <radhermit@gentoo.org> stfl-0.22.ebuild,
+  +files/stfl-0.22-ruby-sharedlib.patch:
+  Link ruby lib against shared lib.
 
   11 Jan 2012; Tim Harder <radhermit@gentoo.org> stfl-0.22.ebuild:
   Fix building ruby support (bug #395569) and update to EAPI 4.

diff --git a/dev-libs/stfl/Manifest b/dev-libs/stfl/Manifest
index aa0921bb5f4b995d9bd80d43b86c62af2fd21a89..c2350706011cfcb3171007468e0c6a1c31871b81 100644 (file)
--- a/dev-libs/stfl/Manifest
+++ b/dev-libs/stfl/Manifest
@@ -2,21 +2,22 @@
 Hash: SHA512
 
 AUX stfl-0.21-python.patch 1936 RMD160 fce9de74ac0cab5abe0e9b2d53c82cad602a5be1 SHA1 1ae240823806120b94c5cda5ba96b57e289bd730 SHA256 905260dbd13b4ce374d95ced9ea5d443fc44de0f14c0f1140fc8c7cead6c1f06
+AUX stfl-0.22-ruby-sharedlib.patch 735 RMD160 af0f7296fc330e6957eb0cbe984a461fdeb81cbe SHA1 cb9c75422abc00f9e510c7db41e4d24f2a7544e6 SHA256 743a53291cdc25646044488a2171bc127bc80636e36fe25e8c5372738e4dade0
 AUX stfl-0.22-soname-symlink.patch 444 RMD160 10a21f385f10695d2c19ed8b9122ba273a78edd4 SHA1 aa7aa0d2c6b92b5b0b12107ec3d9a458c8e60527 SHA256 312f0b9dd2c628531b139614d22806eec16f2587e83dc33ba28a093a3af63d38
 DIST stfl-0.21.tar.gz 41093 RMD160 d8b56cc97b4d76adba8034ce9bbae631e6e9d17e SHA1 0313eafa1fe4dcfea1f2edd34d453baaa46df277 SHA256 bf0ead0a66b635602222bc9089414b99f99081b956c92baf77699d283bcc88eb
 DIST stfl-0.22.tar.gz 41412 RMD160 d76a0ef7a86efcf7c4b25033958f161a7dcc3220 SHA1 226488be2b33867dfb233f0fa2dde2d066e494bd SHA256 2dddafd331e61ad04baf1251ccecb3a69feaf99880dd75155be8423c1cc55418
 EBUILD stfl-0.21.ebuild 2734 RMD160 d4f33d65571629944987585832bddc1c19558da4 SHA1 4a34f9cb5ca40b1d66b0ea58da18e4f5217c90c5 SHA256 1176e6dfd333d7d9c4011d99d4df346f15ac487dd08517f69cd1a585a2fd3936
-EBUILD stfl-0.22.ebuild 2829 RMD160 3dd8b4f885529a25143a40371a8bf3e4efcc8454 SHA1 7bad216e85fb2416f2a64bd04076cf0817b71d5c SHA256 1aeb9da887b6852677bd587c3d995d06e7edfc10e362f57979b2119e197bfc3d
-MISC ChangeLog 5299 RMD160 c15c5c73e5bb475f05a787ab10011d0f58251281 SHA1 5c100dfd24759b19cbeb63aa35a54f0934f6de28 SHA256 7eed2474599db026566c243b6429077fc28b1f7bafedb1a0a199d30000f6cb0d
+EBUILD stfl-0.22.ebuild 2908 RMD160 115b1725c7d4adc43dfaed1c08dc3d4862f23083 SHA1 51456e007ca38eb54b1b47690aba2b1175eed63d SHA256 fc963327cb4c5d260c8ab1a679db8663e5d608beb508732d1921603767a6e1ff
+MISC ChangeLog 5444 RMD160 cf6d2a995069001b9f11427cd980a9bcfe355130 SHA1 8b0a6bf9af8420e01205bb40bec6d7101e3e9ab5 SHA256 b8535cbbafbcd6c466df91f8c242a9966eb56da1e8531ee31f77165bc9d6d2a5
 MISC metadata.xml 900 RMD160 c1bf53da4498fdeff04e9cb17e9e370541fc8d45 SHA1 fc78cd937e2970b6dafeaa57df7726f65e858f5f SHA256 b23c1d0b55c1ff86ed4397f13b8272e52efc4ac826817694c9030ca72ccd6d74
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPDYQAAAoJEEqz6FtPBkyjSg0H/RpiKbKZG/NaNrtZybb5gMvU
-JZkYukeqKkNAiJT3qYwd2T34bnFHEFQeQ5RjM3wZPlg6OkAZJDB8yXm7zytjENB+
-fBmB4VjcU8tdqvpDzYt6/vO6+ihkGusFHrJFnNTeN9dwMdV+wuWMAjairMcE2bWW
-OdEYBL926nls5tqoDLpjn2FBARz9OjHNsHoNsG2GuVS8x8/MohXg6ySWCdB1H+Sz
-cEQbo367bCP+NJsHJ3pm28hiuF0T4Ktj+5lRm2ICmZLYRWMjLh+wHsaHxk2MzlPK
-mcFwyXF2i8+5a7UJMuuYPV7GMdRdrqTSIP9CPSJ6b5asjuHvdWivQfpbaFXMgJs=
-=t5LJ
+iQEcBAEBCgAGBQJPDZZeAAoJEEqz6FtPBkyj34UH/jn37sJZL0gL+w78/jTbrhmm
+uKpeDOocZJxdzDQ2WyfPbTbq1gRWtdNGTNK/r41kIN/KD9VjG1wJ2/P/25SwQkjq
+6Bqu8Gj8EPNw2KwzGkwXuNjjaMygZbY03dn94YuTBPbCwUv2OvOn2/mlYlKZ28l+
+hMrDjeoy//FU7/l5zS33VKg/hhadLIXTUR2nP0F+Fl1wVgVikBlOvPjdY7nyaLIy
+QWEIdKlXmyQUJulqunC7V/7CAHLAcJqRrvk36TPKB2sXlylclF2b6NIykcfYA0e8
+sLY2UoNPNjzJFSLvnH5bQPcg4Uebrqoi3uxIcXJtm5E8DCPzmeTFMMOPKJ03qtY=
+=KLk7
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/stfl/files/stfl-0.22-ruby-sharedlib.patch b/dev-libs/stfl/files/stfl-0.22-ruby-sharedlib.patch
new file mode 100644 (file)
index 0000000..90698ec
--- /dev/null
+++ b/dev-libs/stfl/files/stfl-0.22-ruby-sharedlib.patch
@@ -0,0 +1,14 @@
+--- stfl-0.22/ruby/Makefile.snippet.orig
++++ stfl-0.22/ruby/Makefile.snippet
+@@ -23,9 +23,9 @@
+ 
+ install: install_ruby
+ 
+-ruby/build_ok: libstfl.a stfl.h ruby/stfl.i swig/*.i
++ruby/build_ok: libstfl.so.$(VERSION) 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)/$(libdir)/ruby
++      $(MAKE) -C ruby clean && $(MAKE) -C ruby LIBS+="../libstfl.so.$(VERSION) -lncursesw" CFLAGS+="-pthread -I.." DLDFLAGS+="-pthread" DESTDIR=$(DESTDIR) prefix=$(prefix) sitedir=$(prefix)/$(libdir)/ruby
+       touch ruby/build_ok
+ 
+ install_ruby: ruby/build_ok

diff --git a/dev-libs/stfl/stfl-0.22.ebuild b/dev-libs/stfl/stfl-0.22.ebuild
index 7e31ac2a36dd1beb742f0a3ac8512d4f11c63040..29d9e98a098f75dd45722d9ae90b7aa08f2828e8 100644 (file)
--- a/dev-libs/stfl/stfl-0.22.ebuild
+++ b/dev-libs/stfl/stfl-0.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/stfl/stfl-0.22.ebuild,v 1.2 2012/01/11 12:43:35 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/stfl/stfl-0.22.ebuild,v 1.3 2012/01/11 14:02:00 radhermit Exp $
 
 EAPI="4"
 SUPPORT_PYTHON_ABIS="1"
@@ -41,11 +41,12 @@ src_prepare() {
                Makefile || die "sed failed"
 
        if ! use static-libs ; then
-               sed -i -e "/install .* libstfl.a/d" Makefile
+               sed -i -e "/install .* libstfl.a/d" Makefile || die
        fi
 
        epatch "${FILESDIR}"/${PN}-0.21-python.patch
        epatch "${FILESDIR}"/${P}-soname-symlink.patch
+       epatch "${FILESDIR}"/${P}-ruby-sharedlib.patch
 
        if use perl ; then
                echo "FOUND_PERL5=1" >> Makefile.cfg
@@ -62,6 +63,8 @@ src_prepare() {
        echo "FOUND_PYTHON=0" >> Makefile.cfg
 }
 
+src_configure() { :; }
+
 src_compile() {
        emake CC="$(tc-getCC)"