gentoo resync : 04.08.2018

5 files changed, 3 insertions, 273 deletions

diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 31c09f0bd3bb..e37889ef0f32 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/hplip-plugin/Manifest b/net-print/hplip-plugin/Manifest
index 69a77851f227..cb91b205574e 100644
--- a/net-print/hplip-plugin/Manifest
+++ b/net-print/hplip-plugin/Manifest
@@ -1,5 +1,5 @@
 DIST hplip-3.17.10-plugin.run 2062947 BLAKE2B 86f15193a751794eb64acfbaf1b42151c34336603d4d592cc84a375ccca4e7be4177d3dda76fc153ac0a6898eff24174df43256450cd81ae8ad4d4f6abd69ade SHA512 98eef413b122527c4a7860b621baf11c04ec9d7f4e43ce4f36e7822a633c64b3d98cbc86cd7d305c74d9a49a4159ebd7280d652e1ba430cad4cc70f66d23ee07
-DIST hplip-3.18.5-plugin.run 2065554 BLAKE2B af0acfbde9c5c3ff92437c86739dac339e91f7d4e1552bad46b3e3a4831317b3ddd3b18375bc8ed4e2340d7b039f11b2bf2b48145ba02b59c876c28fc51842de SHA512 5fd105f15dcc5f47948090c3cb32a2b7db5abc81d10a33e76b4274be407d56c2ff6d6a877f1931ed8a1fa01e7b109a65424fe9de7a6cb5f7eb5f968a10f4721c
+DIST hplip-3.18.6-plugin.run 2065663 BLAKE2B 501a37dd504250225ddad9712259e0e1b564aa034e433f24d277c5609fa95580417da1a0ae040a4624ff48806a3b34ec56ff31aed843e9f0f0b68b304d2ebd9e SHA512 7b5eb2f43dd014df25ccd9e72dd7efc069db47921f2de650b2ff993dbee60056063edeee6593be7d35019212daf623fff9696b13508a808db92128f5c81bde76
 EBUILD hplip-plugin-3.17.10.ebuild 1545 BLAKE2B 31f321fa6f038a90c5f2487b9d6242d7fea58fe9cf6af69ac8dc2eabd3788d09e57ab325737ca71ea5e7b26a686c83bb39448d3bba71f47500c16f2aae855d6c SHA512 e9c19899a37e95c2a61cf432e0c2557dbe8a8ff302da5f39475f97c89d362ab0da51a28818f457633c7d1b2a782703349d798d0e9526f2ef31346f39ed77a6cf
-EBUILD hplip-plugin-3.18.5.ebuild 1553 BLAKE2B 79d9f5f3892dd3f1f08a5c6111bd336fd5b95d1457c52cf46c8349950e83fc26daead599d039acc5aee24bec931a311e8a1af7d97061cf2b5b564b90194fd67a SHA512 bf2563690e81384e8c521e08234966af3332324e4cb892bb320fdc8017ecf3182b9496d2e2fe09f767054f80511b27bbfef2af3094f7afd7ad36500dfb2a3b52
+EBUILD hplip-plugin-3.18.6.ebuild 1551 BLAKE2B d034eacc21cb423a79ccd668d322d40f23aed57392d75aa75b10f3f90f634d96510e5e87c485b04bca566cfdc7bb59056f75a13493e90e92ad4ea13ffe4198f8 SHA512 6ed4f208ec25a1805ed377749d9232ed59f890eaedcdbc1f58fa6c2b41eb77ea52d8dad9f7beec5ad8b156eac22384956faddf458562febf7e20ed1b88bff356
 MISC metadata.xml 334 BLAKE2B 8f1a0784c57af6204db98f443bdb09df2a6432674d711a5ecf577c20e29f04a030549ea19c6e04f51cd9a36e60a6da94bebafbfcc10d52da87109e59c32d42ee SHA512 105a5442ba05b94b2886f9075bd89268d4f2e0567ad69a637a1bd7d7d0eafdc280dfdb198aab5d72525300a9be0d4ad78f6bfe6398c896cc9de0f591651d102c
