version bump

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xBD3A97A3

6 files changed, 470 insertions, 19 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index b5ecb78c35a2..c81e557ecc58 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.649 2014/11/02 12:42:26 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.650 2014/11/19 19:41:40 tamiko Exp $
+
+*cups-2.0.1 (19 Nov 2014)
+
+  19 Nov 2014; Matthias Maier <tamiko@gentoo.org> +cups-2.0.1.ebuild,
+  +files/cups-2.0.1-fix-compilation.patch,
+  +files/cups-2.0.1-rename-systemd-service-files.patch, cups-2.0.0-r2.ebuild:
+  version bump
 
   02 Nov 2014; Sven Vermeulen <swift@gentoo.org> cups-1.7.5-r2.ebuild,
   cups-1.7.5.ebuild, cups-1.7.9999.ebuild, cups-2.0.0-r2.ebuild,
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 37048be631fb..0667e4e0ef81 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -6,30 +6,34 @@ AUX cups-1.6.0-dont-compress-manpages.patch 435 SHA256 d3e41e8d4a841ac71e5ed8598
 AUX cups-1.6.0-fix-install-perms.patch 948 SHA256 4a4a885bb2e111bd67bcb90a5780f33841b18bc02382317fb5e64c384aa0c4c8 SHA512 9b2ecc47be2fd08d092017316af39e217e17a540d096cc62971521052632c40033a06cd7bdd5b319bd7f623fea803d569ced6728504d680fd50087288302164f WHIRLPOOL 7d6f4a5eab9964e6c2277f03affaf0eada9b7408eeac742a75d541ec5efe883940c816ea508a59c733327d3bbe0e31bd242b8c183e3f817a54208ed4a3071982
 AUX cups-1.7.2-systemd-socket-2.patch 11799 SHA256 aec7a98202143e26384fc46baa434f9da022b97793413c95bc1b3765449aceef SHA512 f551e6e1917303ce3e2206284f396885a9aa15bfdee6fdcd88182279cd52a26fc92f5e529b8b30edb0c58dbc749440d23515fa1246959875f525fb5e6b08d466 WHIRLPOOL 063253ffc641c1fd35d929f65c3e42374d5223afc106c2a2f2f0098d5115788573eeaad8fb2c53efe90334ef7a1605d164b1741189c8f8b77e7788097aa76923
 AUX cups-2.0.0-rename-systemd-service-files.patch 5429 SHA256 ef6e8c7aae48b3968e6185a80a7247137abfbc1609ebbaf1e631daba86f96dc3 SHA512 2219c0986fca7c1f89fd980447ada92f4e54548587a8b6d2af001a728d1594d01c5746e8136f7c6763d5846b81061d6e220f9231460e8460b3b838e7150a3d2d WHIRLPOOL b2f71be2fdc9724a9e82149820c866b00466156c30612a86ac6c824a39dfe854e77d7ede5ed782f4dc83dbde70156ef8e6e5d8399479d01e58411fead8cdd40a
