Patch from Stu Tomlinson for gaim-0.81

10 files changed, 133 insertions, 2 deletions

diff --git a/x11-plugins/gaim-xmms-remote/ChangeLog b/x11-plugins/gaim-xmms-remote/ChangeLog
index 9402e3f713bf..590b31d7cc46 100644
--- a/x11-plugins/gaim-xmms-remote/ChangeLog
+++ b/x11-plugins/gaim-xmms-remote/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/gaim-xmms-remote
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-xmms-remote/ChangeLog,v 1.14 2004/08/06 14:07:20 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-xmms-remote/ChangeLog,v 1.15 2004/08/06 14:37:16 rizzo Exp $
+
+*gaim-xmms-remote-1.4-r1 (06 Aug 2004)
+
+  06 Aug 2004; Don Seiler <rizzo@gentoo.org> +files/gxr-1.4-gaim-0.81.patch,
+  +gaim-xmms-remote-1.4-r1.ebuild:
+  Patch from Stu Tomlinson for gaim-0.81
 
   06 Aug 2004; Don Seiler <rizzo@gentoo.org> gaim-xmms-remote-1.4.ebuild:
   Stable on x86, only works with gaim-0.80
diff --git a/x11-plugins/gaim-xmms-remote/Manifest b/x11-plugins/gaim-xmms-remote/Manifest
index 4d44b62f1467..1cd8373bf495 100644
--- a/x11-plugins/gaim-xmms-remote/Manifest
+++ b/x11-plugins/gaim-xmms-remote/Manifest
@@ -1,4 +1,7 @@
 MD5 0116eaec41c884e84492224dca0773dd ChangeLog 1946
 MD5 4d3d95a45b24c1f9824d3fb40d93ce44 gaim-xmms-remote-1.4.ebuild 727
+MD5 532a664fca47c2c7082fca37f6b6541a gaim-xmms-remote-1.4-r1.ebuild 827
 MD5 dc59d3fab14b084056bc1b0faec90778 metadata.xml 574
 MD5 e402c043a8272796e43c24e802390133 files/digest-gaim-xmms-remote-1.4 72
