gentoo Easter resync : 12.04.2020

4 files changed, 95 insertions, 18 deletions

diff --git a/sys-devel/parity/Manifest b/sys-devel/parity/Manifest
index 20064141035a..74da0aa1099e 100644
--- a/sys-devel/parity/Manifest
+++ b/sys-devel/parity/Manifest
@@ -1,2 +1,4 @@
-EBUILD parity-9999.ebuild 1760 BLAKE2B c62864c0e71a39c4377f42d1ca9d48de76f067cce8d5366b7856425e330e507bd8897903ab1a513a4eed73323ca1f08aa2f62ff1d62fe0224c88d700c90569b9 SHA512 6d861a309dd629d75f8ccb46b3b79dc6f32587e5dc49dc7b241b4d0049aaedecc22185f4c30df93cfe519c56411115679cdbb6a648a23572fbdae806b72bf704
-MISC metadata.xml 1163 BLAKE2B 72a30d918efe5f179d9bdad8accb6a59ddee5bc65c025c2e9b8db3c2eed8a94bd99438609db8a28cca06cabbdde1e52615870384276735855612bd58f0e2ceb8 SHA512 1cb4c0a6fa98ceaf9da3ff73e959fcbc17a1b9a870610f4bc50c0729f5c2560ca9f1753934573dc47b1fe1c4ae98ca7c4dacd5ea99cce6e18c4d97141eda851c
+DIST parity-2.0.1.tar.bz2 371662 BLAKE2B c0fca272665bbe346d5d5ca18e06c65209df61454310811b939239f8ba25ec7a08ad2f864fb43780329dc1f0120afdb6ea4ee2b4b42d2888860358aa1dc176f4 SHA512 3c96c87b87f40cb7affd6ee9a87c8e7cf628aedb44a2d3d89370a5b5e32a43cb15a897ae27425e9d6a00581ffd50a70c7a7481f1ca259eddd1e6f2310b554eb9
+EBUILD parity-2.0.1.ebuild 1810 BLAKE2B 3f322b8d728dc8040dd751797f3e934e428a61c307f9fef449b2582595382469f847ff3c1f9999b9026279f9fc48ea290beac6520f355e448f306dfefa9ee49d SHA512 1342b78b764c8d9e78c8025923b143d52e31c1e323eb7793406b10b2276c7a2d0599b35a1694a9cdb69911679475019bb71739974ce6c11847743f0c4c36de43
+EBUILD parity-9999.ebuild 1810 BLAKE2B 3f322b8d728dc8040dd751797f3e934e428a61c307f9fef449b2582595382469f847ff3c1f9999b9026279f9fc48ea290beac6520f355e448f306dfefa9ee49d SHA512 1342b78b764c8d9e78c8025923b143d52e31c1e323eb7793406b10b2276c7a2d0599b35a1694a9cdb69911679475019bb71739974ce6c11847743f0c4c36de43
+MISC metadata.xml 1029 BLAKE2B 82474429a3a04609f1f1c899a235a759a2f66982d5bb7310ac51b1eea803fbb102cada8c197b14a89b66619c80ac9d1f5beefe607257c3e2c0de390e84aa3fab SHA512 d40f330e336dc0166e3666bab44b6aadb723b0cbdb0a7b47a2d292320e02649c075f28436de622b65280cf024b3f57a8945d7123ff520c4d76e0c910bcafc77a
diff --git a/sys-devel/parity/metadata.xml b/sys-devel/parity/metadata.xml
index 40c8b82ed8b6..b66b8d4e0b7e 100644
--- a/sys-devel/parity/metadata.xml
+++ b/sys-devel/parity/metadata.xml
@@ -9,8 +9,6 @@
 		<remote-id type="github">haubi/parity</remote-id>
 	</upstream>
 	<use>
-		<flag name="vc7_0">Enable support for Visual Studio 2002</flag>
-		<flag name="vc7_1">Enable support for Visual Studio 2003</flag>
 		<flag name="vc8_0">Enable support for Visual Studio 2005</flag>
 		<flag name="vc9_0">Enable support for Visual Studio 2008</flag>
 		<flag name="vc10_0">Enable support for Visual Studio 2010</flag>
@@ -19,7 +17,7 @@
 		<flag name="vc14_0">Enable support for Visual Studio 2015</flag>
 		<flag name="vc15">Enable support for Visual Studio 2017</flag>
 		<flag name="vc16">Enable support for Visual Studio 2019</flag>
