gentoo resync : 25.11.2020

5 files changed, 33 insertions, 49 deletions

diff --git a/net-print/dymo-cups-drivers/Manifest b/net-print/dymo-cups-drivers/Manifest
index 5dcae1d9c18b..39c5921df795 100644
--- a/net-print/dymo-cups-drivers/Manifest
+++ b/net-print/dymo-cups-drivers/Manifest
@@ -1,7 +1,7 @@
+AUX cups-2.3.0-headers.patch 818 BLAKE2B 9a72c21c1de12b9238585dbf830bf6c76ed089de1845d879305f0e2213dde40e7642304d7712899fce10ec79a330706bc40f80cf0aadfc9dccfd60f2f7e5f7f9 SHA512 eb47e5fb4e0bfc6f6500e1b12d36cea219274b19ae57050da3ef0c438bdfbb7ffc4f0e49b2b618e28664a9bf0318db3affe67fa36ad1103ceae57f785478923e
 AUX dymo-cups-drivers-1.2.0-cxxflags.patch 601 BLAKE2B f34dddaf64e3336744bf5493b12cfeaa45a613e7e92ad2d1957f587e72e47c74d0d20d25a702168d05b373fed7ec602049b947464b357eadfaad73e1df5eb92f SHA512 b0cee2a0bb4664a797b921f6b9bc41b16417ec693683fab548c549bd2681f97627f3b6c3734efc3d15f1843cc08ed43d73f50012e73006dc900937b0e7fbf979
 AUX dymo-cups-drivers-1.4.0.5-flexible-tests.patch 426 BLAKE2B 4a4cab04846ad26e97f9af9d8b3c1c9abae9cf8257e25af8f9f77c7ad74f96f2ee2a8702f2a2756a04a328e0a73afa8a48da452a2c7cb07fcfce83a98180036a SHA512 3188ed2e07156cbbda377476532b62b39c14a1b94004d50bba6624b63ffb75b97edf4c4b0714e015a192fda45ffd3762b67edce14c5e244e81279c78fd1233f2
 AUX port_to_newer_cups_headers.patch 2222 BLAKE2B e5e27e9e8cdc16a1e9a6b85b4759c0b71bf977528775513cb75514900d6c53d27f5bb148a3b6fdb6857b065f45bbbbb7a3532a983e58d3dc7e1163fee0de916e SHA512 55398c498e41a5ce106756f51bbd6dbfc4d7602eeb001e4d1bd104b91c8607ae36a1719eba2a2c9e1124493d5b743370b379b05b093b88cbf9346b8931bf976a
 DIST dymo-cups-drivers-1.4.0.tar.gz 420068 BLAKE2B 586b1d044ea0bb499790b8955a1b7341eaeae92f5c56f0f1d5edb1ebaaa545bdf27371cbe783ac906ddf23946ab757bbaeb0567dabafdc5fd23df2548056383a SHA512 e8c375fa0bc87fa96b18db6213e308a1f32050004c0c8c7d516b548f9d369162431f5f56ebcbb1231be60f5d7a946dcca184c6ff4302952bf3744ba42521cd5c
-EBUILD dymo-cups-drivers-1.4.0-r1.ebuild 1596 BLAKE2B ecd383750f2d5a204d8d0f688de57e54a90db1bba3110900b81647664d62390a01faae3fb540f05c808b7f5870107ca11ed694c4b4b20bc1ec64e5efbdc286ff SHA512 ee12781df59ddb4d2c08f2360096d92c8102b6cf2d385cd214287de4a323119d1321614a5045f5e8bfa70c2cb33c2923343b8c26ccfaeb53882b50e29977c615
-EBUILD dymo-cups-drivers-1.4.0.ebuild 834 BLAKE2B f7550d5f148a959ccb526783bd4696a3949732c4fe7765f6d76b1032daf8f5efc3347b54fff93b5f95851d257ecd9ea728b5e4a9ff9ad0a09567780f0c2b41fa SHA512 3421eeba6021798c3da43037e672f523b1382d91c28e5347adfea62c999ae80b47174f2ea2e3e9d770bc2f4f6c384dcdb91b71395d373fff5734198addd9acbd
-MISC metadata.xml 412 BLAKE2B a5c13d60ae5fdaffa75cb13ec0c1a0e1098a833443326b4b3cf8ef0587377c77ccbb950a98e67ae9c1a8457b80ceedf262f466ce87f95c47577ffade2e61c3bb SHA512 9c907b28318e22a9c72e4fdb00bc9d13d6e30bffcbc3116a441bb2388d9dcbb9ce82df68cd3c413c98d27e8408836fd7e4dfb678be99c133042e94a740f6195e
+EBUILD dymo-cups-drivers-1.4.0-r2.ebuild 1613 BLAKE2B 422e6be44cb749d514ec3e17252ef378b931c52b1695616054924670d52f3b57d8af9d7cce2893c1c4711824fd0b94a7208643f323fee1e0c6e02f114b8777ed SHA512 e7a39e82879e85c00b1d7a7e96fcf16e20f16c88e3ad37d8c8abbb9a5b3c68be35a354cf2bde6b8466f7724fa15257cfc78b90ba31ebaf9cd7f0922b3b4b2359
+MISC metadata.xml 412 BLAKE2B 91e6f9f9856afab076505387b5f5ed7b2672961ae7fa4e63f1d34a6c460483d4249f215a67da6233eef92f87da2a279ba53b95e11dba92351e84a36e702e24b7 SHA512 86a3278589e19f311ad3b4b4cf3c4d3c5ea4bbd9099216c3ef86d5399bcf6341deeb17d9f6e7f8b5c4be48ba9f3bd59fc4dde671526aee09100094a2ccd4cc4b
diff --git a/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0-r1.ebuild b/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0-r2.ebuild
index f5dba4224b3f..4f15dfb3ac98 100644
--- a/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0-r1.ebuild
+++ b/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0-r2.ebuild
@@ -12,20 +12,21 @@ S="${WORKDIR}/${P}.5"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="test usb_modeswitch"
+IUSE="test usb-modeswitch"
 RESTRICT="!test? ( test )"
 
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="net-print/cups"
+RDEPEND=">=net-print/cups-2.3.0"
 DEPEND="${RDEPEND}
 	test? ( dev-util/cppunit )
