[patch] hplip-3.9.2.diff to version 2.8.7

hplip-3.9.2.diff (text/plain), 2.96 KB, created by Daniel Pielmeier on 2009-03-20 18:06:24 UTC

--- ../../../portage/net-print/hplip/hplip-2.8.7.ebuild	2009-03-14 20:06:28.000000000 +0100
+++ hplip-3.9.2.ebuild	2009-03-20 18:38:36.000000000 +0100
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-2.8.7.ebuild,v 1.2 2009/03/14 19:04:39 armin76 Exp $
 
-inherit eutils linux-info python
+EAPI="2"
+
+inherit eutils fdo-mime linux-info python
 
 DESCRIPTION="HP Linux Imaging and Printing System. Includes net-print/hpijs, scanner drivers and service tools."
 HOMEPAGE="http://hplip.sourceforge.net/"
@@ -46,7 +48,6 @@
 		) )
 		qt3? (
 			>=dev-python/PyQt-3.14
-			dev-python/ctypes
 			dbus? ( >=dev-python/dbus-python-0.80 )
 			fax? ( dev-python/reportlab )
 		)
@@ -73,10 +74,7 @@
 	fi
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	sed -i -e "s:\$(doc_DATA)::" Makefile.in || die "Patching Makefile.in failed"
 	sed -i -e "s/'skipstone']/'skipstone', 'epiphany']/" \
 		-e "s/'skipstone': ''}/'skipstone': '', 'epiphany': '--new-window'}/" \
@@ -95,13 +93,23 @@
 	cp "${FILESDIR}"/70-hpmud.rules data/rules
 	sed -i -e "s/55-hpmud.rules/70-hpmud.rules/g" Makefile.* */*.html || die "sed failed"
 
+	sed -i \
+		-e s:\/usr\/lib\/cups\/driver:$(cups-config --serverbin)\/driver:g \
+		installer/core_install.py || die "sed core_install.py"
+
 	# Use system foomatic-rip instead of foomatic-rip-hplip
-	sed -i -e 's/foomatic-rip-hplip/foomatic-rip/' ppd/*.ppd || die "sed failed"
+	local i
+	for i in ppd/*.ppd.gz
+	do
+	    rm -f $i.temp
+	    gunzip -c $i | sed 's/foomatic-rip-hplip/foomatic-rip/g' | gzip > $i.temp || die "*.ppd.gz sed failed"
+	    mv $i.temp $i
+	done
 
 	# Qt4 is still undocumented by upstream, so use with caution
 	local QT_VER
-	use qt4 && QT_VER="4"
 	use qt3 && QT_VER="3"
+	use qt4 && QT_VER="4"
 	sed -i \
 		-e "s/%s --force-startup/%s --force-startup --qt${QT_VER}/" \
 		-e "s/'--force-startup'/'--force-startup', '--qt${QT_VER}'/" \
@@ -111,12 +119,13 @@
 		hplip-systray.desktop.in || die "sed failed"
 }
 
-src_compile() {
+src_configure() {
 	if use qt3 || use qt4 ; then
 		local GUI_BUILD="--enable-gui-build"
 	else
 		local GUI_BUILD="--disable-gui-build"
 	fi
+	use qt4 && GUI_BUILD="$GUI_BUILD --enable-qt4 --disable-qt3"
 
 	econf \
 		--disable-dependency-tracking \
@@ -133,9 +142,7 @@
 		$(use_enable parport pp-build) \
 		$(use_enable ppds foomatic-ppd-install) \
 		$(use_enable scanner scan-build) \
-		$(use_enable snmp network-build) \
-		|| die "econf failed"
-	emake || die "Compilation failed"
+		$(use_enable snmp network-build)
 }
 
 src_install() {
@@ -157,6 +164,7 @@
 
 pkg_postinst() {
 	python_mod_optimize /usr/share/${PN}
+	fdo-mime_desktop_database_update
 
 	elog "You should run hp-setup as root if you are installing hplip for the first time, and may also"
 	elog "need to run it if you are upgrading from an earlier version."
@@ -169,4 +177,5 @@
 
 pkg_postrm() {
 	python_mod_cleanup /usr/share/${PN}
+	fdo-mime_desktop_database_update
 }