-		<flag name="vc_x64">Enable support for 64bit Visual Studio compilers</flag>
-		<flag name="vc_x86">Enable support for 32bit Visual Studio compilers</flag>
+		<flag name="vcx64">Enable support for 64bit Visual Studio compilers</flag>
+		<flag name="vcx86">Enable support for 32bit Visual Studio compilers</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-devel/parity/parity-2.0.1.ebuild b/sys-devel/parity/parity-2.0.1.ebuild
new file mode 100644
index 000000000000..7f41d7bf06e6
--- /dev/null
+++ b/sys-devel/parity/parity-2.0.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == 9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="git@github.com:haubi/parity.git https://github.com/haubi/parity.git"
+	BDEPEND="dev-util/confix"
+else
+	SRC_URI="https://github.com/mduft/${PN}/releases/download/${PV}/${P}.tar.bz2"
+	KEYWORDS="~x64-cygwin"
+fi
+DESCRIPTION="A POSIX to native Win32 Cross-Compiler Tool (requires Visual Studio)"
+HOMEPAGE="https://github.com/mduft/parity"
+
+parity-vcarchs() { echo x64=x86_64 x86=i686 ; }
+parity-vcvers-legacy() { echo 8_0 9_0 ; }
+parity-vcvers-current() { echo 10_0 11_0 12_0 14_0 15 16 ; }
+parity-vcvers() {
+	parity-vcvers-legacy
+	parity-vcvers-current
+}
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="$(
+	for a in $(parity-vcarchs); do echo "+vc${a%=*}"; done
+	for v in $(parity-vcvers-legacy); do echo "vc${v}"; done
+	for v in $(parity-vcvers-current); do echo "+vc${v}"; done
+)"
+
+if [[ ${PV} == 9999 ]]; then
+	src_prepare() {
+		default
+		confix --output || die
+		eautoreconf
+	}
+fi
+
+parity-enabled-vcarchs() {
+	local enabled= a
+	for a in $(parity-vcarchs) ; do
+		if use vc${a%=*} ; then
+			enabled+=",${a#*=}"
+		fi
+	done
+	echo ${enabled#,}
+}
+
+parity-enabled-vcvers() {
+	local enabled= v
+	for v in $(parity-vcvers) ; do
+		if use vc${v} ; then
+			enabled+=",${v/_/.}"
+		fi
+	done
+	echo ${enabled#,}
+}
+
+src_configure() {
+	local myconf=(
+		--enable-msvc-archs="$(parity-enabled-vcarchs)"
+		--enable-msvc-versions="$(parity-enabled-vcvers)"
+		--disable-default-msvc-version
+	)
+	econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+	if [[ -n ${ROOT} ]] ; then
+		einfo "To enable all available MSVC versions, on the target machine please run:"
+		einfo " '${EPREFIX}/usr/bin/parity-setup' --enable-all"
+	else
+		"${EPREFIX}"/usr/bin/parity-setup --enable-all
+	fi
+}
diff --git a/sys-devel/parity/parity-9999.ebuild b/sys-devel/parity/parity-9999.ebuild
index f1ec325bab1f..7f41d7bf06e6 100644
--- a/sys-devel/parity/parity-9999.ebuild
+++ b/sys-devel/parity/parity-9999.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV} == 9999 ]]; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="git@github.com:haubi/parity.git https://github.com/haubi/parity.git"
-	DEPEND="dev-util/confix"
+	BDEPEND="dev-util/confix"
 else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS=""
+	SRC_URI="https://github.com/mduft/${PN}/releases/download/${PV}/${P}.tar.bz2"
+	KEYWORDS="~x64-cygwin"
 fi
 DESCRIPTION="A POSIX to native Win32 Cross-Compiler Tool (requires Visual Studio)"
-HOMEPAGE="https://github.com/haubi/parity"
+HOMEPAGE="https://github.com/mduft/parity"
 
-parity-vcarchs() { echo x64 x86 ; }
-parity-vcvers-legacy() { echo 7_0 7_1 8_0 9_0 ; }
+parity-vcarchs() { echo x64=x86_64 x86=i686 ; }
+parity-vcvers-legacy() { echo 8_0 9_0 ; }
 parity-vcvers-current() { echo 10_0 11_0 12_0 14_0 15 16 ; }
 parity-vcvers() {
 	parity-vcvers-legacy
@@ -25,7 +25,7 @@ parity-vcvers() {
 LICENSE="LGPL-3"
 SLOT="0"
 IUSE="$(
-	for a in $(parity-vcarchs); do echo "+vc_${a}"; done
+	for a in $(parity-vcarchs); do echo "+vc${a%=*}"; done
 	for v in $(parity-vcvers-legacy); do echo "vc${v}"; done
 	for v in $(parity-vcvers-current); do echo "+vc${v}"; done
 )"
@@ -41,8 +41,8 @@ fi
 parity-enabled-vcarchs() {
 	local enabled= a
 	for a in $(parity-vcarchs) ; do
-		if use vc_${a} ; then
-			enabled+=",${a}"
+		if use vc${a%=*} ; then
+			enabled+=",${a#*=}"
 		fi
 	done
 	echo ${enabled#,}
@@ -68,7 +68,7 @@ src_configure() {
 }
 
 pkg_postinst() {
-	if [[ -n ${ROOT%/} ]] ; then
+	if [[ -n ${ROOT} ]] ; then
 		einfo "To enable all available MSVC versions, on the target machine please run:"
 		einfo " '${EPREFIX}/usr/bin/parity-setup' --enable-all"
 	else