Fixes db detection, thanks to Tomas Sedlak, bug#152846. Cleanup old revisions, organize patchset

(Portage version: 2.1.1)
 (Unsigned Manifest commit)

6 files changed, 16 insertions, 108 deletions

diff --git a/app-crypt/xca/Manifest b/app-crypt/xca/Manifest
index ba45df60abf3..e48143c63e0b 100644
--- a/app-crypt/xca/Manifest
+++ b/app-crypt/xca/Manifest
@@ -1,11 +1,7 @@
-AUX Rules.mak-prefix.patch 317 RMD160 a531dd6004069e25aa221a393c367fb949d278ff SHA1 dca4dfb88a0e1ce73d9634dd52a542ce1ff6d52c SHA256 fd74fd4b175990013b14b904695010998ba8480a7943d314aa98a04f5ecfc430
-MD5 a863ab8517d47d6115278df5657a8e6e files/Rules.mak-prefix.patch 317
-RMD160 a531dd6004069e25aa221a393c367fb949d278ff files/Rules.mak-prefix.patch 317
-SHA256 fd74fd4b175990013b14b904695010998ba8480a7943d314aa98a04f5ecfc430 files/Rules.mak-prefix.patch 317
-AUX configure-db.patch 471 RMD160 d3a76db8e455d37e772b9f5d874f1b301b775bb6 SHA1 151a4fccc8f3c5ef02652a67e43b9953d5a62059 SHA256 25b6b57363f51f25901416c33ab7d5d1d19cf8a8de16ed7f6f9394f0bfad77e8
-MD5 ab7ebbe2a038dc3100f6f4af0923946c files/configure-db.patch 471
-RMD160 d3a76db8e455d37e772b9f5d874f1b301b775bb6 files/configure-db.patch 471
-SHA256 25b6b57363f51f25901416c33ab7d5d1d19cf8a8de16ed7f6f9394f0bfad77e8 files/configure-db.patch 471
+AUX xca-0.5.1-build.patch 2965 RMD160 5a5e164a91ac8d8a4dc83b957296b293a3fdf581 SHA1 8f7f22c71f77067f4a7930eee1ccc35b26afed15 SHA256 ca13c5471c751b9b0b429fbad2f4b7f7b5843326d461d75873b7be557bc2e884
+MD5 269f595e7b349b3d627293bf2b093c46 files/xca-0.5.1-build.patch 2965
+RMD160 5a5e164a91ac8d8a4dc83b957296b293a3fdf581 files/xca-0.5.1-build.patch 2965
+SHA256 ca13c5471c751b9b0b429fbad2f4b7f7b5843326d461d75873b7be557bc2e884 files/xca-0.5.1-build.patch 2965
 AUX xca-0.5.1-gcc4.patch 2102 RMD160 a8bfd9cd9adcbf50659e0b78865a025fe28c486b SHA1 9e6342598933c14a0d704cb6ca97904f753b0be6 SHA256 e3061b1fbad16360fc7b62a8992646e3a77c9c36f042b5bd81c889547814debb
 MD5 d7ceb9e30f73b77d905551ce55931171 files/xca-0.5.1-gcc4.patch 2102
 RMD160 a8bfd9cd9adcbf50659e0b78865a025fe28c486b files/xca-0.5.1-gcc4.patch 2102
@@ -14,30 +10,23 @@ AUX xca-0.5.1-openssl.patch 4600 RMD160 94fe9b4c6d6403fe1be0d072601a2216def14fb3
 MD5 6b400e20c459bac0ab47730795bc328e files/xca-0.5.1-openssl.patch 4600
 RMD160 94fe9b4c6d6403fe1be0d072601a2216def14fb3 files/xca-0.5.1-openssl.patch 4600
 SHA256 fb81de315bf35d97187665d23a66bf024024a6e31ee36435f971b9fbf4900303 files/xca-0.5.1-openssl.patch 4600
