gentoo resync : 13.10.2019

31 files changed, 187 insertions, 156 deletions

diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index aca5a71612cf..abfefc90b44a 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/apsfilter/Manifest b/net-print/apsfilter/Manifest
index b47d0431d00b..2ddfe1acab38 100644
--- a/net-print/apsfilter/Manifest
+++ b/net-print/apsfilter/Manifest
@@ -1,5 +1,3 @@
-DIST apsfilter-7.2.5.tar.bz2 309436 BLAKE2B d9f0ca66ba3bec5a77161d90cdb197906149052978b992a4b82a3da1ece3a0e48e7de78b7cb4fdb11df6479c38782cfe8f3b996630795ac5bc679ba6b3cc4ecd SHA512 a9f2060f1636d255a5ec2c9bd9d8c6a34452e7ad76724746acd45bfb2644a924036032013e7f29a753545a02a83fe099364685562a8e95634170df3277c8e943
 DIST apsfilter-7.2.8.tar.bz2 310587 BLAKE2B aae44a7e79157d3ddf9ce56fe51ae90106eb952d536658efe0f19dfcbe5f0d5c7dd078e3bb5044433e250df6b9289a08a466d6e9fc77c91d540daf07a70bf197 SHA512 ca07e7eb620a95b08fb912e899520d5ff85613eb3d1f712e1d38a66cf5b84516dbb35e3e40ef75ac10d1e717cfc2f49930a0f0873fee451d495c8ae572072012
-EBUILD apsfilter-7.2.5.ebuild 1076 BLAKE2B 08fa388017a384d34fa6af5bc971a295c4587b3e3304e5f4bf8809b4b2bbd8833c1a12c4f18a3647c641157e5eb4e1f2d703c5a5579a20f963d450fb49968850 SHA512 a823f376cdcc1898fb929b7d9e487b57c5b072a9135eb4b221c0d301020d4912a25248340cac5e2a64f7fed158fd1e2f3ade1069d974b53f66afad0593e05edd
-EBUILD apsfilter-7.2.8-r1.ebuild 1169 BLAKE2B 2accce4975b86337750a13c53631595c255d2bb7890665616b65a8aa6d230df4814a3426aab5e245160c58657592c4f4c44353a05fa7a0e35708356087a08169 SHA512 ba0acf1bc3f8d0b44853c2b415c8fb4335fc6705a65ce6fcbf3e283c9dd84f0a8e6f80a6977d723abca6f83d4eb0f6d7674cddce2eef9e163c346740a4af5ab1
+EBUILD apsfilter-7.2.8-r1.ebuild 1163 BLAKE2B bf5fd020d0f810fb3803c452930202a755ad2519a9061e392b0e4c81c6eb0e9ed490b32bc573b3c12369c8198744a3125d397872986e023912750d283aef574d SHA512 759d52778232bd40d30bdafecd8ced6ccff8fa056009a966f7a6ebfcd835ee464990d57e10df2500e4a07de5f650d3026b5546edd08377e98f9fb861f3f1b345
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/net-print/apsfilter/apsfilter-7.2.5.ebuild b/net-print/apsfilter/apsfilter-7.2.5.ebuild
deleted file mode 100644
index 47627f70637a..000000000000
--- a/net-print/apsfilter/apsfilter-7.2.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Apsfilter Prints So Fine, It Leads To Extraordinary Results"
-HOMEPAGE="http://www.apsfilter.org"
-KEYWORDS="alpha ppc sparc x86"
-IUSE="cups"
-SLOT="0"
-LICENSE="GPL-2"
-
-RDEPEND="|| ( net-print/cups net-print/lprng )
-	app-text/ghostscript-gpl
-	>=app-text/psutils-1.17
-	>=media-gfx/imagemagick-5.4.5
-	>=app-text/a2ps-4.13b-r4
-	virtual/awk
-	virtual/mta"
-DEPEND="${RDEPEND}"
-
-SRC_URI="http://www.apsfilter.org/download/${P}.tar.bz2"
-S=${WORKDIR}/apsfilter
-
-src_compile() {
-	# assume thet lprng is installed if cups isn't USEd
-	use cups && \
-	    myconf="--with-printcap=/etc/cups/printcap --with-spooldir=/var/spool/cups" || \
-	    myconf="--with-printcap=/etc/lprng/printcap"
-	./configure --prefix=/usr ${myconf} || die
-
-	emake || die
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die
-	dosym /usr/share/apsfilter/SETUP /usr/bin/apsfilter
-	use cups && \
-	    dosym /etc/cups/printcap /etc/printcap || \
-	    dosym /etc/lprng/printcap /etc/printcap
-}
diff --git a/net-print/apsfilter/apsfilter-7.2.8-r1.ebuild b/net-print/apsfilter/apsfilter-7.2.8-r1.ebuild
index ad57c2f64493..80d004a13b7b 100644
--- a/net-print/apsfilter/apsfilter-7.2.8-r1.ebuild
+++ b/net-print/apsfilter/apsfilter-7.2.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -6,7 +6,7 @@ EAPI=4
 DESCRIPTION="Apsfilter Prints So Fine, It Leads To Extraordinary Results"
 HOMEPAGE="http://www.apsfilter.org"
 SRC_URI="http://www.apsfilter.org/download/${P}.tar.bz2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ppc sparc x86"
 IUSE="cups"
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 1a5c77ce8f6f..df5ddb7b2dfa 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -2,11 +2,13 @@ AUX cups-browsed.init.d-r1 154 BLAKE2B 81a1b1b6c8b6f0d7ac874c32aa5c5531b7d791711
 AUX cups-filters-1.25.4-missing_cstring.patch 540 BLAKE2B fdc22ccbc624cc6dc9fb6a30cf461d3142b5ab794708e7456663efce7a2ed207159bfad564dc790d77e8f4b6ab7f1e95768f889523c5c2a9c33d3a4408d46fc6 SHA512 0eaf6ec88a74890ae4045bf954895c48e843f346a2ac8114bd3adf9f6c49b511001e5d9cf22dc4c8215b09b58e9acbec80b1f3d20b1b3c2909694f65bbfe5b4b
 DIST cups-filters-1.21.6.tar.xz 1474944 BLAKE2B a4c3418accb9d2bf46a366ec6004919d2a5c2c0a02022102270da17fb81915428275aadf58f1f50f8ca022e1c09cbdbd7300492fa38c53d4a2cbc4c4b86a09e3 SHA512 804250745ac710706ff1bfa6e161c0b1a8a65a74850a76a311b7614694a7e5d07f01dfd15f277ad79ed7fe1e84ea680bab1643e0b82cefa3e26603fa2eea935a
 DIST cups-filters-1.22.6.tar.xz 1477584 BLAKE2B 7d833c3e97c510eabcc906bbd01d4d1ef2bf3106d963bdec7f735942e96a830c53ec2c03a4ef580d9fc01f19bae3962c1bd2a98d2af7f03f71988ae374366fee SHA512 6c1c46bd74f700b3ab0a46cb4b5b7ecc93000122e9deb20b43878d876cbe2ceeeb4a3c16ef6de00497b10447d04f2689a5d939d0d49212e7274cc51b4617c296
