diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-01-22 10:09:44 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-01-22 10:09:44 +0000 |
| commit | 09351e78166b5e864197c4456ebae3f89dd0bed9 (patch) | |
| tree | 41a96399f56ed3aa399006871bfce4430db84aa2 /net-proxy/trojan | |
| parent | c8a77dfe4d3d307c1d5dd2650b7297447d8b609d (diff) | |
gentoo resync : 22.01.2019
Diffstat (limited to 'net-proxy/trojan')
| -rw-r--r-- | net-proxy/trojan/Manifest | 6 | ||||
| -rw-r--r-- | net-proxy/trojan/trojan-1.10.0.ebuild (renamed from net-proxy/trojan/trojan-1.8.1.ebuild) | 3 | ||||
| -rw-r--r-- | net-proxy/trojan/trojan-1.9.0.ebuild | 46 |
3 files changed, 4 insertions, 51 deletions
diff --git a/net-proxy/trojan/Manifest b/net-proxy/trojan/Manifest index 901e192ea21b..e53e562976ff 100644 --- a/net-proxy/trojan/Manifest +++ b/net-proxy/trojan/Manifest @@ -1,6 +1,4 @@ AUX trojan.initd 542 BLAKE2B 2e5597381353f1aa8da392027b9a4179da08bb387a776f584bd508f9e7d20747317d78ed7506e97047eb809e0e9726f3f52a9f75a2aacf26d349ec8628b23acb SHA512 1e1f230c96c1d7f8c6f0dc23c40eb8895d004448d802c85d62b34e186bea964753e28e90978075dcbe9fbc2e73074564303f6e28cf12633e424230a2d415910e -DIST trojan-1.8.1.tar.gz 37199 BLAKE2B be93a119ca95e5f4151db6ab58ffaa123d5bd304247d7835ca34ba870808d7e246d551c204d60ffb2a982f2fcb2c35ada1d9823e7f931b36377f99ebd0f48bd6 SHA512 1e2b8e2ddb02b2009181a980781574e6e6375c98475bda4096b70a9c00e61c5ca445f28730e195a5179b85bf5464a6dcb1bcb6ba8dc841d95c9a111f8f87c511 -DIST trojan-1.9.0.tar.gz 37704 BLAKE2B 5ddfab3408c0f665e0c43e1f23d4d5df6c2222d38f3525b524b6689e5b25603f928f718bcba7bbd077b7db1c241aea629d01c8dbefc1d35c3dc3d29757c04885 SHA512 3d671d1944bf79879bde8ba74d9c3270e475ff1c5d35ff1ef367391fdce223bd24e4c1072ae8506002e5ee10944bfbe10cfb434e8908c9670535c38b275293fa -EBUILD trojan-1.8.1.ebuild 966 BLAKE2B 1f2463f68e2064c9f66b0fb9c9c2a5bb0a7253d4b45c55eb44b4a0a0020590673d871dd4bc2b45af5b081720f4157985155336f606bc03304af8c025de1bdef7 SHA512 205b38ffac20f40e55b03c567dcb21e2451c94d2c1cecfae5f4a84494ee287dbddd26a91991f48837bc293529baa61983b50eb9e1db23cd68d0bd731b2fadbf5 -EBUILD trojan-1.9.0.ebuild 966 BLAKE2B 1f2463f68e2064c9f66b0fb9c9c2a5bb0a7253d4b45c55eb44b4a0a0020590673d871dd4bc2b45af5b081720f4157985155336f606bc03304af8c025de1bdef7 SHA512 205b38ffac20f40e55b03c567dcb21e2451c94d2c1cecfae5f4a84494ee287dbddd26a91991f48837bc293529baa61983b50eb9e1db23cd68d0bd731b2fadbf5 +DIST trojan-1.10.0.tar.gz 38230 BLAKE2B 2cfa77ebfbae62edef983d1e57e3ce00a61118f6458cab353af60960e2586750fcd0c4237631481cfdfc8ed0ddad586e1d649046269c7e9177594869c187d8d1 SHA512 9d9a74218369f8094b292b8892e5f877ccec7d8912657491bb37da8e9ae4817f07a83fe401e33bbbdd2ac9c50c1440f3a021f93d85999b43df4849b0a04049cf +EBUILD trojan-1.10.0.ebuild 1028 BLAKE2B 2ecbef8706b6f9243c073b9f3b87387c138a27fc0948d6b720e0d36150f9e615bf5320d350847757bd22e777889ded6e07a1b6916f680c6ca14113fe2072ffdf SHA512 577bd8b91b8ddef0f4eee215f30aa65f5245e70e3014ce1c6f6f441eb5ab2cf9633abf42c22e95e601e87b7c3ba4a428cbbe6de9a419bf61161abb782c1f559e MISC metadata.xml 1023 BLAKE2B cea392d59eea944198e523e0dfdab0325180568d9f3f39e40fc7c94c43a1c8b9811e787da5174f4f0b85d932778b34dcf4a07afccc4cf02972de57e7a3004ad4 SHA512 b1a1a6bdb8ea7d62bce25a439753c85e5e340be804ac8a71a3fbbd4f671270c174f9db77b72c2d00cdc1ede7cea6f7a86d2401e6cb8c8f9e395573c9216dfa4b diff --git a/net-proxy/trojan/trojan-1.8.1.ebuild b/net-proxy/trojan/trojan-1.10.0.ebuild index b6c8edf97d81..fb823826e18d 100644 --- a/net-proxy/trojan/trojan-1.8.1.ebuild +++ b/net-proxy/trojan/trojan-1.10.0.ebuild @@ -5,7 +5,7 @@ EAPI=6 PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} ) -inherit cmake-utils python-any-r1 +inherit cmake-utils python-any-r1 systemd DESCRIPTION="An unidentifiable mechanism that helps you bypass GFW" HOMEPAGE="https://github.com/trojan-gfw/${PN}" @@ -31,6 +31,7 @@ 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 diff --git a/net-proxy/trojan/trojan-1.9.0.ebuild b/net-proxy/trojan/trojan-1.9.0.ebuild deleted file mode 100644 index b6c8edf97d81..000000000000 --- a/net-proxy/trojan/trojan-1.9.0.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} ) - -inherit cmake-utils python-any-r1 - -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.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 - -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 -} |