gentoo resync : 12.01.2019

10 files changed, 106 insertions, 150 deletions

diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 858a504c9717..a3631c010732 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/epson-inkjet-printer-escpr/Manifest b/net-print/epson-inkjet-printer-escpr/Manifest
index b52a43b09f3b..569120936b18 100644
--- a/net-print/epson-inkjet-printer-escpr/Manifest
+++ b/net-print/epson-inkjet-printer-escpr/Manifest
@@ -1,12 +1,4 @@
 AUX 1.6.5-warnings.patch 1115 BLAKE2B eac889dc8f5b39bbcf633c3ff2469ba1d3e07f475aa29f82e2ff81568aa72e2a3c25018c481b9d56bfd321314fb931561bbaed5b0883597c6fb296465ac486f1 SHA512 8a32ce7d22bb97cf1a7c1864353cab4a148eb4d1dc599f355420e0119dfb89abbfb66cbe58c8f35e2f8fc3a62b0c4018e0d48065acd21b17cb250e4722b9e027
-DIST epson-inkjet-printer-escpr-1.6.10-1lsb3.2.tar.gz 3632456 BLAKE2B d642c494b2a0cb5fa6921541a4d87e6f1110eb71a5e959758d8f29df0d675a5a2586d88cd48bb75cdda4684d67ec78e50da22d892ae4ef380bb960dcf3a7f1aa SHA512 310664c6521ac15418d3f0ac1330c842871e357eff9f83be52a5942c58354b3717bdca7d04b848ef2e7a9be6140dcbd0c485c3a9845833325689686f39d7f743
-DIST epson-inkjet-printer-escpr-1.6.15-1lsb3.2.tar.gz 3740610 BLAKE2B 848e4f44e9f86ea568660771f8620d7343293f2efa5e5eb06800b2b833356a65dae53041b8a7a6d8921b0795c42564699e9120405401d3974a5b67862a14d42a SHA512 e78e1a0d9439fc8366d4ee9a001171a09077867f3b07feb5ac2f779ede19432ad232ab96413e6563f7d3c03154ba235cadfe61b354879245ded6d424d435fe24
-DIST epson-inkjet-printer-escpr-1.6.17-1lsb3.2.tar.gz 3866776 BLAKE2B 18affa25a78aad2be94b45ee5d81c347397a3c5ae8dbace7c1f34bdd0cdad61e8dcd68f80fc09b20fb347593535bb039083c67a8ea6d34400c96a581d2f236a4 SHA512 b9711dc75c87832b24a6dc2225cd15ca4d68224ce2eaca55312f73e0dcebd3d31af0da1a81672fef003dda1001753d21bc06c92cb70a609effcdc928d8702a1e
 DIST epson-inkjet-printer-escpr-1.6.33-1lsb3.2.tar.gz 4402012 BLAKE2B a200ebb94460ff5d6b8731d66ccaa8d7423d8f249871183d3e8e321e2fba84dfca3d72638901c7d81344de8713e765de59ff6e6d579599ec9c565b10bb9e4a0c SHA512 b7af8c69cff0869410a3dfad3204bb908f42070fc2721e1037631d5d5da972a800e195df27ef8e62418a9b927adcbedb2dfe77a6d189d34841f20789aa41eca1
