--- /var/portage/cvs/gentoo-x86/net-print/cups/cups-1.1.23-r3.ebuild	2005-05-24 08:53:45 +0000
+++ cups-1.1.23-r3.ebuild	2005-05-28 10:46:41 +0000
@@ -16,10 +16,13 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="ssl slp pam samba nls cjk"
+IUSE="ssl slp pam samba nls cjk gnutls"
 
 DEP="pam? ( virtual/pam )
-	ssl? ( >=dev-libs/openssl-0.9.6b )
+	ssl? ( 
+		!gnutls? ( >=dev-libs/openssl-0.9.6b )
+		gnutls? ( net-libs/gnutls )
+		)
 	slp? ( >=net-libs/openslp-1.0.4 )
 	nls? ( sys-devel/gettext )
 	>=media-libs/libpng-1.2.1
@@ -35,11 +38,18 @@
 
 S=${WORKDIR}/${MY_P}
 
+pkg_setup() {
+	enewgroup lp
+	enewuser lp -1 -1 -1 lp
+}
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/disable-strip.patch
 	epatch ${FILESDIR}/cups-gcc4-amd64.patch #79791
+	epatch ${FILESDIR}/cups-gentooalt.patch
+	epatch ${FILESDIR}/cups-lppasswd-setXid.patch
 	WANT_AUTOCONF=2.5 autoconf || die
 
 	# disable builtin xpdf
@@ -50,17 +60,23 @@
 
 	local myconf
 	use amd64 && replace-flags -Os -O2
-	use pam || myconf="${myconf} --disable-pam"
-	use ssl || myconf="${myconf} --disable-ssl"
-	use slp || myconf="${myconf} --disable-slp"
-	use nls || myconf="${myconf} --disable-nls"
 
-	./configure \
+	use ssl && \
+		myconf="${myconf} $(use_enable gnutls) $(use_enable !gnutls openssl)"
+
+	CUPS_REQUESTS="/var/spool/cups" \
+	econf \
 		--with-cups-user=lp \
 		--with-cups-group=lp \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
+		$(use_enable pam) \
+		$(use_enable ssl) \
+		$(use_enable slp) \
+		$(use_enable nls) \
+		--with-logdir=/var/log/cups \
+		${myconf} \
+		|| die "econf failed"
 
-	make || die "compile problem"
+	emake || die "compile problem"
 }
 
 src_install() {
@@ -92,12 +108,8 @@
 	dosym /usr/share/cups/docs /usr/share/doc/${PF}/html
 
 	# cleanups
-	rm -rf ${D}/etc/init.d
-	rm -rf ${D}/etc/pam.d
-	rm -rf ${D}/etc/rc*
-	rm -rf ${D}/usr/share/man/cat*
-	rm -rf ${D}/etc/cups/{certs,interfaces,ppd}
-	rm -rf ${D}/var
+	rm -rf ${D}/etc/init.d ${D}/etc/pam.d ${D}/etc/rc* ${D}/usr/share/man/cat* \
+		${D}/etc/cups/{certs,interfaces,ppd} ${D}/var
 
 	sed -i -e "s:^#\(DocumentRoot\).*:\1 /usr/share/cups/docs:" \
 		-e "s:^#\(SystemGroup\).*:\1 lp:" \
@@ -141,7 +153,7 @@
 	if useq cjk ; then
 		einfo
 		einfo "If you want CJK support on PDF's you'll need to re-emerge"
-		einfo "appt-text/xpdf with your LINGUAS variable set instead of"
+		einfo "app-text/xpdf with your LINGUAS variable set instead of"
 		einfo "the CJK flag. (Bug: 67493)"
 	fi
 }