install CHANGES file, and don't install duplicated documents (added patch & configure args)

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo x86_64

4 files changed, 31 insertions, 6 deletions

diff --git a/net-misc/wicd/ChangeLog b/net-misc/wicd/ChangeLog
index 8e36ee06b056..177589696927 100644
--- a/net-misc/wicd/ChangeLog
+++ b/net-misc/wicd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/wicd
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.6 2008/09/14 14:56:15 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.7 2008/09/14 16:15:32 darkside Exp $
+
+  14 Sep 2008; Jeremy Olexa <darkside@gentoo.org>
+  +files/wicd-1.5.2-remove-docs.patch, wicd-1.5.2.ebuild:
+  install CHANGES file, and don't install duplicated documents (added patch &
+  configure args)
 
 *wicd-1.5.2 (14 Sep 2008)
 
diff --git a/net-misc/wicd/Manifest b/net-misc/wicd/Manifest
index 9912d45c6f96..befc845010cc 100644
--- a/net-misc/wicd/Manifest
+++ b/net-misc/wicd/Manifest
@@ -1,7 +1,8 @@
+AUX wicd-1.5.2-remove-docs.patch 574 RMD160 bf4cd223836333a378bc448f48372a2cfcdfd2c5 SHA1 fefa1005a37e7edde67ab1e0ddad57773892b698 SHA256 de889b274dee7d6052f7dcab3c72e7b1bc10df69775d0e4eedcb012717663eeb
 AUX wicd-init.d 424 RMD160 f9c12319678d7af37856a8c48b4789c3ca2cfebd SHA1 74a8882f05c8ed23805a5577e795a07039c35908 SHA256 d61b5280440853ad32a683aded8d4f51c81907248fc0e1d75762cede3db63803
 DIST wicd-1.5.1.tar.gz 228262 RMD160 c4f4c10b3d8d6f6ca421c5be8db3df9495881027 SHA1 3cffd046a996cda341c43c86df22b3de3ff5aaf2 SHA256 378faa1e4081c4696517a0f3a5eec0777e65e0511a862034b95ea05464a76ef8
 DIST wicd-1.5.2.tar.gz 233932 RMD160 3a6210462bd68f44e2bd23896e4b06f00c6b1dc2 SHA1 966e77a606898da4cd7e9d385eff8df6ea9af543 SHA256 8c375e3db6f5594c25acf88c6011ff9fdc37213bebe87d107b3fd3f145e51706
 EBUILD wicd-1.5.1.ebuild 1362 RMD160 06749fa218bf0c998cc78e9d4b54dbbf45fb7347 SHA1 3218dc592b154520071dc3241e598219c478e640 SHA256 049a51858dd4bd9282b810b862cfce042157d1bda5a9ae48336d8044b956e16b
-EBUILD wicd-1.5.2.ebuild 1362 RMD160 25f7c46709d8b75726c7b28f9a19f3065a32e6bf SHA1 74204d91dad25a3ac69b847a13383b6b59ee2ee7 SHA256 8b87ee8bf9de7c151c8b797ea320db243bc32f6ca61e5b63a6c51c5eadd4cb4e
-MISC ChangeLog 2092 RMD160 30a3be8363c8724d8152e896e8c4952aeeb1fd20 SHA1 dbcf980fc7894e8dae3dfc58e963c53d2f41601d SHA256 983dbf045dfea6926a2cc34257f1dcb6eb573bb6b964417415e1e1a954e08c84
+EBUILD wicd-1.5.2.ebuild 1590 RMD160 900d4beb09820ca09cf03f0c5a0a48ad372c34fb SHA1 e8445c201807f2d1cad1238393967c6fab15dc2b SHA256 f5f7740ec7aa7d023d9c5386b77035d24629a02f67fd6a0f27800bab67a6a748
+MISC ChangeLog 2297 RMD160 c88d547103083977424655ea817d41978787784b SHA1 a81fb1ded43f0af2f101284dd847a0ffff8820ac SHA256 7a033fbbe7b7a1a2bf38d74c2b5eefb21f37555667388094ffbdb8aa92dac6ba
 MISC metadata.xml 224 RMD160 ef4cc3054936a3572ec992bcceee2519eddcba46 SHA1 3b0afde57f521aa4f834fed82806e79be3530c3e SHA256 fc3ff3b3ec6fac6a93feff4a2692f42f8abd9e7b5741d81a272a820d40092b73
diff --git a/net-misc/wicd/files/wicd-1.5.2-remove-docs.patch b/net-misc/wicd/files/wicd-1.5.2-remove-docs.patch
new file mode 100644
index 000000000000..781120fd0094
--- /dev/null
+++ b/net-misc/wicd/files/wicd-1.5.2-remove-docs.patch
@@ -0,0 +1,11 @@
+--- setup.py.old	2008-09-14 11:07:08.000000000 -0500
++++ setup.py	2008-09-14 11:10:34.000000000 -0500
+@@ -301,7 +301,7 @@
+     (wpath.share, ['data/wicd.glade', ]),
+     (wpath.lib, ['wicd/wicd-client.py', 'wicd/monitor.py', 'wicd/wicd-daemon.py', 'wicd/configscript.py', 'wicd/suspend.py', 'wicd/autoconnect.py']), #'wicd/wicd-gui.py', 
+     (wpath.autostart, ['other/wicd-tray.desktop', ]),
+-    ( wpath.docdir, [ 'AUTHORS', 'README' ]),
++    #( wpath.docdir, [ 'AUTHORS', 'README' ]),
+     ]
+     piddir = os.path.dirname(wpath.pidfile)
+     if not piddir.endswith('/'):
diff --git a/net-misc/wicd/wicd-1.5.2.ebuild b/net-misc/wicd/wicd-1.5.2.ebuild
index 5b3123a6bb9e..2ab1049e187b 100644
--- a/net-misc/wicd/wicd-1.5.2.ebuild
+++ b/net-misc/wicd/wicd-1.5.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.5.2.ebuild,v 1.1 2008/09/14 14:56:15 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.5.2.ebuild,v 1.2 2008/09/14 16:15:32 darkside Exp $
 
-inherit distutils
+inherit distutils eutils
 
 DESCRIPTION="A lightweight wired and wireless network manager for Linux"
 HOMEPAGE="http://wicd.sourceforge.net/"
@@ -27,12 +27,20 @@ RDEPEND="dev-python/dbus-python
 		sys-apps/net-tools
 	)"
 
+src_unpack() {
+	distutils_src_unpack
+	# I would be insterested in some sed magic to acomplish this patch. 
+	epatch "${FILESDIR}/${PN}-1.5.2-remove-docs.patch"
+
+}
+
 src_compile() {
-	${python} ./setup.py configure --no-install-init --resume=/usr/share/wicd/scripts/ --suspend=/usr/share/wicd/scripts/ --verbose
+	${python} ./setup.py configure --no-install-init --no-install-install --no-install-license --resume=/usr/share/wicd/scripts/ --suspend=/usr/share/wicd/scripts/ --verbose
 	distutils_src_compile
 }
 
 src_install() {
+	DOCS="CHANGES"
 	distutils_src_install
 	newinitd "${FILESDIR}/wicd-init.d" wicd || die "newinitd failed"
 }