gentoo resync : 29.12.2022

6 files changed, 2 insertions, 174 deletions

diff --git a/app-i18n/opencc/Manifest b/app-i18n/opencc/Manifest
index 6db1cca93fee..39c593d583a5 100644
--- a/app-i18n/opencc/Manifest
+++ b/app-i18n/opencc/Manifest
@@ -1,10 +1,4 @@
-AUX opencc-stop-copy.patch 625 BLAKE2B ab2f98a03bb079ad116994c4d05e59e3638f648b3e03ea4e6a357a8658612a1425f2578989c0086e31d749e3533ffb814457071582f9fbf3fbcdf0d184892940 SHA512 e34388bc5d1841e3655c6209e31cf18957a9a02f23d49d9b1f184e48005cf5d5c108656439900f0d79fc1801700872a433ab761154abc424b717e12a616487ca
-AUX opencc-test.patch 202 BLAKE2B 1dd3bc35c1f8644cd4f27ce8a5b5dea3b0ef2750612f112d7dc6de658634ad5151972b80c7b2ede9f41ea98ac7a2d29eaeb961132c862f66dd160dc2dd522a6d SHA512 5318058587b41fb7021ffce64d4b999b1beed294ce4c00137fb4b0396dd2cb471af789bceb8a8076b1d4ec2226d3c3fdf8b3d3d6a1f5d80936cf2407b8bdd3ec
-DIST opencc-1.0.5.tar.gz 1598354 BLAKE2B a66b32b96dab543d8401960ff0548a4e3f9414606513941426eacf105bca0755a7b364c68b7eb996ef82444e52f849d2f8151353a14fb97a358ad1463fbea2d3 SHA512 3fbefbafe5c3c2491032158577ab97b5a3edf6ea98a03a7250deba082b72c3112ad4a3396d1a469936ec32e1d141f0a2236001c2891ac9c793add2b082596cc1
-DIST opencc-1.1.2.tar.gz 2804665 BLAKE2B 9b8be92cfdc2f565c9dc27745724c739e674239f2e3925a1ccdfcbf83e0d1857430d72e91a064c09456e69c00d79e47179801b21a4c7c6fd5dc6d0d16f1bcb98 SHA512 56c84bc472b39eb0b23bac6df5aada2c2ed5fd2fbe653c1ae89d392ec0b74741a15de93c748883ec3c0779396e790a1197f6e3b267b524f111459d45daeb5d4b
 DIST opencc-1.1.3.tar.gz 2805430 BLAKE2B 060ca820676a92ddfddc362488031e1ada538626a1fbeb8d178a0ef059b99f606cb0f1151857579221942183820bf34c6f96517d13d4ae8dc3f81846537b668d SHA512 90da656fa4790c58932ad2240a076cc4a9e8cf70ac73d83e0d299e84472deb6491a823966a7686ed1487ef8405909981b9a12b661d8de7f086bd4b498594abac
