gentoo resync : 15.01.2020

4 files changed, 17 insertions, 19 deletions

diff --git a/net-proxy/trojan/Manifest b/net-proxy/trojan/Manifest
index 2936d5dee0ee..50d1e285b528 100644
--- a/net-proxy/trojan/Manifest
+++ b/net-proxy/trojan/Manifest
@@ -2,7 +2,7 @@ AUX trojan.initd 539 BLAKE2B 1dcca22a0647d109928570ab58780237a67bf5bd5952da6a0e6
 DIST trojan-1.10.0.tar.gz 38230 BLAKE2B 2cfa77ebfbae62edef983d1e57e3ce00a61118f6458cab353af60960e2586750fcd0c4237631481cfdfc8ed0ddad586e1d649046269c7e9177594869c187d8d1 SHA512 9d9a74218369f8094b292b8892e5f877ccec7d8912657491bb37da8e9ae4817f07a83fe401e33bbbdd2ac9c50c1440f3a021f93d85999b43df4849b0a04049cf
 DIST trojan-1.12.3.tar.gz 41786 BLAKE2B f6306210a46316906b919fefb245a7c379ddcf785513bfbc3b8fc6a9c78e1c8cf22069533f58086fb4ffad05b625ab2b2fcacf2256520833ea49c0f307cee296 SHA512 f59afa28446dfef8680d7530aaff3609566b2873416bb11f8981ef111f63ed8deeacb2093373012547ede02dfb9beb8d92655b8f9ebafd6012c45b3ce787c22f
 DIST trojan-1.13.0.tar.gz 44579 BLAKE2B 87aba58687fa5f42385893b8d919a46428b7d3cdbd2da38ee3e96900c11a6a3df7778c2a54295d5abb1964991d2d30433c4b37e70a9ca4ba184005d338bbed74 SHA512 5904ff75d348e9ccdd451836b1b05df6736e22530643d67a192e393fe32623576e0bbc106c883b6bc32daa2a086d5a7e42f836d684b66fc0deca019b14e3b3ab
-EBUILD trojan-1.10.0.ebuild 1024 BLAKE2B 37744644fa8f9e38d54cdc08cbaf6174676e7b6fdc8521c62b403048fc827c62eb2fe8b9f611195a55463626d69835641c2245ebabf645dcfea46e185f2de662 SHA512 306cb838df2d05604940c1c519865829e3eb65a78e87df80b248cf93eb8d4628a69f65460cdf5e8537ef9f2622cae960bbfd0b4c82491fe369e477959283a118
-EBUILD trojan-1.12.3.ebuild 1021 BLAKE2B 14122028ed5d2eaed5b8ceeb702119efffb1864a7b09f7db43501ca546c100dad1c666502ca159a371415d912f4352066c6a1a71acc249a2f68520fca63ae6dc SHA512 86108b7321ae1bb4bc5fed94196f463fbbaafa58cea4a4c5003d84aa5947b01d547d266b8e9496326ce3f6eb78f1197ae6329f774f21337723597b55e50721b6
-EBUILD trojan-1.13.0.ebuild 1051 BLAKE2B e8819727464ad71d189a1a00c5018bd47f359c2001a716416a75df343ce6159f54b9b782ee169a75e08af0b1e46cfe65ce70cea657fef99a5499345a9f2dffb9 SHA512 e44ccfa4df33fe4bb5feb469b6df79cacde8bd6fc1bcb7e60eb12eb4619230d7560bade30008ae3357dcd70e2b0063d990a551fdacebc4981c1d40761dc310b4
+EBUILD trojan-1.10.0.ebuild 1017 BLAKE2B 7f946e5d93d6637a0de5850b97c841abb5053eae85d4edf539a63779670c643507463c71ffe23d9b56ebac04dee2a674324fe1da9ed5dc98dee6c2a86bb6ee25 SHA512 1058ceedc28c35f385352db9fb63c3b9ad566c2d24b2cfd7233ac48e801b9adc968d91fe79b62fa7eee49f5fbc46299062a2cadecdca7501bf0295ee886808ca
+EBUILD trojan-1.12.3.ebuild 952 BLAKE2B 29b89597e886409b80feb112edb8446d594d8b54a097f75c5bd3e4c9fd6cc946bf96bc8c51644006f134aae370692f6e0a1c5ecfd47f0e078a66c09353011ccf SHA512 a755aabb7cadf51614069261bc8026a5a2cb264df654d9b9b0bf04f8beadc0cecff9f3df7d6f4b5e2cef10356470242c4b31c56ba4e5b5eb9b6adfbcd7f05f09
+EBUILD trojan-1.13.0.ebuild 982 BLAKE2B ede4d5b6092f26415ebe3b4648a17c45414f945cdf7240eccd4b8568e12e0bbcfa3c0840e0f59606979a43bff606969c72ecaad5bc39103e316bb4872a3447d9 SHA512 18df4cf86d54b8566144cba94906f082b2841a2147756537b21fcaabb37d87dd1f66378420d0d098a7f819631394c1d36c5c8cff0d949ae0d98699bcfb524d4e
 MISC metadata.xml 1023 BLAKE2B cea392d59eea944198e523e0dfdab0325180568d9f3f39e40fc7c94c43a1c8b9811e787da5174f4f0b85d932778b34dcf4a07afccc4cf02972de57e7a3004ad4 SHA512 b1a1a6bdb8ea7d62bce25a439753c85e5e340be804ac8a71a3fbbd4f671270c174f9db77b72c2d00cdc1ede7cea6f7a86d2401e6cb8c8f9e395573c9216dfa4b
