Converted some ebuild hackery into patches for upstream integration.

Package-Manager: portage-2.1.6.13/cvs/Linux i686

5 files changed, 70 insertions, 12 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 5bab7c4d391f..a98a3c236660 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.131 2009/11/12 21:34:46 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.132 2009/11/14 16:33:06 billie Exp $
+
+  14 Nov 2009; Daniel Pielmeier <billie@gentoo.org> hplip-3.9.10.ebuild,
+  +files/hplip-3.9.10-browser.patch, +files/hplip-3.9.10-desktop.patch:
+  Converted some ebuild hackery into patches for upstream integration.
 
 *hplip-3.9.10 (12 Nov 2009)
 
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 91075e319b8c..8c7c80b618f8 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,12 +1,14 @@
 AUX 70-hpmud.rules 763 RMD160 b8326b26658b8e8355ae3d74423b51e2e15001e2 SHA1 fdb6b4937a814db50dc3ac3ca9b9c04cb44a6590 SHA256 6e7f2a0fd5a2111505066a412daea0d29c1ce858f09dbbaa489bb5a2f231e837
+AUX hplip-3.9.10-browser.patch 1447 RMD160 0276eacae608821b6b900c9fb27dbd20fb207d04 SHA1 67eec05d9b29445a98a16d496e671cd0f29e1471 SHA256 0e3b3b251ff4cf73032f4c78b6c0495b2d95fefd53d9fd8897faf6528ddd2875
+AUX hplip-3.9.10-desktop.patch 492 RMD160 52a8bcf1544d0073920e00a383aeb22a9caf5487 SHA1 9394a73448b7b1b3ab1a014ab63b9edc731def66 SHA256 04bb5ef5ee4145eadc5f9e6498ca8a2d3d2277569b179263cb86f0f56231e462
 AUX hplip-3.9.4+glibc-2.10.patch 1023 RMD160 9571a0c34421432f892a1535ff0bf6533dc3883c SHA1 1254a4c2b9f5d2e6a488b3b0567f7edda3ab7a26 SHA256 4ab1cde2cb9a405011faa5c3c3bf9d7c52ce97653a28aa056e01c71909d08b3b
 DIST hplip-2.8.6b.tar.gz 10955713 RMD160 fa903344c59f4bc474aeb049dd75631e72435b92 SHA1 b15e1dcb00d745ccc424633a84ba062c307740f9 SHA256 aa1094f0f91bbc0b5a611ce6ece40651edc7b3da8fa111921a3524916fc179fa
 DIST hplip-3.9.10.tar.gz 20999540 RMD160 65ea83e53bc19df0e2a054e723c74734fc5f39a8 SHA1 9c9a8b0bd990b7d6e29a9024ec80f3edceab269b SHA256 5dcde242478405a9f127a6a235a53f4d30a63725d9a6e4f4fda4662304e9723a
 DIST hplip-3.9.4b.tar.gz 15712313 RMD160 bfed762c59b8dc2210d450ba86a5636773831cc1 SHA1 d2b06f1ee347a1f3aacd6b52600d08fc71ac5b12 SHA256 57496c01fb3ead9678e630c1c4a385e156b76d328440da550ebfc24b95ff8b1a
 DIST hplip-3.9.8.tar.gz 15715640 RMD160 8b06537176bfb32d32ae20eec1cfa6765609ecc0 SHA1 bcf0d1d8d6a006dd00224b4f90c208c21af28e55 SHA256 6471d99bde2b1182f45082c50dbd9e424a3ec2c0e98c48c934a1cd0d4ccb4e36
 EBUILD hplip-2.8.6b.ebuild 5223 RMD160 b22ab30c66893db8aa5b66844a38fefbdbcf80fa SHA1 3e402dbc955fe3c7ea98be5980d2e747600e4845 SHA256 0d1e993376b31bd5f2ddaa2d051fc927d6ebf38ae0d7e336061d1d3d24320719
-EBUILD hplip-3.9.10.ebuild 8482 RMD160 7763feda8853a7c6ec278b91bd08bbfed53bee80 SHA1 a4c1377566a0695436588236fbf3cdaacf4069b9 SHA256 14c621cefb1f25aea621482640e2d385364b1e767f059296b51d6a0058dc5c4c
+EBUILD hplip-3.9.10.ebuild 8394 RMD160 9d159461aa7fab57aa0e212c88e25e218d85e4d3 SHA1 7bc42b970bb5c1b443848c4734b06047db2ab529 SHA256 d09defcf1dc044226c4a08f670772f0752dfc0339a142085108f1ed4754fc4d3
 EBUILD hplip-3.9.4b-r1.ebuild 6450 RMD160 ee06e2af71f51ef1d6d67be04a25d5bfb01ec6af SHA1 2869085220ce59defb512e96c06016560ab7afac SHA256 fb80576ee4cba069386cfa34ce87caacc2529d780af181faea5c58bfd3a8ca4c
 EBUILD hplip-3.9.8-r3.ebuild 8037 RMD160 3bbff08fd64a069726bc1dddc03092abd3e85078 SHA1 aea58ca32d43606b668f35a8f3b1d4741fa161fa SHA256 43dd34c9cbfbb88aa82b14c8b84959cc3562938d3c9d4d1f0438dcd58e99e94d
