put cups source files back where they belong.

Package-Manager: portage-2.1

4 files changed, 163 insertions, 5 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 0a5b78038e72..ef1b8c27a876 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,12 @@
 # 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.172 2006/06/05 18:47:34 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.173 2006/06/13 18:30:35 rajiv Exp $
+
+*cups-1.2.1-r1 (13 Jun 2006)
+
+  13 Jun 2006; Rajiv Aaron Manglani <rajiv@gentoo.org>
+  +cups-1.2.1-r1.ebuild:
+  put cups source files back where they belong.
 
   05 Jun 2006; Stefan Schweizer <genstef@gentoo.org> -cups-1.2.0_pre.ebuild,
   -cups-1.2.0.ebuild, cups-1.2.1.ebuild:
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 2e18e77e026c..672bd4944f53 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -72,14 +72,18 @@ EBUILD cups-1.1.23-r7.ebuild 4608 RMD160 632e6dd43be3eb0c12ea172492b5b39902c9f9e
 MD5 bf5afc4432a75abcd25c934233de0406 cups-1.1.23-r7.ebuild 4608
 RMD160 632e6dd43be3eb0c12ea172492b5b39902c9f9e5 cups-1.1.23-r7.ebuild 4608
 SHA256 40e886b9a539b594135464a3fd6a8b63000878e8b1b7e2ebc6d29b22ae6bbb35 cups-1.1.23-r7.ebuild 4608
+EBUILD cups-1.2.1-r1.ebuild 4003 RMD160 e3cadfee9150d5ad4b7be0f6bfc2c8e8b4419552 SHA1 c230c2e170dac2b101a6a65737d93077e674fced SHA256 6fb014d4497dd9c78f220e93226e355720266f048699a6ffaa6734bbbaab6f63
+MD5 923a2c2a95fd93feac48bc5ecee2d2d4 cups-1.2.1-r1.ebuild 4003
+RMD160 e3cadfee9150d5ad4b7be0f6bfc2c8e8b4419552 cups-1.2.1-r1.ebuild 4003
+SHA256 6fb014d4497dd9c78f220e93226e355720266f048699a6ffaa6734bbbaab6f63 cups-1.2.1-r1.ebuild 4003
 EBUILD cups-1.2.1.ebuild 4046 RMD160 1f53ad79318aacfde5c82b19a8c5d4ce76e31b20 SHA1 e35a63b61ef5c68e13ca4e802d3b73286e19a01d SHA256 581f1d375871676c085bacb2494d6d1c30bfb18403f982d3ad06a080ad507dfb
 MD5 9e97662b8b617be6cf75225a2d1129bc cups-1.2.1.ebuild 4046
 RMD160 1f53ad79318aacfde5c82b19a8c5d4ce76e31b20 cups-1.2.1.ebuild 4046
 SHA256 581f1d375871676c085bacb2494d6d1c30bfb18403f982d3ad06a080ad507dfb cups-1.2.1.ebuild 4046
-MISC ChangeLog 23138 RMD160 4d85a62e19019cfbc81044beed4d6f565c87dfe2 SHA1 583a9bb2bd1e584b00f85261c0e42171e93a4a95 SHA256 3de5fa8287091fddb39ab1b0c58609e8084969993ed1bfc2a228bf958ba6497b
-MD5 72bb42f2ff1cc08caad503f308b2dd71 ChangeLog 23138
-RMD160 4d85a62e19019cfbc81044beed4d6f565c87dfe2 ChangeLog 23138
-SHA256 3de5fa8287091fddb39ab1b0c58609e8084969993ed1bfc2a228bf958ba6497b ChangeLog 23138
+MISC ChangeLog 23295 RMD160 23f08980284f6bd39127ceb484379cab499a566d SHA1 d70be0bba9ecd4183ccef6b7094c950796129d2e SHA256 49addf7ec22ef8e9df50a18af5e8fab8a27ab5df16d8b8fbf9a083a7721239c7
+MD5 07b9d5dd446c5b753df1766063e0a7c9 ChangeLog 23295
+RMD160 23f08980284f6bd39127ceb484379cab499a566d ChangeLog 23295
+SHA256 49addf7ec22ef8e9df50a18af5e8fab8a27ab5df16d8b8fbf9a083a7721239c7 ChangeLog 23295
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
@@ -96,3 +100,6 @@ SHA256 ac20d82dc48e47fa2124e971108c121a1e0600ae2215e4be38c138332b4c3415 files/di
 MD5 a89cd5824677acfcf778dbd54cbb2664 files/digest-cups-1.2.1 259
 RMD160 8aa0e96163aff3488fca924e02dc76268095cf11 files/digest-cups-1.2.1 259
 SHA256 74e565ea8d6b8d416c3e8f79d8e3043d0cdf95b0784806bf48608fab744048e3 files/digest-cups-1.2.1 259
