Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 267546 | Differences between
and this patch

Collapse All | Expand All

(-)hplip-3.9.2.ebuild (-9 / +26 lines)
Lines 14-23 Link Here
14
SLOT="0"
14
SLOT="0"
15
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
15
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
16
16
17
IUSE="cupsddk dbus doc fax gtk minimal parport ppds qt3 qt4 scanner snmp"
17
IUSE="cupsddk dbus doc fax gtk minimal parport policykit ppds qt3 qt4 scanner snmp"
18
18
19
DEPEND="!net-print/hpijs
19
DEPEND="!net-print/hpijs
20
	!net-print/hpoj
20
	!net-print/hpoj
21
	>=dev-lang/python-2.4.4[threads]
21
	virtual/ghostscript
22
	virtual/ghostscript
22
	media-libs/jpeg
23
	media-libs/jpeg
23
	>=net-print/foomatic-filters-3.0.20080507[cups]
24
	>=net-print/foomatic-filters-3.0.20080507[cups]
Lines 25-31 Link Here
25
		net-print/cups
26
		net-print/cups
26
		dev-libs/libusb
27
		dev-libs/libusb
27
		cupsddk? ( net-print/cupsddk )
28
		cupsddk? ( net-print/cupsddk )
28
		dbus? ( sys-apps/dbus )
29
		dbus? (
30
			sys-apps/dbus
31
			dev-python/dbus-python
32
		)
29
		scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
33
		scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
30
		snmp? (
34
		snmp? (
31
			net-analyzer/net-snmp
35
			net-analyzer/net-snmp
Lines 38-55 Link Here
38
		!<sys-fs/udev-114
42
		!<sys-fs/udev-114
39
		scanner? (
43
		scanner? (
40
			dev-python/imaging
44
			dev-python/imaging
45
			dev-python/reportlab
41
			gtk? ( media-gfx/xsane )
46
			gtk? ( media-gfx/xsane )
42
			!gtk? ( media-gfx/sane-frontends )
47
			!gtk? ( media-gfx/sane-frontends )
43
		)
48
		)
49
		fax? (
50
			dev-python/reportlab
51
		)
44
		qt4? ( !qt3? (
52
		qt4? ( !qt3? (
45
			dev-python/PyQt4
53
			dev-python/PyQt4
46
			dbus? ( dev-python/dbus-python )
54
			dbus? ( dev-python/dbus-python )
47
			fax? ( dev-python/reportlab )
48
		) )
55
		) )
49
		qt3? (
56
		qt3? (
50
			dev-python/PyQt
57
			dev-python/PyQt
51
			dbus? ( dev-python/dbus-python )
58
			dbus? ( dev-python/dbus-python )
52
			fax? ( dev-python/reportlab )
53
		)
59
		)
54
	)"
60
	)"
55
61
Lines 75-81 Link Here
75
}
81
}
76
82
77
src_prepare() {
83
src_prepare() {
78
	epatch "${FILESDIR}"/${P}-high_cpu_utilization_logout.patch
79
	sed -i -e "s:\$(doc_DATA)::" Makefile.in || die "Patching Makefile.in failed"
84
	sed -i -e "s:\$(doc_DATA)::" Makefile.in || die "Patching Makefile.in failed"
80
	sed -i -e "s/'skipstone']/'skipstone', 'epiphany']/" \
85
	sed -i -e "s/'skipstone']/'skipstone', 'epiphany']/" \
81
		-e "s/'skipstone': ''}/'skipstone': '', 'epiphany': '--new-window'}/" \
86
		-e "s/'skipstone': ''}/'skipstone': '', 'epiphany': '--new-window'}/" \
Lines 94-106 Link Here
94
	cp "${FILESDIR}"/70-hpmud.rules data/rules
99
	cp "${FILESDIR}"/70-hpmud.rules data/rules
95
	sed -i -e "s/55-hpmud.rules/70-hpmud.rules/g" Makefile.* */*.html || die "sed failed"
100
	sed -i -e "s/55-hpmud.rules/70-hpmud.rules/g" Makefile.* */*.html || die "sed failed"
96
101
102
	# SYSFS deprecated - https://bugs.launchpad.net/hplip/+bug/346390
103
	sed -i -e "s/SYSFS/ATTRS/g" -e "s/sysfs/attrs/g" data/rules/56-hpmud_support.rules || die "sed failed"
104
105
	# plugins check
106
	mv data/rules/56-hpmud_support.rules data/rules/71-hpmud_support.rules
107
	sed -i -e "s/56-hpmud_support.rules/71-hpmud_support.rules/g" Makefile.* */*.html || die "sed failed"
108
97
	sed -i \
109
	sed -i \
98
		-e s:/usr/lib/cups/driver:$(cups-config --serverbin)/driver:g \
110
		-e s:/usr/lib/cups/driver:$(cups-config --serverbin)/driver:g \
99
		installer/core_install.py || die "sed core_install.py"
111
		installer/core_install.py || die "sed core_install.py"
100
112
101
	# Use system foomatic-rip instead of foomatic-rip-hplip
113
	# Use system foomatic-rip instead of foomatic-rip-hplip
102
	local i
114
	local i
103
	for i in ppd/*.ppd.gz
115
	for i in ppd/{hpcups,hpijs}/*.ppd.gz
104
	do
116
	do
105
	    rm -f ${i}.temp
117
	    rm -f ${i}.temp
106
	    gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | gzip > ${i}.temp || die "*.ppd.gz sed failed"
118
	    gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | gzip > ${i}.temp || die "*.ppd.gz sed failed"
Lines 125-134 Link Here
125
src_configure() {
137
src_configure() {
126
	if use qt3 || use qt4 ; then
138
	if use qt3 || use qt4 ; then
127
		local gui_build="--enable-gui-build"
139
		local gui_build="--enable-gui-build"
140
		if use qt4; then
141
		    gui_build="${gui_build} --enable-qt4 --disable-qt3"
142
		else
143
		    use qt3 && gui_build="${gui_build} --enable-qt3 --disable-qt4"
144
		fi
128
	else
145
	else
129
		local gui_build="--disable-gui-build"
146
		local gui_build="--disable-gui-build"
130
	fi
147
	fi
131
	use qt4 && gui_build="${gui_build} --enable-qt4 --disable-qt3"
132
148
133
	econf \
149
	econf \
134
		--disable-dependency-tracking \
150
		--disable-dependency-tracking \
Lines 145-151 Link Here
145
		$(use_enable parport pp-build) \
161
		$(use_enable parport pp-build) \
146
		$(use_enable ppds foomatic-ppd-install) \
162
		$(use_enable ppds foomatic-ppd-install) \
147
		$(use_enable scanner scan-build) \
163
		$(use_enable scanner scan-build) \
148
		$(use_enable snmp network-build)
164
		$(use_enable snmp network-build) \
165
		$(use_enable policykit policykit)
149
}
166
}
150
167
151
src_install() {
168
src_install() {
Lines 166-172 Link Here
166
	fi
183
	fi
167
184
168
	# Do not install unzipped ppd files
185
	# Do not install unzipped ppd files
169
	rm -f "${D}"/usr/share/ppd/HP/*.ppd
186
	rm -rf "${D}"/usr/share/ppd/HP/*.ppd
170
}
187
}
171
188
172
pkg_preinst() {
189
pkg_preinst() {

Return to bug 267546