gentoo resync : 11.02.2018

4 files changed, 4 insertions, 78 deletions

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