gentoo resync : 27.03.2021

5 files changed, 83 insertions, 127 deletions

diff --git a/app-i18n/opencc/Manifest b/app-i18n/opencc/Manifest
index c67f98059600..d8e56709c888 100644
--- a/app-i18n/opencc/Manifest
+++ b/app-i18n/opencc/Manifest
@@ -1,15 +1,16 @@
 AUX opencc-1.1.0-parallel_build.patch 986 BLAKE2B 86cd6372ef0239986a4ab3c52d1b407b76341e9e556d9c847e43d7a2fa8123376640eac26d9830a2ef5b04c82815a01cb9097fca7f9f4ebcca9a337c33f1c9ad SHA512 0183ccb3aa4d71b6fb8cdac0e1f62aedd69781fcd1c1ae33fffe4d9d6537059f23c2088ee39f5c1ef75e3d5778e3025abe8cf711e14c4fdefa4038097e96dac4
 AUX opencc-1.1.1-system_libraries.patch 2542 BLAKE2B 6fe941c585f8b621bfd4f79fcc097dc55c912c89d153fe5c62ae710516b7704d2c5c401890eb381b4a26631819ddef7808fd274e3b2b1fd0d37e731861fb4421 SHA512 0b6afd427a55ce72ab9ceeea5d52bd6ccb40be77cba6a6e285cf83d180ff8ded7415a82be1ce444f908c1b163a70bd58a22443cb228d230038fc615f11ba48f8
-AUX opencc-1.1.2-system_libraries.patch 3034 BLAKE2B eaba6418757a4ce4fa71ae4f13fdaf7e0980da4af3e74c666d6b907646a5ffd2cb22f9cc5223486c13878cdb913d75af85b491b922579b456d036f4e39801e8c SHA512 305ad0a65bd43f092fd4d8bdbc4250667a7d2cafe0589e927ee92efe6898711a4a3a923149cfc3191e51f131fcccf25483af94678449bff5d8edf64098946d53
 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.0.6.tar.gz 1621561 BLAKE2B d58ee0e04e133fbf6a7632788bcaf0f7891bb74051a970075f6d94b048adfec7bbe4438913933d7dfdd4d58ec2c1a5ec47685415c26532ddd8c13e8abd52cab6 SHA512 67c7bb7432483c1781701dc64ff28e4d5750898ed3d2d41f97d3782918b5f9aa1a49baa1e3a58e4b24cfbd2adcf9ea166a05ad934221fb1cb7afb35e909749e7
 DIST opencc-1.1.0.tar.gz 2209140 BLAKE2B 71cc659976cf30ac0d7dd52cdfa644a85e4e38fed081176bb2f2da2702203c0faeddf76818c8cc89a5fe2a2cfe3eee85fcb27010766db461817b204403cc9b46 SHA512 c5d95e84e0c8edf600f441b79431f721e721b1028619170e27fbc762da32c9ef99c9d28c2c5eaf34226d23a24e2fe5e494cedb28f1182acb06f94b72d7cbb52c
 DIST opencc-1.1.1.tar.gz 2212256 BLAKE2B 0299023f4c950ebedc0a7bc4ca142fbf737c612aca5c8cba8787bebcf2ac8afcacb056b015fbc151136166f679a4551fc5d6bbc0481b930331228ea7484fbe68 SHA512 48ccf61f63cf0a1c0fc484a52ae1d406a28949a52be7d7d1595e6aaf87f40ac47ea4697308441a9381f0cd6f404ee5a28b85a2fa2f288c4b3933be36f4a41363