-AUX xca-0.5.1-qt.diff 466 RMD160 b12477cce4bf73965472d87c2f1b791eeb0982c6 SHA1 fc67adf470a3f69dc0279624172446f058574297 SHA256 72967565b2100e88608b0bbdac43a7e0a1f525a2b07fc9b2138cd5b2fbfbe01e
-MD5 8bdc8f5dfc26313d6d167f947ce7bd8c files/xca-0.5.1-qt.diff 466
-RMD160 b12477cce4bf73965472d87c2f1b791eeb0982c6 files/xca-0.5.1-qt.diff 466
-SHA256 72967565b2100e88608b0bbdac43a7e0a1f525a2b07fc9b2138cd5b2fbfbe01e files/xca-0.5.1-qt.diff 466
+AUX xca-0.5.1-qt.patch 466 RMD160 b12477cce4bf73965472d87c2f1b791eeb0982c6 SHA1 fc67adf470a3f69dc0279624172446f058574297 SHA256 72967565b2100e88608b0bbdac43a7e0a1f525a2b07fc9b2138cd5b2fbfbe01e
+MD5 8bdc8f5dfc26313d6d167f947ce7bd8c files/xca-0.5.1-qt.patch 466
+RMD160 b12477cce4bf73965472d87c2f1b791eeb0982c6 files/xca-0.5.1-qt.patch 466
+SHA256 72967565b2100e88608b0bbdac43a7e0a1f525a2b07fc9b2138cd5b2fbfbe01e files/xca-0.5.1-qt.patch 466
 DIST xca-0.5.1.tar.gz 287025 RMD160 7d21c94d245679c8b842e4b0e1a9c4420104017f SHA1 f8b99438cfa4da47972a69d1856ef876b06d5b40 SHA256 cf51de5760c6d34b17b379c23f17699ee597a3264b9bed0f165bd302726757cb
