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

Collapse All | Expand All

(-)cups.old/cups-1.5.2-r21.ebuild (-10 / +10 lines)
Lines 99-104 PATCHES=( Link Here
99
	"${WORKDIR}/${PN}-1.5.2-avahi.patch"			# avahi support from debian
99
	"${WORKDIR}/${PN}-1.5.2-avahi.patch"			# avahi support from debian
100
	"${FILESDIR}/${PN}-1.5.2-browsing.patch"		# browsing off by default
100
	"${FILESDIR}/${PN}-1.5.2-browsing.patch"		# browsing off by default
101
	"${WORKDIR}/${PN}-1.5.2-locales.patch"			# patch locales back into existence
101
	"${WORKDIR}/${PN}-1.5.2-locales.patch"			# patch locales back into existence
102
	"${FILESDIR}/${PN}-1.5.2-libexec.patch"
102
)
103
)
103
104
104
pkg_setup() {
105
pkg_setup() {
Lines 178-194 src_configure() { Link Here
178
	fi
179
	fi
179
180
180
	econf \
181
	econf \
181
		--libdir=/usr/$(get_libdir) \
182
		--libdir="${EPREFIX}"/usr/$(get_libdir) \
182
		--localstatedir=/var \
183
		--exec-prefix="${EPREFIX}"/usr \
184
		--localstatedir="${EPREFIX}"/var \
183
		--with-cups-user=lp \
185
		--with-cups-user=lp \
184
		--with-cups-group=lp \
186
		--with-cups-group=lp \
185
		--with-docdir=/usr/share/cups/html \
187
		--with-docdir="${EPREFIX}"/usr/share/cups/html \
188
		--with-icondir="${EPREFIX}"/usr/share/icon \
186
		--with-languages="${LINGUAS}" \
189
		--with-languages="${LINGUAS}" \
187
		--with-pdftops=/usr/bin/pdftops \
190
		--with-menudir="${EPREFIX}"/usr/share/menu \
191
		--with-pdftops="${EPREFIX}"/usr/bin/pdftops \
192
		--with-rcdir="${EPREFIX}"/etc \
188
		--with-system-groups=lpadmin \
193
		--with-system-groups=lpadmin \
189
		$(use_enable acl) \
194
		$(use_enable acl) \
190
		$(use_enable avahi) \
195
		$(use_enable avahi) \
191
		$(use_enable dbus) \
196
		$(use_enable dbus) \
197
		--with-dbusdir=$(use dbus && echo "${EPREFIX}"/etc/dbus || echo "") \
192
		$(use_enable debug) \
198
		$(use_enable debug) \
193
		$(use_enable debug debug-guards) \
199
		$(use_enable debug debug-guards) \
194
		$(use_enable jpeg) \
200
		$(use_enable jpeg) \
Lines 210-221 src_configure() { Link Here
210
		--disable-dnssd \
216
		--disable-dnssd \
211
		$(use_with systemd systemdsystemunitdir "$(systemd_get_unitdir)") \
217
		$(use_with systemd systemdsystemunitdir "$(systemd_get_unitdir)") \
212
		${myconf}
218
		${myconf}
213
214
	# install in /usr/libexec always, instead of using /usr/lib/cups, as that
215
	# makes more sense when facing multilib support.
216
	sed -i -e 's:SERVERBIN.*:SERVERBIN = "$(BUILDROOT)"/usr/libexec/cups:' Makedefs || die
217
	sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libexec/cups":' config.h || die
218
	sed -i -e 's:cups_serverbin=.*:cups_serverbin=/usr/libexec/cups:' cups-config || die
219
}
219
}
220
220
221
src_compile() {
221
src_compile() {

Return to bug 416217