gentoo Easter resync : 12.04.2020

7 files changed, 48 insertions, 106 deletions

diff --git a/net-proxy/trojan/Manifest b/net-proxy/trojan/Manifest
index 3b834a60870e..6691cca64309 100644
--- a/net-proxy/trojan/Manifest
+++ b/net-proxy/trojan/Manifest
@@ -1,10 +1,6 @@
-AUX trojan.initd 539 BLAKE2B 1dcca22a0647d109928570ab58780237a67bf5bd5952da6a0e68cc4b8d75348b392ea309beddda64e3f00619f3ce2744a29445794338c406b50b28cd44687fcd SHA512 d032f840d2e3dc0a9f3fe92d40aad3946a9c70217c673ecb89a9da8bf14fa9c4e764431534f63edf70d38fed293903aa8a298af474ddc8343e10d169855d81e6
-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
+AUX trojan.initd 753 BLAKE2B a0dab04f6abe08a00bfcf4e8eb2f7c2f1368e346c485d5ccec40f9aeb798ee9e3b838ac06b98d252a9823f3ad96d798fec193791c042c041b49999cd0e46fa08 SHA512 73e84faa009436215793a39e19f5664bc7b1ddcd9d82a205b98ff16378f13cfc1dfb4380ab58804cbae988b7796b51149c11c4cd227ee0e4b15a6ca68e888b7f
 DIST trojan-1.14.1.tar.gz 45884 BLAKE2B 2498476f7e1a2190e21d85b2572fbc91a77b50f9f2adc2d3c3c5cef2554da17f322fbdb23232a55c66c38a4f680175f5c2aa87cefc25853b2007de4bb8bac84d SHA512 c8fcdae584e742d958c896e3a18605f22073341a8227a1d7cb116e9f2ddadd6e5007bfe40ff765d564f8659cd9e9d11731d95a5c74459b0698cc48dac49ead19