+AUX cups-2.0.1-fix-compilation.patch 713 SHA256 adca276aa0ed4f4580da49a53f6301ec2c557131ac402ee731002312551deb93 SHA512 2e3c7565a1647a9d01b77ea02a38d4d965c6ae878fadd43334cfd4aaa986fde6e6e2f4c9bb0cf4fd964b4f71427b3383637b216cdbaf5b0c5967edd24e47e5ee WHIRLPOOL 230168efe3b985511e375fb79bad3c28d70deb5e3411d0cfc87f42ab7a51cbbbb9eb0d45f966ea1e416f29c67113dd83202a9414a54a3d5eac335e035b9bf3de
+AUX cups-2.0.1-rename-systemd-service-files.patch 2450 SHA256 5d7ede862d2e26c3a63f7b599b73e3e9dcc3a73d9ac1e1d7472abcd9c4710742 SHA512 12980ee5d7bff7edcfbbed1a94b89705d12430daa0a292eea8e353b456afbf765ac528fc1913b82b3062b901a888681854d0e86e6c12f75892d97e2ab695f1ac WHIRLPOOL 42896ce5e5c90a6d7ad700df8267c7953ea59fd299711dc3431553bcedfa0c6f353f8b31de1fc9604405a611919d556ae6716a9e1715f034c461d69613b55580
 AUX cupsd.init.d-r1 504 SHA256 4705b68372090ee7db69da1ad35131551ed1ba99032db2486ff6c31d2170ce6b SHA512 9eac4fc725b14615bb31c96a69c00a14ab2fb23fa355f1ced655f93e6364555b2710a277ceab439199a275405b016492b4c9183fab755c02354013e0904a03bc WHIRLPOOL e0ce34f4b73de6e63ba1f01b0df543cd66fecc692af8254acb3dd1147c0cd4e1f42ed7df4b18b26af0114db54c3b8c1bca526ed54146307223ac24a0b3d3502c
 DIST cups-1.7.5-source.tar.bz2 8793338 SHA256 18cb4c6847dbaaaa05c8b35af787f19dd5c7686970b46548e72c711c6f26bd02 SHA512 fe446b3d904539d744d3fa24f3ced2549ef9dfea8c805f1602eb71d03e19c2f06edaacf51f148e8216207af0c901f7d956c855f49b13b01112b01c9c45b75b9d WHIRLPOOL 7a85ec51f6333493b42b566471ba218cdf7d3bf9ac6314d4a1b1e922c0bbc3f51380331c0a3da9d2ecf4bf0d58dc9e50f905c8aa6b328592fb5427ddb167ae2d
 DIST cups-2.0.0-source.tar.bz2 8737532 SHA256 83fdbbcb4ac4d82949bbde6d5dce7a4b6a62557da8f3d46c5e34b951110f5be2 SHA512 d6b3f3ef786c477914678825cff68c96d8e3457fdf8742e65f444312e8b9da44b44a5a91b09b855011a2abb4b16b3351d5dfd649ddb9e98d17bec849c9908d33 WHIRLPOOL 2615a2d339e4702538ee717d485130be2245cfec4091032de13ada89c9eb06b92a12de4302fcb7b15731fcfad6dcc4a0c7240d988b830a844b5701c0c067bd0a
+DIST cups-2.0.1-source.tar.bz2 8738217 SHA256 60f7f2cca69f3b761a029fb314ee4299e3ea0fc02350f06d192cf31d58215525 SHA512 a92e4735f23f45fd16fb47ea729be762001c5b74f785d344bb11d3e87a361aa772ef79ff41106cdc30f45a1396ba419d6e5f77164b9deee27876e9928357f3ce WHIRLPOOL 4f9695bfa759d5bcf611f30c0f071ad352066313f871e2459c005511a4713ad1c58b90bbe3cc233bb72a5b0a51e27b630c0a27d1ddfed80044c0f6dca14e53c8
 EBUILD cups-1.7.5-r2.ebuild 10666 SHA256 da0787e5fa181fef0cea06a48d345dc598a95017ddceb9d05a2afcdae322e7c4 SHA512 a5a143146903882056227d6a390032c3b34984b3f6ce23d6aaf7c31f71269165c73c6c57cae8003f4ac79f65a1997c39825bd3ad755bce59c85ebc9bdb3adf9a WHIRLPOOL 91ac853f30b2e48da07f504d72f20d19f9505d6a805dfabf27b7080a8fec848553c55a77ff4a80679c8513dbd97ca610879670caf0aa53266cbac6c078c7d531
 EBUILD cups-1.7.5.ebuild 10431 SHA256 328696896e43f0348df62ba50ee7715f8232b83367fe5941b46783ed438bd458 SHA512 a61568ac379ddd995c0f527cceecc914c5c1d45e040000a0024f7a2015f0f4e567669dac223ba1c2b246c0aecf9eff68d718f4dd000be620a21f6c510ce35b7c WHIRLPOOL 59978548be1cad588e994b57e26d67c27ed47890c6256f152976d0247d43fa8ebfdc374478187b69acd314d85913f7852283c81023f497958d505e53d17e23f7
 EBUILD cups-1.7.9999.ebuild 10621 SHA256 e27e4f543474fa2f7a00ea0bb32758a941a6c7db0267fdab9b384b25e8b51914 SHA512 2fccf3f4759eeec3bec079073a13486136e71850ea783114ecab953212f5c0fbeefde5a6683712a88799f7a8a9ad02321e6e02c45804ae737cc55273e4066be4 WHIRLPOOL 45ed707f69b10203322392649e67238868c5675e8b67ba7e98af66128b624fbab3cf261760a3a669a8d7a81200a9015f873ecc500557ae6f9cc8ec57fe366a39
