removed old beta versions and updated to work with gaim-2.0.0_beta3

(Portage version: 2.1_pre7-r2)

10 files changed, 53 insertions, 118 deletions

diff --git a/x11-plugins/gaim-encryption/ChangeLog b/x11-plugins/gaim-encryption/ChangeLog
index 3b0b2ac15a8b..6b54cc49dd2c 100644
--- a/x11-plugins/gaim-encryption/ChangeLog
+++ b/x11-plugins/gaim-encryption/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-plugins/gaim-encryption
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-encryption/ChangeLog,v 1.78 2006/03/28 19:59:39 gothgirl Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-encryption/ChangeLog,v 1.79 2006/03/29 18:45:54 gothgirl Exp $
+
+*gaim-encryption-3.0_beta4-r1 (29 Mar 2006)
+
+  29 Mar 2006; kathryn <gothgirl@gentoo.org>
+  +files/gaim-encryption-3.0beta4-encrypt.patch,
+  -gaim-encryption-3.0_beta1.ebuild, -gaim-encryption-3.0_beta2.ebuild,
+  -gaim-encryption-3.0_beta3.ebuild, +gaim-encryption-3.0_beta4-r1.ebuild:
+  removed old versions of beta and updated to work with gaim-2.0.0_beta3
 
 *gaim-encryption-3.0_beta4 (28 Mar 2006)
 
diff --git a/x11-plugins/gaim-encryption/Manifest b/x11-plugins/gaim-encryption/Manifest
index 15660c851d71..8ced7d504119 100644
--- a/x11-plugins/gaim-encryption/Manifest
+++ b/x11-plugins/gaim-encryption/Manifest
@@ -19,24 +19,21 @@ SHA256 cc3705d02e912e08af56a2866e0547f32b8aaab084bb52698625518a4e5e84fd files/di
 MD5 4f47ba1a5d57da23681402f4f6241581 files/digest-gaim-encryption-2.38 72
 RMD160 d1588f5ccf89d2ec0f80a726be5b89545383a8d1 files/digest-gaim-encryption-2.38 72
 SHA256 8ee3d84dfd132800c1d649eb15ba65dfa8d1c247f3e9f1b3f5b16e438afc96be files/digest-gaim-encryption-2.38 72
-MD5 b1fb5bb2c2c89945051c4ba41c73e3a2 files/digest-gaim-encryption-3.0_beta1 76
-RMD160 94a67e8a08f279ade653c2e002fc89495194518b files/digest-gaim-encryption-3.0_beta1 76
-SHA256 402584932f819a2599c19308f1672d591f1dfa3926e89324af476a66a0562cf9 files/digest-gaim-encryption-3.0_beta1 76
-MD5 7858e1ca01e412a6f921ab9d6710114c files/digest-gaim-encryption-3.0_beta2 76
-RMD160 65f43ce9c965aa46f71f473af71e840e7d4d28ee files/digest-gaim-encryption-3.0_beta2 76
-SHA256 e07b6ff1882f7150cdc0baaca029e46048128cec92aa8a9225cadafaf0f3ad38 files/digest-gaim-encryption-3.0_beta2 76
-MD5 028c0bb3959ac89337fbacdcc43c5d9e files/digest-gaim-encryption-3.0_beta3 76
-RMD160 01e060bc3c90787376c1561f576fbdd837921765 files/digest-gaim-encryption-3.0_beta3 76
-SHA256 0f1ef4fdce48aaec69340926ee44b7d54a49155c70521a53e1f1fa66c7c1629d files/digest-gaim-encryption-3.0_beta3 76
 MD5 f29c62d772cc41d0402fa4d3c17333ce files/digest-gaim-encryption-3.0_beta4 274
 RMD160 611edca7e5b75e381e40b42865366cd99951c90a files/digest-gaim-encryption-3.0_beta4 274
 SHA256 a7f770b3ed1b8b5a6333eb45309913aad9bb4024666e59849d648ebf8dc02fe0 files/digest-gaim-encryption-3.0_beta4 274
