Move /var/run/cups to /run/cups, bug 451756

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!

6 files changed, 358 insertions, 20 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 438784c1e75d..d8b71116f3c9 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.526 2013/03/24 21:59:55 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.527 2013/04/01 22:21:26 dilfridge Exp $
+
+*cups-1.6.2-r1 (01 Apr 2013)
+
+  01 Apr 2013; Andreas K. Huettel <dilfridge@gentoo.org> +cups-1.6.2-r1.ebuild,
+  +files/cups-1.6.2-statedir.patch, cups-9999.ebuild, +files/cupsd.init.d-r1:
+  Move /var/run/cups to /run/cups, bug 451756
 
   24 Mar 2013; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.6.2.ebuild,
   cups-9999.ebuild:
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index c2f3ed172a38..fc67de4fc4e3 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -14,7 +14,9 @@ AUX cups-1.5.2-threads2.patch 3192 SHA256 07a495e49b7646bfbb0d9f12841f3db8ccd449
 AUX cups-1.5.3-fix-install-perms.patch 989 SHA256 784254b8d0580b1b9823c5a499052c4fc76e2cadf2c22f975b69ab8655fbc59c SHA512 accc6bd685a201ffc84ed591c20cf467a4ab2beef71fa6ad56b25d425d0c73812998152b6e70fb59fd2d894ebeb7f8cb0affda88be25b038c5cd29a24cedda5d WHIRLPOOL 43d752741ac7097ce24cb0a96169ff778bf8d7d3f104cb670887d685b0a3e24ed910fd89cba8de88fe398534dfdd09e11f936142334e952bdea42bc78824424b
 AUX cups-1.6.0-dont-compress-manpages.patch 435 SHA256 d3e41e8d4a841ac71e5ed8598fc444a2f11b4c94215b55dcf5147694bbbc88c3 SHA512 f004b1e7178212eddefda8416c33514834e0e444243c456a8f0723e763247330b8366e71f64ee0e84196789498c5b22334049a8bec210068e02f06b64b683d7c WHIRLPOOL 1453927d8478c740f74ad9f18ef2bdc3dea30596b59cd5fb2a740942da14bef76a2418c3e536aeaad1cbf5ffb14c72e914ba6726776fe5f23f8b43ef4dedd25f
 AUX cups-1.6.0-fix-install-perms.patch 948 SHA256 4a4a885bb2e111bd67bcb90a5780f33841b18bc02382317fb5e64c384aa0c4c8 SHA512 9b2ecc47be2fd08d092017316af39e217e17a540d096cc62971521052632c40033a06cd7bdd5b319bd7f623fea803d569ced6728504d680fd50087288302164f WHIRLPOOL 7d6f4a5eab9964e6c2277f03affaf0eada9b7408eeac742a75d541ec5efe883940c816ea508a59c733327d3bbe0e31bd242b8c183e3f817a54208ed4a3071982
+AUX cups-1.6.2-statedir.patch 468 SHA256 52867308281522fce419b704ddf5c2c7c10b670fe4977050cf926f1d2f4259ca SHA512 dd9a609aa3d24d23cbb96f14c0a177d7d571508f63cfc98f7050d11b4ec59162bc48df2875ff2d39de1d1bba79ae0b163b82272fc5a48c1f080baff33502925c WHIRLPOOL 5fce69513834e675bd8c9dc843f75131f452601007f086db40878d0fc5453ebd7c5d06e25f3d556447fb9bf29a1df712f87477561d67d521e973835de1eb94e9
 AUX cupsd.init.d 402 SHA256 66b14dffc99900c0db04453765e5bf48cdf0c197c6f50dccf2a55dc66dd0cf95 SHA512 1f71ba4240f5e8735f782dc688f21db5020065eed9063e1f452eeb5c7cef10cf50519c88746ce4b6a3133ce178fe7dd0ac975e5270ec0df95274e4b13627ef1b WHIRLPOOL c3a1be2ac335642ce85940855c4405af1d0e6e0b45f8e121e18ba98402ce5d035a6202e817bf7b03357b7727191ec7c2e7394d6e856df518b4443c5f81eff8de
