gentoo resync : 25.11.2020

5 files changed, 151 insertions, 50 deletions

diff --git a/app-i18n/opencc/Manifest b/app-i18n/opencc/Manifest
index 96f1cf888566..7282cd5a38e9 100644
--- a/app-i18n/opencc/Manifest
+++ b/app-i18n/opencc/Manifest
@@ -1,6 +1,8 @@
 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
-EBUILD opencc-1.0.5.ebuild 1025 BLAKE2B b9c774d3cfed6c15a2e73d37a7dd2482c0ba5563a842485985cf5e1e8daa4c30d8567482de35c553d6834e1bfd969a2dc83da365cbe986f35d0b7c29beb8c9d7 SHA512 c2f1712eb26ddf53b56f9250dc318293e1389aa1ee7179212f61725344e92d88dae8afb1563e13adb4f563881874cc6a659c0b1fd55e81ca0cc9b750c120057e
-EBUILD opencc-9999.ebuild 989 BLAKE2B 56348d3d7b5365fa1143bd26c86d06f45870b347a3700c72200d6e6ae0bb3f9bf50e830d5456cf004edd249e8edc45663f49d858eab3a323aa752070f4bc921f SHA512 b15870c21c474a4af87e0a8a9cb96f2f6f92c398d93050f345c84e5acb0fed31c68cc9616dedcde57dd892c1839d5d8c9d73d7c04617160aca3902c8e644954c
-MISC metadata.xml 491 BLAKE2B ec523a795afb6ae99cc5835e3df9fe07916aac4bf8552254f3bacbb9e1764a3ba5a79eddcabd8f34417544709a10a0bd34e6133a01b9b7a15156a9d282316d86 SHA512 303cf35b932c5d5a1fdd1a25b2c71a65a4aab761fe3c66d72439d691255a5edd1b943287afe8b4c53ab62531a012dafb5f416471a172f5b487557684dc6655df
+DIST opencc-1.0.6.tar.gz 1621561 BLAKE2B d58ee0e04e133fbf6a7632788bcaf0f7891bb74051a970075f6d94b048adfec7bbe4438913933d7dfdd4d58ec2c1a5ec47685415c26532ddd8c13e8abd52cab6 SHA512 67c7bb7432483c1781701dc64ff28e4d5750898ed3d2d41f97d3782918b5f9aa1a49baa1e3a58e4b24cfbd2adcf9ea166a05ad934221fb1cb7afb35e909749e7
+EBUILD opencc-1.0.5.ebuild 1379 BLAKE2B c1a62bbb0971d538154cf525af4ff8d9a8becb59a701d663f2bcfe0f77db900eb18224c379bb7df46a472a27124a1db225c817838784cd917a9cb933e410c045 SHA512 9be51d5871bbd0bad6db8bb1cb4f6e58326ed4b9060add48eec76069f79dfdf2152171bc731712d03342f0c62b11fa4ccc7a8e60c95aa87da55067115c21a0d8
+EBUILD opencc-1.0.6.ebuild 1354 BLAKE2B 948b8d384e4f9af810005a1e44209def5977ebcee6b0ebaeb208b39790f91aa821f63a79c725999a785fdd197fceabf6372bce1f05de4512fb74719aa4fbed88 SHA512 e2537586767a47fbbb22101e9ba22ef45742381fd9f6845b09804bb723407a5578cec62601fae79c4a463bcab339e9adce99179507290c6d67546fa999e873e6
+EBUILD opencc-9999.ebuild 1380 BLAKE2B 4e4301a0b1927025ec88bbe3162895782ff3f49e6a1d6ecc1cb69a60a157838c6848db288d53949a5a8ab1da313972f8d28359676628eb8bec68c4540ea784bd SHA512 50141301b91df838a7833d18d7df5d27266f071ca6e80f8621f4856fc9912f1db6f4d6f725d37ad5cf47b4ea41dc70456c7eec1ed10bd2f5de628826bf386256
+MISC metadata.xml 609 BLAKE2B 033d770cab9cbc02a2e50b414ec469089f6864826f0bc7f969b19552303aec84d540b0b748770b43e61ec4ff5aa5f946c292e587a8ea144d2e16de70bda8669d SHA512 73432bae21dfaa03db07de30b15aa5417b25b7d9a6b886b595652f2fbde2d505367236164f6e01ff4cab31e967aaea9d2b30f636a28aacc2cb167c51e2535626
diff --git a/app-i18n/opencc/metadata.xml b/app-i18n/opencc/metadata.xml
index 377bdc587a2d..b53d22485f11 100644
--- a/app-i18n/opencc/metadata.xml
+++ b/app-i18n/opencc/metadata.xml
@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-  <longdescription lang="en">
-    OpenCC is a library for converting characters and phrases between
-    Traditional Chinese and Simplified Chinese.
-  </longdescription>
-  <upstream>
-    <remote-id type="github">BYVoid/OpenCC</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>arfrever.fta@gmail.com</email>
+		<name>Arfrever Frehtes Taifersar Arahesis</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<longdescription lang="en">
+		OpenCC is a library for converting characters and phrases between
+		Traditional Chinese and Simplified Chinese.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">BYVoid/OpenCC</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/opencc/opencc-1.0.5.ebuild b/app-i18n/opencc/opencc-1.0.5.ebuild
index 63d6cf51df70..791c79b18315 100644
--- a/app-i18n/opencc/opencc-1.0.5.ebuild
+++ b/app-i18n/opencc/opencc-1.0.5.ebuild
@@ -1,48 +1,64 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 2010-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
+PYTHON_COMPAT=(python{3_7,3_8,3_9})
 