-EBUILD trojan-1.10.0.ebuild 1018 BLAKE2B 06f93c7c4672a215fcc139a17b2f17ce6d5eec88b11d598d7409db5000f11bf91ed1159a17df95b836a94602a7eaf686b1b3e2afaf98cd0478f9844ef9bfa2ca SHA512 50d3b4acd48770c5b4ebd19aec6f69c75b1c44ee0bdc1958cec7d67eea9834ce6edfc9483c802b24728babdbee19e97201335aa7bf697984316221f47d9bbb7e
-EBUILD trojan-1.12.3.ebuild 953 BLAKE2B 90151ee22e7c2f4cbe748ba3cbb450dcab5a1fbd7d85c121a939e3bd38e451e7800d37b9bf6590ce2c1ef9b49461e8fed272812d657c1a9e1e006f7fdde13fcd SHA512 1dea01ddce5a14f536f0abdd9ba2da7450a92c773045714fb024870dfcfa31a71a38feef35c86715f75f7655cea86c7c699887cd8d66e51155117d465ab6d361
-EBUILD trojan-1.13.0.ebuild 982 BLAKE2B ede4d5b6092f26415ebe3b4648a17c45414f945cdf7240eccd4b8568e12e0bbcfa3c0840e0f59606979a43bff606969c72ecaad5bc39103e316bb4872a3447d9 SHA512 18df4cf86d54b8566144cba94906f082b2841a2147756537b21fcaabb37d87dd1f66378420d0d098a7f819631394c1d36c5c8cff0d949ae0d98699bcfb524d4e
-EBUILD trojan-1.14.1.ebuild 982 BLAKE2B ede4d5b6092f26415ebe3b4648a17c45414f945cdf7240eccd4b8568e12e0bbcfa3c0840e0f59606979a43bff606969c72ecaad5bc39103e316bb4872a3447d9 SHA512 18df4cf86d54b8566144cba94906f082b2841a2147756537b21fcaabb37d87dd1f66378420d0d098a7f819631394c1d36c5c8cff0d949ae0d98699bcfb524d4e
-MISC metadata.xml 1023 BLAKE2B cea392d59eea944198e523e0dfdab0325180568d9f3f39e40fc7c94c43a1c8b9811e787da5174f4f0b85d932778b34dcf4a07afccc4cf02972de57e7a3004ad4 SHA512 b1a1a6bdb8ea7d62bce25a439753c85e5e340be804ac8a71a3fbbd4f671270c174f9db77b72c2d00cdc1ede7cea6f7a86d2401e6cb8c8f9e395573c9216dfa4b
+DIST trojan-1.15.1.tar.gz 48121 BLAKE2B 38f288d8b9a6c7a98ada85b6b2dd2448604f54068334380c2e6b49d6ee015a1fad2847747734ef1e670d201d9625e64859ccddde5b924ea09c4e87e206997431 SHA512 5e0dfb46116b9de54f5d4e6d0646ab5ba3746143c5ad0f275c894929ba7fc840cacb187e514bbfaa770f0651fc4d3ff9e662f648f515a972ddf72ad0e93d616f
+EBUILD trojan-1.14.1.ebuild 1318 BLAKE2B 82970b3afbef707e54a9f4612a8632edff3ecbcece6658537e6930a65eee8aadee14e413436f123108949c50378a41f4e88dc718e272fb8157bd11e1df144adc SHA512 fb2938164b0be2248b0143d6d3b67ea434aa973e72bda6bdc1a0dbfc3edb7844ebdd05004183306c21c26336bf9187022283ccf9e6d13be2ef55fc3b9e7e958f
+EBUILD trojan-1.15.1.ebuild 1318 BLAKE2B 82970b3afbef707e54a9f4612a8632edff3ecbcece6658537e6930a65eee8aadee14e413436f123108949c50378a41f4e88dc718e272fb8157bd11e1df144adc SHA512 fb2938164b0be2248b0143d6d3b67ea434aa973e72bda6bdc1a0dbfc3edb7844ebdd05004183306c21c26336bf9187022283ccf9e6d13be2ef55fc3b9e7e958f
+MISC metadata.xml 1124 BLAKE2B 0d11d3625f824da33597ff489cb1170cac018279c80ce230c0b0233c7bc1e19a279adbea4f2aa9d83077ac8359d37714326dddb3c8f7f8503dbc9e17857a08d5 SHA512 2c912d390ff5483dc5458ff887958e259bdd6897754a3374d5d978729b692d0fc99768bd12975dc6c9e44b4080046914d9f55bc67045f68e792e2712cc513f30
diff --git a/net-proxy/trojan/files/trojan.initd b/net-proxy/trojan/files/trojan.initd
index cee794ad4d72..2990245430db 100644
--- a/net-proxy/trojan/files/trojan.initd
+++ b/net-proxy/trojan/files/trojan.initd
@@ -1,10 +1,17 @@
 #!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-TJ_CONFIG="/etc/trojan/config.json"