-DIST cups-filters-1.25.4.tar.xz 1449676 BLAKE2B 1ba36c013d37d57ebf04a9395638bee8aa3935832ed5f0235f50fcfbc61e4002701dec15f7c45952975fc1e53e7f57fd93f86b9af153a732795745e21e38d329 SHA512 0386c4640249a0325257f9b10a0eee387bc6e8129bde734b6c35704719c0ad60624f9ad44c73cd199768373ffd331fc1b4b4c4c8641f5ec8792ddf8850da510a
-DIST cups-filters-1.25.5.tar.xz 1450264 BLAKE2B 126f32604ff4b2599154406177f8aeaf061f9624255177de968f88706a9138ed9fc8f170987bc25bb4c3801b33432c51c304d2b4a1bdc7249b7472d9cbaadca6 SHA512 4e7126f4c439cb7392484dd3531023da5a1c885c7a6c7377260e7cccc2f3f51e3d0aa879965ecdb2625217d6f9ee1ca9c860c4fc05a7959697cd269696f10f59
-EBUILD cups-filters-1.21.6.ebuild 3488 BLAKE2B da4a24389073b98e8d081290baf781dca00fd9c78512f17c74c8e1962a2e54cbfcac5ae28fd4f2a7ad9c4d9e15b8588a88ddcabfbd33e333839e26d138bd9fc3 SHA512 48d0ab3b1f0361006e79426bff2ad563950ad90833f49aad9934c8cfc607c89fc8ab9ef74c18d832113ba35a76d0a46d5135b739619550790a751a20edf0cca0
-EBUILD cups-filters-1.22.6.ebuild 3415 BLAKE2B c989890436b23dcf06a9de7e35be07b149e6d6f61138bc5c98097b15e0ee36f37cdd6ccd011022a433ae3cc45aac35e77ff3ed014c1b1945740f9ea6e85c27a1 SHA512 6749713a40f33310fc86c4c27bdc7171f5380cd7ca06b84990c46aeeee49d165de95d33f0f0df19901c798bde4d36acdc37790e678938ab15d68551389cd2177
-EBUILD cups-filters-1.25.4.ebuild 3447 BLAKE2B 15b83730551c5bda0b8603dc22248810c299f04bf9f2a1586f5a9949daecc4b49c48e7aa75e62f899a041d023161017adc72a130dc9fbe4519ac57a4f68aa157 SHA512 17c640fb9703663e6ec43ff16ccaafbcda24222aba347d59cf1595988a92a405d44175911247e5011b22a14c119cfd194a027b4926d14a0bfc996c5d74f1ca16
-EBUILD cups-filters-1.25.5.ebuild 3384 BLAKE2B 0b3a0f627fc1422c27c37e67ce4c938849738afc29a705fb6f395b770eea20872885b43c14cc0fd90d75d8a49d89b86975fc5621444535f05e32e20cfc89dc13 SHA512 6b93a7820236f97c207ad877bd96383f7c671dfec809e7e92571a9c54152c8b21a0828614c3aa818a8ef9e542972460e693105dafb0ec55ea27748c0adf7a0f9
-EBUILD cups-filters-9999.ebuild 3384 BLAKE2B 0b3a0f627fc1422c27c37e67ce4c938849738afc29a705fb6f395b770eea20872885b43c14cc0fd90d75d8a49d89b86975fc5621444535f05e32e20cfc89dc13 SHA512 6b93a7820236f97c207ad877bd96383f7c671dfec809e7e92571a9c54152c8b21a0828614c3aa818a8ef9e542972460e693105dafb0ec55ea27748c0adf7a0f9
+DIST cups-filters-1.25.10.tar.xz 1483276 BLAKE2B 34961ec157db992b4225413143566e9d74f8effc879848ff4a47cbd1b87d3fab7b41b75d3a48310c2b56cc834e7999d4268eaa5f30a7e20a3969c13cb4c98585 SHA512 1ac2e05e4a9c7ccc000f39d4a0cfa66e1328a049154cede71602bdef5ba5a19a13fa4e48d33adb7e19849bc4f659559ff73151f8b2b36c1eb6d1625396704abf
+DIST cups-filters-1.25.11.tar.xz 1482792 BLAKE2B 67801904dbe025933d1209817e23ff74b661b35c3af560081f12d4f9a26102e009bac9d4741e15dc257dd477967b18ae23911647f8f56b361e9f8d51b0d619f2 SHA512 67e7c624952b5e2db33a698ac1287a3448a4787fa28000cefc5a982c2fa18a4f56e11e3ba65da8a6e565a53a193c6eb31ba1867ad36ca8dc7e61250f11232681
+DIST cups-filters-1.25.6.tar.xz 1482160 BLAKE2B 13587dc5153e7e0368b2d4edcfab0aec3864b1b17e403fc54bd1f0677ed8611934b55bfbd5ce2a474486a9e56e946530493afba3a7d7bc2731f08bb11dbe2bdb SHA512 14c958bcb98e4addde84c3c0d27e7056f1b4790b8502f5fb0c23c1e2cf80a6fd22fa39816a2f2e6c0501272a57cfcc84ce939a8614563e795e5d2ae035972f33
+EBUILD cups-filters-1.21.6.ebuild 3476 BLAKE2B 7c9acaa6d3990e169008c8538557535db6dcb43e5771f3914df0de3a60b4c78fa7d54920ce790753cc369921c7e1c9c470d6d49b918c6ad1bfb6f882ee0bf80e SHA512 4ab66b437984893ac38bec0d32b86d77b0bc05efcf09add70ff1df5bdb2628344eb4b2b5a4242c3df30074f0ed79e6dbfbb69c137fe94df3ccb995a09031198c
+EBUILD cups-filters-1.22.6.ebuild 3403 BLAKE2B 9549b2e0988f52962babe5bce222811d4dc8a66818da2bfcbe556b8d80c1ad3dfeb8be55c9f720da291c0e1ee854ca964fefd1132dfe4d0865655f301ffc69a6 SHA512 5a4911380b842abe3a1aada19fcd5194daae4d9d3866befe22df5d3ed570144f7ead77ce7055cf2f9450dd9fcc6f67646ea749a5af06d6fd941705bb195cbd71
+EBUILD cups-filters-1.25.10.ebuild 3372 BLAKE2B 8fdd4d6f858299e28ddc1063c402cbdd5a730a66f2ab24865bb6197fa474672813a3846ddf9d56de3b15860ffcfb88835fadeaea23d8747f05f649165ada1cf6 SHA512 c1e8815269ba2eb6fdb34930a9e5eeb9658d040c96ed073681e215b80026cfc6703bd9137ab6bb00b9b9c44255dd001b15339b4bef32ce0871dfc649e3f35c78
+EBUILD cups-filters-1.25.11.ebuild 3372 BLAKE2B 8fdd4d6f858299e28ddc1063c402cbdd5a730a66f2ab24865bb6197fa474672813a3846ddf9d56de3b15860ffcfb88835fadeaea23d8747f05f649165ada1cf6 SHA512 c1e8815269ba2eb6fdb34930a9e5eeb9658d040c96ed073681e215b80026cfc6703bd9137ab6bb00b9b9c44255dd001b15339b4bef32ce0871dfc649e3f35c78
+EBUILD cups-filters-1.25.6.ebuild 3372 BLAKE2B 8fdd4d6f858299e28ddc1063c402cbdd5a730a66f2ab24865bb6197fa474672813a3846ddf9d56de3b15860ffcfb88835fadeaea23d8747f05f649165ada1cf6 SHA512 c1e8815269ba2eb6fdb34930a9e5eeb9658d040c96ed073681e215b80026cfc6703bd9137ab6bb00b9b9c44255dd001b15339b4bef32ce0871dfc649e3f35c78
+EBUILD cups-filters-9999.ebuild 3372 BLAKE2B 8fdd4d6f858299e28ddc1063c402cbdd5a730a66f2ab24865bb6197fa474672813a3846ddf9d56de3b15860ffcfb88835fadeaea23d8747f05f649165ada1cf6 SHA512 c1e8815269ba2eb6fdb34930a9e5eeb9658d040c96ed073681e215b80026cfc6703bd9137ab6bb00b9b9c44255dd001b15339b4bef32ce0871dfc649e3f35c78
 MISC metadata.xml 560 BLAKE2B ef0a2d2d0db2d065b1dcb444a6bf3333cc3cc8658629ffcdf44e9d39c4f13d8adb5e5b770d4abeb76fea5d4d3e85968daaf2ce2d9a13d3f396ab91f51b1ef723 SHA512 b734c24f2b65bc5c7d13b1ec8ec86f2188d758c295f7bd5aad12a794498ec92d43d543a0aed2ff49013c26aa3baf1f3e03fead90bd5c7f70bf430d48c063b06a
