reinit the tree, so we can have metadata

9 files changed, 314 insertions, 0 deletions

diff --git a/net-misc/wicd/Manifest b/net-misc/wicd/Manifest
new file mode 100644
index 000000000000..7be8165d0bf5
--- /dev/null
+++ b/net-misc/wicd/Manifest
@@ -0,0 +1,13 @@
+AUX wicd-1.7.2.4-fix-desktop-categories.patch 879 SHA256 11da20e35ac224f5a4ddd50d3c700eb2d139eb004956dffe8600e36fab241b6d SHA512 f67dd4bbe84dd145e25718185b6c50e5b2a99e77787ca536d1cc1844b0ed70d1d3acff3f660d94299479bc4d4ce685ebb43f7afd7565682b05d99e14d657ed9e WHIRLPOOL f8c1b07c3aeac7306e238c7e9db53e2242455fae6e756b2e4873d22cac25e358412aa7159e7386869f9378efe78f13dfac25397dea79f0754614299ab957a9ca
+AUX wicd-1.7.3-add-missing-gnome-shell-extension.patch 1695 SHA256 9e94c652e2a85d8a2bdff41b9a2d7c28dd9f552fb0bdc88cff61e2b9b4336deb SHA512 4a08360d192f040983e782a81f8a57b8407726531551f512f5ea8537c18c3abf8934a1c597e73945637e15c96ba0f26cfc63525d00981a7ab6897ef0ab4ed2e5 WHIRLPOOL 6fa2c1bd6d7397dfc28e354019eba31ff77a6f1716c0b4a0f9490528dd85ce673c32dfd2c94c157384298716bf3839af4b7505339cfd0586e8f3668d25829eea
+AUX wicd-1.7.3-bitrate-property.patch 775 SHA256 06c38a1ac8c7f150473c33da4053badd19ae5b6cbae740b3511be012e63139a1 SHA512 02a4e219b62b5ba36371aac75c89adf0e2c05d57d472ab39f7bca0f500140ff78cab94db292f793dc2398933d26c2e18e1c806940b339e120afbd617d83e67a8 WHIRLPOOL 11509d9649462360af035547af99bde11438a278b8479e1f2b3f2a1a6fe1d703cd0b82b5562c20a2c8ed426127c3c1acdad03569c447d697699c413948411468
+AUX wicd-1.7.3-undefined-LANG.patch 946 SHA256 747f5a0b87460148af67c37cb63c563dd0ec68b362a1853836515f4ccfed182e SHA512 c2d197d41a84975bb3caf44de9b05b741b6702c38079ecc917632f9eedcf2be71373416154013690620511f2e9e99fb0d88cee0b22292fe007795cde664e63e5 WHIRLPOOL 0b36b1d1cf4de2ec375f70e8bfbf7d453eb5104bd3aa1b0e4e2ade6b9e211f1d0759cdd7b78a356ce5ef2d8a4cf5017a2529e8f274b41408597d45315e171085
+AUX wicd-1.7.3-urwid-1.3.0.patch 477 SHA256 eed37078a474fa64da0290c34c9107f2562a76ddc3f73796e00124061862dc6b SHA512 f5904e9fd082fb77d6b930285d6f1662d603d11c348068ec29820683aee319adf4ff0ddd28f7da80dc3c5b5834d9f9a0649d4077aed09d6c8ce8e24d8791d5c6 WHIRLPOOL 0d5277e87841f20eeca9ace601cfa682c995549eda60cf570efbd862f5c3355e188139368303710dc16c5f07919b1c4c4b9735a7d5ca481113ba7910f0d17c95
+AUX wicd-init-sve-start.patch 317 SHA256 20d7ada99465da5b50d03e5ef117226910bc20288278f6f788be3fbff05716db SHA512 d62db40a156aa9e7b97b23b3ebceded77bcae18ae513c39b8e4ef8733c30429059a83f932c83b3cf0b90fd0aeeeadc6249a71498c569630df057037acf43f3fc WHIRLPOOL 7df520e4e3291e032d031763f43596e97b66bdcf8418f0a328b885e3ee7051807b7023fa0663e2f42010bc3b71e4d7852e954a5b8e00e2805f4487f409a0da31
+DIST Icone-Wicd-Lucid.tar.gz 9015 SHA256 6e4e3483c6cff7398e6871dd3e4360e361e5c6e64007e8e1240fd1c259ac707e SHA512 0df0dbdf05b462264dca2dd9955454a82f688b0fbfa7c2ad70a424df57eb27b35561d37819fc88b5746cff8a54de5b7b43ec325d2f98a4a1a30e4d500e86d2f8 WHIRLPOOL 336f363092c9bac7523047b6052a856a699820147967820418c6ac1ca528c472d371c6c211c505c325b5eb001812042c01425b05e1dfdf2d4a528f96686c530a
+DIST wicd-1.7.4.tar.gz 547393 SHA256 67989614004773db349791c37675efb914d084bdb221356a05e4369c35e7eb62 SHA512 1e99a45daa858eba634e60e50c22aa2fab3fc4d643979a6741b6164bf500bd6db285d11c12ccd164ab6cf0792284e319e3c3447804088e74b4fc67bb6f431959 WHIRLPOOL 680c79380ea645a286889c737c7b478a933e4243ad20c5c0f8cf53d37747a1d98780e21a4aeb98bed6da37f93f61d5dd4a42b22466f2feceae08e87d853b80fd
+DIST wicd-mac4lin-icons.tar.xz 53136 SHA256 4c48c769c71f962415e3bd3573557e9288351afb867347f9a6f652883ae31011 SHA512 98ed3f92ec361aa8651c64efdb5128b8f73068f1cf2423640dafc4b46889ae32c1d1f56f509ad609b2bf98f634f8ada4c501f2294e3a64affd1befd4400498a8 WHIRLPOOL 84c097432ebb6ca66c0fa48d4226c8da5f6342b6fdeeb9546c98952b8f6e52a1f87d0ba23c1b409f3008432e5c6346bf65949dad99070804b1dcc2c1055eb9ea
+EBUILD wicd-1.7.4-r2.ebuild 5090 SHA256 655787b6e96bcfbe6d65262917855c966b642006cd664e7e00ba1a4a8a8bd123 SHA512 70de74c229f32ef67472b5e4bb90e11aa6db3c964cb2e584128c73217ede9e7b01d307e5d488ae7808fd33c8d2eea753e7e7938c70012d1fce5f861454da5248 WHIRLPOOL b201cb9f889760a5fbe5430be55cc014881762310215a4ff580ec161ca407c89d522032c8dc85dedf665ddefbac7c7131930f100e1827d64c5a6a4f1888c780e
+MISC ChangeLog 6589 SHA256 40c4d124de33cac3e06ca57c7739fd18fdfbd7b3404920e2b112171732227043 SHA512 52583ce554757db55effec9b9282ef15886034edb85e009ebd838c71f14fee3975706dec7352211ae3b47ab9fa1d91f47d042f3fc1f254e128415d4f41ce5b4a WHIRLPOOL de6f7117fc6178cf45c8994eb8a04ef472fb5332acf03493fe05b9212dfc57dfa20b3494473365650cf5f901b55f64779726334ddf5001e179b698f5bba6b6e0
+MISC ChangeLog-2015 26387 SHA256 a7f737451ae142fbf394d86d0ea0b45aa0569a783ab741b0fb625949d82dd6a8 SHA512 9116e57c3808bf057848c154f8d7db97c2d4d8a5cb550755b7c153cddcf00172624cb2144dd97507d8477634b60593b9888e50457c5c5d9b2d7e8be1ea440b80 WHIRLPOOL 665ea3e24b5e4ff25340bde9e96babea90437a320cb9d593bb7996b0b8796556c4c55ca087a297b16815d387f22d41cc0685b4acf8a93a777184cc17750244bc
+MISC metadata.xml 913 SHA256 093b6929d3794e81c15c1ceb1c2460d998f3a4c32e78e8459c1255d982c57054 SHA512 2cc53e7e0f14169b88d26324b071b2078012cc57bd9ddae0b14f18efbe2d1bc1ef0b66122c178b0e3019a48bec2ba87fc09186b4d8a96e8e7d8e51a997c09d69 WHIRLPOOL ec17032c4cfb7e9046a4ea13cb5fd7763c2ec4534e3d58c4c2ae846e108acadf72ad7c2a6b90132d94a17a56a98c866415af54fdbf144e9f534e5d4a07da8d60
diff --git a/net-misc/wicd/files/wicd-1.7.2.4-fix-desktop-categories.patch b/net-misc/wicd/files/wicd-1.7.2.4-fix-desktop-categories.patch
new file mode 100644
index 000000000000..0ccbd7833b23
--- /dev/null
+++ b/net-misc/wicd/files/wicd-1.7.2.4-fix-desktop-categories.patch
@@ -0,0 +1,20 @@
+diff -U 3 -dHrN wicd-1.7.2.4.orig/other/wicd.desktop wicd-1.7.2.4/other/wicd.desktop
+--- wicd-1.7.2.4.orig/other/wicd.desktop	2013-06-24 22:18:00.715578998 +0200
++++ wicd-1.7.2.4/other/wicd.desktop	2013-06-24 22:18:57.672595363 +0200
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-Categories=Application;Network;
++Categories=Network;Settings;Utility;X-GNOME-NetworkSettings;
+ Exec=wicd-gtk --no-tray
+ GenericName=Network Manager
+ Icon=wicd-gtk
+diff -U 3 -dHrN wicd-1.7.2.4.orig/other/wicd-tray.desktop wicd-1.7.2.4/other/wicd-tray.desktop
+--- wicd-1.7.2.4.orig/other/wicd-tray.desktop	2013-06-24 22:18:00.715578998 +0200
++++ wicd-1.7.2.4/other/wicd-tray.desktop	2013-06-24 22:18:59.864595996 +0200
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-Categories=Application;Network;
++Categories=Network;Settings;Utility;X-GNOME-NetworkSettings;
+ Exec=wicd-gtk --tray
+ GenericName=Network Manager
+ Icon=wicd-gtk
diff --git a/net-misc/wicd/files/wicd-1.7.3-add-missing-gnome-shell-extension.patch b/net-misc/wicd/files/wicd-1.7.3-add-missing-gnome-shell-extension.patch
new file mode 100644
index 000000000000..9ea419eb4e71
--- /dev/null
+++ b/net-misc/wicd/files/wicd-1.7.3-add-missing-gnome-shell-extension.patch
@@ -0,0 +1,39 @@
+diff -U 3 -dHrN wicd-1.7.3.orig/gnome-shell/extension.js wicd-1.7.3/gnome-shell/extension.js
+--- wicd-1.7.3.orig/gnome-shell/extension.js	1970-01-01 01:00:00.000000000 +0100
++++ wicd-1.7.3/gnome-shell/extension.js	2015-01-19 14:12:12.962333228 +0100
+@@ -0,0 +1,29 @@
++/*
++ * Copyright © 2012, David Paleino <d.paleino@gmail.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License Version 2 as
++ * published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ */
++
++const StatusIconDispatcher = imports.ui.statusIconDispatcher;
++
++function init(metadata) {
++}
++
++function enable() {
++    StatusIconDispatcher.STANDARD_TRAY_ICON_IMPLEMENTATIONS['wicd-client.py'] = 'wicd-gtk';
++}
++
++function disable() {
++    StatusIconDispatcher.STANDARD_TRAY_ICON_IMPLEMENTATIONS['wicd-client.py'] = '';
++}
+diff -U 3 -dHrN wicd-1.7.3.orig/gnome-shell/metadata.json wicd-1.7.3/gnome-shell/metadata.json
+--- wicd-1.7.3.orig/gnome-shell/metadata.json	1970-01-01 01:00:00.000000000 +0100
++++ wicd-1.7.3/gnome-shell/metadata.json	2015-01-19 14:12:12.962333228 +0100
+@@ -0,0 +1 @@
++{"shell-version": ["3.4.2"], "uuid": "wicd@code.hanskalabs.net", "name": "WICD Network Manager", "description": "Show status of WICD"}
+\ No newline at end of file
diff --git a/net-misc/wicd/files/wicd-1.7.3-bitrate-property.patch b/net-misc/wicd/files/wicd-1.7.3-bitrate-property.patch
new file mode 100644
index 000000000000..855a2939b5de
--- /dev/null
+++ b/net-misc/wicd/files/wicd-1.7.3-bitrate-property.patch
@@ -0,0 +1,19 @@
+--- a/curses/netentry_curses.py
++++ b/curses/netentry_curses.py
+@@ -538,11 +538,12 @@
+         self.bitrates = wireless.GetAvailableBitrates()
+         self.bitrates.append('auto')
+         self.bitrate_combo.set_list(self.bitrates)
+-        self.bitrate_combo.set_focus(
+-            self.bitrates.index(
+-                wireless.GetWirelessProperty(networkID, 'bitrate')
++        if wireless.GetWirelessProperty(networkID, 'bitrate'):
++            self.bitrate_combo.set_focus(
++                self.bitrates.index(
++                    wireless.GetWirelessProperty(networkID, 'bitrate')
++                )
+             )
+-        )
+         self.allow_lower_bitrates_chkbox.set_state(
+             to_bool(self.format_entry(networkID, 'allow_lower_bitrates'))
+         )
diff --git a/net-misc/wicd/files/wicd-1.7.3-undefined-LANG.patch b/net-misc/wicd/files/wicd-1.7.3-undefined-LANG.patch
new file mode 100644
index 000000000000..b854607d9583
--- /dev/null
+++ b/net-misc/wicd/files/wicd-1.7.3-undefined-LANG.patch
@@ -0,0 +1,24 @@
+Fixes compilation errors when os.environ['LANG'] is undefiend
+--- ./setup.py
++++ ./setup.py
+@@ -621,7 +621,7 @@ class compile_translations(Command):
+                 shutil.rmtree('translations/')
+             os.makedirs('translations')
+ 
+-            oldlang = os.environ['LANG']
++            oldlang = os.environ.get('LANG', None)
+             os.environ['LANG'] = 'C'
+ 
+             for pofile in sorted(glob('po/*.po')):
+@@ -656,7 +656,10 @@ class compile_translations(Command):
+                     os.makedirs('translations/' + lang + '/LC_MESSAGES/')
+                     os.system('pybabel compile -D wicd -i %s -l %s -d translations/' % (pofile, lang))
+ 
+-            os.environ['LANG'] = oldlang
++            if oldlang is not None:
++                os.environ['LANG'] = oldlang
++            else:
++                del os.environ['LANG']
+ 
+ class uninstall(Command):
+     description = "remove Wicd using uninstall.sh and install.log"
diff --git a/net-misc/wicd/files/wicd-1.7.3-urwid-1.3.0.patch b/net-misc/wicd/files/wicd-1.7.3-urwid-1.3.0.patch
new file mode 100644
index 000000000000..d7f73dca8d59
--- /dev/null
+++ b/net-misc/wicd/files/wicd-1.7.3-urwid-1.3.0.patch
@@ -0,0 +1,15 @@
+--- a/curses/wicd-curses.py
++++ b/curses/wicd-curses.py
+@@ -1153,9 +1153,10 @@
+         if not ui._started:
+             return False
+ 
+-        input_data = ui.get_input_nonblocking()
++        ui.set_input_timeouts(max_wait=0)
++        input_data = ui.get_input()
+         # Resolve any "alarms" in the waiting
+-        self.handle_keys(input_data[1])
++        self.handle_keys(input_data)
+ 
+         # Update the screen
+         canvas = self.frame.render((self.size), True)
diff --git a/net-misc/wicd/files/wicd-init-sve-start.patch b/net-misc/wicd/files/wicd-init-sve-start.patch
new file mode 100644
index 000000000000..c6314920d74a
--- /dev/null
+++ b/net-misc/wicd/files/wicd-init-sve-start.patch
@@ -0,0 +1,10 @@
+diff -U 3 -dHrN wicd-1.7.1b2.old/in/init=gentoo=wicd.in wicd-1.7.1b2/in/init=gentoo=wicd.in
+--- wicd-1.7.1b2.old/in/init=gentoo=wicd.in	2011-05-07 20:52:13.000000000 +0200
++++ wicd-1.7.1b2/in/init=gentoo=wicd.in	2011-05-07 20:52:43.000000000 +0200
+@@ -35,5 +35,5 @@
+ 
+ restart() {
+ 	force_kill
+-	start
++	sve_start
+ }
diff --git a/net-misc/wicd/metadata.xml b/net-misc/wicd/metadata.xml
new file mode 100644
index 000000000000..8fa97712dc59
--- /dev/null
+++ b/net-misc/wicd/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<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.
+	This will improve speed but is experimental.</flag>
+		<flag name="mac4lin">Change default icons to mac4lin icon set</flag>
+		<flag name="ncurses">Installs a ncurses UI</flag>
+		<flag name="pm-utils">Installs the pm-utils hooks for suspend/resume and
+	requires <pkg>sys-power/pm-utils</pkg></flag>
+		<flag name="gnome-shell">Install gnome-shell extension</flag>
+	</use>
+	<upstream>
+		<remote-id type="launchpad">wicd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/wicd/wicd-1.7.4-r2.ebuild b/net-misc/wicd/wicd-1.7.4-r2.ebuild
new file mode 100644
index 000000000000..c06f9fd6f0ff
--- /dev/null
+++ b/net-misc/wicd/wicd-1.7.4-r2.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ncurses?,xml"
+
+inherit eutils distutils-r1 linux-info readme.gentoo-r1 systemd
+
+DESCRIPTION="A lightweight wired and wireless network manager for Linux"
+HOMEPAGE="https://launchpad.net/wicd"
+SRC_URI="https://launchpad.net/wicd/1.7/${PV}/+download/${P}.tar.gz
+	mac4lin? ( https://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 ~arm ~mips ppc ppc64 x86"
+IUSE="doc X ambiance +gtk ioctl libnotify mac4lin ncurses nls +pm-utils gnome-shell"
+
+DEPEND="nls? ( dev-python/Babel[${PYTHON_USEDEP}] )"
+RDEPEND="${PYTHON_DEPS}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	X? (
+		gtk? ( dev-python/pygtk[${PYTHON_USEDEP}] )
+		|| (
+			x11-misc/ktsuss
+			kde-plasma/kde-cli-tools[kdesu]
+			kde-frameworks/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[${PYTHON_USEDEP}] )
+	ioctl? ( dev-python/python-iwscan[${PYTHON_USEDEP}]
+			 dev-python/python-wpactrl[${PYTHON_USEDEP}] )
+	libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
+	ncurses? (
+		dev-python/urwid[${PYTHON_USEDEP}]
+		dev-python/pygobject:2[${PYTHON_USEDEP}]
+	)
+	pm-utils? ( sys-power/pm-utils )
+	gnome-shell? ( gnome-base/gnome-shell )
+	|| (
+		>=sys-apps/util-linux-2.31_rc1
+		net-wireless/rfkill
+	)
+	"
+PATCHES=(
+	"${FILESDIR}"/${PN}-init-sve-start.patch
+	# The Categories entry in the .desktop files is outdated
+	"${FILESDIR}"/${PN}-1.7.2.4-fix-desktop-categories.patch
+	# Upstream bug https://bugs.launchpad.net/wicd/+bug/1412413
+	# Creates files -> give -p
+	"${FILESDIR}"/${PN}-1.7.3-add-missing-gnome-shell-extension.patch
+	# If LANG is undefined, build can fail (bug 537202)
+	"${FILESDIR}"/${PN}-1.7.3-undefined-LANG.patch
+	# Fix urwid compat again
+	"${FILESDIR}"/${PN}-1.7.3-urwid-1.3.0.patch
+	# Another compatibility patch from launchpad bug 1075399
+	"${FILESDIR}"/${PN}-1.7.3-bitrate-property.patch
+)
+
+src_prepare() {
+	CONFIG_CHECK="~CFG80211_WEXT"
+	local WARNING_CFG80211_WEXT="Wireless extensions have not been \
+	configured in your kernel.  Wicd will not work unless CFG80211_WEXT is set."
+	check_extra_config
+
+	default
+
+	# 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"
+	# Fix misc helper scripts:
+	sed -e "s:/usr/bin/env python:/usr/bin/env python2:" \
+		-i wicd/suspend.py wicd/autoconnect.py wicd/monitor.py || die
+	# fix shebang for openrc init script (bug #573846)
+	sed 's@/sbin/runscript@/sbin/openrc-run@' \
+		-i in/init=gentoo=wicd.in || die
+	if use nls; then
+	  # Asturian is faulty with PyBabel
+	  # (https://bugs.launchpad.net/wicd/+bug/928589)
+	  rm po/ast.po
+	  # zh_CN fails with newer PyBabel (Aug 2013)
+	  rm po/zh_CN.po
+	else
+	  # nuke translations
+	  rm po/*.po
+	fi
+
+	DOC_CONTENTS="To start wicd at boot with openRC, add
+		/etc/init.d/wicd to a runlevel and: (1) Remove all net.*
+		initscripts (except for net.lo) from all runlevels (2) Add these
+		scripts to the RC_PLUG_SERVICES line in /etc/rc.conf (For
+		example, rc_hotplug=\"!net.eth* !net.wlan*\")"
+}
+
+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"
+	use gnome-shell || myconf="${myconf} --no-install-gnome-shell-extensions"
+	python_setup
+	"${EPYTHON}" ./setup.py configure --no-install-docs \
+		--resume=/usr/share/wicd/scripts/ \
+		--suspend=/usr/share/wicd/scripts/ \
+		--verbose ${myconf}
+}
+
+src_install() {
+	distutils-r1_src_install
+	keepdir /var/lib/wicd/configurations
+	keepdir /etc/wicd/scripts/{postconnect,disconnect,preconnect}
+	keepdir /var/log/wicd
+	use nls || rm -rv "${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/ || die
+	fi
+	if use ambiance; then
+		# Overwrite tray icons with ambiance icon
+		rm "${WORKDIR}/Icone Wicd Lucid"/signal* || die
+		cp "${WORKDIR}/Icone Wicd Lucid"/*.png "${D}"/usr/share/pixmaps/wicd/ || die
+	fi
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	# 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/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
+
+	readme.gentoo_print_elog
+}