| 1 |
jer 07/10/24 07:24:18 |
| 2 |
|
| 3 |
Modified: ChangeLog cups-1.2.12-r1.ebuild |
| 4 |
Log: |
| 5 |
Stable for HPPA (bug #195278). Fixed quoting issues. |
| 6 |
(Portage version: 2.1.3.16) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.251 net-print/cups/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/ChangeLog?rev=1.251&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/ChangeLog?rev=1.251&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/ChangeLog?r1=1.250&r2=1.251 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v |
| 18 |
retrieving revision 1.250 |
| 19 |
retrieving revision 1.251 |
| 20 |
diff -u -r1.250 -r1.251 |
| 21 |
--- ChangeLog 22 Oct 2007 20:09:10 -0000 1.250 |
| 22 |
+++ ChangeLog 24 Oct 2007 07:24:17 -0000 1.251 |
| 23 |
@@ -1,6 +1,9 @@ |
| 24 |
# ChangeLog for net-print/cups |
| 25 |
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.250 2007/10/22 20:09:10 maekke Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.251 2007/10/24 07:24:17 jer Exp $ |
| 28 |
+ |
| 29 |
+ 24 Oct 2007; Jeroen Roovers <jer@g.o> cups-1.2.12-r1.ebuild: |
| 30 |
+ Stable for HPPA (bug #195278). Fixed quoting issues. |
| 31 |
|
| 32 |
22 Oct 2007; Markus Meier <maekke@g.o> cups-1.2.12-r1.ebuild: |
| 33 |
x86 stable, bug #195278 |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.3 net-print/cups/cups-1.2.12-r1.ebuild |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/cups-1.2.12-r1.ebuild?rev=1.3&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/cups-1.2.12-r1.ebuild?rev=1.3&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/cups-1.2.12-r1.ebuild?r1=1.2&r2=1.3 |
| 42 |
|
| 43 |
Index: cups-1.2.12-r1.ebuild |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.12-r1.ebuild,v |
| 46 |
retrieving revision 1.2 |
| 47 |
retrieving revision 1.3 |
| 48 |
diff -u -r1.2 -r1.3 |
| 49 |
--- cups-1.2.12-r1.ebuild 22 Oct 2007 20:09:10 -0000 1.2 |
| 50 |
+++ cups-1.2.12-r1.ebuild 24 Oct 2007 07:24:17 -0000 1.3 |
| 51 |
@@ -1,6 +1,6 @@ |
| 52 |
# Copyright 1999-2007 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.12-r1.ebuild,v 1.2 2007/10/22 20:09:10 maekke Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.12-r1.ebuild,v 1.3 2007/10/24 07:24:17 jer Exp $ |
| 56 |
|
| 57 |
WANT_AUTOMAKE=latest |
| 58 |
|
| 59 |
@@ -16,7 +16,7 @@ |
| 60 |
|
| 61 |
LICENSE="GPL-2" |
| 62 |
SLOT="0" |
| 63 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd x86 ~x86-fbsd" |
| 64 |
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd x86 ~x86-fbsd" |
| 65 |
IUSE="ldap ssl slp pam php samba nls dbus tiff png ppds jpeg X" |
| 66 |
|
| 67 |
DEP="pam? ( virtual/pam ) |
| 68 |
@@ -81,10 +81,10 @@ |
| 69 |
|
| 70 |
src_unpack() { |
| 71 |
unpack ${A} |
| 72 |
- cd ${S} |
| 73 |
+ cd "${S}" |
| 74 |
|
| 75 |
# upstream does not acknowledge bindnow as a solution |
| 76 |
- epatch ${FILESDIR}/cups-1.2.0-bindnow.patch |
| 77 |
+ epatch "${FILESDIR}"/cups-1.2.0-bindnow.patch |
| 78 |
|
| 79 |
# cups does not use autotools "the usual way" and ship a static config.h.in |
| 80 |
eaclocal |
| 81 |
@@ -127,29 +127,29 @@ |
| 82 |
} |
| 83 |
|
| 84 |
src_install() { |
| 85 |
- emake BUILDROOT=${D} install || die "emake install failed" |
| 86 |
+ emake BUILDROOT="${D}" install || die "emake install failed" |
| 87 |
dodoc {CHANGES{,-1.{0,1}},CREDITS,LICENSE,README}.txt |
| 88 |
|
| 89 |
# clean out cups init scripts |
| 90 |
- rm -rf ${D}/etc/{init.d/cups,rc*,pam.d/cups} |
| 91 |
+ rm -rf "${D}"/etc/{init.d/cups,rc*,pam.d/cups} |
| 92 |
# install our init scripts |
| 93 |
- newinitd ${FILESDIR}/cupsd.init cupsd |
| 94 |
+ newinitd "${FILESDIR}"/cupsd.init cupsd |
| 95 |
# install our pam script |
| 96 |
pamd_mimic_system cups auth account |
| 97 |
|
| 98 |
# correct path |
| 99 |
- sed -i -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" ${D}/etc/xinetd.d/cups-lpd |
| 100 |
+ sed -i -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" "${D}"/etc/xinetd.d/cups-lpd |
| 101 |
# it is safer to disable this by default, bug 137130 |
| 102 |
- grep -w 'disable' ${D}/etc/xinetd.d/cups-lpd || \ |
| 103 |
- sed -i -e "s:}:\tdisable = yes\n}:" ${D}/etc/xinetd.d/cups-lpd |
| 104 |
+ grep -w 'disable' "${D}"/etc/xinetd.d/cups-lpd || \ |
| 105 |
+ sed -i -e "s:}:\tdisable = yes\n}:" "${D}"/etc/xinetd.d/cups-lpd |
| 106 |
|
| 107 |
# install pdftops filter |
| 108 |
exeinto /usr/libexec/cups/filter/ |
| 109 |
- newexe ${FILESDIR}/pdftops.pl pdftops |
| 110 |
+ newexe "${FILESDIR}"/pdftops.pl pdftops |
| 111 |
|
| 112 |
# only for gs-esp this is correct, see bug 163897 |
| 113 |
if has_version app-text/ghostscript-gpl || has_version app-text/ghostscript-gnu; then |
| 114 |
- sed -i -e "s:#application/vnd.cups-postscript:application/vnd.cups-postscript:" ${D}/etc/cups/mime.convs |
| 115 |
+ sed -i -e "s:#application/vnd.cups-postscript:application/vnd.cups-postscript:" "${D}"/etc/cups/mime.convs |
| 116 |
fi |
| 117 |
|
| 118 |
keepdir /usr/share/cups/profiles /usr/libexec/cups/driver /var/log/cups \ |
| 119 |
@@ -157,9 +157,9 @@ |
| 120 |
|
| 121 |
# .desktop handling. X useflag. xdg-open from freedesktop is preferred |
| 122 |
if use X; then |
| 123 |
- sed -i -e "s:htmlview:xdg-open:" ${D}/usr/share/applications/cups.desktop |
| 124 |
+ sed -i -e "s:htmlview:xdg-open:" "${D}"/usr/share/applications/cups.desktop |
| 125 |
else |
| 126 |
- rm -r ${D}/usr/share/applications |
| 127 |
+ rm -r "${D}"/usr/share/applications |
| 128 |
fi |
| 129 |
|
| 130 |
# Fix a symlink collision, see bug #172341 |
| 131 |
@@ -169,7 +169,7 @@ |
| 132 |
|
| 133 |
pkg_preinst() { |
| 134 |
# cleanups |
| 135 |
- [ -n "${PN}" ] && rm -fR ${ROOT}/usr/share/doc/${PN}-* |
| 136 |
+ [ -n "${PN}" ] && rm -fR "${ROOT}"/usr/share/doc/${PN}-* |
| 137 |
} |
| 138 |
|
| 139 |
pkg_postinst() { |
| 140 |
@@ -201,7 +201,7 @@ |
| 141 |
ewarn |
| 142 |
ewarn "You need to rebuild kdelibs for kdeprinter to work with cups-1.2" |
| 143 |
fi |
| 144 |
- if [ -e ${ROOT}/usr/lib/cups ]; then |
| 145 |
+ if [ -e "${ROOT}"/usr/lib/cups ]; then |
| 146 |
ewarn |
| 147 |
ewarn "/usr/lib/cups exists - You need to remerge every ebuild that" |
| 148 |
ewarn "installed into /usr/lib/cups and /etc/cups, qfile is in portage-utils:" |
| 149 |
@@ -212,7 +212,7 @@ |
| 150 |
ewarn "You should also run revdep-rebuild" |
| 151 |
|
| 152 |
# place symlinks to make the update smoothless |
| 153 |
- for i in ${ROOT}/usr/lib/cups/{backend,filter}/*; do |
| 154 |
+ for i in "${ROOT}"/usr/lib/cups/{backend,filter}/*; do |
| 155 |
if [ "${i/\*}" == "${i}" ] && ! [ -e ${i/lib/libexec} ]; then |
| 156 |
ln -s ${i} ${i/lib/libexec} |
| 157 |
fi |
| 158 |
|
| 159 |
|
| 160 |
|
| 161 |
-- |
| 162 |
gentoo-commits@g.o mailing list |
Archives