-MISC ChangeLog 22342 RMD160 156890c757fff6907834fd6173d0f4a62d2e89a6 SHA1 e578534a42e24720042e4ee223a1036f83cc1473 SHA256 af99362ff617cca2565605ea6e0b611c519fece5366b64a5c9577c0eb3d00e9c
+MISC ChangeLog 22559 RMD160 bd92c0e38ce2487867a9886eec675d5e91eae49b SHA1 28c418543e718fd2e80ddd38c170fc41ce20032a SHA256 8c7f38eb41738221163632e1008bb74b340461a6a3c30a99f3fd7e5f9b0d549d
 MISC metadata.xml 2717 RMD160 b9498de6ef7a6c2a576e672b2116857ef1ec44b5 SHA1 810311f22a22a0d414525931c1ef4896abaf4840 SHA256 9e157960d81e23c7b7a56271f4e3cad18e450e238f4abe32ae6952cca4f0bc9f
diff --git a/net-print/hplip/files/hplip-3.9.10-browser.patch b/net-print/hplip/files/hplip-3.9.10-browser.patch
new file mode 100644
index 000000000000..46c4f634f36d
--- /dev/null
+++ b/net-print/hplip/files/hplip-3.9.10-browser.patch
@@ -0,0 +1,38 @@
+--- base/utils.py.old	2009-11-14 15:23:29.000000000 +0100
++++ base/utils.py	2009-11-14 15:37:53.000000000 +0100
+@@ -812,13 +812,15 @@
+     return True
+ 
+ 
+-BROWSERS = ['firefox', 'mozilla', 'konqueror', 'galeon', 'skipstone'] # in preferred order
+-BROWSER_OPTS = {'firefox': '-new-window', 'mozilla' : '', 'konqueror': '', 'galeon': '-w', 'skipstone': ''}
++BROWSERS = ['firefox', 'mozilla', 'konqueror', 'epiphany', 'skipstone'] # in preferred order
++BROWSER_OPTS = {'firefox': '-new-tab', 'mozilla': '', 'konqueror': '', 'epiphany': '--new-tab', 'skipstone': ''}
+ 
+ 
+ def find_browser():
+     if platform_avail and platform.system() == 'Darwin':
+         return "open"
++    if platform_avail and platform.system() == 'Linux' and which("xdg-open"):
++        return "xdg-open"
+     else:
+         for b in BROWSERS:
+             if which(b):
+@@ -832,11 +834,14 @@
+         cmd = 'open "%s"' % url
+         log.debug(cmd)
+         os.system(cmd)
++    if platform_avail and platform.system() == 'Linux' and which("xdg-open"):
++        cmd = 'xdg-open "%s"' % url
++        log.debug(cmd)
++        os.system(cmd)
+     else:
+         for b in BROWSERS:
+-            bb = which(b)
+-            if bb:
+-                bb = os.path.join(bb, b)
++            if b:
++                bb = which(b, return_full_path='True')
+                 if use_browser_opts:
+                     cmd = """%s %s "%s" &""" % (bb, BROWSER_OPTS[b], url)
+                 else:
diff --git a/net-print/hplip/files/hplip-3.9.10-desktop.patch b/net-print/hplip/files/hplip-3.9.10-desktop.patch
new file mode 100644
index 000000000000..4713cefede3c
--- /dev/null
+++ b/net-print/hplip/files/hplip-3.9.10-desktop.patch
@@ -0,0 +1,18 @@
+--- Makefile.am.old	2009-11-06 22:56:26.000000000 +0100
++++ Makefile.am	2009-11-14 16:50:39.000000000 +0100
+@@ -325,6 +325,7 @@
+ hppgsz_CFLAGS = $(libapdk_la_CFLAGS)
+ hppgsz_LDADD = libapdk.la -ljpeg -ldl
+ 
++if GUI_BUILD
+ # hplip.desktop
+ hplip_desktopdir = $(icondir)
+ hplip_desktop_DATA = hplip.desktop
+@@ -332,6 +333,7 @@
+ # hplip-systray.desktop
+ hplip_systraydir = $(systraydir)
+ hplip_systray_DATA = hplip-systray.desktop
++endif
+ 
+ # hpipjs (CUPS filter)
+ hplipjsdir = $(cupsfilterdir)
diff --git a/net-print/hplip/hplip-3.9.10.ebuild b/net-print/hplip/hplip-3.9.10.ebuild
index ea99a6d78a26..279f553efb4b 100644
--- a/net-print/hplip/hplip-3.9.10.ebuild
+++ b/net-print/hplip/hplip-3.9.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.10.ebuild,v 1.1 2009/11/12 21:34:46 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.10.ebuild,v 1.2 2009/11/14 16:33:06 billie Exp $
 
 EAPI="2"
 
@@ -91,9 +91,10 @@ pkg_setup() {
 }
 
 src_prepare() {
-	sed -i -e "s/'skipstone']/'skipstone', 'epiphany']/" \
-		-e "s/'skipstone': ''}/'skipstone': '', 'epiphany': '--new-window'}/" \
-		base/utils.py  || die "Sed base/utils.py failed"
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/452113
+	epatch "${FILESDIR}"/${P}-desktop.patch
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/482674
+	epatch "${FILESDIR}"/${P}-browser.patch
 
 	# bug 98428
 	sed -i -e "s:/usr/bin/env python:/usr/bin/python:g" hpssd.py || die "Sed hpssd.py failed"
@@ -237,11 +238,6 @@ src_install() {
 	# Bug #201023
 	rm -f "${D}"/etc/sane.d/dll.conf
 
-	# bug 106035/259763
-	if ! use qt3 && ! use qt4 ; then
-		rm -r "${D}"/usr/share/applications "${D}"/etc/xdg
-	fi
-
 	# kde3 autostart hack
 	if [[ -d /usr/kde/3.5/share/autostart ]] && use !minimal ; then
 		insinto /usr/kde/3.5/share/autostart