From: Ben de Groot <yngwin@gentoo.org>
Date: Fri, 26 Mar 2010 23:32:41 +0000 (+0000)
Subject: Use qt4-r2.eclass (bug #311481)
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4254ee9d3f44a9a3ae075ad72ca3909f408456db;p=gentoo.git

Use qt4-r2.eclass (bug #311481)
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
---

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/Manifest b/app-crypt/qca/Manifest
index 3ef0d3f490db..06952c7c90f8 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,15 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX qca-2.0.2-pcfilespath.patch 409 RMD160 65368cb474f2dd1d79b0c9d00424831acd777465 SHA1 a2defc2ae7d3dc31986f89cb8ec2760df85cb208 SHA256 d4d276c13f08bc538b79779aba49126b310df5c97f95b2c7010de050c880d695
 DIST qca-2.0.2.tar.bz2 1937201 RMD160 18b0f497709f9700227644977946735d2ec3c623 SHA1 5a414c3296cd37d1ec34182be0d089c5073f55a8 SHA256 49b5474450104a2298747c243de1451ab7a6aeed4bf7df43ffa4b7128a2837b8
-EBUILD qca-2.0.2-r2.ebuild 2087 RMD160 8e69e7b70316f7ef6fa9c364e2f5a93a0b91af30 SHA1 79830f4c0dfad5bf510e203d1083a4c8a42bd324 SHA256 f84b514edb711d6c991839e2d51ac9370ff14e8f6a2786f9f04b67e7cb21979f
-MISC ChangeLog 9923 RMD160 43fc9eb5f1cfd2097518deebed475d0c3d17b8c7 SHA1 76fa3a83423b336acf42b02bff6a8a675d3fcd11 SHA256 43c15c9c93ef3654095f5dfe96a56472ab06bcec9de17c140f2ce4dd93e4833a
+EBUILD qca-2.0.2-r2.ebuild 1989 RMD160 ff7fec3e99f23bd5fe0b5a89c4c1e52540898ec8 SHA1 0cf6a3959e762ca549e8aa689b65bf5ef9979638 SHA256 4cd29fd079ac9746adcfd9d8079df96504e5501ea2170b48f67c1e23f700128a
+MISC ChangeLog 10061 RMD160 bcc94aabbdecb92b2c8df0e86385532a03b94967 SHA1 d6a51d5caf2ad81b65c9f2e81d61b5587a803244 SHA256 a29b098847839779db16833bf055059366fef35062ad1412d6c28efdccb3823f
 MISC metadata.xml 192 RMD160 421d4665996ea38fdfc756e2da700603abe17ec7 SHA1 c32af4b790776c36b524e5f2e2dca587c9cd3351 SHA256 e585d77a075b30463ad28cc89374f9ef2876636bca95a23321b824e0122aa6fd
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAktOFKIACgkQOypDUo0oQOpRQQCgqEyFdm4sXkm/TDBeMHrV1M9g
-TgQAoIKc3rdx6806lYkaVC2T7JKoVw/h
-=yCuw
------END PGP SIGNATURE-----
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