[gentoo-commits] repo/gentoo:master commit in: media-gfx/valentina/files/, media-gfx/valentina/

[Miroslav Šulc]

commit:     1a5a24193e56f815fa1929f904fcd787c7eb7636
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 24 08:30:35 2017 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Oct 24 08:30:58 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a5a2419

media-gfx/valentina: fixed homepage, sources and issues with version 0.5.0

Package-Manager: Portage-2.3.12, Repoman-2.3.3

 media-gfx/valentina/Manifest                       |  4 +-
 .../files/0.5.0-disable-tests-compilation.patch    | 35 --------------
 .../files/0.5.0-fix-insecure-runpaths.patch        | 56 ----------------------
 media-gfx/valentina/files/0.5.0-locales.patch      | 48 -------------------
 ...a-0.5.0-r1.ebuild => valentina-0.5.0-r2.ebuild} | 17 +++----
 media-gfx/valentina/valentina-9999.ebuild          | 10 ++--
 6 files changed, 17 insertions(+), 153 deletions(-)

diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest
index 8d506f0de2a..370ab1039f0 100644
--- a/media-gfx/valentina/Manifest
+++ b/media-gfx/valentina/Manifest
@@ -1 +1,3 @@
-DIST valentina-0.5.0.zip 21431337 SHA256 7d80d7cf49250cc48f7ae791e1ee3a8de2216f818fe100b883302099d984de05 SHA512 e04615fe0d79e8d0adebaea1808ee123d979babcd9f9320e897921aeda811ece37aff20575fb4bc033f21a91b498f409dbf1a4b8999e8b3c841c2f842ce41263 WHIRLPOOL 59714a19dee39cadc86f5542e52b4424fd7724bbbf5c9e3f6f33ebc48c313bc2b7c5f3f11f82b660f9a2619d05e76bc91f65201c95ae1473efaa540e132020d9
+DIST valentina-0.5.0.zip 37175844 SHA256 f750027814e765b169c41934927f205350525b947f50559fd9bfcba016e095cb SHA512 3e69f965de1f8179850a8c6a5a0d3b5e87384158191b9c4a3647a5421d1efe567e98298bd8f47a8288eac358520469ae7979a4a61df64ccfbeb1a36fb231efcf WHIRLPOOL 271b471f25a59f356cca5b2c00e1a200e504c5184d2001e93c954ce0c921a56585811029e79e424f91c8550d44ea498d501f0f05c8aff62981cfc8be339ae673
+DIST valentina-4798.patch 25302 SHA256 3ff7b9555933fb361aad3b96b8486b2d5e4988fb0ee34f3fc98609d0673e3baf SHA512 c3adbd2caa4cfb73960de850b29bee881fc408c9e4032e1fa2f29ba80b91abaa194738ff1cfb607657343990a166ad310387a66ceca546ffae0543d774bc53b4 WHIRLPOOL 245496681adb86b6662b29426bfac11d7db6e9d7b2ab48e89d6508c5211fdc520bac450d1af051c066e00e914608fdc412cbae38dc0230dfc0090c0af6c4f979
+DIST valentina-4802.patch 6733 SHA256 abee2e871f9f741cdf26ac151dca24a0cfc9d3f22bbe2abfdb88ad7c42768c96 SHA512 5628599c1dd208ba9ea8ea5e518bf6aed5ef11aa750670335478e5af49d6e9f235901c79d6483b1897f8288259fd06b463462eddcd062c4920ff251430998ff4 WHIRLPOOL bb4f89a44eb5204192b680ba29226d04439b2326b37992e7a8623e713a94f20ec3043f31a059037f90a24feb2d283773f21c06f1777e4f61bf5f7a8d5f7d54af

