gentoo resync : 12.11.2017

5 files changed, 122 insertions, 98 deletions

diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 896274c3e137..b7c2d30982ee 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -7,15 +7,16 @@ AUX cups-2.0.3-cross-compile.patch 773 SHA256 5d9b8d5b79c5c34e9a992cf530a6f03f78
 AUX cups-2.1.2-systemd-socket.patch 1542 SHA256 d24e13eee72917882ed4143989046f143f720e0fe10d01b6dee08ef36834a3aa SHA512 56759eafbac1e9947bcc445c850acd0c176687ae6360bc925bbb62153d4a049143d1d41efb3fcc78bbdeba18b0f11ef9a0c5452ec20fae7ef689518781cac48e WHIRLPOOL 8d6e20d02cef902fd8e9491ee51256e02f3b17dd10c96fde6fdb20c798c1d33ed6544d2a180318c73455353f1b013fa997f2b08d2a1f1acb80a50c0945053fa6
 AUX cups-2.2.0-dont-compress-manpages.patch 319 SHA256 f0a2d485d97734c3a7d17483d366cd8f03619d7ceb7ebac1baf2e8c8221d9246 SHA512 0f4822e50f9376dc2e8c87b55f6526ab514f5f08f737071f5b15696e71b51416203df6c9219d78989544bbc135cd92be91ef351a377be7ab4052e98c25c0c4f5 WHIRLPOOL 9897c0fc34ed29937129db10c431704d99ce95d5d452bc6cb9fc5f7570eaa41c2fe9351e52f26872a26ab4bd25e025f42aee7ca3898b171e9d158d11839c485a
 AUX cups-2.2.4-fix-install-perms.patch 646 SHA256 c070e555cda7bb2745a48e55bc652b9ebed0053862c69a026f2a62fb62a3afb8 SHA512 8ead1792208d0190aff22ec1c648e215ab456435c3ecb135b0318585789009cb27b67de939164637f58563fbed809c25ba1a39e39232e17e9470133ead387a5d WHIRLPOOL 24921f7951aa48c73eda8ed9f790976a3470c9e570e47935d310f68eb2f0ffedfcf43bafbd36185225129f195e33c95fe5a61bc28ae4cb27734a6ca52db1b622
+AUX cups-2.2.6-fix-install-perms.patch 660 SHA256 a15c47fe8a2f4283baca05c845845b0f463fc48a66fc4322d47607b565a67b2b SHA512 f64ed254bc79935ea3d9fce4c4cd8074445397c20ee1bc1e759e3bc7a336b30f73722357d2702219932e7a774f925abf9a450d3b30a12ca1f0c5f3c92b0b5fbf WHIRLPOOL 3274346388a918bd4ae587576575df8d785718f6687220ddd832b0d07805e3bb9c78d3525788042324ca0208ed67af76e443c0d8cb2f73540cde964575147907
 AUX cupsd.init.d-r2 432 SHA256 54b86ec2d7086004cde4e8b69aa49b7334718cad42a4426382f56269bb0f5a78 SHA512 d14973383158dd78e4970dce3037b73e812788f9e61ad9348b580cc8891e7ad6c2214709cac4a43829f7010720a755855c8357d1ada11d048deccf59aa4e83d5 WHIRLPOOL 42b5e0107d1d2fe8399a2ebe8a7d559d56d8c96bca63a587e8a79fc6b04096d072f2dedbc9ae3551fa0238ac169de178f63ea32436790a84354e308baf566a80
 AUX cupsd.init.d-r3 584 SHA256 06ccf2b8166cbe0046da899e4800ceb879d97d10544c40788d1117d0c1e2591a SHA512 ace66b46c17f99f8c6487188c14e8a1baf7acad602156b88cdae7fb4738c163a045240a1b28c6db4af86caa317723357186812eed81f9553a9ef3517c966c6b3 WHIRLPOOL 50020193e046da70f9236bbe3d6ca68acb27d337eaf7d5804156492c7d46885ebe8a873ea32770abbf063f8d1ccf8ef87407e6f39d14b53d1f8c1fa9385a61fd
 DIST cups-2.1.4.tar.gz 9572653 SHA256 1f182f145489e2454969b221056b6b9bac2beb4e38cd75fa12a9ec15d24d5301 SHA512 5f36d21e1e094323f1811229b452f096f3f0b264757b3c3b1742bbd7ea0059e34d3cd2fbf3b6856d25a04ae1779babafa6d598a8ba249448fce3bf7cafa59aae WHIRLPOOL 217b9024c34369c8839b0a1b2b3924eb00e9b8d87cfd8d50a59ad0c33c1044f53d479246d67dff4598049efd15259def90e4bcddc6c3c20dff38811e159d2c4b
