Respect CC,CFLAGS,LDFLAGS wrt bug 335701. Thanks to Diego for the report and Ross Smith <gaurdro@gmail.com> for patch.

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

3 files changed, 68 insertions, 3 deletions

diff --git a/x11-misc/x2x/ChangeLog b/x11-misc/x2x/ChangeLog
index b95ab337ce59..d209b86b4d92 100644
--- a/x11-misc/x2x/ChangeLog
+++ b/x11-misc/x2x/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/x2x
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2x/ChangeLog,v 1.22 2008/02/21 14:25:57 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2x/ChangeLog,v 1.23 2010/09/03 06:20:21 xarthisius Exp $
+
+*x2x-1.27-r3 (03 Sep 2010)
+
+  03 Sep 2010; Kacper Kowalik <xarthisius@gentoo.org> +x2x-1.27-r3.ebuild:
+  Respect CC,CFLAGS,LDFLAGS wrt bug 335701. Thanks to Diego for the report
+  and Ross Smith <gaurdro@gmail.com> for patch.
 
   21 Feb 2008; Raúl Porcel <armin76@gentoo.org> x2x-1.27-r2.ebuild:
   alpha/sparc/x86 stable
diff --git a/x11-misc/x2x/Manifest b/x11-misc/x2x/Manifest
index ad63f974f898..20996937edfd 100644
--- a/x11-misc/x2x/Manifest
+++ b/x11-misc/x2x/Manifest
@@ -5,5 +5,6 @@ DIST x2x_1.27-8-initvars.patch.gz 494 RMD160 33c15b42d387298b6d32f19203d9cc8a949
 DIST x2x_1.27-8.diff.gz 13291 RMD160 a3832676ad8a7858dfc65fbb398cd7b4b038140f SHA1 e44ec25636479f91759c6671dc7079ee67bf5e0f SHA256 d20fcc3e81ef60ef4720737883642739bb744a1d690c74b33d9086118e8b10ab
 EBUILD x2x-1.27-r1.ebuild 1333 RMD160 29ee8f178ebd3eb0541a83b6b06a9790ff56a520 SHA1 6158ddcb9a24ae07c472c898a78b3d48c35e29c4 SHA256 360576a86b61ceda2e30ae1af901e30ab3a8db6b694c0df2f86e91810530ea50
 EBUILD x2x-1.27-r2.ebuild 1527 RMD160 f6bcc2424f981a45a55352f7a91d8a0e2541a024 SHA1 9d7c6c0b45508fb4bf8a6d12073ec4677e3d9e8a SHA256 6b77969710d8d22a6601ad2c187dbf8c43676dd600993e33a7f50986ec601168
-MISC ChangeLog 2862 RMD160 a120b4b032725421e1ea158e15919e4b45957401 SHA1 7d1c915732dcba94350c1d1e1817203c11874210 SHA256 74a38ac3efa752f94f2dcd07217cd1fd568aeb3f5b4e47cf3d77c8b9645ec599
+EBUILD x2x-1.27-r3.ebuild 1581 RMD160 e01d0c49bf71bbf2d8989dd01dc6750b647a3c50 SHA1 894b406bb96ed81d3f816a85f7674d0ea741d70f SHA256 9e9e3bbb5a60d2b3d98fbef73d7d6a54627f9ef4eb058aecd096eae9ec0af238
+MISC ChangeLog 3092 RMD160 945b3034d1950ee10b71824cf151745b3dee071d SHA1 f8d2c14d77291bad49a6401aefb6851bfd305021 SHA256 9165286ff54571bdfdbb2d7bfa53c9c21413dc749dfe9024cb55deff87ee9f94
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
diff --git a/x11-misc/x2x/x2x-1.27-r3.ebuild b/x11-misc/x2x/x2x-1.27-r3.ebuild
new file mode 100644
index 000000000000..7729f1bf471f
--- /dev/null
+++ b/x11-misc/x2x/x2x-1.27-r3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2x/x2x-1.27-r3.ebuild,v 1.1 2010/09/03 06:20:21 xarthisius Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="An utility to connect the Mouse and KeyBoard to another X"
+HOMEPAGE="http://www.the-labs.com/X11/#x2x"
+LICENSE="as-is"
+SRC_URI="http://ftp.digital.com/pub/Digital/SRC/x2x/${P}.tar.gz
+	mirror://debian/pool/main/x/x2x/x2x_1.27-8.diff.gz
+	mirror://gentoo/x2x_1.27-8-initvars.patch.gz
+	mirror://gentoo/${P}-license.patch.gz
+	mirror://gentoo/${P}-keymap.diff.gz"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXtst
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	app-text/rman
+	x11-misc/imake
+	x11-proto/xproto"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Patch from Debian to add -north and -south, among other fixes
+	epatch "${DISTDIR}"/x2x_1.27-8.diff.gz
+
+	# Fix variable initialization in Debian patch
+	epatch "${DISTDIR}"/x2x_1.27-8-initvars.patch.gz
+
+	# Patch to add LICENSE
+	epatch "${DISTDIR}"/${P}-license.patch.gz
+
+	# Patch to fix bug #126939
+	# AltGr does not work in x2x with different keymaps:
+	epatch "${DISTDIR}"/${P}-keymap.diff.gz
+
+	# Man-page is packaged as x2x.1 but needs to be x2x.man for building
+	mv x2x.1 x2x.man || die
+}
+
+src_compile() {
+	xmkmf || die
+	emake CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}" || die
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die
+	newman x2x.man x2x.1 || die
+}