gentoo resync : 18.03.2018

9 files changed, 4 insertions, 145 deletions

diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 5aa89864305e..230abf59cd5a 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 86953e212652..f768a66736cb 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -5,7 +5,7 @@ DIST cups-filters-1.19.0.tar.xz 1465524 BLAKE2B 044ab5906f73a9405de55df953c76f7e
 DIST cups-filters-1.20.0.tar.xz 1465820 BLAKE2B 3ddc0ca7017776a8b69266dc7c19484626f0f6f70a44cefc9c6e1137a7c90123beb1e4d98e75906f5dfe156af01a7725ae8f1ce668f7194f07d4595f6cbba300 SHA512 b71722cc14f81cf8cbed5b8e980c9689adc2daf6cfa72e4174b6842bd89574090831f0e986b5e32a0e9fc4e29836f04e74e72c48918d7f3a8f65faa3a6c077af
 DIST cups-filters-1.20.1.tar.xz 1467060 BLAKE2B 1d7e8537376fa1d8a574ff90aa6474cf567d67172b796b44d7d144ac9df19c7b080ca5559c09d2fc2c0200c6698438d90e873d91706d792bcc86ee5adb88b1c0 SHA512 9c0fc3c821a24db99a55b0d5e1750946b294e3b265edae4d4701b4bb3ff9d0f19cb282ff44ec8880a0f643a2703ea3419b03d3d32a5e045d86a2d37031cef108
 EBUILD cups-filters-1.16.4.ebuild 3432 BLAKE2B 9733302bc404c6454ba652bd523f2a41ba0070eb605c8b4150056ed5ddbd6093bdd72871889fa030093c7426721e45580ef75671080655eb6ec2c89dcff2bf25 SHA512 4a69c596427cbca25b3549aeb2fa91733065f1fd7a30d236234633a9955998147614d53b2e7e8044c034f297b292a67d83ebdba603079223f4f8352b4d4c3049
-EBUILD cups-filters-1.17.9.ebuild 3496 BLAKE2B 6406d907dcf41fc06457d2a89372610248c9d708b10bc04baedcf69e46003b1fd4ab8508328b2350492f35ef5a99676e8540b84a88deebc38a6540817e22b826 SHA512 cbe654be0fac47e29aae6b3789a80d105cab8252dd66882e962acbd2b795d7e84cf168aa1fe524f97df8270e91879d1a69a942861c956359951b74cfb179e2dc
+EBUILD cups-filters-1.17.9.ebuild 3495 BLAKE2B 0354831007a19a9a5fc00152e52fec2d95a0b35adfb498278c3312cbcf00ecfc62f717e353e21085b1c55462ba81bb8aed9e60e8d439a5dbe9da9af838b2db92 SHA512 35391fc1cc809d8fbc2c7ba4944924244ea1f97bb14180532b30f841c2a6a8da3fc8e34def58417d11fc604821d010914d8f6462ce4fca69c44adcd754169d3e
 EBUILD cups-filters-1.19.0.ebuild 3504 BLAKE2B ceb5f203394fcb688acb1e80e520b14bcbe5a664f20725841d4fce9b70b31ea95746f737fbd3181979fe214836fd4c16c9bb9434999b1b8542ac750f806d20a4 SHA512 cbc2fed9c50d9773530fe806ed177220cd6daaabc1f1bfe0c360c75bc33a899a3c8893694798e5cac0413d84a67e3163c40f19852738b21b7d13bb2c770f589a
 EBUILD cups-filters-1.20.0.ebuild 3504 BLAKE2B ceb5f203394fcb688acb1e80e520b14bcbe5a664f20725841d4fce9b70b31ea95746f737fbd3181979fe214836fd4c16c9bb9434999b1b8542ac750f806d20a4 SHA512 cbc2fed9c50d9773530fe806ed177220cd6daaabc1f1bfe0c360c75bc33a899a3c8893694798e5cac0413d84a67e3163c40f19852738b21b7d13bb2c770f589a
 EBUILD cups-filters-1.20.1.ebuild 3504 BLAKE2B ceb5f203394fcb688acb1e80e520b14bcbe5a664f20725841d4fce9b70b31ea95746f737fbd3181979fe214836fd4c16c9bb9434999b1b8542ac750f806d20a4 SHA512 cbc2fed9c50d9773530fe806ed177220cd6daaabc1f1bfe0c360c75bc33a899a3c8893694798e5cac0413d84a67e3163c40f19852738b21b7d13bb2c770f589a
