ppc/x86 stable wrt bug #523158

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xC42EB5D6

4 files changed, 16 insertions, 73 deletions

diff --git a/x11-misc/xxkb/ChangeLog b/x11-misc/xxkb/ChangeLog
index 9a37dba157bb..388ad76fef7a 100644
--- a/x11-misc/xxkb/ChangeLog
+++ b/x11-misc/xxkb/ChangeLog
@@ -1,6 +1,10 @@
 # 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.32 2014/11/22 11:24:59 jer Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xxkb/ChangeLog,v 1.33 2015/02/20 09:35:18 zlogene Exp $
+
+  20 Feb 2015; Mikle Kolyada <zlogene@gentoo.org> -xxkb-1.11-r2.ebuild,
+  xxkb-1.11-r3.ebuild:
+  ppc/x86 stable wrt bug #523158
 
 *xxkb-1.11.1 (22 Nov 2014)
 
diff --git a/x11-misc/xxkb/Manifest b/x11-misc/xxkb/Manifest
index 38774302bfbd..82cc81205935 100644
--- a/x11-misc/xxkb/Manifest
+++ b/x11-misc/xxkb/Manifest
@@ -12,15 +12,16 @@ AUX svg-flags.patch 7143 SHA256 0102385fe0d201460781b12ecddc2a96ac03856ae664d272
 DIST xxkb-1.11-src.tar.gz 37262 SHA256 596d465bd39b2b660c1d19390a82cc5515cbf8f7e9600e82135564469e11bd3c SHA512 12675bee3be5a37b5e471fa763e2f8600859d5621dcf7ea9f004bad8f2200035582661cfb36938e9606582a86570e6de99c30dcf2d988c96604daf1185592c14 WHIRLPOOL da14d3ee40c35efa1dc3eb3b5df17a53540ed9eb007a7b8a42039dbf8bb97052d27ee77d04b3f115c002daebc0a7229aafb855621b057ab294b45cecb5beed87
 DIST xxkb-1.11.1-src.tar.gz 38123 SHA256 ceaa33bed81d8ae5bf77e89787d0736f7564c3de047c35a57bcbf6f4d1888142 SHA512 081629ccee41016cd468bd411c8584298bf64d4d791bf803490f6286a330401b933f895fbff2f4a6d1fcfe86c0490267f86d334436c1cea743ad08d97b26038f WHIRLPOOL 62b4847722ee8f23cc7db6f9bb21b1d01dacd2eb68d5d0db09933b9970c6846bc239d1388bd3d7ada2490a42ce1d56cffa1e1a7e55df029864ae426a0adaf96a
 DIST xxkb-flags.tar.bz2 2541 SHA256 f777c676a58ecab97c242efd703c0e8056cc2a93bb5b7a2fdb1f677348d6727c SHA512 c75929bf78a8aa84ffb615c85c2ad70110a9f7b0465891651a57e4772eae5e0ded61d10197f430f9cdd0cf707903af3d0af4250ff1743fdd59d9ff19bc0c33a9 WHIRLPOOL 7c626b2e6ec805b888ebcaeba658978efcbd4528729966a087ac7692b6c2e18ee5deb6dcb5eefea5a31826dce3ebb9c81a87cfc9e01efa5c18d800d8cd0bad6f
-EBUILD xxkb-1.11-r2.ebuild 1621 SHA256 9967b271ef7dc5e9a7096a3ed0a3df6f8144831f227292b723961608fa070263 SHA512 ad62044b79f8b36fc84fec3994e89310bc77a436f23a1232163fe753e98e6f972944bf85e4745b389371f600a305fc5249c4b460cf39512b3ffbff40ff5ca28b WHIRLPOOL 07311e6d0039b253da500a4a9eaf68ef052653e7a9b85630c41a1d4a201118422452ab38299daa2a5b373e86c950a9e1337deeb1e524cda28a07f323a004a39f
-EBUILD xxkb-1.11-r3.ebuild 1668 SHA256 f258c1fdda13980b3a383c58e30bf76afd4d71ff7f37f523638d08c59387595f SHA512 efa01e2bb71603a42e2b90a1ed84c9dbc6b74a5a739d331b4a593af0416885460484306988c7c3bfc0a77715c0af3732aa15184171557520951ef846514b0973 WHIRLPOOL 7f42bdb460f3717d3f2f46d4074c282a30f264fbb7cc101b7410700be6864dc3c95092169438498fcf886f296015b311662e7174e3d52e25c4db04302d0be626
+EBUILD xxkb-1.11-r3.ebuild 1670 SHA256 659858da2cea380d17a70007cb0b1bb811aadbf5f9cc7a37c190a524b2baee9a SHA512 c91303c367c02f0a397a57f041aec17526e3acb8bc7746dcd59ad8e76d8362d4ff04906ea4d5afe5dbecd3ce925a27e1eea3dda3cc413d8230daea22a5637c7c WHIRLPOOL f25cf9ce1057a1de812a0c8bd4cbd37f5cd5e2b72c6e51c3504cc953544d5d5951df0b740459604412a6a301f061457b909088e2a5709eb903e578ff5d36553b
 EBUILD xxkb-1.11.1.ebuild 1648 SHA256 45483a3e81b5938a057baf361ace0567101781c05e143cec1164ae278de0d6bb SHA512 aeb360522c5ad4edb79c692d8993d239eda93ebfa5e6b6e5f546787b263a64ee06140d9592f7cf95c592da913ba86f2fbf0461fa579d4de25d8666b98074a713 WHIRLPOOL d426762b74537e740df8ca310877cc96e10c2f1d5645f0d43f746d9063ce8476f8c118183f628ba7216d0d3e228b182c5b9e6623ea93146524662922410282f5
