gentoo resync : 11.02.2018

9 files changed, 9 insertions, 83 deletions

diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index b252a24e185f..dd846cd3be5f 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/cups-bjnp/Manifest b/net-print/cups-bjnp/Manifest
index bb2369fb42e6..7e6807bcca12 100644
--- a/net-print/cups-bjnp/Manifest
+++ b/net-print/cups-bjnp/Manifest
@@ -3,5 +3,5 @@ DIST cups-bjnp-1.2.1.tar.gz 140536 BLAKE2B a47fac5c9550de024b817401b7844c5f1812b
 DIST cups-bjnp-2.0.tar.gz 140617 BLAKE2B 7d280346a6f29a3530b605d8e259007c004dc5c53386904db93e5302303a158b8a5a4ed86e8cf72692fb4d64f4b041625b224a1325d5c77e4ecc82cd59bfa0d2 SHA512 60b7c58828c736eab6986896730db7635d3364e94d6d7c4992eb7f49f22ced6a5643153c069d3823d4dc663ee7de8748b8e8ec527e04afc65389c521b791c8d0
 EBUILD cups-bjnp-1.1.ebuild 432 BLAKE2B 7c1993cf1053036750e47319e06015a666bf4422cd8f2ff826b1dc573bc3206270df02fd66aa28b6c05772ea8035926c5f75236d995039a6df5437ed6704a134 SHA512 d5c1ab4d82b7602c844c14d83c84b773ab92757e1766f93e64fec0f2b37c57d3ed35b26cafb71a2171ee81c7cad715fb4ed185c1bca2cf9f338880a7c6c1a6e8
 EBUILD cups-bjnp-1.2.1.ebuild 483 BLAKE2B 2be553cd6e1f21e532a687490f0f21a5db3b7a8502eb1b935287ef835da541773962283b23fba2bd1fe3cef577d5b09b049aca236c83980de78fc4d96af7fa1c SHA512 bc9b8d18009d951e7781463e0ea2150ee264beb23121f6acdecb0fcf43733b751df07bb978dfc2f0e27281e290bc4da78aa8b0e5a4b6b38a08ed0b19f1a10c0d
-EBUILD cups-bjnp-2.0.ebuild 482 BLAKE2B 1656a9218d12a4c84456c0d2596612e3631fe02f55cf91d70b47839e3dc1a1b66ada644be4b28ddfad10ccd2b1cd95fad6eb29cc0640faf9dc8911b8f294b5f6 SHA512 824c62c09c8dc71637e8fa9db4548df5eea19155f4a2e7e41138de84142a8d3e87dfa8c7046ed955775b734968d15e4f2be42ca4e3f39b22cf5592b57577d345
+EBUILD cups-bjnp-2.0.ebuild 481 BLAKE2B 75ff24ed8dba8575f614745ad86913156077eb877bbb0a35f58bf307c9429e90064ead3919c2795e675248c65c69673cfb0ca854bd62a47eddb0e66b38918d8a SHA512 4eab0921680a478ad9f4fe8217e5acd41acf787334743c53050076b139d4c6aed4e1d406e5b76d1b87c4d1f840719dc7d7f522ec327ec04bef0404d4388ad269
 MISC metadata.xml 338 BLAKE2B 672c0b7535be027177912e73ba4978fa3fbc6a7ff597f664ef719d0b11e3d95b6a0fa630385ff371ec2567aa016063c017cf8f38c4a2046214aa3d958b675b96 SHA512 be2e9f37b6456136fedac3ee2bcf004d8bf5ac644dd5154714aba02fa3dbc026b5c8f0e0518e494d9bc5d22902339c97cd8df8955df814306337883a68a87a84
