diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2007-11-09 21:08:29 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2007-11-09 21:08:29 +0000 |
| commit | 432223d2df6f919d5fa4fadf9aa7a72b67e411c0 (patch) | |
| tree | 8e54ee17b3f9c4e7dd24ec8bb0d8a32f62c16b77 /net-print | |
| parent | Dropped ppc-macos keyword, see you in prefix (diff) | |
| download | gentoo-2-432223d2df6f919d5fa4fadf9aa7a72b67e411c0.tar.gz gentoo-2-432223d2df6f919d5fa4fadf9aa7a72b67e411c0.tar.bz2 gentoo-2-432223d2df6f919d5fa4fadf9aa7a72b67e411c0.zip | |
Fix installation of cups init.d script.
(Portage version: 2.1.3.19)
Diffstat (limited to 'net-print')
| -rw-r--r-- | net-print/cups/ChangeLog | 7 | ||||
| -rw-r--r-- | net-print/cups/cups-1.3.4-r1.ebuild | 9 |
2 files changed, 10 insertions, 6 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/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 |