diff --git a/media-gfx/valentina/files/0.5.0-disable-tests-compilation.patch b/media-gfx/valentina/files/0.5.0-disable-tests-compilation.patch
deleted file mode 100644
index a819a02a336..00000000000
--- a/media-gfx/valentina/files/0.5.0-disable-tests-compilation.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-# HG changeset patch
-# User Roman Telezhynskyi <kroluku@×××××.com>
-# Date 1455906661 -7200
-# Branch develop
-# Node ID 8edb1b0f161a5f472a0e6a8a8b5b8a1ae7cf33c5
-# Parent  42a73e7a17757ce9d12e16f616a41f52efdf4b91
-CONFIG key to disable building tests.
-
-diff --git a/src/src.pro b/src/src.pro
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -1,8 +1,17 @@
- TEMPLATE = subdirs
--SUBDIRS = \
--    libs \
--    app \
--    test
- 
--app.depends = libs
--test.depends = libs
-+noTests{ # For enable run qmake with CONFIG+=noTests
-+	SUBDIRS = \
-+		libs \
-+		app
-+
-+} else {
-+	SUBDIRS = \
-+		libs \
-+		app \
-+		test
-+
-+	test.depends = libs
-+}
-+
-+app.depends = libs 

diff --git a/media-gfx/valentina/files/0.5.0-fix-insecure-runpaths.patch b/media-gfx/valentina/files/0.5.0-fix-insecure-runpaths.patch
deleted file mode 100644
index a98a069dfb5..00000000000
--- a/media-gfx/valentina/files/0.5.0-fix-insecure-runpaths.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-# HG changeset patch
-# User Roman Telezhynskyi <kroluku@×××××.com>
-# Date 1455895311 -7200
-# Branch develop
-# Node ID ebb8c53b8fdc09d2542ec6b8a63585be63c02725
-# Parent  a29fbab1f3ac59fda0e81bf1e99d153b5f47bd7c
-CONFIG key to disable setting custom rpath option.
-
-diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro
---- a/src/app/tape/tape.pro
-+++ b/src/app/tape/tape.pro
-@@ -348,10 +348,16 @@
- # Path to recource file.
- win32:RC_FILE = share/resources/tape.rc
- 
--unix:!macx{
--    # suppress the default RPATH
--    QMAKE_LFLAGS_RPATH =
--    QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}"
-+noRunPath{ # For enable run qmake with CONFIG+=noRunPath
-+    # do nothing
-+} else {
-+    unix:!macx{
-+        # suppress the default RPATH
-+        # helps to run the program without Qt Creator
-+        # see problem with path to libqmuparser and libpropertybrowser
-+        QMAKE_LFLAGS_RPATH =
-+        QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}"
-+    }
- }
- 
- # When the GNU linker sees a library, it discards all symbols that it doesn't need.
-diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro
---- a/src/app/valentina/valentina.pro
-+++ b/src/app/valentina/valentina.pro
-@@ -476,10 +476,16 @@
-     copyToDestdir($$pdftops_path, $$shell_path($${OUT_PWD}/$$DESTDIR))
- }
- 
--unix:!macx{
--    # suppress the default RPATH
--    QMAKE_LFLAGS_RPATH =
--    QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}"
-+noRunPath{ # For enable run qmake with CONFIG+=noRunPath
-+    # do nothing
-+} else {
-+    unix:!macx{
-+        # suppress the default RPATH
-+        # helps to run the program without Qt Creator
-+        # see problem with path to libqmuparser and libpropertybrowser
-+        QMAKE_LFLAGS_RPATH =
-+        QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}"
-+    }
- }
- 
- # When the GNU linker sees a library, it discards all symbols that it doesn't need.

