# HG changeset patch
# User Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
# Date 2010-03-07 17:11:19
# Node ID 77ebb1b096f1289a187daa7d2b0bd522f6a7c444
# Parent  8730ea995bd4f7519cd703dad0bd863984e56a2b

app-crypt/qca: Install qca2.pc, this breakage reported by edt.

diff --git a/app-crypt/qca/ChangeLog b/app-crypt/qca/ChangeLog
--- a/app-crypt/qca/ChangeLog
+++ b/app-crypt/qca/ChangeLog
@@ -2,6 +2,11 @@
 # 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 $
 
+  07 Mar 2010; Nathan Phillip Brink (ohnobinki)
+  <ohnobinki@ohnopublishing.net> +files/qca2.pc.in, qca-2.0.2-r2.ebuild:
+  Install qca2.pc while still avoiding qconf. This breakage was reported by
+  Ed Tomlinson (edt).
+
   13 Feb 2010; Nathan Phillip Brink (ohnobinki)
   <ohnobinki@ohnopublishing.net> qca-2.0.2-r2.ebuild:
   Fix directories in sed expressions. Add QMAKE_LIBDR_QT variable to eqmake4
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,7 +1,8 @@
 AUX app.pri.in 246 RMD160 3bddf86df88a0cbaad4c780fdee840216daba96a SHA1 6fd8e2c7f0ed72ab734183fffe663366b436b845 SHA256 81529b8999546a440154c403c30308d35380c32c7f09fbe02e577f85a0c35a0a
 AUX conf.pri.in 533 RMD160 b105d169207de318a67f46e27686bb6cedcc721b SHA1 e69fd52a96cb630357f3f763834df2b9a72719db SHA256 caf6cb1a6ff28592c5ecb19b042ba9a072b1d1a5ce45bed16a524120feb5822e
 AUX qca-2.0.2-pcfilespath.patch 409 RMD160 65368cb474f2dd1d79b0c9d00424831acd777465 SHA1 a2defc2ae7d3dc31986f89cb8ec2760df85cb208 SHA256 d4d276c13f08bc538b79779aba49126b310df5c97f95b2c7010de050c880d695
+AUX qca2.pc.in 223 RMD160 25a2445f02a90df07ef22624baba629ce4a624ba SHA1 2a522f88bb7adc3cd5bcc3ad050474bc5089a54a SHA256 5c55d6ede069d27638ff5a3d55339c14438948bd34a781fb6f0be2df28a13b58
 DIST qca-2.0.2.tar.bz2 1937201 RMD160 18b0f497709f9700227644977946735d2ec3c623 SHA1 5a414c3296cd37d1ec34182be0d089c5073f55a8 SHA256 49b5474450104a2298747c243de1451ab7a6aeed4bf7df43ffa4b7128a2837b8
-EBUILD qca-2.0.2-r2.ebuild 2675 RMD160 c35aa3601273542b6dd53b9c4546461af1836ab0 SHA1 6153896206cfe06c6d769315a252843e9a5e7b42 SHA256 b8f12742e5e78684cd5095f3dc6e503dbad9699815bd1282f35c9edc81c0c941
-MISC ChangeLog 10382 RMD160 b01ff364d8e863e12a6a318db76403a99bbad84f SHA1 ea0942c245117a0afe88a635d590b47c0f8cfa0f SHA256 214bde3cb4d4e8a35a5e956d2dc02b4bafca7ba7a5bfb430dcda6bdaafc3e52f
+EBUILD qca-2.0.2-r2.ebuild 2890 RMD160 622cc861cc0825e21af06b52aa03f08f2d683a04 SHA1 69eb9e745a24e623fd07e7585f2fc1e0f6cdb645 SHA256 b5b15a62931d840bc2f09fcde80e488a62bb5d2a9156d40ebe934878617fa1ed
+MISC ChangeLog 10602 RMD160 ec7b8aad286ab31a0fdd582ccd70dddf8bf6815e SHA1 306a54a634902941e4f9e1c59a2c0b1e089d930c SHA256 52bac3739f84bf6f1af3f72fdc9289279d8a6df603611333ba95a92a361b6378
 MISC metadata.xml 192 RMD160 421d4665996ea38fdfc756e2da700603abe17ec7 SHA1 c32af4b790776c36b524e5f2e2dca587c9cd3351 SHA256 e585d77a075b30463ad28cc89374f9ef2876636bca95a23321b824e0122aa6fd
diff --git a/app-crypt/qca/files/qca2.pc.in b/app-crypt/qca/files/qca2.pc.in
new file mode 100644
--- /dev/null
+++ b/app-crypt/qca/files/qca2.pc.in
@@ -0,0 +1,10 @@
+prefix=@PREFIX@
+exec_prefix=${prefix}
+libdir=@LIBDIR@
+includedir=@INCDIR@/QtCrypto
+Name: QCA
+Description: Qt Cryptographic Architecture library
+Version: @PV@
+Requires: QtCore
+Libs: -L${libdir} -lqca
+Cflags: -I${includedir}
diff --git a/app-crypt/qca/qca-2.0.2-r2.ebuild b/app-crypt/qca/qca-2.0.2-r2.ebuild
--- a/app-crypt/qca/qca-2.0.2-r2.ebuild
+++ b/app-crypt/qca/qca-2.0.2-r2.ebuild
@@ -29,14 +29,20 @@ src_prepare() {
 		src/src.pro
 }
 
+# $1 - basename of file
+# $2 - subdirectory of "${S}" to output the file to, includes only trailing slash
 qca_do_pri() {
 	local buildtype=release
 	einfo "Manually generating $1 to avoid calling qconf-generated ./configure, bug 305905"
 
 	use debug && buildtype=debug
+	if [[ -n "$2" ]]; then
+		mkdir -p $2 || die
+	fi
 
 	sed "${FILESDIR}"/$1.in \
 		-e "s:@PN@:${PN}${PV:0:1}:" \
+		-e "s:@PV@:${PV}:" \
 		-e "s:@PREFIX@:${EPREFIX}/usr:" \
 		-e "s:@BINDIR@:${EPREFIX}/usr/bin:" \
 		-e "s:@INCDIR@:${EPREFIX}/usr/include:" \
@@ -44,7 +50,7 @@ qca_do_pri() {
 		-e "s:@DATADIR@:${EPREFIX}/usr/share:" \
 		-e "s:@BUILDTYPE@:${buildtype}:" \
 		-e "s:@QTDATADIR@:${EPREFIX}/usr/share/qt4:" \
-		> "${S}"/$1 \
+		> "${S}"/$2$1 \
 		|| die "Failed to install and preprocess $1"
 }
 
@@ -57,6 +63,7 @@ src_configure() {
 	for pri in app conf; do
 		qca_do_pri ${pri}.pri
 	done
+	qca_do_pri qca2.pc lib/pkgconfig/
 
 	# prepare crypto.prf:
 	echo "QCA_LIBDIR = /usr/${_libdir}/${PN}${PV:0:1}" >> crypto.prf || die