Fix bug#196765 thanks for Alexander Skwar for reporting, cleanup

Package-Manager: portage-2.1.3.15

14 files changed, 40 insertions, 486 deletions

diff --git a/app-crypt/xca/ChangeLog b/app-crypt/xca/ChangeLog
index af52b4b564b9..cbcff2ba698a 100644
--- a/app-crypt/xca/ChangeLog
+++ b/app-crypt/xca/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-crypt/xca
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/xca/ChangeLog,v 1.12 2007/09/22 18:20:49 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/xca/ChangeLog,v 1.13 2007/10/23 15:49:30 alonbl Exp $
+
+  23 Oct 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  -files/xca-0.5.1-build.patch, -files/xca-0.5.1-db.patch,
+  -files/xca-0.5.1-gcc4.patch, -files/xca-0.5.1-openssl.patch,
+  -files/xca-0.5.1-qt.patch, -files/xca-0.6.0-build.patch,
+  +files/xca-0.6.4-openssl.patch, -xca-0.5.1-r1.ebuild, -xca-0.6.0.ebuild,
+  xca-0.6.4.ebuild:
+  Fix bug#196765 thanks for Alexander Skwar for reporting, cleanup
 
 *xca-0.6.4 (22 Sep 2007)
 
diff --git a/app-crypt/xca/Manifest b/app-crypt/xca/Manifest
index 5a6bc42292a9..4c694b1364b7 100644
--- a/app-crypt/xca/Manifest
+++ b/app-crypt/xca/Manifest
@@ -1,60 +1,24 @@
-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-db.patch 1260 RMD160 e02034b7de0020eadd94fcbd1b2ed7f2b2f00bd5 SHA1 04dcf47abf4ceda13ff9dcc3d003bcd113d2fcb1 SHA256 f0b29faba52626b5d91810a5cc0b19a15f6f27a1edf6250fda285f26cf67c7e9
-MD5 12db6b3e2166ad3bdfc1abf947ed6933 files/xca-0.5.1-db.patch 1260
-RMD160 e02034b7de0020eadd94fcbd1b2ed7f2b2f00bd5 files/xca-0.5.1-db.patch 1260
-SHA256 f0b29faba52626b5d91810a5cc0b19a15f6f27a1edf6250fda285f26cf67c7e9 files/xca-0.5.1-db.patch 1260
-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
-SHA256 e3061b1fbad16360fc7b62a8992646e3a77c9c36f042b5bd81c889547814debb files/xca-0.5.1-gcc4.patch 2102
-AUX xca-0.5.1-openssl.patch 4600 RMD160 94fe9b4c6d6403fe1be0d072601a2216def14fb3 SHA1 d5c06927942c9f86a77c64c7dfcd6e2048273bdf SHA256 fb81de315bf35d97187665d23a66bf024024a6e31ee36435f971b9fbf4900303
-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.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
-AUX xca-0.6.0-build.patch 830 RMD160 75a56b6f9a006e7811e7686d1134f5d7308c5747 SHA1 5e29b61e17f96e292206df5010f6222ba99df64d SHA256 0763649a5771bc9b1643b3b7e6b673569ac3adfb06d699d35c39be8c8c4cf924
-MD5 7898b30dcf3061babf8d575884ee5c5b files/xca-0.6.0-build.patch 830
-RMD160 75a56b6f9a006e7811e7686d1134f5d7308c5747 files/xca-0.6.0-build.patch 830
-SHA256 0763649a5771bc9b1643b3b7e6b673569ac3adfb06d699d35c39be8c8c4cf924 files/xca-0.6.0-build.patch 830
 AUX xca-0.6.4-build.patch 1236 RMD160 6574b6ecbfe7cebc6073850f644ad4c1a9ace426 SHA1 66159df2766b1c99b4c610999191a863a88be09c SHA256 b5d20b02750808728ede57b28a3fff5f2adde6a0d101a1b38d136f8ea023192d
 MD5 0578ef32a8eb5d4b905bc8d64fa696c7 files/xca-0.6.4-build.patch 1236
 RMD160 6574b6ecbfe7cebc6073850f644ad4c1a9ace426 files/xca-0.6.4-build.patch 1236
 SHA256 b5d20b02750808728ede57b28a3fff5f2adde6a0d101a1b38d136f8ea023192d files/xca-0.6.4-build.patch 1236
