Revision bump to work with gaim-2.0.0beta4

Package-Manager: portage-2.1.2_pre2-r9

5 files changed, 77 insertions, 15 deletions

diff --git a/x11-plugins/gaim-otr/ChangeLog b/x11-plugins/gaim-otr/ChangeLog
index 8d5fe1ce88e8..f086b7e799e8 100644
--- a/x11-plugins/gaim-otr/ChangeLog
+++ b/x11-plugins/gaim-otr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/gaim-otr
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-otr/ChangeLog,v 1.13 2006/06/14 13:04:16 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-otr/ChangeLog,v 1.14 2006/10/21 13:29:43 gothgirl Exp $
+
+*gaim-otr-3.0.0-r2 (21 Oct 2006)
+
+  21 Oct 2006; gothgirl <gothgirl@gentoo.org> +files/gaim-2b4-otr.patch,
+  +gaim-otr-3.0.0-r2.ebuild:
+  Revision bump to work with gaim-2.0beta4
 
 *gaim-otr-3.0.0-r1 (14 Jun 2006)
 
diff --git a/x11-plugins/gaim-otr/Manifest b/x11-plugins/gaim-otr/Manifest
index 3041dd944366..ade57dc96042 100644
--- a/x11-plugins/gaim-otr/Manifest
+++ b/x11-plugins/gaim-otr/Manifest
@@ -1,6 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX gaim-2b4-otr.patch 379 RMD160 1dd9d12d8fc49cc56c7add8ff9ac9bc1e2b5a267 SHA1 eecac56a4df7ab5b65eddb9eeee345bcbcb2aded SHA256 2a490774753e5fa2ca45ed699075e982c2ad69ae9be96106c46f568ad6a835df
+MD5 574740aba630925869032c3ccfdaac8f files/gaim-2b4-otr.patch 379
+RMD160 1dd9d12d8fc49cc56c7add8ff9ac9bc1e2b5a267 files/gaim-2b4-otr.patch 379
+SHA256 2a490774753e5fa2ca45ed699075e982c2ad69ae9be96106c46f568ad6a835df files/gaim-2b4-otr.patch 379
 AUX gaim-otr-1.0.3-fPIC.patch 364 RMD160 6bd524e20cb2aa5bd36e077dcab4134d9aad8fe9 SHA1 e1d2eeaed4c346af63f7af0e8b7fa75ca839631b SHA256 c04f4a9416f3623728aa9fb4bb0a01fa269fef8ac5a26b28d14ee247ba7c26fd
 MD5 f35f82a092a303af1e9780ec9fd495fa files/gaim-otr-1.0.3-fPIC.patch 364
 RMD160 6bd524e20cb2aa5bd36e077dcab4134d9aad8fe9 files/gaim-otr-1.0.3-fPIC.patch 364
@@ -31,14 +32,18 @@ EBUILD gaim-otr-3.0.0-r1.ebuild 919 RMD160 47ccee89177b33edc294c3d56df2a436d2c89
 MD5 3f5b2136089a3d417b7a50604e20da1a gaim-otr-3.0.0-r1.ebuild 919
 RMD160 47ccee89177b33edc294c3d56df2a436d2c894fb gaim-otr-3.0.0-r1.ebuild 919
 SHA256 d83fea7cf0d506a32f2f8e0b6a67e48efafdf598284858f86c9510087e2edb03 gaim-otr-3.0.0-r1.ebuild 919
