gentoo resync : 03.03.2019

5 files changed, 57 insertions, 268 deletions

diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest
index 862c5947fa4c..1e8c38a94ac3 100644
--- a/media-gfx/valentina/Manifest
+++ b/media-gfx/valentina/Manifest
@@ -1,11 +1,5 @@
-DIST valentina-0.5.0.zip 37175844 BLAKE2B 73cfb434c87e7d59efa76c303f4cc13dd9df08b9d5f61becd03943b78ce68e8735d192f2f2d5d5dfe25cda19ba998b0ea4a73bc3d0845bd4a065f7c5b4e66098 SHA512 3e69f965de1f8179850a8c6a5a0d3b5e87384158191b9c4a3647a5421d1efe567e98298bd8f47a8288eac358520469ae7979a4a61df64ccfbeb1a36fb231efcf
-DIST valentina-0.6.0.zip 38305855 BLAKE2B 82733e97cd2ab1c2e0edddc05de228c040c43bd6a21b874b30554c526123ebd26d70f9fb8bb7556062f7df7b8d8f38c370d0f9ccd3d38100dacf841a68d4d1e6 SHA512 3bcc943c155b1b848c5328b53c8148448ede8fd057c8a50570045f61519bbeaaf0831f4a16127a24537feacb5251236c3bdc96e02788729635f4ec072686ca16
+AUX 5823.patch 1870 BLAKE2B 1a4edc390abd09010fb946035dab6f4ee9223eaa286f9843404db4f95d94e60da73dbf515c99aa857acdcb7d26bca3117fcdfdf2b9514ad45c2e795ab579cc46 SHA512 0cf9d1691816b165ab691cd34807f7c82eea685b5af2d9c483a9427987ae565f44e31bffcec9c3ede6102aa800d3988b054a178ec74f1826be1a88fd9f5ec28c
 DIST valentina-0.6.1.zip 38326440 BLAKE2B 33d9163058b890254120bb0849972941f36526c71ed0acd8df82867a0116a35be4818c31c3ebb8a7322cf53bca4f9e77b2de10ea0df51c46b764f8f9e7abb8d2 SHA512 6511194c734a1b6cd8a1ed489213c288e90bd653dbd8373c4ee13be78e2ae4fe00a35e19a5ee074e868319ab1a13eb8baea35dedb7242b3888d03aa4b4dc69ce
