gentoo resync : 30.12.2017

3 files changed, 73 insertions, 20 deletions

diff --git a/app-admin/quickswitch/Manifest b/app-admin/quickswitch/Manifest
index 1dfa24c38d9f..e350ec648feb 100644
--- a/app-admin/quickswitch/Manifest
+++ b/app-admin/quickswitch/Manifest
@@ -1,3 +1,4 @@
+AUX quickswitch-1.05-fix-paths.patch 1924 BLAKE2B b10ea8e626248963b8acfbbd0631f7cbde6cbd6c05d429c9a28ac163389809c1d211dd9f4bdf614d3f0ca5f50779152a7737a83cbb33eb7f51f96052ba4b4c1b SHA512 1df3e97dc223be657efa17637b7bfb541b3fb116856662d06c4be97bffadfc43e8b6242791b6918ff3b7cbc02ce5e01008efc2856269ff0ed1e40216bd33d13c
 DIST quickswitch-1.05.tar.gz 20218 BLAKE2B 9a17132e07c838dd0d39eb887502ee70fd35206d38d795e5f49307eafa756cbf78b7ffdb0c7de19197560adedff902f09bf52a4c7db9359185ecc37f42abb6c7 SHA512 dfb6b952e06d03834b22ad1abe415499bc3f231dcfee0b551ceadc4c020604b2574b70fff03ffb7099913d77e49c545ee44d51f9f7651c4fba113b0503c3bd26
-EBUILD quickswitch-1.05.ebuild 1055 BLAKE2B 44464cb3bd48ea8bcdd75f422f876e1a1aea4a5e850a16a24539260cc801268207d35161fd24e13fbc770b23643c7a88b36476cd70e905d2d594b979c703fdc6 SHA512 b4e92d4b4f036148e8374e364e13b666d308a27c7146ed574b6859ab3eef103f0d615960e07390a7535ef22eacabbc93eae753bf6c865c09417a6f8cbd0fbde4
+EBUILD quickswitch-1.05.ebuild 628 BLAKE2B bf33cf3a209b8ad8531326c8f08497d32f0c54d619d019f1d447663a430617b40fe69eee64b7c3484b0e6b537cb52852bb567bd93cc3085bdcf2713b6bac7980 SHA512 874076e10e7dd9c94d4e96bddb0b30663f14be113c0e40db0b8ac4b1f871ba90fbedca03868a69e861b0da9381d703379ff8ad9913d5ccf659b8527d0585da78
 MISC metadata.xml 377 BLAKE2B c17495cc30293086a7a85a9a278ed134e4e7d47169e8ffb1e6d94dcd2f3f81372aa90e5e628ab322e1d3d9bb98af194445764399573231e604e3b51562d359f2 SHA512 05f90b3b4a18647e32f7c3f3029822fefb7aef4cbdbd2f6e74a8f2799e5a42f7f5546307c792aa4bf366536b4d7c1eeef6b4cc1a6b4d6f84d0ac16e5e77a8c88
