[patch] bump "Ebuild ready for main tree" to hplip-plugin-3.12.10a

hplip-plugin-3.12.10a.patch (text/plain), 1.81 KB, created by poncho on 2012-11-24 09:06:39 UTC

--- hplip-plugin-3.11.1.ebuild	2012-11-24 09:58:46.500441427 +0100
+++ hplip-plugin-3.12.10a.ebuild	2012-10-28 15:33:45.908313000 +0100
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="3"
 
-inherit eutils multilib
+inherit eutils multilib toolchain-funcs unpacker
 
 DESCRIPTION="Proprietary plugins and firmware for HPLIP"
 HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
@@ -14,9 +14,9 @@ LICENSE="hplip-plugin"
 SLOT="0"
 IUSE=""
 
+DEPEND="virtual/pkgconfig"
 RDEPEND="~net-print/hplip-${PV}
 	sys-fs/udev"
-DEPEND=""
 
 HPLIP_HOME=/usr/share/hplip
 
@@ -27,6 +27,7 @@ QA_PRESTRIPPED="
 /usr/share/hplip/scan/plugins/bb_soapht.so
 /usr/share/hplip/scan/plugins/bb_soap.so
 /usr/share/hplip/fax/plugins/fax_marvell.so
+/usr/share/hplip/prnt/plugins/hbpl1.so
 /usr/share/hplip/prnt/plugins/lj.so"
 
 # License does not allow us to redistribute the "source" package
@@ -36,14 +37,13 @@ src_unpack() {
 	unpack_makeself "hplip-${PV}-plugin.run" || die 'unpack failed'
 }
 
-src_prepare() {
-	sed -i -e 's/SYSFS/ATTR/g' *.rules || die
-}
-
 src_install() {
 	local hplip_arch=$(use amd64 && echo 'x86_64' || echo 'x86_32')
 
-	insinto /$(get_libdir)/udev/rules.d
+	local udevdir=/lib/udev
+	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+
+	insinto "${udevdir}"/rules.d
 	doins *.rules || die
 
 	insinto "${HPLIP_HOME}"/data/firmware
@@ -59,4 +59,14 @@ src_install() {
 		exeinto "${HPLIP_HOME}"/${plugin_type}/plugins
 		newexe ${plugin} ${plugin/-${hplip_arch}} || die "failed to install ${plugin}"
 	done
+
+	cat <<- EOF > "${WORKDIR}/hplip.state"
+		[plugin]
+		installed = 1
+		eula = 1
+		version = ${PV}
+	EOF
+
+	insinto /var/lib/hp
+	doins hplip.state
 }