Revbump with various patches i collected around.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 253 insertions, 2 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index bad1fcfa4a60..2902d9a2a978 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.394 2010/08/10 20:54:31 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.395 2010/08/13 08:42:58 scarabeus Exp $
+
+*cups-1.4.4-r1 (13 Aug 2010)
+
+  13 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  +cups-1.4.4-r1.ebuild:
+  Revbump with various patches i collected around.
 
   10 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org>
   cups-1.3.11-r1.ebuild, cups-1.3.11-r2.ebuild:
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 799622674a6a..af808ebd77b1 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -9,9 +9,11 @@ AUX cups-1.4.2-str3200.patch 1654 RMD160 cc40d26f7e9dbe5a12d9426535d09de10254da2
 AUX cupsd.init.d 293 RMD160 19fbef21cee7e472e7028f3101b680baa0089c54 SHA1 e6b27b2638fec258fe2f55c926c2530e909ca3d2 SHA256 b4268a6bae95e96b6af21c3716ecc905073736ce7dc33be1489d574a447f3c48
 AUX pdftops-1.20.gentoo 10412 RMD160 16e229662c47e03af1d1f4cb5764a76d17a66642 SHA1 6afb8a655b6ff013a2c8c8cbfb615ba1e561503b SHA256 ac5fa01ca776d75bd7cef62eef9f6b0c3945ee87e8950b40ca9f9f3ff46a16c1
 DIST cups-1.3.11-source.tar.bz2 3799393 RMD160 a0646f2ba29fbd39d211ea5c3fdbd24a00f66a78 SHA1 df5cfb64fb608fc128acadde670dc30af49bdb18 SHA256 5e310fd324a15fae1e1c9721879f5c948d788e04735a5263a40c6146fff607b8
+DIST cups-1.4.4-gentoopatches-01.tar.bz2 18305 RMD160 08290e81255170ccb9bf7300b439e69125a1980d SHA1 f9346484d67c406fe41d15f64dcfc0e58b03ee84 SHA256 3f5a5b35b5f11ee3b61fa6a51772632af0ff0d02710c2ca112aa6bb015f4cdaa
 DIST cups-1.4.4-source.tar.bz2 4472741 RMD160 1f486acda02e83b6824f8ca33b74c02ff3f01994 SHA1 3e179c007fa6cd6874b60ff18a6f48070547a00a SHA256 d25ffa35add3abeeec0eba60be2cffc89425b649c64ef3a73dfc724683a59aa3
 EBUILD cups-1.3.11-r1.ebuild 8236 RMD160 3d691e0cd89724f2f167c0df9b0709ebd5d1c568 SHA1 670d92532d1b436470e851e8fa3df90d3c0575f8 SHA256 cfce6af026847d98ed64c8ceb2c4114d2df6e896c6f2b0ab3605f9c1755701b7
 EBUILD cups-1.3.11-r2.ebuild 8431 RMD160 f57db7c53959e8f2e9f334019552210d662982d8 SHA1 a046c3c5255a9ac4e1c1c2b19d511e0aaac8d102 SHA256 c10dc5a854f9b859c236c29c09c87d3467c191bbad455eaa5d22d672e3166e6e
+EBUILD cups-1.4.4-r1.ebuild 6120 RMD160 9d6920db238e1769119ec9c41c31e39bfa5693aa SHA1 827eb0887d8eb4baf07caf0e83d7ef3f3ce747c0 SHA256 8fcd2a27af85732ab25aa973e89f600979a2ea36d9e5f2e977e3a87bd78eec92
 EBUILD cups-1.4.4.ebuild 5397 RMD160 a9112da2f66517b0735abafcb26e621fcb4bb0d7 SHA1 178b4523d05a8e653fe1eb534cc142a14db89cff SHA256 3c4636515f29c0cea04d56f570852f1df47e2aff648ba52577dd9d835e402e3d