+MD5 a89cd5824677acfcf778dbd54cbb2664 files/digest-cups-1.2.1-r1 259
+RMD160 8aa0e96163aff3488fca924e02dc76268095cf11 files/digest-cups-1.2.1-r1 259
+SHA256 74e565ea8d6b8d416c3e8f79d8e3043d0cdf95b0784806bf48608fab744048e3 files/digest-cups-1.2.1-r1 259
diff --git a/net-print/cups/cups-1.2.1-r1.ebuild b/net-print/cups/cups-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..63de097cc8c7
--- /dev/null
+++ b/net-print/cups/cups-1.2.1-r1.ebuild
@@ -0,0 +1,142 @@
+# 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.1-r1.ebuild,v 1.1 2006/06/13 18:30:35 rajiv Exp $
+
+inherit eutils pam flag-o-matic multilib autotools
+
+MY_P=${P/_/}
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="http://www.cups.org/"
+SRC_URI="http://ftp.easysw.com/pub/cups/${PV}/${MY_P}-source.tar.bz2"
+#ESVN_REPO_URI="http://svn.easysw.com/public/cups/trunk"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="ssl slp pam samba nls gnutls dbus"
+
+DEP="pam? ( virtual/pam )
+	ssl? (
+		!gnutls? ( >=dev-libs/openssl-0.9.6b )
+		gnutls? ( net-libs/gnutls )
+		)
+	slp? ( >=net-libs/openslp-1.0.4 )
+	dbus? ( sys-apps/dbus )
+	>=media-libs/libpng-1.2.1
+	>=media-libs/tiff-3.5.5
+	>=media-libs/jpeg-6b
+	app-text/libpaper"
+DEPEND="${DEP}
+	nls? ( sys-devel/gettext )"
+RDEPEND="${DEP}
+	nls? ( virtual/libintl )
+	!virtual/lpr
+	>=app-text/poppler-0.4.3-r1"
+PDEPEND="samba? ( >=net-fs/samba-3.0.8 )
+	virtual/ghostscript"
+PROVIDE="virtual/lpr"
+
+# upstream includes an interactive test which is a nono for gentoo.
+# therefore, since the printing herd has bigger fish to fry, for now,
+# we just leave it out, even if FEATURES=test
+RESTRICT="test"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewgroup lp
+	enewuser lp -1 -1 -1 lp
+
+	enewgroup lpadmin 106
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/cups-1.2.0-bindnow.patch
+
+	# upstream has refused to fix this for me
+	sed -i -e "s:#if defined(__linux) && defined(LP_POUTPA):#if 0:" backend/usb-unix.c
+
+	# cups does not use autotools "the usual way" and ship a static config.h.in
+	eaclocal
+	eautoconf
+}
+
+src_compile() {
+	local myconf
+
+	use ssl && \
+		myconf="${myconf} $(use_enable gnutls) $(use_enable !gnutls openssl)"
+
+	export DSOFLAGS="${LDFLAGS}"
+	econf \
+		--with-cups-user=lp \
+		--with-cups-group=lp \
+		--with-system-groups=lpadmin \
+		--localstatedir=/var \
+		--with-bindnow=$(bindnow-flags) \
+		$(use_enable pam) \
+		$(use_enable ssl) \
+		$(use_enable slp) \
+		$(use_enable nls) \
+		$(use_enable dbus) \
+		--enable-libpaper \
+		--enable-threads \
+		--enable-static \
+		--disable-pdftops \
+		${myconf} \
+		|| die "econf failed"
+
+	# 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"
+}
+
+src_install() {
+	make BUILDROOT=${D} install || die "make install failed"
+
+	# cleanups
+	rm -rf ${D}/etc/init.d ${D}/etc/pam.d ${D}/etc/rc* ${D}/usr/share/man/cat*
+
+	dodoc {CHANGES,CREDITS,LICENSE,README}.txt
+
+	pamd_mimic_system cups auth account
+	newinitd ${FILESDIR}/cupsd.rc6 cupsd
+
+	sed -i -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" ${D}/etc/xinetd.d/cups-lpd
+
+	# install pdftops filter
+	exeinto /usr/libexec/cups/filter/
+	newexe ${FILESDIR}/pdftops.pl pdftops
+
+	fowners lp:lp /var/log/cups /var/run/cups/certs /var/cache/cups \
+		/var/spool/cups/tmp /var/spool/cups /etc/cups/{,interfaces,ppd}
+	keepdir /var/log/cups /var/run/cups/certs /var/cache/cups /var/spool/cups/tmp
+}
+
+pkg_preinst() {
+	# cleanups
+	[ -n "${PN}" ] && rm -fR /usr/share/doc/${PN}-*
+}
+
+pkg_postinst() {
+	einfo "Remote printing: change "
+	echo "Listen localhost:631"
+	einfo "to"
+	echo "Listen *:631"
+	einfo "in /etc/cups/cupsd.conf"
+	einfo
+	einfo "For more information about installing a printer take a look at:"
+	einfo "http://www.gentoo.org/doc/en/printing-howto.xml."
+	einfo
+	einfo "You need to emerge ghostscript with the cups-USEflag turned on"
+	ewarn
+	ewarn "If you are updating from cups-1.1.* you need to remerge every ebuild"
+	ewarn "that installed into /usr/lib/cups: \"emerge -va \$(qfile -qC /usr/lib/cups)\""
+}
diff --git a/net-print/cups/files/digest-cups-1.2.1-r1 b/net-print/cups/files/digest-cups-1.2.1-r1
new file mode 100644
index 000000000000..90fc088bcc11
--- /dev/null
+++ b/net-print/cups/files/digest-cups-1.2.1-r1
@@ -0,0 +1,3 @@
+MD5 f804995e3f469bdefedc033510f6e6a5 cups-1.2.1-source.tar.bz2 3475342
+RMD160 84040c5ac65d4a3d13d813fb91f90cbccb211c25 cups-1.2.1-source.tar.bz2 3475342
+SHA256 10fb273b8118858fdce795608065860865432b2d9f1016b53fff1eb340385e45 cups-1.2.1-source.tar.bz2 3475342