From: Thomas Kahle Date: Sat, 1 Oct 2011 16:18:28 +0000 (+0000) Subject: Bump urwid dep in -r7, restrict urwid in all other versions (Bug 384761) X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=693234bebecf2d5eb7f7c42822fe2847733ff5f0;p=gentoo.git Bump urwid dep in -r7, restrict urwid in all other versions (Bug 384761) Package-Manager: portage-2.1.10.20/cvs/Linux i686 --- diff --git a/net-misc/wicd/ChangeLog b/net-misc/wicd/ChangeLog index 9c1c734cbbf9..14e8a073176d 100644 --- a/net-misc/wicd/ChangeLog +++ b/net-misc/wicd/ChangeLog @@ -1,6 +1,14 @@ # 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.94 2011/09/13 19:25:14 tomka Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.95 2011/10/01 16:18:28 tomka Exp $ + +*wicd-1.7.1_beta2-r7 (01 Oct 2011) + + 01 Oct 2011; Thomas Kahle wicd-1.7.0.ebuild, + wicd-1.7.0-r1.ebuild, wicd-1.7.1_beta2-r3.ebuild, wicd-1.7.1_beta2-r4.ebuild, + wicd-1.7.1_beta2-r6.ebuild, +wicd-1.7.1_beta2-r7.ebuild, + +files/wicd-1.7.1_beta2-urwid-1.0.patch: + Bump urwid dep in -r7, restrict urwid in all other versions (Bug 384761) *wicd-1.7.1_beta2-r6 (13 Sep 2011) diff --git a/net-misc/wicd/Manifest b/net-misc/wicd/Manifest index ed2ee786d2f8..059a1f00bf78 100644 --- a/net-misc/wicd/Manifest +++ b/net-misc/wicd/Manifest @@ -4,23 +4,23 @@ Hash: SHA256 AUX add-wpa-psk-hex-template.patch 980 RMD160 9071bc60a01d2637df92309e183c11286c790f49 SHA1 febafc67f6501af227964e7a8af8d45ab0b6a0e4 SHA256 d5e45971adb2cd8649c81ce3a4edfb4bda954981767ff8a95374b062b460fca7 AUX fix-ad-hoc-networking.patch 729 RMD160 4e2a7b36eade357aa7fcd83b8d37e4ec9052212e SHA1 60b69e24e06f10e6d8dce99c6f89c33db79d644a SHA256 1e476d6fe340bc652c747e544b8795f5f01d5c899986fe179ba370a167a441f4 AUX wicd-1.7.1_beta2-init.patch 409 RMD160 58abdf5debc49517977dd5b691c6fe24cd8303c6 SHA1 4c24f4bb924035e109e905789a7669d6e7b0e7ed SHA256 473146793cc9cf8b2b780c1ce13f27138662f9942b53e5a7e293634196fbebcf +AUX wicd-1.7.1_beta2-urwid-1.0.patch 895 RMD160 13aec910e261d4f5574a9aebc365570b03089fe5 SHA1 db2b6a4811a9413ca4d8137bd387fdfdee4e718a SHA256 2988afdd35f7d9d0d374ce523a9c4ed193e25e70fd6eb2e9a05ec8b520e952ff AUX wicd-init-sve-start.patch 317 RMD160 e08a391b31c6d48e67ad51bcd8fb08457bbc0ebc SHA1 149775d7ef4deffc4e66f73fa47276ca194c92cb SHA256 20d7ada99465da5b50d03e5ef117226910bc20288278f6f788be3fbff05716db 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 3061 RMD160 bb369b4759c77d5b053886be102865d1aee86a9a SHA1 99a13e4ea0d6491b673aa776e29b095d464edcd4 SHA256 c7f4ab73c526fc2306cfd66e6fbbc663284db3185157f13224d0b3e987832640 -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 -EBUILD wicd-1.7.1_beta2-r6.ebuild 3697 RMD160 6531773e6df75052de2283437040af00d7dc87be SHA1 a4a7f855179bd43d439c0c4e6147479f94e4c14e SHA256 ddaf1578b16dec83d2bd6f471825ce035d7b96632893c94417f3eb57863a1974 -MISC ChangeLog 16532 RMD160 38397e6a938625e010903eadf3b4abaa93fc3170 SHA1 66c4da7e09042499b3ebbe819867a3632672b9bd SHA256 0716abf0dcd21520ee5557b627022bb3a0a67b3e4dcbce3331adf62369e7de30 +EBUILD wicd-1.7.0-r1.ebuild 3087 RMD160 41b8b5d6ba410d8d18501c685ba18e1e5a9a7520 SHA1 bd82f7dc551ff8578423e89abf3af66271caddcb SHA256 f5ed6a4512d25f91e6e1e62290b2a96d50165b7fe0f5fcc9d50112757c45af40 +EBUILD wicd-1.7.0.ebuild 2883 RMD160 fe8c5032d5cb8d187a121cf8d158dee6def232f0 SHA1 23136f453f1e889dae679596b5f94b94b552db7e SHA256 5992bda052319b3e3c4bc54f4d45c3d393ecbee0cd5814c57e694e3866948e4b +EBUILD wicd-1.7.1_beta2-r3.ebuild 3204 RMD160 2c28a4e38e1c0e06ef42793ad361adfbfd4c49bb SHA1 d351ece0b9d2650e00ddef6f918835fd787d071e SHA256 e120349cd593849bb06cd048090e83db73fb1fdd44d3aa26f46b4bc7abc2beb3 +EBUILD wicd-1.7.1_beta2-r4.ebuild 3436 RMD160 9dbcf3a1c1670a3f7b1aa3264e25415da5b463a2 SHA1 28447653a423c32541f2523ebe813f9df1bdeafc SHA256 e8dae3fa29079e412fb3c60c4b149cf981e194d0d489551c9d2f77c4d4265cf7 +EBUILD wicd-1.7.1_beta2-r6.ebuild 3723 RMD160 3fc4776e2e782a6e71b9beb9716c9ee4c41ebcd5 SHA1 aa77d3be3f8c924f08a0086fde7406f2aa04a349 SHA256 f51b40ccbeab28ab4eb2f73776063da4002a858b942ec9fd4be65b342d6c58fc +EBUILD wicd-1.7.1_beta2-r7.ebuild 3757 RMD160 5cf1304657171d4704da3ccd48c30da71d13e6d6 SHA1 f4c09be2fbdf16e356ccbd3e512ae91f533d95a3 SHA256 bf760e9314a0ac81d96fec61a2537445032227671b38242fa3f439ca88e2206b +MISC ChangeLog 16892 RMD160 822bd83bf0505b00fe54f2af9eb6e4248886eef9 SHA1 2bc0c048118fcf3e5faac0eaea8ae3f96e6a596c SHA256 5e6d6c29147e018106ee294255d897fd11aaa612466a1d8460985003ada0cc93 MISC metadata.xml 774 RMD160 20237c33867c0fd2a430f1e276ea1bdc861641d6 SHA1 9e87afff653f6d56d05d4630d2077b18327e6404 SHA256 9e9acf67db6ee267b658c1c6952ab60f5b1896b528511c46039210f83c6a06f4 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iJwEAQEIAAYFAk59rRcACgkQfXuS5UK5QB19bQQAqTf91BYnaVpIfXlVVlaAcOx9 -Kbse0mX7Hd1nXWQVCaxulMOxPNk/CKuoSxcqQqB/K5GCZgCqej7IEJXhmB4+pJzy -LQfSV6cAbX/6HhIYitQitrocplVq0EetFD0mKT4jiqRibiWFUc+af+RUwi4fgolp -wE3YcpXZa+GSYDmuuQA= -=0Tih +iF4EAREIAAYFAk6HPV0ACgkQodBTJSDyo66doAD/Y05tIW1af3sx496GvlIh6md3 +bW6Qmad83vOORVHLZrMA/Ai+0LL/lTJfaWwZ+3eOk8sC6/Be9/YqjM3BvXQb7LmM +=4Yj2 -----END PGP SIGNATURE----- diff --git a/net-misc/wicd/files/wicd-1.7.1_beta2-urwid-1.0.patch b/net-misc/wicd/files/wicd-1.7.1_beta2-urwid-1.0.patch new file mode 100644 index 000000000000..b1b5abc02795 --- /dev/null +++ b/net-misc/wicd/files/wicd-1.7.1_beta2-urwid-1.0.patch @@ -0,0 +1,20 @@ +--- /usr/share/wicd/curses/wicd-curses.py.old 2011-10-01 14:54:47.478406517 +0400 ++++ /usr/share/wicd/curses/wicd-curses.py 2011-10-01 14:49:50.781273004 +0400 +@@ -241,7 +241,7 @@ + # Don't stop because someone let go of the mouse on the frame + mouse_release = False + for k in keys: +- if urwid.is_mouse_event(k) and k[0] == "mouse release": ++ if urwid.util.is_mouse_event(k) and k[0] == "mouse release": + mouse_release = True + break + if mouse_release : +@@ -882,7 +882,7 @@ + data[4], False) + + for k in keys: +- if urwid.is_mouse_event(k): ++ if urwid.util.is_mouse_event(k): + event, button, col, row = k + self.frame.mouse_event( self.size, + event, button, col, row, diff --git a/net-misc/wicd/wicd-1.7.0-r1.ebuild b/net-misc/wicd/wicd-1.7.0-r1.ebuild index 748d11b7cda4..903e7e25caf6 100644 --- a/net-misc/wicd/wicd-1.7.0-r1.ebuild +++ b/net-misc/wicd/wicd-1.7.0-r1.ebuild @@ -1,6 +1,6 @@ # 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.0-r1.ebuild,v 1.3 2011/03/19 08:23:54 tomka Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.0-r1.ebuild,v 1.4 2011/10/01 16:18:28 tomka Exp $ EAPI=3 @@ -50,6 +50,7 @@ RDEPEND=" libnotify? ( dev-python/notify-python ) ncurses? ( >=dev-python/urwid-0.9.9.1 + =sys-power/pm-utils-1.1.1 ) diff --git a/net-misc/wicd/wicd-1.7.0.ebuild b/net-misc/wicd/wicd-1.7.0.ebuild index ae4b0912f595..3218147400e2 100644 --- a/net-misc/wicd/wicd-1.7.0.ebuild +++ b/net-misc/wicd/wicd-1.7.0.ebuild @@ -1,6 +1,6 @@ # 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.0.ebuild,v 1.10 2011/04/10 21:42:27 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.0.ebuild,v 1.11 2011/10/01 16:18:28 tomka Exp $ EAPI=3 @@ -45,6 +45,7 @@ RDEPEND=" libnotify? ( dev-python/notify-python ) ncurses? ( >=dev-python/urwid-0.9.9.1 + =sys-power/pm-utils-1.1.1 ) diff --git a/net-misc/wicd/wicd-1.7.1_beta2-r3.ebuild b/net-misc/wicd/wicd-1.7.1_beta2-r3.ebuild index be3382490339..d4b103a03bc4 100644 --- a/net-misc/wicd/wicd-1.7.1_beta2-r3.ebuild +++ b/net-misc/wicd/wicd-1.7.1_beta2-r3.ebuild @@ -1,6 +1,6 @@ # 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-r3.ebuild,v 1.4 2011/05/29 10:55:34 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.1_beta2-r3.ebuild,v 1.5 2011/10/01 16:18:28 tomka Exp $ EAPI=3 @@ -54,6 +54,7 @@ RDEPEND=" libnotify? ( dev-python/notify-python ) ncurses? ( >=dev-python/urwid-0.9.9.1 + =sys-power/pm-utils-1.1.1 ) diff --git a/net-misc/wicd/wicd-1.7.1_beta2-r4.ebuild b/net-misc/wicd/wicd-1.7.1_beta2-r4.ebuild index 76b9c8ece1f6..1221dd5f4d4a 100644 --- a/net-misc/wicd/wicd-1.7.1_beta2-r4.ebuild +++ b/net-misc/wicd/wicd-1.7.1_beta2-r4.ebuild @@ -1,6 +1,6 @@ # 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-r4.ebuild,v 1.6 2011/07/17 19:55:00 halcy0n Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.1_beta2-r4.ebuild,v 1.7 2011/10/01 16:18:28 tomka Exp $ EAPI=3 @@ -54,6 +54,7 @@ RDEPEND=" libnotify? ( dev-python/notify-python ) ncurses? ( >=dev-python/urwid-0.9.9.1 + =sys-power/pm-utils-1.1.1 ) diff --git a/net-misc/wicd/wicd-1.7.1_beta2-r6.ebuild b/net-misc/wicd/wicd-1.7.1_beta2-r6.ebuild index 6e639d27a432..b86943e66d17 100644 --- a/net-misc/wicd/wicd-1.7.1_beta2-r6.ebuild +++ b/net-misc/wicd/wicd-1.7.1_beta2-r6.ebuild @@ -1,6 +1,6 @@ # 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-r6.ebuild,v 1.1 2011/09/13 19:25:14 tomka Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.1_beta2-r6.ebuild,v 1.2 2011/10/01 16:18:28 tomka Exp $ EAPI=3 @@ -54,6 +54,7 @@ RDEPEND=" libnotify? ( dev-python/notify-python ) ncurses? ( >=dev-python/urwid-0.9.9.1 + =sys-power/pm-utils-1.1.1 ) diff --git a/net-misc/wicd/wicd-1.7.1_beta2-r7.ebuild b/net-misc/wicd/wicd-1.7.1_beta2-r7.ebuild new file mode 100644 index 000000000000..1bd9b1ecc6bf --- /dev/null +++ b/net-misc/wicd/wicd-1.7.1_beta2-r7.ebuild @@ -0,0 +1,118 @@ +# 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-r7.ebuild,v 1.1 2011/10/01 16:18:28 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-1.0.0 + dev-python/pygobject + ) + pm-utils? ( >=sys-power/pm-utils-1.1.1 ) + " +DOCS="CHANGES NEWS AUTHORS README" + +src_prepare() { + epatch "${FILESDIR}"/${P}-init.patch + # Fix urwid calls + epatch "${FILESDIR}/${P}"-urwid-1.0.patch + epatch "${FILESDIR}"/${PN}-init-sve-start.patch + # Fix ad-hoc networking (bug 351337) + epatch "${FILESDIR}"/fix-ad-hoc-networking.patch + # Add a template for hex psk's and wpa (Bug 306423) + epatch "${FILESDIR}"/add-wpa-psk-hex-template.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 +}