+AUX cupsd.init.d-r1 394 SHA256 239f9831ba2a9df36d334037307cdc11cfa6476a11cbf6668db4ffb4096a248d SHA512 1050fb3073a2ef97660af061ce4b892f302cddc2c16c4db24a06549eef141b946ba104c140cc647d8afe9d78241267aaa894c593bed139a893fe13d6d60a4610 WHIRLPOOL 29118adc80f1593002f6c4d208b1978c2ec16aaa4fe84c9e547ec4412a7eb0d82c7e10f6bf4e1df52d5e37139f290f98a0d7a0cf6c6cc2532b97386ce67b4415
 AUX pdftops-1.20.gentoo 10412 SHA256 ac5fa01ca776d75bd7cef62eef9f6b0c3945ee87e8950b40ca9f9f3ff46a16c1 SHA512 ee6179e862ef3561412a246e755a8c4379ca1afca3885412452104e2dbc8335d745cc7a4336f806d2bcd25a466a37751b34ce6283ee5d8682f41107b9e989469 WHIRLPOOL 8ebf6a8ad25485171f3cb55dfbdea4ccf30d56f095554e27f9800e72cefd2ae00dfe58ac28ddd8b8c30ab53e1fe74f4a5451d4b313ebe48b9832bc1a11b6262d
 DIST cups-1.5.0-source.tar.bz2 4090210 SHA256 c6f99b68a558f4d626e9a5076d664f38e9925715dc541b07f0328c9aeb02ec33 SHA512 246fcd6fc74604ea5c3ed27696c7445bb09fc25c4e45f2a6d64461481d853c84d81abde421472243c4e1a16e47450256262aea21bdca8c32af60f256c10ee34c WHIRLPOOL c0bee514acfc3e306b346c61112ad3eeef1c288aacae3306cec53cdee5ab9a0784e38192467b6e79a79164758f6c85894886c42270bdc5a56f4618de932aac04
 DIST cups-1.5.2-avahi.patch.bz2 17252 SHA256 6100029c6eec05729b6ef49f743876b9bf4d67f7b20b624be98372f4fb3e1ede SHA512 8bb501d5989272803ad420e38249b5ac69c93d9bb12d86663d98b090e2bbf025c104b9e6a65b240d3df868ec780a3fa74b24bc7c3c4e007b0a21022750a5bf20 WHIRLPOOL f97bdef28419d5e9626823ea69ac59ea6f4d1d5dbdd075b386e23993eaf0ad475508b04eeff9089edce1b264e8086dbab00b6cac2265df1c97104829c044f4fb
@@ -28,26 +30,27 @@ EBUILD cups-1.5.0.ebuild 8250 SHA256 0e7967449e58ad9c385154c93c7dd35cd211f8dd062
 EBUILD cups-1.5.2-r4.ebuild 8363 SHA256 5962ac89342b0430eb663dbd012af6ad02f836d712496088b65af28817a241c3 SHA512 dd1cb9a9c570d51e376c71c784a3c6dfff38e07a2594792666cbcded73ba3dc5301393fc59c01113cc6461fd1e63371348df015be9cd3d2aa50859ad296535b6 WHIRLPOOL 2a69b6d45f64b191dabb4b6a4f112c7a9975a356c28999e50a413e6ab73a7f292e00a5995d9008419420063ee769ee11879267acd69a12a2c81deb0ab00829f0
 EBUILD cups-1.5.3.ebuild 8623 SHA256 4cba3b3f068540fe208208dd84785b4b235883fc9d1546a7c678835ac67bc01d SHA512 b82a7a79c7ab586dd3d66b70016ce0c9c79ea7d1deffca81fb2bd8c5de0d601456245471502ab7ecbc9887fa5f732c19d933a5358c28250fc016f5837e390303 WHIRLPOOL 7925273a5321b57476c2834583f1f491bb53cba89e86babe51c13eab10506c1c7a0ae08e6e4a23b84162323a85b9010303d4f2feec4482530dee6923fb68aa40
 EBUILD cups-1.6.1.ebuild 8313 SHA256 ea7db57c0936d02be764b6c45c114c53b636384bac04f4611c91a82b1fa061fd SHA512 700d3a9c4f51e3d29b8f9853d796cfc634140c302a7684e119c9e8ef95f3427dbf843f92cf3178c9ce7203610d06f79ecf8952bdf39bc1cd1000bcfb65459566 WHIRLPOOL 7c37a51280c31899b251b29f589c06651ba49e9f3399aa7b7e6b9ced9785b6961258dda6b0eb4d1226646cfd5e1e09e7f3775789a01c663263e8ff4db1ad1b38