-EBUILD cups-2.0.0-r2.ebuild 10356 SHA256 c4d6aee26441863eccfe0aa9e109d5b9de35ff0dc6ad9436a9d78f28ec4a1d7b SHA512 2ba199c313336afa03efd170770476f78c9083945035f53a1f21e9108b09be1bf80474ff0640c5248b1bcf2b43c84bcd123ab8c335e1f91909fb732422e9c6a1 WHIRLPOOL 082644673f126b833cf2a375ba957252e3f02e4109996921f149cc2dea36b52dac2276da584b7ed7660ff093130dfe8c7da5d47e60b09b81f8cbf25404a01f28
+EBUILD cups-2.0.0-r2.ebuild 10350 SHA256 8d50f9037a07df7a97cb6c0ade5e348c26da12b0a4a43a9f94f9f055c1c33091 SHA512 d8f6b63e14635f36148ad5d2795321bde87f498ebc6b172f3f6dd925bc30a984a751088a3b997376e52dbd1bacc510b2c8c795a27b43bfca7e5a942f062143a4 WHIRLPOOL 06fe31e815ccb14af9e9014824e1e06a0e7f4b4b1fc77e8bfb42ae5568f326cb1b729d5bcf8f9e1380b6d0085e53f2f46ec2c59c87a5173821e9e7f63dc4fd6b
+EBUILD cups-2.0.1.ebuild 10390 SHA256 94ccd04795ec0e8ac737f5eda2289e37ce035addd2f3ca0a7553ab7bd25cd8cb SHA512 38d79c63e0e59f3ea0c86a78f8505da1dcbb5c3a188660e691bec5b51434d2232a41c83e7344b7687d072151862f7ab25544dc6c4f75e22f6805fb3818921752 WHIRLPOOL 5a3fa72ed64049d48cd94c30cee60c5374bd19133940b95795796e08b45d6d50a76eb0f17ff62848e5102d5da737ed2886d82957a359292cb93c4afb1e49299d
 EBUILD cups-9999.ebuild 10379 SHA256 091c2619d78e431f95f420f338d3d8a09ed8d14b3b82f639b6b9643dbf4bdda2 SHA512 171ce4c065e1b0c2aa685728515d76d2c95930f64c1d0f105d85e085c130e430acd317854b48256b511b1da73ffacdd1db6b3da6593b39ca7cf9d1937c1740e3 WHIRLPOOL e01daef7090562d346a1fdef7dde4c6bbe816a78be38c098233c56e162df446318ee112042cf78cd26ee933de6353adba3c83d352f1a346ca1c57dae257e4d20
