EAPI bump. Remove /usr/$(get_libdir)/X11/app-defaults (bug #496116). Clean up patches.

Package-Manager: portage-2.2.13/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

6 files changed, 110 insertions, 100 deletions

diff --git a/x11-misc/xxkb/ChangeLog b/x11-misc/xxkb/ChangeLog
index b5d5542e4fa4..c1320490db7f 100644
--- a/x11-misc/xxkb/ChangeLog
+++ b/x11-misc/xxkb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/xxkb
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xxkb/ChangeLog,v 1.26 2013/07/21 09:45:28 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xxkb/ChangeLog,v 1.27 2014/09/18 18:40:50 jer Exp $
+
+*xxkb-1.11-r3 (18 Sep 2014)
+
+  18 Sep 2014; Jeroen Roovers <jer@gentoo.org> -xxkb-1.11-r1.ebuild,
+  +xxkb-1.11-r3.ebuild, files/svg-appdefaults.patch, files/svg-flags.patch:
+  EAPI bump. Remove /usr/$(get_libdir)/X11/app-defaults (bug #496116). Clean up
+  patches.
 
   21 Jul 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due #473480
diff --git a/x11-misc/xxkb/Manifest b/x11-misc/xxkb/Manifest
index 515325b95aea..cf1f05c8165b 100644
--- a/x11-misc/xxkb/Manifest
+++ b/x11-misc/xxkb/Manifest
@@ -7,17 +7,17 @@ AUX de48.xpm 2606 SHA256 8a12f0b93430334c98152f2ef9249b04ebba0b757920c22b76c6f98
 AUX missing_init.patch 660 SHA256 76f17e5ad899359631531315ba4b019fd7fc8491924202cac02530fe901c0496 SHA512 764fd8d10f1aa08b452f3b2e54ad76558e4a0a713edee365de64dc79ac4a3d3d1ea9f72165fdf1961b292313e82da3b52779afc39d720d99ca836690f4cfeae0 WHIRLPOOL 6cc92060d8c89637092d9385c7de48f74a5a5f9d25727e47770062624b4aa14eb6c47acfd52f266edd47807d2b985ed1a95fe68bdc1c8392cc5500a8b8e63455
 AUX pl15.xpm 380 SHA256 9050285c2098ec31137e30e2d6e59fa7b6d57846c0d25c2517b75341559b1d74 SHA512 0b09558fd25cbf09ada3430999f04a397898a9e8f96b9f3a80f4b0286547b9fd07db9a3457acda283efaa3d82583649c4d27f3d2888782e40ffb504d367e42d4 WHIRLPOOL b93a878de122ff1d1b66bbd538caf9d8d9bbc82ebd8e8c1a7077867800e8778716cc60e9dc0389bae13c8e23be3cae8dee31ebd9e73e76907f213218f6b5d1c9
 AUX pl48.xpm 2591 SHA256 557ac51268061af4c910f94a6d97aeac06123a6a63e7a60400fb9a84ebe182a3 SHA512 bff1cf1d74516929fa9085eb3919265d1273454660a1179c5591066cb76f6c55adb189652b9135abd91fbf06a365d23ece10acdd743249f395e341477ff5defc WHIRLPOOL 256e4abac2b6dd6307cc359947d347a3bd0b847a385884352562a782c32ab920f6652e6383d3fe733d9a197104eda86d99cc7aa986459090137a8b750c4325dc
-AUX svg-appdefaults.patch 845 SHA256 0478465d8dd9621e0621d8dd8ec6dbc7d79a8a3d7c770284c4399c12796fde3b SHA512 83024356d811fef6949d3316922b0484a43ab8c26c316ed5b0246a4548e07d9360ae1fddeaf52b31aec25f5b790754415ce4cc9bebf9be809c7f3794c4683bb8 WHIRLPOOL 8f8aae5ebee3fe827e31ec04cffc9f3132311e65c873c6c5347b82f7446578c6cb942545ee868a7e803bc52ad432c186c3ca79533eb027b37283a58590d73319
-AUX svg-flags.patch 8151 SHA256 50cff80a764d82346620814658b839a7682a0e48ad0090ba11f9ef9e5df35d8a SHA512 a319d0c4f359b2df84d1f0abc92a62c9e4c7ff67eedf3363ca54cbf9d92a7ec9e7f0833bc8e52a61c480b94356d12d29ff57bbd577d57c3f0107224316ff1da2 WHIRLPOOL e3d8ac2f03d3e40aaf25ea7868c521ce96719c666ec47d71eadb4622eccffebe66ff8fca1a307ef2655349fe67004f0949058304e609e92598c0b971d5368976
+AUX svg-appdefaults.patch 769 SHA256 2d497eea58a931c3e47c068b3cc0cc396171af4049e73aa42b013aac9428f0ff SHA512 8e4831b993983fea3b217b34440e855291eef2cdd0e2b82079c6856142c9f866fdb53ac859091772bcd4365ad87eccf324798347dd88a8b7e9cb0514abdc0664 WHIRLPOOL f51d4c45ebd6a1817b83afb7ecbba3bf0dc68a82c258049b3ab9bc2a1f766ca1804aa725f02b8cd6de05957f22058264cabe2c4bfec757f2327c0f465e0ece47
+AUX svg-flags.patch 7143 SHA256 0102385fe0d201460781b12ecddc2a96ac03856ae664d272b7762ff92d614ae7 SHA512 e2d6bc62dc75d664007e4cb1d192ce4366ef9c859606e3ff4481d56bc8d0deeca32fa5727cab127bda832b5172ce7e33d5c2039463c9bc46df0679c24dd14ecd WHIRLPOOL e3724d1531139264b5f84171421965f0422970fcb53623729c0b2672e37df59fedfc5d26502d8f9fdb3029eccde17d13b7f3daf47159e318879fff4794a40e9b
 DIST xxkb-1.11-src.tar.gz 37262 SHA256 596d465bd39b2b660c1d19390a82cc5515cbf8f7e9600e82135564469e11bd3c SHA512 12675bee3be5a37b5e471fa763e2f8600859d5621dcf7ea9f004bad8f2200035582661cfb36938e9606582a86570e6de99c30dcf2d988c96604daf1185592c14 WHIRLPOOL da14d3ee40c35efa1dc3eb3b5df17a53540ed9eb007a7b8a42039dbf8bb97052d27ee77d04b3f115c002daebc0a7229aafb855621b057ab294b45cecb5beed87
-EBUILD xxkb-1.11-r1.ebuild 1580 SHA256 5c5c0862d54ddef2406f4695229ece3b22f19bfb6db33d24f70efbda00fbd240 SHA512 317e67c5235e1fe931d95636cfc63de470fef8bae0cd7fa8c3e715a9619ee5e58817d348a84750adc01afede2015e0a0cb44c6e9a23ef76946cdc4641068254e WHIRLPOOL 45b2f79dceebbd77ecdd131f063e190eb9e4509fead9e077e1e672722dbc39239021275ea4fa7f9cbb12e53ea6aae8cda8121c1dc791efc76468837c6117d3e0
 EBUILD xxkb-1.11-r2.ebuild 1621 SHA256 9967b271ef7dc5e9a7096a3ed0a3df6f8144831f227292b723961608fa070263 SHA512 ad62044b79f8b36fc84fec3994e89310bc77a436f23a1232163fe753e98e6f972944bf85e4745b389371f600a305fc5249c4b460cf39512b3ffbff40ff5ca28b WHIRLPOOL 07311e6d0039b253da500a4a9eaf68ef052653e7a9b85630c41a1d4a201118422452ab38299daa2a5b373e86c950a9e1337deeb1e524cda28a07f323a004a39f
-MISC ChangeLog 3315 SHA256 b6f7c41e80e2674fe2a77479685e1a9792ecf73053a18127bb435d98848cbc5c SHA512 998f040744acde1ea656a5b6c4d75b2ed095544237e26d37fad53a9790acd3158667633b41c8edec4d0bf0f30795b721e454bd1949dde29776a844e863d529e1 WHIRLPOOL 3b085d6cb5c31cf3cadcd53c4cc84cde2890b2ce3cd641f4c0ae8f87282015114ef2665a0dc1266c5c9dfe9e2b633ee8e2bb0225f8af6e91ca0a4cf9a7a86c1d
+EBUILD xxkb-1.11-r3.ebuild 1574 SHA256 648201010543df10b20c6c7ae8455efd350629ce8bdaa9fa5a0945fe996e628c SHA512 9a64229958d3cadc356dd1a99595cbb2b1e0dbb890d72ae1541d4309a125ce25818112fccafe569e1eb498a0c8aef4e49cc8b4ade009a0c2e7e758789dc51e5d WHIRLPOOL ffafc52d77bb187030919faa43379c15778cbd8528251d3abb15b55d04a9dbb8886fb0136bf7303f392f78d4be839bca12a7053a827641bae763864f89de0a12
+MISC ChangeLog 3579 SHA256 9306bd7f75817ee347b6877641a7efb92aee5c39782df0b83fcbafe699bb872c SHA512 e7f24c4a77cc0d696cac8e3f0a4a26273c64bf4ac3e92bc677226b3697501255b286b9293cfb6c7987a8c1a7070fcb6a8c743ac3a968fa1e263d8649e8788409 WHIRLPOOL b80ef911e30e4ffa276d278e6c3ff4d419468bb1706677cb4f0d7984bf3838c81778a99c3fcf4c7cde1f80c5346dbbc7db097727d1b8fc420203b3a0b4b189fd
 MISC metadata.xml 165 SHA256 d7da9ed29b7afb87ac00580d48a49d248f89c92269e9a7791782dc72f4490aec SHA512 243d1391ff105563c9bf0f75b1eab39434cfb69e084e81cebf6e4eb3aa391cd7e36210b2c3808895bf876dd761eb72330144af2a81e467453c60b37ccdf0e63c WHIRLPOOL f63c52b91f14d86972c7de46b5a50b2d47822a1347d627e05845027ff75299dc79a135988141e1dec933925c4e0213287ef6933ed76ed2fd3fcdff3757c1766b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlHrrbkACgkQCaWpQKGI+9To2ACfZqlDnh8EAMj4H8snHD/0ZtyX
-HiYAnihETHbQdgw/3lBlr5WEKkPTZoRY
-=Opdb
+iEYEAREIAAYFAlQbJzQACgkQVWmRsqeSphNT2ACdHyfrv4A1XQvJc81ijvn+WWp5
+BvYAmweNg+TgTfHftgxSsjC4YbbMXYim
+=lKKH
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xxkb/files/svg-appdefaults.patch b/x11-misc/xxkb/files/svg-appdefaults.patch
index e6de1bfc1e71..ff80f006d8f1 100644
--- a/x11-misc/xxkb/files/svg-appdefaults.patch
+++ b/x11-misc/xxkb/files/svg-appdefaults.patch
@@ -1,5 +1,5 @@
---- XXkb.ad.var	2010-04-08 21:25:17.000000000 +0200
-+++ XXkb.ad.new	2010-04-08 21:28:33.000000000 +0200
+--- a/XXkb.ad
++++ b/XXkb.ad
 @@ -4,10 +4,10 @@
  XXkb.group.alt: 2
  
diff --git a/x11-misc/xxkb/files/svg-flags.patch b/x11-misc/xxkb/files/svg-flags.patch
index 4adec2a5f85d..971d5d264742 100644
--- a/x11-misc/xxkb/files/svg-flags.patch
+++ b/x11-misc/xxkb/files/svg-flags.patch
@@ -1,6 +1,5 @@
-diff -ruN flags/bg.svg new/flags/bg.svg
---- flags/bg.svg	1970-01-01 01:00:00.000000000 +0100
-+++ new/flags/bg.svg	2008-08-15 08:59:52.000000000 +0200
+--- a/flags/bg.svg
++++ b/flags/bg.svg
 @@ -0,0 +1,6 @@
 +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 +<svg xmlns="http://www.w3.org/2000/svg" width="1000" height="600" viewBox="0 0 5 3">
@@ -8,9 +7,8 @@ diff -ruN flags/bg.svg new/flags/bg.svg
 +<rect width="5" height="2" y="1" fill="#00966E"/>
 +<rect width="5" height="1" y="2" fill="#D62612"/>
 +</svg>
-diff -ruN flags/by.svg new/flags/by.svg
---- flags/by.svg	1970-01-01 01:00:00.000000000 +0100
-+++ new/flags/by.svg	2010-02-25 02:33:00.000000000 +0100
+--- a/flags/by.svg
++++ b/flags/by.svg
 @@ -0,0 +1,20 @@
 +<?xml version="1.0" encoding="UTF-8"?>

 +<svg xmlns="http://www.w3.org/2000/svg" width="1200px" height="600px" viewBox="0 0 360 180" xmlns:xlink="http://www.w3.org/1999/xlink">

@@ -33,9 +31,8 @@ diff -ruN flags/by.svg new/flags/by.svg
 +<use xlink:href="#g2" transform="translate(0,180) scale(1,-1)"/>

 +</svg>
 \ Kein Zeilenumbruch am Dateiende.
-diff -ruN flags/de.svg new/flags/de.svg
---- flags/de.svg	1970-01-01 01:00:00.000000000 +0100
-+++ new/flags/de.svg	2008-09-05 10:35:31.000000000 +0200
+--- a/flags/de.svg
++++ b/flags/de.svg
 @@ -0,0 +1,9 @@
 +<?xml version="1.0" encoding="UTF-8" standalone="no"?>

 +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"

@@ -46,9 +43,8 @@ diff -ruN flags/de.svg new/flags/de.svg
 +	<rect id="red_stripe" width="5" height="2" y="1" x="0" fill="#D00"/>

 +	<rect id="gold_stripe" width="5" height="1" y="2" x="0" fill="#FFCE00"/>

 +</svg>

-diff -ruN flags/en.svg new/flags/en.svg
---- flags/en.svg	1970-01-01 01:00:00.000000000 +0100
-+++ new/flags/en.svg	2008-09-08 16:46:02.000000000 +0200
+--- a/flags/en.svg
++++ b/flags/en.svg
 @@ -0,0 +1,10 @@
 +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 60 30" width="1200" height="600">
 +<clipPath id="t">
@@ -60,9 +56,8 @@ diff -ruN flags/en.svg new/flags/en.svg
 +<path d="M30,0 v30 M0,15 h60" stroke="#fff" stroke-width="10"/>
 +<path d="M30,0 v30 M0,15 h60" stroke="#cf142b" stroke-width="6"/>
 +</svg>
-diff -ruN flags/il.svg new/flags/il.svg
---- flags/il.svg	1970-01-01 01:00:00.000000000 +0100
-+++ new/flags/il.svg	2008-09-05 11:36:48.000000000 +0200
+--- a/flags/il.svg
++++ b/flags/il.svg
 @@ -0,0 +1,35 @@
 +<?xml version="1.0" encoding="utf-8"?>
 +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
@@ -99,9 +94,8 @@ diff -ruN flags/il.svg new/flags/il.svg
 +  <use xlink:href="#triangle" transform="translate(110,80)"/>
 +  <use xlink:href="#triangle" transform="translate(110,80) rotate(180)"/>
 +</svg>
-diff -ruN flags/pl.svg new/flags/pl.svg
---- flags/pl.svg	1970-01-01 01:00:00.000000000 +0100
-+++ new/flags/pl.svg	2009-07-08 23:38:13.000000000 +0200
+--- a/flags/pl.svg
++++ b/flags/pl.svg
 @@ -0,0 +1,6 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
@@ -109,20 +103,17 @@ diff -ruN flags/pl.svg new/flags/pl.svg
 +<rect width="16" height="5" fill="#fff"/>
 +<rect width="16" height="5" fill="#dc143c" y="5"/>
 +</svg>
-diff -ruN flags/ru.svg new/flags/ru.svg
---- flags/ru.svg	1970-01-01 01:00:00.000000000 +0100
-+++ new/flags/ru.svg	2010-04-06 19:16:23.000000000 +0200
+--- a/flags/ru.svg
++++ b/flags/ru.svg
 @@ -0,0 +1 @@
 +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 9 6" width="900" height="600"><rect fill="#FFF" width="9" height="3"/><rect fill="#F00" y="3" width="9" height="3"/><rect fill="#00F" y="2" width="9" height="2"/></svg>
 \ Kein Zeilenumbruch am Dateiende.
-diff -ruN flags/su.svg new/flags/su.svg
---- flags/su.svg	1970-01-01 01:00:00.000000000 +0100
-+++ new/flags/su.svg	2009-12-02 19:20:49.000000000 +0100
+--- a/flags/su.svg
++++ b/flags/su.svg
 @@ -0,0 +1 @@
 +<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="600" height="300" viewBox="0 0 600 300"><rect width="600" height="300" style="fill:#c00"/><path d="M 67.8,79.9 L 76.5,88.6 L 83.6,81.3 C 99.4,97.6 115.2,114 131,130.3 C 134.5,129.5 136.4,128.1 137.5,124.1 L 88.8,76.2 L 98.6,67.4 L 84.3,63.5 L 67.8,79.9 L 67.8,79.9 z" id="hammer" style="fill:#ffd700"/><path d="M 95.8,30.7 L 82.3,30.7 L 93.2,38.7 L 89.1,51.5 L 100,43.6 L 110.9,51.5 L 106.8,38.6 L 117.7,30.7 L 104.2,30.7 L 100,17.8008 L 100,17.8 L 95.8,30.7 z M 100,25.8 L 102.4,33.2 L 110.1,33.2 L 103.9,37.7 L 106.26115,45.055357 L 99.99998,40.501778 L 93.73881,45.1 L 96.1,37.7 L 89.9,33.17 L 97.62,33.17 L 100,25.8 L 100,25.8 z" id="star" style="fill:#ffd700"/><path d="M 100.1,55.3 C 121.1,63 134.3,80.6 134.38,93.6 C 134.6,122.3 103.3,136.1 83.1,113 L 81.7,114 L 82,116.5 C 75.9,115.9 70.4,134.6 63.8,129.4 C 57.8,121.8 74.4,118.3 76.1,110.6 L 78.5,110.8 L 80.5,108.7 L 82.4,109 L 84.8,106.5 C 104.5,127.3 129.4,111.2 125.9,90.5 C 123.4,74.6 113.4,65.5 100,55.3 L 100.1,55.3 L 100.1,55.3 L 100.1,55.3 L 100.1,55.3 L 100.1,55.3 L 100.1,55.3 z" id="sichel" style="fill:#ffd700"/></svg>

-diff -ruN flags/ua.svg new/flags/ua.svg
---- flags/ua.svg	1970-01-01 01:00:00.000000000 +0100
-+++ new/flags/ua.svg	2010-04-06 19:16:40.000000000 +0200
+--- a/flags/ua.svg
++++ b/flags/ua.svg
 @@ -0,0 +1,4 @@
 +<svg xmlns="http://www.w3.org/2000/svg" width="1200" height="800">

 +<rect width="1200" height="800" fill="#005BBB"/>

diff --git a/x11-misc/xxkb/xxkb-1.11-r1.ebuild b/x11-misc/xxkb/xxkb-1.11-r1.ebuild
deleted file mode 100644
index f4845858c2b5..000000000000
--- a/x11-misc/xxkb/xxkb-1.11-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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-r1.ebuild,v 1.7 2012/05/05 04:53:47 jdhore 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"
-}
-
-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*
-}
diff --git a/x11-misc/xxkb/xxkb-1.11-r3.ebuild b/x11-misc/xxkb/xxkb-1.11-r3.ebuild
new file mode 100644
index 000000000000..61a02d79208d
--- /dev/null
+++ b/x11-misc/xxkb/xxkb-1.11-r3.ebuild
@@ -0,0 +1,73 @@
+# 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.1 2014/09/18 18:40:50 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"
+
+LICENSE="Artistic"
+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
+"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	mkdir flags
+	epatch "${FILESDIR}"/svg-flags.patch
+	use svg && epatch "${FILESDIR}"/svg-appdefaults.patch
+	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*
+}