summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen de Groot <yngwin@gentoo.org>2010-03-26 23:54:22 +0000
committerBen de Groot <yngwin@gentoo.org>2010-03-26 23:54:22 +0000
commit98dd59bb975d9bcb35a7cf57c04c2b6759bcff32 (patch)
tree93428ef7459bfc550341796535e8cdbd7e64044b /app-crypt
parentUse qt4-r2.eclass (bug #311481). Tighten formatting. (diff)
downloadgentoo-2-98dd59bb975d9bcb35a7cf57c04c2b6759bcff32.tar.gz
gentoo-2-98dd59bb975d9bcb35a7cf57c04c2b6759bcff32.tar.bz2
gentoo-2-98dd59bb975d9bcb35a7cf57c04c2b6759bcff32.zip
Use qt4-r2.eclass (bug #311481). Tighten formatting.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'app-crypt')
-rw-r--r--app-crypt/qca-ossl/ChangeLog6
-rw-r--r--app-crypt/qca-ossl/qca-ossl-2.0.0_beta3-r1.ebuild18
2 files changed, 12 insertions, 12 deletions
diff --git a/app-crypt/qca-ossl/ChangeLog b/app-crypt/qca-ossl/ChangeLog
index 626a9fb1eeaf..09f13b966ff1 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-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 $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-ossl/ChangeLog,v 1.24 2010/03/26 23:54:21 yngwin Exp $
+
+ 26 Mar 2010; Ben de Groot <yngwin@gentoo.org>
+ qca-ossl-2.0.0_beta3-r1.ebuild:
+ Use qt4-r2.eclass (bug #311481). Tighten formatting.
22 Jan 2010; Jonathan Callen <abcd@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 5a733feb7269..94bf9211ca1a 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,10 +1,9 @@
# 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.9 2010/01/22 04:21:38 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-ossl/qca-ossl-2.0.0_beta3-r1.ebuild,v 1.10 2010/03/26 23:54:22 yngwin Exp $
EAPI="2"
-
-inherit base eutils qt4
+inherit eutils qt4-r2
MY_P="${P/_/-}"
QCA_VER="${PV%.*}"
@@ -22,7 +21,7 @@ DEPEND=">=app-crypt/qca-${QCA_VER}[debug?]
>=dev-libs/openssl-0.9.6"
RDEPEND="${DEPEND}"
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
PATCHES=( "${FILESDIR}/${PN}-openssl-0.9.8i.patch" )
@@ -32,15 +31,12 @@ src_configure() {
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="${EPREFIX}"/usr \
- $(use debug && echo "--debug" || echo "--release") \
- --no-separate-debug-info \
- || die "configure failed"
+ ./configure --qtdir="${EPREFIX}"/usr --no-separate-debug-info \
+ $(use debug && echo "--debug" || echo "--release") || die
- eqmake4 ${PN}.pro
+ eqmake4
}
src_install() {
- emake INSTALL_ROOT="${D}" install || die "emake install failed"
+ emake INSTALL_ROOT="${D}" install || die
}