gentoo resync : 03.11.2019

5 files changed, 23 insertions, 130 deletions

diff --git a/app-i18n/xvnkb/Manifest b/app-i18n/xvnkb/Manifest
index 62d4e00f9e24..c50eb01bc2a6 100644
--- a/app-i18n/xvnkb/Manifest
+++ b/app-i18n/xvnkb/Manifest
@@ -1,8 +1,4 @@
-AUX 0.2.8a-putenv.patch 337 BLAKE2B a288ed8cfa4d4130df371cccd61c86267ccf0d51b68eb297306abf666de218bdf036ed9a7c50de30d34566135a16045c0788d12db974a386a9ac2f8076fcad60 SHA512 1354f215534427f63b2ba663cc271858bc0cc4451c369464033241d71b665dcf5858b748e0144587b044644d20639f34684674b6ad49a71f8f02cfc156241a6f
-AUX xvnkb-0.2.8a.patch 562 BLAKE2B 9302bfc3e510b555995f00efb9bc9d51276ce557a8b4c32306f01318c1950c533e6e219b7ab4a63e2aaf45421c42d87caa529eab3f9efd6d3ea644b582bb5825 SHA512 1859b8bcbae7baa33d565d7fe4f861bfd14a1a08dfc0b0188704f728ab1ada606f74dcb7782afc83bf644ead6f66e0228231d85cefae9a210293e595da480c46
 AUX xvnkb-0.2.9a-ldflags.patch 1261 BLAKE2B cfa566937710bc9c45f9faa0cb6d5dc4d62ef96383c957e7e0d3d731814d5112978062dd873e5428b1035f77f2a96e5e76973258c35da859f98b76cc1773cc52 SHA512 5b54ce3d25a9f634f53347e553ce45b35456228b0cb00f9308d872dcbb33c18218e27921a54e4b9e91d98892f0490c864662d96cee09e99a8400fba46f590afb
-DIST xvnkb-0.2.8a.tar.bz2 76221 BLAKE2B a9bc825ba9412f7e2fa1fdd400ba5f648ad9001dbac7e3b804fc444d5b88534b4f75cb529bf489cb0b107564d4c562be419ea9883b29d154cb3141e0d52fec1e SHA512 76ed49fec52fbcfa4a81a7d80208b3f11d911695e2f8f37d9fbb5e6e1899ffffa722c26a577d4236dfd459769d08d0180593ee0db971910b0cd62e77c49516d5
 DIST xvnkb-0.2.9a.tar.bz2 76429 BLAKE2B 33205bfe8dcc2fd68eaffb507dfb2db55cc1a71d33765f807b3804091a29f8c34ca8dcaf65a3f3978da921534d054096fb22abded3c4829d5ca256d3e51fff34 SHA512 3dbf4adb65f321d721fc74e05e92d2d1460e63c49e8a1ab2e10ab9f015e1a57bd3e641645d1283f1d0c5592eb7b342bf210d9fcab9ba441b6416c2f8fd1af6da