+EBUILD cups-1.6.2-r1.ebuild 8503 SHA256 cd47e6decf7e31b908609c2ff8c76d123d1626b79b74afccd6b9c07b53aae3e6 SHA512 c19c9b22a98ce4ef4a19b751f0c92759da65558fd174005cb68b8b8d9b0c208797f021eedf98b4601ca7e120906c4ce858be035c457dadcf52718786546accb0 WHIRLPOOL b808e30eed653a86436722e1982a0914994f2c392e8e8b11afdc9ad2d84737d6115aeb6184e85700f7bf74840af96d851f22441c0684f4f6cfe001e98ca57655
 EBUILD cups-1.6.2.ebuild 8459 SHA256 d0dccfbc627276838a75c6e07f4427fa37afec936eb951303ee19d3c2865423d SHA512 0e3be444977d67f7cc27bc448a5411f5a1f5f2c6b17f773c69b2b18feafb8eb14895da168c655fcf332a309ccd0a0956555738a808e865c53de38bda7a7f6fbf WHIRLPOOL 678997cab410ed3d09a7e750df2c8131f4670728b217b2cdcba4a67a77a88188e09dd095c883fdfea553ada90bd3fa1ade618f93b07e9e3ed15559a4e2ca4f25
-EBUILD cups-9999.ebuild 8459 SHA256 b937bacf65d162c95b16ca74d56d051c5562dbcb289c4ed1c65f358d41060610 SHA512 24540b3ff78a6021bd12dd3dd4d7d858acff57e110ad28fc76bda3c7cb223f0d645fc0c06d75900abf53acaeb7537120ebf8a1d4afbbe751271afad7540d9bbe WHIRLPOOL ad1fa2b3cefd81a35830afd8827a4c66cd09c466c8eb4f706988e7657195fe040d39fb7353fd2833aeb1171c1700a7133cb068adafe2480c9674b1faba5e8507
-MISC ChangeLog 80006 SHA256 5fd5b8bfb5ebe17cd80156cd31230c472059ba59dfa893e4323cff91d3d6ed08 SHA512 92f345bdf7360b781e2381d2593a3e67529386547a13dec0bbd108dd543d4b0ee13fecdd6298c78debf46b69b066ea4e9aa028a9e17b7cd4efba2b05c6771bc0 WHIRLPOOL abd2178ea036759fa91513f62b2d0fea9bc3e22fabd0034a93da9353a6b46d41e767dbe8d6c2e36f86edd2a185e6257169f40885f5011d2f70dbfd5808fa906f
+EBUILD cups-9999.ebuild 8500 SHA256 9220cbb2128125c496ad6137d83018efdc1bb11e10cdeb45cb78f6b83e16043d SHA512 f038a10ca61fe3b14a2e21e160f74ab3b867e2e4a85b66f9f12383533bad137bc8471d047244b913c0f4656da49fb1f1df4f324715d36ac93c7489f924778478 WHIRLPOOL fc0f068ca53722ed31818d5302d145f132df6572a8723d8fec919d84385b0c5c6b3dbe1630038fa7a3dd5277b77b7259fffda0fcf9ddddb776daea54e18b50cd
+MISC ChangeLog 80241 SHA256 09a810dd0d1d28cdc69d4c17b328d505ee6ae3726118c7af356dac0fa5dba455 SHA512 050bc0a9d31fc1181f6fe0b1eb0752519cb6c2eb5b8db14f9d3735d63e388a37fe580962b2496cb6324fe23651c41a1c646ab7a3b873882757f3389b2d2d0d62 WHIRLPOOL a271b622ca6ff397d3cc2b6ed26799a1c6802277569267bddf34f0989a05b084902e3d14230f667f66c488f94713820e5aff3e84a253fe6a960ac4cb92f8d201
 MISC metadata.xml 778 SHA256 26a8d1221a4334579f98705c38f3e3a882c223df86181dcf7968eac2118188b8 SHA512 717b6c3d940b2de149a68bb1c66175cd6fac04e21fcf581d6f1dd248c1bc5ee8fb98ec26a1fa2fca94e8fcb33f131c6635d40a6954721020a989dc260e8b8fbc WHIRLPOOL 057426e3c3f1e7e5a6bb124e0af0d804e15f6bbf17f7b278ef90d773f997beed6c6376bcc9603ac4c67f75675a33bc1fb7a02bb89f7a1ed69634a5d7bf9befbb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRT3eUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJRWgieXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcEJsP/2VCqJBYSOFBlRctz3C8T1+0