diff --git a/app-admin/quickswitch/files/quickswitch-1.05-fix-paths.patch b/app-admin/quickswitch/files/quickswitch-1.05-fix-paths.patch
new file mode 100644
index 000000000000..707a355c09f9
--- /dev/null
+++ b/app-admin/quickswitch/files/quickswitch-1.05-fix-paths.patch
@@ -0,0 +1,62 @@
+--- a/switcher
++++ b/switcher
+@@ -67,7 +67,7 @@
+ 
+ ### load quickswitch package
+ $_SWITCHTO = '/usr/bin/switchto'; # default location
+-$CONF_FILE = '/etc/switchto.conf';
++$CONF_FILE = '/etc/quickswitch/switchto.conf';
+ $SWITCHTO = find_switchto($CONF_FILE);
+ $ENV{RUNNING_FROM_SWITCHER} = 1;
+ require $SWITCHTO;
+--- a/switchto
++++ b/switchto
+@@ -26,7 +26,7 @@
+ #
+ # Send bug-reports, comments, women to bugs@muthanna.com
+ #
+-# Also see /etc/switchto.conf for further docs.
++# Also see /etc/quickswitch/switchto.conf for further docs.
+ #
+ # Release: 0.16
+ #
+@@ -143,8 +143,8 @@
+ $AUTHOR    = "Mohit Muthanna, Paul Seamons";
+ $DATE      = '2002';
+ 
+-### I would suggest renaming this /etc/switchto.conf
+-$CONF_FILE = "/etc/switchto.conf";
++### I would suggest renaming this /etc/quickswitch/switchto.conf
++$CONF_FILE = "/etc/quickswitch/switchto.conf";
+ %DEFAULTS  = (
+               autoconfig      => 0,
+               device          => "eth0",
+@@ -165,7 +165,7 @@
+               nfsexportall    => "/usr/sbin/exportfs -a",
+               nfsexportsfile  => "/etc/exports",
+               niscommand      => "/bin/nisdomainname",
+-              servicefilename => "/etc/switchto.last",
++              servicefilename => "/etc/quickswitch/switchto.last",
+               execpre         => undef,
+               execpost        => undef,
+ 
+--- a/switchto.conf
++++ b/switchto.conf
+@@ -43,7 +43,7 @@
+ device=eth0
+ 
+ # Path to save last good known configuration...
+-servicefilename=/etc/switchto.last
++servicefilename=/etc/quickswitch/switchto.last
+ 
+ # Path and arguments to switchto. This is for the switcher GUI
+ # switchtopath=/usr/bin/switchto -b
+@@ -52,7 +52,7 @@
+ # Uncomment theses and change them if needed.
+ # ------------------------------------------
+ # ifconfig=/sbin/ifconfig
+-# iwconfig=/usr/local/sbin/iwconfig
++# iwconfig=/sbin/iwconfig
+ # netstat=/bin/netstat
+ # route=/sbin/route
+ # hostnamecmd=/bin/hostname
diff --git a/app-admin/quickswitch/quickswitch-1.05.ebuild b/app-admin/quickswitch/quickswitch-1.05.ebuild
index ab9f3d539ebe..24b21cea6b25 100644
--- a/app-admin/quickswitch/quickswitch-1.05.ebuild
+++ b/app-admin/quickswitch/quickswitch-1.05.ebuild
@@ -1,38 +1,28 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-IUSE="ncurses"
+EAPI=6
 
 DESCRIPTION="Utility to switch network profiles on the fly"
 SRC_URI="mirror://sourceforge/quickswitch/${P}.tar.gz"
 HOMEPAGE="http://quickswitch.sf.net"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc s390 amd64"
+IUSE="ncurses"
 
 DEPEND=">=dev-lang/perl-5.6.0"
 RDEPEND="ncurses? ( dev-perl/CursesWidgets )"
 
+PATCHES=( "${FILESDIR}"/${PN}-1.05-fix-paths.patch )
+
 src_install() {
 	dobin switchto
-	dosed "s:/etc/switchto.conf:/etc/quickswitch/switchto.conf:" \
-		/usr/bin/switchto
-	dosed "s:/etc/switchto.last:/etc/quickswitch/switchto.last:" \
-		/usr/bin/switchto
-	if use ncurses; then
-		dobin switcher
-		dosed "s:/etc/switchto.conf:/etc/quickswitch/switchto.conf:" \
-			/usr/bin/switcher
-	fi
-
-	dodir /etc/quickswitch
+	use ncurses && dobin switcher
+
 	insinto /etc/quickswitch
 	newins switchto.conf switchto.conf.sample
 
-	dosed "s:/etc/switchto.last:/etc/quickswitch/switchto.last:" \
-		/etc/quickswitch/switchto.conf.sample
-	dosed "s:/usr/local/sbin/iwconfig:/sbin/iwconfig:" \
-		/etc/quickswitch/switchto.conf.sample
-	dodoc README
+	einstalldocs
 }