7 files changed, 20 insertions, 91 deletions
diff --git a/app-crypt/qca/ChangeLog b/app-crypt/qca/ChangeLog
index d9a2b25c3761..74da20ae3ce7 100644
--- a/app-crypt/qca/ChangeLog
+++ b/app-crypt/qca/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/qca
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/ChangeLog,v 1.21 2005/07/28 14:13:06 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/ChangeLog,v 1.22 2005/07/29 22:56:57 dragonheart Exp $
+
+  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:
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index d58ef56376c6..a5512e793306 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,10 +1,16 @@
-MD5 d55561c7e20d1b977976b3767cf50426 qca-1.0-r1.ebuild 985
-MD5 175d2ffce2f5438b255c4bab253696fb qca-1.0-r2.ebuild 1102
-MD5 fa90fa962ea2eac4f994c7cdb4645773 ChangeLog 2506
-MD5 a6769cc55d4056f48df5d49783598cab qca-1.0.ebuild 980
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 179c94a52db3cc58e4267c5b6f9855fa ChangeLog 2679
 MD5 b5393a27b5b3d74649028c3befaf49fe metadata.xml 226
-MD5 79ff5b8052703491612213e47cdb6947 files/digest-qca-1.0 59
-MD5 79ff5b8052703491612213e47cdb6947 files/digest-qca-1.0-r1 59
-MD5 79ff5b8052703491612213e47cdb6947 files/digest-qca-1.0-r2 59
+MD5 b4f26da02222264df61a9e9f67e1e98e qca-1.0-r2.ebuild 1089
 MD5 ee5764e49e4425fb387e29a7d8e2fec0 files/qca-pathfix.patch 267
+MD5 79ff5b8052703491612213e47cdb6947 files/digest-qca-1.0-r2 59
 MD5 2efadaf203fdd3186a7e909c0d02c425 files/qca-1.0-fbsd.patch 753
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC6rRHmdTrptrqvGERAs1mAJoDSyD2NbVkB3fWjwW7NobqUy8hrgCgg4bP
+d3BoxD1sNg7H2FXon2DsCag=
+=xmE+
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/qca/files/digest-qca-1.0 b/app-crypt/qca/files/digest-qca-1.0
deleted file mode 100644
index 036a79023886..000000000000
--- a/app-crypt/qca/files/digest-qca-1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ee44022eb0e5b8b5df64c62630f6e6b6 qca-1.0.tar.bz2 30677
diff --git a/app-crypt/qca/files/digest-qca-1.0-r1 b/app-crypt/qca/files/digest-qca-1.0-r1
deleted file mode 100644
index 036a79023886..000000000000
--- a/app-crypt/qca/files/digest-qca-1.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ee44022eb0e5b8b5df64c62630f6e6b6 qca-1.0.tar.bz2 30677
diff --git a/app-crypt/qca/qca-1.0-r1.ebuild b/app-crypt/qca/qca-1.0-r1.ebuild
deleted file mode 100644
index cfac30993ee3..000000000000
--- a/app-crypt/qca/qca-1.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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-r1.ebuild,v 1.7 2005/07/28 14:13:06 caleb Exp $
-
-inherit eutils qt3
-
-DESCRIPTION="Qt Cryptographic Architecture (QCA)"
-HOMEPAGE="http://delta.affinix.com/qca/"
-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=""
-
-DEPEND="$(qt_min_version 3.3.0)
-	>=dev-libs/openssl-0.9.6i"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/qca-pathfix.patch || die "bad patch"
-}
-
-src_compile() {
-	./configure --prefix=/usr || die "configure failed"
-	sed -i \
-		-e "/^CFLAGS/s:$: ${CFLAGS}:" \
-		-e "/^CXXFLAGS/s:$: ${CXXFLAGS}:" \
-		Makefile
-	emake || die "emake failed"
-}
-
-src_install() {
-	make INSTALL_ROOT="${D}" install || die "make install failed"
-	if [ "$(get_libdir)" != "lib" ]; then
-		mv ${D}/usr/lib ${D}/usr/$(get_libdir)
-	fi
-}
diff --git a/app-crypt/qca/qca-1.0-r2.ebuild b/app-crypt/qca/qca-1.0-r2.ebuild
index c22a007b8619..1b76a538d627 100644
--- a/app-crypt/qca/qca-1.0-r2.ebuild
+++ b/app-crypt/qca/qca-1.0-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.11 2005/07/28 14:13:06 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/qca-1.0-r2.ebuild,v 1.12 2005/07/29 22:56:57 dragonheart Exp $
 
 inherit eutils qt3
 
@@ -19,7 +19,7 @@ RDEPEND=" ssl? ( app-crypt/qca-tls ) "
 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
 }
diff --git a/app-crypt/qca/qca-1.0.ebuild b/app-crypt/qca/qca-1.0.ebuild
deleted file mode 100644
index 749290d598e2..000000000000
--- a/app-crypt/qca/qca-1.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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.ebuild,v 1.7 2005/07/28 14:13:06 caleb Exp $
-
-inherit eutils qt3
-
-DESCRIPTION="Qt Cryptographic Architecture (QCA)"
-HOMEPAGE="http://delta.affinix.com/qca/"
-SRC_URI="http://delta.affinix.com/qca//qca-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~sparc ~ppc ~ia64 ~hppa"
-IUSE=""
-
-DEPEND="$(qt_min_version 3.3.0)
-	>=dev-libs/openssl-0.9.6i"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-#	epatch ${FILESDIR}/qca-pathfix.patch || die "bad patch"
-}
-
-src_compile() {
-	./configure --prefix=/usr || die "configure failed"
-	sed -i \
-		-e "/^CFLAGS/s:$: ${CFLAGS}:" \
-		-e "/^CXXFLAGS/s:$: ${CXXFLAGS}:" \
-		Makefile
-	emake || die "emake failed"
-}
-
-src_install() {
-	make INSTALL_ROOT="${D}" install || die "make install failed"
-
-	if [ "$(get_libdir)" != "lib" ]; then
-		mv ${D}/usr/lib ${D}/usr/$(get_libdir)
-	fi
-}