gentoo resync : 20.10.2021

7 files changed, 143 insertions, 37 deletions

diff --git a/app-i18n/xvnkb/Manifest b/app-i18n/xvnkb/Manifest
index a7b00d331773..8effafd73c31 100644
--- a/app-i18n/xvnkb/Manifest
+++ b/app-i18n/xvnkb/Manifest
@@ -1,4 +1,8 @@
-AUX xvnkb-0.2.9a-ldflags.patch 1261 BLAKE2B cfa566937710bc9c45f9faa0cb6d5dc4d62ef96383c957e7e0d3d731814d5112978062dd873e5428b1035f77f2a96e5e76973258c35da859f98b76cc1773cc52 SHA512 5b54ce3d25a9f634f53347e553ce45b35456228b0cb00f9308d872dcbb33c18218e27921a54e4b9e91d98892f0490c864662d96cee09e99a8400fba46f590afb
+AUX xvnkb-0.2.11-ldflags.patch 1077 BLAKE2B a1302da0f64a8975d4c88c63ce80e21b43d656d0766940ada495509649f890f917cb7dbc78a874a2854ee6d096e3ef6cd4a582f52f48913fd5c618a5767187e5 SHA512 8e64e433b4d05c30579f61f38ebb2d3d8f96ef620ddee7da62196a480fcfaf03595058f7dbf53d25948b89c534eefb89e61e62a5bea54edaa9601fe299642ed3
+AUX xvnkb-0.2.9a-ldflags.patch 1065 BLAKE2B 9a1fdc685b0451c06acb5a66b85c632876bd6b542f61a66be4d9c4d502a4e96336eb4d81d707e0248940372681d70683f5192f6b07d30e6934b71c759f05b12d SHA512 34a526e4732ed63a308a5dc37a7dde762512598619e8c7e3258cc0a58e3c95cee2ee2baee8c91646683e738e7b5542c6696467d0b0f16f82f07fa3c5b0a842a5
+AUX xvnkb-cc.patch 217 BLAKE2B e33d60d26bef4c34f8f1e40a923ed3f1f759211965a6ecb66d8b257cdd2100112ab005899e208d0c89df63f38dac42bd215721d913a5dcad763a5dac2905fe7f SHA512 e5696260fb5e70e0c9d85b3d3686eb7f3f62df68b27d78e77bcecbf0177afeeaf805df0c71eb4f8a9c7209def0caf9cff096a515efd9812473f9848e8cce095f
+DIST xvnkb-0.2.11.tar.bz2 76397 BLAKE2B 8ebe4c389f5174b74af32fb001ef5f94d388b16a7c1ca0f409faffc6d63a4543d4daf7dc3609a8e7066324280eaf2d980e4a4e379ae478010269b808effb61cd SHA512 10d24ec159a89dd5fa68540bb8a92ae4d925f11039e7a7b77ed273862e4eb28ccd66d53ca1d0304f2a6d38182eddd304362d2bfd8c6804a2e7bfb354b20e5e83
 DIST xvnkb-0.2.9a.tar.bz2 76429 BLAKE2B 33205bfe8dcc2fd68eaffb507dfb2db55cc1a71d33765f807b3804091a29f8c34ca8dcaf65a3f3978da921534d054096fb22abded3c4829d5ca256d3e51fff34 SHA512 3dbf4adb65f321d721fc74e05e92d2d1460e63c49e8a1ab2e10ab9f015e1a57bd3e641645d1283f1d0c5592eb7b342bf210d9fcab9ba441b6416c2f8fd1af6da
