gentoo auto-resync : 18:08:2022 - 08:34:07

4 files changed, 2 insertions, 98 deletions

diff --git a/app-i18n/xvnkb/Manifest b/app-i18n/xvnkb/Manifest
index 73905c639db1..4693ae739813 100644
--- a/app-i18n/xvnkb/Manifest
+++ b/app-i18n/xvnkb/Manifest
@@ -1,8 +1,5 @@
 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.11.ebuild 1336 BLAKE2B a5b33a86e3d79721978adc05498712829993fad0ff1567ff69bab1c39d282fd593dcfe105e4e1e7df0d9f940e778fcea302d9395b0bc7078ea3b4d65f7e38237 SHA512 5e436876c8ad58a8271a32f252317019a5ac1c9ded83c6877cdeebc3fa49c47dbcd7c6313e7d409fcd9d11d295be9c9555e775a11fa2824454d4e0611b44604c
-EBUILD xvnkb-0.2.9a-r1.ebuild 1335 BLAKE2B 5363f8b9ba2b09385d8b843bf9714a6a65aaad3029d8def9bcd590abbee5cc5cbf709b754d91cbb117ce9d566459e56d1b9ae175b47e34829ad013543050f6e0 SHA512 ce4cfadb50f778dd0ac9f915cb49dc8c8605e7ae906e07cf6eef0ad4bd1b16541ee547a755402e8709818ff23cb898e9152d7f70348a9d2fba0fa1d320f26a85
+EBUILD xvnkb-0.2.11.ebuild 1335 BLAKE2B 2c2b48628b0e2514c0a64789a39f6cb3e1554b9d3ec994d77d4d1738cd6b214859a3b7144b20bf1ab1f7b1ba10e9b6cb2c5c8f09ac2ec083983ed83bcda2870b SHA512 81d363127a657e3505722f2a8217f365da9ad44cc22340950506b62ce89094857b916da3612ca7404588718884f0f304c00bf99ea17603de81c0a1ec456a53ba
 MISC metadata.xml 310 BLAKE2B 8cc6252010668c0621159f3bfc8be62a27e75a6798aeab86824ca9670f10844199aa1960c93d4b3d0f6b614595c00e26126f280cde4ed1d253ac17de74864ab1 SHA512 3ae9cfe5184876f5754768c37e25425b1067fd53e1fdc16cfc19508cf7d4845ff47f6f7f0d7752a532e2f4c8f74ca7abb16ec69db00bfec78ba6aa25872663f0
diff --git a/app-i18n/xvnkb/files/xvnkb-0.2.9a-ldflags.patch b/app-i18n/xvnkb/files/xvnkb-0.2.9a-ldflags.patch
deleted file mode 100644
index b954b2914178..000000000000
--- a/app-i18n/xvnkb/files/xvnkb-0.2.9a-ldflags.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- 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)
-+	$(CC) $(CFLAGS) $(DLFLAGS) $(CORE_OBJS) -o $@ -L$(XLIB_PATH) $(LIBDL) $(LDFLAGS)
- 
- $(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/xvnkb-0.2.11.ebuild b/app-i18n/xvnkb/xvnkb-0.2.11.ebuild
index 6442bca8677d..5493f9d719bf 100644
--- a/app-i18n/xvnkb/xvnkb-0.2.11.ebuild
+++ b/app-i18n/xvnkb/xvnkb-0.2.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}.sourceforge.net/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="spell xft"
 
 RDEPEND="x11-libs/libX11:=
diff --git a/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild b/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild
deleted file mode 100644
index 5281e3024429..000000000000
--- a/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-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}"
-}