Respect LDFLAGS from environment wrt #334653 by Diego Elio Pettenò

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

4 files changed, 54 insertions, 14 deletions

diff --git a/app-i18n/skkfep/ChangeLog b/app-i18n/skkfep/ChangeLog
index 4a8c056ceae2..19b7ccca3213 100644
--- a/app-i18n/skkfep/ChangeLog
+++ b/app-i18n/skkfep/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/skkfep
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/skkfep/ChangeLog,v 1.11 2011/02/14 20:46:29 armin76 Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/skkfep/ChangeLog,v 1.12 2012/03/18 08:25:09 ssuominen Exp $
+
+  18 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> skkfep-0.87-r1.ebuild,
+  +files/skkfep-0.87-LDFLAGS.patch:
+  Respect LDFLAGS from environment wrt #334653 by Diego Elio Pettenò
 
   14 Feb 2011; Raúl Porcel <armin76@gentoo.org> skkfep-0.86c.ebuild,
   skkfep-0.87.ebuild, skkfep-0.87-r1.ebuild:
diff --git a/app-i18n/skkfep/Manifest b/app-i18n/skkfep/Manifest
index 1bfe9aeb741d..c214715b8cb5 100644
--- a/app-i18n/skkfep/Manifest
+++ b/app-i18n/skkfep/Manifest
@@ -1,9 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX skkfep-0.87-LDFLAGS.patch 616 RMD160 083940d2c22c4c71ed258bd7b04b9100d014cee3 SHA1 9f487872322e87719cea27281c788f33dd44ab1c SHA256 146cda4b3cec79b4cd2fd388214ad142d13b75164e7de93d6b4757d80fc6fa1f
 AUX skkfep-0.87-gentoo.patch 4318 RMD160 7d9ec3a30e2fcff5f8a874081d8e60465262e3f7 SHA1 c8c49b23cc99a031496da3e858ffcc0d9eec490a SHA256 394c7e804093883e6f2fd072267461bc62c572a527cfc9d6413a7ae8a309b270
 DIST skkfep-0.87.tar.gz 45711 RMD160 a2f1581ab56540e8488a4146efa58964b61cc01b SHA1 db0cce3c93d482faa910fea267c534ccdd6970c4 SHA256 f5eb6a23a7bf9b8a5493e8104c346ac053c2545bab1a3b82054cd1a09cef0e61
 DIST skkfep0.86c-kh1.2.10.patch.gz 30234 RMD160 1a9ac4b6b3b6ab1b128c4f45911280f8889344ac SHA1 248cc8b22cf03480736b7e37fdba6c22ee1a0039 SHA256 d7192c12acc77f3cbccc43e068e4d43961a03fb0dffa91654e39ca073dbf22ca
 DIST skkfep0.86c.tar.gz 46748 RMD160 11bfc483ee31b74070d288ecb3e269cb66347760 SHA1 fe1473c2a9d28901a96fdc5cf51079de47c86c32 SHA256 41082f17703da4fd0a0903f6f6143cc0d393c2387b2d95705a98e761e814cf75
 EBUILD skkfep-0.86c.ebuild 1122 RMD160 4225260a426eebfd2ba7b6fea62d040c7566e91b SHA1 c12b76d03bdfff966aa24322b0e9372908911a9d SHA256 214120ff613dfc18e2d6451c3c42c50193d76545069c9663b300f725faac99aa
-EBUILD skkfep-0.87-r1.ebuild 855 RMD160 04f10bc5f7f2b2f2e2f42df29e84c9f82b07f2ac SHA1 9cb3141d716ba607592dbaf75e347b7967ece246 SHA256 6df3393c277f046bfe5e954f406fcbc7c5f0ce12823bca4c8e340f014392c540
+EBUILD skkfep-0.87-r1.ebuild 876 RMD160 a64940d7ddf9d576bb68f99a99fef863ebea96a9 SHA1 e88c6e8c493e63541d35d9247ff2c5cc187fb0e0 SHA256 003bbcaea400ed91378c6a84b656d6bd987d245158e569f2b78372852ea0a9fc
 EBUILD skkfep-0.87.ebuild 1204 RMD160 be09296f933498b75e75a8b819f1267e64029043 SHA1 bea204b5a0811675ad5c50ce773a6c8b01ca2f87 SHA256 a80c3213a78bebbcc41f6cc67436f9736487330ce258d092704518ea04082123