-EBUILD xvnkb-0.2.9a-r1.ebuild 1284 BLAKE2B f098c17bb08a6b904a89ee08b9821770e63375983edef2e87c91c19a108652fc69199efe63cf5a81c3f282c12ea4850aaa991c3f73a919b573531a0b6f3b601d SHA512 adc863b50c4dab538ce46dc57c762efc513dbab83e922fe83dc7a85d9159bb0c21422b7f395184f621d332bb579cfb9e05f5213d6221a17a07e636d83e2632c4
-MISC metadata.xml 320 BLAKE2B e5356409f97855131627a00f695dc327d051fab6e9dfcf6b6edae5b584fdb03d2e3b77322a66aff607f6c9031ec80b7b7d196c220214895325ecd0643b280a67 SHA512 56222abda6239d6c1e522975c2461b37f4b1418e1317f250a71351579bb98ad770678ae32158f4e24ae68752cab290a40bbca42206ea951fbc3b949c70385e24
+EBUILD xvnkb-0.2.11.ebuild 1338 BLAKE2B 66dc96ec926be619406fd7c5d39e57e24b4477a58caf44da76002b8d3c80981a630bf0cedd0fb2a764971c478114566a4f0a72bb1dcc4a395738f1cdb2f5ad1f SHA512 5f68df0a7c19d698df2ad2081e0d0ce113a5d4304c38ea0a53de2aa448c1caacf832eda764df90b8456dbb45b0516758108dcc8bff2de049f2058ed25ac31015
+EBUILD xvnkb-0.2.9a-r1.ebuild 1335 BLAKE2B 5363f8b9ba2b09385d8b843bf9714a6a65aaad3029d8def9bcd590abbee5cc5cbf709b754d91cbb117ce9d566459e56d1b9ae175b47e34829ad013543050f6e0 SHA512 ce4cfadb50f778dd0ac9f915cb49dc8c8605e7ae906e07cf6eef0ad4bd1b16541ee547a755402e8709818ff23cb898e9152d7f70348a9d2fba0fa1d320f26a85
+MISC metadata.xml 310 BLAKE2B 8cc6252010668c0621159f3bfc8be62a27e75a6798aeab86824ca9670f10844199aa1960c93d4b3d0f6b614595c00e26126f280cde4ed1d253ac17de74864ab1 SHA512 3ae9cfe5184876f5754768c37e25425b1067fd53e1fdc16cfc19508cf7d4845ff47f6f7f0d7752a532e2f4c8f74ca7abb16ec69db00bfec78ba6aa25872663f0
diff --git a/app-i18n/xvnkb/files/xvnkb-0.2.11-ldflags.patch b/app-i18n/xvnkb/files/xvnkb-0.2.11-ldflags.patch
new file mode 100644
index 000000000000..8cae65fda777
--- /dev/null
+++ b/app-i18n/xvnkb/files/xvnkb-0.2.11-ldflags.patch
@@ -0,0 +1,30 @@
+--- a/Makefile.common
++++ b/Makefile.common
+@@ -19,10 +19,10 @@
+ 	$(CC) -fpic $(CFLAGS) $(FPTR) $(VK_OPT) -DVERSION=\"$(VERSION)\" -Wall -I$(XLIB_INC) -c $<
+ 
+ $(CORE): $(CORE_OBJS)
+-	$(CC) $(CFLAGS) $(DLFLAGS) $(CORE_OBJS) -o $@ -L$(XLIB_PATH) $(LIBDL) -lX11
++	$(CC) $(CFLAGS) $(DLFLAGS) $(CORE_OBJS) -o $@ -L$(XLIB_PATH) $(LIBDL) $(LDFLAGS) -lX11
+ 
+ $(GUI): $(GUI_OBJS)
+-	$(CC) $(CFLAGS) $(GUI_OBJS) -o $@ -L$(XLIB_PATH) $(LIBS) $(XFT_LIBS)
++	$(CC) $(CFLAGS) $(GUI_OBJS) -o $@ -L$(XLIB_PATH) $(LIBS) $(XFT_LIBS) $(LDFLAGS)
+ 
+ main: $(CORE) $(GUI)
+ 	@echo >/dev/null
+--- a/tools/Makefile.common
++++ b/tools/Makefile.common
+@@ -16,10 +16,10 @@
+ 	$(CC) $(CFLAGS) $(DEFS) -Wall -I$(XLIB_INC) -c $<
+ 
+ xvnkb_ctrl: $(CONTROL_OBJS)
+-	$(CC) $(CFLAGS) -o $@ $(CONTROL_OBJS) -L$(XLIB_PATH) $(LIBS)
++	$(CC) $(CFLAGS) -o $@ $(CONTROL_OBJS) -L$(XLIB_PATH) $(LIBS) $(LDFLAGS)
+ 
+ xvnkb_setup: $(SETUP_OBJS)
+-	$(CC) $(CFLAGS) -o $@ $(SETUP_OBJS) -L$(XLIB_PATH) $(LIBS) $(XFT_LIBS)
++	$(CC) $(CFLAGS) -o $@ $(SETUP_OBJS) -L$(XLIB_PATH) $(LIBS) $(XFT_LIBS) $(LDFLAGS)
+ 
+ main-tools: $(TOOLS)
+ 
diff --git a/app-i18n/xvnkb/files/xvnkb-0.2.9a-ldflags.patch b/app-i18n/xvnkb/files/xvnkb-0.2.9a-ldflags.patch
index f089f0dde899..b954b2914178 100644
--- a/app-i18n/xvnkb/files/xvnkb-0.2.9a-ldflags.patch
+++ b/app-i18n/xvnkb/files/xvnkb-0.2.9a-ldflags.patch
@@ -1,8 +1,6 @@
-diff --git a/Makefile.common b/Makefile.common
-index 06f0b78..d9f8976 100644
 --- a/Makefile.common
 +++ b/Makefile.common
-@@ -19,10 +19,10 @@ all: do-it-all
+@@ -19,10 +19,10 @@
  	$(CC) -fpic $(CFLAGS) $(FPTR) $(VK_OPT) -DVERSION=\"$(VERSION)\" -Wall -I$(XLIB_INC) -c $<
  
  $(CORE): $(CORE_OBJS)
@@ -15,11 +13,9 @@ index 06f0b78..d9f8976 100644
  
  main: $(CORE) $(GUI)
  	@echo >/dev/null
-diff --git a/tools/Makefile.common b/tools/Makefile.common
-index fe16cc1..16ec511 100644
 --- a/tools/Makefile.common
 +++ b/tools/Makefile.common