-EBUILD xca-0.5.1-r1.ebuild 1160 RMD160 e21f0fc97bb92a1e2e4d9a0e498d24a9ce835e1a SHA1 e15027729aafc7664bfff684760698667293e6dc SHA256 03ff181c1b90e6433d8f8fdc3229f349086c0baba633edbd28ddc669c41b1f96
-MD5 642e56e25551417bca8f4643507648c0 xca-0.5.1-r1.ebuild 1160
-RMD160 e21f0fc97bb92a1e2e4d9a0e498d24a9ce835e1a xca-0.5.1-r1.ebuild 1160
-SHA256 03ff181c1b90e6433d8f8fdc3229f349086c0baba633edbd28ddc669c41b1f96 xca-0.5.1-r1.ebuild 1160
-EBUILD xca-0.5.1.ebuild 1081 RMD160 036538d2f38201a6fbc56d9af18dab118edac201 SHA1 26ea0633831ea22857107f3020f9919ec68519b8 SHA256 f9bf4ef8a3094e3db83f2f002cbd11f6982aac2720608130959c87829eb7b93d
-MD5 c69224368997c24ca0bbd21e6f492aaf xca-0.5.1.ebuild 1081
-RMD160 036538d2f38201a6fbc56d9af18dab118edac201 xca-0.5.1.ebuild 1081
-SHA256 f9bf4ef8a3094e3db83f2f002cbd11f6982aac2720608130959c87829eb7b93d xca-0.5.1.ebuild 1081
-MISC ChangeLog 1498 RMD160 614752ac3e243f385399f38483fbf66d9d2bfa6f SHA1 b13e282fbad02cfb4e03f547c27144ecc586e48a SHA256 edc540db7f7705c9483647999b11ef8cfd4094f3ad4965cff42f005667872cc6
-MD5 74586cbb53deee34d08aa6f2c3bbdc43 ChangeLog 1498
-RMD160 614752ac3e243f385399f38483fbf66d9d2bfa6f ChangeLog 1498
-SHA256 edc540db7f7705c9483647999b11ef8cfd4094f3ad4965cff42f005667872cc6 ChangeLog 1498
+EBUILD xca-0.5.1-r1.ebuild 1147 RMD160 1994380ed6fb3dead0e333e60e6421136fa5a7b3 SHA1 70cc57d2f0f11bd7257669e96d38fcc5c72c4e66 SHA256 21fb74614d79ec6c0f0a408e1fe13bba70c83c0cd3f75392b09e54efa6bcad0b
+MD5 2973a0f1f11996eed7beafcc4ec60b52 xca-0.5.1-r1.ebuild 1147
+RMD160 1994380ed6fb3dead0e333e60e6421136fa5a7b3 xca-0.5.1-r1.ebuild 1147
+SHA256 21fb74614d79ec6c0f0a408e1fe13bba70c83c0cd3f75392b09e54efa6bcad0b xca-0.5.1-r1.ebuild 1147
+MISC ChangeLog 1835 RMD160 6be0fb94f77a705d995538bd5e4c0e3d811051fb SHA1 22bc4b7ef84f1af820f05478ccec318ac13e1ed5 SHA256 5fee43a11f85fe822d893e58bae9fb12f1a89a46ff09314bbd7fec44b203be59
+MD5 876c45b8b40c559d9e252e77b17674a0 ChangeLog 1835
+RMD160 6be0fb94f77a705d995538bd5e4c0e3d811051fb ChangeLog 1835
+SHA256 5fee43a11f85fe822d893e58bae9fb12f1a89a46ff09314bbd7fec44b203be59 ChangeLog 1835
 MISC metadata.xml 224 RMD160 74db96ad8aa1d285d83ae93a9f4a767335f55c15 SHA1 d86a171d981b45e7ed0c0b3b5059d2a63c811001 SHA256 9e9ce661a9fdb45a535ad875a247b700a70745359b27533ec29a6a46fa708e86
 MD5 566cf4f89e44670d0aba4a745913d748 metadata.xml 224
 RMD160 74db96ad8aa1d285d83ae93a9f4a767335f55c15 metadata.xml 224
 SHA256 9e9ce661a9fdb45a535ad875a247b700a70745359b27533ec29a6a46fa708e86 metadata.xml 224
-MD5 d7b2b38fcc07e1225a416664d3f05252 files/digest-xca-0.5.1 229
-RMD160 68ba6a21b74d54e522d8f9c1193e62c8a4a06276 files/digest-xca-0.5.1 229
-SHA256 c5dc0a65766c285befb93a3834c4acda2831f81515b2b000c040e62e80fba4f5 files/digest-xca-0.5.1 229
 MD5 d7b2b38fcc07e1225a416664d3f05252 files/digest-xca-0.5.1-r1 229
 RMD160 68ba6a21b74d54e522d8f9c1193e62c8a4a06276 files/digest-xca-0.5.1-r1 229
 SHA256 c5dc0a65766c285befb93a3834c4acda2831f81515b2b000c040e62e80fba4f5 files/digest-xca-0.5.1-r1 229
