Revbump, bug#450574, with patch to not abort on fatal exception when debugger is present. No point in having the x86-winnt keyword. Prevent live keywords from ekeyword.

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xA630CCB8

5 files changed, 114 insertions, 13 deletions

diff --git a/sys-devel/parity/ChangeLog b/sys-devel/parity/ChangeLog
index 8f8410456183..1918c6a7470e 100644
--- a/sys-devel/parity/ChangeLog
+++ b/sys-devel/parity/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-devel/parity
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/parity/ChangeLog,v 1.3 2012/04/16 08:40:47 haubi Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/parity/ChangeLog,v 1.4 2013/01/17 10:57:50 haubi Exp $
+
+*parity-1.2.6 (17 Jan 2013)
+
+  17 Jan 2013; Michael Haubenwallner <haubi@gentoo.org> +parity-1.2.6.ebuild,
+  +files/parity-1.2.6-debugging.patch, parity-9999.ebuild:
+  Revbump, bug#450574, with patch to not abort on fatal exception when debugger
+  is present. No point in having the x86-winnt keyword. Prevent live keywords
+  from ekeyword.
 
   16 Apr 2012; Michael Haubenwallner <haubi@gentoo.org> metadata.xml:
   add myself as co-maintainer
diff --git a/sys-devel/parity/Manifest b/sys-devel/parity/Manifest
index 3d817d1fec57..234b11069c41 100644
--- a/sys-devel/parity/Manifest
+++ b/sys-devel/parity/Manifest
@@ -1,7 +1,20 @@
-DIST parity-1.2.4.tar.gz 456408 RMD160 e5dc1bc61cac7679a4589acfb6f9bb244a32be5b SHA1 e631d729dd56deac55cf44b618e32d037154dbeb SHA256 13d781a5f606244f53d980bdb362f30bbdb67d29e8d93075c893fc7ee13fc496
-DIST parity-1.2.5.tar.gz 559411 RMD160 32f34161ae8521062a864a0e298d28376f8d954f SHA1 227d39425201262af0027e500572f84d41b4a0cb SHA256 950d7888c7bf0cd6ad8955b4781d2fafcbdae2b009d13f80929b12a1af9cc4df
-EBUILD parity-1.2.4.ebuild 1971 RMD160 f3c4e520842520a577b0c255e043de6cec941d44 SHA1 9332ec5e168e3400bf4857e456bc40475e0f5b4f SHA256 082377ce869623c0ea6a45f0f1e50b42d8f3c296140f348fc447a8d426568462
-EBUILD parity-1.2.5.ebuild 1967 RMD160 edf947fd307fae37bac105b2ba24c45e923397cf SHA1 92b300523f7b6ea02d4d90690f8a8efb598611ad SHA256 413da9340a02f0dfeae5b1b19b7e6df30309a91de73c344910297ca18fcd7c10
-EBUILD parity-9999.ebuild 1969 RMD160 734a381f17dc884901e5b9a577a5d9fe6b96cd01 SHA1 d2d3ed1bd81603cfdbfea77c555e351c8388237d SHA256 e7814da6660ea832c2fcb694c8c6832ff972e2728ce6c5052a887c585e72504d
-MISC ChangeLog 3798 RMD160 cddcab9bb3ca0e028c784378a2c995a1014c8ef9 SHA1 307ecc18a7fa5edc572dfa5873c77aca483f394e SHA256 91b42940ed5a5a6cebbddbdf7545471074e14efb70f1672ff7dc5b0653e00846
-MISC metadata.xml 365 RMD160 9b421b049d27f9ffc3526ef5ff834f0d14731952 SHA1 9ea6dc48f3ddd94fa39e74eb631956afb0d6ad19 SHA256 141dbd421fd624489a1f1067fa6858dec1bf84507398dfb10be18ec2e97ae5ab
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX parity-1.2.6-debugging.patch 431 SHA256 dc502d3650a887807afb52474fc682003d9c28afb1f6bdf91a66226884ef2a43 SHA512 da62fc499c5d9e25c3373d8f3529c8dfb0c26bfb08bba851b144d4f2f0b98e29fcf2d1e11022d10412b67afad84e70bcd5456842f4beccaaeab1bf1091e9ddb9 WHIRLPOOL b0cb5fe0e187521e3f6d503e8ffbac4238f7003119b1ff5e2e35a982e88d4dc25965b46dd050962a9ea205593353ba3b9d01d2cadf5d2f42d1a80374ac2410ca
+DIST parity-1.2.4.tar.gz 456408 SHA256 13d781a5f606244f53d980bdb362f30bbdb67d29e8d93075c893fc7ee13fc496
+DIST parity-1.2.5.tar.gz 559411 SHA256 950d7888c7bf0cd6ad8955b4781d2fafcbdae2b009d13f80929b12a1af9cc4df SHA512 daadf80582b7fa8914f7899e4055185885164210f9a970ff178c3846da83058e3bd70c1db10406e3bcaef05148e87226846cb39e30cbbd1e0821176a8f65c32b WHIRLPOOL 90f3803b0fd62b5a8d198a3c2c95eb23a7db62ad80b49ec71daf7eb834f51f5af37a1efaba9bcaa7d54170655c527d95b4e399c4038993f0b17a9dba3dbe2fe6
+DIST parity-1.2.6.tar.gz 559357 SHA256 a0b9fb69e6bbef5f2b4a6ef84910c23b8cac5649456ef1834d0517a06d2c3537 SHA512 fe043feef71db20cf759fd1b5eb8e855f5f78b278f48e9d4afdd2c06fc6c6ae861439cde3829728d3548e072cb065aea5d4048da7ad8bc49f5bc7fcebf7ad430 WHIRLPOOL 98662c7f37b3eb4040ac49e1135d4fa6bbea8a4473094ee5d9f12c79fa81886dbf4ccd3037d56f55ee707a0d749be6898b6826e8f7126b426608011d79a042fe
+EBUILD parity-1.2.4.ebuild 1971 SHA256 082377ce869623c0ea6a45f0f1e50b42d8f3c296140f348fc447a8d426568462 SHA512 c9a4f88912ed01fdf992c306c5efa68f43d425c3989da5bda35dafca76d4fe723653cb35aa0a074ffdbb848899470a534a677ae24aa9aa788a1a8260cbb021ba WHIRLPOOL 69993fefc4ac413abef3262b1b974a82851d3e2e04efc29123e437860bd2990b5e590cd2a2e5c8715437a3a95b61350dc2f31d7215ce32dd01d41d7360f75609
+EBUILD parity-1.2.5.ebuild 1967 SHA256 413da9340a02f0dfeae5b1b19b7e6df30309a91de73c344910297ca18fcd7c10 SHA512 c23ed0441a44495730b5f019100507f2a7d408e8cfe89f9cec1e370578675a1626f4bea444ecb1285c71361d2985f4becaba5a4793960235bf90df9553a53df0 WHIRLPOOL cc0f332b1703eaf4b47f0b45c00c8206c4901fdd829c72032b3b2bceca8571b161e73c0fc9f38bba7b898bd2c76b9bc94e099a838dc0836b90f2a076801d2695
+EBUILD parity-1.2.6.ebuild 2038 SHA256 11beb17675e185d0fbb1735658ba1ce37ec2bd807ec1171646070c51337d7e96 SHA512 d78666e88f8bf38772ea0f2c3b6a9d4420eb272a18914e31a06fd554bef14f87723da24e17a7ced55e1581b277261a37c673ced2e80b0e3ccfe45c276cec9ef1 WHIRLPOOL 67aa3e05375b15e3a2e1bac286c2164c14b0a5dc440b408ba13886dfb43b68ed0affeaf3a6c2855b60a97a821529e6f87634342b9295c99d2c691f2129c7d9ca
+EBUILD parity-9999.ebuild 1959 SHA256 b572bf6722c20a7c29561c056ff114386f05f6e127f8c26cfaba2b4290da0191 SHA512 2b56006b01b19c4ba703fdcfb462ecfecaaa0c49e96fe0592513fed22c9d762b9a51bef52f2ac94ed1983833108ed5cffa988200084da49e5125a482ef2d7947 WHIRLPOOL 4de24a0d6fa81740953f579ca8fc47c512f000c26a54bd35bd37b9801d345d3d33c77f830e56e67bade346729449647a16ee36a2837bbf89cfd5c1d184979e79
+MISC ChangeLog 4140 SHA256 51a87b17b70ed9fddbcc1e8360ed4867e00b29bf3f85a64e2fefd15678185639 SHA512 ab82d142b4b6fbc0b88a281f43d69c87a739a19d8eb93db55c07e807eae3727ed978d513a3d607fe918863592432cdaa5f8a2a217362c9b1ff25bd48b4c3db78 WHIRLPOOL 3dd4ed5ee6b6d49904217e5f41423936c1ed4311d2f4bf2ecd4099d75d0ee239cf37ddb8975ef45e05d09b5535359031c667df6be4eeca845a425d8c6efd8303
+MISC metadata.xml 365 SHA256 141dbd421fd624489a1f1067fa6858dec1bf84507398dfb10be18ec2e97ae5ab SHA512 b505e001c6c2a516cde97bd1a17d4fd542c26b4b19cd7c4f3914bc16bb6e300f43ce162f84309539e054187dfc3ddc381cd9832b4534f2b7c2446d8c8a50820a WHIRLPOOL 888db1a6fab66edd6bfae287d678a3ec9a2f63937285ee4c6e25143c06bc8084f2e6c45e57083dae78ff57898b3b5f63cc08f2f721e4496bb71852af2c53d0b5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREIAAYFAlD32WIACgkQLc0TWKYwzLjfagCgsNoMm98AeNRd2Djghk6m5hhD
+Q5AAmwQ7c5kvkGwcYGeQ4swloUf3SB40
+=7ETt
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/parity/files/parity-1.2.6-debugging.patch b/sys-devel/parity/files/parity-1.2.6-debugging.patch
new file mode 100644
index 000000000000..709f46ee9734
--- /dev/null
+++ b/sys-devel/parity/files/parity-1.2.6-debugging.patch
@@ -0,0 +1,17 @@
+--- parity.runtime/diagnose.c.orig	2012-09-28 17:12:54 +0200
++++ parity.runtime/diagnose.c	2012-09-28 17:11:14 +0200
+@@ -745,9 +745,11 @@
+ 		CloseHandle(hCore);
+ 	}
+ 
+-	// abort on fatal exceptions
+-	TerminateProcess(GetCurrentProcess(), 1);
+-	ExitProcess(1);
++	if (!IsDebuggerPresent()) {
++		// abort on fatal exceptions
++		TerminateProcess(GetCurrentProcess(), 1);
++		ExitProcess(1);
++	}
+ 	return EXCEPTION_CONTINUE_SEARCH;
+ }
+ 
diff --git a/sys-devel/parity/parity-1.2.6.ebuild b/sys-devel/parity/parity-1.2.6.ebuild
new file mode 100644
index 000000000000..54c54ff53917
--- /dev/null
+++ b/sys-devel/parity/parity-1.2.6.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/parity/parity-1.2.6.ebuild,v 1.1 2013/01/17 10:57:50 haubi Exp $
+
+EAPI=4
+
+inherit eutils
+
+if [[ ${PV} == 9999 ]]; then
+	inherit subversion
+	ESVN_REPO_URI="https://parity.svn.sf.net/svnroot/parity/trunk"
+	ESVN_BOOTSTRAP="confix --bootstrap"
+	ESVN_PROJECT="${PN}"
+	: ${KEYWORDS=""}
+
+	DEPEND="dev-util/confix"
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	KEYWORDS="~x86-interix"
+fi
+DESCRIPTION="An Interix to native Win32 Cross-Compiler Tool (requires Visual Studio)."
+HOMEPAGE="http://www.sourceforge.net/projects/parity/"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE=""
+
+pkg_setup() {
+	if [ -z "${MSSDK}" ]; then
+		einfo "NOTE: When using Visual Studio 2008, the Platform SDK is no longer"
+		einfo "installed alongside with the other components, but has it's own"
+		einfo "root directory, most likely something like this:"
+		einfo ""
+		einfo "  C:\\Program Files\\Microsoft SDKs\\Windows\\v6.0A"
+		einfo ""
+		einfo "To make parity find it's paths correctly, please set MSSDK to the"
+		einfo "value correspoding to the above example for your system."
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-debugging.patch
+}
+
+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
+	dosym /usr/bin/parity.gnu.gcc${exeext} /usr/bin/i586-pc-winnt$(uname -r)-gcc
+	dosym /usr/bin/parity.gnu.gcc${exeext} /usr/bin/i586-pc-winnt$(uname -r)-c++
+	dosym /usr/bin/parity.gnu.gcc${exeext} /usr/bin/i586-pc-winnt$(uname -r)-g++
+	dosym /usr/bin/parity.gnu.ld${exeext} /usr/bin/i586-pc-winnt$(uname -r)-ld
+
+	# 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
+}
diff --git a/sys-devel/parity/parity-9999.ebuild b/sys-devel/parity/parity-9999.ebuild
index d1ee5b12ea5f..7fbf94c95ef7 100644
--- a/sys-devel/parity/parity-9999.ebuild
+++ b/sys-devel/parity/parity-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/parity/parity-9999.ebuild,v 1.3 2011/08/10 20:31:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/parity/parity-9999.ebuild,v 1.4 2013/01/17 10:57:50 haubi Exp $
 
 EAPI=4
 
@@ -9,12 +9,12 @@ if [[ ${PV} == 9999 ]]; then
 	ESVN_REPO_URI="https://parity.svn.sf.net/svnroot/parity/trunk"
 	ESVN_BOOTSTRAP="confix --bootstrap"
 	ESVN_PROJECT="${PN}"
-	KEYWORDS=""
+	: ${KEYWORDS=""}
 
 	DEPEND="dev-util/confix"
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~x86-interix ~x86-winnt"
+	KEYWORDS="~x86-interix"
 fi
 DESCRIPTION="An Interix to native Win32 Cross-Compiler Tool (requires Visual Studio)."
 HOMEPAGE="http://www.sourceforge.net/projects/parity/"