Adding ambience icon theme (bug 401125)

Package-Manager: portage-2.1.10.45/cvs/Linux x86_64

4 files changed, 139 insertions, 6 deletions

diff --git a/net-misc/wicd/ChangeLog b/net-misc/wicd/ChangeLog
index 28330a8678b5..a3e85c3298e8 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.112 2012/02/05 16:21:38 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.113 2012/02/09 14:40:05 tomka Exp $
+
+*wicd-1.7.1-r1 (09 Feb 2012)
+
+  09 Feb 2012; Thomas Kahle <tomka@gentoo.org> +wicd-1.7.1-r1.ebuild,
+  metadata.xml:
+  Adding ambience icon theme (bug 401125)
 
 *wicd-1.7.1 (05 Feb 2012)
 
diff --git a/net-misc/wicd/Manifest b/net-misc/wicd/Manifest
index 8f2a4574363c..1820d0f3569c 100644
--- a/net-misc/wicd/Manifest
+++ b/net-misc/wicd/Manifest
@@ -7,6 +7,7 @@ AUX wicd-1.7.1_pre20111210-fix-config-reading.patch 392 RMD160 0faf4dce918ab921c
 AUX wicd-1.7.1_pre20111210-wpa-psk-hex-template.patch 920 RMD160 422aefe7be91d5f28ec2458a43ec546c198732cb SHA1 df6fbf1a68fbf0e4707d40377afddbbb769502c1 SHA256 b721a8b90c97330d12787608108dd8f1db99742c596a786d4fcfa1f3abb19be6
 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 Icone-Wicd-Lucid.tar.gz 9015 RMD160 b28de907ac557c7308b3cc5e094e3a31e1cf5ecb SHA1 36140c9d3319ad25978360a38533d800706dd54b SHA256 6e4e3483c6cff7398e6871dd3e4360e361e5c6e64007e8e1240fd1c259ac707e
 DIST wicd-1.7.0.tar.bz2 411166 RMD160 66893e4043ba7e96996d698f847c0ab3b350df6a SHA1 1cd087f53538b1f6e1cfad9735c87741e05698f6 SHA256 14c5692bf8a4c93c9ac083ce9ad677b0d9022b19f84e777854766b2a6f753b32
 DIST wicd-1.7.1.tar.gz 444677 RMD160 ef785ca1c6608e1589aa5306fa822996ab4f5d44 SHA1 d22bfa246953748912cd511b574fca11eac68f15 SHA256 ab0048b3be453503a883f7ad931eea11ef44c6dd65b8c18ac84d5ddf01349f67
 DIST wicd-1.7.1_pre20111210.tar.gz 476203 RMD160 1fb4fc8775982b27bd006e13d4c895b4615fea8d SHA1 0f113b83987ef0c3229bc997ed99ab2ff8e5cabf SHA256 ae6cb59b39324d088b9aee76233e224dd168541bb089faa8b016c9d905a87734
@@ -15,17 +16,18 @@ DIST wicd-1.7.1b2.tar.bz2 509990 RMD160 587e922271d017eb67499f64c2502b02def44f9d
 DIST wicd-mac4lin-icons.tar.xz 53136 RMD160 a5b26fda9bbabf48ddeff634f87cbcedeb3e99a4 SHA1 1a5ddf37b48a84f2a3dfc14eb2a8f01fd90b8b12 SHA256 4c48c769c71f962415e3bd3573557e9288351afb867347f9a6f652883ae31011
 EBUILD wicd-1.7.0-r1.ebuild 3072 RMD160 cee75c0a4ce24c2ca347e9c5f2587effa5d19b35 SHA1 3897fe2d505472d72f6defeba2e4f26179c1c1a1 SHA256 0b7525576cf858a83c995ecc4d45695a1d16f8efc50001073d17088e7ac40697
 EBUILD wicd-1.7.0.ebuild 2868 RMD160 98708bc1168ac9ddbc5ba5eee597caadabbeffa4 SHA1 eff48c68649747f1690003fbdd76b9f1fa7f4faa SHA256 5b42776831a158c860f91357c9006b6e75c22d3fcbd2e44219cd085c3bc74cf9