+MD5 cbbbfed3871a420efcb29d0ca9c95e3a files/gxr-1.4-gaim-0.81.patch 990
+MD5 e402c043a8272796e43c24e802390133 files/digest-gaim-xmms-remote-1.4-r1 72
diff --git a/x11-plugins/gaim-xmms-remote/files/digest-gaim-xmms-remote-1.4-r1 b/x11-plugins/gaim-xmms-remote/files/digest-gaim-xmms-remote-1.4-r1
new file mode 100644
index 000000000000..cc1e8077054e
--- /dev/null
+++ b/x11-plugins/gaim-xmms-remote/files/digest-gaim-xmms-remote-1.4-r1
@@ -0,0 +1 @@
+MD5 54af9bc90ffd55d68192fa81b791822a gaim-xmms-remote-1.4.tar.gz 306872
diff --git a/x11-plugins/gaim-xmms-remote/files/gxr-1.4-gaim-0.81.patch b/x11-plugins/gaim-xmms-remote/files/gxr-1.4-gaim-0.81.patch
new file mode 100644
index 000000000000..acd74ce1d478
--- /dev/null
+++ b/x11-plugins/gaim-xmms-remote/files/gxr-1.4-gaim-0.81.patch
@@ -0,0 +1,26 @@
+Index: src/gaim-xmms-remote.c
+===================================================================
+RCS file: /var/lib/cvs/gaim-xmms-remote/src/gaim-xmms-remote.c,v
+retrieving revision 1.20
+retrieving revision 1.21
+diff -u -p -r1.20 -r1.21
+--- src/gaim-xmms-remote.c	6 Jul 2004 00:40:41 -0000	1.20
++++ src/gaim-xmms-remote.c	26 Jul 2004 14:53:59 -0000	1.21
+@@ -551,7 +551,7 @@ gxr_conv_destroyed_cb(GaimConversation *
+ }
+ 
+ static GaimCmdRet
+-gxr_cmd_cb(GaimConversation *c, const gchar *cmd, gchar **args, gchar **error) {
++gxr_cmd_cb(GaimConversation *c, const gchar *cmd, gchar **args, gchar **error, void *data) {
+ 	gchar *lower;
+ 	gint session = GXR_SESSION;
+ 
+@@ -780,7 +780,7 @@ gxr_load(GaimPlugin *plugin) {
+ 	/* register our command */
+ 	gxr_cmd = gaim_cmd_register("gxr", "w", GAIM_CMD_P_PLUGIN,
+ 								GAIM_CMD_FLAG_IM | GAIM_CMD_FLAG_CHAT, NULL,
+-								gxr_cmd_cb, help);
++								gxr_cmd_cb, help, NULL);
+ 
+ 	/* hijack the popup menus in the imhtmls */
+ 	gxr_hook_popups();
diff --git a/x11-plugins/gaim-xmms-remote/gaim-xmms-remote-1.4-r1.ebuild b/x11-plugins/gaim-xmms-remote/gaim-xmms-remote-1.4-r1.ebuild
new file mode 100644
index 000000000000..ad39618042d7
--- /dev/null
+++ b/x11-plugins/gaim-xmms-remote/gaim-xmms-remote-1.4-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-xmms-remote/gaim-xmms-remote-1.4-r1.ebuild,v 1.1 2004/08/06 14:37:16 rizzo Exp $
+
+IUSE="debug"
+
+inherit eutils
+use debug && inherit debug
+
+DESCRIPTION="Gaim XMMS Remote is a Gaim plugin that lets you control XMMS from within gaim."
+
+HOMEPAGE="http://guifications.sourceforge.net/Gaim-XMMS-Remote/"
+SRC_URI="mirror://sourceforge/guifications/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+
+DEPEND=">=net-im/gaim-0.81
+	media-sound/xmms"
+
+#RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/gxr-1.4-gaim-0.81.patch
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README VERSION
+}
diff --git a/x11-plugins/guifications/ChangeLog b/x11-plugins/guifications/ChangeLog
index 7f31a72751b4..ed944efc4a24 100644
--- a/x11-plugins/guifications/ChangeLog
+++ b/x11-plugins/guifications/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/guifications
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/guifications/ChangeLog,v 1.3 2004/07/19 13:41:29 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/guifications/ChangeLog,v 1.4 2004/08/06 14:39:29 rizzo Exp $
+
+*guifications-1.10-r1 (06 Aug 2004)
+
+  06 Aug 2004; Don Seiler <rizzo@gentoo.org> +files/gf-1.10-gaim-0.81.patch,
+  +guifications-1.10-r1.ebuild:
+  Patch from Stu Tomlinson for gaim-0.81
 
 *guifications-1.10 (19 Jul 2004)
 
diff --git a/x11-plugins/guifications/Manifest b/x11-plugins/guifications/Manifest
index e6be107abf92..1215224a1ef0 100644
--- a/x11-plugins/guifications/Manifest
+++ b/x11-plugins/guifications/Manifest
@@ -1,4 +1,7 @@
+MD5 56e14edd152a50860c4666db4603459d guifications-1.10-r1.ebuild 896
 MD5 5f66bd8aba230f31f842fb8d59f0707a ChangeLog 1530
 MD5 8d08e9a7e45330b731e02aadc8acb6fc metadata.xml 354
 MD5 139dade462d53ac69fa5729d57b7bc7e guifications-1.10.ebuild 796
+MD5 1ebdb44cf39382ae8d55a23cfdfb5bad files/gf-1.10-gaim-0.81.patch 635
 MD5 93f037460f3ffe26723099b62ca68afa files/digest-guifications-1.10 69
+MD5 93f037460f3ffe26723099b62ca68afa files/digest-guifications-1.10-r1 69
diff --git a/x11-plugins/guifications/files/digest-guifications-1.10-r1 b/x11-plugins/guifications/files/digest-guifications-1.10-r1
new file mode 100644
index 000000000000..29fbe79f73cc
--- /dev/null
+++ b/x11-plugins/guifications/files/digest-guifications-1.10-r1
@@ -0,0 +1 @@
+MD5 91110f09327dcda28b443e544aa5a290 guifications-1.10.tar.gz 347924
diff --git a/x11-plugins/guifications/files/gf-1.10-gaim-0.81.patch b/x11-plugins/guifications/files/gf-1.10-gaim-0.81.patch
new file mode 100644
index 000000000000..96f6266351c3
--- /dev/null
+++ b/x11-plugins/guifications/files/gf-1.10-gaim-0.81.patch
@@ -0,0 +1,17 @@
+Index: src/guifications.c
+===================================================================
+RCS file: /var/lib/cvs/guifications/src/guifications.c,v
+retrieving revision 1.19
+retrieving revision 1.20
+diff -u -p -r1.19 -r1.20
+--- src/guifications.c	11 Jul 2004 09:43:48 -0000	1.19
++++ src/guifications.c	1 Aug 2004 13:17:48 -0000	1.20
+@@ -402,7 +402,7 @@ make_guification(GaimBuddy *buddy, gf_ev
+ 	g_object_unref(G_OBJECT(protocol_scaled));
+ 
+ 	if (gaim_prefs_get_bool(GF_PREF_BEHAVIOR_ALIAS))
+-		name = g_strdup(gaim_get_buddy_alias(buddy));
++		name = g_strdup(gaim_buddy_get_alias(buddy));
+ 	else
+ 		name = g_strdup(buddy->name);
+ 	
diff --git a/x11-plugins/guifications/guifications-1.10-r1.ebuild b/x11-plugins/guifications/guifications-1.10-r1.ebuild
new file mode 100644
index 000000000000..b830b8871002
--- /dev/null
+++ b/x11-plugins/guifications/guifications-1.10-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/guifications/guifications-1.10-r1.ebuild,v 1.1 2004/08/06 14:39:29 rizzo Exp $
+
+inherit eutils
+
+DESCRIPTION="Guifications are graphical notification plugin for the open source instant message client gaim"
+HOMEPAGE="http://guifications.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE="debug"
+
+DEPEND=">=net-im/gaim-0.81"
+#RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/gf-1.10-gaim-0.81.patch
+}
+
+src_compile() {
+	local myconf
+	myconf=`use_enable debug`
+
+	econf ${myconf} || die "econf failure"
+	emake || die "emake failure"
+}
+
+src_install() {
+	einstall || die "einstall failure"
+	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO VERSION
+}