+DIST opencc-1.1.2.tar.gz 2804665 BLAKE2B 9b8be92cfdc2f565c9dc27745724c739e674239f2e3925a1ccdfcbf83e0d1857430d72e91a064c09456e69c00d79e47179801b21a4c7c6fd5dc6d0d16f1bcb98 SHA512 56c84bc472b39eb0b23bac6df5aada2c2ed5fd2fbe653c1ae89d392ec0b74741a15de93c748883ec3c0779396e790a1197f6e3b267b524f111459d45daeb5d4b
 EBUILD opencc-1.0.5.ebuild 1380 BLAKE2B 8ab9c830656672341c4c8752a5785585719794e8a0413c9f0cccdbc43331a3358f769427d70daa7bde7551abed293fd42eff12a5cf47c08b5bd98e34df3af938 SHA512 6eae458b2987825cf6a38b69a8aad9a062f89358c47a297a29327f6f96ded31d22c0ba45d8e20ebdcea9ec0f185b381d764a0730dbd52350f1c7d7da4b88086a
 EBUILD opencc-1.0.6.ebuild 1354 BLAKE2B 948b8d384e4f9af810005a1e44209def5977ebcee6b0ebaeb208b39790f91aa821f63a79c725999a785fdd197fceabf6372bce1f05de4512fb74719aa4fbed88 SHA512 e2537586767a47fbbb22101e9ba22ef45742381fd9f6845b09804bb723407a5578cec62601fae79c4a463bcab339e9adce99179507290c6d67546fa999e873e6
 EBUILD opencc-1.1.0.ebuild 1402 BLAKE2B 56e77f6bb4902bcc6cd6bf1659edcd6f18fdc85566bc22518989670d8f2b2463111cbcce240822bdf2482b413943e67482b7c9d5e11daf5fa6e64deb1f82ea33 SHA512 d83319b58fcf9d05c91c45765afe8856c58784d3bb981dd4ea9cf7b7068dec40d6ddff3bc5619b542ae37d91980f1c2f8a4a23d8fd326558c20718e76fd1f22e
-EBUILD opencc-1.1.1.ebuild 1647 BLAKE2B ddc71cae9fe727e7a466d008dd6e7d4174e9f8a7c213baf0902cf202312e9c14b35106375e08a9d8a9793cb6fe2cc51f3a862eb51819e9bade08c0c1fea867c8 SHA512 d26bce27b3bc48343622a1b91eab6ffd4aaa8a164a03d56312cbf191773b182bb8e76cf677c881f7581e37505db12f830e7d0fc7044b05ff2ade851b905dbb0b
-EBUILD opencc-9999.ebuild 1629 BLAKE2B 8fcc56601dc78f7205b0e05634922293ff480607c74a64cd7199a374f20ffa67b9bfd6af3491145cbe18463132a9b82b5503c7acf40fb644a64d4b3eef87ce33 SHA512 cfc6b67c69038b368354904e4e91ca6ceaf2bd4daf62470ec10a4ad3256a67df7945366a1ad80cfb4b7e639318e3614fd754a0f1b9702144bc8bd3ffbfdfe5a6
+EBUILD opencc-1.1.1.ebuild 1734 BLAKE2B 922fad745e8ae2e058745d015691af86a756ad2d8dbdce509d6f6e8a227acc15cf499066b72b644c36836e9afd219af0972e6d3699003dac04b554b209b3a44c SHA512 a5e721743864204fb4c6f3c866333f44869e527251e8083fee5c04d32330a9dafc567a6db37fd04b8911fb4a5680c0b534dff74a627aacb630ede1c8c500a79a
+EBUILD opencc-1.1.2.ebuild 1749 BLAKE2B 388b4c3191fe20b421f9ee2a1f2623afbd3bf89fb324c97c412652948295ac9268fb227be4213a04a2ea145abc76121e2de25f470ce29bda6e94196047b48c7b SHA512 05de975345746ca9441cf3af1c2d0ac62c377c70b0f687be39a0ad2168edbd8fd14c4d76bafef161414fe9be9b27e6ca7f9556bf85cfdb5df9166a179bc6a626
+EBUILD opencc-9999.ebuild 1535 BLAKE2B c28ffe1567ffeacfca976ba75b2b908cf262f7596df453427b3e1ca9e8662cf22b3842bad2a7a8799244ecedbfd9e3d809f5add4ee720993cec6961aa890a4cd SHA512 31270fd23ea40983a4559bca08e7179064a958f7e6115be1daf20e715189245d95934c7d11dc4ea63e046f20a9985ffde1258d8ad88b7afd234bbea117c1bae0
 MISC metadata.xml 623 BLAKE2B 5b03b8cb9509583d2d39733f07ae50953f022842dd8b109ee8470ffb869e1130efa76b0687529b9b05153bfa1ad9a806776703b246ff9b2f9108f86db0833797 SHA512 794b61c79fc56923c97a4909ec3ba51f2087322bc50879904295be41d9c3e8dc2048fd77f4519c7781ba9c9ac1fdcb1f7423ab5be1bba38968f8092c8f7431ac