+EBUILD wicd-1.7.1-r1.ebuild 4178 RMD160 721fb8979bdf9b72435785319960e9433c83ed67 SHA1 58b66f1894f4b0becb98f63095d5fab7ebc74ffb SHA256 acda2c6d6a340bae89836fc47269026cbf09c50afec7a28df15190ce8a4fa9c1
 EBUILD wicd-1.7.1.ebuild 3863 RMD160 4b018265e99344167ff451fc7753b7e122da1f21 SHA1 cfa348b6bca188652c06c25e1b5e5aa4c030ea8f SHA256 7000719e6e968f03f7928e53abd6bb43047436955ce7f33892a8849035478abd
 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 19734 RMD160 6de5c8eb1d4b69c62a014f9430e6c2f60ab96b2c SHA1 f248b940bebd771ec3eec530d54e7ba8e407685c SHA256 7bbc7bee7402b26bd3f040a2cced459752ca33705172a0062371ba1d066782cd
-MISC metadata.xml 842 RMD160 04d4114ca290134bef4bab332c3e7afb90afcbd6 SHA1 4ed5fc502368f1810635f5cee33c14356447a1c1 SHA256 6358cacc45392ebb7a97e49d8a7f2ced8d041ff48fa57d3cc4d8c8dfe2f6cf23
+MISC ChangeLog 19893 RMD160 e0b0236546808a008e4dda0d2f80ca8c1a2e7593 SHA1 d80b73172820db390986760129288d7077cdebd4 SHA256 c7c267f005cab931a43388c06f342f625bd950fd69b622f97fa0b59368dfdaf1
+MISC metadata.xml 915 RMD160 28228e703502435eb74c398892ec1246024db558 SHA1 68f981a5787f875a72eec0dc48cbdf918b4a06ea SHA256 43ad2b234c323c6727348b18991283a8c6d4f6cdf4f80c35f417646defeba339
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk8urJcACgkQodBTJSDyo67oagD/Y+VU49vb6X91eDLvx5eGVWaF
-zglaAIGB/YJCJLiF31sA/3bClyFmyDcwaaZlnS3hBiiVY1GIo0C+3v6ZHBfOqae1
-=PTUE
+iF4EAREIAAYFAk8z2s8ACgkQodBTJSDyo67dDQD7BFOs2OuwZOJ6Pz4jeujF2Xki
+aCeB3gFT7MaTV0hn49oA/jLMESXvPjuOEjr4zq6QmkaiOIGAxEzb7qiw/o4fiq6N
+=8ppT
 -----END PGP SIGNATURE-----
diff --git a/net-misc/wicd/metadata.xml b/net-misc/wicd/metadata.xml
index 9588531c3f36..7b536379192d 100644
--- a/net-misc/wicd/metadata.xml
+++ b/net-misc/wicd/metadata.xml
@@ -10,6 +10,7 @@
 	<name>Dane Smith</name>
 </maintainer>
 <use>
+	<flag name='ambiance'>Install icons from Ubuntu's ambiance theme</flag>
 	<flag name='gtk'>Installs a gtk UI. This is enabled by default because it is
 		intended behavior. Requires <pkg>dev-python/pygtk</pkg></flag>
 	<flag name='ioctl'>Installs additional python libraries to use as a backend.
diff --git a/net-misc/wicd/wicd-1.7.1-r1.ebuild b/net-misc/wicd/wicd-1.7.1-r1.ebuild
new file mode 100644
index 000000000000..4a126d7494d2
--- /dev/null
+++ b/net-misc/wicd/wicd-1.7.1-r1.ebuild
@@ -0,0 +1,124 @@
+# 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-r1.ebuild,v 1.1 2012/02/09 14:40:05 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
+
+DESCRIPTION="A lightweight wired and wireless network manager for Linux"
+HOMEPAGE="http://wicd.sourceforge.net/"
+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 ~x86"
+IUSE="X ambiance +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
+	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() {
+	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
+}