-EBUILD opencc-1.0.5.ebuild 1377 BLAKE2B 4d38a897f7d9d42be4c9e84bc33342deea38b9cdbd617fc70bde26e3e172c9a8ab27c46547c94d734951b353c9b8a9b506acd25a3c8b14a6ab0dce804256b313 SHA512 5fa0e68dea35abc4c8c5caa567e04c7de16ce705cf1e965cce417d43f8981b29d9d87673c05942406e98f6ada609908a2ba89df8659bc3e9e513de1c3b089fbe
-EBUILD opencc-1.1.2.ebuild 1774 BLAKE2B 51d415dcd35c310b01f518afe4feebb73061cadfebd42b33458353446a894cf7c432afff6f7135c9381ae88314cd981b7335afe0bca81b329d80fa132a75cec8 SHA512 f1746220dbc95041be12f30e34ac439b6e0d7fb9f5c217337112e3592d7521807e39ea77c19224399e1296795dfb9cdebaf01902e76d37af531448063aaafd62
-EBUILD opencc-1.1.3.ebuild 1583 BLAKE2B 40e5f836ec791fd8cc1974671b7a88e6c7ecb5fcd7eba6beb140bf16d09e8f9522207c57bad4798f5c91cfdcae22c208d6bf36a4495fd13a8f8ac6f1ef4bf5bd SHA512 b96738785f54359cefd5f525acbaa7ef6f6a5032edaa1e974d547530b9cd6ca8b81682770be7f48aed5dcb9ad4ffc4488dd10e9e6731a99a7df36c27bf22e15f
+EBUILD opencc-1.1.3.ebuild 1584 BLAKE2B 2648b515e72bb61064e0cdf0ac2adc8823dc13dd604d6795ad6640b5558ab1e63f4df023f61ff5b2ba417b95e04674534fd0051f97fa48f98fb3657e1d98fae4 SHA512 9ac4e2157b1338188652c77b33dd6f3077f25d6c22df74c98673b944ce88d506acea7dff257abf1132e0fd2d3114a5232206e46eb2762ce60b086b48a88b7e6f
 EBUILD opencc-9999.ebuild 1533 BLAKE2B 7af70265939b180ea374cdf1f94160257c9bd3ba4c1f26eb70e1a2663e102466d0300ada0008aa29bf8788f1656d8b63475dcfbbb6ef89925b1ef671ff942a2e SHA512 a73dfa1a151602462a0406925963102224874bcff1eebfc277b461d0910310a69dff10ff0c9e5ce0bc5f0acf00f2bd7b9fc293090fbe00cc78c4c67d1e870b27
 MISC metadata.xml 624 BLAKE2B 0fc3325d54820e80e6800c408c9590b0ad55587f94f1cde371c1c2f5396eb650dc53e3d568eeab3e92739c5db142e698119dea51ccacaaed106765d03db9242c SHA512 562f4b08443ed1a7e9ff97b412d5e050ebb6d9e89cd6609302fdaa903cacd5a031f12360c7cbc2504b027b08d3690a119568760621cfeea0294916366bf5261c