-MISC ChangeLog 1339 RMD160 8edf63c4aefe6c5794f425d0f9d1c785194e7530 SHA1 b8c23da04dce6e17601103b6f3ed1cf3f3bcf154 SHA256 ebb1a6b2e0b216f597bdca7353c0171393250bf1a8fb099f241260497d325fa4
+MISC ChangeLog 1525 RMD160 fb9cecd0c00fd07b60e18e31f0ec161c260f2e74 SHA1 09d965529b4688bfc709d505e64d32c32da88b44 SHA256 9edb2aa770ae78c96a80da6608370c09950dd7e46c9b89598a2e231623494c1f
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPZZvWAAoJEEdUh39IaPFNJXEIAJC9zCGyET5u5KcTgxcjiLa4
+vTHbwRu+3tqV2/t50Ulb1pLp9ZeUC6pQYNosUvwNAdvp77tVpAKL4U1AJZWLSCZW
+4Jb2vdOvkzsXfSlYC9EZBQ6zZ+shz2zICQol7yOdqYlonU1f4e1rSoe8tTsSZhm9
+MIBsbKBgqExlpTrsP+IBnh9dVsYJYZ/JV9fymiaY0WdJpdAGnM9BmjxNh85fCV6k
+vSU54wibwbJuki4NiJR+Rxv9DkOmFfPa4uvNrxgZKzEkgQBpE5lV4GShd5hy1DQE
+UtiZWGd81Jq16tyWCbpgvWTWG2RGESsoATax/onpuXe6ifuvbwYfgoWoyOCQX/k=
+=U6Z7
+-----END PGP SIGNATURE-----
diff --git a/app-i18n/skkfep/files/skkfep-0.87-LDFLAGS.patch b/app-i18n/skkfep/files/skkfep-0.87-LDFLAGS.patch
new file mode 100644
index 000000000000..6532d000770e
--- /dev/null
+++ b/app-i18n/skkfep/files/skkfep-0.87-LDFLAGS.patch
@@ -0,0 +1,21 @@
+http://bugs.gentoo.org/334653
+
+--- protoMakefile
++++ protoMakefile
+@@ -13,13 +13,13 @@
+ 	./jc -`./jc -c romkan-org.c`P romkan-org.c > romkan.c
+ 
+ jc: jc.o
+-	$(CC) $(CFLAGS) -o jc jc.o
++	$(CC) $(LDFLAGS) $(CFLAGS) -o jc jc.o
+ 
+ $(SKKFEP): $(OBJS) $(SKKOBJS)
+-	$(CC) $(CFLAGS) -o $(SKKFEP) $(OBJS) $(SKKOBJS) $(LIBS)
++	$(CC) $(LDFLAGS) $(CFLAGS) -o $(SKKFEP) $(OBJS) $(SKKOBJS) $(LIBS)
+ 
+ simpledic: $(SDICOBJS) $(SKKOBJS)
+-	$(CC) $(CFLAGS) -o simpledic $(SDICOBJS) $(SKKOBJS) $(LIBS)
++	$(CC) $(LDFLAGS) $(CFLAGS) -o simpledic $(SDICOBJS) $(SKKOBJS) $(LIBS)
+ 
+ clean:
+ 	-rm -rf $(OBJS) $(SKKOBJS) $(SDICOBJS) romkan.c
diff --git a/app-i18n/skkfep/skkfep-0.87-r1.ebuild b/app-i18n/skkfep/skkfep-0.87-r1.ebuild
index 52e7cb131e67..4b5c9c44d65b 100644
--- a/app-i18n/skkfep/skkfep-0.87-r1.ebuild
+++ b/app-i18n/skkfep/skkfep-0.87-r1.ebuild
@@ -1,7 +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/app-i18n/skkfep/skkfep-0.87-r1.ebuild,v 1.3 2011/02/14 20:46:29 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/skkfep/skkfep-0.87-r1.ebuild,v 1.4 2012/03/18 08:25:09 ssuominen Exp $
 
+EAPI=4
 inherit eutils toolchain-funcs
 
 DESCRIPTION="A SKK-like Japanese input method for console"
@@ -13,26 +14,25 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-RDEPEND="sys-libs/ncurses"
+RDEPEND=">=sys-libs/ncurses-5.7-r7"
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4
 	sys-apps/gawk"
 RDEPEND="${RDEPEND}
 	app-i18n/skk-jisyo"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-LDFLAGS.patch
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" OPTIMIZE="${CFLAGS}" || die
+	emake CC="$(tc-getCC)" OPTIMIZE="${CFLAGS}"
 }
 
 src_install() {
-	dobin skkfep escmode || die
+	dobin skkfep escmode
 	doman skkfep.1
-
 	dodoc README HISTORY TODO
 }