gentoo resync : 25.01.2018

4 files changed, 5 insertions, 89 deletions

diff --git a/net-print/foomatic-db/Manifest b/net-print/foomatic-db/Manifest
index 789ecc416005..c5f763fba04b 100644
--- a/net-print/foomatic-db/Manifest
+++ b/net-print/foomatic-db/Manifest
@@ -1,9 +1,5 @@
-DIST foomatic-db-4.0-20140105.tar.gz 38845034 BLAKE2B d61f6f2eb6eeb913d8875c16538b2c0dce2b2962ba85c4856471cd84b0866d1450b1d3fec863faa22ae0766848562f81d4ab543192bcc6c2a5f8bdc3435ec18c SHA512 4d06d63fe79bcfb912875b8209d658e018f4486821e7bf9433cb181d68df58602a58e755202d8ce53e0a9b9d8b0f1b31a7847c4d1346164e88105b06a4003ee4
-DIST foomatic-db-4.0-20160504.tar.xz 4074612 BLAKE2B aa7bbbc3798edbed0ed0ad84fb83566ebdda1c883eaa19b1d1b7c8db536c11e0899671953355bb56d10899003ca7abdb779ee7e5198432094efb94b32dc9944b SHA512 ade62d14773fc5c4c82ac5ebf791ab0e70b36d758493468307acde21730a146bdb198cfe7bc14041aa05ed5b29961ca2dde4ad29d3e555164020046a4f89e5eb
-DIST foomatic-db-4.0-20161101.tar.xz 4474300 BLAKE2B 2919f33d379777c61d5eebc8b5349bd44ec18ca4cd8698643d2172ed6513be707045eca1e3cdbe8855f30c94bfa2d6e75e649fbe0204ac411f0cbaf53279181c SHA512 8370632697846e1635d00c369125eebc83fd0363896ed3b29d684c8e6cacc4d8cc8c679e889f20e83458f07b254dcfab22b1faef2dcf3063fbe9d3f457ead623
 DIST foomatic-db-4.0-20170331.tar.xz 5083832 BLAKE2B 3c22869cc50f9e68e04bc9edaf6227764ede1566bf93311f1098d0022174911697a63685488be2c753205e40284ec22c31a64e672fee3851eeec920730b5a344 SHA512 f265a476533a77c27f0eb6414a3b93c6b269effba7bb0d46c9d3965c0e7218c3b081ae5e3f01ebfe7afbec70379543dd2e553b97b338eca43c34c11a4ffb4dcc
-EBUILD foomatic-db-4.0.20140105.ebuild 1308 BLAKE2B 1c3e97532e60ccb48bd294a50bf51ee7b0181a14def76b899c715330dafe06ca52fa19f5719bbd5dbb347c68b88322f30e846cb66fbad86adb530f3fdb9103fd SHA512 fedbc2040876bf5e25b81a492b16c9361a287725262d2d5b9506405934a83662c0e2b87f90aa76a1e2eebb9dcbc16b798388ba51b02fba26c7d717440d27a328
-EBUILD foomatic-db-4.0.20160504.ebuild 1216 BLAKE2B c39a85d657c4abf7d86ae4dd4f06f74229e998efee1657ccf9808d330be5ae50745684e0f606b928775e4a4ee6a2c7ab9153b6d9201b7bbce0e8d53421d8e925 SHA512 08e880232898c05ac71884fff0e1e367a41974d13bc3e0ade29c89d71378de497273ed322fbf7fbfe9add425a46cc4e91e38279424a7134aa26621759fc14bf1
-EBUILD foomatic-db-4.0.20161101.ebuild 1216 BLAKE2B c39a85d657c4abf7d86ae4dd4f06f74229e998efee1657ccf9808d330be5ae50745684e0f606b928775e4a4ee6a2c7ab9153b6d9201b7bbce0e8d53421d8e925 SHA512 08e880232898c05ac71884fff0e1e367a41974d13bc3e0ade29c89d71378de497273ed322fbf7fbfe9add425a46cc4e91e38279424a7134aa26621759fc14bf1
+DIST foomatic-db-4.0-20180126.tar.xz 5418608 BLAKE2B e11dbfc7e4cf121ba8b456820438b0418981c414c6a798dee463430dd8ccf65b424e1d597bc21b32929e858d0282b12df81fb419793bd34172b0c414619d2762 SHA512 1879e2601ad88262c99201bff5353ac40516985de72dd894eeeae2589ae2b82dd4dbfc972cb3ff43f209efb92753d4ed0ce584d89cd242fedc011511c45d8a87
 EBUILD foomatic-db-4.0.20170331.ebuild 1207 BLAKE2B 2aed57c70dd5ccdac9ed27f5af6bfd754ed950da1a075ea57c85651e870440b3538bb049c358c227f01f63857ee4feb29260a9f94451a031b15ce1e101cee4ea SHA512 5fe1da45af096d8419faa461369067e5b45bfecc311e788b05ee506e92cd88324e58cff9a619706ea69c5fdfe6837cdab1cc346eca74e4766a70346404d9d7b3
