Patches for use gaim-0.77

5 files changed, 80 insertions, 2 deletions

diff --git a/net-im/gaim-encryption/ChangeLog b/net-im/gaim-encryption/ChangeLog
index 9c3abb9d17ee..fef16539ddd9 100644
--- a/net-im/gaim-encryption/ChangeLog
+++ b/net-im/gaim-encryption/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/gaim-encryption
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim-encryption/ChangeLog,v 1.20 2004/04/22 14:16:24 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim-encryption/ChangeLog,v 1.21 2004/04/23 12:12:51 rizzo Exp $
+
+*gaim-encryption-2.24-r1 (23 Apr 2004)
+
+  23 Apr 2004; Don Seiler <rizzo@gentoo.org>; +files/encrypt_api.diff,
+  +gaim-encryption-2.24-r1.ebuild:
+  Patches for use gaim-0.77
 
   22 Apr 2004; Travis Tilley <lv@gentoo.org> gaim-encryption-2.22.ebuild:
   stable on amd64
diff --git a/net-im/gaim-encryption/Manifest b/net-im/gaim-encryption/Manifest
index 9caa1e326abc..4f5e84cbf4a8 100644
--- a/net-im/gaim-encryption/Manifest
+++ b/net-im/gaim-encryption/Manifest
@@ -1,8 +1,11 @@
 MD5 68670a03fbde525ebe3f69dd00d50906 gaim-encryption-2.24.ebuild 1488
 MD5 c7f17c30cc58952c71e57a2e23600e49 gaim-encryption-2.21.ebuild 1260
-MD5 91ed5580f621ae498c65f21b8a04acf7 ChangeLog 2612
+MD5 6328f4895440419069b168c386243c9d ChangeLog 2790
 MD5 ab7db4bf9ff48c8de9da14fd12f6c15c metadata.xml 344
 MD5 8006b2fa4b739f0b9919144b66fe1160 gaim-encryption-2.22.ebuild 1260
+MD5 90952dfbd66401684af2be98efea4712 gaim-encryption-2.24-r1.ebuild 1572
+MD5 634fb953048e9a3e63ed137b1ecebf46 files/encrypt_api.diff 537
 MD5 24597e0458ae20c16bf8a8b363de4af4 files/digest-gaim-encryption-2.21 72
 MD5 2d945bd60bd6d47a3adbddb2184e3354 files/digest-gaim-encryption-2.22 72
 MD5 951d14a45791f387ee09954239e51cd8 files/digest-gaim-encryption-2.24 72
+MD5 951d14a45791f387ee09954239e51cd8 files/digest-gaim-encryption-2.24-r1 72
diff --git a/net-im/gaim-encryption/files/digest-gaim-encryption-2.24-r1 b/net-im/gaim-encryption/files/digest-gaim-encryption-2.24-r1
new file mode 100644
index 000000000000..9be01742275c
--- /dev/null
+++ b/net-im/gaim-encryption/files/digest-gaim-encryption-2.24-r1
@@ -0,0 +1 @@
+MD5 70beb68dbb6413c75423a88e0080e171 gaim-encryption-2.24.tar.gz 357046
diff --git a/net-im/gaim-encryption/files/encrypt_api.diff b/net-im/gaim-encryption/files/encrypt_api.diff
new file mode 100644
index 000000000000..98ec6caf8306
--- /dev/null
+++ b/net-im/gaim-encryption/files/encrypt_api.diff
@@ -0,0 +1,11 @@
+--- encrypt.c.orig	2004-04-22 11:15:40.576477904 -0500
++++ encrypt.c	2004-04-22 11:17:05.246606088 -0500
+@@ -1110,7 +1110,7 @@
+ 
+ static GaimPluginInfo info =
+ {
+-	2,                                                /**< api_version    */
++	GAIM_PLUGIN_API_VERSION,                          /**< api_version    */
+ 	GAIM_PLUGIN_STANDARD,                             /**< type           */
+ 	GAIM_GTK_PLUGIN_TYPE,                             /**< ui_requirement */
+ 	0,                                                /**< flags          */
diff --git a/net-im/gaim-encryption/gaim-encryption-2.24-r1.ebuild b/net-im/gaim-encryption/gaim-encryption-2.24-r1.ebuild
new file mode 100644
index 000000000000..231f11e1178e
--- /dev/null
+++ b/net-im/gaim-encryption/gaim-encryption-2.24-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim-encryption/gaim-encryption-2.24-r1.ebuild,v 1.1 2004/04/23 12:12:51 rizzo Exp $
+
+inherit flag-o-matic
+
+IUSE=""
+DESCRIPTION="GAIM Encryption PlugIn"
+HOMEPAGE="http://gaim-encryption.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~x86 ~sparc ~amd64 ~ppc ~alpha ~ia64 ~hppa ~mips"
+
+DEPEND=">=net-im/gaim-0.76
+	|| ( dev-libs/nss net-www/mozilla )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/encrypt_api.diff
+}
+
+src_compile() {
+	local myconf
+	myconf="--with-gaim=/usr/include/gaim"
+
+	NSS_LIB=/usr/lib
+	NSS_INC=/usr/include
+	has_version dev-libs/nss && {
+		# Only need to specify this if no pkgconfig from mozilla
+		myconf="${myconf} --with-nspr-includes=${NSS_INC}/nspr"
+		myconf="${myconf} --with-nss-includes=${NSS_INC}/nss"
+		myconf="${myconf} --with-nspr-libs=${NSS_LIB}"
+		myconf="${myconf} --with-nss-libs=${NSS_LIB}"
+	}
+
+	econf ${myconf} || die "Configuration failed"
+	einfo "Replacing -Os CFLAG with -O2"
+	replace-flags -Os -O2
+
+	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
+}
+
+src_install() {
+	einstall || die "Install failed"
+	dodoc CHANGELOG COPYING INSTALL NOTES README TODO VERSION WISHLIST
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn "This release is not backwards compatible for MSN, Yahoo, or IRC."
+	ewarn "See the release notes at:"
+	ewarn "https://sourceforge.net/project/shownotes.php?release_id=230104"
+	ewarn
+}