gentoo resync : 25.11.2020

6 files changed, 119 insertions, 0 deletions

diff --git a/dev-libs/qtcompress/Manifest b/dev-libs/qtcompress/Manifest
new file mode 100644
index 000000000000..67d08d54031a
--- /dev/null
+++ b/dev-libs/qtcompress/Manifest
@@ -0,0 +1,6 @@
+AUX qtcompress-0_p20180513-nogui.patch 271 BLAKE2B 707ece6707c14e01119f7e31e07b6055af511897638a487b4a561ce7afb3bbb596c24c0496ab8114d1cb46ff71c0733b31f57475bae37d38eabc3b23f4894c31 SHA512 ba55a21fd90c59792ed95036828a3664888d51a3d602ebc81d9f50d841a0afdfd720602e1b27e4d4c3f2946c9a11d17b09382a6c0ff7d14ea07e80ecf4bfa16b
+AUX qtcompress-0_p20180513-remove-zlib.patch 276 BLAKE2B f19e4e9a26f64ca0329ff99e64b7c7aa92997a903dc011547d79efef0c457b56b955c037ee73726238c75931dd25e13561a4744c8ca6cfa423bc076c2282881f SHA512 c99e0aacdf9e485f915d911b55e1824046345364c89e6a4fbc172687bd604b4eeff20bde22975ea5c65c103efda3c9af7e907b9599b6acdfad095fec9501670b
+AUX qtcompress-0_p20180513-test-include.patch 377 BLAKE2B a44f61f1321c7ec81404dff13b62c064c27553d74c0776cefa3e1c7b6031b11a16e6b5a57fb8f63398f3c1d3f1511b0ed0ce89b23e99007dfbebd42b504ef276 SHA512 1dffaccebaac8071467406273a7242949c197f95125b0ac8ad2678c63c24d7c7a018757ab7c91ef618feb4c16eacb839fb2ef27caaf362d7ba69af4e5e714105
+DIST qtcompress-0_p20180513.tar.gz 251845 BLAKE2B eab320403b2b853fd12b9c10146bbdbbaad6053e57e7b72e7d80448c3913a6e4dbe898496dcec49631b8d0b371a9c7af20e30324dc960d91180cdf2fb4865121 SHA512 6a1d980f94d689063cbb8322e154d618de0002b956460303fe76cd0b6d14d6f9ea6925fe347aa91831eaa0364ea1c5ba50bdcbf5006b1651a23d93bb8867e336
+EBUILD qtcompress-0_p20180513.ebuild 1456 BLAKE2B dfb3032b2d8a6862fba0db4c0cb8e4a2f3368fc93512a1c03d470f7f684dffcf69584f3f32b33ea6cd115d20ccb7c94a1eb9edfe9e0d9eda27c5d93ae773b58e SHA512 5595ffba5db197ad4267accbdd6677a9e6173903e2202be28304b9da2afec1071c5be844465c30ca951c1c6459b9a4ad65c5391b049271472c2c195513157b21
+MISC metadata.xml 457 BLAKE2B 5d91d6540bde9264de584a447773b0e88770a674ac00d70e661c4be7d569335b9669c44dec78be1352fc1f3108372601d6610afa91146e69264ee84336a542cd SHA512 86d096ae7e165edb3052cab594e400c3d8af08bb4dd99e4cb8d44c4cf111304f5baaa476ccc0dc59dd66b0da9a7e9c559f4ce67c7dd1b68508df32da726452fe
diff --git a/dev-libs/qtcompress/files/qtcompress-0_p20180513-nogui.patch b/dev-libs/qtcompress/files/qtcompress-0_p20180513-nogui.patch
new file mode 100644
index 000000000000..1dd5f4f1ed8c
--- /dev/null
+++ b/dev-libs/qtcompress/files/qtcompress-0_p20180513-nogui.patch
@@ -0,0 +1,10 @@
+--- a/tests/auto/unit/qzip/qzip.pro	2018-05-13 08:44:01.000000000 -0000
++++ b/tests/auto/unit/qzip/qzip.pro	2020-10-10 14:23:34.377528668 -0000
+@@ -1,6 +1,7 @@
+ CONFIG += testcase
+ TARGET = tst_qzip
+ QT += compress testlib
++QT -= gui
+ SOURCES += tst_qzip.cpp
+ 
+ wince* {
diff --git a/dev-libs/qtcompress/files/qtcompress-0_p20180513-remove-zlib.patch b/dev-libs/qtcompress/files/qtcompress-0_p20180513-remove-zlib.patch
new file mode 100644
index 000000000000..de89e7ac2ae4
--- /dev/null
+++ b/dev-libs/qtcompress/files/qtcompress-0_p20180513-remove-zlib.patch
@@ -0,0 +1,10 @@
+diff --git a/src/compress/compress.pro b/src/compress/compress.pro
+index 14ec502..3105a7f 100644
+--- a/src/compress/compress.pro
++++ b/src/compress/compress.pro
+@@ -11,5 +11,3 @@ HEADERS += \
+         qtcompressglobal.h
+ 
+ SOURCES += qzip.cpp
+-
+-include(../3rdparty/zlib.pri)
diff --git a/dev-libs/qtcompress/files/qtcompress-0_p20180513-test-include.patch b/dev-libs/qtcompress/files/qtcompress-0_p20180513-test-include.patch
new file mode 100644
index 000000000000..cc7bec4ed1e1
--- /dev/null
+++ b/dev-libs/qtcompress/files/qtcompress-0_p20180513-test-include.patch
@@ -0,0 +1,13 @@
+--- a/tests/auto/unit/qzip/tst_qzip.cpp	2018-05-13 09:44:01.000000000 +0100
++++ b/tests/auto/unit/qzip/tst_qzip.cpp	2020-09-28 09:40:14.493025102 +0100
+@@ -41,8 +41,8 @@
+ 
+ #include <QtTest/QtTest>
+ #include <QDebug>
+-#include <QtCompress/qzipwriter.h>
+-#include <QtCompress/qzipreader.h>
++#include <qzipwriter.h>
++#include <qzipreader.h>
+ 
+ class tst_QZip : public QObject
+ {
diff --git a/dev-libs/qtcompress/metadata.xml b/dev-libs/qtcompress/metadata.xml
new file mode 100644
index 000000000000..a07b3622f7d5
--- /dev/null
+++ b/dev-libs/qtcompress/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alexey+gentoo@asokolov.org</email>
+		<name>Alexey Sokolov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">nezticle/qtcompress</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/qtcompress/qtcompress-0_p20180513.ebuild b/dev-libs/qtcompress/qtcompress-0_p20180513.ebuild
new file mode 100644
index 000000000000..58e66c1c3c30
--- /dev/null
+++ b/dev-libs/qtcompress/qtcompress-0_p20180513.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils toolchain-funcs virtualx
+
+DESCRIPTION="A public API for QZip in an easy to use module"
+
+HOMEPAGE="https://github.com/nezticle/qtcompress"
+MY_COMMIT="23f8831826cd72aedf99fc3699148b6c994fd677"
+SRC_URI="https://github.com/nezticle/qtcompress/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/qtcompress-${MY_COMMIT}"
+
+LICENSE="|| ( LGPL-2.1 GPL-3 ) FDL-1.3"
+SLOT="0/5.11.0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	sys-libs/zlib
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-remove-zlib.patch"
+	"${FILESDIR}/${P}-test-include.patch"
+	"${FILESDIR}/${P}-nogui.patch"
+)
+
+src_prepare() {
+	default
+	# qtcompress is bundling its own zlib, remove it
+	rm -r src/3rdparty/ || die
+}
+
+src_configure() {
+	local pkg_config="$(tc-getPKG_CONFIG)"
+	eqmake5 \
+		"INCLUDEPATH+=$("${pkg_config}" --cflags zlib)" \
+		"LIBS+=$("${pkg_config}" --libs zlib)"
+}
+
+src_test() {
+	cd tests/auto/unit || die
+	eqmake5 \
+		"INCLUDEPATH+=${S}/src/compress"
+	emake
+	virtx qzip/target_wrapper.sh qzip/tst_qzip
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	rm "${ED}/usr/$(get_libdir)/libQt5Compress.la" || die
+	insinto /usr/include/qt5/QtCompress
+	doins src/compress/{qzipreader.h,qzipwriter.h,qtcompressglobal.h}
+}