summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDon Seiler <rizzo@gentoo.org>2004-02-17 22:21:12 +0000
committerDon Seiler <rizzo@gentoo.org>2004-02-17 22:21:12 +0000
commitcdecb096020deabd48762fdf0f65a24d7f65e8a8 (patch)
treeb4e3dc8505ee6c7f233499c1dbd3482a0d72bcd4
parentstable on alpha and ia64 (Manifest recommit) (diff)
downloadgentoo-2-cdecb096020deabd48762fdf0f65a24d7f65e8a8.tar.gz
gentoo-2-cdecb096020deabd48762fdf0f65a24d7f65e8a8.tar.bz2
gentoo-2-cdecb096020deabd48762fdf0f65a24d7f65e8a8.zip
Moving net-im/jabber-server to net-im/jabberd
-rw-r--r--profiles/package.mask6
-rw-r--r--profiles/updates/1Q-20041
-rw-r--r--profiles/use.local.desc7
3 files changed, 3 insertions, 11 deletions
diff --git a/profiles/package.mask b/profiles/package.mask
index 6980d5e01cac..b16cdb0c5958 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
#####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.2705 2004/02/17 16:30:54 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.2706 2004/02/17 22:21:12 rizzo Exp $
#
#When you add an entry to this file, add your name, the date, and an
#explanation of why something is getting masked
@@ -99,10 +99,6 @@ media-video/sinek
# this is still in development
=net-zope/plone-2.0.0_rc3
-# <humpback@gentoo.org> (26 Jan 2004)
-# Needs testing
-=net-im/jabber-server-1.4.3-r2
-
# <pebenito@gentoo.org> (24 Jan 2004)
# badly broken
=sys-boot/grub-0.93.20040125
diff --git a/profiles/updates/1Q-2004 b/profiles/updates/1Q-2004
index 6db443e26c96..18ac74fd3b7e 100644
--- a/profiles/updates/1Q-2004
+++ b/profiles/updates/1Q-2004
@@ -14,3 +14,4 @@ move app-benchmarks/volcanomark app-benchmarks/volanomark
move net-www/mozilla-firebird-bin net-www/mozilla-firefox-bin
move games-fps/d1x games-action/d1x
move games-fps/descent1-maps games-action/descent1-maps
+move net-im/jabber-server net-im/jabberd
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 230eabcbfb1d..e39a09a4fb24 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/use.local.desc,v 1.246 2004/02/16 01:58:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/use.local.desc,v 1.247 2004/02/17 22:21:12 rizzo Exp $
# This file contains descriptions of local USE flags, and the ebuilds which
# contain them.
@@ -176,11 +176,6 @@ net-im/bitlbee:oscar - Enable Oscar (AIM/ICQ) protocol support
net-im/bitlbee:yahoo - Enable Yahoo Messenger protocol support
net-im/gnugadu:jabber - Enable jabber protocol support
net-im/gnugadu:tlen - Enable Tlen.pl protocol support
-net-im/jabber-server:j-noaim - If you do NOT want the AIM/ICQ transport built with jabber-server
-net-im/jabber-server:j-nojud - If you do NOT want the Jabber User Directory built with jabber-server
-net-im/jabber-server:j-nomsn - If you do NOT want the MSN transport built with jabber-server
-net-im/jabber-server:j-nomuconf - If you do NOT want the mu-conference addon built with jabber-server
-net-im/jabber-server:j-noyahoo - If you do NOT want the Yahoo transport built with jabber-server (removes glib dependency)
net-im/kadu:kadu-voice - Enables voice chat in kadu
net-im/kadu:kadu-modules - Enables modules in kadu
net-irc/xchat:xchatnogtk - Disables building the GTK front end to XChat