*** empty log message ***

4 files changed, 100 insertions, 13 deletions

diff --git a/app-crypt/qca/ChangeLog b/app-crypt/qca/ChangeLog
index 539095ebb50d..a5e742783b44 100644
--- a/app-crypt/qca/ChangeLog
+++ b/app-crypt/qca/ChangeLog
@@ -1,6 +1,79 @@
 # ChangeLog for app-crypt/qca
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/ChangeLog,v 1.1 2004/12/03 20:49:13 humpback Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/ChangeLog,v 1.1.1.1 2005/11/30 09:44:49 chriswhite Exp $
+
+  25 Oct 2005; Gustavo Felisberto <humpback@gentoo.org>; qca-1.0-r2.ebuild:
+  Plugin like deps should not be in RDEPEND
+
+  29 Jul 2005; Daniel Black <dragonheart@gentoo.org> -qca-1.0.ebuild,
+  -qca-1.0-r1.ebuild, qca-1.0-r2.ebuild:
+  removed die from epatch || die. old version cleanout
+
+  28 Jul 2005; Caleb Tennis <caleb@gentoo.org> qca-1.0.ebuild,
+  qca-1.0-r1.ebuild, qca-1.0-r2.ebuild:
+  Fix qt per bug #100235
+
+  09 Jul 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  +files/qca-1.0-fbsd.patch, qca-1.0-r2.ebuild:
+  Patch to solve problems on bsd. Thaks to Diego Pettenò in bug #93817.
+
+  02 Jul 2005; Hardave Riar <hardave@gentoo.org> qca-1.0-r2.ebuild:
+  Stable on mips
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org> qca-1.0-r2.ebuild:
+  Stable on ppc64
+
+  08 Apr 2005; Markus Rothe <corsair@gentoo.org> qca-1.0-r2.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> qca-1.0-r2.ebuild:
+  Stable on alpha.
+
+  24 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> qca-1.0-r2.ebuild:
+  stable on amd64 wrt #86389
+
+  23 Feb 2005; Hardave Riar <hardave@gentoo.org> qca-1.0-r2.ebuild:
+  Marked ~mips
+
+*qca-1.0-r2 (24 Jan 2005)
+
+  24 Jan 2005; Gustavo Felisberto <humpback@gentoo.org>; +qca-1.0-r2.ebuild:
+  Some cosmetic fixes, thanks to Justin (psi developer)
+
+  21 Jan 2005; Lars Weiler <pylon@gentoo.org> qca-1.0-r1.ebuild:
+  Stable on ppc.
+
+  21 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> qca-1.0-r1.ebuild:
+  Add ~alpha keyword.
+
+  18 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> qca-1.0-r1.ebuild:
+  Stable on sparc
+
+  17 Jan 2005; Gustavo Felisberto <humpback@gentoo.org>; qca-1.0-r1.ebuild:
+  Marked x86
+
+  05 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org> qca-1.0-r1.ebuild,
+  qca-1.0.ebuild:
+  multilib fixes.
+
+*qca-1.0-r1 (04 Jan 2005)
+
+  04 Jan 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  +files/qca-pathfix.patch, +qca-1.0-r1.ebuild:
+  Fixed no-fixpath. Lets see if it solves the Sandbox issues.
+
+  03 Jan 2005; Gustavo Felisberto <humpback@gentoo.org>; metadata.xml:
+  Updated maintainer in metadata.xml
+
+  30 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> qca-1.0.ebuild:
+  Added to ~amd64.
+
+  30 Dec 2004; Chris White <chriswhite@gentoo.org> qca-1.0.ebuild:
+  Ok so, added ~ppc keywords and ~hppa/~ia64 as per vapier's request. Fixed to
+  install into /usr not /usr/local.
+
+  29 Dec 2004; Jason Wever <weeve@gentoo.org> qca-1.0.ebuild:
+  Added ~sparc keyword to fix broken deps of qca-tls-1.0-r1.
 
 *qca-1.0 (03 Dec 2004)
 
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index 4e4b68ea16c8..924c604b069b 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,2 +1,16 @@
-MD5 7cec049fe9642446277763442d267157 qca-1.0.ebuild 860
-MD5 79ff5b8052703491612213e47cdb6947 files/digest-qca-1.0 59
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 eadce6147dc40587fc5bf1c40bc205da ChangeLog 2798
+MD5 79ff5b8052703491612213e47cdb6947 files/digest-qca-1.0-r2 59
+MD5 2efadaf203fdd3186a7e909c0d02c425 files/qca-1.0-fbsd.patch 753
+MD5 ee5764e49e4425fb387e29a7d8e2fec0 files/qca-pathfix.patch 267
+MD5 b5393a27b5b3d74649028c3befaf49fe metadata.xml 226
+MD5 365b5ba7ea24f47bf72806fd97d05620 qca-1.0-r2.ebuild 1047
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDXlEk8zY1VwezZiERAmFIAKCjC+noGokXqFc5g4Q9R01HYewhXgCfYbiE
+F8icsFeQcXAfYhWIaxjSc5U=
+=vxg7
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/qca/metadata.xml b/app-crypt/qca/metadata.xml
index df1a1a8242fe..1a8dbfb3b845 100644
--- a/app-crypt/qca/metadata.xml
+++ b/app-crypt/qca/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<herd>crypto</herd>
 	<maintainer>
-		<email>crypto@gentoo.org</email>
+		<email>humpback@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>
diff --git a/app-crypt/qca/qca-1.0-r2.ebuild b/app-crypt/qca/qca-1.0-r2.ebuild
index fc6d959a5b57..1a1c8240fa76 100644
--- a/app-crypt/qca/qca-1.0-r2.ebuild
+++ b/app-crypt/qca/qca-1.0-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/qca-1.0-r2.ebuild,v 1.1 2005/01/24 18:02:19 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/qca-1.0-r2.ebuild,v 1.1.1.1 2005/11/30 09:44:49 chriswhite Exp $
 
-inherit eutils
+inherit eutils qt3
 
 DESCRIPTION="Qt Cryptographic Architecture (QCA)"
 HOMEPAGE="http://delta.affinix.com/qca/"
@@ -10,17 +10,17 @@ SRC_URI="http://delta.affinix.com/qca/qca-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86 sparc ppc ~ia64 ~hppa ~alpha"
-IUSE=""
+KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
+IUSE="ssl"
 
-DEPEND=">=x11-libs/qt-3.3.0-r1"
-
-RDEPEND=" ssl? ( app-crypt/qca-tls ) "
+DEPEND="$(qt_min_version 3.3.0)"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/qca-pathfix.patch || die "bad patch"
+	epatch ${FILESDIR}/qca-pathfix.patch
+	#This is needed just in bsd, but make no harm in linux
+	epatch ${FILESDIR}/qca-1.0-fbsd.patch
 }
 
 src_compile() {