Actualy fix the deps to be correct. Dependency on debug is never = but only ?. Also block correct slot not only <x because it would fail when there is some new revbump. Also move that blocker to rdep, where all blocks should be (binary packages).

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

3 files changed, 72 insertions, 12 deletions

diff --git a/app-crypt/qca/ChangeLog b/app-crypt/qca/ChangeLog
index 9946f7393a2c..8eada9711f02 100644
--- a/app-crypt/qca/ChangeLog
+++ b/app-crypt/qca/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-crypt/qca
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/ChangeLog,v 1.65 2009/06/10 20:17:09 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/ChangeLog,v 1.66 2009/06/12 11:04:32 scarabeus Exp $
+
+*qca-2.0.2-r2 (12 Jun 2009)
+
+  12 Jun 2009; Tomáš Chvátal <scarabeus@gentoo.org> +qca-2.0.2-r2.ebuild:
+  Actualy fix the deps to be correct. Dependency on debug is never = but
+  only ?. Also block correct slot not only <x because it would fail when
+  there is some new revbump. Also move that blocker to rdep, where all
+  blocks should be (binary packages).
 
   10 Jun 2009; Markus Meier <maekke@gentoo.org> qca-2.0.2-r1.ebuild:
   amd64/x86 stable, bug #272865
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index 0ddcb56b90a1..b7e53ddb206d 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX qca-1.0-fbsd.patch 753 RMD160 481eee7ad8e334f1551c00de7ac7f597694a92a2 SHA1 582f3259623ee82ec38a1a9e4391b22c2946c0ac SHA256 53a0257ecbf917741b41ab4bc50a1d9518cb1bd86f0be36dbf3a1c6ef1d5257c
 AUX qca-2.0.0-debug-same-pkgconfig-file.patch 1112 RMD160 a0bbc98447d7ddfa090bc20b404655c768f00947 SHA1 7c11cceb62d46094367d5cb81088d96d376bbdfe SHA256 5240f0853a3d918efe6ef861cdf1c5b0e611f165257d3e74479468de014d1883
 AUX qca-2.0.1-pcfilespath.patch 378 RMD160 5c2dd4ca13339bf6c0d5d4262f1d4d2df6516ffb SHA1 decdaf319a0f414d9ed91554cd4af46267612db2 SHA256 720178f24b39cb8411b0e85ee508ce0a592cd50610a5b48b5d104f0c5552f604
@@ -12,12 +9,6 @@ DIST qca-2.0.2.tar.bz2 1937201 RMD160 18b0f497709f9700227644977946735d2ec3c623 S
 EBUILD qca-1.0-r3.ebuild 1359 RMD160 ad5344c3ef85b7453f1d4898341aa0f03e3d19da SHA1 e9e6c30da0e0c550db21f09b937fbc9cdace2e86 SHA256 1d840266250e93113f82f4760e0a9ba7984147c2b5e8f9c1499078687fc35d8a
 EBUILD qca-2.0.0-r2.ebuild 2281 RMD160 d74baeee388c4416134da622cc5a6cfd260e6688 SHA1 ceda8e5d874857a8dedb385fa3745abe1c012693 SHA256 be026cbb13c25ebd5723c57cf6994671090b5d1c65b16a575fc378c0bdf0a6b3
 EBUILD qca-2.0.2-r1.ebuild 1451 RMD160 ee2b8787f0467d09746608c405d6f64343f258e3 SHA1 cfb7a4eeaa984522c257ad3dd6bc0f21235a7282 SHA256 8ba1957dc710debef07c27a92ec51fff74e26e21495aec2be1f871a2ebf14a2b
-MISC ChangeLog 7841 RMD160 21129bbe1cfb30cc91cd69d1a722a7c02cdb1ac3 SHA1 abe3189aabe2526c077b81ab1f5f5a058bdb99b6 SHA256 b72ab4c1289f855edc60fdc164dd517edc0bf2a50a795f4524d38b2be6a85f7a
+EBUILD qca-2.0.2-r2.ebuild 1452 RMD160 054cbd27bc272f760f720e8264af409502c52eac SHA1 0dc2d975d21263ad9e8af0046e17a2c3d7c5b111 SHA256 f65528cb255eb91bd8c7294c9de540907d03b7b781366179dc1def197e72564a
+MISC ChangeLog 8206 RMD160 af0d2fc02f8ec5c288da0d482c828f982d7df18f SHA1 8721a21e3acc0dfe8020c7db0d3699f7b4851b31 SHA256 49b8b5a36e1fee48b4449f0a95cdb02fce52bbe4ed82d733360311e848661980
 MISC metadata.xml 192 RMD160 421d4665996ea38fdfc756e2da700603abe17ec7 SHA1 c32af4b790776c36b524e5f2e2dca587c9cd3351 SHA256 e585d77a075b30463ad28cc89374f9ef2876636bca95a23321b824e0122aa6fd
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkowFNsACgkQkKaRLQcq0GL8mACgkv9b34S1Y4MbJ3SOrG5+dRjn
-HMwAnjcEthhegtf6f1kUB1bpxQN8mCGH
-=QzWN
------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
new file mode 100644
index 000000000000..98bb0642cf67
--- /dev/null
+++ b/app-crypt/qca/qca-2.0.2-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2009 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.1 2009/06/12 11:04:32 scarabeus Exp $
+
+EAPI="2"
+
+inherit eutils multilib qt4
+
+DESCRIPTION="Qt Cryptographic Architecture (QCA)"
+HOMEPAGE="http://delta.affinix.com/qca/"
+SRC_URI="http://delta.affinix.com/download/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc examples"
+RESTRICT="test"
+
+DEPEND="x11-libs/qt-core:4[debug?]"
+RDEPEND="${DEPEND}
+	!app-crypt/qca:0
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-pcfilespath.patch
+}
+
+src_configure() {
+	_libdir=$(get_libdir)
+
+	./configure \
+		--prefix=/usr \
+		--qtdir=/usr \
+		--includedir="/usr/include/qca2" \
+		--libdir="/usr/${_libdir}/qca2" \
+		--no-separate-debug-info \
+		--disable-tests \
+		--$(use debug && echo debug || echo release) \
+		|| die "configure failed"
+
+	eqmake4
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install || die "emake install failed"
+	dodoc README TODO || die "dodoc failed"
+
+	cat <<-EOF > "${WORKDIR}"/44qca2
+	LDPATH=/usr/${_libdir}/qca2
+	EOF
+	doenvd "${WORKDIR}"/44qca2 || die
+
+	if use doc; then
+		dohtml "${S}"/apidocs/html/* || die "Failed to install documentation"
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/
+		doins -r "${S}"/examples || die "Failed to install examples"
+	fi
+}