[gentoo-commits] gentoo-x86 commit in net-print/cups: cups-1.3.4-r1.ebuild ChangeLog

[gentoo-commits] gentoo-x86 commit in net-print/cups: cups-1.3.4-r1.ebuild ChangeLog

[Mike Frysinger (vapier)]

vapier      07/11/09 21:08:30

  Modified:             cups-1.3.4-r1.ebuild ChangeLog
  Log:
  Fix installation of cups init.d script.
  (Portage version: 2.1.3.19)

Revision  Changes    Path
1.2                  net-print/cups/cups-1.3.4-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/cups-1.3.4-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/cups-1.3.4-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/cups-1.3.4-r1.ebuild?r1=1.1&r2=1.2

Index: cups-1.3.4-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.4-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-1.3.4-r1.ebuild	8 Nov 2007 23:15:12 -0000	1.1
+++ cups-1.3.4-r1.ebuild	9 Nov 2007 21:08:29 -0000	1.2
@@ -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_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 @@
 	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



1.267                net-print/cups/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/ChangeLog?rev=1.267&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/ChangeLog?rev=1.267&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/ChangeLog?r1=1.266&r2=1.267

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -r1.266 -r1.267
--- ChangeLog	9 Nov 2007 19:53:16 -0000	1.266
+++ ChangeLog	9 Nov 2007 21:08:29 -0000	1.267
@@ -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



-- 
gentoo-commits@gentoo.org mailing list