refixed gpgme

5 files changed, 29 insertions, 9 deletions

diff --git a/net-im/licq/ChangeLog b/net-im/licq/ChangeLog
index a09c3f2f5d24..429c66f0c376 100644
--- a/net-im/licq/ChangeLog
+++ b/net-im/licq/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-im/licq
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.43 2004/08/21 19:29:56 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.44 2004/08/22 12:36:05 voxus Exp $
+
+*licq-1.3.0_pre-r4 (22 Aug 2004)
+
+  22 Aug 2004; Konstantin Arkhipov <voxus@gentoo.org>
+  -licq-1.3.0_pre-r3,
+  +licq-1.3.0_pre-r4,
+  files/1.3.0-gpgme3_hack.patch:
+  Re-fixed gpgme3 support, thanks to
+  Arash Abedinzadeh <thunfisch@thunfisch.org> for patches.
 
 *licq-1.3.0_pre-r3 (21 Aug 2004)
 
diff --git a/net-im/licq/Manifest b/net-im/licq/Manifest
index b59b59dff0cc..a3d51c7451d4 100644
--- a/net-im/licq/Manifest
+++ b/net-im/licq/Manifest
@@ -1,11 +1,11 @@
 MD5 481c2244bfa25938051e82c760aba1b9 licq-1.2.7.ebuild 3494
-MD5 6da823f2d78cfe62a6b9f32f0f0c2cec licq-1.3.0_pre-r3.ebuild 4073
-MD5 3a06c789addc111e6a224eec939ae4f5 ChangeLog 6561
+MD5 232fc203bb67077a22d09fbf8d66b15f licq-1.3.0_pre-r4.ebuild 4115
+MD5 deda0d4813a979532dc30d88fc755600 ChangeLog 6823
 MD5 c18e90be9c36c7efb06211733ad765ff files/1.2.7-debugflag.patch 396
 MD5 5f64e4b71c311ff7b6489953fc8bf1f9 files/1.2.7-nptl.patch 1178
 MD5 3795e526fdf015e985be17fca698e2d1 files/digest-licq-1.2.7 64
 MD5 8cc9f21e0153522e2b9a7ac4b4dd023b files/1.3.0-upgradepath.patch 547
-MD5 310c7a57b61e21d49cd783cde62cf9b8 files/1.3.0-gpgme3_hack.patch 326
+MD5 4abd6d07e8cb49d9f2b8f27384d6afa6 files/1.3.0-gpgme3_hack.patch 605
 MD5 71930b700c70113e9b9aa7586e34066a files/1.3.0-no_stupid_koloboks.patch 3363
 MD5 d33d4cb8bdbcd113307b7fd44184a445 files/1.3.0-gcc3.4.patch 558
-MD5 5079eefd8c78bf30104105bf933436cd files/digest-licq-1.3.0_pre-r3 68
+MD5 5079eefd8c78bf30104105bf933436cd files/digest-licq-1.3.0_pre-r4 68
diff --git a/net-im/licq/files/1.3.0-gpgme3_hack.patch b/net-im/licq/files/1.3.0-gpgme3_hack.patch
index 8ce36cedb163..ae0d6195b76f 100644
--- a/net-im/licq/files/1.3.0-gpgme3_hack.patch
+++ b/net-im/licq/files/1.3.0-gpgme3_hack.patch
@@ -1,5 +1,5 @@
---- configure~	2004-08-20 23:11:47.676939085 +0400
-+++ configure	2004-08-20 23:11:57.560881631 +0400
+--- configure~	2004-08-22 20:10:52.000000000 +0400
++++ configure	2004-08-22 20:11:10.000000000 +0400
 @@ -6388,7 +6388,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -9,3 +9,12 @@
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  /* confdefs.h.  */
+@@ -6438,7 +6438,7 @@
+ echo "${ECHO_T}$ac_cv_lib_gpgme_gpgme_check_version" >&6
+ if test $ac_cv_lib_gpgme_gpgme_check_version = yes; then
+ 
+-                    LIBS="$LIBS -lgpgme"
++                    LIBS="$LIBS -lgpgme3"
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBGPGME 1
diff --git a/net-im/licq/files/digest-licq-1.3.0_pre-r3 b/net-im/licq/files/digest-licq-1.3.0_pre-r4
index c750dc0bb3eb..c750dc0bb3eb 100644
--- a/net-im/licq/files/digest-licq-1.3.0_pre-r3
+++ b/net-im/licq/files/digest-licq-1.3.0_pre-r4
diff --git a/net-im/licq/licq-1.3.0_pre-r3.ebuild b/net-im/licq/licq-1.3.0_pre-r4.ebuild
index de395ac95cce..f68d2c33312e 100644
--- a/net-im/licq/licq-1.3.0_pre-r3.ebuild
+++ b/net-im/licq/licq-1.3.0_pre-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.0_pre-r3.ebuild,v 1.1 2004/08/21 19:29:56 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.0_pre-r4.ebuild,v 1.1 2004/08/22 12:36:05 voxus Exp $
 
 inherit eutils
 
@@ -67,8 +67,10 @@ src_compile() {
 	use socks5	&& myconf="${myconf} --enable-socks5"
 	if use crypt
 	then
-		myconf="${myconf} --disable-gpgme"
+		myconf="${myconf} --enable-gpgme"
 		epatch ${FILESDIR}/1.3.0-gpgme3_hack.patch
+	else
+		myconf="${myconf} --disable-gpgme"
 	fi
 
 	econf ${myconf} || die