summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2013-10-21 15:21:03 +0000
committerFabian Groffen <grobian@gentoo.org>2013-10-21 15:21:03 +0000
commit963481f4cc3103f6c8606337d76aae81db6fb8d4 (patch)
tree3947a1d6b93ff321beeebd543c2ead9c291371e3 /net-print
parentDo not install palo.conf twice, but do install Changes debian/changelog and T... (diff)
downloadgentoo-2-963481f4cc3103f6c8606337d76aae81db6fb8d4.tar.gz
gentoo-2-963481f4cc3103f6c8606337d76aae81db6fb8d4.tar.bz2
gentoo-2-963481f4cc3103f6c8606337d76aae81db6fb8d4.zip
Fix cups.sock location for Prefix, bug #488204
(Portage version: 2.2.7-prefix/cvs/SunOS i386, signed Manifest commit with key 0x5F75F607C5C74E89)
Diffstat (limited to 'net-print')
-rw-r--r--net-print/cups/ChangeLog6
-rw-r--r--net-print/cups/cups-1.7_rc1.ebuild4
-rw-r--r--net-print/cups/cups-9999.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 02ec8e28f2d6..df530c718987 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-print/cups
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.564 2013/10/01 21:10:50 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.565 2013/10/21 15:21:03 grobian Exp $
+
+ 21 Oct 2013; Fabian Groffen <grobian@gentoo.org> cups-1.7_rc1.ebuild,
+ cups-9999.ebuild:
+ Fix cups.sock location for Prefix, bug #488204
*cups-1.6.4 (01 Oct 2013)
diff --git a/net-print/cups/cups-1.7_rc1.ebuild b/net-print/cups/cups-1.7_rc1.ebuild
index 7ca380929f27..cc789a07ee37 100644
--- a/net-print/cups/cups-1.7_rc1.ebuild
+++ b/net-print/cups/cups-1.7_rc1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7_rc1.ebuild,v 1.4 2013/09/05 19:44:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7_rc1.ebuild,v 1.5 2013/10/21 15:21:03 grobian Exp $
EAPI=5
@@ -250,7 +250,7 @@ src_install() {
use X || rm -r "${ED}"/usr/share/applications
# create /etc/cups/client.conf, bug #196967 and #266678
- echo "ServerName /run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf
+ echo "ServerName ${EPREFIX}/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf
# the following files are now provided by cups-filters:
rm -r "${ED}"/usr/share/cups/banners || die
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index 89174a1df2a5..788d8b2124a8 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.43 2013/09/05 19:44:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.44 2013/10/21 15:21:03 grobian Exp $
EAPI=5
@@ -250,7 +250,7 @@ src_install() {
use X || rm -r "${ED}"/usr/share/applications
# create /etc/cups/client.conf, bug #196967 and #266678
- echo "ServerName /run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf
+ echo "ServerName ${EPREFIX}/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf
# the following files are now provided by cups-filters:
rm -r "${ED}"/usr/share/cups/banners || die