Fix --as-needed failure. Bug #384697

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

4 files changed, 35 insertions, 5 deletions

diff --git a/app-i18n/nabi/ChangeLog b/app-i18n/nabi/ChangeLog
index de18533db458..c46eb71d7b48 100644
--- a/app-i18n/nabi/ChangeLog
+++ b/app-i18n/nabi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/nabi
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/nabi/ChangeLog,v 1.28 2011/03/27 10:54:45 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/nabi/ChangeLog,v 1.29 2011/09/30 00:49:36 naota Exp $
+
+  30 Sep 2011; Naohiro Aota <naota@gentoo.org> nabi-0.15.ebuild,
+  +files/nabi-0.15-asneeded.patch, nabi-0.17.ebuild:
+  Fix --as-needed failure. Bug #384697
 
   27 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> nabi-0.15.ebuild,
   nabi-0.17.ebuild, nabi-0.99.3.ebuild:
diff --git a/app-i18n/nabi/files/nabi-0.15-asneeded.patch b/app-i18n/nabi/files/nabi-0.15-asneeded.patch
new file mode 100644
index 000000000000..c5f6d2422cc8
--- /dev/null
+++ b/app-i18n/nabi/files/nabi-0.15-asneeded.patch
@@ -0,0 +1,12 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 700557c..ac6ec0d 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -27,6 +27,5 @@ nabi_SOURCES = \
+ 	keycapturedialog.c \
+ 	main.c
+ 
+-nabi_LDFLAGS = @X_LIBS@ @X_PRE_LIBS@ -lX11 @GTK_LIBS@ 
+-nabi_LDADD = ../IMdkit/libXimd.a
++nabi_LDADD = @X_LIBS@ @X_PRE_LIBS@ -lX11 @GTK_LIBS@ ../IMdkit/libXimd.a
+ 
diff --git a/app-i18n/nabi/nabi-0.15.ebuild b/app-i18n/nabi/nabi-0.15.ebuild
index 012a8101ccc5..227dc314071d 100644
--- a/app-i18n/nabi/nabi-0.15.ebuild
+++ b/app-i18n/nabi/nabi-0.15.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/nabi/nabi-0.15.ebuild,v 1.8 2011/03/27 10:54:45 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/nabi/nabi-0.15.ebuild,v 1.9 2011/09/30 00:49:36 naota Exp $
 
-EAPI="1"
+EAPI="4"
+
+inherit eutils autotools
 
 DESCRIPTION="Simple Hanguk X Input Method"
 HOMEPAGE="http://nabi.kldp.net/"
@@ -17,6 +19,11 @@ RDEPEND=">=x11-libs/gtk+-2.2:2"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.15-asneeded.patch
+	eautoreconf
+}
+
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 
diff --git a/app-i18n/nabi/nabi-0.17.ebuild b/app-i18n/nabi/nabi-0.17.ebuild
index 2a0ce7aa94ce..18150accf7ab 100644
--- a/app-i18n/nabi/nabi-0.17.ebuild
+++ b/app-i18n/nabi/nabi-0.17.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/nabi/nabi-0.17.ebuild,v 1.3 2011/03/27 10:54:45 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/nabi/nabi-0.17.ebuild,v 1.4 2011/09/30 00:49:36 naota Exp $
 
-EAPI="1"
+EAPI="4"
+
+inherit eutils autotools
 
 DESCRIPTION="Simple Hanguk X Input Method"
 HOMEPAGE="http://nabi.kldp.net/"
@@ -18,6 +20,11 @@ RDEPEND=">=x11-libs/gtk+-2.2:2
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.99.3-asneeded.patch
+	eautoreconf
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"