summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDon Seiler <rizzo@gentoo.org>2005-08-18 03:42:53 +0000
committerDon Seiler <rizzo@gentoo.org>2005-08-18 03:42:53 +0000
commit28c41e03faa1924fa1e69714c5f7c6f9ac144875 (patch)
treee7e2c98fe60a009388427b21ef68e0961c7b4769 /net-im/gaim
parentinitial import (diff)
downloadhistorical-28c41e03faa1924fa1e69714c5f7c6f9ac144875.tar.gz
historical-28c41e03faa1924fa1e69714c5f7c6f9ac144875.tar.bz2
historical-28c41e03faa1924fa1e69714c5f7c6f9ac144875.zip
Pruning obsolete files
Package-Manager: portage-2.0.51.22-r2
Diffstat (limited to 'net-im/gaim')
-rw-r--r--net-im/gaim/ChangeLog8
-rw-r--r--net-im/gaim/Manifest24
-rw-r--r--net-im/gaim/files/digest-gaim-1.3.11
-rw-r--r--net-im/gaim/files/digest-gaim-1.4.0-r21
-rw-r--r--net-im/gaim/files/gaim-1.3.0-silc-ft.patch19
-rw-r--r--net-im/gaim/files/gaim-1.4.0-libgg-mem.patch16
-rw-r--r--net-im/gaim/files/gaim-1.4.0-msn-userlist.diff23
-rw-r--r--net-im/gaim/files/gaim-1.4.0-oscar-ssi.diff31
-rw-r--r--net-im/gaim/gaim-1.3.1.ebuild147
-rw-r--r--net-im/gaim/gaim-1.4.0-r2.ebuild145
10 files changed, 10 insertions, 405 deletions
diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index fa86b56b08d1..1f6e65225447 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-im/gaim
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.369 2005/08/13 07:24:29 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.370 2005/08/18 03:42:53 rizzo Exp $
+
+ 18 Aug 2005; Don Seiler <rizzo@gentoo.org>
+ -files/gaim-1.3.0-silc-ft.patch, -files/gaim-1.4.0-libgg-mem.patch,
+ -files/gaim-1.4.0-msn-userlist.diff, -files/gaim-1.4.0-oscar-ssi.diff,
+ -gaim-1.3.1.ebuild, -gaim-1.4.0-r2.ebuild:
+ Pruning obsolete files
13 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> gaim-1.5.0.ebuild:
Stable on hppa.
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index 8c235eb07ac3..d32213cbfed8 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -1,23 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 6727d140d07549b6be4b0ca9886e2514 metadata.xml 414
-MD5 6f78882ffd6e3e3ad4b6f3cd857ddce9 gaim-1.4.0-r2.ebuild 4353
+MD5 c5d430875f22eed32d8d049f6d6f9cde ChangeLog 53810
MD5 375e4842d0812bfba079e1b2539c7b17 gaim-1.5.0.ebuild 4181
-MD5 f0320b012e455c11a4ff683409df1309 gaim-1.3.1.ebuild 4275
-MD5 a0a25de1bb0d6ef11cb6fbe08f2761ee ChangeLog 53552
-MD5 34466df05198ffffaa36d5469babd2aa files/digest-gaim-1.3.1 64
-MD5 20166c600c6de257f42af05bea6efd22 files/digest-gaim-1.4.0-r2 64
-MD5 1a1937855d7436ad73db7062927a2be2 files/gaim-1.4.0-msn-userlist.diff 729
-MD5 7eeaeb97528ef69941cf3fa3d04dea3e files/gaim-1.3.0-silc-ft.patch 567
-MD5 55807d838af0375bc41eabe3534fdda8 files/digest-gaim-1.5.0 64
-MD5 d28b7cad9b42f5e1ecd276003220a0f8 files/gaim-1.4.0-oscar-ssi.diff 1200
-MD5 11f026799a722bb53a2f4cdac2dad2d7 files/gaim-1.4.0-libgg-mem.patch 477
+MD5 6727d140d07549b6be4b0ca9886e2514 metadata.xml 414
MD5 afc682711efed5d09a9229bd06a7a13b files/gaim-0.76-xinput.patch 644
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDAXIHgIKl8Uu19MoRAsvEAJ9S4lStyvS8epp7LhpyvyZxSC+fLgCfbN/W
-mrj5hiyMAUjEJQtqm/S8DNM=
-=rpLr
------END PGP SIGNATURE-----
+MD5 55807d838af0375bc41eabe3534fdda8 files/digest-gaim-1.5.0 64
diff --git a/net-im/gaim/files/digest-gaim-1.3.1 b/net-im/gaim/files/digest-gaim-1.3.1
deleted file mode 100644
index f8c498ed135b..000000000000
--- a/net-im/gaim/files/digest-gaim-1.3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a76e59c5093773169fbb232782a2f116 gaim-1.3.1.tar.bz2 5862559
diff --git a/net-im/gaim/files/digest-gaim-1.4.0-r2 b/net-im/gaim/files/digest-gaim-1.4.0-r2
deleted file mode 100644
index 26b60f0f8a08..000000000000
--- a/net-im/gaim/files/digest-gaim-1.4.0-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d7717cb771e556012ecd5b7f3bdb02ba gaim-1.4.0.tar.bz2 5979303
diff --git a/net-im/gaim/files/gaim-1.3.0-silc-ft.patch b/net-im/gaim/files/gaim-1.3.0-silc-ft.patch
deleted file mode 100644
index 00bc3bb86817..000000000000
--- a/net-im/gaim/files/gaim-1.3.0-silc-ft.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: ft.c
-===================================================================
-RCS file: /cvsroot/gaim/gaim/src/protocols/silc/ft.c,v
-retrieving revision 1.5.2.1
-diff -u -r1.5.2.1 ft.c
---- ft.c 10 Feb 2005 00:07:35 -0000 1.5.2.1
-+++ ft.c 13 May 2005 15:11:38 -0000
-@@ -363,11 +363,6 @@
- if (!silc_parse_userfqdn(name, &nickname, NULL))
- return;
-
--#ifndef _WIN32
-- silc_debug = TRUE;
-- silc_log_set_debug_string("*client*,*ftp*");
--#endif
--
- /* Find client entry */
- clients = silc_client_get_clients_local(client, conn, nickname, name,
- &clients_count);
diff --git a/net-im/gaim/files/gaim-1.4.0-libgg-mem.patch b/net-im/gaim/files/gaim-1.4.0-libgg-mem.patch
deleted file mode 100644
index 48887b3262b4..000000000000
--- a/net-im/gaim/files/gaim-1.4.0-libgg-mem.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- libgg.c.orig 2005-07-19 17:35:24.000000000 +0200
-+++ libgg.c 2005-07-19 17:39:05.000000000 +0200
-@@ -1086,8 +1086,11 @@
-
- e->event.status60.descr = buf;
-
-- if (len > 4 && p[h->length - 5] == 0)
-- e->event.status60.time = *((int*) (p + h->length - 4));
-+ if (len > 4 && p[h->length - 5] == 0) {
-+ uint32_t t;
-+ memcpy(&t, p + h->length - 4, sizeof(uint32_t));
-+ e->event.status60.time = t;
-+ }
- }
-
- break;
diff --git a/net-im/gaim/files/gaim-1.4.0-msn-userlist.diff b/net-im/gaim/files/gaim-1.4.0-msn-userlist.diff
deleted file mode 100644
index 7ace7eea6bf4..000000000000
--- a/net-im/gaim/files/gaim-1.4.0-msn-userlist.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-===================================================================
-RCS file: /cvsroot/gaim/gaim/src/protocols/msn/userlist.c,v
-retrieving revision 1.16.2.10
-retrieving revision 1.16.2.11
-diff -u -r1.16.2.10 -r1.16.2.11
---- gaim/gaim/src/protocols/msn/userlist.c 2005/03/17 05:17:04 1.16.2.10
-+++ gaim/gaim/src/protocols/msn/userlist.c 2005/07/08 04:16:17 1.16.2.11
-@@ -622,6 +622,15 @@
-
- group_id = -1;
-
-+ if (!gaim_email_is_valid(who))
-+ {
-+ char *str = g_strdup_printf(_("Unable to add \"%s\"."), who);
-+ gaim_notify_error(NULL, NULL, str,
-+ _("The screen name specified is invalid."));
-+ g_free(str);
-+ return;
-+ }
-+
- if (group_name != NULL)
- {
- group_id = msn_userlist_find_group_id(userlist, group_name);
diff --git a/net-im/gaim/files/gaim-1.4.0-oscar-ssi.diff b/net-im/gaim/files/gaim-1.4.0-oscar-ssi.diff
deleted file mode 100644
index ac996033c6d8..000000000000
--- a/net-im/gaim/files/gaim-1.4.0-oscar-ssi.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-===================================================================
-RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/ssi.c,v
-retrieving revision 1.60.2.1
-retrieving revision 1.60.2.3
-diff -u -r1.60.2.1 -r1.60.2.3
---- gaim/gaim/src/protocols/oscar/ssi.c 2005/06/14 00:24:29 1.60.2.1
-+++ gaim/gaim/src/protocols/oscar/ssi.c 2005/07/09 18:51:05 1.60.2.3
-@@ -671,20 +671,18 @@
- /* Make sure there aren't any duplicate buddies in a group, or duplicate permits or denies */
- cur = sess->ssi.local;
- while (cur) {
-- next = cur->next;
--
- if ((cur->type == AIM_SSI_TYPE_BUDDY) || (cur->type == AIM_SSI_TYPE_PERMIT) || (cur->type == AIM_SSI_TYPE_DENY))
- {
- struct aim_ssi_item *cur2, *next2;
-- cur2 = next;
-+ cur2 = cur->next;
- while (cur2) {
- next2 = cur2->next;
-- if ((cur->type == cur2->type) && (cur->gid == cur2->gid) && (!strcmp(cur->name, cur2->name)))
-+ if ((cur->type == cur2->type) && (cur->gid == cur2->gid) && (cur->name != NULL) && (cur2->name != NULL) && (!strcmp(cur->name, cur2->name)))
- aim_ssi_itemlist_del(&sess->ssi.local, cur2);
- cur2 = next2;
- }
- }
-- cur = next;
-+ cur = cur->next;
- }
-
- /* Check if there are empty groups and delete them */
diff --git a/net-im/gaim/gaim-1.3.1.ebuild b/net-im/gaim/gaim-1.3.1.ebuild
deleted file mode 100644
index c6ae79aa9e9e..000000000000
--- a/net-im/gaim/gaim-1.3.1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-1.3.1.ebuild,v 1.11 2005/07/13 14:19:53 swegener Exp $
-
-inherit flag-o-matic eutils toolchain-funcs debug
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://gaim.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
-IUSE="nls perl spell nas cjk gnutls silc eds krb4 tcltk debug"
-
-RDEPEND=">=x11-libs/gtk+-2.0
- >=dev-libs/glib-2.0
- nas? ( >=media-libs/nas-1.4.1-r1 )
- media-libs/libao
- >=media-libs/audiofile-0.2.0
- perl? ( >=dev-lang/perl-5.8.2-r1
- !<perl-core/ExtUtils-MakeMaker-6.17 )
- spell? ( >=app-text/gtkspell-2.0.2 )
- gnutls? ( net-libs/gnutls )
- !gnutls? ( >=dev-libs/nss-3.9.2-r2 )
- silc? ( >=net-im/silc-toolkit-0.9.12-r3 )
- eds? ( gnome-extra/evolution-data-server )
- krb4? ( >=app-crypt/mit-krb5-1.3.6-r1 )
- tcltk? ( dev-lang/tcl
- dev-lang/tk )
- x11-libs/startup-notification"
-
-DEPEND="$RDEPEND
- dev-util/pkgconfig
- nls? ( sys-devel/gettext )"
-
-# List of plugins
-# app-accessibility/festival-gaim
-# net-im/gaim-blogger
-# net-im/gaim-bnet
-# net-im/gaim-meanwhile
-# net-im/gaim-snpp
-# x11-plugins/autoprofile
-# x11-plugins/gaim-assistant
-# x11-plugins/gaim-encryption
-# x11-plugins/gaim-extprefs
-# x11-plugins/gaim-latex
-# x11-plugins/gaim-otr
-# x11-plugins/gaim-rhythmbox
-# x11-plugins/gaim-xmms-remote
-# x11-plugins/gaimosd
-# x11-plugins/guifications
-
-
-print_gaim_warning() {
- ewarn
- ewarn "If you are merging ${P} from an earlier version, you may need"
- ewarn "to re-merge any plugins like gaim-encryption or gaim-snpp."
- ewarn
- ewarn "If you experience problems with gaim, file them as bugs with"
- ewarn "Gentoo's bugzilla, http://bugs.gentoo.org. DO NOT report them"
- ewarn "as bugs with gaim's sourceforge tracker, and by all means DO NOT"
- ewarn "seek help in #gaim."
- ewarn
- ewarn "Be sure to USE=\"debug\" and include a backtrace for any seg"
- ewarn "faults, see http://gaim.sourceforge.net/gdb.php for details on"
- ewarn "backtraces."
- ewarn
- ewarn "Please read the gaim FAQ at http://gaim.sourceforge.net/faq.php"
- ewarn
- einfo
- einfo "Note that we are now filtering all unstable flags in C[XX]FLAGS."
- einfo
- ebeep 5
- epause 3
-}
-
-pkg_setup() {
- print_gaim_warning
- if use krb4 && ! built_with_use app-crypt/mit-krb5 krb4 ; then
- eerror
- eerror You need to rebuild app-crypt/mit-krb5 with USE=krb4 in order to
- eerror enable krb4 support for the zephyr protocol in gaim.
- eerror
- die "Configure failed"
- fi
-}
-
-src_unpack() {
- unpack ${A}
- cd ${S}
- use cjk && epatch ${FILESDIR}/gaim-0.76-xinput.patch
-
- # Fix silc building
- if use silc ; then
- cd ${S}/src/protocols/silc
- epatch ${FILESDIR}/gaim-1.3.0-silc-ft.patch
- cd ${S}
- fi
-}
-
-src_compile() {
- # Stabilize things, for your own good
- strip-flags
- replace-flags -O? -O2
-
- # -msse2 doesn't play nice on gcc 3.2
- [ "`gcc-version`" == "3.2" ] && filter-flags -msse2
-
- local myconf
- use debug && myconf="${myconf} --enable-debug"
- use perl || myconf="${myconf} --disable-perl"
- use spell || myconf="${myconf} --disable-gtkspell"
- use nls || myconf="${myconf} --disable-nls"
- use nas && myconf="${myconf} --enable-nas" || myconf="${myconf} --disable-nas"
- use eds || myconf="${myconf} --disable-gevolution"
- use krb4 && myconf="${myconf} --with-krb4"
- use tcltk || myconf="${myconf} --disable-tcl --disable-tk"
-
- if use gnutls ; then
- einfo "Disabling NSS, using GnuTLS"
- myconf="${myconf} --enable-nss=no"
- myconf="${myconf} --with-gnutls-includes=/usr/include/gnutls"
- myconf="${myconf} --with-gnutls-libs=/usr/lib"
- else
- einfo "Disabling GnuTLS, using NSS"
- myconf="${myconf} --enable-gnutls=no"
- myconf="${myconf} --with-nspr-includes=/usr/include/nspr"
- myconf="${myconf} --with-nss-includes=/usr/include/nss"
- myconf="${myconf} --with-nspr-libs=/usr/lib/nspr"
- myconf="${myconf} --with-nss-libs=/usr/lib/nss"
- fi
-
-
- econf ${myconf} || die "Configuration failed"
-
- emake -j1 || die "Make failed"
-}
-
-src_install() {
- make install DESTDIR=${D} || die "Install failed"
- dodoc ABOUT-NLS AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog VERSION
-}
-
-pkg_postinst() {
- print_gaim_warning
-}
diff --git a/net-im/gaim/gaim-1.4.0-r2.ebuild b/net-im/gaim/gaim-1.4.0-r2.ebuild
deleted file mode 100644
index 002b7ddef01c..000000000000
--- a/net-im/gaim/gaim-1.4.0-r2.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-1.4.0-r2.ebuild,v 1.9 2005/08/16 04:56:22 vapier Exp $
-
-inherit flag-o-matic eutils toolchain-funcs debug multilib
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://gaim.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="nls perl spell nas cjk gnutls silc eds krb4 tcltk debug"
-
-RDEPEND=">=x11-libs/gtk+-2.0
- >=dev-libs/glib-2.0
- nas? ( >=media-libs/nas-1.4.1-r1 )
- media-libs/libao
- >=media-libs/audiofile-0.2.0
- perl? ( >=dev-lang/perl-5.8.2-r1
- !<perl-core/ExtUtils-MakeMaker-6.17 )
- spell? ( >=app-text/gtkspell-2.0.2 )
- gnutls? ( net-libs/gnutls )
- !gnutls? ( >=dev-libs/nss-3.9.2-r2 )
- silc? ( >=net-im/silc-toolkit-0.9.12-r3 )
- eds? ( gnome-extra/evolution-data-server )
- krb4? ( >=app-crypt/mit-krb5-1.3.6-r1 )
- tcltk? ( dev-lang/tcl
- dev-lang/tk )
- x11-libs/startup-notification"
-
-DEPEND="$RDEPEND
- dev-util/pkgconfig
- nls? ( sys-devel/gettext )"
-
-# List of plugins
-# app-accessibility/festival-gaim
-# net-im/gaim-blogger
-# net-im/gaim-bnet
-# net-im/gaim-meanwhile
-# net-im/gaim-snpp
-# x11-plugins/autoprofile
-# x11-plugins/gaim-assistant
-# x11-plugins/gaim-encryption
-# x11-plugins/gaim-extprefs
-# x11-plugins/gaim-latex
-# x11-plugins/gaim-otr
-# x11-plugins/gaim-rhythmbox
-# x11-plugins/gaim-xmms-remote
-# x11-plugins/gaimosd
-# x11-plugins/guifications
-
-
-print_gaim_warning() {
- ewarn
- ewarn "If you are merging ${P} from an earlier version, you may need"
- ewarn "to re-merge any plugins like gaim-encryption or gaim-snpp."
- ewarn
- ewarn "If you experience problems with gaim, file them as bugs with"
- ewarn "Gentoo's bugzilla, http://bugs.gentoo.org. DO NOT report them"
- ewarn "as bugs with gaim's sourceforge tracker, and by all means DO NOT"
- ewarn "seek help in #gaim."
- ewarn
- ewarn "Be sure to USE=\"debug\" and include a backtrace for any seg"
- ewarn "faults, see http://gaim.sourceforge.net/gdb.php for details on"
- ewarn "backtraces."
- ewarn
- ewarn "Please read the gaim FAQ at http://gaim.sourceforge.net/faq.php"
- ewarn
- einfo
- einfo "Note that we are now filtering all unstable flags in C[XX]FLAGS."
- einfo
- ebeep 5
- epause 3
-}
-
-pkg_setup() {
- print_gaim_warning
- if use krb4 && ! built_with_use app-crypt/mit-krb5 krb4 ; then
- eerror
- eerror You need to rebuild app-crypt/mit-krb5 with USE=krb4 in order to
- eerror enable krb4 support for the zephyr protocol in gaim.
- eerror
- die "Configure failed"
- fi
-}
-
-src_unpack() {
- unpack ${A}
- cd ${S}
- use cjk && epatch ${FILESDIR}/gaim-0.76-xinput.patch
- epatch ${FILESDIR}/gaim-1.4.0-oscar-ssi.diff
- epatch ${FILESDIR}/gaim-1.4.0-msn-userlist.diff
-
- cd ${S}/src/protocols/gg
- epatch ${FILESDIR}/gaim-1.4.0-libgg-mem.patch
-}
-
-src_compile() {
- # Stabilize things, for your own good
- strip-flags
- replace-flags -O? -O2
-
- # -msse2 doesn't play nice on gcc 3.2
- [ "`gcc-version`" == "3.2" ] && filter-flags -msse2
-
- local myconf
- use debug && myconf="${myconf} --enable-debug"
- use perl || myconf="${myconf} --disable-perl"
- use spell || myconf="${myconf} --disable-gtkspell"
- use nls || myconf="${myconf} --disable-nls"
- use nas && myconf="${myconf} --enable-nas" || myconf="${myconf} --disable-nas"
- use eds || myconf="${myconf} --disable-gevolution"
- use krb4 && myconf="${myconf} --with-krb4"
- use tcltk || myconf="${myconf} --disable-tcl --disable-tk"
-
- if use gnutls ; then
- einfo "Disabling NSS, using GnuTLS"
- myconf="${myconf} --enable-nss=no"
- myconf="${myconf} --with-gnutls-includes=/usr/include/gnutls"
- myconf="${myconf} --with-gnutls-libs=/usr/$(get_libdir)"
- else
- einfo "Disabling GnuTLS, using NSS"
- myconf="${myconf} --enable-gnutls=no"
- myconf="${myconf} --with-nspr-includes=/usr/include/nspr"
- myconf="${myconf} --with-nss-includes=/usr/include/nss"
- myconf="${myconf} --with-nspr-libs=/usr/$(get_libdir)/nspr"
- myconf="${myconf} --with-nss-libs=/usr/$(get_libdir)/nss"
- fi
-
-
- econf ${myconf} || die "Configuration failed"
-
- emake -j1 || die "Make failed"
-}
-
-src_install() {
- make install DESTDIR=${D} || die "Install failed"
- dodoc ABOUT-NLS AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog VERSION
-}
-
-pkg_postinst() {
- print_gaim_warning
-}