Keyword ~amd64-linux/~x86-linux, prefixify; remove old

(Portage version: -svn/cvs/Linux i686)

3 files changed, 14 insertions, 62 deletions

diff --git a/app-crypt/qca-ossl/ChangeLog b/app-crypt/qca-ossl/ChangeLog
index 3e1413c2da46..626a9fb1eeaf 100644
--- a/app-crypt/qca-ossl/ChangeLog
+++ b/app-crypt/qca-ossl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/qca-ossl
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-ossl/ChangeLog,v 1.22 2009/12/29 18:11:28 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-ossl/ChangeLog,v 1.23 2010/01/22 04:21:38 abcd Exp $
+
+  22 Jan 2010; Jonathan Callen <abcd@gentoo.org>
+  -qca-ossl-2.0.0_beta3.ebuild, qca-ossl-2.0.0_beta3-r1.ebuild:
+  Keyword ~amd64-linux/~x86-linux, prefixify; remove old
 
   29 Dec 2009; Raúl Porcel <armin76@gentoo.org>
   qca-ossl-2.0.0_beta3.ebuild, qca-ossl-2.0.0_beta3-r1.ebuild:
diff --git a/app-crypt/qca-ossl/qca-ossl-2.0.0_beta3-r1.ebuild b/app-crypt/qca-ossl/qca-ossl-2.0.0_beta3-r1.ebuild
index 96da4a626fd0..5a733feb7269 100644
--- a/app-crypt/qca-ossl/qca-ossl-2.0.0_beta3-r1.ebuild
+++ b/app-crypt/qca-ossl/qca-ossl-2.0.0_beta3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-ossl/qca-ossl-2.0.0_beta3-r1.ebuild,v 1.8 2009/12/29 18:11:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-ossl/qca-ossl-2.0.0_beta3-r1.ebuild,v 1.9 2010/01/22 04:21:38 abcd Exp $
 
 EAPI="2"
 
@@ -15,7 +15,7 @@ SRC_URI="http://delta.affinix.com/download/qca/${QCA_VER}/plugins/${MY_P}.tar.bz
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND=">=app-crypt/qca-${QCA_VER}[debug?]
@@ -27,9 +27,13 @@ S="${WORKDIR}/${MY_P}"
 PATCHES=( "${FILESDIR}/${PN}-openssl-0.9.8i.patch" )
 
 src_configure() {
+	use prefix || EPREFIX=
+	# Fix some locations
+	sed -e "s|/usr/|${EPREFIX}/usr/|g" -e "s|usr/local|usr/|g" -i configure
+
 	# cannot use econf because of non-standard configure script
 	./configure \
-		--qtdir=/usr \
+		--qtdir="${EPREFIX}"/usr \
 		$(use debug && echo "--debug" || echo "--release") \
 		--no-separate-debug-info \
 		|| die "configure failed"
diff --git a/app-crypt/qca-ossl/qca-ossl-2.0.0_beta3.ebuild b/app-crypt/qca-ossl/qca-ossl-2.0.0_beta3.ebuild
deleted file mode 100644
index b2b4133cb5a1..000000000000
--- a/app-crypt/qca-ossl/qca-ossl-2.0.0_beta3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-ossl/qca-ossl-2.0.0_beta3.ebuild,v 1.15 2009/12/29 18:11:28 armin76 Exp $
-
-inherit base eutils qt4
-
-MY_P="${P/_/-}"
-QCA_VER="${PV%.*}"
-
-DESCRIPTION="TLS, S/MIME, PKCS#12, crypto algorithms plugin for QCA"
-HOMEPAGE="http://delta.affinix.com/qca/"
-SRC_URI="http://delta.affinix.com/download/qca/${QCA_VER}/plugins/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="debug"
-
-DEPEND=">=app-crypt/qca-${QCA_VER}
-	>=dev-libs/openssl-0.9.6"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${PN}-openssl-0.9.8i.patch" )
-
-pkg_setup() {
-	if use debug && ! built_with_use ">=app-crypt/qca-${QCA_VER}" debug; then
-		echo
-		eerror "You are trying to compile ${PN} with USE=\"debug\""
-		eerror "while qca is built without this flag. It will not work."
-		echo
-		eerror "Possible solutions to this problem are:"
-		eerror "a) install ${PN} without debug USE flag"
-		eerror "b) re-emerge qca with debug USE flag"
-		echo
-		die "can't emerge ${PN} with debug USE flag"
-	fi
-}
-
-src_compile() {
-	# cannot use econf because of non-standard configure script
-	./configure \
-		--qtdir=/usr \
-		$(use debug && echo "--debug" || echo "--release") \
-		--no-separate-debug-info \
-		|| die "configure failed"
-
-	eqmake4 ${PN}.pro
-	sed -i -e '/strip/d' Makefile || die "sed failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die "emake install failed"
-}