diff --git a/net-print/cups-filters/cups-filters-1.21.6.ebuild b/net-print/cups-filters/cups-filters-1.21.6.ebuild
index 3abe2224bf08..e6254b113709 100644
--- a/net-print/cups-filters/cups-filters-1.21.6.ebuild
+++ b/net-print/cups-filters/cups-filters-1.21.6.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
 else
 	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~m68k-mint"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~m68k-mint"
 fi
 DESCRIPTION="Cups filters"
 HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
diff --git a/net-print/cups-filters/cups-filters-1.22.6.ebuild b/net-print/cups-filters/cups-filters-1.22.6.ebuild
index 9549f96b1d5a..18623608c7dc 100644
--- a/net-print/cups-filters/cups-filters-1.22.6.ebuild
+++ b/net-print/cups-filters/cups-filters-1.22.6.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git"
 else
 	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~m68k-mint"
 fi
 DESCRIPTION="Cups filters"
 HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
diff --git a/net-print/cups-filters/cups-filters-1.25.5.ebuild b/net-print/cups-filters/cups-filters-1.25.10.ebuild
index cdc922f82de3..e581c47e5e42 100644
--- a/net-print/cups-filters/cups-filters-1.25.5.ebuild
+++ b/net-print/cups-filters/cups-filters-1.25.10.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git"
 else
 	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~m68k-mint"
 fi
 DESCRIPTION="Cups filters"
 HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
diff --git a/net-print/cups-filters/cups-filters-1.25.4.ebuild b/net-print/cups-filters/cups-filters-1.25.11.ebuild
index 03ae82bd13c0..e581c47e5e42 100644
--- a/net-print/cups-filters/cups-filters-1.25.4.ebuild
+++ b/net-print/cups-filters/cups-filters-1.25.11.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git"
 else
 	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~m68k-mint"
 fi
 DESCRIPTION="Cups filters"
 HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
@@ -48,10 +48,6 @@ DEPEND="${RDEPEND}
 	test? ( media-fonts/dejavu )
 "
 