-4V8NLbbPWW+jhXb0lmhuCvxv6GKIf6BiI2pARc148nd+vu4TbfMbGwcTAs2pCvG8
-R2HcLzd8DXPRIVEnxnFtWf9J27MjDTZWS+Jg4zVa5xpfKB/yuPevbHOlcoWXa2Nm
-14Re2Y8PMt7EiNYzh1WyczVLxgGtd1NmIXx8p5bC6tx1pjbK9xa3zS9cDbAEil40
-f9YTm7Taj1lZymnOniPKAzHWk+As559vCChQaR9tYFSoYSvFK5xNtkK5mi2bRdXS
-obs4PwQfn82vk25kMYpHIIqoWr8j1lP9BVctnJhFI+X91dyxroNsMc3JjQg6qlwL
-UjYtO6KUVjObMzd2T8xYPkzn9A0Q3W8IvCEj/C8gK6ncXgL2Pihmrfh2wlbyrLhy
-AcSdvFK+YFJduHWt6/4Ah9SKeAwnc1iuL9BpgAzcoNpIxvio47z1bRRRFiNSbJOO
-wSI/rakSLMH8B4kBsEyKOxkoFJ/UFmO8eBA6rwsrLPQPMjEpFn8mwTqA+jCQdJnQ
-RYrbFhh0PL2qbxh6zL6v4LqBgwzok5EDWC++CrHXHcrNn/OfR6slDT9Ewnz3ZXR7
-U7n1tUoAcEOfjhv/m29OfRO1xEtlNL71qIpfJpoZ7wbEFlT/ZFpX4vwZWZFU+17U
-fYH4P5DNdrD/LQPLExsd
-=TbC7
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcD1oP/18qOaD5yItmfKXptEB1FfM+
+gpS6N+mFFvl76jSCsShwDrkJikpESp4SokzG/MTWVFu7/7w0gr2/2wkwA7lDxNH8
+gagNQQiSWPJ0BWdUVtIfe7ikfrPiepbEnvolPiWywUUj2gKMyiUIHOsOe3VHiVi2
+YT0ZQ3bJtW1Ay+LNVUrKqAgjMPlYmoCdy3xevqrT5TUn95G7erjJUcNufCn7+q8f
+bArpbSOa3bASkpwyOZiK1NyIA0lVhrE/Oj+35FBSgt2ZJ5Mq6sv5ptpB/eCX1hqa
+8dm3Y3iA3TnSjhaFO/jUsUDPknDf3RbW0cBPc9wyFmYVGNv7hpPn64o3BJDWHwvE
+DpmAgyuptZBsJ53qjkJ/BkhU6Q0Mlj/Yq7axDMiIFWUhekC+qpQ0tX2g8/uLiyPT
+kzfq/PF7p4c1g1STeb13cjmIgfxjdvCJHqGVpOmM26XqxfwBTxjX6TQEC89g/cWC
+hMMNU2JpZE+Bz86SgweWWD1fOr7jHlsBbV/4/kgxarIvXl3goIfJsj3SIQmdoxXg
+yXHzAjccnRsg2bYOvCQXHld9kpQLK1ZzGtv91pwRJ1MdYMJqc1mgVYxMBrJ+SbEt
+4mMRO+fdnY2wFq8YAa90FSbltE82Ak2eWetjfxtOVPloxB1R0ASzRYw1HnfF982Y
+srBRzR4dzDKtdcECvWvs
+=q7Y1
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.6.2-r1.ebuild b/net-print/cups/cups-1.6.2-r1.ebuild
new file mode 100644
index 000000000000..8d85f0f95ad1
--- /dev/null
+++ b/net-print/cups/cups-1.6.2-r1.ebuild
@@ -0,0 +1,294 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6.2-r1.ebuild,v 1.1 2013/04/01 22:21:26 dilfridge Exp $
+
+EAPI=5
+
+PYTHON_DEPEND="python? 2:2.5"
+
+inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam python user versionator java-pkg-opt-2 systemd
+
+MY_P=${P/_beta/b}
+MY_PV=${PV/_beta/b}
+
+if [[ "${PV}" != "9999" ]]; then
+	SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+else
+	inherit subversion
+	ESVN_REPO_URI="http://svn.easysw.com/public/cups/trunk"
+	KEYWORDS=""
+fi
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="http://www.cups.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="acl avahi dbus debug +filters gnutls java kerberos pam
+	python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
+
+LANGS="ca es fr ja ru"
+for X in ${LANGS} ; do
+	IUSE="${IUSE} +linguas_${X}"
+done
+
+RDEPEND="
+	app-text/libpaper
+	acl? (
+		kernel_linux? (
+			sys-apps/acl
+			sys-apps/attr
+		)
+	)
+	avahi? ( net-dns/avahi )
+	dbus? ( sys-apps/dbus )
+	java? ( >=virtual/jre-1.6 )
+	kerberos? ( virtual/krb5 )
+	pam? ( virtual/pam )
+	selinux? ( sec-policy/selinux-cups )
+	ssl? (
+		gnutls? (
+			dev-libs/libgcrypt
+			net-libs/gnutls
+		)
+		!gnutls? ( >=dev-libs/openssl-0.9.8g )
+	)
+	systemd? ( sys-apps/systemd )
+	usb? ( virtual/libusb:0 )
+	X? ( x11-misc/xdg-utils )
+	xinetd? ( sys-apps/xinetd )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+PDEPEND="
+	app-text/ghostscript-gpl[cups]
+	app-text/poppler[utils]
+	>=net-print/cups-filters-1.0.30
+	filters? ( net-print/foomatic-filters )
+"
+
+REQUIRED_USE="gnutls? ( ssl )"
+
+# upstream includes an interactive test which is a nono for gentoo
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.6.0-dont-compress-manpages.patch"
+	"${FILESDIR}/${PN}-1.6.0-fix-install-perms.patch"
+	"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
+	"${FILESDIR}/${PN}-1.5.0-systemd-socket.patch"		# systemd support
+	"${FILESDIR}/${PN}-1.6.2-statedir.patch"
+)
+
+pkg_setup() {
+	enewgroup lp
+	enewuser lp -1 -1 -1 lp
+	enewgroup lpadmin 106
+
+	# python 3 is no-go
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+
+	if use kernel_linux; then
+		linux-info_pkg_setup
+		if  ! linux_config_exists; then
+			ewarn "Can't check the linux kernel configuration."
+			ewarn "You might have some incompatible options enabled."
+		else
+			# recheck that we don't have usblp to collide with libusb
+			if use usb; then
+				if linux_chkconfig_present USB_PRINTER; then
+					eerror "Your usb printers will be managed via libusb. In this case, "
+					eerror "${P} requires the USB_PRINTER support disabled."
+					eerror "Please disable it:"
+					eerror "    CONFIG_USB_PRINTER=n"
+					eerror "in /usr/src/linux/.config or"
+					eerror "    Device Drivers --->"
+					eerror "        USB support  --->"
+					eerror "            [ ] USB Printer support"
+					eerror "Alternatively, just disable the usb useflag for cups (your printer will still work)."
+				fi
+			else
+				#here we should warn user that he should enable it so he can print
+				if ! linux_chkconfig_present USB_PRINTER; then
+					ewarn "If you plan to use USB printers you should enable the USB_PRINTER"
+					ewarn "support in your kernel."
+					ewarn "Please enable it:"
+					ewarn "    CONFIG_USB_PRINTER=y"
+					ewarn "in /usr/src/linux/.config or"
+					ewarn "    Device Drivers --->"
+					ewarn "        USB support  --->"
+					ewarn "            [*] USB Printer support"
+					ewarn "Alternatively, enable the usb useflag for cups and use the libusb code."
+				fi
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	base_src_prepare
+	AT_M4DIR=config-scripts eaclocal
+	eautoconf
+}
+
+src_configure() {
+	export DSOFLAGS="${LDFLAGS}"
+
+	einfo LANGS=\"${LANGS}\"
+	einfo LINGUAS=\"${LINGUAS}\"
+
+	local myconf
+	if use ssl ; 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-system-groups=lpadmin \
+		$(use_enable acl) \
+		$(use_enable avahi) \
+		$(use_enable dbus) \
+		$(use_enable debug) \
+		$(use_enable debug debug-guards) \
+		$(use_enable kerberos gssapi) \
+		$(use_enable pam) \
+		$(use_enable static-libs static) \
+		$(use_enable threads) \
+		$(use_enable usb libusb) \
+		$(use_enable zeroconf dnssd) \
+		$(use_with java) \
+		--without-perl \
+		--without-php \
+		$(use_with python) \
+		$(use_with xinetd xinetd /etc/xinetd.d) \
+		--enable-libpaper \
+		$(use_with systemd systemdsystemunitdir "$(systemd_get_unitdir)") \
+		${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_install() {
+	# Fix install-sh, posix sh does not have 'function'.
+	sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh"
+
+	emake BUILDROOT="${D}" install
+	dodoc {CHANGES,CREDITS,README}.txt
+
+	# 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}
+
+	# install our init script
+	local neededservices
+	use avahi && neededservices+=" avahi-daemon"
+	use dbus && neededservices+=" dbus"
+	[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
+	cp "${FILESDIR}"/cupsd.init.d-r1 "${T}"/cupsd || die
+	sed -i \
+		-e "s/@neededservices@/$neededservices/" \
+		"${T}"/cupsd || die
+	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:" \
+			"${ED}"/etc/xinetd.d/cups-lpd || die
+		# it is safer to disable this by default, bug #137130
+		grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \
+			{ sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/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 "${ED}"/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/spool/cups/tmp
+
+	keepdir /etc/cups/{interfaces,ppd,ssl}
+
+	use X || rm -r "${ED}"/usr/share/applications
+
+	# create /etc/cups/client.conf, bug #196967 and #266678
+	echo "ServerName /run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf
+
+	# the following files are now provided by cups-filters:
+	rm -r "${ED}"/usr/share/cups/banners || die
+	rm -r "${ED}"/usr/share/cups/data/testprint || die
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	# Update desktop file database and gtk icon cache (bug 370059)
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+
+	# not slotted - at most one value
+	if ! [[ "${REPLACING_VERSIONS}" ]]; then
+		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
+	fi
+
+	if [[ "${REPLACING_VERSIONS}" ]] && [[ "${REPLACING_VERSIONS}" < "1.6" ]]; then
+		echo
+		elog "CUPS-1.6 no longer supports automatic remote printers or implicit classes"
+		elog "via the CUPS, LDAP, or SLP protocols, i.e. \"network browsing\"."
+		elog "You will have to find printers using zeroconf/avahi instead, enter"
+		elog "the location manually, or run cups-browsed from net-print/cups-filters"
+		elog "which re-adds that functionality as a separate daemon."
+		echo
+	elif [[ "${REPLACING_VERSIONS}" ]] && [[ "${REPLACING_VERSIONS}" < "1.6.2" ]]; then
+		echo
+		elog "Starting with net-print/cups-filters-1.0.30, that package provides"
+		elog "a daemon cups-browsed which implements printer discovery via the"
+		elog "Cups-1.5 protocol. Not much tested so far though."
+		echo
+	fi
+}
+
+pkg_postrm() {
+	# Update desktop file database and gtk icon cache (bug 370059)
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index 2e2ad22f6f78..60afd32e94ce 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.26 2013/03/24 21:59:55 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.27 2013/04/01 22:21:26 dilfridge Exp $
 
 EAPI=5
 
@@ -84,6 +84,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.6.0-fix-install-perms.patch"
 	"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
 	"${FILESDIR}/${PN}-1.5.0-systemd-socket.patch"		# systemd support
+	"${FILESDIR}/${PN}-1.6.2-statedir.patch"
 )
 
 pkg_setup() {
@@ -213,7 +214,7 @@ src_install() {
 	use avahi && neededservices+=" avahi-daemon"
 	use dbus && neededservices+=" dbus"
 	[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
-	cp "${FILESDIR}"/cupsd.init.d "${T}"/cupsd || die
+	cp "${FILESDIR}"/cupsd.init.d-r1 "${T}"/cupsd || die
 	sed -i \
 		-e "s/@neededservices@/$neededservices/" \
 		"${T}"/cupsd || die
@@ -245,7 +246,7 @@ src_install() {
 	use X || rm -r "${ED}"/usr/share/applications
 
 	# create /etc/cups/client.conf, bug #196967 and #266678
-	echo "ServerName /var/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf
+	echo "ServerName /run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf
 
 	# the following files are now provided by cups-filters:
 	rm -r "${ED}"/usr/share/cups/banners || die
diff --git a/net-print/cups/files/cups-1.6.2-statedir.patch b/net-print/cups/files/cups-1.6.2-statedir.patch
new file mode 100644
index 000000000000..3e836657de8a
--- /dev/null
+++ b/net-print/cups/files/cups-1.6.2-statedir.patch
@@ -0,0 +1,12 @@
+diff -ruN cups-1.6.2.orig/config-scripts/cups-directories.m4 cups-1.6.2/config-scripts/cups-directories.m4
+--- cups-1.6.2.orig/config-scripts/cups-directories.m4	2012-10-01 03:55:23.000000000 +0200
++++ cups-1.6.2/config-scripts/cups-directories.m4	2013-04-02 00:11:41.000000000 +0200
+@@ -429,7 +429,7 @@
+ 		;;
+ 	*)
+ 		# All others
+-		CUPS_STATEDIR="$localstatedir/run/cups"
++		CUPS_STATEDIR="/run/cups"
+ 		;;
+ esac
+ AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR")
diff --git a/net-print/cups/files/cupsd.init.d-r1 b/net-print/cups/files/cupsd.init.d-r1
new file mode 100644
index 000000000000..99f617498823
--- /dev/null
+++ b/net-print/cups/files/cupsd.init.d-r1
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+
+depend() {
+	use net
+	@neededservices@
+	before nfs
+	after logger
+}
+
+start() {
+	ebegin "Starting cupsd"
+	checkpath -q -d -m 0755 -o root:lp /run/cups
+	checkpath -q -d -m 0511 -o lp:lpadmin /run/cups/certs
+	start-stop-daemon --start --quiet --exec /usr/sbin/cupsd
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping cupsd"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/cupsd
+	eend $?
+}