remove opts variable from init script (bug 381885)

Package-Manager: portage-2.1.10.14/cvs/Linux i686

3 files changed, 124 insertions, 6 deletions

diff --git a/net-misc/wicd/ChangeLog b/net-misc/wicd/ChangeLog
index 3059f75ec9de..daa489219347 100644
--- a/net-misc/wicd/ChangeLog
+++ b/net-misc/wicd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/wicd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.92 2011/07/17 19:55:00 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.93 2011/09/09 11:18:41 tomka Exp $
+
+*wicd-1.7.1_beta2-r5 (09 Sep 2011)
+
+  09 Sep 2011; Thomas Kahle <tomka@gentoo.org> +wicd-1.7.1_beta2-r5.ebuild:
+  remove opts variable from init script (bug 381885)
 
   17 Jul 2011; Mark Loeser <halcy0n@gentoo.org> wicd-1.7.1_beta2-r4.ebuild:
   Stable on ppc/ppc64; bug #370525
diff --git a/net-misc/wicd/Manifest b/net-misc/wicd/Manifest
index 38316c61d175..a62189e10958 100644
--- a/net-misc/wicd/Manifest
+++ b/net-misc/wicd/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX wicd-1.7.1_beta2-init.patch 409 RMD160 58abdf5debc49517977dd5b691c6fe24cd8303c6 SHA1 4c24f4bb924035e109e905789a7669d6e7b0e7ed SHA256 473146793cc9cf8b2b780c1ce13f27138662f9942b53e5a7e293634196fbebcf
 AUX wicd-init-sve-start.patch 317 RMD160 e08a391b31c6d48e67ad51bcd8fb08457bbc0ebc SHA1 149775d7ef4deffc4e66f73fa47276ca194c92cb SHA256 20d7ada99465da5b50d03e5ef117226910bc20288278f6f788be3fbff05716db
@@ -10,12 +10,13 @@ EBUILD wicd-1.7.0-r1.ebuild 3061 RMD160 bb369b4759c77d5b053886be102865d1aee86a9a
 EBUILD wicd-1.7.0.ebuild 2860 RMD160 22c134b2c4ee8c344e91a712e750072d731b8141 SHA1 7d94e09cb32fc482cef11e04a6f635ee6bb9205b SHA256 83bad107c9e5e971e163040bcae4cc4053c93233a78c54e7f9a3929e18c4c467
 EBUILD wicd-1.7.1_beta2-r3.ebuild 3183 RMD160 71b9cb44e33704b4f38adb6c40d40b64f948aa64 SHA1 529e04e77e542e304c93edb45eb8817562487318 SHA256 804a7a902e085a9b546ad81eb2fe2f3de2136e75ca88ec923e2980d926878dfe
 EBUILD wicd-1.7.1_beta2-r4.ebuild 3412 RMD160 8777556f3d466091508890b289ba70b65f16b4f4 SHA1 2bb190152e5bf185b496008f3d81c2a1ba2507b8 SHA256 ed1d3cc5775642f0b2f9b0418357a57172dc999284cd678450a6beffc4334310
-MISC ChangeLog 16089 RMD160 8922f9e34a578e92df7372289f63607b51bdba5d SHA1 6b7d5a9d25a457e2d0abb47dff2d83e287ecedbf SHA256 814e3eec2359253982b106a73eef99e18ea590f33629057bdb4b0abdd0972ef0
+EBUILD wicd-1.7.1_beta2-r5.ebuild 3503 RMD160 8781d906a1a2e6447f55b462f425def6b45c79bd SHA1 385644936c4ccbc1b2d61a5ef2c8919bb952c8d3 SHA256 3e835b31d227bab40d64a9a017ddcbde32798ea5a32c59d2f7038a6b9bd97925
+MISC ChangeLog 16253 RMD160 2732043b5ae8105cbc186048d56e846213e95b06 SHA1 d9269cb202d33da6bb71729f3d95c925c6ab5b25 SHA256 dae51b3e3b3c8eb4392467d2d4e88dc888b346c952ba9958c95e2135b8bf9f1f
 MISC metadata.xml 795 RMD160 237424ffc88cb2020c18b063347a41b168fea63e SHA1 a5eab12eb1d22d54b713bd25bf8a6d216c38efe4 SHA256 370e0a1d289a2e54b68f6d9d78a92cdb17b115c1752f6cf8bcee1ea9b93b329e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4jPhoACgkQCRZPokWLroSFrQCfSL+DvaYo+H9vFnTP1zcdfPjm
-sBMAoNf6olqBEuWXLxxUFR74Ww0K8r2O
-=Q5Tw
+iF4EAREIAAYFAk5p9hkACgkQodBTJSDyo65RGAD+Ixq8gVMmvEKZ9IlSPAASQsg/
+A3tq20pfRsYrnerU7N0A/jYWsr7Y8G4+UIVgnS2uBaok2vMAXh2WWvPqb3iVtBj/
+=OD9a
 -----END PGP SIGNATURE-----
diff --git a/net-misc/wicd/wicd-1.7.1_beta2-r5.ebuild b/net-misc/wicd/wicd-1.7.1_beta2-r5.ebuild
new file mode 100644
index 000000000000..f99ffbe176b2
--- /dev/null
+++ b/net-misc/wicd/wicd-1.7.1_beta2-r5.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2011 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-r5.ebuild,v 1.1 2011/09/09 11:18:41 tomka Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="ncurses? xml"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+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
+		dev-python/pygobject
+	)
+	pm-utils? ( >=sys-power/pm-utils-1.1.1 )
+	"
+DOCS="CHANGES NEWS AUTHORS README"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-init.patch
+	epatch "${FILESDIR}"/${PN}-init-sve-start.patch
+	# get rid of opts variable to fix bug 381885
+	sed -i "/opts/d" "in/init=gentoo=wicd.in"
+	# 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"
+	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/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/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
+}