-TJ_PIDFILE="/run/trojan.pid"
-TJ_LOG="/var/log/trojan.log"
+TJ_NAME=${SVCNAME##*.}
+if [ -n "${TJ_NAME}" -a "${SVCNAME}" != "trojan" ]; then
+	TJ_PIDFILE="/run/trojan.${TJ_NAME}.pid"
+	TJ_CONFIG="/etc/trojan/${TJ_NAME}.json"
+	TJ_LOG="/var/log/trojan.${TJ_NAME}.log"
+else
+	TJ_PIDFILE="/run/trojan.pid"
+	TJ_CONFIG="/etc/trojan/config.json"
+	TJ_LOG="/var/log/trojan.log"
+fi
 
 depend() {
 	need net
diff --git a/net-proxy/trojan/metadata.xml b/net-proxy/trojan/metadata.xml
index 9b97efd6cb49..097dc1718605 100644
--- a/net-proxy/trojan/metadata.xml
+++ b/net-proxy/trojan/metadata.xml
@@ -5,6 +5,10 @@
 		<email>yangmame@icloud.com</email>
 		<name>Xin Yang</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>dlan@gentoo.org</email>
+		<name>Yixun Lan</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/net-proxy/trojan/trojan-1.10.0.ebuild b/net-proxy/trojan/trojan-1.10.0.ebuild
deleted file mode 100644
index 9926cef05ccd..000000000000
--- a/net-proxy/trojan/trojan-1.10.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit cmake-utils python-any-r1 systemd
-
-DESCRIPTION="An unidentifiable mechanism that helps you bypass GFW"
-HOMEPAGE="https://github.com/trojan-gfw/trojan"
-SRC_URI="https://github.com/trojan-gfw/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="mysql test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/boost-1.54.0:=
-	>=dev-libs/openssl-1.0.2:=
-	mysql? ( dev-db/mysql-connector-c:= )
-"
-DEPEND="
-	${RDEPEND}
-	test? ( net-misc/curl ${PYTHON_DEPS} )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_MYSQL=$(usex mysql)
-		-DSYSTEMD_SERVICE=ON
-		-DSYSTEMD_SERVICE_PATH=$(systemd_get_systemunitdir)
-		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	newinitd "${FILESDIR}/trojan.initd" trojan
-}
-
-src_test() {
-	cmake-utils_src_test -j1
-}
diff --git a/net-proxy/trojan/trojan-1.12.3.ebuild b/net-proxy/trojan/trojan-1.12.3.ebuild
deleted file mode 100644
index 5a088c7f2987..000000000000
--- a/net-proxy/trojan/trojan-1.12.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit cmake python-any-r1 systemd
-
-DESCRIPTION="An unidentifiable mechanism that helps you bypass GFW"
-HOMEPAGE="https://github.com/trojan-gfw/trojan"
-SRC_URI="https://github.com/trojan-gfw/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="mysql test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/boost-1.66.0:=
-	>=dev-libs/openssl-1.0.2:=
-	mysql? ( dev-db/mysql-connector-c:= )
-"
-DEPEND="
-	${RDEPEND}
-	test? ( net-misc/curl ${PYTHON_DEPS} )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_MYSQL=$(usex mysql)
-		-DSYSTEMD_SERVICE=ON
-		-DSYSTEMD_SERVICE_PATH=$(systemd_get_systemunitdir)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	newinitd "${FILESDIR}/trojan.initd" trojan
-}
-
-src_test() {
-	cmake_src_test -j1
-}
diff --git a/net-proxy/trojan/trojan-1.14.1.ebuild b/net-proxy/trojan/trojan-1.14.1.ebuild
index aa4fa9f95beb..21f494f1364d 100644
--- a/net-proxy/trojan/trojan-1.14.1.ebuild
+++ b/net-proxy/trojan/trojan-1.14.1.ebuild
@@ -45,3 +45,17 @@ src_install() {
 src_test() {
 	cmake_src_test -j1
 }
+
+pkg_postinst() {
+	elog "Running Trojan with multi instances"
+	elog ""
+
+	elog "Prepare /etc/trojan/\${blah}.json first"
+	elog "Config with Openrc"
+	elog "   ln -s /etc/init.d/trojan{,.\${blah}}"
+	elog "   rc-update add trojan.\${blah} default"
+	elog ""
+	elog "Config with Systemd"
+	elog "   systemctl enable trojan.\${blah}"
+	elog ""
+}
diff --git a/net-proxy/trojan/trojan-1.13.0.ebuild b/net-proxy/trojan/trojan-1.15.1.ebuild
index aa4fa9f95beb..21f494f1364d 100644
--- a/net-proxy/trojan/trojan-1.13.0.ebuild
+++ b/net-proxy/trojan/trojan-1.15.1.ebuild
@@ -45,3 +45,17 @@ src_install() {
 src_test() {
 	cmake_src_test -j1
 }
+
+pkg_postinst() {
+	elog "Running Trojan with multi instances"
+	elog ""
+
+	elog "Prepare /etc/trojan/\${blah}.json first"
+	elog "Config with Openrc"
+	elog "   ln -s /etc/init.d/trojan{,.\${blah}}"
+	elog "   rc-update add trojan.\${blah} default"
+	elog ""
+	elog "Config with Systemd"
+	elog "   systemctl enable trojan.\${blah}"
+	elog ""
+}