summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/aiccu/aiccu-2007.01.15-r5.ebuild2
-rw-r--r--net-misc/bfgminer/Manifest1
-rw-r--r--net-misc/bfgminer/bfgminer-3.10.10.ebuild9
-rw-r--r--net-misc/bfgminer/bfgminer-3.10.5.ebuild2
-rw-r--r--net-misc/bfgminer/bfgminer-3.10.8.ebuild2
-rw-r--r--net-misc/bfgminer/bfgminer-4.10.1.ebuild2
-rw-r--r--net-misc/bfgminer/bfgminer-4.10.2.ebuild2
-rw-r--r--net-misc/bfgminer/bfgminer-4.10.3.ebuild9
-rw-r--r--net-misc/bfgminer/bfgminer-5.0.0.ebuild2
-rw-r--r--net-misc/bfgminer/bfgminer-5.1.0.ebuild2
-rw-r--r--net-misc/bfgminer/bfgminer-5.2.0.ebuild9
-rw-r--r--net-misc/bfgminer/bfgminer-5.3.0.ebuild195
-rw-r--r--net-misc/chrome-remote-desktop/Manifest6
-rw-r--r--net-misc/chrome-remote-desktop/chrome-remote-desktop-40.0.2214.44.ebuild102
-rw-r--r--net-misc/chrome-remote-desktop/chrome-remote-desktop-41.0.2272.41.ebuild102
-rw-r--r--net-misc/chrome-remote-desktop/chrome-remote-desktop-45.0.2454.17.ebuild (renamed from net-misc/chrome-remote-desktop/chrome-remote-desktop-41.0.2272.41-r1.ebuild)2
-rw-r--r--net-misc/chrome-remote-desktop/files/chrome-remote-desktop-41.0.2272.41-always-sudo.patch18
-rw-r--r--net-misc/dhcp/Manifest1
-rw-r--r--net-misc/dhcp/dhcp-4.2.5_p1.ebuild240
-rw-r--r--net-misc/dhcp/dhcp-4.3.3.ebuild (renamed from net-misc/dhcp/dhcp-4.2.5_p1-r1.ebuild)25
-rw-r--r--net-misc/dhcp/files/dhcp-4.3.3-bind-disable.patch30
-rw-r--r--net-misc/dhcpcd/Manifest1
-rw-r--r--net-misc/dhcpcd/dhcpcd-6.9.3.ebuild120
-rw-r--r--net-misc/dleyna-server/dleyna-server-0.5.0.ebuild2
-rw-r--r--net-misc/gnome-online-miners/gnome-online-miners-3.14.3-r1.ebuild2
-rw-r--r--net-misc/grive/Manifest4
-rw-r--r--net-misc/grive/grive-0.2.0-r1.ebuild54
-rw-r--r--net-misc/grive/grive-0.3.0_pre20130503.ebuild72
-rw-r--r--net-misc/grive/grive-0.4.0_pre20150905.ebuild (renamed from net-misc/grive/grive-0.3.0_pre20141119.ebuild)15
-rw-r--r--net-misc/guacamole-server/Manifest1
-rw-r--r--net-misc/guacamole-server/guacamole-server-0.9.8.ebuild62
-rw-r--r--net-misc/ipv6calc/Manifest1
-rw-r--r--net-misc/ipv6calc/ipv6calc-0.97.4.ebuild2
-rw-r--r--net-misc/ipv6calc/ipv6calc-0.99.1.ebuild66
-rw-r--r--net-misc/lksctp-tools/lksctp-tools-1.0.16.ebuild2
-rw-r--r--net-misc/modemmanager/modemmanager-1.4.10.ebuild2
-rw-r--r--net-misc/mulk/mulk-0.6.0.ebuild2
-rw-r--r--net-misc/mulk/mulk-0.7.0.ebuild2
-rw-r--r--net-misc/netcf/Manifest1
-rw-r--r--net-misc/netcf/metadata.xml11
-rw-r--r--net-misc/netcf/netcf-0.1.9.ebuild31
-rw-r--r--net-misc/networkmanager-openswan/Manifest4
-rw-r--r--net-misc/networkmanager-openswan/networkmanager-openswan-0.9.8.4-r1.ebuild52
-rw-r--r--net-misc/networkmanager-openswan/networkmanager-openswan-1.0.6.ebuild (renamed from net-misc/networkmanager-openswan/networkmanager-openswan-1.0.0.ebuild)3
-rw-r--r--net-misc/networkmanager-openvpn/Manifest4
-rw-r--r--net-misc/networkmanager-openvpn/networkmanager-openvpn-0.9.10.0.ebuild52
-rw-r--r--net-misc/networkmanager-openvpn/networkmanager-openvpn-0.9.8.4.ebuild56
-rw-r--r--net-misc/networkmanager-openvpn/networkmanager-openvpn-1.0.0.ebuild52
-rw-r--r--net-misc/networkmanager-openvpn/networkmanager-openvpn-1.0.6-r1.ebuild (renamed from net-misc/networkmanager-openvpn/networkmanager-openvpn-1.0.0-r1.ebuild)15
-rw-r--r--net-misc/networkmanager-pptp/Manifest4
-rw-r--r--net-misc/networkmanager-pptp/networkmanager-pptp-0.9.10.0.ebuild51
-rw-r--r--net-misc/networkmanager-pptp/networkmanager-pptp-0.9.8.4.ebuild51
-rw-r--r--net-misc/networkmanager-pptp/networkmanager-pptp-1.0.6.ebuild (renamed from net-misc/networkmanager-pptp/networkmanager-pptp-1.0.0.ebuild)8
-rw-r--r--net-misc/networkmanager-vpnc/Manifest4
-rw-r--r--net-misc/networkmanager-vpnc/networkmanager-vpnc-0.9.10.0.ebuild50
-rw-r--r--net-misc/networkmanager-vpnc/networkmanager-vpnc-0.9.8.6.ebuild55
-rw-r--r--net-misc/networkmanager-vpnc/networkmanager-vpnc-1.0.6.ebuild (renamed from net-misc/networkmanager-vpnc/networkmanager-vpnc-1.0.0.ebuild)6
-rw-r--r--net-misc/networkmanager/Manifest4
-rw-r--r--net-misc/networkmanager/files/networkmanager-0.9.10.0-arpingpath.patch16
-rw-r--r--net-misc/networkmanager/files/networkmanager-0.9.8.4-pre-sleep.patch131
-rw-r--r--net-misc/networkmanager/files/networkmanager-0.9.8.9-fix-crash-on-wifi-rescan.patch47
-rw-r--r--net-misc/networkmanager/files/networkmanager-1.0.0-find-helpers.patch23
-rw-r--r--net-misc/networkmanager/files/networkmanager-1.0.0-lto-switch.patch36
-rw-r--r--net-misc/networkmanager/files/networkmanager-1.0.0-remove-bashisms.patch44
-rw-r--r--net-misc/networkmanager/files/nm-system-settings.conf-ifnet6
-rw-r--r--net-misc/networkmanager/networkmanager-0.9.10.1_pre20141101.ebuild302
-rw-r--r--net-misc/networkmanager/networkmanager-0.9.8.10-r1.ebuild252
-rw-r--r--net-misc/networkmanager/networkmanager-1.0.0.ebuild305
-rw-r--r--net-misc/networkmanager/networkmanager-1.0.2-r1.ebuild2
-rw-r--r--net-misc/networkmanager/networkmanager-1.0.2.ebuild292
-rw-r--r--net-misc/networkmanager/networkmanager-1.0.6.ebuild (renamed from net-misc/networkmanager/networkmanager-1.0.4.ebuild)123
-rw-r--r--net-misc/openvpn-auth-ldap/metadata.xml1
-rw-r--r--net-misc/openvpn/openvpn-2.3.8.ebuild2
-rw-r--r--net-misc/ps3mediaserver/metadata.xml1
-rw-r--r--net-misc/rygel/rygel-0.26.1.ebuild2
-rw-r--r--net-misc/spice-gtk/spice-gtk-0.28.ebuild2
-rw-r--r--net-misc/strongswan/Manifest1
-rw-r--r--net-misc/strongswan/strongswan-5.3.3.ebuild302
-rw-r--r--net-misc/vinagre/vinagre-3.16.1.ebuild2
-rw-r--r--net-misc/vino/vino-3.16.0.ebuild2
-rw-r--r--net-misc/wicd/Manifest1
-rw-r--r--net-misc/wicd/files/wicd-1.7.1-provide-net.patch11
-rw-r--r--net-misc/wicd/files/wicd-1.7.1_beta2-init.patch11
-rw-r--r--net-misc/wicd/files/wicd-1.7.1_pre20111210-wpa-psk-hex-template.patch30
-rw-r--r--net-misc/wicd/files/wicd-1.7.2.4-fix-dbus-error.patch16
-rw-r--r--net-misc/wicd/files/wicd-1.7.2.4-second-urwid.patch43
-rw-r--r--net-misc/wicd/files/wicd-1.7.2.4-urwid.patch66
-rw-r--r--net-misc/wicd/wicd-1.7.2.4-r3.ebuild142
-rw-r--r--net-misc/wicd/wicd-1.7.3-r1.ebuild142
-rw-r--r--net-misc/x2goserver/Manifest3
-rw-r--r--net-misc/x2goserver/x2goserver-4.0.1.12.ebuild4
-rw-r--r--net-misc/x2goserver/x2goserver-4.0.1.15.ebuild82
-rw-r--r--net-misc/x2goserver/x2goserver-4.0.1.16.ebuild82
-rw-r--r--net-misc/x2goserver/x2goserver-4.0.1.17.ebuild82
-rw-r--r--net-misc/x2goserver/x2goserver-4.0.1.18-r1.ebuild85
-rw-r--r--net-misc/x2goserver/x2goserver-4.0.1.18-r2.ebuild2
-rw-r--r--net-misc/x2goserver/x2goserver-4.0.1.18.ebuild82
-rw-r--r--net-misc/x2goserver/x2goserver-4.0.1.19.ebuild2
-rw-r--r--net-misc/youtube-dl/Manifest4
-rw-r--r--net-misc/youtube-dl/youtube-dl-2015.09.03.ebuild (renamed from net-misc/youtube-dl/youtube-dl-2015.08.23.ebuild)0
-rw-r--r--net-misc/youtube-dl/youtube-dl-2015.09.09.ebuild (renamed from net-misc/youtube-dl/youtube-dl-2015.08.28.ebuild)0
101 files changed, 948 insertions, 3523 deletions
diff --git a/net-misc/aiccu/aiccu-2007.01.15-r5.ebuild b/net-misc/aiccu/aiccu-2007.01.15-r5.ebuild
index 1a4d54158791..c5058247abb6 100644
--- a/net-misc/aiccu/aiccu-2007.01.15-r5.ebuild
+++ b/net-misc/aiccu/aiccu-2007.01.15-r5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.sixxs.net/archive/sixxs/aiccu/unix/${PN}_${PV//\./}.tar.gz"
LICENSE="SixXS"
SLOT="0"
-KEYWORDS="amd64 arm hppa ~ppc ~sparc ~x86"
+KEYWORDS="amd64 arm hppa ppc ~sparc ~x86"
IUSE="systemd"
RDEPEND="
diff --git a/net-misc/bfgminer/Manifest b/net-misc/bfgminer/Manifest
index 3f78149a8619..a956ce6b0409 100644
--- a/net-misc/bfgminer/Manifest
+++ b/net-misc/bfgminer/Manifest
@@ -7,3 +7,4 @@ DIST bfgminer-4.10.3.tar.xz 988552 SHA256 c9e4ac3754dad838d3a8120afd499751ac2e8b
DIST bfgminer-5.0.0.tar.xz 1012092 SHA256 f1dada4d83737f7bc9623ad695a07a88808d8103c9c7617ce18825d241e328fd SHA512 fc1b116347e0b2af4e2c7f895368abe156019be5495e286df2f90708c16c1739e7362682389eb88ce64835d53545a5603eab4818d70018f7f872a28b4ec6c797 WHIRLPOOL 95085f7ddc374579520bae130b12923669c5788c0ea21e7377e57e907ed997936f6a413d9067c0121410bde42b33c0b194774794965a86328b60f3cf0d881165
DIST bfgminer-5.1.0.tar.xz 1024292 SHA256 436595e8b3af267e8fed023ac6b5f208a385d891d0c3c1c41b8aa13f1c1e69c9 SHA512 826f3b1b2a3c0c0ce66ce888308cc531a2f8cf8212771bc07a650cf2811aeb40ed1d41ba1ffc8b3b16719cf261a5ce9d087bfa17603255cc53f0866b7ddc5459 WHIRLPOOL 9e1310b47f678c17840216e82f99d3c06152ad2efd49096ce27e31614282da62359bcca1e0a812ca2433fc933c5848ae0a8c271ccb2b7c8a7102e7d25b022ad2
DIST bfgminer-5.2.0.tar.xz 1017012 SHA256 0cec8a4012d5784f781201d245bee834b0085274a24737ff3a4d0a28d48edc28 SHA512 5bb930d3cf9aed0ae9eaabbd92c3a26146a7308e61bcf5ebdf67f8f5f70a7bae1df0bad51312b4bdfabcc10547b0d991a1117db5f6b98b1047c1dae6fd880f85 WHIRLPOOL f18d4d029d6296d130bbb439b1323fe9ae8dfd89ddc3cdd3f4f85742969a17ccadb7ad49ff3527e9399d4b60ff6b7c2bd83cd291003e0f676af4307141b635da
+DIST bfgminer-5.3.0.tar.xz 1017536 SHA256 d48fa6e51ff70ee1a85f77334a24f842ca6774c073c2d864fe739f07093ef77f SHA512 935b2a0595a2230f8ba9f832a280f52418c1b50b884010bebd2059cbef83d28c535d8d0b3cd7abe5b2420f6dc9fa8e9e0e32839ccdb6cd002a1e874dc5b1841a WHIRLPOOL 0244c9cf2a8928590f69819cfaa222498ae9e0b65aba4c0bc3fc751b7712e9284110ef238dd3bdeaa0562f4eaa292b4257e4d509966ff8e92731dd3f1d9f8ecc
diff --git a/net-misc/bfgminer/bfgminer-3.10.10.ebuild b/net-misc/bfgminer/bfgminer-3.10.10.ebuild
index 26093d157c86..fea1916cec51 100644
--- a/net-misc/bfgminer/bfgminer-3.10.10.ebuild
+++ b/net-misc/bfgminer/bfgminer-3.10.10.ebuild
@@ -42,7 +42,7 @@ REQUIRED_USE='
DEPEND='
net-misc/curl
ncurses? (
- sys-libs/ncurses[unicode?]
+ sys-libs/ncurses:=[unicode?]
)
>=dev-libs/jansson-2
net-libs/libblkmaker:=
@@ -80,14 +80,7 @@ RDEPEND="${DEPEND}
opencl? (
|| (
virtual/opencl
- virtual/opencl-sdk
- dev-util/ati-stream-sdk
- dev-util/ati-stream-sdk-bin
- dev-util/amdstream
- dev-util/amd-app-sdk
- dev-util/amd-app-sdk-bin
dev-util/nvidia-cuda-sdk[opencl]
- dev-util/intel-opencl-sdk
)
)
"
diff --git a/net-misc/bfgminer/bfgminer-3.10.5.ebuild b/net-misc/bfgminer/bfgminer-3.10.5.ebuild
index 09f7262daba9..e47ba2e45adc 100644
--- a/net-misc/bfgminer/bfgminer-3.10.5.ebuild
+++ b/net-misc/bfgminer/bfgminer-3.10.5.ebuild
@@ -42,7 +42,7 @@ REQUIRED_USE='
DEPEND='
net-misc/curl
ncurses? (
- sys-libs/ncurses[unicode?]
+ sys-libs/ncurses:=[unicode?]
)
>=dev-libs/jansson-2
net-libs/libblkmaker
diff --git a/net-misc/bfgminer/bfgminer-3.10.8.ebuild b/net-misc/bfgminer/bfgminer-3.10.8.ebuild
index bd156beb5f10..fea1916cec51 100644
--- a/net-misc/bfgminer/bfgminer-3.10.8.ebuild
+++ b/net-misc/bfgminer/bfgminer-3.10.8.ebuild
@@ -42,7 +42,7 @@ REQUIRED_USE='
DEPEND='
net-misc/curl
ncurses? (
- sys-libs/ncurses[unicode?]
+ sys-libs/ncurses:=[unicode?]
)
>=dev-libs/jansson-2
net-libs/libblkmaker:=
diff --git a/net-misc/bfgminer/bfgminer-4.10.1.ebuild b/net-misc/bfgminer/bfgminer-4.10.1.ebuild
index edd840685ec2..66a4b78bd4b6 100644
--- a/net-misc/bfgminer/bfgminer-4.10.1.ebuild
+++ b/net-misc/bfgminer/bfgminer-4.10.1.ebuild
@@ -48,7 +48,7 @@ REQUIRED_USE='
DEPEND='
net-misc/curl
ncurses? (
- sys-libs/ncurses[unicode?]
+ sys-libs/ncurses:=[unicode?]
)
>=dev-libs/jansson-2
dev-libs/libbase58
diff --git a/net-misc/bfgminer/bfgminer-4.10.2.ebuild b/net-misc/bfgminer/bfgminer-4.10.2.ebuild
index edd840685ec2..66a4b78bd4b6 100644
--- a/net-misc/bfgminer/bfgminer-4.10.2.ebuild
+++ b/net-misc/bfgminer/bfgminer-4.10.2.ebuild
@@ -48,7 +48,7 @@ REQUIRED_USE='
DEPEND='
net-misc/curl
ncurses? (
- sys-libs/ncurses[unicode?]
+ sys-libs/ncurses:=[unicode?]
)
>=dev-libs/jansson-2
dev-libs/libbase58
diff --git a/net-misc/bfgminer/bfgminer-4.10.3.ebuild b/net-misc/bfgminer/bfgminer-4.10.3.ebuild
index 163781356fb7..66a4b78bd4b6 100644
--- a/net-misc/bfgminer/bfgminer-4.10.3.ebuild
+++ b/net-misc/bfgminer/bfgminer-4.10.3.ebuild
@@ -48,7 +48,7 @@ REQUIRED_USE='
DEPEND='
net-misc/curl
ncurses? (
- sys-libs/ncurses[unicode?]
+ sys-libs/ncurses:=[unicode?]
)
>=dev-libs/jansson-2
dev-libs/libbase58
@@ -87,14 +87,7 @@ RDEPEND="${DEPEND}
opencl? (
|| (
virtual/opencl
- virtual/opencl-sdk
- dev-util/ati-stream-sdk
- dev-util/ati-stream-sdk-bin
- dev-util/amdstream
- dev-util/amd-app-sdk
- dev-util/amd-app-sdk-bin
dev-util/nvidia-cuda-sdk[opencl]
- dev-util/intel-opencl-sdk
)
)
"
diff --git a/net-misc/bfgminer/bfgminer-5.0.0.ebuild b/net-misc/bfgminer/bfgminer-5.0.0.ebuild
index cd79ef780970..bad51c92a25a 100644
--- a/net-misc/bfgminer/bfgminer-5.0.0.ebuild
+++ b/net-misc/bfgminer/bfgminer-5.0.0.ebuild
@@ -65,7 +65,7 @@ REQUIRED_USE='
DEPEND='
net-misc/curl
ncurses? (
- sys-libs/ncurses[unicode?]
+ sys-libs/ncurses:=[unicode?]
)
>=dev-libs/jansson-2
dev-libs/libbase58
diff --git a/net-misc/bfgminer/bfgminer-5.1.0.ebuild b/net-misc/bfgminer/bfgminer-5.1.0.ebuild
index cd79ef780970..bad51c92a25a 100644
--- a/net-misc/bfgminer/bfgminer-5.1.0.ebuild
+++ b/net-misc/bfgminer/bfgminer-5.1.0.ebuild
@@ -65,7 +65,7 @@ REQUIRED_USE='
DEPEND='
net-misc/curl
ncurses? (
- sys-libs/ncurses[unicode?]
+ sys-libs/ncurses:=[unicode?]
)
>=dev-libs/jansson-2
dev-libs/libbase58
diff --git a/net-misc/bfgminer/bfgminer-5.2.0.ebuild b/net-misc/bfgminer/bfgminer-5.2.0.ebuild
index 136a2b86f119..bad51c92a25a 100644
--- a/net-misc/bfgminer/bfgminer-5.2.0.ebuild
+++ b/net-misc/bfgminer/bfgminer-5.2.0.ebuild
@@ -65,7 +65,7 @@ REQUIRED_USE='
DEPEND='
net-misc/curl
ncurses? (
- sys-libs/ncurses[unicode?]
+ sys-libs/ncurses:=[unicode?]
)
>=dev-libs/jansson-2
dev-libs/libbase58
@@ -104,14 +104,7 @@ RDEPEND="${DEPEND}
opencl? (
|| (
virtual/opencl
- virtual/opencl-sdk
- dev-util/ati-stream-sdk
- dev-util/ati-stream-sdk-bin
- dev-util/amdstream
- dev-util/amd-app-sdk
- dev-util/amd-app-sdk-bin
dev-util/nvidia-cuda-sdk[opencl]
- dev-util/intel-opencl-sdk
)
)
"
diff --git a/net-misc/bfgminer/bfgminer-5.3.0.ebuild b/net-misc/bfgminer/bfgminer-5.3.0.ebuild
new file mode 100644
index 000000000000..bad51c92a25a
--- /dev/null
+++ b/net-misc/bfgminer/bfgminer-5.3.0.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Modular Bitcoin ASIC/FPGA/GPU/CPU miner in C"
+HOMEPAGE="https://bitcointalk.org/?topic=168174"
+SRC_URI="http://luke.dashjr.org/programs/bitcoin/files/${PN}/${PV}/${P}.txz -> ${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+
+# TODO: knc (needs i2c-tools header)
+# TODO: kncasic & titan (need systemwide knc-asic install)
+# TODO: minergate (needs actual miner_gate)
+IUSE="adl antminer avalon avalonmm bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian keccak klondike +libusb littlefury lm_sensors metabank minion modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt +sha256d twinfury +udev udev-broad-rules unicode x6500 zeusminer ztex"
+REQUIRED_USE='
+ || ( keccak scrypt sha256d )
+ || ( antminer avalon avalonmm bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer gridseed hashbuster hashbuster2 hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury x6500 zeusminer ztex )
+ adl? ( opencl )
+ antminer? ( sha256d )
+ avalon? ( sha256d )
+ avalonmm? ( sha256d )
+ bfsb? ( sha256d bitfury )
+ bfx? ( sha256d bitfury libusb )
+ bifury? ( sha256d )
+ bigpic? ( sha256d bitfury )
+ bitforce? ( sha256d )
+ bitfury? ( sha256d )
+ cointerra? ( sha256d )
+ drillbit? ( sha256d bitfury )
+ dualminer? ( || ( sha256d scrypt ) icarus )
+ gridseed? ( scrypt )
+ hashbuster? ( sha256d bitfury )
+ hashbuster2? ( sha256d bitfury libusb )
+ hashfast? ( sha256d )
+ icarus? ( || ( scrypt sha256d ) )
+ jingtian? ( sha256d )
+ keccak? ( || ( cpumining opencl proxy ) )
+ klondike? ( sha256d libusb )
+ littlefury? ( sha256d bitfury )
+ lm_sensors? ( opencl )
+ metabank? ( sha256d bitfury )
+ minion? ( sha256d )
+ modminer? ( sha256d )
+ nanofury? ( sha256d bitfury )
+ scrypt? ( || ( cpumining dualminer gridseed opencl proxy zeusminer ) )
+ sha256d? ( || ( antminer avalon avalonmm bfx bifury bitforce bfsb bigpic bitfury cointerra cpumining drillbit dualminer hashbuster hashbuster2 hashfast icarus jingtian klondike littlefury metabank modminer nanofury opencl proxy rockminer twinfury x6500 ztex ) )
+ twinfury? ( bitfury )
+ unicode? ( ncurses )
+ proxy? ( || ( proxy_getwork proxy_stratum ) )
+ proxy_getwork? ( proxy )
+ proxy_stratum? ( proxy )
+ rockminer? ( sha256d )
+ twinfury? ( sha256d )
+ x6500? ( sha256d libusb )
+ zeusminer? ( scrypt )
+ ztex? ( sha256d libusb )
+'
+
+DEPEND='
+ net-misc/curl
+ ncurses? (
+ sys-libs/ncurses:=[unicode?]
+ )
+ >=dev-libs/jansson-2
+ dev-libs/libbase58
+ net-libs/libblkmaker
+ udev? (
+ virtual/udev
+ )
+ hashbuster? (
+ dev-libs/hidapi
+ )
+ libusb? (
+ virtual/libusb:1
+ )
+ lm_sensors? (
+ sys-apps/lm_sensors
+ )
+ nanofury? (
+ dev-libs/hidapi
+ )
+ proxy_getwork? (
+ net-libs/libmicrohttpd
+ )
+ proxy_stratum? (
+ dev-libs/libevent
+ )
+ screen? (
+ app-misc/screen
+ || (
+ >=sys-apps/coreutils-8.15
+ sys-freebsd/freebsd-bin
+ app-misc/realpath
+ )
+ )
+'
+RDEPEND="${DEPEND}
+ opencl? (
+ || (
+ virtual/opencl
+ dev-util/nvidia-cuda-sdk[opencl]
+ )
+ )
+"
+DEPEND="${DEPEND}
+ virtual/pkgconfig
+ >=dev-libs/uthash-1.9.7
+ sys-apps/sed
+ cpumining? (
+ amd64? (
+ >=dev-lang/yasm-1.0.1
+ )
+ x86? (
+ >=dev-lang/yasm-1.0.1
+ )
+ )
+"
+
+src_configure() {
+ local CFLAGS="${CFLAGS}"
+ local with_curses
+ use hardened && CFLAGS="${CFLAGS} -nopie"
+
+ if use ncurses; then
+ if use unicode; then
+ with_curses='--with-curses=ncursesw'
+ else
+ with_curses='--with-curses=ncurses'
+ fi
+ else
+ with_curses='--without-curses'
+ fi
+
+ CFLAGS="${CFLAGS}" \
+ econf \
+ --docdir="/usr/share/doc/${PF}" \
+ $(use_enable adl) \
+ $(use_enable antminer) \
+ $(use_enable avalon) \
+ $(use_enable avalonmm) \
+ $(use_enable bifury) \
+ $(use_enable bitforce) \
+ $(use_enable bfsb) \
+ $(use_enable bfx) \
+ $(use_enable bigpic) \
+ $(use_enable bitfury) \
+ $(use_enable cointerra) \
+ $(use_enable cpumining) \
+ $(use_enable drillbit) \
+ $(use_enable dualminer) \
+ $(use_enable gridseed) \
+ $(use_enable hashbuster) \
+ $(use_enable hashbuster2 hashbusterusb) \
+ $(use_enable hashfast) \
+ $(use_enable icarus) \
+ $(use_enable jingtian) \
+ $(use_enable keccak) \
+ $(use_enable klondike) \
+ $(use_enable littlefury) \
+ $(use_enable metabank) \
+ $(use_enable minion) \
+ $(use_enable modminer) \
+ $(use_enable nanofury) \
+ $(use_enable opencl) \
+ $(use_enable rockminer) \
+ $(use_enable scrypt) \
+ $(use_enable sha256d) \
+ $(use_enable twinfury) \
+ --with-system-libblkmaker \
+ $with_curses \
+ $(use_with udev libudev) \
+ $(use_enable udev-broad-rules broad-udevrules) \
+ $(use_with lm_sensors sensors) \
+ $(use_with proxy_getwork libmicrohttpd) \
+ $(use_with proxy_stratum libevent) \
+ $(use_enable x6500) \
+ $(use_enable zeusminer) \
+ $(use_enable ztex)
+}
+
+src_install() {
+ emake install DESTDIR="$D"
+ if ! use examples; then
+ rm -r "${D}/usr/share/doc/${PF}/rpc-examples"
+ fi
+ if ! use screen; then
+ rm "${D}/usr/bin/start-bfgminer.sh"
+ fi
+}
diff --git a/net-misc/chrome-remote-desktop/Manifest b/net-misc/chrome-remote-desktop/Manifest
index 84e18da07144..8dfeb994235a 100644
--- a/net-misc/chrome-remote-desktop/Manifest
+++ b/net-misc/chrome-remote-desktop/Manifest
@@ -1,6 +1,4 @@
-DIST chrome-remote-desktop_40.0.2214.44_amd64.deb 14745924 SHA256 ad808f914e7929d98ec030a13749139f51fc58a8372cd95eb893cf98f4c7d0d8 SHA512 eeeda7c30e38d8af4e02e7462db0abcf21a3d04410eba82b880f2752b43dcdc970ae835d9fba4f5c7484537394d935e33503eb6e9338475d708a88f9a22058f9 WHIRLPOOL 85d88bc3f417e16a8144eb3c6210c7800c7007d1c92464665c60ac9cd49fb126e887f703000d4e761770ac26029f9a685e49687ff6f2b96a0bb1ffd5d2aa42b1
-DIST chrome-remote-desktop_40.0.2214.44_i386.deb 15490864 SHA256 97e9acefa7330f23f264ba56cc8ad8e9ac3bcdbb26c1a3219bf6203c8845b55e SHA512 56f82a2f051bec8bd365307d91f61c15bbf8dbfc21b0ad26a3be994ccfea028eef7fd83e0ce1bcea25a53a109f33a9a9ab962cb1ffc71075d068d48b4dede43f WHIRLPOOL 56848354bcb8789912548174bc8d1b9a9b2145a9167ca695eb19af84f39226e9729d00db7a00e3e5241a6b181b349e4098d411686e77e5c7e1d73a7eab0497a3
-DIST chrome-remote-desktop_41.0.2272.41_amd64.deb 14857068 SHA256 3d6ed3c527bf0b069f2602b318ee2b39451bbb86768ea5f325ce48e3d75476dd SHA512 41720c209966fd7458f9f5b8b10b7aa19e8ba12b45a9676fa0cfddc54d880c8ece019b2e943daad8d1d8acc1df04c4879fe98272e43ea023e406faedf84a1fa3 WHIRLPOOL e699797fd2b4936851e00655f7204541a56be4b89f53236d70010b4e184ce29bba7afc100e428b4e7d3c51ae98d8350f0ada415f78fc7ab2e4ead62486e8e568
-DIST chrome-remote-desktop_41.0.2272.41_i386.deb 15534358 SHA256 b591a3815366832229902b1d15d9d2cb246651b715c08f58d7d52df1f4d2dad0 SHA512 d9610e93df2e636163935debdeeee25843ca5bd0071330de9c9ce63fda717e6e4d29791822867c37466b80e8136eac4a86678c9d1536300701510f2a8c10658f WHIRLPOOL 94fe2c5eabfb15e4f12d9babac1bb08c406eef21d156051969304411311654ff0d087d44aefbb07b79eb9f3bf93a50ab10ed9f8bc54d0607eee60e5a402b07e7
DIST chrome-remote-desktop_44.0.2403.44_amd64.deb 15171514 SHA256 ff47c5611447d2b72726aa04d7e4cc78865d488f1390b0a7c5bfd5ebc5139415 SHA512 44bbf90d4fd487d25e1bda8d2fef1aed2d2b6cdda6f18df0055aa341ac9e06b76dc49f742d839d20c37d67a46852807ca03eba56d84f9024b71ceed93c4de135 WHIRLPOOL 8e9f6d55ce13380cacc5fbf17808f95be43988231bd57ddd7cc78829810adbadb23f0ba2ac0474cea44b4c424c983f8806e33f2f0ac1f01f630354934f22a60f
DIST chrome-remote-desktop_44.0.2403.44_i386.deb 16004938 SHA256 dde48a5cd7ff840857bcb3fad811b9cd1406c800a2332027240f0fb5788d0254 SHA512 5172d73c4bb45835ed3398a7f82f3096241b22f116fb24abf719c9160f234b82c3bf46f0d7b5ce43f1f50c62a39291ea2644876dc4af77a90fb11f8301b585b3 WHIRLPOOL ef3f3326c20f67bff9d1788ed6c70673051fff1ac309644b7edcd3fe2a2dbbeb1f7f17d269187185f4a06f0a154109793f11eeb87387c1229939b88bd2f9322e
+DIST chrome-remote-desktop_45.0.2454.17_amd64.deb 15349384 SHA256 c176730b1d42c1855804836ab7532dce9523710c7f68db11811a2d8b4fc4f2a7 SHA512 139b50d607db138d674fe1b7159ab7ec08a8a574b3114ed21eb5b1f82b6b9b447348ad0b28d3752ec1f54855e95ff439af08c3b1f7b2928efbcec3ca795817da WHIRLPOOL 045ed2dd8c64a1b8be6f87f970e241977ee19de92061c97e231a9ca7bb2e926ec2b80c36ccb09e67bf65b78e87c7b21aaae84d278f89d93eb356d6034a15a73f
+DIST chrome-remote-desktop_45.0.2454.17_i386.deb 16146850 SHA256 c4687db4424f0cd867db6926d3a1d458c19baa77c176064fbb707bf38e8f68f4 SHA512 59441ca3f4a9177e8999bc9953fd7b58aaae9afcc8d55252ff0d3dac965c7aec632bb708a925e56ef1d2351b7dc3415f238ce88a9975d99d86565f78fb19e6b1 WHIRLPOOL 1690447e012af6740c10f8a4c6dceeb75e24219c4101e230da26d7f87bdc14c46079af2f72d1a99bec57a3e8bfc0e3a1955ad5d165338f6426cd85fd7bd0fff7
diff --git a/net-misc/chrome-remote-desktop/chrome-remote-desktop-40.0.2214.44.ebuild b/net-misc/chrome-remote-desktop/chrome-remote-desktop-40.0.2214.44.ebuild
deleted file mode 100644
index f07ac10a6580..000000000000
--- a/net-misc/chrome-remote-desktop/chrome-remote-desktop-40.0.2214.44.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Base URL: https://dl.google.com/linux/chrome-remote-desktop/deb/
-# Fetch the Release file:
-# https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/Release
-# Which gives you the Packages file:
-# https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-i386/Packages
-# https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-amd64/Packages
-# And finally gives you the file name:
-# pool/main/c/chrome-remote-desktop/chrome-remote-desktop_29.0.1547.32_amd64.deb
-#
-# Use curl to find the answer:
-# curl -q https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-i386/Packages | grep ^Filename
-
-EAPI="4"
-
-inherit unpacker
-
-DESCRIPTION="access remote computers via Chrome!"
-PLUGIN_URL="https://chrome.google.com/remotedesktop"
-HOMEPAGE="https://support.google.com/chrome/answer/1649523 ${PLUGIN_URL}"
-BASE_URI="https://dl.google.com/linux/chrome-remote-desktop/deb/pool/main/c/${PN}/${PN}_${PV}"
-SRC_URI="amd64? ( ${BASE_URI}_amd64.deb )
- x86? ( ${BASE_URI}_i386.deb )"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-# All the libs this package links against.
-RDEPEND="app-admin/sudo
- dev-lang/python
- >=dev-libs/expat-2
- dev-libs/glib:2
- dev-libs/nspr
- dev-libs/nss
- dev-python/psutil
- gnome-base/gconf:2
- media-libs/fontconfig
- media-libs/freetype:2
- sys-devel/gcc
- sys-libs/glibc
- sys-libs/pam
- x11-libs/cairo
- x11-libs/gtk+:2
- x11-libs/libX11
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libXtst
- x11-libs/pango"
-# Settings we just need at runtime.
-RDEPEND+="
- x11-base/xorg-server[xvfb]"
-DEPEND=""
-
-S=${WORKDIR}
-
-QA_PREBUILT="/opt/google/chrome-remote-desktop/*"
-
-src_install() {
- insinto /etc
- doins -r etc/opt
-
- insinto /opt
- doins -r opt/google
- chmod a+rx "${ED}"/opt/google/${PN}/* || die
-
- dodir /etc/pam.d
- dosym system-remote-login /etc/pam.d/${PN}
-
- dodoc usr/share/doc/${PN}/changelog*
-
- newinitd "${FILESDIR}"/${PN}.rc ${PN}
- newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]] ; then
- elog "Two ways to launch the server:"
- elog "(1) access an existing desktop"
- elog " (a) install the Chrome plugin on the server & client:"
- elog " ${PLUGIN_URL}"
- elog " (b) on the server, run the Chrome plugin & enable remote access"
- elog " (c) on the client, connect to the server"
- elog "(2) headless system"
- elog " (a) install the Chrome plugin on the client:"
- elog " ${PLUGIN_URL}"
- elog " (b) visit https://accounts.google.com/o/oauth2/auth?response_type=code&scope=https://www.googleapis.com/auth/chromoting+https://www.googleapis.com/auth/googletalk+https://www.googleapis.com/auth/userinfo.email&access_type=offline&redirect_uri=https://chromoting-auth.googleplex.com/auth&approval_prompt=force&client_id=440925447803-avn2sj1kc099s0r7v62je5s339mu0am1.apps.googleusercontent.com&hl=en&from_login=1&as=-760f476eeaec11b8&pli=1&authuser=0"
- elog " (c) run the command mentioned on the server"
- elog " (d) on the client, connect to the server"
- elog
- elog "Configuration settings you might want to be aware of:"
- elog " ~/.${PN}-session - shell script to start your session"
- elog " /etc/init.d/${PN} - script to auto-restart server"
- fi
-}
diff --git a/net-misc/chrome-remote-desktop/chrome-remote-desktop-41.0.2272.41.ebuild b/net-misc/chrome-remote-desktop/chrome-remote-desktop-41.0.2272.41.ebuild
deleted file mode 100644
index f07ac10a6580..000000000000
--- a/net-misc/chrome-remote-desktop/chrome-remote-desktop-41.0.2272.41.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Base URL: https://dl.google.com/linux/chrome-remote-desktop/deb/
-# Fetch the Release file:
-# https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/Release
-# Which gives you the Packages file:
-# https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-i386/Packages
-# https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-amd64/Packages
-# And finally gives you the file name:
-# pool/main/c/chrome-remote-desktop/chrome-remote-desktop_29.0.1547.32_amd64.deb
-#
-# Use curl to find the answer:
-# curl -q https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-i386/Packages | grep ^Filename
-
-EAPI="4"
-
-inherit unpacker
-
-DESCRIPTION="access remote computers via Chrome!"
-PLUGIN_URL="https://chrome.google.com/remotedesktop"
-HOMEPAGE="https://support.google.com/chrome/answer/1649523 ${PLUGIN_URL}"
-BASE_URI="https://dl.google.com/linux/chrome-remote-desktop/deb/pool/main/c/${PN}/${PN}_${PV}"
-SRC_URI="amd64? ( ${BASE_URI}_amd64.deb )
- x86? ( ${BASE_URI}_i386.deb )"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-# All the libs this package links against.
-RDEPEND="app-admin/sudo
- dev-lang/python
- >=dev-libs/expat-2
- dev-libs/glib:2
- dev-libs/nspr
- dev-libs/nss
- dev-python/psutil
- gnome-base/gconf:2
- media-libs/fontconfig
- media-libs/freetype:2
- sys-devel/gcc
- sys-libs/glibc
- sys-libs/pam
- x11-libs/cairo
- x11-libs/gtk+:2
- x11-libs/libX11
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libXtst
- x11-libs/pango"
-# Settings we just need at runtime.
-RDEPEND+="
- x11-base/xorg-server[xvfb]"
-DEPEND=""
-
-S=${WORKDIR}
-
-QA_PREBUILT="/opt/google/chrome-remote-desktop/*"
-
-src_install() {
- insinto /etc
- doins -r etc/opt
-
- insinto /opt
- doins -r opt/google
- chmod a+rx "${ED}"/opt/google/${PN}/* || die
-
- dodir /etc/pam.d
- dosym system-remote-login /etc/pam.d/${PN}
-
- dodoc usr/share/doc/${PN}/changelog*
-
- newinitd "${FILESDIR}"/${PN}.rc ${PN}
- newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]] ; then
- elog "Two ways to launch the server:"
- elog "(1) access an existing desktop"
- elog " (a) install the Chrome plugin on the server & client:"
- elog " ${PLUGIN_URL}"
- elog " (b) on the server, run the Chrome plugin & enable remote access"
- elog " (c) on the client, connect to the server"
- elog "(2) headless system"
- elog " (a) install the Chrome plugin on the client:"
- elog " ${PLUGIN_URL}"
- elog " (b) visit https://accounts.google.com/o/oauth2/auth?response_type=code&scope=https://www.googleapis.com/auth/chromoting+https://www.googleapis.com/auth/googletalk+https://www.googleapis.com/auth/userinfo.email&access_type=offline&redirect_uri=https://chromoting-auth.googleplex.com/auth&approval_prompt=force&client_id=440925447803-avn2sj1kc099s0r7v62je5s339mu0am1.apps.googleusercontent.com&hl=en&from_login=1&as=-760f476eeaec11b8&pli=1&authuser=0"
- elog " (c) run the command mentioned on the server"
- elog " (d) on the client, connect to the server"
- elog
- elog "Configuration settings you might want to be aware of:"
- elog " ~/.${PN}-session - shell script to start your session"
- elog " /etc/init.d/${PN} - script to auto-restart server"
- fi
-}
diff --git a/net-misc/chrome-remote-desktop/chrome-remote-desktop-41.0.2272.41-r1.ebuild b/net-misc/chrome-remote-desktop/chrome-remote-desktop-45.0.2454.17.ebuild
index 0d69171a4d5e..52f80d8b26cf 100644
--- a/net-misc/chrome-remote-desktop/chrome-remote-desktop-41.0.2272.41-r1.ebuild
+++ b/net-misc/chrome-remote-desktop/chrome-remote-desktop-45.0.2454.17.ebuild
@@ -64,7 +64,7 @@ S=${WORKDIR}
QA_PREBUILT="/opt/google/chrome-remote-desktop/*"
src_prepare() {
- epatch "${FILESDIR}"/${PN}-41.0.2272.41-always-sudo.patch #541708
+ epatch "${FILESDIR}"/${PN}-44.0.2403.44-always-sudo.patch #541708
}
src_install() {
diff --git a/net-misc/chrome-remote-desktop/files/chrome-remote-desktop-41.0.2272.41-always-sudo.patch b/net-misc/chrome-remote-desktop/files/chrome-remote-desktop-41.0.2272.41-always-sudo.patch
deleted file mode 100644
index 39e9d27e9d3a..000000000000
--- a/net-misc/chrome-remote-desktop/files/chrome-remote-desktop-41.0.2272.41-always-sudo.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://bugs.gentoo.org/541708
-
-just use `sudo` for everything
-
---- a/opt/google/chrome-remote-desktop/chrome-remote-desktop
-+++ b/opt/google/chrome-remote-desktop/chrome-remote-desktop
-@@ -1092,10 +1092,7 @@
- except KeyError:
- logging.info("Group '%s' not found." % CHROME_REMOTING_GROUP_NAME)
-
-- if os.getenv("DISPLAY"):
-- sudo_command = "gksudo --description \"Chrome Remote Desktop\""
-- else:
-- sudo_command = "sudo"
-+ sudo_command = "sudo"
- command = ("sudo -k && exec %(sudo)s -- sh -c "
- "\"groupadd -f %(group)s && gpasswd --add %(user)s %(group)s\"" %
- { 'group': CHROME_REMOTING_GROUP_NAME,
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index ef99fa7cf3f7..d4813d9c0670 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -1,3 +1,4 @@
DIST dhcp-4.2.5-P1.tar.gz 8255960 SHA256 59b06c9f5d775e46999b422c45b9229402c462b114ce1685617bfb2b8b028250 SHA512 02a811b6e88ce013f7ecff6abf81d4b2aff82fff584521ae03fc3242b6036d0d0ad3afc6283fe8b97d18b8fffd4b6d2253386897ae2297c165240017f5f219ec WHIRLPOOL b8cf91c69ae0e1b234089ce3fae4b9daf5bde7f415d8cbc274ab4d006c8aa25f55807c70ba4c6771e0c9803ec5a99f8cc2088e561cac7d16479f5f022ee5459f
DIST dhcp-4.3.1.tar.gz 8980806 SHA256 266cbca8a7a6bb8f9ccc5765da0d2b04099329314a54a4fc1022d510ad3e9af0 SHA512 84ca525fda825bf367a98754f1fb1b8eba5b095c92c25ddaec6e30b31008c7d5c43062ae43cecaa43731a8e78ae406a3123906fd402d2ba4b46b7adbae65aa6a WHIRLPOOL 3fd3720f6883b43856d2169264ee2adfb541b793604728c4e5cc3b647d4a88d6245fb6e53062de4118301cc15f0b4388363eba304bf3623dfb88c91bde94b2b6
DIST dhcp-4.3.2.tar.gz 9230340 SHA256 6246c9b358759f6cdcc45104caaf76e732a211dbbbbf64a21f499c8db1298165 SHA512 b91a0a90736c6e8bd66a74af8c67949c81db3148eba23ee647f0987bbd98543f0dfd1605c94e152b28a606bbbecd94cd8a8112db5f5fe4c3d041101bda1b95da WHIRLPOOL a201cea52e96517ff1dae2b6c05b05da11feb4c2eed6dca539ea5ab3185711377cd7f7ed9ecc5e5f2bc30bc84d73a85d4140154c43b4f0f27a7e0a4a51f56787
+DIST dhcp-4.3.3.tar.gz 9205539 SHA256 553c4945b09b1c1b904c4780f34f72aaefa2fc8c6556715de0bc9d4e3d255ede SHA512 33671816e21456ffec57e2c9ab2d129377096b4e2e5b4ca8194dcd9495c6a9e18a2a5e79d4f05694f3dc841895aa0adb63afd7bd6fe4641eb5a80d3fd7e715d9 WHIRLPOOL 27e7f2fdd1f1f7b3309b444a67e21d139468317538345cc3599e6a47f20489fa5d07018eabe8e32c429f2f16f03c28b22b29bff2ab08972f541c63603bd3df9a
diff --git a/net-misc/dhcp/dhcp-4.2.5_p1.ebuild b/net-misc/dhcp/dhcp-4.2.5_p1.ebuild
deleted file mode 100644
index 4ef10a979298..000000000000
--- a/net-misc/dhcp/dhcp-4.2.5_p1.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils toolchain-funcs user
-
-MY_PV="${PV//_alpha/a}"
-MY_PV="${MY_PV//_beta/b}"
-MY_PV="${MY_PV//_rc/rc}"
-MY_PV="${MY_PV//_p/-P}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
-HOMEPAGE="http://www.isc.org/products/DHCP"
-SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
- ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz"
-
-LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
-
-DEPEND="selinux? ( sec-policy/selinux-dhcp )
- client? ( kernel_linux? ( sys-apps/net-tools ) )
- ldap? (
- net-nds/openldap
- ssl? ( dev-libs/openssl )
- )"
-RDEPEND="${DEPEND}
- vim-syntax? ( app-vim/dhcpd-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- unpack ${A}
- # handle local bind hell
- cd "${S}"/bind
- unpack ./bind.tar.gz
-}
-
-src_prepare() {
- # Gentoo patches - these will probably never be accepted upstream
- # Fix some permission issues
- epatch "${FILESDIR}"/${PN}-3.0-fix-perms.patch
- # Enable dhclient to equery NTP servers
- epatch "${FILESDIR}"/${PN}-4.0-dhclient-ntp.patch
- # resolvconf support in dhclient-script
- epatch "${FILESDIR}"/${PN}-4.2.2-dhclient-resolvconf.patch
- # Stop downing the interface on Linux as that breaks link daemons
- # such as wpa_supplicant and netplug
- epatch "${FILESDIR}"/${PN}-3.0.3-dhclient-no-down.patch
- epatch "${FILESDIR}"/${PN}-4.2.0-errwarn-message.patch
- # Enable dhclient to get extra configuration from stdin
- epatch "${FILESDIR}"/${PN}-4.2.2-dhclient-stdin-conf.patch
- epatch "${FILESDIR}"/${PN}-4.2.2-nogateway.patch #265531
- epatch "${FILESDIR}"/${PN}-4.2.4-quieter-ping.patch #296921
- epatch "${FILESDIR}"/${PN}-4.2.4-always-accept-4.patch #437108
-
- # Brand the version with Gentoo
- sed -i \
- -e "/VERSION=/s:'$: Gentoo-${PR}':" \
- configure || die
-
- # Change the hook script locations of the scripts
- sed -i \
- -e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \
- -e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
- client/scripts/* || die
-
- # No need for the linux script to force bash #158540
- sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die
-
- # Quiet the freebsd logger a little
- sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die
-
- # Remove these options from the sample config
- sed -i -r \
- -e "/(script|host-name|domain-name) /d" \
- client/dhclient.conf.example || die
-
- if use client && ! use server ; then
- sed -i -r \
- -e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \
- Makefile.in || die
- elif ! use client && use server ; then
- sed -i -r \
- -e '/^SUBDIRS/s:\<client\>::' \
- Makefile.in || die
- fi
-
- # Only install different man pages if we don't have en
- if [[ " ${LINGUAS} " != *" en "* ]]; then
- # Install Japanese man pages
- if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
- einfo "Installing Japanese documention"
- cp doc/ja_JP.eucJP/dhclient* client
- cp doc/ja_JP.eucJP/dhcp* common
- fi
- fi
- # Now remove the non-english docs so there are no errors later
- rm -rf doc/ja_JP.eucJP
-
- # make the bind build work
- binddir=${S}/bind
- cd "${binddir}" || die
- cat <<-EOF > bindvar.tmp
- binddir=${binddir}
- GMAKE=${MAKE:-gmake}
- EOF
- epatch "${FILESDIR}"/${PN}-4.2.2-bind-disable.patch
- cd bind-*/
- epatch "${FILESDIR}"/${PN}-4.2.2-bind-parallel-build.patch #380717
- epatch "${FILESDIR}"/${PN}-4.2.2-bind-build-flags.patch
-}
-
-src_configure() {
- # bind defaults to stupid `/usr/bin/ar`
- tc-export AR BUILD_CC
- export ac_cv_path_AR=${AR}
-
- # this is tested for by the bind build system, and can cause trouble
- # when cross-building; since dhcp itself doesn't make use of libcap,
- # simply disable it.
- export ac_cv_lib_cap_cap_set_proc=no
-
- # Use FHS sane paths ... some of these have configure options,
- # but not all, so just do it all here.
- local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
- cat <<-EOF >> includes/site.h
- #define _PATH_DHCPD_CONF "${e}/dhcpd.conf"
- #define _PATH_DHCLIENT_CONF "${e}/dhclient.conf"
- #define _PATH_DHCPD_DB "${l}/dhcpd.leases"
- #define _PATH_DHCPD6_DB "${l}/dhcpd6.leases"
- #define _PATH_DHCLIENT_DB "${l}/dhclient.leases"
- #define _PATH_DHCLIENT6_DB "${l}/dhclient6.leases"
- #define _PATH_DHCPD_PID "${r}/dhcpd.pid"
- #define _PATH_DHCPD6_PID "${r}/dhcpd6.pid"
- #define _PATH_DHCLIENT_PID "${r}/dhcpclient.pid"
- #define _PATH_DHCLIENT6_PID "${r}/dhcpclient6.pid"
- #define _PATH_DHCRELAY_PID "${r}/dhcrelay.pid"
- #define _PATH_DHCRELAY6_PID "${r}/dhcrelay6.pid"
- EOF
-
- econf \
- --enable-paranoia \
- --enable-early-chroot \
- --sysconfdir=${e} \
- $(use_enable ipv6 dhcpv6) \
- $(use_with ldap) \
- $(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
-
- # configure local bind cruft. symtable option requires
- # perl and we don't want to require that #383837.
- cd bind/bind-*/ || die
- eval econf \
- $(sed -n '/ [.].configure /{s:^[^-]*::;s:>.*::;p}' ../Makefile) \
- --disable-symtable \
- --without-make-clean
-}
-
-src_compile() {
- # build local bind cruft first
- emake -C bind/bind-*/lib/export install
- # then build standard dhcp code
- emake AR="$(tc-getAR)"
-}
-
-src_install() {
- default
-
- dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
- dohtml doc/References.html
-
- if [[ -e client/dhclient ]] ; then
- # move the client to /
- dodir /sbin
- mv "${D}"/usr/sbin/dhclient "${D}"/sbin/ || die
-
- exeinto /sbin
- if use kernel_linux ; then
- newexe "${S}"/client/scripts/linux dhclient-script
- else
- newexe "${S}"/client/scripts/freebsd dhclient-script
- fi
- fi
-
- if [[ -e server/dhcpd ]] ; then
- if use ldap ; then
- insinto /etc/openldap/schema
- doins contrib/ldap/dhcp.*
- dosbin contrib/ldap/dhcpd-conf-to-ldap
- fi
-
- newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
- newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
- newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
- newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
- newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
- newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
-
- sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
- fi
-
- # the default config files aren't terribly useful #384087
- local f
- for f in "${ED}"/etc/dhcp/*.conf.example ; do
- mv "${f}" "${f%.example}" || die
- done
- sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
-}
-
-pkg_preinst() {
- enewgroup dhcp
- enewuser dhcp -1 -1 /var/lib/dhcp dhcp
-
- # Keep the user files over the sample ones. The
- # hashing is to ignore the crappy defaults #384087.
- local f h
- for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
- h=${f#*:}
- f="/etc/dhcp/${f%:*}.conf"
- if [ -e "${EROOT}"${f} ] ; then
- case $(md5sum "${EROOT}"${f}) in
- ${h}*) ;;
- *) cp -p "${EROOT}"${f} "${ED}"${f};;
- esac
- fi
- done
-}
-
-pkg_postinst() {
- if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
- ewarn
- ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
- ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
- ewarn "and dhcp should be removed from the default runlevel"
- ewarn
- fi
-}
diff --git a/net-misc/dhcp/dhcp-4.2.5_p1-r1.ebuild b/net-misc/dhcp/dhcp-4.3.3.ebuild
index 8561aa995a05..b5a75fa4cbdc 100644
--- a/net-misc/dhcp/dhcp-4.2.5_p1-r1.ebuild
+++ b/net-misc/dhcp/dhcp-4.3.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="4"
-inherit eutils toolchain-funcs user
+inherit eutils systemd toolchain-funcs user
MY_PV="${PV//_alpha/a}"
MY_PV="${MY_PV//_beta/b}"
@@ -18,10 +18,10 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
-DEPEND="selinux? ( sec-policy/selinux-dhcp )
+DEPEND="
client? (
kernel_linux? (
ipv6? ( sys-apps/iproute2 )
@@ -33,6 +33,7 @@ DEPEND="selinux? ( sec-policy/selinux-dhcp )
ssl? ( dev-libs/openssl )
)"
RDEPEND="${DEPEND}
+ selinux? ( sec-policy/selinux-dhcp )
vim-syntax? ( app-vim/dhcpd-syntax )"
S="${WORKDIR}/${MY_P}"
@@ -50,12 +51,10 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-3.0-fix-perms.patch
# Enable dhclient to equery NTP servers
epatch "${FILESDIR}"/${PN}-4.0-dhclient-ntp.patch
- # resolvconf support in dhclient-script
- epatch "${FILESDIR}"/${PN}-4.2.2-dhclient-resolvconf.patch
+ epatch "${FILESDIR}"/${PN}-4.3.1-dhclient-resolvconf.patch
# Stop downing the interface on Linux as that breaks link daemons
# such as wpa_supplicant and netplug
epatch "${FILESDIR}"/${PN}-3.0.3-dhclient-no-down.patch
- epatch "${FILESDIR}"/${PN}-4.2.0-errwarn-message.patch
# Enable dhclient to get extra configuration from stdin
epatch "${FILESDIR}"/${PN}-4.2.2-dhclient-stdin-conf.patch
epatch "${FILESDIR}"/${PN}-4.2.2-nogateway.patch #265531
@@ -115,7 +114,7 @@ src_prepare() {
binddir=${binddir}
GMAKE=${MAKE:-gmake}
EOF
- epatch "${FILESDIR}"/${PN}-4.2.2-bind-disable.patch
+ epatch "${FILESDIR}"/${PN}-4.3.3-bind-disable.patch
cd bind-*/
epatch "${FILESDIR}"/${PN}-4.2.2-bind-parallel-build.patch #380717
epatch "${FILESDIR}"/${PN}-4.2.2-bind-build-flags.patch
@@ -161,7 +160,7 @@ src_configure() {
# perl and we don't want to require that #383837.
cd bind/bind-*/ || die
eval econf \
- $(sed -n '/ [.].configure /{s:^[^-]*::;s:>.*::;p}' ../Makefile) \
+ $(sed -n '/^bindconfig =/,/^$/{:a;N;$!ba;s,^[^-]*,,;s,\\\s*\n\s*--,--,g;s, @[[:upper:]]\+@,,g;P;D}' ../Makefile.in) \
--disable-symtable \
--without-make-clean
}
@@ -206,6 +205,14 @@ src_install() {
newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
+ systemd_newtmpfilesd "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
+ systemd_dounit "${FILESDIR}"/dhcpd4.service
+ systemd_dounit "${FILESDIR}"/dhcpd6.service
+ systemd_dounit "${FILESDIR}"/dhcrelay4.service
+ systemd_dounit "${FILESDIR}"/dhcrelay6.service
+ systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
+ systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
+
sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
fi
diff --git a/net-misc/dhcp/files/dhcp-4.3.3-bind-disable.patch b/net-misc/dhcp/files/dhcp-4.3.3-bind-disable.patch
new file mode 100644
index 000000000000..1064bbf8e469
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.3.3-bind-disable.patch
@@ -0,0 +1,30 @@
+--- dhcp-4.3.3/bind/Makefile.in
++++ dhcp-4.3.3/bind/Makefile.in
+@@ -40,6 +40,7 @@
+ @BIND_ATF_TRUE@all: bind1 atf bind2
+
+ bind1:
++disable:
+ # Extract the source from the tarball, if it hasn't been already.
+ @if test -d ${bindsrcdir} ; then \
+ echo ${bindsrcdir} already unpacked... ; \
+@@ -68,6 +69,7 @@
+ fi
+
+ atf:
++disable:
+ # Build and copy the ATF support if not yet installed.
+ @if test -d ./atf ; then \
+ echo ATF support already installed ; \
+@@ -79,6 +81,7 @@
+ fi
+
+ bind2:
++disable:
+ # Build and install the export libraries
+ # No need to do anything if we already have something installed.
+ @if test -d ${binddir}/lib ; then \
+--- dhcp-4.3.3/bind/test
++++ dhcp-4.3.3/bind/test
+@@ -0,0 +1 @@
++--disable-kqueue --disable-epoll --disable-devpoll --without-openssl --without-libxml2 --enable-exportlib --with-gssapi=no --enable-threads=no @BINDCONFIG@ --with-export-includedir=${binddir}/include --with-export-libdir=${binddir}/lib
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 1c93fe263fb9..7cf8786a6f23 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,3 +1,4 @@
DIST dhcpcd-6.9.0.tar.bz2 176736 SHA256 1566a58ef785880c07762ff6c520e974cf42872be5fbb23b4520f4446b120a68 SHA512 bb02005ff54ad722961208be69f48c61fb72cf56c9ca89348f3e0973e96317b06b4eaf48412ec5e763c9e20bad6f38e06d520048f3412d3bf46716f5dfb671a6 WHIRLPOOL 450b89ff260cfef8e865d1f02b7aa7119d0e37a231d08577545d0091496cee370f5f9c2614e6d5ef2b9a99b412d909d3ed4711c7433b6de085b7dc62df84a4fb
DIST dhcpcd-6.9.1.tar.xz 175656 SHA256 c03b750e1fe2890b62ac0e7d7092a1698b598adb6f88b67916586a619f7c066f SHA512 87ecd54fc94eb3fbebbf87c4037da4767f31ca60718c5fd8cc3dcff4c3294edf7808627ef909120b668f1b767f0d588dddb7c1920a971c86bdc83f72b64e33a3 WHIRLPOOL d8ef71fef224101a785c838ae48fbe440e7b3ca0f07d435d0a9f7a3fef458e28c094b08966ac88a25ec92fbadcfc06a52d55c39f5772427958f715d665cfe0e9
DIST dhcpcd-6.9.2.tar.xz 176240 SHA256 e9f82422a35ad1f4f5f888a433a76e98e3cdd4419886c29ccbfb336eecc58a70 SHA512 9eb9dccdd26d9b088cf1bfdcef0ebcb83b8f18f1058a8ce385c3f69ab30682814215c24fbe5903d6a9ee7b4a5fbc93504949513987525515e1f597183e8b6920 WHIRLPOOL 86788c68d92ce774a96806bdcd03ff624ccf632f9bc5627cab218e63824e4da9d997300453de2d0fe299127880dc6d51a1bc9130246bebb425d32e1315f62455
+DIST dhcpcd-6.9.3.tar.xz 176320 SHA256 6089471ed695fa62ac8351466b96b4b6365fd14ec455a120a6524663808eae53 SHA512 0a895f17fa093ac758224bfddad003ee25f81fe96331b1952264c3623018e00048603c9a3c5ba385a93441e987b1ce4cd02ec1f42e1caca2e646a6ac4781c3d9 WHIRLPOOL 6de1622444cf393287abbd469016f3c3cc0a99e6ecc4b781c5b9e0389c899365cfefa46e93d16872e6427517f92ff4750e3a246604562922836ae112dbd4349d
diff --git a/net-misc/dhcpcd/dhcpcd-6.9.3.ebuild b/net-misc/dhcpcd/dhcpcd-6.9.3.ebuild
new file mode 100644
index 000000000000..3db5ed559d33
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-6.9.3.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [[ ${PV} == "9999" ]]; then
+ FOSSIL_URI="http://roy.marples.name/projects/dhcpcd"
+else
+ MY_P="${P/_alpha/-alpha}"
+ MY_P="${MY_P/_beta/-beta}"
+ MY_P="${MY_P/_rc/-rc}"
+ SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+ S="${WORKDIR}/${MY_P}"
+fi
+
+inherit eutils systemd toolchain-funcs
+
+DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
+HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
+
+COMMON_DEPEND="udev? ( virtual/udev )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+if [[ ${PV} == "9999" ]]; then
+ DEPEND+=" dev-vcs/fossil"
+
+ src_unpack()
+ {
+ local distdir=${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}
+ local repo=${distdir}/fossil/${PN}.fossil
+
+ addwrite "${distdir}"
+
+ if [[ -e "${repo}" ]]; then
+ fossil pull "${FOSSIL_URI}" -R "${repo}" || die
+ else
+ mkdir -p "${distdir}/fossil" || die
+ fossil clone "${FOSSIL_URI}" "${repo}" || die
+ fi
+
+ mkdir -p "${S}" || die
+ cd "${S}" || die
+ fossil open "${repo}" || die
+ }
+fi
+
+src_prepare()
+{
+ epatch_user
+}
+
+src_configure()
+{
+ local dev hooks rundir
+ use udev || dev="--without-dev --without-udev"
+ hooks="--with-hook=ntp.conf"
+ use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
+ use kernel_linux && rundir="--rundir=${EPREFIX}/run"
+ econf \
+ --prefix="${EPREFIX}" \
+ --libexecdir="${EPREFIX}/lib/dhcpcd" \
+ --dbdir="${EPREFIX}/var/lib/dhcpcd" \
+ --localstatedir="${EPREFIX}/var" \
+ ${rundir} \
+ $(use_enable embedded) \
+ $(use_enable ipv6) \
+ ${dev} \
+ CC="$(tc-getCC)" \
+ ${hooks}
+}
+
+src_install()
+{
+ default
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst()
+{
+ # Upgrade the duid file to the new format if needed
+ local old_duid="${ROOT}"/var/lib/dhcpcd/dhcpcd.duid
+ local new_duid="${ROOT}"/etc/dhcpcd.duid
+ if [ -e "${old_duid}" ] && ! grep -q '..:..:..:..:..:..' "${old_duid}"; then
+ sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_duid}"
+ fi
+
+ # Move the duid to /etc, a more sensible location
+ if [ -e "${old_duid}" -a ! -e "${new_duid}" ]; then
+ cp -p "${old_duid}" "${new_duid}"
+ fi
+
+ if [ -z "$REPLACING_VERSIONS" ]; then
+ elog
+ elog "dhcpcd has zeroconf support active by default."
+ elog "This means it will always obtain an IP address even if no"
+ elog "DHCP server can be contacted, which will break any existing"
+ elog "failover support you may have configured in your net configuration."
+ elog "This behaviour can be controlled with the noipv4ll configuration"
+ elog "file option or the -L command line switch."
+ elog "See the dhcpcd and dhcpcd.conf man pages for more details."
+
+ elog
+ elog "Dhcpcd has duid enabled by default, and this may cause issues"
+ elog "with some dhcp servers. For more information, see"
+ elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
+ fi
+
+ if ! has_version net-dns/bind-tools; then
+ elog
+ elog "If you activate the lookup-hostname hook to look up your hostname"
+ elog "using the dns, you need to install net-dns/bind-tools."
+ fi
+}
diff --git a/net-misc/dleyna-server/dleyna-server-0.5.0.ebuild b/net-misc/dleyna-server/dleyna-server-0.5.0.ebuild
index 97a23ba91f1e..1490e084d695 100644
--- a/net-misc/dleyna-server/dleyna-server-0.5.0.ebuild
+++ b/net-misc/dleyna-server/dleyna-server-0.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://01.org/sites/default/files/downloads/dleyna/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE=""
RDEPEND="
diff --git a/net-misc/gnome-online-miners/gnome-online-miners-3.14.3-r1.ebuild b/net-misc/gnome-online-miners/gnome-online-miners-3.14.3-r1.ebuild
index 836944a1bb07..e1c4f28f42f0 100644
--- a/net-misc/gnome-online-miners/gnome-online-miners-3.14.3-r1.ebuild
+++ b/net-misc/gnome-online-miners/gnome-online-miners-3.14.3-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineMiners"
LICENSE="GPL-2+"
SLOT="0"
IUSE="flickr"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
# libgdata[gnome] needed for goa support
RDEPEND="
diff --git a/net-misc/grive/Manifest b/net-misc/grive/Manifest
index ceeb9137ad14..7ab66d5021ad 100644
--- a/net-misc/grive/Manifest
+++ b/net-misc/grive/Manifest
@@ -1,3 +1 @@
-DIST grive-0.2.0.tar.gz 145760 SHA256 bb0de191cbe98e8efda6ce8fd5bcef3ae4903984aaaa9592909ddb4a24175f45 SHA512 5bae5d1de4655775347ca3148a0ae8b3294c56dff659cbd32f8c53d6cfa40f645d6f710a2e26e2189e51632bccaba494f45bec55a7721d6f7a40b467b1f3c7fd WHIRLPOOL 167093c15348bfdd6bd9b9db31919708ccd1f79b349ea43bd478227c500d8773d64cbf845e3c2f9747c3097945c4fea68462b3babfd81c0211cc52f03767c92e
-DIST grive-0.3.0_pre20130503.tar.gz 162471 SHA256 0b038cc627f898831872fdf3c20ac563f78a72094f594adda7ff737a1c1f207e SHA512 bd96a02366af47c5fde8e044066616c72a33607818d5e9cf4bea5fe70c0d63f83a2b726ce9a763cb907c78b2a563d7b2296b25e55743288dacef98adea3de729 WHIRLPOOL 38577f235fd9abc3f8f5da56c459c3569ac09cd1e3b16cfbea463a60103c25c0a4a4a163599974d35d8d146a5ec2c9c06e02c1cb518040a5462dd3200c7ebba9
-DIST grive-0.3.0_pre20141119.tar.gz 72990 SHA256 33b27eb534db51c525947810a21327195c24cb7c4ba3b448a33b2a7f98d4c014 SHA512 0ac69985fa597039ef5aaf91c7f1b4de8a1472406365cc1624c9410cdb02a186a4bf81a7d5e8d0272abfb68219de779815b38d030dfc550cd29caf313341cb4b WHIRLPOOL 9b184cdef9b0a74e53bb7235679ba358c7241df824a411c0473ac7a69e7cd1287d7edc6b65b636a59c81665af4b58def499a513921bc2056d210b9d14b811358
+DIST grive-0.4.0_pre20150905.tar.gz 158858 SHA256 c488e9956a48fa5416e1f6082ede649ae9d541b57a5170a4f6ff555e9e92e2aa SHA512 2a6842c742d79345ff805f92e74990de624d656c1f16fd98b2611e2359b051d6dfebef07590390eee3ea07e60143ca9e66ceecd675a3a75d6a099dcb0070ab46 WHIRLPOOL 22d25ea2913568d5132247f3472ca09ee5d291028b8303bd2f6784f1930e3308219f72e7a15b95a5e5a19637fb73e3d60181925afaa21e15f4fdaacc6d7769d4
diff --git a/net-misc/grive/grive-0.2.0-r1.ebuild b/net-misc/grive/grive-0.2.0-r1.ebuild
deleted file mode 100644
index 4d55755b0208..000000000000
--- a/net-misc/grive/grive-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils eutils multilib
-
-if [[ ${PV} = *9999 ]]; then
- inherit git-2
- EGIT_REPO_URI="git://github.com/Grive/${PN}.git"
-else
- inherit eutils vcs-snapshot
- SRC_URI="mirror://github/Grive/${PN}/tarball/v${PV} -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="an open source Linux client for Google Drive"
-HOMEPAGE="http://www.lbreda.com/grive/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- dev-libs/boost:=
- dev-libs/expat
- dev-libs/json-c:=
- dev-libs/libgcrypt:0=
- net-misc/curl
- sys-devel/binutils
- sys-libs/glibc
- sys-libs/zlib
- "
-
-DEPEND="${RDEPEND}"
-
-DOCS=( "README" )
-
-src_prepare() {
- epatch "${FILESDIR}"/"${P}"-check-bfd.h.patch
-
- #include dir change in json-c-0.10 #462632 and #452234
- if has_version ">=dev-libs/json-c-0.10" ; then
- sed -i -e '/\(include\|INCLUDE\)/s@json/@json-c/@' \
- libgrive/src/protocol/Json.cc \
- cmake/Modules/FindJSONC.cmake || die
- fi
- #json-c library changed in 0.11, bug #467432
- if has_version ">=dev-libs/json-c-0.11" ; then
- sed -i -e '/LIBRARY/s@json)@json-c)@' \
- cmake/Modules/FindJSONC.cmake || die
- fi
-}
diff --git a/net-misc/grive/grive-0.3.0_pre20130503.ebuild b/net-misc/grive/grive-0.3.0_pre20130503.ebuild
deleted file mode 100644
index 00548e2f13cc..000000000000
--- a/net-misc/grive/grive-0.3.0_pre20130503.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils eutils multilib
-
-if [[ ${PV} = *9999 ]]; then
- inherit git-2
- EGIT_REPO_URI="git://github.com/Grive/${PN}.git"
-else
- inherit eutils vcs-snapshot
- COMMIT="27817e835fe115ebbda5410ec904aa49a2ad01f1"
- SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="an open source Linux client for Google Drive"
-HOMEPAGE="http://www.lbreda.com/grive/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- dev-libs/boost:=
- dev-libs/expat
- dev-libs/json-c:=
- dev-libs/libgcrypt:0=
- dev-libs/yajl
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- net-misc/curl
- sys-devel/binutils
- sys-libs/glibc
- sys-libs/zlib
- "
-
-DEPEND="${RDEPEND}"
-
-DOCS=( "README" )
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}"-0.2.0-check-bfd.h.patch
-
- #include dir change in json-c-0.10 #462632 and #452234
- if has_version ">=dev-libs/json-c-0.10" ; then
- sed -i -e '/\(include\|INCLUDE\)/s@json/@json-c/@' \
- libgrive/src/protocol/Json.cc \
- cmake/Modules/FindJSONC.cmake || die
- fi
- #json-c library changed in 0.11, bug #467432
- if has_version ">=dev-libs/json-c-0.11" ; then
- sed -i -e '/LIBRARY/s@json)@json-c)@' \
- cmake/Modules/FindJSONC.cmake || die
- fi
-
- sed -i '/grive.1/s/^/#/' bgrive/CMakeLists.txt || die
-}
-
-src_install(){
- cmake-utils_src_install
-
- local icon size
- for icon in icon/*/*.png; do
- size=${icon##*/}
- size=${size%.png}
- newicon -s "${size}" "${icon}" ${PN}.png
- done
- make_desktop_entry bgrive
-}
diff --git a/net-misc/grive/grive-0.3.0_pre20141119.ebuild b/net-misc/grive/grive-0.4.0_pre20150905.ebuild
index 221f78fce166..59b1608601c1 100644
--- a/net-misc/grive/grive-0.3.0_pre20141119.ebuild
+++ b/net-misc/grive/grive-0.4.0_pre20150905.ebuild
@@ -8,15 +8,15 @@ inherit cmake-utils
if [[ ${PV} = *9999 ]]; then
inherit git-2
- EGIT_REPO_URI="git://github.com/linwiz/${PN}.git"
+ EGIT_REPO_URI="git://github.com/vitalif/${PN}2.git"
else
inherit vcs-snapshot
- COMMIT="afd106ff47758d74daac4db35002e5e0d8d4d389"
- SRC_URI="https://github.com/linwiz/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+ COMMIT="5dc7028c8aebb26d35ed31c4b07ac180cc1887c9"
+ SRC_URI="https://github.com/vitalif/${PN}2/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
fi
-DESCRIPTION="an open source Linux client for Google Drive"
-HOMEPAGE="http://www.lbreda.com/grive/"
+DESCRIPTION="An open source Linux client for Google Drive"
+HOMEPAGE="https://github.com/vitalif/grive2"
LICENSE="GPL-2"
SLOT="0"
@@ -31,8 +31,5 @@ RDEPEND="
net-misc/curl
sys-libs/glibc
dev-libs/yajl
- "
-
+"
DEPEND="${RDEPEND}"
-
-DOCS=( "README" )
diff --git a/net-misc/guacamole-server/Manifest b/net-misc/guacamole-server/Manifest
index aebe61f34b86..291baa068af7 100644
--- a/net-misc/guacamole-server/Manifest
+++ b/net-misc/guacamole-server/Manifest
@@ -3,3 +3,4 @@ DIST guacamole-server-0.9.0.tar.gz 556465 SHA256 289cb1ea0261396e9ede6aa0d2ac8d8
DIST guacamole-server-0.9.2.tar.gz 595062 SHA256 b6e26751023082b6f0380323f05b8b50e71bcf4c1421c3118237b5a8df22660d SHA512 ed01bcbfc0612a1b05434cc5c412fbed6f877713049418aa25a577e9e020bd6abddeab4d31a50b5b4a6785b8c79f0625dd90181a643913bd813cbbba3a24bf6c WHIRLPOOL 6eac4e63cfabcedc2d31ed9c2063c6a0f0293dc0a9769e70bbf785d8236e5139caec5d255f9d2094220aca37eb2f96677223de6351a6c818141daf74e6b36185
DIST guacamole-server-0.9.3.tar.gz 614640 SHA256 545e22401bbe62734c02577331c52e54dddf14dd950844d2ccc5aad318c16076 SHA512 eb296f17b27bc14633b511ce6cbe0025e18ea24e3b9b3e132b103de2071a9f18b64d7ced8f20bea1ab8f65755a047e98d670d522f4a5b4ec73e5696ecfb7d948 WHIRLPOOL db2f8f4d0839de9fa82bd0aeb047ed33468f817c0ee094388c7fb587ce044b586a097de94ac2e0e997bb757f31e6f4927e3b1d059f0caab6b7177ca37b5717a8
DIST guacamole-server-0.9.7.tar.gz 639630 SHA256 285f367d89ee51981db84b00698b05b3d9ba5de2fb2922115c9e38d2b9b88d09 SHA512 c9ef2df6d0724c19e61b3f8913e94ff7c39f17e3beca0bd2eab1648e3c96d4b248bef9bc09b47fd8a4da6b994aea9df94e442286ce0fa3881d5e44b4923b1b14 WHIRLPOOL c7f2213b92e6ca40b93a251a72698229c7e34fbfaf00006b372910d7f2456c0cf6ccf75f8d89f136c41b61cd41ea492c52a14e970ff5bc2231fe826584c8d723
+DIST guacamole-server-0.9.8.tar.gz 691627 SHA256 6fcbff7b540ae296e049ff9b25b7b84bae247b54d2d8dfb5672fea4967406bdc SHA512 3bdbc9502070fa11fc276c7122a33a8428d130ad122157740618a5addf77bebf8d79e2c1a765f36a30feed2ac18f1911c84c9dc4a04e0235dd4d4069c8990a73 WHIRLPOOL 2e9be3f0a6492f1d6dab34f00f7decd5b7e133ad879ca6c4822496731a7fe3aac6cb22af43f634f3e526790187acea91f0ae3f3c6a4ab7901c2cbbec71b70ca3
diff --git a/net-misc/guacamole-server/guacamole-server-0.9.8.ebuild b/net-misc/guacamole-server/guacamole-server-0.9.8.ebuild
new file mode 100644
index 000000000000..d093bf36ed71
--- /dev/null
+++ b/net-misc/guacamole-server/guacamole-server-0.9.8.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils systemd user
+DESCRIPTION="This is the proxy-daemon used by www-apps/guacamole"
+
+HOMEPAGE="http://guac-dev.org/"
+SRC_URI="mirror://sourceforge/guacamole/${P}.tar.gz"
+
+LICENSE="MIT"
+
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+IUSE="rdesktop vnc ssh pulseaudio vorbis telnet ssl"
+
+DEPEND="x11-libs/cairo
+ media-libs/libpng:*
+ dev-libs/ossp-uuid
+ rdesktop? ( <net-misc/freerdp-1.1.0_beta1_p20150312 )
+ ssh? ( x11-libs/pango
+ net-libs/libssh2 )
+ telnet? ( net-libs/libtelnet
+ x11-libs/pango )
+ vnc? ( net-libs/libvncserver
+ pulseaudio? ( media-sound/pulseaudio ) )
+ ssl? ( dev-libs/openssl:* )
+ vorbis? ( media-libs/libvorbis )"
+
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local myconf="--without-terminal --without-pango"
+ if use ssh || use telnet; then
+ myconf="--with-terminal --with-pango"
+ fi
+
+ econf $myconf \
+ $(use_with ssh) \
+ $(use_with rdesktop rdp) \
+ $(use_with vnc) \
+ $(use_with pulseaudio pulse) \
+ $(use_with vorbis) \
+ $(use_with telnet) \
+ $(use_with ssl)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ doinitd "${FILESDIR}/guacd"
+ systemd_dounit "${FILESDIR}/guacd.service"
+}
+
+pkg_postinst() {
+ enewgroup guacd
+ enewuser guacd -1 -1 -1 guacd
+}
diff --git a/net-misc/ipv6calc/Manifest b/net-misc/ipv6calc/Manifest
index d4e371879e3f..8a1dcb6fb7a3 100644
--- a/net-misc/ipv6calc/Manifest
+++ b/net-misc/ipv6calc/Manifest
@@ -1,3 +1,4 @@
DIST ipv6calc-0.94.1.tar.gz 749953 SHA256 3bd73fd92c1d971fadea41b39830975b4a20bbcd26587dfb2835964b33de4040 SHA512 804aaa1a78aacd5c78e0de0642438ab85fe00d6bac36310022653c5f4d6e24c0d4c616133dcc9b0e35a0288f4f477f277376ea9465521702e5b46c098aa0fd16 WHIRLPOOL 481aabebcff8b4591105757c3e583c56f1fd2ae4ebe101cb562691abd0a2aaa55eee6eeaec9145e6caba2c1a5f9a4829af125465ea0836e4000c1a67a13e7691
DIST ipv6calc-0.97.4.tar.gz 1037582 SHA256 ed2c9e895fdbffa3bee2e46591e0a010eacdefc1bf8eace5fbee9abaa9c3df39 SHA512 133f4e281da8eb1ea13b7c37123ae9f1b88e100553de758ceaa6cc63b0306e4711447bc7a4c171508fc5ce1ed447daec9749c5a75e5288deef0efcdc095bfcde WHIRLPOOL f6a9eb3201045851705f3631cd35e2aead26a167687b4c2064829ae530a803d6e48c57ac5d47996124b8e41706c1cc91850b9b42f225552640b4dbc9ebf17cb8
DIST ipv6calc-0.99.0.tar.gz 1155118 SHA256 fc7535b900339d75d9862b1c3d359304330f72e94a4cade539dfb714e533fdb5 SHA512 18993711a9203b1d7ecbaa885cb8cb21738b4d25e379593f18b7f833ae7f1675339ec25b39bec7424735a97781a3dc9f4b4453e00873a3526dd3c2ff5ef64965 WHIRLPOOL 7e66df01d4270f88003bf8c44e93b4d4988744b488bd28eacd6e375e3e51c4f1d5717caeebbe2a6810a49342a5df86ac1e2ee0eabfc6bb1f14b289c0d1312dad
+DIST ipv6calc-0.99.1.tar.gz 1234188 SHA256 b0bc5d2f83c928524f82053b40f670589bd0181719046a2e4c267912a2ba1d28 SHA512 976c8a6b72e197b7f2e5096939f53a30440095aeac76043cddef38f671cf6c91d77b5c5b971276670f7e3f81404a72b41d8cc863e37c882974d034362d0a28de WHIRLPOOL 0bbff968d665e0c77afc110f018296d4ee6f6d284ab9328ce95db8a8536576fdf706b6ee22f213446dfb72be656e0353b0f4e4e317ce59c008355c7d0296dfda
diff --git a/net-misc/ipv6calc/ipv6calc-0.97.4.ebuild b/net-misc/ipv6calc/ipv6calc-0.97.4.ebuild
index 82290215b0b5..90d029ca4e8d 100644
--- a/net-misc/ipv6calc/ipv6calc-0.97.4.ebuild
+++ b/net-misc/ipv6calc/ipv6calc-0.97.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 hppa ppc ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="geoip test"
RDEPEND="
diff --git a/net-misc/ipv6calc/ipv6calc-0.99.1.ebuild b/net-misc/ipv6calc/ipv6calc-0.99.1.ebuild
new file mode 100644
index 000000000000..526f6b80f208
--- /dev/null
+++ b/net-misc/ipv6calc/ipv6calc-0.99.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit eutils
+
+DESCRIPTION="IPv6 address calculator"
+HOMEPAGE="http://www.deepspace6.net/projects/ipv6calc.html"
+SRC_URI="ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="geoip test"
+
+RDEPEND="
+ dev-libs/openssl:=
+ geoip? ( >=dev-libs/geoip-1.4.7 )
+"
+DEPEND="${RDEPEND}
+ test? ( dev-perl/Digest-SHA1 )
+"
+
+#dev-perl/URI is needed for web interface, that is not installed now
+
+src_configure() {
+ # These options are broken. You can't disable them. That's
+ # okay because we want then force enabled.
+ # --disable-db-as-registry
+ # --disable-db-cc-registry
+ if use geoip; then
+ myconf=$(use_enable geoip)
+ myconf+=" --with-geoip-db=${EPREFIX}/usr/share/GeoIP"
+ fi
+ econf \
+ --disable-bundled-getopt \
+ --disable-bundled-md5 \
+ --enable-shared \
+ --enable-dynamic-load \
+ --enable-db-ieee \
+ --enable-db-ipv4 \
+ --enable-db-ipv6 \
+ --disable-dbip \
+ --disable-external \
+ --disable-ip2location \
+ ${myconf}
+}
+
+src_compile() {
+ # Disable default CFLAGS (-O2 and -g)
+ emake DEFAULT_CFLAGS=""
+}
+
+src_test() {
+ if [[ ${EUID} -eq 0 ]]; then
+ # Disable tests that fail as root
+ echo true > ipv6logstats/test_ipv6logstats.sh
+ fi
+ default
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc ChangeLog CREDITS README TODO USAGE
+}
diff --git a/net-misc/lksctp-tools/lksctp-tools-1.0.16.ebuild b/net-misc/lksctp-tools/lksctp-tools-1.0.16.ebuild
index 92c033b79dec..5feba66c9b51 100644
--- a/net-misc/lksctp-tools/lksctp-tools-1.0.16.ebuild
+++ b/net-misc/lksctp-tools/lksctp-tools-1.0.16.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/lksctp/${P}.tar.gz"
LICENSE="|| ( GPL-2+ LGPL-2.1 )"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86"
IUSE="kernel_linux static-libs"
# This is only supposed to work with Linux to begin with.
diff --git a/net-misc/modemmanager/modemmanager-1.4.10.ebuild b/net-misc/modemmanager/modemmanager-1.4.10.ebuild
index f4441121c4fe..3de6c3da6dbe 100644
--- a/net-misc/modemmanager/modemmanager-1.4.10.ebuild
+++ b/net-misc/modemmanager/modemmanager-1.4.10.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar
LICENSE="GPL-2+"
SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="+introspection mbim policykit +qmi qmi-newest vala"
REQUIRED_USE="
qmi-newest? ( qmi )
diff --git a/net-misc/mulk/mulk-0.6.0.ebuild b/net-misc/mulk/mulk-0.6.0.ebuild
index 545c6088e812..f92c34e3bdac 100644
--- a/net-misc/mulk/mulk-0.6.0.ebuild
+++ b/net-misc/mulk/mulk-0.6.0.ebuild
@@ -26,7 +26,7 @@ DEPEND="net-misc/curl
checksum? ( dev-libs/openssl )
)"
-REQUIRE_USE="checksum? ( metalink )"
+REQUIRED_USE="checksum? ( metalink )"
RDEPEND="${DEPEND}"
diff --git a/net-misc/mulk/mulk-0.7.0.ebuild b/net-misc/mulk/mulk-0.7.0.ebuild
index ba5d01d4c697..def1aee1adfe 100644
--- a/net-misc/mulk/mulk-0.7.0.ebuild
+++ b/net-misc/mulk/mulk-0.7.0.ebuild
@@ -26,7 +26,7 @@ DEPEND="net-misc/curl
checksum? ( dev-libs/openssl )
)"
-REQUIRE_USE="checksum? ( metalink )"
+REQUIRED_USE="checksum? ( metalink )"
RDEPEND="${DEPEND}"
diff --git a/net-misc/netcf/Manifest b/net-misc/netcf/Manifest
deleted file mode 100644
index 54a3deb24b93..000000000000
--- a/net-misc/netcf/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST netcf-0.1.9.tar.gz 579227 RMD160 29bc4166c605cb1a7ee75c00429002c5603c359d SHA1 9cb91e94989215ad23a7c3b3f5c59fefaf0df261 SHA256 01a6ad0879a1140deaf7b46d3d38a852370bcdc6456c43f02e2db0715c2fb3bb
diff --git a/net-misc/netcf/metadata.xml b/net-misc/netcf/metadata.xml
deleted file mode 100644
index b2b86fc4d13d..000000000000
--- a/net-misc/netcf/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer>
- <email>cardoe@gentoo.org</email>
- <name>Doug Goldstein</name>
- <description>Anyone can take over this package if they
- want</description>
- </maintainer>
-</pkgmetadata>
-
diff --git a/net-misc/netcf/netcf-0.1.9.ebuild b/net-misc/netcf/netcf-0.1.9.ebuild
deleted file mode 100644
index 921e291a7266..000000000000
--- a/net-misc/netcf/netcf-0.1.9.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-DESCRIPTION="netcf is a cross-platform network configuration library"
-HOMEPAGE="https://fedorahosted.org/netcf/"
-SRC_URI="https://fedorahosted.org/released/netcf/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=app-admin/augeas-0.5.0
- dev-libs/libnl:1.1
- dev-libs/libxml2
- dev-libs/libxslt
- sys-libs/readline"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- # static libs are a waste of time and disk for this
- econf --disable-static
-}
-
-src_install() {
- emake DESTDIR="${ED}" install || die "install failed"
- dodoc AUTHORS ChangeLog README NEWS
-}
diff --git a/net-misc/networkmanager-openswan/Manifest b/net-misc/networkmanager-openswan/Manifest
index 08d2d1aa6c76..6da569344d24 100644
--- a/net-misc/networkmanager-openswan/Manifest
+++ b/net-misc/networkmanager-openswan/Manifest
@@ -1,4 +1,2 @@
-DIST NetworkManager-openswan-0.9.8.4.tar.xz 301068 SHA256 b11bbfeb2eb2efe6392a94f4b8f41efc3c79a947ed2eff3f0881d5bcd2edf107 SHA512 0e32005d979923add3db42333f6bf3f5e6759cde9436a4f6deb9e21f0ec227b5fe91467dbb2e4d95ed576cbfef016096123e36684af006b4b38ed141cc3eab20 WHIRLPOOL d211035e4d2d1ba068a3fed2b09d6177114c1fd90253a8518064fff6b859144441fc42b5388db7ae5b61731d8713dc8c79bcd2caa4490fba0135677f7bfafe25
-DIST NetworkManager-openswan-1.0.0.tar.xz 306000 SHA256 baac8816c95cc8d50aa00cbe8a78d8ddeb0b8ce710367e7e776ef36dd80c97fd SHA512 c39a9d21bca6d1a831cdbbe58115801d317e0d3f62f2298d04333a940e425220915e5803fe8e32b9e18a78584acb7e978b885546ab99d15895f9a7281c2cd337 WHIRLPOOL 54dec450f81ddbc9f8554daa2f27d228fc7edd64b72dad2ee203a88b4a61e1955063b8d3680ed3d7660f67b138d9db340e5ac2c352b4fde7228589d44b4c137e
DIST NetworkManager-openswan-1.0.2.tar.xz 307168 SHA256 9a31b792e9b0d6a577a00fe8b9fb45d363bed790b43bbedbf1015fefb164adba SHA512 b1b5b7f8085c1b7ff48970416b527cf28ca617c9073115c0753e36c9f0aa45961febe82a73aa77e51feca677ef5ac3e6c8c7c6d9601b12ecb2eeea8c56899d07 WHIRLPOOL 5cc047b199aff8e1fc27ae038a1ea2c99f34ef508eb0aeeaf6345307eddf8f189f2b9d66e545e97099c128f05c9a51bd779ebe64a46a8d9a2af98a1231d53f58
-DIST networkmanager-openswan-0.9.8.4-patches.tar.bz2 11604 SHA256 fbf01743fa6cd0cb8986a218d54e5da5d0eb8caed92f05f8aa68a87de07b4a0b SHA512 f488b5c25011ef5af2e862f2f9885b1529448303da47ca611339e8b5929be2212d4dcacc08e5b8075ef3f57ed1bd0f09d163e0582b14dcbf2a81b2dc12cc77b0 WHIRLPOOL d36dd8b68ec70e57ce2aea79ed50aa47e071416396de3a85f6fcdf3c0b722952265608695dc62d2e78f9c51c03a9279edf92386d635d09acdf7ed371f7600e2a
+DIST NetworkManager-openswan-1.0.6.tar.xz 306648 SHA256 79e1f85d10d6b80548594bedaed990643b730dbc738a2465ca78112dfa5db4e1 SHA512 e1f4fd9fe6e535fa717deb862cbf08e73e5f66a7a3d8ca328f653f009229a3a811de5157f641588a884528a8c9e2d63b22759864fa4d02276b1cf0721c8932ce WHIRLPOOL bf7fc847e8e28180821d14710717bd7cde90786dc3461bcd1791b194b9e619e895044bdd319754ffe6e50390e76e5b40e14d652ef58966e1c9e3db29ca5f30f8
diff --git a/net-misc/networkmanager-openswan/networkmanager-openswan-0.9.8.4-r1.ebuild b/net-misc/networkmanager-openswan/networkmanager-openswan-0.9.8.4-r1.ebuild
deleted file mode 100644
index 8b6819eb95bf..000000000000
--- a/net-misc/networkmanager-openswan/networkmanager-openswan-0.9.8.4-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="NetworkManager Openswan plugin"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-SRC_URI="${SRC_URI} https://dev.gentoo.org/~pacho/gnome/${P}-patches.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk"
-
-RDEPEND="
- >=net-misc/networkmanager-0.9.8:=
- >=dev-libs/dbus-glib-0.74
- || ( net-misc/openswan net-misc/libreswan )
- gtk? (
- >=x11-libs/gtk+-3.0.0:3
- gnome-base/gnome-keyring
- gnome-base/libgnome-keyring
- )"
-
-DEPEND="${RDEPEND}
- sys-devel/gettext
- dev-util/intltool
- virtual/pkgconfig"
-
-src_prepare() {
- # Apply patches from Fedora, upstream bug #735692
- epatch "${WORKDIR}/${P}-patches"/*.patch
- echo "auth-dialog/nm-openswan-auth-dialog.desktop.in" >> po/POTFILES.in || die
- echo "auth-dialog/nm-openswan-auth-dialog.desktop.in.in" >> po/POTFILES.in || die
-
- eautoreconf
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-more-warnings \
- --disable-static \
- --with-dist-version=Gentoo \
- --with-gtkver=3 \
- $(use_with gtk gnome)
-}
diff --git a/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.0.ebuild b/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.6.ebuild
index 87cb09caea58..a66b8445582d 100644
--- a/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.0.ebuild
+++ b/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.6.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
IUSE="gtk"
RDEPEND="
@@ -24,6 +24,7 @@ RDEPEND="
|| ( net-misc/openswan net-misc/libreswan )
gtk? (
app-crypt/libsecret
+ >=gnome-extra/nm-applet-0.9.10
>=x11-libs/gtk+-3.4:3
)
"
diff --git a/net-misc/networkmanager-openvpn/Manifest b/net-misc/networkmanager-openvpn/Manifest
index 3a665930da91..9593c1979e97 100644
--- a/net-misc/networkmanager-openvpn/Manifest
+++ b/net-misc/networkmanager-openvpn/Manifest
@@ -1,4 +1,2 @@
-DIST NetworkManager-openvpn-0.9.10.0.tar.xz 400648 SHA256 7b65e738a189758b090eca7a2da63d444776c89adb979e71bcc3a982a1ff140d SHA512 89ba98c3c5e1598d4619b2199e3f4030d3b130e0b738478da28b0b6ccbb5083763b8709b1b2a61d8e847522eff09a25d56da8eadd2016e22e8838077d02f0e88 WHIRLPOOL 568acc5eb72bf701bad5822f99be19677e1ea4c2545f4503d7ba9885378902bcdb0ed68b5c074f1b79adf7a30fa5f2cb0d3813fbb7258e50bd9e6b7f84cb3e53
-DIST NetworkManager-openvpn-0.9.8.4.tar.xz 395816 SHA256 af8c52b6a61af3c178eed1ea8f1d4704bea87331fde43deb3d4aafe1821e6687 SHA512 e0b5f0dd4eb07adbc4d07dac4d3a2dd19f9154bb5eb654d2ae0ab4c9dce2f351c65e3b4edfd9635ac254b14cf5bed0aecf659b98f410d932ecd22b0363677e70 WHIRLPOOL b9c2a32325224d1e293ddf9072a69892ba41c253b0b493640fd5f6d048cbe93609c6252408a3ef148707d51cf512155ba24bddb5df8757dacafed1f8927f340f
-DIST NetworkManager-openvpn-1.0.0.tar.xz 406752 SHA256 d0ad918c8d3736b690f0ed031c03251829fa110aa339e0e531e47100551f1bf0 SHA512 f9034b4b5cccc990e361cc446e42397b12114437e639a31008cac03804dd66a5b27b69dcc72b4ba1d3beaba256f0ab8ed4f50a8a1503f224828251aae5131570 WHIRLPOOL 532d8561abf3c1acc8f068747e99492dde393b8a287f257e4a17f23ee62b2fd13e9bc03f97825f58f654b09021cb2a309977268cd07dd7649125c945d5fbfc7f
DIST NetworkManager-openvpn-1.0.2.tar.xz 413496 SHA256 1643824bc7fdab42e1dab836bf81c328692295c86f146bde602eca093b394bb0 SHA512 7ee60b47ac0825e116e8c90c577fee778d2a271cdc97772aa716a9a348a576a3afb8db541473297a3cd775fd716d528df385622c54a82139b3701ebab1980a50 WHIRLPOOL fdbc330736bd8b24a834b01c5cc1dd81acaef557fa754b5668a8354ebc39c85288798259ae6c107c76d4fc329217f776057f7c50a631695d481e7ccee0ee385c
+DIST NetworkManager-openvpn-1.0.6.tar.xz 413464 SHA256 c982b644fa43d3019cb654a17e692bb3a7175a86d28065ea51f55ae7dfe45d8c SHA512 4ea2a6c71d73d5fd6db7a5c68b8521db6c1b24f3ae825a4db0ba540fc954408127b6e7a212b02139e518abc3e6fc715c14c7799e0e106e987e7a8c6bddffa48a WHIRLPOOL 5c9c769619bc32aa9bba42dd381c28c11f477c50077d89e6c2894548f15e2dc2e7e306411ec798b3436be7e2ce8925cc8928a5b517f801eb6ce2f73539e78ae8
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.9.10.0.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.9.10.0.ebuild
deleted file mode 100644
index bb02e71efe13..000000000000
--- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.9.10.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2
-
-DESCRIPTION="NetworkManager OpenVPN plugin"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk test"
-
-RDEPEND="
- >=dev-libs/dbus-glib-0.74
- >=dev-libs/glib-2.32:2
- >=net-misc/networkmanager-0.9.9
- >=net-misc/openvpn-2.1_rc9
- gtk? (
- app-crypt/libsecret
- >=gnome-extra/nm-applet-0.9.9.0
- >=x11-libs/gtk+-3.4:3
- )"
-
-DEPEND="${RDEPEND}
- sys-devel/gettext
- >=dev-util/intltool-0.35
- virtual/pkgconfig
-"
-
-src_prepare() {
- # Test will fail if the machine doesn't have a particular locale installed
- # FAIL: (tls-import-data) unexpected 'ca' secret value
- sed '/test_non_utf8_import (plugin, test_dir)/ d' \
- -i properties/tests/test-import-export.c || die "sed failed"
-
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-more-warnings \
- --disable-static \
- --with-dist-version=Gentoo \
- $(use_with gtk gnome) \
- $(use_with test tests)
-}
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.9.8.4.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.9.8.4.ebuild
deleted file mode 100644
index 03f1daedef64..000000000000
--- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.9.8.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit eutils gnome2-utils gnome.org
-
-DESCRIPTION="NetworkManager OpenVPN plugin"
-HOMEPAGE="https://www.gnome.org/projects/NetworkManager/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="gtk test"
-
-RDEPEND="
- >=dev-libs/dbus-glib-0.74
- >=net-misc/networkmanager-0.9.8
- >=net-misc/openvpn-2.1_rc9
- gtk? (
- >=x11-libs/gtk+-2.91.4:3
- gnome-base/gnome-keyring
- gnome-base/libgnome-keyring
- )"
-
-DEPEND="${RDEPEND}
- sys-devel/gettext
- >=dev-util/intltool-0.35
- virtual/pkgconfig
-"
-
-src_prepare() {
- # Test will fail if the machine doesn't have a particular locale installed
- # FAIL: (tls-import-data) unexpected 'ca' secret value
- sed '/test_non_utf8_import (plugin, test_dir)/ d' \
- -i properties/tests/test-import-export.c || die "sed failed"
-
- gnome2_disable_deprecation_warning
-}
-
-src_configure() {
- econf \
- --disable-more-warnings \
- --disable-static \
- --with-dist-version=Gentoo \
- --with-gtkver=3 \
- $(use_with gtk gnome) \
- $(use_with test tests)
-}
-
-src_install() {
- default
- prune_libtool_files
-}
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.0.0.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.0.0.ebuild
deleted file mode 100644
index 8fe1f5adbe5c..000000000000
--- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.0.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GCONF_DEBUG="no"
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit eutils gnome2
-
-DESCRIPTION="NetworkManager OpenVPN plugin"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="gtk test"
-
-RDEPEND="
- >=dev-libs/dbus-glib-0.74
- >=dev-libs/glib-2.32:2
- >=net-misc/networkmanager-0.9.10:=
- >=net-misc/openvpn-2.1_rc9
- gtk? (
- app-crypt/libsecret
- >=gnome-extra/nm-applet-0.9.9.0
- >=x11-libs/gtk+-3.4:3
- )"
-
-DEPEND="${RDEPEND}
- sys-devel/gettext
- >=dev-util/intltool-0.35
- virtual/pkgconfig
-"
-
-src_prepare() {
- # Test will fail if the machine doesn't have a particular locale installed
- # FAIL: (tls-import-data) unexpected 'ca' secret value, upstream bug #742708
- sed '/test_non_utf8_import (plugin, test_dir)/ d' \
- -i properties/tests/test-import-export.c || die "sed failed"
-
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-more-warnings \
- --disable-static \
- --with-dist-version=Gentoo \
- $(use_with gtk gnome) \
- $(use_with test tests)
-}
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.0.0-r1.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.0.6-r1.ebuild
index 135bdf1df92b..d653cc35f606 100644
--- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.0.0-r1.ebuild
+++ b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.0.6-r1.ebuild
@@ -6,14 +6,14 @@ EAPI=5
GCONF_DEBUG="no"
GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-inherit eutils gnome2
+inherit eutils gnome2 user
DESCRIPTION="NetworkManager OpenVPN plugin"
HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~x86"
IUSE="gtk test"
RDEPEND="
@@ -23,16 +23,21 @@ RDEPEND="
>=net-misc/openvpn-2.1_rc9
gtk? (
app-crypt/libsecret
- >=gnome-extra/nm-applet-0.9.9.0
+ >=gnome-extra/nm-applet-1.0.5
>=x11-libs/gtk+-3.4:3
- )"
-
+ )
+"
DEPEND="${RDEPEND}
sys-devel/gettext
>=dev-util/intltool-0.35
virtual/pkgconfig
"
+pkg_setup() {
+ enewgroup nm-openvpn
+ enewuser nm-openvpn -1 -1 -1 nm-openvpn
+}
+
src_prepare() {
# Test will fail if the machine doesn't have a particular locale installed
# FAIL: (tls-import-data) unexpected 'ca' secret value, upstream bug #742708
diff --git a/net-misc/networkmanager-pptp/Manifest b/net-misc/networkmanager-pptp/Manifest
index b8fe619348c8..b00561885c73 100644
--- a/net-misc/networkmanager-pptp/Manifest
+++ b/net-misc/networkmanager-pptp/Manifest
@@ -1,4 +1,2 @@
-DIST NetworkManager-pptp-0.9.10.0.tar.xz 350984 SHA256 564b16c9b2821a1d2ede06f56f4db5cb0d62ccb35f87c92ad6c636ed48e0af58 SHA512 97ed2840e3615d9131319e752536fd5ed30d8fe1e3084fd82ec963f5efa30ff627cd30d1c21cc6382ea58c2edd4422d3ce597d170bb26c2471d044c19c19b2c8 WHIRLPOOL 932d9eeb9f2dce7cb528e5fd6f841208f09454830365ae99c1afa9c26bc05a6049a1b50c52b66d61a3eec9ef976f3eee2b9a9b01ed57b9a9b822c01430c96aa1
-DIST NetworkManager-pptp-0.9.8.4.tar.xz 353004 SHA256 97ba8f6f726056c3b8e0e1c8d2ab3d32791cadd7c3a38e0478fb2bd3ecafdce8 SHA512 86138cb91b22596c075575cad7ad6c5c9efa3cc6d3491bb148b6ba79007968764b6043c3b89d1034b6825d25f2cf56158f9f278d5a2c12636e34c541384e5489 WHIRLPOOL 2ce9389bbc3623748f74e706389ae7b6969aa82fe0c63dcc6293721b90d373d4046a7a89c09e26a80531724b7208eba49871b139924141969dddb519f9e6884d
-DIST NetworkManager-pptp-1.0.0.tar.xz 351716 SHA256 200d5c65cdae248d3b4d0daa76a4f8bc1432376ed4da7afedd5085bb0da7ee76 SHA512 554811d19324fa73406b6a37f0bcb8694f076e25eedb8f2ba6ac4acda4d2890bb4af750d6ec14df3a0ee330f137f385f40fa8ccb579c6d712a08d9aba9080b77 WHIRLPOOL cfd0e7cce0a049123d05e60acde1122569e0f80f414f4b0b89a74107f3898db4a95205f6e0646fe687fb4a3927682faae0fa1937b7634df30bc4db65fd75e04a
DIST NetworkManager-pptp-1.0.2.tar.xz 353420 SHA256 37cb7c6064d1a65ea9b67bb9d31947c2434db3cfb55a2911481fa4e48e332017 SHA512 02518ed9b38ce8fde61d254a9375b709dbca394e5037f213203ab5b58dd7525813862d5a115f036612cefc362a28063cb2fd394621a53269a315578076592bbe WHIRLPOOL ca03929b928b8830b64ee8418e28f562d85da074a293e88938289230a4feb9afd691ef79fbdac8e435cc28fc0a98bb2b1161815b8c73c2bfd80a4c007f3a9dad
+DIST NetworkManager-pptp-1.0.6.tar.xz 354148 SHA256 96fa456ba43e62d017890efcad018894b1c0a9168f0aab3399f673313272c1be SHA512 0219b51d4a749f4f2164e9ffb94ae1c04fee2dc3477c0d16f8ed71d71728226568d733e86e880b76040affbf279718f2eb81b86be8dc76988ef0940c315a50ec WHIRLPOOL 70d92639cc578302aa3a306952998ca965839a10f30fef7e9bceb63274aea3934a4338cd6e4171cea839c1670d37dfad00bc8707ba02d24b4c8e710651d8f64f
diff --git a/net-misc/networkmanager-pptp/networkmanager-pptp-0.9.10.0.ebuild b/net-misc/networkmanager-pptp/networkmanager-pptp-0.9.10.0.ebuild
deleted file mode 100644
index 1bb2ddc57a41..000000000000
--- a/net-misc/networkmanager-pptp/networkmanager-pptp-0.9.10.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GCONF_DEBUG="no"
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit gnome2
-
-DESCRIPTION="NetworkManager PPTP plugin"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk"
-
-RDEPEND="
- >=net-misc/networkmanager-0.9.6
- >=dev-libs/dbus-glib-0.74
- >=dev-libs/glib-2.32:2
- net-dialup/ppp:=
- net-dialup/pptpclient
- gtk? (
- app-crypt/libsecret
- >=gnome-extra/nm-applet-0.9.9.0
- >=x11-libs/gtk+-3.4:3
- )"
-
-DEPEND="${RDEPEND}
- sys-devel/gettext
- dev-util/intltool
- virtual/pkgconfig
-"
-
-src_configure() {
- local myconf
- # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
- local PPPD_VER=`best_version net-dialup/ppp`
- PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
- PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
- myconf="${myconf} --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER}"
-
- gnome2_src_configure \
- --disable-more-warnings \
- --disable-static \
- --with-dist-version=Gentoo \
- $(use_with gtk gnome) \
- ${myconf}
-}
diff --git a/net-misc/networkmanager-pptp/networkmanager-pptp-0.9.8.4.ebuild b/net-misc/networkmanager-pptp/networkmanager-pptp-0.9.8.4.ebuild
deleted file mode 100644
index 6c7e092e4cde..000000000000
--- a/net-misc/networkmanager-pptp/networkmanager-pptp-0.9.8.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit eutils gnome2-utils gnome.org
-
-DESCRIPTION="NetworkManager PPTP plugin"
-HOMEPAGE="https://www.gnome.org/projects/NetworkManager/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="gtk"
-
-RDEPEND="
- >=net-misc/networkmanager-0.9.8
- >=dev-libs/dbus-glib-0.74
- net-dialup/ppp
- net-dialup/pptpclient
- gtk? (
- >=x11-libs/gtk+-2.91.4:3
- gnome-base/gnome-keyring
- gnome-base/libgnome-keyring
- )"
-
-DEPEND="${RDEPEND}
- sys-devel/gettext
- dev-util/intltool
- virtual/pkgconfig
-"
-
-src_prepare() {
- gnome2_disable_deprecation_warning
-}
-
-src_configure() {
- econf \
- --disable-more-warnings \
- --disable-static \
- --with-dist-version=Gentoo \
- --with-gtkver=3 \
- $(use_with gtk gnome)
-}
-
-src_install() {
- default
- prune_libtool_files
-}
diff --git a/net-misc/networkmanager-pptp/networkmanager-pptp-1.0.0.ebuild b/net-misc/networkmanager-pptp/networkmanager-pptp-1.0.6.ebuild
index 85f1c5d68f7e..142b77f2b136 100644
--- a/net-misc/networkmanager-pptp/networkmanager-pptp-1.0.0.ebuild
+++ b/net-misc/networkmanager-pptp/networkmanager-pptp-1.0.6.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~x86"
IUSE="gtk"
RDEPEND="
@@ -24,10 +24,10 @@ RDEPEND="
net-dialup/pptpclient
gtk? (
app-crypt/libsecret
- >=gnome-extra/nm-applet-0.9.9.0
+ >=gnome-extra/nm-applet-1.0.5
>=x11-libs/gtk+-3.4:3
- )"
-
+ )
+"
DEPEND="${RDEPEND}
sys-devel/gettext
dev-util/intltool
diff --git a/net-misc/networkmanager-vpnc/Manifest b/net-misc/networkmanager-vpnc/Manifest
index 5c46a91f9a6c..fe7c93f311c0 100644
--- a/net-misc/networkmanager-vpnc/Manifest
+++ b/net-misc/networkmanager-vpnc/Manifest
@@ -1,4 +1,2 @@
-DIST NetworkManager-vpnc-0.9.10.0.tar.xz 348824 SHA256 cf9168876602af8d56c79c888ce168b62485dc65bb7690a86ce5f4603eb48774 SHA512 0291f605cbbc15ddc54ccc60f9249ff6f62e4724944a5a22183580cc66db28dcda75bee49cb1c2964a35e126fb9b956d9ffd1cbd1a7fe058ecd798464ad6cd9a WHIRLPOOL 32b74d78807a7989fbccb2bb044886626776e3860de69f72b5b661a7a5a92772b732cdc683a1c0c483e261df5a8584c7b4f9a1f87b262a5eb1cab606a8fab2f5
-DIST NetworkManager-vpnc-0.9.8.6.tar.xz 348168 SHA256 40306cd713d4e6e9df6a520d2992664d22173b3327e94df45a6dac23f0a8abd6 SHA512 ccd44a5a55caa46d950a1afca393987820fcd60f13a921599d6fa47d09508c5e72cc58861824b0d83376bd4cf3105f0ef1163d2b88afe72ea467f5f8f6a8ab1d WHIRLPOOL 292abff615e239460702f9eba44cdbfd2ab7710674f695e1772cc0b8d9ee3b7eff548ac0216b2ca43695d3c4c109c02b528d929ff6aedbef7a3725b64a7e77e0
-DIST NetworkManager-vpnc-1.0.0.tar.xz 356224 SHA256 5ed0413932cd2d6100dc8b95e11ce18c44a182d81aca1dfd0400a6e419359894 SHA512 c3b99e5c8bab084fe47684dc991044c1fab65e36a91c9df9dafde1a78dadffdecce12b001206ad4351638ae5a2518381a7952346908baa7346c2eaa2e3b41e93 WHIRLPOOL 66dc5aee71004ca58de871f4f1f4b416d41c37959bdc5b345d088e39ba12fd37bc34a65f98b37c728d16f48488011f4b0c39ca9cd09d4b1394ad4c99dd76baf9
DIST NetworkManager-vpnc-1.0.2.tar.xz 358100 SHA256 3e17bfc505d304b3d21a784c06fc4b990cabdafd6886b47632496dfba0dea500 SHA512 8f6fdf84d4951c0f623791a40ff141db34d7d00b3d48e3afc80a8bb1d591840717ef7eb145c9c021423174404eeb3133c537d3b970940cd7b43595a0257473d3 WHIRLPOOL aea37a15d893ce0af9a2220afe70fe4c93f33783132a7fa1d4b19e5fd1922a2bc08dc0ce86ea029ecd09fee4b742dd3e407c8896afe3cd7cc71ce4a2152149e6
+DIST NetworkManager-vpnc-1.0.6.tar.xz 357504 SHA256 538298d72845863bf16435940333d30a32a3b28b03b67f9f46c8a0c32cbdcc43 SHA512 ca14dffd9cfc2758dd435990a8afb6985b80425bf7886b36183566320c98a529c0b71f9a46c4b1aebdfe1bdc427b7cdc8e23b248a2bd0a52ef04333fc11b2c7b WHIRLPOOL 9d1db24f40ec050defda1753105bbc1955b4ed3af82283f2b2f42cf0b2d5af4f6934e7790f15190f1e441d4ed1a093ab3429e2918e8ebc243743de7d31336664
diff --git a/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.9.10.0.ebuild b/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.9.10.0.ebuild
deleted file mode 100644
index ad715e6df1bc..000000000000
--- a/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.9.10.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GCONF_DEBUG="no"
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit gnome2
-
-DESCRIPTION="NetworkManager VPNC plugin"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk test"
-
-RDEPEND="
- >=net-misc/networkmanager-0.9.6
- >=dev-libs/dbus-glib-0.74
- >=dev-libs/glib-2.32:2
- >=net-misc/vpnc-0.5
- gtk? (
- app-crypt/libsecret
- >=gnome-extra/nm-applet-0.9.9.0
- >=x11-libs/gtk+-3.4:3
- )
-"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- dev-util/intltool
- virtual/pkgconfig
-"
-
-src_prepare() {
- # Test will fail if the machine doesn't have a particular locale installed
- sed '/test_non_utf8_import (plugin/ d' \
- -i properties/tests/test-import-export.c || die "sed failed"
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-more-warnings \
- --disable-static \
- --with-dist-version=Gentoo \
- $(use_with gtk gnome) \
- $(use_with test tests)
-}
diff --git a/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.9.8.6.ebuild b/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.9.8.6.ebuild
deleted file mode 100644
index df6b76a48baa..000000000000
--- a/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.9.8.6.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit eutils gnome2-utils gnome.org
-
-DESCRIPTION="NetworkManager VPNC plugin"
-HOMEPAGE="https://www.gnome.org/projects/NetworkManager/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="gtk test"
-
-RDEPEND="
- >=net-misc/networkmanager-0.9.8
- >=dev-libs/dbus-glib-0.74
- >=net-misc/vpnc-0.5
- gtk? (
- >=x11-libs/gtk+-2.91.4:3
- gnome-base/gnome-keyring
- gnome-base/libgnome-keyring
- )
-"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- dev-util/intltool
- virtual/pkgconfig
-"
-
-src_prepare() {
- # Test will fail if the machine doesn't have a particular locale installed
- sed '/test_non_utf8_import (plugin/ d' \
- -i properties/tests/test-import-export.c || die "sed failed"
-
- gnome2_disable_deprecation_warning
-}
-
-src_configure() {
- econf \
- --disable-more-warnings \
- --disable-static \
- --with-dist-version=Gentoo \
- --with-gtkver=3 \
- $(use_with gtk gnome) \
- $(use_with test tests)
-}
-
-src_install() {
- default
- prune_libtool_files
-}
diff --git a/net-misc/networkmanager-vpnc/networkmanager-vpnc-1.0.0.ebuild b/net-misc/networkmanager-vpnc/networkmanager-vpnc-1.0.6.ebuild
index 5765c3207c94..71d980b47ab8 100644
--- a/net-misc/networkmanager-vpnc/networkmanager-vpnc-1.0.0.ebuild
+++ b/net-misc/networkmanager-vpnc/networkmanager-vpnc-1.0.6.ebuild
@@ -13,17 +13,17 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~x86"
IUSE="gtk test"
RDEPEND="
>=net-misc/networkmanager-0.9.10:=
>=dev-libs/dbus-glib-0.74
>=dev-libs/glib-2.32:2
- >=net-misc/vpnc-0.5
+ >=net-misc/vpnc-0.5.3_p550
gtk? (
app-crypt/libsecret
- >=gnome-extra/nm-applet-0.9.9.0
+ >=gnome-extra/nm-applet-1.0.5
>=x11-libs/gtk+-3.4:3
)
"
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 96ae1db3c177..3d6b3b98e515 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -1,5 +1,3 @@
-DIST NetworkManager-0.9.10.1_pre20141101.tar.xz 2507248 SHA256 5f2e61c74713ce9ebb755c23c9aca279f321eb924247c282bdd50c2c8337fe40 SHA512 0cc4ec34e5933229a9b25e25b26d7619ac1a61275cd4c33a658c98578e6a27d4d2b1337c1e839467c625739a6ae2175ab6d883c4bfbe35642dbbafb7b11a421d WHIRLPOOL 1d0fb976ffc26aba74fc8b8bee081efc236ea647da0970a5564730522f2f837bfa5cd0853268d5098126810a4429b2ff7840f9cf66e6faa3bd5829b175679681
-DIST NetworkManager-0.9.8.10.tar.xz 2015492 SHA256 064d27223d3824859df12e1fb25b787fec1c68bbc864dc52a0289b9211c4c972 SHA512 8688b8dceadf87d26b76bdda76ecb0b383ecaa7991487e6f6ddc150cf311f2f0cb3487afd91f19ecde2925585e8d53c8761fd45743f25c488eff6a7811ca4200 WHIRLPOOL 29c4f2189eb812c23e8c1cfbce728c525282ad3f04d3c9c25b3a80a043c95f2a9419fa71ac6f8a59d7abde8a30275e68e3ef615b74f78c07846757d92f114e1c
-DIST NetworkManager-1.0.0.tar.xz 3210884 SHA256 3a66afec670c975edd9832e620b725a5f16ed267a1b9e1b2d51ef27250d85947 SHA512 7089496ce31bfdffe99c0f031b6326734d2e36b3bb9a2ed0ecbe3dad64bff0dc993b2e6bcac770b31bcfe634833bd8dbabc23d128356dbba8243a6d8fc489a5e WHIRLPOOL df928cb0a9be0782b1f853d808273f798ca62be5f0fd650caf033fb16b98ef696c7f90eaed90488ef7f6a9e607cf74cd865848523fbbf08cd26487e98b4a455a
DIST NetworkManager-1.0.2.tar.xz 3210588 SHA256 359385707494bedbb48cfe0992ccfbcc4ac147dae1f7a47055c71e96439508ff SHA512 9c5884c75c2a2aae478d99bde4ecbb0dc4293b3f50dcf78a1579aa13e09ab95b01981a366f1dc58cd5d02fe77dc90fc0941f00142cd5ef1cea14c3b9d89f5c36 WHIRLPOOL 0a9f4bc6cc0f176bfc1c82294b45392c86b6d6a65cefe38fc80fce8f09584f275a23163d1909dfde9427405fe7b4086b8e2bc4995eded4cf441b8024fa00657d
DIST NetworkManager-1.0.4.tar.xz 3364168 SHA256 e4099fa2f4f4b8d95d0ad9fdd03ec20960845085fa500bf79aecbf54cee018c9 SHA512 b07583ca654a95dc018a712626ba0065c2ff5d9904b326891be684b32526f360f287b46cbd11026277a385558c1b55e38a086ae2b0aab059b63a4f3e11566cb1 WHIRLPOOL d6a612a855e216b7b46c620a85ceb3b3893029cf83bb9699ed0ba1c2d349abdeb4ee8921155216fb8285ac369cea64704836984e86bbf3813d8287b4803fc49a
+DIST NetworkManager-1.0.6.tar.xz 3381092 SHA256 38ea002403e3b884ffa9aae25aea431d2a8420f81f4919761c83fb92648254bd SHA512 74e8f91bbd9a70f1764b06c729717e091d2be0a8e316fe1b6235e644b65f43add5214be7a1100fe9d30b1511f4a00b9892dce79bb8ba0f0b0d57089d2ba6ddbb WHIRLPOOL 5f1d8c905e4aaa78c742c16e773f8fdbcdb2771edf36565f6b419af457776084573aa43b384ba32885992e76b399d4f2fc7dc94ad4295ac28dcfa3d6b6994b97
diff --git a/net-misc/networkmanager/files/networkmanager-0.9.10.0-arpingpath.patch b/net-misc/networkmanager/files/networkmanager-0.9.10.0-arpingpath.patch
deleted file mode 100644
index f8e0d5260014..000000000000
--- a/net-misc/networkmanager/files/networkmanager-0.9.10.0-arpingpath.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Source: Timo Gurr <tgurr@exherbo.org>
-Upstream: Reported, https://bugzilla.gnome.org/show_bug.cgi?id=734131
-Reason: fix hardcoded path to arping
-
-diff -Naur NetworkManager-0.9.10.0.old/src/devices/nm-device.c NetworkManager-0.9.10.0/src/devices/nm-device.c
---- NetworkManager-0.9.10.0.old/src/devices/nm-device.c 2014-07-04 02:44:19.000000000 +0200
-+++ NetworkManager-0.9.10.0/src/devices/nm-device.c 2014-09-01 17:35:29.656282068 +0200
-@@ -4429,7 +4429,7 @@
- static void
- send_arps (NMDevice *self, const char *mode_arg)
- {
-- const char *argv[] = { "/sbin/arping", mode_arg, "-q", "-I", nm_device_get_ip_iface (self), "-c", "1", NULL, NULL };
-+ const char *argv[] = { "/bin/arping", mode_arg, "-q", "-I", nm_device_get_ip_iface (self), "-c", "1", NULL, NULL };
- int ip_arg = G_N_ELEMENTS (argv) - 2;
- NMConnection *connection;
- NMSettingIP4Config *s_ip4;
diff --git a/net-misc/networkmanager/files/networkmanager-0.9.8.4-pre-sleep.patch b/net-misc/networkmanager/files/networkmanager-0.9.8.4-pre-sleep.patch
deleted file mode 100644
index 6e6dfbe8ee29..000000000000
--- a/net-misc/networkmanager/files/networkmanager-0.9.8.4-pre-sleep.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From ffb08fa288cea4c9ac8f18fd83e063b2e86ac51b Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sun, 27 Jan 2013 23:39:56 -0500
-Subject: [PATCH] Implement "pre-sleep" action dispatch
-
-Based on work by Christian Becke <christianbecke@gmail.com> in
-https://bugzilla.gnome.org/show_bug.cgi?id=387832
----
- callouts/nm-dispatcher-utils.c | 3 ++-
- src/nm-dispatcher.c | 8 ++++++--
- src/nm-dispatcher.h | 3 ++-
- src/nm-manager.c | 28 +++++++++++++++++++++-------
- 4 files changed, 31 insertions(+), 11 deletions(-)
-
-diff --git a/callouts/nm-dispatcher-utils.c b/callouts/nm-dispatcher-utils.c
-index 8824295..66cbc4b 100644
---- a/callouts/nm-dispatcher-utils.c
-+++ b/callouts/nm-dispatcher-utils.c
-@@ -409,7 +409,8 @@ nm_dispatcher_utils_construct_envp (const char *action,
- g_return_val_if_fail (*out_iface == NULL, NULL);
-
- /* Hostname changes don't require a device nor contain a connection */
-- if (!strcmp (action, "hostname"))
-+ if (!strcmp (action, "hostname") ||
-+ !strcmp (action, "pre-sleep"))
- return g_new0 (char *, 1);
-
- /* Canonicalize the VPN interface name; "" is used when passing it through
-diff --git a/src/nm-dispatcher.c b/src/nm-dispatcher.c
-index 12cd0f0..42d7e12 100644
---- a/src/nm-dispatcher.c
-+++ b/src/nm-dispatcher.c
-@@ -237,6 +237,8 @@ action_to_string (DispatcherAction action)
- return "dhcp4-change";
- case DISPATCHER_ACTION_DHCP6_CHANGE:
- return "dhcp6-change";
-+ case DISPATCHER_ACTION_PRE_SLEEP:
-+ return "pre-sleep";
- default:
- break;
- }
-@@ -269,7 +271,8 @@ _dispatcher_call (DispatcherAction action,
- DispatchInfo *info;
-
- /* All actions except 'hostname' require a device */
-- if (action != DISPATCHER_ACTION_HOSTNAME)
-+ if (action != DISPATCHER_ACTION_HOSTNAME &&
-+ action != DISPATCHER_ACTION_PRE_SLEEP)
- g_return_val_if_fail (NM_IS_DEVICE (device), NULL);
- /* VPN actions require at least an IPv4 config (for now) */
- if (action == DISPATCHER_ACTION_VPN_UP)
-@@ -308,7 +311,8 @@ _dispatcher_call (DispatcherAction action,
- vpn_ip6_props = value_hash_create ();
-
- /* hostname actions only send the hostname */
-- if (action != DISPATCHER_ACTION_HOSTNAME) {
-+ if (action != DISPATCHER_ACTION_HOSTNAME &&
-+ action != DISPATCHER_ACTION_PRE_SLEEP) {
- fill_device_props (device,
- device_props,
- device_ip4_props,
-diff --git a/src/nm-dispatcher.h b/src/nm-dispatcher.h
-index 05a6c87..8e95834 100644
---- a/src/nm-dispatcher.h
-+++ b/src/nm-dispatcher.h
-@@ -39,7 +39,8 @@ typedef enum {
- DISPATCHER_ACTION_VPN_PRE_DOWN,
- DISPATCHER_ACTION_VPN_DOWN,
- DISPATCHER_ACTION_DHCP4_CHANGE,
-- DISPATCHER_ACTION_DHCP6_CHANGE
-+ DISPATCHER_ACTION_DHCP6_CHANGE,
-+ DISPATCHER_ACTION_PRE_SLEEP = 999,
- } DispatcherAction;
-
- typedef void (*DispatcherFunc) (gconstpointer call, gpointer user_data);
-diff --git a/src/nm-manager.c b/src/nm-manager.c
-index 811f49d..f52956d 100644
---- a/src/nm-manager.c
-+++ b/src/nm-manager.c
-@@ -73,6 +73,7 @@
- #include "nm-sleep-monitor.h"
- #include "nm-connectivity.h"
- #include "nm-policy.h"
-+#include "nm-dispatcher.h"
-
-
- #define NM_AUTOIP_DBUS_SERVICE "org.freedesktop.nm_avahi_autoipd"
-@@ -3350,6 +3351,23 @@ impl_manager_deactivate_connection (NMManager *self,
- }
-
- static void
-+pre_sleep_dispatcher_done (gpointer call, gpointer user_data)
-+{
-+ NMManager *self = (NMManager *) user_data;
-+ NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
-+ GSList *iter;
-+
-+ /* Just deactivate and down all devices from the device list,
-+ * to keep things fast the device list will get resynced when
-+ * the manager wakes up.
-+ */
-+ for (iter = priv->devices; iter; iter = iter->next)
-+ nm_device_set_managed (NM_DEVICE (iter->data), FALSE, NM_DEVICE_STATE_REASON_SLEEPING);
-+
-+ nm_manager_update_state (self);
-+}
-+
-+static void
- do_sleep_wake (NMManager *self)
- {
- NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
-@@ -3359,13 +3377,9 @@ do_sleep_wake (NMManager *self)
- if (manager_sleeping (self)) {
- nm_log_info (LOGD_SUSPEND, "sleeping or disabling...");
-
-- /* Just deactivate and down all devices from the device list,
-- * to keep things fast the device list will get resynced when
-- * the manager wakes up.
-- */
-- for (iter = priv->devices; iter; iter = iter->next)
-- nm_device_set_managed (NM_DEVICE (iter->data), FALSE, NM_DEVICE_STATE_REASON_SLEEPING);
--
-+ nm_dispatcher_call (DISPATCHER_ACTION_PRE_SLEEP, NULL, NULL,
-+ pre_sleep_dispatcher_done, self);
-+ return;
- } else {
- nm_log_info (LOGD_SUSPEND, "waking up and re-enabling...");
-
---
-1.8.3.2
-
diff --git a/net-misc/networkmanager/files/networkmanager-0.9.8.9-fix-crash-on-wifi-rescan.patch b/net-misc/networkmanager/files/networkmanager-0.9.8.9-fix-crash-on-wifi-rescan.patch
deleted file mode 100644
index 35e9c04aff4b..000000000000
--- a/net-misc/networkmanager/files/networkmanager-0.9.8.9-fix-crash-on-wifi-rescan.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 4099c9242b091604466dda081dc5f6909354258b Mon Sep 17 00:00:00 2001
-From: M. Vefa Bicakci <m.v.b@runbox.com>
-Date: Sat, 24 May 2014 23:37:00 +0000
-Subject: core: fix crash during Wi-Fi rescan by emitting NM_DEVICE_AUTH_REQUEST signal correctly
-
-Fixes regression introduced by commit da59b6d2229b85afbb9e14846931376340dc6030.
-
-https://mail.gnome.org/archives/networkmanager-list/2014-May/msg00038.html
-
-Backport-of: d9653484859c426f707b4759bc9882f7a57c1152
-[thaller@redhat.com: original patch modified in nm-device-wifi.c to pass no
- connection, as it is done on master]
-Signed-off-by: Thomas Haller <thaller@redhat.com>
----
-diff --git a/src/nm-device-wifi.c b/src/nm-device-wifi.c
-index 8ca5278..052d68f 100644
---- a/src/nm-device-wifi.c
-+++ b/src/nm-device-wifi.c
-@@ -1563,6 +1563,7 @@ impl_device_request_scan (NMDeviceWifi *self,
- g_signal_emit_by_name (device,
- NM_DEVICE_AUTH_REQUEST,
- context,
-+ NULL,
- NM_AUTH_PERMISSION_NETWORK_CONTROL,
- TRUE,
- request_scan_cb,
-diff --git a/src/nm-manager.c b/src/nm-manager.c
-index 9037e64..96bf3b4 100644
---- a/src/nm-manager.c
-+++ b/src/nm-manager.c
-@@ -1874,10 +1874,10 @@ device_auth_request_cb (NMDevice *device,
- }
-
- /* Ensure the subject has permissions for this connection */
-- if (!nm_auth_uid_in_acl (connection,
-- priv->session_monitor,
-- sender_uid,
-- &error_desc)) {
-+ if (connection != NULL && !nm_auth_uid_in_acl (connection,
-+ priv->session_monitor,
-+ sender_uid,
-+ &error_desc)) {
- error = g_error_new_literal (NM_MANAGER_ERROR,
- NM_MANAGER_ERROR_PERMISSION_DENIED,
- error_desc);
---
-cgit v0.9.0.2-2-gbebe
diff --git a/net-misc/networkmanager/files/networkmanager-1.0.0-find-helpers.patch b/net-misc/networkmanager/files/networkmanager-1.0.0-find-helpers.patch
deleted file mode 100644
index a84909c8253e..000000000000
--- a/net-misc/networkmanager/files/networkmanager-1.0.0-find-helpers.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 6f643d2761650e53fd3b647526110a8473138b5d Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Thu, 8 Jan 2015 11:55:50 +0100
-Subject: core: add /bin to the default search path
-
-https://bugzilla.gnome.org/show_bug.cgi?id=742576
-(cherry picked from commit abbca50ca9d552a28eca792f12ec618df6128fff)
-
-diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c
-index 2c291cd..6747b65 100644
---- a/src/NetworkManagerUtils.c
-+++ b/src/NetworkManagerUtils.c
-@@ -814,6 +814,7 @@ const char *const NM_PATHS_DEFAULT[] = {
- "/sbin/",
- "/usr/sbin/",
- "/usr/local/sbin/",
-+ "/bin/",
- "/usr/bin/",
- "/usr/local/bin/",
- NULL,
---
-cgit v0.10.2
-
diff --git a/net-misc/networkmanager/files/networkmanager-1.0.0-lto-switch.patch b/net-misc/networkmanager/files/networkmanager-1.0.0-lto-switch.patch
deleted file mode 100644
index 5d66c3393c71..000000000000
--- a/net-misc/networkmanager/files/networkmanager-1.0.0-lto-switch.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From cda2802fe960737abb4623166ca4f75a63b5fe5a Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Thu, 8 Jan 2015 12:01:32 +0100
-Subject: build: fix --enable-lto configure option to allow disabling option
- explicitly
-
-When specifying '--enable-lto=anything' or '--disable-lto',
-the configure script would always set enable_lto=yes.
-
-The only way to disable lto, was *not* specifying the
-configure option.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=742575
-(cherry picked from commit 6eccfda0face594f86dea495d2ed2546b0d37e77)
-
-diff --git a/configure.ac b/configure.ac
-index b6bf38e..b407686 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -821,10 +821,11 @@ AM_CONDITIONAL(BUILD_NMTUI, test "$build_nmtui" = yes)
-
- NM_COMPILER_WARNINGS
-
--AC_ARG_ENABLE(lto, AS_HELP_STRING([--enable-lto], [Enable Link Time Optimization for smaller size (default: no)]),
-- [enable_lto=yes], [enable_lto=no])
-+AC_ARG_ENABLE(lto, AS_HELP_STRING([--enable-lto], [Enable Link Time Optimization for smaller size (default: no)]))
- if (test "${enable_lto}" = "yes"); then
- CFLAGS="-flto $CFLAGS"
-+else
-+ enable_lto='no'
- fi
-
-
---
-cgit v0.10.2
-
diff --git a/net-misc/networkmanager/files/networkmanager-1.0.0-remove-bashisms.patch b/net-misc/networkmanager/files/networkmanager-1.0.0-remove-bashisms.patch
deleted file mode 100644
index 366627f7eb18..000000000000
--- a/net-misc/networkmanager/files/networkmanager-1.0.0-remove-bashisms.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 4c3c9a38272112fe7a6a248ba521d55ac1b66892 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
-Date: Sun, 25 Jan 2015 13:02:19 +0100
-Subject: [PATCH] build: use POSIX-compliant 'printf' instead of 'echo'
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes the following error when running ./configure with dash:
-
- checking for QT... yes
- checking for moc-qt4... no
- checking for moc... moc
- configure: error: --with-udev-dir must be an absolute path or 'yes' or
- 'no'. Instead it is '/lib/udev'
-
-As per the Autoconf Manual's section on "Limitations of Shell Builtins":
-
- The simple echo is probably the most surprising source of portability
- troubles. It is not possible to use ‘echo’ portably unless both
- options and escape sequences are omitted.
-
-https://www.gnu.org/software/automake/faq/autoconf.html#echo
-https://bugs.gentoo.org/536540
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index b407686..5c87c7e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -302,7 +302,7 @@ AM_CONDITIONAL(WITH_QT, test "${enable_qt}" = "yes")
-
- AC_ARG_WITH(udev-dir, AS_HELP_STRING([--with-udev-dir=DIR], [Absolute path of the udev base directory. Set to 'no' not to install the udev rules]), [], [with_udev_dir="yes"])
- if (test "$with_udev_dir" != 'no'); then
-- if (test "$with_udev_dir" != 'yes' && echo -n "$with_udev_dir" | grep -v -q '^/'); then
-+ if (test "$with_udev_dir" != 'yes' && printf '%s' "$with_udev_dir" | grep -v -q '^/'); then
- AC_MSG_ERROR([--with-udev-dir must be an absolute path or 'yes' or 'no'. Instead it is '$with_udev_dir'])
- fi
- if (test "$with_udev_dir" = 'yes'); then
---
-2.2.1
-
diff --git a/net-misc/networkmanager/files/nm-system-settings.conf-ifnet b/net-misc/networkmanager/files/nm-system-settings.conf-ifnet
deleted file mode 100644
index 4d14ee7b8041..000000000000
--- a/net-misc/networkmanager/files/nm-system-settings.conf-ifnet
+++ /dev/null
@@ -1,6 +0,0 @@
-[main]
-plugins=ifnet,keyfile
-
-[ifnet]
-managed=true
-auto_refresh=false
diff --git a/net-misc/networkmanager/networkmanager-0.9.10.1_pre20141101.ebuild b/net-misc/networkmanager/networkmanager-0.9.10.1_pre20141101.ebuild
deleted file mode 100644
index 54d9952bfe57..000000000000
--- a/net-misc/networkmanager/networkmanager-0.9.10.1_pre20141101.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME_ORG_MODULE="NetworkManager"
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.18"
-VALA_USE_DEPEND="vapigen"
-
-# Tests need python2, https://bugzilla.gnome.org/show_bug.cgi?id=739448
-PYTHON_COMPAT=( python2_7 )
-
-inherit bash-completion-r1 eutils gnome2 linux-info multilib python-any-r1 systemd user readme.gentoo toolchain-funcs vala versionator virtualx udev
-
-DESCRIPTION="Universal network configuration daemon for laptops, desktops, servers and virtualization hosts"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-SRC_URI="https://dev.gentoo.org/~pacho/gnome/${GNOME_ORG_MODULE}-${PV}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
-
-IUSE="bluetooth connection-sharing consolekit +dhclient dhcpcd gnutls +introspection \
-kernel_linux +nss +modemmanager ncurses +ppp resolvconf selinux systemd teamd test \
-vala +wext +wifi zeroconf" # wimax
-
-KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
-
-REQUIRED_USE="
- modemmanager? ( ppp )
- ^^ ( nss gnutls )
- ^^ ( dhclient dhcpcd )
-"
-
-S="${WORKDIR}/${GNOME_ORG_MODULE}-0.9.10.1"
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-# TODO: Qt support?
-#
-# iputils version needed due path changes (#523632). Upstream fixed
-# it with a major refactor committed to 'master' for handling different
-# paths for arping and other tools and, then, the version requirement
-# will be able to be dropped on next major NM version
-COMMON_DEPEND="
- >=sys-apps/dbus-1.2
- >=dev-libs/dbus-glib-0.100
- >=dev-libs/glib-2.32:2
- >=dev-libs/libnl-3.2.8:3=
- >=sys-auth/polkit-0.106
- net-libs/libndp
- >=net-libs/libsoup-2.26:2.4=
- >=net-misc/iputils-20121221-r1
- sys-libs/readline:0
- >=virtual/libgudev-165:=
- bluetooth? ( >=net-wireless/bluez-5 )
- connection-sharing? (
- net-dns/dnsmasq[dhcp]
- net-firewall/iptables )
- gnutls? (
- dev-libs/libgcrypt:0=
- net-libs/gnutls:= )
- modemmanager? ( >=net-misc/modemmanager-0.7.991 )
- ncurses? ( >=dev-libs/newt-0.52.15 )
- nss? ( >=dev-libs/nss-3.11:= )
- dhclient? ( =net-misc/dhcp-4*[client] )
- dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
- introspection? ( >=dev-libs/gobject-introspection-0.10.3 )
- ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] net-dialup/rp-pppoe )
- resolvconf? ( net-dns/openresolv )
- systemd? ( >=sys-apps/systemd-183:0= )
- teamd? ( >=net-misc/libteam-1.9 )
- zeroconf? ( net-dns/avahi:=[autoipd] )
- || ( sys-power/upower sys-power/upower-pm-utils >=sys-apps/systemd-183 )
-"
-RDEPEND="${COMMON_DEPEND}
- consolekit? ( sys-auth/consolekit )
- wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.40
- >=sys-devel/gettext-0.17
- >=sys-kernel/linux-headers-2.6.29
- virtual/pkgconfig
- vala? ( $(vala_depend) )
- test? (
- $(python_gen_any_dep '
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/pygobject:2[${PYTHON_USEDEP}]')
- )
-"
-
-sysfs_deprecated_check() {
- ebegin "Checking for SYSFS_DEPRECATED support"
-
- if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
- eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
- eerror "or NetworkManager will not work correctly."
- eerror "See https://bugs.gentoo.org/333639 for more info."
- die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
- fi
- eend $?
-}
-
-pkg_pretend() {
- if use kernel_linux; then
- get_version
- if linux_config_exists; then
- sysfs_deprecated_check
- else
- ewarn "Was unable to determine your kernel .config"
- ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
- ewarn "See https://bugs.gentoo.org/333639 for more info."
- fi
-
- fi
-}
-
-pkg_setup() {
- enewgroup plugdev
-}
-
-src_prepare() {
- DOC_CONTENTS="To modify system network connections without needing to enter the
- root password, add your user account to the 'plugdev' group."
-
- # Find arping at proper place, bug #523632
- epatch "${FILESDIR}/${PN}-0.9.10.0-arpingpath.patch"
-
- # Force use of /run, avoid eautoreconf, upstream bug #737139
- sed -e 's:$localstatedir/run/:/run/:' -i configure || die
-
- use vala && vala_src_prepare
-
- epatch_user # don't remove, users often want custom patches for NM
-
- gnome2_src_prepare
-}
-
-src_configure() {
- local myconf
-
- # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
- if use ppp; then
- local PPPD_VER=`best_version net-dialup/ppp`
- PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
- PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
- myconf="${myconf} --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER}"
- fi
-
- # unit files directory needs to be passed only when systemd is enabled,
- # otherwise systemd support is not disabled completely, bug #524534
- use systemd && myconf="${myconf} "$(systemd_with_unitdir)""
-
- # TODO: enable wimax when we have a libnl:3 compatible revision of it
- # wimax will be removed, bug #522822
- # ifnet plugin always disabled until someone volunteers to actively
- # maintain and fix it
- gnome2_src_configure \
- --disable-more-warnings \
- --disable-static \
- --localstatedir=/var \
- --disable-ifnet \
- --without-netconfig \
- --with-dbus-sys-dir=/etc/dbus-1/system.d \
- --with-udev-dir="$(get_udevdir)" \
- --with-config-plugins-default=keyfile \
- --with-iptables=/sbin/iptables \
- --with-libsoup=yes \
- --enable-concheck \
- --with-crypto=$(usex nss nss gnutls) \
- --with-session-tracking=$(usex systemd systemd $(usex consolekit consolekit no)) \
- --with-suspend-resume=$(usex systemd systemd upower) \
- $(use_enable bluetooth bluez5-dun) \
- $(use_enable introspection) \
- $(use_enable ppp) \
- --disable-wimax \
- $(use_with dhclient) \
- $(use_with dhcpcd) \
- $(use_with modemmanager modem-manager-1) \
- $(use_with ncurses nmtui) \
- $(use_with resolvconf) \
- $(use_with selinux) \
- $(use_enable teamd teamdctl) \
- $(use_enable test tests) \
- $(use_enable vala) \
- --without-valgrind \
- $(use_with wext) \
- ${myconf}
-}
-
-src_test() {
- python_setup
- Xemake check
-}
-
-src_install() {
- # Install completions at proper place, bug #465100
- gnome2_src_install completiondir="$(get_bashcompdir)"
-
- readme.gentoo_create_doc
-
- newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager
- newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
- # /var/run/NetworkManager is used by some distros, but not by Gentoo
- rmdir -v "${ED}/var/run/NetworkManager" || die "rmdir failed"
-
- # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
- keepdir /etc/NetworkManager/dispatcher.d
-
- # Provide openrc net dependency only when nm is connected
- exeinto /etc/NetworkManager/dispatcher.d
- newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
- sed -e "s:@EPREFIX@:${EPREFIX}:g" \
- -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
- keepdir /etc/NetworkManager/system-connections
- chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765
-
- # Allow users in plugdev group to modify system connections
- insinto /usr/share/polkit-1/rules.d/
- doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- readme.gentoo_print_elog
-
- if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
- ewarn "The ${PN} system configuration file has moved to a new location."
- ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
- ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
- ewarn
- ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
- fi
-
- # The polkit rules file moved to /usr/share
- old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
- if [[ -f "${old_rules}" ]]; then
- case "$(md5sum ${old_rules})" in
- 574d0cfa7e911b1f7792077003060240* )
- # Automatically delete the old rules.d file if the user did not change it
- elog
- elog "Removing old ${old_rules} ..."
- rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
- ;;
- * )
- elog "The ${old_rules}"
- elog "file moved to /usr/share/polkit-1/rules.d/ in >=networkmanager-0.9.4.0-r4"
- elog "If you edited ${old_rules}"
- elog "without changing its behavior, you may want to remove it."
- ;;
- esac
- fi
-
- # ifnet plugin was disabled for systemd users with 0.9.8.6 version
- # and for all people with 0.9.10.0-r1 (see ChangeLog for full explanations)
- if use systemd; then
- if ! version_is_at_least 0.9.8.6 ${REPLACING_VERSIONS}; then
- ewarn "Ifnet plugin won't be used with systemd support enabled"
- ewarn "as it is meant to be used with openRC and can cause collisions"
- ewarn "(like bug #485658)."
- ewarn "Because of this, you will likely need to reconfigure some of"
- ewarn "your networks. To do this you can rely on Gnome control center,"
- ewarn "nm-connection-editor or nmtui tools for example once updated"
- ewarn "NetworkManager version is installed."
- fi
- else
- if ! version_is_at_least 0.9.10.0-r1 ${REPLACING_VERSIONS}; then
- ewarn "Ifnet plugin is now disabled because of it being unattended"
- ewarn "and unmaintained for a long time, leading to some unfixed bugs"
- ewarn "and new problems appearing. We will now use upstream 'keyfile'"
- ewarn "plugin."
- ewarn "Because of this, you will likely need to reconfigure some of"
- ewarn "your networks. To do this you can rely on Gnome control center,"
- ewarn "nm-connection-editor or nmtui tools for example once updated"
- ewarn "NetworkManager version is installed."
- fi
- fi
-
- # NM fallbacks to plugin specified at compile time (upstream bug #738611)
- # but still show a warning to remember people to have cleaner config file
- if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
- if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
- ewarn
- ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
- ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
- ewarn
- fi
- fi
-
- # NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457
- if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
- ewarn "You have psk-flags=1 setting in above files, you will need to"
- ewarn "either reconfigure affected networks or, at least, set the flag"
- ewarn "value to '0'."
- fi
-}
diff --git a/net-misc/networkmanager/networkmanager-0.9.8.10-r1.ebuild b/net-misc/networkmanager/networkmanager-0.9.8.10-r1.ebuild
deleted file mode 100644
index 7e5d00c9c0b3..000000000000
--- a/net-misc/networkmanager/networkmanager-0.9.8.10-r1.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GNOME_ORG_MODULE="NetworkManager"
-VALA_MIN_API_VERSION="0.18"
-VALA_USE_DEPEND="vapigen"
-
-inherit bash-completion-r1 gnome.org linux-info systemd user readme.gentoo toolchain-funcs vala virtualx udev eutils
-
-DESCRIPTION="Universal network configuration daemon for laptops, desktops, servers and virtualization hosts"
-HOMEPAGE="https://projects.gnome.org/NetworkManager/"
-
-LICENSE="GPL-2+"
-SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
-IUSE="avahi bluetooth connection-sharing consolekit dhclient +dhcpcd gnutls +introspection kernel_linux +nss +modemmanager +ppp resolvconf systemd test vala +wext +wifi" # wimax
-
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~sparc x86"
-
-REQUIRED_USE="
- modemmanager? ( ppp )
- ^^ ( nss gnutls )
- ^^ ( dhclient dhcpcd )
-"
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-# TODO: Qt support?
-COMMON_DEPEND="
- >=sys-apps/dbus-1.2
- >=dev-libs/dbus-glib-0.94
- >=dev-libs/glib-2.30
- >=dev-libs/libnl-3.2.7:3=
- >=sys-auth/polkit-0.106
- >=net-libs/libsoup-2.26:2.4=
- virtual/libgudev:=
- bluetooth? ( >=net-wireless/bluez-4.82 )
- avahi? ( net-dns/avahi:=[autoipd] )
- connection-sharing? (
- net-dns/dnsmasq[dhcp]
- net-firewall/iptables )
- gnutls? (
- dev-libs/libgcrypt:0=
- net-libs/gnutls:= )
- modemmanager? ( >=net-misc/modemmanager-0.7.991 )
- nss? ( >=dev-libs/nss-3.11:= )
- dhclient? ( =net-misc/dhcp-4*[client] )
- dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
- introspection? ( >=dev-libs/gobject-introspection-0.10.3 )
- ppp? ( >=net-dialup/ppp-2.4.5[ipv6] )
- resolvconf? ( net-dns/openresolv )
- systemd? ( >=sys-apps/systemd-183:0= )
- || ( sys-power/upower sys-power/upower-pm-utils >=sys-apps/systemd-183 )
-"
-RDEPEND="${COMMON_DEPEND}
- virtual/udev
- consolekit? ( sys-auth/consolekit )
- wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.40
- >=sys-devel/gettext-0.17
- >=sys-kernel/linux-headers-2.6.29
- virtual/pkgconfig
- vala? ( $(vala_depend) )
- test? (
- dev-lang/python:2.7
- dev-python/dbus-python[python_targets_python2_7]
- dev-python/pygobject:2[python_targets_python2_7] )
-"
-
-sysfs_deprecated_check() {
- ebegin "Checking for SYSFS_DEPRECATED support"
-
- if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
- eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
- eerror "or NetworkManager will not work correctly."
- eerror "See https://bugs.gentoo.org/333639 for more info."
- die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
- fi
- eend $?
-}
-
-pkg_pretend() {
- if use kernel_linux; then
- get_version
- if linux_config_exists; then
- sysfs_deprecated_check
- else
- ewarn "Was unable to determine your kernel .config"
- ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
- ewarn "See https://bugs.gentoo.org/333639 for more info."
- fi
-
- fi
-}
-
-pkg_setup() {
- enewgroup plugdev
-}
-
-src_prepare() {
- DOC_CONTENTS="To modify system network connections without needing to enter the
- root password, add your user account to the 'plugdev' group."
-
- # Bug #402085, https://bugzilla.gnome.org/show_bug.cgi?id=387832
- epatch "${FILESDIR}/${PN}-0.9.8.4-pre-sleep.patch"
-
- # https://www.mail-archive.com/networkmanager-list@gnome.org/msg24038.html
- epatch "${FILESDIR}/${PN}-0.9.8.9-fix-crash-on-wifi-rescan.patch"
-
- # Use python2.7 shebangs for test scripts
- sed -e 's@\(^#!.*python\)@\12.7@' \
- -i */tests/*.py || die
-
- # Fix completiondir, avoid eautoreconf, bug #465100
- sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
- cli/completion/Makefile.in || die "sed completiondir failed"
-
- ## Force use of /run, avoid eautoreconf
- sed -e 's:$localstatedir/run/:/run/:' -i configure || die
-
- use vala && vala_src_prepare
-
- epatch_user # don't remove, users often want custom patches for NM
-}
-
-src_configure() {
- # TODO: enable wimax when we have a libnl:3 compatible revision of it
- # We are not ready for bluez5 yet
- econf \
- --enable-bluez4 \
- --disable-more-warnings \
- --disable-static \
- --localstatedir=/var \
- $(usex systemd '--disable-ifnet' '--enable-ifnet') \
- --without-netconfig \
- --with-dbus-sys-dir=/etc/dbus-1/system.d \
- --with-udev-dir="$(get_udevdir)" \
- --with-iptables=/sbin/iptables \
- --enable-concheck \
- --with-crypto=$(usex nss nss gnutls) \
- --with-session-tracking=$(usex systemd systemd $(usex consolekit consolekit no)) \
- --with-suspend-resume=$(usex systemd systemd upower) \
- $(use_enable introspection) \
- $(use_enable ppp) \
- --disable-wimax \
- $(use_with dhclient) \
- $(use_with dhcpcd) \
- $(use_with modemmanager modem-manager-1) \
- $(use_with resolvconf) \
- $(use_enable test tests) \
- $(use_enable vala) \
- $(use_with wext) \
- "$(systemd_with_unitdir)"
-}
-
-src_test() {
- # bug #????
- cp libnm-util/tests/certs/test_ca_cert.pem src/settings/plugins/ifnet/tests/ || die
- Xemake check
-}
-
-src_install() {
- default
-
- readme.gentoo_create_doc
-
- # Gentoo init script
- newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager
-
- # /var/run/NetworkManager is used by some distros, but not by Gentoo
- rmdir -v "${ED}/var/run/NetworkManager" || die "rmdir failed"
-
- # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
- keepdir /etc/NetworkManager/dispatcher.d
-
- # Provide openrc net dependency only when nm is connected
- exeinto /etc/NetworkManager/dispatcher.d
- newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
- sed -e "s:@EPREFIX@:${EPREFIX}:g" \
- -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
- # Default conf.d file
- newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
- # Add keyfile plugin support
- keepdir /etc/NetworkManager/system-connections
- chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765
-
- if ! use systemd; then
- insinto /etc/NetworkManager
- newins "${FILESDIR}/nm-system-settings.conf-ifnet" NetworkManager.conf
- fi
-
- # Allow users in plugdev group to modify system connections
- insinto /usr/share/polkit-1/rules.d/
- doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-
- prune_libtool_files --modules
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-
- if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
- ewarn "The ${PN} system configuration file has moved to a new location."
- ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
- ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
- ewarn
- ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
- fi
-
- # The polkit rules file moved to /usr/share
- old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
- if [[ -f "${old_rules}" ]]; then
- case "$(md5sum ${old_rules})" in
- 574d0cfa7e911b1f7792077003060240* )
- # Automatically delete the old rules.d file if the user did not change it
- elog
- elog "Removing old ${old_rules} ..."
- rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
- ;;
- * )
- elog "The ${old_rules}"
- elog "file moved to /usr/share/polkit-1/rules.d/ in >=networkmanager-0.9.4.0-r4"
- elog "If you edited ${old_rules}"
- elog "without changing its behavior, you may want to remove it."
- ;;
- esac
- fi
-
- if use systemd; then
- if [[ ${REPLACING_VERSIONS} < 0.9.8.6 ]]; then
- ewarn "Ifnet plugin won't be used with systemd support enabled"
- ewarn "as it is meant to be used with openRC and can cause collisions"
- ewarn "(like bug #485658)."
- ewarn "Because of this, you will likely need to reconfigure some of"
- ewarn "your networks."
- fi
-
- if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
- if grep -q plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
- ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
- ewarn "Since it won't be used when running under Systemd, you will need to stop setting"
- ewarn "ifnet plugin there to allow NetworkManager to work."
- fi
- fi
- fi
-}
diff --git a/net-misc/networkmanager/networkmanager-1.0.0.ebuild b/net-misc/networkmanager/networkmanager-1.0.0.ebuild
deleted file mode 100644
index 6ffd8ce4e83d..000000000000
--- a/net-misc/networkmanager/networkmanager-1.0.0.ebuild
+++ /dev/null
@@ -1,305 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME_ORG_MODULE="NetworkManager"
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.18"
-VALA_USE_DEPEND="vapigen"
-
-# Tests need python2, https://bugzilla.gnome.org/show_bug.cgi?id=739448
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools bash-completion-r1 eutils gnome2 linux-info multilib python-any-r1 systemd \
- user readme.gentoo toolchain-funcs vala versionator virtualx udev
-
-DESCRIPTION="Universal network configuration daemon for laptops, desktops, servers and virtualization hosts"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
-
-IUSE="bluetooth connection-sharing consolekit +dhclient dhcpcd gnutls +introspection \
-kernel_linux +nss +modemmanager ncurses +ppp resolvconf selinux systemd teamd test \
-vala +wext +wifi zeroconf" # wimax
-
-KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 ~sparc x86"
-
-REQUIRED_USE="
- modemmanager? ( ppp )
- ^^ ( nss gnutls )
- ^^ ( dhclient dhcpcd )
-"
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-# TODO: Qt support?
-COMMON_DEPEND="
- >=sys-apps/dbus-1.2
- >=dev-libs/dbus-glib-0.100
- >=dev-libs/glib-2.32:2
- >=dev-libs/libnl-3.2.8:3=
- >=sys-auth/polkit-0.106
- net-libs/libndp
- >=net-libs/libsoup-2.26:2.4=
- net-misc/iputils
- sys-libs/readline:0
- >=virtual/libgudev-165:=
- bluetooth? ( >=net-wireless/bluez-5 )
- connection-sharing? (
- net-dns/dnsmasq[dhcp]
- net-firewall/iptables )
- gnutls? (
- dev-libs/libgcrypt:0=
- net-libs/gnutls:= )
- modemmanager? ( >=net-misc/modemmanager-0.7.991 )
- ncurses? ( >=dev-libs/newt-0.52.15 )
- nss? ( >=dev-libs/nss-3.11:= )
- dhclient? ( =net-misc/dhcp-4*[client] )
- dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
- introspection? ( >=dev-libs/gobject-introspection-0.10.3 )
- ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] net-dialup/rp-pppoe )
- resolvconf? ( net-dns/openresolv )
- systemd? ( >=sys-apps/systemd-209:0= )
- teamd? ( >=net-misc/libteam-1.9 )
- zeroconf? ( net-dns/avahi:=[autoipd] )
- || ( sys-power/upower sys-power/upower-pm-utils >=sys-apps/systemd-209 )
-"
-RDEPEND="${COMMON_DEPEND}
- consolekit? ( sys-auth/consolekit )
- wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
- dev-util/gdbus-codegen
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.40
- >=sys-devel/gettext-0.17
- >=sys-kernel/linux-headers-2.6.29
- virtual/pkgconfig
- vala? ( $(vala_depend) )
- test? (
- $(python_gen_any_dep '
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/pygobject:2[${PYTHON_USEDEP}]')
- )
-"
-
-sysfs_deprecated_check() {
- ebegin "Checking for SYSFS_DEPRECATED support"
-
- if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
- eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
- eerror "or NetworkManager will not work correctly."
- eerror "See https://bugs.gentoo.org/333639 for more info."
- die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
- fi
- eend $?
-}
-
-pkg_pretend() {
- if use kernel_linux; then
- get_version
- if linux_config_exists; then
- sysfs_deprecated_check
- else
- ewarn "Was unable to determine your kernel .config"
- ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
- ewarn "See https://bugs.gentoo.org/333639 for more info."
- fi
-
- fi
-}
-
-pkg_setup() {
- enewgroup plugdev
-}
-
-src_prepare() {
- DOC_CONTENTS="To modify system network connections without needing to enter the
- root password, add your user account to the 'plugdev' group."
-
- # Find arping in our paths, upstream bug #742576 (from 1.0 branch)
- epatch "${FILESDIR}"/${PN}-1.0.0-find-helpers.patch
-
- # Fix lto configure switch, upstream bug #742575 (from 1.0 branch)
- epatch "${FILESDIR}"/${PN}-1.0.0-lto-switch.patch
-
- # Fix build with /bin/sh != bash, see bug #536540, upstream bug #743480
- epatch "${FILESDIR}/${PN}-1.0.0-remove-bashisms.patch"
-
- # Force use of /run, avoid eautoreconf, upstream bug #737139
- sed -e 's:$localstatedir/run/:/run/:' -i configure || die
-
- use vala && vala_src_prepare
-
- epatch_user # don't remove, users often want custom patches for NM
-
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- local myconf
-
- # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
- if use ppp; then
- local PPPD_VER=`best_version net-dialup/ppp`
- PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
- PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
- myconf="${myconf} --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER}"
- fi
-
- # unit files directory needs to be passed only when systemd is enabled,
- # otherwise systemd support is not disabled completely, bug #524534
- use systemd && myconf="${myconf} "$(systemd_with_unitdir)""
-
- # TODO: enable wimax when we have a libnl:3 compatible revision of it
- # wimax will be removed, bug #522822
- # ifnet plugin always disabled until someone volunteers to actively
- # maintain and fix it
- gnome2_src_configure \
- --disable-more-warnings \
- --disable-static \
- --localstatedir=/var \
- --disable-lto \
- --disable-config-plugin-ibft \
- --disable-ifnet \
- --without-netconfig \
- --with-dbus-sys-dir=/etc/dbus-1/system.d \
- --with-udev-dir="$(get_udevdir)" \
- --with-config-plugins-default=keyfile \
- --with-iptables=/sbin/iptables \
- --with-libsoup=yes \
- --enable-concheck \
- --with-crypto=$(usex nss nss gnutls) \
- --with-session-tracking=$(usex systemd systemd $(usex consolekit consolekit no)) \
- --with-suspend-resume=$(usex systemd systemd upower) \
- $(use_enable bluetooth bluez5-dun) \
- $(use_enable introspection) \
- $(use_enable ppp) \
- --disable-wimax \
- $(use_with dhclient) \
- $(use_with dhcpcd) \
- $(use_with modemmanager modem-manager-1) \
- $(use_with ncurses nmtui) \
- $(use_with resolvconf) \
- $(use_with selinux) \
- $(use_enable teamd teamdctl) \
- $(use_enable test tests) \
- $(use_enable vala) \
- --without-valgrind \
- $(use_with wext) \
- ${myconf}
-}
-
-src_test() {
- python_setup
- Xemake check
-}
-
-src_install() {
- # Install completions at proper place, bug #465100
- gnome2_src_install completiondir="$(get_bashcompdir)"
-
- readme.gentoo_create_doc
-
- newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager
- newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
- # /var/run/NetworkManager is used by some distros, but not by Gentoo
- rmdir -v "${ED}/var/run/NetworkManager" || die "rmdir failed"
- rmdir -v "${ED}/var/run" || die "rmdir failed"
-
- # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
- keepdir /etc/NetworkManager/dispatcher.d
-
- # Provide openrc net dependency only when nm is connected
- exeinto /etc/NetworkManager/dispatcher.d
- newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
- sed -e "s:@EPREFIX@:${EPREFIX}:g" \
- -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
- keepdir /etc/NetworkManager/system-connections
- chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765
-
- # Allow users in plugdev group to modify system connections
- insinto /usr/share/polkit-1/rules.d/
- doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- readme.gentoo_print_elog
-
- if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
- ewarn "The ${PN} system configuration file has moved to a new location."
- ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
- ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
- ewarn
- ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
- fi
-
- # The polkit rules file moved to /usr/share
- old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
- if [[ -f "${old_rules}" ]]; then
- case "$(md5sum ${old_rules})" in
- 574d0cfa7e911b1f7792077003060240* )
- # Automatically delete the old rules.d file if the user did not change it
- elog
- elog "Removing old ${old_rules} ..."
- rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
- ;;
- * )
- elog "The ${old_rules}"
- elog "file moved to /usr/share/polkit-1/rules.d/ in >=networkmanager-0.9.4.0-r4"
- elog "If you edited ${old_rules}"
- elog "without changing its behavior, you may want to remove it."
- ;;
- esac
- fi
-
- # ifnet plugin was disabled for systemd users with 0.9.8.6 version
- # and for all people with 0.9.10.0-r1 (see ChangeLog for full explanations)
- if use systemd; then
- if ! version_is_at_least 0.9.8.6 ${REPLACING_VERSIONS}; then
- ewarn "Ifnet plugin won't be used with systemd support enabled"
- ewarn "as it is meant to be used with openRC and can cause collisions"
- ewarn "(like bug #485658)."
- ewarn "Because of this, you will likely need to reconfigure some of"
- ewarn "your networks. To do this you can rely on Gnome control center,"
- ewarn "nm-connection-editor or nmtui tools for example once updated"
- ewarn "NetworkManager version is installed."
- fi
- else
- if ! version_is_at_least 0.9.10.0-r1 ${REPLACING_VERSIONS}; then
- ewarn "Ifnet plugin is now disabled because of it being unattended"
- ewarn "and unmaintained for a long time, leading to some unfixed bugs"
- ewarn "and new problems appearing. We will now use upstream 'keyfile'"
- ewarn "plugin."
- ewarn "Because of this, you will likely need to reconfigure some of"
- ewarn "your networks. To do this you can rely on Gnome control center,"
- ewarn "nm-connection-editor or nmtui tools for example once updated"
- ewarn "NetworkManager version is installed."
- fi
- fi
-
- # NM fallbacks to plugin specified at compile time (upstream bug #738611)
- # but still show a warning to remember people to have cleaner config file
- if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
- if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
- ewarn
- ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
- ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
- ewarn
- fi
- fi
-
- # NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457
- if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
- ewarn "You have psk-flags=1 setting in above files, you will need to"
- ewarn "either reconfigure affected networks or, at least, set the flag"
- ewarn "value to '0'."
- fi
-}
diff --git a/net-misc/networkmanager/networkmanager-1.0.2-r1.ebuild b/net-misc/networkmanager/networkmanager-1.0.2-r1.ebuild
index 7d17e3b2716b..f77872f7b98a 100644
--- a/net-misc/networkmanager/networkmanager-1.0.2-r1.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.0.2-r1.ebuild
@@ -23,7 +23,7 @@ IUSE="bluetooth connection-sharing consolekit +dhclient dhcpcd gnutls +introspec
kernel_linux +nss +modemmanager ncurses +ppp resolvconf selinux systemd teamd test \
vala +wext +wifi zeroconf" # wimax
-KEYWORDS="~alpha amd64 arm ~arm64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 ~sparc x86"
REQUIRED_USE="
modemmanager? ( ppp )
diff --git a/net-misc/networkmanager/networkmanager-1.0.2.ebuild b/net-misc/networkmanager/networkmanager-1.0.2.ebuild
deleted file mode 100644
index 0dd58e6074d2..000000000000
--- a/net-misc/networkmanager/networkmanager-1.0.2.ebuild
+++ /dev/null
@@ -1,292 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME_ORG_MODULE="NetworkManager"
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.18"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit bash-completion-r1 eutils gnome2 linux-info multilib python-any-r1 systemd \
- user readme.gentoo toolchain-funcs vala versionator virtualx udev
-
-DESCRIPTION="Universal network configuration daemon for laptops, desktops, servers and virtualization hosts"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
-
-IUSE="bluetooth connection-sharing consolekit +dhclient dhcpcd gnutls +introspection \
-kernel_linux +nss +modemmanager ncurses +ppp resolvconf selinux systemd teamd test \
-vala +wext +wifi zeroconf" # wimax
-
-KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 ~sparc x86"
-
-REQUIRED_USE="
- modemmanager? ( ppp )
- ^^ ( nss gnutls )
- ^^ ( dhclient dhcpcd )
-"
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-# TODO: Qt support?
-COMMON_DEPEND="
- >=sys-apps/dbus-1.2
- >=dev-libs/dbus-glib-0.100
- >=dev-libs/glib-2.32:2
- >=dev-libs/libnl-3.2.8:3=
- >=sys-auth/polkit-0.106
- net-libs/libndp
- >=net-libs/libsoup-2.26:2.4=
- net-misc/iputils
- sys-libs/readline:0
- >=virtual/libgudev-165:=
- bluetooth? ( >=net-wireless/bluez-5 )
- connection-sharing? (
- net-dns/dnsmasq[dhcp]
- net-firewall/iptables )
- gnutls? (
- dev-libs/libgcrypt:0=
- net-libs/gnutls:= )
- modemmanager? ( >=net-misc/modemmanager-0.7.991 )
- ncurses? ( >=dev-libs/newt-0.52.15 )
- nss? ( >=dev-libs/nss-3.11:= )
- dhclient? ( >=net-misc/dhcp-4[client] )
- dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
- introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
- ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] net-dialup/rp-pppoe )
- resolvconf? ( net-dns/openresolv )
- systemd? ( >=sys-apps/systemd-209:0= )
- !systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) )
- teamd? ( >=net-misc/libteam-1.9 )
- zeroconf? ( net-dns/avahi:=[autoipd] )
-"
-RDEPEND="${COMMON_DEPEND}
- consolekit? ( sys-auth/consolekit )
- wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
- dev-util/gdbus-codegen
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.40
- >=sys-devel/gettext-0.17
- >=sys-kernel/linux-headers-2.6.29
- virtual/pkgconfig
- vala? ( $(vala_depend) )
- test? (
- $(python_gen_any_dep '
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/pygobject:2[${PYTHON_USEDEP}]')
- )
-"
-
-sysfs_deprecated_check() {
- ebegin "Checking for SYSFS_DEPRECATED support"
-
- if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
- eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
- eerror "or NetworkManager will not work correctly."
- eerror "See https://bugs.gentoo.org/333639 for more info."
- die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
- fi
- eend $?
-}
-
-pkg_pretend() {
- if use kernel_linux; then
- get_version
- if linux_config_exists; then
- sysfs_deprecated_check
- else
- ewarn "Was unable to determine your kernel .config"
- ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
- ewarn "See https://bugs.gentoo.org/333639 for more info."
- fi
-
- fi
-}
-
-pkg_setup() {
- enewgroup plugdev
-}
-
-src_prepare() {
- DOC_CONTENTS="To modify system network connections without needing to enter the
- root password, add your user account to the 'plugdev' group."
-
- # Force use of /run, avoid eautoreconf, upstream bug #737139
- sed -e 's:$localstatedir/run/:/run/:' -i configure || die
-
- use vala && vala_src_prepare
-
- epatch_user # don't remove, users often want custom patches for NM
- gnome2_src_prepare
-}
-
-src_configure() {
- local myconf
-
- # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
- if use ppp; then
- local PPPD_VER=`best_version net-dialup/ppp`
- PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
- PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
- myconf="${myconf} --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER}"
- fi
-
- # unit files directory needs to be passed only when systemd is enabled,
- # otherwise systemd support is not disabled completely, bug #524534
- use systemd && myconf="${myconf} "$(systemd_with_unitdir)""
-
- # TODO: enable wimax when we have a libnl:3 compatible revision of it
- # wimax will be removed, bug #522822
- # ifnet plugin always disabled until someone volunteers to actively
- # maintain and fix it
- gnome2_src_configure \
- --disable-more-warnings \
- --disable-static \
- --localstatedir=/var \
- --disable-lto \
- --disable-config-plugin-ibft \
- --disable-ifnet \
- --without-netconfig \
- --with-dbus-sys-dir=/etc/dbus-1/system.d \
- --with-udev-dir="$(get_udevdir)" \
- --with-config-plugins-default=keyfile \
- --with-iptables=/sbin/iptables \
- --with-libsoup=yes \
- --enable-concheck \
- --with-crypto=$(usex nss nss gnutls) \
- --with-session-tracking=$(usex systemd systemd $(usex consolekit consolekit no)) \
- --with-suspend-resume=$(usex systemd systemd upower) \
- $(use_enable bluetooth bluez5-dun) \
- $(use_enable introspection) \
- $(use_enable ppp) \
- --disable-wimax \
- $(use_with dhclient) \
- $(use_with dhcpcd) \
- $(use_with modemmanager modem-manager-1) \
- $(use_with ncurses nmtui) \
- $(use_with resolvconf) \
- $(use_with selinux) \
- $(use_enable teamd teamdctl) \
- $(use_enable test tests) \
- $(use_enable vala) \
- --without-valgrind \
- $(use_with wext) \
- ${myconf}
-}
-
-src_test() {
- python_setup
- Xemake check
-}
-
-src_install() {
- # Install completions at proper place, bug #465100
- gnome2_src_install completiondir="$(get_bashcompdir)"
-
- ! use systemd && readme.gentoo_create_doc
-
- newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager
- newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
- # /var/run/NetworkManager is used by some distros, but not by Gentoo
- rmdir -v "${ED}/var/run/NetworkManager" || die "rmdir failed"
- rmdir -v "${ED}/var/run" || die "rmdir failed"
-
- # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
- keepdir /etc/NetworkManager/dispatcher.d
-
- # Provide openrc net dependency only when nm is connected
- exeinto /etc/NetworkManager/dispatcher.d
- newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
- sed -e "s:@EPREFIX@:${EPREFIX}:g" \
- -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
- keepdir /etc/NetworkManager/system-connections
- chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765
-
- # Allow users in plugdev group to modify system connections
- insinto /usr/share/polkit-1/rules.d/
- doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- ! use systemd && readme.gentoo_print_elog
-
- if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
- ewarn "The ${PN} system configuration file has moved to a new location."
- ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
- ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
- ewarn
- ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
- fi
-
- # The polkit rules file moved to /usr/share
- old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
- if [[ -f "${old_rules}" ]]; then
- case "$(md5sum ${old_rules})" in
- 574d0cfa7e911b1f7792077003060240* )
- # Automatically delete the old rules.d file if the user did not change it
- elog
- elog "Removing old ${old_rules} ..."
- rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
- ;;
- * )
- elog "The ${old_rules}"
- elog "file moved to /usr/share/polkit-1/rules.d/ in >=networkmanager-0.9.4.0-r4"
- elog "If you edited ${old_rules}"
- elog "without changing its behavior, you may want to remove it."
- ;;
- esac
- fi
-
- # ifnet plugin was disabled for systemd users with 0.9.8.6 version
- # and for all people with 0.9.10.0-r1 (see ChangeLog for full explanations)
- if use systemd; then
- if ! version_is_at_least 0.9.8.6 ${REPLACING_VERSIONS}; then
- ewarn "Ifnet plugin won't be used with systemd support enabled"
- ewarn "as it is meant to be used with openRC and can cause collisions"
- ewarn "(like bug #485658)."
- ewarn "Because of this, you will likely need to reconfigure some of"
- ewarn "your networks. To do this you can rely on Gnome control center,"
- ewarn "nm-connection-editor or nmtui tools for example once updated"
- ewarn "NetworkManager version is installed."
- fi
- else
- if ! version_is_at_least 0.9.10.0-r1 ${REPLACING_VERSIONS}; then
- ewarn "Ifnet plugin is now disabled because of it being unattended"
- ewarn "and unmaintained for a long time, leading to some unfixed bugs"
- ewarn "and new problems appearing. We will now use upstream 'keyfile'"
- ewarn "plugin."
- ewarn "Because of this, you will likely need to reconfigure some of"
- ewarn "your networks. To do this you can rely on Gnome control center,"
- ewarn "nm-connection-editor or nmtui tools for example once updated"
- ewarn "NetworkManager version is installed."
- fi
- fi
-
- # NM fallbacks to plugin specified at compile time (upstream bug #738611)
- # but still show a warning to remember people to have cleaner config file
- if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
- if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
- ewarn
- ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
- ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
- ewarn
- fi
- fi
-
- # NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457
- if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
- ewarn "You have psk-flags=1 setting in above files, you will need to"
- ewarn "either reconfigure affected networks or, at least, set the flag"
- ewarn "value to '0'."
- fi
-}
diff --git a/net-misc/networkmanager/networkmanager-1.0.4.ebuild b/net-misc/networkmanager/networkmanager-1.0.6.ebuild
index de67526801eb..fd570b5a1536 100644
--- a/net-misc/networkmanager/networkmanager-1.0.4.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.0.6.ebuild
@@ -10,7 +10,7 @@ VALA_USE_DEPEND="vapigen"
PYTHON_COMPAT=( python{2_7,3_3,3_4} )
inherit autotools bash-completion-r1 eutils gnome2 linux-info multilib python-any-r1 systemd \
- user readme.gentoo toolchain-funcs vala versionator virtualx udev
+ user readme.gentoo toolchain-funcs vala versionator virtualx udev multilib-minimal
DESCRIPTION="Universal network configuration daemon for laptops, desktops, servers and virtualization hosts"
HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
@@ -22,7 +22,7 @@ IUSE="bluetooth connection-sharing consolekit +dhclient dhcpcd gnutls +introspec
kernel_linux +nss +modemmanager ncurses +ppp resolvconf selinux systemd teamd test \
vala +wext +wifi zeroconf" # wimax
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
REQUIRED_USE="
modemmanager? ( ppp )
@@ -35,26 +35,26 @@ REQUIRED_USE="
# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
# TODO: Qt support?
COMMON_DEPEND="
- >=sys-apps/dbus-1.2
- >=dev-libs/dbus-glib-0.100
- >=dev-libs/glib-2.37.6:2
+ >=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
+ >=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
+ >=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
>=dev-libs/libnl-3.2.8:3=
>=sys-auth/polkit-0.106
net-libs/libndp
>=net-libs/libsoup-2.26:2.4=
net-misc/iputils
sys-libs/readline:0
- >=virtual/libgudev-165:=
+ >=virtual/libgudev-165:=[${MULTILIB_USEDEP}]
bluetooth? ( >=net-wireless/bluez-5 )
connection-sharing? (
net-dns/dnsmasq[dhcp]
net-firewall/iptables )
gnutls? (
- dev-libs/libgcrypt:0=
- net-libs/gnutls:= )
+ dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
+ net-libs/gnutls:=[${MULTILIB_USEDEP}] )
modemmanager? ( >=net-misc/modemmanager-0.7.991 )
ncurses? ( >=dev-libs/newt-0.52.15 )
- nss? ( >=dev-libs/nss-3.11:= )
+ nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
dhclient? ( >=net-misc/dhcp-4[client] )
dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
@@ -121,6 +121,9 @@ src_prepare() {
# Force use of /run, avoid eautoreconf, upstream bug #737139, fixed in 'master'
sed -e 's:$localstatedir/run/:/run/:' -i configure || die
+ # Don't build examples, they are not needed and can cause build failure
+ sed -e '/^\s*examples\s*\\/d' -i Makefile.{am,in} || die
+
use vala && vala_src_prepare
epatch_user # don't remove, users often want custom patches for NM
@@ -130,25 +133,35 @@ src_prepare() {
gnome2_src_prepare
}
-src_configure() {
- local myconf
+multilib_src_configure() {
+ local myconf=()
# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
if use ppp; then
local PPPD_VER=`best_version net-dialup/ppp`
PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
- myconf="${myconf} --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER}"
+ myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
fi
# unit files directory needs to be passed only when systemd is enabled,
# otherwise systemd support is not disabled completely, bug #524534
- use systemd && myconf="${myconf} "$(systemd_with_unitdir)""
+ use systemd && myconf+=( "$(systemd_with_unitdir)" )
+
+ if multilib_is_native_abi; then
+ # work-around man out-of-source brokenness, must be done before configure
+ mkdir man || die
+ find "${S}"/man -name '*.?' -exec ln -s {} man/ ';' || die
+ else
+ # libnl, libndp are only used for executables, not libraries
+ myconf+=( LIB{NL,NDP}_{CFLAGS,LIBS}=' ' )
+ fi
# TODO: enable wimax when we have a libnl:3 compatible revision of it
# wimax will be removed, bug #522822
# ifnet plugin always disabled until someone volunteers to actively
# maintain and fix it
+ ECONF_SOURCE=${S} \
gnome2_src_configure \
--disable-more-warnings \
--disable-static \
@@ -161,39 +174,75 @@ src_configure() {
--with-udev-dir="$(get_udevdir)" \
--with-config-plugins-default=keyfile \
--with-iptables=/sbin/iptables \
- --with-libsoup=yes \
- --enable-concheck \
+ $(multilib_native_with libsoup) \
+ $(multilib_native_enable concheck) \
--with-crypto=$(usex nss nss gnutls) \
- --with-session-tracking=$(usex systemd systemd $(usex consolekit consolekit no)) \
- --with-suspend-resume=$(usex systemd systemd upower) \
- $(use_enable bluetooth bluez5-dun) \
- $(use_enable introspection) \
- $(use_enable ppp) \
+ --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex consolekit consolekit no)) \
+ --with-suspend-resume=$(multilib_native_usex systemd systemd upower) \
+ $(multilib_native_use_enable bluetooth bluez5-dun) \
+ $(multilib_native_use_enable introspection) \
+ $(multilib_native_use_enable ppp) \
--disable-wimax \
$(use_with dhclient) \
$(use_with dhcpcd) \
- $(use_with modemmanager modem-manager-1) \
- $(use_with ncurses nmtui) \
- $(use_with resolvconf) \
- $(use_with selinux) \
- $(use_enable teamd teamdctl) \
- $(use_enable test tests) \
- $(use_enable vala) \
+ $(multilib_native_use_with modemmanager modem-manager-1) \
+ $(multilib_native_use_with ncurses nmtui) \
+ $(multilib_native_use_with resolvconf) \
+ $(multilib_native_use_with selinux) \
+ $(multilib_native_use_enable teamd teamdctl) \
+ $(multilib_native_use_enable test tests) \
+ $(multilib_native_use_enable vala) \
--without-valgrind \
- $(use_with wext) \
- $(use_enable wifi) \
- ${myconf}
+ $(multilib_native_use_with wext) \
+ $(multilib_native_use_enable wifi) \
+ "${myconf[@]}"
+
+ # work-around gtk-doc out-of-source brokedness
+ if multilib_is_native_abi; then
+ local d
+ for d in api libnm libnm-util libnm-glib; do
+ ln -s "${S}"/docs/${d}/html docs/${d}/html || die
+ done
+ fi
}
-src_test() {
- python_setup
- Xemake check
+multilib_src_compile() {
+ if multilib_is_native_abi; then
+ emake
+ else
+ emake all-am
+ emake -C include
+ emake -C introspection # generated headers, needed for libnm
+ emake -C libnm-core
+ emake -C libnm
+ emake -C libnm-util
+ emake -C libnm-glib
+ fi
}
-src_install() {
- # Install completions at proper place, bug #465100
- gnome2_src_install completiondir="$(get_bashcompdir)"
+multilib_src_test() {
+ if multilib_is_native_abi; then
+ python_setup
+ Xemake check
+ fi
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ # Install completions at proper place, bug #465100
+ gnome2_src_install completiondir="$(get_bashcompdir)"
+ else
+ emake DESTDIR="${D}" install-am
+ emake DESTDIR="${D}" install -C include
+ emake DESTDIR="${D}" install -C introspection
+ emake DESTDIR="${D}" install -C libnm-core
+ emake DESTDIR="${D}" install -C libnm
+ emake DESTDIR="${D}" install -C libnm-util
+ emake DESTDIR="${D}" install -C libnm-glib
+ fi
+}
+multilib_src_install_all() {
! use systemd && readme.gentoo_create_doc
newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager
@@ -213,7 +262,7 @@ src_install() {
-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
keepdir /etc/NetworkManager/system-connections
- chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765
+ chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
# Allow users in plugdev group to modify system connections
insinto /usr/share/polkit-1/rules.d/
diff --git a/net-misc/openvpn-auth-ldap/metadata.xml b/net-misc/openvpn-auth-ldap/metadata.xml
index 3e7867df9601..a95d24666619 100644
--- a/net-misc/openvpn-auth-ldap/metadata.xml
+++ b/net-misc/openvpn-auth-ldap/metadata.xml
@@ -7,5 +7,6 @@
</maintainer>
<upstream>
<remote-id type="google-code">openvpn-auth-ldap</remote-id>
+ <remote-id type="github">threerings/openvpn-auth-ldap</remote-id>
</upstream>
</pkgmetadata>
diff --git a/net-misc/openvpn/openvpn-2.3.8.ebuild b/net-misc/openvpn/openvpn-2.3.8.ebuild
index 30418adf5994..436d9c7b06a9 100644
--- a/net-misc/openvpn/openvpn-2.3.8.ebuild
+++ b/net-misc/openvpn/openvpn-2.3.8.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://openvpn.net/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
IUSE="examples down-root iproute2 +lzo pam passwordsave pkcs11 +plugins polarssl selinux socks +ssl static systemd userland_BSD"
REQUIRED_USE="static? ( !plugins !pkcs11 )
diff --git a/net-misc/ps3mediaserver/metadata.xml b/net-misc/ps3mediaserver/metadata.xml
index b4d63de760df..3e5aa55ddaa5 100644
--- a/net-misc/ps3mediaserver/metadata.xml
+++ b/net-misc/ps3mediaserver/metadata.xml
@@ -16,5 +16,6 @@
<upstream>
<remote-id type="google-code">ps3mediaserver</remote-id>
<remote-id type="sourceforge">ps3mediaserver</remote-id>
+ <remote-id type="github">ps3mediaserver/ps3mediaserver</remote-id>
</upstream>
</pkgmetadata>
diff --git a/net-misc/rygel/rygel-0.26.1.ebuild b/net-misc/rygel/rygel-0.26.1.ebuild
index 9ec428c5da96..95a898d3a01d 100644
--- a/net-misc/rygel/rygel-0.26.1.ebuild
+++ b/net-misc/rygel/rygel-0.26.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Rygel"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="X +introspection +sqlite tracker test transcode"
# The deps for tracker? and transcode? are just the earliest available
diff --git a/net-misc/spice-gtk/spice-gtk-0.28.ebuild b/net-misc/spice-gtk/spice-gtk-0.28.ebuild
index 33656b080ca0..754d355e5e33 100644
--- a/net-misc/spice-gtk/spice-gtk-0.28.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.28.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://spice-space.org http://gitorious.org/spice-gtk"
LICENSE="LGPL-2.1"
SLOT="0"
SRC_URI="http://spice-space.org/download/gtk/${P}.tar.bz2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="dbus gstreamer gtk3 +introspection lz4 policykit pulseaudio python sasl smartcard static-libs usbredir vala webdav"
REQUIRED_USE="
diff --git a/net-misc/strongswan/Manifest b/net-misc/strongswan/Manifest
index 2edf21e4dc65..22c7ecdde17b 100644
--- a/net-misc/strongswan/Manifest
+++ b/net-misc/strongswan/Manifest
@@ -1 +1,2 @@
DIST strongswan-5.3.2.tar.bz2 4320601 SHA256 a4a9bc8c4e42bdc4366a87a05a02bf9f425169a7ab0c6f4482d347e44acbf225 SHA512 60b17645c00769d497f4cea2229b41a217c29fe1109b58be256a0d4a6ccf4765348b9eb89466539c2528756344c2fa969f25ea1cd8856d56c5d55aa78e632e68 WHIRLPOOL e5ca686e25daf2ca9c42ab8a2fcb62635c7ef2c164313dc01265bb7718d9522d478b9be5ef63d52df27dc44654d455b7dc0a41c86312e0a4c2b25aa279f3a21e
+DIST strongswan-5.3.3.tar.bz2 4423437 SHA256 39d2e8f572a57a77dda8dd8bdaf2ee47ad3cefeb86bbb840d594aa75f00f33e2 SHA512 469b32635bb4c60af1fa5ee535bea5abcd91081c7d482baa861e3951e4aab00783620698b5eade82d9a77aea4ab60d2a00fbf7e9e8760feeffb67c517756169f WHIRLPOOL dafac5830ebc90a3ed04e34d227768f39d92d375200391082abedb4fcab43bc6dcdaeeb2028866eefefc2087a8b7ca61da287875e4b201952f4dda5cb904e5ea
diff --git a/net-misc/strongswan/strongswan-5.3.3.ebuild b/net-misc/strongswan/strongswan-5.3.3.ebuild
new file mode 100644
index 000000000000..d1830fa88ebc
--- /dev/null
+++ b/net-misc/strongswan/strongswan-5.3.3.ebuild
@@ -0,0 +1,302 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils linux-info systemd user
+
+DESCRIPTION="IPsec-based VPN solution focused on security and ease of use, supporting IKEv1/IKEv2 and MOBIKE"
+HOMEPAGE="http://www.strongswan.org/"
+SRC_URI="http://download.strongswan.org/${P}.tar.bz2"
+
+LICENSE="GPL-2 RSA DES"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl sqlite pam pkcs11"
+
+STRONGSWAN_PLUGINS_STD="led lookip systime-fix unity vici"
+STRONGSWAN_PLUGINS_OPT="blowfish ccm ctr gcm ha ipseckey ntru padlock rdrand unbound whitelist"
+for mod in $STRONGSWAN_PLUGINS_STD; do
+ IUSE="${IUSE} +strongswan_plugins_${mod}"
+done
+
+for mod in $STRONGSWAN_PLUGINS_OPT; do
+ IUSE="${IUSE} strongswan_plugins_${mod}"
+done
+
+COMMON_DEPEND="!net-misc/openswan
+ gmp? ( >=dev-libs/gmp-4.1.5 )
+ gcrypt? ( dev-libs/libgcrypt:0 )
+ caps? ( sys-libs/libcap )
+ curl? ( net-misc/curl )
+ ldap? ( net-nds/openldap )
+ openssl? ( >=dev-libs/openssl-0.9.8[-bindist] )
+ mysql? ( virtual/mysql )
+ sqlite? ( >=dev-db/sqlite-3.3.1 )
+ networkmanager? ( net-misc/networkmanager )
+ pam? ( sys-libs/pam )
+ strongswan_plugins_unbound? ( net-dns/unbound )"
+DEPEND="${COMMON_DEPEND}
+ virtual/linux-sources
+ sys-kernel/linux-headers"
+RDEPEND="${COMMON_DEPEND}
+ virtual/logger
+ sys-apps/iproute2
+ !net-misc/libreswan"
+
+UGID="ipsec"
+
+pkg_setup() {
+ linux-info_pkg_setup
+ elog "Linux kernel version: ${KV_FULL}"
+
+ if ! kernel_is -ge 2 6 16; then
+ eerror
+ eerror "This ebuild currently only supports ${PN} with the"
+ eerror "native Linux 2.6 IPsec stack on kernels >= 2.6.16."
+ eerror
+ fi
+
+ if kernel_is -lt 2 6 34; then
+ ewarn
+ ewarn "IMPORTANT KERNEL NOTES: Please read carefully..."
+ ewarn
+
+ if kernel_is -lt 2 6 29; then
+ ewarn "[ < 2.6.29 ] Due to a missing kernel feature, you have to"
+ ewarn "include all required IPv6 modules even if you just intend"
+ ewarn "to run on IPv4 only."
+ ewarn
+ ewarn "This has been fixed with kernels >= 2.6.29."
+ ewarn
+ fi
+
+ if kernel_is -lt 2 6 33; then
+ ewarn "[ < 2.6.33 ] Kernels prior to 2.6.33 include a non-standards"
+ ewarn "compliant implementation for SHA-2 HMAC support in ESP and"
+ ewarn "miss SHA384 and SHA512 HMAC support altogether."
+ ewarn
+ ewarn "If you need any of those features, please use kernel >= 2.6.33."
+ ewarn
+ fi
+
+ if kernel_is -lt 2 6 34; then
+ ewarn "[ < 2.6.34 ] Support for the AES-GMAC authentification-only"
+ ewarn "ESP cipher is only included in kernels >= 2.6.34."
+ ewarn
+ ewarn "If you need it, please use kernel >= 2.6.34."
+ ewarn
+ fi
+ fi
+
+ if use non-root; then
+ enewgroup ${UGID}
+ enewuser ${UGID} -1 -1 -1 ${UGID}
+ fi
+}
+
+src_prepare() {
+ epatch_user
+}
+
+src_configure() {
+ local myconf=""
+
+ if use non-root; then
+ myconf="${myconf} --with-user=${UGID} --with-group=${UGID}"
+ fi
+
+ # If a user has already enabled db support, those plugins will
+ # most likely be desired as well. Besides they don't impose new
+ # dependencies and come at no cost (except for space).
+ if use mysql || use sqlite; then
+ myconf="${myconf} --enable-attr-sql --enable-sql"
+ fi
+
+ # strongSwan builds and installs static libs by default which are
+ # useless to the user (and to strongSwan for that matter) because no
+ # header files or alike get installed... so disabling them is safe.
+ if use pam && use eap; then
+ myconf="${myconf} --enable-eap-gtc"
+ else
+ myconf="${myconf} --disable-eap-gtc"
+ fi
+
+ for mod in $STRONGSWAN_PLUGINS_STD; do
+ if use strongswan_plugins_${mod}; then
+ myconf+=" --enable-${mod}"
+ fi
+ done
+
+ for mod in $STRONGSWAN_PLUGINS_OPT; do
+ if use strongswan_plugins_${mod}; then
+ myconf+=" --enable-${mod}"
+ fi
+ done
+
+ econf \
+ --disable-static \
+ --enable-ikev1 \
+ --enable-ikev2 \
+ --enable-swanctl \
+ --enable-socket-dynamic \
+ $(use_with caps capabilities libcap) \
+ $(use_enable curl) \
+ $(use_enable constraints) \
+ $(use_enable ldap) \
+ $(use_enable debug leak-detective) \
+ $(use_enable dhcp) \
+ $(use_enable eap eap-sim) \
+ $(use_enable eap eap-sim-file) \
+ $(use_enable eap eap-simaka-sql) \
+ $(use_enable eap eap-simaka-pseudonym) \
+ $(use_enable eap eap-simaka-reauth) \
+ $(use_enable eap eap-identity) \
+ $(use_enable eap eap-md5) \
+ $(use_enable eap eap-aka) \
+ $(use_enable eap eap-aka-3gpp2) \
+ $(use_enable eap md4) \
+ $(use_enable eap eap-mschapv2) \
+ $(use_enable eap eap-radius) \
+ $(use_enable eap eap-tls) \
+ $(use_enable eap xauth-eap) \
+ $(use_enable farp) \
+ $(use_enable gmp) \
+ $(use_enable gcrypt) \
+ $(use_enable mysql) \
+ $(use_enable networkmanager nm) \
+ $(use_enable openssl) \
+ $(use_enable pam xauth-pam) \
+ $(use_enable pkcs11) \
+ $(use_enable sqlite) \
+ "$(systemd_with_unitdir)" \
+ ${myconf}
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ doinitd "${FILESDIR}"/ipsec
+
+ local dir_ugid
+ if use non-root; then
+ fowners ${UGID}:${UGID} \
+ /etc/ipsec.conf \
+ /etc/strongswan.conf
+
+ dir_ugid="${UGID}"
+ else
+ dir_ugid="root"
+ fi
+
+ diropts -m 0750 -o ${dir_ugid} -g ${dir_ugid}
+ dodir /etc/ipsec.d \
+ /etc/ipsec.d/aacerts \
+ /etc/ipsec.d/acerts \
+ /etc/ipsec.d/cacerts \
+ /etc/ipsec.d/certs \
+ /etc/ipsec.d/crls \
+ /etc/ipsec.d/ocspcerts \
+ /etc/ipsec.d/private \
+ /etc/ipsec.d/reqs
+
+ dodoc NEWS README TODO || die
+
+ # shared libs are used only internally and there are no static libs,
+ # so it's safe to get rid of the .la files
+ find "${D}" -name '*.la' -delete || die "Failed to remove .la files."
+}
+
+pkg_preinst() {
+ has_version "<net-misc/strongswan-4.3.6-r1"
+ upgrade_from_leq_4_3_6=$(( !$? ))
+
+ has_version "<net-misc/strongswan-4.3.6-r1[-caps]"
+ previous_4_3_6_with_caps=$(( !$? ))
+}
+
+pkg_postinst() {
+ if ! use openssl && ! use gcrypt; then
+ elog
+ elog "${PN} has been compiled without both OpenSSL and libgcrypt support."
+ elog "Please note that this might effect availability and speed of some"
+ elog "cryptographic features. You are advised to enable the OpenSSL plugin."
+ elif ! use openssl; then
+ elog
+ elog "${PN} has been compiled without the OpenSSL plugin. This might effect"
+ elog "availability and speed of some cryptographic features. There will be"
+ elog "no support for Elliptic Curve Cryptography (Diffie-Hellman groups 19-21,"
+ elog "25, 26) and ECDSA."
+ fi
+
+ if [[ $upgrade_from_leq_4_3_6 == 1 ]]; then
+ chmod 0750 "${ROOT}"/etc/ipsec.d \
+ "${ROOT}"/etc/ipsec.d/aacerts \
+ "${ROOT}"/etc/ipsec.d/acerts \
+ "${ROOT}"/etc/ipsec.d/cacerts \
+ "${ROOT}"/etc/ipsec.d/certs \
+ "${ROOT}"/etc/ipsec.d/crls \
+ "${ROOT}"/etc/ipsec.d/ocspcerts \
+ "${ROOT}"/etc/ipsec.d/private \
+ "${ROOT}"/etc/ipsec.d/reqs
+
+ ewarn
+ ewarn "The default permissions for /etc/ipsec.d/* have been tightened for"
+ ewarn "security reasons. Your system installed directories have been"
+ ewarn "updated accordingly. Please check if necessary."
+ ewarn
+
+ if [[ $previous_4_3_6_with_caps == 1 ]]; then
+ if ! use non-root; then
+ ewarn
+ ewarn "IMPORTANT: You previously had ${PN} installed without root"
+ ewarn "privileges because it was implied by the 'caps' USE flag."
+ ewarn "This has been changed. If you want ${PN} with user privileges,"
+ ewarn "you have to re-emerge it with the 'non-root' USE flag enabled."
+ ewarn
+ fi
+ fi
+ fi
+ if ! use caps && ! use non-root; then
+ ewarn
+ ewarn "You have decided to run ${PN} with root privileges and built it"
+ ewarn "without support for POSIX capability dropping. It is generally"
+ ewarn "strongly suggested that you reconsider- especially if you intend"
+ ewarn "to run ${PN} as server with a public ip address."
+ ewarn
+ ewarn "You should re-emerge ${PN} with at least the 'caps' USE flag enabled."
+ ewarn
+ fi
+ if use non-root; then
+ elog
+ elog "${PN} has been installed without superuser privileges (USE=non-root)."
+ elog "This imposes several limitations mainly to the IKEv1 daemon 'pluto'"
+ elog "but also a few to the IKEv2 daemon 'charon'."
+ elog
+ elog "Please carefully read: http://wiki.strongswan.org/wiki/nonRoot"
+ elog
+ elog "pluto uses a helper script by default to insert/remove routing and"
+ elog "policy rules upon connection start/stop which requires superuser"
+ elog "privileges. charon in contrast does this internally and can do so"
+ elog "even with reduced (user) privileges."
+ elog
+ elog "Thus if you require IKEv1 (pluto) or need to specify a custom updown"
+ elog "script to pluto or charon which requires superuser privileges, you"
+ elog "can work around this limitation by using sudo to grant the"
+ elog "user \"ipsec\" the appropriate rights."
+ elog "For example (the default case):"
+ elog "/etc/sudoers:"
+ elog " ipsec ALL=(ALL) NOPASSWD: SETENV: /usr/sbin/ipsec"
+ elog "Under the specific connection block in /etc/ipsec.conf:"
+ elog " leftupdown=\"sudo -E ipsec _updown iptables\""
+ elog
+ fi
+ elog
+ elog "Make sure you have _all_ required kernel modules available including"
+ elog "the appropriate cryptographic algorithms. A list is available at:"
+ elog " http://wiki.strongswan.org/projects/strongswan/wiki/KernelModules"
+ elog
+ elog "The up-to-date manual is available online at:"
+ elog " http://wiki.strongswan.org/"
+ elog
+}
diff --git a/net-misc/vinagre/vinagre-3.16.1.ebuild b/net-misc/vinagre/vinagre-3.16.1.ebuild
index 1b4ba2972808..dfa5bd801a90 100644
--- a/net-misc/vinagre/vinagre-3.16.1.ebuild
+++ b/net-misc/vinagre/vinagre-3.16.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Vinagre"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
IUSE="rdp +ssh spice +telepathy zeroconf"
# cairo used in vinagre-tab
diff --git a/net-misc/vino/vino-3.16.0.ebuild b/net-misc/vino/vino-3.16.0.ebuild
index 037b150630ab..08c7dd0148e6 100644
--- a/net-misc/vino/vino-3.16.0.ebuild
+++ b/net-misc/vino/vino-3.16.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vino"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="crypt libsecret ipv6 jpeg ssl +telepathy zeroconf +zlib"
# bug #394611; tight encoding requires zlib encoding
REQUIRED_USE="jpeg? ( zlib )"
diff --git a/net-misc/wicd/Manifest b/net-misc/wicd/Manifest
index 290c9f13a4c3..11e0f0e6610d 100644
--- a/net-misc/wicd/Manifest
+++ b/net-misc/wicd/Manifest
@@ -1,4 +1,3 @@
DIST Icone-Wicd-Lucid.tar.gz 9015 SHA256 6e4e3483c6cff7398e6871dd3e4360e361e5c6e64007e8e1240fd1c259ac707e SHA512 0df0dbdf05b462264dca2dd9955454a82f688b0fbfa7c2ad70a424df57eb27b35561d37819fc88b5746cff8a54de5b7b43ec325d2f98a4a1a30e4d500e86d2f8 WHIRLPOOL 336f363092c9bac7523047b6052a856a699820147967820418c6ac1ca528c472d371c6c211c505c325b5eb001812042c01425b05e1dfdf2d4a528f96686c530a
-DIST wicd-1.7.2.4.tar.gz 439297 SHA256 dcfdfb5dbbb49dbb9b205fddf064d6b1a4e88f66f1cf40d12fb7fe0e0c7cdc97 SHA512 6dd8d4726c5f9c943d90305b7ed70573b42b5dae00de443209d9f526778e91ac01aabffa14447c47374b4d9986133aacfcc970735d1b5befa232da44d3190d7c WHIRLPOOL 59885a22dbf350e73a55fdbf7ea1c9b93a339edae116beb1c22c271762d90488ecdeb7952a4efc8241d362b5bafcaccf88053c4d5c41468cba0cd524cf2a5756
DIST wicd-1.7.3.tar.gz 542341 SHA256 91e38857b1651d242ed7e3b3e3fd8b076b4d06a23eedb033310fae510ece8401 SHA512 3ff3f42cd228327641b584bf85ef785a7d490fa5a57d1aa695f9b4860dae086c240a60321832a0aeee2dfb23de70da1a9f6abce4f1b6ecab58455304407fd536 WHIRLPOOL 69a9042e77f78f6d0dabc73e0569023d5a6747b82e3c944aad51a74681765b1b439beef1a578fcba4f048dbba6cbeabe0aca54ea62076d7dacdcbc4100ef2025
DIST wicd-mac4lin-icons.tar.xz 53136 SHA256 4c48c769c71f962415e3bd3573557e9288351afb867347f9a6f652883ae31011
diff --git a/net-misc/wicd/files/wicd-1.7.1-provide-net.patch b/net-misc/wicd/files/wicd-1.7.1-provide-net.patch
deleted file mode 100644
index f325bcbaa89d..000000000000
--- a/net-misc/wicd/files/wicd-1.7.1-provide-net.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -U 3 -dHrN wicd-1.7.1.orig/in/init=gentoo=wicd.in wicd-1.7.1/in/init=gentoo=wicd.in
---- wicd-1.7.1.orig/in/init=gentoo=wicd.in 2012-02-27 21:49:36.422873826 +0100
-+++ wicd-1.7.1/in/init=gentoo=wicd.in 2012-02-27 21:50:26.957127714 +0100
-@@ -10,6 +10,7 @@
- depend() {
- need dbus
- after hald
-+ provide net
- }
-
- start() {
diff --git a/net-misc/wicd/files/wicd-1.7.1_beta2-init.patch b/net-misc/wicd/files/wicd-1.7.1_beta2-init.patch
deleted file mode 100644
index 6a736f9e2cdd..000000000000
--- a/net-misc/wicd/files/wicd-1.7.1_beta2-init.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- in/init=gentoo=wicd.in 2010-10-29 11:36:55.000000000 -0400
-+++ in/init=gentoo=wicd.in.new 2011-03-28 09:40:27.245339002 -0400
-@@ -15,7 +15,7 @@
- start() {
- ebegin "Starting wicd daemon"
- # fix Gentoo bug 296197
-- sed -i 's/^\[\]$//' /etc/wicd/wired-settings.conf
-+ [ -f /etc/wicd/wired-settings.conf ] && sed -i 's/^\[\]$//' /etc/wicd/wired-settings.conf
- "${WICD_DAEMON}" >/dev/null 2>&1
- eend $?
- }
diff --git a/net-misc/wicd/files/wicd-1.7.1_pre20111210-wpa-psk-hex-template.patch b/net-misc/wicd/files/wicd-1.7.1_pre20111210-wpa-psk-hex-template.patch
deleted file mode 100644
index 6736cb7b8d1b..000000000000
--- a/net-misc/wicd/files/wicd-1.7.1_pre20111210-wpa-psk-hex-template.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -U 3 -dHrN wicd.org/encryption/templates/active wicd/encryption/templates/active
---- wicd.org/encryption/templates/active 2011-12-05 16:22:49.584224158 +0100
-+++ wicd/encryption/templates/active 2011-12-05 16:16:10.736172566 +0100
-@@ -1,6 +1,7 @@
- wpa
- wpa-peap
- wpa-psk
-+wpa-psk-hex
- wpa2-leap
- wpa2-peap
- wep-hex
-diff -U 3 -dHrN wicd.org/encryption/templates/wpa-psk-hex wicd/encryption/templates/wpa-psk-hex
---- wicd.org/encryption/templates/wpa-psk-hex 1970-01-01 01:00:00.000000000 +0100
-+++ wicd/encryption/templates/wpa-psk-hex 2011-12-05 16:16:43.428012863 +0100
-@@ -0,0 +1,15 @@
-+name = WPA 1/2 (Preshared Hex Key)
-+author = Thomas Kahle
-+version = 1
-+require apsk *Preshared_Key
-+-----
-+ctrl_interface=/var/run/wpa_supplicant
-+network={
-+ ssid="$_ESSID"
-+ scan_ssid=$_SCAN
-+ proto=WPA RSN
-+ key_mgmt=WPA-PSK
-+ pairwise=CCMP TKIP
-+ group=CCMP TKIP
-+ psk=$_APSK
-+}
diff --git a/net-misc/wicd/files/wicd-1.7.2.4-fix-dbus-error.patch b/net-misc/wicd/files/wicd-1.7.2.4-fix-dbus-error.patch
deleted file mode 100644
index 2fddc9a2e55f..000000000000
--- a/net-misc/wicd/files/wicd-1.7.2.4-fix-dbus-error.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-=== modified file 'wicd/misc.py'
---- wicd/misc.py 2012-04-30 19:20:47 +0000
-+++ wicd/misc.py 2012-05-03 16:01:49 +0000
-@@ -430,7 +430,10 @@
- """ Sanitize property names to be used in config-files. """
- allowed = string.ascii_letters + '_' + string.digits
- table = string.maketrans(allowed, ' ' * len(allowed))
-- return s.translate(None, table)
-+
-+ # s is a dbus.String -- since we don't allow unicode property keys,
-+ # make it simple.
-+ return str(s).translate(None, table)
-
- def sanitize_escaped(s):
- """ Sanitize double-escaped unicode strings. """
-
diff --git a/net-misc/wicd/files/wicd-1.7.2.4-second-urwid.patch b/net-misc/wicd/files/wicd-1.7.2.4-second-urwid.patch
deleted file mode 100644
index 9a0bae6c9625..000000000000
--- a/net-misc/wicd/files/wicd-1.7.2.4-second-urwid.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-=== modified file 'curses/curses_misc.py'
---- curses/curses_misc.py 2012-11-15 09:26:21 +0000
-+++ curses/curses_misc.py 2012-11-16 09:22:47 +0000
-@@ -352,7 +352,7 @@
- if urwid.VERSION < (1, 1, 0):
- self.focus = focus
- else:
-- self.focus_position = focus
-+ self._w.focus_position = focus
-
- self.callback = callback
- self.user_args = user_args
-@@ -368,7 +368,10 @@
- if urwid.VERSION < (1, 1, 0):
- self.focus = index
- else:
-- self.focus_position = index
-+ try:
-+ self._w.focus_position = index
-+ except IndexError:
-+ pass
-
- # API changed between urwid 0.9.8.4 and 0.9.9
- try:
-@@ -386,7 +389,7 @@
- if urwid.VERSION < (1, 1, 0):
- index = self.focus
- else:
-- index = self.focus_position
-+ index = self._w.focus_position
-
- self.cbox = DynWrap(SelText([self.list[index]+self.DOWN_ARROW]),
- attrs=self.attrs,focus_attr=self.focus_attr)
-@@ -434,7 +437,7 @@
- if urwid.VERSION < (1, 1, 0):
- return None, self.focus
- else:
-- return None, self.focus_position
-+ return None, self._w.focus_position
-
- def get_sensitive(self):
- return self.cbox.get_sensitive()
-
diff --git a/net-misc/wicd/files/wicd-1.7.2.4-urwid.patch b/net-misc/wicd/files/wicd-1.7.2.4-urwid.patch
deleted file mode 100644
index 63eba2ed48b6..000000000000
--- a/net-misc/wicd/files/wicd-1.7.2.4-urwid.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-=== modified file 'curses/curses_misc.py'
---- curses/curses_misc.py 2012-05-06 15:16:15 +0000
-+++ curses/curses_misc.py 2012-11-15 09:26:21 +0000
-@@ -349,7 +349,10 @@
- # We need this to pick our keypresses
- self.use_enter = use_enter
-
-- self.focus = focus
-+ if urwid.VERSION < (1, 1, 0):
-+ self.focus = focus
-+ else:
-+ self.focus_position = focus
-
- self.callback = callback
- self.user_args = user_args
-@@ -362,7 +365,11 @@
- self.list = list
-
- def set_focus(self,index):
-- self.focus = index
-+ if urwid.VERSION < (1, 1, 0):
-+ self.focus = index
-+ else:
-+ self.focus_position = index
-+
- # API changed between urwid 0.9.8.4 and 0.9.9
- try:
- self.cbox.set_w(SelText(self.list[index]+self.DOWN_ARROW))
-@@ -376,16 +383,21 @@
- def build_combobox(self,parent,ui,row):
- str,trash = self.label.get_text()
-
-- self.cbox = DynWrap(SelText([self.list[self.focus]+self.DOWN_ARROW]),
-+ if urwid.VERSION < (1, 1, 0):
-+ index = self.focus
-+ else:
-+ index = self.focus_position
-+
-+ self.cbox = DynWrap(SelText([self.list[index]+self.DOWN_ARROW]),
- attrs=self.attrs,focus_attr=self.focus_attr)
- if str != '':
- w = urwid.Columns([('fixed',len(str),self.label),self.cbox],
- dividechars=1)
-- self.overlay = self.ComboSpace(self.list,parent,ui,self.focus,
-+ self.overlay = self.ComboSpace(self.list,parent,ui,index,
- pos=(len(str)+1,row))
- else:
- w = urwid.Columns([self.cbox])
-- self.overlay = self.ComboSpace(self.list,parent,ui,self.focus,
-+ self.overlay = self.ComboSpace(self.list,parent,ui,index,
- pos=(0,row))
-
- self._w = w
-@@ -419,7 +431,10 @@
- if self.overlay:
- return self.overlay._listbox.get_focus()
- else:
-- return None,self.focus
-+ if urwid.VERSION < (1, 1, 0):
-+ return None, self.focus
-+ else:
-+ return None, self.focus_position
-
- def get_sensitive(self):
- return self.cbox.get_sensitive()
-
diff --git a/net-misc/wicd/wicd-1.7.2.4-r3.ebuild b/net-misc/wicd/wicd-1.7.2.4-r3.ebuild
deleted file mode 100644
index c9aca7b276d3..000000000000
--- a/net-misc/wicd/wicd-1.7.2.4-r3.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ncurses?,xml"
-
-inherit eutils distutils-r1 linux-info readme.gentoo systemd
-
-DESCRIPTION="A lightweight wired and wireless network manager for Linux"
-HOMEPAGE="https://launchpad.net/wicd"
-SRC_URI="https://launchpad.net/wicd/1.7/${PV}/+download/${P}.tar.gz
- mac4lin? ( https://dev.gentoo.org/~anarchy/dist/wicd-mac4lin-icons.tar.xz )
- ambiance? ( http://freetimesblog.altervista.org/blog/wp-content/uploads/downloads/2010/05/Icone-Wicd-Lucid.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc ppc64 x86"
-IUSE="doc X ambiance +gtk ioctl libnotify mac4lin ncurses nls +pm-utils"
-
-DEPEND="nls? ( dev-python/Babel )"
-RDEPEND="${PYTHON_DEPS}
- dev-python/dbus-python[${PYTHON_USEDEP}]
- X? (
- gtk? ( dev-python/pygtk )
- || (
- x11-misc/ktsuss
- x11-libs/gksu
- kde-apps/kdesu
- )
- )
- || (
- net-misc/dhcpcd
- net-misc/dhcp
- net-misc/pump
- )
- net-wireless/wireless-tools
- net-wireless/wpa_supplicant
- || (
- sys-apps/net-tools
- sys-apps/ethtool
- )
- !gtk? ( dev-python/pygobject:2[${PYTHON_USEDEP}] )
- ioctl? ( dev-python/python-iwscan dev-python/python-wpactrl )
- libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
- ncurses? (
- dev-python/urwid
- dev-python/pygobject:2[${PYTHON_USEDEP}]
- )
- pm-utils? ( sys-power/pm-utils )
- "
-
-src_prepare() {
- CONFIG_CHECK="~CFG80211_WEXT"
- local WARNING_CFG80211_WEXT="Wireless extensions have not been \
- configured in your kernel. Wicd will not work unless CFG80211_WEXT is set."
- check_extra_config
-
- # Fix bug 441966 (urwid-1.1.0 compatibility)
- epatch "${FILESDIR}"/${P}-urwid.patch
- epatch "${FILESDIR}"/${P}-second-urwid.patch
- epatch "${FILESDIR}"/${PN}-1.7.1_beta2-init.patch
- epatch "${FILESDIR}"/${PN}-init-sve-start.patch
- # Add a template for hex psk's and wpa (Bug 306423)
- epatch "${FILESDIR}"/${PN}-1.7.1_pre20111210-wpa-psk-hex-template.patch
- # The Categories entry in the .desktop files is outdated
- epatch "${FILESDIR}"/${P}-fix-desktop-categories.patch
- # Fix bug 416579 (should be included in next release)
- epatch "${FILESDIR}"/${P}-fix-dbus-error.patch
- # get rid of opts variable to fix bug 381885
- sed -i "/opts/d" "in/init=gentoo=wicd.in" || die
- # Make init script provide net per bug 405775
- epatch "${FILESDIR}"/${PN}-1.7.1-provide-net.patch
- # Need to ensure that generated scripts use Python 2 at run time.
- sed -e "s:self.python = '/usr/bin/python':self.python = '/usr/bin/python2':" \
- -i setup.py || die "sed failed"
- # Fix misc helper scripts:
- sed -e "s:/usr/bin/env python:/usr/bin/env python2:" \
- -i wicd/suspend.py wicd/autoconnect.py wicd/monitor.py
- if use nls; then
- # Asturian is faulty with PyBabel
- # (https://bugs.launchpad.net/wicd/+bug/928589)
- rm po/ast.po
- # zh_CN fails with newer PyBabel (Aug 2013)
- rm po/zh_CN.po
- else
- # nuke translations
- rm po/*.po
- fi
-
- DOC_CONTENTS="To start wicd at boot with openRC, add
- /etc/init.d/wicd to a runlevel and: (1) Remove all net.*
- initscripts (except for net.lo) from all runlevels (2) Add these
- scripts to the RC_PLUG_SERVICES line in /etc/rc.conf (For
- example, rc_hotplug=\"!net.eth* !net.wlan*\")"
-}
-
-src_configure() {
- local myconf
- use gtk || myconf="${myconf} --no-install-gtk"
- use libnotify || myconf="${myconf} --no-use-notifications"
- use ncurses || myconf="${myconf} --no-install-ncurses"
- use pm-utils || myconf="${myconf} --no-install-pmutils"
- python_export_best
- "${EPYTHON}" ./setup.py configure --no-install-docs \
- --resume=/usr/share/wicd/scripts/ \
- --suspend=/usr/share/wicd/scripts/ \
- --verbose ${myconf}
-}
-
-src_install() {
- distutils-r1_src_install
- keepdir /var/lib/wicd/configurations
- keepdir /etc/wicd/scripts/{postconnect,disconnect,preconnect}
- keepdir /var/log/wicd
- use nls || rm -rf "${D}"/usr/share/locale
- systemd_dounit "${S}/other/wicd.service"
-
- if use mac4lin; then
- rm -rf "${D}"/usr/share/pixmaps/wicd || die "Failed to remove old icons"
- mv "${WORKDIR}"/wicd "${D}"/usr/share/pixmaps/
- fi
- if use ambiance; then
- # Overwrite tray icons with ambiance icon
- rm "${WORKDIR}/Icone Wicd Lucid"/signal*
- cp "${WORKDIR}/Icone Wicd Lucid"/*.png "${D}"/usr/share/pixmaps/wicd/
- fi
- readme.gentoo_src_install
-}
-
-pkg_postinst() {
- # Maintainer's note: the consolekit use flag short circuits a dbus rule and
- # allows the connection. Else, you need to be in the group.
- if ! has_version sys-auth/consolekit; then
- ewarn "Wicd-1.6 and newer requires your user to be in the 'users' group. If"
- ewarn "you are not in that group, then modify /etc/dbus-1/system.d/wicd.conf"
- fi
-
- readme.gentoo_print_elog
-}
diff --git a/net-misc/wicd/wicd-1.7.3-r1.ebuild b/net-misc/wicd/wicd-1.7.3-r1.ebuild
deleted file mode 100644
index a5f950313580..000000000000
--- a/net-misc/wicd/wicd-1.7.3-r1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ncurses?,xml"
-
-inherit eutils distutils-r1 linux-info readme.gentoo systemd
-
-DESCRIPTION="A lightweight wired and wireless network manager for Linux"
-HOMEPAGE="https://launchpad.net/wicd"
-SRC_URI="https://launchpad.net/wicd/1.7/${PV}/+download/${P}.tar.gz
- mac4lin? ( https://dev.gentoo.org/~anarchy/dist/wicd-mac4lin-icons.tar.xz )
- ambiance? ( http://freetimesblog.altervista.org/blog/wp-content/uploads/downloads/2010/05/Icone-Wicd-Lucid.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-IUSE="doc X ambiance +gtk ioctl libnotify mac4lin ncurses nls +pm-utils gnome-shell"
-
-DEPEND="nls? ( dev-python/Babel[${PYTHON_USEDEP}] )"
-RDEPEND="${PYTHON_DEPS}
- dev-python/dbus-python[${PYTHON_USEDEP}]
- X? (
- gtk? ( dev-python/pygtk[${PYTHON_USEDEP}] )
- || (
- x11-misc/ktsuss
- x11-libs/gksu
- kde-apps/kdesu
- )
- )
- || (
- net-misc/dhcpcd
- net-misc/dhcp
- net-misc/pump
- )
- net-wireless/wireless-tools
- net-wireless/wpa_supplicant
- || (
- sys-apps/net-tools
- sys-apps/ethtool
- )
- !gtk? ( dev-python/pygobject:2[${PYTHON_USEDEP}] )
- ioctl? ( dev-python/python-iwscan[${PYTHON_USEDEP}]
- dev-python/python-wpactrl[${PYTHON_USEDEP}] )
- libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
- ncurses? (
- dev-python/urwid[${PYTHON_USEDEP}]
- dev-python/pygobject:2[${PYTHON_USEDEP}]
- )
- pm-utils? ( sys-power/pm-utils )
- gnome-shell? ( gnome-base/gnome-shell )
- "
-
-src_prepare() {
- CONFIG_CHECK="~CFG80211_WEXT"
- local WARNING_CFG80211_WEXT="Wireless extensions have not been \
- configured in your kernel. Wicd will not work unless CFG80211_WEXT is set."
- check_extra_config
-
- epatch "${FILESDIR}"/${PN}-init-sve-start.patch
- # The Categories entry in the .desktop files is outdated
- epatch "${FILESDIR}"/${PN}-1.7.2.4-fix-desktop-categories.patch
- # Upstream bug https://bugs.launchpad.net/wicd/+bug/1412413
- # Creates files -> give -p
- epatch -p1 "${FILESDIR}"/${P}-add-missing-gnome-shell-extension.patch
- # If LANG is undefined, build can fail (bug 537202)
- epatch "${FILESDIR}"/${P}-undefined-LANG.patch
- # Fix urwid compat again
- epatch "${FILESDIR}"/${P}-urwid-1.3.0.patch
- # get rid of opts variable to fix bug 381885
- sed -i "/opts/d" "in/init=gentoo=wicd.in" || die
- # Need to ensure that generated scripts use Python 2 at run time.
- sed -e "s:self.python = '/usr/bin/python':self.python = '/usr/bin/python2':" \
- -i setup.py || die "sed failed"
- # Fix misc helper scripts:
- sed -e "s:/usr/bin/env python:/usr/bin/env python2:" \
- -i wicd/suspend.py wicd/autoconnect.py wicd/monitor.py
- if use nls; then
- # Asturian is faulty with PyBabel
- # (https://bugs.launchpad.net/wicd/+bug/928589)
- rm po/ast.po
- # zh_CN fails with newer PyBabel (Aug 2013)
- rm po/zh_CN.po
- else
- # nuke translations
- rm po/*.po
- fi
-
- DOC_CONTENTS="To start wicd at boot with openRC, add
- /etc/init.d/wicd to a runlevel and: (1) Remove all net.*
- initscripts (except for net.lo) from all runlevels (2) Add these
- scripts to the RC_PLUG_SERVICES line in /etc/rc.conf (For
- example, rc_hotplug=\"!net.eth* !net.wlan*\")"
-}
-
-src_configure() {
- local myconf
- use gtk || myconf="${myconf} --no-install-gtk"
- use libnotify || myconf="${myconf} --no-use-notifications"
- use ncurses || myconf="${myconf} --no-install-ncurses"
- use pm-utils || myconf="${myconf} --no-install-pmutils"
- use gnome-shell || myconf="${myconf} --no-install-gnome-shell-extensions"
- python_setup
- "${EPYTHON}" ./setup.py configure --no-install-docs \
- --resume=/usr/share/wicd/scripts/ \
- --suspend=/usr/share/wicd/scripts/ \
- --verbose ${myconf}
-}
-
-src_install() {
- distutils-r1_src_install
- keepdir /var/lib/wicd/configurations
- keepdir /etc/wicd/scripts/{postconnect,disconnect,preconnect}
- keepdir /var/log/wicd
- use nls || rm -rf "${D}"/usr/share/locale
- systemd_dounit "${S}/other/wicd.service"
-
- if use mac4lin; then
- rm -rf "${D}"/usr/share/pixmaps/wicd || die "Failed to remove old icons"
- mv "${WORKDIR}"/wicd "${D}"/usr/share/pixmaps/
- fi
- if use ambiance; then
- # Overwrite tray icons with ambiance icon
- rm "${WORKDIR}/Icone Wicd Lucid"/signal*
- cp "${WORKDIR}/Icone Wicd Lucid"/*.png "${D}"/usr/share/pixmaps/wicd/
- fi
- readme.gentoo_src_install
-}
-
-pkg_postinst() {
- # Maintainer's note: the consolekit use flag short circuits a dbus rule and
- # allows the connection. Else, you need to be in the group.
- if ! has_version sys-auth/consolekit; then
- ewarn "Wicd-1.6 and newer requires your user to be in the 'users' group. If"
- ewarn "you are not in that group, then modify /etc/dbus-1/system.d/wicd.conf"
- fi
-
- readme.gentoo_print_elog
-}
diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest
index e1e83f9ed7fe..a1416aa55877 100644
--- a/net-misc/x2goserver/Manifest
+++ b/net-misc/x2goserver/Manifest
@@ -1,6 +1,3 @@
DIST x2goserver-4.0.1.12.tar.gz 78958 SHA256 447c5e7b47e6b2bc087731ed26c827020130cc8530ca020a03f7f3ecadc308cc SHA512 30ce6c20cf0bf67ee162cda5d0cbbfd994ac47aa140e3c4cd6118b594ed8fbf83dbc961f2323694206c705f647f32dba8a7fc7bde4ef22be2d4936642865a3d3 WHIRLPOOL 9d4887a1dd701d361311850a8e936d7f22ecf76e1b4ee78b11feca6ec25d02419221b0fb2e72c440394f81e63ffa73762b33bd58123e7bd441e32446ce40814e
-DIST x2goserver-4.0.1.15.tar.gz 76128 SHA256 46c0fc2303014db99b138a352a7f3df89c4f7cfabc11dc0aeea4cdc76253bdfb SHA512 ca806c39d2536e7962540733e85199fefea54e80695c6f1ca736cc1998b411524afa8d9cf29c26855fc3373105277daa4ddd69cbcd05c2bbecb01ca5172ba05c WHIRLPOOL b06ace09acf14a0b82b0b5b8f795823d7997c99a4a78bd120ecadedf3bbb8c0b6ad371e8bacf1c080e5d6b45d9760cef8c04f69b9a86a1b2dceb3ebaa450bde0
-DIST x2goserver-4.0.1.16.tar.gz 81836 SHA256 c13dde4f6755f6c42fdc32a5a6167a5e2765eb5077a43e74ffdb50a36be7f8f8 SHA512 f66da1e4b1b29021951f3ebdd93ff7be08b20b6322b7cbae66f5792336b54f23d39273fb9e4956dc6b01620488d7b869269a0fe1e7491147650f6232330236ea WHIRLPOOL c79db32e632a6db876529eed0cd1dc0bf13d0ec82c2f2939e595f9e0b9828a0cdf8553eedec483da413ca0cc041627093addb18682f6aa197e84d61001bced6a
-DIST x2goserver-4.0.1.17.tar.gz 82298 SHA256 364d4f3152a4b4a4b04742a125f5b1c6fd0c82ad9e17a8363d56d926998b213b SHA512 3ffcc8678a5ed380b7820042fa0f8c19d017777cd13e6eed84689636ae49aa0733b4ed4e496e37a64939bbc1fafead19671c919f713f86db5e47ce02e1a73cc1 WHIRLPOOL fddffe5e86f355f46cacd9158387b9859c0c8dfe6f32bf02a7e1bac3a1ea643127e0355d9813a1592bd4b19764861eee3f1d522653bdba11187442f039d9261d
DIST x2goserver-4.0.1.18.tar.gz 82452 SHA256 4a1e7eb9cf309c126fdab1f97bd55cd036b0a02a04cda1d317b193d8ab9b0612 SHA512 e0f439301cbb2acc09e14a101bebbbac3e436383de51b7ae029117eaa95c6181045335c83125615e0f0ed191ae39d5abb120c1f6b20fa5b78fe94288248d6fd8 WHIRLPOOL fe0ad6b5a0a1a124d62ebcee152a84dd7b34ebe83f04440ff5dac471b1f5e19339dfa340631cd2df10398d38c4ed34c875a52337a394281b2976d9059d6f1bbd
DIST x2goserver-4.0.1.19.tar.gz 89434 SHA256 3dd5c1464a7992a38760fd6b08f5f8d37646f939f4f7834a7cd96bf4950623cc SHA512 dbd054a6bf781d843a48fcea3449037b991aaa38a52705d48dd5fa8d7fe85c56d4ff31b9a10189a9043a3e5cc0c69475947aea5a5fb78e3c076c0e56079b747d WHIRLPOOL f44fadfda6e1ff165ff989f0c10116c8318f5915764b9bfc663e4658190934eb5155e17e072f131842a98cc02908366b0f91c7b0b9b9e73d4e2a729f00ba0d31
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.12.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.12.ebuild
index 9afea863698d..db55676150b0 100644
--- a/net-misc/x2goserver/x2goserver-4.0.1.12.ebuild
+++ b/net-misc/x2goserver/x2goserver-4.0.1.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -23,7 +23,7 @@ RDEPEND="dev-perl/Capture-Tiny
dev-perl/File-BaseDir
dev-perl/File-ReadBackwards
media-fonts/font-cursor-misc
- media-fonts/font-misc-misc
+ media-fonts/font-misc-misc[nls]
net-misc/nx
net-misc/openssh
x11-apps/xauth
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.15.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.15.ebuild
deleted file mode 100644
index fa090b2b79b3..000000000000
--- a/net-misc/x2goserver/x2goserver-4.0.1.15.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils multilib systemd toolchain-funcs user
-
-DESCRIPTION="The X2Go server"
-HOMEPAGE="http://www.x2go.org"
-SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+fuse postgres +sqlite"
-
-REQUIRED_USE="|| ( postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-perl/Capture-Tiny
- dev-perl/Config-Simple
- dev-perl/File-BaseDir
- dev-perl/File-ReadBackwards
- media-fonts/font-cursor-misc
- media-fonts/font-misc-misc
- net-misc/nx
- net-misc/openssh
- x11-apps/xauth
- x11-apps/xhost
- x11-apps/xwininfo
- fuse? ( sys-fs/sshfs-fuse )
- postgres? ( dev-perl/DBD-Pg )
- sqlite? ( dev-perl/DBD-SQLite )"
-
-pkg_setup() {
- # Force the group creation, #479650
- enewgroup x2gouser
- enewgroup x2goprint
- enewuser x2gouser -1 -1 /var/lib/x2go x2gouser
- enewuser x2goprint -1 -1 /var/spool/x2goprint x2goprint
-}
-
-src_prepare() {
- # Multilib clean
- sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i Makefile */Makefile || die "multilib sed failed"
- # Skip man2html build
- sed -e "s/build-indep: build_man2html/build-indep:/" -i Makefile */Makefile || die "man2html sed failed"
- # Use nxagent directly
- sed -i -e "/NX_TEMP=/s/x2goagent/nxagent/" x2goserver/bin/x2gostartagent || die "sed failed"
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" PREFIX=/usr
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX=/usr install
-
- fowners root:x2goprint /usr/bin/x2goprint
- fperms 2755 /usr/bin/x2goprint
- fperms 0750 /etc/sudoers.d
- fperms 0440 /etc/sudoers.d/x2goserver
- dosym /usr/share/applications /etc/x2go/applications
-
- newinitd "${FILESDIR}"/${PN}.init x2gocleansessions
- systemd_dounit "${FILESDIR}"/x2gocleansessions.service
-}
-
-pkg_postinst() {
- if use sqlite ; then
- elog "To use sqlite and create the initial database, run:"
- elog " # x2godbadmin --createdb"
- fi
- if use postgres ; then
- elog "To use a PostgreSQL databse, more information is availabe here:"
- elog "http://www.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql"
- fi
-
- elog "For password authentication, you need to enable PasswordAuthentication"
- elog "in /etc/ssh/sshd_config (disabled by default in Gentoo)"
- elog "An init script was installed for x2gocleansessions"
-}
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.16.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.16.ebuild
deleted file mode 100644
index cb09ae2abc15..000000000000
--- a/net-misc/x2goserver/x2goserver-4.0.1.16.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils multilib systemd toolchain-funcs user
-
-DESCRIPTION="The X2Go server"
-HOMEPAGE="http://www.x2go.org"
-SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+fuse postgres +sqlite"
-
-REQUIRED_USE="|| ( postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-perl/Capture-Tiny
- dev-perl/Config-Simple
- dev-perl/File-BaseDir
- dev-perl/File-ReadBackwards
- media-fonts/font-cursor-misc
- media-fonts/font-misc-misc
- >=net-misc/nx-3.5.0.25
- net-misc/openssh
- x11-apps/xauth
- x11-apps/xhost
- x11-apps/xwininfo
- fuse? ( sys-fs/sshfs-fuse )
- postgres? ( dev-perl/DBD-Pg )
- sqlite? ( dev-perl/DBD-SQLite )"
-
-pkg_setup() {
- # Force the group creation, #479650
- enewgroup x2gouser
- enewgroup x2goprint
- enewuser x2gouser -1 -1 /var/lib/x2go x2gouser
- enewuser x2goprint -1 -1 /var/spool/x2goprint x2goprint
-}
-
-src_prepare() {
- # Multilib clean
- sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i Makefile */Makefile || die "multilib sed failed"
- # Skip man2html build
- sed -e "s/build-indep: build_man2html/build-indep:/" -i Makefile */Makefile || die "man2html sed failed"
- # Use nxagent directly
- sed -i -e "/NX_TEMP=/s/x2goagent/nxagent/" x2goserver/bin/x2gostartagent || die "sed failed"
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" PREFIX=/usr
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX=/usr install
-
- fowners root:x2goprint /usr/bin/x2goprint
- fperms 2755 /usr/bin/x2goprint
- fperms 0750 /etc/sudoers.d
- fperms 0440 /etc/sudoers.d/x2goserver
- dosym /usr/share/applications /etc/x2go/applications
-
- newinitd "${FILESDIR}"/${PN}.init x2gocleansessions
- systemd_dounit "${FILESDIR}"/x2gocleansessions.service
-}
-
-pkg_postinst() {
- if use sqlite ; then
- elog "To use sqlite and create the initial database, run:"
- elog " # x2godbadmin --createdb"
- fi
- if use postgres ; then
- elog "To use a PostgreSQL databse, more information is availabe here:"
- elog "http://www.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql"
- fi
-
- elog "For password authentication, you need to enable PasswordAuthentication"
- elog "in /etc/ssh/sshd_config (disabled by default in Gentoo)"
- elog "An init script was installed for x2gocleansessions"
-}
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.17.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.17.ebuild
deleted file mode 100644
index cb09ae2abc15..000000000000
--- a/net-misc/x2goserver/x2goserver-4.0.1.17.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils multilib systemd toolchain-funcs user
-
-DESCRIPTION="The X2Go server"
-HOMEPAGE="http://www.x2go.org"
-SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+fuse postgres +sqlite"
-
-REQUIRED_USE="|| ( postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-perl/Capture-Tiny
- dev-perl/Config-Simple
- dev-perl/File-BaseDir
- dev-perl/File-ReadBackwards
- media-fonts/font-cursor-misc
- media-fonts/font-misc-misc
- >=net-misc/nx-3.5.0.25
- net-misc/openssh
- x11-apps/xauth
- x11-apps/xhost
- x11-apps/xwininfo
- fuse? ( sys-fs/sshfs-fuse )
- postgres? ( dev-perl/DBD-Pg )
- sqlite? ( dev-perl/DBD-SQLite )"
-
-pkg_setup() {
- # Force the group creation, #479650
- enewgroup x2gouser
- enewgroup x2goprint
- enewuser x2gouser -1 -1 /var/lib/x2go x2gouser
- enewuser x2goprint -1 -1 /var/spool/x2goprint x2goprint
-}
-
-src_prepare() {
- # Multilib clean
- sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i Makefile */Makefile || die "multilib sed failed"
- # Skip man2html build
- sed -e "s/build-indep: build_man2html/build-indep:/" -i Makefile */Makefile || die "man2html sed failed"
- # Use nxagent directly
- sed -i -e "/NX_TEMP=/s/x2goagent/nxagent/" x2goserver/bin/x2gostartagent || die "sed failed"
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" PREFIX=/usr
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX=/usr install
-
- fowners root:x2goprint /usr/bin/x2goprint
- fperms 2755 /usr/bin/x2goprint
- fperms 0750 /etc/sudoers.d
- fperms 0440 /etc/sudoers.d/x2goserver
- dosym /usr/share/applications /etc/x2go/applications
-
- newinitd "${FILESDIR}"/${PN}.init x2gocleansessions
- systemd_dounit "${FILESDIR}"/x2gocleansessions.service
-}
-
-pkg_postinst() {
- if use sqlite ; then
- elog "To use sqlite and create the initial database, run:"
- elog " # x2godbadmin --createdb"
- fi
- if use postgres ; then
- elog "To use a PostgreSQL databse, more information is availabe here:"
- elog "http://www.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql"
- fi
-
- elog "For password authentication, you need to enable PasswordAuthentication"
- elog "in /etc/ssh/sshd_config (disabled by default in Gentoo)"
- elog "An init script was installed for x2gocleansessions"
-}
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.18-r1.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.18-r1.ebuild
deleted file mode 100644
index 463eaf9c5391..000000000000
--- a/net-misc/x2goserver/x2goserver-4.0.1.18-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils multilib systemd toolchain-funcs user
-
-DESCRIPTION="The X2Go server"
-HOMEPAGE="http://www.x2go.org"
-SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+fuse postgres +sqlite"
-
-REQUIRED_USE="|| ( postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-perl/Capture-Tiny
- dev-perl/Config-Simple
- dev-perl/File-BaseDir
- dev-perl/File-ReadBackwards
- media-fonts/font-cursor-misc
- media-fonts/font-misc-misc
- >=net-misc/nx-3.5.0.25
- net-misc/openssh
- x11-apps/xauth
- x11-apps/xhost
- x11-apps/xwininfo
- fuse? ( sys-fs/sshfs-fuse )
- postgres? ( dev-perl/DBD-Pg )
- sqlite? ( dev-perl/DBD-SQLite )"
-
-pkg_setup() {
- # Force the group creation, #479650
- enewgroup x2gouser
- enewgroup x2goprint
- enewuser x2gouser -1 -1 /var/lib/x2go x2gouser
- enewuser x2goprint -1 -1 /var/spool/x2goprint x2goprint
-}
-
-src_prepare() {
- # Bug #524350
- epatch "${FILESDIR}"/${P}-prevent_bash_failures_xsession.patch
-
- # Multilib clean
- sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i Makefile */Makefile || die "multilib sed failed"
- # Skip man2html build
- sed -e "s/build-indep: build_man2html/build-indep:/" -i Makefile */Makefile || die "man2html sed failed"
- # Use nxagent directly
- sed -i -e "/NX_TEMP=/s/x2goagent/nxagent/" x2goserver/bin/x2gostartagent || die "sed failed"
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" PREFIX=/usr
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX=/usr install
-
- fowners root:x2goprint /usr/bin/x2goprint
- fperms 2755 /usr/bin/x2goprint
- fperms 0750 /etc/sudoers.d
- fperms 0440 /etc/sudoers.d/x2goserver
- dosym /usr/share/applications /etc/x2go/applications
-
- newinitd "${FILESDIR}"/${PN}.init x2gocleansessions
- systemd_dounit "${FILESDIR}"/x2gocleansessions.service
-}
-
-pkg_postinst() {
- if use sqlite ; then
- elog "To use sqlite and create the initial database, run:"
- elog " # x2godbadmin --createdb"
- fi
- if use postgres ; then
- elog "To use a PostgreSQL databse, more information is availabe here:"
- elog "http://www.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql"
- fi
-
- elog "For password authentication, you need to enable PasswordAuthentication"
- elog "in /etc/ssh/sshd_config (disabled by default in Gentoo)"
- elog "An init script was installed for x2gocleansessions"
-}
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.18-r2.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.18-r2.ebuild
index 9a23e81a01e4..c67ee794cd9a 100644
--- a/net-misc/x2goserver/x2goserver-4.0.1.18-r2.ebuild
+++ b/net-misc/x2goserver/x2goserver-4.0.1.18-r2.ebuild
@@ -22,7 +22,7 @@ RDEPEND="dev-perl/Capture-Tiny
dev-perl/File-BaseDir
dev-perl/File-ReadBackwards
media-fonts/font-cursor-misc
- media-fonts/font-misc-misc
+ media-fonts/font-misc-misc[nls]
>=net-misc/nx-3.5.0.25
net-misc/openssh
x11-apps/xauth
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.18.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.18.ebuild
deleted file mode 100644
index cb09ae2abc15..000000000000
--- a/net-misc/x2goserver/x2goserver-4.0.1.18.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils multilib systemd toolchain-funcs user
-
-DESCRIPTION="The X2Go server"
-HOMEPAGE="http://www.x2go.org"
-SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+fuse postgres +sqlite"
-
-REQUIRED_USE="|| ( postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-perl/Capture-Tiny
- dev-perl/Config-Simple
- dev-perl/File-BaseDir
- dev-perl/File-ReadBackwards
- media-fonts/font-cursor-misc
- media-fonts/font-misc-misc
- >=net-misc/nx-3.5.0.25
- net-misc/openssh
- x11-apps/xauth
- x11-apps/xhost
- x11-apps/xwininfo
- fuse? ( sys-fs/sshfs-fuse )
- postgres? ( dev-perl/DBD-Pg )
- sqlite? ( dev-perl/DBD-SQLite )"
-
-pkg_setup() {
- # Force the group creation, #479650
- enewgroup x2gouser
- enewgroup x2goprint
- enewuser x2gouser -1 -1 /var/lib/x2go x2gouser
- enewuser x2goprint -1 -1 /var/spool/x2goprint x2goprint
-}
-
-src_prepare() {
- # Multilib clean
- sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i Makefile */Makefile || die "multilib sed failed"
- # Skip man2html build
- sed -e "s/build-indep: build_man2html/build-indep:/" -i Makefile */Makefile || die "man2html sed failed"
- # Use nxagent directly
- sed -i -e "/NX_TEMP=/s/x2goagent/nxagent/" x2goserver/bin/x2gostartagent || die "sed failed"
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" PREFIX=/usr
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX=/usr install
-
- fowners root:x2goprint /usr/bin/x2goprint
- fperms 2755 /usr/bin/x2goprint
- fperms 0750 /etc/sudoers.d
- fperms 0440 /etc/sudoers.d/x2goserver
- dosym /usr/share/applications /etc/x2go/applications
-
- newinitd "${FILESDIR}"/${PN}.init x2gocleansessions
- systemd_dounit "${FILESDIR}"/x2gocleansessions.service
-}
-
-pkg_postinst() {
- if use sqlite ; then
- elog "To use sqlite and create the initial database, run:"
- elog " # x2godbadmin --createdb"
- fi
- if use postgres ; then
- elog "To use a PostgreSQL databse, more information is availabe here:"
- elog "http://www.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql"
- fi
-
- elog "For password authentication, you need to enable PasswordAuthentication"
- elog "in /etc/ssh/sshd_config (disabled by default in Gentoo)"
- elog "An init script was installed for x2gocleansessions"
-}
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.19.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.19.ebuild
index 827c64d8a68f..97d790c35a18 100644
--- a/net-misc/x2goserver/x2goserver-4.0.1.19.ebuild
+++ b/net-misc/x2goserver/x2goserver-4.0.1.19.ebuild
@@ -23,7 +23,7 @@ RDEPEND="dev-perl/Capture-Tiny
dev-perl/File-ReadBackwards
dev-perl/File-Which
media-fonts/font-cursor-misc
- media-fonts/font-misc-misc
+ media-fonts/font-misc-misc[nls]
>=net-misc/nx-3.5.0.25
net-misc/openssh
x11-apps/xauth
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 825bef46372d..e4862935d20d 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,3 +1,3 @@
DIST youtube-dl-2015.04.03.tar.gz 1472296 SHA256 0521a15a24a9b620728a2f45ea9163ca74660ed443781b6e69b4e06d36d7bf59 SHA512 6b2c85cfa222a31f3462aab583fa98bb92544cd5fb0d395ca0b69a26c24ab174870d02264e058281f09305752d50aa5a06d0d747205499a530b275e3194fc6f9 WHIRLPOOL 391e06ea261f92e03a0b38618307f1c9d53a2dfb9f2062fe0cd3ded1ea0c411033a17ded581616032c74a9e4fb398a57e565bf847196a23a9f89433f861362ae
-DIST youtube-dl-2015.08.23.tar.gz 1715870 SHA256 774de06d23a87a37a040399101f716c86b17d21ff78971346263217d6862757e SHA512 83868d04b106539c546f1fd7555a0226acb42c33ed8c53e61415e76a9320329020c4c5f69292c7a4bb91d95b55cdbfe3abeb5bc8086b0f495ed1db44ff1d46f6 WHIRLPOOL dd55b82e6c96f698fa053d9fe9723aa19f2283f8580dcf7884ccf9fd697ee20152471ec0041c530741b2e9ff14e5ba7a0d5f2608685a38ab958e617d6a9bc5ad
-DIST youtube-dl-2015.08.28.tar.gz 1717348 SHA256 7763dc3869804696b1f1b66cb460d578d1af8de0a73046d449803bd3ac5f5045 SHA512 c55322d39077d7843004c0c873aaa4541c082b637a70fa214f7e1ad4f092db91b56d2014e9fef1cf55d4be19b815c20c7ca333e6a18b65943202957e3e68ac2a WHIRLPOOL bfa425702bebe7768c6672fd171dc1557211cca4b31985b811b7453c5e9e98914f53db67ae78dd4bb31796de7361ef96731760cfc7d8a67bb90a615e8410671f
+DIST youtube-dl-2015.09.03.tar.gz 1724479 SHA256 dfa0efc89412eb58d1cdf641a7747ad95dcd31d8d08b006334a2e603325eb273 SHA512 8c8163eb570bbc04089726aaa0ccc7cbcb79a6c8fb5036c929ba86042f1ca9fba422d8bc20c835cd94ede05ae30445f57299405dd6422b8f8199cf1fc59ffd8e WHIRLPOOL 2a41a5c34c3ef1adbf4a62e3abc9624696a623262f645176d42592c75ffeccf144c08d772077eb908efa02cba4abd7d7a2c53b6763fbebb927a0598e401b52ec
+DIST youtube-dl-2015.09.09.tar.gz 1729706 SHA256 fa2419fc47d0108b800c52dbe292fe1edf40259163035b57efb3b981e517511b SHA512 4f33be2afe7d0bcc91720555ca03d56f9c9cbc3280e36ae70afcc36ed931a1cb840580279e93e72bea9c1d4bbf275d8c557f1596cf8d2f3245969f8033495e08 WHIRLPOOL 42510a54291af9e195dca924385fd2e4a2cf30508b2792e2f77d0ac25cb59f84142c1321cca83c9079bc11207a8278fd1e15832263a020a7967aad6d10fbe6cc
diff --git a/net-misc/youtube-dl/youtube-dl-2015.08.23.ebuild b/net-misc/youtube-dl/youtube-dl-2015.09.03.ebuild
index db29af284def..db29af284def 100644
--- a/net-misc/youtube-dl/youtube-dl-2015.08.23.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2015.09.03.ebuild
diff --git a/net-misc/youtube-dl/youtube-dl-2015.08.28.ebuild b/net-misc/youtube-dl/youtube-dl-2015.09.09.ebuild
index db29af284def..db29af284def 100644
--- a/net-misc/youtube-dl/youtube-dl-2015.08.28.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2015.09.09.ebuild