diff --git a/net-print/hplip-plugin/hplip-plugin-3.18.5.ebuild b/net-print/hplip-plugin/hplip-plugin-3.18.6.ebuild
index 906e4c9f061b..afbacbc8fbc3 100644
--- a/net-print/hplip-plugin/hplip-plugin-3.18.5.ebuild
+++ b/net-print/hplip-plugin/hplip-plugin-3.18.6.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=6
 
 inherit udev unpacker
 
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 4d2e9c10fa3a..d538dbc9519e 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,9 +1,7 @@
 DIST hplip-3.17.10.tar.gz 23878364 BLAKE2B 0165bcb00159572a16277624db0de4b2ca8421d5cf42418bf406548dd68a7d5087142a74a0e6ca332936b006f6ffeaa4d9202c5332fd1f971923bb142adb244f SHA512 0c1c78730d269ec41f95bbde887a490aebb4c9c3dcb9784052a1c3b537c12093cbc426e1f79266c63dd5e7adecdda0735b9bf964ddc1307b2c6603f3fa0462a8
 DIST hplip-3.17.9-patches-1.tar.xz 8484 BLAKE2B 3a1f25d0554af5597266eb5ed3ff9f594560671784a89ade6246e9287661bf17fa16c555391c3f685e59aec8c548560911065a9c4188906c2f00c755f503fe49 SHA512 125f9cfd1c3cad662ce33954b8ab9ab1898368b449c4ad78dfe99f29de8025183773272b9865cd22b976a30c502e38254ce0ac59d685299dff7f9314927d546a
 DIST hplip-3.18.3-patches-2.tar.xz 8936 BLAKE2B 58c17f3b6332de1edd88a3b458f1e9f856bc917842f62eee0808469ec14ff5793cd33c7a2ba30593eba624e58c12a6d426fa43a7d375d6ac50b985b895a85b4c SHA512 cbafcd9616f9c86318007b703325d3429ed0698c3fc9d3eddd422e4cd7a16c77320ac168bfa01b5874213e1740cfaae1867d31c3cf96cd57573ad33651a674ed
-DIST hplip-3.18.5.tar.gz 22437406 BLAKE2B d32c38209b8a60c6ca7fe89512409d4d32bf095097cdc499a1afeb985c9add2da5e99b12b307f1cf0c4513071f2d4b62291d7624fe982579e8781ace5f533f6a SHA512 2c99bb446af604a2f011f9dd5ddf4bf5019b7cd36a0ecb1cbe6dce0c0358b8472a695ad85d09e52c3e63de8a69e2a3e7081c61ec36f44aae2770b5fef0f67516
 DIST hplip-3.18.6.tar.gz 22590564 BLAKE2B edbc80120bb332de9848e528095839b8f3496404ae83482a17bb8bd196c30dd8d3fca4d3dbb60c048bfbeeddd4384b4d7844798dad993eaf52d5418a9391b4ad SHA512 deb4e6e1c7e9ea7452967f7d7d7fd93e92eb59406b4978bb9b874db93bc5022b25aab012a7420ac3e991259032bc7cb749cd924c93a164544e29a4152962184f
 EBUILD hplip-3.17.10.ebuild 7417 BLAKE2B 6a79d111d6b6c19a2b18b3d0995ba56828ed64f47fc9ce2098916303dd4c239f51dec295852a9a850dd93eb5e80f7421f35165585caecebd710e1175ff3deeb9 SHA512 855943629bf3dd0fdd85013e71b00fe40ea7414403cc3b761f93f63f7c4a7f2deab8f3d464c724ea1f585317ded9d855b99411d54872d96005241981aa6fc54a
-EBUILD hplip-3.18.5.ebuild 7822 BLAKE2B d2d2f630089de97c290d9573657f581daa6867b26a012a1952c438c6dc121bf69a97fab22321ccee25d9734217870a2a108f4c970bba1581159bfb37e4a48766 SHA512 0f0c743f6c749b9f1b6de5fe284c95cf1a6e97ef9533ae62df615224ce562994e09e8c3a41b04771217b77a16c84a6c0af67725016a07b07757b9b48b7d6b319
 EBUILD hplip-3.18.6.ebuild 7819 BLAKE2B 396e6a2796b80ba1dca1f8d80a4fd1c88a6e7d55c00a78f4c581aa92af71152e991d2f6636b08fdd2af9cee300b22d3b22e7613d75effa36d7e85aae188bd0c3 SHA512 6bed14047d5807fbadf923c473991bb91c00cb576a61f26fc192f6f76ef672dc923acafbb7ab854b23b3b8d458317e87c720095c40e40cdbe25af7ec19b6368a
 MISC metadata.xml 1767 BLAKE2B 67ab6b778637b42f5849699aa506c48844ea510a6528c2e62e54164a1d4502def06f0461bb79e9ea525b09026b502039719dfb42d9168738822e4fd588989196 SHA512 eab26de132a410104ad260bf09962702fdc0c554261511264d4d95375a7afa07fa5b902115e4a500d5371e54f483c6f655f6d0c1fbc387e46f10e98d20b842b3
