diff options
Diffstat (limited to 'net-print')
-rw-r--r-- | net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60-r1.ebuild | 3 | ||||
-rw-r--r-- | net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild | 3 | ||||
-rw-r--r-- | net-print/cups/cups-2.2.12.ebuild | 2 | ||||
-rw-r--r-- | net-print/cups/cups-2.3.0.ebuild | 2 | ||||
-rw-r--r-- | net-print/cups/cups-9999.ebuild | 2 | ||||
-rw-r--r-- | net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0-r1.ebuild | 4 | ||||
-rw-r--r-- | net-print/kyocera-mita-ppds/kyocera-mita-ppds-8.4-r1.ebuild | 2 | ||||
-rw-r--r-- | net-print/pykota/pykota-1.26-r1.ebuild | 2 |
8 files changed, 11 insertions, 9 deletions
diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60-r1.ebuild b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60-r1.ebuild index 9e25fae92195..cbdab7f9b8cb 100644 --- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60-r1.ebuild +++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60-r1.ebuild @@ -77,7 +77,8 @@ src_compile() { change_dir emake # Cannot be moved to 'change_dir' as it doesn't need eautoreconf - ( cd "${S}/c3plmod_ipc" && emake ) || die + cd "${S}/c3plmod_ipc" || die + emake } src_install() { diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild index 92dd9f05754d..23e5c3724b52 100644 --- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild +++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild @@ -80,7 +80,8 @@ src_compile() { change_dir emake # Cannot be moved to 'change_dir' as it doesn't need eautoreconf - ( cd "${S}/c3plmod_ipc" && emake ) || die + cd "${S}/c3plmod_ipc" || die + emake } src_install() { diff --git a/net-print/cups/cups-2.2.12.ebuild b/net-print/cups/cups-2.2.12.ebuild index 70574c1dd3d0..972e518ff81a 100644 --- a/net-print/cups/cups-2.2.12.ebuild +++ b/net-print/cups/cups-2.2.12.ebuild @@ -265,7 +265,7 @@ multilib_src_install_all() { grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \ { sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; } # write permission for file owner (root), bug #296221 - fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed" + fperms u+w /etc/xinetd.d/cups-lpd else # always configure with --with-xinetd= and clean up later, # bug #525604 diff --git a/net-print/cups/cups-2.3.0.ebuild b/net-print/cups/cups-2.3.0.ebuild index 5d1def034fe6..46eed6927902 100644 --- a/net-print/cups/cups-2.3.0.ebuild +++ b/net-print/cups/cups-2.3.0.ebuild @@ -262,7 +262,7 @@ multilib_src_install_all() { grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \ { sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; } # write permission for file owner (root), bug #296221 - fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed" + fperms u+w /etc/xinetd.d/cups-lpd else # always configure with --with-xinetd= and clean up later, # bug #525604 diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild index 5d1def034fe6..46eed6927902 100644 --- a/net-print/cups/cups-9999.ebuild +++ b/net-print/cups/cups-9999.ebuild @@ -262,7 +262,7 @@ multilib_src_install_all() { grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \ { sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; } # write permission for file owner (root), bug #296221 - fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed" + fperms u+w /etc/xinetd.d/cups-lpd else # always configure with --with-xinetd= and clean up later, # bug #525604 diff --git a/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0-r1.ebuild b/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0-r1.ebuild index 339b8008b67b..f5dba4224b3f 100644 --- a/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0-r1.ebuild +++ b/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0-r1.ebuild @@ -47,10 +47,10 @@ src_test() { # upstream tests are designed to be run AFTER make install, because they depend on final paths. testroot="${T}/testroot" mkdir -p "${testroot}" - emake install DESTDIR="${testroot}" || die "Failed to install for testing" + emake install DESTDIR="${testroot}" # -W filters is because CUPS tries really hard for secure filters: they must be root/root for the filter tests to pass #chown root:root "${testroot}"/usr/libexec/cups/filter/{raster2dymolm,raster2dymolw} || die "failed to set ownership for tests" # This will trigger the following warning repeatedly #Bad permissions on cupsFilter file "..${testroot}/usr/libexec/cups/filter/raster2dymolm" - emake check CUPSTESTPPD_OPTS="-R ${testroot} -W filters" || die "failed tests" + emake check CUPSTESTPPD_OPTS="-R ${testroot} -W filters" } diff --git a/net-print/kyocera-mita-ppds/kyocera-mita-ppds-8.4-r1.ebuild b/net-print/kyocera-mita-ppds/kyocera-mita-ppds-8.4-r1.ebuild index 8c66696feaf6..739a186c508c 100644 --- a/net-print/kyocera-mita-ppds/kyocera-mita-ppds-8.4-r1.ebuild +++ b/net-print/kyocera-mita-ppds/kyocera-mita-ppds-8.4-r1.ebuild @@ -32,7 +32,7 @@ src_install() { inslanguage() { if use l10n_$1; then - doins $2/*.ppd || die "failed to install $2 ppds" + doins $2/*.ppd fi } diff --git a/net-print/pykota/pykota-1.26-r1.ebuild b/net-print/pykota/pykota-1.26-r1.ebuild index f7181c518167..ccab1c34b787 100644 --- a/net-print/pykota/pykota-1.26-r1.ebuild +++ b/net-print/pykota/pykota-1.26-r1.ebuild @@ -57,7 +57,7 @@ python_install_all() { doins -r initscripts/* # Fixes permissions for bug 155865 - fperms 0700 /usr/share/pykota/cupspykota || die + fperms 0700 /usr/share/pykota/cupspykota rm "${ED%/}"/usr/share/doc/${PN}/{LICENSE,COPYING} || die mv "${ED%/}"/usr/share/doc/{${PN},${PF}} || die |