Fix building with -Wl,--as-needed wrt #276302 by Kacper Kowalik.

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

4 files changed, 48 insertions, 20 deletions

diff --git a/app-i18n/fcitx/ChangeLog b/app-i18n/fcitx/ChangeLog
index 63d23da96444..23eb44b7b1d5 100644
--- a/app-i18n/fcitx/ChangeLog
+++ b/app-i18n/fcitx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/fcitx
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/ChangeLog,v 1.28 2009/11/09 07:06:06 tove Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/ChangeLog,v 1.29 2010/02/06 15:36:35 ssuominen Exp $
+
+  06 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> fcitx-3.6.2.ebuild,
+  +files/fcitx-3.6.2-asneeded.patch:
+  Fix building with -Wl,--as-needed wrt #276302 by Kacper Kowalik.
 
 *fcitx-3.6.2 (07 Nov 2009)
 
diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest
index c0393a703577..f66a62d9fbea 100644
--- a/app-i18n/fcitx/Manifest
+++ b/app-i18n/fcitx/Manifest
@@ -1,7 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX fcitx-3.5_pre070703-asneeded.patch 359 RMD160 fb2de1bb3d20bd1a72b50caae2344616f33f9fb2 SHA1 e1a31ec925f6e14d2c4f43e38ab84008d239fd4f SHA256 ed671bac0442310f26c2756f21df665a9206f225ad06c643c00f660f0ca9979b
+AUX fcitx-3.6.2-asneeded.patch 831 RMD160 63033110b1f779d951d7dcfa0ccc20a07ae65fdc SHA1 e63fdec28dc860f6c45ae0a243814aec9e267692 SHA256 ffe6a448bfc4d473f68b01eb0fa7a3f49594f100ab5fc820cb004d308e92c92e
 DIST fcitx-3.1.1.tar.bz2 2920856 RMD160 229155ec71deb189ffc52851ee9a242ba9192a5b SHA1 3d23a0786edd6ff6e69d353692849d9041442038 SHA256 011863a2964e64b89f2eabf1f98bed2caf8201e4a998847ffff55098dc7dadaa
 DIST fcitx-3.5-BlackFri.tar.bz2 5719492 RMD160 24f3494247651e21fb9f48fc618ec2d8306090ea SHA1 9ed191dcab5c0877654e0c3adad77ffe0e8ba47f SHA256 07dfb11655097a15be57f38d33ef04c5db98adb7eb5c3326d9ed1acdf3bc80be
 DIST fcitx-3.6.1.tar.bz2 6347872 RMD160 e60e398c3db0de795e48fee0b8ba27f0f2817b30 SHA1 a01b9e7c19855da149b019acf7cd84b3b8a48931 SHA256 0b8a4de36d44ea28f31008c6f997843e1dc56be25246264f3a3dcf79a3ade22a
@@ -9,13 +7,6 @@ DIST fcitx-3.6.2.tar.bz2 6347362 RMD160 e7dde0ab977c0e27d30430a442afde8da28ff675
 EBUILD fcitx-3.1.1.ebuild 1425 RMD160 a9b6c39ec2cc01c3fb0a484b18aca74ac055ddf5 SHA1 b353a37e751f3a17f45649b51e728c8e66501614 SHA256 f1c7ccb3acd095227284c074a0817529fc66472f968815d031f4aedbc64498df
 EBUILD fcitx-3.5.ebuild 1442 RMD160 302d424e374bede65a58e99240440d657754e411 SHA1 41aec05fb8a5ee09bf168371f3e3ca39fc1afabe SHA256 0516ca6fc217297653d148cb9c65a0c16468c931ea51e19cc04094b76075e933
 EBUILD fcitx-3.6.1.ebuild 1391 RMD160 71ebb6fcc2c38a6d95954796d842eab440588fd6 SHA1 9b7dfea9028a8962a4400fd8e1654c8dd22dc062 SHA256 dcae83c5af3c732ec207e2aff5316916ad91850c63ae87dbbbbfc0eb4e281e9f