diff --git a/net-print/cups-filters/cups-filters-1.17.9.ebuild b/net-print/cups-filters/cups-filters-1.17.9.ebuild
index 96b4cecbf79c..2fbdff771bdc 100644
--- a/net-print/cups-filters/cups-filters-1.17.9.ebuild
+++ b/net-print/cups-filters/cups-filters-1.17.9.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 ~amd64-fbsd ~m68k-mint"
 fi
 DESCRIPTION="Cups filters"
 HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
diff --git a/net-print/libinklevel/Manifest b/net-print/libinklevel/Manifest
index 76b263e0dbe9..7c3e9769502a 100644
--- a/net-print/libinklevel/Manifest
+++ b/net-print/libinklevel/Manifest
@@ -1,10 +1,3 @@
-AUX libinklevel-0.8.0-automagicdebug.patch 671 BLAKE2B c3e8907390b2880916a45ccb67312db45280599e16f35486551633369d218dbb23dabb43fe80b89ea29bb09b082db1c4fa0c5fa08ac0ab8026848453c8eda9ca SHA512 1c3cc70e969dfa1cd574e27566a92f7dff82638256c5ac87f6eb6ba847666510f2616e54637a9cfd7a9a9c05ad9b4f279a0fd2c513e725d824f858cff1c298da
-DIST libinklevel-0.8.0.tar.gz 326397 BLAKE2B 470b8f12f14c453865f9b4cb6a642f65b5fcb8dcfec28b2208c961d5f456061137f92af1073b8c2544fedb81096c0de8ce0085ccce813a16819f802f622a3608 SHA512 bc521a97eafe0b0b73a907e522ef3af6ce404c5b8f44ddb3765ee7c388a67f93392a623c7987053e31411d7d9e247065463c2eeaa77e5fcd70c13b915c36d30e
-DIST libinklevel-0.9.0.tar.gz 367521 BLAKE2B 4e1ac21e5773fa1df5d9524ef322c34133d80f02170f70bd09c91a03ce767a123cb24e69ef0c73b19bb3754bdaf29da9564ef3129ce279b47208d9ad7d49c765 SHA512 23ff9a0f959aff953006a51d1bced235be57dee7bf4046147cdec85525b8d8003d3d3d22bd116b7a3adf3620b10002f736e0156968c78224bccab63505bc5b49
-DIST libinklevel-0.9.1.tar.gz 367651 BLAKE2B 5e82641391535e810a75c8837be5488170b16566d1e9ad09f68689697ef9ef738a94d665e8a4ad72d1c6aeffecf90ae55dc0198969377297e42bb498699fc6ee SHA512 c21ac2ed2949777dcca0f2258de8e0bf565b429b579d6b2c6c7bdb218935b9b7c88e891b240996c4c5274bb7bc8f5796bd9bb1f90b89d9b09580ab8fb9dd067a
 DIST libinklevel-0.9.2.tar.gz 367928 BLAKE2B f74af31529246668a0bc00c17b2ec1432532eb484b7efb230873e251c26b349ff26f4eb51f7f610198416964c090f60232f10e40f5170783cbe806cbcf849155 SHA512 127acaef2d2c09981b4da80e4d86a869c66f0f2f9733e139800bc944c159ddca42829499a97ecbb712b74c950bb28a4e22382c9c2a42d374bc5593f8802b6c59
