Removing obsolete version, adding user supplied patch from bug #407127.

(Portage version: 2.1.10.49/cvs/Linux i686)

5 files changed, 92 insertions, 63 deletions

diff --git a/x11-misc/xxkb/ChangeLog b/x11-misc/xxkb/ChangeLog
index 89c75f9d63a1..756c892402c4 100644
--- a/x11-misc/xxkb/ChangeLog
+++ b/x11-misc/xxkb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/xxkb
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xxkb/ChangeLog,v 1.21 2012/05/05 04:53:47 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xxkb/ChangeLog,v 1.22 2012/05/22 20:36:29 phosphan Exp $
+
+*xxkb-1.11-r2 (22 May 2012)
+
+  22 May 2012; Patrick Kursawe <phosphan@gentoo.org> -xxkb-1.10.ebuild,
+  -files/xxkb-1.10-gcc34-fix.patch, +xxkb-1.11-r2.ebuild,
+  +files/missing_init.patch:
+  Removing obsolete version, adding user supplied patch from bug #407127.
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> xxkb-1.11-r1.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/x11-misc/xxkb/files/missing_init.patch b/x11-misc/xxkb/files/missing_init.patch
new file mode 100644
index 000000000000..52ea8833d347
--- /dev/null
+++ b/x11-misc/xxkb/files/missing_init.patch
@@ -0,0 +1,22 @@
+--- xxkb.c	2012-03-06 17:49:02.888079235 +0200
++++ xxkb_fixed.c	2012-03-06 17:48:58.712462301 +0200
+@@ -667,12 +667,14 @@
+ 					Window rwin, parent, *children;
+ 					int num;
+ 
+-					XQueryTree(dpy, temp_win, &rwin, &parent, &children, &num);
+-					AddWindow(temp_win, parent);
++					if (XQueryTree(dpy, temp_win, &rwin, &parent, &children, &num) != 0)
++                    {
++                        AddWindow(temp_win, parent);
+ 
+-					if (children != None) {
+-						XFree(children);
+-					}
++                        if (children != None) {
++                            XFree(children);
++                        }
++                    }
+ 				}
+ 				break;
+ 
diff --git a/x11-misc/xxkb/files/xxkb-1.10-gcc34-fix.patch b/x11-misc/xxkb/files/xxkb-1.10-gcc34-fix.patch
deleted file mode 100644
index a3005aa220cd..000000000000
--- a/x11-misc/xxkb/files/xxkb-1.10-gcc34-fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- resource.c.old	2002-11-30 14:34:12.000000000 +0100
-+++ resource.c	2004-08-23 23:52:03.431865596 +0200
-@@ -383,7 +383,6 @@
-   case XpmNoMemory:
-     printf("No memory for open xpm file: %s\n", name);
-     break;
--  default:
-   }
- }
- 
diff --git a/x11-misc/xxkb/xxkb-1.10.ebuild b/x11-misc/xxkb/xxkb-1.10.ebuild
deleted file mode 100644
index f68b8ada540b..000000000000
--- a/x11-misc/xxkb/xxkb-1.10.ebuild
+++ /dev/null
@@ -1,52 +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.10.ebuild,v 1.15 2010/08/26 19:36:04 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}.tar.gz"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	app-text/rman
-	x11-misc/imake"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gcc34-fix.patch"
-}
-
-src_compile() {
-	xmkmf || die "xmkmf failed."
-	emake PROJECTROOT=/usr PIXMAPDIR=/usr/share/xxkb || die "emake failed."
-}
-
-src_install() {
-	dodir /usr/bin
-	dodir /usr/share/xxkb
-
-	exeinto /usr/bin
-	doexe xxkb
-
-	insinto /usr/share/xxkb
-	doins *.xpm
-	doins "${FILESDIR}"/*.xpm
-
-	insinto /etc/X11/app-defaults
-	mv XXkb.ad XXkb
-	doins XXkb
-
-	dodoc README-Linux.koi8 README.koi8 CHANGES.koi8  "${FILESDIR}"/README
-	mv xxkb.man xxkb.man.1
-	doman xxkb.man.1
-}
diff --git a/x11-misc/xxkb/xxkb-1.11-r2.ebuild b/x11-misc/xxkb/xxkb-1.11-r2.ebuild
new file mode 100644
index 000000000000..812bc99a1574
--- /dev/null
+++ b/x11-misc/xxkb/xxkb-1.11-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xxkb/xxkb-1.11-r2.ebuild,v 1.1 2012/05/22 20:36:30 phosphan Exp $
+
+EAPI="1"
+
+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:2 )"
+DEPEND="${RDEPEND}
+	app-text/rman
+	x11-misc/imake
+	svg? ( virtual/pkgconfig )"
+
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	mkdir flags
+	epatch "${FILESDIR}/svg-flags.patch"
+	use svg && epatch "${FILESDIR}/svg-appdefaults.patch"
+	epatch "${FILESDIR}/missing_init.patch"
+}
+
+src_compile() {
+	local myconf
+	use svg && myconf="-DWITH_SVG_SUPPORT"
+	xmkmf ${myconf} || die "xmkmf failed."
+	emake CDEBUGFLAGS="${CFLAGS}" EXTRA_LIBRARIES="-lXext" PROJECTROOT=/usr \
+			PIXMAPDIR=/usr/share/xxkb LOCAL_LDFLAGS="${LDFLAGS}" || die "emake failed."
+}
+
+src_install() {
+	local myopts
+	if use svg; then
+		myopts="PIXMAPS=flags/de.svg flags/pl.svg flags/il.svg flags/by.svg \
+		flags/ua.svg flags/su.svg flags/ru.svg flags/bg.svg flags/en.svg"
+	else
+		myopts="FOOBAR=buzz"
+	fi
+	emake "${myopts}"  DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install.man || die "emake install.man failed"
+
+	insinto /usr/share/xxkb
+	use svg || doins "${FILESDIR}"/*.xpm
+	dodoc README* CHANGES*
+}