net-im/ssip-gst: Version bump, building fine with gaim-1.5.0 and gaim-2.0.0_beta5. Remove old version.

svn path=/trunk/; revision=443

8 files changed, 56 insertions, 52 deletions

diff --git a/net-im/ssip-gst/ChangeLog b/net-im/ssip-gst/ChangeLog
index 306a6cd..57bd0cf 100644
--- a/net-im/ssip-gst/ChangeLog
+++ b/net-im/ssip-gst/ChangeLog
@@ -5,3 +5,11 @@
 	  files/ssip-gst-0.9.7-subscription.diff, ssip-gst-0.9.7.ebuild:
 	  Initial import of ssip-gst gaim plugin (0.9.7)
 
+  10 Dec 2006; Stefan Knoblich <stkn@gentoo.org> -ssip-gst-0.9.7.ebuild,
+  -files/ssip-gst-0.9.7-makefile.diff,
+  -files/ssip-gst-0.9.7-subscription.diff, +ssip-gst-1.1.1.ebuild,
+  +files/ssip-gst-1.1.1-gaim15_api.diff,
+  +files/ssip-gst-1.1.1-makefile.diff:
+  Version bump, building fine with gaim-1.5.0 and gaim-2.0.0_beta5. Remove old
+  version.
+
diff --git a/net-im/ssip-gst/Manifest b/net-im/ssip-gst/Manifest
index 4d9ac0b..a66ab81 100644
--- a/net-im/ssip-gst/Manifest
+++ b/net-im/ssip-gst/Manifest
@@ -1,20 +1,20 @@
-AUX ssip-gst-0.9.7-makefile.diff 1783 RMD160 e9f2b3f8f38e9e5ed47eed9909ccf26c3a238d44 SHA1 c30408e350e0daab7e202de825abfee90ddd908c SHA256 ff8887ae714c9490a973afe787b1fc8cfacf6a5d8108df0a2d8f8b00ab1a5b44
-MD5 3f4392d8da79bdd5f4a2fa08c3073664 files/ssip-gst-0.9.7-makefile.diff 1783
-RMD160 e9f2b3f8f38e9e5ed47eed9909ccf26c3a238d44 files/ssip-gst-0.9.7-makefile.diff 1783
-SHA256 ff8887ae714c9490a973afe787b1fc8cfacf6a5d8108df0a2d8f8b00ab1a5b44 files/ssip-gst-0.9.7-makefile.diff 1783
-AUX ssip-gst-0.9.7-subscription.diff 775 RMD160 1c0e00bac6e4f2a7469e2c147e8e6d910e2b0523 SHA1 97e79bc49f7268a596d7dab8157e2a4f786aef38 SHA256 9810647284bc650fe5c72a7946b9a1b8781491074983ab709dd151862f225dd9
-MD5 061e4af40e86a4a3a86562e80d1382b8 files/ssip-gst-0.9.7-subscription.diff 775
-RMD160 1c0e00bac6e4f2a7469e2c147e8e6d910e2b0523 files/ssip-gst-0.9.7-subscription.diff 775
-SHA256 9810647284bc650fe5c72a7946b9a1b8781491074983ab709dd151862f225dd9 files/ssip-gst-0.9.7-subscription.diff 775
-DIST ssip-gst-0.9.7.tar.gz 304898
-EBUILD ssip-gst-0.9.7.ebuild 945 RMD160 994d88478fc8f8b4176082c4c4f00e0f9fcbbcb5 SHA1 a223e207ca0bdebb29e0cbd79ad4016c8668752f SHA256 2428689612c05b87bec3764e2ab2579cf548cd2f03fb40f507323b0685dd8029
-MD5 194b6f72330ff1fbd580f036dc20d77a ssip-gst-0.9.7.ebuild 945
-RMD160 994d88478fc8f8b4176082c4c4f00e0f9fcbbcb5 ssip-gst-0.9.7.ebuild 945
-SHA256 2428689612c05b87bec3764e2ab2579cf548cd2f03fb40f507323b0685dd8029 ssip-gst-0.9.7.ebuild 945
-MISC ChangeLog 238 RMD160 0d6640aba4a69b6adfaef85af3ede1a0ef221274 SHA1 723e1c43c3e03dc149d6710712081a3842e6fe0f SHA256 3afe81b62300eda0e4f963d91772d2b5dbbebd254d9677cdbed9d7f069cf59d7
-MD5 1a7501e7647a898c4c4a36ec53e22fdd ChangeLog 238
-RMD160 0d6640aba4a69b6adfaef85af3ede1a0ef221274 ChangeLog 238
-SHA256 3afe81b62300eda0e4f963d91772d2b5dbbebd254d9677cdbed9d7f069cf59d7 ChangeLog 238
-MD5 4e65a2a7eb24360eb5ee23afd36ec009 files/digest-ssip-gst-0.9.7 66
-RMD160 08c9b622e1a36d69c26179bdafc0d12e81f800d7 files/digest-ssip-gst-0.9.7 66
-SHA256 538922679aa624734b468eb09294c9c56cd617eacf4b87b90cd432fdbcc04187 files/digest-ssip-gst-0.9.7 66
+AUX ssip-gst-1.1.1-gaim15_api.diff 464 RMD160 832c50c9a2d6ed3c92a121eb057b0e3977161e41 SHA1 df2e3eaaa571d65659b470e1eb8ba13141e8ae85 SHA256 4d81f6824a6a702ae80a047783247e1ebbaa42ac8b1271552b758962d546aef7
+MD5 01b75de2a7b0755eab8c36c24ac22900 files/ssip-gst-1.1.1-gaim15_api.diff 464
+RMD160 832c50c9a2d6ed3c92a121eb057b0e3977161e41 files/ssip-gst-1.1.1-gaim15_api.diff 464
+SHA256 4d81f6824a6a702ae80a047783247e1ebbaa42ac8b1271552b758962d546aef7 files/ssip-gst-1.1.1-gaim15_api.diff 464
+AUX ssip-gst-1.1.1-makefile.diff 1783 RMD160 e9f2b3f8f38e9e5ed47eed9909ccf26c3a238d44 SHA1 c30408e350e0daab7e202de825abfee90ddd908c SHA256 ff8887ae714c9490a973afe787b1fc8cfacf6a5d8108df0a2d8f8b00ab1a5b44
+MD5 3f4392d8da79bdd5f4a2fa08c3073664 files/ssip-gst-1.1.1-makefile.diff 1783
+RMD160 e9f2b3f8f38e9e5ed47eed9909ccf26c3a238d44 files/ssip-gst-1.1.1-makefile.diff 1783
+SHA256 ff8887ae714c9490a973afe787b1fc8cfacf6a5d8108df0a2d8f8b00ab1a5b44 files/ssip-gst-1.1.1-makefile.diff 1783
+DIST sofiasip-gaim-prpl-1.1.1.tar.gz 328134 RMD160 01ebd97511aa00e839d9c4085f5f38c478791444 SHA1 f428e8c53bd4bb78dc542d9b45d804218ad40a77 SHA256 d1b0b4777a792b9eaa8072026fdabd5b3132fbf1e326d285dc3a792b7d86a6ca
+EBUILD ssip-gst-1.1.1.ebuild 908 RMD160 200256ecdaa0ef099b58f724a7bfa6f2038a24f2 SHA1 479177fdb8e80003f8decfd0c9eca631c8af312a SHA256 2f2cc6c825b685040a7782c59fee4a994c0b9df090b37ef96755b0db25d2e2d5
+MD5 38346fafc541d863270770bbdfdad459 ssip-gst-1.1.1.ebuild 908
+RMD160 200256ecdaa0ef099b58f724a7bfa6f2038a24f2 ssip-gst-1.1.1.ebuild 908
+SHA256 2f2cc6c825b685040a7782c59fee4a994c0b9df090b37ef96755b0db25d2e2d5 ssip-gst-1.1.1.ebuild 908
+MISC ChangeLog 588 RMD160 0fbd56d583b9022211f31ab5a07b5c9506e3dfaf SHA1 ddd4e9bbb76fb1e7e31432a02681facee07c9129 SHA256 ed91117e20f722c77a4f8352da9cab8546c82daa5b4b6acd6c334cfc2abc099c
+MD5 5fc7abb20db82c0c22565ad94843a8dd ChangeLog 588
+RMD160 0fbd56d583b9022211f31ab5a07b5c9506e3dfaf ChangeLog 588
+SHA256 ed91117e20f722c77a4f8352da9cab8546c82daa5b4b6acd6c334cfc2abc099c ChangeLog 588
+MD5 ea0edaf11ea03869e5cc831a05a80e49 files/digest-ssip-gst-1.1.1 274
+RMD160 159b1a97d65405d1189903ac3c4e3db1e2cccb2e files/digest-ssip-gst-1.1.1 274
+SHA256 f10530799a3686e7282d0fbab9984e8a1db906c5e7ebca589a481088577e6058 files/digest-ssip-gst-1.1.1 274
diff --git a/net-im/ssip-gst/files/digest-ssip-gst-0.9.7 b/net-im/ssip-gst/files/digest-ssip-gst-0.9.7
deleted file mode 100644
index 4d5190e..0000000
--- a/net-im/ssip-gst/files/digest-ssip-gst-0.9.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b563e6fcb23f02bb47c459b0e7520344 ssip-gst-0.9.7.tar.gz 304898
diff --git a/net-im/ssip-gst/files/digest-ssip-gst-1.1.1 b/net-im/ssip-gst/files/digest-ssip-gst-1.1.1
new file mode 100644
index 0000000..199d79b
--- /dev/null
+++ b/net-im/ssip-gst/files/digest-ssip-gst-1.1.1
@@ -0,0 +1,3 @@
+MD5 d1b7b0466bd791591fcf7cba56d539db sofiasip-gaim-prpl-1.1.1.tar.gz 328134
+RMD160 01ebd97511aa00e839d9c4085f5f38c478791444 sofiasip-gaim-prpl-1.1.1.tar.gz 328134
+SHA256 d1b0b4777a792b9eaa8072026fdabd5b3132fbf1e326d285dc3a792b7d86a6ca sofiasip-gaim-prpl-1.1.1.tar.gz 328134
diff --git a/net-im/ssip-gst/files/ssip-gst-0.9.7-subscription.diff b/net-im/ssip-gst/files/ssip-gst-0.9.7-subscription.diff
deleted file mode 100644
index eaef572..0000000
--- a/net-im/ssip-gst/files/ssip-gst-0.9.7-subscription.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- ssip-gst-0.9.7/src/ssip.c.orig	2005-11-23 21:10:11.000000000 +0100
-+++ ssip-gst-0.9.7/src/ssip.c	2005-12-16 19:48:43.000000000 +0100
-@@ -524,6 +524,10 @@
- 
-   gaim_debug_misc(__func__, "entered.\n");
- 
-+  /* At this point username is formalized (in ssip_login), no regexp needed */
-+  username = gaim_account_get_username(account);
-+  passwd = gaim_account_get_password(account);
-+
-   if (status >= 200 && status < 300) {
-     return;
-   }
-@@ -540,7 +544,7 @@
-     else if (sip && sip->sip_proxy_authenticate) {
-       scheme = (char const *) sip->sip_proxy_authenticate->au_scheme;
-       realm = (char const *) *sip->sip_proxy_authenticate->au_params;
--      }
-+    }
-     
-     tmp = g_strndup(IGNORE_SIP_PREFIX(username), strstr(username, "@") - username - 4);
-     
diff --git a/net-im/ssip-gst/files/ssip-gst-1.1.1-gaim15_api.diff b/net-im/ssip-gst/files/ssip-gst-1.1.1-gaim15_api.diff
new file mode 100644
index 0000000..2ef4bf8
--- /dev/null
+++ b/net-im/ssip-gst/files/ssip-gst-1.1.1-gaim15_api.diff
@@ -0,0 +1,14 @@
+--- sofiasip-gaim-prpl-1.1.1/src/ssip.c.orig	2006-12-10 20:46:48.000000000 +0100
++++ sofiasip-gaim-prpl-1.1.1/src/ssip.c	2006-12-10 20:46:53.000000000 +0100
+@@ -1103,7 +1103,11 @@
+   ssip_oper_t *op = NULL;
+   ssip_buddy_t *sb = g_hash_table_lookup(ssip->s_buddies, buddy->name);
+   GList *m = NULL;
++#if SSIP_OLD_GAIM_API
++  GaimBlistNodeAction *act;
++#else
+   GaimMenuAction *act;
++#endif
+   char buf[20];
+   sip_from_t const *from = NULL;
+   GString *b = NULL;
diff --git a/net-im/ssip-gst/files/ssip-gst-0.9.7-makefile.diff b/net-im/ssip-gst/files/ssip-gst-1.1.1-makefile.diff
index 683cd4f..683cd4f 100644
--- a/net-im/ssip-gst/files/ssip-gst-0.9.7-makefile.diff
+++ b/net-im/ssip-gst/files/ssip-gst-1.1.1-makefile.diff
diff --git a/net-im/ssip-gst/ssip-gst-0.9.7.ebuild b/net-im/ssip-gst/ssip-gst-1.1.1.ebuild
index 742cd58..47e7486 100644
--- a/net-im/ssip-gst/ssip-gst-0.9.7.ebuild
+++ b/net-im/ssip-gst/ssip-gst-1.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.2.0.ebuild,v 1.2 2005/11/20 21:33:56 stkn Exp $
+# $Header: $
 
 inherit eutils
 
