Add ghostscript PDEPEND, add --with-docdir, readd initd file

Package-Manager: portage-2.1_rc2-r3

3 files changed, 22 insertions, 14 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 7a62c6c6c623..fa7e7867045e 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-print/cups
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.169 2006/05/25 09:59:55 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.170 2006/05/27 09:26:38 genstef Exp $
+
+  27 May 2006; <stefan@gentoo.org> cups-1.2.1.ebuild:
+  Add ghostscript PDEPEND, add --with-docdir, readd initd file
 
 *cups-1.2.1 (25 May 2006)
 
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index f42b39d8db46..28194a88cdc7 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -81,14 +81,14 @@ EBUILD cups-1.2.0_pre.ebuild 3759 RMD160 824b00c3780968ebbd4a37bcae524b8255416fa
 MD5 b41d0e66360f62c1df0f8f6ec66e04fe cups-1.2.0_pre.ebuild 3759
 RMD160 824b00c3780968ebbd4a37bcae524b8255416fa1 cups-1.2.0_pre.ebuild 3759
 SHA256 00a13dd8aed87593569de1c36e4c4c10c68d3de5eff37ce1eca5cd15c455adde cups-1.2.0_pre.ebuild 3759
-EBUILD cups-1.2.1.ebuild 3687 RMD160 5b8379cb61d3be853c691e1398b17e7836bc4b26 SHA1 5dd12cdc95c343fff99073189cf6246aff39e3a4 SHA256 209003227e133bd8a675134bd9f1b8cce44788f41e5b6746783bd16466e747b3
-MD5 cf464477c26ed4c0f8b5147236d71253 cups-1.2.1.ebuild 3687
-RMD160 5b8379cb61d3be853c691e1398b17e7836bc4b26 cups-1.2.1.ebuild 3687
-SHA256 209003227e133bd8a675134bd9f1b8cce44788f41e5b6746783bd16466e747b3 cups-1.2.1.ebuild 3687
-MISC ChangeLog 22691 RMD160 7d8894e706c83126b08ea360c86a70bcca98286c SHA1 e467b09691eeec430a5ddec2f3a76859f3ad745f SHA256 6ef9ce75fe9289ae91761cb094b69d8dfc309fd4dad37c9d8e08fa07a638dae6
-MD5 79a4e495774d767e1880629a54a08aae ChangeLog 22691
-RMD160 7d8894e706c83126b08ea360c86a70bcca98286c ChangeLog 22691
-SHA256 6ef9ce75fe9289ae91761cb094b69d8dfc309fd4dad37c9d8e08fa07a638dae6 ChangeLog 22691
+EBUILD cups-1.2.1.ebuild 3908 RMD160 0293676733d3c73885b68dc0efb34391b0a1fe25 SHA1 858c7a0bdbd60b537071157ec6d0bcd4ef495fea SHA256 d162584fa88b5c6e365bad12ff2e5d5282b16aa4b95769f2c076e1cc322ad205
+MD5 9fc826f0b8ad3b2f7118eef7ccce5061 cups-1.2.1.ebuild 3908
+RMD160 0293676733d3c73885b68dc0efb34391b0a1fe25 cups-1.2.1.ebuild 3908
+SHA256 d162584fa88b5c6e365bad12ff2e5d5282b16aa4b95769f2c076e1cc322ad205 cups-1.2.1.ebuild 3908
+MISC ChangeLog 22809 RMD160 25478dc0be871defd1f8a117bfab5ff706589f9d SHA1 93a17b7563a9016653b68b3e9465b670f0001ef2 SHA256 cf97aeaa3966155881130c6732a7d428af988df7c1320801009663d5629749ee
+MD5 1afd44c733ff95831bf530a8dbef6d91 ChangeLog 22809
+RMD160 25478dc0be871defd1f8a117bfab5ff706589f9d ChangeLog 22809
+SHA256 cf97aeaa3966155881130c6732a7d428af988df7c1320801009663d5629749ee ChangeLog 22809
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
diff --git a/net-print/cups/cups-1.2.1.ebuild b/net-print/cups/cups-1.2.1.ebuild
index 83363bc0ac2c..ee23608b69ad 100644
--- a/net-print/cups/cups-1.2.1.ebuild
+++ b/net-print/cups/cups-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.1.ebuild,v 1.1 2006/05/25 09:59:55 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.1.ebuild,v 1.2 2006/05/27 09:26:38 genstef Exp $
 
 inherit eutils pam flag-o-matic multilib autotools
 
@@ -33,7 +33,8 @@ RDEPEND="${DEP}
 	nls? ( virtual/libintl )
 	!virtual/lpr
 	>=app-text/poppler-0.4.3-r1"
-PDEPEND="samba? ( >=net-fs/samba-3.0.8 )"
+PDEPEND="samba? ( >=net-fs/samba-3.0.8 )
+	virtual/ghostscript"
 PROVIDE="virtual/lpr"
 
 # upstream includes an interactive test which is a nono for gentoo.
@@ -72,6 +73,7 @@ src_compile() {
 		--with-cups-group=lp \
 		--with-system-groups=lpadmin \
 		--localstatedir=/var \
+		--with-docdir=/usr/share/doc/${PF}/html \
 		--with-bindnow=$(bindnow-flags) \
 		$(use_enable pam) \
 		$(use_enable ssl) \
@@ -97,13 +99,13 @@ src_compile() {
 src_install() {
 	make BUILDROOT=${D} install || die "make install failed"
 
-	dodoc {CHANGES,CREDITS,LICENSE,README}.txt
-	dosym /usr/share/cups/docs /usr/share/doc/${PF}/html
-
 	# cleanups
 	rm -rf ${D}/etc/init.d ${D}/etc/pam.d ${D}/etc/rc* ${D}/usr/share/man/cat*
 
+	dodoc {CHANGES,CREDITS,LICENSE,README}.txt
+
 	pamd_mimic_system cups auth account
+	newinitd ${FILESDIR}/cupsd.rc6 cupsd
 
 	sed -i -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" ${D}/etc/xinetd.d/cups-lpd
 
@@ -132,4 +134,7 @@ pkg_postinst() {
 	einfo "http://www.gentoo.org/doc/en/printing-howto.xml."
 	einfo
 	einfo "You need to emerge ghostscript with the cups-USEflag turned on"
+	ewarn
+	ewarn "If you are updating from cups-1.1.* you need to remerge every ebuild"
+	ewarn "that installed into /usr/lib/cups: \"emerge -va \$(qfile -qC /usr/lib/cups)\""
 }