-PATCHES=(
-	"${FILESDIR}/${P}-missing_cstring.patch" #693498
-)
-
 src_prepare() {
 	default
 	[[ "${PV}" == "9999" ]] && eautoreconf
diff --git a/net-print/cups-filters/cups-filters-1.25.6.ebuild b/net-print/cups-filters/cups-filters-1.25.6.ebuild
new file mode 100644
index 000000000000..e581c47e5e42
--- /dev/null
+++ b/net-print/cups-filters/cups-filters-1.25.6.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENTOO_DEPEND_ON_PERL=no
+
+inherit perl-module systemd flag-o-matic
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git"
+else
+	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~m68k-mint"
+fi
+DESCRIPTION="Cups filters"
+HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
+
+LICENSE="MIT GPL-2"
+SLOT="0"
+IUSE="dbus +foomatic ipp_autosetup jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf"
+
+RDEPEND="
+	>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils]
+	>=app-text/qpdf-8.3.0:=
+	dev-libs/glib:2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/lcms:2
+	>=net-print/cups-1.7.3
+	!<=net-print/cups-1.5.9999
+	sys-devel/bc
+	sys-libs/zlib
+	dbus? ( sys-apps/dbus )
+	foomatic? ( !net-print/foomatic-filters )
+	jpeg? ( virtual/jpeg:0 )
+	ldap? ( net-nds/openldap )
+	pdf? ( app-text/mupdf )
+	perl? ( dev-lang/perl:= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
+	tiff? ( media-libs/tiff:0 )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	test? ( media-fonts/dejavu )
+"
+
+src_prepare() {
+	default
+	[[ "${PV}" == "9999" ]] && eautoreconf
+
+	# Bug #626800
+	append-cxxflags -std=c++11
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-imagefilters
+		--localstatedir="${EPREFIX}"/var
+		--with-browseremoteprotocols=DNSSD,CUPS
+		--with-cups-rundir="${EPREFIX}"/run/cups
+		--with-fontdir="fonts/conf.avail"
+		--with-pdftops=pdftops
+		--with-rcdir=no
+		--without-php
+		$(use_enable dbus)
+		$(use_enable foomatic)
+		$(use_enable ipp_autosetup auto-setup-driverless)
+		$(use_enable ldap)
+		$(use_enable pclm)
+		$(use_enable pdf mutool)
+		$(use_enable postscript ghostscript)
+		$(use_enable static-libs static)
+		$(use_enable zeroconf avahi)
+		$(use_with jpeg)
+		$(use_with png)
+		$(use_with tiff)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use perl; then
+		pushd "${S}/scripting/perl" > /dev/null
+		perl-module_src_configure
+		perl-module_src_compile
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	default
+
+	if use perl; then
+		pushd "${S}/scripting/perl" > /dev/null
+		perl-module_src_install
+		perl_delete_localpod
+		popd > /dev/null
+	fi
+
+	if use postscript; then
+		# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
+		dosym gstoraster /usr/libexec/cups/filter/pstoraster
+		dosym gstopxl /usr/libexec/cups/filter/pstopxl
+	fi
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+
+	cp "${FILESDIR}"/cups-browsed.init.d-r1 "${T}"/cups-browsed || die
+
+	if ! use zeroconf ; then
+		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
+		sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
+	fi
+
+	doinitd "${T}"/cups-browsed
+	systemd_dounit "${S}/utils/cups-browsed.service"
+}
+
+src_test() {
+	emake check
+}
+
+pkg_postinst() {
+	if ! use foomatic ; then
+		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
+		ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
+	fi
+}
diff --git a/net-print/cups-filters/cups-filters-9999.ebuild b/net-print/cups-filters/cups-filters-9999.ebuild
index cdc922f82de3..e581c47e5e42 100644
--- a/net-print/cups-filters/cups-filters-9999.ebuild
+++ b/net-print/cups-filters/cups-filters-9999.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git"
 else
 	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~m68k-mint"
 fi
 DESCRIPTION="Cups filters"
 HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
diff --git a/net-print/cups-windows/Manifest b/net-print/cups-windows/Manifest
index 9bb5829a1448..d6582bd310d7 100644
--- a/net-print/cups-windows/Manifest
+++ b/net-print/cups-windows/Manifest
@@ -1,3 +1,3 @@
 DIST cups-windows-6.0-source.tar.bz2 38284 BLAKE2B 67722a99dc906ac9c39ba9a93b7fbbb24a44b7400de6209ac5d0ddedc4f891b48ad0284d6cfa8336400697af6eaa006e79349931cefe55cf72b428546c6ff43e SHA512 03bd66d210ee191d25139d9e462543a01d30e8a0dc797a9ee62673e84cfa9d057cc6d327792c74941a17e5021a7ffe52c40bcb52a3f3f4186f59f04796c809df
-EBUILD cups-windows-6.0-r1.ebuild 583 BLAKE2B 437697725b6d980ceb93fc215f868002c6378164a38afc857cddb02e8a8fa5f07acd25e9963fb9c2fd06ca1be41aedd815fecbaced23ec8a50491861cef29a0b SHA512 292eae1c39066a39906e1ca79f93a7870eb6f6425533673dea468ca73888af9b7397a8a343755ad4267b7b7697b784f52c9b60b0445c844693d46e3904884a03
+EBUILD cups-windows-6.0-r1.ebuild 573 BLAKE2B 25b9460e33387427f3cdb26960159caa8742eb40a7db073947f2d24c14cb63eb15d1d88e5a0517ae974f5da7d01298a5bdff60554af5679d97cd516b7c79304a SHA512 9e46bc935d3fd5a8d6ca0b8b8cbf41cc7b3a6895efd43350aad9e157c756f0fe7f2d249d1ece0dd5588c16c94c6d3aff0df35620b55d8f44f201f9a182b32c61
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/net-print/cups-windows/cups-windows-6.0-r1.ebuild b/net-print/cups-windows/cups-windows-6.0-r1.ebuild
index abb0f1bf4758..a440c47854d2 100644
--- a/net-print/cups-windows/cups-windows-6.0-r1.ebuild
+++ b/net-print/cups-windows/cups-windows-6.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}-source.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 RDEPEND=">=net-print/cups-1.2"
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 035834bf0706..fba05f373dd5 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -6,7 +6,7 @@ AUX cups-2.2.6-fix-install-perms.patch 660 BLAKE2B 85c42742762dc72c746550c36160c
 AUX cupsd.init.d-r3 584 BLAKE2B f503663a59673209fc6c161aed3cc214cab2b3e68692078dc47c1a833fe141225f48f2d07dab65fc19ea68e54bb7c9a7c94f6db1dac443111d04b392fd7855a4 SHA512 ace66b46c17f99f8c6487188c14e8a1baf7acad602156b88cdae7fb4738c163a045240a1b28c6db4af86caa317723357186812eed81f9553a9ef3517c966c6b3
 DIST cups-2.2.12-source.tar.gz 10409313 BLAKE2B 126ea81f7108b3b62f5e062ed522898dd48d4e5b4077c834e8fe89012445dd0a903bafa62f593551ed5f1c92cce4fbd22f56834e0615ed65ca4a6ae84dc2ca1c SHA512 b8e7be512938ad388d469d093ad0c882ab42ea1408c27a91340f8424aa0e79e588df3d59795624973b89074a2af650fa9b5b6ed5224138b17e4c6dbbcbf0a2e6
 DIST cups-2.3.0-source.tar.gz 8129049 BLAKE2B 738dbc7ee5ddcc9ffee44083cd93d8a0e75f4d3bf0b704dd643dc59db2cc2381dd65f676c0979bc65fee03438d160d9d650ceb93f8c702102eb1449d306a81a3 SHA512 c51f173b5fbae1554a3f4a3786fb3b5566e50d9f775473788ee3553922ac7e02e4785492c87c93fd46f159f50d97cc10ff6feafb3397cd9c1840840f3a9cdfae
