summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen de Groot <yngwin@gentoo.org>2010-03-26 23:32:41 +0000
committerBen de Groot <yngwin@gentoo.org>2010-03-26 23:32:41 +0000
commit626bf6337a4c6dedff2ac58a91bf324f02a79fea (patch)
tree6593d476b1fc84db542900c7c74e7039792a8e8e /app-crypt
parentFixed bug 308359, quote DESKTOP_SESSION in case it's not defined (diff)
downloadgentoo-2-626bf6337a4c6dedff2ac58a91bf324f02a79fea.tar.gz
gentoo-2-626bf6337a4c6dedff2ac58a91bf324f02a79fea.tar.bz2
gentoo-2-626bf6337a4c6dedff2ac58a91bf324f02a79fea.zip
Use qt4-r2.eclass (bug #311481)
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'app-crypt')
-rw-r--r--app-crypt/qca/ChangeLog5
-rw-r--r--app-crypt/qca/qca-2.0.2-r2.ebuild16
2 files changed, 11 insertions, 10 deletions
diff --git a/app-crypt/qca/ChangeLog b/app-crypt/qca/ChangeLog
index 7f6fcec380b4..160881f1db00 100644
--- a/app-crypt/qca/ChangeLog
+++ b/app-crypt/qca/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-crypt/qca
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/ChangeLog,v 1.81 2010/01/13 18:44:41 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/ChangeLog,v 1.82 2010/03/26 23:32:41 yngwin Exp $
+
+ 26 Mar 2010; Ben de Groot <yngwin@gentoo.org> qca-2.0.2-r2.ebuild:
+ Use qt4-r2.eclass (bug #311481). Removed unneeded die messages.
13 Jan 2010; Jonathan Callen <abcd@gentoo.org> qca-2.0.2-r2.ebuild:
Add initial USE=aqua support, fix rpaths for prefix
diff --git a/app-crypt/qca/qca-2.0.2-r2.ebuild b/app-crypt/qca/qca-2.0.2-r2.ebuild
index fb7105cf8a52..b3945bf26f89 100644
--- a/app-crypt/qca/qca-2.0.2-r2.ebuild
+++ b/app-crypt/qca/qca-2.0.2-r2.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/qca-2.0.2-r2.ebuild,v 1.12 2010/01/13 18:44:41 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/qca-2.0.2-r2.ebuild,v 1.13 2010/03/26 23:32:41 yngwin Exp $
EAPI="2"
-
-inherit eutils multilib qt4
+inherit eutils multilib qt4-r2
DESCRIPTION="Qt Cryptographic Architecture (QCA)"
HOMEPAGE="http://delta.affinix.com/qca/"
@@ -18,8 +17,7 @@ RESTRICT="test"
DEPEND="x11-libs/qt-core:4[debug?]"
RDEPEND="${DEPEND}
- !<app-crypt/qca-1.0-r3:0
-"
+ !<app-crypt/qca-1.0-r3:0"
src_prepare() {
epatch "${FILESDIR}"/${P}-pcfilespath.patch
@@ -53,8 +51,8 @@ src_configure() {
}
src_install() {
- emake INSTALL_ROOT="${D}" install || die "emake install failed"
- dodoc README TODO || die "dodoc failed"
+ emake INSTALL_ROOT="${D}" install || die
+ dodoc README TODO || die
cat <<-EOF > "${WORKDIR}"/44qca2
LDPATH="${EPREFIX}/usr/${_libdir}/qca2"
@@ -62,12 +60,12 @@ src_install() {
doenvd "${WORKDIR}"/44qca2 || die
if use doc; then
- dohtml "${S}"/apidocs/html/* || die "Failed to install documentation"
+ dohtml "${S}"/apidocs/html/* || die
fi
if use examples; then
insinto /usr/share/doc/${PF}/
- doins -r "${S}"/examples || die "Failed to install examples"
+ doins -r "${S}"/examples || die
fi
# add the proper rpath for packages that do CONFIG += crypto