gentoo resync : 07.07.2018

3 files changed, 55 insertions, 28 deletions

diff --git a/sys-devel/parity/Manifest b/sys-devel/parity/Manifest
index d546de112092..237f750972a9 100644
--- a/sys-devel/parity/Manifest
+++ b/sys-devel/parity/Manifest
@@ -5,5 +5,5 @@ DIST parity-1.2.6.tar.gz 559357 BLAKE2B 733721306e02e50d5fc65859b77d562c4fd5a7df
 EBUILD parity-1.2.4.ebuild 1840 BLAKE2B b2f7e16a0991c862e70e32a6dbd1c5b0825579983e408cd5230b2b6678272405f8c538cc79e8cd89ce981251a66b17f9f5841dc3ba810fb7306ef6e035fcac83 SHA512 b9a729395449b6265357c134b56046bd3928dfb2c99a526e402be319c74f04ddfeca107ca15db3c405ec1d9a9ed2b512e24aa48f7d57db0ae485c6ce86ff1379
 EBUILD parity-1.2.5.ebuild 1840 BLAKE2B b2f7e16a0991c862e70e32a6dbd1c5b0825579983e408cd5230b2b6678272405f8c538cc79e8cd89ce981251a66b17f9f5841dc3ba810fb7306ef6e035fcac83 SHA512 b9a729395449b6265357c134b56046bd3928dfb2c99a526e402be319c74f04ddfeca107ca15db3c405ec1d9a9ed2b512e24aa48f7d57db0ae485c6ce86ff1379
 EBUILD parity-1.2.6.ebuild 1912 BLAKE2B aa23528b4e873248845648dbeb3b065f1b96e7dc402779f572c12bcb094396bba497ce9aedae51d5c8adc0e89fc5193287fab44c06c8793644e2dc9af32a5ce6 SHA512 3472126d0cca7f23f207187fe648c48a31abfafb7440a815f1a7dae952b53a42732fa3d50dae3b3e3eb5f5b42c00bfcd847f108a9845ecd21ecc440245b47c99
-EBUILD parity-9999.ebuild 1556 BLAKE2B df93113f7466ca912d2b2c6ff521798b087fb1887c2d0fd4cd67601d999dac79432b8900c88f3da658f1729a19b619f4200b559ecd2eac4c056457829f1fb072 SHA512 a24c92b8e9c312568cb52148e605a4b8a4fccc0708641ce5bbf5185c028f4fe98cb88ceda5afb080d0954b0ec192d3cd2593f22281321733877d581e1b6e2202
-MISC metadata.xml 381 BLAKE2B 31a3e33b6db4147ba07a7fc4988acdf194d3592491b749e5fc7782016ade2462ff6f5eea343cf20ccda35062cc366bcb63e9534b75a8344be8ec520b7e653141 SHA512 6ba0a9716f0ac257e89c2a2ac1b35c9a39f8ced04260b74c4e8fce0906a9dbcad9844817aaeb8c3288e16cd3897c3617233d19634728f8e49a2e31e0d39e586e
+EBUILD parity-9999.ebuild 1564 BLAKE2B c95521e6e6932cfcdd542e6120bd3f594027d62d968654fb7378c377fa800e868bfe51264e9e4469af849c715907c5e4929303aaaca9f7727d1387456d0c92bc SHA512 b2df1abe207af6e9e20663fee5ee3c652bff655e22a039894f5b0bc275db0b3a817d9ff875d0f8cfa6a60b2e3f57e1dbdce514aeabe2d6a6ef18a031316f6377
+MISC metadata.xml 1022 BLAKE2B 2d956608c84b46a6d6ad2621e7e1e8987bb5090a3ea68ea894b193ce4011e3bd05ffaa7c554077eb7a514db423a45fce39e2021005b7a3dff7ddd445c7fd6fd5 SHA512 78b79c971f871f42fa524a88caa17cfc3a44572c9aa35faeace1024c8ad363cb4328823261bd4f03993c052944e3870f307816d1782c4152f0d2a1ca4e8b001e
diff --git a/sys-devel/parity/metadata.xml b/sys-devel/parity/metadata.xml
index c0714eac500c..2d8ffbadd138 100644
--- a/sys-devel/parity/metadata.xml
+++ b/sys-devel/parity/metadata.xml
@@ -6,7 +6,18 @@
 		<name>Michael Haubenwallner</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">parity</remote-id>
 		<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>
+		<flag name="vc11_0">Enable support for Visual Studio 2012</flag>
+		<flag name="vc12_0">Enable support for Visual Studio 2013</flag>
+		<flag name="vc14_0">Enable support for Visual Studio 2015</flag>
+		<flag name="vc15_0">Enable support for Visual Studio 2017</flag>
+		<flag name="vc_x86">Enable support for 32bit Visual Studio compilers</flag>
+	</use>
 </pkgmetadata>
diff --git a/sys-devel/parity/parity-9999.ebuild b/sys-devel/parity/parity-9999.ebuild
index 381b4c753823..24a6582d4eab 100644
--- a/sys-devel/parity/parity-9999.ebuild
+++ b/sys-devel/parity/parity-9999.ebuild
@@ -14,9 +14,15 @@ fi
 DESCRIPTION="A POSIX to native Win32 Cross-Compiler Tool (requires Visual Studio)"
 HOMEPAGE="https://github.com/haubi/parity"
 
+parity-vcarchs() { echo x86 ; }
+parity-vcvers() { echo 7_0 7_1 8_0 9_0 10_0 11_0 12_0 14_0 15_0 ; }
+
 LICENSE="LGPL-3"
 SLOT="0"
-IUSE=""
+IUSE="$(
+	for a in $(parity-vcarchs); do echo "+vc_${a}"; done
+	for v in $(parity-vcvers); do echo "+vc${v}"; done
+)"
 
 if [[ ${PV} == 9999 ]]; then
 	src_prepare() {
@@ -25,30 +31,40 @@ if [[ ${PV} == 9999 ]]; then
 	}
 fi
 
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# create i586-pc-winnt-g[++|cc|..] links..
-	local exeext=
-
-	[[ -f ${ED}usr/bin/parity.gnu.gcc.exe ]] && exeext=.exe
-
-	# create cross compiler syms, also for former versioned winnt profiles
-	local v t
-	for v in "" 5.2 6.1; do
-		dosym /usr/bin/parity.gnu.gcc${exeext} /usr/bin/i586-pc-winnt${v}-c++
-		dosym /usr/bin/parity.gnu.gcc${exeext} /usr/bin/i586-pc-winnt${v}-g++
-		for t in gcc ld windres ar nm ranlib strip; do
-			if [[ -e "${ED}"usr/bin/parity.gnu.${t}${exeext} ]]; then
-				dosym /usr/bin/parity.gnu.${t}${exeext} /usr/bin/i586-pc-winnt${v}-${t}
-			else
-				dosym /usr/bin/parity.gnu.${t} /usr/bin/i586-pc-winnt${v}-${t}
-			fi
-		done
+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[@]}"
+}
 
-	# we don't need the header files installed by parity... private
-	# header files are supported with a patch from 2.1.0-r1 onwards,
-	# so they won't be there anymore, but -f does the job in any case.
-	rm -f "${ED}"/usr/include/*.h
+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
 }