gentoo resync : 13.10.2019

3 files changed, 9 insertions, 67 deletions

diff --git a/net-print/foomatic-db-engine/Manifest b/net-print/foomatic-db-engine/Manifest
index e29dbc24638e..377541523472 100644
--- a/net-print/foomatic-db-engine/Manifest
+++ b/net-print/foomatic-db-engine/Manifest
@@ -1,8 +1,6 @@
 AUX 4.0.12-use-pkgconfig.patch 1010 BLAKE2B d37cb4ad77e191229c0ca7ae64b8f51b7ce275ea7f7434b0fdf629c0773f2b4f742e05a6afb06a627d4f7bb609e053f00e994bbea8b157d959a5852e8dcf135e SHA512 d0ea9514dbc7354d2d771af049de04455ccdf9145823174b99f963c82d1a4453f3198e31abc6a4953883f860df86b55452a2bfc0dd269112c029df6eddd3e1e6
 AUX 4.0.7-perl-module.patch 392 BLAKE2B 48a1913833c637eaf80f0d9c8366e85750857356a28d346ec37a11c233e1cfed7d79eb5ada6033cfdc2743c6823d8db976f9095ee04694fa176979f2dbad9d62 SHA512 7f26ac25325dffa706bef97915be06707c4953ee7c436a86a79d4edf764bbe4db9e6eeb37b889f6f4214b9b8d5ceb31091398c5ccce7607be941a74b3fe4ebf7
 AUX 4.0.7-respect-ldflag.patch 719 BLAKE2B 534ac6b3b3333bd54c9abe8b7e658faed0759b95e0104d36e381ba178f8138b9b79fa38a35f66ef5c78ca54630d870da0fb1a12f949764e623247d10dcba61c6 SHA512 432c4b61c94d1b774fc909375217587f4d8336603db0b944ec9e98e3022c2b1355928445e2cc7fbbd06a1452927082ed0fb655bc955643cce6290fe8f2d5d6c9
-DIST foomatic-db-engine-4.0.11.tar.gz 360379 BLAKE2B efef3edd3780f5824c67f4724ec71115999fc159e9fb07bb50f87ad5cac291b57a44316105177acab1f7a95e9f490333925cbea0530ada1496170e8eb56a96f5 SHA512 790d08a7ba69a397988695248de5f1dff2d8461b7da415b73daea133426cc39ea69b59d59a5d1651007388c99276e878dbc3388b54219338090a1a95e6a5ae0a
 DIST foomatic-db-engine-4.0.12.tar.gz 360499 BLAKE2B b03ba0a0cddc2d1c59a64ffa33e577f991d36c478e3f7b43f66474c749b7fb546f0ad5b04fee056c69532a6f126b87c95a72e5561443ef79bf3bdfed650d6b07 SHA512 b7e99ace6a632e9b0213183bd2c6c2d11ca072ea0414e8ca569082b7ec183dd81c80594ad63fdee82d761ae36d4fce9d3c881569a95a6085ec326ef7fd21154f