-@@ -16,10 +16,10 @@ all: do-it-all
+@@ -16,10 +16,10 @@
  	$(CC) $(CFLAGS) $(DEFS) -Wall -I$(XLIB_INC) -c $<
  
  xvnkb_ctrl: $(CONTROL_OBJS)
diff --git a/app-i18n/xvnkb/files/xvnkb-cc.patch b/app-i18n/xvnkb/files/xvnkb-cc.patch
new file mode 100644
index 000000000000..1104998f7883
--- /dev/null
+++ b/app-i18n/xvnkb/files/xvnkb-cc.patch
@@ -0,0 +1,10 @@
+--- a/tools/Makefile.common
++++ b/tools/Makefile.common
+@@ -49,6 +49,6 @@
+ Makefile.dep:
+ 	@echo
+ 	@echo -n Create $@ ... 
+-	@gcc -I$(XLIB_INC) -MM *.c > $@
++	@$(CC) -I$(XLIB_INC) -MM *.c > $@
+ 	@echo " done"
+ 	@echo
diff --git a/app-i18n/xvnkb/metadata.xml b/app-i18n/xvnkb/metadata.xml
index 5a3a0aa5676d..0df6a83c250e 100644
--- a/app-i18n/xvnkb/metadata.xml
+++ b/app-i18n/xvnkb/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">xvnkb</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">xvnkb</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/xvnkb/xvnkb-0.2.11.ebuild b/app-i18n/xvnkb/xvnkb-0.2.11.ebuild
new file mode 100644
index 000000000000..66a1c6ccd41f
--- /dev/null
+++ b/app-i18n/xvnkb/xvnkb-0.2.11.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Vietnamese input keyboard for X"
+HOMEPAGE="http://xvnkb.sourceforge.net/"
+SRC_URI="http://${PN}.sourceforge.net/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="spell xft"
+
+RDEPEND="x11-libs/libX11:=
+	xft? ( x11-libs/libXft:= )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="xft? ( virtual/pkgconfig )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-cc.patch
+	"${FILESDIR}"/${P}-ldflags.patch
+)
+
+src_prepare() {
+	default
+	tc-export CC
+}
+
+src_configure() {
+	# *not* autotools
+	./configure \
+		$(usex spell '' '--no-spellcheck') \
+		$(usex xft '' '--no-xft') \
+		--use-extstroke \
+		|| die "./configure failed"
+}
+
+src_install() {
+	dobin ${PN}
+	dobin tools/${PN}_ctrl
+
+	dolib.so ${PN}.so.${PV}
+	dosym ${PN}.so.${PV} /usr/$(get_libdir)/${PN}.so
+
+	einstalldocs
+	dodoc -r doc/. scripts 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/$(get_libdir)/${PN}.so"
+	elog "before starting X Window"
+	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 ${PN}"
+}
diff --git a/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild b/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild
index 3f52d6d81c32..5281e3024429 100644
--- a/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild
+++ b/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild
@@ -1,47 +1,50 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="7"
 
 inherit toolchain-funcs
 
 DESCRIPTION="Vietnamese input keyboard for X"
-SRC_URI="http://xvnkb.sourceforge.net/${P}.tar.bz2"
 HOMEPAGE="http://xvnkb.sourceforge.net/"
+SRC_URI="http://${PN}.sourceforge.net/${P}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="spell xft"
 
-RDEPEND="
-	x11-libs/libX11:=
+RDEPEND="x11-libs/libX11:=
 	xft? ( x11-libs/libXft:= )"
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
+BDEPEND="xft? ( virtual/pkgconfig )"
 
-PATCHES=( "${FILESDIR}"/${P}-ldflags.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-cc.patch
+	"${FILESDIR}"/${P}-ldflags.patch
+)
 
-src_configure() {
+src_prepare() {
+	default
 	tc-export CC
+}
 
-	local myconf=()
-	! use spell && myconf+=( --no-spellcheck )
-	! use xft && myconf+=( --no-xft )
-
+src_configure() {
 	# *not* autotools
 	./configure \
-		--use-extstroke "${myconf[@]}" \
+		$(usex spell '' '--no-spellcheck') \
+		$(usex xft '' '--no-xft') \
+		--use-extstroke \
 		|| die "./configure failed"
 }
 
 src_install() {
-	dobin xvnkb
-	dobin tools/xvnkb_ctrl
+	dobin ${PN}
+	dobin tools/${PN}_ctrl
 
-	dolib.so xvnkb.so.${PV}
-	dosym xvnkb.so.${PV} /usr/$(get_libdir)/xvnkb.so
+	dolib.so ${PN}.so.${PV}
+	dosym ${PN}.so.${PV} /usr/$(get_libdir)/${PN}.so
 
 	einstalldocs
 	dodoc -r doc/. scripts contrib
@@ -51,10 +54,10 @@ 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/$(get_libdir)/xvnkb.so"
+	elog "$ export LD_PRELOAD=/usr/$(get_libdir)/${PN}.so"
 	elog "before starting X Window"
 	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"
+	ewarn "You have to unset suid/sgid to use with ${PN}"
 }