1 |
commit: d7eef58d8c3ba44604691f721bb1e25428b86ff7 |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 5 02:02:21 2018 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 5 02:02:21 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7eef58d |
7 |
|
8 |
net-vpn/tinc: drop gui, bug #665208 |
9 |
|
10 |
Thanks Charlie Gehlin <charlie <AT> gehlin.com> |
11 |
|
12 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
13 |
|
14 |
...1_pre16-fix-paths.patch => tinc-1.1_pre16-r1-fix-paths.patch} | 0 |
15 |
net-vpn/tinc/metadata.xml | 1 - |
16 |
net-vpn/tinc/{tinc-1.1_pre16.ebuild => tinc-1.1_pre16-r1.ebuild} | 9 +-------- |
17 |
3 files changed, 1 insertion(+), 9 deletions(-) |
18 |
|
19 |
diff --git a/net-vpn/tinc/files/tinc-1.1_pre16-fix-paths.patch b/net-vpn/tinc/files/tinc-1.1_pre16-r1-fix-paths.patch |
20 |
similarity index 100% |
21 |
rename from net-vpn/tinc/files/tinc-1.1_pre16-fix-paths.patch |
22 |
rename to net-vpn/tinc/files/tinc-1.1_pre16-r1-fix-paths.patch |
23 |
|
24 |
diff --git a/net-vpn/tinc/metadata.xml b/net-vpn/tinc/metadata.xml |
25 |
index 02dd537c6e6..f6ec81bf4f8 100644 |
26 |
--- a/net-vpn/tinc/metadata.xml |
27 |
+++ b/net-vpn/tinc/metadata.xml |
28 |
@@ -14,7 +14,6 @@ |
29 |
<!-- |
30 |
<flag name="gcrypt">Add support for encrypted log files using <pkg>dev-libs/libgcrypt</pkg></flag> |
31 |
--> |
32 |
- <flag name="gui">Add GUI support, using <pkg>dev-python/wxpython</pkg></flag> |
33 |
<flag name="uml"> Enable support for User Mode Linux Sockets</flag> |
34 |
<flag name="vde"> Enable Virtual Distributed Ethernet (VDE) based networking</flag> |
35 |
</use> |
36 |
|
37 |
diff --git a/net-vpn/tinc/tinc-1.1_pre16.ebuild b/net-vpn/tinc/tinc-1.1_pre16-r1.ebuild |
38 |
similarity index 90% |
39 |
rename from net-vpn/tinc/tinc-1.1_pre16.ebuild |
40 |
rename to net-vpn/tinc/tinc-1.1_pre16-r1.ebuild |
41 |
index 91923228701..f252a1217c3 100644 |
42 |
--- a/net-vpn/tinc/tinc-1.1_pre16.ebuild |
43 |
+++ b/net-vpn/tinc/tinc-1.1_pre16-r1.ebuild |
44 |
@@ -24,12 +24,11 @@ SRC_URI="http://www.tinc-vpn.org/packages/${MY_P}.tar.gz |
45 |
LICENSE="GPL-2" |
46 |
SLOT="0" |
47 |
KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" |
48 |
-IUSE="+lzo +ncurses gui libressl +readline +ssl uml vde upnp +zlib" |
49 |
+IUSE="+lzo +ncurses libressl +readline +ssl uml vde upnp +zlib" |
50 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
51 |
|
52 |
DEPEND=" |
53 |
${PYTHON_DEPS} |
54 |
- gui? ( dev-python/wxpython:3.0[${PYTHON_USEDEP}] ) |
55 |
ssl? ( |
56 |
!libressl? ( dev-libs/openssl:0= ) |
57 |
libressl? ( dev-libs/libressl:0= ) |
58 |
@@ -89,12 +88,6 @@ src_install() { |
59 |
doconfd "${FILESDIR}"/tinc.networks |
60 |
newconfd "${FILESDIR}"/tincd.conf tincd |
61 |
newinitd "${FILESDIR}"/tincd-r2 tincd |
62 |
- |
63 |
- if use gui; then |
64 |
- python_fix_shebang "${ED}"/usr/bin/tinc-gui |
65 |
- else |
66 |
- rm -f "${ED}"/usr/bin/tinc-gui || die |
67 |
- fi |
68 |
} |
69 |
|
70 |
pkg_postinst() { |