-	usb_modeswitch? ( sys-apps/usb_modeswitch )"
+	usb-modeswitch? ( sys-apps/usb_modeswitch )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.2.0-cxxflags.patch
 	"${FILESDIR}"/port_to_newer_cups_headers.patch
 	"${FILESDIR}"/dymo-cups-drivers-1.4.0.5-flexible-tests.patch
+	"${FILESDIR}"/cups-2.3.0-headers.patch
 )
 
 DOCS=( AUTHORS README ChangeLog docs/SAMPLES )
@@ -38,9 +39,7 @@ src_prepare() {
 
 src_install() {
 	default
-
-	insinto /usr/share/doc/${PF}
-	doins docs/*.{txt,rtf,ps,png}
+	dodoc docs/*.{txt,rtf,ps,png}
 }
 
 src_test() {
diff --git a/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0.ebuild b/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0.ebuild
deleted file mode 100644
index 3e7e04d9b913..000000000000
--- a/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils autotools
-
-DESCRIPTION="Dymo SDK for LabelWriter/LabelManager printers"
-HOMEPAGE="https://newellrubbermaid.secure.force.com/dymopkb"
-SRC_URI="http://download.dymo.com/Download%20Drivers/Linux/Download/${P}.tar.gz"
-
-S="${WORKDIR}/${P}.5"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="test"
-
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="net-print/cups"
-DEPEND="${RDEPEND}
-	test? ( dev-util/cppunit )"
-
-# tests fail but needs to be investigated
-RESTRICT=test
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.2.0-cxxflags.patch
-	epatch "${FILESDIR}"/port_to_newer_cups_headers.patch
-	eautoreconf
-}
-
-DOCS=( AUTHORS README ChangeLog docs/SAMPLES )
-
-src_install() {
-	default
-
-	insinto /usr/share/doc/${PF}
-	doins docs/*.{txt,rtf,ps,png}
-}
diff --git a/net-print/dymo-cups-drivers/files/cups-2.3.0-headers.patch b/net-print/dymo-cups-drivers/files/cups-2.3.0-headers.patch
new file mode 100644
index 000000000000..059c3d0c29c1
--- /dev/null
+++ b/net-print/dymo-cups-drivers/files/cups-2.3.0-headers.patch
@@ -0,0 +1,24 @@
+https://github.com/codeprofis/dymo-cups-drivers/commit/948abc3500f45578a386182c0d2a55bcfcbc2c66.patch
+
+From 948abc3500f45578a386182c0d2a55bcfcbc2c66 Mon Sep 17 00:00:00 2001
+From: Florian Knodt <adlerweb@adlerweb.info>
+Date: Fri, 28 Feb 2020 23:26:34 +0100
+Subject: [PATCH] Add missing backend header. Fixes #11.
+
+---
+ src/common/CupsPrintEnvironment.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/common/CupsPrintEnvironment.h b/src/common/CupsPrintEnvironment.h
+index 23043d8..76ecefc 100644
+--- a/src/common/CupsPrintEnvironment.h
++++ b/src/common/CupsPrintEnvironment.h
+@@ -21,6 +21,8 @@
+ #ifndef h952b1c81_8931_433a_8479_7ae6d8e85a86
+ #define h952b1c81_8931_433a_8479_7ae6d8e85a86
+ 
++#include <cups/backend.h>
++#include <cups/sidechannel.h>
+ #include "PrinterDriver.h"
+ 
+ namespace DymoPrinterDriver
diff --git a/net-print/dymo-cups-drivers/metadata.xml b/net-print/dymo-cups-drivers/metadata.xml
index 169f1f54e1f4..94da820c05d1 100644
--- a/net-print/dymo-cups-drivers/metadata.xml
+++ b/net-print/dymo-cups-drivers/metadata.xml
@@ -6,6 +6,6 @@
     <description>Occasional access to Dymo LabelWriter 450 Turbo</description>
   </maintainer>
   <use>
-    <flag name="usb_modeswitch">Include usb_modeswitch for some hardware (bug #601242)</flag>
+    <flag name="usb-modeswitch">Include usb_modeswitch for some hardware (bug #601242)</flag>
   </use>
 </pkgmetadata>