diff --git a/net-print/cups-bjnp/cups-bjnp-2.0.ebuild b/net-print/cups-bjnp/cups-bjnp-2.0.ebuild
index 13bb734f026c..794ea7b24fb9 100644
--- a/net-print/cups-bjnp/cups-bjnp-2.0.ebuild
+++ b/net-print/cups-bjnp/cups-bjnp-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE=""
 
 DEPEND="net-print/cups"
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 212664c98880..21bc66af7900 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -4,7 +4,7 @@ DIST cups-filters-1.17.9.tar.xz 1454068 BLAKE2B 7c4b1c1a017cbaaf5d413071195ce53e
 DIST cups-filters-1.19.0.tar.xz 1465524 BLAKE2B 044ab5906f73a9405de55df953c76f7efd09ac4f7800df538c8c3cfd1651de6ed4ea6e3de9378221fef69d983f070b6dcab68dfd2b822fe59aa7f804a8c27907 SHA512 4b580734f7bac78c9d48aad7d8bb9e47227134e594fba76b1c82632fd8dd3e885f3897f7efd1a4b56647b74741f452f4e36d0157591c7fd5d626001028903d30
 DIST cups-filters-1.20.0.tar.xz 1465820 BLAKE2B 3ddc0ca7017776a8b69266dc7c19484626f0f6f70a44cefc9c6e1137a7c90123beb1e4d98e75906f5dfe156af01a7725ae8f1ce668f7194f07d4595f6cbba300 SHA512 b71722cc14f81cf8cbed5b8e980c9689adc2daf6cfa72e4174b6842bd89574090831f0e986b5e32a0e9fc4e29836f04e74e72c48918d7f3a8f65faa3a6c077af
 EBUILD cups-filters-1.16.4.ebuild 3432 BLAKE2B 9733302bc404c6454ba652bd523f2a41ba0070eb605c8b4150056ed5ddbd6093bdd72871889fa030093c7426721e45580ef75671080655eb6ec2c89dcff2bf25 SHA512 4a69c596427cbca25b3549aeb2fa91733065f1fd7a30d236234633a9955998147614d53b2e7e8044c034f297b292a67d83ebdba603079223f4f8352b4d4c3049
-EBUILD cups-filters-1.17.9.ebuild 3501 BLAKE2B c15b3c960a4a03d09ef337fb24b87633878d492ec11d13c5dd700da6a8b35a8b159406527f61cff230e06f1c79f8675eed154ae3d172ac010e13eb1e17090e3d SHA512 a6b0c900758decf93932e75a557258cf7c03daeecf0198177a04a733946b1a3ab4a188890f2db5a138c9369f285ae5833923f2ee54710d659db77054ee816861
+EBUILD cups-filters-1.17.9.ebuild 3499 BLAKE2B 0004e1861d14ee5671312725369ec7edc37f2716b9b71a78077aef0904730d2888c0aef2db5fafad2e00e5650e71feeae773c8a0de52ed2cf8cadab7f6a7328b SHA512 039e9709b071444eeedefe59f44b4cf8cc0856e9ceff38ea911128a53541c01dce314bd047b7fe35ada7b6a12eb90dae265d270aae4b52ab06c6b7068bb4a71a
 EBUILD cups-filters-1.19.0.ebuild 3504 BLAKE2B ceb5f203394fcb688acb1e80e520b14bcbe5a664f20725841d4fce9b70b31ea95746f737fbd3181979fe214836fd4c16c9bb9434999b1b8542ac750f806d20a4 SHA512 cbc2fed9c50d9773530fe806ed177220cd6daaabc1f1bfe0c360c75bc33a899a3c8893694798e5cac0413d84a67e3163c40f19852738b21b7d13bb2c770f589a
 EBUILD cups-filters-1.20.0.ebuild 3504 BLAKE2B ceb5f203394fcb688acb1e80e520b14bcbe5a664f20725841d4fce9b70b31ea95746f737fbd3181979fe214836fd4c16c9bb9434999b1b8542ac750f806d20a4 SHA512 cbc2fed9c50d9773530fe806ed177220cd6daaabc1f1bfe0c360c75bc33a899a3c8893694798e5cac0413d84a67e3163c40f19852738b21b7d13bb2c770f589a
 EBUILD cups-filters-9999.ebuild 3504 BLAKE2B 5d8c026d3040863a9bbfe54dd4bcbd36ba20ff341dcc9348f21af574aa64162ee46536f9c868df3b0bf51caf55ee4ddf20e178741ab00bc1a24b5278fa26bfe0 SHA512 4eeff094b85dc861d817a58211fed3b812b9e8b7d73c2ffb2dd2245cfa53e325c0f8d7844b20580331f1d72c24f7d2e5bc2bb44e4385a83f7e2b466e30268a02
diff --git a/net-print/cups-filters/cups-filters-1.17.9.ebuild b/net-print/cups-filters/cups-filters-1.17.9.ebuild
index 947b950d103d..66223cd5a521 100644
--- a/net-print/cups-filters/cups-filters-1.17.9.ebuild
+++ b/net-print/cups-filters/cups-filters-1.17.9.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
 else
 	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd ~m68k-mint"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd ~m68k-mint"
 fi
 DESCRIPTION="Cups filters"
 HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
