bump to eapi5 and distutils-r1 (bugs 469910, 473772)

Package-Manager: portage-2.1.12.9/cvs/Linux x86_64
Manifest-Sign-Key: 0x89DEB219565C32BC!

4 files changed, 167 insertions, 6 deletions

diff --git a/net-misc/wicd/ChangeLog b/net-misc/wicd/ChangeLog
index 2812d5ee2fe7..5dcf9040de30 100644
--- a/net-misc/wicd/ChangeLog
+++ b/net-misc/wicd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/wicd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.139 2013/06/02 11:00:43 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.140 2013/06/24 22:02:53 tomka Exp $
+
+*wicd-1.7.2.4-r3 (24 Jun 2013)
+
+  24 Jun 2013; Thomas Kahle <tomka@gentoo.org>
+  +files/wicd-1.7.2.4-fix-desktop-categories.patch, +wicd-1.7.2.4-r3.ebuild:
+  bump to eapi5 and distutils-r1 (bugs 469910, 473772)
 
   02 Jun 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due bug #328951
diff --git a/net-misc/wicd/Manifest b/net-misc/wicd/Manifest
index 7cb84c255818..e1af54c3bacb 100644
--- a/net-misc/wicd/Manifest
+++ b/net-misc/wicd/Manifest
@@ -7,6 +7,7 @@ AUX wicd-1.7.1_beta2-init.patch 409 SHA256 473146793cc9cf8b2b780c1ce13f27138662f
 AUX wicd-1.7.1_pre20111210-fix-config-reading.patch 392 SHA256 437b282881bda8146145a30d85848615da039ebf43fa18f89d62da944502fdc3 SHA512 230e1517ae9db35247db52bf5faff5b3a77527981dd569a93ebde60618c37b0bcc984e93e6a8b864c53d5b91a10f95be61a3e6fd14f4fcae82264671207b3673 WHIRLPOOL fceb0b80fa2230225b07fb041484e82f94ac82427a911cd56c3572035788287b8e626a4ed8a9d5957d239c9b662eb6a4ab98d12d6219025cf2101785e640d340
 AUX wicd-1.7.1_pre20111210-wpa-psk-hex-template.patch 920 SHA256 b721a8b90c97330d12787608108dd8f1db99742c596a786d4fcfa1f3abb19be6 SHA512 35ca12131929bc16f43489a5db93461db40eb8756322349c399fe05c866195d4ee923f9b04bc060b3f1f24b7df962bafa45a4ea42414d7c6fa78b00f42eabe28 WHIRLPOOL a261fe450ed6b5a41e363c206388e429525afd586eaf39a60050a81ab6744eb8c0d194e929b18c27af0f112fe3ddd57131968f9fab6ea074bf7af86fbff97999
 AUX wicd-1.7.2.4-fix-dbus-error.patch 582 SHA256 665c86a6412fd8178ef3ef1552180d4d6ec86f2c625cb6640816b5952e6b1192 SHA512 cacfd1a03cc862c030d21c2327b92750427fceb768923ef64845bf25cb43141b62139329d35f7cd2d2299d13afe8ae7d7e9a2596e516565529015adeca9a8c6d WHIRLPOOL 566ef450e2d110c322c1424d699063ed91b5ab9f8f6067a0a8f8fccde6702b8d319f05afe7d3d600310c9d81e2369102fe85179f34dbcc6ebad28bb9de11eb27
+AUX wicd-1.7.2.4-fix-desktop-categories.patch 831 SHA256 ee431b7435e3fbab5c6f098c896e8e8a35aa09e9295a4ecfb5fb442deda7a995 SHA512 378d4834ea1c547424bca31478c73e167f430cf1aa1caa7c518a823209f9e05f73a8ddff847b2949c2ade007e704067585be83f4730ad6dc96fd7d16575c4943 WHIRLPOOL 7fa40181a6103df0bb381933133c4ff40d82bf0cf78beaa0ce521291b88d8d44fda9ff656a14fbd5215b527651c703b9e5d976922a1f9742aaa55d52a75b5ae4
 AUX wicd-1.7.2.4-second-urwid.patch 1378 SHA256 3eed2084f5631bdeb4a27ce1f729aa4be8cb12414af5364312b09005b75bc7b5 SHA512 8c9ddf06eeba28408f38ed9c1bfc2e9bcd8f8a9df86b3dd8675c82c673e38fd180dff113e7965cae5d4448f27ee5af4378daa34d147a15151811e854606a1d92 WHIRLPOOL 360151ca59baf2300309f851ac73faf3044d783c6901d2327f56bfc2ac7672f2d53ac7d7034ea072e314cf487499a5ef0e3c0255782c669d92ee0e7b42bf4ab5
 AUX wicd-1.7.2.4-urwid.patch 2281 SHA256 6770f31f3a701fcdb019562ec63e53653463aca471d0d907227f6608d671cdf2 SHA512 0376d1f5fc3d9cd857fafa30024b6e754d202bbebc0c7fd498b77fd4c34d70cacd4c2b1cf6f5bd4be0ef6f6e2617feceab3e5b734e91ab2efe6c69f1a6a14508 WHIRLPOOL 1ebdf2f3c1362aa70fbed202c9d5afdc42ca12e1876c39184c2d52e681207a531b0bfd28c3131e3eaca158cc4277f61e7b2369a7414b1405189200b11d8d026a
 AUX wicd-init-sve-start.patch 317 SHA256 20d7ada99465da5b50d03e5ef117226910bc20288278f6f788be3fbff05716db SHA512 d62db40a156aa9e7b97b23b3ebceded77bcae18ae513c39b8e4ef8733c30429059a83f932c83b3cf0b90fd0aeeeadc6249a71498c569630df057037acf43f3fc WHIRLPOOL 7df520e4e3291e032d031763f43596e97b66bdcf8418f0a328b885e3ee7051807b7023fa0663e2f42010bc3b71e4d7852e954a5b8e00e2805f4487f409a0da31