-DIST valentina-4798.patch 25302 BLAKE2B 153cc2ccc603703a520b5181e5192bac86410ab51eec305effe43463ce081dbbf3bb48eedb93e8ea5928f3f71351526a175c61a23a7005fda5bf4e14cc57403e SHA512 c3adbd2caa4cfb73960de850b29bee881fc408c9e4032e1fa2f29ba80b91abaa194738ff1cfb607657343990a166ad310387a66ceca546ffae0543d774bc53b4
-DIST valentina-4802.patch 6733 BLAKE2B b7e30b77aab75b45e7bfd06165586f8356cfa438e0f5f5fb708d818f04fe9be7fdd025b8098cb5ca1f45cceef0671abf7014c112ab11da8e6c9c1a640e412ab8 SHA512 5628599c1dd208ba9ea8ea5e518bf6aed5ef11aa750670335478e5af49d6e9f235901c79d6483b1897f8288259fd06b463462eddcd062c4920ff251430998ff4
-DIST valentina-5406.patch 596 BLAKE2B 34c5cf515555e455416500795c2afd96176b3ca3c2c3e278dbb6311e7cfb38bba6556126beef23d8b98ace76f0156250974d95310a6af046c0884580aa1d19d9 SHA512 f504ca766969703a20fc7c16652d4615722afda9156eb07c43845d1a6e9c7d08a2e8f07be7c71b4379326757f95e95e85858add2b1d13b0e4e5e8b1974ce18ae
-EBUILD valentina-0.5.0-r2.ebuild 2569 BLAKE2B f372de37045b9a7ef8e582ed2e15c4f9519bf9b438e8a27b755e9cd33a9fc7caa2cbba8d1d5bf73c99539ce43dc97318154aea9a7a0410fc5607db45d640e17a SHA512 b52157b044ace4638a3610e5e5e5e6dc1ba50b6d9e6ab4183752d97fb0fd9970cc5fe80decaec688dad871343c22e8fb7293cbfe4b9f206f7493bb65d394be30
-EBUILD valentina-0.6.0.ebuild 2138 BLAKE2B a4c29b1c55c2055565225c448a4ba33fd89a45cf63452e05dc55d9aada619cb45bf2eb0db60cdf6c8fd0d1defd6ae9f78d38239eb2943427bb3bc6175a112997 SHA512 59e5dacfcfa1caea28f6dc5ca59fd9bba9c71cc50b695d4161a8d6c5fc10e83d3cd5ac4a26ffb5432cb1498751b14381f11393fb1f70218a25be08284d0c8c98
-EBUILD valentina-0.6.1.ebuild 2138 BLAKE2B 71fb0b9174b83ad55c8d9211d2190074a9949bfdde11375941e98949c13649b848de8c0dea85afcd341088d9c572b77b5c40e89f91e8da0940b1bb6827261944 SHA512 8a65e38f3d69c987544381bb1dc1e81d3e476516c1eff9d0072809de3f535c08c6d2cd90c774daf190509bc55df569c81c435b2e71c33216882c5d0a3649d1bd
+EBUILD valentina-0.6.1.ebuild 2177 BLAKE2B 58239504686422d35909bfae8d2913cbda227f6862f6cf7097235045b6a86d0b5f1a93689efd886e6c9f7db0fe7029d14cf5b8c9d2db1d88b3bcf1b262cce37f SHA512 827aee577d869b07cace5e4a9f2c30eb21cc187e52a5eceadc68081d7372e669d182085b0d4243675dbfc2052fdf8e370ec5b9e6919466360eca048c7001c979
 EBUILD valentina-9999.ebuild 2057 BLAKE2B 8f0884308477778a8bdb0ee588b4e976156513fa865c24406acd09079c545b719b82726ed0ec336150e6c26fcfdb97eb3ce71811c55bdffae38a6f0fd4b06525 SHA512 7ae7e33c54c720abd0111783acf5f8ea4c2e4812dc4013176bafc533a33b2359819f386648cef97cea3521329fc55af3f8156b28e4b69353ff1bc882c377fd20
 MISC metadata.xml 334 BLAKE2B 7f146a505a30d4461165308b40383e2b78998411874c8af6113c3040142003868f397872ecd22b9b8f3ec6193c532fa934c8646ee04e8c49157464b58035de09 SHA512 d1264aa0d26ba75466c5572c37ca6fd384d4e6db392aca0e47d4b1d0bd3ef7e035fed51c460af1bb258c500d1cc9211ec2e85db3e3aa158d378fb1389a3ebf03