+MD5 f29c62d772cc41d0402fa4d3c17333ce files/digest-gaim-encryption-3.0_beta4-r1 274
+RMD160 611edca7e5b75e381e40b42865366cd99951c90a files/digest-gaim-encryption-3.0_beta4-r1 274
+SHA256 a7f770b3ed1b8b5a6333eb45309913aad9bb4024666e59849d648ebf8dc02fe0 files/digest-gaim-encryption-3.0_beta4-r1 274
 MD5 c33a7ee554fd61adb3272fabea5a0487 files/encryption_icon_fix.diff 528
 RMD160 4b69b1992ed27e21caadc7c1634d6e64a89659de files/encryption_icon_fix.diff 528
 SHA256 84e397d026a22e251bb629c35cb078477b07edaeb2b3247015e275dc605265a4 files/encryption_icon_fix.diff 528
 MD5 d1ed62b75600295e0fb8f1bd11aa37b3 files/gaim-encryption-3.0beta4-configure.patch 19212
 RMD160 d38435c52acb502b861c2e1b8de08815b00f0267 files/gaim-encryption-3.0beta4-configure.patch 19212
 SHA256 d9b0357483059e1ac2a17c81ebf07ab0e0623c0b0558e27788eec7140aad6f5f files/gaim-encryption-3.0beta4-configure.patch 19212
+MD5 bf00bcda552573822213dba81c3e063a files/gaim-encryption-3.0beta4-encrypt.patch 621
+RMD160 3624bd8185d15a87668649fb39271528d223bd4d files/gaim-encryption-3.0beta4-encrypt.patch 621
+SHA256 622fcd0cabb1230b931ed49eb5581cd1af4c8da5baca0deaac26ba468777f32e files/gaim-encryption-3.0beta4-encrypt.patch 621
 MD5 fd1990d36ce5bb9894308ba2e72ac71b gaim-encryption-2.32-r1.ebuild 973
 RMD160 359a7f998e784efab84bd9bf45a6eae0e76c22f4 gaim-encryption-2.32-r1.ebuild 973
 SHA256 6491579bc45e08c6b5bbc7d81a8619c5913f141e90f8a02401ee91bd9b44e4ed gaim-encryption-2.32-r1.ebuild 973
@@ -55,15 +52,9 @@ SHA256 96ea654c8a934aecefa0b14260a6c3394c1e03f7406aa5e463807f10d7a969d5 gaim-enc
 MD5 b45fff756dd5498a00552868cd96765e gaim-encryption-2.38.ebuild 999
 RMD160 1f3a6d6a45ae8d6cac873382f34f90c1c5d99542 gaim-encryption-2.38.ebuild 999
 SHA256 19a2da617fb57add23f01601c53584227b888f14b07206e20d876a83dcd45d8e gaim-encryption-2.38.ebuild 999
-MD5 757b58073867ea176efb65fd8c867363 gaim-encryption-3.0_beta1.ebuild 1122
-RMD160 fb9981d32e302284a8b37682816339ff5f86d79a gaim-encryption-3.0_beta1.ebuild 1122
-SHA256 579eb7f05c942611669a97b96d1f6f171bfeeaef2a875cb76928b7c503eaf7d2 gaim-encryption-3.0_beta1.ebuild 1122
-MD5 ec57a68e7c96bdbfe52234668a1b6cab gaim-encryption-3.0_beta2.ebuild 1077
-RMD160 003d3612935f1130b2696ab3a12962635dcb9114 gaim-encryption-3.0_beta2.ebuild 1077
-SHA256 75ec2ddfcb90a64cbfc09059cade2b7f7fb5ed420233a8f3505846f46d6cda62 gaim-encryption-3.0_beta2.ebuild 1077
-MD5 2396964b1dfd186627c72ed7a88d7f57 gaim-encryption-3.0_beta3.ebuild 1091
-RMD160 3a1749d1ef33f2bb94fdc38796c690aa9720737b gaim-encryption-3.0_beta3.ebuild 1091
-SHA256 db184cd8cc97d5dccce8c8babd88b825ea1d81d829b7182e43fa5002ec15c39b gaim-encryption-3.0_beta3.ebuild 1091
+MD5 035fa449cf98a9279dc64a99e798fee7 gaim-encryption-3.0_beta4-r1.ebuild 1168
+RMD160 8d5429451855ac5ae6d44e2b26910ca2720b7aa4 gaim-encryption-3.0_beta4-r1.ebuild 1168
+SHA256 f8acbf69748179a2a9c40d1e3f1ac24e3d00b3f7cc10c15a1894b88ad17505dd gaim-encryption-3.0_beta4-r1.ebuild 1168
 MD5 ed564acce89d1e43990a8a1f3daf4f96 gaim-encryption-3.0_beta4.ebuild 1124
 RMD160 880981dfec0b6a4aba42d5317ada955e1541ab5a gaim-encryption-3.0_beta4.ebuild 1124
 SHA256 5809b83ac4951e3ebf98482dfe84684e45bb740af5f22b0f129156b722e9d7e3 gaim-encryption-3.0_beta4.ebuild 1124