diff --git a/app-i18n/opencc/files/opencc-stop-copy.patch b/app-i18n/opencc/files/opencc-stop-copy.patch
deleted file mode 100644
index 4793951dd251..000000000000
--- a/app-i18n/opencc/files/opencc-stop-copy.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-We don't need this copy command on Linux (or other than Visual Studio
-build).  Since it is colliding each other on parallel build, drop the
-command for now.
-
-See https://bugs.gentoo.org/666904
-diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
-index 1516775..2deb764 100644
---- a/data/CMakeLists.txt
-+++ b/data/CMakeLists.txt
-@@ -109,8 +109,6 @@ foreach(DICT ${DICTS})
-       ${DICT}.ocd
-     COMMENT
-       "Building ${DICT}.ocd"
--    COMMAND
--      ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:libopencc>" "$<TARGET_FILE_DIR:${OPENCC_DICT_BIN}>"
-     COMMAND
-       ${OPENCC_DICT_BIN}
-         --input ${DICT_${DICT}_INPUT}
diff --git a/app-i18n/opencc/files/opencc-test.patch b/app-i18n/opencc/files/opencc-test.patch
deleted file mode 100644
index dd6e91b984d2..000000000000
--- a/app-i18n/opencc/files/opencc-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/PhraseExtractTest.cpp
-+++ b/src/PhraseExtractTest.cpp
-@@ -16,6 +16,8 @@
-  * limitations under the License.
-  */
- 
-+#include <cmath>
-+
- #include "PhraseExtract.hpp"
- #include "TestUtils.hpp"
- 
diff --git a/app-i18n/opencc/opencc-1.0.5.ebuild b/app-i18n/opencc/opencc-1.0.5.ebuild
deleted file mode 100644
index 3fcb5271474d..000000000000
--- a/app-i18n/opencc/opencc-1.0.5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 2010-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit cmake python-any-r1
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/BYVoid/OpenCC"
-fi
-
-DESCRIPTION="Library for conversion between Traditional and Simplified Chinese characters"
-HOMEPAGE="https://github.com/BYVoid/OpenCC"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/BYVoid/OpenCC/archive/ver.${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-# OpenCC: Apache-2.0
-# deps/darts-clone: BSD-2
-# deps/gtest-1.7.0: BSD
-# deps/rapidjson-0.11: MIT
-# deps/tclap-1.2.1: MIT
-LICENSE="Apache-2.0 BSD-2 MIT test? ( BSD )"
-SLOT="0/2"
-KEYWORDS="amd64 arm64 ~hppa ppc ppc64 sparc x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="${PYTHON_DEPS}
-	doc? ( app-doc/doxygen )"
-DEPEND=""
-RDEPEND=""
-
-if [[ "${PV}" != "9999" ]]; then
-	S="${WORKDIR}/OpenCC-ver.${PV}"
-fi
-
-PATCHES=(
-	"${FILESDIR}/${PN}-test.patch"
-	"${FILESDIR}/${PN}-stop-copy.patch"
-)
-
-DOCS=(AUTHORS NEWS.md README.md)
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -e "s:\${DIR_SHARE_OPENCC}/doc:share/doc/${PF}:" -i doc/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOCUMENTATION=$(usex doc ON OFF)
-		-DBUILD_SHARED_LIBS=ON
-		-DENABLE_GTEST=$(usex test ON OFF)
-	)
-
-	cmake_src_configure
-}
diff --git a/app-i18n/opencc/opencc-1.1.2.ebuild b/app-i18n/opencc/opencc-1.1.2.ebuild
deleted file mode 100644
index 0f250ab5c041..000000000000
--- a/app-i18n/opencc/opencc-1.1.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 2010-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake python-any-r1
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/BYVoid/OpenCC"
-fi
-
-DESCRIPTION="Library for conversion between Traditional and Simplified Chinese characters"
-HOMEPAGE="https://github.com/BYVoid/OpenCC"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/BYVoid/OpenCC/archive/ver.${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0/1.1"
-KEYWORDS="amd64 arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="${PYTHON_DEPS}
-	doc? ( app-doc/doxygen )"
-DEPEND="dev-cpp/tclap
-	dev-libs/darts
-	dev-libs/marisa:0=
-	dev-libs/rapidjson
-	test? (
-		dev-cpp/gtest
-		!hppa? ( !sparc? ( dev-cpp/benchmark ) )
-	)"
-RDEPEND="dev-libs/marisa:0="
-
-if [[ "${PV}" != "9999" ]]; then
-	S="${WORKDIR}/OpenCC-ver.${PV}"
-fi
-
-DOCS=(AUTHORS NEWS.md README.md)
-
-src_prepare() {
-	rm -r deps || die
-
-	cmake_src_prepare
-
-	sed -e "s:\${DIR_SHARE_OPENCC}/doc:share/doc/${PF}:" -i doc/CMakeLists.txt || die
-
-	# https://github.com/BYVoid/OpenCC/issues/550
-	# https://github.com/BYVoid/OpenCC/commit/736b93d3d16fdf0548bdaae2922569199615e919
-	sed -e "s:#ifdef ENABLE_DARTS:#if 1:" -i src/Common.hpp || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOCUMENTATION=$(usex doc ON OFF)
-		-DENABLE_BENCHMARK=$(if use test && has_version -d dev-cpp/benchmark; then echo ON; else echo OFF; fi)
-		-DENABLE_GTEST=$(usex test ON OFF)
-		-DUSE_SYSTEM_DARTS=ON
-		-DUSE_SYSTEM_GOOGLE_BENCHMARK=ON
-		-DUSE_SYSTEM_GTEST=ON
-		-DUSE_SYSTEM_MARISA=ON
-		-DUSE_SYSTEM_RAPIDJSON=ON
-		-DUSE_SYSTEM_TCLAP=ON
-	)
-
-	cmake_src_configure
-}
diff --git a/app-i18n/opencc/opencc-1.1.3.ebuild b/app-i18n/opencc/opencc-1.1.3.ebuild
index cb2c8e19f174..ccdabe3b3bb3 100644
--- a/app-i18n/opencc/opencc-1.1.3.ebuild
+++ b/app-i18n/opencc/opencc-1.1.3.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="Apache-2.0"
 SLOT="0/1.1"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"