Closes bug #624 (empty dirs disappearing on remerge/upgrade)

3 files changed, 117 insertions, 1 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index ad63f228beda..c8b628350ff1 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,11 @@
 # 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.3 2002/02/08 16:58:29 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.4 2002/02/10 03:37:26 drobbins Exp $
+
+*cups-1.1.13-r2 (9 Feb 2002)
+
+  9 Feb 2002; Daniel Robbins <drobbins@gentoo.org>: Moved all empty directory
+  creations to pkg_postinst() to prevent them from being unmerged on upgrade
 
 *cups-1.1.13-r1 (8 Feb 2002)
 
diff --git a/net-print/cups/cups-1.1.13-r2.ebuild b/net-print/cups/cups-1.1.13-r2.ebuild
new file mode 100644
index 000000000000..64749d851e41
--- /dev/null
+++ b/net-print/cups/cups-1.1.13-r2.ebuild
@@ -0,0 +1,110 @@
+# 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-r2.ebuild,v 1.1 2002/02/10 03:37:26 drobbins Exp $
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="http://www.cups.org"
+
+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/files/digest-cups-1.1.13-r2 b/net-print/cups/files/digest-cups-1.1.13-r2
new file mode 100644
index 000000000000..bf61983f40dc
--- /dev/null
+++ b/net-print/cups/files/digest-cups-1.1.13-r2
@@ -0,0 +1 @@
+MD5 b2ebc4b2ea4947e83e69804146a9a8b4 cups-1.1.13-source.tar.bz2 5432116