gentoo resync : 14.12.2020

3 files changed, 3 insertions, 66 deletions

diff --git a/net-print/splix/Manifest b/net-print/splix/Manifest
index 0fb52817243c..38e554d3cbfd 100644
--- a/net-print/splix/Manifest
+++ b/net-print/splix/Manifest
@@ -1,6 +1,5 @@
 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
+EBUILD splix-2.0.0_p20130826-r1.ebuild 2185 BLAKE2B 397a6da1a164cffa6e57b5db4938e80cad4ae2eb5e43c195c9a847dc9831e3859996135fcae4efaaaa689a7a0780273aaae8e55edf21ca3d6e438d5cb19277af SHA512 ff981508fd1641eca3344318846dbe55caca28f7a640c91a11c3b5da4c236ba3262ebfa40fa4782654bac026341bee2492f18d8e979e8da00b0059d5d0858127
 MISC metadata.xml 448 BLAKE2B 90ff61ffb785842747851b72263a3be4dc4fe3327450458d670bf2e4f0eea69a1ad3fc65ced40b0cea04542cc72cedeb071796b677af69d9dee7f9408a60fcdd SHA512 0ff863e6a4c76cfd3d027903a438b455a647c840250cd5d317600ea7c1df2b941f9cc61b096dade6f64c7b7ad0b3a1e28e9d3fd5d8c930f15b642e9c2fecdb9d
diff --git a/net-print/splix/splix-2.0.0_p20130826-r1.ebuild b/net-print/splix/splix-2.0.0_p20130826-r1.ebuild
index f8278234dc38..fd915aa6e56c 100644
--- a/net-print/splix/splix-2.0.0_p20130826-r1.ebuild
+++ b/net-print/splix/splix-2.0.0_p20130826-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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
diff --git a/net-print/splix/splix-2.0.0_p20130826.ebuild b/net-print/splix/splix-2.0.0_p20130826.ebuild
deleted file mode 100644
index 3ca2d9b6afb6..000000000000
--- a/net-print/splix/splix-2.0.0_p20130826.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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}"
-
-src_prepare() {
-	# Move to correct place
-	mv *.ppd ppd/ || die "ppd files move failed"
-	# Honor LDFLAGS
-	sed -e "/[a-z]_LDFLAGS/s/:=.*/:= $\{LDFLAGS\}/" -i module.mk \
-		|| die "module.mk sed failed"
-	# Correct link comand
-	sed -e "s/g++/$\{LINKER\}/" -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"
-
-	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)'"
-}