gentoo resync : 22.04.2018

4 files changed, 26 insertions, 18 deletions

diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 628f9289c350..7ddafce9ac33 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,8 +1,9 @@
 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-1.tar.xz 8752 BLAKE2B 140dd3490b8a06be1c64755ce927320c4620fd8407f9a0fd7051e03f6be5ff5838b4f177abe3664d4cf46ef7700c73adaa5823584538d03f84832b6aca5e94db SHA512 f842233fde24a430ef3cc222b74cdec6355301e7a3f8b72b19c57d70e18636d18bd689274e632d9950f7ad2d95d6860ac8aeab3272b0f5d0f4c650d1f21426b6
+DIST hplip-3.18.3-patches-2.tar.xz 8936 BLAKE2B 58c17f3b6332de1edd88a3b458f1e9f856bc917842f62eee0808469ec14ff5793cd33c7a2ba30593eba624e58c12a6d426fa43a7d375d6ac50b985b895a85b4c SHA512 cbafcd9616f9c86318007b703325d3429ed0698c3fc9d3eddd422e4cd7a16c77320ac168bfa01b5874213e1740cfaae1867d31c3cf96cd57573ad33651a674ed
 DIST hplip-3.18.3.tar.gz 22178733 BLAKE2B 2d5c30d884cd04314ef3727e88abd1a2621e39916c0fa9a558e72ed2d040a5d11847cd82237da33efccd41b23eeb0fad69c84b36fbb736af3def4aa60f00ba71 SHA512 cb51e357cc9def3c087231b01752941b469e5fc4508ec83c6f5875352694249ef72339f2f20c4a6831c49ace7c1f6b902cc11a961c0e1f43ce098b2bf800728f
-EBUILD hplip-3.17.10-r1.ebuild 7600 BLAKE2B f0d7271fb88916af700a9ab29eba97e79dbc15f4d1880f32aebaa45793f9c89f87f6f3fd85553f39418d282ab85873cd310df2a8adcf83f7c8f33a08caba9bf0 SHA512 c2843ca389afc1c7a4b89a70eb7512f53a4114b4bf4a51c3d25ee7a0653d9e17b5477c0061b67e40baf807bfea5f967b2647e58b9fc0350e64f3deaa394d7ad9
-EBUILD hplip-3.17.10.ebuild 7421 BLAKE2B c708481459926b833aa3d414c3470f0fd3ae58bdb7b844e54c737152ca2c32d10cf7cb33e6bfc6387be52b8d3a0ee37fb5100a5f8bd6d784a88fe45685b061be SHA512 9ab8ffba42b528f8a85d0c10bd97bc867f9e8364c1646dad9346d1a8aa68f2c35bd1a18a35960bc9982d9ef7030393962d17b4faeec335de5253cdaf846f4214
-EBUILD hplip-3.18.3.ebuild 7818 BLAKE2B 5189de5cce50bc1af70af3c8601177aaacf6b8b6f3da75b17c056f25d22bac348b2844e79835a5c968c77eb276a906b264418ab0aee6a0d03f7e7700bf356d21 SHA512 4fc6c618afb6de1fcb254a2ab9ba6c371020f75d43512e2dbad770dfdceeeaf5c8cb7892fb08c8c72b8f96b10b7bb015b06b4efedfcb4849ae1b7ea6eaf993bd
+EBUILD hplip-3.17.10.ebuild 7417 BLAKE2B 6a79d111d6b6c19a2b18b3d0995ba56828ed64f47fc9ce2098916303dd4c239f51dec295852a9a850dd93eb5e80f7421f35165585caecebd710e1175ff3deeb9 SHA512 855943629bf3dd0fdd85013e71b00fe40ea7414403cc3b761f93f63f7c4a7f2deab8f3d464c724ea1f585317ded9d855b99411d54872d96005241981aa6fc54a
+EBUILD hplip-3.18.3-r1.ebuild 7814 BLAKE2B 83aa08ceb21bebb3c9cf535412bf1a593e9c8a74df51650da0416aa0b167bf9f0e2e7a4ff5869b983eb2281211b142d6e3b5e8123f4f3c23b3e8d2047c54be78 SHA512 9cc2d3f80e12b16061cd439a08e5373860b1ca7e934e8c6a72f0b595dab52751ebf6bd6849a287a8c2632031e99b92281ec211bb88850bb58ea47e7bb11cd5b0
+EBUILD hplip-3.18.3.ebuild 7814 BLAKE2B 4941882e1ff69c2a5f7b856ad67c3018387a6959cf40730c2e56ae19ed53d67d576e139b853ab04f4e418d5d9ecc16adf5a4b317c6e40ce5b4c31d960b8668fd SHA512 bb3f52ce2f5c8532f80a0d12de4129d57b5706ea135a8a0b30216f3e5f6853fc52ea0d69e66358edc6bf19a6dfba91e76fe5e60e096affbc8aea8b85c27f2e79
 MISC metadata.xml 1767 BLAKE2B 67ab6b778637b42f5849699aa506c48844ea510a6528c2e62e54164a1d4502def06f0461bb79e9ea525b09026b502039719dfb42d9168738822e4fd588989196 SHA512 eab26de132a410104ad260bf09962702fdc0c554261511264d4d95375a7afa07fa5b902115e4a500d5371e54f483c6f655f6d0c1fbc387e46f10e98d20b842b3