-DIST epson-inkjet-printer-escpr-1.6.5-1lsb3.2.tar.gz 3277627 BLAKE2B c975d323707027aa36c61a6ec60c4985fee958b433941bf3246dfcd9d50c6fcc61768ee11bbf03fa22e11e295fb514898e898542e34be0876f3d6d84a2f53627 SHA512 31c3e11f9a19de592727318d8714940c62a3ee7a443fe5b1e51e8f995e536b427d4054e47438645f333816a44accb7c880f8b6e74e9973c072a07016ee94b7da
-EBUILD epson-inkjet-printer-escpr-1.6.10.ebuild 874 BLAKE2B 820e28779c7a403ac9a241c38864d3442f03daae85915a03611de33e0cd65cf6e1451ae3265d1903b9d6f80e174dd8c28c22feed60f52aa9ed7299ab9a1c9eb1 SHA512 a101e2511b97d94a144d0084fbaf56dc38dd8d368645f9aa13909ceb7921e4c080f9bbce3c8643f25a24f6028374cefa64738c55fc7623d4d116c74598a6df35
-EBUILD epson-inkjet-printer-escpr-1.6.15.ebuild 874 BLAKE2B 8a964847e13359295e2d1e1f06434a2f928b3d0bf6729bc370dae536b5938612ca8d6ec0aa9aa0bdd821dc00fcb3d232633778d4a91ce70f7f0eaaac7a23d68c SHA512 230518eaa845205c05c1224cb019481a733e0ebc542565bf44b39e640a8da5a04c87ef261f5758568c12cbddeba4a6326705d898e021dfcd3c3a5c71c3d43a01
-EBUILD epson-inkjet-printer-escpr-1.6.17.ebuild 874 BLAKE2B 9e678564ebfb2cd8d055e1ae3df5ba9b80c5026ac464bd357220e342c07feefa7e077efa55b99458adf3e537609ef04f2e37bff51a2fbd2823be4191d8fe8584 SHA512 b0ef22eda7b576f2e49db3586c2d05f9fc4632fee1d67778a5566d01fe704075de020ac876c6f33217c3467717798b683cbdd9728e5cf1a12ddc9a27a376175a
 EBUILD epson-inkjet-printer-escpr-1.6.33.ebuild 870 BLAKE2B 78f09f3ad1f605bbf0ec092241669e2f306c32546820234cf9c1fa624f96e52e8d4a796882bae295ba6eeded4442a692abb19562acd9d7a4225877a5cb5abd78 SHA512 a17cfb20e8c3a948d81ee619983e6963c028a606e5d85171c9aae7845b2642b958b68741f4bacb97ed74a47460bb1dd47cd44438e9e094a9820d4df02fcf2fdd