+EBUILD gaim-otr-3.0.0-r2.ebuild 958 RMD160 b61164df62cd1be82aee43a2850c19d54cad9df1 SHA1 ab9c4ffa446e12d443e8da7f2e91a68c5c19c256 SHA256 b8e64615d2ddcf599cf07278b791bf55a90bccb943949bacb17b7f7540793069
+MD5 a3d018b8daed44272cc42bce5118bbf4 gaim-otr-3.0.0-r2.ebuild 958
+RMD160 b61164df62cd1be82aee43a2850c19d54cad9df1 gaim-otr-3.0.0-r2.ebuild 958
+SHA256 b8e64615d2ddcf599cf07278b791bf55a90bccb943949bacb17b7f7540793069 gaim-otr-3.0.0-r2.ebuild 958
 EBUILD gaim-otr-3.0.0.ebuild 790 RMD160 fc36299f053aa2731c975041c8ef2c6fe64bade4 SHA1 7a2d99ef0dd705ea04d08dbaa4d4acd33950dc17 SHA256 815d5cb2311822a3c8cae36ab9f9b3740513ec10ce1211e948d3c80d9951eb11
 MD5 4678d2c9bf1edc755d264a4a78d6955d gaim-otr-3.0.0.ebuild 790
 RMD160 fc36299f053aa2731c975041c8ef2c6fe64bade4 gaim-otr-3.0.0.ebuild 790
 SHA256 815d5cb2311822a3c8cae36ab9f9b3740513ec10ce1211e948d3c80d9951eb11 gaim-otr-3.0.0.ebuild 790
-MISC ChangeLog 2162 RMD160 c7f95808ebbd65e00f61e7f279f99d274a2b4a5f SHA1 7b4a7f0dba1dd83f5ec04fb1bfafca334c4cd849 SHA256 8ff37f9936402a22affea0935b8877544fe0a6ca2756d71b83e9c062ba87cb3a
-MD5 99b70262be68b418d02ee0f86b6937fe ChangeLog 2162
-RMD160 c7f95808ebbd65e00f61e7f279f99d274a2b4a5f ChangeLog 2162
-SHA256 8ff37f9936402a22affea0935b8877544fe0a6ca2756d71b83e9c062ba87cb3a ChangeLog 2162
+MISC ChangeLog 2342 RMD160 2ab4a05087619b6fbeb158dcabe604d6552b4c36 SHA1 60fa5ce3ce15c97ad89bcb82c55a23d43dd71cf4 SHA256 0955a49e68910871042f3d7974a30b44c746a9a8ff25cf70389b3686161f51e6
+MD5 19eef22a9ecf9c3586a0c3db8e65eaf0 ChangeLog 2342
+RMD160 2ab4a05087619b6fbeb158dcabe604d6552b4c36 ChangeLog 2342
+SHA256 0955a49e68910871042f3d7974a30b44c746a9a8ff25cf70389b3686161f51e6 ChangeLog 2342
 MISC metadata.xml 159 RMD160 3e0df024f9705f0cd1798f45cd4b0698e183ee87 SHA1 08e27d5a696205dc5c9992d4f3b647cd609ec139 SHA256 bb3130d2515d5b2e4ff19aff2199bb00ac7c350bf78b34bbec55268bf1013908
 MD5 a574ec2607edf5e80117d65415e01d3c metadata.xml 159
 RMD160 3e0df024f9705f0cd1798f45cd4b0698e183ee87 metadata.xml 159
