gentoo resync : 29.01.2021

3 files changed, 79 insertions, 2 deletions

diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest
index f735ae50a7c2..3343c98e355f 100644
--- a/media-gfx/valentina/Manifest
+++ b/media-gfx/valentina/Manifest
@@ -1,6 +1,7 @@
 AUX 5823.patch 1870 BLAKE2B 1a4edc390abd09010fb946035dab6f4ee9223eaa286f9843404db4f95d94e60da73dbf515c99aa857acdcb7d26bca3117fcdfdf2b9514ad45c2e795ab579cc46 SHA512 0cf9d1691816b165ab691cd34807f7c82eea685b5af2d9c483a9427987ae565f44e31bffcec9c3ede6102aa800d3988b054a178ec74f1826be1a88fd9f5ec28c
+AUX valentina-0.6.1-disable-vcs-version.patch 2623 BLAKE2B 30ed726eabcbf18269fb41f7cb32230b0f498364b6e2922de415cc93c4fce49dca2b5db7d28cc8fb34efbc11e7b8f136f601fc0d552b52869042c496cf627463 SHA512 906f82b0793919be6a846030b4b5891e716967e9c2bd8b01bf81671383cc5f20d50ddc0c6d174c08b5e5f31522acf7283b2cc6d11e29bca60d45a64cc7418e98
 DIST valentina-5858.patch.bz2 4507 BLAKE2B 10bf1e48b9c822b5fecd040edea05a9fa16bc84d6d8a872a50329bd6b61ae250b489fbf71b19f0453ab5caea0bd7dc821d8c6fbe0fc24a6306d57ce5b34350f9 SHA512 037d2a5305d85d7d6be90c181ee6c39110a86c5f5d77c22453a2933e7d6a43c600f6ffb393015e98f9aab55b0d11291dca482352e1fc74f485578b65b3b84720
 DIST valentina-v0.6.1.tar.bz2 25575677 BLAKE2B 56d5adc973df319b3a65f877768c2195e1af2db39118e18fb17636e5739610d55e4ade4d4516a6817347dcdb0e4468e4587cff91fc5a5ea74a35029c52bf858c SHA512 52a3a02bd08f85c6241fe29baa9c8a2b80d2e8b071877bc68f98c3ff7bcdf810d9975903f804bf4e120f1a65c06de405fd44bc822292ab7b6191b778ec703542
-EBUILD valentina-0.6.1-r1.ebuild 2143 BLAKE2B 5f3b0e7038c3809c97ff5ab5ffc139897d68d822a201c792b0d235588f33a97dce4a3b1e260e05b19ce44a39bb2812659a960493febde39029837316220e50c4 SHA512 459aaa638771b0312dce45786b7f7074e74d7cc28115ba5d27080174c0695ffaf3ad00f07e3e5a41fc296b364fbd292943591349ae3326864680a2f3176fc0f5
+EBUILD valentina-0.6.1-r1.ebuild 2189 BLAKE2B aea847aa2313d46ebf889531806f1f9c2a5e1d4865c78faed42587ff76d5908e3012da8af7add2f794c1aba39e924d88800a638cfdaa6f791275cadb06bb1e9c SHA512 d52df819ca46613b322b6de0470180b689e954334838adddd61b12aae3d3217facb731f957c5799830461caa03deaf8463a89ca3b1767af4bc8e2b4632cdc8ff
 EBUILD valentina-9999.ebuild 1945 BLAKE2B ba3f8e84d5654d312910d83d7ba2a2d875477b08e85b140e3e9d9bbf43ae25dcc67b32cc3933dd66bb2201e464b853c935378d70583e7295c3c3269c32311a74 SHA512 10651225c740f0a513c3733b7f6a5417510062a30f08743c0d8e50fa6053ec708c29b7e2ec5740fc8ffbff7333b7a8ec987f758924a9bc25a401fb25dda2bb49
 MISC metadata.xml 334 BLAKE2B 7f146a505a30d4461165308b40383e2b78998411874c8af6113c3040142003868f397872ecd22b9b8f3ec6193c532fa934c8646ee04e8c49157464b58035de09 SHA512 d1264aa0d26ba75466c5572c37ca6fd384d4e6db392aca0e47d4b1d0bd3ef7e035fed51c460af1bb258c500d1cc9211ec2e85db3e3aa158d378fb1389a3ebf03