-MISC ChangeLog 4206 SHA256 d4a2322bab7b66432137b5eb90ff3b722a43509f3e349d77857bc693bdf9c43a SHA512 bc159d76f016e499fec030fb9665256cf01ddaebbe83516d91ffae2e3e426562f2063849be31994d3d86f48a1a50ff7c50fc2d959dea1341e745b6328f176e76 WHIRLPOOL 1932831ff60a34b26ec76b67ee089889b613aca956bb708cce0784fe5eb0ad79bf5a09c6a13539495263f83d35f00dbe3b99aeb05f62afec10e32623a90191dd
+MISC ChangeLog 4339 SHA256 2860ae7a3f0b71f2921f44a50e2f8771dbaf601949e542c3aaf88f2b53a23aac SHA512 630ac4032cc860f0720b707a49b9da245203ac5f7b2eaf162f0859156117594b828237d8c315a19272971655997125fff72062e207471ba8bc524bab88a018db WHIRLPOOL a9c485177f154ebb02bc1956b3e0cf1a1a6adbb88d9d63bcd5f2131ea81c1380a05f08a58c900a5a36b90299687961f1d32d08a8b9fcce01d3ad97ff5a1a5804
 MISC metadata.xml 165 SHA256 d7da9ed29b7afb87ac00580d48a49d248f89c92269e9a7791782dc72f4490aec SHA512 243d1391ff105563c9bf0f75b1eab39434cfb69e084e81cebf6e4eb3aa391cd7e36210b2c3808895bf876dd761eb72330144af2a81e467453c60b37ccdf0e63c WHIRLPOOL f63c52b91f14d86972c7de46b5a50b2d47822a1347d627e05845027ff75299dc79a135988141e1dec933925c4e0213287ef6933ed76ed2fd3fcdff3757c1766b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlRwcowACgkQVWmRsqeSphMrUACfQx1SeK0hgwZ/1Wruuati0X3x
-SBkAnRZjynAVSq/7c1J6OXGmGX/G9pvq
-=+OsF
+iJwEAQEIAAYFAlTm/3EACgkQG9wOWsQutdYJkQP/aPxC7jnKQWCfgIM1XuJVetAE
+6BtHv9A+wHi/NmwnnVnXygrlcD8NPc5bItTc9CBcmNay+l1c9lahxysenNb2p6wA
+tuWf1N5KMwQlZOasCfipyMHD5P6p/k22tKaR5vI/L38jVQaAeuKof33I9TlAOCz7
+mc7uJSnQpGYz1tSl8Ns=
+=etF1
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xxkb/xxkb-1.11-r2.ebuild b/x11-misc/xxkb/xxkb-1.11-r2.ebuild
deleted file mode 100644
index 4af732d0f05d..000000000000
--- a/x11-misc/xxkb/xxkb-1.11-r2.ebuild
+++ /dev/null
@@ -1,62 +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-r2.ebuild,v 1.4 2012/10/04 21:41:54 ranger 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*
-}
diff --git a/x11-misc/xxkb/xxkb-1.11-r3.ebuild b/x11-misc/xxkb/xxkb-1.11-r3.ebuild
index 5cf6428d2651..069e5fc48afc 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
+# Copyright 1999-2015 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.4 2014/11/22 11:24:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xxkb/xxkb-1.11-r3.ebuild,v 1.5 2015/02/20 09:35:18 zlogene Exp $
 
 EAPI=5
 inherit eutils multilib
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="svg"
 
 RDEPEND="