New gpa.desktop patch.

7 files changed, 373 insertions, 6 deletions

diff --git a/app-crypt/gpa/ChangeLog b/app-crypt/gpa/ChangeLog
new file mode 100644
index 0000000..168a4ea
--- /dev/null
+++ b/app-crypt/gpa/ChangeLog
@@ -0,0 +1,269 @@
+# ChangeLog for app-crypt/gpa
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpa/ChangeLog,v 1.76 2010/09/29 06:20:47 ssuominen Exp $
+
+  29 Sep 2010; Samuli Suominen <ssuominen@gentoo.org>
+  gpa-0.9.1_pre20100416.ebuild, +files/gpa-desktop-file-validate.patch:
+  Replace po/Makefile.in.in with a system copy wrt #323743 by Lars Wendler.
+  Validate .desktop entry with desktop-file-utils 0.17.
+
+  13 Sep 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -gpa-0.9.0.ebuild:
+  Delete.
+
+  30 Aug 2010; Raúl Porcel <armin76@gentoo.org>
+  gpa-0.9.1_pre20100416.ebuild:
+  alpha/sparc stable wrt #320037
+
+  21 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  gpa-0.9.1_pre20100416.ebuild:
+  ppc64 stable wrt #320037
+
+  27 Jun 2010; Christian Faulhammer <fauli@gentoo.org>
+  gpa-0.9.1_pre20100416.ebuild:
+  stable x86, bug 320037
+
+  26 May 2010; Markos Chandras <hwoarang@gentoo.org>
+  gpa-0.9.1_pre20100416.ebuild:
+  Stable on amd64 wrt bug #320037
+
+  24 May 2010; <nixnut@gentoo.org> gpa-0.9.1_pre20100416.ebuild:
+  ppc stable #320037
+
+*gpa-0.9.1_pre20100416 (16 Apr 2010)
+
+  16 Apr 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +gpa-0.9.1_pre20100416.ebuild:
+  Add snapshot supporting libassuan-2.
+
+  30 Jan 2010; Raúl Porcel <armin76@gentoo.org> gpa-0.9.0.ebuild:
+  sparc stable wrt #279367
+
+  14 Jan 2010; Christian Faulhammer <fauli@gentoo.org> gpa-0.9.0.ebuild:
+  stable x86, bug 279367
+
+  24 Dec 2009; Pacho Ramos <pacho@gentoo.org> gpa-0.9.0.ebuild:
+  amd64 stable, bug 279367
+
+  31 Aug 2009; Brent Baude <ranger@gentoo.org> gpa-0.9.0.ebuild:
+  stable ppc64, bug 279367
+
+  29 Aug 2009; nixnut <nixnut@gentoo.org> gpa-0.9.0.ebuild:
+  ppc stable #279367
+
+  28 Aug 2009; Tobias Klausmann <klausman@gentoo.org> gpa-0.9.0.ebuild:
+  Stable on alpha, bug #279367
+
+*gpa-0.9.0 (27 Jun 2009)
+
+  27 Jun 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -gpa-0.7.6.ebuild, -files/gpa-0.7.6-qa.patch, +gpa-0.9.0.ebuild:
+  Version bump.
+
+  26 Apr 2009; Brent Baude <ranger@gentoo.org> gpa-0.8.0.ebuild:
+  stable ppc, bug 266047
+
+  23 Apr 2009; Raúl Porcel <armin76@gentoo.org> gpa-0.8.0.ebuild:
+  sparc stable wrt #266047
+
+  19 Apr 2009; Markus Meier <maekke@gentoo.org> gpa-0.8.0:
+  amd64/x86 stable, bug #266047
+
+  18 Apr 2009; Tobias Klausmann <klausman@gentoo.org> gpa-0.8.0.ebuild:
+  Stable on alpha, bug #266047
+
+  14 Apr 2009; Brent Baude <ranger@gentoo.org> gpa-0.8.0.ebuild:
+  Marking gpa-0.8.0 ppc64 for bug 266047
+
+*gpa-0.8.0 (04 Nov 2008)
+
+  04 Nov 2008; Daniel Black <dragonheart@gentoo.org> +gpa-0.8.0.ebuild:
+  version bump as per bug #237858 thanks to Arfrever and Christian
+
+  01 Sep 2008; Daniel Black <dragonheart@gentoo.org> gpa-0.7.6.ebuild:
+  correct path to gnupg helper programs. thanks to Mario/Kristoffer in bug
+  #212405
+
+  27 Apr 2008; Samuli Suominen <drac@gentoo.org> gpa-0.7.6.ebuild:
+  Split pkgconfig and gettext into DEPEND.
+
+  02 Jan 2008; Alon Bar-Lev <alonbl@gentoo.org> -files/gpa-0.7.3-qa.patch,
+  -gpa-0.7.3.ebuild, -gpa-0.7.4.ebuild:
+  Cleanup
+
+  02 Jan 2008; Christoph Mende <angelos@gentoo.org> gpa-0.7.6.ebuild:
+  Stable on amd64 wrt bug #198653
+
+  31 Dec 2007; Raúl Porcel <armin76@gentoo.org> gpa-0.7.6.ebuild:
+  alpha/sparc stable wrt #198653
+
+  29 Dec 2007; Markus Meier <maekke@gentoo.org> gpa-0.7.6.ebuild:
+  x86 stable, bug #198653
+
+  29 Dec 2007; nixnut <nixnut@gentoo.org> gpa-0.7.6.ebuild:
+  Stable on ppc wrt bug 198653
+
+*gpa-0.7.6 (10 Nov 2007)
+
+  10 Nov 2007; Alon Bar-Lev <alonbl@gentoo.org> +files/gpa-0.7.6-qa.patch,
+  +gpa-0.7.6.ebuild:
+  Version bump
+
+  07 Jun 2007; Alon Bar-Lev <alonbl@gentoo.org> -gpa-0.7.0-r2.ebuild:
+  Cleanup
+
+  07 Jun 2007; Raúl Porcel <armin76@gentoo.org> gpa-0.7.3.ebuild:
+  alpha stable wrt #150386
+
+  02 Jun 2007; Joshua <joslwah@gentoo.org> gpa-0.7.4.ebuild:
+  Adding ~ppc64 to 0.7.4 since it seems to work.
+
+  04 Feb 2007; <welp@gentoo.org> gpa-0.7.3.ebuild:
+  Stable on amd64 wrt bug #150386
+
+  23 Jan 2007; nixnut <nixnut@gentoo.org> gpa-0.7.3.ebuild:
+  Stable on ppc wrt bug 150386
+
+  23 Jan 2007; Christian Faulhammer <opfer@gentoo.org> gpa-0.7.3.ebuild:
+  stable x86, bug #150386
+
+  22 Jan 2007; Gustavo Zacarias <gustavoz@gentoo.org> gpa-0.7.3.ebuild:
+  Stable on sparc wrt #150386
+
+*gpa-0.7.4 (21 Jan 2007)
+
+  21 Jan 2007; Alon Bar-Lev <alonbl@gentoo.org> +gpa-0.7.4.ebuild:
+  Version bump
+
+  21 Jan 2007; Alon Bar-Lev <alonbl@gentoo.org> +files/gpa-0.7.3-qa.patch,
+  gpa-0.7.3.ebuild:
+  Added qa patch
+
+  13 Oct 2006; Alon Bar-Lev <alonbl@gentoo.org> gpa-0.7.0-r2.ebuild,
+  gpa-0.7.3.ebuild:
+  Added required pkgconfig dependency, bug#151136, thanks to Evil Compile Person.
+
+  13 Aug 2006; Sven Wegener <swegener@gentoo.org> gpa-0.7.3.ebuild:
+  No longer install pixmap files and additional .desktop file, closes bug
+  #131860.
+
+*gpa-0.7.3 (25 May 2006)
+
+  25 May 2006; Marcelo Goes <vanquirius@gentoo.org> +gpa-0.7.3.ebuild:
+  0.7.3 version bump for bug 131860. Thanks to Sascha Geschwandtner
+  <s.geschwandtner at gmx dot de>.
+
+  08 Aug 2005; Fernando J. Pereda <ferdy@gentoo.org> gpa-0.7.0-r2.ebuild:
+  stable on alpha
+
+  07 Aug 2005; Daniel Black <dragonheart@gentoo.org> gpa-0.7.0-r2.ebuild:
+  change to mirror://gnupg + QA (backtick to $()
+
+  12 Jun 2005; Sven Wegener <swegener@gentoo.org> gpa-0.7.0-r2.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  05 May 2005; Sven Wegener <swegener@gentoo.org> gpa-0.7.0-r2.ebuild:
+  Fixed [<>]=cat/pkg-ver* dependencies.
+
+  21 Apr 2005; Simon Stelling <blubb@gentoo.org> gpa-0.7.0-r2.ebuild:
+  stable on amd64
+
+  24 Feb 2005; Daniel Black <dragonheart@gentoo.org> gpa-0.7.0-r2.ebuild:
+  Added desktop entry as per bug #81736. Thanks Sebastian Spaeth
+  <Sebastian@SSpaeth.de>
+
+  02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  16 Nov 2004; Daniel Black <dragonheart@gentoo.org> -gpa-0.6.1.ebuild,
+  gpa-0.7.0-r2.ebuild:
+  cleanup of old ebuild that depend on old gpgme versions in the deletion queue
+
+  02 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> gpa-0.7.0-r2.ebuild:
+  Keyword ~alpha, requested in bug 64485.
+
+  29 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> gpa-0.7.0-r2.ebuild:
+  Stable on sparc wrt #64485
+
+  10 Sep 2004; Daniel Black <dragonheart@gentoo.org> metadata.xml,
+  gpa-0.6.1.ebuild, -gpa-0.7.0-r1.ebuild, -gpa-0.7.0.ebuild:
+  cypto herd taking maintaince. Removed old versions and modified gpgme
+  dependancy in preparation for new gpgme stabilisation
+
+*gpa-0.7.0-r2 (08 Aug 2004)
+
+  08 Aug 2004; Daniel Black <dragonheart@gentoo.org> +metadata.xml,
+  +gpa-0.7.0-r2.ebuild:
+  Depandancy changes as per bug #57193.
+
+  11 Jul 2004; Danny van Dyk <kugelfang@gentoo.org> gpa-0.7.0-r1.ebuild:
+  Marked ~amd64.
+
+*gpa-0.7.0-r1 (16 Jun 2004)
+
+  16 Jun 2004; Martin Schlemmer <azarah@gentoo.org> +gpa-0.7.0-r1.ebuild:
+  By default gnupg puts gpgkeys_hkp in /usr/libexec/gnupg, so
+  check if it is in uncommon /usr/lib/gnupg, and change libexecdir
+  if so.  If we do not do this, hkp server types is not usable,
+  as gpa cannot find gpgkeys_hkp ...
+
+  15 Jun 2004; Scott W Taylor <swtaylor@gentoo.org> gpa-0.7.0.ebuild:
+  dependancy fix for gpa #54013
+
+*gpa-0.7.0 (14 Jun 2004)
+
+  14 Jun 2004; Scott W Taylor <swtaylor@gentoo.org> +gpa-0.7.0.ebuild:
+  version bump
+
+  25 Apr 2004; Aron Griffis <agriffis@gentoo.org> gpa-0.6.1.ebuild:
+  Add die following econf for bug 48950
+
+  21 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> gpa-0.4.3.ebuild:
+  old ebuild cleanup
+
+  07 Feb 2004; Lars Weiler <pylon@gentoo.org> gpa-0.6.1.ebuild:
+  stable on ppc
+
+  24 Jan 2004; Jason Wever <weeve@gentoo.org> gpa-0.6.1.ebuild:
+  Marked stable on sparc.
+
+  06 Jan 2004; Jason Wever <weeve@gentoo.org> gpa-0.6.1.ebuild:
+  Added ~sparc keyword.
+
+*gpa-0.6.1 (07 Feb 2003)
+
+  28 Mar 2003; Pieter Van den Abeele <pvdabeel@gentoo.org> gpc-0.6.1.ebuild: 
+  Add ~ppc keyword
+
+  07 Feb 2003; J Robert Ray <jrray@gentoo.org> gpa-0.6.1.ebuild : Version bump,
+  thanks to Erinn Looney-Triggs <erinnlooneytriggs@ekno.com> and Jacob Perkins
+  <jap1@users.sourceforge.net>.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*gpa-0.4.3 (19 May 2002)
+
+  28 Jul 2002; Calum Selkiirk <cselkirk@gentoo.org> gpa-0.4.3.ebuild :
+
+  Added ppc to KEYWORDS.
+  Added RDEPEND.
+
+  19 May 2002; Ryan Phillips <rphillips@gentoo.org> ChangeLog :
+
+  Updated to new version of gpa
+
+*gpa-0.4.1-r2 (17 Apr 2002)
+
+  17 Apr 2002; Ryan Phillips <rphillips@gentoo.org> ChangeLog :
+
+  Added dependency to app-crypt/gnupg
+  
+*gpa-0.4.1-r1 (1 Feb 2002)
+
+  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  
+  Added initial ChangeLog which should be updated whenever the package is
+  updated in any way. This changelog is targetted to users. This means that the
+  comments should well explained and written in clean English. The details about
+  writing correct changelogs are explained in the skel.ChangeLog file which you
+  can find in the root directory of the portage repository.
diff --git a/app-crypt/gpa/Manifest b/app-crypt/gpa/Manifest
new file mode 100644
index 0000000..cd27395
--- /dev/null
+++ b/app-crypt/gpa/Manifest
@@ -0,0 +1,5 @@
+AUX gpa-desktop-file-validate.patch 759 RMD160 b34a8b6929aee3895a66db0d69fba7c04ade681e SHA1 b53ebce4a21d13f00ce251fc27fd7588a14224e2 SHA256 1290c8dc08e163579e7cedd3a5ba743e7129adc54bf97bc17da64e90ec95f8a9
+DIST gpa-0.9.1_pre20100416.tar.bz2 974400 RMD160 47ec9faa62323fe873bd86c7525733fd6dfd8558 SHA1 b2f2cb63cdfad31c8716b754c968c13dd867c8c9 SHA256 89ff78e01f78865dfec6af38f6035d235707b326e394d4b55239393ea3ed8cf1
+EBUILD gpa-0.9.1_pre20100416.ebuild 1630 RMD160 6a85d5586d52a4ff44ca0f079f3e036b840102d9 SHA1 92b778fe249569889570880b06d5d398e5264749 SHA256 76a93e1bb2b27269d0dc7e8209d6554bbab55439216ff64d25f1795d8da586ba
+MISC ChangeLog 9012 RMD160 cf7c53abb34daadd817763d5ad1d073b9cc9743d SHA1 e862f663a2dd24e0cba6a8e62d73bdf0a4003903 SHA256 a039a621690d3e6bcd19ffb347737f734f0c50fd1df37288de6f24bee2b6c94e
+MISC metadata.xml 224 RMD160 74db96ad8aa1d285d83ae93a9f4a767335f55c15 SHA1 d86a171d981b45e7ed0c0b3b5059d2a63c811001 SHA256 9e9ce661a9fdb45a535ad875a247b700a70745359b27533ec29a6a46fa708e86
diff --git a/app-crypt/gpa/files/gpa-desktop-file-validate.patch b/app-crypt/gpa/files/gpa-desktop-file-validate.patch
new file mode 100644
index 0000000..980b424
--- /dev/null
+++ b/app-crypt/gpa/files/gpa-desktop-file-validate.patch
@@ -0,0 +1,24 @@
+--- gpa.desktop	2010-04-16 16:00:00.000000000 -0400
++++ gpa.desktop.new	2010-12-10 08:46:13.000000000 -0500
+@@ -1,13 +1,12 @@
+ [Desktop Entry]
+-Name=gpa
+-Name[sv]=gpa
+-Name[en_US.ISO8859-1]=gpa
+-GenericName=GNU Privacy Assistant
+-GenericName[sv]=GNU Integritets-hjälpreda
+-GenericName[en_US.ISO8859-1]=GNU Privacy Assistant
++Name=GNU Privacy Assistant
++Name[sv]=GNU Integritets-hjälpreda
++Name[en_US.ISO8859-1]=GNU Privacy Assistant
++GenericName=Cryptographic Keyring Manager
++GenericName[sv]=Cryptographic Nyckelring Manager
++GenericName[en_US.ISO8859-1]=Cryptographic Keyring Manager
+ Exec=gpa
+-Icon=gpa.png
++Icon=gpa
+ Terminal=false
+-Encoding=UTF-8
+ Type=Application
+-Categories=GTK;Application;Security;Utility;
++Categories=GTK;Utility;System;Security;
diff --git a/app-crypt/gpa/gpa-0.9.1_pre20100416.ebuild b/app-crypt/gpa/gpa-0.9.1_pre20100416.ebuild
new file mode 100644
index 0000000..8631b6b
--- /dev/null
+++ b/app-crypt/gpa/gpa-0.9.1_pre20100416.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpa/gpa-0.9.1_pre20100416.ebuild,v 1.7 2010/09/29 06:20:47 ssuominen Exp $
+
+EAPI="3"
+
+inherit autotools eutils multilib
+
+DESCRIPTION="The GNU Privacy Assistant (GPA) is a graphical user interface for GnuPG"
+HOMEPAGE="http://gpa.wald.intevation.org"
+#STUPID_NUM="603"
+#SRC_URI="http://wald.intevation.org/frs/download.php/${STUPID_NUM}/${P}.tar.bz2"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+IUSE="nls"
+
+RDEPEND=">=x11-libs/gtk+-2.10.0
+	>=dev-libs/libgpg-error-1.4
+	>=dev-libs/libassuan-1.1.0
+	>=app-crypt/gnupg-2
+	>=app-crypt/gpgme-1.2.0"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.7
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-desktop-file-validate.patch
+
+	local x=/usr/share/gettext/po/Makefile.in.in
+	[[ -e $x ]] && cp -f $x po/ #323743
+
+	sed -e "s|gnupg/:|:|g" -i configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# By default gnupg puts gpgkeys_hkp in /usr/libexec/gnupg, so
+	# check if it is in uncommon /usr/lib/gnupg, and change libexecdir
+	# if so.  If we do not do this, hkp server types is not usable,
+	# as gpa cannot find gpgkeys_hkp ...
+	[[ -f /usr/lib/gnupg/gpgkeys_hkp ]] && myconf="--libexecdir=/usr/$(get_libdir)"
+
+	econf \
+		--with-gpgme-prefix=/usr \
+		--with-libassuan-prefix=/usr \
+		$(use_enable nls) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog README NEWS TODO
+}
diff --git a/app-crypt/gpa/metadata.xml b/app-crypt/gpa/metadata.xml
new file mode 100644
index 0000000..df1a1a8
--- /dev/null
+++ b/app-crypt/gpa/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>crypto</herd>
+	<maintainer>
+		<email>crypto@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index 41ed76b..a7816f0 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -10,5 +10,5 @@ AUX johntheripper-1.7.3.1-stackdef.S.patch 2112 RMD160 bbf978098ff017700f05d0240
 AUX johntheripper-1.7.6-cflags.patch 2927 RMD160 76bf59d4938ef618b49a19f7067c5e9ba8d24146 SHA1 f2cb76ef4ba742d7fb02c4a1fca1717a932bf93c SHA256 0490311893ec85b4ca9fed1cce39341378959fed307b012f29adf11789a444ae
 DIST john-1.7.6-jumbo-4.diff.gz 206601 RMD160 53ac2218ca33d458eb7250bce18a9e9af5a881d6 SHA1 ccef570680a8496618d359a42a101b331d40aeb7 SHA256 12760c528c3eabe0e429954745f016107c08ce936ed4be2e63d2a75c64717f3a
 DIST john-1.7.6.tar.gz 832790 RMD160 294fa9a381b45df6fda6e537bc920e74c1d966b0 SHA1 da0b6298e6e045606d48880df045096e8bc87fcb SHA256 77e44d068d317648c41d3ac61b8ea1df18d5c7401083e7a4f6681816900c1a73