-inherit cmake-utils
+inherit cmake python-any-r1
 
 if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 
 	EGIT_REPO_URI="https://github.com/BYVoid/OpenCC"
-else
-	inherit vcs-snapshot
-
-	SRC_URI="https://github.com/BYVoid/${PN^^[oc]}/archive/ver.${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
-DESCRIPTION="Libraries for conversion between Traditional and Simplified Chinese"
+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"
+# 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 )"
 
-DEPEND="doc? ( app-doc/doxygen )"
+BDEPEND="${PYTHON_DEPS}
+	doc? ( app-doc/doxygen )"
+DEPEND=""
+RDEPEND=""
+
+if [[ "${PV}" != "9999" ]]; then
+	S="${WORKDIR}/OpenCC-ver.${PV}"
+fi
 
-DOCS="AUTHORS *.md"
 PATCHES=(
-	"${FILESDIR}"/${PN}-test.patch
-	"${FILESDIR}"/${PN}-stop-copy.patch
+	"${FILESDIR}/${PN}-test.patch"
+	"${FILESDIR}/${PN}-stop-copy.patch"
 )
 
+DOCS=(AUTHORS NEWS.md README.md)
+
 src_prepare() {
-	sed -i "s|\${DIR_SHARE_OPENCC}/doc|share/doc/${PF}|" doc/CMakeLists.txt
+	cmake_src_prepare
 
-	cmake-utils_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)
+		-DBUILD_DOCUMENTATION=$(usex doc ON OFF)
 		-DBUILD_SHARED_LIBS=ON
-		-DENABLE_GTEST=$(usex test)
+		-DENABLE_GTEST=$(usex test ON OFF)
 	)
-	cmake-utils_src_configure
+
+	cmake_src_configure
 }
diff --git a/app-i18n/opencc/opencc-1.0.6.ebuild b/app-i18n/opencc/opencc-1.0.6.ebuild
new file mode 100644
index 000000000000..70b4f7a65c7b
--- /dev/null
+++ b/app-i18n/opencc/opencc-1.0.6.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2010-2020 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
+
+# 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}-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-9999.ebuild b/app-i18n/opencc/opencc-9999.ebuild
index 0b47d39a633a..8a1dbc501c8b 100644
--- a/app-i18n/opencc/opencc-9999.ebuild
+++ b/app-i18n/opencc/opencc-9999.ebuild
@@ -1,48 +1,64 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2010-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
+PYTHON_COMPAT=(python{3_7,3_8,3_9})
 
-inherit cmake-utils
+inherit cmake python-any-r1
 
 if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 
 	EGIT_REPO_URI="https://github.com/BYVoid/OpenCC"
-else
-	inherit vcs-snapshot
-
-	SRC_URI="https://github.com/BYVoid/${PN^^[oc]}/archive/ver.${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
-DESCRIPTION="Libraries for conversion between Traditional and Simplified Chinese"
+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"
+# OpenCC: Apache-2.0
+# deps/darts-clone: BSD-2
+# deps/gtest-1.11.0: BSD
+# deps/marisa-0.2.5: || ( BSD-2 LGPL-2.1+ )
+# deps/rapidjson-1.1.0: MIT
+# deps/tclap-1.2.2: MIT
+LICENSE="Apache-2.0 BSD-2 MIT || ( BSD-2 LGPL-2.1+ ) test? ( BSD )"
 SLOT="0/2"
 KEYWORDS=""
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
-DEPEND="doc? ( app-doc/doxygen )"
+BDEPEND="${PYTHON_DEPS}
+	doc? ( app-doc/doxygen )"
+DEPEND=""
+RDEPEND=""
+
+if [[ "${PV}" != "9999" ]]; then
+	S="${WORKDIR}/OpenCC-ver.${PV}"
+fi
 
-DOCS="AUTHORS *.md"
 PATCHES=(
-	"${FILESDIR}"/${PN}-test.patch
-	"${FILESDIR}"/${PN}-stop-copy.patch
+	"${FILESDIR}/${PN}-stop-copy.patch"
 )
 
+DOCS=(AUTHORS NEWS.md README.md)
+
 src_prepare() {
-	sed -i "s|\${DIR_SHARE_OPENCC}/doc|share/doc/${PF}|" doc/CMakeLists.txt
+	cmake_src_prepare
 
-	cmake-utils_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)
+		-DBUILD_DOCUMENTATION=$(usex doc ON OFF)
 		-DBUILD_SHARED_LIBS=ON
-		-DENABLE_GTEST=$(usex test)
+		-DENABLE_GTEST=$(usex test ON OFF)
 	)
-	cmake-utils_src_configure
+
+	cmake_src_configure
 }