Update with main tree

4 files changed, 51 insertions, 40 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 0265b17..fe325e1 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.454 2012/02/08 14:51:03 jer Exp $
 
+*cups-1.5.2-r21 (27 May 2012)
+
+  27 May 2012; Daniel Solano Gómez <gentoo@sattvik.com> cups-1.5.2-r4.ebuild,
+  -cups-1.5.2-r20.ebuild, +cups-1.5.2-r21.ebuild:
+  Sync up with portage.
+
   04 May 2012; Daniel Solano Gómez <gentoo@sattvik.com> cups-1.4.8-r1.ebuild,
   cups-1.4.8-r23.ebuild, cups-1.5.2-r4.ebuild, cups-1.5.2-r20.ebuild:
   Sync up with portage.
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index fe0c882..4e924a2 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -21,10 +21,11 @@ AUX pdftops-1.20.gentoo 10412 RMD160 16e229662c47e03af1d1f4cb5764a76d17a66642 SH
 DIST cups-1.4.8-source.tar.bz2 4547162 RMD160 ee80e8d0b56dc0e2edf2a9aa9a43c4b92619f741 SHA1 9167f556e78e0bc075f1eb2f695d79cc1f334007 SHA256 6bd27e1213c139ed0bbadc5c29f97cf1e8f7f8f5b0bb29b227ecaff32aafa9a6
 DIST cups-1.5.2-avahi.patch.bz2 17252 RMD160 40c7165de7f23e01aa3edf3968406e69fd0280f7 SHA1 e69c9b62b2773431dd7bb86573255d7c39fc2012 SHA256 6100029c6eec05729b6ef49f743876b9bf4d67f7b20b624be98372f4fb3e1ede
 DIST cups-1.5.2-ipp-r8950.patch.bz2 19525 RMD160 346a3141ae445dc9f17c7fbc0a467aea4910f10b SHA1 4bc3b40771261c37b63cbe4f65213b5db6c66534 SHA256 1a2d36136fc66b5f53e7cfb3e5d815e62cc3a6b4cc61d678f29d8a0bb748572a
+DIST cups-1.5.2-locales.patch.xz 313616 RMD160 2346f911910c19364fc67c67c22b4d7583efe616 SHA1 b3f2660affd00d6a505beeccfb1280275197bd49 SHA256 273f3583882533ce995a0d3380d6db1b5aedb88790def799c38a3454c84357eb
 DIST cups-1.5.2-source.tar.bz2 9595665 RMD160 98181e2ee8c6e574fb6d405f688f52c9b61a2355 SHA1 56fdb4f58e676607845321c0296c1e90e416883f SHA256 b150aa108c631f4f07e92cb13c01263a67170e5ac8383c5548ef8f8473a187fb
 EBUILD cups-1.4.8-r1.ebuild 7308 RMD160 c54f6afc3378f4533fba70a81596bc91cbd8f246 SHA1 90cc9c36c59700673fee34eaa838a49762b5d756 SHA256 ed07484f7896d3a6958d31a112169150a1cd93d7e20911a752d1a53e9a4fd002
 EBUILD cups-1.4.8-r23.ebuild 8918 RMD160 e9bced39eeedfa497e2fea9efa75961a4e85018f SHA1 44fe6d7673f7381809ae69b58f847b532bdba18a SHA256 2f69534f197b14cdead18a6c7d70f2aef7dd31cce739f4b96f3c85e98904d59d