-MISC ChangeLog 98230 SHA256 b128c1fbb2efdeee98d588e73c551a02235b80f3710af4a30a5992d0731e072f SHA512 29c468997217708b518f2c4a8cef294f4ad8e50739abc5bdf7604d37b09941c919d1fa48998f58856436adb4e22aaa274d406c5d66a3c7f10eb36d3de8de131e WHIRLPOOL c834dc87ac9a10eeac53f4c6fb99a0939da98148187e58402dcd637d44868560c5d7e1a17ab70939521705bd40e62bc0c4d7df7ba9ace59c2947e8f8add40c84
+MISC ChangeLog 98465 SHA256 79956ec75097fe6235494ea4ff843fa832fd04bb9b1c6c488c6d52846d2bb10a SHA512 0de859ec48fe3f8339afb7def805cd428af08dce5775e72171cad429114ca0e8ce53e8966e255b2dfa2c40e5d746a348fc75480db4a56218bdd55e9f20c1f07d WHIRLPOOL 67ec2a22ce2e887e77dcc50693c89bc3b390e98fa4be21b16c3376124224dd42a0efd774845cda670202c09cbaba50e767b909ab2c4f767dc70de649c0150dcd
 MISC metadata.xml 496 SHA256 732bba7ee060b7be5e0b23d06d24c12c2bfc1c6be1440cdfebe6d5d94d145c47 SHA512 713300abb461ad923c4f6e59326fa97b2372181df4ef82bf04dd6f2d68dc0eb7c34e518cbb40ebd535cb9c4bf52d2648512002cc2cb55c6f21406cc973fa4496 WHIRLPOOL 061013ee6ddaf510964589024e39c4a05f18f0a6d2488eb5b121bb962a378348e71261f7e153f34dbb33337a2e49eb7da94e52d0cb7a128d71e9b4466f8a5933
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iQIcBAEBCAAGBQJUVia0AAoJEC7dUkA7aK9HL+YP/jXmwWwYOsp5uX9EiS586jpO
-JYfPEH94v64WcoSTqEpTMjoM5tEXpDeKzrnRNs/EZB3uJAu+LkfVo0tTzSGKm62M
-XGtJRwXLarnGFcloaB8rn2c7AI9IrQRGvaAvyD3DeWKLnL/FwR2IJfSBkVQ+G63e
-mmt3m1Cs5yX+WflE69kxoVqQGm9+xzKMGdub7zGA2LRIO2lP0jdTZACBK+2CqYjC
-ANVUv7C1N6m1w7VNj24HC3II22nssuqW/lhREfY3Qa9ShMIdYFYr8QTjArSKwBI4
-sc0e8EZbplu4B5tiBhd/2QY+FTM1gpi+qruUdqbadXVHKcXv8E6+TLuC7swMsx+g
-+aPrUFmi+HtRBRS3zSyxizaEgzrzU3qK4fRIapAxZUM4Ma2DEjUjxNTApb4TRrKP
-k7ztZ0nFevSA4tAZFweDnJ9b32yirDW3oIz6umvBgZyrnLt3F+DosJEOkvK7TmON
-LJnplHIiHVIsoj/vaMwXE3erov6LpoZQZsOkEaddHN9devgaZhAhbK97oSl5CZwt
-rENn3E63WgTz14e4ZUTqfJqwgvvNKEaiKdvAisYFRacYVptj8cnsQrPcID83mbXI
-HSJ8iEAdmTqKyBMNyRrVN/5jlrUYyfW32iBy6WWd4/TUN5H01O+QO+Ksk7iBh1M7
-axG4ITWUeLpEZwFyKCGR
-=+Q6d
+iQIcBAEBCAAGBQJUbPJ2AAoJELhOzYlK7nn/vBcQAM3Uy9D3X7NeGiaBL5wRVYA7
+hyVhVY67DyGcDXnFsRVa100aYbKc71HPLZVeZ+1P20keMmV/1XpcBNFMv9X2Gl1v
+Gnrr5Y2BSUt99lG9W1Jq+FgFbJ3rMkDZOiBK7LSu9HE4pA0upUB5mQZ8/b61yJu2
+p3zsUbcWqbBUZbiiqT6s5m6GcJqW3Ge030GwqO/DCu2HMNWLNn9M4lxhMZt1BMhF
+hTEVBZBQSM52eoiDxkhzpPgxO/N+iybUqEe33Y/iaBnuT91ExKW1hAAjZ4nzSgBt
+UewDPL574HkvlFaoKUkiDrHgkTM7bkxPMFdVqGwnNErVrw81KfV9q24/VFBJpkS7
+BKDAch80FNCoNmxGBBPKnzaaDKmHdKSMWZKlehofV0kap3Nzz7a4ov6Plsh4K9P9
+D7ajpjtQuF+pxbBBFUNgrIkQSKClRlIkWY+9orCqDKgKBuseZugQi8FYTbN2f2LM
+dZ/nA9V2f44tnqIdBYctRj4iYfhRWyPbUgC2bYnR6pIYjirHrnIIn/TiHgtLCPO6
+vcC4n5qxv31Uiix6ulo9hA4NhzyyoOFGdruUMqWUKlnrKgCzQuD5NGkKDxM0jrFK
+/Wksn/7SOzsttiRe1WBjDVi963xQxgwaAevbqzytxMDHv92xAshtM1X27zNxa+a1
+aHMZ3zzcKI4E+IxH3aW3
+=BQ7x
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-2.0.0-r2.ebuild b/net-print/cups/cups-2.0.0-r2.ebuild
index f2a790c9e136..f9a73b0fea55 100644
--- a/net-print/cups/cups-2.0.0-r2.ebuild
+++ b/net-print/cups/cups-2.0.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-2.0.0-r2.ebuild,v 1.4 2014/11/02 12:42:26 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-2.0.0-r2.ebuild,v 1.5 2014/11/19 19:41:40 tamiko Exp $
 
 EAPI=5
 