-EBUILD xvnkb-0.2.8a-r1.ebuild 1480 BLAKE2B a589a21afa8f501b92f42610c25cc17ce97e6f54d549fbf28309977bf1f0012134a72e6ab1c1e1579c0c8b0abe2b22ec8a63994ec217244eca0a7ab9756a6094 SHA512 1393190018e2d133d48f2bae9edbbac08387724e4ed3b472434a2d21a2342e09647fe819bbed2cc5717189eb0dc88a1da86cfc4a542b529320c0abb26322f361
-EBUILD xvnkb-0.2.9a-r1.ebuild 1426 BLAKE2B 23c976233d008fa9e822d4a12ea4661c9761ded63d1a33105c1d1a67b557a8f7aea370436657354308da2ba6df838763b1f363bfcf7e05dd6fbd6059e120292e SHA512 7facf8728a6b2e147bdebed757347c7fff69fe35024a6891a7ebf6b40898b49313417191b738969e3c081297d6e4ba662636496f4567ebcacc7935146d140d57
+EBUILD xvnkb-0.2.9a-r1.ebuild 1284 BLAKE2B f098c17bb08a6b904a89ee08b9821770e63375983edef2e87c91c19a108652fc69199efe63cf5a81c3f282c12ea4850aaa991c3f73a919b573531a0b6f3b601d SHA512 adc863b50c4dab538ce46dc57c762efc513dbab83e922fe83dc7a85d9159bb0c21422b7f395184f621d332bb579cfb9e05f5213d6221a17a07e636d83e2632c4
 MISC metadata.xml 319 BLAKE2B d651b6c56f28bb3735d1ee4cbe42ab1cd6f0db55692494fbb78ad9e61aa5655a9003dd12d2da620d184bae5739f79c9642b69e182fc134ed0401b8b135e78694 SHA512 72d8e0bd2181f6f9ab0b0d9a688a718b6e5b606abb7882cb50d36c0e273308055eeb87f0a55834d85240fea60278c8933c828a79822a24b9700189bc1bea77b1