-DIST xca-0.5.1.tar.gz 287025 RMD160 7d21c94d245679c8b842e4b0e1a9c4420104017f SHA1 f8b99438cfa4da47972a69d1856ef876b06d5b40 SHA256 cf51de5760c6d34b17b379c23f17699ee597a3264b9bed0f165bd302726757cb
-DIST xca-0.6.0.tar.gz 261479 RMD160 cea0ca3eeefe2cf015b9be1edcb11e4f8c868490 SHA1 9d3a49add6a550ce9414cffea6ccd15f35259532 SHA256 523e406a4e94e006aa72ae53f24e8ccf9b55b348e1695f27abf2abc23ff74077
+AUX xca-0.6.4-openssl.patch 628 RMD160 1478b6959461a355f633d1632ac09ae0a07babd6 SHA1 7400a2633c30e04ff998632d281af4c8a43db0c3 SHA256 0f23131b0042120958f0b000113aa4a2fcd6b6d8d68d07399de345559f46a2d5
+MD5 b2f6b0ed4c229e9763aad054b3ee7f61 files/xca-0.6.4-openssl.patch 628
+RMD160 1478b6959461a355f633d1632ac09ae0a07babd6 files/xca-0.6.4-openssl.patch 628
+SHA256 0f23131b0042120958f0b000113aa4a2fcd6b6d8d68d07399de345559f46a2d5 files/xca-0.6.4-openssl.patch 628
 DIST xca-0.6.4.tar.gz 266574 RMD160 15f8253bf2d80aac9053f52c189dabf5b73a5d6a SHA1 bc4ce3d1bbb988ba9bcd762a33084571c161b8a4 SHA256 63e5992d461cbea38fb5433c989ee1cc73d7dac5162e57d6e70a7735d9f80ed4
-EBUILD xca-0.5.1-r1.ebuild 1183 RMD160 f225bf47a7dcb2b65c1b4ccbf4f9c9f138c4a57d SHA1 05a3188afc14f3e329e787277f876e7d114d7306 SHA256 f01662628ff1eefb2fb9e57a6e54efe6f6fe1b78b984498eee5487ce35f6a1ca
-MD5 e3e5b458d85f24ff8212ad9d7b64b9f0 xca-0.5.1-r1.ebuild 1183
-RMD160 f225bf47a7dcb2b65c1b4ccbf4f9c9f138c4a57d xca-0.5.1-r1.ebuild 1183
-SHA256 f01662628ff1eefb2fb9e57a6e54efe6f6fe1b78b984498eee5487ce35f6a1ca xca-0.5.1-r1.ebuild 1183
-EBUILD xca-0.6.0.ebuild 1423 RMD160 d36bf4b1c03d7aed4ff3b868568d80a04ceda019 SHA1 43e43763237e2a7ea4383c0c36a5524d4f064365 SHA256 14f55b98640db2a63fb2b660a5b964c224da8636e146af181b8e9f250e2f00ca
-MD5 f3430c002f76160815d1a9ebc76865fb xca-0.6.0.ebuild 1423
-RMD160 d36bf4b1c03d7aed4ff3b868568d80a04ceda019 xca-0.6.0.ebuild 1423
-SHA256 14f55b98640db2a63fb2b660a5b964c224da8636e146af181b8e9f250e2f00ca xca-0.6.0.ebuild 1423
-EBUILD xca-0.6.4.ebuild 1269 RMD160 db334ede3866f686e9a1242666c0c822b9aaa2bc SHA1 4c2b13073a13d97621babbf6b52822eb82b8bf13 SHA256 a3dc914e431fec4508cf84f9f3e1d558c73efb98c202102074a23d8462dfb94b
-MD5 16904b1bcc63e9c75824286c5b707731 xca-0.6.4.ebuild 1269
-RMD160 db334ede3866f686e9a1242666c0c822b9aaa2bc xca-0.6.4.ebuild 1269
-SHA256 a3dc914e431fec4508cf84f9f3e1d558c73efb98c202102074a23d8462dfb94b xca-0.6.4.ebuild 1269
-MISC ChangeLog 2312 RMD160 c2c98e1caeca55e58c8b3bd44d03c4116eb12fce SHA1 6fe6a202a80e1ac1865ca15fb884992ba4db8e4b SHA256 63c0d2f8d367f88c69a6ba9cdf1492a31ac1fe3bef99b2bb0b31698c1db6c872
-MD5 e37236654124fe2c53e162b7ee04dbe7 ChangeLog 2312
-RMD160 c2c98e1caeca55e58c8b3bd44d03c4116eb12fce ChangeLog 2312
-SHA256 63c0d2f8d367f88c69a6ba9cdf1492a31ac1fe3bef99b2bb0b31698c1db6c872 ChangeLog 2312
+EBUILD xca-0.6.4.ebuild 1310 RMD160 57f43bebf0cea70b1408d16fe5fae3da6c5e4de1 SHA1 e01435f3a6734adf7f10ec6630b09845d71f99d3 SHA256 b255db246d741b11d88f690d9a547c1c96e2c7755ce48d27e4a93c1c550b2592
+MD5 405de3eb79016397c4a8ee63cd24e1e8 xca-0.6.4.ebuild 1310
+RMD160 57f43bebf0cea70b1408d16fe5fae3da6c5e4de1 xca-0.6.4.ebuild 1310
+SHA256 b255db246d741b11d88f690d9a547c1c96e2c7755ce48d27e4a93c1c550b2592 xca-0.6.4.ebuild 1310
+MISC ChangeLog 2704 RMD160 4b54fd44c614522417bae38a65d2dd32ff64d7e8 SHA1 78ad71f662149700b3848679edd0185e91bf9c73 SHA256 b7a612feeefc8dd598a15da56de0bad05e38d45983f1c3a2ef6903dff6a5f7a1
+MD5 fee0e8c1eeb08d9d1267131985499d92 ChangeLog 2704
+RMD160 4b54fd44c614522417bae38a65d2dd32ff64d7e8 ChangeLog 2704
+SHA256 b7a612feeefc8dd598a15da56de0bad05e38d45983f1c3a2ef6903dff6a5f7a1 ChangeLog 2704
 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-r1 229