-EBUILD epson-inkjet-printer-escpr-1.6.5.ebuild 873 BLAKE2B c0589229396d882b9203abcebba3400456e4f79cc828be8231218a3d64984809472b8877f4f76c9556b133dad75cd263ed1482df7dbaaec2822d08917046a64d SHA512 451eb21acdcba8769b398b60ff9a49b5476d45a1c4d2d243f1ef8aed4c38311bb19ceaac256faad4a8a95dc9b2afdfbcd1a589d5e69fbbd750ea78da1c6673f5
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+MISC metadata.xml 253 BLAKE2B 9f98272e44d92f62df07adebeb8942eb26113e29ae3021a9d1ef478a1bc2bdd26bd4700cc7d88dab9c5fd78d54958327997e9849c100ac00fbe051915ab3f2e0 SHA512 e8bc4d02500676e2506fbe7f0811be984878560deb05d09122cede2e62e633fb7644fa59b73a20da8f3fceea8f8cb928768726e8b679f32178c0aed9a874ea15
diff --git a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.10.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.10.ebuild
deleted file mode 100644
index 9f8cb06fcff8..000000000000
--- a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.10.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Epson Inkjet Printer Driver (ESC/P-R)"
-HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
-SRC_URI="https://download3.ebz.epson.net/dsc/f/03/00/05/20/91/05b7c89713fa620593175010796eecfbfe73cb9a/epson-inkjet-printer-escpr-1.6.10-1lsb3.2.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="net-print/cups"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/1.6.5-warnings.patch"
-)
-
-src_configure() {
-	econf --disable-shared
-
-	# Makefile calls ls to generate a file list which is included in Makefile.am
-	# Set the collation to C to avoid automake being called automatically
-	unset LC_ALL
-	export LC_COLLATE=C
-}
-
-src_install() {
-	emake -C ppd DESTDIR="${D}" install
-	emake -C src DESTDIR="${D}" install
-	einstalldocs
-}
diff --git a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.15.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.15.ebuild
deleted file mode 100644
index 58c39a98d244..000000000000
--- a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.15.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Epson Inkjet Printer Driver (ESC/P-R)"
-HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
-SRC_URI="https://download3.ebz.epson.net/dsc/f/03/00/06/25/43/f63808b4062f7f527e09e75a8f0dd9db46c573fe/epson-inkjet-printer-escpr-1.6.15-1lsb3.2.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="net-print/cups"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/1.6.5-warnings.patch"
-)
-
-src_configure() {
-	econf --disable-shared
-
-	# Makefile calls ls to generate a file list which is included in Makefile.am
-	# Set the collation to C to avoid automake being called automatically
-	unset LC_ALL
-	export LC_COLLATE=C
-}
-
-src_install() {
-	emake -C ppd DESTDIR="${D}" install
-	emake -C src DESTDIR="${D}" install
-	einstalldocs
-}
diff --git a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.17.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.17.ebuild
deleted file mode 100644
index 55e411272651..000000000000
--- a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.17.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Epson Inkjet Printer Driver (ESC/P-R)"
-HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
-SRC_URI="https://download3.ebz.epson.net/dsc/f/03/00/06/66/09/4ac2bf69bb1ddf4a9ad525596615cbb40fe4dad5/epson-inkjet-printer-escpr-1.6.17-1lsb3.2.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="net-print/cups"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/1.6.5-warnings.patch"
-)
-
-src_configure() {
-	econf --disable-shared
-
-	# Makefile calls ls to generate a file list which is included in Makefile.am
-	# Set the collation to C to avoid automake being called automatically
-	unset LC_ALL
-	export LC_COLLATE=C
-}
-
-src_install() {
-	emake -C ppd DESTDIR="${D}" install
-	emake -C src DESTDIR="${D}" install
-	einstalldocs
-}
diff --git a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.5.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.5.ebuild
deleted file mode 100644
index c978234a9e1a..000000000000
--- a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Epson Inkjet Printer Driver (ESC/P-R)"
-HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
-SRC_URI="https://download3.ebz.epson.net/dsc/f/03/00/04/54/27/b73564748bfde7b7ce625e20d4a3257d447bec79/epson-inkjet-printer-escpr-1.6.5-1lsb3.2.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="net-print/cups"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/1.6.5-warnings.patch"
-)
-
-src_configure() {
-	econf --disable-shared
-
-	# Makefile calls ls to generate a file list which is included in Makefile.am
-	# Set the collation to C to avoid automake being called automatically
-	unset LC_ALL
-	export LC_COLLATE=C
-}
-
-src_install() {
-	emake -C ppd DESTDIR="${D}" install
-	emake -C src DESTDIR="${D}" install
-	einstalldocs
-}
diff --git a/net-print/epson-inkjet-printer-escpr/metadata.xml b/net-print/epson-inkjet-printer-escpr/metadata.xml
index 7a38bb900964..c6bc2d94015a 100644
--- a/net-print/epson-inkjet-printer-escpr/metadata.xml
+++ b/net-print/epson-inkjet-printer-escpr/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>asturm@gentoo.org</email>
+		<name>Andreas Sturmlechner</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-print/splix/Manifest b/net-print/splix/Manifest
index 2203e6fa06e0..0fb52817243c 100644
--- a/net-print/splix/Manifest
+++ b/net-print/splix/Manifest
@@ -1,4 +1,6 @@
+AUX splix-2.0.0_p20130826-algo0x11_le.patch 1231 BLAKE2B 8fe043f615bae54bf24635817696d2c38bf5250c77a4f52061b3cd7a82cc6c46a705ceed9ae4d46e47d5e8af64f8932a83acc718dabc614f6b03156274a34119 SHA512 9c96805deedc819cf4e663de63d35c4016b36a04ab56f5d3cee503e64dcd7a25d6ede2cd2ae3facf51d4e673476295a551e5659e9b91de6c30d1c21dc294be4a
 DIST samsung-cms-20120312.tar.xz 3354884 BLAKE2B ebff80c7e4ddebb87c46b0d282c64037d7584170ed224931e5b17fc93a76b162bd1b33ed00c59371464dcaef345cf6c33d428aa42c7b67c82958a23384ed0bac SHA512 448f111493540dc93b88d59fa50857bdca2aa9eb772e53c1d227402235d878ad599683d74bc4d815b4789527b5e7ebe207bb0c8fa9194eaf61ca95b78a1444db
 DIST splix-2.0.0_p20130826.tar.bz2 127278 BLAKE2B 6a8eb6b15e5208dd4173d50bf2b41d0e0f136057fbb46f36fb68ab1302c0c8a6b735311bc03f15e7afce0de802b3fa62df04ad5cd016532216b67a74e39835c3 SHA512 dda07e24b4321e6c1e3d4fbdd03fcc2b5931465db36ed9d8676a62313c4c64b7cbd58bf41996ddd1ab02086438f225439db0506aca7f0269f6c84e80eff72cb0