diff --git a/media-gfx/valentina/files/5823.patch b/media-gfx/valentina/files/5823.patch
new file mode 100644
index 000000000000..79df9a74c5a6
--- /dev/null
+++ b/media-gfx/valentina/files/5823.patch
@@ -0,0 +1,50 @@
+# HG changeset patch
+# User Roman Telezhynskyi <kroluku@gmail.com>
+# Date 1551441739 -7200
+#      Fri Mar 01 14:02:19 2019 +0200
+# Branch release
+# Node ID 82e62ea2d785e093af68089e509b224f3f4f843f
+# Parent  0108ef767e2447e5b5f39378bcf245e25947a25d
+Don't use Qt OpenGL module since Q5.4.
+
+diff -r 0108ef767e24 -r 82e62ea2d785 src/app/valentina/valentina.pro
+--- a/src/app/valentina/valentina.pro	Sun Feb 24 17:29:12 2019 +0200
++++ b/src/app/valentina/valentina.pro	Fri Mar 01 14:02:19 2019 +0200
+@@ -297,7 +297,6 @@
+         $$[QT_INSTALL_BINS]/icuuc*.dll \ # Different name for different Qt releases
+         $$[QT_INSTALL_BINS]/Qt5Core.dll \
+         $$[QT_INSTALL_BINS]/Qt5Concurrent.dll \
+-        $$[QT_INSTALL_BINS]/Qt5OpenGL.dll \
+         $$[QT_INSTALL_BINS]/Qt5Gui.dll \
+         $$[QT_INSTALL_BINS]/Qt5Network.dll \
+         $$[QT_INSTALL_BINS]/Qt5PrintSupport.dll \
+@@ -309,6 +308,11 @@
+         $$[QT_INSTALL_BINS]/libstdc++-6.dll \
+         $$[QT_INSTALL_BINS]/libwinpthread-1.dll
+ 
++    # Don't use Qt OpenGL module since Q5.4
++    equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 4) {
++        package.files += $$[QT_INSTALL_BINS]/Qt5OpenGL.dll
++    }
++
+     # For support Windows 7+
+     greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 6) {
+         package.files += $$[QT_INSTALL_BINS]/Qt5WinExtras.dll
+diff -r 0108ef767e24 -r 82e62ea2d785 src/libs/vwidgets/vwidgets.pro
+--- a/src/libs/vwidgets/vwidgets.pro	Sun Feb 24 17:29:12 2019 +0200
++++ b/src/libs/vwidgets/vwidgets.pro	Fri Mar 01 14:02:19 2019 +0200
+@@ -7,7 +7,12 @@
+ # File with common stuff for whole project
+ include(../../../common.pri)
+ 
+-QT += widgets printsupport opengl
++QT += widgets printsupport
++
++# Don't use Qt OpenGL module since Q5.4
++equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 4) {
++    QT += opengl
++}
+ 
+ # Name of the library
+ TARGET = vwidgets
+
diff --git a/media-gfx/valentina/valentina-0.5.0-r2.ebuild b/media-gfx/valentina/valentina-0.5.0-r2.ebuild
deleted file mode 100644
index 4dcf9c98e9b2..000000000000
--- a/media-gfx/valentina/valentina-0.5.0-r2.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils gnome2-utils xdg-utils epatch
-
-DESCRIPTION="Cloth patternmaking software"
-HOMEPAGE="https://valentinaproject.bitbucket.io/"
-SRC_URI="https://bitbucket.org/dismine/${PN}/get/v${PV}.zip -> ${P}.zip
-	https://bitbucket.org/dismine/${PN}/commits/d78ca13c4891ccf3542b0704a7d66af0f9b02938/raw -> valentina-4798.patch
-	https://bitbucket.org/dismine/${PN}/commits/98e869c4146204ef31822087fa826cfa1cd7e0f4/raw -> valentina-4802.patch
-	https://bitbucket.org/dismine/${PN}/commits/572fe909f75e013be310905c118e1afe4368db1c/raw -> valentina-5406.patch"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome"
-
-LANGS="cs de el en en es fi fr he id it nl pt-BR ro ru uk zh-CN"
-
-for LANG in ${LANGS}; do
-	IUSE="${IUSE} l10n_${LANG}"
-done
-
-CDEPEND="
-	app-text/poppler
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/dismine-${PN}-31c95eadca8b
-
-src_prepare() {
-	epatch "${DISTDIR}/${PN}-4798.patch" \
-		"${DISTDIR}/${PN}-4802.patch" \
-		"${DISTDIR}/${PN}-5406.patch"
-
-	default
-}
-
-src_configure() {
-	local locales=""
-	local locale
-
-	for LANG in ${LANGS}; do
-		if use l10n_${LANG}; then
-			case ${LANG} in
-			"cs")
-				locale="cs_CZ"
-				;;
-			"de")
-				locale="de_DE"
-				;;
-			"el")
-				locale="el_GR"
-				;;
-			"en")
-				locale="en_CA en_IN en_US"
-				;;
-			"es")
-				locale="es_ES"
-				;;
-			"fi")
-				locale="fi_FI"
-				;;
-			"fr")
-				locale="fr_FR"
-				;;
-			"he")
-				locale="he_IL"
-				;;
-			"id")
-				locale="id_ID"
-				;;
-			"it")
-				locale="it_IT"
-				;;
-			"nl")
-				locale="nl_NL"
-				;;
-			"pt-BR")
-				locale="pt_BR"
-				;;
-			"ro")
-				locale="ro_RO"
-				;;
-			"ru")
-				locale="ru_RU"
-				;;
-			"uk")
-				locale="uk_UA"
-				;;
-			"zh-CN")
-				locale="zh_CN"
-				;;
-			esac
-
-			locales="${locales} ${locale}"
-		fi
-	done
-
-	eqmake5 LOCALES="${locales}" "CONFIG+=noStripDebugSymbols no_ccache noRunPath noTests" Valentina.pro -r
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-
-	dodoc AUTHORS.txt ChangeLog.txt README.txt
-
-	doman dist/debian/${PN}.1
-	doman dist/debian/tape.1
-
-	cp dist/debian/valentina.sharedmimeinfo dist/debian/${PN}.xml || die
-	insinto /usr/share/mime/packages
-	doins dist/debian/${PN}.xml
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	if use gnome ; then
-		gnome2_icon_cache_update
-	fi
-}
diff --git a/media-gfx/valentina/valentina-0.6.0.ebuild b/media-gfx/valentina/valentina-0.6.0.ebuild
deleted file mode 100644
index b063352ab947..000000000000
--- a/media-gfx/valentina/valentina-0.6.0.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils gnome2-utils xdg-utils
-
-DESCRIPTION="Cloth patternmaking software"
-HOMEPAGE="https://valentinaproject.bitbucket.io/"
-SRC_URI="https://bitbucket.org/dismine/${PN}/get/v${PV}.zip -> ${P}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome"
-
-LANGS="cs de el en en es fi fr he id it nl pt-BR ro ru uk zh-CN"
-
-for LANG in ${LANGS}; do
-	IUSE="${IUSE} l10n_${LANG}"
-done
-
-CDEPEND="
-	app-text/poppler
-	dev-qt/linguist:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/dismine-${PN}-dd3cff212db5
-
-src_configure() {
-	local locales=""
-	local locale
-
-	for LANG in ${LANGS}; do
-		if use l10n_${LANG}; then
-			case ${LANG} in
-			"cs")
-				locale="cs_CZ"
-				;;
-			"de")
-				locale="de_DE"
-				;;
-			"el")
-				locale="el_GR"
-				;;
-			"en")
-				locale="en_CA en_IN en_US"
-				;;
-			"es")
-				locale="es_ES"
-				;;
-			"fi")
-				locale="fi_FI"
-				;;
-			"fr")
-				locale="fr_FR"
-				;;
-			"he")
-				locale="he_IL"
-				;;
-			"id")
-				locale="id_ID"
-				;;
-			"it")
-				locale="it_IT"
-				;;
-			"nl")
-				locale="nl_NL"
-				;;
-			"pt-BR")
-				locale="pt_BR"
-				;;
-			"ro")
-				locale="ro_RO"
-				;;
-			"ru")
-				locale="ru_RU"
-				;;
-			"uk")
-				locale="uk_UA"
-				;;
-			"zh-CN")
-				locale="zh_CN"
-				;;
-			esac
-
-			locales="${locales} ${locale}"
-		fi
-	done
-
-	eqmake5 LOCALES="${locales}" "CONFIG+=noDebugSymbols no_ccache noRunPath noTests noWindowsInstaller" Valentina.pro -r
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-
-	dodoc AUTHORS.txt ChangeLog.txt README.txt
-
-	doman dist/debian/${PN}.1
-	doman dist/debian/tape.1
-
-	cp dist/debian/valentina.sharedmimeinfo dist/debian/${PN}.xml || die
-	insinto /usr/share/mime/packages
-	doins dist/debian/${PN}.xml
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	if use gnome ; then
-		gnome2_icon_cache_update
-	fi
-}
diff --git a/media-gfx/valentina/valentina-0.6.1.ebuild b/media-gfx/valentina/valentina-0.6.1.ebuild
index c9b395040317..a59fb86953a5 100644
--- a/media-gfx/valentina/valentina-0.6.1.ebuild
+++ b/media-gfx/valentina/valentina-0.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -38,6 +38,10 @@ DEPEND="${CDEPEND}
 
 S=${WORKDIR}/dismine-${PN}-b639b75d1688
 
+PATCHES=(
+	"${FILESDIR}/5823.patch"
+)
+
 src_configure() {
 	local locales=""
 	local locale