-EBUILD foomatic-db-engine-4.0.11.ebuild 1121 BLAKE2B 2179a0eb5de0ce374e18fbea3516e14a0482101d731521a5a8b266a21221e7ae0affc70b2f98243123df739ae8174280be1cccd18120875e46fa30fb6e1a4530 SHA512 23bade875561c290c69800f6d0abf22d752c2d0f0ea5457f356339c7e2bf848e0095a57b421ce62bbc458e1655a19bb3c003f086511631d15a8981356860a9ba
-EBUILD foomatic-db-engine-4.0.12.ebuild 1167 BLAKE2B 472b1fcf3c28f446abf032d03366e6c78ad042d770ec6ccf8161e88349778feb4788741c3ff9b98b166ec38db31dca12d37112a934fd67f10bab4e5d7cac9461 SHA512 4c0eb8db152e7bd964e2e5e3eb6e08f395514299076581a39be1c092e6ef0413ddee48c68d2ba6ebb4cac96f741e2c4ed73a0e08a50f6db4e2b21281bdfc96a7
+EBUILD foomatic-db-engine-4.0.12.ebuild 1163 BLAKE2B c371e62ba75c3932dd19ffa788ec42f96c6e3e8f8e45420f0a535d0a0afa05db238799bcb51e01cfd6c0ef2259e87d6e8db8db33ed4f9c1853fe3c98acb09598 SHA512 7fde9e1c2f32fa957babf71bbbcad82b28c8dc6dc9cd6354f53ad32a2bd85ceb4f3ba00949d3bdeef4fa863269d7c6e6f009d455030adc4bb44593dda6e498fd
 MISC metadata.xml 259 BLAKE2B 4a7248bc5a529d1cf3b51f8bcfff668a9e525df3e62584369d4b5526c89e70235378420b164073946ea91cf182065d9c8d2d46c8750d5f77855239b77ce45bae SHA512 7b1cbb90c1ddcf63b8802cfa3a53611f6367801b492c7677ef038738a337002c4606bcf93c5186abf808e74bca1fa76266169245acdb3b5997651bcabfecfa5c
diff --git a/net-print/foomatic-db-engine/foomatic-db-engine-4.0.11.ebuild b/net-print/foomatic-db-engine/foomatic-db-engine-4.0.11.ebuild
deleted file mode 100644
index 9dd5fdc3102c..000000000000
--- a/net-print/foomatic-db-engine/foomatic-db-engine-4.0.11.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL_SUBSLOT=yes
-inherit eutils perl-app versionator
-
-DESCRIPTION="Generates ppds out of xml foomatic printer description files"
-HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
-SRC_URI="http://www.openprinting.org/download/foomatic/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="net-print/cups"
-RDEPEND="
-	dev-libs/libxml2
-	>=net-print/cups-filters-1.0.43-r1[foomatic]
-"
-PDEPEND="net-print/foomatic-db"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/4.0.7-perl-module.patch \
-		"${FILESDIR}"/4.0.7-respect-ldflag.patch
-	sed -i -e "s:@LIB_CUPS@:$(cups-config --serverbin):" Makefile.in || die
-}
-
-src_configure() {
-	default
-	emake defaults
-
-	cd lib
-	perl-app_src_configure
-}
-
-src_compile() {
-	emake
-
-	cd lib
-	perl-app_src_compile
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog README TODO USAGE
-
-	cd lib
-	perl-module_src_install
-}
-
-src_test() {
-	cd lib
-	perl-module_src_test
-}
diff --git a/net-print/foomatic-db-engine/foomatic-db-engine-4.0.12.ebuild b/net-print/foomatic-db-engine/foomatic-db-engine-4.0.12.ebuild
index c714859db0b6..46011da40dbe 100644
--- a/net-print/foomatic-db-engine/foomatic-db-engine-4.0.12.ebuild
+++ b/net-print/foomatic-db-engine/foomatic-db-engine-4.0.12.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-GENTOO_DEPEND_ON_PERL_SUBSLOT=yes
-inherit eutils perl-app versionator autotools
+inherit eutils perl-module versionator autotools
 
 DESCRIPTION="Generates ppds out of xml foomatic printer description files"
 HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
@@ -12,7 +11,7 @@ SRC_URI="http://www.openprinting.org/download/foomatic/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 DEPEND="net-print/cups
@@ -30,6 +29,9 @@ src_prepare() {
 		"${FILESDIR}"/4.0.12-use-pkgconfig.patch
 	sed -i -e "s:@LIB_CUPS@:$(cups-config --serverbin):" Makefile.in || die
 	eautoreconf
+
+	cd lib
+	perl-module_src_prepare
 }
 
 src_configure() {
@@ -37,14 +39,14 @@ src_configure() {
 	emake defaults
 
 	cd lib
-	perl-app_src_configure
+	perl-module_src_configure
 }
 
 src_compile() {
 	default
 
 	cd lib
-	perl-app_src_compile
+	perl-module_src_compile
 }
 
 src_install() {