diff --git a/app-crypt/xca/files/Rules.mak-prefix.patch b/app-crypt/xca/files/Rules.mak-prefix.patch
deleted file mode 100644
index ee46285c831e..000000000000
--- a/app-crypt/xca/files/Rules.mak-prefix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- work/xca-0.5.2/Rules.mak	2004-04-15 01:36:54.000000000 +0200
-+++ work/xca-0.5.2/Rules.mak	2005-02-22 10:15:30.157857504 +0100
-@@ -2,8 +2,8 @@
- 
- all: target.obj
- 
--ifneq ($(prefix),)
--  CFLAGS+= -DPREFIX=\"$(prefix)\"
-+ifneq ($(inst_prefix),)
-+  CFLAGS+= -DPREFIX=\"$(inst_prefix)\"
- endif
- 
- ifneq ($(basedir),)
diff --git a/app-crypt/xca/files/configure-db.patch b/app-crypt/xca/files/configure-db.patch
deleted file mode 100644
index 05f10dde7466..000000000000
--- a/app-crypt/xca/files/configure-db.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- work/xca-0.5.2/configure	2004-04-23 10:22:57.000000000 +0200
-+++ work/xca-0.5.2/configure	2005-02-21 21:37:42.000000000 +0100
-@@ -94,7 +94,7 @@
-  
- 
- ######################## DB
--subdirs="/db /db4 /db3"
-+subdirs="/db4.?"
- search_includes db_cxx.h || err "The Berkeley DB header files were not found"
- search_lib db_cxx db4_cxx db_cxx-4 db3_cxx db_cxx-3 || err "The Berkeley DB library was not found. Try installing db-dev" 
- ## The fun of NPTL... (Thx Enrico Scholz)
diff --git a/app-crypt/xca/files/digest-xca-0.5.1 b/app-crypt/xca/files/digest-xca-0.5.1
deleted file mode 100644
index f6b8229164e1..000000000000
--- a/app-crypt/xca/files/digest-xca-0.5.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 24e0289c189b8db2f1f15a4ddac1b1c3 xca-0.5.1.tar.gz 287025
-RMD160 7d21c94d245679c8b842e4b0e1a9c4420104017f xca-0.5.1.tar.gz 287025
-SHA256 cf51de5760c6d34b17b379c23f17699ee597a3264b9bed0f165bd302726757cb xca-0.5.1.tar.gz 287025
diff --git a/app-crypt/xca/files/xca-0.5.1-qt.diff b/app-crypt/xca/files/xca-0.5.1-qt.diff
deleted file mode 100644
index c6d101942ff8..000000000000
--- a/app-crypt/xca/files/xca-0.5.1-qt.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur xca-0.5.1.orig/widgets/clicklabel.cpp xca-0.5.1/widgets/clicklabel.cpp
---- xca-0.5.1.orig/widgets/clicklabel.cpp	2003-11-26 23:03:18.000000000 +0100
-+++ xca-0.5.1/widgets/clicklabel.cpp	2004-12-09 20:18:02.632858864 +0100
-@@ -58,7 +58,7 @@
- ClickLabel::ClickLabel( QWidget* parent,  const char* name, WFlags f )
- 	:QLabel( parent, name, f )
- {
--	QFont font( font() );
-+	QFont font;
- 	font.setBold(true);
- 	setFont( font );
- 	setFrameShape( QLabel::Panel );
diff --git a/app-crypt/xca/xca-0.5.1.ebuild b/app-crypt/xca/xca-0.5.1.ebuild
deleted file mode 100644
index 82fad48d011f..000000000000
--- a/app-crypt/xca/xca-0.5.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/xca/xca-0.5.1.ebuild,v 1.7 2006/06/11 21:58:32 jokey Exp $
-
-inherit eutils kde toolchain-funcs
-
-DESCRIPTION="a graphical user interface to OpenSSL, RSA public keys, certificates, signing requests and revokation lists"
-HOMEPAGE="http://www.hohnstaedt.de/xca.html"
-SRC_URI="mirror://sourceforge/xca/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=">=dev-libs/openssl-0.9.6
-	=x11-libs/qt-3*
-	>=sys-libs/db-4.1"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-qt.diff
-	epatch ${FILESDIR}/configure-db.patch
-	echo "inst_prefix=/usr" >> Local.mak
-	epatch ${FILESDIR}/Rules.mak-prefix.patch
-}
-
-src_compile() {
-	kde_src_compile nothing
-	CC=$(tc-getCC) prefix=/usr ./configure || die "configure died"
-	inst_prefix=/usr emake || die "emake failed"
-}
-
-src_install() {
-	make destdir=${D} mandir=share/man install
-
-	dodoc README CREDITS AUTHORS COPYRIGHT
-
-	insinto /etc/xca
-	doins misc/*.txt
-}