Apply correct pkgconfig patch. Should fix bug 268090

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

4 files changed, 83 insertions, 2 deletions

diff --git a/app-crypt/qca/ChangeLog b/app-crypt/qca/ChangeLog
index 5a1d04d6610a..09dee789bca0 100644
--- a/app-crypt/qca/ChangeLog
+++ b/app-crypt/qca/ChangeLog
@@ -1,6 +1,12 @@
 # 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.61 2009/05/02 09:25:20 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/ChangeLog,v 1.62 2009/05/04 12:44:56 hwoarang Exp $
+
+*qca-2.0.2-r1 (04 May 2009)
+
+  04 May 2009; Markos Chandras <hwoarang@gentoo.org> +qca-2.0.2-r1.ebuild,
+  +files/qca-2.0.2-pcfilespath.patch:
+  Apply correct pkgconfig patch. Should fix bug 268090
 
 *qca-2.0.2 (02 May 2009)
 
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index c5706c04c05b..840d0c50c58b 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,6 +1,7 @@
 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
+AUX qca-2.0.2-pcfilespath.patch 409 RMD160 65368cb474f2dd1d79b0c9d00424831acd777465 SHA1 a2defc2ae7d3dc31986f89cb8ec2760df85cb208 SHA256 d4d276c13f08bc538b79779aba49126b310df5c97f95b2c7010de050c880d695
 AUX qca-pathfix.patch 267 RMD160 933217ccfdf29b4b37a8a6106ec79bb42f68ab13 SHA1 2cdbf42746969bbfcf03eceae5309f444a8e7145 SHA256 423980ef7c981a1af07297e1f8abd4769a70e2e92a638012cac68d912b0dea4c
 DIST qca-1.0.tar.bz2 30677 RMD160 129d8eeed68fb98e9cba94040b8f75b9f94c8a60 SHA1 b4b166f9dbbe222ebaf5287582a0ba29ddbc1391 SHA256 614b8c9e03d8796c90f7f316f2ace66a5356270a75921ea72cebf129de491c5b
 DIST qca-2.0.0.tar.bz2 5106520 RMD160 256ca518fea507d03b67c0f5d26ba2ac7b3db517 SHA1 5b896647426637e1974703f2950786746408c70b SHA256 2ed0d49300459ae1f2d138fc2e68ed7f92850065981032c96f2538e1878fc2d3
@@ -10,6 +11,7 @@ EBUILD qca-1.0-r2.ebuild 1085 RMD160 5a069215836f0981758c76792a76e08cd85e6b89 SH
 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.1-r1.ebuild 1570 RMD160 64bf81c0be5b8abc88dec13437b9271977d802ba SHA1 5a0cf465f6bb6d1d47e34feb71d903c0e1baf5eb SHA256 74e88e019b0acde39fdc5b5e47521282d2fcfd02bed3903267065a0c1e6c8bb0
+EBUILD qca-2.0.2-r1.ebuild 1456 RMD160 b4bf94fe1b7ac1aea5461729c5749d30cacdda95 SHA1 838b9920a2d54de228fb07abe6f9ce856ec52d1e SHA256 c417b017fd1f8135d6b4d1e83e60c3579f98a7dd75d733d53284c56762a99b72
 EBUILD qca-2.0.2.ebuild 1456 RMD160 699646d9981bea837d577b9c7a877f524b711cb4 SHA1 f83e80df81fb34d2d0489a3eb411c5098d9838a2 SHA256 895c98bf2cf23cee48ea6771b87f272c0abbaddcb6bfd8301263e8f0d8024c2f
-MISC ChangeLog 7307 RMD160 857a66518f8a7c72d9b9cc8da71343d5586428f7 SHA1 b66c47ee0f5b02b758f742f55ff0e764613a2dfb SHA256 6d29a66ea3936f988e1b98596961645c0ce2941718c1312fd4dc5c1c3a07b690
+MISC ChangeLog 7505 RMD160 1ac4fab3d36d643e0a841575cc7c0120f7f1f80d SHA1 75611cc84b19c62e5add0750c799567b4c5f2f6f SHA256 d5e8bb3b08480e9937366414c8afa8c824f793dac187ac15f63238edc49c6fa5
 MISC metadata.xml 192 RMD160 421d4665996ea38fdfc756e2da700603abe17ec7 SHA1 c32af4b790776c36b524e5f2e2dca587c9cd3351 SHA256 e585d77a075b30463ad28cc89374f9ef2876636bca95a23321b824e0122aa6fd
diff --git a/app-crypt/qca/files/qca-2.0.2-pcfilespath.patch b/app-crypt/qca/files/qca-2.0.2-pcfilespath.patch
new file mode 100644
index 000000000000..c52e8e78071b
--- /dev/null
+++ b/app-crypt/qca/files/qca-2.0.2-pcfilespath.patch
@@ -0,0 +1,13 @@
+Index: qca-2.0.2/configure
+===================================================================
+--- qca-2.0.2.orig/configure
++++ qca-2.0.2/configure
+@@ -937,7 +937,7 @@ public:
+ 		if(!pcfiles.isEmpty())
+ 		{
+         		str = QString(
+-			"pcfiles.path = \$\$LIBDIR/pkgconfig\n"
++			"pcfiles.path = \$\$LIBDIR/../pkgconfig\n"
+ 			"pcfiles.files = %1\n"
+ 			"INSTALLS += pcfiles\n"
+ 			).arg(pcfiles.join(" "));
diff --git a/app-crypt/qca/qca-2.0.2-r1.ebuild b/app-crypt/qca/qca-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..0f04b626cfff
--- /dev/null
+++ b/app-crypt/qca/qca-2.0.2-r1.ebuild
@@ -0,0 +1,60 @@
+# 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-r1.ebuild,v 1.1 2009/05/04 12:44:56 hwoarang 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="!<app-crypt/qca-1.0-r3
+	x11-libs/qt-core:4[debug=]"
+RDEPEND="${DEPEND}"
+
+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
+}