gentoo resync : 06.08.2019

4 files changed, 72 insertions, 58 deletions

diff --git a/x11-misc/xvkbd/Manifest b/x11-misc/xvkbd/Manifest
index b8818f7576b6..3b7b4c8733d2 100644
--- a/x11-misc/xvkbd/Manifest
+++ b/x11-misc/xvkbd/Manifest
@@ -1,8 +1,9 @@
 AUX xvkbd-3.6-last_altgr_mask.patch 202 BLAKE2B d980f06b4975bf5dadd6e6e656fd3471fbfc651cfee7f4c118010b1c38d41f7597f7bd6d7e07e6c261f7fed0b07efefdfd4f09fcee38029f0047ed5fc2a1317f SHA512 d3d58b1ba3a7dc71a0240ba3240fd06cc1719ac35ab8f1b119f7d79823fddcdbe1605a457722ec75d4b74804f0a68ec221c5ec3d6c15bd2c4130ce96c01f771e
+AUX xvkbd-4.0-destdir.patch 1026 BLAKE2B 473a1499bff1f00846ae81de75973bc77f63f456d071ebd70fc1d112d254345bda108d34d6934075268e1f5c6e02bcc0107bbd1565380ad01dc1c08ce9b243ef SHA512 8c675dd76eb2f126c48cc669dbb5bf87e337816ef4ac5d6c4730f4259862353e4de1dfc255fda36e35f9a93b507add5922595f53e7c91257996e4c5ee6c8043b
 DIST xvkbd-3.7.tar.gz 81645 BLAKE2B 9133b3b8e176034f2c39deb3ad9b334f553c834ba3285aaed59ab2a6f531c0184879c7bfe8c702313c9b0d4089883603c2f8430160f3c2af243705e5328b4ed0 SHA512 19ac5e78c34889d80571bb9feea65582fa413cdce0ba2f949840a08e70c900d720ca789d90d1118aa9667d32183b0f1edb33b7b0029ef5abb1d6faf058134385
-DIST xvkbd-3.8.tar.gz 88508 BLAKE2B bdaa3b31322ef2393298cb6987e4980536f3a6707df4016acc698a6713f25bff3e92cdecfcbf0c513af5cb8290e9b434fc61108095138c15cbbba9765ba856a1 SHA512 8a1ff96d90d1021bfd60ac6c251e62d68a65e86a1f1ee1fbdbf67344bdd07d7e1929a646e7e80f1da5f3e12e50c655e2be180c9ae4129fa7912f32aa5f40f5f5
 DIST xvkbd-3.9.tar.gz 88440 BLAKE2B d024e97c3e134fd4270db07b1eb54c45380b74bdbffb3fbcf7778e839b51ad8a74a7a236e440215eaea38062ae321db866c5344ecb7eaf2ed9ce15d663cbde9a SHA512 f85d94f9b8012023eb4e901c1962ea39a491df2af67b617efb0817023eb93c460446ab9414fb20dcaee02e270cb9cb7b058a83ae96ffae73291b799f15a04b98
+DIST xvkbd-4.0.tar.gz 408256 BLAKE2B 12f18dc6af9636021a9a067528b9ee2387c43aec0d7a23e01e7e4979273ccfa1eae7752cd2814465da906eeada44a31ff70a3f00f030e87ff66db35e3f3c7f5a SHA512 17fe50b86974f21f1456c522cec107f42a8915fa4ffa60849e03d56a3eb8b600aba46becfde458799e30b073d435c60ee8b3b61d79f4c0d86575770cb4bfd951
 EBUILD xvkbd-3.7.ebuild 1039 BLAKE2B 0e1530b3eb6453dea3da454de2012414831c5108bccc208f69ee6514ff27e66f9d6c8b2a0d0c1cb4e2ad30ddba08921b1e1107643241701bfa1a24623e7e35fa SHA512 a33d41cf74553169337716e060398061397e4d399696234a214a1887efa3326761fe36b0c351d25dfa8e42d1bff6885ff287df91ac587964b5c6d84adea38e15
-EBUILD xvkbd-3.8.ebuild 1007 BLAKE2B 4b2ed2fd51d0c4f569bb3712870e8b1cec359e1da441b5f54a114533bc1dcb489c3bffcbf7697021222512d964224868ae59a9cab3c9d13493f6abd074649782 SHA512 486c7453c758d5374be0c8bfc5e59faf7a8a335de67ed1eee07fabf74c1357d6d569de7d681f37ea8ee0393f24910a8ed41ce2d7bf28272df9178ef5d9f62486
 EBUILD xvkbd-3.9.ebuild 1007 BLAKE2B 4b2ed2fd51d0c4f569bb3712870e8b1cec359e1da441b5f54a114533bc1dcb489c3bffcbf7697021222512d964224868ae59a9cab3c9d13493f6abd074649782 SHA512 486c7453c758d5374be0c8bfc5e59faf7a8a335de67ed1eee07fabf74c1357d6d569de7d681f37ea8ee0393f24910a8ed41ce2d7bf28272df9178ef5d9f62486
