Fix building ruby support (bug #395569) and update to EAPI 4.

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

diff --git a/dev-libs/stfl/ChangeLog b/dev-libs/stfl/ChangeLog
index 2768f132c8405b40283b0579c69db31d73fca138..8cc10047f5307b52385d809d2d9d478ee9552133 100644 (file)
--- a/dev-libs/stfl/ChangeLog
+++ b/dev-libs/stfl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/stfl
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/stfl/ChangeLog,v 1.33 2011/11/01 07:37:02 radhermit Exp $
+# 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 $
+
+  11 Jan 2012; Tim Harder <radhermit@gentoo.org> stfl-0.22.ebuild:
+  Fix building ruby support (bug #395569) and update to EAPI 4.
 
 *stfl-0.22 (01 Nov 2011)
 

diff --git a/dev-libs/stfl/Manifest b/dev-libs/stfl/Manifest
index 2dbb66cf4babf97c98ca072eb0e8d1d9f25571ff..aa0921bb5f4b995d9bd80d43b86c62af2fd21a89 100644 (file)
--- a/dev-libs/stfl/Manifest
+++ b/dev-libs/stfl/Manifest
@@ -6,17 +6,17 @@ AUX stfl-0.22-soname-symlink.patch 444 RMD160 10a21f385f10695d2c19ed8b9122ba273a
 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 2968 RMD160 cf4bce25d381d8308bc807668a40bdaa0b1892d1 SHA1 7efea4131e96606177a1d214ae205aa931f1f21b SHA256 9fcdb86946fd4ef30e00d9d64eee79e54f3c689d330e9b51c673db7b585fbc4d
-MISC ChangeLog 5167 RMD160 e243db304cd7e01cfe9fd0beda118ce04a99591a SHA1 614227a9820c8490cddcb032498ff38bd44554ab SHA256 de5654b75f162109126d334abc7cf49093d9ba2cb68cb8421a90e6caf2db97c5
+EBUILD stfl-0.22.ebuild 2829 RMD160 3dd8b4f885529a25143a40371a8bf3e4efcc8454 SHA1 7bad216e85fb2416f2a64bd04076cf0817b71d5c SHA256 1aeb9da887b6852677bd587c3d995d06e7edfc10e362f57979b2119e197bfc3d
+MISC ChangeLog 5299 RMD160 c15c5c73e5bb475f05a787ab10011d0f58251281 SHA1 5c100dfd24759b19cbeb63aa35a54f0934f6de28 SHA256 7eed2474599db026566c243b6429077fc28b1f7bafedb1a0a199d30000f6cb0d
 MISC metadata.xml 900 RMD160 c1bf53da4498fdeff04e9cb17e9e370541fc8d45 SHA1 fc78cd937e2970b6dafeaa57df7726f65e858f5f SHA256 b23c1d0b55c1ff86ed4397f13b8272e52efc4ac826817694c9030ca72ccd6d74
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOr6GoAAoJEEqz6FtPBkyjpN4IAKl569Z+Ep1wYRK2zoMAzHlE
-YZRxgTlwxSenDAQRmiZ5zKRtEaR0zalywk+s67ET5iJnK1bwFfB9KApEzkkbIPt4
-QG+pioKiknV+EF1MHMJf0RsTHqLAXoB2F4joKqG31LgPMVTxCrmpesShvL7VRX/x
-aB2IaSAo8okbkEF0sn5vawUVskJf1GHBJLjgAZPATJH5KI4ciwdMIECmTcjRTwsA
-/Tf+xlXAd8MPh13QZexY2GYuhuIHcHKQ4ZZ+ZJrgOauhb+e67P9aReKQ650JLWlG
-xqxHHBTJNPKfM7LPZ2cXOeqCZCzvKeFGeE/GB3UgDHFzZ5W/kjDB/ebZ+c8zaZ0=
-=vRkt
+iQEcBAEBCgAGBQJPDYQAAAoJEEqz6FtPBkyjSg0H/RpiKbKZG/NaNrtZybb5gMvU
+JZkYukeqKkNAiJT3qYwd2T34bnFHEFQeQ5RjM3wZPlg6OkAZJDB8yXm7zytjENB+
+fBmB4VjcU8tdqvpDzYt6/vO6+ihkGusFHrJFnNTeN9dwMdV+wuWMAjairMcE2bWW
+OdEYBL926nls5tqoDLpjn2FBARz9OjHNsHoNsG2GuVS8x8/MohXg6ySWCdB1H+Sz
+cEQbo367bCP+NJsHJ3pm28hiuF0T4Ktj+5lRm2ICmZLYRWMjLh+wHsaHxk2MzlPK
+mcFwyXF2i8+5a7UJMuuYPV7GMdRdrqTSIP9CPSJ6b5asjuHvdWivQfpbaFXMgJs=
+=t5LJ
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/stfl/stfl-0.22.ebuild b/dev-libs/stfl/stfl-0.22.ebuild
index 248c1555f6515529d2c641a122f4cdf4435b8190..7e31ac2a36dd1beb742f0a3ac8512d4f11c63040 100644 (file)
--- a/dev-libs/stfl/stfl-0.22.ebuild
+++ b/dev-libs/stfl/stfl-0.22.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.1 2011/11/01 07:37:02 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/stfl/stfl-0.22.ebuild,v 1.2 2012/01/11 12:43:35 radhermit Exp $
 
-EAPI="3"
+EAPI="4"
 SUPPORT_PYTHON_ABIS="1"
 
 inherit eutils multilib perl-module python toolchain-funcs
@@ -63,9 +63,7 @@ src_prepare() {
 }
 
 src_compile() {
-       local targets="libstfl.so.${PV}"
-       use static-libs && targets+=" libstfl.a"
-       emake CC="$(tc-getCC)" ${targets} || die "emake failed"
+       emake CC="$(tc-getCC)"
 
        if use python ; then
                python_copy_sources python
@@ -82,7 +80,7 @@ src_compile() {
 }
 
 src_install() {
-       emake prefix="/usr" DESTDIR="${D}" libdir="$(get_libdir)" install || die "emake install failed"
+       emake prefix="/usr" DESTDIR="${D}" libdir="$(get_libdir)" install
 
        if use python ; then
                installation() {