diff --git a/net-print/splix/Manifest b/net-print/splix/Manifest
index 1b8d68daac78..7d519e577441 100644
--- a/net-print/splix/Manifest
+++ b/net-print/splix/Manifest
@@ -1,6 +1,4 @@
 DIST samsung-cms-20120312.tar.xz 3354884 BLAKE2B ebff80c7e4ddebb87c46b0d282c64037d7584170ed224931e5b17fc93a76b162bd1b33ed00c59371464dcaef345cf6c33d428aa42c7b67c82958a23384ed0bac SHA512 448f111493540dc93b88d59fa50857bdca2aa9eb772e53c1d227402235d878ad599683d74bc4d815b4789527b5e7ebe207bb0c8fa9194eaf61ca95b78a1444db
-DIST splix-2.0.0_p20111206.tar.bz2 122216 BLAKE2B d7f2986b57a3ea3397112c7a9d001f8e38be97cf2dcfdee971f3eb3aa73c91fd82e7cdbc502369519a43ec3a5d68f7b705553b42f5a9e625f07bef187791cbf2 SHA512 370840b646acb7d62814a7b8a123fb4e7b51360f83ea6c2ec4b7b1ecc15a42d7538bfa9bdb3bcc52c6f1e2cd46a0f72467ab8a8f9753341b823ac9986820d3b5
 DIST splix-2.0.0_p20130826.tar.bz2 127278 BLAKE2B 6a8eb6b15e5208dd4173d50bf2b41d0e0f136057fbb46f36fb68ab1302c0c8a6b735311bc03f15e7afce0de802b3fa62df04ad5cd016532216b67a74e39835c3 SHA512 dda07e24b4321e6c1e3d4fbdd03fcc2b5931465db36ed9d8676a62313c4c64b7cbd58bf41996ddd1ab02086438f225439db0506aca7f0269f6c84e80eff72cb0
-EBUILD splix-2.0.0_p20111206.ebuild 2564 BLAKE2B ca3745f6887691cdce7d36635af89bea1943c1c2d94a08ec5e2123194f1ea0a9dd3f6510f1674aaa6c076b9172e528bc727a5326ed434365f1800a45c604e790 SHA512 bedf4cd7730d313a9a7389edc239d5a8b5870f195a1a8adc9f637b8b2d253722b8560d2ed906c2008f6c5c98e98903bbad9cd5698bc087ae19855509a6306327
-EBUILD splix-2.0.0_p20130826.ebuild 2223 BLAKE2B 3590c9decdc42f09219f3168d7384d5c6e54602c62746f14764da5e6c77509f9db1e55737b55f22d6a0e478e67dcf99afb0d66a1087997ef26dd650dd3e43572 SHA512 0f8d2379bd987a6cba4a147cd8513093990c40848203839d9e66147012575d65ead71d5d8876393385f3f7cf6cf2730122c62213d1613334a2d87f0e2eba25dd
-MISC metadata.xml 606 BLAKE2B 5bc2281d7195e8ce0a163d5443a731022655e68f6ec9062d172ce70a464d2a99a9ea83724ab32dd13314e0eaa8fd8db4380c20c2d5e931d8e84a8bcea8492270 SHA512 bcae5483217e119928f51390ece67ae9dd6e27c9721a565707940986c7c8041e669c79ec55d76e4d6afafe4e8206c4883d38e3c9b85c17fa53615db6d8b05235
+EBUILD splix-2.0.0_p20130826.ebuild 2222 BLAKE2B 5954d062804e255f70a3cb11e2cbd79c2cecc1ca85565bcaee31a4925fb13cae61369ea4d20f03748ddb206109287112afd2dbd3da211f1199d297568c9a388b SHA512 2e124078fdde449972d150db2416d177841ec4088b0749a0406ef661f9d56959ea93ec28dfa0903c98f35866a34e72af31f8a764675864c485995e6d85aee327
+MISC metadata.xml 558 BLAKE2B 63719010206fba3816cc0f4131e232cd243e312d21194a00aa10f6c3e0e80117abce321b6b28b2f8f6b9ed8c058df5b7d31d7f81486fb9c856bc5961706f907f SHA512 a71c72aeb60dd0bfb7cca13f81027131e19a3b72b1ebd8dae076f6bd5d3808a96d5a96caa2422fef0c6f902ae8d81f3a45ee293cafe45ccda20bc8eaaa34fe30
diff --git a/net-print/splix/metadata.xml b/net-print/splix/metadata.xml
index 9b64ff4d63bf..6406935f8e29 100644
--- a/net-print/splix/metadata.xml
+++ b/net-print/splix/metadata.xml
@@ -4,7 +4,6 @@
 	<maintainer type="person">
 		<email>wschlich@gentoo.org</email>
 		<name>Wolfram Schlich</name>
