diff options
| -rw-r--r-- | net-print/cups/ChangeLog | 9 | ||||
| -rw-r--r-- | net-print/cups/cups-1.1.13-r3.ebuild | 110 | ||||
| -rw-r--r-- | net-print/cups/cups-1.1.14-r2.ebuild (renamed from net-print/cups/cups-1.1.14-r1.ebuild) | 51 | ||||
| -rw-r--r-- | net-print/cups/files/digest-cups-1.1.13-r3 | 1 | ||||
| -rw-r--r-- | net-print/cups/files/digest-cups-1.1.14-r2 (renamed from net-print/cups/files/digest-cups-1.1.14-r1) | 0 |
5 files changed, 30 insertions, 141 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog index a0a51f7ad1e4..22b97477db56 100644 --- a/net-print/cups/ChangeLog +++ b/net-print/cups/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-print/cups # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.7 2002/03/07 14:26:21 gbevin Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.8 2002/03/29 18:39:16 woodchip Exp $ + +*cups-1.1.14-r2 (29 Mar 2002) + + 29 Mar 2002; Donny Davies <woodchip@gentoo.org>: + + Add link to the html docs. Cleaned syntax of several statements. No need to + recompile/reinstall unless you enjoy that sort of thing ;) *cups-1.1.14-r1 (7 Mar 2002) diff --git a/net-print/cups/cups-1.1.13-r3.ebuild b/net-print/cups/cups-1.1.13-r3.ebuild deleted file mode 100644 index c0faae6fffcd..000000000000 --- a/net-print/cups/cups-1.1.13-r3.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author: Donny Davies <woodchip@gentoo.org> -# Maintainer: System Team <system@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.13-r3.ebuild,v 1.1 2002/02/10 13:22:20 verwilst Exp $ - -DESCRIPTION="The Common Unix Printing System" -HOMEPAGE="http://www.cups.org" -SLOT="0" -S=${WORKDIR}/${P} -SRC_URI="ftp://ftp.easysw.com/pub/cups/${PV}/${P}-source.tar.bz2" -PROVIDE="virtual/lpr" - -DEPEND="virtual/glibc - pam? ( >=sys-libs/pam-0.75 ) - ssl? ( >=dev-libs/openssl-0.9.6b ) - slp? ( >=net-libs/openslp-1.0.4 ) - >=media-libs/libpng-1.0.12 - >=media-libs/tiff-3.5.5 - >=media-libs/jpeg-6b" -RDEPEND="${DEPEND} !virtual/lpr" - -src_unpack() { - unpack ${A} ; cd ${S} - # make sure libcupsimage gets linked with libjpeg - patch -p0 < ${FILESDIR}/configure-jpeg-buildfix.diff - # This patch is stillr required for 1.1.13 and closes bug #608 - assert "bad patchfile" - autoconf || die -} - -src_compile() { - - local myconf - use pam || myconf="${myconf} --disable-pam" - use ssl || myconf="${myconf} --disable-ssl" - use slp || myconf="${myconf} --disable-slp" - - ./configure --host=${CHOST} ${myconf} --with-cups-user=lp --with-cups-group=lp - assert "bad ./configure" - - make || die "compile problem" -} - -src_install() { - - # set these up now or make install will.. and that aint pretty! - diropts -m 755 ; dodir /var/spool - diropts -m 755 ; dodir /var/log/cups - diropts -m 755 ; dodir /etc/cups - - make \ - LOCALEDIR=${D}/usr/share/locale \ - DOCDIR=${D}/usr/share/cups/docs \ - REQUESTS=${D}/var/spool/cups \ - SERVERBIN=${D}/usr/lib/cups \ - DATADIR=${D}/usr/share/cups \ - INCLUDEDIR=${D}/usr/include \ - AMANDIR=${D}/usr/share/man \ - PMANDIR=${D}/usr/share/man \ - MANDIR=${D}/usr/share/man \ - SERVERROOT=${D}/etc/cups \ - LOGDIR=${D}/var/log/cups \ - SBINDIR=${D}/usr/sbin \ - PAMDIR=${D}/etc/pam.d \ - EXEC_PREFIX=${D}/usr \ - LIBDIR=${D}/usr/lib \ - BINDIR=${D}/usr/bin \ - bindir=${D}/usr/bin \ - INITDIR=${D}/etc \ - PREFIX=${D} \ - install || die "install problem" - - dodoc {CHANGES,CREDITS,ENCRYPTION,LICENSE,README}.txt LICENSE.html - - # cleanups and fixups - rm -rf ${D}/etc/init.d - rm -rf ${D}/etc/pam.d - rm -rf ${D}/etc/rc* - rm -rf ${D}/usr/share/man/cat* - dosed "s:#DocumentRoot /usr/share/doc/cups:DocumentRoot /usr/share/cups/docs:" /etc/cups/cupsd.conf - dosed "s:#SystemGroup sys:SystemGroup lp:" /etc/cups/cupsd.conf - dosed "s:#User lp:User lp:" /etc/cups/cupsd.conf - dosed "s:#Group sys:Group lp:" /etc/cups/cupsd.conf - - # sanity checks - chown lp.root ${D}/usr/bin/lppasswd ; chmod 4755 ${D}/usr/bin/lppasswd - chown lp.root ${D}/etc/cups/certs ; chmod 711 ${D}/etc/cups/certs - chown lp.root ${D}/var/spool/cups ; chmod 0700 ${D}/var/spool/cups - chown lp.root ${D}/var/spool/cups/tmp ; chmod 01700 ${D}/var/spool/cups/tmp - - # gentoo config stuff - insinto /etc/pam.d ; newins ${FILESDIR}/cups.pam cups - exeinto /etc/init.d ; newexe ${FILESDIR}/cupsd.rc6 cupsd - insinto /etc/xinetd.d ; newins ${FILESDIR}/cups.xinetd cups-lpd - - # we need to recreate these dirs outside in pkg_postinst() since they're - # empty and will get zapped on upgrade otherwise. - rm -rf ${D}/etc/cups/{certs,interfaces,ppd} - rm -rf ${D}/var -} - -pkg_postinst() { - install -d ${ROOT}/var/log/cups - install -d ${ROOT}/var/spool - install -m0700 -o lp -d ${ROOT}/var/spool/cups - install -m1700 -o lp -d ${ROOT}/var/spool/cups/tmp - install -m0711 -o lp -d ${ROOT}/etc/cups/certs - install -d -m0755 ${ROOT}/etc/cups/{interfaces,ppd} -} diff --git a/net-print/cups/cups-1.1.14-r1.ebuild b/net-print/cups/cups-1.1.14-r2.ebuild index 94d157d84e6b..006476658c8d 100644 --- a/net-print/cups/cups-1.1.14-r1.ebuild +++ b/net-print/cups/cups-1.1.14-r2.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# Author: Donny Davies <woodchip@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.14-r1.ebuild,v 1.2 2002/03/07 14:47:53 gbevin Exp $ +# Maintainer: Donny Davies <woodchip@gentoo.org> +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.14-r2.ebuild,v 1.1 2002/03/29 18:39:16 woodchip Exp $ DESCRIPTION="The Common Unix Printing System" HOMEPAGE="http://www.cups.org" @@ -40,10 +40,7 @@ src_compile() { } src_install() { - # set these up now or make install will.. and that aint pretty! - diropts -m 755 ; dodir /var/spool - diropts -m 755 ; dodir /var/log/cups - diropts -m 755 ; dodir /etc/cups + dodir /var/spool /var/log/cups /etc/cups make \ LOCALEDIR=${D}/usr/share/locale \ @@ -68,44 +65,40 @@ src_install() { install || die "install problem" dodoc {CHANGES,CREDITS,ENCRYPTION,LICENSE,README}.txt LICENSE.html + dosym /usr/share/cups/docs /usr/share/doc/${PF}/html - # cleanups and fixups + fowners lp.root /usr/bin/lppasswd + fperms 4755 /usr/bin/lppasswd + + # cleanups rm -rf ${D}/etc/init.d rm -rf ${D}/etc/pam.d rm -rf ${D}/etc/rc* rm -rf ${D}/usr/share/man/cat* - dosed "s:#DocumentRoot /usr/share/doc/cups:DocumentRoot /usr/share/cups/docs:" /etc/cups/cupsd.conf - dosed "s:#SystemGroup sys:SystemGroup lp:" /etc/cups/cupsd.conf - dosed "s:#User lp:User lp:" /etc/cups/cupsd.conf - dosed "s:#Group sys:Group lp:" /etc/cups/cupsd.conf + rm -rf ${D}/etc/cups/{certs,interfaces,ppd} + rm -rf ${D}/var - # sanity checks - chown lp.root ${D}/usr/bin/lppasswd ; chmod 4755 ${D}/usr/bin/lppasswd - chown lp.root ${D}/etc/cups/certs ; chmod 711 ${D}/etc/cups/certs - chown lp.root ${D}/var/spool/cups ; chmod 0700 ${D}/var/spool/cups - chown lp.root ${D}/var/spool/cups/tmp ; chmod 01700 ${D}/var/spool/cups/tmp + mv ${D}/etc/cups/cupsd.conf ${D}/etc/cups/cupsd.conf.orig + sed -e "s:^#\(DocumentRoot\).*:\1 /usr/share/cups/docs:" \ + -e "s:^#\(SystemGroup\).*:\1 lp:" \ + -e "s:^#\(User\).*:\1 lp:" \ + -e "s:^#\(Group\).*:\1 lp:" \ + ${D}/etc/cups/cupsd.conf.orig > ${D}/etc/cups/cupsd.conf + rm -f ${D}/etc/cups/cupsd.conf.orig # foomatic cups filters - insinto /usr/lib/cups/filter - doins ${FILESDIR}/cupsomatic - fperms 755 /usr/lib/cups/filter/cupsomatic - doins ${FILESDIR}/foomatic-gswrapper - fperms 755 /usr/lib/cups/filter/foomatic-gswrapper + exeinto /usr/lib/cups/filter + doexe ${FILESDIR}/cupsomatic + doexe ${FILESDIR}/foomatic-gswrapper - # gentoo config stuff insinto /etc/pam.d ; newins ${FILESDIR}/cups.pam cups exeinto /etc/init.d ; newexe ${FILESDIR}/cupsd.rc6 cupsd insinto /etc/xinetd.d ; newins ${FILESDIR}/cups.xinetd cups-lpd - - # we need to recreate these dirs outside in pkg_postinst() since they're - # empty and will get zapped on upgrade otherwise. - rm -rf ${D}/etc/cups/{certs,interfaces,ppd} - rm -rf ${D}/var } pkg_postinst() { - install -d ${ROOT}/var/log/cups - install -d ${ROOT}/var/spool + install -d -m0755 ${ROOT}/var/log/cups + install -d -m0755 ${ROOT}/var/spool install -m0700 -o lp -d ${ROOT}/var/spool/cups install -m1700 -o lp -d ${ROOT}/var/spool/cups/tmp install -m0711 -o lp -d ${ROOT}/etc/cups/certs diff --git a/net-print/cups/files/digest-cups-1.1.13-r3 b/net-print/cups/files/digest-cups-1.1.13-r3 deleted file mode 100644 index bf61983f40dc..000000000000 --- a/net-print/cups/files/digest-cups-1.1.13-r3 +++ /dev/null @@ -1 +0,0 @@ -MD5 b2ebc4b2ea4947e83e69804146a9a8b4 cups-1.1.13-source.tar.bz2 5432116 diff --git a/net-print/cups/files/digest-cups-1.1.14-r1 b/net-print/cups/files/digest-cups-1.1.14-r2 index b2cf7e05bf18..b2cf7e05bf18 100644 --- a/net-print/cups/files/digest-cups-1.1.14-r1 +++ b/net-print/cups/files/digest-cups-1.1.14-r2 |