diff --git a/x11-plugins/gaim-encryption/files/digest-gaim-encryption-3.0_beta1 b/x11-plugins/gaim-encryption/files/digest-gaim-encryption-3.0_beta1
deleted file mode 100644
index 29a1d62df7e7..000000000000
--- a/x11-plugins/gaim-encryption/files/digest-gaim-encryption-3.0_beta1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 71e16b7e70bc5123e0e7503025527e54 gaim-encryption-3.0beta1.tar.gz 571752
diff --git a/x11-plugins/gaim-encryption/files/digest-gaim-encryption-3.0_beta2 b/x11-plugins/gaim-encryption/files/digest-gaim-encryption-3.0_beta2
deleted file mode 100644
index 7cf77bd31ebb..000000000000
--- a/x11-plugins/gaim-encryption/files/digest-gaim-encryption-3.0_beta2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e05c3917d1feab752ff2c3281dbc6617 gaim-encryption-3.0beta2.tar.gz 550082
diff --git a/x11-plugins/gaim-encryption/files/digest-gaim-encryption-3.0_beta3 b/x11-plugins/gaim-encryption/files/digest-gaim-encryption-3.0_beta3
deleted file mode 100644
index c18b00a93347..000000000000
--- a/x11-plugins/gaim-encryption/files/digest-gaim-encryption-3.0_beta3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b1b28c3b6594def60162d6bb001a89af gaim-encryption-3.0beta3.tar.gz 555185
diff --git a/x11-plugins/gaim-encryption/files/digest-gaim-encryption-3.0_beta4-r1 b/x11-plugins/gaim-encryption/files/digest-gaim-encryption-3.0_beta4-r1
new file mode 100644
index 000000000000..0151005793c9
--- /dev/null
+++ b/x11-plugins/gaim-encryption/files/digest-gaim-encryption-3.0_beta4-r1
@@ -0,0 +1,3 @@
+MD5 bdfcdaa29971456a46f2b77162fd2ee3 gaim-encryption-3.0beta4.tar.gz 568915
+RMD160 364eaf9eb8788190b9dd6f7d6097fa6f348842fe gaim-encryption-3.0beta4.tar.gz 568915
+SHA256 d4f6e7d7ba082d2ac6d2551deab2bec866065a3c9d305aa141ddf6f240be0211 gaim-encryption-3.0beta4.tar.gz 568915
diff --git a/x11-plugins/gaim-encryption/files/gaim-encryption-3.0beta4-encrypt.patch b/x11-plugins/gaim-encryption/files/gaim-encryption-3.0beta4-encrypt.patch
new file mode 100644
index 000000000000..4cd1db54e192
--- /dev/null
+++ b/x11-plugins/gaim-encryption/files/gaim-encryption-3.0beta4-encrypt.patch
@@ -0,0 +1,23 @@
+--- encrypt.c-orig	2006-03-29 12:22:59.174610448 -0600
++++ encrypt.c	2006-03-29 12:23:48.498112136 -0600
+@@ -37,7 +37,6 @@
+ #include <signals.h>
+ #include <util.h>
+ #include <version.h>
+-#include <internal.h>
+ 
+ #include "cryptproto.h"
+ #include "cryptutil.h"
+@@ -82,6 +81,12 @@
+ G_MODULE_IMPORT GSList *gaim_accounts;
+ G_MODULE_IMPORT guint im_options;
+ 
++#define MSG_LEN 2048
++/* The above should normally be the same as BUF_LEN,
++ * but just so we're explicitly asking for the max message
++ * length. */
++#define BUF_LEN MSG_LEN
++#define BUF_LONG BUF_LEN * 2
+ 
+ #define ENCRYPT_PLUGIN_ID "gtk-obobo-gaim-encryption"
+ 
diff --git a/x11-plugins/gaim-encryption/gaim-encryption-3.0_beta1.ebuild b/x11-plugins/gaim-encryption/gaim-encryption-3.0_beta1.ebuild
deleted file mode 100644
index e4dfabbf6dbe..000000000000
--- a/x11-plugins/gaim-encryption/gaim-encryption-3.0_beta1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-encryption/gaim-encryption-3.0_beta1.ebuild,v 1.1 2005/12/20 19:17:29 gothgirl Exp $
-
-inherit flag-o-matic debug multilib
-
-MY_PV="${PV/_beta/beta}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="GAIM Encryption PlugIn"
-HOMEPAGE="http://gaim-encryption.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=net-im/gaim-1.0.1
-		>=dev-libs/nss-3.9.2-r2"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/encryption_icon_fix.diff
-}
-
-src_compile() {
-	strip-flags
-	replace-flags -O? -O2
-	econf \
-		--with-nspr-includes=/usr/include/nspr \
-		--with-nss-includes=/usr/include/nss \
-		--with-nspr-libs=/usr/$(get_libdir)/nspr \
-		--with-nss-libs=/usr/$(get_libdir)/nss\
-		|| die "Configuration failed"
-	emake -j1 || die "Make failed"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "Install failed"
-	dodoc CHANGELOG INSTALL NOTES README TODO VERSION WISHLIST
-}
diff --git a/x11-plugins/gaim-encryption/gaim-encryption-3.0_beta2.ebuild b/x11-plugins/gaim-encryption/gaim-encryption-3.0_beta2.ebuild
deleted file mode 100644
index 9022076df3a9..000000000000
--- a/x11-plugins/gaim-encryption/gaim-encryption-3.0_beta2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-encryption/gaim-encryption-3.0_beta2.ebuild,v 1.1 2005/12/21 16:54:52 gothgirl Exp $
-
-inherit flag-o-matic debug multilib
-
-MY_PV="${PV/_beta/beta}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="GAIM Encryption PlugIn"
-HOMEPAGE="http://gaim-encryption.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=net-im/gaim-1.0.1
-		>=dev-libs/nss-3.9.2-r2"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-
-src_compile() {
-	strip-flags
-	replace-flags -O? -O2
-	econf \
-		--with-nspr-includes=/usr/include/nspr \
-		--with-nss-includes=/usr/include/nss \
-		--with-nspr-libs=/usr/$(get_libdir)/nspr \
-		--with-nss-libs=/usr/$(get_libdir)/nss\
-		|| die "Configuration failed"
-	emake -j1 || die "Make failed"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "Install failed"
-	dodoc CHANGELOG INSTALL NOTES README TODO VERSION WISHLIST
-}
diff --git a/x11-plugins/gaim-encryption/gaim-encryption-3.0_beta3.ebuild b/x11-plugins/gaim-encryption/gaim-encryption-3.0_beta4-r1.ebuild
index bb2adf05ebe0..f63534d68bb5 100644
--- a/x11-plugins/gaim-encryption/gaim-encryption-3.0_beta3.ebuild
+++ b/x11-plugins/gaim-encryption/gaim-encryption-3.0_beta4-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-encryption/gaim-encryption-3.0_beta3.ebuild,v 1.3 2006/01/30 17:44:00 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-encryption/gaim-encryption-3.0_beta4-r1.ebuild,v 1.1 2006/03/29 18:45:54 gothgirl Exp $
 
-inherit flag-o-matic debug multilib
+inherit flag-o-matic debug eutils
 
 MY_PV="${PV/_beta/beta}"
 MY_P="${PN}-${MY_PV}"
@@ -18,22 +18,22 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
 DEPEND=">=net-im/gaim-1.0.1
-		>=dev-libs/nss-3.9.2-r2"
+		>=dev-libs/nss-3.11"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+	epatch "${FILESDIR}/${MY_P}-configure.patch"
+	epatch "${FILESDIR}/${MY_P}-encrypt.patch"
+	libtoolize --force --copy || die "failed running libtoolize"
+	aclocal || die "failed running aclocal"
+	WANT_AUTOCONF="2.59" autoconf || die "failed to run autoconf"
 }
 
 src_compile() {
 	strip-flags
 	replace-flags -O? -O2
-	econf \
-		--with-nspr-includes=/usr/include/nspr \
-		--with-nss-includes=/usr/include/nss \
-		--with-nspr-libs=/usr/$(get_libdir)/nspr \
-		--with-nss-libs=/usr/$(get_libdir)/nss\
-		|| die "Configuration failed"
+	econf || die "failed running configure"
 	emake -j1 || die "Make failed"
 }