5 files changed, 12 insertions, 88 deletions
diff --git a/app-crypt/qca-tls/ChangeLog b/app-crypt/qca-tls/ChangeLog
index dcd790dc136c..aec3bcc874ca 100644
--- a/app-crypt/qca-tls/ChangeLog
+++ b/app-crypt/qca-tls/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/qca-tls
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-tls/ChangeLog,v 1.47 2008/01/18 16:47:09 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-tls/ChangeLog,v 1.48 2008/02/15 09:04:35 alonbl Exp $
+
+  15 Feb 2008; Alon Bar-Lev <alonbl@gentoo.org> -qca-tls-1.0.ebuild,
+  -qca-tls-1.0-r2.ebuild, qca-tls-1.0-r3.ebuild, qca-tls-1.0-r4.ebuild:
+  Fix URI, bug#210171, thanks to  Thomas Wouters, cleanups
 
 *qca-tls-1.0-r4 (18 Jan 2008)
 
diff --git a/app-crypt/qca-tls/qca-tls-1.0-r2.ebuild b/app-crypt/qca-tls/qca-tls-1.0-r2.ebuild
deleted file mode 100644
index 358285a6b563..000000000000
--- a/app-crypt/qca-tls/qca-tls-1.0-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-tls/qca-tls-1.0-r2.ebuild,v 1.11 2006/09/11 05:42:58 wormo Exp $
-
-inherit eutils
-
-DESCRIPTION="plugin to provide SSL/TLS capability to programs that utilize the Qt Cryptographic Architecture (QCA)"
-HOMEPAGE="http://delta.affinix.com/qca/"
-SRC_URI="http://delta.affinix.com/qca/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-#alpha amd64 and ppc64 need testing
-KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND=">=app-crypt/qca-1.0
-	>=dev-libs/openssl-0.9.6i"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/qca-pathfix.patch
-}
-
-src_compile() {
-	./configure || 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"
-	insinto /usr/include
-
-	dodoc README
-}
diff --git a/app-crypt/qca-tls/qca-tls-1.0-r3.ebuild b/app-crypt/qca-tls/qca-tls-1.0-r3.ebuild
index a20db33588c3..d59be985ba60 100644
--- a/app-crypt/qca-tls/qca-tls-1.0-r3.ebuild
+++ b/app-crypt/qca-tls/qca-tls-1.0-r3.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-tls/qca-tls-1.0-r3.ebuild,v 1.12 2006/11/09 03:24:35 iluxa Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-tls/qca-tls-1.0-r3.ebuild,v 1.13 2008/02/15 09:04:35 alonbl Exp $
 
 inherit eutils
 
-DESCRIPTION="plugin to provide SSL/TLS capability to programs that utilize the Qt Cryptographic Architecture (QCA)"
+DESCRIPTION="plugin to provide SSL/TLS capability to programs that utilize QCA"
 HOMEPAGE="http://delta.affinix.com/qca/"
-SRC_URI="http://delta.affinix.com/qca/${P}.tar.bz2"
+SRC_URI="http://delta.affinix.com/download/${PN%-*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-crypt/qca-tls/qca-tls-1.0-r4.ebuild b/app-crypt/qca-tls/qca-tls-1.0-r4.ebuild
index 0c3ec5180187..0dc0c89c1e78 100644
--- a/app-crypt/qca-tls/qca-tls-1.0-r4.ebuild
+++ b/app-crypt/qca-tls/qca-tls-1.0-r4.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-tls/qca-tls-1.0-r4.ebuild,v 1.1 2008/01/18 16:47:09 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-tls/qca-tls-1.0-r4.ebuild,v 1.2 2008/02/15 09:04:35 alonbl Exp $
 
 inherit eutils
 
-DESCRIPTION="plugin to provide SSL/TLS capability to programs that utilize the Qt Cryptographic Architecture (QCA)"
+DESCRIPTION="plugin to provide SSL/TLS capability to programs that utilize QCA"
 HOMEPAGE="http://delta.affinix.com/qca/"
-SRC_URI="http://delta.affinix.com/qca/${P}.tar.bz2"
+SRC_URI="http://delta.affinix.com/download/${PN%-*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-crypt/qca-tls/qca-tls-1.0.ebuild b/app-crypt/qca-tls/qca-tls-1.0.ebuild
deleted file mode 100644
index f7f7fca472e0..000000000000
--- a/app-crypt/qca-tls/qca-tls-1.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-tls/qca-tls-1.0.ebuild,v 1.23 2006/09/11 05:42:58 wormo Exp $
-
-inherit eutils qt3
-
-DESCRIPTION="plugin to provide SSL/TLS capability to programs that utilize the Qt Cryptographic Architecture (QCA)"
-HOMEPAGE="http://psi.affinix.com/"
-SRC_URI="http://psi.affinix.com/beta/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="$(qt_min_version 3.3)
-	>=dev-libs/openssl-0.9.6i"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/qca-pathfix.patch
-}
-
-src_compile() {
-	./configure || 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"
-	insinto /usr/include
-	doins qcaprovider.h qca.h qca-tls.h
-
-	dodoc README
-}