-EBUILD libinklevel-0.8.0-r1.ebuild 870 BLAKE2B 6ca9c307edaa44c6cba01cdd56dcf7e82de97f9c4e9e45a6f657081ab1c73a790417e35ebff6203dabbd3468f32c0cc9099847f023c27e03e3e3d601ad22a1aa SHA512 95b0a044f1fe928a03e3504baf365837b5cb845811680d62400b4a10be1abfa1cdc5c05905f708e81a5488777e83c40b6a355c998517171996693f970d1c6eac
-EBUILD libinklevel-0.9.0.ebuild 842 BLAKE2B bb16e701377e7414f0f2d53eb92d13fb6ffb9af67058899c87b379346dfcd6f069b3370cac55877a59a68b1747e5dbd7040af82e73d8e7286eca183a0ff12405 SHA512 4ef23488bdd40f970e88ca717ddabb0771d9b46dc17dd0938d1ddab9b5364ae22ad7fee5bed58f3c70e779a9fea01d529b36de881597685a36962570f04ea200
-EBUILD libinklevel-0.9.1.ebuild 842 BLAKE2B bb16e701377e7414f0f2d53eb92d13fb6ffb9af67058899c87b379346dfcd6f069b3370cac55877a59a68b1747e5dbd7040af82e73d8e7286eca183a0ff12405 SHA512 4ef23488bdd40f970e88ca717ddabb0771d9b46dc17dd0938d1ddab9b5364ae22ad7fee5bed58f3c70e779a9fea01d529b36de881597685a36962570f04ea200
-EBUILD libinklevel-0.9.2.ebuild 841 BLAKE2B 6e9146628fa3c735dfcb7dcd12ff0021838f6955cad50337ca745d504413aa27697356a3d5b7c93d4ca404c935bde1e0fecb48d4663e9112c56c69cc16c0d74d SHA512 ddffca3f9e617d0ff37e32f0977001febfdabadd3e31efa19f9ba8c2f99ad9ba7ea66eaf8145615d72fc7864b5992eaf979d0420f207600eeecbb246320a405b
+EBUILD libinklevel-0.9.2.ebuild 840 BLAKE2B b6528ed140e2969716d02da1c39431068b2b57246476cad46f41c2c6af1d2744d101027ff79b2543556f6e5c8727a6cecee43ea2a2649caba44891ff826e797b SHA512 88b8d8c021462a68728614aa24117b3fc9cee6d8c847654c5a8b48a5ae02a2db3062f1a697cc0a35adcea37440b8b41cd47143f44b6a472434f8c97682d398fa
 MISC metadata.xml 340 BLAKE2B 806c842e37b146f940771d5e121a9ea618fbafa287a6bee402cce2c99b7d1ba4d834d19153de7685166cc4efcc7f538ea0b1980fa374f18b0898c0d12683cf9e SHA512 d801f16f230f2e7bd5173ea283205cf0666928a447edbc68221dda7f221c220d453cd3500af6d3577b12e898af713ae2843718848a941802a9ce84ecc5127dc8