diff --git a/app-i18n/xvnkb/files/0.2.8a-putenv.patch b/app-i18n/xvnkb/files/0.2.8a-putenv.patch
deleted file mode 100644
index ef7827e20fe8..000000000000
--- a/app-i18n/xvnkb/files/0.2.8a-putenv.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xvnkb.c.old	2005-05-04 22:11:50.323413496 +0700
-+++ xvnkb.c	2005-05-04 22:12:01.212758064 +0700
-@@ -77,7 +77,7 @@
- static void __attribute__ ((constructor)) xvnkb_init(void)
- {
- 	static char gtk_xim_env[24] = "GTK_IM_MODULE=xim";
--	putenv(gtk_xim_env);
-+	/*putenv(gtk_xim_env);*/
- 	/* TODO:
- 	 - Initialize some more variables
- 	 */
diff --git a/app-i18n/xvnkb/files/xvnkb-0.2.8a.patch b/app-i18n/xvnkb/files/xvnkb-0.2.8a.patch
deleted file mode 100644
index 51862a1986bd..000000000000
--- a/app-i18n/xvnkb/files/xvnkb-0.2.8a.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur xvnkb-0.2.8/visckey.c xvnkb-0.2.8-new/visckey.c
---- xvnkb-0.2.8/visckey.c	2004-01-17 05:19:17.000000000 +0700
-+++ xvnkb-0.2.8-new/visckey.c	2004-03-03 04:20:44.000000000 +0700
-@@ -423,8 +423,11 @@
- /*----------------------------------------------------------------------------*/
- inline void VKClearBuffer()
- {
--	tempoff = count = *word = vpc = 0;
-+	tempoff = count = *word = 0;
-+#ifdef VK_CHECK_SPELLING
-+	vpc = 0;
- 	vp = -1;
-+#endif
- }
- /*----------------------------------------------------------------------------*/
- inline long VKBackspaceDelete()
diff --git a/app-i18n/xvnkb/xvnkb-0.2.8a-r1.ebuild b/app-i18n/xvnkb/xvnkb-0.2.8a-r1.ebuild
deleted file mode 100644
index 51c383883193..000000000000
--- a/app-i18n/xvnkb/xvnkb-0.2.8a-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-IUSE="spell xft"
-
-DESCRIPTION="Vietnamese input keyboard for X"
-SRC_URI="http://xvnkb.sourceforge.net/xvnkb/${P}.tar.bz2"
-HOMEPAGE="http://xvnkb.sourceforge.net/"
-
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="ppc x86"
-RDEPEND="x11-libs/libX11
-	xft? ( x11-libs/libXft )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}.patch"
-	epatch "${FILESDIR}/${PV}-putenv.patch"
-
-	# Remove pregenerated dep file.
-	rm -f "${S}/tools/Makefile.dep"
-}
-
-src_compile() {
-	local myconf
-
-	use spell || myconf="${myconf} --no-spellcheck"
-	use xft || myconf="${myconf} --no-xft"
-
-	# *not* autotools
-	./configure \
-		--use-extstroke ${myconf} \
-		|| die "./configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	dobin xvnkb
-	dobin tools/xvnkb_ctrl
-
-	dolib xvnkb.so.${PV}
-	dosym /usr/lib/xvnkb.so.${PV} /usr/lib/xvnkb.so
-
-	dodoc ChangeLog AUTHORS THANKS TODO INSTALL* README* doc/*
-	docinto scripts
-	dodoc scripts/*
-	docinto contrib
-	dodoc contrib/*
-}
-
-pkg_postinst() {
-	elog "Remember to"
-	elog "$ export LANG=en_US.UTF-8"
-	elog "(or any other UTF-8 locale) and"
-	elog "$ export LD_PRELOAD=/usr/lib/xvnkb.so"
-	elog "before starting X Window"
-	elog "More documents are in /usr/share/doc/${PF}"
-	ewarn "Programs with suid/sgid will have LD_PRELOAD cleared"
-	ewarn "You have to unset suid/sgid to use with xvnkb"
-}
diff --git a/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild b/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild
index 3011a7130047..3f52d6d81c32 100644
--- a/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild
+++ b/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild
@@ -1,57 +1,50 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit eutils multilib toolchain-funcs
-
-IUSE="spell xft"
+inherit toolchain-funcs
 
 DESCRIPTION="Vietnamese input keyboard for X"
 SRC_URI="http://xvnkb.sourceforge.net/${P}.tar.bz2"
 HOMEPAGE="http://xvnkb.sourceforge.net/"
 
 LICENSE="GPL-2"
-
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-RDEPEND="x11-libs/libX11
-	xft? ( x11-libs/libXft )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
+KEYWORDS="amd64 ppc x86"
+IUSE="spell xft"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-}
+RDEPEND="
+	x11-libs/libX11:=
+	xft? ( x11-libs/libXft:= )"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
 
-src_compile() {
-	local myconf
+PATCHES=( "${FILESDIR}"/${P}-ldflags.patch )
 
+src_configure() {
 	tc-export CC
 
-	use spell || myconf="${myconf} --no-spellcheck"
-	use xft || myconf="${myconf} --no-xft"
+	local myconf=()
+	! use spell && myconf+=( --no-spellcheck )
+	! use xft && myconf+=( --no-xft )
 
 	# *not* autotools
 	./configure \
-		--use-extstroke ${myconf} \
+		--use-extstroke "${myconf[@]}" \
 		|| die "./configure failed"
-
-	emake || die "emake failed"
 }
 
 src_install() {
 	dobin xvnkb
 	dobin tools/xvnkb_ctrl
 
-	dolib xvnkb.so.${PV}
+	dolib.so xvnkb.so.${PV}
 	dosym xvnkb.so.${PV} /usr/$(get_libdir)/xvnkb.so
 
-	dodoc ChangeLog AUTHORS THANKS TODO README* doc/*
-	docinto scripts; dodoc scripts/*
-	docinto contrib; dodoc contrib/*
+	einstalldocs
+	dodoc -r doc/. scripts contrib
 }
 
 pkg_postinst() {
@@ -60,7 +53,8 @@ pkg_postinst() {
 	elog "(or any other UTF-8 locale) and"
 	elog "$ export LD_PRELOAD=/usr/$(get_libdir)/xvnkb.so"
 	elog "before starting X Window"
-	elog "More documents are in /usr/share/doc/${PF}"
+	elog "More documents are in ${EROOT}/usr/share/doc/${PF}"
+
 	ewarn "Programs with suid/sgid will have LD_PRELOAD cleared"
 	ewarn "You have to unset suid/sgid to use with xvnkb"
 }