-DIST cups-2.2.3.tar.gz 9496214 SHA256 7aa7e8d581f0eb204f75203082403bfa931f8c058bffae71b210800102e5feb5 SHA512 95d8f18fad5b3fd25fe88cc29d159723dcfa735248503d0285949fcd7451f0ccac286719077d0f8a8eda7ee9a053a3d30fa3fd28cb74b59336b6718552d9d2e8 WHIRLPOOL 3aa43f1b83ee62939939bd148c2ab13985143746f7acc3d9c82283e1b096524c7738ae5e1670e717c9329f8d3e917cfcc1c8a7e33af93baa74ea83837d92b5f9
 DIST cups-2.2.4.tar.gz 9984903 SHA256 339fb0c0a70a1edf1ef169f2afb21bab92cdd3074adf630352c427b795f20fa7 SHA512 765fe49d1a7a491d7d5db051f73d039d183d0f7a560e9fd89f6732b8a699d3246080e1aaed4ddfed3a9fbdb876b09aa22939d6ee5da2280b1246e4ba933c55f0 WHIRLPOOL 86557f6244b7aa7b19cc67caff7c845291d09699353bd337090111f92b6afb6b9e175ca68df8a15d8915a5a15fd72348805e4ecb7da532a994f46b2c2d4cdada
+DIST cups-2.2.6.tar.gz 10317889 SHA256 bf75b33755be92ffe11642dc54365d876c57cee13d6e12507645a8c2d570033a SHA512 ae880aa3f675e0c1ad269200d06be3c25675a45a697c7a8b44e6ec0c30f05f333acca35cd965e667ff066d753df5e59447c2eeaea240e72d2731690b3b9dcf76 WHIRLPOOL 6f7107703701f12349122f45401d4fbfd7c03fae847fcf5760a656b24f2cadf836447491b305bbc1074bf2f17aead3b9544c6d03fd16201dc30b5852ff349662
 EBUILD cups-2.1.4.ebuild 10392 SHA256 e864a9be631312db0bca0bd340affd29e8e23b7065f37e8fa18de142ee4b48f4 SHA512 bbf47ec4c8392a862ca8f559b6a80fb77f9b9997b8a42aabfd99d1b26b5dac53cc05518617af5313e172a4acd9d5a63e88aaf13836217ecbdaf2756c4897ae61 WHIRLPOOL e4bf4f9bb210ea40ee845d90d02d608e2a5eee18c6a1128d507b528874c42b52f1a262d51863bbf6362989e24bdd63111d5ead886b239fca7a6e002c2c1e3214