diff --git a/net-print/hplip/hplip-3.18.5.ebuild b/net-print/hplip/hplip-3.18.5.ebuild
deleted file mode 100644
index 00309e5ab471..000000000000
--- a/net-print/hplip/hplip-3.18.5.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_REQ_USE="threads,xml"
-
-# 14 and 15 spit out a lot of warnings about subdirs
-WANT_AUTOMAKE="1.13"
-
-inherit autotools linux-info python-single-r1 readme.gentoo-r1 udev
-
-DESCRIPTION="HP Linux Imaging and Printing - Print, scan, fax drivers and service tools"
-HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing"
-SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
-		https://dev.gentoo.org/~billie/distfiles/${PN}-3.18.3-patches-2.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-
-IUSE="doc fax +hpcups hpijs kde libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
-
-# dependency on dev-python/notify-python dropped due to python 3 incompatibility
-# possible replacement notify2 (https://pypi.org/project/notify2/0.3) not in tree
-
-COMMON_DEPEND="
-	net-print/cups
-	virtual/jpeg:0
-	hpijs? ( net-print/cups-filters[foomatic] )
-	!minimal? (
-		${PYTHON_DEPS}
-		sys-apps/dbus
-		!libusb0? ( virtual/libusb:1 )
-		libusb0? ( virtual/libusb:0 )
-		scanner? ( media-gfx/sane-backends )
-		snmp? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:= )
-			net-analyzer/net-snmp
-		)
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	app-text/ghostscript-gpl
-	!minimal? (
-		>=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_USEDEP}]' 'python2*')
-		$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' 'python3*')
-		fax? ( dev-python/reportlab[${PYTHON_USEDEP}] )
-		kernel_linux? ( virtual/udev )
-		qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_USEDEP}] )
-		scanner? (
-			>=dev-python/reportlab-3.2[${PYTHON_USEDEP}]
-			>=dev-python/pillow-3.1.1[${PYTHON_USEDEP}]
-			X? ( || (
-				kde? ( kde-misc/skanlite )
-				media-gfx/xsane
-				media-gfx/sane-frontends
-			) )
-		)
-	)
-	policykit? ( sys-auth/polkit )
-"
-
-REQUIRED_USE="!minimal? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${WORKDIR}/patches"
-)
-
-CONFIG_CHECK="~PARPORT ~PPDEV"
-ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
-
-#DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-For more information on setting up your printer please take
-a look at the hplip section of the gentoo printing guide:
-https://wiki.gentoo.org/wiki/Printing
-
-Any user who wants to print must be in the lp group.
-"
-
-pkg_setup() {
-	use !minimal && python-single-r1_pkg_setup
-
-	use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
-
-	if ! use hpcups && ! use hpijs ; then
-		ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver,"
-		ewarn "which is probably not what you want."
-		ewarn "You will almost certainly not be able to print."
-	fi
-
-	if use minimal ; then
-		ewarn "Installing driver portions only, make sure you know what you are doing."
-		ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver"
-		ewarn "is installed. If both USE flags are set hpijs overrides hpcups."
-	else
-		use parport && linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-
-	if use !minimal ; then
-		python_export EPYTHON PYTHON
-		python_fix_shebang .
-	fi
-
-	# Make desktop files follow the specification
-	# Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=443680
-	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/1080324
-	sed -i -e '/^Categories=/s/Application;//' \
-		-e '/^Encoding=.*/d' hplip.desktop.in || die
-	sed -i -e '/^Categories=/s/Application;//' \
-		-e '/^Version=.*/d' \
-		-e '/^Comment=.*/d' hplip-systray.desktop.in || die
-
-	# Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725
-	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847,
-	# https://bugs.launchpad.net/hplip/+bug/500086
-	local udevdir=$(get_udevdir)
-	sed -i -e "s|/etc/udev|${udevdir}|g" \
-		$(find . -type f -exec grep -l /etc/udev {} +) || die
-
-	# Force recognition of Gentoo distro by hp-check
-	sed -i \
-		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
-		installer/core_install.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf drv_build minimal_build
-
-	if use libusb0 ; then
-		myconf="${myconf} --enable-libusb01_build"
-	else
-		myconf="${myconf} --disable-libusb01_build"
-	fi
-
-	if use hpcups ; then
-		drv_build="$(use_enable hpcups hpcups-install)"
-		if use static-ppds ; then
-			drv_build="${drv_build} --enable-cups-ppd-install"
-			drv_build="${drv_build} --disable-cups-drv-install"
-		else
-			drv_build="${drv_build} --enable-cups-drv-install"
-			drv_build="${drv_build} --disable-cups-ppd-install"
-		fi
-	else
-		drv_build="--disable-hpcups-install"
-		drv_build="${drv_build} --disable-cups-drv-install"
-		drv_build="${drv_build} --disable-cups-ppd-install"
-	fi
-
-	if use hpijs ; then
-		drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
-		if use static-ppds ; then
-			drv_build="${drv_build} --enable-foomatic-ppd-install"
-			drv_build="${drv_build} --disable-foomatic-drv-install"
-		else
-			drv_build="${drv_build} --enable-foomatic-drv-install"
-			drv_build="${drv_build} --disable-foomatic-ppd-install"
-		fi
-	else
-		drv_build="${drv_build} --disable-hpijs-install"
-		drv_build="${drv_build} --disable-foomatic-drv-install"
-		drv_build="${drv_build} --disable-foomatic-ppd-install"
-	fi
-
-	if use minimal ; then
-		if use hpijs ; then
-			minimal_build="--enable-hpijs-only-build"
-		else
-			minimal_build="--disable-hpijs-only-build"
-		fi
-		if use hpcups ; then
-			minimal_build="${minimal_build} --enable-hpcups-only-build"
-		else
-			minimal_build="${minimal_build} --disable-hpcups-only-build"
-		fi
-	fi
-
-	# disable class driver for now
-	econf \
-		--disable-cups11-build \
-		--disable-lite-build \
-		--disable-foomatic-rip-hplip-install \
-		--disable-shadow-build \
-		--disable-qt3 \
-		--disable-qt4 \
-		--disable-udev_sysfs_rules \
-		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
-		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
-		--with-docdir=/usr/share/doc/${PF} \
-		--with-htmldir=/usr/share/doc/${PF}/html \
-		${myconf} \
-		${drv_build} \
-		${minimal_build} \
-		--enable-hpps-install \
-		--disable-class-driver \
-		$(use_enable doc doc-build) \
-		$(use_enable fax fax-build) \
-		$(use_enable !minimal gui-build) \
-		$(use_enable !minimal dbus-build) \
-		$(use_enable parport pp-build) \
-		$(use_enable policykit) \
-		$(use_enable qt5) \
-		$(use_enable scanner scan-build) \
-		$(use_enable snmp network-build)
-
-	# hpijs ppds are created at configure time but are not installed (3.17.11)
-
-	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
-	# The hpcups driver does not use foomatic-rip
-	#local i
-	#for i in ppd/hpijs/*.ppd.gz ; do
-	#	rm -f ${i}.temp || die
-	#	gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
-	#		gzip > ${i}.temp || die
-	#	mv ${i}.temp ${i} || die
-	#done
-}
-
-src_install() {
-	# Disable parallel install
-	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=578018
-	emake -j1 DESTDIR="${D}" install
-	einstalldocs
-	# default
-
-	# Installed by sane-backends
-	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=201023
-	rm -f "${ED%/}"/etc/sane.d/dll.conf || die
-
-	# Remove desktop and autostart files
-	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=638770
-	use qt5 || {
-		rm -Rf "${ED}"/usr/share/applications "${ED}"/etc/xdg
-	}
-
-	rm -f "${ED%/}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
-	rmdir --ignore-fail-on-non-empty "${ED%/}"/usr/share/doc/${PF}/ || die
-
-	# Remove hal fdi files
-	rm -rf "${ED%/}"/usr/share/hal || die
-
-	find "${D}" -name '*.la' -delete || die
-
-	if use !minimal ; then
-		python_export EPYTHON PYTHON
-		python_optimize "${ED%/}"/usr/share/hplip
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}