gentoo resync : 15.01.2020

4 files changed, 2 insertions, 77 deletions

diff --git a/x11-libs/libfakekey/Manifest b/x11-libs/libfakekey/Manifest
index 0101417a423c..8230c4b04062 100644
--- a/x11-libs/libfakekey/Manifest
+++ b/x11-libs/libfakekey/Manifest
@@ -1,7 +1,4 @@
-AUX libfakekey-0.1-ac.patch 746 BLAKE2B 01bcc6cabd6f138eaeb6fba8452a3c7348e1ad7a6e91b6676bf8d7a29a05004af4b295d134072697bb6d34370f9a3cfffa1358c774f785a4c05652feaa06412d SHA512 b1cabad39d87d8df492f48b2afff78e182e64167d5253a40abf74ab786c8598bb1ee6e24ee62f394c787e08e5f7740e23864ccc82624efa9d2a533b9a37877cf
 AUX libfakekey-0.3-ac.patch 764 BLAKE2B 733cdb11da016a2d3b9e196943d6c0a948404ed15de0684d8bf7bba28d700a5cc83a3cb0ed5b82ca95ed2d7c531136362f0373c87bab3c979a33ce8c2f613e64 SHA512 8cfe2a3185580e26c5d76d6b392003b96b73a1aabb15255b1aab54a777b3759e496d4c0323b18ee2a67a5537e68388b9c67f6d885bd791f62b42b39e37fb635c
-DIST libfakekey-0.1.tar.bz2 203504 BLAKE2B f3e51a1ff38dd95238a1035617045f728177c9dca96d760dfe3c4485511b500944e6f64aeb5acb3e65db3badc4c189ae25ea50f42f58a927f3ec1899c4778751 SHA512 1fda0548cf14657083a6602f8d6c08efae8cae2236de7ed17fc4058765156c6bb923956e3c7fd75f2db586399f1d8a3320ab5bbed71cc5a8b0d146590a14a808
 DIST libfakekey-0.3.tar.bz2 9672 BLAKE2B 1cd86581148e218879b14ff52fb085fd20248a475ccf00a08918d64db811b21bbba3632e799d798077a197298da4d976be3180c060a6016c396428519d1aaef2 SHA512 b0502dbb01839009de7120f8ca939c839850e7c3c88678b52d6df9f4205cbec20769cedd61c9307e8307f6bf789eee25b20d4fe20c25e7285318f5ea1334555a
-EBUILD libfakekey-0.1-r3.ebuild 1144 BLAKE2B c917446ab90d8a19ddc565ff85d0f02c864dab602c7e68e0a121953f238f86a83525dbdcbf3d991fe8dfb4d01ebd97b15245e3fef856d625865a5ff282d5d076 SHA512 bc35111648791927ef1923a65780abccf84a25db23aa8d0004a340b90fbbd2362d3fc8390d188b9119cf76f854e4bc7c4c0f0a3364f383434e887b997ca4b888
-EBUILD libfakekey-0.3.ebuild 1151 BLAKE2B 7dece2bc252046d6fa46de727b8da01b02c073c47a2c39322fde1c2acbe64150d95e60b1590d8f5a9ebc4d08bbfab89bbe1fa4365143134b983579fbb281bbe2 SHA512 6a1e925fc595a60c5d6b43474bbd97aa466d38713b4b3adee3f5ac53c20b15f02713739448839bb67456ca2c01d2d71710f47d58d0b61728e452452c085e6643
+EBUILD libfakekey-0.3.ebuild 1148 BLAKE2B 8fa5ba23bda2f51379c930255a074b8e36f1c94cea00485b542109c5d0f8b7c1958c078a94fdfe71ba5273607ed43f084ee9be1d6bd5a01ccb3f6340b6d0e356 SHA512 5c82621b0c0386949bf91aa7f39a12feef9eafbdebcb825305270af7f9c870521f016f26b0d02aae851d857d74320863e7e22d9002ce51f9b9c022fbb29f9066
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/x11-libs/libfakekey/files/libfakekey-0.1-ac.patch b/x11-libs/libfakekey/files/libfakekey-0.1-ac.patch
deleted file mode 100644
index 7158ad220efd..000000000000
--- a/x11-libs/libfakekey/files/libfakekey-0.1-ac.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/configure.ac	2011-05-22 14:59:45.801746472 +0100
-+++ b/configure.ac	2011-05-22 15:02:59.437159981 +0100
-@@ -14,16 +14,14 @@ AC_HEADER_STDC
- 
- dnl ------ libtool versioning -----------------------------------------------
- 
--LT_CURRENT=0
--LT_REVISION=1
--AC_SUBST(LT_CURRENT)
--AC_SUBST(LT_REVISION)
--LT_AGE=0
-+m4_define(LT_CURRENT, 0)
-+m4_define(LT_REVISION, 1)
-+m4_define(LT_AGE, 0)
- 
--LT_VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
-+LT_VERSION_INFO="LT_CURRENT():LT_REVISION():LT_AGE()"
- AC_SUBST(LT_VERSION_INFO)
- 
--LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
-+LT_CURRENT_MINUS_AGE="m4_eval(LT_CURRENT() - LT_AGE())"
- AC_SUBST(LT_CURRENT_MINUS_AGE)
- 
- dnl ------ Check for X Stuff ------------------------------------------------
diff --git a/x11-libs/libfakekey/libfakekey-0.1-r3.ebuild b/x11-libs/libfakekey/libfakekey-0.1-r3.ebuild
deleted file mode 100644
index d423f654cc18..000000000000
--- a/x11-libs/libfakekey/libfakekey-0.1-r3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Helper library for the x11-misc/matchbox-keyboard package"
-HOMEPAGE="https://www.yoctoproject.org/tools-resources/projects/matchbox"
-SRC_URI="http://downloads.yoctoproject.org/releases/matchbox/${PN}/${PV}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86"
-IUSE="debug doc"
-
-RDEPEND="x11-libs/libXtst"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-PATCHES=(
-	# Allow configure to use libtool-2
-	"${FILESDIR}/${P}-ac.patch"
-)
-
-src_prepare() {
-	default
-
-	# Fix underlinking bug #367595
-	sed -i -e 's/^fakekey_test_LDADD=/fakekey_test_LDADD=-lX11 /' \
-		tests/Makefile.am || die 'Cannot sed Makefile.am'
-	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	# --with/without-x is ignored by configure script and X is used.
-	econf --with-x \
-		$(use_enable debug) \
-		$(use_enable doc doxygen-docs)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	use doc && local HTML_DOCS=( doc/html/. )
-	einstalldocs
-}
diff --git a/x11-libs/libfakekey/libfakekey-0.3.ebuild b/x11-libs/libfakekey/libfakekey-0.3.ebuild
index 4cee737959b9..02a258f0146f 100644
--- a/x11-libs/libfakekey/libfakekey-0.3.ebuild
+++ b/x11-libs/libfakekey/libfakekey-0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://git.yoctoproject.org/cgit/cgit.cgi/${PN}/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86"
 IUSE="debug doc"
 
 BDEPEND="doc? ( app-doc/doxygen )"