-		<description>Primary maintainer</description>
 	</maintainer>
 	<maintainer type="person">
 		<email>voyageur@gentoo.org</email>
diff --git a/net-print/splix/splix-2.0.0_p20111206.ebuild b/net-print/splix/splix-2.0.0_p20111206.ebuild
deleted file mode 100644
index 57df07148cd1..000000000000
--- a/net-print/splix/splix-2.0.0_p20111206.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A set of CUPS printer drivers for SPL (Samsung Printer Language) printers"
-HOMEPAGE="http://splix.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.bz2
-	http://dev.gentooexperimental.org/~scarabeus/samsung-cms-20120312.tar.xz"
-
-# If you can't find your printer cms open the new bug if you recheck the
-# cms home and it is contained there. Otherwise bummer.
-# The cms can be found here:
-#    http://www.bchemnet.com/suldr/smfpv3.html
-# It is stored int he unifieddriver tarball and repacked.
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+jbig"
-
-DEPEND=">=app-text/ghostscript-gpl-9.02
-	>=net-print/cups-1.4.0
-	jbig? ( media-libs/jbigkit )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	# Honor LDFLAGS
-	sed -e "/[a-z]_LDFLAGS/s/:=.*/:= $\{LDFLAGS\}/" -i module.mk \
-		|| die "module.mk sed failed"
-	# Correct link comand, do not strip on install
-	sed -e "s/g++/$\{LINKER\}/" -e "/install/s/-s //" -i rules.mk \
-		|| die "rules.mk sed failed"
-}
-
-src_compile() {
-	local options="MODE=optimized"
-	use jbig || options="${options} DISABLE_JBIG=1"
-	emake ${options} PSTORASTER=gstoraster CXX="$(tc-getCXX)" \
-		OPTIM_CFLAGS="${CFLAGS}" OPTIM_CXXFLAGS="${CXXFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	gzip "${ED}"/$(cups-config --datadir)/model/*/*.ppd || die "ppd gzip failed"
-
-	# it is expected to be at:
-	#    /usr/share/cups/profiles/{samsung,xerox,dell}
-	# instead it is only at:
-	#    /usr/share/cups/profiles/samsung
-	emake DESTDIR="${D}" CMSDIR="${WORKDIR}"/cms MANUFACTURER=samsung installcms
-	dosym $(cups-config --datadir)/profiles/samsung $(cups-config --datadir)/profiles/xerox
-	dosym $(cups-config --datadir)/profiles/samsung $(cups-config --datadir)/profiles/dell
-}
-
-pkg_postinst() {
-	ewarn "You *MUST* make sure that the PPD files that CUPS is using"
-	ewarn "for actually installed printers are updated if you upgraded"
-	ewarn "from a previous version of splix!"
-	ewarn "Otherwise you will be unable to print (your printer might"
-	ewarn "spit out blank pages etc.)."
-	ewarn "To do that, simply delete the corresponding PPD file in"
-	ewarn "/etc/cups/ppd/, click on 'Modify Printer' belonging to the"
-	ewarn "corresponding printer in the CUPS webinterface (usually"
-	ewarn "reachable via http://localhost:631/) and choose the correct"
-	ewarn "printer make and model, for example:"
-	ewarn "'Samsung' -> 'Samsung ML-1610, 1.0 (en)'"
-}
diff --git a/net-print/splix/splix-2.0.0_p20130826.ebuild b/net-print/splix/splix-2.0.0_p20130826.ebuild
index a74aa0c2db94..3ca2d9b6afb6 100644
--- a/net-print/splix/splix-2.0.0_p20130826.ebuild
+++ b/net-print/splix/splix-2.0.0_p20130826.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+jbig"
 
 DEPEND=">=app-text/ghostscript-gpl-9.02