Add ~amd64-linux/~x86-linux; drop old versions

Package-Manager: portage--svn/cvs/Linux i686

6 files changed, 17 insertions, 189 deletions

diff --git a/app-crypt/qca/ChangeLog b/app-crypt/qca/ChangeLog
index 6561e05e8342..023904a5f9db 100644
--- a/app-crypt/qca/ChangeLog
+++ b/app-crypt/qca/ChangeLog
@@ -1,6 +1,11 @@
 # 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.77 2009/11/13 12:40:44 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/ChangeLog,v 1.78 2009/12/14 16:44:17 abcd Exp $
+
+  14 Dec 2009; Jonathan Callen <abcd@gentoo.org> -qca-2.0.0-r2.ebuild,
+  -files/qca-2.0.0-debug-same-pkgconfig-file.patch, -qca-2.0.2-r1.ebuild,
+  qca-2.0.2-r2.ebuild:
+  Add ~amd64-linux/~x86-linux; drop old versions
 
   13 Nov 2009; Joseph Jezak <josejx@gentoo.org> qca-2.0.2-r2.ebuild:
   Marked ppc64 stable for bug #272685.
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index ce71ad895d42..6b24f6bdd678 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,23 +1,9 @@
------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.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
 DIST qca-2.0.2.tar.bz2 1937201 RMD160 18b0f497709f9700227644977946735d2ec3c623 SHA1 5a414c3296cd37d1ec34182be0d089c5073f55a8 SHA256 49b5474450104a2298747c243de1451ab7a6aeed4bf7df43ffa4b7128a2837b8
 EBUILD qca-1.0-r3.ebuild 1359 RMD160 ad5344c3ef85b7453f1d4898341aa0f03e3d19da SHA1 e9e6c30da0e0c550db21f09b937fbc9cdace2e86 SHA256 1d840266250e93113f82f4760e0a9ba7984147c2b5e8f9c1499078687fc35d8a
-EBUILD qca-2.0.0-r2.ebuild 1612 RMD160 c04e67d01180835cade7e0227350b9d4792b80b3 SHA1 3c4c8177d08f2b430d2f8a2687d02a85cbbabd29 SHA256 d5200aac2fef8fafaae46af5719dab2db81f6711df33b155ab41b6d92c9eb27a
-EBUILD qca-2.0.2-r1.ebuild 1447 RMD160 e20c34b8f947ea963cf81fc86092178b88b32fc9 SHA1 0c15748577af74259b0f21e4b81ffff68fd9cf12 SHA256 a23981552704bb3ea77a55a58121c402f83a75b7b978d69566f6d034ff1190e2
-EBUILD qca-2.0.2-r2.ebuild 1449 RMD160 68247360cae024eeaadccbc5880701a62bfe4699 SHA1 54e9efc61e86d1161473d29dd5a0aa22812ff7b7 SHA256 bb06dc8ee024fe69054621ae9c28781552fe63acba1f41c995fb6d699dc88b85
-MISC ChangeLog 9385 RMD160 6520cb518f33a79b1286ad722d7e7526ba10ce19 SHA1 bdfa153614e41f95bb4fcc52a2882769cb18de53 SHA256 c3e91c9211081993c93396f0cd99796675f17a3642ae7029fcf18caae3198493
+EBUILD qca-2.0.2-r2.ebuild 1552 RMD160 d8cba5d0905b4d1ca1b2f28a5dbc92bee396ada6 SHA1 5a98d8c7739cdd101844e8c5bcd76390e762b3c5 SHA256 0edd9c1b38d4141bc46357dedf0c5244150a4a05332d3492004d72a45c39f3f1
+MISC ChangeLog 9601 RMD160 66a871ad1138d0dc1f11a15683830452110c9eef SHA1 e4c2405e6ab8086f78c41e4f7840b1da4a4b5c65 SHA256 8fc917c89a2af95f1d683f279c542cc9755d1f433104235d5846344f32ee1ad9
 MISC metadata.xml 192 RMD160 421d4665996ea38fdfc756e2da700603abe17ec7 SHA1 c32af4b790776c36b524e5f2e2dca587c9cd3351 SHA256 e585d77a075b30463ad28cc89374f9ef2876636bca95a23321b824e0122aa6fd
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkr9U8cACgkQcsIHjyDViGTE/wCfRH5nPnEJU7G8lNc4fWrewvMi
-YAcAmQGPE7j+tQ+uWE9NEF68X8rtt0s8
-=Y3yh
------END PGP SIGNATURE-----
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
deleted file mode 100644
index 28f10d06af50..000000000000
--- a/app-crypt/qca/files/qca-2.0.0-debug-same-pkgconfig-file.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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
deleted file mode 100644
index 808de7ea665c..000000000000
--- a/app-crypt/qca/qca-2.0.0-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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.0-r2.ebuild,v 1.19 2009/10/05 19:08:48 ayoy 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}"
-
-PATCHES=( "${FILESDIR}/${P}-debug-same-pkgconfig-file.patch" )
-
-src_configure() {
-	_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
-}
-
-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
-}
diff --git a/app-crypt/qca/qca-2.0.2-r1.ebuild b/app-crypt/qca/qca-2.0.2-r1.ebuild
deleted file mode 100644
index 2939d7665bde..000000000000
--- a/app-crypt/qca/qca-2.0.2-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.6 2009/08/09 11:47:08 nixnut 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
-}
diff --git a/app-crypt/qca/qca-2.0.2-r2.ebuild b/app-crypt/qca/qca-2.0.2-r2.ebuild
index ab0eaac98185..bece1bdc894f 100644
--- a/app-crypt/qca/qca-2.0.2-r2.ebuild
+++ b/app-crypt/qca/qca-2.0.2-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.8 2009/11/13 12:40:44 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/qca-2.0.2-r2.ebuild,v 1.9 2009/12/14 16:44:17 abcd Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug doc examples"
 RESTRICT="test"
 
@@ -26,13 +26,15 @@ src_prepare() {
 }
 
 src_configure() {
+	use prefix || EPREFIX=
+
 	_libdir=$(get_libdir)
 
 	./configure \
-		--prefix=/usr \
-		--qtdir=/usr \
-		--includedir="/usr/include/qca2" \
-		--libdir="/usr/${_libdir}/qca2" \
+		--prefix="${EPREFIX}"/usr \
+		--qtdir="${EPREFIX}"/usr \
+		--includedir="${EPREFIX}"/usr/include/qca2 \
+		--libdir="${EPREFIX}"/usr/${_libdir}/qca2 \
 		--no-separate-debug-info \
 		--disable-tests \
 		--$(use debug && echo debug || echo release) \
@@ -46,7 +48,7 @@ src_install() {
 	dodoc README TODO || die "dodoc failed"
 
 	cat <<-EOF > "${WORKDIR}"/44qca2
-	LDPATH=/usr/${_libdir}/qca2
+	LDPATH="${EPREFIX}/usr/${_libdir}/qca2"
 	EOF
 	doenvd "${WORKDIR}"/44qca2 || die