-EBUILD cups-2.2.3.ebuild 10140 SHA256 a8be1b257bbb8ad58f9d066579b65bff077a83f3e2bf8501f9cf7814ca9e8fa3 SHA512 85cbee64c1d1e6a876849081eef72c89962314e144a98426d6c98907939b94663c67245db8b40986c2bf17e75c5ee1ae4c8cde763cd28b98a259769a80226adb WHIRLPOOL a979d4f33391b1cbdbcd2c7003585275a0aa92a4c2ab8230f1764fb9283ba8b15a22be4b45e1d658b782d3e6575cfd38d792b7391215b3557189c3643eb01156
-EBUILD cups-2.2.4.ebuild 10088 SHA256 0a5c480875fda7bab575107e8f6fbf9e3560bcb5a3d615338e316cb94f927868 SHA512 4f2f9685c9c509e05e802221eca3263fc18f4c5cab1685f3d001834e04ef1749323f82ac4ad574b45649f7dfad73e0b9e5608dbf6a2f6e058fea5f82e6ff6c32 WHIRLPOOL f20547ee711d6757d593c68868aef375350235514d9b83baca2ab8fd582d4712ede8243a39565b40f794d7143c12559b697b562399570af740206dac96ff6a29
-EBUILD cups-9999.ebuild 10090 SHA256 45415cc15505918653a04186465c71ebacfc68acfd35b28b9381a6c5917a7d82 SHA512 a664a8b880bc7713dc0b2e933941d009ddbffda099573737723be296097070f1ba3ed455e59c83546ece9038e4a3983b7b247f9fdf9fbcc5510d73deae962200 WHIRLPOOL ea2def95369d12ae6ebe66cb247e966f7df51781716c8c5a38459eb35343a1e7f68fb6bc9cf6db0d2ae990258e0580274ffe431a508d98cc88105295cdf22c26
+EBUILD cups-2.2.4.ebuild 10079 SHA256 423df6ce4b4399bac5996471cf5622f4baa8d457bb8f4403ad5f4368e37426c7 SHA512 b4d4a944dba2ddeb0facb669f3656fc8b01e29114cf70049a73b303e56a0c4ef4cfe7d499892b860cc12c7006bc4b5e5d37f05fe3df26be412e3ef787eab9870 WHIRLPOOL 522bbf49dd18bc39b9af99367beab328b1f7f533d7f6800e83565531ddc76f3ba08547f3a0f97195dc2e3d2960529afc1382533ca6dbac97dae904247bbb10d5
+EBUILD cups-2.2.6.ebuild 10079 SHA256 423df6ce4b4399bac5996471cf5622f4baa8d457bb8f4403ad5f4368e37426c7 SHA512 b4d4a944dba2ddeb0facb669f3656fc8b01e29114cf70049a73b303e56a0c4ef4cfe7d499892b860cc12c7006bc4b5e5d37f05fe3df26be412e3ef787eab9870 WHIRLPOOL 522bbf49dd18bc39b9af99367beab328b1f7f533d7f6800e83565531ddc76f3ba08547f3a0f97195dc2e3d2960529afc1382533ca6dbac97dae904247bbb10d5
+EBUILD cups-9999.ebuild 10079 SHA256 423df6ce4b4399bac5996471cf5622f4baa8d457bb8f4403ad5f4368e37426c7 SHA512 b4d4a944dba2ddeb0facb669f3656fc8b01e29114cf70049a73b303e56a0c4ef4cfe7d499892b860cc12c7006bc4b5e5d37f05fe3df26be412e3ef787eab9870 WHIRLPOOL 522bbf49dd18bc39b9af99367beab328b1f7f533d7f6800e83565531ddc76f3ba08547f3a0f97195dc2e3d2960529afc1382533ca6dbac97dae904247bbb10d5
 MISC ChangeLog 10454 SHA256 aac7bd2c8e875aec6f463a11fcf12c4e9565cf0c679ea68bb84d243eafc5eab8 SHA512 bd76be7dfe667b8e18c66bf6bd6c17326c781394690150eb5d89908b1058866d78b0662ada5be3bdfdca30e7654f4324b4e74a30469eb6fe82692f6ce8fad7f6 WHIRLPOOL 620bd44336602b2542c30b37ae0955562ffbeb8308d2d8b37c6bae5c4ab37cc35eac769050519d615766e50127a7b32acbf979fd145587a9cef05ad85aed4486
 MISC ChangeLog-2015 103648 SHA256 adcf00fa34197ba3b90d67437030427fc35ac3451d485d2e9c9fa8801243deaa SHA512 745e845ddf34c1a961b7e7571a7a5b3008a356eaf21ea1bd0dc8b5010b6ff271b937a78f3dae215070854d266aa57204679662b3c855bb62e396205bdfc03a7a WHIRLPOOL 8a35e77792b4faa2310ce4ed46a2e528488eb488485c68248b2f67d137d2e016da618fafb3697230df841ed51a18269ab5895fb74433425445dd6da001af62c8
 MISC metadata.xml 677 SHA256 30911b798a3853b5f838878037fd188d98e986183b11cbc6c93e54ae92976865 SHA512 f7ed769c4f662ea52ed9e24702b91948a376e7d5a59b305f6d89950d0ea40130e6d471cc0bee373a63338f590bce3b6df5a09e56a166ba7fdd960f82e7648717 WHIRLPOOL 927f62af1c4c4066398c9f66fbef08ce598382081ff0016b5ce3eb16d51f2b0c9390b9595e631ab6b7dab467b22bcadef1e67747fc7e512cc56694c9e66e7a1b
diff --git a/net-print/cups/cups-2.2.4.ebuild b/net-print/cups/cups-2.2.4.ebuild
index 1022bea6f56a..af840a3d0aa9 100644
--- a/net-print/cups/cups-2.2.4.ebuild
+++ b/net-print/cups/cups-2.2.4.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit autotools fdo-mime gnome2-utils flag-o-matic linux-info \
+inherit autotools gnome2-utils flag-o-matic linux-info xdg-utils \
 	multilib multilib-minimal pam python-single-r1 user versionator \
 	java-pkg-opt-2 systemd toolchain-funcs
 