diff --git a/media-gfx/valentina/files/0.5.0-locales.patch b/media-gfx/valentina/files/0.5.0-locales.patch
deleted file mode 100644
index a9084627df5..00000000000
--- a/media-gfx/valentina/files/0.5.0-locales.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/src/app/translations.pri b/src/app/translations.pri
-index b2dd2c4..87c55f7 100755
---- a/src/app/translations.pri
-+++ b/src/app/translations.pri
-@@ -9,22 +9,27 @@ PMSYSTEMS += \
-     p0 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 p13 p14 p15 p16 p17 p18 p19 p20 p21 p22 p23 p24 p25 p26 p27 p28 p29 p30 \
-     p31 p32 p33 p34 p35 p36 p37 p38 p39 p40 p41 p42 p43 p44 p45 p46 p47 p48 p49 p50 p51 p52 p53 p54 p998
- 
--LANGUAGES += \
--    ru_RU \
--    uk_UA \
--    de_DE \
--    cs_CZ \
--    he_IL \
--    fr_FR \
--    it_IT \
--    nl_NL \
--    id_ID \
--    es_ES \
--    fi_FI \
--    en_US \
--    en_CA \
--    en_IN \
--    ro_RO
-+isEmpty(LOCALES){
-+ LANGUAGES += \
-+ ru_RU \
-+ uk_UA \
-+ de_DE \
-+ cs_CZ \
-+ he_IL \
-+ fr_FR \
-+ it_IT \
-+ nl_NL \
-+ id_ID \
-+ es_ES \
-+ fi_FI \
-+ en_US \
-+ en_CA \
-+ en_IN \
-+ ro_RO \
-+ zh_CN
-+ } else {
-+ LANGUAGES = $${LOCALES}
-+ }
- 
- for(lang, LANGUAGES) {
-     INSTALL_TRANSLATIONS += $${TRANSLATIONS_PATH}/valentina_$${lang}.qm

diff --git a/media-gfx/valentina/valentina-0.5.0-r1.ebuild b/media-gfx/valentina/valentina-0.5.0-r2.ebuild
similarity index 70%
rename from media-gfx/valentina/valentina-0.5.0-r1.ebuild
rename to media-gfx/valentina/valentina-0.5.0-r2.ebuild
index 96dceba5eb9..3ba76fa3cd6 100644
--- a/media-gfx/valentina/valentina-0.5.0-r1.ebuild
+++ b/media-gfx/valentina/valentina-0.5.0-r2.ebuild
@@ -3,11 +3,13 @@
 
 EAPI=6
 
-inherit epatch qmake-utils gnome2-utils xdg-utils
+inherit qmake-utils gnome2-utils xdg-utils epatch
 
 DESCRIPTION="Cloth patternmaking software"
-HOMEPAGE="https://valentina-project.org/"
-SRC_URI="https://github.com/valentina-project/vpo2/archive/v${PV}.zip -> ${P}.zip"
+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"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -35,12 +37,11 @@ RDEPEND="${CDEPEND}"
 DEPEND="${CDEPEND}
 	app-arch/unzip"
 
-S=${WORKDIR}/dismine-${PN}-44d43351cb59
+S=${WORKDIR}/dismine-${PN}-31c95eadca8b
 
 src_prepare() {
-	epatch "${FILESDIR}/${PV}-locales.patch" \
-		"${FILESDIR}/${PV}-fix-insecure-runpaths.patch" \
-		"${FILESDIR}/${PV}-disable-tests-compilation.patch"
+	epatch "${DISTDIR}/${PN}-4798.patch" \
+		"${DISTDIR}/${PN}-4802.patch"
 
 	default
 }
@@ -60,7 +61,7 @@ src_configure() {
 src_install() {
 	emake install INSTALL_ROOT="${D}"
 
-	dodoc AUTHORS.txt ChangeLog.txt README.md
+	dodoc AUTHORS.txt ChangeLog.txt README.txt
 
 	doman dist/debian/${PN}.1
 	doman dist/debian/tape.1

diff --git a/media-gfx/valentina/valentina-9999.ebuild b/media-gfx/valentina/valentina-9999.ebuild
index 66229d43a07..3c119be7617 100644
--- a/media-gfx/valentina/valentina-9999.ebuild
+++ b/media-gfx/valentina/valentina-9999.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=6
 
-inherit git-r3 qmake-utils gnome2-utils xdg-utils
+inherit mercurial qmake-utils gnome2-utils xdg-utils
 
 DESCRIPTION="Cloth patternmaking software"
-HOMEPAGE="https://valentina-project.org/"
-EGIT_REPO_URI="https://github.com/valentina-project/vpo2.git"
-EGIT_BRANCH="develop"
+HOMEPAGE="https://valentinaproject.bitbucket.io/"
+EHG_REPO_URI="https://bitbucket.org/dismine/valentina"
+EHG_REVISION="develop"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -50,7 +50,7 @@ src_configure() {
 src_install() {
 	emake install INSTALL_ROOT="${D}"
 
-	dodoc AUTHORS.txt ChangeLog.txt README.md
+	dodoc AUTHORS.txt ChangeLog.txt README.txt
 
 	doman dist/debian/${PN}.1
 	doman dist/debian/tape.1