gentoo resync : 15.12.2019

3 files changed, 2 insertions, 55 deletions

diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 2722ae1d8e5f..177e10f73fb5 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,6 +1,4 @@
-DIST xkeyboard-config-2.27.tar.bz2 1664454 BLAKE2B ac5e02903f46579a1df0423c01d2c07412642d00a5e73b05c0d112e4a65163c20c2df762438775afc52445eed47025c8e061fa0945140245679b693d740e904c SHA512 ae29177461f9d2c6ce1c56c0b8b147600e3f0ecd15e8754c9531811702d9a030a31f42679a88a9fb706bec458974c337ee2a0180f22573702caa7184eb94017e
 DIST xkeyboard-config-2.28.tar.bz2 1682987 BLAKE2B 8883787119bb46e4351d4023aee0f1a495b6acc87755b408ffa51d5082f84f4b1a083a8a0ee640b00afd35777bc8e8e0ef2187cd0bbb2600db81da8fef19298f SHA512 be38e61a7d3a1c03f9dc92fed5aada65fdb8b42272e874e01156a39de07f2a7c81846e9ba449aeb95661587f8d05217d549a1315ee0dd92facbb6158362e68ae
-EBUILD xkeyboard-config-2.27.ebuild 1257 BLAKE2B 82ff338d351e3e91999ed7717d7dee92098d9306f6d6722c75fcd0dc4c047f01f48fe0c0685117ecaff9b13cf03efb878a05b1bb8df4039475d8739e960ae679 SHA512 c8fe092fe39b8889cb1fcde3e612d669f01dff3397e7c384a12c428170a7c1ea64f900f803db48d4012b5b918df9efe109a88ba1994524fe12effe37ba073a5a
-EBUILD xkeyboard-config-2.28.ebuild 1268 BLAKE2B b3cf4dac632e36c230bb384c245785483b253e773e04b0bdb46aa6b2414ff465d854dda76a180c997b4b25fa04657424f1e322f7da1d5b7a2b38a42ee0cf4dcb SHA512 510a440ad821c65813f9ba1904d2cd0615a595c1c8ddb4b0f3a7812bfd7869eb81646aba3eb9233c4b8cd4ba48b81af2675fd818190d805f281b417fa631d87d
+EBUILD xkeyboard-config-2.28.ebuild 1258 BLAKE2B 1098f824b448d3b6beab9657f9589bd71cd0111bd58a968bb139301231d1ac677c5b21f2aaf231eb245cd6159f4ba7ffc9e7ca5adfdcff8f7744290bcabddff7 SHA512 3ccb42a720e2304539d4d09f1523b703629303c08616ce84dba5ccfbcfcc5bd459e8ad7f7af3280ee473ccf587026e8425536008f7becb44b3296f09e5a96a51
 EBUILD xkeyboard-config-9999.ebuild 1268 BLAKE2B b3cf4dac632e36c230bb384c245785483b253e773e04b0bdb46aa6b2414ff465d854dda76a180c997b4b25fa04657424f1e322f7da1d5b7a2b38a42ee0cf4dcb SHA512 510a440ad821c65813f9ba1904d2cd0615a595c1c8ddb4b0f3a7812bfd7869eb81646aba3eb9233c4b8cd4ba48b81af2675fd818190d805f281b417fa631d87d
 MISC metadata.xml 337 BLAKE2B ab0893146e71b0d96879e7ec41c7c4e057cb92570227daef015b6fa1a24c55709cd3d19e16df5afe80f706995e12a44a9fc29826a552bd436b1e9381e44acde5 SHA512 6a43f86407638d3f156d4ae64caee882878dbd1ee7c23991c8f378d55cfb0afe016202866f95c328d8b4e59186efa6a7cb7335a1c86e3fbdda4c16a96e175cf0
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.27.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.27.ebuild
deleted file mode 100644
index 29052cada6c0..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.27.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="X keyboard configuration database"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git"
-	inherit autotools git-r3
-	# x11-misc/util-macros only required on live ebuilds
-	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
-else
-	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-RDEPEND="
-	!<x11-apps/xkbcomp-1.2.3
-	!<x11-libs/libX11-1.4.3
-"
-DEPEND="
-	${LIVE_DEPEND}
-"
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	local econfargs=(
-		--with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
-		--enable-compat-rules
-		# do not check for runtime deps
-		--disable-runtime-deps
-		--with-xkb-rules-symlink=xorg
-	)
-
-	econf "${econfargs[@]}"
-}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.28.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.28.ebuild
index d2d56f95cc31..0cc5883a831f 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.28.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.28.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
 else
 	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"