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

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

diff --git a/app-crypt/qca-ossl/ChangeLog b/app-crypt/qca-ossl/ChangeLog
index 626a9fb1eeafbbe2f6e0531a997e71537c4628c5..09f13b966ff1a6c666888e2ef53619dc1247ea0d 100644 (file)
--- 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/Manifest b/app-crypt/qca-ossl/Manifest
index c59c11e4c55c75764a20e45b8b69d8045aa59df6..123d6a84e7dd6b93513ee0fc02bf26230eb10ede 100644 (file)
--- a/app-crypt/qca-ossl/Manifest
+++ b/app-crypt/qca-ossl/Manifest
@@ -1,15 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX qca-ossl-openssl-0.9.8i.patch 774 RMD160 711598d6c52f03abe234058867ecbe66206d42b8 SHA1 2cad3a7c536ab20b94d988ed7265ea002e0e08b9 SHA256 1fff9870c295a5634e203f836ad6c201fed8eb8fc10ab4c0643a2ec464422e4f
 DIST qca-ossl-2.0.0-beta3.tar.bz2 49188 RMD160 c979c3c3427eb45e8866e28746f83966e8bcf3c2 SHA1 dd925e8732ff76f24f9f90f4094abaf2f0ac27bf SHA256 08e09ff586b184d5fb53b88f0b48eed0a7bf0a5f210a9f97a76cf4cd5446c67b
-EBUILD qca-ossl-2.0.0_beta3-r1.ebuild 1257 RMD160 dc499c6f7444b306815e7947c7a8479614ed7263 SHA1 8c8db44ebb9655ca37cc24b2c7cff4eacce5fb2d SHA256 3182977721b29f62bf2d3303562ddb38d6479043233716ac5daf6bc1e891a9a5
-MISC ChangeLog 4103 RMD160 a333a5f42377a526927db8126b57e251a23b1651 SHA1 2640146e62a93d798c33faefa9badeff20ef3b54 SHA256 c674a248e5189f8b52bb02f649bf7bd018bb5bfe7f3882b9a9f9b3d47526535f
+EBUILD qca-ossl-2.0.0_beta3-r1.ebuild 1191 RMD160 8ba859302f728cb2910133b1aa5d573cea3b0d9b SHA1 e4215e5b8f06c7252aea1c13e86b1290f3be4906 SHA256 59db724936907f9d9b72f4d83f33e529a28134cbda8a233b33afeda8ee6a8f44
+MISC ChangeLog 4243 RMD160 88d9184a6950b215ad08cb18768606c3555bc93b SHA1 91ea0fee35950f6cc82d16dd59f4461f17d4c741 SHA256 90cb11128ae9247f5fdca9aec3fe95aac7c0f9f7b95d8ce01642d89996abab13
 MISC metadata.xml 192 RMD160 745ecce4d913885d0c5794b96fafd63a29a6e19e SHA1 fe4c3a2accae45b2ade98c5b45a3bd4533aac681 SHA256 2f70cf009da734f5a0166d90a267b186b6a4148cec4778a7f27ca8ef38709096
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAktZJ9sACgkQOypDUo0oQOr05gCfdk/5VKXvdUugElhiV8soSUdf
-XxYAoMVsaGOL8YPrrvCQaJp9LItF2dZN
-=hTpK
------END PGP SIGNATURE-----

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 5a733feb7269e15e637399ec4c4620b96ad11d03..94bf9211ca1a9a5660226274365d0b316813bca4 100644 (file)
--- 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
 }