-EBUILD fcitx-3.6.2.ebuild 1411 RMD160 60fa560d4592422d3e719c7ccef9546676a96bc3 SHA1 29a60c47a68456b28f56ca4570f831688efe29c6 SHA256 9983d17a4d28217fe29fbef4995c70967ca5879189dea5693d4df629e9a4f072
-MISC ChangeLog 4292 RMD160 1ce6c28788860b0d4cfb590f1f87f27e89367b09 SHA1 dad980e33e2ab12b6e77a6da82226042cf2769c9 SHA256 23584088fed67315709091609d99d1bc9b3f818c027564ed6dec40157679a471
+EBUILD fcitx-3.6.2.ebuild 1494 RMD160 75f6542a7dc9d4772c2b1771559a4926cde2ad49 SHA1 1fa49cbe30fb5a1e74698cd4194a52891a5add42 SHA256 bc3f2146dc3393f68f0bb00e90fa6078ca2c7c3d018e3a87578079cc5c4286d8
+MISC ChangeLog 4476 RMD160 a670751c36c16aca54aa306776d53e20f7924525 SHA1 a07129eaf5fed3d3dadaf1936bfea688e7aa7d15 SHA256 dc9048811908d1de6f450979715d1af4b90a1fbc7ad2246cf0e97f5060bd3ce9
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkr3v2QACgkQV3J2n04EauyOhQCbBwogIshx7tXzZ6VwMO4fssaF
-9YUAoLl9t54An6E34Z/61oS6edYiaYuE
-=YVjp
------END PGP SIGNATURE-----
diff --git a/app-i18n/fcitx/fcitx-3.6.2.ebuild b/app-i18n/fcitx/fcitx-3.6.2.ebuild
index 61e8d5740305..41ddf3d09235 100644
--- a/app-i18n/fcitx/fcitx-3.6.2.ebuild
+++ b/app-i18n/fcitx/fcitx-3.6.2.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-3.6.2.ebuild,v 1.1 2009/11/07 07:07:25 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-3.6.2.ebuild,v 1.2 2010/02/06 15:36:35 ssuominen Exp $
 
 EAPI=2
-
-inherit flag-o-matic
+inherit autotools eutils
 
 DESCRIPTION="Free Chinese Input Toy for X. Another Chinese XIM Input Method"
 HOMEPAGE="http://www.fcitx.org/"
@@ -19,13 +18,18 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXpm
 	x11-libs/libXrender
 	x11-libs/libXt
+	x11-libs/libXtst
+	x11-libs/libXext
 	x11-libs/libXft"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-src_configure() {
-	append-ldflags $(no-as-needed)
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+	eautoreconf
+}
 
+src_configure() {
 	# --disable-xft doesn't work
 	# econf $(use_enable xft) || die
 	econf || die
diff --git a/app-i18n/fcitx/files/fcitx-3.6.2-asneeded.patch b/app-i18n/fcitx/files/fcitx-3.6.2-asneeded.patch
new file mode 100644
index 000000000000..d83f4773d58d
--- /dev/null
+++ b/app-i18n/fcitx/files/fcitx-3.6.2-asneeded.patch
@@ -0,0 +1,29 @@
+http://bugs.gentoo.org/show_bug.cgi?id=276302
+
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -1,7 +1,7 @@
+ DEFS = -DPKGDATADIR=\"$(pkgdatadir)\"
+ 
+ INCLUDES = -I. -I$(top_srcdir)/lib -I$(top_srcdir)/xpm
+-AM_CFLAGS = -O2 -fno-strength-reduce
++AM_CFLAGS = -fno-strength-reduce
+ 
+ 
+ bin_PROGRAMS = fcitx
+@@ -34,5 +34,4 @@
+ 		fcitx.h extra.c extra.h \
+ 		internalVersion.c
+ 		
+-fcitx_LDADD = ../lib/libXimd.a
+-fcitx_LDFLAGS = -lXpm -lXtst
++fcitx_LDADD = ../lib/libXimd.a -lXpm -lXtst -lXext
+--- lib/Makefile.am
++++ lib/Makefile.am
+@@ -1,5 +1,5 @@
+ noinst_LIBRARIES = libXimd.a
+-AM_CFLAGS = -c -O2 -fno-strength-reduce -fno-strict-aliasing
++AM_CFLAGS = -fno-strength-reduce -fno-strict-aliasing
+ libXimd_a_SOURCES = \
+   FrameMgr.c FrameMgr.h i18nAttr.c i18nClbk.c i18nIc.c \
+   i18nIMProto.c i18nMethod.c i18nPtHdr.c i18nUtil.c i18nX.c \