1 |
commit: 35277459b38617e7c8bcaaab4cdedd57c13dd845 |
2 |
Author: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Mar 9 14:36:08 2020 +0000 |
4 |
Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Mar 9 14:55:26 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35277459 |
7 |
|
8 |
sys-devel/parity: upstream changed arch names; drop _ in USE |
9 |
|
10 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
11 |
Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org> |
12 |
|
13 |
sys-devel/parity/metadata.xml | 4 ++-- |
14 |
sys-devel/parity/parity-9999.ebuild | 12 ++++++------ |
15 |
2 files changed, 8 insertions(+), 8 deletions(-) |
16 |
|
17 |
diff --git a/sys-devel/parity/metadata.xml b/sys-devel/parity/metadata.xml |
18 |
index 40c8b82ed8b..606de9ef652 100644 |
19 |
--- a/sys-devel/parity/metadata.xml |
20 |
+++ b/sys-devel/parity/metadata.xml |
21 |
@@ -19,7 +19,7 @@ |
22 |
<flag name="vc14_0">Enable support for Visual Studio 2015</flag> |
23 |
<flag name="vc15">Enable support for Visual Studio 2017</flag> |
24 |
<flag name="vc16">Enable support for Visual Studio 2019</flag> |
25 |
- <flag name="vc_x64">Enable support for 64bit Visual Studio compilers</flag> |
26 |
- <flag name="vc_x86">Enable support for 32bit Visual Studio compilers</flag> |
27 |
+ <flag name="vcx64">Enable support for 64bit Visual Studio compilers</flag> |
28 |
+ <flag name="vcx86">Enable support for 32bit Visual Studio compilers</flag> |
29 |
</use> |
30 |
</pkgmetadata> |
31 |
|
32 |
diff --git a/sys-devel/parity/parity-9999.ebuild b/sys-devel/parity/parity-9999.ebuild |
33 |
index f1ec325bab1..d6b23a8c4e0 100644 |
34 |
--- a/sys-devel/parity/parity-9999.ebuild |
35 |
+++ b/sys-devel/parity/parity-9999.ebuild |
36 |
@@ -1,4 +1,4 @@ |
37 |
-# Copyright 1999-2019 Gentoo Authors |
38 |
+# Copyright 1999-2020 Gentoo Authors |
39 |
# Distributed under the terms of the GNU General Public License v2 |
40 |
|
41 |
EAPI=6 |
42 |
@@ -9,12 +9,12 @@ if [[ ${PV} == 9999 ]]; then |
43 |
DEPEND="dev-util/confix" |
44 |
else |
45 |
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
46 |
- KEYWORDS="" |
47 |
+ KEYWORDS="~x64-cygwin" |
48 |
fi |
49 |
DESCRIPTION="A POSIX to native Win32 Cross-Compiler Tool (requires Visual Studio)" |
50 |
HOMEPAGE="https://github.com/haubi/parity" |
51 |
|
52 |
-parity-vcarchs() { echo x64 x86 ; } |
53 |
+parity-vcarchs() { echo x64=x86_64 x86=i686 ; } |
54 |
parity-vcvers-legacy() { echo 7_0 7_1 8_0 9_0 ; } |
55 |
parity-vcvers-current() { echo 10_0 11_0 12_0 14_0 15 16 ; } |
56 |
parity-vcvers() { |
57 |
@@ -25,7 +25,7 @@ parity-vcvers() { |
58 |
LICENSE="LGPL-3" |
59 |
SLOT="0" |
60 |
IUSE="$( |
61 |
- for a in $(parity-vcarchs); do echo "+vc_${a}"; done |
62 |
+ for a in $(parity-vcarchs); do echo "+vc${a%=*}"; done |
63 |
for v in $(parity-vcvers-legacy); do echo "vc${v}"; done |
64 |
for v in $(parity-vcvers-current); do echo "+vc${v}"; done |
65 |
)" |
66 |
@@ -41,8 +41,8 @@ fi |
67 |
parity-enabled-vcarchs() { |
68 |
local enabled= a |
69 |
for a in $(parity-vcarchs) ; do |
70 |
- if use vc_${a} ; then |
71 |
- enabled+=",${a}" |
72 |
+ if use vc${a%=*} ; then |
73 |
+ enabled+=",${a#*=}" |
74 |
fi |
75 |
done |
76 |
echo ${enabled#,} |