diff --git a/app-i18n/opencc/files/opencc-1.1.2-system_libraries.patch b/app-i18n/opencc/files/opencc-1.1.2-system_libraries.patch
deleted file mode 100644
index e0b624a63e9f..000000000000
--- a/app-i18n/opencc/files/opencc-1.1.2-system_libraries.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-https://github.com/BYVoid/OpenCC/issues/547
-
---- /CMakeLists.txt
-+++ /CMakeLists.txt
-@@ -28,8 +28,14 @@
- option(ENABLE_GTEST "Build all tests." OFF)
- option(ENABLE_BENCHMARK "Build benchmark tests." OFF)
- option(ENABLE_DARTS "Build DartsDict (ocd format)." ON)
--option(BUILD_BUNDLED_LIBMARISA "" ON)
- option(BUILD_PYTHON "Build python library" OFF)
-+option(USE_SYSTEM_DARTS "Use system version of Darts" OFF)
-+option(USE_SYSTEM_GOOGLE_BENCHMARK "Use system version of Google Benchmark" OFF)
-+option(USE_SYSTEM_GTEST "Use system version of GoogleTest" OFF)
-+option(USE_SYSTEM_MARISA "Use system version of Marisa" OFF)
-+option(USE_SYSTEM_PYBIND11 "Use system version of pybind11" OFF)
-+option(USE_SYSTEM_RAPIDJSON "Use system version of RapidJSON" OFF)
-+option(USE_SYSTEM_TCLAP "Use system version of TCLAP" OFF)
- 
- ######## Package information
- set (PACKAGE_URL https://github.com/BYVoid/Opencc)
-@@ -173,7 +179,7 @@
- 
- ######## Dependencies
- 
--if(BUILD_BUNDLED_LIBMARISA)
-+if(NOT USE_SYSTEM_MARISA)
-   message(STATUS "Use bundled marisa library.")
-   add_subdirectory(deps/marisa-0.2.5)
- else()
-@@ -195,20 +201,30 @@
- ######## Testing
- 
- if (ENABLE_GTEST)
--  add_subdirectory(deps/gtest-1.11.0)
-+  if(NOT USE_SYSTEM_GTEST)
-+    add_subdirectory(deps/gtest-1.11.0)
-+  endif()
-   enable_testing()
- endif()
- 
- if (ENABLE_BENCHMARK)
-   set(BENCHMARK_ENABLE_TESTING OFF)
--  add_subdirectory(deps/google-benchmark)
-+  if(NOT USE_SYSTEM_GOOGLE_BENCHMARK)
-+    add_subdirectory(deps/google-benchmark)
-+  endif()
-   enable_testing()
- endif()
- 
- ######## Python
- 
- if (BUILD_PYTHON)
--  add_subdirectory(deps/pybind11-2.5.0)
-+  if(USE_SYSTEM_PYBIND11)
-+    include(pybind11Config)
-+    include(pybind11Common)
-+    include(pybind11Tools)
-+  else()
-+    add_subdirectory(deps/pybind11-2.5.0)
-+  endif()
-   pybind11_add_module(opencc_clib src/py_opencc.cpp)
-   target_link_libraries(opencc_clib PRIVATE libopencc)
- endif()
---- /src/CMakeLists.txt
-+++ /src/CMakeLists.txt
-@@ -1,7 +1,13 @@
- include (GenerateExportHeader)
--include_directories(../deps/marisa-0.2.5/include)
--include_directories(../deps/rapidjson-1.1.0)
--include_directories(../deps/tclap-1.2.2)
-+if(NOT USE_SYSTEM_MARISA)
-+  include_directories(../deps/marisa-0.2.5/include)
-+endif()
-+if(NOT USE_SYSTEM_RAPIDJSON)
-+  include_directories(../deps/rapidjson-1.1.0)
-+endif()
-+if(NOT USE_SYSTEM_TCLAP)
-+  include_directories(../deps/tclap-1.2.2)
-+endif()
- 
- # Library
- 
-@@ -72,7 +78,9 @@
- )
- 
- if (ENABLE_DARTS)
--  include_directories(../deps/darts-clone)
-+  if(NOT USE_SYSTEM_DARTS)
-+    include_directories(../deps/darts-clone)
-+  endif()
-   set(
-     LIBOPENCC_HEADERS
-     ${LIBOPENCC_HEADERS}
---- /test/CMakeLists.txt
-+++ /test/CMakeLists.txt
-@@ -1,4 +1,3 @@
--include_directories(../deps/libdarts/src)
- include_directories(../src)
- 
- set(CONFIG_TEST
-@@ -27,7 +26,9 @@
-     )
-   endif()
- 
--  include_directories(../deps/gtest-1.7.0/include)
-+  if(NOT USE_SYSTEM_GTEST)
-+    include_directories(../deps/gtest-1.7.0/include)
-+  endif()
-   set(UNITTESTS
-     CommandLineConvertTest
-   )
diff --git a/app-i18n/opencc/opencc-1.1.1.ebuild b/app-i18n/opencc/opencc-1.1.1.ebuild
index 896492a3195f..049871a65815 100644
--- a/app-i18n/opencc/opencc-1.1.1.ebuild
+++ b/app-i18n/opencc/opencc-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2010-2020 Gentoo Authors
+# Copyright 2010-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -33,8 +33,8 @@ DEPEND="dev-cpp/tclap
 	dev-libs/marisa:0=
 	dev-libs/rapidjson
 	test? (
-		dev-cpp/benchmark
 		dev-cpp/gtest
+		!hppa? ( !sparc? ( dev-cpp/benchmark ) )
 	)"
 RDEPEND="dev-libs/marisa:0="
 
@@ -62,7 +62,7 @@ src_configure() {
 
 	local mycmakeargs=(
 		-DBUILD_DOCUMENTATION=$(usex doc ON OFF)
-		-DENABLE_BENCHMARK=$(usex test 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
diff --git a/app-i18n/opencc/opencc-1.1.2.ebuild b/app-i18n/opencc/opencc-1.1.2.ebuild
new file mode 100644
index 000000000000..6411df9081ed
--- /dev/null
+++ b/app-i18n/opencc/opencc-1.1.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2010-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{3_7,3_8,3_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
+
+LICENSE="Apache-2.0"
+SLOT="0/1.1"
+KEYWORDS="~amd64 ~arm64 ~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-9999.ebuild b/app-i18n/opencc/opencc-9999.ebuild
index 877345405505..2bcf333bd7cf 100644
--- a/app-i18n/opencc/opencc-9999.ebuild
+++ b/app-i18n/opencc/opencc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2010-2020 Gentoo Authors
+# Copyright 2010-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -33,8 +33,8 @@ DEPEND="dev-cpp/tclap
 	dev-libs/marisa:0=
 	dev-libs/rapidjson
 	test? (
-		dev-cpp/benchmark
 		dev-cpp/gtest
+		!hppa? ( !sparc? ( dev-cpp/benchmark ) )
 	)"
 RDEPEND="dev-libs/marisa:0="
 
@@ -42,11 +42,6 @@ if [[ "${PV}" != "9999" ]]; then
 	S="${WORKDIR}/OpenCC-ver.${PV}"
 fi
 
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.0-parallel_build.patch"
-	"${FILESDIR}/${PN}-1.1.2-system_libraries.patch"
-)
-
 DOCS=(AUTHORS NEWS.md README.md)
 
 src_prepare() {
@@ -58,11 +53,9 @@ src_prepare() {
 }
 
 src_configure() {
-	local -x CXXFLAGS="${CXXFLAGS} -I${ESYSROOT}/usr/include/rapidjson"
-
 	local mycmakeargs=(
 		-DBUILD_DOCUMENTATION=$(usex doc ON OFF)
-		-DENABLE_BENCHMARK=$(usex test 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