diff --git a/net-print/libinklevel/files/libinklevel-0.8.0-automagicdebug.patch b/net-print/libinklevel/files/libinklevel-0.8.0-automagicdebug.patch
deleted file mode 100644
index 68af9e102f9d..000000000000
--- a/net-print/libinklevel/files/libinklevel-0.8.0-automagicdebug.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.in	2010-03-28 22:11:26.000000000 +0300
-+++ configure.in.fixed	2010-03-28 22:18:14.000000000 +0300
-@@ -16,9 +16,14 @@
- 
- ## Determine hostname & OS
- ## AC_CANONICAL_HOST
--
--AC_ARG_ENABLE([debug], [  --enable-debug	  enable debugging output], 
--	      AC_DEFINE(DEBUG, 1, [enable debugging output]))
-+AC_ARG_ENABLE(debug,
-+              [  --enable-debug         Enable debugging output if available (default=no)],
-+              [ case "${enableval}" in
-+             yes|"") enabled=yes; AC_DEFINE(DEBUG, 1, [enable debugging output]) ;;
-+             no) ;;
-+             *) ;;
-+    esac],
-+)
- 
- ## Check for programs
- ## we want libtool to build our libs
diff --git a/net-print/libinklevel/libinklevel-0.8.0-r1.ebuild b/net-print/libinklevel/libinklevel-0.8.0-r1.ebuild
deleted file mode 100644
index d220441aa0ea..000000000000
--- a/net-print/libinklevel/libinklevel-0.8.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit autotools eutils
-
-MY_P="${P/_/}"
-DESCRIPTION="A library to get the ink level of your printer"
-HOMEPAGE="http://libinklevel.sourceforge.net/"
-SRC_URI="mirror://sourceforge/libinklevel/${MY_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-LICENSE="GPL-2"
-IUSE="debug"
-
-DEPEND=">=sys-libs/libieee1284-0.2.11"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-automagicdebug.patch
-	sed -i -e "/^dist_doc_DATA/d" Makefile.am \
-		|| die "Failed to disable installation of docs"
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable debug)
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
-	rm "${D}"/usr/lib/libinklevel.la
-}
diff --git a/net-print/libinklevel/libinklevel-0.9.0.ebuild b/net-print/libinklevel/libinklevel-0.9.0.ebuild
deleted file mode 100644
index 4d84a588e9cf..000000000000
--- a/net-print/libinklevel/libinklevel-0.9.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils multilib
-
-MY_P="${P/_/}"
-DESCRIPTION="A library to get the ink level of your printer"
-HOMEPAGE="http://libinklevel.sourceforge.net/"
-SRC_URI="mirror://sourceforge/libinklevel/${MY_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-LICENSE="GPL-2"
-IUSE="debug static-libs"
-
-DEPEND=">=sys-libs/libieee1284-0.2.11
-	virtual/libusb:1"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i -e "/^dist_doc_DATA/d" Makefile.am \
-		|| die "Failed to disable installation of docs"
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable debug)
-}
-
-src_install () {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog NEWS README
-	use static-libs || rm "${D}"/usr/$(get_libdir)/libinklevel.{a,la}
-}
diff --git a/net-print/libinklevel/libinklevel-0.9.1.ebuild b/net-print/libinklevel/libinklevel-0.9.1.ebuild
deleted file mode 100644
index 4d84a588e9cf..000000000000
--- a/net-print/libinklevel/libinklevel-0.9.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils multilib
-
-MY_P="${P/_/}"
-DESCRIPTION="A library to get the ink level of your printer"
-HOMEPAGE="http://libinklevel.sourceforge.net/"
-SRC_URI="mirror://sourceforge/libinklevel/${MY_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-LICENSE="GPL-2"
-IUSE="debug static-libs"
-
-DEPEND=">=sys-libs/libieee1284-0.2.11
-	virtual/libusb:1"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i -e "/^dist_doc_DATA/d" Makefile.am \
-		|| die "Failed to disable installation of docs"
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable debug)
-}
-
-src_install () {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog NEWS README
-	use static-libs || rm "${D}"/usr/$(get_libdir)/libinklevel.{a,la}
-}
diff --git a/net-print/libinklevel/libinklevel-0.9.2.ebuild b/net-print/libinklevel/libinklevel-0.9.2.ebuild
index e6fbf0aac6b2..ee8d9fc6e867 100644
--- a/net-print/libinklevel/libinklevel-0.9.2.ebuild
+++ b/net-print/libinklevel/libinklevel-0.9.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://libinklevel.sourceforge.net/"
 SRC_URI="mirror://sourceforge/libinklevel/${MY_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 LICENSE="GPL-2"
 IUSE="debug static-libs"