-EBUILD cups-2.2.12.ebuild 9775 BLAKE2B 37d41f1388d74dcad7e71aa401593bd6e46f57ef9c257c177b83159a95804e357d773ef108fb69ef6ce5effff8e5f60b1d1bd78cdb4792834ecb6006840b89e7 SHA512 f2be9a200c0faaf11b35c19945dc18ed35ce90918357e1b680e09bd760b1f48fc9ea0f187d71064226daf0c78955794e342ac560b9d51b9260ddac08cb4d4200
-EBUILD cups-2.3.0.ebuild 9633 BLAKE2B 2b62636ffa95594e5b3985c3649120fc5deaea937035225ed5f70a4a3f3ceecf21b7eb1ab90a8568c6de0711c169131117de03f8c9ceac32a4493c9eec4494cb SHA512 26221b3b0b98c65dbda3820ccd7a5b88318bacca52d79af37d7cdc35efa441de6696f7082206f716a29001853960ca3f4e6a8ce8e6ef031e4b6025068dea57e1
-EBUILD cups-9999.ebuild 9633 BLAKE2B 2b62636ffa95594e5b3985c3649120fc5deaea937035225ed5f70a4a3f3ceecf21b7eb1ab90a8568c6de0711c169131117de03f8c9ceac32a4493c9eec4494cb SHA512 26221b3b0b98c65dbda3820ccd7a5b88318bacca52d79af37d7cdc35efa441de6696f7082206f716a29001853960ca3f4e6a8ce8e6ef031e4b6025068dea57e1
+EBUILD cups-2.2.12.ebuild 9754 BLAKE2B 9cd4860d8f13efd8351091ca188177e6e8ea475b62a6e2cdb87c6d990671e2fed04707e6f547fa1899da428505c705d952d8de7afb5a831b41cd624c3b668e5e SHA512 8b8677a3c83b7c0004e2131e81afc27d7bd43d8ada6283d7418a934afb9e67a22920f9ddaf700e8bfcd060c2bd79d8b5b48b61a1a286577ce93490eb89d5ef47
+EBUILD cups-2.3.0.ebuild 9612 BLAKE2B 12fbb4ca4f31a2910d07cb5f8a4c1386943007a8f27fd097f7a3b8d21d9634a87aff82121f7c55b3f6595aba8a9255cc7a0436be21278e5e7872b12e8c14cd71 SHA512 a718024c0a1c2eb0ccad9083d23838814048d0aafb8e0978762801389da765b213d079fb4b555933a9b86f8016b81229408958ee95b83128144333e199611e7a
+EBUILD cups-9999.ebuild 9612 BLAKE2B 12fbb4ca4f31a2910d07cb5f8a4c1386943007a8f27fd097f7a3b8d21d9634a87aff82121f7c55b3f6595aba8a9255cc7a0436be21278e5e7872b12e8c14cd71 SHA512 a718024c0a1c2eb0ccad9083d23838814048d0aafb8e0978762801389da765b213d079fb4b555933a9b86f8016b81229408958ee95b83128144333e199611e7a
 MISC metadata.xml 733 BLAKE2B 2014cd9267e3f7f1a4f73124ab6bb9f4ba80b95ef08c9a781a03a95bbb3f97dadeb9e1a239d8dea5a6f6678d99eb906a2835df0168c13ba5456baff8ab3c6e0f SHA512 e4e2342cb4b0598fc23486753d9296254da78eb7d448fbdc250a2ba181e5692002e1e671799971c9cfaf25d40e034e3e2752836067b1b24813cfb3ed1b682e22
diff --git a/net-print/cups/cups-2.2.12.ebuild b/net-print/cups/cups-2.2.12.ebuild
index fdabb541c491..70574c1dd3d0 100644
--- a/net-print/cups/cups-2.2.12.ebuild
+++ b/net-print/cups/cups-2.2.12.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	#SRC_URI="https://github.com/apple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	SRC_URI="https://github.com/apple/cups/releases/download/v${PV}/${P}-source.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~m68k-mint"
 fi
 
 DESCRIPTION="The Common Unix Printing System"
@@ -44,7 +44,7 @@ CDEPEND="
 	java? ( >=virtual/jre-1.6:* )
 	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
 	!lprng-compat? ( !net-print/lprng )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	python? ( ${PYTHON_DEPS} )
 	ssl? ( >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] )
 	systemd? ( sys-apps/systemd )
diff --git a/net-print/cups/cups-2.3.0.ebuild b/net-print/cups/cups-2.3.0.ebuild
index b2da32a36b26..5d1def034fe6 100644
--- a/net-print/cups/cups-2.3.0.ebuild
+++ b/net-print/cups/cups-2.3.0.ebuild
@@ -21,7 +21,7 @@ else
 	#SRC_URI="https://github.com/apple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	SRC_URI="https://github.com/apple/cups/releases/download/v${MY_PV}/${MY_P}-source.tar.gz"
 	if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~m68k-mint"
 	fi
 fi
 
@@ -44,7 +44,7 @@ CDEPEND="
 	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
 	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
 	!lprng-compat? ( !net-print/lprng )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	ssl? ( >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] )
 	systemd? ( sys-apps/systemd )
 	usb? ( virtual/libusb:1 )
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index b2da32a36b26..5d1def034fe6 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.ebuild
@@ -21,7 +21,7 @@ else
 	#SRC_URI="https://github.com/apple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	SRC_URI="https://github.com/apple/cups/releases/download/v${MY_PV}/${MY_P}-source.tar.gz"
 	if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~m68k-mint"
 	fi
 fi
 
