cups version bumps.

12 files changed, 500 insertions, 353 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 2efd0f4..a2407e9 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,7 +1,20 @@
 # ChangeLog for net-print/cups
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*cups-1.4.5 (03 Jan 2011)
+*cups-1.4.4-r2 (03 Jan 2011)
+*cups-1.3.11-r4 (03 Jan 2011)
+
+  03 Jan 2011; Daniel Solano Gómez <gentoo@sattvik.com>
+  -cups-1.3.11-r2.ebuild, -cups-1.3.11-r3.ebuild, +cups-1.3.11-r4.ebuild,
+  +files/cups-1.3.11-pdf-m4.patch, -cups-1.4.4.ebuild, +cups-1.4.4-r2.ebuild,
+  +files/cups-1.4.4-dont-compress-manpages.patch,
+  +files/cups-1.4.4-fix-install-perms.patch, +files/cups-1.4.4-nostrip.patch,
+  +files/cups-1.4.4-perl-includes.patch, +files/cups-1.4.4-php-destdir.patch,
+  +cups-1.4.5.ebuild:
+  Version bumps/sync with portage.
+
 *cups-1.3.11-r3 (15 Nov 2010)
 
   15 Nov 2010; Daniel Solano Gómez <gentoo@sattvik.com>
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index a7fe2d3..0c34450 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,5 +1,6 @@
 AUX cups-1.3.0-configure.patch 651 RMD160 e4c7f45d7ddc28157433bf025c7f946c7e3b6d6a SHA1 101bf1893b56640d9fa82078e29319fbbd1449c7 SHA256 d6e5e60a982a3c093c0d0f89cf865e2b4c36290f5b1e188b7bf305d210070736
 AUX cups-1.3.10-str3178.patch 888 RMD160 ff061fc3500960f441c59896cdfe421d5f47f386 SHA1 fac5361b1172aba167d48988f874faa6faf1554a SHA256 e6550fad17017ac6897e6e9c70a4aafaaec5473c05a19e9e50277293cdc6aac6
+AUX cups-1.3.11-pdf-m4.patch 1476 RMD160 be4d4ed2b699625282c9725faee08e01edca9b7a SHA1 a8b092b9c155c161c781319a94cb1bb7de734c3f SHA256 191b0c41c142ed31718fc01f55fcefc6c26735fa56165c23450fd7a454818b01
 AUX cups-1.3.11-str3200.patch 1782 RMD160 6c9134d1bc90650b882e167a5ae118d0f239b7ae SHA1 adb5b0ef222ad5beb2424bcb93a3c891af6a744e SHA256 2ae6d48ce7071051120740d654787be1bba0258752f4844f55a18f8e03e062e6
 AUX cups-1.3.11-str3367-security-1.3v2.patch 12834 RMD160 e770139528cbdf918f5c9073fbea8b31f30cac0f SHA1 81825028af8021aff2e67a36d8e9aa71cbbb42f4 SHA256 d4d770ce17855293348059451909fecbcc9e968d6731ac73b8d81927e2afe134
 AUX cups-1.3.11-str3401-security-1.3v2-regression.patch 871 RMD160 bb08b55e8d61341e9eeecc8fe99ba743d38500dd SHA1 33a919f4ef5de3c780f6f35e68d096ccf8371718 SHA256 ab9f24c05a422995b9ee274f36ffa0a9a6dca4d55fde4830a31201d1e61bd756
@@ -8,12 +9,18 @@ AUX cups-1.3.8-group_fix.patch 1755 RMD160 c26e4b0fb3d47b022200c4220807c0116038f
 AUX cups-1.4.0-backend-https.patch 483 RMD160 b338f67ebf0719b5e12eaa8490affbd7a1bb8c0e SHA1 bfeadba67792203d654a64bdec16f3d2a31aeca6 SHA256 9060a5d848d6655db4629822d01fd772a3fbe1a5107109c50cb0ecb4de7a9526
 AUX cups-1.4.1-group_fix.patch 1752 RMD160 b2e8fde6ddc0e385e85ced4e38668bea23cde800 SHA1 241fa8f1220976cd69c447bc276d17d8808c8eed SHA256 625a5abff28d58ef0f747781777535549ddba77dd36f1cf72c3aea7a4fdafaab
 AUX cups-1.4.2-str3200.patch 1654 RMD160 cc40d26f7e9dbe5a12d9426535d09de10254da26 SHA1 b330108bcfb8ca3ab5d6dd3b48dc3d2937c7bca1 SHA256 8a64f5c72d64ecd95d330fd90630eb02a67865c07921ecb0c010e84b49b537e0
