gentoo resync : 18.08.2019

4 files changed, 103 insertions, 3 deletions

diff --git a/dev-libs/utfcpp/Manifest b/dev-libs/utfcpp/Manifest
index 8933b52f0398..d735502871b8 100644
--- a/dev-libs/utfcpp/Manifest
+++ b/dev-libs/utfcpp/Manifest
@@ -1,3 +1,6 @@
 DIST utf8_v2_3_4.zip 22422 BLAKE2B cf736876a99068c7e5cb1b0b892d1d63cb38906c993c60b78c8c5625aef86fac3a849551771d0840c3cccf04f1a3617216cbd4684fa5cdde0037e3901c70ff4b SHA512 0e85e443e7bd4ecbe85dedfb7bdf8b1767808108b3a4fc1c0c508bcf74787539ae0af95a31a70e715ca872689ac4d7233afc075ceb375375d26743f92051e222
+DIST utfcpp-3.1.tar.gz 25871 BLAKE2B 6bafb933b777e842375b3dc6b1b5bc41efb0e9f40bbd33ccbbaf07b57a28c4e485d596725297fc2de83c23fa3c66872519883727714d236f4a37e07ed4825fc9 SHA512 826ac7aa61215ac2144fa3f5edc7f291c3dd25dc69b0c82526840f4651f822515ec262915e1117d975e5c5dd729f6166806a5d397262f59a2b323eb7009671f5
 EBUILD utfcpp-2.3.4.ebuild 537 BLAKE2B cceb94f796696ab61bc98cf7ee4f601a0b2a2c528aed81d89ab3cae6f626868c1f33703e6e19785f35c9bf080716580764dd6f6b68a1a6ae7ace9264e1ed9c5d SHA512 5ab92460e7cc22c0d19c78a4632d12eaff02b9c2e0f985ab86dceefb3d73235012a7c037907d42ee956532d160a9775021d2c5c7cc5ffdb9aac2c834c395a4b0
-MISC metadata.xml 241 BLAKE2B bebf9b2f9e4975ea533d4cd1d684f5b702b6f3ec3535623cb53ae32dc4dadc2d753f8ad0f010125ce7228c7d7faf358856a7098f498ef7eaf954f83c9c36232e SHA512 863bee3a93ff22253bbb40c46dc65adbb4cedcef5ab478971cdaba2ab152d0e4490e0d987805622c3c4d2f937852187d6cd42e9524995563d8c91e6192d58100
+EBUILD utfcpp-3.1.ebuild 946 BLAKE2B c72550954ecda684130ac539d566dd3b1cecc26f653302a54b28cf64fdd02716ddf278654c86ff47eba1e8156a89a33267e605660c8a21c9a8f7a1228dfef6c4 SHA512 5128f79915aa8924b6e82f75dfc2faf71a0e34803a55bf88df5af04f59e8ffd79edaf4b94f0355ee6b36f6f274c51dfa1f497bcf83c7f51e1824a0a1bbc31812
+EBUILD utfcpp-9999.ebuild 916 BLAKE2B 8a7a1e05ae84fbb8d875e0b7fb0558cfc0c9835090b0253343648d6d9c1833724f99de9b64702d1976a89f93bfdb38f36cf7c41979e73cae9a39bdf66338f5d0 SHA512 e7d512b80328c68fd6037d08796ea88ffabaf903d18e33ebed26253f03c5cdd02c050450a38980e23d83356c3bb30f90ecdba1c8125fb86f877c846c4bb33b01
+MISC metadata.xml 352 BLAKE2B 4ffd4d4fed2363f01b91b53dd2e869b6c49aa0bbddc249e7525b064df74e51528c193a5a987880ca2a3d20a13eba774498d220181d4f55ae262c8ac0e2867083 SHA512 bcd0d5ab729af171d91a6147ff7437f1627638a7d1f4e0c6501aaf6269d9912bca3ee8666dadd1d7037f06850468a40952ba97d572bcf846c38ac7b9273e6cad
diff --git a/dev-libs/utfcpp/metadata.xml b/dev-libs/utfcpp/metadata.xml
index 162dbab4fe24..433cf52c3011 100644
--- a/dev-libs/utfcpp/metadata.xml
+++ b/dev-libs/utfcpp/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
+	<maintainer type="person">
+		<email>arfrever.fta@gmail.com</email>
+		<name>Arfrever Frehtes Taifersar Arahesis</name>
+	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">utfcpp</remote-id>
+		<remote-id type="github">nemtrif/utfcpp</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/utfcpp/utfcpp-3.1.ebuild b/dev-libs/utfcpp/utfcpp-3.1.ebuild
new file mode 100644
index 000000000000..9bd3480908d9
--- /dev/null
+++ b/dev-libs/utfcpp/utfcpp-3.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2015-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit cmake-utils
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/nemtrif/utfcpp"
+	EGIT_SUBMODULES=()
+fi
+
+DESCRIPTION="UTF-8 C++ library"
+HOMEPAGE="https://github.com/nemtrif/utfcpp"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/nemtrif/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND=""
+DEPEND="test? ( dev-cpp/gtest )"
+RDEPEND=""
+
+src_prepare() {
+	sed -e "/add_subdirectory(extern\/gtest)/d" -i CMakeLists.txt || die
+	sed -e "s/gtest_main/gtest &/" -i tests/CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUTF8_SAMPLES=OFF
+		-DUTF8_TESTS=$(usex test ON OFF)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/utfcpp/utfcpp-9999.ebuild b/dev-libs/utfcpp/utfcpp-9999.ebuild
new file mode 100644
index 000000000000..2b6fa17b5966
--- /dev/null
+++ b/dev-libs/utfcpp/utfcpp-9999.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2015-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit cmake-utils
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/nemtrif/utfcpp"
+	EGIT_SUBMODULES=()
+fi
+
+DESCRIPTION="UTF-8 C++ library"
+HOMEPAGE="https://github.com/nemtrif/utfcpp"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/nemtrif/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND=""
+DEPEND="test? ( dev-cpp/gtest )"
+RDEPEND=""
+
+src_prepare() {
+	sed -e "/add_subdirectory(extern\/gtest)/d" -i CMakeLists.txt || die
+	sed -e "s/gtest_main/gtest &/" -i tests/CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUTF8_SAMPLES=OFF
+		-DUTF8_TESTS=$(usex test ON OFF)
+	)
+
+	cmake-utils_src_configure
+}