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

(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)

3 files changed, 37 insertions, 12 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/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
 }