Added SVG format flags, see bug #297220.

(Portage version: 2.1.8.3/cvs/Linux i686)

5 files changed, 230 insertions, 4 deletions

diff --git a/x11-misc/xxkb/ChangeLog b/x11-misc/xxkb/ChangeLog
index 4f45835c6132..dde235c6a43e 100644
--- a/x11-misc/xxkb/ChangeLog
+++ b/x11-misc/xxkb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/xxkb
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xxkb/ChangeLog,v 1.14 2008/04/16 08:54:14 phosphan Exp $
+# 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 $
+
+*xxkb-1.11-r1 (08 Apr 2010)
+
+  08 Apr 2010; Patrick Kursawe <phosphan@gentoo.org> +xxkb-1.11-r1.ebuild,
+  +files/svg-appdefaults.patch, +files/svg-flags.patch:
+  Added SVG format flags, see bug #297220.
 
 *xxkb-1.11 (16 Apr 2008)
 
diff --git a/x11-misc/xxkb/files/svg-appdefaults.patch b/x11-misc/xxkb/files/svg-appdefaults.patch
new file mode 100644
index 000000000000..e6de1bfc1e71
--- /dev/null
+++ b/x11-misc/xxkb/files/svg-appdefaults.patch
@@ -0,0 +1,30 @@
+--- XXkb.ad.var	2010-04-08 21:25:17.000000000 +0200
++++ XXkb.ad.new	2010-04-08 21:28:33.000000000 +0200
+@@ -4,10 +4,10 @@
+ XXkb.group.alt: 2
+ 
+ XXkb.mainwindow.enable: yes
+-XXkb.mainwindow.geometry: 48x48
+-XXkb.mainwindow.image.1: en48.xpm
+-XXkb.mainwindow.image.2: ru48.xpm
+-XXkb.mainwindow.image.3: su48.xpm
++XXkb.mainwindow.geometry: 48x48+0+0
++XXkb.mainwindow.image.1: en.svg
++XXkb.mainwindow.image.2: ru.svg
++XXkb.mainwindow.image.3: su.svg
+ XXkb.mainwindow.image.4:
+ XXkb.mainwindow.label.font: -misc-*-r-*-20-*
+ 
+@@ -23,9 +23,9 @@
+ 
+ XXkb.button.enable: yes
+ XXkb.button.geometry: 15x15-60+7
+-XXkb.button.image.1: en15.xpm
+-XXkb.button.image.2: ru15.xpm
+-XXkb.button.image.3: su15.xpm
++XXkb.button.image.1: en.svg
++XXkb.button.image.2: ru.svg
++XXkb.button.image.3: su.svg
+ XXkb.button.image.4:
+ XXkb.button.label.font: -misc-*-r-*-13-*
+ 
diff --git a/x11-misc/xxkb/files/svg-flags.patch b/x11-misc/xxkb/files/svg-flags.patch
new file mode 100644
index 000000000000..4adec2a5f85d
--- /dev/null
+++ b/x11-misc/xxkb/files/svg-flags.patch
@@ -0,0 +1,131 @@
+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
+@@ -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">
++<rect width="5" height="3" fill="#fff"/>
++<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
+@@ -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">

++<rect fill="#090" width="360" height="180"/>

++<rect fill="#c00" width="360" height="120"/>

++<rect fill="#fff" width="40" height="180"/>

++<g id="g2">

++<g id="g1" fill="#c00">

++<path d="M20,90v-1h-1v-2h-1v-2h-2v2h1v2h1v1z M10,90v-2h-2v-3h-1v-3h-2v-3h-1v-4h2v3h2v3h2v3h1v-3h2v-3h2v-3h2v-3h2v-4h-2v-5h-2v-4h-2v5h1v5h-1v4h-2v4h-1v-4h-2v-4h-2v-5h-1v-4h1v-4h2v-4h1v-4h2v-4h2v4h2v4h2v4h2v5h1v15h-2v3h-2v3h-2v3h-1v3h-2v2z M11,37h2v-4h2v-4h2v-4h2v-4h1v-4h-1v-4h-2v-4h-2v-4h-2v-4h-2v4h-2v4h-2v4h-2v4h-1v4h1v4h2v4h2v4h2v4z M4,9v-4h2v4zM4,33v-4h2v4z M4,52v-4h2v4z M4,74v-4h2v4z M4,90v-2h2v2z M14,90v-2h2v2z M19,84v-4h1v4z M19,52v-4h1v4z M19,33v-4h2v4z M19,9v-4h1v4z"/>

++<path fill="#fff" d="M11,29h2v-4h2v-4h2v-4h-2v-4h-2v-4h-2v4h-2v4h-2v4h2v4h2v4z"/>

