Verify and potentially improve Python-related code, #315847

Package-Manager: portage-2.2.0_alpha9/cvs/Linux x86_64

4 files changed, 220 insertions, 2 deletions

diff --git a/net-misc/wicd/ChangeLog b/net-misc/wicd/ChangeLog
index aa67b5e379a4..0c87d4b62714 100644
--- a/net-misc/wicd/ChangeLog
+++ b/net-misc/wicd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/wicd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.75 2010/12/20 23:47:20 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.76 2010/12/21 08:03:16 jlec Exp $
+
+*wicd-1.7.1_beta2-r1 (21 Dec 2010)
+*wicd-1.7.0-r1 (21 Dec 2010)
+
+  21 Dec 2010; Justin Lecher <jlec@gentoo.org> +wicd-1.7.0-r1.ebuild,
+  +wicd-1.7.1_beta2-r1.ebuild:
+  Verify and potentially improve Python-related code, #315847
 
   20 Dec 2010; Jeremy Olexa <darkside@gentoo.org> metadata.xml:
   remove myself as maintainer
diff --git a/net-misc/wicd/Manifest b/net-misc/wicd/Manifest
index 224f0efb259f..b042447111da 100644
--- a/net-misc/wicd/Manifest
+++ b/net-misc/wicd/Manifest
@@ -1,7 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX wicd-init.d 434 RMD160 408065ff312ab595022f777853c15031bab17dcf SHA1 87426d2958c9e4bfff9b8ea48d5857d9e67aa191 SHA256 5546deda3d5fa8f6ee1125922f1217182b24d68a22f5a1212509bb13bf0156e2
 DIST wicd-1.7.0.tar.bz2 411166 RMD160 66893e4043ba7e96996d698f847c0ab3b350df6a SHA1 1cd087f53538b1f6e1cfad9735c87741e05698f6 SHA256 14c5692bf8a4c93c9ac083ce9ad677b0d9022b19f84e777854766b2a6f753b32
 DIST wicd-1.7.1b2.tar.bz2 509990 RMD160 587e922271d017eb67499f64c2502b02def44f9d SHA1 2e3d2346f1607f7f63bb00bf7fef41bc5a419726 SHA256 810d51b3eec10be39b399f8baa0b2ef36ed7bb14606f9e0844bea11b8532ea8d
+EBUILD wicd-1.7.0-r1.ebuild 3034 RMD160 3aa50f1d1a9fd50360bd70838e30f2cca56bca9f SHA1 40b828a3c917c4b09d460f4e363dfc9e51cdab53 SHA256 120c8de122d7e04a9d464b40abd1e1c8a6a35e5f759e190172199b7d057f41d5
 EBUILD wicd-1.7.0.ebuild 2832 RMD160 11069f3adfb840f7e678bbaabba2f9cbf5632030 SHA1 0dd7db7e299299557a2578d40ae1ec34b29cbd0a SHA256 83265451e103545f9f3bd50de8d0a4a07a9fcc9e7a4a27c459f47cf1c50abfb3
+EBUILD wicd-1.7.1_beta2-r1.ebuild 3086 RMD160 4af2d9c9f9385cd20f85e4cb8390bacfee7bf239 SHA1 35f49fc720fb9dbd3b3c61368730e7147a4df9bc SHA256 85743f684f80330dcd2fb60ff46e52b5fc83a8fa6cb0dcb78af93ef3cdaaa158
 EBUILD wicd-1.7.1_beta2.ebuild 2888 RMD160 1b73592c0fec25f4c59465b31c774fdb8dabddec SHA1 7a43b26a9cc1a9c7a36a828c442acb9f739c08b9 SHA256 12d53bdb228a6155b0272f1d6868b422b94c275fb271261f259b0904505ec383
