gentoo resync : 04.05.2019

4 files changed, 0 insertions, 108 deletions

diff --git a/media-gfx/wkhtmltopdf/Manifest b/media-gfx/wkhtmltopdf/Manifest
index 5067c62fcdea..342ce5d16cac 100644
--- a/media-gfx/wkhtmltopdf/Manifest
+++ b/media-gfx/wkhtmltopdf/Manifest
@@ -1,7 +1,3 @@
-AUX wkhtmltopdf-0.12.4-build.patch 883 BLAKE2B 42a078df1eae5abe887ed80deaaa42c7a40b7abd140217cbc639f89e1cd78e188f6b13a4b75cbd20a9711003bba9a351d195dc9762b7cb71ee6876f0b78e076c SHA512 679196b89343bade3b8846bc7913c5ebf9d9badb63ffb3de6797a9bdb14e83806cdc0771354bfa9e633bda9c6934d65cbcc7b4f585a31499565a8c6777e1370e
-AUX wkhtmltopdf-0.12.4-gcc6-warn.patch 1271 BLAKE2B fc81541b57da3ce5342026a0d9b4c7017e417cdd6c2546f6a699061e4d8307023611ec7166d0bd27ee092ade0aa73776804f798c007c9fb2e99fcd14879c32e1 SHA512 af4282d023e2da3ab5ba2e7475b3bfa476fc1c9507e2af2db407ff99312cbae60b41846e13564c3b55b670caecd072f6c996348dbbc68528e6a798b3068f6058
-DIST wkhtmltopdf-0.12.4.tar.gz 128695 BLAKE2B 4bd65b8c0b424973524d9307ff329f05702a9ba3206b91abd8252a4127781a502cf40314669b35b395bb0b3712f9fbcf8ba2537164a7fcf8b3276c3262283eb3 SHA512 6ec27453efdf32b97f6434a3eb5dd3d3470bbdccdbb4f997ff4234441c79960932e51d963e5d0d2d98bbf8b4f7ab2ed8835dbc1a35407a63815691b59217caa2
 DIST wkhtmltopdf-0.12.5.tar.gz 511181 BLAKE2B f52d56fd932dfa514cc2711d22f99ea29960a3c4da2522be9f58f3197cb12494f1cdc8856399e328cfc39956282b8174886ee8edfc7417ba5c5d65ea353f6046 SHA512 3f982a6964085b36f62988b618d88d4339f03ad8d2e733c1fcba5e2e7cb545ccc99313ce35474605df818f91c289a87ddd952f21974fdbe846f990bf03fc2fdb
-EBUILD wkhtmltopdf-0.12.4-r1.ebuild 1011 BLAKE2B 870938f9f9c8b32e998a1e746bd4d93233c0f2fa6caeb069ba1090a766f2c602ef7818e3eec14a0a4242eb707a727df8dc48ee4e9123c58f9dc9834e0fc55d14 SHA512 ac76c9b09621fb465a8d6caa05c4406259dd81373541bf9b80a4b8b90d72ef95dc61fb58af5953918923b055bdccee398fa878e95e1511c0d11d5111f33e3bcb
 EBUILD wkhtmltopdf-0.12.5.ebuild 894 BLAKE2B 9fb89715477e0fc29ef9a8043a5a330c133c4cb3820a02de0a89f34df189b0eff715adac588fbb981cb9affaf89cc6a9871c2870f9429a9c67cf17a16fcd89fd SHA512 2cf388f46e5f220b7498bc007240c3735ff094b069200fac34a0c1c892a0faf62bf008cc800b536330948518273a817ba741f20e4015fd8b16cb3c352e8ebb9f
 MISC metadata.xml 347 BLAKE2B d7124ab4db60733f87dcb83d4d12ae47352d5b672a82a949426c3f0c8498c7178fb04ec91ddaf9639b3f1f897f623f7d1e76a10c46af4a0c2a94b8b15efc196e SHA512 b642c6b896856dca084c706f397b6fed8537b126105356365ec0eb14fc6bd51229fece832800f2ab18d8d64a1f22c4015d2fa6467d067ffc58c001af6e216828