diff --git a/net-print/hplip/hplip-3.17.10.ebuild b/net-print/hplip/hplip-3.17.10.ebuild
index ad761f8e3012..f54e6aae145d 100644
--- a/net-print/hplip/hplip-3.17.10.ebuild
+++ b/net-print/hplip/hplip-3.17.10.ebuild
@@ -20,7 +20,7 @@ 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.python.org/pypi/notify2/0.3) not in tree
+# possible replacement notify2 (https://pypi.org/project/notify2/0.3) not in tree
 
 COMMON_DEPEND="
 	net-print/cups
diff --git a/net-print/hplip/hplip-3.17.10-r1.ebuild b/net-print/hplip/hplip-3.18.3-r1.ebuild
index b9500be12bd2..c1bd7d6cc228 100644
--- a/net-print/hplip/hplip-3.17.10-r1.ebuild
+++ b/net-print/hplip/hplip-3.18.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,12 +6,15 @@ 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="http://hplipopensource.com/hplip-web/index.html"
 SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
-		https://dev.gentoo.org/~billie/distfiles/${PN}-3.17.9-patches-1.tar.xz"
+		https://dev.gentoo.org/~billie/distfiles/${PN}-3.18.3-patches-2.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -20,7 +23,7 @@ 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.python.org/pypi/notify2/0.3) not in tree
+# possible replacement notify2 (https://pypi.org/project/notify2/0.3) not in tree
 
 COMMON_DEPEND="
 	net-print/cups
@@ -131,16 +134,6 @@ src_prepare() {
 		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
 		installer/core_install.py || die
 
-	# 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
-
 	eautoreconf
 }
 
@@ -196,6 +189,7 @@ src_configure() {
 		fi
 	fi
 
+	# disable class driver for now
 	econf \
 		--disable-cups11-build \
 		--disable-lite-build \
@@ -212,6 +206,7 @@ src_configure() {
 		${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) \
@@ -221,6 +216,18 @@ src_configure() {
 		$(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() {
diff --git a/net-print/hplip/hplip-3.18.3.ebuild b/net-print/hplip/hplip-3.18.3.ebuild
index fe86e7d5b572..7a03206eac1d 100644
--- a/net-print/hplip/hplip-3.18.3.ebuild
+++ b/net-print/hplip/hplip-3.18.3.ebuild
@@ -23,7 +23,7 @@ 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.python.org/pypi/notify2/0.3) not in tree
+# possible replacement notify2 (https://pypi.org/project/notify2/0.3) not in tree
 
 COMMON_DEPEND="
 	net-print/cups