-EBUILD cups-1.5.2-r20.ebuild 8545 RMD160 29107dc4cc033ff22ef66f776181674ce9390720 SHA1 f6605586995f3c316b35b9187171a0e39df1fc07 SHA256 055c9a0b941d1ca584713173e3b155301744af3213cb03d70daced068aca27d5
-EBUILD cups-1.5.2-r4.ebuild 8349 RMD160 a7ada879a5f619f6991e11eaf23e5f10f6998900 SHA1 e8ca3e46c2ed69512cb40027c4512ea4c801e2fa SHA256 5d850521d1d8d0dfdc5e2d763f15306382dd31771f4f5d369774aa495f97db4d
-MISC ChangeLog 69912 RMD160 a5b7b2750dfd7bce611126709e8cb9b7564a22c9 SHA1 20939819cf9cee607210d78d4f27bc8c29bc2cfa SHA256 c25b2e8c0465b892f6a79384b1aa29e8b9e3b7f437f461ac63e68c15567c59f8
+EBUILD cups-1.5.2-r21.ebuild 9018 RMD160 c24842f7c0774b9582835912fe0133d0a36fbf2c SHA1 2e3b40832b540ccbb50cb1b5ea55dced18936ef1 SHA256 513b3989cdc5a20131ebc2828092a748ac6a1ffee9f1edbdb4f4ddbace5d13e3
+EBUILD cups-1.5.2-r4.ebuild 8393 RMD160 f451292dcfb39945488d93b035051bc131d0169b SHA1 d420d07254040e56142b153dcc6bf48dcafe5c11 SHA256 f0343340d0dd046f646b58f6b00d827e2197a05180afbd96884d2be204fbf1e2
+MISC ChangeLog 70097 RMD160 bb1d8e1c269b43c9655f9f496d6b247008a47dc7 SHA1 a88afac314bd86307d3099291fb0160c5c5b57a8 SHA256 edb8b04232217b6e3a5448233370dcc5ad3585d5c3e6e2305f867c55585ce5d7
 MISC metadata.xml 691 RMD160 2a77a55b3ba142202c16f7c9e5710107cdd7565f SHA1 0fedf6ebd837708cd218a4a03741a20091714950 SHA256 3d89754273130856a7433fb325a132b07b86f7c0391284ab2c7dc8a2fa46fec7
diff --git a/net-print/cups/cups-1.5.2-r20.ebuild b/net-print/cups/cups-1.5.2-r21.ebuild
index 34dd329..8db919d 100644
--- a/net-print/cups/cups-1.5.2-r20.ebuild
+++ b/net-print/cups/cups-1.5.2-r21.ebuild
@@ -1,26 +1,33 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r20.ebuild,v 1.3 2012/05/03 07:22:30 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r21.ebuild,v 1.4 2012/05/21 22:25:01 dilfridge Exp $
 
 EAPI=4
 
 PYTHON_DEPEND="python? 2:2.5"
 
-inherit autotools eutils fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python versionator java-pkg-opt-2 systemd
-
 MY_P=${P/_}
 MY_PV=${PV/_}
 
+if [[ "${PV}" != "9999" ]]; then
+	inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python versionator java-pkg-opt-2 systemd
+	SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2
+		http://dev.gentoo.org/~dilfridge/distfiles/${P}-ipp-r8950.patch.bz2
+		http://dev.gentoo.org/~dilfridge/distfiles/${P}-avahi.patch.bz2
+		http://dev.gentoo.org/~dilfridge/distfiles/${P}-locales.patch.xz
+	"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+else
+	inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python versionator java-pkg-opt-2 systemd subversion
+	ESVN_REPO_URI="http://svn.easysw.com/public/cups/trunk"
+	KEYWORDS=""
+fi
+
 DESCRIPTION="The Common Unix Printing System"
 HOMEPAGE="http://www.cups.org/"
-SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2
-	http://dev.gentoo.org/~dilfridge/distfiles/${P}-ipp-r8950.patch.bz2
-	http://dev.gentoo.org/~dilfridge/distfiles/${P}-avahi.patch.bz2
-"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
 IUSE="acl avahi dbus debug +filters gnutls java +jpeg kerberos ldap pam perl
 	+png python slp +ssl static-libs systemd +threads +tiff usb X xinetd"
 