+AUX cups-1.4.4-dont-compress-manpages.patch 580 RMD160 cbc2bf11025c1f27286bd7f2ece7ba76be6aa7ee SHA1 d7b2447263724eeb092b8cfc8ce54553ad1e5e11 SHA256 cdefd273dcdc78aa5fe14bb0246e25572da7d28a91de5c7ac8be2a0bdd915860
+AUX cups-1.4.4-fix-install-perms.patch 838 RMD160 206bd49e918bab96d24ca72f85f679d3c9122975 SHA1 6e8ef0f3e5c0efa636b4d2324bab2c8edc9461db SHA256 66e68f3bebd7339434e3de99582190d0bedce4b2e5370ff65104cc863daee6c2
+AUX cups-1.4.4-nostrip.patch 487 RMD160 27fe9a5512abb3496416e492dc4ec4fcd9c733c2 SHA1 2a1b6e7b718a5feb5921f38ec02f37b9d0edd310 SHA256 b96448896f08c5f91d5afb0c093f2638a262d1c45e716c29d5164cefee18bc61
+AUX cups-1.4.4-perl-includes.patch 637 RMD160 88d4f170ed5c9392860462f140adf9f860a24cfd SHA1 93185acfe7252ff9a69499f63192b3483d857cb0 SHA256 c730419e7b4bc16a8773a01eeb66523882901480af68686d0790558a2f5fe57d
+AUX cups-1.4.4-php-destdir.patch 679 RMD160 1b15d42373a952a608a01cb8c97efbbd3c78ac77 SHA1 e312bbae57224dead45284f9c62942b1a25282fc SHA256 d5126c5e917d8c41c7a4da1477800edd4aa752aaa4c6a67a73adbe1e3b050110
 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-source.tar.bz2 4472741 RMD160 1f486acda02e83b6824f8ca33b74c02ff3f01994 SHA1 3e179c007fa6cd6874b60ff18a6f48070547a00a SHA256 d25ffa35add3abeeec0eba60be2cffc89425b649c64ef3a73dfc724683a59aa3
