Version bump. Readd missing patch (bug #527728 by Alex Efros).

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A792A613)

3 files changed, 86 insertions, 2 deletions

diff --git a/x11-misc/xxkb/ChangeLog b/x11-misc/xxkb/ChangeLog
index f20e21f69863..9a37dba157bb 100644
--- a/x11-misc/xxkb/ChangeLog
+++ b/x11-misc/xxkb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/xxkb
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xxkb/ChangeLog,v 1.31 2014/10/31 15:47:08 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xxkb/ChangeLog,v 1.32 2014/11/22 11:24:59 jer Exp $
+
+*xxkb-1.11.1 (22 Nov 2014)
+
+  22 Nov 2014; Jeroen Roovers <jer@gentoo.org> xxkb-1.11-r3.ebuild,
+  +xxkb-1.11.1.ebuild:
+  Version bump. Readd missing patch (bug #527728 by Alex Efros).
 
   31 Oct 2014; Chema Alonso <nimiux@gentoo.org> xxkb-1.11-r3.ebuild:
   Stable for amd64 wrt bug #523158
diff --git a/x11-misc/xxkb/xxkb-1.11-r3.ebuild b/x11-misc/xxkb/xxkb-1.11-r3.ebuild
index 8ac2defe516f..5cf6428d2651 100644
--- a/x11-misc/xxkb/xxkb-1.11-r3.ebuild
+++ b/x11-misc/xxkb/xxkb-1.11-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xxkb/xxkb-1.11-r3.ebuild,v 1.3 2014/10/31 15:47:08 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xxkb/xxkb-1.11-r3.ebuild,v 1.4 2014/11/22 11:24:59 jer Exp $
 
 EAPI=5
 inherit eutils multilib
@@ -40,6 +40,7 @@ src_prepare() {
 	if use svg; then
 		mv "${WORKDIR}"/flags . || die
 		epatch "${FILESDIR}"/svg-flags.patch
+		epatch "${FILESDIR}"/svg-appdefaults.patch
 	fi
 
 	epatch "${FILESDIR}"/missing_init.patch
diff --git a/x11-misc/xxkb/xxkb-1.11.1.ebuild b/x11-misc/xxkb/xxkb-1.11.1.ebuild
new file mode 100644
index 000000000000..f0ffc1e0c633
--- /dev/null
+++ b/x11-misc/xxkb/xxkb-1.11.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xxkb/xxkb-1.11.1.ebuild,v 1.1 2014/11/22 11:24:59 jer Exp $
+
+EAPI=5
+inherit eutils multilib
+
+DESCRIPTION="eXtended XKB - assign different keymaps to different windows"
+HOMEPAGE="http://sourceforge.net/projects/xxkb/"
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}-src.tar.gz
+	svg? ( https://dev.gentoo.org/~jer/${PN}-flags.tar.bz2 )
+"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="svg"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXt
+	svg? (
+		dev-libs/glib:2
+		gnome-base/librsvg:2
+		x11-libs/gtk+:2
+	)
+"
+DEPEND="
+	${RDEPEND}
+	app-text/rman
+	svg? ( virtual/pkgconfig )
+	x11-misc/imake
+"
+
+src_prepare() {
+	if use svg; then
+		mv "${WORKDIR}"/flags . || die
+		epatch "${FILESDIR}"/svg-flags.patch
+		epatch "${FILESDIR}"/svg-appdefaults.patch
+	fi
+
+	epatch "${FILESDIR}"/missing_init.patch
+}
+
+src_configure() {
+	xmkmf $(usex svg -DWITH_SVG_SUPPORT '') || die
+}
+
+src_compile() {
+	emake \
+		CDEBUGFLAGS="${CFLAGS}" \
+		EXTRA_LIBRARIES="-lXext" \
+		LOCAL_LDFLAGS="${LDFLAGS}" \
+		PIXMAPDIR=/usr/share/xxkb \
+		PROJECTROOT=/usr
+}
+
+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
+	rm -r "${D}"/usr/$(get_libdir)/X11/app-defaults || die
+
+	emake DESTDIR="${D}" install.man
+
+	insinto /usr/share/xxkb
+	use svg || doins "${FILESDIR}"/*.xpm
+	dodoc README* CHANGES*
+}