@@ -15,12 +16,13 @@ DIST Icone-Wicd-Lucid.tar.gz 9015 SHA256 6e4e3483c6cff7398e6871dd3e4360e361e5c6e
 DIST wicd-1.7.2.4.tar.gz 439297 SHA256 dcfdfb5dbbb49dbb9b205fddf064d6b1a4e88f66f1cf40d12fb7fe0e0c7cdc97 SHA512 6dd8d4726c5f9c943d90305b7ed70573b42b5dae00de443209d9f526778e91ac01aabffa14447c47374b4d9986133aacfcc970735d1b5befa232da44d3190d7c WHIRLPOOL 59885a22dbf350e73a55fdbf7ea1c9b93a339edae116beb1c22c271762d90488ecdeb7952a4efc8241d362b5bafcaccf88053c4d5c41468cba0cd524cf2a5756
 DIST wicd-mac4lin-icons.tar.xz 53136 SHA256 4c48c769c71f962415e3bd3573557e9288351afb867347f9a6f652883ae31011
 EBUILD wicd-1.7.2.4-r2.ebuild 4717 SHA256 cbc88379d72b1e1debb7aad05133ce3c647d78a9ef339b3f12ebabfdf10c7e5a SHA512 5fb8e4ffb954125a32bc0746bf5ddee0e0d98e2c5b981b323441e01e88af974669a72a57022824a2f4c961cdfc0b3ca73909ae96162bd2cebb671e6410e2b7c9 WHIRLPOOL 2b9e813f6b3b5b5d319d885bfbd596cf0a70ba584592a2d73df46457951d5f066506d9cf7988d3078be5d55e5470faec5aab7486d0bb7706207f5e063041813f
-MISC ChangeLog 23627 SHA256 e9abb04d0c729a76bc74f71c6a5ee17cdd544ebd210a0cdbab7f6705076a70a2 SHA512 47713fd2a9c32e9176f3bca6e6c9b500def624a811013dbf87a8fadb7315414806183211e19ce04fe899db047e1951456b36f85c16db29a128a4b6d850dde1c8 WHIRLPOOL d91a63cc4c8c134b9e82591888273d805ddd7eef659d9f655f1ceab74261b9584fdda06f1df970cb7dd06f16dc91691bf14352b7c1d97eee8800850be39c98ab
+EBUILD wicd-1.7.2.4-r3.ebuild 4564 SHA256 6358262ba90c91bc40a82d70f002e8cd3bc63e5e40561168d531c7b2645130d6 SHA512 5ec20b86da852c48f7fd00d3291b52cc8839f5d9e6869b28b9affae5b494f1a7c31eaa73124c3f05907c16f115b3e75b02d8a622cfe948fd00059ff0c3b9fdd7 WHIRLPOOL 5055bfac8c4e783e27fad768a75f5526a4d3f782d58e7c6bf51e6fb7e8497bba2662c2d318480b82f21d07bf8ed6cd004a0961b4960a35dfead913ddd3a70cc7
+MISC ChangeLog 23839 SHA256 57125ca46c606aa7034bcb910722380a965a94c5fdd361faba59201166b68926 SHA512 a9e5a9a45c4851b4f962601c0164550a8db802e5986f4eee6f6f63d7d11da70b1a49a09cdd51307b1460e0d6e6f03954701198cce9520d3b7b8b4d12bb241d29 WHIRLPOOL 364f6b9a05e61c6895c9759a43a51b5bf77dc31a66d1a6626d187fef2d4d4656567181833fc04020bccc0d37bf52d6fe3c04875772478eb47f89038cc7236ace
 MISC metadata.xml 829 SHA256 34aaf71ae35098b6860ba090961034321b4ac982e5b9e7ee9cfc22769e27aa77 SHA512 4a8725dd2eedfc60f7c90630cfb0a5d3df28d6abed43b6555423f81d88b66db3d684fae48fb316f4d5aff1918275ca53035afaa6ae9a85f1d1d9307305c7912c WHIRLPOOL 983cbe2b47b1c50c2e16d1a8ebed0aa235fb3d8ac5d1d987997e11949f018171cb6f0d3136f34bb764f50be4fff827c14def54e3e4c8834f1205c7fef540d728
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlGrJdwACgkQCaWpQKGI+9Rt4gCcDrpSl86bb2ixfxDBmJqlkPKA
-4lMAoIWXmCMsMbXP28KHkjOk7x7wSKr6
-=cGqS
+iF4EAREIAAYFAlHIwhYACgkQid6yGVZcMrxchQD/dJSxeSZ2/3iNEB9gdMpf6kw4
+40f5rG9NL7mKbNtJJJUA/1MG5HlQBsyaQx0eRBzhswAE46CsB0UIM/BzSTLjStkx
+=Dn1W
 -----END PGP SIGNATURE-----