@@ -61,10 +66,6 @@ SHA256 742bd2b768d5f9b70d4a9765666d1e5483b8367bf76d373e552c55b588d987c9 files/di
 MD5 a8927832a3241b942e253e2e925c6854 files/digest-gaim-otr-3.0.0-r1 467
 RMD160 e969e9f2683dd0702dd10f50085356c5d7a8f764 files/digest-gaim-otr-3.0.0-r1 467
 SHA256 1a2656209edd2e117253f5f2f7377dfb823d2d9497263c8406a64155898473e1 files/digest-gaim-otr-3.0.0-r1 467
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFEkAlQp5vW4rUFj5oRAnLDAKCCJmaw+ocUhGtRWidoo3iscHG8MQCgrWaX
-gLyNtw7ZgeVXb++ibRUVE+g=
-=OdHV
------END PGP SIGNATURE-----
+MD5 a8927832a3241b942e253e2e925c6854 files/digest-gaim-otr-3.0.0-r2 467
+RMD160 e969e9f2683dd0702dd10f50085356c5d7a8f764 files/digest-gaim-otr-3.0.0-r2 467
+SHA256 1a2656209edd2e117253f5f2f7377dfb823d2d9497263c8406a64155898473e1 files/digest-gaim-otr-3.0.0-r2 467
diff --git a/x11-plugins/gaim-otr/files/digest-gaim-otr-3.0.0-r2 b/x11-plugins/gaim-otr/files/digest-gaim-otr-3.0.0-r2
new file mode 100644
index 000000000000..26f4d27261ac
--- /dev/null
+++ b/x11-plugins/gaim-otr/files/digest-gaim-otr-3.0.0-r2
@@ -0,0 +1,6 @@
+MD5 e819ef065bc0758f58beae5aa6a73ab1 gaim-otr-3.0.0.tar.gz 326217
+RMD160 7b550b2be1bd150a48ae697fdea3efb1f1677747 gaim-otr-3.0.0.tar.gz 326217
+SHA256 d6887fe5054bba466d15d1436ed15982a3b8ef1dbb8e73eeb79195535f88be01 gaim-otr-3.0.0.tar.gz 326217
+MD5 7a255b5dad10066452cf7083cc99f215 gaim2b2-otr.diff 9133
+RMD160 1eb6dde0312720d043a36eb17ff93637a63e7972 gaim2b2-otr.diff 9133
+SHA256 7d2f9605b4d0cb90c447698f2ee4b52f059c49f9136ae973b9696e87af57f5b9 gaim2b2-otr.diff 9133
diff --git a/x11-plugins/gaim-otr/files/gaim-2b4-otr.patch b/x11-plugins/gaim-otr/files/gaim-2b4-otr.patch
new file mode 100644
index 000000000000..ff1b13b9e8f7
--- /dev/null
+++ b/x11-plugins/gaim-otr/files/gaim-2b4-otr.patch
@@ -0,0 +1,12 @@
+diff -ur gaim-otr-3.0.0/gtk-dialog.c gaim-otr-3.0.0.new/gtk-dialog.c
+--- gaim-otr-3.0.0/gtk-dialog.c	2006-10-20 13:40:14.000000000 -0400
++++ gaim-otr-3.0.0.new/gtk-dialog.c	2006-10-20 13:45:11.000000000 -0400
+@@ -30,7 +30,7 @@
+ #if GAIM_MAJOR_VERSION < 2
+ #include "stock.h"
+ #else
+-#include "gtkstock.h"
++#include "gaimstock.h"
+ #endif
+ #include "plugin.h"
+ #include "notify.h"
diff --git a/x11-plugins/gaim-otr/gaim-otr-3.0.0-r2.ebuild b/x11-plugins/gaim-otr/gaim-otr-3.0.0-r2.ebuild
new file mode 100644
index 000000000000..7f87b9e108b1
--- /dev/null
+++ b/x11-plugins/gaim-otr/gaim-otr-3.0.0-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-otr/gaim-otr-3.0.0-r2.ebuild,v 1.1 2006/10/21 13:29:43 gothgirl Exp $
+
+inherit flag-o-matic eutils debug
+
+DESCRIPTION="(OTR) Messaging allows you to have private conversations over instant messaging"
+HOMEPAGE="http://www.cypherpunks.ca/otr/"
+SRC_URI="http://www.cypherpunks.ca/otr/${P}.tar.gz http://www.cypherpunks.ca/otr/gaim2b2-otr.diff"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=net-libs/libotr-3.0.0
+	>=net-im/gaim-1.5.0"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${DISTDIR}/gaim2b2-otr.diff
+	epatch ${FILESDIR}/gaim-2b4-otr.patch
+}
+
+src_compile() {
+	strip-flags
+	replace-flags -O? -O2
+
+	econf || die "econf failed"
+	emake -j1 || die "Make failed"
+}
+
+src_install() {
+	make install DESTDIR=${D} || die "Install failed"
+	dodoc COPYING ChangeLog README
+}