@@ -88,7 +88,7 @@ RESTRICT="test"
 # systemd-socket.patch from Fedora
 PATCHES=(
 	"${FILESDIR}/${PN}-2.2.0-dont-compress-manpages.patch"
-	"${FILESDIR}/${PN}-2.2.4-fix-install-perms.patch"
+	"${FILESDIR}/${PN}-2.2.6-fix-install-perms.patch"
 	"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
 	"${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
 	"${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
@@ -318,7 +318,7 @@ pkg_preinst() {
 pkg_postinst() {
 	# Update desktop file database and gtk icon cache (bug 370059)
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 
 	local v
 
@@ -345,5 +345,5 @@ pkg_postinst() {
 pkg_postrm() {
 	# Update desktop file database and gtk icon cache (bug 370059)
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
diff --git a/net-print/cups/cups-2.2.3.ebuild b/net-print/cups/cups-2.2.6.ebuild
index 8afa9e83e60c..af840a3d0aa9 100644
--- a/net-print/cups/cups-2.2.3.ebuild
+++ b/net-print/cups/cups-2.2.6.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit autotools fdo-mime gnome2-utils flag-o-matic linux-info \
+inherit autotools gnome2-utils flag-o-matic linux-info xdg-utils \
 	multilib multilib-minimal pam python-single-r1 user versionator \
 	java-pkg-opt-2 systemd toolchain-funcs
 
@@ -88,11 +88,10 @@ RESTRICT="test"
 # systemd-socket.patch from Fedora
 PATCHES=(
 	"${FILESDIR}/${PN}-2.2.0-dont-compress-manpages.patch"
-	"${FILESDIR}/${PN}-1.6.0-fix-install-perms.patch"
+	"${FILESDIR}/${PN}-2.2.6-fix-install-perms.patch"
 	"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
 	"${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
 	"${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
-	"${FILESDIR}/${PN}-2.0.3-cross-compile.patch"
 )
 
 MULTILIB_CHOST_TOOLS=(
@@ -160,51 +159,54 @@ multilib_src_configure() {
 	einfo LANGS=\"${LANGS}\"
 	einfo LINGUAS=\"${LINGUAS}\"
 
-	local myconf=()
+	local myeconfargs=()
+
+	# explicitly specify compiler wrt bug 524340
+	#
+	# need to override KRB5CONFIG for proper flags
+	# https://github.com/apple/cups/issues/4423
+	myeconfargs+=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		--localstatedir="${EPREFIX}"/var
+		--with-exe-file-perm=755
+		--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="${EPREFIX}"/etc/xinetd.d
+		$(multilib_native_use_enable acl)
+		$(use_enable dbus)
+		$(use_enable debug)
+		$(use_enable debug debug-guards)
+		$(use_enable debug debug-printfs)
+		$(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)
+	)
 
 	if tc-is-static-only; then
-		myconf+=(
+		myeconfargs+=(
 			--disable-shared
 		)
 	fi
 
-	# explicitly specify compiler wrt bug 524340
-	#
-	# need to override KRB5CONFIG for proper flags
-	# https://github.com/apple/cups/issues/4423
-	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="${EPREFIX}"/etc/xinetd.d \
-		$(multilib_native_use_enable acl) \
-		$(use_enable dbus) \
-		$(use_enable debug) \
-		$(use_enable debug debug-guards) \
-		$(use_enable debug debug-printfs) \
-		$(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[@]}"
+	econf "${myeconfargs[@]}"
 
 	# install in /usr/libexec always, instead of using /usr/lib/cups, as that
 	# makes more sense when facing multilib support.
@@ -241,7 +243,7 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	dodoc {CHANGES,CREDITS,README}.txt
+	dodoc {CHANGES,CREDITS,README}.md
 
 	# move the default config file to docs
 	dodoc "${ED}"/etc/cups/cupsd.conf.default
@@ -316,7 +318,7 @@ pkg_preinst() {
 pkg_postinst() {
 	# Update desktop file database and gtk icon cache (bug 370059)
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 
 	local v
 
@@ -343,5 +345,5 @@ pkg_postinst() {
 pkg_postrm() {
 	# Update desktop file database and gtk icon cache (bug 370059)
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index f32e1a41dda6..af840a3d0aa9 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit autotools fdo-mime gnome2-utils flag-o-matic linux-info \
+inherit autotools gnome2-utils flag-o-matic linux-info xdg-utils \
 	multilib multilib-minimal pam python-single-r1 user versionator \
 	java-pkg-opt-2 systemd toolchain-funcs
 
@@ -54,7 +54,7 @@ CDEPEND="
 	pam? ( virtual/pam )
 	python? ( ${PYTHON_DEPS} )
 	ssl? (
-		>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}]
+		>=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}]
 	)
 	systemd? ( sys-apps/systemd )
 	usb? ( virtual/libusb:1 )
@@ -88,7 +88,7 @@ RESTRICT="test"
 # systemd-socket.patch from Fedora
 PATCHES=(
 	"${FILESDIR}/${PN}-2.2.0-dont-compress-manpages.patch"
-	"${FILESDIR}/${PN}-2.2.4-fix-install-perms.patch"
+	"${FILESDIR}/${PN}-2.2.6-fix-install-perms.patch"
 	"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
 	"${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
 	"${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
@@ -159,51 +159,54 @@ multilib_src_configure() {
 	einfo LANGS=\"${LANGS}\"
 	einfo LINGUAS=\"${LINGUAS}\"
 
-	local myconf=()
+	local myeconfargs=()
+
+	# explicitly specify compiler wrt bug 524340
+	#
+	# need to override KRB5CONFIG for proper flags
+	# https://github.com/apple/cups/issues/4423
+	myeconfargs+=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		--localstatedir="${EPREFIX}"/var
+		--with-exe-file-perm=755
+		--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="${EPREFIX}"/etc/xinetd.d
+		$(multilib_native_use_enable acl)
+		$(use_enable dbus)
+		$(use_enable debug)
+		$(use_enable debug debug-guards)
+		$(use_enable debug debug-printfs)
+		$(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)
+	)
 
 	if tc-is-static-only; then
-		myconf+=(
+		myeconfargs+=(
 			--disable-shared
 		)
 	fi
 
-	# explicitly specify compiler wrt bug 524340
-	#
-	# need to override KRB5CONFIG for proper flags
-	# https://github.com/apple/cups/issues/4423
-	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="${EPREFIX}"/etc/xinetd.d \
-		$(multilib_native_use_enable acl) \
-		$(use_enable dbus) \
-		$(use_enable debug) \
-		$(use_enable debug debug-guards) \
-		$(use_enable debug debug-printfs) \
-		$(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[@]}"
+	econf "${myeconfargs[@]}"
 
 	# install in /usr/libexec always, instead of using /usr/lib/cups, as that
 	# makes more sense when facing multilib support.
@@ -240,7 +243,7 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	dodoc {CHANGES,CREDITS,README}.txt
+	dodoc {CHANGES,CREDITS,README}.md
 
 	# move the default config file to docs
 	dodoc "${ED}"/etc/cups/cupsd.conf.default
@@ -315,7 +318,7 @@ pkg_preinst() {
 pkg_postinst() {
 	# Update desktop file database and gtk icon cache (bug 370059)
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 
 	local v
 
@@ -342,5 +345,5 @@ pkg_postinst() {
 pkg_postrm() {
 	# Update desktop file database and gtk icon cache (bug 370059)
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
diff --git a/net-print/cups/files/cups-2.2.6-fix-install-perms.patch b/net-print/cups/files/cups-2.2.6-fix-install-perms.patch
new file mode 100644
index 000000000000..a8f007446f2d
--- /dev/null
+++ b/net-print/cups/files/cups-2.2.6-fix-install-perms.patch
@@ -0,0 +1,18 @@
+--- cups-2.2.6/Makedefs.in
++++ cups-2.2.6/Makedefs.in
+@@ -49,12 +49,12 @@
+ #
+ 
+ INSTALL_BIN	=	@LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
+-INSTALL_COMPDATA =	$(INSTALL) -c -m 444 @INSTALL_GZIP@
++INSTALL_COMPDATA =	$(INSTALL) -c -m 644 @INSTALL_GZIP@
+ INSTALL_CONFIG	=	$(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
+-INSTALL_DATA	=	$(INSTALL) -c -m 444
++INSTALL_DATA	=	$(INSTALL) -c -m 644
+ INSTALL_DIR	=	$(INSTALL) -d
+ INSTALL_LIB	=	@LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
+-INSTALL_MAN	=	$(INSTALL) -c -m 444
++INSTALL_MAN	=	$(INSTALL) -c -m 644
+ INSTALL_SCRIPT	=	$(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
+ 
+ #