diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-05-07 21:25:15 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-05-07 21:25:15 +0000 |
| commit | e8416f43cf752ca35ef6b28ff583567685b9592f (patch) | |
| tree | c5374534dcaf7333966943b0439d2b8f22ffe5c6 /net-print | |
| parent | Unmask cabal-1.1.4. (tested with ghc-6.4.1-r2 and all cabalised ebuilds) (diff) | |
| download | gentoo-2-e8416f43cf752ca35ef6b28ff583567685b9592f.tar.gz gentoo-2-e8416f43cf752ca35ef6b28ff583567685b9592f.tar.bz2 gentoo-2-e8416f43cf752ca35ef6b28ff583567685b9592f.zip | |
Install inside /usr/libexec to workaround multilib problems, and fix cups-config file, too.
(Portage version: 2.1_pre10-r3)
Diffstat (limited to 'net-print')
| -rw-r--r-- | net-print/cups/ChangeLog | 6 | ||||
| -rw-r--r-- | net-print/cups/cups-1.2.0_pre.ebuild | 13 |
2 files changed, 13 insertions, 6 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog index 3a3d2eaa12a6..ea30617e0ca6 100644 --- a/net-print/cups/ChangeLog +++ b/net-print/cups/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-print/cups # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.164 2006/05/07 17:16:33 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.165 2006/05/07 21:25:15 flameeyes Exp $ + + 07 May 2006; Diego Pettenò <flameeyes@gentoo.org> cups-1.2.0_pre.ebuild: + Install inside /usr/libexec to workaround multilib problems, and fix + cups-config file, too. 07 May 2006; Diego Pettenò <flameeyes@gentoo.org> cups-1.2.0_pre.ebuild: Make sure that the cups-lpd xinetd file is safe for FreeBSD, too. diff --git a/net-print/cups/cups-1.2.0_pre.ebuild b/net-print/cups/cups-1.2.0_pre.ebuild index 5406216426ab..78bc7589e16e 100644 --- a/net-print/cups/cups-1.2.0_pre.ebuild +++ b/net-print/cups/cups-1.2.0_pre.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.0_pre.ebuild,v 1.3 2006/05/07 17:16:33 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.0_pre.ebuild,v 1.4 2006/05/07 21:25:15 flameeyes Exp $ inherit eutils flag-o-matic pam autotools multilib subversion @@ -72,8 +72,11 @@ src_compile() { ${myconf} \ || die "econf failed" - sed -i -e 's:SERVERBIN.*:SERVERBIN = $(BUILDROOT)/usr/'$(get_libdir)'/cups:' Makedefs - sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/'$(get_libdir)'/cups":' config.h + # 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 + sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libexec/cups":' config.h + sed -i -e 's:cups_serverbin=.*:cups_serverbin=/usr/libexec/cups:' cups-config emake || die "emake failed" } @@ -101,10 +104,10 @@ src_install() { pamd_mimic_system cups auth account - sed -i -e "s:server = .*:server = /usr/$(get_libdir)/cups/daemon/cups-lpd:" ${D}/etc/xinetd.d/cups-lpd + sed -i -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" ${D}/etc/xinetd.d/cups-lpd # install pdftops filter - exeinto /usr/$(get_libdir)/cups/filter/ + exeinto /usr/libexec/cups/filter/ newexe ${FILESDIR}/pdftops.pl pdftops fowners lp:lp /var/log/cups /var/run/cups/certs /var/cache/cups \ |