@@ -78,6 +85,23 @@ RESTRICT="test"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4.4-dont-compress-manpages.patch"
+	"${FILESDIR}/${PN}-1.4.4-fix-install-perms.patch"
+	"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
+	"${FILESDIR}/${PN}-1.4.4-php-destdir.patch"
+	"${FILESDIR}/${PN}-1.4.4-perl-includes.patch"
+	"${FILESDIR}/${PN}-1.5.2-linkperl.patch"
+	"${FILESDIR}/${PN}-1.5.2-threads.patch"
+	"${FILESDIR}/${PN}-1.5.2-threads2.patch"
+	"${FILESDIR}/${PN}-1.5.0-systemd-socket.patch"		# systemd support
+	"${WORKDIR}/${PN}-1.5.2-ipp-r8950.patch"		# revert ipp backend to 1.4 state
+	"${WORKDIR}/${PN}-1.5.2-avahi.patch"			# avahi support from debian
+	"${FILESDIR}/${PN}-1.5.2-browsing.patch"		# browsing off by default
+	"${WORKDIR}/${PN}-1.5.2-locales.patch"			# patch locales back into existence
+	"${FILESDIR}/${PN}-1.5.0-group_fix.patch"       # Dan's group fix
+)
+
 pkg_setup() {
 	enewgroup lp
 	enewuser lp -1 -1 -1 lp
@@ -127,31 +151,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# 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"
-	epatch "${FILESDIR}/${PN}-1.5.2-linkperl.patch"
-	epatch "${FILESDIR}/${PN}-1.5.2-threads.patch"
-	epatch "${FILESDIR}/${PN}-1.5.2-threads2.patch"
-
-	# systemd support
-	epatch "${FILESDIR}/${PN}-1.5.0-systemd-socket.patch"
-
-	# revert ipp backend to 1.4 state, as ubuntu and debian
-	epatch "${DISTDIR}/${PN}-1.5.2-ipp-r8950.patch.bz2"
-
-	# avahi support from debian
-	epatch "${DISTDIR}/${PN}-1.5.2-avahi.patch.bz2"
-
-	# browsing off by default
-	epatch "${FILESDIR}/${PN}-1.5.2-browsing.patch"
-
-	# Dan's group fix
-	epatch "${FILESDIR}/${PN}-1.5.0-group_fix.patch"
-
+	base_src_prepare
 	AT_M4DIR=config-scripts eaclocal
 	eautoconf
 }
@@ -240,6 +240,10 @@ src_install() {
 		popd > /dev/null
 	fi
 
+	# move the default config file to docs
+	dodoc "${ED}"/etc/cups/cupsd.conf.default
+	rm -f "${ED}"/etc/cups/cupsd.conf.default
+
 	# clean out cups init scripts
 	rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups}
 
@@ -297,7 +301,7 @@ pkg_postinst() {
 	elog "take a look at: http://www.gentoo.org/doc/en/printing-howto.xml"
 	echo
 	elog "Network browsing for printers is now switched off by default in the config file."
-	elog "To (re-)enable it, edit /etc/cupsd.conf and set \"Browsing On\", "
+	elog "To (re-)enable it, edit /etc/cups/cupsd.conf and set \"Browsing On\", "
 	elog "afterwards re-start or reload cups."
 	echo
 }
diff --git a/net-print/cups/cups-1.5.2-r4.ebuild b/net-print/cups/cups-1.5.2-r4.ebuild
index b82789c..dbe3c8f 100644
--- a/net-print/cups/cups-1.5.2-r4.ebuild
+++ b/net-print/cups/cups-1.5.2-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r4.ebuild,v 1.6 2012/05/03 20:45:48 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r4.ebuild,v 1.12 2012/05/24 21:37:03 johu Exp $
 
 EAPI=4
 
@@ -20,7 +20,7 @@ SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ~ppc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE="acl avahi dbus debug +filters gnutls java +jpeg kerberos ldap pam perl
 	+png python slp +ssl static-libs +threads +tiff usb X xinetd"
 
@@ -292,7 +292,7 @@ pkg_postinst() {
 	elog "take a look at: http://www.gentoo.org/doc/en/printing-howto.xml"
 	echo
 	elog "Network browsing for printers is now switched off by default in the config file."
-	elog "To (re-)enable it, edit /etc/cupsd.conf and set \"Browsing On\", "
+	elog "To (re-)enable it, edit /etc/cups/cupsd.conf and set \"Browsing On\", "
 	elog "afterwards re-start or reload cups."
 	echo
 }