* [gentoo-commits] gentoo-x86 commit in net-print/cups: cups-1.6.2-r4.ebuild ChangeLog cups-9999.ebuild
@ 2013-05-11 22:16 Andreas HAttel (dilfridge)
0 siblings, 0 replies; only message in thread
From: Andreas HAttel (dilfridge) @ 2013-05-11 22:16 UTC (permalink / raw
To: gentoo-commits
dilfridge 13/05/11 22:16:12
Modified: cups-1.6.2-r4.ebuild ChangeLog cups-9999.ebuild
Log:
Add prefix support (dir offsets), bug 416217
(Portage version: 2.2.0_alpha174/cvs/Linux x86_64, signed Manifest commit with key 84AD142F)
Revision Changes Path
1.2 net-print/cups/cups-1.6.2-r4.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.6.2-r4.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.6.2-r4.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.6.2-r4.ebuild?r1=1.1&r2=1.2
Index: cups-1.6.2-r4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6.2-r4.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-1.6.2-r4.ebuild 5 May 2013 07:09:16 -0000 1.1
+++ cups-1.6.2-r4.ebuild 11 May 2013 22:16:12 -0000 1.2
@@ -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.6.2-r4.ebuild,v 1.1 2013/05/05 07:09:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6.2-r4.ebuild,v 1.2 2013/05/11 22:16:12 dilfridge Exp $
EAPI=5
@@ -160,11 +160,11 @@
fi
econf \
- --libdir=/usr/$(get_libdir) \
- --localstatedir=/var \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ --localstatedir="${EPREFIX}"/var \
--with-cups-user=lp \
--with-cups-group=lp \
- --with-docdir=/usr/share/cups/html \
+ --with-docdir="${EPREFIX}"/usr/share/cups/html \
--with-languages="${LINGUAS}" \
--with-system-groups=lpadmin \
$(use_enable acl) \
@@ -189,9 +189,9 @@
# install in /usr/libexec always, instead of using /usr/lib/cups, as that
# makes more sense when facing multilib support.
- sed -i -e 's:SERVERBIN.*:SERVERBIN = "$(BUILDROOT)"/usr/libexec/cups:' Makedefs || die
- sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libexec/cups":' config.h || die
- sed -i -e 's:cups_serverbin=.*:cups_serverbin=/usr/libexec/cups:' cups-config || die
+ sed -i -e 's:SERVERBIN.*:SERVERBIN = "$(BUILDROOT)${EPREFIX}"/usr/libexec/cups:' Makedefs || die
+ sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "${EPREFIX}/usr/libexec/cups":' config.h || die
+ sed -i -e 's:cups_serverbin=.*:cups_serverbin=${EPREFIX}/usr/libexec/cups:' cups-config || die
}
src_install() {
1.534 net-print/cups/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.534&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.534&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?r1=1.533&r2=1.534
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v
retrieving revision 1.533
retrieving revision 1.534
diff -u -r1.533 -r1.534
--- ChangeLog 5 May 2013 07:09:16 -0000 1.533
+++ ChangeLog 11 May 2013 22:16:12 -0000 1.534
@@ -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.533 2013/05/05 07:09:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.534 2013/05/11 22:16:12 dilfridge Exp $
+
+ 11 May 2013; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.6.2-r4.ebuild,
+ cups-9999.ebuild:
+ Add prefix support (dir offsets), bug 416217
*cups-1.6.2-r4 (05 May 2013)
1.32 net-print/cups/cups-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-9999.ebuild?rev=1.32&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-9999.ebuild?rev=1.32&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-9999.ebuild?r1=1.31&r2=1.32
Index: cups-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- cups-9999.ebuild 5 May 2013 07:09:16 -0000 1.31
+++ cups-9999.ebuild 11 May 2013 22:16:12 -0000 1.32
@@ -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.31 2013/05/05 07:09:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.32 2013/05/11 22:16:12 dilfridge Exp $
EAPI=5
@@ -160,11 +160,11 @@
fi
econf \
- --libdir=/usr/$(get_libdir) \
- --localstatedir=/var \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ --localstatedir="${EPREFIX}"/var \
--with-cups-user=lp \
--with-cups-group=lp \
- --with-docdir=/usr/share/cups/html \
+ --with-docdir="${EPREFIX}"/usr/share/cups/html \
--with-languages="${LINGUAS}" \
--with-system-groups=lpadmin \
$(use_enable acl) \
@@ -189,9 +189,9 @@
# install in /usr/libexec always, instead of using /usr/lib/cups, as that
# makes more sense when facing multilib support.
- sed -i -e 's:SERVERBIN.*:SERVERBIN = "$(BUILDROOT)"/usr/libexec/cups:' Makedefs || die
- sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libexec/cups":' config.h || die
- sed -i -e 's:cups_serverbin=.*:cups_serverbin=/usr/libexec/cups:' cups-config || die
+ sed -i -e 's:SERVERBIN.*:SERVERBIN = "$(BUILDROOT)${EPREFIX}"/usr/libexec/cups:' Makedefs || die
+ sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "${EPREFIX}/usr/libexec/cups":' config.h || die
+ sed -i -e 's:cups_serverbin=.*:cups_serverbin=${EPREFIX}/usr/libexec/cups:' cups-config || die
}
src_install() {
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-05-11 22:16 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-11 22:16 [gentoo-commits] gentoo-x86 commit in net-print/cups: cups-1.6.2-r4.ebuild ChangeLog cups-9999.ebuild Andreas HAttel (dilfridge)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox