Version bump as per bug 129536.

(Portage version: 2.1.4)

4 files changed, 135 insertions, 2 deletions

diff --git a/app-crypt/qca/ChangeLog b/app-crypt/qca/ChangeLog
index 20c14de5511a..9e0e7a06026c 100644
--- a/app-crypt/qca/ChangeLog
+++ b/app-crypt/qca/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/qca
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/ChangeLog,v 1.28 2006/10/19 00:14:00 jokey Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/ChangeLog,v 1.29 2008/01/13 17:54:13 philantrop Exp $
+
+*qca-2.0.0-r2 (13 Jan 2008)
+
+  13 Jan 2008; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/qca-2.0.0-debug-same-pkgconfig-file.patch, +qca-2.0.0-r2.ebuild:
+  Version bump as per bug 129536.
 
   19 Oct 2006; Markus Ullmann <jokey@gentoo.org> qca-1.0-r2.ebuild:
   minor QA: IUSE wrt bug #150083
diff --git a/app-crypt/qca/files/digest-qca-2.0.0-r2 b/app-crypt/qca/files/digest-qca-2.0.0-r2
new file mode 100644
index 000000000000..605c97b6c4f8
--- /dev/null
+++ b/app-crypt/qca/files/digest-qca-2.0.0-r2
@@ -0,0 +1,3 @@
+MD5 07d54358ef4880d05b3c6f56b629aa55 qca-2.0.0.tar.bz2 5106520
+RMD160 256ca518fea507d03b67c0f5d26ba2ac7b3db517 qca-2.0.0.tar.bz2 5106520
+SHA256 2ed0d49300459ae1f2d138fc2e68ed7f92850065981032c96f2538e1878fc2d3 qca-2.0.0.tar.bz2 5106520
diff --git a/app-crypt/qca/files/qca-2.0.0-debug-same-pkgconfig-file.patch b/app-crypt/qca/files/qca-2.0.0-debug-same-pkgconfig-file.patch
new file mode 100644
index 000000000000..28f10d06af50
--- /dev/null
+++ b/app-crypt/qca/files/qca-2.0.0-debug-same-pkgconfig-file.patch
@@ -0,0 +1,37 @@
+This patch ensures that QCA2 installs the same pkg-config file,
+for both a release and a debug build.
+
+diff -ur qca-2.0.0.orig/qca-2.0.0/configure qca-2.0.0/qca-2.0.0/configure
+--- qca-2.0.0.orig/qca-2.0.0/configure	2007-12-13 14:31:23.000000000 +0100
++++ qca-2.0.0/qca-2.0.0/configure	2007-12-19 15:47:35.000000000 +0100
+@@ -749,8 +749,7 @@
+ 		QStringList pcfiles;
+ 
+ 		QDir::current().mkdir("lib");
+-		if(release)
+-		{
++
+ 			str =  pkg_template1.arg(prefix, libdir, incdir);
+ 			str += pkg_template2.arg("QCA");
+ 			str += pkg_template3.arg("QtCore");
+@@ -760,20 +759,6 @@
+ 				f.write(str.toLatin1());
+ 			f.close();
+ 			pcfiles += "lib/qca2.pc";
+-		}
+-
+-		if(debug)
+-		{
+-			str =  pkg_template1.arg(prefix, libdir, incdir);
+-			str += pkg_template2.arg("QCA_debug");
+-			str += pkg_template3.arg("QtCore_debug");
+-			str += pkg_template4.arg("qca_debug");
+-			f.setFileName("lib/qca2_debug.pc");
+-			if(f.open(QFile::WriteOnly | QFile::Truncate))
+-				f.write(str.toLatin1());
+-			f.close();
+-			pcfiles += "lib/qca2_debug.pc";
+-		}
+ 
+         	str = QString(
+ 		"pcfiles.path = \$\$PREFIX/lib/pkgconfig\n"
diff --git a/app-crypt/qca/qca-2.0.0-r2.ebuild b/app-crypt/qca/qca-2.0.0-r2.ebuild
new file mode 100644
index 000000000000..8efc773a9fde
--- /dev/null
+++ b/app-crypt/qca/qca-2.0.0-r2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/qca-2.0.0-r2.ebuild,v 1.1 2008/01/13 17:54:13 philantrop Exp $
+
+EAPI="1"
+
+inherit eutils multilib qt4
+
+DESCRIPTION="Qt Cryptographic Architecture (QCA)"
+HOMEPAGE="http://delta.affinix.com/qca/"
+SRC_URI="http://delta.affinix.com/download/qca/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc examples"
+RESTRICT="mirror test"
+
+DEPEND=">=x11-libs/qt-4.2.0:4"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	if use debug && ! built_with_use x11-libs/qt:4 debug; then
+		echo
+		eerror "You are trying to compile ${PN} package with USE=\"debug\""
+		eerror "while qt4 is built without this particular flag."
+		echo
+		eerror "Possible solutions to this problem are:"
+		eerror "a) install package ${PN} without debug USE flag"
+		eerror "b) re-emerge qt4 with debug USE flag"
+		echo
+		die "can't emerge ${PN} with debug USE flag"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-debug-same-pkgconfig-file.patch"
+}
+
+src_compile() {
+	_libdir=$(get_libdir)
+	local myconf
+	if use debug; then
+		myconf="--debug"
+	else
+		myconf="--release"
+	fi
+
+	# Multilib fix.
+	sed -e "/pcfiles.path/s:lib:${_libdir}:" \
+		-i "${S}"/configure || die "Multilib fix failed."
+
+	./configure \
+		--prefix=/usr \
+		--qtdir=/usr \
+		--includedir="/usr/include/qca2" \
+		--libdir="/usr/${_libdir}/qca2" \
+		--no-separate-debug-info \
+		--disable-tests \
+		${myconf} \
+		|| die "configure failed"
+
+	eqmake4 ${PN}.pro
+	emake || die "emake failed"
+}
+
+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
+
+	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
+}