Version bump as per bug 129536.

Package-Manager: portage-2.1.4

5 files changed, 151 insertions, 16 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/Manifest b/app-crypt/qca/Manifest
index 4243776fd7cf..dac399eced64 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,23 +1,29 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX qca-1.0-fbsd.patch 753 RMD160 481eee7ad8e334f1551c00de7ac7f597694a92a2 SHA1 582f3259623ee82ec38a1a9e4391b22c2946c0ac SHA256 53a0257ecbf917741b41ab4bc50a1d9518cb1bd86f0be36dbf3a1c6ef1d5257c
 MD5 2efadaf203fdd3186a7e909c0d02c425 files/qca-1.0-fbsd.patch 753
 RMD160 481eee7ad8e334f1551c00de7ac7f597694a92a2 files/qca-1.0-fbsd.patch 753
 SHA256 53a0257ecbf917741b41ab4bc50a1d9518cb1bd86f0be36dbf3a1c6ef1d5257c files/qca-1.0-fbsd.patch 753
+AUX qca-2.0.0-debug-same-pkgconfig-file.patch 1112 RMD160 a0bbc98447d7ddfa090bc20b404655c768f00947 SHA1 7c11cceb62d46094367d5cb81088d96d376bbdfe SHA256 5240f0853a3d918efe6ef861cdf1c5b0e611f165257d3e74479468de014d1883
+MD5 865db1dbed582c947097356a78f1db10 files/qca-2.0.0-debug-same-pkgconfig-file.patch 1112
+RMD160 a0bbc98447d7ddfa090bc20b404655c768f00947 files/qca-2.0.0-debug-same-pkgconfig-file.patch 1112
+SHA256 5240f0853a3d918efe6ef861cdf1c5b0e611f165257d3e74479468de014d1883 files/qca-2.0.0-debug-same-pkgconfig-file.patch 1112
 AUX qca-pathfix.patch 267 RMD160 933217ccfdf29b4b37a8a6106ec79bb42f68ab13 SHA1 2cdbf42746969bbfcf03eceae5309f444a8e7145 SHA256 423980ef7c981a1af07297e1f8abd4769a70e2e92a638012cac68d912b0dea4c
 MD5 ee5764e49e4425fb387e29a7d8e2fec0 files/qca-pathfix.patch 267
 RMD160 933217ccfdf29b4b37a8a6106ec79bb42f68ab13 files/qca-pathfix.patch 267
 SHA256 423980ef7c981a1af07297e1f8abd4769a70e2e92a638012cac68d912b0dea4c files/qca-pathfix.patch 267
 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
 EBUILD qca-1.0-r2.ebuild 1070 RMD160 b1075f03effb69f45e37e41bc4f8025d6771cba2 SHA1 a0d9f75b6f5e84a12ea9834491b38e2b270cd925 SHA256 5314dce386be236d215179a08ab6a6ccb638463642be51116ff06025a5406ea2
 MD5 31a1f7ff426af65d3834a63cb61c7994 qca-1.0-r2.ebuild 1070
 RMD160 b1075f03effb69f45e37e41bc4f8025d6771cba2 qca-1.0-r2.ebuild 1070
 SHA256 5314dce386be236d215179a08ab6a6ccb638463642be51116ff06025a5406ea2 qca-1.0-r2.ebuild 1070
-MISC ChangeLog 3247 RMD160 6687d9cf22cfa1e409ccf44c6b599d8022619d2a SHA1 c4a96da134080698dc5587e255aed0cdec81b4bc SHA256 513004bdbf0a98ea41c4e5815b075a99f12b7ccd2b91022cc574d82081803640
-MD5 f96bd60648d1f1e69dbaae1ebd948b56 ChangeLog 3247
-RMD160 6687d9cf22cfa1e409ccf44c6b599d8022619d2a ChangeLog 3247
-SHA256 513004bdbf0a98ea41c4e5815b075a99f12b7ccd2b91022cc574d82081803640 ChangeLog 3247
+EBUILD qca-2.0.0-r2.ebuild 2055 RMD160 f4ab9cac9cda11cdfb070cf50a9e15ba3356b901 SHA1 7971e0fc89f942ff9501d232949194aa2760db40 SHA256 e340e97e679d2a3dd0ae44646df9d02670ed69801d24da2a9de688186d631f6f
+MD5 1cf8ac259230eafa76f3f15a94fc8924 qca-2.0.0-r2.ebuild 2055
+RMD160 f4ab9cac9cda11cdfb070cf50a9e15ba3356b901 qca-2.0.0-r2.ebuild 2055
+SHA256 e340e97e679d2a3dd0ae44646df9d02670ed69801d24da2a9de688186d631f6f qca-2.0.0-r2.ebuild 2055
+MISC ChangeLog 3445 RMD160 8bf5923a37120511ba9827dbf727f206913e60ac SHA1 ce79173c2c2e8c83684c172064b81ac936fd06a2 SHA256 ae949a75646c1a4fc80a14d8e585b4df8b5bf8bb6cbd24e5db622a8ac1763514
+MD5 df7daf4788bf5b365fdf207f16980991 ChangeLog 3445
+RMD160 8bf5923a37120511ba9827dbf727f206913e60ac ChangeLog 3445
+SHA256 ae949a75646c1a4fc80a14d8e585b4df8b5bf8bb6cbd24e5db622a8ac1763514 ChangeLog 3445
 MISC metadata.xml 175 RMD160 7b2f22c798e48fc11f071762f6acf20baaf40188 SHA1 a36f05b8242f0ca11a2efb95c6cfdc5cd7d93fb7 SHA256 1b062933bb6cf3e6d3bca8c2830f0b87701781bc4a3594229ad28e9bee874176
 MD5 864865fd8582ff568410e7b390bea42f metadata.xml 175
 RMD160 7b2f22c798e48fc11f071762f6acf20baaf40188 metadata.xml 175
@@ -25,10 +31,6 @@ SHA256 1b062933bb6cf3e6d3bca8c2830f0b87701781bc4a3594229ad28e9bee874176 metadata
 MD5 2323bf42b55a722609732dcd1a558bd4 files/digest-qca-1.0-r2 223
 RMD160 8e20220dc4fc74d4055cc71f2f7f6cc0875073f4 files/digest-qca-1.0-r2 223
 SHA256 6739aa693753de597bfb6aec78009c9862a0b93a3e0e333d33a6ab878754f1d0 files/digest-qca-1.0-r2 223
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFNsMPz974XjDVpbkRAq09AJ0Xi0dOGCa5qu32s/3c54LzEkUQ1wCfc0cY
-f7x6NJZM2DVx/CgjpnSNTSQ=
-=rvQ/
------END PGP SIGNATURE-----
+MD5 30cfbfcbf1ccb461f4391e729ec6a05b files/digest-qca-2.0.0-r2 235
+RMD160 affdf7b0b7c3f4f15e17c65cf4c55b19b3b19e84 files/digest-qca-2.0.0-r2 235
+SHA256 8aa775c7fcda6151176c9f14f954350c9677f43191c0bd6f22bc2a6fe38026a0 files/digest-qca-2.0.0-r2 235
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
+}