From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 25 Nov 2020 22:39:15 +0000
Subject: gentoo resync : 25.11.2020

---
 app-i18n/xsunpinyin/Manifest                       |  4 +--
 .../xsunpinyin-2.0.4_pre20200306162733.ebuild      |  5 ++-
 app-i18n/xsunpinyin/xsunpinyin-3.0.0_rc1.ebuild    | 40 ----------------------
 3 files changed, 5 insertions(+), 44 deletions(-)
 delete mode 100644 app-i18n/xsunpinyin/xsunpinyin-3.0.0_rc1.ebuild

(limited to 'app-i18n/xsunpinyin')

diff --git a/app-i18n/xsunpinyin/Manifest b/app-i18n/xsunpinyin/Manifest
index 16284575cfc8..8b0e8a775ca4 100644
--- a/app-i18n/xsunpinyin/Manifest
+++ b/app-i18n/xsunpinyin/Manifest
@@ -1,5 +1,3 @@
 DIST sunpinyin-2.0.4_pre20200306162733.tar.gz 547519 BLAKE2B 6e0e4457217d7b85221cab15173f588a5c7c039208a8f6cd48ed5fb21c5b5eae2f4616d6fddbf6eff8a006193097de26c866d5385d4602f41059ee8d7e52a2d5 SHA512 e8cf73aeca8dcbc7dd6f51f034a9a0363201bc14a814800e071c987933935b0e8039aa84178a6bd1cba1c7dee4b25b2d5546e78ea683e68e8981afea48fdab33
-DIST sunpinyin-3.0.0_rc1.tar.gz 547138 BLAKE2B 682e733241d690d1fef8ce452c497a894c5ab61bf5298c1f292ce3a25a681d594744db43ebd51b3e59274cce0e47a1bce15a793f2c20e2998915c3432f2a7c32 SHA512 c9d4936de5835a7f02e52c5b32bf1a42d76bf7588449aaa813f3df7ab2d72f3ca0f4e18f74a60be4860f0724b5e05cbe567c67e6f3150b0e71b23b3a9002fc5e
-EBUILD xsunpinyin-2.0.4_pre20200306162733.ebuild 1822 BLAKE2B 29544096b09a537a7ff42ffb1018748b80189877c785837a9bbc8e06e4c3b12e2460e5f71baaf900de2a68b7cac83b63214fcf96769125bc677ddd942e859bb7 SHA512 a60ba52e47fc68e71b3dc3e5d719fc6237c152a9454a127287830ae8df5f8be4c8fb28450775887a0cd634648dd2cac82a9783d82007c19aae4afb89ac4a804c
-EBUILD xsunpinyin-3.0.0_rc1.ebuild 838 BLAKE2B da1adbb00714726eedd65cd1ccfe144ed469265dce54afb0e64ba2f8ffe72cab2eaa6f99a44375164d28fbabe2315296318a1c8916aff579ecb53d7b48542a37 SHA512 f44f42d1a03aa89d9c2ab128f4a8d40823546029a053910f1b5b28ad3a48a9b951ea83bb15f6301a361ad0c0efa72b83d8f855d2fced666d5588d6fa0f330cf4
+EBUILD xsunpinyin-2.0.4_pre20200306162733.ebuild 1943 BLAKE2B 6449d085eabb7e845416540364db8c7fe6aa4727c6cc2a90d3e773ea76ae56d43ce2026e0fbbe6acbe968a24d9e214f2903b7a6e8e985f58e4b6e5cb3f0f8ccc SHA512 ef30aee88a418d7f34b3d9ccb7c33f240b97582b75059aea664107b70b1d3a98b88d1d862c450f8bd3671af9b675270c3c6f9f7136a2454352095422829f01ee
 MISC metadata.xml 318 BLAKE2B cd239258d08a95f0d27a760678be36731954a721daae521d147b882fd07eb5206a38ce9ac9938e94e3501611cd95aba5699fb2e5a5176f3652e8e5531e5e4cf8 SHA512 44d76425ce41ba6cb84f584c7dfe3b0552eb65aec93b4ed72f9c2e6c153e5e51a3965bf4248486046d3ca9e39f861c3bcde90424ba35e4a57f2102a24faf0df5
diff --git a/app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20200306162733.ebuild b/app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20200306162733.ebuild
index 410b23009438..06ccf1ef63b2 100644
--- a/app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20200306162733.ebuild
+++ b/app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20200306162733.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{3_6,3_7,3_8})
+PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
 
 inherit python-any-r1 scons-utils toolchain-funcs
 
@@ -57,6 +57,9 @@ src_prepare() {
 
 	# https://github.com/sunpinyin/sunpinyin/issues/110
 	sed -e "s/^\( *\)('CXX', 'CXX'),/&\n\1('AR', 'AR'),\n\1('RANLIB', 'RANLIB'),/" -i wrapper/xim/SConstruct || die
+
+	# https://github.com/sunpinyin/sunpinyin/issues/114
+	sed -e "/^#include <iconv\.h>$/d" -i wrapper/xim/xim.c || die
 }
 
 src_configure() {
diff --git a/app-i18n/xsunpinyin/xsunpinyin-3.0.0_rc1.ebuild b/app-i18n/xsunpinyin/xsunpinyin-3.0.0_rc1.ebuild
deleted file mode 100644
index c87c83f85db7..000000000000
--- a/app-i18n/xsunpinyin/xsunpinyin-3.0.0_rc1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1 scons-utils toolchain-funcs vcs-snapshot
-
-MY_P="${P:1}"
-
-DESCRIPTION="A standalone XIM server for SunPinyin"
-HOMEPAGE="https://github.com/sunpinyin/sunpinyin"
-SRC_URI="https://github.com/${PN#*-}/${PN#*-}/archive/v${PV/_rc/-rc}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1 CDDL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="~app-i18n/sunpinyin-${PV}:=
-	x11-libs/gtk+:2
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	tc-export CXX
-}
-
-src_compile() {
-	escons -C wrapper/xim \
-		--prefix="${EPREFIX}"/usr
-}
-
-src_install() {
-	escons -C wrapper/xim --install-sandbox="${D}" install
-	dodoc wrapper/xim/README
-}
-- 
cgit v1.2.3