[gentoo-commits] repo/gentoo:master commit in: profiles/, net-proxy/trojan/files/, net-proxy/trojan/

[Michał Górny]

commit:     187ac04d251f28c762e2fced73446a67064957f2
Author:     YangMame <me <AT> yangmame <DOT> org>
AuthorDate: Tue Apr 16 16:49:47 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun May 26 09:43:25 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=187ac04d

net-proxy/trojan: version bump to 1.12.2

Signed-off-by: Xin Yang <yangmame <AT> icloud.com>
Closes: https://github.com/gentoo/gentoo/pull/11540
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 net-proxy/trojan/Manifest             |  1 +
 net-proxy/trojan/files/trojan.initd   |  2 +-
 net-proxy/trojan/trojan-1.12.2.ebuild | 47 +++++++++++++++++++++++++++++++++++
 profiles/package.mask                 |  1 +
 4 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/net-proxy/trojan/Manifest b/net-proxy/trojan/Manifest
index a98743f222c..d1d3c306277 100644
--- a/net-proxy/trojan/Manifest
+++ b/net-proxy/trojan/Manifest
@@ -1 +1,2 @@
 DIST trojan-1.10.0.tar.gz 38230 BLAKE2B 2cfa77ebfbae62edef983d1e57e3ce00a61118f6458cab353af60960e2586750fcd0c4237631481cfdfc8ed0ddad586e1d649046269c7e9177594869c187d8d1 SHA512 9d9a74218369f8094b292b8892e5f877ccec7d8912657491bb37da8e9ae4817f07a83fe401e33bbbdd2ac9c50c1440f3a021f93d85999b43df4849b0a04049cf
+DIST trojan-1.12.2.tar.gz 41742 BLAKE2B 7090c426c66877ed31a61b8b678d5169094af4687b37622cacac758ce907154f579b5a5455d850ed1ca5fb70e8793a13c3c4aa20015cca70d78d0ce51c747e2c SHA512 1cf0eb7cf740f6212140886e481adb00883f7132ba21d346812a2c23fca35222b93251b3cdaba6b6dad66b15f743d8627a5d42e28f32aaef5cab682ea37b5983

diff --git a/net-proxy/trojan/files/trojan.initd b/net-proxy/trojan/files/trojan.initd
old mode 100755
new mode 100644
index f525eefe74d..cee794ad4d7
--- a/net-proxy/trojan/files/trojan.initd
+++ b/net-proxy/trojan/files/trojan.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 TJ_CONFIG="/etc/trojan/config.json"

diff --git a/net-proxy/trojan/trojan-1.12.2.ebuild b/net-proxy/trojan/trojan-1.12.2.ebuild
new file mode 100644
index 00000000000..e394deff72a
--- /dev/null
+++ b/net-proxy/trojan/trojan-1.12.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_5,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/${PN}"
+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)
+		-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/profiles/package.mask b/profiles/package.mask
index 9666ecde52c..a23337f0f3b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -448,6 +448,7 @@ sys-boot/systemrescuecd-x86-grub
 >=dev-libs/boost-1.70.0
 >=dev-util/boost-build-1.70.0
 >=net-mail/libpst-0.6.66-r2
+>=net-proxy/trojan-1.12.2
 
 # Robin H. Johnson <robbat2@g.o> (25 Mar 2019)
 # Requires >=dev-lang/lua-5.3 which is masked