Respects LDFLAGS now, see bug #333985. Dropped obsolete version.

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 10 insertions, 50 deletions

diff --git a/x11-misc/xxkb/ChangeLog b/x11-misc/xxkb/ChangeLog
index dde235c6a43e..3a5b3363ded0 100644
--- a/x11-misc/xxkb/ChangeLog
+++ b/x11-misc/xxkb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xxkb
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xxkb/ChangeLog,v 1.15 2010/04/08 20:17:02 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xxkb/ChangeLog,v 1.16 2010/08/26 19:24:36 phosphan Exp $
+
+  26 Aug 2010; Patrick Kursawe <phosphan@gentoo.org> -xxkb-1.11.ebuild,
+  xxkb-1.11-r1.ebuild:
+  Respects LDFLAGS now, see bug #333985. Dropped obsolete version.
 
 *xxkb-1.11-r1 (08 Apr 2010)
 
diff --git a/x11-misc/xxkb/Manifest b/x11-misc/xxkb/Manifest
index 5bdd88201f28..c434f6241e9e 100644
--- a/x11-misc/xxkb/Manifest
+++ b/x11-misc/xxkb/Manifest
@@ -9,7 +9,7 @@ AUX xxkb-1.10-gcc34-fix.patch 237 RMD160 fca3133be36cc7c347047c9b1cdd27ce7574d73
 DIST xxkb-1.10.tar.gz 29178 RMD160 bcc0d1affccac0921abf2aa6ac833927a8b48c8f SHA1 bf214f6fb5d1c599b504dc0df053db9df0ed2490 SHA256 32b5461f1bb2e56a8cf68661e536bcb2d18bb6aac9f78120b1c0dd9e0db538ce
 DIST xxkb-1.11-src.tar.gz 37262 RMD160 a75fae2bb178be51ec03679c0ee6a87c15d16a4c SHA1 d85df3d3b9ae7d274fb8dc10da97a38616962d35 SHA256 596d465bd39b2b660c1d19390a82cc5515cbf8f7e9600e82135564469e11bd3c
 EBUILD xxkb-1.10.ebuild 1118 RMD160 e6776adadfcb5b23e3eeaac12302b40810f3635d SHA1 21aec00db9919a984781b296021ea4ce9ff961ab SHA256 4b0db83662fdeb1e923d8f65f5fef6bbf61c58d2535bd4842575de8c3667795a
-EBUILD xxkb-1.11-r1.ebuild 1551 RMD160 ab03ad308fe15f1a6d44d742101a92b6fb12e451 SHA1 a2819ce304fe2ee523b48fb1c34bbf54eec24939 SHA256 3065b8f33b4cf4b772c1690096ce5a1939e14a49556663885eff629b5cf4d6ae
-EBUILD xxkb-1.11.ebuild 1141 RMD160 60a177e93fbbc5d594d8736b55baa20eb34743ef SHA1 acfb40aee4b79edb2fccadf3ba60f4950fad9749 SHA256 69fbc3ba7281a3e8b1265e2a8bbb1fdf612ddd0cb2e9a60003ce4af62c128390
-MISC ChangeLog 1950 RMD160 d6c76f4454e49d18df5ecc3df9b38d2c2c8bc4aa SHA1 03cfaac51cca24d37f6c985349043070bbdc514a SHA256 f884c710267a661f2677375b30abfeb67ed39953dd45061357b7004ce425f856
+EBUILD xxkb-1.11-r1.ebuild 1578 RMD160 3518fecbe2fae2c52640c849a15e3928ac0b342a SHA1 9183e442f2e5ce33dfa0e2e2764953ab6e2b0fb9 SHA256 d4481ab8924d669710c7c2e01dbd1ea7a7aa1f3bc70902ec06d77191c476788a
+MISC ChangeLog 2113 RMD160 8511da3c1c58432fbc543a41653f817b6d57b78f SHA1 47cbb5b2ee733d8d312ba4f58c332f593e76dd16 SHA256 248a00b046a2638fd4f678dd412dba917d4ddd52cb47f38e02f36536bddb65cd
 MISC metadata.xml 229 RMD160 47a0ab3f9561f670f64cbeba3a3c923b24161520 SHA1 5ddb48f84952e34b4b1181079dfd764d08f26378 SHA256 8653799042b178ad608e7e3b1591514a901fc074c691c4abe071f048e919e348
+MISC xxkb-1.10.ebuild.orig 1118 RMD160 e6776adadfcb5b23e3eeaac12302b40810f3635d SHA1 21aec00db9919a984781b296021ea4ce9ff961ab SHA256 4b0db83662fdeb1e923d8f65f5fef6bbf61c58d2535bd4842575de8c3667795a
diff --git a/x11-misc/xxkb/xxkb-1.11-r1.ebuild b/x11-misc/xxkb/xxkb-1.11-r1.ebuild
index 922b1ce2453a..5773b5df21bf 100644
--- a/x11-misc/xxkb/xxkb-1.11-r1.ebuild
+++ b/x11-misc/xxkb/xxkb-1.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xxkb/xxkb-1.11-r1.ebuild,v 1.1 2010/04/08 20:17:02 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xxkb/xxkb-1.11-r1.ebuild,v 1.2 2010/08/26 19:24:36 phosphan Exp $
 
 inherit eutils
 
@@ -39,7 +39,7 @@ src_compile() {
 	use svg && myconf="-DWITH_SVG_SUPPORT"
 	xmkmf ${myconf} || die "xmkmf failed."
 	emake CDEBUGFLAGS="${CFLAGS}" EXTRA_LIBRARIES="-lXext" PROJECTROOT=/usr \
-			PIXMAPDIR=/usr/share/xxkb || die "emake failed."
+			PIXMAPDIR=/usr/share/xxkb LOCAL_LDFLAGS="${LDFLAGS}" || die "emake failed."
 }
 
 src_install() {
diff --git a/x11-misc/xxkb/xxkb-1.11.ebuild b/x11-misc/xxkb/xxkb-1.11.ebuild
deleted file mode 100644
index 2111ae45c8d5..000000000000
--- a/x11-misc/xxkb/xxkb-1.11.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xxkb/xxkb-1.11.ebuild,v 1.2 2010/04/08 20:17:02 phosphan Exp $
-
-inherit eutils
-
-DESCRIPTION="eXtended XKB - assign different keymaps to different windows"
-HOMEPAGE="http://sourceforge.net/projects/xxkb/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="svg"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXpm
-	svg? ( >=dev-libs/glib-2
-		>=x11-libs/gtk+-2
-		gnome-base/librsvg )"
-DEPEND="${RDEPEND}
-	app-text/rman
-	x11-misc/imake
-	svg? ( dev-util/pkgconfig )"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	local myconf
-	use svg && myconf="-DWITH_SVG_SUPPORT"
-	xmkmf ${myconf} || die "xmkmf failed."
-	emake EXTRA_LIBRARIES="-lXext" PROJECTROOT=/usr PIXMAPDIR=/usr/share/xxkb || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	emake DESTDIR="${D}" install.man || die "emake install.man failed"
-
-	insinto /usr/share/xxkb
-	doins "${FILESDIR}"/*.xpm
-
-	dodoc README* CHANGES*
-}