+EBUILD xvkbd-4.0.ebuild 706 BLAKE2B 1ce003b13e95fb0f3152e148e774ece79b7a76eb1a1c74e5f02f961ed48188249fc00449f4f407fbc5af610591b8a67fafa03b8b276720d285f68c832591e57f SHA512 dd41fb0962c6538163cbc34493806148a4c741947c86a5e01977f011399559c3ebecf1f4b01be175c673cb4d93eb3a824dde68e8f7a04980f93b25dfc1dde88b
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xvkbd/files/xvkbd-4.0-destdir.patch b/x11-misc/xvkbd/files/xvkbd-4.0-destdir.patch
new file mode 100644
index 000000000000..83879dd9fd02
--- /dev/null
+++ b/x11-misc/xvkbd/files/xvkbd-4.0-destdir.patch
@@ -0,0 +1,25 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,5 +1,4 @@
+-appdefaultdir=$(shell pkg-config --variable=appdefaultdir xt)
+-datarootdir=$(shell pkg-config --variable=datarootdir xt)
++appdefaultdir = $(shell $(PKG_CONFIG) --variable=appdefaultdir xt)
+ 
+ SUBDIRS = .
+ bin_PROGRAMS = xvkbd
+@@ -17,11 +16,12 @@
+ 	[ which ad2c > /dev/null ] || ad2c XVkbd-common.ad > XVkbd-common.h
+ 
+ install-data-hook:
++	[ -d $(DESTDIR)/$(appdefaultdir)/xvkbd/ ] || mkdir $(DESTDIR)/$(appdefaultdir)/xvkbd/
+ 	for file in *.ad; do \
+-		$(INSTALL_DATA) $$file $(appdefaultdir)/$${file%.ad}; \
++		$(INSTALL_DATA) $$file $(DESTDIR)/$(appdefaultdir)/$${file%.ad}; \
+ 	done
+-	[ -d $(datarootdir)/xvkbd/ ] || mkdir $(datarootdir)/xvkbd/
+-	$(INSTALL_DATA) words.english $(datarootdir)/xvkbd/words.english
++	[ -d $(DESTDIR)/$(datarootdir)/xvkbd/ ] || mkdir $(DESTDIR)/$(datarootdir)/xvkbd/
++	$(INSTALL_DATA) words.english $(DESTDIR)/$(datarootdir)/xvkbd/words.english
+ 
+ EXTRA_DIST = XVkbd-common.h *.ad *.xbm xvkbd.man README ChangeLog Imakefile words.english
+ 
diff --git a/x11-misc/xvkbd/xvkbd-3.8.ebuild b/x11-misc/xvkbd/xvkbd-3.8.ebuild
deleted file mode 100644
index 3033ea4d6dd8..000000000000
--- a/x11-misc/xvkbd/xvkbd-3.8.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib toolchain-funcs
-
-DESCRIPTION="virtual keyboard for X window system"
-HOMEPAGE="http://t-sato.in.coocan.jp/xvkbd/"
-SRC_URI="${HOMEPAGE}${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXaw3d
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXtst
-"
-DEPEND="
-	${RDEPEND}
-	app-text/rman
-	x11-base/xorg-proto
-	x11-misc/gccmakedep
-	x11-misc/imake
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.6-last_altgr_mask.patch
-)
-
-src_configure() {
-	xmkmf -a || die
-}
-
-src_compile() {
-	emake \
-		CC=$(tc-getCC) LD=$(tc-getCC) \
-		XAPPLOADDIR="/usr/share/X11/app-defaults" \
-		LOCAL_LDFLAGS="${LDFLAGS}" \
-		CDEBUGFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake \
-		XAPPLOADDIR="/usr/share/X11/app-defaults" \
-		DESTDIR="${D}" \
-		install
-
-	rm -r "${D}"/usr/$(get_libdir) "${D}"/etc || die
-
-	dodoc README
-	newman ${PN}.man ${PN}.1
-}
diff --git a/x11-misc/xvkbd/xvkbd-4.0.ebuild b/x11-misc/xvkbd/xvkbd-4.0.ebuild
new file mode 100644
index 000000000000..52f200bc9b23
--- /dev/null
+++ b/x11-misc/xvkbd/xvkbd-4.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="virtual keyboard for X window system"
+HOMEPAGE="http://t-sato.in.coocan.jp/xvkbd/"
+SRC_URI="${HOMEPAGE}${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXaw3d
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXtst
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0-destdir.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	dodir /usr/share/X11/app-defaults
+
+	default
+
+	dodoc ChangeLog README
+	newman ${PN}.man ${PN}.1
+}