@@ -8,7 +8,7 @@ IUSE="ssl"
 
 DESCRIPTION="Sofia-SIP based SIP UA plugin for Gaim"
 HOMEPAGE="http://sofia-sip.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sofia-sip/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/sofia-sip/sofiasip-gaim-prpl-${PV}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
@@ -23,25 +23,27 @@ DEPEND="${RDEPEND}
 
 RESTRICT="nomirror"
 
+S="${WORKDIR}/sofiasip-gaim-prpl-${PV}"
+
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
-	epatch ${FILESDIR}/${P}-makefile.diff
+	epatch "${FILESDIR}"/${P}-makefile.diff
 
-	# fix segfault during SUBSCRIBE
-	epatch ${FILESDIR}/${P}-subscription.diff
+	# gaim-1.5 api compat
+	epatch "${FILESDIR}"/${P}-gaim15_api.diff
 }
 
 src_compile() {
 	econf \
-		--with-gaimlibdir=/usr/$(get_libdir)/gaim || die
+		--with-gaim-libdir=/usr/$(get_libdir)/gaim || die
 
 	emake || die
 }
 
 src_install() {
-	make DESTDIR=${D} install-plugin || die
+	make DESTDIR="${D}" install-plugin || die
 
 	dodoc ChangeLog COPYRIGHTS README TODO COPYING AUTHORS
 }