gentoo resync : 20.03.2021

3 files changed, 9 insertions, 84 deletions

diff --git a/x11-misc/xxkb/Manifest b/x11-misc/xxkb/Manifest
index 6178558fa4b8..a215e9826e34 100644
--- a/x11-misc/xxkb/Manifest
+++ b/x11-misc/xxkb/Manifest
@@ -8,6 +8,5 @@ AUX svg-appdefaults.patch 777 BLAKE2B 5fb362d421569377f907a07446b437270e01b75acb
 AUX svg-flags.patch 7143 BLAKE2B bb05bf9e8ad16983dd82670283c7c8a7915f358556eebd065b7a70b66c54b6c9ec37475f192bdd49c7734d5fc84c15939512b7f484667cf3dcd49aa2fc6a94e1 SHA512 e2d6bc62dc75d664007e4cb1d192ce4366ef9c859606e3ff4481d56bc8d0deeca32fa5727cab127bda832b5172ce7e33d5c2039463c9bc46df0679c24dd14ecd
 DIST xxkb-1.11.1-src.tar.gz 38123 BLAKE2B eb7cce9a6e64cdcf1a75e375f81f43edd312f443294959fe7b169e5bad1fa107a2e8294edc3b13f1022055027fdae8d52aa5fddef57bbb9f283a63e369b93de6 SHA512 081629ccee41016cd468bd411c8584298bf64d4d791bf803490f6286a330401b933f895fbff2f4a6d1fcfe86c0490267f86d334436c1cea743ad08d97b26038f
 DIST xxkb-flags.tar.bz2 2541 BLAKE2B cb8d181ea21dc29881450b2a12e381c72e98f70c225b25db53b183337436d30e300b34d983b060a8618b927afc7a43d10a015f841d4fba663a9856238904bff4 SHA512 c75929bf78a8aa84ffb615c85c2ad70110a9f7b0465891651a57e4772eae5e0ded61d10197f430f9cdd0cf707903af3d0af4250ff1743fdd59d9ff19bc0c33a9
-EBUILD xxkb-1.11.1-r1.ebuild 1582 BLAKE2B 3f8bfaf93f73ffe8ce9ae6abb654ac5fdf4922bb26bfe4286ddc53fcb22fa7c3aafaf3ad76e73a8ba3d120bd0a625f271f60e50dfc9bedee9634e7e06ee16e13 SHA512 ad4bc6f8a1371abe4deb4ae5c5395705259f05cb907c50c37c7c4fc2f32e8aa4e29e3799392fabc6a6837e253c6fec8726ed2ade2c1d968dfa6456ddb59f985b
-EBUILD xxkb-1.11.1.ebuild 1542 BLAKE2B af8a2aafabbd0087e7b0981c27bcfe06a3eeebadc645672fa88bc3da6d47d8dba49f320b0e9de0e03d75bce8e846019b41fc52080b92ee9a340b47eac4ac8955 SHA512 e1601cb58f20c623717f8f16e7cf4b49521d22b9816359f8a2be7e77ee9e6e402e7ae7f75a66046ff7275b667c1649336ac348ebcd10c7a93019701540320886
+EBUILD xxkb-1.11.1-r1.ebuild 1606 BLAKE2B be081935ce92267e7127748dfc6297741379d985f2c05776eff2070877c163afc654f8a98001a3db853fad5b587a812ef29c0082fcc142a0dfb56f4bf1a8d1cb SHA512 56f2dcbe216ea5c82a9e073209e0b012c27f59ded3e6a79b717e6f88ca0917722256be103d4b2dcb95bdbadd2aff004e4a65c882dcbfde806af9a08eb6627644
 MISC metadata.xml 350 BLAKE2B e482660157076064a3b6b3b70613bc6c1ace83e27e46fd0152794de353617c7f357d6d01bb2b9c0b3cd4d52c0855bd9651474bdaaa10c1e530b26f3e4b27df4a SHA512 0261ca73c33500566a7d6763654df4f6db22c29dab3fbebb781ba63a082bb2dbcff454afc3bbe1a72b19563a34516ed8670f72853e15634dcbac4d7a728957fb
diff --git a/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild b/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild
index 3cc40778ed9f..bd8c8243f121 100644
--- a/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild
+++ b/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit multilib toolchain-funcs
+
+inherit toolchain-funcs
 
 DESCRIPTION="eXtended XKB - assign different keymaps to different windows"
 HOMEPAGE="https://sourceforge.net/projects/xxkb/"
@@ -13,10 +14,11 @@ SRC_URI="
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="svg"
 
 RDEPEND="
+	x11-libs/gdk-pixbuf-xlib
 	x11-libs/libX11
 	x11-libs/libXpm
 	x11-libs/libXt
@@ -26,11 +28,11 @@ RDEPEND="
 		x11-libs/gtk+:2
 	)
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-text/rman
-	svg? ( virtual/pkgconfig )
 	x11-misc/imake
+	svg? ( virtual/pkgconfig )
 "
 
 src_prepare() {
diff --git a/x11-misc/xxkb/xxkb-1.11.1.ebuild b/x11-misc/xxkb/xxkb-1.11.1.ebuild
deleted file mode 100644
index 16f2f9b64abe..000000000000
--- a/x11-misc/xxkb/xxkb-1.11.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib
-
-DESCRIPTION="eXtended XKB - assign different keymaps to different windows"
-HOMEPAGE="https://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*
-}