-RMD160 68ba6a21b74d54e522d8f9c1193e62c8a4a06276 files/digest-xca-0.5.1-r1 229
-SHA256 c5dc0a65766c285befb93a3834c4acda2831f81515b2b000c040e62e80fba4f5 files/digest-xca-0.5.1-r1 229
-MD5 864de0024d3404092f70e07a52e17fd4 files/digest-xca-0.6.0 229
-RMD160 06e687f3b0b724a91d3872c9f2892acc205ce6e2 files/digest-xca-0.6.0 229
-SHA256 21903aca5ef176e49daadbe9c491577f2e563274dc81a307b1ca0b52a1ef00a2 files/digest-xca-0.6.0 229
 MD5 9def83df8370ea4916b88ccd32d1fa3e files/digest-xca-0.6.4 229
 RMD160 d69abe54c8c417927b0f1f1358c11d3d04f7ed57 files/digest-xca-0.6.4 229
 SHA256 e8aded82d75e4f062c8c5a289bff95cb49733e0664207cfbcb47159119ad1e3b files/digest-xca-0.6.4 229
diff --git a/app-crypt/xca/files/digest-xca-0.5.1-r1 b/app-crypt/xca/files/digest-xca-0.5.1-r1
deleted file mode 100644
index f6b8229164e1..000000000000
--- a/app-crypt/xca/files/digest-xca-0.5.1-r1
+++ /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/digest-xca-0.6.0 b/app-crypt/xca/files/digest-xca-0.6.0
deleted file mode 100644
index 3dcb0396ba51..000000000000
--- a/app-crypt/xca/files/digest-xca-0.6.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9f683408a35630217e4f5250f1d14ff4 xca-0.6.0.tar.gz 261479
-RMD160 cea0ca3eeefe2cf015b9be1edcb11e4f8c868490 xca-0.6.0.tar.gz 261479
-SHA256 523e406a4e94e006aa72ae53f24e8ccf9b55b348e1695f27abf2abc23ff74077 xca-0.6.0.tar.gz 261479
diff --git a/app-crypt/xca/files/xca-0.5.1-build.patch b/app-crypt/xca/files/xca-0.5.1-build.patch
deleted file mode 100644
index 9fbafdc04315..000000000000
--- a/app-crypt/xca/files/xca-0.5.1-build.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff -urNp xca-0.5.1.org/configure xca-0.5.1/configure
---- xca-0.5.1.org/configure	2004-04-23 11:22:57.000000000 +0300
-+++ xca-0.5.1/configure	2006-10-26 22:23:56.000000000 +0200
-@@ -66,9 +66,11 @@ add_lib() {
- search_includes() {
-   for dir in ${DIRS};  do
-     for dbn in "" ${subdirs}; do
--      if test -r ${dir}/include${dbn}/$1; then
--          add_include ${dir}/include${dbn}
--          echo Found:  $1 at ${dir}/include${dbn}
-+      for inc_path in `ls -dr "${dir}"/include${dbn} 2> /dev/null`; do
-+          if test -r "${inc_path}/$1"; then
-+              add_include "${inc_path}"
-+              echo "Found:  $1 at ${inc_path}"
--          return 0
-+              return 0
-+          fi
-+      done
--      fi
-     done
-@@ -81,9 +81,9 @@ search_lib() {
-   for dir in ${DIRS};  do
-     for dbn in $@; do
-       for suffix in so dylib obj; do
--        if test -r ${dir}/lib/lib${dbn}.${suffix}; then
--          add_lib ${dir}/lib ${dbn};
--	  echo Found: lib${dbn}.${suffix} at ${dir}/lib
-+        if test -r "${dir}/lib/lib${dbn}.${suffix}"; then
-+          add_lib "${dir}/lib" "${dbn}";
-+	  echo "Found: lib${dbn}.${suffix} at ${dir}/lib"
-           return 0
- 	fi
-       done
-@@ -94,7 +94,7 @@ search_lib() {
-  
- 
- ######################## 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)
-@@ -144,11 +144,11 @@ fi
- 
- 
- 
--if test -x $QTDIR/bin/moc; then
-+if test -x "$QTDIR/bin/moc"; then
-   MOC="$QTDIR/bin/moc"
- fi
- 
--if test -x $QTDIR/bin/uic; then
-+if test -x "$QTDIR/bin/uic"; then
-   UIC="$QTDIR/bin/uic"
- fi
- 
-@@ -160,22 +160,22 @@ echo "CFLAGS    :${CFLAGS:=-Wall}"
-
- for dirs in /bin /usr/bin /usr/local/bin /sw/bin; do
-   for make in gmake make; do
--    if ${dirs}/${make} -v 2>/dev/null | grep GNU; then
--      mak=${dirs}/${make}
-+    if "${dirs}/${make}" -v 2>/dev/null | grep GNU; then
-+      mak="${dirs}/${make}"
-     fi
-   done  
- done
- 
- echo
- if test ! -z "${mak}"; then
--  echo A usable "make" executable was found in ${mak}
-+  echo "A usable "make" executable was found in ${mak}"
- else
--  echo No usable "make" executable found.
-+  echo "No usable "make" executable found."
- fi
- echo
- 
- if test "x${err_occ}" = "xY"; then
-   echo
--  echo An error occured. Please edit 'Local.mak' manually if compiling fails.
-+  echo "An error occured. Please edit 'Local.mak' manually if compiling fails."
- fi
- 
-diff -urNp xca-0.5.1.org/Rules.mak xca-0.5.1/Rules.mak
---- xca-0.5.1.org/Rules.mak	2004-04-15 02:36:54.000000000 +0300
-+++ xca-0.5.1/Rules.mak	2006-10-26 22:20:04.000000000 +0200
-@@ -2,8 +2,8 @@ include $(TOPDIR)/Local.mak
- 
- 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/xca-0.5.1-db.patch b/app-crypt/xca/files/xca-0.5.1-db.patch
deleted file mode 100644
index d4b426bd791c..000000000000
--- a/app-crypt/xca/files/xca-0.5.1-db.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -urNp xca-0.5.1.org/widgets/MainWindow.cpp xca-0.5.1/widgets/MainWindow.cpp
---- xca-0.5.1.org/widgets/MainWindow.cpp	2004-06-14 00:22:37.000000000 +0300
-+++ xca-0.5.1/widgets/MainWindow.cpp	2006-10-29 00:42:07.000000000 +0200
-@@ -445,7 +445,11 @@ void MainWindow::Error(errorEx &err)
- 	}
- }
- 
-+#if DB_VERSION_MINOR < 3
- void MainWindow::dberr(const char *errpfx, char *msg)
-+#else
-+void MainWindow::dberr(const DbEnv *dbEnv, const char *errpfx, const char *msg)
-+#endif
- {
- 	errorEx e(QString(errpfx) + "\n" + msg);
- 	Error(e);
-diff -urNp xca-0.5.1.org/widgets/MainWindow.h xca-0.5.1/widgets/MainWindow.h
---- xca-0.5.1.org/widgets/MainWindow.h	2004-04-15 02:36:56.000000000 +0300
-+++ xca-0.5.1/widgets/MainWindow.h	2006-10-29 00:43:38.000000000 +0200
-@@ -104,7 +104,11 @@ class MainWindow: public MainWindow_UI
- 	int initPass();
- 	static int passRead(char *buf, int size, int rwflag, void *userdata);
- 	static int passWrite(char *buf, int size, int rwflag, void *userdata);
-+#if DB_VERSION_MINOR < 3
- 	static void dberr(const char *errpfx, char *msg);
-+#else
-+	static void dberr(const DbEnv *dbEnv, const char *errpfx, const char *msg);
-+#endif
- 	static NewX509 *newX509();
- 	static QString md5passwd(const char *pass);
- 	static void Error(errorEx &err);
diff --git a/app-crypt/xca/files/xca-0.5.1-gcc4.patch b/app-crypt/xca/files/xca-0.5.1-gcc4.patch
deleted file mode 100644
index 1a81ae8eb4f5..000000000000
--- a/app-crypt/xca/files/xca-0.5.1-gcc4.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -urNp xca-0.5.1.org/lib/asn1time.h xca-0.5.1/lib/asn1time.h
---- xca-0.5.1.org/lib/asn1time.h	2003-08-06 11:15:37.000000000 +0300
-+++ xca-0.5.1/lib/asn1time.h	2006-09-24 21:56:09.000000000 +0300
-@@ -75,7 +75,7 @@ class a1time
- 	QString toPlain() const;
- 	QString toSortable() const;
- 	int ymdg(int *y, int *m, int *d, int *g) const;
--	int a1time::ymdg(int *y, int *m, int *d, int *h, int *M, int *s, int *g) const;
-+	int ymdg(int *y, int *m, int *d, int *h, int *M, int *s, int *g) const;
- 	ASN1_TIME *get() const;
- 	ASN1_TIME *get_utc() const;
- 	a1time &now(int delta = 0);
-diff -urNp xca-0.5.1.org/lib/db_crl.h xca-0.5.1/lib/db_crl.h
---- xca-0.5.1.org/lib/db_crl.h	2004-04-16 01:31:31.000000000 +0300
-+++ xca-0.5.1/lib/db_crl.h	2006-09-24 21:56:19.000000000 +0300
-@@ -69,7 +69,7 @@ class db_crl: public db_base
- 	void preprocess();
- 	void inToCont(pki_base *pki);
- 	pki_base *insert(pki_base *item);
--	void db_crl::deletePKI(pki_base *pki);
-+	void deletePKI(pki_base *pki);
-     signals:
- 	void updateCertView();
- };
-diff -urNp xca-0.5.1.org/lib/db_x509.h xca-0.5.1/lib/db_x509.h
---- xca-0.5.1.org/lib/db_x509.h	2004-02-18 02:03:05.000000000 +0200
-+++ xca-0.5.1/lib/db_x509.h	2006-09-24 21:57:08.000000000 +0300
-@@ -84,7 +84,7 @@ class db_x509: public db_x509super
- 	void writeAllCerts(const QString fname, bool onlyTrusted);
- 	pki_x509 *getByIssSerial(const pki_x509 *issuer, const a1int &a);
- 	pki_x509 *getBySubject(const x509name &xname, pki_x509 *last = NULL);
--	pki_base *db_x509::insert(pki_base *item);
-+	pki_base *insert(pki_base *item);
-     public slots:
- 	void revokeCert(const x509rev &revok, const pki_x509 *issuer);
-     
-diff -urNp xca-0.5.1.org/lib/pki_key.h xca-0.5.1/lib/pki_key.h
---- xca-0.5.1.org/lib/pki_key.h	2003-12-10 08:43:05.000000000 +0200
-+++ xca-0.5.1/lib/pki_key.h	2006-09-24 21:56:30.000000000 +0300
-@@ -83,7 +83,7 @@ class pki_key: public pki_base
- 	pki_key(const QString name = "", int type = EVP_PKEY_RSA);
- 	pki_key(EVP_PKEY *pkey);
- 	// copy constructor
--	pki_key::pki_key(const pki_key *pk);
-+	pki_key(const pki_key *pk);
- 	/* destructor */
- 	~pki_key();
- 	
diff --git a/app-crypt/xca/files/xca-0.5.1-openssl.patch b/app-crypt/xca/files/xca-0.5.1-openssl.patch
deleted file mode 100644
index 3b3d312e8c4c..000000000000
--- a/app-crypt/xca/files/xca-0.5.1-openssl.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-diff -urNp xca-0.5.1.org/lib/asn1time.cpp xca-0.5.1/lib/asn1time.cpp
---- xca-0.5.1.org/lib/asn1time.cpp	2003-12-14 21:11:33.000000000 +0200
-+++ xca-0.5.1/lib/asn1time.cpp	2006-09-24 22:22:29.000000000 +0300
-@@ -250,7 +250,7 @@ unsigned char *a1time::d2i(unsigned char
- 	unsigned char *mp = p;
- 	if (time)
- 		ASN1_TIME_free(time);
--	time = d2i_ASN1_TIME(NULL, &mp, size);
-+	time = d2i_ASN1_TIME(NULL, (const unsigned char **)&mp, size);
- 	return mp;
- }
- 
-diff -urNp xca-0.5.1.org/lib/pki_crl.cpp xca-0.5.1/lib/pki_crl.cpp
---- xca-0.5.1.org/lib/pki_crl.cpp	2004-04-20 00:19:35.000000000 +0300
-+++ xca-0.5.1/lib/pki_crl.cpp	2006-09-24 22:49:05.000000000 +0300
-@@ -131,7 +131,7 @@ pki_crl::~pki_crl()
- void pki_crl::fromData(unsigned char *p, int size)
- {
- 	X509_CRL *crl_sik = crl;
--	crl = d2i_X509_CRL(NULL, &p, size);
-+	crl = d2i_X509_CRL(NULL, (const unsigned char **)&p, size);
- 	if (crl)
- 		X509_CRL_free(crl_sik);
- 	else
-diff -urNp xca-0.5.1.org/lib/pki_key.cpp xca-0.5.1/lib/pki_key.cpp
---- xca-0.5.1.org/lib/pki_key.cpp	2004-02-18 02:03:06.000000000 +0200
-+++ xca-0.5.1/lib/pki_key.cpp	2006-09-24 22:58:03.000000000 +0300
-@@ -107,7 +107,7 @@ pki_key::pki_key(const pki_key *pk) 
- 	if (pk == NULL) return;
- 	key->type = pk->key->type;
- 	if (key->type == EVP_PKEY_RSA) {
--		key->pkey.rsa=((RSA *)ASN1_dup( (int (*)())i2d_RSAPrivateKey, (char *(*)())d2i_RSAPrivateKey,(char *)pk->key->pkey.rsa));
-+		key->pkey.rsa=ASN1_dup_of_const(RSA, i2d_RSAPrivateKey, d2i_RSAPrivateKey, pk->key->pkey.rsa);
- 	}
- 	// TODO add DSA support.....	
- 	openssl_error();
-@@ -216,7 +216,7 @@ void pki_key::fromData(unsigned char *p,
- 		rsakey = d2i_RSAPrivateKey(NULL, &pdec, decsize);
- #endif
- 		if (ign_openssl_error()) {
--			rsakey = d2i_RSA_PUBKEY(NULL, &sik, decsize);
-+			rsakey = d2i_RSA_PUBKEY(NULL, (const unsigned char **)&sik, decsize);
- 		}
- 		openssl_error(); 
- 		if (rsakey) EVP_PKEY_assign_RSA(key, rsakey);
-diff -urNp xca-0.5.1.org/lib/pki_x509.cpp xca-0.5.1/lib/pki_x509.cpp
---- xca-0.5.1.org/lib/pki_x509.cpp	2004-02-18 02:03:06.000000000 +0200
-+++ xca-0.5.1/lib/pki_x509.cpp	2006-09-24 22:24:30.000000000 +0300
-@@ -276,7 +276,7 @@ void pki_x509::fromData(unsigned char *p
- 	version = intFromData(&p1);
- 	if (version >=1 || version <= 4) {
- 		sCert = intFromData(&p1);
--		cert = d2i_X509(NULL, &p1, sCert);
-+		cert = d2i_X509(NULL, (const unsigned char **)&p1, sCert);
- 		trust = intFromData(&p1);
- 		sRev = intFromData(&p1);
- 		if (sRev) {
-@@ -314,7 +314,7 @@ void pki_x509::fromData(unsigned char *p
- 		// version 3 did save a recent date :-((
- 	}
- 	else { // old version
--		cert = d2i_X509(NULL, &p, size);
-+		cert = d2i_X509(NULL, (const unsigned char **)&p, size);
- 		revoked = NULL;
- 		trust = 1;
- 		efftrust = 1;
-diff -urNp xca-0.5.1.org/lib/pki_x509req.cpp xca-0.5.1/lib/pki_x509req.cpp
---- xca-0.5.1.org/lib/pki_x509req.cpp	2004-02-05 22:17:55.000000000 +0200
-+++ xca-0.5.1/lib/pki_x509req.cpp	2006-09-24 22:51:19.000000000 +0300
-@@ -134,9 +134,9 @@ void pki_x509req::fromData(unsigned char
- {
- 	unsigned char *ps = p;
- 	privkey = NULL;
--	request = d2i_X509_REQ(&request, &ps, size);
-+	request = d2i_X509_REQ(&request, (const unsigned char **)&ps, size);
- 	if (ps - p < size)
--		spki = d2i_NETSCAPE_SPKI(NULL, &ps , size + p - ps); 
-+		spki = d2i_NETSCAPE_SPKI(NULL, (const unsigned char **)&ps , size + p - ps); 
- 	openssl_error();
- }
- 
-@@ -257,7 +257,7 @@ void pki_x509req::setSPKIFromData(unsign
- {
- 	NETSCAPE_SPKI *spki = NULL;
- 
--	spki = d2i_NETSCAPE_SPKI(NULL,&p,size);
-+	spki = d2i_NETSCAPE_SPKI(NULL,(const unsigned char **)&p,size);
- 	if (spki == NULL) goto err;
- 
- 	set_spki (spki);
-diff -urNp xca-0.5.1.org/lib/x509name.cpp xca-0.5.1/lib/x509name.cpp
---- xca-0.5.1.org/lib/x509name.cpp	2003-12-12 01:41:09.000000000 +0200
-+++ xca-0.5.1/lib/x509name.cpp	2006-09-24 22:58:52.000000000 +0300
-@@ -149,7 +149,7 @@ unsigned char *x509name::d2i(unsigned ch
- {
- 	unsigned char *mp = p;
- 	X509_NAME *xn_sik = xn;
--	xn = d2i_X509_NAME(NULL, &mp, size);
-+	xn = d2i_X509_NAME(NULL, (const unsigned char **)&mp, size);
- 	if (xn == NULL)
- 		xn = xn_sik;
- 	else
-diff -urNp xca-0.5.1.org/lib/x509rev.cpp xca-0.5.1/lib/x509rev.cpp
---- xca-0.5.1.org/lib/x509rev.cpp	2003-11-24 15:42:44.000000000 +0200
-+++ xca-0.5.1/lib/x509rev.cpp	2006-09-24 22:20:09.000000000 +0300
-@@ -50,9 +50,8 @@
- 
- #include "x509rev.h"
- 
--#define X509_REVOKED_dup(x5r) (X509_REVOKED *)ASN1_dup((int (*)())i2d_X509_REVOKED, \
--		(char *(*)())d2i_X509_REVOKED,(char *)x5r)
--	
-+#define X509_REVOKED_dup(x5r) ASN1_dup_of (X509_REVOKED, i2d_X509_REVOKED, d2i_X509_REVOKED, x5r)
-+
- x509rev::x509rev()
- {
- 	rev = X509_REVOKED_new();
diff --git a/app-crypt/xca/files/xca-0.5.1-qt.patch b/app-crypt/xca/files/xca-0.5.1-qt.patch
deleted file mode 100644
index c6d101942ff8..000000000000
--- a/app-crypt/xca/files/xca-0.5.1-qt.patch
+++ /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/files/xca-0.6.0-build.patch b/app-crypt/xca/files/xca-0.6.0-build.patch
deleted file mode 100644
index eec44664f2ad..000000000000
--- a/app-crypt/xca/files/xca-0.6.0-build.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- xca-0.6.0/configure	2007-03-16 21:34:51.000000000 +0200
-+++ xca-0.6.0.new/configure	2007-04-02 13:48:17.000000000 +0300
-@@ -103,17 +103,19 @@ search_includes() {
- # check for libs
- search_lib() {
-   for dir in ${DIRS};  do
-+for subdir in "" ${subdirs}; do
-     for dbn in $@; do
-       for suffix in so dylib obj a; do
-         for lib in lib out; do
--          if test -r "${dir}/${lib}/lib${dbn}.${suffix}"; then
--            add_lib "${dir}/${lib}" "${dbn}" "${suffix}"
--	    echo "Found: lib${dbn}.${suffix} at ${dir}/${lib}"
-+          if test -r "${dir}/${lib}/${subdir}/lib${dbn}.${suffix}"; then
-+            add_lib "${dir}/${lib}/${subdir}" "${dbn}" "${suffix}"
-+	    echo "Found: lib${dbn}.${suffix} at ${dir}/${lib}/${subdir}"
-             return 0
- 	  fi
- 	done
-       done
-     done
-+done
-   done
-   return 1
- }
diff --git a/app-crypt/xca/files/xca-0.6.4-openssl.patch b/app-crypt/xca/files/xca-0.6.4-openssl.patch
new file mode 100644
index 000000000000..929bceb0d643
--- /dev/null
+++ b/app-crypt/xca/files/xca-0.6.4-openssl.patch
@@ -0,0 +1,17 @@
+diff -urNp xca-0.6.4.org/lib/x509rev.cpp xca-0.6.4/lib/x509rev.cpp
+--- xca-0.6.4.org/lib/x509rev.cpp	2007-08-13 21:55:50.000000000 +0300
++++ xca-0.6.4/lib/x509rev.cpp	2007-10-23 17:35:42.000000000 +0200
+@@ -7,7 +7,12 @@
+ 
+ #include "x509rev.h"
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x00908000L
++#if OPENSSL_VERSION_NUMBER >= 0x0090806fL
++#define X509_REVOKED_dup(x5r) (X509_REVOKED *)ASN1_dup( \
++	(i2d_of_void*)i2d_X509_REVOKED, \
++	(d2i_of_void*)d2i_X509_REVOKED, \
++	(char *)x5r)
++#elif OPENSSL_VERSION_NUMBER >= 0x00908000L
+ #define X509_REVOKED_dup(x5r) \
+ 	ASN1_dup_of (X509_REVOKED, i2d_X509_REVOKED, d2i_X509_REVOKED, x5r)
+ 
diff --git a/app-crypt/xca/xca-0.5.1-r1.ebuild b/app-crypt/xca/xca-0.5.1-r1.ebuild
deleted file mode 100644
index a75b09ce1b05..000000000000
--- a/app-crypt/xca/xca-0.5.1-r1.ebuild
+++ /dev/null
@@ -1,44 +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-r1.ebuild,v 1.3 2006/10/28 22:50:34 alonbl 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.8
-	=x11-libs/qt-3*
-	>=sys-libs/db-4.1"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-build.patch"
-	epatch "${FILESDIR}/${P}-gcc4.patch"
-	epatch "${FILESDIR}/${P}-openssl.patch"
-	epatch "${FILESDIR}/${P}-qt.patch"
-	epatch "${FILESDIR}/${P}-db.patch"
-}
-
-src_compile() {
-	kde_src_compile nothing
-	STRIP="true" CC="$(tc-getCC)" prefix=/usr ./configure || die "configure died"
-	echo "inst_prefix=/usr" >> Local.mak
-	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
-}
diff --git a/app-crypt/xca/xca-0.6.0.ebuild b/app-crypt/xca/xca-0.6.0.ebuild
deleted file mode 100644
index 4411058607c7..000000000000
--- a/app-crypt/xca/xca-0.6.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/xca/xca-0.6.0.ebuild,v 1.1 2007/04/02 11:09:42 alonbl Exp $
-
-inherit eutils 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.8
-	=x11-libs/qt-4*"
-
-pkg_setup() {
-	# Upstream:
-	# http://sourceforge.net/tracker/index.php?func=detail&aid=1692800&group_id=62274&atid=500028
-	if has_version ">=x11-libs/qt-4.2.2" ; then
-		if ! built_with_use x11-libs/qt qt3support ; then
-			eerror ">=qt4.2.2 requires qt3support"
-			die "rebuild >=x11-libs/qt-4.2.2 with the qt3support USE flag"
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Upstream:
-	# http://sourceforge.net/tracker/index.php?func=detail&aid=1692798&group_id=62274&atid=500027
-	epatch "${FILESDIR}/${P}-build.patch"
-}
-
-src_compile() {
-	QTDIR=/usr \
-		STRIP="true" \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		prefix=/usr \
-		./configure || die	"configure failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake destdir="${D}" mandir="share/man" install
-
-	dodoc README CREDITS AUTHORS COPYRIGHT
-
-	insinto /etc/xca
-	doins misc/*.txt
-}
diff --git a/app-crypt/xca/xca-0.6.4.ebuild b/app-crypt/xca/xca-0.6.4.ebuild
index 499243ad28d9..14215e663ea5 100644
--- a/app-crypt/xca/xca-0.6.4.ebuild
+++ b/app-crypt/xca/xca-0.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/xca/xca-0.6.4.ebuild,v 1.1 2007/09/22 18:20:49 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/xca/xca-0.6.4.ebuild,v 1.2 2007/10/23 15:49:30 alonbl Exp $
 
 inherit eutils
 
@@ -28,6 +28,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-build.patch"
+	epatch "${FILESDIR}/${P}-openssl.patch"
 }
 
 src_compile() {