+EBUILD foomatic-db-4.0.20180126.ebuild 1225 BLAKE2B 39fec6d0fed1bbaf3f75d5015bc727589e8a60cd3f2b3d146cee1bb820ab0511cee115cf299929cfcf908ca99421fa5bd5fd3f9bee8d2bd7fefd0114dd60b6ae SHA512 7d20d8cbef85150a5ca7847467ddee3dbcd355af02c75991709f82e498c7d27703c0f24057e2df70fdc26195e7e5982c99221fbd4b415d22d63ca8ca657d5481
 MISC metadata.xml 259 BLAKE2B 4a7248bc5a529d1cf3b51f8bcfff668a9e525df3e62584369d4b5526c89e70235378420b164073946ea91cf182065d9c8d2d46c8750d5f77855239b77ce45bae SHA512 7b1cbb90c1ddcf63b8802cfa3a53611f6367801b492c7677ef038738a337002c4606bcf93c5186abf808e74bca1fa76266169245acdb3b5997651bcabfecfa5c
diff --git a/net-print/foomatic-db/foomatic-db-4.0.20140105.ebuild b/net-print/foomatic-db/foomatic-db-4.0.20140105.ebuild
deleted file mode 100644
index 8c7581fcb014..000000000000
--- a/net-print/foomatic-db/foomatic-db-4.0.20140105.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator
-
-DESCRIPTION="Printer information files for foomatic-db-engine to generate ppds"
-HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
-#SRC_URI="http://www.openprinting.org/download/foomatic/${PN}-$(replace_version_separator 2 -).tar.gz"
-SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${PN}-$(replace_version_separator 2 -).tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	net-print/foomatic-db-engine
-	!net-print/foo2zjs[hp2600n]"
-
-S="${WORKDIR}/${PN}-$(get_version_component_range 3 ${PV})"
-
-src_prepare() {
-	# ppd files do not belong to this package
-	rm -r db/source/PPD || die
-}
-
-src_configure() {
-	econf \
-		--disable-gzip-ppds \
-		--disable-ppds-to-cups
-}
-
-src_install() {
-	default
-	rmdir "${ED}"/usr/share/foomatic/db/source/PPD || die
-	# Avoid collision with foo2zjs, bug 185486
-	rm "${ED}"/usr/share/foomatic/db/source/{driver/foo2{hp,lava,xqx,zjs}.xml,printer/{Generic-ZjStream_Printer,HP-{Color_LaserJet_{1500,1600,2600n},LaserJet_{10{00,05,18,20,22},M1005_MFP}},Minolta-{Color_PageWorks_Pro_L,magicolor_2{20,30,43}0_DL},Samsung-CLP-{3,6}00}.xml}  || die
-}
diff --git a/net-print/foomatic-db/foomatic-db-4.0.20161101.ebuild b/net-print/foomatic-db/foomatic-db-4.0.20161101.ebuild
deleted file mode 100644
index eb237a0a62eb..000000000000
--- a/net-print/foomatic-db/foomatic-db-4.0.20161101.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator
-
-DESCRIPTION="Printer information files for foomatic-db-engine to generate ppds"
-HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
-SRC_URI="http://www.openprinting.org/download/foomatic/${PN}-$(replace_version_separator 2 -).tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	net-print/foomatic-db-engine
-	!net-print/foo2zjs[hp2600n]"
-
-S="${WORKDIR}/${PN}-$(get_version_component_range 3 ${PV})"
-
-src_prepare() {
-	# ppd files do not belong to this package
-	rm -r db/source/PPD || die
-}
-
-src_configure() {
-	econf \
-		--disable-gzip-ppds \
-		--disable-ppds-to-cups
-}
-
-src_install() {
-	default
-	rmdir "${ED}"/usr/share/foomatic/db/source/PPD || die
-	# Avoid collision with foo2zjs, bug 185486
-	rm "${ED}"/usr/share/foomatic/db/source/{driver/foo2{hp,lava,xqx,zjs}.xml,printer/{Generic-ZjStream_Printer,HP-{Color_LaserJet_{1500,1600,2600n},LaserJet_{10{00,05,18,20,22},M1005_MFP}},Minolta-{Color_PageWorks_Pro_L,magicolor_2{20,30,43}0_DL},Samsung-CLP-{3,6}00}.xml}  || die
-}
diff --git a/net-print/foomatic-db/foomatic-db-4.0.20160504.ebuild b/net-print/foomatic-db/foomatic-db-4.0.20180126.ebuild
index eb237a0a62eb..1a475c50eb02 100644
--- a/net-print/foomatic-db/foomatic-db-4.0.20160504.ebuild
+++ b/net-print/foomatic-db/foomatic-db-4.0.20180126.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit versionator
 
@@ -24,6 +24,7 @@ S="${WORKDIR}/${PN}-$(get_version_component_range 3 ${PV})"
 src_prepare() {
 	# ppd files do not belong to this package
 	rm -r db/source/PPD || die
+	default
 }
 
 src_configure() {