diff --git a/net-proxy/trojan/trojan-1.10.0.ebuild b/net-proxy/trojan/trojan-1.10.0.ebuild
index cda661f9eaff..cca6f739ed10 100644
--- a/net-proxy/trojan/trojan-1.10.0.ebuild
+++ b/net-proxy/trojan/trojan-1.10.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit cmake-utils python-any-r1 systemd
 
diff --git a/net-proxy/trojan/trojan-1.12.3.ebuild b/net-proxy/trojan/trojan-1.12.3.ebuild
index e394deff72a0..a380f99123e8 100644
--- a/net-proxy/trojan/trojan-1.12.3.ebuild
+++ b/net-proxy/trojan/trojan-1.12.3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
-inherit cmake-utils python-any-r1 systemd
+inherit cmake python-any-r1 systemd
 
 DESCRIPTION="An unidentifiable mechanism that helps you bypass GFW"
 HOMEPAGE="https://github.com/trojan-gfw/${PN}"
@@ -32,16 +32,15 @@ src_configure() {
 		-DENABLE_MYSQL=$(usex mysql)
 		-DSYSTEMD_SERVICE=ON
 		-DSYSTEMD_SERVICE_PATH=$(systemd_get_systemunitdir)
-		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	newinitd "${FILESDIR}/trojan.initd" trojan
 }
 
 src_test() {
-	cmake-utils_src_test -j1
+	cmake_src_test -j1
 }
diff --git a/net-proxy/trojan/trojan-1.13.0.ebuild b/net-proxy/trojan/trojan-1.13.0.ebuild
index 64ae38797920..aa4fa9f95beb 100644
--- a/net-proxy/trojan/trojan-1.13.0.ebuild
+++ b/net-proxy/trojan/trojan-1.13.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
-inherit cmake-utils python-any-r1 systemd
+inherit cmake python-any-r1 systemd
 
 DESCRIPTION="An unidentifiable mechanism that helps you bypass GFW"
 HOMEPAGE="https://github.com/trojan-gfw/trojan"
@@ -33,16 +33,15 @@ src_configure() {
 		-DENABLE_MYSQL=$(usex mysql)
 		-DSYSTEMD_SERVICE=ON
 		-DSYSTEMD_SERVICE_PATH=$(systemd_get_systemunitdir)
-		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	newinitd "${FILESDIR}/trojan.initd" trojan
 }
 
 src_test() {
-	cmake-utils_src_test -j1
+	cmake_src_test -j1
 }