@@ -97,7 +97,7 @@ 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}-2.0.0-rename-systemd-service-files.patch"
+	"${FILESDIR}/${P}-rename-systemd-service-files.patch"
 )
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/net-print/cups/cups-2.0.1.ebuild b/net-print/cups/cups-2.0.1.ebuild
new file mode 100644
index 000000000000..a9809bae5a5c
--- /dev/null
+++ b/net-print/cups/cups-2.0.1.ebuild
@@ -0,0 +1,356 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-2.0.1.ebuild,v 1.1 2014/11/19 19:41:40 tamiko Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info \
+	multilib multilib-minimal pam python-single-r1 user versionator \
+	java-pkg-opt-2 systemd toolchain-funcs
+
+MY_P=${P/_rc/rc}
+MY_P=${MY_P/_beta/b}
+MY_PV=${PV/_rc/rc}
+MY_PV=${MY_PV/_beta/b}
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="http://www.cups.org/cups.git"
+	if [[ ${PV} != 9999 ]]; then
+		EGIT_BRANCH=branch-${PV/.9999}
+	fi
+	KEYWORDS=""
+else
+	SRC_URI="http://www.cups.org/software/${MY_PV}/${MY_P}-source.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~m68k-mint" # ~x86-fbsd
+fi
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="http://www.cups.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="acl dbus debug java kerberos lprng-compat pam
+	python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
+
+LANGS="es"
+for X in ${LANGS} ; do
+	IUSE="${IUSE} +linguas_${X}"
+done
+
+CDEPEND="
+	app-text/libpaper
+	acl? (
+		kernel_linux? (
+			sys-apps/acl
+			sys-apps/attr
+		)
+	)
+	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
+	java? ( >=virtual/jre-1.6 )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	!lprng-compat? ( !net-print/lprng )
+	pam? ( virtual/pam )
+	python? ( ${PYTHON_DEPS} )
+	ssl? (
+		>=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}]
+		>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}]
+	)
+	systemd? ( sys-apps/systemd )
+	usb? ( virtual/libusb:1 )
+	X? ( x11-misc/xdg-utils )
+	xinetd? ( sys-apps/xinetd )
+	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)
+"
+
+DEPEND="${CDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-cups )
+"
+
+PDEPEND="
+	app-text/ghostscript-gpl[cups]
+	app-text/poppler[utils]
+	>=net-print/cups-filters-1.0.43
+"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	usb? ( threads )
+"
+
+# 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}/${P}-rename-systemd-service-files.patch"
+	"${FILESDIR}/${P}-fix-compilation.patch"
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/cups-config
+)
+
+pkg_setup() {
+	enewgroup lp
+	enewuser lp -1 -1 -1 lp
+	enewgroup lpadmin 106
+
+	use python && python-single-r1_pkg_setup
+
+	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
+
+	# Remove ".SILENT" rule for verbose output (bug 524338).
+	sed 's#^.SILENT:##g' -i "${S}"/Makedefs.in || die "sed failed"
+
+	# Fix install-sh, posix sh does not have 'function'.
+	sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh"
+
+	AT_M4DIR=config-scripts eaclocal
+	eautoconf
+
+	# custom Makefiles
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	export DSOFLAGS="${LDFLAGS}"
+
+	einfo LANGS=\"${LANGS}\"
+	einfo LINGUAS=\"${LINGUAS}\"
+
+	local myconf=()
+
+	if tc-is-static-only; then
+		myconf+=(
+			--disable-shared
+		)
+	fi
+
+	# explicitly specify compiler wrt bug 524340
+	#
+	# need to override KRB5CONFIG for proper flags
+	# https://www.cups.org/str.php?L4423
+	econf \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--localstatedir="${EPREFIX}"/var \
+		--with-rundir="${EPREFIX}"/run/cups \
+		--with-cups-user=lp \
+		--with-cups-group=lp \
+		--with-docdir="${EPREFIX}"/usr/share/cups/html \
+		--with-languages="${LINGUAS}" \
+		--with-system-groups=lpadmin \
+		--with-xinetd=/etc/xinetd.d \
+		$(multilib_native_use_enable acl) \
+		$(use_enable dbus) \
+		$(use_enable debug) \
+		$(use_enable debug debug-guards) \
+		$(multilib_native_use_with java) \
+		$(use_enable kerberos gssapi) \
+		$(multilib_native_use_enable pam) \
+		$(multilib_native_use_with python python "${PYTHON}") \
+		$(use_enable static-libs static) \
+		$(use_enable threads) \
+		$(use_enable ssl gnutls) \
+		$(use_enable systemd) \
+		$(multilib_native_use_enable usb libusb) \
+		$(use_enable zeroconf avahi) \
+		--disable-dnssd \
+		--without-perl \
+		--without-php \
+		$(multilib_is_native_abi && echo --enable-libpaper || echo --disable-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\)${EPREFIX}/usr/libexec/cups\":" Makedefs || die
+	sed -i -e "s:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN \"${EPREFIX}/usr/libexec/cups\":" config.h || die
+	sed -i -e "s:cups_serverbin=.*:cups_serverbin=\"${EPREFIX}/usr/libexec/cups\":" cups-config || die
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake libs
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake BUILDROOT="${D}" install
+	else
+		emake BUILDROOT="${D}" install-libs install-headers
+		dobin cups-config
+	fi
+}
+
+multilib_src_install_all() {
+	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 zeroconf && 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
+		# always configure with --with-xinetd= and clean up later,
+		# bug #525604
+		rm -rf "${ED}"/etc/xinetd.d
+	fi
+
+	keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
+		/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 ${EPREFIX}/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
+
+	# the following are created by the init script
+	rm -r "${ED}"/var/cache/cups || die
+	rm -r "${ED}"/run || die
+
+	# for the special case of running lprng and cups together, bug 467226
+	if use lprng-compat ; then
+		rm -fv "${ED}"/usr/bin/{lp*,cancel}
+		rm -fv "${ED}"/usr/sbin/lp*
+		rm -fv "${ED}"/usr/share/man/man1/{lp*,cancel*}
+		rm -fv "${ED}"/usr/share/man/man8/lp*
+		ewarn "Not installing lp... binaries, since the lprng-compat useflag is set."
+		ewarn "Unless you plan to install an exotic server setup, you most likely"
+		ewarn "do not want this. Disable the useflag then and all will be fine."
+	fi
+}
+
+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
+	fi
+
+	if [[ "${REPLACING_VERSIONS}" == "1.6.2-r4" ]]; then
+		ewarn
+		ewarn "You are upgrading from the broken version net-print/cups-1.6.2-r4."
+		ewarn "Please rebuild net-print/cups-filters now to make sure everything is OK."
+		ewarn
+	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/files/cups-2.0.1-fix-compilation.patch b/net-print/cups/files/cups-2.0.1-fix-compilation.patch
new file mode 100644
index 000000000000..5828b6801306
--- /dev/null
+++ b/net-print/cups/files/cups-2.0.1-fix-compilation.patch
@@ -0,0 +1,25 @@
+From 7bb9184b40bea3c4b9f46362642e5d40053a3ae1 Mon Sep 17 00:00:00 2001
+From: Matthias Maier <tamiko@kyomu.43-1.org>
+Date: Wed, 19 Nov 2014 18:44:33 +0100
+Subject: [PATCH] fix compilation
+
+---
+ test/ippserver.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/ippserver.c b/test/ippserver.c
+index c785e5f..1c64668 100644
+--- a/test/ippserver.c
++++ b/test/ippserver.c
+@@ -421,7 +421,7 @@ static int		valid_job_attributes(_ipp_client_t *client);
+ 
+ #  ifdef HAVE_DNSSD
+ static DNSServiceRef	DNSSDMaster = NULL;
+-#  else /* HAVE_AVAHI */
++#  elif defined(HAVE_AVAHI)
+ static AvahiThreadedPoll *DNSSDMaster = NULL;
+ static AvahiClient	*DNSSDClient = NULL;
+ #  endif /* HAVE_DNSSD */
+-- 
+2.0.4
+
diff --git a/net-print/cups/files/cups-2.0.1-rename-systemd-service-files.patch b/net-print/cups/files/cups-2.0.1-rename-systemd-service-files.patch
new file mode 100644
index 000000000000..967856e4ee60
--- /dev/null
+++ b/net-print/cups/files/cups-2.0.1-rename-systemd-service-files.patch
@@ -0,0 +1,59 @@
+From 33e0d4c8e450fe69b195422c0880aaa96ca9478d Mon Sep 17 00:00:00 2001
+From: Matthias Maier <tamiko@kyomu.43-1.org>
+Date: Wed, 19 Nov 2014 18:00:06 +0100
+Subject: [PATCH] change systemd service files to gentoo naming scheme
+
+---
+ scheduler/Makefile                  | 10 +++++-----
+ scheduler/org.cups.cupsd.path.in    |  2 +-
+ scheduler/org.cups.cupsd.service.in |  2 +-
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/scheduler/Makefile b/scheduler/Makefile
+index 3e0884a..b354420 100644
+--- a/scheduler/Makefile
++++ b/scheduler/Makefile
+@@ -203,11 +203,11 @@ install-data:
+ 	if test "x$(SYSTEMD_DIR)" != x; then \
+ 		echo Installing systemd configuration files...; \
+ 		$(INSTALL_DIR) $(BUILDROOT)$(SYSTEMD_DIR); \
+-		$(INSTALL_DATA) org.cups.cupsd.path $(BUILDROOT)$(SYSTEMD_DIR); \
+-		$(INSTALL_DATA) org.cups.cupsd.service $(BUILDROOT)$(SYSTEMD_DIR); \
+-		$(INSTALL_DATA) org.cups.cupsd.socket $(BUILDROOT)$(SYSTEMD_DIR); \
+-		$(INSTALL_DATA) org.cups.cups-lpdAT.service $(BUILDROOT)$(SYSTEMD_DIR)/org.cups.cups-lpd@.service; \
+-		$(INSTALL_DATA) org.cups.cups-lpd.socket $(BUILDROOT)$(SYSTEMD_DIR); \
++		$(INSTALL_DATA) org.cups.cupsd.path $(BUILDROOT)$(SYSTEMD_DIR)/cups.path; \
++		$(INSTALL_DATA) org.cups.cupsd.service $(BUILDROOT)$(SYSTEMD_DIR)/cups.service; \
++		$(INSTALL_DATA) org.cups.cupsd.socket $(BUILDROOT)$(SYSTEMD_DIR)/cups.socket; \
++		$(INSTALL_DATA) org.cups.cups-lpdAT.service $(BUILDROOT)$(SYSTEMD_DIR)/cups-lpd@.service; \
++		$(INSTALL_DATA) org.cups.cups-lpd.socket $(BUILDROOT)$(SYSTEMD_DIR)/cups-lpd.socket; \
+ 	elif test "x$(XINETD)" != x; then \
+ 		echo Installing xinetd configuration file for cups-lpd...; \
+ 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(XINETD); \
+diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in
+index 1bccc6f..90c8576 100644
+--- a/scheduler/org.cups.cupsd.path.in
++++ b/scheduler/org.cups.cupsd.path.in
+@@ -2,7 +2,7 @@
+ Description=CUPS Scheduler
+ 
+ [Path]
+-PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
++PathExists=@CUPS_CACHEDIR@/d*
+ 
+ [Install]
+ WantedBy=multi-user.target
+diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
+index 0a27c76..7a04248 100644
+--- a/scheduler/org.cups.cupsd.service.in
++++ b/scheduler/org.cups.cupsd.service.in
+@@ -7,5 +7,5 @@ ExecStart=@sbindir@/cupsd -l
+ Type=simple
+ 
+ [Install]
+-Also=org.cups.cupsd.socket org.cups.cupsd.path
++Also=cups.socket cups.path
+ WantedBy=printer.target
+-- 
+2.0.4
+