-EBUILD cups-1.3.11-r2.ebuild 8481 RMD160 d08b759e1acb34da7b3f2009aea06b5d080b3501 SHA1 d1f0249a4ccf75a805ea49ef55004d8d3372e4ac SHA256 a8f9b650b1100d3750f8e52d50ff43269bac4e33f9fba7e263c9b4371790e773
-EBUILD cups-1.3.11-r3.ebuild 8431 RMD160 f57db7c53959e8f2e9f334019552210d662982d8 SHA1 a046c3c5255a9ac4e1c1c2b19d511e0aaac8d102 SHA256 c10dc5a854f9b859c236c29c09c87d3467c191bbad455eaa5d22d672e3166e6e
-EBUILD cups-1.4.4.ebuild 5400 RMD160 90b06cbfee318ca5cf9739de5d32ff9dfa1148e2 SHA1 4592083288218af2bbe7c5f22c76ba07d1479983 SHA256 f2692257285ffefab0da908a3dbcf918ed13f9c18fa49ca4e9e380f81ebeacd9
-MISC ChangeLog 1315 RMD160 114884c6ae8c6126051a995503954cc8946d77af SHA1 9926e40517329328fd95f0649d3323d188a6d39f SHA256 9e89083f8b20a72e487566b95769ce59a24475ba11106f8525244699201eb77f
+DIST cups-1.4.5-source.tar.bz2 4513924 RMD160 3fb32cd845d56e3fe7ef9c54f1d761bcee908218 SHA1 68af37234645954e1bfad6a3608c67c03a9aef78 SHA256 0450d6d8e6e8af225d2a3319c848737d76473a6c7579cf97c52086d0371c0efe
+EBUILD cups-1.3.11-r4.ebuild 8570 RMD160 f4cb3829a78854fa2ddd436ba3820a94e990a758 SHA1 28332d7519726f953f895f27a38d422d01e2073c SHA256 ac80899f70d916ce97a5886787f599e8979124e421b314eb5d4a9768965c44b4
+EBUILD cups-1.4.4-r2.ebuild 6197 RMD160 231bcf181ca0bfa903aa2e3bf38614e021f83dd7 SHA1 402e7d8ba906aefc83b2fff22e56690462316eea SHA256 41c7f1718d352574e82ab99bbb247bf41ba26e9563988ed323a077108d9504b0
+EBUILD cups-1.4.5.ebuild 6194 RMD160 15c698d90b645b92a12d7dbef2cb9dc2b3159011 SHA1 1fc5a3d4accb7374e30e090dbfd12c1bc2735016 SHA256 88597b8400f140fb0a22cc4dfb548ee365f7286fa30da31510bd42dc1cfab7a8
+MISC ChangeLog 1874 RMD160 e9ab6529d5095a5a33b501931fcdefd8df7ce34b SHA1 8c05ee0090aed6d259405e9aaf197f2ec3b01dda SHA256 e592a5895024366d21233c09d1d0a7c1a8a2e9a4b77ce0eac2baa4b8d532b59b
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
diff --git a/net-print/cups/cups-1.3.11-r3.ebuild b/net-print/cups/cups-1.3.11-r3.ebuild
deleted file mode 100644
index 1195c5a..0000000
--- a/net-print/cups/cups-1.3.11-r3.ebuild
+++ /dev/null
@@ -1,298 +0,0 @@
-# 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.3.11-r2.ebuild,v 1.13 2010/08/10 20:54:31 scarabeus Exp $
-
-EAPI=2
-inherit autotools eutils flag-o-matic multilib pam
-
-MY_P=${P/_}
-
-DESCRIPTION="The Common Unix Printing System"
-HOMEPAGE="http://www.cups.org/"
-SRC_URI="mirror://easysw/${PN}/${PV}/${MY_P}-source.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="acl avahi dbus gnutls java jpeg kerberos ldap pam perl php png ppds python samba slp ssl static tiff X xinetd zeroconf"
-
-COMMON_DEPEND="
-	app-text/libpaper
-	dev-libs/libgcrypt
-	acl? (
-		kernel_linux? (
-			sys-apps/acl
-			sys-apps/attr
-		)
-	)
-	avahi? ( net-dns/avahi[mdnsresponder-compat] )
-	dbus? ( sys-apps/dbus )
-	gnutls? ( net-libs/gnutls )
-	java? ( >=virtual/jre-1.4 )
-	jpeg? ( >=media-libs/jpeg-6b )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	pam? ( virtual/pam )
-	perl? ( dev-lang/perl )
-	php? ( dev-lang/php )
-	png? ( >=media-libs/libpng-1.2.1 )
-	python? ( dev-lang/python )
-	slp? ( >=net-libs/openslp-1.0.4 )
-	ssl? (
-		!gnutls? ( >=dev-libs/openssl-0.9.8g )
-	)
-	tiff? ( >=media-libs/tiff-3.5.5 )
-	xinetd? ( sys-apps/xinetd )
-	zeroconf? (
-		!avahi? ( net-misc/mDNSResponder )
-	)
-"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	!<net-print/foomatic-filters-ppds-20070501
-	!<net-print/hplip-1.7.4a-r1
-	!virtual/lpr
-	X? ( x11-misc/xdg-utils )
-"
-PDEPEND="
-	app-text/ghostscript-gpl
-	>=app-text/poppler-0.12.3-r3[utils]
-	ppds? (
-		|| (
-			(
-				net-print/foomatic-filters-ppds
-				net-print/foomatic-db-ppds
-			)
-			net-print/foomatic-filters-ppds
-			net-print/foomatic-db-ppds
-			net-print/hplip
-			net-print/gutenprint
-			net-print/foo2zjs
-			net-print/cups-pdf
-		)
-	)
-	samba? ( >=net-fs/samba-3.0.8 )
-"
-
-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}"
-
-LANGS="de en es et fr he id it ja pl sv zh_TW"
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-pkg_setup() {
-	enewgroup lp
-	enewuser lp -1 -1 -1 lp
-
-	enewgroup lpadmin 106
-}
-
-src_prepare() {
-	# disable configure automagic for acl/attr, upstream bug STR #2723
-	epatch "${FILESDIR}/${PN}-1.3.0-configure.patch"
-
-	# create a missing symlink to allow https printing via IPP, bug #217293
-	epatch "${FILESDIR}/${PN}-1.3.7-backend-https.patch"
-
-	# detect recent libgnutls versions, upstream bug STR #3178
-	epatch "${FILESDIR}/${PN}-1.3.10-str3178.patch"
-
-	# CVE-2009-2820: Several XSS flaws in forms processed by CUPS web interface
-	# upstream bug STR #3178 and STR #3401
-	epatch "${FILESDIR}/${PN}-1.3.11-str3367-security-1.3v2.patch"
-	epatch "${FILESDIR}/${PN}-1.3.11-str3401-security-1.3v2-regression.patch"
-	# CVE-2009-3553: Use-after-free (crash) due improper reference counting in abstract file descriptors handling interface
-	# upstream bug STR #3200
-	epatch "${FILESDIR}/${PN}-1.3.11-str3200.patch"
-
-	# cups does not use autotools "the usual way" and ship a static config.h.in
-	eaclocal
-	eautoconf
-}
-
-src_configure() {
-	# Fails to compile on SH
-	use sh && replace-flags -O? -O0
-
-	# needed to prevent ghostscript compile failures
-	use kerberos && strip-flags
-
-	# locale support
-	strip-linguas ${LANGS}
-
-	if [ -z "${LINGUAS}" ] ; then
-		export LINGUAS=all
-	fi
-
-	export DSOFLAGS="${LDFLAGS}"
-
-	if use ldap ; then
-		append-flags -DLDAP_DEPRECATED
-	fi
-
-	local myconf
-
-	if use avahi || use zeroconf ; then
-		myconf="${myconf} --enable-dnssd"
-	else
-		myconf="${myconf} --disable-dnssd"
-	fi
-
-	if use ssl || use gnutls ; then
-		myconf="${myconf} \
-			$(use_enable gnutls) \
-			$(use_enable !gnutls openssl)"
-	else
-		myconf="${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 \
-		--with-xinetd=/etc/xinetd.d \
-		$(use_enable acl) \
-		$(use_enable dbus) \
-		$(use_enable jpeg) \
-		$(use_enable kerberos gssapi) \
-		$(use_enable ldap) \
-		$(use_enable pam) \
-		$(use_enable png) \
-		$(use_enable slp) \
-		$(use_enable static) \
-		$(use_enable tiff) \
-		$(use_with java) \
-		$(use_with perl) \
-		$(use_with php) \
-		$(use_with python) \
-		--enable-libpaper \
-		--enable-pdftops \
-		--enable-threads \
-		--with-optim="${CFLAGS}" \
-		${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
-	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
-}
-
-src_install() {
-	emake BUILDROOT="${D}" install || die "emake install failed"
-	dodoc {CHANGES{,-1.{0,1}},CREDITS,README}.txt || die "dodoc install failed"
-
-	# 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="$neededservices avahi-daemon"
-	use dbus && neededservices="$neededservices dbus"
-	use zeroconf && ! use avahi && neededservices="$neededservices mDNSResponderPosix"
-	[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
-	sed -e "s/@neededservices@/$neededservices/" "${FILESDIR}"/cupsd.init.d > "${T}"/cupsd
-	doinitd "${T}"/cupsd
-
-	# 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
-		# 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
-	else
-		rm -rf "${D}"/etc/xinetd.d
-	fi
-
-	keepdir /usr/share/cups/profiles /usr/libexec/cups/driver /var/log/cups \
-		/var/run/cups/certs /var/cache/cups /var/spool/cups/tmp /etc/cups/ssl
-
-	# .desktop handling. X useflag. xdg-open from freedesktop is preferred, upstream bug STR #2724.
-	if use X ; then
-		sed -i -e "s:htmlview:xdg-open:" "${D}"/usr/share/applications/cups.desktop
-	else
-		rm -r "${D}"/usr/share/applications
-	fi
-
-	# fix a symlink collision, see bug #172341
-	dodir /usr/share/ppd
-	dosym /usr/share/ppd /usr/share/cups/model/foomatic-ppds
-
-	# create RSS feed directory
-	diropts -m 0740 -o lp -g lp
-	dodir /var/cache/cups/rss
-
-	# create /etc/cups/client.conf, bug #196967 and #266678
-	echo "ServerName /var/run/cups/cups.sock" >> "${D}"/etc/cups/client.conf
-}
-
-pkg_preinst() {
-	# cleanups
-	[ -n "${PN}" ] && rm -fR "${ROOT}"/usr/share/doc/"${PN}"-*
-	has_version "=${CATEGORY}/${PN}-1.2*"
-	upgrade_from_1_2=$?
-}
-
-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
-
-	local good_gs=false
-	for x in app-text/ghostscript-gpl app-text/ghostscript-gnu ; do
-		if has_version ${x} && built_with_use ${x} cups ; then
-			good_gs=true
-			break
-		fi
-	done
-	if ! ${good_gs} ; then
-		echo
-		ewarn "You need to emerge ghostscript with the \"cups\" USE flag turned on."
-		echo
-	fi
-
-	if [[ $upgrade_from_1_2 = 0 ]] ; then
-		echo
-		ewarn "You have upgraded from an older cups version. Please make sure"
-		ewarn "to run \"etc-update\" and \"revdep-rebuild\" NOW."
-		echo
-	fi
-
-	if [ -e "${ROOT}"/usr/lib/cups ] ; then
-		echo
-		ewarn "/usr/lib/cups exists - You need to remerge every ebuild that"
-		ewarn "installed into /usr/lib/cups and /etc/cups, qfile is in portage-utils:"
-		ewarn "# FEATURES=-collision-protect emerge -va1 \$(qfile -qC /usr/lib/cups /etc/cups | sed -e \"s:net-print/cups$::\")"
-		echo
-		ewarn "FEATURES=-collision-protect is needed to overwrite the compatibility"
-		ewarn "symlinks installed by this package, it won't be needed on later merges."
-		ewarn "You should also run revdep-rebuild"
-		echo
-
-		# place symlinks to make the update smoothless
-		for i in "${ROOT}"/usr/lib/cups/{backend,filter}/* ; do
-			if [ "${i/\*}" == "${i}" ] && ! [ -e ${i/lib/libexec} ] ; then
-				ln -s ${i} ${i/lib/libexec}
-			fi
-		done
-	fi
-}
diff --git a/net-print/cups/cups-1.3.11-r2.ebuild b/net-print/cups/cups-1.3.11-r4.ebuild
index 119a2ba..3a70f20 100644
--- a/net-print/cups/cups-1.3.11-r2.ebuild
+++ b/net-print/cups/cups-1.3.11-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.11-r2.ebuild,v 1.13 2010/08/10 20:54:31 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.11-r4.ebuild,v 1.1 2010/12/01 13:03:55 scarabeus Exp $
 
 EAPI=2
 inherit autotools eutils flag-o-matic multilib pam
@@ -104,7 +104,6 @@ src_prepare() {
 
 	# detect recent libgnutls versions, upstream bug STR #3178
 	epatch "${FILESDIR}/${PN}-1.3.10-str3178.patch"
-	epatch "${FILESDIR}/${PN}-1.3.8-group_fix.patch"
 
 	# CVE-2009-2820: Several XSS flaws in forms processed by CUPS web interface
 	# upstream bug STR #3178 and STR #3401
@@ -113,6 +112,11 @@ src_prepare() {
 	# CVE-2009-3553: Use-after-free (crash) due improper reference counting in abstract file descriptors handling interface
 	# upstream bug STR #3200
 	epatch "${FILESDIR}/${PN}-1.3.11-str3200.patch"
+	# Fix failing if poppler is not around
+	epatch "${FILESDIR}/${PN}-1.3.11-pdf-m4.patch"
+
+	# Dan's groups patch
+	epatch "${FILESDIR}/${PN}-1.3.8-group_fix.patch"
 
 	# cups does not use autotools "the usual way" and ship a static config.h.in
 	eaclocal
@@ -182,7 +186,6 @@ src_configure() {
 		$(use_with php) \
 		$(use_with python) \
 		--enable-libpaper \
-		--enable-pdftops \
 		--enable-threads \
 		--with-optim="${CFLAGS}" \
 		${myconf}
diff --git a/net-print/cups/cups-1.4.4-r2.ebuild b/net-print/cups/cups-1.4.4-r2.ebuild
new file mode 100644
index 0000000..e5f3ae0
--- /dev/null
+++ b/net-print/cups/cups-1.4.4-r2.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2011 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-r2.ebuild,v 1.3 2010/09/12 17:19:23 scarabeus Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="python? 2:2.5"
+
+inherit autotools eutils flag-o-matic multilib pam perl-module python versionator java-pkg-opt-2
+
+MY_P=${P/_}
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="http://www.cups.org/"
+SRC_URI="mirror://easysw/${PN}/${PV}/${MY_P}-source.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="acl dbus debug gnutls java +jpeg kerberos ldap pam perl php +png python samba slp +ssl static-libs +threads +tiff +usb X xinetd"
+
+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
+	acl? (
+		kernel_linux? (
+			sys-apps/acl
+			sys-apps/attr
+		)
+	)
+	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 )
+	X? ( x11-misc/xdg-utils )
+	xinetd? ( sys-apps/xinetd )
+	!net-print/cupsddk
+"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+"
+
+PDEPEND="
+	app-text/ghostscript-gpl[cups]
+	>=app-text/poppler-0.12.3-r3[utils]
+"
+
+PROVIDE="virtual/lpr"
+
+# 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() {
+	# create a missing symlink to allow https printing via IPP, bug #217293
+	epatch "${FILESDIR}/${PN}-1.4.0-backend-https.patch"
+	# various build time fixes
+	epatch "${FILESDIR}/${PN}-1.4.4-dont-compress-manpages.patch"
+	epatch "${FILESDIR}/${PN}-1.4.4-fix-install-perms.patch"
+	epatch "${FILESDIR}/${PN}-1.4.4-nostrip.patch"
+	epatch "${FILESDIR}/${PN}-1.4.4-php-destdir.patch"
+	epatch "${FILESDIR}/${PN}-1.4.4-perl-includes.patch"
+
+	# Dan's group fix
+	epatch "${FILESDIR}/${PN}-1.4.1-group_fix.patch"
+
+	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 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-libs static) \
+		$(use_enable threads) \
+		$(use_enable tiff) \
+		$(use_enable usb libusb) \
+		$(use_with java) \
+		$(use_with perl) \
+		$(use_with php) \
+		$(use_with python) \
+		$(use_with xinetd xinetd /etc/xinetd.d) \
+		--enable-libpaper \
+		--disable-dnssd \
+		${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"
+
+	if use perl ; then
+		cd "${S}"/scripting/perl
+		perl-module_src_prep
+		perl-module_src_compile
+	fi
+
+	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"
+
+	if use perl ; then
+		cd "${S}"/scripting/perl
+		perl-module_src_install
+		fixlocalpod
+	fi
+
+	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 dbus && neededservices+=" dbus"
+	[[ -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 ; }
+		# write permission for file owner (root), bug #296221
+		fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed"
+	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
+}
diff --git a/net-print/cups/cups-1.4.4.ebuild b/net-print/cups/cups-1.4.5.ebuild
index 48f54bb..3f76c7d 100644
--- a/net-print/cups/cups-1.4.4.ebuild
+++ b/net-print/cups/cups-1.4.5.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.ebuild,v 1.1 2010/06/22 21:52:23 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.5.ebuild,v 1.1 2010/12/01 12:34:34 scarabeus Exp $
 
-EAPI="2"
+EAPI=3
 
-inherit autotools eutils flag-o-matic multilib pam versionator
+PYTHON_DEPEND="python? 2:2.5"
+
+inherit autotools eutils flag-o-matic multilib pam perl-module python versionator java-pkg-opt-2
 
 MY_P=${P/_}
 
@@ -15,9 +17,14 @@ SRC_URI="mirror://easysw/${PN}/${PV}/${MY_P}-source.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="acl dbus debug gnutls java +jpeg kerberos ldap pam perl php +png python samba slp +ssl static +tiff +usb X xinetd"
+IUSE="acl dbus debug gnutls java +jpeg kerberos ldap pam perl php +png python samba slp +ssl static-libs +threads +tiff +usb X xinetd"
+
+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
 
-COMMON_DEPEND="
+RDEPEND="
 	app-text/libpaper
 	dev-libs/libgcrypt
 	acl? (
@@ -27,31 +34,30 @@ COMMON_DEPEND="
 		)
 	)
 	dbus? ( sys-apps/dbus )
-	gnutls? ( net-libs/gnutls )
-	java? ( >=virtual/jre-1.4 )
-	jpeg? ( >=media-libs/jpeg-6b:0 )
+	java? ( >=virtual/jre-1.6 )
+	jpeg? ( virtual/jpeg:0 )
 	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
+	ldap? ( net-nds/openldap[ssl?,gnutls?] )
 	pam? ( virtual/pam )
 	perl? ( dev-lang/perl )
 	php? ( dev-lang/php )
-	png? ( >=media-libs/libpng-1.2.1 )
-	python? ( dev-lang/python )
+	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? ( dev-libs/libusb )
+	usb? ( virtual/libusb:0 )
+	X? ( x11-misc/xdg-utils )
 	xinetd? ( sys-apps/xinetd )
+	!net-print/cupsddk
 "
-DEPEND="${COMMON_DEPEND}"
 
-RDEPEND="${COMMON_DEPEND}
-	!net-print/cupsddk
-	!virtual/lpr
-	X? ( x11-misc/xdg-utils )
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
 "
+
 PDEPEND="
 	app-text/ghostscript-gpl[cups]
 	>=app-text/poppler-0.12.3-r3[utils]
@@ -60,38 +66,40 @@ PDEPEND="
 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}"
 
-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
-
 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() {
-	# remove default optimizations and do not strip by default
-	sed -e 's:OPTIM="-Os -g":OPTIM="":' \
-		-e 's:INSTALL_STRIP="-s":INSTALL_STRIP="":' \
-		-i config-scripts/cups-compiler.m4
-
 	# create a missing symlink to allow https printing via IPP, bug #217293
 	epatch "${FILESDIR}/${PN}-1.4.0-backend-https.patch"
+	# various build time fixes
+	epatch "${FILESDIR}/${PN}-1.4.4-dont-compress-manpages.patch"
+	epatch "${FILESDIR}/${PN}-1.4.4-fix-install-perms.patch"
+	epatch "${FILESDIR}/${PN}-1.4.4-nostrip.patch"
+	epatch "${FILESDIR}/${PN}-1.4.4-php-destdir.patch"
+	epatch "${FILESDIR}/${PN}-1.4.4-perl-includes.patch"
+
+	# Dan's group fix
+	epatch "${FILESDIR}/${PN}-1.4.1-group_fix.patch"
 
 	AT_M4DIR=config-scripts eaclocal
-	epatch "${FILESDIR}/${PN}-1.4.1-group_fix.patch"
 	eautoconf
 }
 
 src_configure() {
+	export DSOFLAGS="${LDFLAGS}"
+
 	# locale support
 	strip-linguas ${LANGS}
 	if [ -z "${LINGUAS}" ] ; then
@@ -100,13 +108,15 @@ src_configure() {
 
 	local myconf
 	if use ssl || use gnutls ; then
-		myconf="${myconf} \
-			$(use_enable gnutls) \
-			$(use_enable !gnutls openssl)"
+		myconf+="
+			$(use_enable gnutls)
+			$(use_enable !gnutls openssl)
+		"
 	else
-		myconf="${myconf} \
-			--disable-gnutls \
-			--disable-openssl"
+		myconf+="
+			--disable-gnutls
+			--disable-openssl
+		"
 	fi
 
 	econf \
@@ -128,7 +138,8 @@ src_configure() {
 		$(use_enable pam) \
 		$(use_enable png) \
 		$(use_enable slp) \
-		$(use_enable static) \
+		$(use_enable static-libs static) \
+		$(use_enable threads) \
 		$(use_enable tiff) \
 		$(use_enable usb libusb) \
 		$(use_with java) \
@@ -137,29 +148,57 @@ src_configure() {
 		$(use_with python) \
 		$(use_with xinetd xinetd /etc/xinetd.d) \
 		--enable-libpaper \
-		--enable-threads \
 		--disable-dnssd \
 		${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
-	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
+	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"
+
+	if use perl ; then
+		cd "${S}"/scripting/perl
+		perl-module_src_prep
+		perl-module_src_compile
+	fi
+
+	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"
 
+	if use perl ; then
+		cd "${S}"/scripting/perl
+		perl-module_src_install
+		fixlocalpod
+	fi
+
+	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 dbus && neededservices="$neededservices dbus"
+	use dbus && neededservices+=" dbus"
 	[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
-	sed -e "s/@neededservices@/$neededservices/" "${FILESDIR}"/cupsd.init.d > "${T}"/cupsd
+	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
@@ -167,10 +206,14 @@ src_install() {
 
 	if use xinetd ; then
 		# correct path
-		sed -i -e "s:server = .*:server = /usr/libexec/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 || 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
+			{ sed -i -e "s:}:\tdisable = yes\n}:" "${D}"/etc/xinetd.d/cups-lpd || die ; }
+		# write permission for file owner (root), bug #296221
+		fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed"
 	else
 		rm -rf "${D}"/etc/xinetd.d
 	fi
diff --git a/net-print/cups/files/cups-1.3.11-pdf-m4.patch b/net-print/cups/files/cups-1.3.11-pdf-m4.patch
new file mode 100644
index 0000000..830ecfb
--- /dev/null
+++ b/net-print/cups/files/cups-1.3.11-pdf-m4.patch
@@ -0,0 +1,52 @@
+# This patch is taken from cups 1.4.5 and fixes annoying requirement to have poppler around during build-time
+
+--- cups-1.3.11/config-scripts/cups-pdf.m4	2009-03-12 22:34:21.000000000 +0100
++++ cups-1.4.5/config-scripts/cups-pdf.m4	2009-08-08 00:30:30.000000000 +0200
+@@ -13,12 +13,7 @@
+ dnl   file is missing or damaged, see the license at "http://www.cups.org/".
+ dnl
+ 
+-AC_ARG_ENABLE(pdftops, [  --enable-pdftops        build pdftops filter, default=auto ])
+-AC_ARG_WITH(pdftops, [  --with-pdftops          set pdftops filter (gs,pdftops,none), default=pdftops ])
+-
+-if test "x$enable_pdftops" = xno -a "x$with_pdftops" = x; then
+-	with_pdftops=no
+-fi
++AC_ARG_WITH(pdftops, [  --with-pdftops          set pdftops filter (gs,/path/to/gs,pdftops,/path/to/pdftops,none), default=pdftops ])
+ 
+ PDFTOPS=""
+ CUPS_PDFTOPS=""
+@@ -52,6 +47,12 @@
+ 	fi
+ 	;;
+ 
++	x/*/gs) # Use /path/to/gs without any check:
++	CUPS_GHOSTSCRIPT="$with_pdftops"
++	AC_DEFINE(HAVE_GHOSTSCRIPT)
++	PDFTOPS="pdftops"
++	;;
++
+ 	xpdftops)
+ 	AC_PATH_PROG(CUPS_PDFTOPS, pdftops)
+ 	if test "x$CUPS_PDFTOPS" != x; then
+@@ -62,6 +63,20 @@
+ 		exit 1
+ 	fi
+ 	;;
++
++	x/*/pdftops) # Use /path/to/pdftops without any check:
++	CUPS_PDFTOPS="$with_pdftops"
++	AC_DEFINE(HAVE_PDFTOPS)
++	PDFTOPS="pdftops"
++	;;
++
++	xnone) # Make no pdftops filter if with_pdftops=none:
++	;;
++
++	*) # Invalid with_pdftops value:
++	AC_MSG_ERROR(Invalid with_pdftops value!)
++	exit 1
++	;;
+ esac
+ 
+ AC_DEFINE_UNQUOTED(CUPS_PDFTOPS, "$CUPS_PDFTOPS")
diff --git a/net-print/cups/files/cups-1.4.4-dont-compress-manpages.patch b/net-print/cups/files/cups-1.4.4-dont-compress-manpages.patch
new file mode 100644
index 0000000..4a639c0
--- /dev/null
+++ b/net-print/cups/files/cups-1.4.4-dont-compress-manpages.patch
@@ -0,0 +1,20 @@
+# Source: Fedora
+
+diff -up cups-1.4b2-svn8404/config-scripts/cups-manpages.m4.no-gzip-man cups-1.4b2-svn8404/config-scripts/cups-manpages.m4
+--- cups-1.4b2-svn8404/config-scripts/cups-manpages.m4.no-gzip-man	2009-01-16 08:58:42.000000000 +0000
++++ cups-1.4b2-svn8404/config-scripts/cups-manpages.m4	2009-03-05 11:11:12.000000000 +0000
+@@ -69,10 +69,10 @@ case "$uname" in
+ 		;;
+ 	Linux* | GNU* | Darwin*)
+ 		# Linux, GNU Hurd, and Mac OS X
+-		MAN1EXT=1.gz
+-		MAN5EXT=5.gz
+-		MAN7EXT=7.gz
+-		MAN8EXT=8.gz
++		MAN1EXT=1
++		MAN5EXT=5
++		MAN7EXT=7
++		MAN8EXT=8
+ 		MAN8DIR=8
+ 		;;
+ 	*)
diff --git a/net-print/cups/files/cups-1.4.4-fix-install-perms.patch b/net-print/cups/files/cups-1.4.4-fix-install-perms.patch
new file mode 100644
index 0000000..726f030
--- /dev/null
+++ b/net-print/cups/files/cups-1.4.4-fix-install-perms.patch
@@ -0,0 +1,22 @@
+# Source: Fedora
+
+diff -up cups-1.4.2/Makedefs.in.0755 cups-1.4.2/Makedefs.in
+--- cups-1.4.2/Makedefs.in.0755	2010-01-13 17:06:48.507913044 +0000
++++ cups-1.4.2/Makedefs.in	2010-01-13 17:07:10.049912905 +0000
+@@ -41,13 +41,13 @@ SHELL		=	/bin/sh
+ # Installation programs...
+ #
+ 
+-INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
++INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
+ INSTALL_CONFIG	=	$(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
+ INSTALL_DATA	=	$(INSTALL) -c -m 444
+ INSTALL_DIR	=	$(INSTALL) -d
+-INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
++INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
+ INSTALL_MAN	=	$(INSTALL) -c -m 444
+-INSTALL_SCRIPT	=	$(INSTALL) -c -m 555
++INSTALL_SCRIPT	=	$(INSTALL) -c -m 755
+ 
+ #
+ # Default user, group, and system groups for the scheduler...
diff --git a/net-print/cups/files/cups-1.4.4-nostrip.patch b/net-print/cups/files/cups-1.4.4-nostrip.patch
new file mode 100644
index 0000000..cd2b070
--- /dev/null
+++ b/net-print/cups/files/cups-1.4.4-nostrip.patch
@@ -0,0 +1,14 @@
+# Source: Gentoo
+
+diff -urN cups-1.4.4/config-scripts/cups-compiler.m4 cups-1.4.4.new/config-scripts/cups-compiler.m4
+--- cups-1.4.4/config-scripts/cups-compiler.m4	2009-05-17 02:13:47.000000000 +0200
++++ cups-1.4.4.new/config-scripts/cups-compiler.m4	2010-08-12 19:19:45.937020635 +0200
+@@ -30,7 +30,7 @@
+ if test x$enable_debug = xyes; then
+ 	OPTIM="-g"
+ else
+-	INSTALL_STRIP="-s"
++	INSTALL_STRIP=""
+ fi
+ 
+ dnl Debug printfs can slow things down, so provide a separate option for that
diff --git a/net-print/cups/files/cups-1.4.4-perl-includes.patch b/net-print/cups/files/cups-1.4.4-perl-includes.patch
new file mode 100644
index 0000000..677c57d
--- /dev/null
+++ b/net-print/cups/files/cups-1.4.4-perl-includes.patch
@@ -0,0 +1,12 @@
+diff -urN cups-1.4.4/scripting/perl/Makefile.PL cups-1.4.4.new//scripting/perl/Makefile.PL
+--- cups-1.4.4/scripting/perl/Makefile.PL	2002-08-19 22:43:03.000000000 +0200
++++ cups-1.4.4.new//scripting/perl/Makefile.PL	2010-09-12 19:12:53.173000149 +0200
+@@ -11,7 +11,7 @@
+     'LIBS'		=> ['-lcups '], # e.g., '-lm'
+     'DEFINE'		=> '', # e.g., '-DHAVE_SOMETHING'
+ 	# Insert -I. if you add *.h files later:
+-    'INC'		=> '', # e.g., '-I/usr/include/other'
++    'INC'		=> '-I../../', # e.g., '-I/usr/include/other'
+ 	# Un-comment this if you add C files to link with later:
+     # 'OBJECT'		=> '$(O_FILES)', # link all the C files too
+ );
diff --git a/net-print/cups/files/cups-1.4.4-php-destdir.patch b/net-print/cups/files/cups-1.4.4-php-destdir.patch
new file mode 100644
index 0000000..01a64c8
--- /dev/null
+++ b/net-print/cups/files/cups-1.4.4-php-destdir.patch
@@ -0,0 +1,21 @@
+# Source: Gentoo
+
+diff -urN cups-1.4.4/scripting/php/Makefile cups-1.4.4.new//scripting/php/Makefile
+--- cups-1.4.4/scripting/php/Makefile	2008-08-27 23:12:43.000000000 +0200
++++ cups-1.4.4.new//scripting/php/Makefile	2010-08-13 10:32:35.764063909 +0200
+@@ -95,11 +95,11 @@
+ 
+ install-exec:
+ 	echo Installing $(PHPCUPS) in $(PHPDIR)
+-	$(INSTALL_DIR) $(PHPDIR)
+-	$(INSTALL_LIB) $(PHPCUPS) $(PHPDIR)
++	$(INSTALL_DIR) $(DESTDIR)/$(PHPDIR)
++	$(INSTALL_LIB) $(PHPCUPS) $(DESTDIR)/$(PHPDIR)
+ 	if test "x$(SYMROOT)" != x; then \
+-		$(INSTALL_DIR) $(SYMROOT); \
+-		cp $(PHPCUPS) $(SYMROOT); \
++		$(INSTALL_DIR) $(DESTDIR)/$(SYMROOT); \
++		cp $(PHPCUPS) $(DESTDIR)/$(SYMROOT); \
+ 	fi
+ 
+