From 46dd0b8e2966b117e6d15c0864425aa6ca672b24 Mon Sep 17 00:00:00 2001
From: Samuli Suominen <ssuominen@gentoo.org>
Date: Fri, 8 Jan 2010 14:56:34 +0000
Subject: Fix building with -Wl,--as-needed wrt #248546, thanks to Kacper
 Kowalik for patch. Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

---
 x11-misc/accessx/ChangeLog              |  9 +++++++--
 x11-misc/accessx/Manifest               |  4 ++--
 x11-misc/accessx/accessx-0951-r1.ebuild | 20 +++++++++++---------
 3 files changed, 20 insertions(+), 13 deletions(-)

(limited to 'x11-misc')

diff --git a/x11-misc/accessx/ChangeLog b/x11-misc/accessx/ChangeLog
index 97b055fcc8ca..3346baa8ebe3 100644
--- a/x11-misc/accessx/ChangeLog
+++ b/x11-misc/accessx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/accessx
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/accessx/ChangeLog,v 1.27 2008/02/09 01:04:43 coldwind Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/accessx/ChangeLog,v 1.28 2010/01/08 14:56:34 ssuominen Exp $
+
+  08 Jan 2010; Samuli Suominen <ssuominen@gentoo.org>
+  accessx-0951-r1.ebuild:
+  Fix building with -Wl,--as-needed wrt #248546, thanks to Kacper Kowalik
+  for patch.
 
   09 Feb 2008; Santiago M. Mola <coldwind@gentoo.org> -accessx-0951.ebuild:
   Remove unused version.
diff --git a/x11-misc/accessx/Manifest b/x11-misc/accessx/Manifest
index 7e17c4de327e..e1820b7d56d2 100644
--- a/x11-misc/accessx/Manifest
+++ b/x11-misc/accessx/Manifest
@@ -1,5 +1,5 @@
 AUX accessx-0951-build.patch 1666 RMD160 abf8d73875ce94d5e2e7b59f5606bf0bc56be720 SHA1 7c8a16fff372db6f4f2950455c86b581160dedfa SHA256 8f22d2effde1ff63e4201236bd2a8928db37fdf1ecafe618569e3a1ff03bcecc
 DIST accessx0951.tar.gz 17199 RMD160 505db30895d16137ff893ee0adbc1e8a8c706e4b SHA1 c189d86067df37d206c7c1cd99ec7568f045d0a8 SHA256 441e9316552a88d26b265a3074656ec56a84d8ea287d7dcebdb7a2b562111863
-EBUILD accessx-0951-r1.ebuild 870 RMD160 4af0d4c55dec84be922bc03f0f70f141d43cfc1b SHA1 d879cdaf896cbaa43dc65592d1f329202bcc5e1f SHA256 d6f2894ca8812c966220b39cacc293024af4c6cc978075c6729795c71223653f
-MISC ChangeLog 2819 RMD160 a5547825d4e2098fba78340e3bb9711105da6c86 SHA1 7bba4c8e340ba9283d08ade218480bf264983188 SHA256 a1fbd538eb9690f96cdf66c926c8333448cfd9b5d4125f61194adb57f70f4cac
+EBUILD accessx-0951-r1.ebuild 938 RMD160 e06db241d15ac6edef648dee292a157a8a10e643 SHA1 890d53509eb783cbbb0626c593808b2bee07f3cf SHA256 66d57ee354e8d33de3c82325acaefcf17ddfa1bbe84ef504914e62a261931523
+MISC ChangeLog 2988 RMD160 dcd404badb62f4e21fbb78276ef03cd794b3564a SHA1 0bc4fab7002f064e4e9edc2571acad548b881ca5 SHA256 8d012abb27373c6bcaae038037ebf515030ed532b571f4b54176a55160047e92
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
diff --git a/x11-misc/accessx/accessx-0951-r1.ebuild b/x11-misc/accessx/accessx-0951-r1.ebuild
index b7609e565c71..1808fafc3d3c 100644
--- a/x11-misc/accessx/accessx-0951-r1.ebuild
+++ b/x11-misc/accessx/accessx-0951-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/accessx/accessx-0951-r1.ebuild,v 1.4 2008/01/10 18:19:04 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/accessx/accessx-0951-r1.ebuild,v 1.5 2010/01/08 14:56:34 ssuominen Exp $
 
+EAPI=2
 inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="Interface to the XKEYBOARD extension in X11"
@@ -13,25 +14,26 @@ SLOT="0"
 KEYWORDS="~amd64 ppc sparc x86"
 IUSE=""
 
-RDEPEND="x11-libs/libX11
+DEPEND="x11-libs/libX11
 	x11-libs/libXext
 	dev-lang/tk"
-DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${PN}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-build.patch
+
+	sed -i \
+		-e 's:$(CC) $(OPTS) ax.C:$(CC) $(LDFLAGS) $(OPTS) ax.C:' \
+		Makefile || die
 }
 
 src_compile() {
 	emake CC="$(tc-getCXX)" OPTS="${CXXFLAGS}" \
-		XLIBDIR="-L/usr/$(get_libdir)" || die "emake failed."
+		XLIBDIR="-L/usr/$(get_libdir)" LLIBS="-lXext -lX11" || die
 }
 
 src_install() {
-	dobin accessx ax
+	dobin accessx ax || die
 	dodoc CHANGES README
 }
-- 
cgit v1.2.3-65-gdbad