change patch to include my patch submitted (and included) in upstream's trunk. better solution. no rev bump needed, nothing is really changed for people that already have 1.5.2 installed.

(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo x86_64)

4 files changed, 70 insertions, 16 deletions

diff --git a/net-misc/wicd/ChangeLog b/net-misc/wicd/ChangeLog
index 177589696927..6d16740d5eab 100644
--- a/net-misc/wicd/ChangeLog
+++ b/net-misc/wicd/ChangeLog
@@ -1,6 +1,13 @@
 # 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.7 2008/09/14 16:15:32 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.8 2008/09/14 19:39:14 darkside Exp $
+
+  14 Sep 2008; Jeremy Olexa <darkside@gentoo.org>
+  +files/wicd-1.5.2-docs.patch, -files/wicd-1.5.2-remove-docs.patch,
+  wicd-1.5.2.ebuild:
+  change patch to include my patch submitted (and included) in upstream's
+  trunk. better solution. no rev bump needed, nothing is really changed for
+  people that already have 1.5.2 installed.
 
   14 Sep 2008; Jeremy Olexa <darkside@gentoo.org>
   +files/wicd-1.5.2-remove-docs.patch, wicd-1.5.2.ebuild:
diff --git a/net-misc/wicd/files/wicd-1.5.2-docs.patch b/net-misc/wicd/files/wicd-1.5.2-docs.patch
new file mode 100644
index 000000000000..0f78a0f618c4
--- /dev/null
+++ b/net-misc/wicd/files/wicd-1.5.2-docs.patch
@@ -0,0 +1,57 @@
+Index: setup.py
+===================================================================
+--- setup.py	(revision 457)
++++ setup.py	(working copy)
+@@ -78,8 +78,7 @@
+         ('no-install-man', None, 'do not install the man file'),
+         ('no-install-kde', None, 'do not install the kde autostart file'),
+         ('no-install-acpi', None, 'do not install the suspend.d and resume.d acpi scripts'),
+-        ('no-install-install', None, 'do not install the INSTALL file'),
+-        ('no-install-license', None, 'do not install the LICENSE file')
++        ('no-install-docs', None, 'do not install the auxiliary documentation')
+         ]
+         
+ 
+@@ -108,8 +107,7 @@
+         self.no_install_man = False
+         self.no_install_kde = False
+         self.no_install_acpi = False
+-        self.no_install_install = False
+-        self.no_install_license = False
++        self.no_install_docs = False
+ 
+         # figure out what the default init file
+         # location should be on several different distros
+@@ -301,16 +299,13 @@
+     (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' ]),
+     ]
+     piddir = os.path.dirname(wpath.pidfile)
+     if not piddir.endswith('/'):
+         piddir += '/'
+     data.append (( piddir, [] ))
+-    if not wpath.no_install_install:
+-        data.append(( wpath.docdir, [ 'INSTALL' ] ))
+-    if not wpath.no_install_license:
+-        data.append(( wpath.docdir, [ 'LICENSE' ] ))
++    if not wpath.no_install_docs:
++        data.append(( wpath.docdir, [ 'INSTALL', 'LICENSE', 'AUTHORS', 'README' ]))
+     if not wpath.no_install_kde:
+         data.append(( wpath.kdedir, [ 'other/wicd-tray.desktop' ]))
+     if not wpath.no_install_init:
+Index: in/wicd=wpath.py.in
+===================================================================
+--- in/wicd=wpath.py.in	(revision 457)
++++ in/wicd=wpath.py.in	(working copy)
+@@ -52,8 +52,7 @@
+ no_install_man = %NO_INSTALL_MAN%
+ no_install_kde = %NO_INSTALL_KDE%
+ no_install_acpi = %NO_INSTALL_ACPI%
+-no_install_install = %NO_INSTALL_INSTALL%
+-no_install_license = %NO_INSTALL_LICENSE%
++no_install_docs = %NO_INSTALL_DOCS%
+ 
+ def chdir(file):
+     """Change directory to the location of the specified file.
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
deleted file mode 100644
index 781120fd0094..000000000000
--- a/net-misc/wicd/files/wicd-1.5.2-remove-docs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 2ab1049e187b..72c8a4500373 100644
--- a/net-misc/wicd/wicd-1.5.2.ebuild
+++ b/net-misc/wicd/wicd-1.5.2.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2008/09/14 16:15:32 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.5.2.ebuild,v 1.3 2008/09/14 19:39:14 darkside Exp $
 
 inherit distutils eutils
 
@@ -29,13 +29,14 @@ RDEPEND="dev-python/dbus-python
 
 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"
+	# Patch to add the no-install-docs switch, included in next upstream
+	# release =) (already in upstream's svn)
+	epatch "${FILESDIR}/${PN}-1.5.2-docs.patch"
 
 }
 
 src_compile() {
-	${python} ./setup.py configure --no-install-init --no-install-install --no-install-license --resume=/usr/share/wicd/scripts/ --suspend=/usr/share/wicd/scripts/ --verbose
+	${python} ./setup.py configure --no-install-init --no-install-docs --resume=/usr/share/wicd/scripts/ --suspend=/usr/share/wicd/scripts/ --verbose
 	distutils_src_compile
 }