++<path d="M11,21h2v-4h-2v4z"/>

++<g id="g3">

++<path d="M17,48h1v-3h1v-3h1v-3h-1v-3h-1v-3h-1v3h-1v3h-1v3h1v3h1v3z"/>

++<path fill="#fff" d="M17,39h1v3h-1v-3z"/>

++</g>

++<use xlink:href="#g3" transform="translate(-10)"/>

++</g>

++<use xlink:href="#g1" transform="rotate(180, 20,90)"/>

++</g>

++<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
+@@ -0,0 +1,9 @@
++<?xml version="1.0" encoding="UTF-8" standalone="no"?>

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

++	"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">

++<svg xmlns="http://www.w3.org/2000/svg" width="1000" height="600" viewBox="0 0 5 3">

++	<desc>Flag of Germany</desc>

++	<rect id="black_stripe" width="5" height="3" y="0" x="0" fill="#000"/>

++	<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
+@@ -0,0 +1,10 @@
++<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 60 30" width="1200" height="600">
++<clipPath id="t">
++	<path d="M30,15 h30 v15 z v15 h-30 z h-30 v-15 z v-15 h30 z"/>
++</clipPath>
++<path d="M0,0 v30 h60 v-30 z" fill="#00247d"/>
++<path d="M0,0 L60,30 M60,0 L0,30" stroke="#fff" stroke-width="6"/>
++<path d="M0,0 L60,30 M60,0 L0,30" clip-path="url(#t)" stroke="#cf142b" stroke-width="4"/>
++<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
+@@ -0,0 +1,35 @@
++<?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">
++<svg xmlns="http://www.w3.org/2000/svg" version="1.1"
++  xmlns:xlink="http://www.w3.org/1999/xlink"
++  width="660" height="480" viewBox="0 0 220 160">
++  <desc>Flag of Israel</desc>
++  <defs>
++    <!-- Specs are taken from "The Provisional Council of State Proclamation of
++      the Flag of the State of Israel," 25 Tishrei 5709 (28 October 1948)
++    For Magen David, the "Israel Science and Technology Homepage" at
++      http://www.science.co.il/Israel-flag.asp specifies each side as 60 cm.
++      Outer radius is then 30 / cos(30) = 20 * sqrt(3)
++    For equilateral triangles, middle radius = outer radius - width:
++      20 * sqrt(3) - 5.5
++    Coordinates for upward-pointing triangle relative to center are then:
++      (                            0,-(20*sqrt(3) - 5.5)          )
++      (-(20*sqrt(3) - 5.5) * cos(30), (20*sqrt(3) - 5.5) * sin(30))
++      ( (20*sqrt(3) - 5.5) * cos(30), (20*sqrt(3) - 5.5) * sin(30)) -->
++    <polygon id="triangle" points="0,-29.1410161513775421
++                -25.2368602791855814, 14.5705080756887710
++                 25.2368602791855814, 14.5705080756887710"
++      stroke="#0038b8" stroke-width="5.5" fill-opacity="0"/>
++  </defs>
++  <!-- "The flag is 220 cm long and 160 cm wide.  The background is white" -->
++  <rect width="220" height="160" fill="white"/>
++  <!-- "...two stripes of dark sky-blue, 25 cm broad, over the whole length of
++    the flag, at a distance of 15 cm from the top and from the bottom..."
++    Legislation does not specify exact shade of blue; "#0038b8" is typical of
++    flags used in Israel -->
++  <rect width="220" height="25" fill="#0038b8" y="15"/>
++  <rect width="220" height="25" fill="#0038b8" y="120"/>
++  <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
+@@ -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">
++<svg width="1280" height="800" id="Flag of Poland" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 10">
++<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
+@@ -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
+@@ -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
+@@ -0,0 +1,4 @@
++<svg xmlns="http://www.w3.org/2000/svg" width="1200" height="800">

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

++<rect width="1200" height="400" y="400" fill="#FFD500"/>

++</svg>
+\ Kein Zeilenumbruch am Dateiende.
diff --git a/x11-misc/xxkb/xxkb-1.11-r1.ebuild b/x11-misc/xxkb/xxkb-1.11-r1.ebuild
new file mode 100644
index 000000000000..922b1ce2453a
--- /dev/null
+++ b/x11-misc/xxkb/xxkb-1.11-r1.ebuild
@@ -0,0 +1,59 @@
+# 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 $
+
+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_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 || 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.ebuild b/x11-misc/xxkb/xxkb-1.11.ebuild
index e347fb307f94..2111ae45c8d5 100644
--- a/x11-misc/xxkb/xxkb-1.11.ebuild
+++ b/x11-misc/xxkb/xxkb-1.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.1 2008/04/16 08:54:14 phosphan Exp $
+# $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