diff --git a/media-gfx/wkhtmltopdf/files/wkhtmltopdf-0.12.4-build.patch b/media-gfx/wkhtmltopdf/files/wkhtmltopdf-0.12.4-build.patch
deleted file mode 100644
index 0148f3b42948..000000000000
--- a/media-gfx/wkhtmltopdf/files/wkhtmltopdf-0.12.4-build.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Fix build without patched Qt
-
-This was broken since 96b03ae.
-
-diff --git a/src/lib/multipageloader.cc b/src/lib/multipageloader.cc
-index 93dece8..456a857 100644
---- a/src/lib/multipageloader.cc
-+++ b/src/lib/multipageloader.cc
-@@ -213,10 +213,11 @@ ResourceObject::ResourceObject(MultiPageLoaderPrivate & mpl, const QUrl & u, con
- 	}
- 
- 	webPage.setNetworkAccessManager(&networkAccessManager);
--
-+#ifdef __EXTENSIVE_WKHTMLTOPDF_QT_HACK__
- 	double devicePixelRatio = multiPageLoader.dpi / 96.; // The used version of WebKit always renders at 96 DPI when no zoom is applied. It does not fully support a device pixel ratio != 1 natively.
- 	webPage.mainFrame()->setZoomFactor(devicePixelRatio * settings.zoomFactor); // Zoom in the page to achieve a higher DPI.
- 	webPage.setDevicePixelRatio(devicePixelRatio); // Fix CSS media queries (does not affect anything else).
-+#endif
- }
- 
- /*!
diff --git a/media-gfx/wkhtmltopdf/files/wkhtmltopdf-0.12.4-gcc6-warn.patch b/media-gfx/wkhtmltopdf/files/wkhtmltopdf-0.12.4-gcc6-warn.patch
deleted file mode 100644
index 83f862677a67..000000000000
--- a/media-gfx/wkhtmltopdf/files/wkhtmltopdf-0.12.4-gcc6-warn.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From c7a709f3d9b7628d5416e45c365901381beef7cc Mon Sep 17 00:00:00 2001
-From: Ashish Kulkarni <kulkarni.ashish@gmail.com>
-Date: Tue, 20 Dec 2016 17:57:26 +0530
-Subject: [PATCH] fix compilation warning with GCC 6.2
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-../lib/pdfsettings.cc: In function ‘QString wkhtmltopdf::settings::unitRealToStr(const UnitReal&, bool*)’:
-../lib/pdfsettings.cc:308:3: warning: this ‘if’ clause does not guard... [-Wmisleading-indentation]
-   if (ok) *ok=false; break;
-   ^~
-../lib/pdfsettings.cc:308:22: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the ‘if’
-   if (ok) *ok=false; break;
-                      ^~~~~
----
- src/lib/pdfsettings.cc | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/lib/pdfsettings.cc b/src/lib/pdfsettings.cc
-index e3c62526..b339ec10 100644
---- a/src/lib/pdfsettings.cc
-+++ b/src/lib/pdfsettings.cc
-@@ -305,7 +305,8 @@ QString unitRealToStr(const UnitReal & ur, bool * ok) {
- 	case QPrinter::Point: c = "pt"; break;
- 	case QPrinter::Millimeter: c = "mm"; break;
- 	default:
--		if (ok) *ok=false; break;
-+		if (ok) *ok=false;
-+		return "";
- 	}
- 	return QString("%1%2").arg(ur.first).arg(c);
- }
diff --git a/media-gfx/wkhtmltopdf/wkhtmltopdf-0.12.4-r1.ebuild b/media-gfx/wkhtmltopdf/wkhtmltopdf-0.12.4-r1.ebuild
deleted file mode 100644
index 26b0e472f391..000000000000
--- a/media-gfx/wkhtmltopdf/wkhtmltopdf-0.12.4-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-DESCRIPTION="Convert html to pdf (and various image formats) using webkit"
-HOMEPAGE="https://wkhtmltopdf.org/ https://github.com/wkhtmltopdf/wkhtmltopdf/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebkit:5[printsupport]
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}
-	dev-qt/qtxmlpatterns:5
-"
-
-DOCS=( AUTHORS CHANGELOG.md README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-build.patch
-	"${FILESDIR}"/${P}-gcc6-warn.patch
-)
-
-src_prepare() {
-	default
-	sed -i "s:\(INSTALLBASE/\)lib:\1$(get_libdir):" src/lib/lib.pro || die
-}
-
-src_configure() {
-	eqmake5 INSTALLBASE=/usr
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	use examples && dodoc -r examples
-	einstalldocs
-}