-EBUILD johntheripper-1.7.6-r1.ebuild 3808 RMD160 381532b386890da0b7b9857ec50c0df2e0bf668d SHA1 d865d1c9e01580b52f4acee749b4c905a8e05f6d SHA256 ba4f18a613de3eb48c7a315577f1a7edc52df5f51bff325db80d17e508b34e85
+EBUILD johntheripper-1.7.6-r1.ebuild 3998 RMD160 1d5d8b7815afd754098cdb6ca83917cd2c4b9675 SHA1 4cd5283bc7b9ff3bb237b27390ddfb06f129de58 SHA256 a43f46cf92eeb5d4fd3b22685c8097869c08ca9ba5bf92c57f3fe8b1a8520c6e
 MISC ChangeLog 276 RMD160 ce3f67053996601285e51dfb86b7c0649b340a81 SHA1 b5722e6d35fb890517a0485011deb9b67d3b8ad5 SHA256 7d185414dc56671e2b13521c98d49a46960950e6b0a9b9862f040318bbfafdf6
diff --git a/app-crypt/johntheripper/johntheripper-1.7.6-r1.ebuild b/app-crypt/johntheripper/johntheripper-1.7.6-r1.ebuild
index aa2e90a..fbc885c 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.6-r1.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.6-r1.ebuild
@@ -17,16 +17,19 @@ HOMEPAGE="http://www.openwall.com/john/"
 
 SRC_URI="http://www.openwall.com/john/g/${MY_P}.tar.gz
 	!minimal? ( http://www.openwall.com/john/contrib/${MY_P}-${JUMBO}.diff.gz )"
+#	mpi? ( ftp://ftp.openwall.com/john/contrib/mpi/2009-bindshell/${MY_P}-${MPI}.patch.gz )
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="altivec custom-cflags -minimal mmx -mpi sse2"
+IUSE="altivec custom-cflags -minimal mmx openmp sse2"
+#IUSE="altivec custom-cflags -minimal mmx -mpi sse2"
 
 # Seems a bit fussy with other MPI implementations.
 RDEPEND="!minimal? ( >=dev-libs/openssl-0.9.7 )"
 #	mpi? ( sys-cluster/openmpi )
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	openmp? ( >=sys-devel/gcc-4.2[openmp] )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -86,7 +89,7 @@ src_prepare() {
 }
 
 src_compile() {
-	local OMP
+	local OMP=''
 
 	use custom-cflags || strip-flags
 	append-flags -fPIC -fPIE \
@@ -94,8 +97,7 @@ src_compile() {
 		'-DJOHN_SYSTEMWIDE_HOME=\\\"/etc/john\\\"' \
 		'-DJOHN_SYSTEMWIDE_EXEC=\\\"/usr/libexec/john\\\"'
 	gcc-specs-pie && append-ldflags -nopie
-	
-	use mpi && OMP="-fopenmp"
+	use openmp && OMP="-fopenmp"
 
 	CPP=$(tc-getCXX) CC=$(tc-getCC) AS=$(tc-getCC) LD=$(tc-getCC)
 #	use mpi && CPP=mpicxx CC=mpicc AS=mpicc LD=mpicc