+EBUILD splix-2.0.0_p20130826-r1.ebuild 2187 BLAKE2B c2ffaa6080752032849d34eba2d0d8db0195cbcd4ccd6fd1e04d73056cc9f90bb59b0940dd90e3d99b11fe371db1f3c24740070a94c370d4bb50db36c342346a SHA512 99e8c29f6d0e5390386395d36374cfeeac39914a49c4ec511a68e8b3e2a54cc2947010a1a45fc8984e3b4d9ee6aeba19ce9895bc8f30f88ec2f10591031dff47
 EBUILD splix-2.0.0_p20130826.ebuild 2222 BLAKE2B 5954d062804e255f70a3cb11e2cbd79c2cecc1ca85565bcaee31a4925fb13cae61369ea4d20f03748ddb206109287112afd2dbd3da211f1199d297568c9a388b SHA512 2e124078fdde449972d150db2416d177841ec4088b0749a0406ef661f9d56959ea93ec28dfa0903c98f35866a34e72af31f8a764675864c485995e6d85aee327
 MISC metadata.xml 448 BLAKE2B 90ff61ffb785842747851b72263a3be4dc4fe3327450458d670bf2e4f0eea69a1ad3fc65ced40b0cea04542cc72cedeb071796b677af69d9dee7f9408a60fcdd SHA512 0ff863e6a4c76cfd3d027903a438b455a647c840250cd5d317600ea7c1df2b941f9cc61b096dade6f64c7b7ad0b3a1e28e9d3fd5d8c930f15b642e9c2fecdb9d
diff --git a/net-print/splix/files/splix-2.0.0_p20130826-algo0x11_le.patch b/net-print/splix/files/splix-2.0.0_p20130826-algo0x11_le.patch
new file mode 100644
index 000000000000..e73e6ebbe9fc
--- /dev/null
+++ b/net-print/splix/files/splix-2.0.0_p20130826-algo0x11_le.patch
@@ -0,0 +1,33 @@
+--- splix-2.0.0_p20130826/src/algo0x11.cpp.orig	2018-12-19 20:55:03.216127909 +0100
++++ splix-2.0.0_p20130826/src/algo0x11.cpp	2018-12-19 20:58:21.986353903 +0100
+@@ -89,7 +89,8 @@
+ 
+     // Print the table
+     for (unsigned long i=0; i < TABLE_PTR_SIZE; i++, w += 2) {
+-        *(uint16_t *)(out + w) = (uint16_t)_ptrArray[i];
++        out[w + 0] = (uint8_t)_ptrArray[i];
++        out[w + 1] = (uint8_t)(_ptrArray[i] >> 8);
+         if (_ptrArray[i] > uncompSize)
+             uncompSize = _ptrArray[i];
+     }
+@@ -97,7 +98,10 @@
+     // Print the first uncompressed bytes
+     if (uncompSize > MAX_UNCOMPRESSED_BYTES)
+         uncompSize = MAX_UNCOMPRESSED_BYTES;
+-    *(uint32_t *)out = (uint32_t)uncompSize;
++    out[0] = (uint8_t)uncompSize;
++    out[1] = (uint8_t)(uncompSize >> 8);
++    out[2] = (uint8_t)(uncompSize >> 16);
++    out[3] = (uint8_t)(uncompSize >> 24);
+     for (r=0; r < uncompSize; r++, w++)
+         out[w] = data[r];
+ 
+@@ -234,7 +238,7 @@
+     // Register the result into a band plane
+     plane = new BandPlane();
+     plane->setData(output, outputSize);
+-    plane->setEndian(BandPlane::Dependant);
++    plane->setEndian(BandPlane::LittleEndian);
+     plane->setCompression(0x11);
+ 
+     return plane;
diff --git a/net-print/splix/splix-2.0.0_p20130826-r1.ebuild b/net-print/splix/splix-2.0.0_p20130826-r1.ebuild
new file mode 100644
index 000000000000..f8278234dc38
--- /dev/null
+++ b/net-print/splix/splix-2.0.0_p20130826-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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
+	https://dev.gentoo.org/~voyageur/distfiles/samsung-cms-20120312.tar.xz"
+
+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}"
+
+PATCHES=( "${FILESDIR}"/${P}-algo0x11_le.patch )
+
+src_prepare() {
+	default
+
+	# Move to correct place
+	mv *.ppd ppd/
+	# Honor LDFLAGS
+	sed -e "/[a-z]_LDFLAGS/s/:=.*/:= $\{LDFLAGS\}/" -i module.mk \
+		|| die
+	# Correct link comand
+	sed -e "s/g++/$\{LINKER\}/" -i rules.mk \
+		|| die
+}
+
+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
+
+	emake DESTDIR="${D}" CMSDIR="${WORKDIR}"/cms MANUFACTURER=samsung installcms
+	# Add symlinks for xerox and dell models (installed in samsung)
+	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)'"
+}