-MISC ChangeLog 13533 RMD160 98bb2e0c69cc38848884331aa3d8f2d25605149a SHA1 32cbcb32a12ab630216a1763fe825752c57e880e SHA256 dec7a255e48f6d1b0a3343e00713de42c4b97b2886d48b86feebe8c08ec13a85
+MISC ChangeLog 13758 RMD160 5e2b796a9bcf5ae78a2a01a811159f1e836805f0 SHA1 c0e62724e73d0df71163e78f74952f34c05fba53 SHA256 affff7c8dcaedf09f8cc042f55c6f6e6ccadf1140821b5bb3467712f899d8856
 MISC metadata.xml 709 RMD160 7bf12d6c8a5623232fdc367f052218acdb0f3ed3 SHA1 70875fcb62e535cf3e63aefada1727af9b3f3614 SHA256 21ced555a2768f5cab22df20ea91025f1afddef0198e5803c04a7eb02c9c6961
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk0QX0oACgkQgAnW8HDreRYLDwCgztPg7tqtew2x7ibQ/AT42F0p
+RfUAn2vMJVkLc8ReguEvfCcbt9XXl+Ts
+=fdAg
+-----END PGP SIGNATURE-----
diff --git a/net-misc/wicd/wicd-1.7.0-r1.ebuild b/net-misc/wicd/wicd-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..1deead374bd6
--- /dev/null
+++ b/net-misc/wicd/wicd-1.7.0-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.0-r1.ebuild,v 1.1 2010/12/21 08:03:17 jlec Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
+
+inherit eutils distutils
+
+DESCRIPTION="A lightweight wired and wireless network manager for Linux"
+HOMEPAGE="http://wicd.sourceforge.net/"
+SRC_URI="http://downloads.wicd.net/src/stable/1.7.x/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="X +gtk ioctl libnotify ncurses nls +pm-utils"
+
+DEPEND=""
+# Maybe virtual/dhcp would work, but there are enough problems with
+# net-misc/dhcp that I want net-misc/dhcpcd to be guarenteed to be considered
+# first if none are installed.
+RDEPEND="
+	dev-python/dbus-python
+	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 )
+	ioctl? ( dev-python/python-iwscan dev-python/python-wpactrl )
+	libnotify? ( dev-python/notify-python )
+	ncurses? ( >=dev-python/urwid-0.9.9.1 )
+	pm-utils? ( >=sys-power/pm-utils-1.1.1 )
+	"
+DOCS="CHANGES NEWS AUTHORS README"
+
+src_prepare() {
+	python_copy_sources
+}
+
+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"
+	configuration() {
+		$(PYTHON) ./setup.py configure --no-install-docs --resume=/usr/share/wicd/scripts/ --suspend=/usr/share/wicd/scripts/ --verbose ${myconf}
+	}
+	python_execute_function -s configuration
+}
+
+src_install() {
+	distutils_src_install
+	keepdir /var/lib/wicd/configurations \
+		|| die "keepdir failed, critical for this app"
+	keepdir /etc/wicd/scripts/{postconnect,disconnect,preconnect} \
+		|| die "keepdir failed, critical for this app"
+	keepdir /var/log/wicd \
+		|| die "keepdir failed, critical for this app"
+	use nls || rm -rf "${D}"/usr/share/locale
+}
+
+pkg_postinst() {
+	distutils_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/conf.d/rc"
+	elog "(For example, RC_PLUG_SERVICES=\"!net.eth0 !net.wlan0\")"
+	# 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/pambase[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
+}
diff --git a/net-misc/wicd/wicd-1.7.1_beta2-r1.ebuild b/net-misc/wicd/wicd-1.7.1_beta2-r1.ebuild
new file mode 100644
index 000000000000..784f2ace2763
--- /dev/null
+++ b/net-misc/wicd/wicd-1.7.1_beta2-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.1_beta2-r1.ebuild,v 1.1 2010/12/21 08:03:17 jlec Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
+
+inherit eutils distutils
+
+MY_P=${P/_beta/b}
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="A lightweight wired and wireless network manager for Linux"
+HOMEPAGE="http://wicd.sourceforge.net/"
+SRC_URI="http://downloads.wicd.net/src/testing/1.7.x/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="X +gtk ioctl libnotify ncurses nls +pm-utils"
+
+DEPEND=""
+# Maybe virtual/dhcp would work, but there are enough problems with
+# net-misc/dhcp that I want net-misc/dhcpcd to be guarenteed to be considered
+# first if none are installed.
+RDEPEND="
+	dev-python/dbus-python
+	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 )
+	ioctl? ( dev-python/python-iwscan dev-python/python-wpactrl )
+	libnotify? ( dev-python/notify-python )
+	ncurses? ( >=dev-python/urwid-0.9.9.1 )
+	pm-utils? ( >=sys-power/pm-utils-1.1.1 )
+	"
+DOCS="CHANGES NEWS AUTHORS README"
+
+src_prepare() {
+	python_copy_sources
+}
+
+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"
+	configuration() {
+		$(PYTHON) ./setup.py configure --no-install-docs --resume=/usr/share/wicd/scripts/ --suspend=/usr/share/wicd/scripts/ --verbose ${myconf}
+	}
+	python_execute_function -s configuration
+}
+
+src_install() {
+	distutils_src_install
+	keepdir /var/lib/wicd/configurations \
+		|| die "keepdir failed, critical for this app"
+	keepdir /etc/wicd/scripts/{postconnect,disconnect,preconnect} \
+		|| die "keepdir failed, critical for this app"
+	keepdir /var/log/wicd \
+		|| die "keepdir failed, critical for this app"
+	use nls || rm -rf "${D}"/usr/share/locale
+}
+
+pkg_postinst() {
+	distutils_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/conf.d/rc"
+	elog "(For example, RC_PLUG_SERVICES=\"!net.eth0 !net.wlan0\")"
+	# 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/pambase[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
+}