-MISC ChangeLog 58383 RMD160 fd0a2c2c7a070e76c766d1180b20193b180c8b54 SHA1 fee01ed99542f8d280cf36b9b7bd0313cbf52498 SHA256 5f0b215fe483b825123debba7979d8edb9a568d123d05f9290fab710b68bee83
+MISC ChangeLog 58545 RMD160 971578e987255a53a68b2bc78cf127a1227dcacd SHA1 82021daf190511bc2ebb89f2ab11f90a50bcf6ad SHA256 2c517135a08c0168d6ee14ef34a81de61baaf6b2d6eea7dd9654f00d9fd4daf5
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
diff --git a/net-print/cups/cups-1.4.4-r1.ebuild b/net-print/cups/cups-1.4.4-r1.ebuild
new file mode 100644
index 000000000000..b187b1490b24
--- /dev/null
+++ b/net-print/cups/cups-1.4.4-r1.ebuild
@@ -0,0 +1,243 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.4-r1.ebuild,v 1.1 2010/08/13 08:42:59 scarabeus Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="python? 2:2.5"
+RESTRICT_PYTHON_ABIS="3.*"
+
+MY_P=${P/_}
+PATCH_VERSION=01
+SRC_PATCHES="http://gentoo.ccss.cz/${P}-gentoopatches-${PATCH_VERSION}.tar.bz2"
+
+inherit autotools eutils flag-o-matic multilib pam perl-module python versionator java-pkg-opt-2
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="http://www.cups.org/"
+SRC_URI="mirror://easysw/${PN}/${PV}/${MY_P}-source.tar.bz2
+	${SRC_PATCHES}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="X acl avahi dbus debug gnutls java +jpeg kerberos ldap pam perl php +png python samba slp +ssl static +threads +tiff +usb xinetd zeroconf"
+
+LANGS="da de es eu fi fr id it ja ko nl no pl pt pt_BR ru sv zh zh_TW"
+for X in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+RDEPEND="
+	app-text/libpaper
+	dev-libs/libgcrypt
+	X? ( x11-misc/xdg-utils )
+	acl? (
+		kernel_linux? (
+			sys-apps/acl
+			sys-apps/attr
+		)
+	)
+	avahi? ( net-dns/avahi[mdnsresponder-compat] )
+	dbus? ( sys-apps/dbus )
+	java? ( >=virtual/jre-1.6 )
+	jpeg? ( virtual/jpeg:0 )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap[ssl?,gnutls?] )
+	pam? ( virtual/pam )
+	perl? ( dev-lang/perl )
+	php? ( dev-lang/php )
+	png? ( >=media-libs/libpng-1.4.3 )
+	slp? ( >=net-libs/openslp-1.0.4 )
+	ssl? (
+		gnutls? ( net-libs/gnutls )
+		!gnutls? ( >=dev-libs/openssl-0.9.8g )
+	)
+	tiff? ( >=media-libs/tiff-3.5.5 )
+	usb? ( virtual/libusb:0 )
+	xinetd? ( sys-apps/xinetd )
+	zeroconf? (
+		!avahi? ( net-misc/mDNSResponder )
+	)
+"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	java? ( >=virtual/jdk-1.6 )
+"
+PDEPEND="
+	app-text/ghostscript-gpl[cups]
+	>=app-text/poppler-0.12.3-r3[utils]
+"
+
+# upstream includes an interactive test which is a nono for gentoo.
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup lp
+	enewuser lp -1 -1 -1 lp
+	enewgroup lpadmin 106
+
+	# python 3 is no-go
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	if [[ -n ${SRC_PATCHES} ]]; then
+		EPATCH_FORCE="yes" \
+		EPATCH_SOURCE="${WORKDIR}/patches" \
+		EPATCH_SUFFIX="patch" \
+		epatch
+	fi
+
+	AT_M4DIR=config-scripts eaclocal
+	eautoconf
+}
+
+src_configure() {
+	export DSOFLAGS="${LDFLAGS}"
+
+	# locale support
+	strip-linguas ${LANGS}
+	if [ -z "${LINGUAS}" ] ; then
+		export LINGUAS=none
+	fi
+
+	local myconf
+	if use ssl || use gnutls ; then
+		myconf+="
+			$(use_enable gnutls)
+			$(use_enable !gnutls openssl)
+		"
+	else
+		myconf+="
+			--disable-gnutls
+			--disable-openssl
+		"
+	fi
+
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		--localstatedir=/var \
+		--with-cups-user=lp \
+		--with-cups-group=lp \
+		--with-docdir=/usr/share/cups/html \
+		--with-languages="${LINGUAS}" \
+		--with-pdftops=/usr/bin/pdftops \
+		--with-system-groups=lpadmin \
+		$(use_enable acl) \
+		$(use_enable avahi) \
+		$(use_enable dbus) \
+		$(use_enable debug) \
+		$(use_enable debug debug-guards) \
+		$(use_enable jpeg) \
+		$(use_enable kerberos gssapi) \
+		$(use_enable ldap) \
+		$(use_enable pam) \
+		$(use_enable png) \
+		$(use_enable slp) \
+		$(use_enable static) \
+		$(use_enable threads) \
+		$(use_enable tiff) \
+		$(use_enable usb libusb) \
+		$(use_enable zeroconf dnssd) \
+		$(use_with java) \
+		$(use_with perl) \
+		$(use_with php) \
+		$(use_with python) \
+		$(use_with xinetd xinetd /etc/xinetd.d) \
+		--enable-libpaper \
+		${myconf}
+
+	# 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
+}
+
+src_compile() {
+	emake || die "emake failed"
+
+	# perl
+	if use perl; then
+		cd "${S}"/scripting/perl
+		perl-module_src_prep
+		perl-module_src_compile
+	fi
+
+	# php
+	if use php; then
+		cd "${S}"/scripting/php
+		emake || die "emake php failed"
+	fi
+}
+
+src_install() {
+	emake BUILDROOT="${D}" install || die "emake install failed"
+	dodoc {CHANGES,CREDITS,README}.txt || die "dodoc install failed"
+
+	# perl
+	if use perl; then
+		cd "${S}"/scripting/perl
+		perl-module_src_install
+		fixlocalpod
+	fi
+
+	# php
+	if use php; then
+		cd "${S}"/scripting/php
+		emake DESTDIR="${D}" install || die "emake install for php bindings failed"
+	fi
+
+	# clean out cups init scripts
+	rm -rf "${D}"/etc/{init.d/cups,rc*,pam.d/cups}
+
+	# install our init script
+	local neededservices
+	use avahi && neededservices+=" avahi-daemon"
+	use dbus && neededservices+=" dbus"
+	use zeroconf && ! use avahi && neededservices+=" mDNSResponderPosix"
+	[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
+	cp "${FILESDIR}"/cupsd.init.d "${T}"/cupsd || die
+	sed -i \
+		-e "s/@neededservices@/$neededservices/" \
+		"${T}"/cupsd || die
+	doinitd "${T}"/cupsd || die "doinitd failed"
+
+	# install our pam script
+	pamd_mimic_system cups auth account
+
+	if use xinetd ; then
+		# correct path
+		sed -i \
+			-e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \
+			"${D}"/etc/xinetd.d/cups-lpd || die
+		# it is safer to disable this by default, bug #137130
+		grep -w 'disable' "${D}"/etc/xinetd.d/cups-lpd || \
+			{ sed -i -e "s:}:\tdisable = yes\n}:" "${D}"/etc/xinetd.d/cups-lpd || die ; }
+	else
+		rm -rf "${D}"/etc/xinetd.d
+	fi
+
+	keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
+		/var/cache/cups /var/cache/cups/rss /var/log/cups /var/run/cups/certs \
+		/var/spool/cups/tmp
+
+	keepdir /etc/cups/{interfaces,ppd,ssl}
+
+	use X || rm -r "${D}"/usr/share/applications
+
+	# create /etc/cups/client.conf, bug #196967 and #266678
+	echo "ServerName /var/run/cups/cups.sock" >> "${D}"/etc/cups/client.conf
+}
+
+pkg_postinst() {
+	echo
+	elog "For information about installing a printer and general cups setup"
+	elog "take a look at: http://www.gentoo.org/doc/en/printing-howto.xml"
+	echo
+}