Fix installation of cups init.d script.

Package-Manager: portage-2.1.3.19

3 files changed, 21 insertions, 17 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index e5f41f3d7b13..a8fae4e950a1 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-print/cups
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.266 2007/11/09 19:53:16 dang Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.267 2007/11/09 21:08:29 vapier Exp $
+
+  09 Nov 2007; Mike Frysinger <vapier@gentoo.org> cups-1.3.4-r1.ebuild:
+  Fix installation of cups init.d script.
 
   09 Nov 2007; Daniel Gryniewicz <dang@gentoo.org> cups-1.2.12-r2.ebuild:
   Marked stable on amd64 for bug #196736
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 11ad45e4e18a..9c2236162228 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -48,14 +48,14 @@ EBUILD cups-1.2.12-r2.ebuild 6985 RMD160 e9399786f3d3cb034c370ea5012ea72f79afe72
 MD5 bef7dfb175f3d6ceb43f1fbd2a4d599e cups-1.2.12-r2.ebuild 6985
 RMD160 e9399786f3d3cb034c370ea5012ea72f79afe72a cups-1.2.12-r2.ebuild 6985
 SHA256 1de1acdf10f61c977881b270dea08cb5ba2300067e1ad4042a9d7de5bc19a870 cups-1.2.12-r2.ebuild 6985
-EBUILD cups-1.3.4-r1.ebuild 7913 RMD160 d30d9b1c9c5eb469e4a940ac78e9eb0ac6aaf98c SHA1 9bb55e74d162fb27c50b93d8ed9c8278ce70c053 SHA256 d2ab68df9a028161be03cd0dd4e7086f2003c9cb68227b39b5082b1b1dde1c9a
-MD5 1d9f123665f097c6a27c073c0d7623f9 cups-1.3.4-r1.ebuild 7913
-RMD160 d30d9b1c9c5eb469e4a940ac78e9eb0ac6aaf98c cups-1.3.4-r1.ebuild 7913
-SHA256 d2ab68df9a028161be03cd0dd4e7086f2003c9cb68227b39b5082b1b1dde1c9a cups-1.3.4-r1.ebuild 7913
-MISC ChangeLog 37697 RMD160 26b082a910ee664eefd4f8d15a308833d433e234 SHA1 b26f7b1c769827925c76319a40dfcd769fc25bf4 SHA256 54ae6d882936eea72ba51188fe965f3282843368801990503633a2ce364de4c8
-MD5 985f9ad50b515752edc08d4a3ac01a9a ChangeLog 37697
-RMD160 26b082a910ee664eefd4f8d15a308833d433e234 ChangeLog 37697
-SHA256 54ae6d882936eea72ba51188fe965f3282843368801990503633a2ce364de4c8 ChangeLog 37697
+EBUILD cups-1.3.4-r1.ebuild 7942 RMD160 12d512c0ad8c279c220ea4617325ed9828539dec SHA1 a91d072a1e875a12038093343cd17c99de4d4f0b SHA256 f797ac7f3dd196310f243a40b47876d5f39365aa4ba2d50377b8186c95b95705
+MD5 5d09b4057a1fc5744ffb4e52936a03bd cups-1.3.4-r1.ebuild 7942
+RMD160 12d512c0ad8c279c220ea4617325ed9828539dec cups-1.3.4-r1.ebuild 7942
+SHA256 f797ac7f3dd196310f243a40b47876d5f39365aa4ba2d50377b8186c95b95705 cups-1.3.4-r1.ebuild 7942
+MISC ChangeLog 37814 RMD160 17756fe30569334e3f85b14b36253ed8800fd1d4 SHA1 7fc52ea95fa2bbc76bb10fb65fb172a5c3c762a6 SHA256 8d0b4b80ffd79616f77807c0d857c0b7bcebe10cc1c815e1a09582087a9bbe5e
+MD5 8da3f274cbafac4b8e11491abdbc2b9f ChangeLog 37814
+RMD160 17756fe30569334e3f85b14b36253ed8800fd1d4 ChangeLog 37814
+SHA256 8d0b4b80ffd79616f77807c0d857c0b7bcebe10cc1c815e1a09582087a9bbe5e ChangeLog 37814
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
@@ -78,7 +78,7 @@ SHA256 a330b10cc5bfd0ba11fab682de999eccf42232d850e0b8d996cb2abecbc0f8e0 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHNLq2omPajV0RnrERAo6dAJ9SNMSvm7czEoaF9ACZGlPTDhvmbQCeKG7S
-ntbwp8Pwifphy2BRFIbJcmY=
-=R4zH
+iD8DBQFHNMxTp/wUKkr7RBoRAhN1AJ0Z6678SUtPcSKdQ6aiYrYcFWupmwCeKOwp
+timDpiZMV5tTZKtTWt1FffM=
+=j30d
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.3.4-r1.ebuild b/net-print/cups/cups-1.3.4-r1.ebuild
index 6d175597d844..58ed42df04e5 100644
--- a/net-print/cups/cups-1.3.4-r1.ebuild
+++ b/net-print/cups/cups-1.3.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.4-r1.ebuild,v 1.1 2007/11/08 23:15:12 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.4-r1.ebuild,v 1.2 2007/11/09 21:08:29 vapier Exp $
 
 inherit autotools eutils flag-o-matic multilib pam
 
@@ -168,7 +168,7 @@ src_compile() {
 
 src_install() {
 	emake BUILDROOT="${D}" install || die "emake install failed"
-	dodoc {CHANGES{,-1.{0,1}},CREDITS,LICENSE,README}.txt || die "dodoc install failed"
+	dodoc {CHANGES{,-1.{0,1}},CREDITS,README}.txt || die "dodoc install failed"
 
 	# clean out cups init scripts
 	rm -rf "${D}"/etc/{init.d/cups,rc*,pam.d/cups}
@@ -178,8 +178,9 @@ src_install() {
 	use avahi && neededservices="$neededservices avahi-daemon"
 	use dbus && neededservices="$neededservices dbus"
 	use zeroconf && ! use avahi && neededservices="$neededservices mDNSResponderPosix"
-	[[ -n ${neededservices} ]] && sed -e "s/@neededservices@/need$neededservices/" "${FILESDIR}/cupsd.init.d" > "${T}/cupsd"
-	doinitd "${T}/cupsd"
+	[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
+	sed -e "s/@neededservices@/$neededservices/" "${FILESDIR}"/cupsd.init.d > "${T}"/cupsd
+	doinitd "${T}"/cupsd
 
 	# install our pam script
 	pamd_mimic_system cups auth account