summaryrefslogtreecommitdiff
path: root/net-print
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-04-25 11:37:10 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-04-25 11:37:10 +0100
commit38423c67c8a23f6a1bc42038193182e2da3116eb (patch)
tree04e2cf4bd43601b77daa79fe654e409187093c5e /net-print
parent623ee73d661e5ed8475cb264511f683407d87365 (diff)
gentoo resync : 25.04.2020
Diffstat (limited to 'net-print')
-rw-r--r--net-print/Manifest.gzbin6420 -> 6416 bytes
-rw-r--r--net-print/cups-filters/Manifest5
-rw-r--r--net-print/cups-filters/cups-filters-1.27.4.ebuild16
-rw-r--r--net-print/cups-filters/cups-filters-9999.ebuild16
-rw-r--r--net-print/cups-filters/files/cups-filters-1.27.4-make-missing-testfont-non-fatal.patch11
-rw-r--r--net-print/cups-windows/Manifest2
-rw-r--r--net-print/cups-windows/cups-windows-6.0-r1.ebuild2
-rw-r--r--net-print/hplip/Manifest2
-rw-r--r--net-print/hplip/hplip-3.20.3.ebuild9
9 files changed, 49 insertions, 14 deletions
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index ebaf1c4ec856..323a702bc3ac 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
Binary files differ
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index d112f5f40ef0..d79711641cc1 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -1,4 +1,5 @@
AUX cups-browsed.init.d-r1 154 BLAKE2B 81a1b1b6c8b6f0d7ac874c32aa5c5531b7d791711a09a448cbf6fb61109c4de8562589c308f20859bab47e4821d0ea89e8b1531a7a1dd2a33bc7cec16b039276 SHA512 9d2b54f6ae24ae1112e53e845937052ba473789a6051b7854b2b36001203d351e4bf7fd5eb307aa33f65a0bce8b9b65cdea3e399301decf0d9351696cfc682d3
+AUX cups-filters-1.27.4-make-missing-testfont-non-fatal.patch 510 BLAKE2B 9b48f841b7034b4c56ed6ea7d229696aacc232b9d78c9984dad6db8f6e967e239c77dbb35886230ac968966ee04912add135a5932ca1483674e1bf2c087e81fc SHA512 ce14af0a4d2db1e67471b8986290261ac17709720fe5a52a6a81bda19e4ae7e4ab92a8f1e954b82b792690f9eae8116c59ee3a11594256a36bf8cff32846e97c
DIST cups-filters-1.25.11.tar.xz 1482792 BLAKE2B 67801904dbe025933d1209817e23ff74b661b35c3af560081f12d4f9a26102e009bac9d4741e15dc257dd477967b18ae23911647f8f56b361e9f8d51b0d619f2 SHA512 67e7c624952b5e2db33a698ac1287a3448a4787fa28000cefc5a982c2fa18a4f56e11e3ba65da8a6e565a53a193c6eb31ba1867ad36ca8dc7e61250f11232681
DIST cups-filters-1.25.13.tar.xz 1485860 BLAKE2B 03fbbbefdd36e8f619fabf17e6e13d051f48f68f87260747a181f6976ff88728d7d01b646227cd5f054e0321f6fe0e64e4c6b1bdba631d9d703304ad98a625eb SHA512 4b5ef647870235436276db68f3ef1879b578807338a025100a1d43115a7330a8f506be631df9c43edb2f1ec15f9a42f15f7cdc725bb5d39612b37bae04631611
DIST cups-filters-1.26.2.tar.xz 1490192 BLAKE2B 6bc5033c648e42a4590a941fd089c3bf3a901a36e26f12b3cdc892ea41943071903b2df2ef5730b7948270f4f59419083c9423af9482e032958360144fb04e9b SHA512 59a5eaba00e0f384f2b1498e58ea3d7272e42923a69eaa0c107ac103dc539c9bf14a94b7a91a73e7185d8a347b4ac7f4a7a655b1ffc373983da807c582e10264
@@ -8,6 +9,6 @@ EBUILD cups-filters-1.25.11.ebuild 3449 BLAKE2B 70f5e8ed635a76f439b479a9ea318c16
EBUILD cups-filters-1.25.13.ebuild 3458 BLAKE2B 2be7cb7eaf1e59fb1ed02e1e64df7b6615d68be1dba9f1da7b3ea46db82f56dfcf54897d89d4af51879f1e30e8ce72144ff9ebca749e2d17cb79d15e8fcb9a10 SHA512 24c51dd6db5b8839eb1bc7ae5ee2a50bc884aab5e59be6af31d195f4dd88f45ad637f15ba907d60e9cc550e88fda3608730fe8f225608055466a9b90ada8d176
EBUILD cups-filters-1.26.2.ebuild 3458 BLAKE2B 422cc3d8c474df23b15b94116dff3cb5cfff4eddaef554743e695e2e58717151370cebaf0b1d600f4d4a185c74af7aa45489be9ebc33f664588d85ae9245b800 SHA512 b31915b570574a117b6ef9e20807990d04085b8850206cf12dc8a9c222571974fb98738a7b6d4d36dc6a186722c797c73da401f85537f897c15f418aacee14c4
EBUILD cups-filters-1.27.2.ebuild 3392 BLAKE2B 61ab3e8b8e4ff3739adaf77bf45ed5e1237fbd156a9eaf21819ee5d13cd64cb1aba977962c554c96c0a0430136554401e30d9e2f4e0b903e8420e2fc89352d03 SHA512 98b9e1ca9385871cb04c8ccb7b3d9bd5f37fcfc8e585cbb99d71b383b974cd5c5420a9f7b220d8aa8456dd1d395301ff7d781731e9ee97e9c0b1063358200638
-EBUILD cups-filters-1.27.4.ebuild 3392 BLAKE2B 61ab3e8b8e4ff3739adaf77bf45ed5e1237fbd156a9eaf21819ee5d13cd64cb1aba977962c554c96c0a0430136554401e30d9e2f4e0b903e8420e2fc89352d03 SHA512 98b9e1ca9385871cb04c8ccb7b3d9bd5f37fcfc8e585cbb99d71b383b974cd5c5420a9f7b220d8aa8456dd1d395301ff7d781731e9ee97e9c0b1063358200638
-EBUILD cups-filters-9999.ebuild 3392 BLAKE2B 61ab3e8b8e4ff3739adaf77bf45ed5e1237fbd156a9eaf21819ee5d13cd64cb1aba977962c554c96c0a0430136554401e30d9e2f4e0b903e8420e2fc89352d03 SHA512 98b9e1ca9385871cb04c8ccb7b3d9bd5f37fcfc8e585cbb99d71b383b974cd5c5420a9f7b220d8aa8456dd1d395301ff7d781731e9ee97e9c0b1063358200638
+EBUILD cups-filters-1.27.4.ebuild 3608 BLAKE2B 52b38a7ff26bb0ae9e761e413a84edac3378fb24e0ae5a823f562ed06df45bca60a5f38f01feb3b72cba894d34668fb6428db052219c1392f681768b3fbe0929 SHA512 5a53ec01c203f44c531507480d04ce041016fa7afcab7b2e40f9f35657c5e9a15e2d0897c941bb3d3849679cb9898dd379d8ce74060406dfb920de388de5a8a6
+EBUILD cups-filters-9999.ebuild 3608 BLAKE2B 52b38a7ff26bb0ae9e761e413a84edac3378fb24e0ae5a823f562ed06df45bca60a5f38f01feb3b72cba894d34668fb6428db052219c1392f681768b3fbe0929 SHA512 5a53ec01c203f44c531507480d04ce041016fa7afcab7b2e40f9f35657c5e9a15e2d0897c941bb3d3849679cb9898dd379d8ce74060406dfb920de388de5a8a6
MISC metadata.xml 560 BLAKE2B ef0a2d2d0db2d065b1dcb444a6bf3333cc3cc8658629ffcdf44e9d39c4f13d8adb5e5b770d4abeb76fea5d4d3e85968daaf2ce2d9a13d3f396ab91f51b1ef723 SHA512 b734c24f2b65bc5c7d13b1ec8ec86f2188d758c295f7bd5aad12a794498ec92d43d543a0aed2ff49013c26aa3baf1f3e03fead90bd5c7f70bf430d48c063b06a
diff --git a/net-print/cups-filters/cups-filters-1.27.4.ebuild b/net-print/cups-filters/cups-filters-1.27.4.ebuild
index 6cb600e6a3ad..7abb7a7fcbf0 100644
--- a/net-print/cups-filters/cups-filters-1.27.4.ebuild
+++ b/net-print/cups-filters/cups-filters-1.27.4.ebuild
@@ -5,10 +5,10 @@ EAPI=7
GENTOO_DEPEND_ON_PERL=no
-inherit perl-module systemd flag-o-matic
+inherit autotools perl-module systemd flag-o-matic
if [[ "${PV}" == "9999" ]] ; then
- inherit autotools git-r3
+ inherit git-r3
EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git"
else
SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
@@ -54,8 +54,18 @@ BDEPEND="
"
src_prepare() {
+ local need_eautoreconf=
+
default
- [[ "${PV}" == "9999" ]] && eautoreconf
+
+ if ! use test ; then
+ eapply "${FILESDIR}"/${PN}-1.27.4-make-missing-testfont-non-fatal.patch
+ need_eautoreconf=yes
+ elif [[ "${PV}" == "9999" ]] ; then
+ need_eautoreconf=yes
+ fi
+
+ [[ -n ${need_eautoreconf} ]] && eautoreconf
# Bug #626800
append-cxxflags -std=c++11
diff --git a/net-print/cups-filters/cups-filters-9999.ebuild b/net-print/cups-filters/cups-filters-9999.ebuild
index 6cb600e6a3ad..7abb7a7fcbf0 100644
--- a/net-print/cups-filters/cups-filters-9999.ebuild
+++ b/net-print/cups-filters/cups-filters-9999.ebuild
@@ -5,10 +5,10 @@ EAPI=7
GENTOO_DEPEND_ON_PERL=no
-inherit perl-module systemd flag-o-matic
+inherit autotools perl-module systemd flag-o-matic
if [[ "${PV}" == "9999" ]] ; then
- inherit autotools git-r3
+ inherit git-r3
EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git"
else
SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
@@ -54,8 +54,18 @@ BDEPEND="
"
src_prepare() {
+ local need_eautoreconf=
+
default
- [[ "${PV}" == "9999" ]] && eautoreconf
+
+ if ! use test ; then
+ eapply "${FILESDIR}"/${PN}-1.27.4-make-missing-testfont-non-fatal.patch
+ need_eautoreconf=yes
+ elif [[ "${PV}" == "9999" ]] ; then
+ need_eautoreconf=yes
+ fi
+
+ [[ -n ${need_eautoreconf} ]] && eautoreconf
# Bug #626800
append-cxxflags -std=c++11
diff --git a/net-print/cups-filters/files/cups-filters-1.27.4-make-missing-testfont-non-fatal.patch b/net-print/cups-filters/files/cups-filters-1.27.4-make-missing-testfont-non-fatal.patch
new file mode 100644
index 000000000000..50866e4a7291
--- /dev/null
+++ b/net-print/cups-filters/files/cups-filters-1.27.4-make-missing-testfont-non-fatal.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -789,7 +789,7 @@ AC_ARG_WITH([test-font-path],
+ [with_test_font_path=`find /usr/share/fonts -name DejaVuSans.ttf || echo /usr/share/fonts/dejavu/DejaVuSans.ttf`]
+ )
+ AC_CHECK_FILE("$with_test_font_path", [], [
+- AC_MSG_ERROR([Requested font file is missing. Please install a package providing it.])
++ AC_MSG_WARN([Specified font for tests not found. Expect test failures!])
+ ])
+ AC_DEFINE_UNQUOTED([TESTFONT], ["$with_test_font_path"], [Path to font used in tests])
+
diff --git a/net-print/cups-windows/Manifest b/net-print/cups-windows/Manifest
index c9142399431c..24eb3ec38385 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 569 BLAKE2B d04de0683f5b8f4c556887d9457587d6811605e3990a65453e287e96014fc6f064e6b922bb3281aea4a76b0b4e3f4c0a49898bba2eddf480fbbcc19342e5beaa SHA512 010e09e08ffc5ae61cdb0acf15c001d3d59de183dcad24d76f89cc36ce10dfdeef3f2d0a7726588ecbffb49bbccc129bd57403cd61d5745ab29c41a7a5a5cd0d
+EBUILD cups-windows-6.0-r1.ebuild 570 BLAKE2B d422d728f72654abf87482946aec1f56a7b092cbe1cf4c519c421d8d37fae7ad8d37aae7b89ebd8849bc7d29ba93eceffc4c1bd403d90a8199c26b4055f88f23 SHA512 fb0c447f039ff03b2ab7560a98929ec04938e7594515583faa5c72de7f3f980e6aad5bed2b8052fe014224884a5ff8b1851d7d30584fc05c274f044c8c7f24e4
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 ad095f4a6ea5..de0af8c17543 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 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
RDEPEND=">=net-print/cups-1.2"
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index a709a98244ba..04ad9aa65d8e 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -4,5 +4,5 @@ DIST hplip-3.20.2.tar.gz 25675649 BLAKE2B 8e98768736fe4ec667852fccebf2bb178047ee
DIST hplip-3.20.3.tar.gz 25672070 BLAKE2B 4c6209a268898de123b2b557d662acddb3ad90b227c0752ebdd1e2afb3fe3d19fddc819aba999347708dd0c098f2b8fea4580dcfb3d5fc7893e47520cae7c1d5 SHA512 a397eb3896292ac956a1969b76707af62c866e47d88148fa75b68574e4639283f7414a2c77e6854c5d22daea49181d4f1bc2daf11fb3058372ff084d591696f1
EBUILD hplip-3.19.12-r1.ebuild 7827 BLAKE2B e57c664d4802fed5721dc0d1d8a211ac292e955bf647d8b453fdf42a40214cd4a61918e764c24cc1dacaee05c77e5b3a8ca0fc7822c9c17e7089cf6b8a7a0692 SHA512 7f4cedf809f7b42c70ad46bc7674789becd4ecd24129465aa892885f80998a86d2919c371ecbe733a2654a8604a427739c85fe63edadebce7f53f5d687594739
EBUILD hplip-3.20.2.ebuild 7832 BLAKE2B a6330e829cb0dbbf580ee6b41c2599a0fcb14ff6323a28f3feec3c00d7c0dde8915767c6e29c4738078bbd915b9f1226fb2bda57ad577a02985ac4a849c7b4d7 SHA512 79f50926870307c4825dee5268199bcfda42db0973cf10ea720a0907bf2f8e789710012d196e3e468cda66e941125777693415b0b8f55b12f57dfe67b685a415
-EBUILD hplip-3.20.3.ebuild 7770 BLAKE2B 25814bff70cdba80fb71932a379f6c139fd5188c9253e603d064f18d554067e6d6e497b5cd4500fbc6353132a8c24ede9302fb102434ee0ed997a52067ced9a3 SHA512 45f73eed34ba3a88e815752061fa20d3e2cd0dc4ab7ca3cc0143b17dfae45feb4855898553e20338a100f882f117cf9002bdbb6eadae807575fd1f5080d6dde5
+EBUILD hplip-3.20.3.ebuild 7873 BLAKE2B 5d44edb2e7b6b4716a6d57ebbf41d7b129ed34d57be4fe4bbbb909170c833c61ab7edb65b42bc73465f63432516d762c231efe1a462029ed89339c14f8531eb2 SHA512 c93ab876029bf2065c5ad607902cf99dddd1d2c1bc8caca43856409fdfe2b7933c137cef1ad68fde0cfa5135d76ea399df5f5bb18b57861bef1903c17ece5af9
MISC metadata.xml 1910 BLAKE2B fd9fc7a40bd2bb877e7b4e26104df247dc8c7aa5cbd7211f5d489ec889834aa64fff20d6624f3c8b3e1e4428704cb7f2eb4d1bffc1c6fb15f15b05fd422297e2 SHA512 022854843c9ae373aed3ebd3879c9f1312773dea5dca15c85fb839ff067ea5599532201fa51d9e91ec18b0be1773e2ad544cd4e5697eb9c91be22d8d9352d7ef
diff --git a/net-print/hplip/hplip-3.20.3.ebuild b/net-print/hplip/hplip-3.20.3.ebuild
index 6abdff9d5b0e..d24a1c95865e 100644
--- a/net-print/hplip/hplip-3.20.3.ebuild
+++ b/net-print/hplip/hplip-3.20.3.ebuild
@@ -3,13 +3,13 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
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
+inherit autotools flag-o-matic 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"
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
IUSE="doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
@@ -54,6 +54,7 @@ RDEPEND="
kernel_linux? ( virtual/udev )
$(python_gen_cond_dep '
>=dev-python/dbus-python-1.2.0-r1[${PYTHON_MULTI_USEDEP}]
+ dev-python/distro[${PYTHON_MULTI_USEDEP}]
fax? ( dev-python/reportlab[${PYTHON_MULTI_USEDEP}] )
qt5? (
>=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_MULTI_USEDEP}]
@@ -147,6 +148,8 @@ src_prepare() {
src_configure() {
local myconf drv_build minimal_build
+ append-cppflags "$(python-config --includes)"
+
if use libusb0 ; then
myconf="${myconf} --enable-libusb01_build"
else
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 18:22:21 +0000