@@ -44,7 +44,7 @@ CDEPEND="
 	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
 	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
 	!lprng-compat? ( !net-print/lprng )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	ssl? ( >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] )
 	systemd? ( sys-apps/systemd )
 	usb? ( virtual/libusb:1 )
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() {
diff --git a/net-print/foomatic-db-ppds/Manifest b/net-print/foomatic-db-ppds/Manifest
index 4ee062d3d523..a4d6c0d14086 100644
--- a/net-print/foomatic-db-ppds/Manifest
+++ b/net-print/foomatic-db-ppds/Manifest
@@ -2,7 +2,7 @@ AUX Makefile.in-4.0.20120117.patch 1161 BLAKE2B f935f674597d1edc4d70b2fc600e5a04
 DIST foomatic-db-4.0-20170331.tar.gz 53321292 BLAKE2B 375421205b80cc84d10629454cad053ea0022c8e230c0eab0797f3de79d42e6cc3769ad286095aa7a5bdde0f49d30fb3484e8cbefbae48a32840c0ca96885276 SHA512 33037b087eccfe08fb5b2c0220992f4ad4762c7206325f6bc8073903aafa27a260382cfa8edb4500f0feeea4d0489a3a345fe3017790484fdfb53aa577f691c0
 DIST foomatic-db-4.0-20180126.tar.gz 58697641 BLAKE2B ae063e5d82e70dcd4b7791d0ffc3914c6a7d218c9e1067f6fe99f029c7f4340399e7034da26119e4219096758d029c832797dc10e8076f49f0e24ca11188785c SHA512 84e9c70e797a5328317d0b2725ebb67aa630923516fd8f860740af58ee5337b6302669c822b6aba32fb10ad9670c5894b34356e3cfc0e1496bd051551f40026d
 DIST foomatic-db-4.0-20190226.tar.xz 6438248 BLAKE2B c5ce6b3ec5a29524f6f8c73fdaec88a97a3fd4521753c5058d470ebadf7c35c3218bd7e78023a26b267796ccfbca98368ee4d4bc5252b9339ee1c067adbe80b2 SHA512 308cf8b5648ae8f3be1a1a5af1885319ae9f263575e7b0b06bd66e6e3e0b495656124face65e285bfa657dbff3cff226bb00d78b873f16849b426641dc7d52fe
-EBUILD foomatic-db-ppds-4.0.20170331.ebuild 845 BLAKE2B 1e05baaa71842a77e33e2c1514dfcefb3a5f73722d52f2d2897dee75a721a6223ac2b75d9b631f10cf2255ef61e8cdc0542e4e4a5bd4429878d37e1d9e88fa93 SHA512 6d0491122d2de885047a92588ba11b6edc6abe95f265f6b62da655ce73bc22eae07b2e5ebc6e37b7cd2be5dc8df475336f51029100ff0124cfebda9529d2266d
-EBUILD foomatic-db-ppds-4.0.20180126.ebuild 863 BLAKE2B 704b3a2f8801d7ce86775323d3d5b93d590664dbba5a55b0b3e802c2f77fafd7d74a47ff5f8a3d03e16aa99a8f59ed4de59333373a0d92b32fa5406ec5b71dae SHA512 91759d2e20b22d17349519cb3ccba8fb140cf289e97da511b756e4c0aa4639a02fe8318a161724a57b1fdb43c7bb9244440623ff047078bd72f47bac5a21851f
-EBUILD foomatic-db-ppds-4.0.20190226.ebuild 860 BLAKE2B 5dd997d84d43b9135d92c293e208c0a2f2c34fac441813b906e26d265e69c09f9f8333f278d6cb845a73fa3bc614c0276cfefeca4bc6a3ee2ce3360e6dee3e67 SHA512 9616bf4eb0a22a964a629ac95e6b3acb376f2ca1db37536ba1f262481d18946ece05e51549d6d95ef32ececb45a1eaede1eb1c719b26a41f4c48b64e3d992a07
+EBUILD foomatic-db-ppds-4.0.20170331.ebuild 835 BLAKE2B c074a9debaf5c00c5a4140fe5b59d369610c092cbecc419eef667ea558863bec3c193f2ff6ece35ce547d6dfd524ee05c492ea61dbae64633751043e453041fb SHA512 6e44117427a0feb3c10b3e5d8f51f95ffb366ce4ce8f3886a6f87730a5558ef5a6b7c4acb4338ce953422c902252d6fb5ea13c4c84d48c14a194145d76cac6a8
+EBUILD foomatic-db-ppds-4.0.20180126.ebuild 853 BLAKE2B 8d3245f5ef09d72f916840a45b295ea05cec1d1aae74d7e611f7f6e6c39b841ad806d9a52eecf1621ce2ce3fa3cded5520445e52457adf93a605f2731897f39a SHA512 9c39237c1d08cf8fd435406003231ac9f21e958c5f33f75bb23f53392007ad44bb16424f323f3053c95183a0652f20c24864b6dbd1e3d6738082b8958e3be0e8
+EBUILD foomatic-db-ppds-4.0.20190226.ebuild 850 BLAKE2B 7b64160725d98ae679bf79c63223d2bf8c8559f79527ac18b19060438fbf58234c8fa9ec6d0d2b71d5a0a36d072310fa985d14484ca0a8c29def073c2f44d365 SHA512 8835238947ec5d479f688507683b47c962ed1f10fdc084ca8b15b9963b0c434eeefc3e1043c2c2d2c9f3679241dbfe90bcb4e9d119590fd60059657caa1eba25
 MISC metadata.xml 259 BLAKE2B 4a7248bc5a529d1cf3b51f8bcfff668a9e525df3e62584369d4b5526c89e70235378420b164073946ea91cf182065d9c8d2d46c8750d5f77855239b77ce45bae SHA512 7b1cbb90c1ddcf63b8802cfa3a53611f6367801b492c7677ef038738a337002c4606bcf93c5186abf808e74bca1fa76266169245acdb3b5997651bcabfecfa5c
diff --git a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20170331.ebuild b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20170331.ebuild
index 077cc3318f07..76bead060bd2 100644
--- a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20170331.ebuild
+++ b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20170331.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://linuxprinting.org/download/foomatic/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${PN/-ppds}-$(get_version_component_range 3 ${PV})"
diff --git a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20180126.ebuild b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20180126.ebuild
index 4acc8fdfb809..93843a46d849 100644
--- a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20180126.ebuild
+++ b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20180126.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://linuxprinting.org/download/foomatic/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
 S="${WORKDIR}/${PN/-ppds}-$(get_version_component_range 3 ${PV})"
diff --git a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20190226.ebuild b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20190226.ebuild
index 39fcb8992631..3bbad3539230 100644
--- a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20190226.ebuild
+++ b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20190226.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://linuxprinting.org/download/foomatic/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
 S="${WORKDIR}/${PN/-ppds}-$(get_version_component_range 3 ${PV})"
diff --git a/net-print/foomatic-db/Manifest b/net-print/foomatic-db/Manifest
index 9e80e6ec52be..7c172a7a08a0 100644
--- a/net-print/foomatic-db/Manifest
+++ b/net-print/foomatic-db/Manifest
@@ -1,7 +1,7 @@
 DIST foomatic-db-4.0-20170331.tar.xz 5083832 BLAKE2B 3c22869cc50f9e68e04bc9edaf6227764ede1566bf93311f1098d0022174911697a63685488be2c753205e40284ec22c31a64e672fee3851eeec920730b5a344 SHA512 f265a476533a77c27f0eb6414a3b93c6b269effba7bb0d46c9d3965c0e7218c3b081ae5e3f01ebfe7afbec70379543dd2e553b97b338eca43c34c11a4ffb4dcc
 DIST foomatic-db-4.0-20180126.tar.xz 5418608 BLAKE2B e11dbfc7e4cf121ba8b456820438b0418981c414c6a798dee463430dd8ccf65b424e1d597bc21b32929e858d0282b12df81fb419793bd34172b0c414619d2762 SHA512 1879e2601ad88262c99201bff5353ac40516985de72dd894eeeae2589ae2b82dd4dbfc972cb3ff43f209efb92753d4ed0ce584d89cd242fedc011511c45d8a87
 DIST foomatic-db-4.0-20190226.tar.xz 6438248 BLAKE2B c5ce6b3ec5a29524f6f8c73fdaec88a97a3fd4521753c5058d470ebadf7c35c3218bd7e78023a26b267796ccfbca98368ee4d4bc5252b9339ee1c067adbe80b2 SHA512 308cf8b5648ae8f3be1a1a5af1885319ae9f263575e7b0b06bd66e6e3e0b495656124face65e285bfa657dbff3cff226bb00d78b873f16849b426641dc7d52fe
-EBUILD foomatic-db-4.0.20170331.ebuild 1207 BLAKE2B 2aed57c70dd5ccdac9ed27f5af6bfd754ed950da1a075ea57c85651e870440b3538bb049c358c227f01f63857ee4feb29260a9f94451a031b15ce1e101cee4ea SHA512 5fe1da45af096d8419faa461369067e5b45bfecc311e788b05ee506e92cd88324e58cff9a619706ea69c5fdfe6837cdab1cc346eca74e4766a70346404d9d7b3
-EBUILD foomatic-db-4.0.20180126.ebuild 1225 BLAKE2B 39fec6d0fed1bbaf3f75d5015bc727589e8a60cd3f2b3d146cee1bb820ab0511cee115cf299929cfcf908ca99421fa5bd5fd3f9bee8d2bd7fefd0114dd60b6ae SHA512 7d20d8cbef85150a5ca7847467ddee3dbcd355af02c75991709f82e498c7d27703c0f24057e2df70fdc26195e7e5982c99221fbd4b415d22d63ca8ca657d5481
-EBUILD foomatic-db-4.0.20190226.ebuild 1222 BLAKE2B 3c3d2ef582643ffba2ebd023785d8b1fd3fc33c954b4be2ffb9e16f97a8496f9a194ed0bcf2b7b9148c7efb2040a9dc01e4bc1856ac87d38a1c9618bea6d982f SHA512 17a32e040c478b067844a151772fd3cc898a473fa6655553b55f665903c58bcdc9c54de089bb4521239bb4ce80fd6c713acd27d2c6ca52b4a3f3a5e3789d22e8
+EBUILD foomatic-db-4.0.20170331.ebuild 1197 BLAKE2B 5a4c3b830093508d5cc5e3b8bd5148a8f23ddaa17d1931c3b75c08adca75e340963d1bfc63d77f4f8f84c03350a9d34d971ed51a4e0f4218610aad736b1f8e69 SHA512 86b87d8885f04cfae38da784b18a3cccb8789c98f2827590279685b1d35479e377485a093afd40fac271723c5e2c328d76708c346d6166f23a69655fb07e0f87
+EBUILD foomatic-db-4.0.20180126.ebuild 1215 BLAKE2B 094a32b3ccdf5ccf1a4304cd281656f7e503d88337c0194cf4d4bb58594be07885cf0ae7d7ed9ed168ce7bfec9ba2d79051fd1b6a5c015b8f941d9b1f86af901 SHA512 d23fdebede97f924bc39f4cb68e38f1c0602ed9049374a2cfd2f0abf83fe9e0a84748b30902383a1f528a16ae0884c55127290acaac12f0c99301d3e746743c4
+EBUILD foomatic-db-4.0.20190226.ebuild 1212 BLAKE2B f719061c34a5de8171f5656c5a1c598afaa047c56742162da4765d622256ec70d36ede5143bca333393000bfd8b4f9ccb043857c3e098e7dc036f78d4e951639 SHA512 3562b04899e313ae43c33a55cce639908d88df3be9e7dabc0cdbe3684ed1b8d6fee44c1f88cc1710e6a9a9e6136368b27dacc863a28261783bdcb9dc644b3daf
 MISC metadata.xml 259 BLAKE2B 4a7248bc5a529d1cf3b51f8bcfff668a9e525df3e62584369d4b5526c89e70235378420b164073946ea91cf182065d9c8d2d46c8750d5f77855239b77ce45bae SHA512 7b1cbb90c1ddcf63b8802cfa3a53611f6367801b492c7677ef038738a337002c4606bcf93c5186abf808e74bca1fa76266169245acdb3b5997651bcabfecfa5c
diff --git a/net-print/foomatic-db/foomatic-db-4.0.20170331.ebuild b/net-print/foomatic-db/foomatic-db-4.0.20170331.ebuild
index 37b5cac7b924..7791e3e5d567 100644
--- a/net-print/foomatic-db/foomatic-db-4.0.20170331.ebuild
+++ b/net-print/foomatic-db/foomatic-db-4.0.20170331.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.openprinting.org/download/foomatic/${PN}-$(replace_version_s
 
 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=""
diff --git a/net-print/foomatic-db/foomatic-db-4.0.20180126.ebuild b/net-print/foomatic-db/foomatic-db-4.0.20180126.ebuild
index 1a475c50eb02..6f5d5933e67b 100644
--- a/net-print/foomatic-db/foomatic-db-4.0.20180126.ebuild
+++ b/net-print/foomatic-db/foomatic-db-4.0.20180126.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.openprinting.org/download/foomatic/${PN}-$(replace_version_s
 
 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=""
diff --git a/net-print/foomatic-db/foomatic-db-4.0.20190226.ebuild b/net-print/foomatic-db/foomatic-db-4.0.20190226.ebuild
index 0eb0def17b86..41b16804fffb 100644
--- a/net-print/foomatic-db/foomatic-db-4.0.20190226.ebuild
+++ b/net-print/foomatic-db/foomatic-db-4.0.20190226.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.openprinting.org/download/foomatic/${PN}-$(replace_version_s
 
 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=""
diff --git a/net-print/libgnomecups/Manifest b/net-print/libgnomecups/Manifest
index 7a56fa4340c0..c62dd0d70fdf 100644
--- a/net-print/libgnomecups/Manifest
+++ b/net-print/libgnomecups/Manifest
@@ -7,6 +7,6 @@ AUX libgnomecups-0.2.3-glib.h.patch 1017 BLAKE2B 1b3ffe7417f1fdfa617a214162efcd0
 AUX libgnomecups-0.2.3-lpoptions.patch 408 BLAKE2B 970583a14c8850d1e65feab9459a11f8b72e72d6d6aebabe6fac188158128a2e5c17cc1322e223bdf1757852b1b5b8d6996764bc87d9bb2412c782d1b9f9ffb8 SHA512 6d64b0b14dcce03a36a1c0b257e19c37e93778552f306ee312b019690fc35b64b0f1f5c1dc54c72ee85dad755b1facb607d5ef7914c6af01c4bcb86ad4628c85
 AUX libgnomecups-0.2.3-pkgconfig.patch 404 BLAKE2B 78c0107172cf057975dcc4f4c938c2ae990b022d1afaf87e7b0d8623987148d5d240970311fbea0a8c23734d1130bde4c8a05a094e17c8102bcb26f90a43d714 SHA512 2a3ea4921c01c01a55266deaf36d9ff2b0511592be1e58add93af398b9d0d92b21d8c3fe62446b09a939b46569997381a8e56435797625758a22b7d52914c3f8
 DIST libgnomecups-0.2.3.tar.bz2 357129 BLAKE2B 8a8babf0af7a83232590c5e756c4e1c2ce329dae59b88ee5be84c0286a6ed6d6c39f891b7ab0bb68bfc29539769cdd82032422c44a6131c4da9c9355669b1a57 SHA512 7276dfc92209c8503d8a59ceb192273e41bc13cc5f3515dcc00444deca4b9de6a29d0ec4c89811398e03971fa3f5ccbb85ca477da6c5f2bc26f2fb70dccb6a75
-EBUILD libgnomecups-0.2.3-r3.ebuild 1124 BLAKE2B 74eb11051371359822ea6bfa1d9785e8f48141c0a3f08adea711117b3d4d0d3f22bc85d7951aea1eb0166fb3dacef5d014c0ad04597ce8cc6c7068e4d309b4ca SHA512 312242157d210f826f7aa5959e5f1eaea7838f554c999cc20bc78be55a44103b88c575713d00b138b9080ec1cee9c0f23cbb2c5e7ebd407b75a70c4fe5679e32
-EBUILD libgnomecups-0.2.3-r5.ebuild 1669 BLAKE2B 8b8491de2dd9946f0bb5b0da49fd027ae725f603ea7263bffe264dcc082b46c34de44ed54b84fb82ec52ba1168b8a2326abff00c11dfd14090250a0d0e723f59 SHA512 43c3ac9eba4b83fed2208349c865c37a1ddd8f620d1d38b70ceffc61d6466c559907dcfe575369f46e1d96153cc4de7f01e73870b64dc24eb4dd4897411ebacc
+EBUILD libgnomecups-0.2.3-r3.ebuild 1102 BLAKE2B a08e1b3176bf650081e865fc58eecd45dcf8747d0875f2599933ab450f4d4ae844eb93d72ee97c6c50162dc88f923195f875c0e7d323221b59de5af718620c72 SHA512 1195a86149241448e7fefc5a82a22032e112d80be4c6be5f621e9ddaa7ecdd542f52fb65a4d93af1e957e3a33ecfeda66942d393c905cc6f38ff193752870cef
+EBUILD libgnomecups-0.2.3-r5.ebuild 1647 BLAKE2B 07e01e55fc1d42e8603bb4d7a2784b8d96971606c3b20f31cc4222dc96ff85b772a25684bc93da9a1e4dc36f83e9c884252418b24a26196f328f2949ec678f60 SHA512 cb64d950f31d255457243fd5846b6ee9c935fdcfba77cea1e072b55af8f7673f03e1a063f36883e90a28ff6a60b0798d66e822009f321c1486a7eab235b4be4f
 MISC metadata.xml 365 BLAKE2B a34fd100f946a0e9b31486a7fbf620e8b63495fbd2a24ac665435526bf980e23715a2b9b1b24b7e114e23c4f86c1a3c144c1d92e034464bb26b051ff39bfd53b SHA512 6696e110749820558c770f257f4f74d8d4a6fb617e9f74b7170e12a6c353a03a4fbfbc1c39f2247657f515079d541752da8f6f993d37464523ae5364f0e7c6e9
diff --git a/net-print/libgnomecups/libgnomecups-0.2.3-r3.ebuild b/net-print/libgnomecups/libgnomecups-0.2.3-r3.ebuild
index dcd57e766a8f..c13286456b88 100644
--- a/net-print/libgnomecups/libgnomecups-0.2.3-r3.ebuild
+++ b/net-print/libgnomecups/libgnomecups-0.2.3-r3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.gnome.org/"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/net-print/libgnomecups/libgnomecups-0.2.3-r5.ebuild b/net-print/libgnomecups/libgnomecups-0.2.3-r5.ebuild
index 8e2ff2f77e14..e95a8f2d6991 100644
--- a/net-print/libgnomecups/libgnomecups-0.2.3-r5.ebuild
+++ b/net-print/libgnomecups/libgnomecups-0.2.3-r5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.gnome.org/"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86"
 IUSE=""
 
 RDEPEND="