diff options
| -rw-r--r-- | net-misc/wicd/ChangeLog | 8 | ||||
| -rw-r--r-- | net-misc/wicd/Manifest | 13 | ||||
| -rw-r--r-- | net-misc/wicd/wicd-1.7.1_pre20120127-r1.ebuild | 121 |
3 files changed, 140 insertions, 2 deletions
diff --git a/net-misc/wicd/ChangeLog b/net-misc/wicd/ChangeLog index 70a4e83c3aed..94e2e0931540 100644 --- a/net-misc/wicd/ChangeLog +++ b/net-misc/wicd/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-misc/wicd # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.110 2012/02/01 17:20:52 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.111 2012/02/01 18:06:10 tomka Exp $ + +*wicd-1.7.1_pre20120127-r1 (01 Feb 2012) + + 01 Feb 2012; Thomas Kahle <tomka@gentoo.org> + +wicd-1.7.1_pre20120127-r1.ebuild: + readd x11-misc/ktsuss as a dependency 01 Feb 2012; Brent Baude <ranger@gentoo.org> wicd-1.7.1_pre20120127.ebuild: Marking wicd-1.7.1_pre20120127 ppc for bug 401005 diff --git a/net-misc/wicd/Manifest b/net-misc/wicd/Manifest index 6032d99605bb..b61f6f196ed5 100644 --- a/net-misc/wicd/Manifest +++ b/net-misc/wicd/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX add-wpa-psk-hex-template.patch 980 RMD160 9071bc60a01d2637df92309e183c11286c790f49 SHA1 febafc67f6501af227964e7a8af8d45ab0b6a0e4 SHA256 d5e45971adb2cd8649c81ce3a4edfb4bda954981767ff8a95374b062b460fca7 AUX wicd-1.7.1_beta2-init.patch 409 RMD160 58abdf5debc49517977dd5b691c6fe24cd8303c6 SHA1 4c24f4bb924035e109e905789a7669d6e7b0e7ed SHA256 473146793cc9cf8b2b780c1ce13f27138662f9942b53e5a7e293634196fbebcf AUX wicd-1.7.1_pre20111210-fix-config-reading.patch 392 RMD160 0faf4dce918ab921cbfa1f9d51a88bbbcfb0a87c SHA1 cd964628f71c972ab1c6ca34946f4a3a30e0b255 SHA256 437b282881bda8146145a30d85848615da039ebf43fa18f89d62da944502fdc3 @@ -13,6 +16,14 @@ EBUILD wicd-1.7.0-r1.ebuild 3072 RMD160 cee75c0a4ce24c2ca347e9c5f2587effa5d19b35 EBUILD wicd-1.7.0.ebuild 2868 RMD160 98708bc1168ac9ddbc5ba5eee597caadabbeffa4 SHA1 eff48c68649747f1690003fbdd76b9f1fa7f4faa SHA256 5b42776831a158c860f91357c9006b6e75c22d3fcbd2e44219cd085c3bc74cf9 EBUILD wicd-1.7.1_beta2-r4.ebuild 3421 RMD160 d891106aac02d2ee7d522d282228f303a5ded42d SHA1 a9357a7e76c6aeddccfc734dfe2e1d8b815997a3 SHA256 4c96591a81bb214784bee57204a536c686d7994455caa2661d0037b847a2e6e8 EBUILD wicd-1.7.1_pre20111210-r1.ebuild 3714 RMD160 e11be388d8c8c300ffc1740efeba12fd0e9ff69a SHA1 abf0899be4e3eab94381f2842464047168ef19cd SHA256 8092308754ce33f32dad9a13dd86465870f079d72edd26d5495685f4d3e5bb7e +EBUILD wicd-1.7.1_pre20120127-r1.ebuild 3912 RMD160 f5a233e6eae04519672e2d722266018d40d88c75 SHA1 cb0a75363e1d52491022ade6cafd17dd0eee2de6 SHA256 84e0c7b4042a1f1360b1d48f5aba3a42ef03d050c4acf3bbbe91d71e7cab8cdd EBUILD wicd-1.7.1_pre20120127.ebuild 3900 RMD160 08f507ec8f7520d1bb38c293d7dc5e2d55c5fb77 SHA1 efbbe0415a4f727c1e3e7756e7144ead35a590b1 SHA256 3836d308f70d0decfb60a8bde4cbb4840e6c198cc1100d005f7636e9feb3bc33 -MISC ChangeLog 19457 RMD160 c061ef30ceaeffa44b38e82b67d9836335d7e326 SHA1 31611cbd600853ae633098a07a7d7bf47c139820 SHA256 6fcceb7b09a2f6f3c636753997492ddd7616ae72d1fd94395686a188be635665 +MISC ChangeLog 19623 RMD160 76d67da34aa11f4b02d1502a4f2261d8ecd83307 SHA1 9e4cda2225a18a8125857abfb2f71f479cb34f83 SHA256 d1b8c3ab32240e337880cff2c5e4bf4793db6d5987535aebd66c041c8ce5548a MISC metadata.xml 842 RMD160 04d4114ca290134bef4bab332c3e7afb90afcbd6 SHA1 4ed5fc502368f1810635f5cee33c14356447a1c1 SHA256 6358cacc45392ebb7a97e49d8a7f2ced8d041ff48fa57d3cc4d8c8dfe2f6cf23 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iF4EAREIAAYFAk8pfyEACgkQodBTJSDyo64tLQD+ICiv19DZeU6W1QCxnYNxzmX5 +puTa4fo2bY2uPV17dxMA/1zi6uXXkEDN1cUTGrXw8vzApJW6sTcT28hw/xQCF6FE +=3Xgc +-----END PGP SIGNATURE----- diff --git a/net-misc/wicd/wicd-1.7.1_pre20120127-r1.ebuild b/net-misc/wicd/wicd-1.7.1_pre20120127-r1.ebuild new file mode 100644 index 000000000000..75f7826b0a63 --- /dev/null +++ b/net-misc/wicd/wicd-1.7.1_pre20120127-r1.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2012 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_pre20120127-r1.ebuild,v 1.1 2012/02/01 18:06:10 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 systemd + +MY_PV="${PN}-1.7.1" +S="${WORKDIR}/${MY_PV}" + +DESCRIPTION="A lightweight wired and wireless network manager for Linux" +HOMEPAGE="http://wicd.sourceforge.net/" +SRC_URI="http://dev.gentoo.org/~tomka/files/${P}.tar.gz + mac4lin? ( http://dev.gentoo.org/~anarchy/dist/wicd-mac4lin-icons.tar.xz )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="X +gtk ioctl libnotify mac4lin 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:2 ) + ioctl? ( dev-python/python-iwscan dev-python/python-wpactrl ) + libnotify? ( dev-python/notify-python ) + ncurses? ( + dev-python/urwid + dev-python/pygobject:2 + ) + pm-utils? ( >=sys-power/pm-utils-1.1.1 ) + " +DOCS="CHANGES NEWS AUTHORS README" + +src_prepare() { + 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 + # get rid of opts variable to fix bug 381885 + sed -i "/opts/d" "in/init=gentoo=wicd.in" || die + # 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 + 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 +} + +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 +} |