diff --git a/net-misc/wicd/files/wicd-1.7.2.4-fix-desktop-categories.patch b/net-misc/wicd/files/wicd-1.7.2.4-fix-desktop-categories.patch
new file mode 100644
index 000000000000..d2b856236606
--- /dev/null
+++ b/net-misc/wicd/files/wicd-1.7.2.4-fix-desktop-categories.patch
@@ -0,0 +1,20 @@
+diff -U 3 -dHrN wicd-1.7.2.4.orig/other/wicd.desktop wicd-1.7.2.4/other/wicd.desktop
+--- wicd-1.7.2.4.orig/other/wicd.desktop	2013-06-24 22:18:00.715578998 +0200
++++ wicd-1.7.2.4/other/wicd.desktop	2013-06-24 22:18:57.672595363 +0200
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-Categories=Application;Network;
++Categories=Network;Settings;Utility;
+ Exec=wicd-gtk --no-tray
+ GenericName=Network Manager
+ Icon=wicd-gtk
+diff -U 3 -dHrN wicd-1.7.2.4.orig/other/wicd-tray.desktop wicd-1.7.2.4/other/wicd-tray.desktop
+--- wicd-1.7.2.4.orig/other/wicd-tray.desktop	2013-06-24 22:18:00.715578998 +0200
++++ wicd-1.7.2.4/other/wicd-tray.desktop	2013-06-24 22:18:59.864595996 +0200
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-Categories=Application;Network;
++Categories=Network;Settings;Utility;
+ Exec=wicd-gtk --tray
+ GenericName=Network Manager
+ Icon=wicd-gtk
diff --git a/net-misc/wicd/wicd-1.7.2.4-r3.ebuild b/net-misc/wicd/wicd-1.7.2.4-r3.ebuild
new file mode 100644
index 000000000000..1fa54f608bdd
--- /dev/null
+++ b/net-misc/wicd/wicd-1.7.2.4-r3.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.2.4-r3.ebuild,v 1.1 2013/06/24 22:02:52 tomka Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_6 python2_7 )
+PYTHON_REQ_USE="ncurses?,xml"
+
+inherit eutils distutils-r1 systemd
+
+DESCRIPTION="A lightweight wired and wireless network manager for Linux"
+HOMEPAGE="https://launchpad.net/wicd"
+SRC_URI="http://launchpad.net/wicd/1.7/${PV}/+download/${P}.tar.gz
+	mac4lin? ( http://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-base/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[${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[${PYTHON_USEDEP}]
+	)
+	pm-utils? ( sys-power/pm-utils )
+	"
+#DOCS="CHANGES NEWS AUTHORS README"
+
+src_prepare() {
+	# 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
+	else
+	  # nuke translations
+	  rm po/*.po
+	fi
+}
+
+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
+}
+
+pkg_postinst() {
+	elog "You may need to restart the dbus service after upgrading wicd."
+	echo
+	elog "To start wicd at boot, add /etc/init.d/wicd to a runlevel and:"
+	elog "- Remove all net.* initscripts (except for net.lo) from all runlevels"
+	elog "- Add these scripts to the RC_PLUG_SERVICES line in /etc/rc.conf"
+	elog "(For example, rc_hotplug=\"!net.eth* !net.wlan*\")"
+	# 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
+}