Use qt4-r2.eclass (bug #311481). Tighten formatting.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

6 files changed, 42 insertions, 42 deletions

diff --git a/app-crypt/qca-cyrus-sasl/ChangeLog b/app-crypt/qca-cyrus-sasl/ChangeLog
index b86e7c47f0a1..7897ff282e2d 100644
--- a/app-crypt/qca-cyrus-sasl/ChangeLog
+++ b/app-crypt/qca-cyrus-sasl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/qca-cyrus-sasl
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-cyrus-sasl/ChangeLog,v 1.10 2009/11/13 12:52:34 josejx Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-cyrus-sasl/ChangeLog,v 1.11 2010/03/26 23:38:18 yngwin Exp $
+
+  26 Mar 2010; Ben de Groot <yngwin@gentoo.org>
+  qca-cyrus-sasl-2.0.0_beta3.ebuild:
+  Use qt4-r2.eclass (bug #311481). Tighten formatting.
 
   13 Nov 2009; Joseph Jezak <josejx@gentoo.org>
   qca-cyrus-sasl-2.0.0_beta3.ebuild:
diff --git a/app-crypt/qca-cyrus-sasl/qca-cyrus-sasl-2.0.0_beta3.ebuild b/app-crypt/qca-cyrus-sasl/qca-cyrus-sasl-2.0.0_beta3.ebuild
index df3a10b9f63b..a5fb17102bd8 100644
--- a/app-crypt/qca-cyrus-sasl/qca-cyrus-sasl-2.0.0_beta3.ebuild
+++ b/app-crypt/qca-cyrus-sasl/qca-cyrus-sasl-2.0.0_beta3.ebuild
@@ -1,10 +1,9 @@
-# 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-cyrus-sasl/qca-cyrus-sasl-2.0.0_beta3.ebuild,v 1.10 2009/11/13 12:52:34 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-cyrus-sasl/qca-cyrus-sasl-2.0.0_beta3.ebuild,v 1.11 2010/03/26 23:38:18 yngwin Exp $
 
 EAPI="2"
-
-inherit eutils qt4
+inherit eutils qt4-r2
 
 MY_P="${P/_/-}"
 QCA_VER="${PV%.*}"
@@ -22,19 +21,16 @@ DEPEND=">=app-crypt/qca-${QCA_VER}[debug?]
 	dev-libs/cyrus-sasl"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 src_configure() {
 	# 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"
+	./configure --qtdir=/usr --no-separate-debug-info \
+		$(use debug && echo "--debug" || echo "--release") || die
 
-	eqmake4 ${PN}.pro
+	eqmake4
 }
 
 src_install() {
-	emake INSTALL_ROOT="${D}" install || die "make install failed"
+	emake INSTALL_ROOT="${D}" install || die
 }
diff --git a/app-crypt/qca-gnupg/ChangeLog b/app-crypt/qca-gnupg/ChangeLog
index d5f8f2796555..aca52e583b65 100644
--- a/app-crypt/qca-gnupg/ChangeLog
+++ b/app-crypt/qca-gnupg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/qca-gnupg
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-gnupg/ChangeLog,v 1.21 2009/12/29 18:12:34 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-gnupg/ChangeLog,v 1.22 2010/03/26 23:41:47 yngwin Exp $
+
+  26 Mar 2010; Ben de Groot <yngwin@gentoo.org>
+  qca-gnupg-2.0.0_beta3.ebuild:
+  Use qt4-r2.eclass (bug #311481). Tighten formatting.
 
   29 Dec 2009; Raúl Porcel <armin76@gentoo.org>
   qca-gnupg-2.0.0_beta3.ebuild:
diff --git a/app-crypt/qca-gnupg/qca-gnupg-2.0.0_beta3.ebuild b/app-crypt/qca-gnupg/qca-gnupg-2.0.0_beta3.ebuild
index 08ccb6cca644..3a7b464b1ec5 100644
--- a/app-crypt/qca-gnupg/qca-gnupg-2.0.0_beta3.ebuild
+++ b/app-crypt/qca-gnupg/qca-gnupg-2.0.0_beta3.ebuild
@@ -1,10 +1,9 @@
-# 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-gnupg/qca-gnupg-2.0.0_beta3.ebuild,v 1.10 2009/12/29 18:12:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-gnupg/qca-gnupg-2.0.0_beta3.ebuild,v 1.11 2010/03/26 23:41:47 yngwin Exp $
 
 EAPI="2"
-
-inherit eutils qt4
+inherit eutils qt4-r2
 
 MY_P="${P/_/-}"
 QCA_VER="${PV%.*}"
@@ -23,19 +22,16 @@ DEPEND=">=app-crypt/qca-${QCA_VER}[debug?]
 RDEPEND="${DEPEND}
 	app-crypt/gnupg"
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 src_configure() {
 	# 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"
+	./configure --qtdir=/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
 }
diff --git a/app-crypt/qca-logger/ChangeLog b/app-crypt/qca-logger/ChangeLog
index 44329b5e4213..02d80491a68e 100644
--- a/app-crypt/qca-logger/ChangeLog
+++ b/app-crypt/qca-logger/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/qca-logger
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-logger/ChangeLog,v 1.10 2009/11/13 12:54:11 josejx Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-logger/ChangeLog,v 1.11 2010/03/26 23:44:44 yngwin Exp $
+
+  26 Mar 2010; Ben de Groot <yngwin@gentoo.org>
+  qca-logger-2.0.0_beta2.ebuild:
+  Use qt4-r2.eclass (bug #311481). Tighten formatting.
 
   13 Nov 2009; Joseph Jezak <josejx@gentoo.org>
   qca-logger-2.0.0_beta2.ebuild:
diff --git a/app-crypt/qca-logger/qca-logger-2.0.0_beta2.ebuild b/app-crypt/qca-logger/qca-logger-2.0.0_beta2.ebuild
index 80681d6db978..ae3a597e8077 100644
--- a/app-crypt/qca-logger/qca-logger-2.0.0_beta2.ebuild
+++ b/app-crypt/qca-logger/qca-logger-2.0.0_beta2.ebuild
@@ -1,10 +1,9 @@
-# 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-logger/qca-logger-2.0.0_beta2.ebuild,v 1.10 2009/11/13 12:54:11 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-logger/qca-logger-2.0.0_beta2.ebuild,v 1.11 2010/03/26 23:44:44 yngwin Exp $
 
 EAPI="2"
-
-inherit eutils qt4
+inherit eutils qt4-r2
 
 MY_P="${P/_/-}"
 QCA_VER="${PV%.*}"
@@ -21,20 +20,17 @@ IUSE="debug"
 DEPEND=">=app-crypt/qca-${QCA_VER}[debug?]"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 src_configure() {
 	# 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"
+	./configure	--qtdir=/usr --no-separate-debug-info \
+		$(use debug && echo "--debug" || echo "--release") || die
 
-	eqmake4 ${PN}.pro
+	eqmake4
 }
 
 src_install() {
-	emake INSTALL_ROOT="${D}" install || die "make install failed"
+	emake INSTALL_ROOT="${D}" install || die
 	dodoc README || die
 }