diff --git a/media-gfx/valentina/files/valentina-0.6.1-disable-vcs-version.patch b/media-gfx/valentina/files/valentina-0.6.1-disable-vcs-version.patch
new file mode 100644
index 000000000000..471d7a85313c
--- /dev/null
+++ b/media-gfx/valentina/files/valentina-0.6.1-disable-vcs-version.patch
@@ -0,0 +1,75 @@
+diff --git a/common.pri b/common.pri
+index 523aa7c..33be789 100644
+--- a/common.pri
++++ b/common.pri
+@@ -212,37 +212,7 @@ defineReplace(enable_ccache){
+ }
+ 
+ defineReplace(FindBuildRevision){
+-CONFIG(debug, debug|release){
+-    # Debug mode
+-    return(\\\"unknown\\\")
+-}else{
+-    # Release mode
+-
+-    macx{
+-        HG = /usr/local/bin/hg # Can't defeat PATH variable on Mac OS.
+-    }else {
+-        HG = hg # All other platforms are OK.
+-    }
+-
+-    #build revision number for using in version
+-    unix {
+-        DVCS_HESH=$$system("$${HG} log -r. --template '{node|short}'")
+-    } else {
+-        # Use escape character before "|" on Windows
+-        DVCS_HESH=$$system($${HG} log -r. --template "{node^|short}")
+-    }
+-    isEmpty(DVCS_HESH){
+-        DVCS_HESH=$$system("git rev-parse --short HEAD")
+-        isEmpty(DVCS_HESH){
+-            DVCS_HESH = \\\"unknown\\\" # if we can't find build revision left unknown.
+-        } else {
+-            DVCS_HESH=\\\"Git:$${DVCS_HESH}\\\"
+-        }
+-    } else {
+-        DVCS_HESH=\\\"Hg:$${DVCS_HESH}\\\"
+-    }
+-    return($${DVCS_HESH})
+-}
++return(\\\"unknown\\\")
+ }
+ 
+ # Default prefix. Use for creation install path.
+diff --git a/src/libs/vmisc/vmisc.pro b/src/libs/vmisc/vmisc.pro
+index cf8db51..fff1c0e 100644
+--- a/src/libs/vmisc/vmisc.pro
++++ b/src/libs/vmisc/vmisc.pro
+@@ -98,10 +98,7 @@ CONFIG(debug, debug|release){
+         HG = hg # All other platforms all OK.
+     }
+     #latest tag distance number for using in version
+-    HG_DISTANCE=$$system($${HG} log -r. --template '{latesttagdistance}')
+-    isEmpty(HG_DISTANCE){
+-        HG_DISTANCE = 0 # if we can't find local revision left 0.
+-    }
++    HG_DISTANCE = 0 # if we can't find local revision left 0.
+     message("Latest tag distance:" $${HG_DISTANCE})
+     DEFINES += "LATEST_TAG_DISTANCE=$${HG_DISTANCE}" # Make available latest tag distance number in sources.
+ }
+diff --git a/src/libs/vtest/vtest.pro b/src/libs/vtest/vtest.pro
+index a336d48..c943fc5 100644
+--- a/src/libs/vtest/vtest.pro
++++ b/src/libs/vtest/vtest.pro
+@@ -92,10 +92,7 @@ CONFIG(debug, debug|release){
+         HG = hg # All other platforms all OK.
+     }
+     #latest tag distance number for using in version
+-    HG_DISTANCE=$$system($${HG} log -r. --template '{latesttagdistance}')
+-    isEmpty(HG_DISTANCE){
+-        HG_DISTANCE = 0 # if we can't find local revision left 0.
+-    }
++    HG_DISTANCE = 0 # if we can't find local revision left 0.
+     message("Latest tag distance:" $${HG_DISTANCE})
+     DEFINES += "LATEST_TAG_DISTANCE=$${HG_DISTANCE}" # Make available latest tag distance number in sources.
+ }
diff --git a/media-gfx/valentina/valentina-0.6.1-r1.ebuild b/media-gfx/valentina/valentina-0.6.1-r1.ebuild
index d6decfb393ab..e770ab6d6e98 100644
--- a/media-gfx/valentina/valentina-0.6.1-r1.ebuild
+++ b/media-gfx/valentina/valentina-0.6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -45,6 +45,7 @@ S=${WORKDIR}/${PN}-v${PV}
 
 PATCHES=(
 	"${FILESDIR}/5823.patch"
+	"${FILESDIR}/${P}-disable-vcs-version.patch"
 	"${WORKDIR}/valentina-5858.patch"
 )