*** empty log message ***

304 files changed, 7219 insertions, 1258 deletions

diff --git a/net-irc/asuka/ChangeLog b/net-irc/asuka/ChangeLog
index 28298a604148..5da9bfd77f5b 100644
--- a/net-irc/asuka/ChangeLog
+++ b/net-irc/asuka/ChangeLog
@@ -1,6 +1,39 @@
 # ChangeLog for net-irc/asuka
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/asuka/ChangeLog,v 1.1 2003/10/27 19:55:17 zul Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/asuka/ChangeLog,v 1.1.1.1 2005/11/30 09:49:01 chriswhite Exp $
+
+*asuka-1.2.1 (10 Apr 2005)
+
+  10 Apr 2005; Sven Wegener <swegener@gentoo.org> files/asuka.conf.d,
+  files/asuka.init.d, +asuka-1.2.1.ebuild:
+  Version bump.
+
+  24 Jul 2004; Sven Wegener <swegener@gentoo.org> asuka-1.0.6.ebuild:
+  Tidied the ebuild a bit more.
+
+  24 Jul 2004; Sven Wegener <swegener@gentoo.org> asuka-1.0.6.ebuild:
+  Removed RDEPEND=""
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> asuka-1.0.6.ebuild:
+  virtual/glibc -> virtual/libc
+
+  19 Jun 2004; Jason Wever <weeve@gentoo.org> asuka-1.0.6.ebuild:
+  Stable on sparc.
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> asuka-1.0.6.ebuild:
+  Masked asuka-1.0.6.ebuild testing for ppc
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> asuka-1.0.6.ebuild:
+  Add inherit eutils
+
+  15 Feb 2004; Jason Wever <weeve@gentoo.org> asuka-1.0.6.ebuild:
+  Added ~sparc keyword.
+
+*asuka-1.0.6 (02 Jan 2004)
+
+  02 Jan 2004; Chuck Short <zul@gentoo.org> asuka-1.0.6.ebuild,
+  files/asuka.conf.d, files/asuka.init.d:
+  Updated copyright years, marked stable.
 
   27 Oct 2003; Chuck Short <zul@gentoo.org> files/asuka.conf.d,
   files/asuka.init.d:
diff --git a/net-irc/asuka/Manifest b/net-irc/asuka/Manifest
index f03390a90013..2375385d5792 100644
--- a/net-irc/asuka/Manifest
+++ b/net-irc/asuka/Manifest
@@ -1,2 +1,18 @@
-MD5 263eb7926bb0360bb6f1561a8018f475 asuka-1.0.6.ebuild 1238
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5708caf3dcd961f06de448b6b3b8dde6 ChangeLog 1360
+MD5 7cdf6ff17898cfc3aa05abcdf1ca4419 asuka-1.0.6.ebuild 1264
+MD5 5c2a040ca4a2ba0872fdc14154d47f6e asuka-1.2.1.ebuild 1373
+MD5 4455beb2fd974af14c39a929a9b048d3 files/asuka.conf.d 272
+MD5 9ce9f8e56028e1ba5d78faba59152081 files/asuka.init.d 562
 MD5 b6b9f176be538c92cd9eeb70dd6f768d files/digest-asuka-1.0.6 64
+MD5 ad44115ddc777c0d1d6fed213b297aac files/digest-asuka-1.2.1 64
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDJDixI1lqEGTUzyQRAhL4AKCqqbcQqGj3EVjU1/STZsU9EAQdGwCffRvU
+u/9JU8pzqDYRTB68Aw7Iy/s=
+=+Mtg
+-----END PGP SIGNATURE-----
diff --git a/net-irc/asuka/asuka-1.0.6.ebuild b/net-irc/asuka/asuka-1.0.6.ebuild
index 22a018f474a5..9a243959203e 100644
--- a/net-irc/asuka/asuka-1.0.6.ebuild
+++ b/net-irc/asuka/asuka-1.0.6.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/asuka/asuka-1.0.6.ebuild,v 1.1 2003/10/27 19:55:17 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/asuka/asuka-1.0.6.ebuild,v 1.1.1.1 2005/11/30 09:49:00 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="The QuakeNet IRC Server"
 HOMEPAGE="http://dev-com.quakenet.org/"
@@ -8,22 +10,19 @@ SRC_URI="http://dev-com.quakenet.org/releases/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 sparc ~ppc"
 
 IUSE="debug"
-DEPEND="virtual/glibc"
-RDEPEND=""
+DEPEND="virtual/libc"
 
 src_compile() {
-	local myconf=""
-
-	use debug && myconf="${myconf} --enable-debug"
-
-	econf 	--with-symlink=asuka-ircd \
+	econf \
+		--with-symlink=asuka-ircd \
 		--with-dpath=/etc/asuka \
 		--with-cpath=/etc/asuka/ircd.conf \
 		--with-lpath=/var/log/asuka/asuka.log \
-		${myconf} || die "econf failed"
+		$(use_enable debug) \
+		|| die "econf failed"
 	emake || die "emake failed"
 }
 
@@ -32,7 +31,6 @@ src_install() {
 
 	newman doc/ircd.8 asuka-ircd.8
 
-	dodir /etc/asuka
 	insinto /etc/asuka
 	doins doc/ircd.conf.sample
 
@@ -42,16 +40,15 @@ src_install() {
 	insinto /etc/conf.d
 	newins ${FILESDIR}/asuka.conf.d asuka
 
-	dodoc INSTALL* LICENSE README* RELEASE.NOTES TODO*
-	dodoc doc/readme.* doc/p10.html doc/features.txt doc/Authors
-}
+	keepdir /var/log/asuka
 
-pkg_setup() {
-	enewuser asuka
+	dodoc INSTALL* LICENSE README* RELEASE.NOTES TODO* \
+		doc/readme.* doc/p10.html doc/features.txt doc/Authors
 }
 
 pkg_postinst() {
-	install -d -m 0700 -o asuka -g root ${ROOT}/var/log/asuka
+	enewuser asuka
+	chown asuka ${ROOT}/var/log/asuka
 
 	einfo
 	einfo "A sample config file can be found at /etc/asuka/ircd.conf.sample"
diff --git a/net-irc/asuka/asuka-1.2.1.ebuild b/net-irc/asuka/asuka-1.2.1.ebuild
index b89725fc5ca4..27f925156d1b 100644
--- a/net-irc/asuka/asuka-1.2.1.ebuild
+++ b/net-irc/asuka/asuka-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/asuka/asuka-1.2.1.ebuild,v 1.1 2005/04/10 12:31:35 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/asuka/asuka-1.2.1.ebuild,v 1.1.1.1 2005/11/30 09:49:01 chriswhite Exp $
 
 inherit eutils
 
@@ -17,7 +17,7 @@ DEPEND="virtual/libc"
 
 src_compile() {
 	econf \
-	 	--with-symlink=asuka-ircd \
+		--with-symlink=asuka-ircd \
 		--with-dpath=/etc/asuka \
 		--with-cpath=/etc/asuka/ircd.conf \
 		--with-lpath=/var/log/asuka/asuka.log \
diff --git a/net-irc/asuka/files/asuka.conf.d b/net-irc/asuka/files/asuka.conf.d
index b906b981e833..e113feed5c79 100644
--- a/net-irc/asuka/files/asuka.conf.d
+++ b/net-irc/asuka/files/asuka.conf.d
@@ -1,7 +1,7 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/asuka/files/asuka.conf.d,v 1.1 2003/10/27 19:55:17 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/asuka/files/asuka.conf.d,v 1.1.1.1 2005/11/30 09:49:01 chriswhite Exp $
 
 # Config file for /etc/init.d/asuka
 
-ASUKA_UID=asuka
+ASUKA_UID="asuka"
diff --git a/net-irc/asuka/files/asuka.init.d b/net-irc/asuka/files/asuka.init.d
index 8de6618d2b63..65f4f4d7850d 100644
--- a/net-irc/asuka/files/asuka.init.d
+++ b/net-irc/asuka/files/asuka.init.d
@@ -1,9 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-irc/asuka/files/asuka.init.d,v 1.1 2003/10/27 19:55:17 zul Exp $
-
-opts="depend start stop"
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/asuka/files/asuka.init.d,v 1.1.1.1 2005/11/30 09:49:01 chriswhite Exp $
 
 depend() {
 	need net
@@ -11,7 +9,7 @@ depend() {
 
 start() {
 	ebegin "Starting asuka-ircd"
-	start-stop-daemon --start --quiet --chuid $ASUKA_UID --exec /usr/bin/asuka-ircd
+	start-stop-daemon --start --quiet --chuid ${ASUKA_UID} --exec /usr/bin/asuka-ircd
 	eend $? "Failed to start asuka-ircd"
 }
 
diff --git a/net-irc/atheme/ChangeLog b/net-irc/atheme/ChangeLog
index 3055dce42a8e..26d99f74b819 100644
--- a/net-irc/atheme/ChangeLog
+++ b/net-irc/atheme/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-irc/atheme
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme/ChangeLog,v 1.1 2005/09/04 06:08:56 beu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme/ChangeLog,v 1.1.1.1 2005/11/30 09:49:02 chriswhite Exp $
+
+  10 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> atheme-0.2.2.ebuild:
+  Keyworded ~sparc wrt #111971
 
 *atheme-0.2.2 (04 Sep 2005)
 
diff --git a/net-irc/atheme/Manifest b/net-irc/atheme/Manifest
index 6c7eb025d05c..cd03929c6c55 100644
--- a/net-irc/atheme/Manifest
+++ b/net-irc/atheme/Manifest
@@ -1,6 +1,16 @@
-MD5 4c1fea5a65a108b583fcfada2a528d36 atheme-0.2.2.ebuild 1342
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 670bd500d34608227819c18a9092e610 atheme-0.2.2.ebuild 1443
+MD5 5c4924ed1f8ebb6ff0ecafb78eaf5e7f ChangeLog 531
 MD5 768955ffa40609049cdfead22879443d metadata.xml 261
-MD5 58c136b33f252609db9de33f23fc499d ChangeLog 336
 MD5 d9426639feac91a74b80c4f246c53f31 files/digest-atheme-0.2.2 61
-MD5 1f482d7cb73e4f059c00fbb18a9eed9e files/makefile-DESTDIR-support.patch 4529
 MD5 fe5c707d98c7536cfde95e9fcbe5117e files/make-postgresql-support-optional.patch 3008
+MD5 919862d853f6089d8ff610e008bf776b files/makefile-DESTDIR-support.patch 4632
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDc48zKRy60XGEcJIRAqqCAJ9EIEOnfnvSHbDlgpMzexle5WMJVACfYZQA
+lhDE3hXAV1Yu2LIwZNaN3nE=
+=h28a
+-----END PGP SIGNATURE-----
diff --git a/net-irc/atheme/atheme-0.2.2.ebuild b/net-irc/atheme/atheme-0.2.2.ebuild
index 1b8b7335e19f..16a60432047b 100644
--- a/net-irc/atheme/atheme-0.2.2.ebuild
+++ b/net-irc/atheme/atheme-0.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme/atheme-0.2.2.ebuild,v 1.1 2005/09/04 06:08:56 beu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme/atheme-0.2.2.ebuild,v 1.1.1.1 2005/11/30 09:49:02 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~sparc ~x86"
 IUSE="largenet postgres"
 
 DEPEND=">=sys-devel/autoconf-2.59"
diff --git a/net-irc/atheme/files/makefile-DESTDIR-support.patch b/net-irc/atheme/files/makefile-DESTDIR-support.patch
index 43ce6ba4e24a..cbd4b4c8a0a4 100644
--- a/net-irc/atheme/files/makefile-DESTDIR-support.patch
+++ b/net-irc/atheme/files/makefile-DESTDIR-support.patch
@@ -2,7 +2,7 @@ diff -Nup -r atheme-0.2.2/backend/Makefile.in atheme-0.2.2.patched/backend/Makef
 --- atheme-0.2.2/backend/Makefile.in	2005-09-03 21:17:28.000000000 +0000
 +++ atheme-0.2.2.patched/backend/Makefile.in	2005-09-04 04:15:55.000000000 +0000
 @@ -6,6 +6,8 @@
- # $Id: makefile-DESTDIR-support.patch,v 1.1 2005/09/04 06:08:56 beu Exp $
+ # $Id: makefile-DESTDIR-support.patch,v 1.1.1.1 2005/11/30 09:49:03 chriswhite Exp $
  #
  
 +DESTDIR := 
@@ -25,7 +25,7 @@ diff -Nup -r atheme-0.2.2/contrib/Makefile.in atheme-0.2.2.patched/contrib/Makef
 --- atheme-0.2.2/contrib/Makefile.in	2005-09-03 21:17:29.000000000 +0000
 +++ atheme-0.2.2.patched/contrib/Makefile.in	2005-09-04 04:15:55.000000000 +0000
 @@ -6,6 +6,8 @@
- # $Id: makefile-DESTDIR-support.patch,v 1.1 2005/09/04 06:08:56 beu Exp $
+ # $Id: makefile-DESTDIR-support.patch,v 1.1.1.1 2005/11/30 09:49:03 chriswhite Exp $
  #
  
 +DESTDIR := 
@@ -48,7 +48,7 @@ diff -Nup -r atheme-0.2.2/modules/Makefile.in atheme-0.2.2.patched/modules/Makef
 --- atheme-0.2.2/modules/Makefile.in	2005-09-03 21:17:30.000000000 +0000
 +++ atheme-0.2.2.patched/modules/Makefile.in	2005-09-04 04:15:55.000000000 +0000
 @@ -6,6 +6,8 @@
- # $Id: makefile-DESTDIR-support.patch,v 1.1 2005/09/04 06:08:56 beu Exp $
+ # $Id: makefile-DESTDIR-support.patch,v 1.1.1.1 2005/11/30 09:49:03 chriswhite Exp $
  #
  
 +DESTDIR := 
@@ -71,7 +71,7 @@ diff -Nup -r atheme-0.2.2/protocol/Makefile.in atheme-0.2.2.patched/protocol/Mak
 --- atheme-0.2.2/protocol/Makefile.in	2005-09-03 21:17:29.000000000 +0000
 +++ atheme-0.2.2.patched/protocol/Makefile.in	2005-09-04 04:15:55.000000000 +0000
 @@ -6,6 +6,8 @@
- # $Id: makefile-DESTDIR-support.patch,v 1.1 2005/09/04 06:08:56 beu Exp $
+ # $Id: makefile-DESTDIR-support.patch,v 1.1.1.1 2005/11/30 09:49:03 chriswhite Exp $
  #
  
 +DESTDIR := 
@@ -94,7 +94,7 @@ diff -Nup -r atheme-0.2.2/src/Makefile.in atheme-0.2.2.patched/src/Makefile.in
 --- atheme-0.2.2/src/Makefile.in	2005-09-03 21:17:29.000000000 +0000
 +++ atheme-0.2.2.patched/src/Makefile.in	2005-09-04 04:15:55.000000000 +0000
 @@ -6,6 +6,8 @@
- # $Id: makefile-DESTDIR-support.patch,v 1.1 2005/09/04 06:08:56 beu Exp $
+ # $Id: makefile-DESTDIR-support.patch,v 1.1.1.1 2005/11/30 09:49:03 chriswhite Exp $
  #
  
 +DESTDIR := 
diff --git a/net-irc/bitchx/ChangeLog b/net-irc/bitchx/ChangeLog
index 6da80234f52b..9118d8a6991e 100644
--- a/net-irc/bitchx/ChangeLog
+++ b/net-irc/bitchx/ChangeLog
@@ -1,11 +1,224 @@
 # ChangeLog for net-irc/bitchx
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/ChangeLog,v 1.1 2002/02/01 21:53:32 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/ChangeLog,v 1.1.1.1 2005/11/30 09:49:00 chriswhite Exp $
 
-*bitchx-1.0.18-r4 (1 Feb 2002)
+  22 Mar 2005; <blubb@gentoo.org> bitchx-1.1-r2.ebuild:
+  pseudo-fixing bug #61133 with an ugly hack, prevents bitchx from building with
+  gtk support on amd64
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> bitchx-1.1-r1.ebuild,
+  bitchx-1.1-r2.ebuild:
+  Switch to use epause and ebeep, bug #62950
+
+*bitchx-1.1-r2 (31 Aug 2004)
+
+  31 Aug 2004; Guy Martin <gmsoft@gentoo.org> +files/fPIC.patch,
+  +bitchx-1.1-r2.ebuild:
+  Added a unconditionnal -fPIC patch (#55238).
+
+  22 Aug 2004; Sven Wegener <swegener@gentoo.org> bitchx-1.1-r1.ebuild:
+  Updated SRC_URI as upstream download location has changed. Closes bug #61005.
+
+  22 Jul 2004; Sven Wegener <swegener@gentoo.org> -bitchx-1.1.ebuild:
+  Removed old ebuild.
+
+*bitchx-1.1-r1 (05 Jul 2004)
+
+  05 Jul 2004; Sven Wegener <swegener@gentoo.org>
+  -files/bitchx-1.0.19-cjk.patch, -files/bitchx-1.0.19-freenode.patch,
+  -files/bitchx-1.0.19-gcc-3.3.patch, -files/bitchx-1.0.19-hebrew.patch,
+  -files/bitchx-1.0.19-nickcomp-nocolor.patch,
+  -files/bitchx-1.0.19-security.patch, -files/bitchx-1.0.19-security2.patch,
+  -bitchx-1.0.19-r5.ebuild, -bitchx-1.0.19-r6.ebuild, +bitchx-1.1-r1.ebuild:
+  Added support for the local cdrom USE flag. Closes bug #55823. Removed older
+  ebuilds.
+
+  20 Jun 2004; Sven Wegener <swegener@gentoo.org>
+  +files/1.1/bitchx-1.1-gcc34.patch, bitchx-1.1.ebuild:
+  Fixed compile error with gcc-3.4. Closes bug #54454.
+
+  07 Jun 2004; Chuck Short <zul@gentoo.org> bitchx-1.0.19-r5.ebuild,
+  bitchx-1.0.19-r6.ebuild, bitchx-1.1.ebuild:
+  Update homepage and SRC_URI. Closes #52360.
+
+  05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> bitchx-1.1.ebuild:
+  Stable on alpha.
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  bitchx-1.0.19-r6.ebuild, bitchx-1.1.ebuild:
+  Masked bitchx-1.1.ebuild stable for ppc
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  bitchx-1.0.19-r6.ebuild:
+  Masked bitchx-1.0.19-r6.ebuild stable for ppc
+
+  25 Apr 2004; Travis Tilley <lv@gentoo.org> +files/BitchX-64bit.patch,
+  bitchx-1.1.ebuild:
+  ported to amd64
+
+  15 Apr 2004; Jason Wever <weeve@gentoo.org> bitchx-1.1.ebuild:
+  Stable on sparc.
+
+  15 Apr 2004; Guy Martin <gmsoft@gentoo.org> bitchx-1.1.ebuild:
+  Marked stable on hppa.
+
+  13 Apr 2004; Chuck Short <zul@gentoo.org> bitchx-1.1.ebuild:
+  Marked stable for x86.
+
+  05 Apr 2004; Jason Wever <weeve@gentoo.org> bitchx-1.0.19-r6.ebuild:
+  Stable on sparc.
+
+  28 Mar 2004; <chuck@gentoo.org> bitchx-1.0.19-r6.ebuild:
+  Marked stable on x86.
+
+*bitchx-1.1 (28 Mar 2004)
+
+  28 Mar 2004; <chuck@gentoo.org> bitchx-1.1.ebuild,
+  files/1.1/bitchx-1.1-cjk.patch, files/1.1/bitchx-1.1-freenode.patch,
+  files/1.1/bitchx-1.1-hebrew.patch:
+  New release, closes #45974.
+
+  28 Mar 2004; Chuck Short <zul@gentoo.org> bitchx-1.0.19-r5.ebuild,
+  bitchx-1.0.19-r6.ebuild:
+  New version of bitchx is out, updated src_uri, partially fixes 45974.
+
+  23 Mar 2004; Chuck Short <zul@gentoo.org> bitchx-1.0.19-r5.ebuild,
+  bitchx-1.0.19-r6.ebuild:
+  Removed USE="ncurses" since it is not tested and its already in DEPEND.
+
+  06 Feb 2004; Aron Griffis <agriffis@gentoo.org> bitchx-1.0.19-r6.ebuild:
+  add ~alpha
+
+  02 Jan 2004; Chuck Short <zul@gentoo.org> bitchx-1.0.19-r5.ebuild,
+  bitchx-1.0.19-r6.ebuild:
+  Updated copyright years.
+
+  15 Oct 2003; Martin Holzer <mholzer@gentoo.org> bitchx-1.0.19-r6.ebuild:
+  fixing type which pretend to install package. closes #31119.
+
+*bitchx-1.0.19-r6 (05 Sep 2003)
+
+  03 Dec 2003; <gmsoft@gentoo.org> bitchx-1.0.19-r6.ebuild :
+  Added hppa to KEYWORDS.
+
+  05 Sep 2003; <solar@gentoo.org> bitchx-1.0.19-r6.ebuild,
+  files/bitchx-1.0.19-freenode.patch,
+  files/bitchx-1.0.19-nickcomp-nocolor.patch:
+  per almost every gentoo developers request we are removing the bold out of the
+  default NICK_COMP fset, and switching freenode to be the default network. two
+  minor patches added added to handle this.
+
+  19 Aug 2003; Greg Fitzgerald <gregf@gentoo.org> bitchx-1.0.19-r5.ebuild,
+  files/bitchx-1.0.19-hebrew.patch:
+  Added Hebrew Patch, This closes bug #26181
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  06 Aug 2003; Patrick Kursawe <phosphan@gentoo.org> bitchx-1.0.19-r5.ebuild:
+  Updated homepage and SRC_URI
+
+  16 Jun 2003; Luca Barbato <lu_zero@gentoo.org> :
+  Applied the fix as suggested by Martin Lesser 
+  <gentoo@better-com.de> to make sure that the zvt
+  workaround works everywhere.
+
+  05 Jun 2003; Luca Barbato <lu_zero@gentoo.org> :
+  State clearly that you can have either gtkBitchX or 
+  the standar BitchX, not both.
+
+  16 Jun 2003; Luca Barbato <lu_zero@gentoo.org> :
+  gtkBitchX fix, gcc-3.3 fix
+
+*bitchx-1.0.19-r5 (15 Mar 2003)
+
+  23 Mar 2003; Jungmin Seo <seo@gentoo.org> :
+  removed the cjk patch SRC_URI
+
+  15 Mar 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Security update.
+
+*bitchx-1.0.19-r4 (20 Feb 2003)
+
+  23 Mar 2003; Jungmin Seo <seo@gentoo.org> :
+  removed the cjk patch SRC_URI
+
+  13 Mar 2003; Guy Martin <gmsoft@gentoo.org> bitchx-1.0.19-r4.ebuild :
+  Added -fPIC to CFLAGS and added hppa to KEYWORDS.
+
+  20 Feb 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Security update.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*bitchx-1.0.19-r3 (11 Nov 2002)
+
+  21 Dec 2002; Jungmin Seo <seo@gentoo.org> bitchx-1.0.19-r3.ebuild,
+  ChangeLog, files/bitchx-1.0.19-cjk.patch:
+  Added 'cjk' use flag on the ebuild, the patch for 'cjk' and
+  the patch is for using 2-byte nicks (euc-kr and euc-jp) 
+
+  19 Nov 2002; phoen][x <phoenix@gentoo.org> bitchx-1.0.19-r3.ebuild :
+  Added "-fPIC" to C(XX)FLAGS on alpha boxes. This fixes bug 10932.
+  Thanks to bjb for the help.
+  
+  21 Oct 2002; phoen][x <phoenix@gentoo.org> bitchx-1.0.19-r3.ebuild,
+  files/digest-bitchx-1.0.19-r3 :
+  Used sed to patch include/config.h. BitchX now compiles with #define LATIN1 ON.
+  This shouldn't break anything but add support for the standard LATIN1 letters.
+  This closes bug #10332.
+
+*bitchx-1.0.19-r2 (26 Jun 2002)
+
+  26 Oct 2002; Jack Morgan <jmorgan@gentoo.org> bitchx-1.0.19-r2.ebuild :
+  Added Sparc/sparc64 keywords
   
+  21 Oct 2002; phoen][x <phoenix@gentoo.org> bitchx-1.0.19-r2.ebuild :
+  Fixed the flag-o-matic setting. It explicitely replaced -O3 with -O2,
+  which made the ebuild fail on -O4++ (which aren't standard gcc settings).
+  Flag-o-matic replaces -O[3-9] with -O2 now. 
+
+  03 Oct 2002; Brad Cowan <bcowan@gentoo.org> bitchx-1.0.19-r2.ebuild :
+  Added flag-o-matic to change -O3 to -O2 this fixes a segmentation fault
+  problem. closes bug #8667
+
+  22 Aug 2002; Seemant Kulleen <seemant@gentoo.org> bitchx-1.0.19-r2.ebuild :
+  Man page now installs properly (ie, it's readable).  Thanks to:
+  stocke2@cox.net (Eric Stockbridge) in bug #6720.
+
+  16 Jul 2002; Ben Lutgens <lamer@gentoo.org> ChangeLog  :
+  Commented out the "use socks5" stuff because bitchx is being lame and
+  doesn't work with any packaged socks implementations in the tree :-(
+
+  26 Jun 2002; Seemant Kulleen <seemant@gentoo.org> bitchx-1.0.19-r1.ebuild
+  files/digest-bitchx-1.0.19-r2 :
+  LFH/man page fixes, SLOT, LICENSE
+
+*bitchx-1.0.19-r1 (23 April 2002)
+
+  23 April 2002; Bart Verwilst <verwilst@gentoo.org> Changelog:
+  Quick revision bump, fixed symlink bug..
+
+*bitchx-1.0.19 (16 Apr 2002)
+
+  16 Apr 2002; Seemant Kulleen <seemant@gentoo.org> bitchx-1.0.19.ebuild,
+  files/digest-bitchx-1.0.19  
+  Quick version bump, and ebuild clean up
+  
+  25 Feb 2002; Geert Bevin <gbevin@gentoo.org> bitchx-1.0.18-r5.ebuild,
+  files/bitchx-1.0.18-dupver.patch :
+  Gcc3 related fixes.
+
+*bitchx-1.0.18-r5 (25 Feb 2002)
+
+  25 Feb 2002; Dan Armak <danarmak@gentoo.org> ChangeLog :  
+  Fixed bug #817 - now, when gnome is in use both gtkBitchX and plain BitchX
+  are built and installed.  
+  Also, fixed case where gtkBitchX would be built even when gnome isn't in use.
+
+*bitchx-1.0.18-r4 (1 Feb 2002)
+
+  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :  
   Added initial ChangeLog which should be updated whenever the package is
   updated in any way. This changelog is targetted to users. This means that the
   comments should well explained and written in clean English. The details about
diff --git a/net-irc/bitchx/Manifest b/net-irc/bitchx/Manifest
index e69de29bb2d1..39ce7067758f 100644
--- a/net-irc/bitchx/Manifest
+++ b/net-irc/bitchx/Manifest
@@ -0,0 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b4f02b199b81e2c523fe135ba0fe149d ChangeLog 8475
+MD5 53d6a87681d7f552e3667db93e58179a bitchx-1.1-r1.ebuild 3434
+MD5 399c7e05821ea1e80ae38756b1fb6c28 bitchx-1.1-r2.ebuild 3622
+MD5 10a57b14bb58910e1f373fbc1b8b2197 files/1.1/bitchx-1.1-cjk.patch 7050
+MD5 0028e0211e23f927b0c03e6dba3ee8fd files/1.1/bitchx-1.1-freenode.patch 976
+MD5 95973485a5a745af87c7bdc9fb6ca0c6 files/1.1/bitchx-1.1-gcc34.patch 394
+MD5 9230369276af6c8a1cdd7a584927cd47 files/1.1/bitchx-1.1-hebrew.patch 477
+MD5 5d622c032159806be3bfc78640da3eb0 files/BitchX-64bit.patch 1135
+MD5 9958cd92ed63cd29972e5c3465ab83aa files/digest-bitchx-1.1-r1 73
+MD5 9958cd92ed63cd29972e5c3465ab83aa files/digest-bitchx-1.1-r2 73
+MD5 cec20e4fc802c01abdd729d89447b3c7 files/fPIC.patch 16020
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDJDixI1lqEGTUzyQRAvj/AJ444X/db5wc2QslLWT8GCzquMJElQCeO4Ce
+S+t8zwk7a5dijSaTjaOSsxs=
+=LLXQ
+-----END PGP SIGNATURE-----
diff --git a/net-irc/bitchx/bitchx-1.1-r1.ebuild b/net-irc/bitchx/bitchx-1.1-r1.ebuild
index c675b9a1f965..96f19a93da9e 100644
--- a/net-irc/bitchx/bitchx-1.1-r1.ebuild
+++ b/net-irc/bitchx/bitchx-1.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/bitchx-1.1-r1.ebuild,v 1.1 2004/07/04 23:19:52 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/bitchx-1.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:49:00 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
@@ -8,23 +8,28 @@ MY_P=ircii-pana-${PV}-final
 S=${WORKDIR}/BitchX
 DESCRIPTION="An IRC Client"
 HOMEPAGE="http://www.bitchx.org/"
-SRC_URI="http://www.bitchx.org/source/${MY_P}.tar.gz"
+SRC_URI="http://www.bitchx.org/files/source/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc sparc alpha arm hppa amd64"
-IUSE="ssl esd gnome xmms ipv6 gtk cjk cdrom"
+IUSE="cdrom cjk esd gnome gtk ipv6 ncurses ssl xmms"
 
 DEPEND=">=sys-libs/ncurses-5.1
 	ssl? ( >=dev-libs/openssl-0.9.6 )
 	ncurses? ( sys-libs/ncurses )
 	!arm? (
-	xmms? ( media-sound/xmms )
-	esd? ( >=media-sound/esound-0.2.5
-		>=media-libs/audiofile-0.1.5 )
-	gtk? ( =x11-libs/gtk+-1.2*
-		>=media-libs/imlib-1.9.10-r1 )
-	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 ) )"
+		xmms? ( media-sound/xmms )
+		esd? (
+			>=media-sound/esound-0.2.5
+			>=media-libs/audiofile-0.1.5
+		)
+		gtk? (
+			=x11-libs/gtk+-1.2*
+			>=media-libs/imlib-1.9.10-r1
+		)
+		gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )
+	)"
 
 src_unpack() {
 	unpack ${MY_P}.tar.gz
@@ -57,7 +62,7 @@ src_compile() {
 		|| myconf="${myconf} --disable-sound"
 
 	use gtk && use gnome\
-	    && myconf="${myconf} --with-gtk" \
+		&& myconf="${myconf} --with-gtk" \
 		|| myconf="${myconf} --without-gtk"
 
 
@@ -76,7 +81,7 @@ src_compile() {
 	use gtk && use gnome && ( \
 		einfo "gtkBitchX will be built, if you want BitchX please issue"
 		einfo "USE="-gtk" emerge bitchx"
-		sleep 10
+		epause 10
 		) && append-flags -I/usr/include/gnome-1.0
 
 	econf \
diff --git a/net-irc/bitchx/bitchx-1.1-r2.ebuild b/net-irc/bitchx/bitchx-1.1-r2.ebuild
index d8ec4b7c4ef1..1d23d62ea86f 100644
--- a/net-irc/bitchx/bitchx-1.1-r2.ebuild
+++ b/net-irc/bitchx/bitchx-1.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/bitchx-1.1-r2.ebuild,v 1.1 2004/08/31 11:45:30 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/bitchx-1.1-r2.ebuild,v 1.1.1.1 2005/11/30 09:49:00 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
@@ -19,12 +19,19 @@ DEPEND=">=sys-libs/ncurses-5.1
 	ssl? ( >=dev-libs/openssl-0.9.6 )
 	ncurses? ( sys-libs/ncurses )
 	!arm? (
-	xmms? ( media-sound/xmms )
-	esd? ( >=media-sound/esound-0.2.5
-		>=media-libs/audiofile-0.1.5 )
-	gtk? ( =x11-libs/gtk+-1.2*
-		>=media-libs/imlib-1.9.10-r1 )
-	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 ) )"
+		xmms? ( media-sound/xmms )
+		esd? (
+			>=media-sound/esound-0.2.5
+			>=media-libs/audiofile-0.1.5
+		)
+		!amd64? (
+			gtk? (
+				=x11-libs/gtk+-1.2*
+				>=media-libs/imlib-1.9.10-r1
+			)
+		)
+		gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )
+	)"
 
 src_unpack() {
 	unpack ${MY_P}.tar.gz
@@ -50,12 +57,12 @@ src_compile() {
 		myconf="${myconf} --enable-debug"
 	fi
 
-	use esd && use gtk \
+	use !amd64 && use esd && use gtk \
 		&& myconf="${myconf} --enable-sound" \
 		|| myconf="${myconf} --disable-sound"
 
-	use gtk && use gnome\
-	    && myconf="${myconf} --with-gtk" \
+	use !amd64 && use gtk && use gnome\
+		&& myconf="${myconf} --with-gtk" \
 		|| myconf="${myconf} --without-gtk"
 
 
@@ -71,12 +78,16 @@ src_compile() {
 		${S}/include/config.h.orig > \
 		${S}/include/config.h
 	#ugly workaround
-	use gtk && use gnome && ( \
+	use !amd64 && use gtk && use gnome && ( \
 		einfo "gtkBitchX will be built, if you want BitchX please issue"
 		einfo "USE="-gtk" emerge bitchx"
-		sleep 10
+		epause 10
 		) && append-flags -I/usr/include/gnome-1.0
-
+	#even uglier hack
+	use amd64 && use gtk && use gnome && ( \
+		ewarn "gtkBitchX is broken on amd64, so we're building it"
+		ewarn "with USE=-gtk. See bug #61133"
+		epause 10 )
 	econf \
 		CFLAGS="${CFLAGS}" \
 		SHLIB_CFLAGS="${CFLAGS} -fPIC" \
@@ -85,7 +96,7 @@ src_compile() {
 		`use_with ssl` \
 		`use_enable ipv6` \
 		${myconf} || die
-	
+
 	emake || die make failed
 	cd contrib && make vh1
 }
@@ -96,7 +107,7 @@ src_install () {
 	rm ${D}/usr/share/man/man1/BitchX*
 	doman doc/BitchX.1
 
-	use gnome && use gtk && ( \
+	use !amd64 && use gnome && use gtk && ( \
 		exeinto /usr/bin
 		#newexe ${S}/source/BitchX BitchX-1.0c19
 		dosym gtkBitchX-1.1-final /usr/bin/gtkBitchX
diff --git a/net-irc/bnc/ChangeLog b/net-irc/bnc/ChangeLog
index 4a686ec37e13..f6a17d747a35 100644
--- a/net-irc/bnc/ChangeLog
+++ b/net-irc/bnc/ChangeLog
@@ -1,7 +1,93 @@
 # ChangeLog for net-irc/bnc
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/bnc/ChangeLog,v 1.1 2002/10/23 14:59:26 vapier Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/bnc/ChangeLog,v 1.1.1.1 2005/11/30 09:48:57 chriswhite Exp $
 
+*bnc-2.9.4 (28 Oct 2005)
+
+  28 Oct 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/bnc-2.9.4-build.patch, +bnc-2.9.4.ebuild:
+  Version bump #110719 by HiHinrik Örn Sigurðsson.
+
+  08 Oct 2005; Simon Stelling <blubb@gentoo.org>
+  +files/bnc-2.9.3-64bit.patch, bnc-2.9.3-r2.ebuild:
+  rekeyword ~amd64 with the patch from bug 106901
+
+  02 Oct 2005; Marcus D. Hanwell <cryos@gentoo.org> bnc-2.9.3-r1.ebuild,
+  bnc-2.9.3-r2.ebuild:
+  Marked -amd64 as this segfaults consistently on amd64, please see bug 106901
+  for patched version.
+
+*bnc-2.9.3-r2 (03 Apr 2005)
+*bnc-2.9.3-r1 (03 Apr 2005)
+
+  03 Apr 2005; Sven Wegener <swegener@gentoo.org> -bnc-2.9.3.ebuild,
+  +bnc-2.9.3-r1.ebuild, +bnc-2.9.3-r2.ebuild:
+  Two revision bumps. One for distributing the fix for bug #87463. And the
+  other one for testing the ssl USE flag.
+
+*bnc-2.9.3 (28 Jan 2005)
+
+  28 Jan 2005; Mike Frysinger <vapier@gentoo.org> -bnc-2.9.1.ebuild,
+  +bnc-2.9.3.ebuild:
+  Version bump for security fun #79568.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  14 Nov 2004; Sven Wegener <swegener@gentoo.org> -bnc-2.8.9.ebuild:
+  Removed old ebuild.
+
+  11 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> bnc-2.9.1.ebuild:
+  Stable on alpha, bug 70674.
+
+  11 Nov 2004; <SeJo@gentoo.org> bnc-2.9.1.ebuild:
+  stable on ppc gsla: 70674
+
+  10 Nov 2004; Jason Wever <weeve@gentoo.org> bnc-2.9.1.ebuild:
+  Stable on sparc wrt security bug #70674.
+
+*bnc-2.9.1 (10 Nov 2004)
+
+  10 Nov 2004; Mike Frysinger <vapier@gentoo.org> metadata.xml,
+  +bnc-2.9.1.ebuild:
+  Version bump for security #70674.
+
+  10 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> bnc-2.8.9.ebuild:
+  Stable on alpha, bug 66912.
+
+  09 Oct 2004; Jason Wever <weeve@gentoo.org> bnc-2.8.9.ebuild:
+  Stable on sparc wrt security bug #66912.
+
+*bnc-2.8.9 (09 Oct 2004)
+
+  09 Oct 2004; Sven Wegener <swegener@gentoo.org> +bnc-2.8.9.ebuild:
+  Version bump for security bug #66912. Made CFLAGS aware.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> bnc-2.6.4.ebuild,
+  bnc-2.8.6-r1.ebuild, bnc-2.8.6.ebuild:
+  virtual/glibc -> virtual/libc
+
+  22 Jun 2004; Sven Wegener <swegener@gentoo.org>
+  files/bnc-2.8.6-gotofail-labelfix.patch, bnc-2.8.6-r1.ebuild:
+  Modified the gcc34 patch to not change functionality. Made CFLAGS aware.
+
+*bnc-2.8.6-r1 (22 Jun 2004)
+
+  22 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> +bnc-2.8.6-r1.ebuild files/bncsetup.patch:
+  Add patch to bncsetup, thanks to redeeman and GurliGebis.
+
+  21 Jun 2004; Bryan Østergaard <kloeri@gentoo.org>
+  +files/bnc-2.8.6-gotofail-labelfix.patch, bnc-2.8.6.ebuild:
+  Add patch by redeeman <redeeman@metanurb.dk>, close bug #54689.
+
+  05 Jan 2004; Jason Wever <weeve@gentoo.org> bnc-2.8.6.ebuild:
+  Marked stable on sparc.
+
+  21 Nov 2003; Chuck Short <zul@gentoo.org> bnc-2.8.6.ebuild:
+  Added cd ${S}, closes bug #33803.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *bnc-2.8.6 (23 Oct 2002)
 
   23 Oct 2002; Mike Frysinger <vapier@gentoo.org> :
diff --git a/net-irc/bnc/Manifest b/net-irc/bnc/Manifest
index e69de29bb2d1..49230d31a4e2 100644
--- a/net-irc/bnc/Manifest
+++ b/net-irc/bnc/Manifest
@@ -0,0 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2b5faf2e05f475d4be565cc209a7f759 ChangeLog 3711
+MD5 d1e5886d87cfe90f8ede10a68de0e6b0 bnc-2.9.3-r1.ebuild 976
+MD5 0230592900cfd7b3857cab0207d91d4b bnc-2.9.3-r2.ebuild 1064
+MD5 57079f4ae38f545e0d1bccb60972fc55 bnc-2.9.4.ebuild 1061
+MD5 2f9e8261e9af06984792f0ee03ab40c2 files/bnc-2.9.3-64bit.patch 402
+MD5 5834a42ea841a6e9834af47976af0eba files/bnc-2.9.4-build.patch 791
+MD5 a6f25e4b520bc1540a80f78bb419d53f files/digest-bnc-2.9.3-r1 59
+MD5 a6f25e4b520bc1540a80f78bb419d53f files/digest-bnc-2.9.3-r2 59
+MD5 03b8633d6f52645050cadf01d4d6334c files/digest-bnc-2.9.4 59
+MD5 b2fd9f07925d7c1a3f1ed2366d0c74ba metadata.xml 221
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDYqymgIKl8Uu19MoRAm+cAJ9fEjjHSWSuXAnOsi2yS/F76DJfdwCcC6EE
+iVS2EqZBwjzkLfSfwCEndaw=
+=xvCk
+-----END PGP SIGNATURE-----
diff --git a/net-irc/bnc/bnc-2.9.3-r1.ebuild b/net-irc/bnc/bnc-2.9.3-r1.ebuild
index 48b76a5f1c92..0c59626adec5 100644
--- a/net-irc/bnc/bnc-2.9.3-r1.ebuild
+++ b/net-irc/bnc/bnc-2.9.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/bnc/bnc-2.9.3-r1.ebuild,v 1.1 2005/04/03 21:41:12 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/bnc/bnc-2.9.3-r1.ebuild,v 1.1.1.1 2005/11/30 09:48:57 chriswhite Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://gotbnc.com/files/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ppc sparc x86"
+KEYWORDS="alpha -amd64 arm ppc sparc x86"
 IUSE=""
 
 DEPEND="virtual/libc"
diff --git a/net-irc/bnc/bnc-2.9.3-r2.ebuild b/net-irc/bnc/bnc-2.9.3-r2.ebuild
index 35581f7743d8..5881b5eb43c2 100644
--- a/net-irc/bnc/bnc-2.9.3-r2.ebuild
+++ b/net-irc/bnc/bnc-2.9.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/bnc/bnc-2.9.3-r2.ebuild,v 1.1 2005/04/03 21:41:12 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/bnc/bnc-2.9.3-r2.ebuild,v 1.1.1.1 2005/11/30 09:48:57 chriswhite Exp $
 
 inherit eutils
 
@@ -22,6 +22,7 @@ S=${WORKDIR}/${MY_P}
 src_unpack() {
 	unpack ${A}
 	sed -i -e s:./mkpasswd:/usr/bin/bncmkpasswd: ${S}/bncsetup || die
+	epatch ${FILESDIR}/${P}-64bit.patch
 }
 
 src_compile() {
diff --git a/net-irc/bnc/bnc-2.9.4.ebuild b/net-irc/bnc/bnc-2.9.4.ebuild
index 82c24b65e2a1..10ffec5a505b 100644
--- a/net-irc/bnc/bnc-2.9.4.ebuild
+++ b/net-irc/bnc/bnc-2.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/bnc/bnc-2.9.4.ebuild,v 1.1 2005/10/28 22:56:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/bnc/bnc-2.9.4.ebuild,v 1.1.1.1 2005/11/30 09:48:57 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-irc/bnc/metadata.xml b/net-irc/bnc/metadata.xml
index 6ef15e900f17..dfacbae4e6ba 100644
--- a/net-irc/bnc/metadata.xml
+++ b/net-irc/bnc/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>net-irc</herd>
+<maintainer>
+ <email>vapier@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/net-irc/bobotpp/ChangeLog b/net-irc/bobotpp/ChangeLog
index 08eaeee135d6..c51f275cc4c7 100644
--- a/net-irc/bobotpp/ChangeLog
+++ b/net-irc/bobotpp/ChangeLog
@@ -1,6 +1,46 @@
 # ChangeLog for net-irc/bobotpp
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/bobotpp/ChangeLog,v 1.1 2004/07/13 19:13:35 swegener Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/bobotpp/ChangeLog,v 1.1.1.1 2005/11/30 09:48:59 chriswhite Exp $
+
+*bobotpp-2.1.8 (02 Sep 2005)
+
+  02 Sep 2005; Sven Wegener <swegener@gentoo.org> +bobotpp-2.1.8.ebuild:
+  Version bump.
+
+*bobotpp-2.1.7 (01 Jun 2005)
+
+  01 Jun 2005; Sven Wegener <swegener@gentoo.org>
+  +files/2.1.7-ifdef-scripts-fix.patch, bobotpp-2.1.6.ebuild,
+  +bobotpp-2.1.7.ebuild:
+  Version bump.
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> bobotpp-2.1.6.ebuild:
+  Stable on ppc.
+
+  22 Apr 2005; Sven Wegener <swegener@gentoo.org> -bobotpp-2.1.4.ebuild,
+  bobotpp-2.1.6.ebuild:
+  Marked stable on x86. Removed old ebuild.
+
+*bobotpp-2.1.6 (11 Mar 2005)
+
+  11 Mar 2005; Sven Wegener <swegener@gentoo.org> -bobotpp-2.1.5.ebuild,
+  +bobotpp-2.1.6.ebuild:
+  Version bump.
+
+*bobotpp-2.1.5 (24 Jan 2005)
+
+  24 Jan 2005; Sven Wegener <swegener@gentoo.org> bobotpp-2.1.4.ebuild,
+  +bobotpp-2.1.5.ebuild:
+  Version bump.
+
+  05 Dec 2004; Sven Wegener <swegener@gentoo.org> bobotpp-2.1.4.ebuild:
+  Added more error checking.
+
+  24 Aug 2004; Sven Wegener <swegener@gentoo.org> bobotpp-2.1.4.ebuild:
+  Marked stable on x86.
+
+  16 Jul 2004; David Holm <dholm@gentoo.org> bobotpp-2.1.4.ebuild:
+  Added to ~ppc.
 
 *bobotpp-2.1.4 (13 Jul 2004)
 
diff --git a/net-irc/bobotpp/Manifest b/net-irc/bobotpp/Manifest
index 3bc78808a1a7..e08005f3ac11 100644
--- a/net-irc/bobotpp/Manifest
+++ b/net-irc/bobotpp/Manifest
@@ -1,3 +1,19 @@
-MD5 d66cad9eef46ae160abb5217d60c54a4 bobotpp-2.1.4.ebuild 984
-MD5 8217cbee96556a5a8dc539c9640b87e5 ChangeLog 468
-MD5 af1adc0f464cb81a7384e051a207ce7e files/digest-bobotpp-2.1.4 65
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 80dd4cba92911844de390ed76871d8a3 ChangeLog 1480
+MD5 28c4e3cd3c5839456b9b775c2bb45489 bobotpp-2.1.6.ebuild 1194
+MD5 71c3c2ce65ad60544df9b3017a5dcd47 bobotpp-2.1.7.ebuild 1307
+MD5 2e7b185269ae3789818a13341a3538d4 bobotpp-2.1.8.ebuild 1196
+MD5 1c03e827030d1211151ffcc7fa9d5261 files/2.1.7-ifdef-scripts-fix.patch 452
+MD5 50c917808fc70d1bdf66c88c169ef853 files/digest-bobotpp-2.1.6 65
+MD5 470cb884861677a99c3b453a331b8c30 files/digest-bobotpp-2.1.7 65
+MD5 2a5dcbd4e077f3f50a26367f16a9b648 files/digest-bobotpp-2.1.8 65
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGEy8I1lqEGTUzyQRAspKAJ9HvuUKdSPLYkA63OGeOLgBtLHaSwCg2FoH
+bMoMVcGoeT+LgJkJrI+m6ZY=
+=od/C
+-----END PGP SIGNATURE-----
diff --git a/net-irc/bobotpp/bobotpp-2.1.6.ebuild b/net-irc/bobotpp/bobotpp-2.1.6.ebuild
index a987187e55ce..fd49dac38855 100644
--- a/net-irc/bobotpp/bobotpp-2.1.6.ebuild
+++ b/net-irc/bobotpp/bobotpp-2.1.6.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/bobotpp/bobotpp-2.1.6.ebuild,v 1.1 2005/03/11 19:38:32 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/bobotpp/bobotpp-2.1.6.ebuild,v 1.1.1.1 2005/11/30 09:48:59 chriswhite Exp $
 
 DESCRIPTION="A flexible IRC bot scriptable in scheme"
 HOMEPAGE="http://unknownlamer.org/code/bobot.html"
 SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc"
 IUSE="guile"
 
 DEPEND="guile? ( dev-util/guile )"
@@ -18,7 +18,7 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "install failed"
+	make DESTDIR="${D}" install || die "install failed"
 
 	dosym bobot++.info /usr/share/info/bobotpp.info || die "dosym failed"
 
diff --git a/net-irc/bobotpp/bobotpp-2.1.7.ebuild b/net-irc/bobotpp/bobotpp-2.1.7.ebuild
index 60f3b3ac9d10..acc59af364d0 100644
--- a/net-irc/bobotpp/bobotpp-2.1.7.ebuild
+++ b/net-irc/bobotpp/bobotpp-2.1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/bobotpp/bobotpp-2.1.7.ebuild,v 1.1 2005/06/01 18:40:09 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/bobotpp/bobotpp-2.1.7.ebuild,v 1.1.1.1 2005/11/30 09:48:59 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-irc/bobotpp/bobotpp-2.1.8.ebuild b/net-irc/bobotpp/bobotpp-2.1.8.ebuild
index cfcf71380e67..cae1f09c9b31 100644
--- a/net-irc/bobotpp/bobotpp-2.1.8.ebuild
+++ b/net-irc/bobotpp/bobotpp-2.1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/bobotpp/bobotpp-2.1.8.ebuild,v 1.1 2005/09/02 12:59:16 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/bobotpp/bobotpp-2.1.8.ebuild,v 1.1.1.1 2005/11/30 09:48:59 chriswhite Exp $
 
 DESCRIPTION="A flexible IRC bot scriptable in scheme"
 HOMEPAGE="http://unknownlamer.org/code/bobot.html"
diff --git a/net-irc/cgiirc/ChangeLog b/net-irc/cgiirc/ChangeLog
index 36c606654bb0..572e75f96745 100644
--- a/net-irc/cgiirc/ChangeLog
+++ b/net-irc/cgiirc/ChangeLog
@@ -1,6 +1,29 @@
 # ChangeLog for net-irc/cgiirc
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/cgiirc/ChangeLog,v 1.1 2004/01/29 15:45:27 mholzer Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/cgiirc/ChangeLog,v 1.1.1.1 2005/11/30 09:48:56 chriswhite Exp $
+
+*cgiirc-0.5.7 (03 Jul 2005)
+
+  03 Jul 2005; Renat Lumpau <rl03@gentoo.org> +cgiirc-0.5.7.ebuild:
+  Version bump per #80003. Install things into MY_CGIBINDIR.
+
+  18 Dec 2004; Simon Stelling <blubb@gentoo.org> cgiirc-0.5.4.ebuild:
+  added ~amd64
+
+  21 Jun 2004; Sven Wegener <swegener@gentoo.org> cgiirc-0.5.3.ebuild:
+  Added IUSE=""
+
+*cgiirc-0.5.4 (31 May 2004)
+
+  31 May 2004; Martin Holzer <mholzer@gentoo.org> cgiirc-0.5.4.ebuild:
+  Version bumped. closes 52392
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  cgiirc-0.5.3.ebuild:
+  Masked cgiirc-0.5.3.ebuild testing for ppc
+
+  19 Apr 2004; Martin Holzer <mholzer@gentoo.org> cgiirc-0.5.3.ebuild:
+  moving webapp-detect to pkg_setup
 
 *cgiirc-0.5.3 (29 Jan 2004)
 
diff --git a/net-irc/cgiirc/Manifest b/net-irc/cgiirc/Manifest
index 36de51f7f771..e4e3d77e91df 100644
--- a/net-irc/cgiirc/Manifest
+++ b/net-irc/cgiirc/Manifest
@@ -1,2 +1,18 @@
-MD5 62384cb64032b3460d79fbc05bf643e2 cgiirc-0.5.3.ebuild 715
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a7f19a81216a61c91bee0fd894254941 cgiirc-0.5.4.ebuild 837
+MD5 723211a70a648d0e0b1d19aab9820dce cgiirc-0.5.3.ebuild 875
+MD5 aa84b7ae07f4e40127a747154da34b38 cgiirc-0.5.7.ebuild 962
+MD5 1f121c68a763612ae47c9ff8e44c8b6c ChangeLog 1080
+MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
 MD5 4ef89acf015aecb207da91dd00e60a9a files/digest-cgiirc-0.5.3 64
+MD5 0f901ebba5b3d8bbcb054639066b192a files/digest-cgiirc-0.5.4 64
+MD5 2aca1bc2f7368c8fcc4d5e947a7d06ab files/digest-cgiirc-0.5.7 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCyDSOEzitwsaoONoRAsThAKCyGGsihLmMvdzMBmvUkjHF71vrzwCgrxwR
+C0tGdRCTtDmuKVeIBfYGVq8=
+=Nh0f
+-----END PGP SIGNATURE-----
diff --git a/net-irc/cgiirc/cgiirc-0.5.3.ebuild b/net-irc/cgiirc/cgiirc-0.5.3.ebuild
index 1497a986b6be..bb956fcb41fc 100644
--- a/net-irc/cgiirc/cgiirc-0.5.3.ebuild
+++ b/net-irc/cgiirc/cgiirc-0.5.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/cgiirc/cgiirc-0.5.3.ebuild,v 1.1 2004/01/29 15:45:27 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/cgiirc/cgiirc-0.5.3.ebuild,v 1.1.1.1 2005/11/30 09:48:56 chriswhite Exp $
 
 inherit webapp-apache
 
@@ -10,11 +10,11 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 RESTRICT="nomirror"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-
-webapp-detect || NO_SERVER=1
+KEYWORDS="~x86 ~ppc"
+IUSE=""
 
 pkg_setup() {
+	webapp-detect || NO_SERVER=1
 	webapp-pkg_setup "${NO_WEBSERVER}"
 	einfo "Installing for ${WEBAPP_SERVER}"
 }
diff --git a/net-irc/cgiirc/cgiirc-0.5.4.ebuild b/net-irc/cgiirc/cgiirc-0.5.4.ebuild
index c7bbb58bec7b..9f1c6650c1a6 100644
--- a/net-irc/cgiirc/cgiirc-0.5.4.ebuild
+++ b/net-irc/cgiirc/cgiirc-0.5.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/cgiirc/cgiirc-0.5.4.ebuild,v 1.1 2004/05/31 15:21:30 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/cgiirc/cgiirc-0.5.4.ebuild,v 1.1.1.1 2005/11/30 09:48:56 chriswhite Exp $
 
 IUSE=""
 
@@ -10,7 +10,7 @@ DESCRIPTION="A perl/CGI program to use IRC from a web browser"
 HOMEPAGE="http://cgiirc.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~ppc ~amd64"
 
 src_unpack() {
 	unpack ${A}
diff --git a/net-irc/cgiirc/cgiirc-0.5.7.ebuild b/net-irc/cgiirc/cgiirc-0.5.7.ebuild
index b1bfdc59016e..11ac86b69281 100644
--- a/net-irc/cgiirc/cgiirc-0.5.7.ebuild
+++ b/net-irc/cgiirc/cgiirc-0.5.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/cgiirc/cgiirc-0.5.7.ebuild,v 1.1 2005/07/03 18:54:39 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/cgiirc/cgiirc-0.5.7.ebuild,v 1.1.1.1 2005/11/30 09:48:56 chriswhite Exp $
 
 IUSE=""
 
diff --git a/net-irc/ctrlproxy/ChangeLog b/net-irc/ctrlproxy/ChangeLog
index 106997f4ca8e..b439dd557f90 100644
--- a/net-irc/ctrlproxy/ChangeLog
+++ b/net-irc/ctrlproxy/ChangeLog
@@ -1,6 +1,58 @@
 # ChangeLog for net-irc/ctrlproxy
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ctrlproxy/ChangeLog,v 1.1 2003/03/28 00:44:48 agriffis Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ctrlproxy/ChangeLog,v 1.1.1.1 2005/11/30 09:48:54 chriswhite Exp $
+
+*ctrlproxy-2.7_pre2 (07 Feb 2005)
+
+  07 Feb 2005; Aron Griffis <agriffis@gentoo.org> ctrlproxy-2.6.1.ebuild,
+  ctrlproxy-2.6.ebuild, +ctrlproxy-2.7_pre2.ebuild:
+  Add testing version 2.7_pre2
+
+  28 Oct 2004; Aron Griffis <agriffis@gentoo.org> ctrlproxy-2.6.1.ebuild:
+  stable on alpha, ia64 and x86
+
+*ctrlproxy-2.6.1 (12 Sep 2004)
+
+  12 Sep 2004; Aron Griffis <agriffis@gentoo.org> +ctrlproxy-2.6.1.ebuild:
+  bump to version 2.6.1
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  ctrlproxy-2.6.ebuild:
+  Masked ctrlproxy-2.6.ebuild testing for ppc
+
+*ctrlproxy-2.6 (08 Jan 2004)
+
+  08 Jan 2004; Aron Griffis <agriffis@gentoo.org> ctrlproxy-2.6.ebuild:
+  Version bump to 2.6
+
+  16 Nov 2003; Aron Griffis <agriffis@gentoo.org> ctrlproxy-2.5.ebuild:
+  Stable on x86 but still having problems on alpha
+
+*ctrlproxy-2.5 (14 Oct 2003)
+
+  14 Oct 2003; Aron Griffis <agriffis@gentoo.org> ctrlproxy-2.2.ebuild,
+  ctrlproxy-2.4.ebuild, ctrlproxy-2.5.ebuild:
+  Remove 2.4 since it has stability issues, replace with 2.5. Mark 2.2 stable on
+  alpha
+
+  06 Oct 2003; Aron Griffis <agriffis@gentoo.org> ctrlproxy-2.4.ebuild:
+  Use -fPIC on alpha
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> metadata.xml:
+  Update metadata with myself as maintainer
+
+*ctrlproxy-2.4 (02 Oct 2003)
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> ctrlproxy-2.4.ebuild:
+  Update to 2.4.  Thanks Jelmer!
+
+  26 May 2003; Aron Griffis <agriffis@gentoo.org> ctrlproxy-2.2.ebuild:
+  Fix bug 20934 by adding glib to DEPEND
+
+*ctrlproxy-2.2 (16 Apr 2003)
+
+  16 Apr 2003; Aron Griffis <agriffis@gentoo.org> ctrlproxy-2.2.ebuild:
+  Add ~x86 to KEYWORDS
 
 *ctrlproxy-2.0 (27 Mar 2003)
 
diff --git a/net-irc/ctrlproxy/Manifest b/net-irc/ctrlproxy/Manifest
index e69de29bb2d1..371842ad69b3 100644
--- a/net-irc/ctrlproxy/Manifest
+++ b/net-irc/ctrlproxy/Manifest
@@ -0,0 +1,8 @@
+MD5 b445616a789c531085669184f4c2658b ctrlproxy-2.6.1.ebuild 858
+MD5 bd1db078b9f11dc1e5dc0e580f54c092 ChangeLog 1992
+MD5 66b0483664d1a297ea7aedf8449e29b0 ctrlproxy-2.7_pre2.ebuild 948
+MD5 1bc885e36c29bc6dce4a5ddb617acdbd ctrlproxy-2.6.ebuild 851
+MD5 397d073413aac58d3f99cef8f19457d8 metadata.xml 252
+MD5 24a24accfa17e9bd9d09802f62313124 files/digest-ctrlproxy-2.6.1 67
+MD5 faa19b5a029a01a480ff87a879bb6a15 files/digest-ctrlproxy-2.7_pre2 71
+MD5 47fa30855b8cde8e1b7dc55e5540aa2c files/digest-ctrlproxy-2.6 65
diff --git a/net-irc/ctrlproxy/ctrlproxy-2.6.1.ebuild b/net-irc/ctrlproxy/ctrlproxy-2.6.1.ebuild
index b0abb3f150ef..68fe3cb793ac 100644
--- a/net-irc/ctrlproxy/ctrlproxy-2.6.1.ebuild
+++ b/net-irc/ctrlproxy/ctrlproxy-2.6.1.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ctrlproxy/ctrlproxy-2.6.1.ebuild,v 1.1 2004/09/13 02:59:38 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ctrlproxy/ctrlproxy-2.6.1.ebuild,v 1.1.1.1 2005/11/30 09:48:54 chriswhite Exp $
 
 inherit flag-o-matic
 
 DESCRIPTION="IRC proxy with multiserver and multiclient support"
 HOMEPAGE="http://jelmer.vernstok.nl/${PN}/"
-SRC_URI="http://jelmer.vernstok.nl/${PN}/${P}.tar.gz"
+SRC_URI="http://jelmer.vernstok.nl/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~ppc"
+KEYWORDS="x86 alpha ~ppc ia64"
 IUSE="ssl"
 
 DEPEND=">=dev-libs/glib-2
diff --git a/net-irc/ctrlproxy/ctrlproxy-2.6.ebuild b/net-irc/ctrlproxy/ctrlproxy-2.6.ebuild
index 41b194d4ebbf..6147f908917b 100644
--- a/net-irc/ctrlproxy/ctrlproxy-2.6.ebuild
+++ b/net-irc/ctrlproxy/ctrlproxy-2.6.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ctrlproxy/ctrlproxy-2.6.ebuild,v 1.1 2004/01/08 19:15:47 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ctrlproxy/ctrlproxy-2.6.ebuild,v 1.1.1.1 2005/11/30 09:48:54 chriswhite Exp $
 
-IUSE="ssl"
+inherit flag-o-matic
 
 DESCRIPTION="IRC proxy with multiserver and multiclient support"
 HOMEPAGE="http://jelmer.vernstok.nl/${PN}/"
-SRC_URI="http://jelmer.vernstok.nl/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
+SRC_URI="http://jelmer.vernstok.nl/releases/${P}.tar.gz"
 
+LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~x86"
-IUSE=""
-DEPEND="
-	>=dev-libs/glib-2
+KEYWORDS="x86 alpha ~ppc"
+IUSE="ssl"
+
+DEPEND=">=dev-libs/glib-2
 	dev-libs/popt
 	dev-libs/libxml2
 	dev-libs/tdb
diff --git a/net-irc/ctrlproxy/ctrlproxy-2.7_pre2.ebuild b/net-irc/ctrlproxy/ctrlproxy-2.7_pre2.ebuild
index eea06377b3be..d208f995f972 100644
--- a/net-irc/ctrlproxy/ctrlproxy-2.7_pre2.ebuild
+++ b/net-irc/ctrlproxy/ctrlproxy-2.7_pre2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ctrlproxy/ctrlproxy-2.7_pre2.ebuild,v 1.1 2005/02/07 18:25:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ctrlproxy/ctrlproxy-2.7_pre2.ebuild,v 1.1.1.1 2005/11/30 09:48:54 chriswhite Exp $
 
 inherit flag-o-matic
 
diff --git a/net-irc/ctrlproxy/metadata.xml b/net-irc/ctrlproxy/metadata.xml
index 6ef15e900f17..cdde4bfeb1d4 100644
--- a/net-irc/ctrlproxy/metadata.xml
+++ b/net-irc/ctrlproxy/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>net-irc</herd>
+<maintainer>
+  <email>agriffis@gentoo.org</email>
+  <name>Aron Griffis</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-irc/cwirc/ChangeLog b/net-irc/cwirc/ChangeLog
index c46eb97e0356..3fc1c359001d 100644
--- a/net-irc/cwirc/ChangeLog
+++ b/net-irc/cwirc/ChangeLog
@@ -1,6 +1,72 @@
 # ChangeLog for net-irc/cwirc
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/cwirc/ChangeLog,v 1.1 2003/12/03 01:18:58 zul Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/cwirc/ChangeLog,v 1.1.1.1 2005/11/30 09:48:58 chriswhite Exp $
+
+  01 Sep 2005; Sven Wegener <swegener@gentoo.org> cwirc-1.8.8.ebuild:
+  Updated HOMEPAGE and SRC_URI.
+
+  21 Jun 2005; Sven Wegener <swegener@gentoo.org> cwirc-1.8.8.ebuild:
+  Adjusted dependencies to work with net-irc/xchat-gnome.
+
+  16 May 2005; Sven Wegener <swegener@gentoo.org> cwirc-1.8.8.ebuild:
+  Added cross-compile support.
+
+  12 Sep 2004; Sven Wegener <swegener@gentoo.org> -cwirc-1.8.6.ebuild,
+  -cwirc-1.8.7.ebuild, cwirc-1.8.8.ebuild:
+  Marked stable on x86. Removed old ebuilds.
+
+  24 Aug 2004; Sven Wegener <swegener@gentoo.org> -cwirc-1.8.3.ebuild,
+  -cwirc-1.8.5.ebuild, cwirc-1.8.6.ebuild:
+  Marked stable on x86 and removed old ebuilds.
+
+  13 Aug 2004; Sven Wegener <swegener@gentoo.org> metadata.xml,
+  cwirc-1.8.5.ebuild:
+  Added longdescription to metadata.xml and marked 1.8.5 stable on x86.
+
+*cwirc-1.8.8 (06 Aug 2004)
+
+  06 Aug 2004; Sven Wegener <swegener@gentoo.org> +cwirc-1.8.8.ebuild:
+  Version bump.
+
+*cwirc-1.8.7 (30 Jul 2004)
+
+  30 Jul 2004; Sven Wegener <swegener@gentoo.org> -cwirc-1.7.1.ebuild,
+  cwirc-1.8.3.ebuild, +cwirc-1.8.7.ebuild:
+  Version bump. Marked 1.8.3 stable on x86. Removed old ebuild.
+
+  24 Jul 2004; Sven Wegener <swegener@gentoo.org> cwirc-1.7.1.ebuild,
+  cwirc-1.8.3.ebuild, cwirc-1.8.5.ebuild, cwirc-1.8.6.ebuild:
+  Added >=sys-apps/sed-4 dependency.
+
+*cwirc-1.8.6 (22 Jul 2004)
+
+  22 Jul 2004; Sven Wegener <swegener@gentoo.org> +cwirc-1.8.6.ebuild:
+  Version bump.
+
+*cwirc-1.8.5 (09 Jul 2004)
+
+  09 Jul 2004; Sven Wegener <swegener@gentoo.org> +cwirc-1.8.5.ebuild:
+  Version bump.
+
+*cwirc-1.8.3 (20 Jun 2004)
+
+  20 Jun 2004; Sven Wegener <swegener@gentoo.org> +cwirc-1.8.3.ebuild:
+  Version bump. Made CFLAGS aware and prevent stripping, to allow
+  FEATURES="nostrip" to work.
+
+  18 Jun 2004; Sven Wegener <swegener@gentoo.org> cwirc-1.7.1.ebuild:
+  Removed S=${WORKDIR}/${P} and RDEPEND=""
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> cwirc-1.7.1.ebuild:
+  Masked cwirc-1.7.1.ebuild testing for ppc
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> cwirc-1.7.1.ebuild:
+  Add inherit eutils
+
+  03 Jan 2004; Chuck Short <zul@gentoo.org> cwirc-1.7.1.ebuild:
+  Updated copyright years.
+
+*cwirc-1.7.1 (02 Dec 2003)
 
   02 Dec 2003; Chuck Short <zul@gentoo.org> metadata.xml,
   files/cwirc-1.7.1-gentoo.patch:
diff --git a/net-irc/cwirc/Manifest b/net-irc/cwirc/Manifest
index c5e37b816dbe..39968d5dbdce 100644
--- a/net-irc/cwirc/Manifest
+++ b/net-irc/cwirc/Manifest
@@ -1,2 +1,15 @@
-MD5 05a9c54cce11ea7b54b2373fa55a073c cwirc-1.7.1.ebuild 729
-MD5 42f9f7605e7754ec072bcd73b39df99d files/digest-cwirc-1.7.1 63
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 bae67bcddc3c5df2f5fdf4e0f7059148 ChangeLog 2577
+MD5 dcc164e052eada5790f33c645b141186 cwirc-1.8.8.ebuild 970
+MD5 7c240ef73cd9a53241026c38c5c8b36f files/cwirc-1.7.1-gentoo.patch 662
+MD5 ff0ee0746cfc1deb98185aabe6be599f files/digest-cwirc-1.8.8 63
+MD5 18d8be7bfeeebf17ad3e91c3cc533726 metadata.xml 427
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDFl9xI1lqEGTUzyQRAjE3AKDUOggc/7dV+GFIWnkJqQlkzkQT/ACcC3un
+/x8k1dmXe0d6PcVdmY0pkJo=
+=fV9G
+-----END PGP SIGNATURE-----
diff --git a/net-irc/cwirc/cwirc-1.8.8.ebuild b/net-irc/cwirc/cwirc-1.8.8.ebuild
index 0b7b014ed52a..7db37ffc9bd4 100644
--- a/net-irc/cwirc/cwirc-1.8.8.ebuild
+++ b/net-irc/cwirc/cwirc-1.8.8.ebuild
@@ -1,37 +1,41 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/cwirc/cwirc-1.8.8.ebuild,v 1.1 2004/08/05 23:10:27 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/cwirc/cwirc-1.8.8.ebuild,v 1.1.1.1 2005/11/30 09:48:58 chriswhite Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="An X-chat plugin for sending and receiving raw morse code over IRC"
-HOMEPAGE="http://webperso.easyconnect.fr/om.the/web/cwirc/"
-SRC_URI="http://webperso.easyconnect.fr/om.the/web/cwirc/download/${P}.tar.gz"
+HOMEPAGE="http://users.skynet.be/ppc/cwirc/"
+SRC_URI="http://users.skynet.be/ppc/cwirc/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+
-	>=net-irc/xchat-2.0.1"
+	|| (
+		>=net-irc/xchat-2.0.1
+		>=net-irc/xchat-gnome-0.4
+	)"
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
-	epatch ${FILESDIR}/cwirc-1.7.1-gentoo.patch
-	sed -i -e 's:$(STRIP):echo:' Makefile
+	epatch "${FILESDIR}"/cwirc-1.7.1-gentoo.patch
+	sed -i -e 's:$(STRIP):true:' Makefile
 }
 
 src_compile() {
-	emake CFLAGS="${CFLAGS} -DLINUX" || die "emake failed"
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -DLINUX" || die "emake failed"
 }
 
 src_install() {
 	einstall || die "einstall failed"
 
 	dodoc README RELEASE_NOTES Changelog
-	cp -R schematics/ ${D}/usr/share/doc/${PF}/schematics/
+	docinto schematics
+	dodoc schematics/*
 }
diff --git a/net-irc/cwirc/metadata.xml b/net-irc/cwirc/metadata.xml
index 6ef15e900f17..148fa57afc5c 100644
--- a/net-irc/cwirc/metadata.xml
+++ b/net-irc/cwirc/metadata.xml
@@ -2,4 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>net-irc</herd>
+<longdescription>
+CWirc is a plugin for the X-Chat IRC client to transmit raw morse code over the
+internet using IRC servers as reflectors. The transmitted morse code can be
+received in near real-time by other X-Chat clients with the CWirc plugin.
+</longdescription>
 </pkgmetadata>
diff --git a/net-irc/cyclone/ChangeLog b/net-irc/cyclone/ChangeLog
index 72f3725cc0de..363f2e37f88e 100644
--- a/net-irc/cyclone/ChangeLog
+++ b/net-irc/cyclone/ChangeLog
@@ -1,9 +1,29 @@
 # ChangeLog for net-irc/cyclone
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/cyclone/ChangeLog,v 1.1 2002/07/12 05:53:44 blocke Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/cyclone/ChangeLog,v 1.1.1.1 2005/11/30 09:49:01 chriswhite Exp $
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  cyclone-0.3.1.1.ebuild:
+  virtual/glibc -> virtual/libc
+
+  07 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> cyclone-0.3.1.1.ebuild:
+  src_postinst() -> pkg_postinst(); IUSE; tidy
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  cyclone-0.3.1.1.ebuild:
+  Masked cyclone-0.3.1.1.ebuild stable for ppc
+
+  03 Jan 2004; Chuck Short <zul@gentoo.org> cyclone-0.3.1.1.ebuild:
+  Updated copyright years
+
+  21 May 2003; Martin Holzer <mholzer@gentoo.org> cyclone-0.3.1.1.ebuild:
+  Adding x86 to KEYWORKS. Closes #21413.
 
 *cyclone-0.3.1.1 (12 Jul 2002)
 
+  30 Oct 2002; Jon Nall <nall@gentoo.org> cyclone-0.3.1.1.ebuild :
+  Added ~ppc to KEYWORDS
+
   12 Jul 2002; Bruce A. Locke <blocke@shivan.org> cyclone-0.3.1.1.ebuild:
 
   Initial ebuild version.
diff --git a/net-irc/cyclone/Manifest b/net-irc/cyclone/Manifest
index 5086a0562309..f50bc9b46cf2 100644
--- a/net-irc/cyclone/Manifest
+++ b/net-irc/cyclone/Manifest
@@ -1,4 +1,5 @@
-MD5 9220920a3a114c37912cba4b8478f49f ChangeLog 440
-MD5 6939c6599e4576f6e0932ec6332e989c cyclone-0.3.1.1.ebuild 3808
+MD5 eeb72d580d57afa98322796df997ef6d ChangeLog 1022
+MD5 0452952c5cdbd549f4e106c8808bb888 cyclone-0.3.1.1.ebuild 3782
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 MD5 0bd50ab68ee1e3e2d0135f402bece427 files/digest-cyclone-0.3.1.1 67
 MD5 1e39d487d36b4205327d85f126b9831c files/res_init.c 6485
diff --git a/net-irc/cyclone/cyclone-0.3.1.1.ebuild b/net-irc/cyclone/cyclone-0.3.1.1.ebuild
index 23336da5bb24..3f119b7a439d 100644
--- a/net-irc/cyclone/cyclone-0.3.1.1.ebuild
+++ b/net-irc/cyclone/cyclone-0.3.1.1.ebuild
@@ -1,39 +1,38 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-irc/cyclone/cyclone-0.3.1.1.ebuild,v 1.1 2002/07/12 05:53:44 blocke Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/cyclone/cyclone-0.3.1.1.ebuild,v 1.1.1.1 2005/11/30 09:49:01 chriswhite Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="IRC daemon with hostname cloaking, SOCKS proxy checking and other advanced features"
-SRC_URI="ftp://ftp.slashnet.org/pub/cyclone/server/${P}.tar.gz"
 HOMEPAGE="http://www.slashnet.org"
+SRC_URI="ftp://ftp.slashnet.org/pub/cyclone/server/${P}.tar.gz"
+
+LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="*"
-LICENSE="GPL & BSD"
-DEPEND="virtual/glibc"
+KEYWORDS="x86 ppc"
+IUSE=""
 
-src_unpack() {
+DEPEND="virtual/libc"
 
+src_unpack() {
 	unpack ${P}.tar.gz
-	cp ${FILESDIR}/res_init.c ${S}/src	
-
+	cp ${FILESDIR}/res_init.c ${S}/src
 }
 
 src_compile() {
-
 	# Server administrators are encouraged to customize the following
 	# variables if actually deploying cyclone in an IRC network.  Upon
 	# merging of this package a config file is created in /etc/cyclone
 	# which is reused whenever this package is upgraded.
 
-	# If you wish to modify this configuration in the future, you can 
-	# either edit this ebuild or edit the created /etc/cyclone/config and 
+	# If you wish to modify this configuration in the future, you can
+	# either edit this ebuild or edit the created /etc/cyclone/config and
 	# remerge this ebuild.
 
 	if [ -f /etc/cyclone/config ]
 	then
 		einfo Reusing compile time configuration stored in /etc/cyclone/config...
 		einfo To reset the configuration delete the config file and remerge.
-		
+
 		cp /etc/cyclone/config ${S}/.config
 	else
 		einfo No previous configuration found... using defaults defined in ebuild...
@@ -79,17 +78,16 @@ END_OF_CONFIG
 
 	mv Config Config.orig
 	sed -e 's|DEFOPT="-O2"|DEFOPT="${CFLAGS}"|' \
-		-e 's|more ChangeLog||'   Config.orig > Config
+		-e 's|more ChangeLog||' \
+		-e 's|clear||' Config.orig > Config
 	chmod +x Config
 	yes "" | ./Config -n
 
 	# compile it
 	emake RES="res_init.o" || die
-
 }
 
-src_install () {
-
+src_install() {
 	# store generated .config file
 	dodir /etc/cyclone
 	cp ${S}/.config ${D}/etc/cyclone/config
@@ -102,7 +100,8 @@ src_install () {
 	mv ${D}/usr/bin/ircd ${D}/usr/bin/cyclone-ircd
 
 	# documentation files
-	dodoc AUTHORS ChangeLog COPYING INSTALL README {doc/*:-history}
+	dodoc AUTHORS ChangeLog INSTALL README doc/oper.txt
+	dodoc doc/NOTICE doc/rfc* doc/Crule.readme doc/cyclone.gif doc/Operators
 
 	# install sample configuration file
 	cp ${S}/doc/example.conf ${D}/etc/cyclone/ircd.conf
@@ -115,20 +114,16 @@ src_install () {
 	chmod 755 ${D}/etc/cyclone/chkconf ${D}/etc/cyclone/encrypt
 	chmod 644 ${D}/etc/cyclone/example.conf ${D}/etc/cyclone/ircd.motd
 	chmod 600 ${D}/etc/cyclone/ircd.conf ${D}/etc/cyclone/config
-
 }
 
-
-src_postinst()
-{
-
-	einfo Please read the documentation.  The default /etc/cyclone/ircd.conf
-	einfo will need to be edited and file permissions changed so only root
-	einfo and the account under which the ircd will run can read the plaintext
-	einfo passwords stored in that file.
+pkg_postinst() {
+	einfo "Please read the documentation.  The default /etc/cyclone/ircd.conf"
+	einfo "will need to be edited and file permissions changed so only root"
+	einfo "and the account under which the ircd will run can read the plaintext"
+	einfo "passwords stored in that file."
 	einfo
-	einfo Failure to modify the ircd.conf will result in cyclone-ircd
-	einfo quietly refusing to run.  Read the documentation and config file.
+	einfo "Failure to modify the ircd.conf will result in cyclone-ircd"
+	einfo "quietly refusing to run.  Read the documentation and config file."
 
 }
 
diff --git a/net-irc/cyclone/files/res_init.c b/net-irc/cyclone/files/res_init.c
index 029e8a611ec9..34484e523bb3 100644
--- a/net-irc/cyclone/files/res_init.c
+++ b/net-irc/cyclone/files/res_init.c
@@ -27,7 +27,7 @@
 #include "nameser.h"
 #include "resolv.h"
 
-CVSID("$Id: res_init.c,v 1.1 2002/07/12 05:53:44 blocke Exp $");
+CVSID("$Id: res_init.c,v 1.1.1.1 2005/11/30 09:49:02 chriswhite Exp $");
 
 /*
  * Resolver state default settings
@@ -206,6 +206,9 @@ res_init()
 
 /*
  * $Log: res_init.c,v $
+ * Revision 1.1.1.1  2005/11/30 09:49:02  chriswhite
+ * *** empty log message ***
+ *
  * Revision 1.1  2002/07/12 05:53:44  blocke
  * cyclone 0.3.1.1: initial version
  *
diff --git a/net-irc/dancer-ircd/ChangeLog b/net-irc/dancer-ircd/ChangeLog
index 0699017e775c..726f29ac0e5e 100644
--- a/net-irc/dancer-ircd/ChangeLog
+++ b/net-irc/dancer-ircd/ChangeLog
@@ -1,9 +1,69 @@
-# ChangeLog for sys-apps/palo
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/dancer-ircd/ChangeLog,v 1.1 2003/03/06 16:26:23 gmsoft Exp $
+# ChangeLog for net-irc/dancer-ircd
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/dancer-ircd/ChangeLog,v 1.1.1.1 2005/11/30 09:49:02 chriswhite Exp $
+
+  01 Aug 2005; Sven Wegener <swegener@gentoo.org> -files/dancer-ircd,
+  -dancer-ircd-1.0.31_p8-r1.ebuild:
+  Removed old ebuild.
+
+  31 Jul 2005; Sven Wegener <swegener@gentoo.org> dancer-ircd-1.0.35.ebuild:
+  Marked stable on x86.
+
+*dancer-ircd-1.0.35 (23 Jan 2005)
+
+  23 Jan 2005; Sven Wegener <swegener@gentoo.org> files/dancer-ircd,
+  +files/dancer-ircd-1.0.35, +files/dancer-ircd.confd,
+  +dancer-ircd-1.0.35.ebuild:
+  Version bump, bug 75474.
+
+  16 Oct 2004; Mike Frysinger <vapier@gentoo.org>
+  dancer-ircd-1.0.31_p8-r1.ebuild:
+  Clean up ugly ebuild and make sure we install mkpasswd as $PN-mkpasswd #6428.
+
+  15 Oct 2004; Sven Wegener <swegener@gentoo.org>
+  dancer-ircd-1.0.31_p8-r1.ebuild:
+  Fixed typo in src_install. Closes bug #67581.
+
+  09 Oct 2004; Sven Wegener <swegener@gentoo.org> files/dancer-ircd:
+  Modified to 'use net' not 'need net' in init script. Closes bug #66467.
+
+  13 Jul 2004; Sven Wegener <swegener@gentoo.org>
+  -dancer-ircd-1.0.31_p8.ebuild:
+  Removed ancient ebuild.
+
+  10 Jun 2004; Aron Griffis <agriffis@gentoo.org>
+  dancer-ircd-1.0.31_p8-r1.ebuild, dancer-ircd-1.0.31_p8.ebuild:
+  Fix use invocation
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  dancer-ircd-1.0.31_p8-r1.ebuild, dancer-ircd-1.0.31_p8.ebuild:
+  Masked dancer-ircd-1.0.31_p8.ebuild testing for ppc
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  dancer-ircd-1.0.31_p8-r1.ebuild:
+  Masked dancer-ircd-1.0.31_p8-r1.ebuild testing for ppc
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org>
+  dancer-ircd-1.0.31_p8-r1.ebuild, dancer-ircd-1.0.31_p8.ebuild:
+  Add die following econf for bug 48950
+
+  14 Feb 2004; Jason Wever <weeve@gentoo.org> dancer-ircd-1.0.31_p8-r1.ebuild:
+  Added ~sparc keyword.
+
+  03 Jan 2004; Chuck Short <zul@gentoo.org> dancer-ircd-1.0.31_p8-r1.ebuild,
+  dancer-ircd-1.0.31_p8.ebuild, files/dancer-ircd:
+  Updated copyright years.
+
+*dancer-ircd-1.0.31_p8-r1 (05 May 2003)
+
+  05 May 2003; Guy Martin <gmsoft@gentoo.org> dancer-ircd-1.0.31_p8-r1.ebuild :
+  Corrected documentation building and creation of the log directory.
 
 *dancer-ircd-1.0.31_p8 (06 Mar 2003)
 
   06 Mar 2003; Guy Martin <gmsoft@gentoo.org> dancer-ircd-1.0.31_p8.ebuild :
+  Removed inherit eutils.
+
+  06 Mar 2003; Guy Martin <gmsoft@gentoo.org> dancer-ircd-1.0.31_p8.ebuild :
   Initial import.
 
diff --git a/net-irc/dancer-ircd/Manifest b/net-irc/dancer-ircd/Manifest
index e69de29bb2d1..22a164dcf451 100644
--- a/net-irc/dancer-ircd/Manifest
+++ b/net-irc/dancer-ircd/Manifest
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 20a4b58983858ee8cdac61d19c7f2513 ChangeLog 2530
+MD5 02950812d55534c766b1605024e1692a dancer-ircd-1.0.35.ebuild 1723
+MD5 d157b5905d12f83b8c1e8faf82729a9e files/dancer-ircd-1.0.35 555
+MD5 415dcb7adbfdcd61acd1d4832a962eaa files/dancer-ircd.confd 249
+MD5 28bb2d973862b88bf5a475afbe8dbd3a files/digest-dancer-ircd-1.0.35 70
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC7gOyI1lqEGTUzyQRAgxhAJwMFll1peI/kTBjMOYLhCIfaZ9igQCbBMLn
+H3XqwTEcVzoHI70Zlxkp5Zw=
+=fbRQ
+-----END PGP SIGNATURE-----
diff --git a/net-irc/dancer-ircd/dancer-ircd-1.0.35.ebuild b/net-irc/dancer-ircd/dancer-ircd-1.0.35.ebuild
index e24de8aedb11..fe7c79fad8e3 100644
--- a/net-irc/dancer-ircd/dancer-ircd-1.0.35.ebuild
+++ b/net-irc/dancer-ircd/dancer-ircd-1.0.35.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/dancer-ircd/dancer-ircd-1.0.35.ebuild,v 1.1 2005/01/23 22:07:46 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/dancer-ircd/dancer-ircd-1.0.35.ebuild,v 1.1.1.1 2005/11/30 09:49:02 chriswhite Exp $
 
 inherit eutils
 
-DESCRIPTION="An ircd used by the freenode network"
+DESCRIPTION="The ircd used by the freenode network"
 HOMEPAGE="http://freenode.net/dancer_ircd.shtml"
 SRC_URI="http://source.freenode.net/~asuffield/dancer/dancer-ircd/stable/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~hppa ~ppc ~sparc ~x86"
+KEYWORDS="~hppa ~ppc ~sparc x86"
 IUSE="doc"
 
 DEPEND="doc? (
@@ -26,12 +26,11 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
 
 	sed -i \
 		-e s:etc/:/etc/: \
 		-e s:var/:/var/: \
-		${S}/src/paths.c
+		"${S}"/src/paths.c
 }
 
 src_compile() {
@@ -55,8 +54,8 @@ src_install() {
 	insinto /etc/dancer-ircd
 	newins doc/example.conf ircd.conf
 
-	newinitd ${FILESDIR}/dancer-ircd-1.0.35 dancer-ircd
-	newconfd ${FILESDIR}/dancer-ircd.confd dancer-ircd
+	newinitd "${FILESDIR}"/dancer-ircd-1.0.35 dancer-ircd
+	newconfd "${FILESDIR}"/dancer-ircd.confd dancer-ircd
 
 	keepdir /var/{lib,log,run}/dancer-ircd
 
@@ -69,7 +68,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	chown dancer ${ROOT}/var/{lib,log,run}/dancer-ircd
+	chown dancer "${ROOT}"/var/{lib,log,run}/dancer-ircd
 
 	if ! use doc
 	then
diff --git a/net-irc/dancer-ircd/files/dancer-ircd-1.0.35 b/net-irc/dancer-ircd/files/dancer-ircd-1.0.35
index 99d4642889f1..7182836ac2e5 100644
--- a/net-irc/dancer-ircd/files/dancer-ircd-1.0.35
+++ b/net-irc/dancer-ircd/files/dancer-ircd-1.0.35
@@ -1,10 +1,11 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/dancer-ircd/files/dancer-ircd-1.0.35,v 1.1 2005/01/23 22:07:46 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/dancer-ircd/files/dancer-ircd-1.0.35,v 1.1.1.1 2005/11/30 09:49:02 chriswhite Exp $
 
 depend() {
 	use net
+	provide ircd
 }
 
 start() {
diff --git a/net-irc/dancer-ircd/files/dancer-ircd.confd b/net-irc/dancer-ircd/files/dancer-ircd.confd
index 63882861cd1d..17d867eb91a4 100644
--- a/net-irc/dancer-ircd/files/dancer-ircd.confd
+++ b/net-irc/dancer-ircd/files/dancer-ircd.confd
@@ -1,5 +1,5 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/dancer-ircd/files/dancer-ircd.confd,v 1.1 2005/01/23 22:07:46 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/dancer-ircd/files/dancer-ircd.confd,v 1.1.1.1 2005/11/30 09:49:02 chriswhite Exp $
 
 DANCER_USER="dancer"
diff --git a/net-irc/dccserver/ChangeLog b/net-irc/dccserver/ChangeLog
index ca33eae7234d..f6f15c0f0de3 100644
--- a/net-irc/dccserver/ChangeLog
+++ b/net-irc/dccserver/ChangeLog
@@ -1,6 +1,40 @@
 # ChangeLog for net-irc/dccserver
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/dccserver/ChangeLog,v 1.1 2003/07/26 20:48:13 gregf Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/dccserver/ChangeLog,v 1.1.1.1 2005/11/30 09:48:54 chriswhite Exp $
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> dccserver-0.4.ebuild:
+  Stable on ppc.
+
+  05 Dec 2004; Sven Wegener <swegener@gentoo.org> -dccserver-0.3.ebuild:
+  Removed old ebuild.
+
+  13 Jul 2004; Sven Wegener <swegener@gentoo.org> dccserver-0.3.ebuild,
+  dccserver-0.4.ebuild:
+  Removed unnecessary src_compile() and marked 0.4 stable on x86.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> dccserver-0.3.ebuild,
+  dccserver-0.4.ebuild:
+  virtual/glibc -> virtual/libc
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  dccserver-0.3.ebuild, dccserver-0.4.ebuild:
+  Masked dccserver-0.4.ebuild testing for ppc
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  dccserver-0.3.ebuild:
+  Masked dccserver-0.3.ebuild testing for ppc
+
+*dccserver-0.4 (03 Jan 2004)
+
+  03 Jan 2004; Chuck Short <zul@gentoo.org> dccserver-0.3.ebuild,
+  dccserver-0.4.ebuild:
+  Header updates.
+
+  21 Nov 2003; Chuck Short <zul@gentoo.org> :
+  Updated SRC_URI, new release.
+
+  21 Nov 2003; Chuck Short <zul@gentoo.org> dccserver-0.3.ebuild:
+  Marked stable for x86.
 
 *dccserver-0.3 (26 Jul 2003)
 
diff --git a/net-irc/dccserver/Manifest b/net-irc/dccserver/Manifest
index 9024744bebe5..26205496e4f1 100644
--- a/net-irc/dccserver/Manifest
+++ b/net-irc/dccserver/Manifest
@@ -1,2 +1,4 @@
-MD5 b49e7c3ce8501e2e1bd38363a43ba4f9 dccserver-0.3.ebuild 508
-MD5 d1498ac6e19cf127c0e6e9deb1ab07d2 files/digest-dccserver-0.3 65
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+MD5 1a8916499a3cf45d43b45a18051b1751 ChangeLog 1500
+MD5 87ea9b27b5484a685957fff265c55315 dccserver-0.4.ebuild 535
+MD5 da02dbdf2d0cd4d2d7bceb04b6be5399 files/digest-dccserver-0.4 65
diff --git a/net-irc/dccserver/dccserver-0.4.ebuild b/net-irc/dccserver/dccserver-0.4.ebuild
index 8f90dbd189b7..64120c131486 100644
--- a/net-irc/dccserver/dccserver-0.4.ebuild
+++ b/net-irc/dccserver/dccserver-0.4.ebuild
@@ -1,23 +1,18 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/dccserver/dccserver-0.4.ebuild,v 1.1 2003/11/21 20:25:25 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/dccserver/dccserver-0.4.ebuild,v 1.1.1.1 2005/11/30 09:48:54 chriswhite Exp $
 
 DESCRIPTION="linux implementation of the mirc dccserver command"
 SRC_URI="http://www.nih.at/dccserver/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc"
 IUSE=""
 HOMEPAGE="http://www.nih.at/dccserver/"
 
-DEPEND="virtual/glibc"
-
-src_compile() {
-	econf || die "Configure failed"
-	emake || die "make failed"
-}
+DEPEND="virtual/libc"
 
 src_install() {
-	einstall
+	einstall || die "einstall failed"
 	dodoc AUTHORS NEWS THANKS TODO
 }
diff --git a/net-irc/dircproxy/ChangeLog b/net-irc/dircproxy/ChangeLog
index 68c7bc0a85fb..ea6c4462ae57 100644
--- a/net-irc/dircproxy/ChangeLog
+++ b/net-irc/dircproxy/ChangeLog
@@ -1,10 +1,73 @@
 # ChangeLog for net-irc/dircproxy
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-irc/dircproxy/ChangeLog,v 1.1 2002/04/13 22:57:53 verwilst Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/dircproxy/ChangeLog,v 1.1.1.1 2005/11/30 09:49:01 chriswhite Exp $
 
+  14 May 2005; Jan Brinkmann <luckyduck@gentoo.org> dircproxy-1.0.5.ebuild:
+  stable on amd64
+
+  18 Feb 2005; Sven Wegener <swegener@gentoo.org>
+  -files/1.1.0-005-numeric.patch, dircproxy-1.1.0-r1.ebuild:
+  Removed the numeric patch, it causes more problems than advantages.
+
+  23 Jan 2005; Sven Wegener <swegener@gentoo.org>
+  +files/1.1.0-less-lag-on-attach.patch, dircproxy-1.1.0-r1.ebuild:
+  Added a patch from Adrian <adrian@planetcoding.net> that reduces the
+  on-attach lag by sending all channels in NAMES and TOPIC requests at once.
+  Closes bug #78341.
+
+  09 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> dircproxy-1.0.5.ebuild,
+  dircproxy-1.1.0-r1.ebuild:
+  added ~amd64 to KEYWORDS. fixes bug #76777.
+
+*dircproxy-1.1.0-r1 (07 Jan 2005)
+
+  07 Jan 2005; Sven Wegener <swegener@gentoo.org>
+  +files/1.1.0-005-numeric.patch, +dircproxy-1.1.0-r1.ebuild,
+  -dircproxy-1.1.0.ebuild:
+  Revision bump to include patch by Adrian <adrian@planetcoding.net> from bug
+  #76781. It patches dircproxy to not ignore the 005 numeric. Old behaviour
+  breaks some scripts.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  dircproxy-1.0.5.ebuild, dircproxy-1.1.0.ebuild:
+  virtual/glibc -> virtual/libc
+
+  17 Jun 2004; Sven Wegener <swegener@gentoo.org> dircproxy-1.0.5.ebuild,
+  dircproxy-1.1.0.ebuild:
+  Added IUSE=""
+
+*dircproxy-1.1.0 (17 Jun 2004)
+
+  17 Jun 2004; Sven Wegener <swegener@gentoo.org> dircproxy-1.0.5.ebuild,
+  +dircproxy-1.1.0.ebuild:
+  Updated SRC_URI and HOMEPAGE to new locations. Added unstable upstream version
+  1.1.0 which only includes small fixes over 1.0.5 and should be considered
+  stable. Thanks to Morten Lied Johansen <mortenjo@ifi.uio.no> for notifcation
+  and patch in bug #53887. Changed make target in src_install() from
+  install-strip to install, as stripping is controlled with FEATURES="nostrip".
+
+  03 Jul 2003; Paul de Vrieze <pauldv@gentoo.org> dircproxy-1.0.5.ebuild:
+  Add the INSTALL file to the documentation as it describes how to configure it
+
+*dircproxy-1.0.5 (03 Feb 2003)
+
+  11 Mar 2003; Aron Griffis <agriffis@gentoo.org> dircproxy-1.0.5.ebuild:
+  Mark stable on alpha
+
+  03 Feb 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #14707.
+
+*dircproxy-1.0.4 (05 Nov 2002)
+
+  05 Nov 2002; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump.
 
 *dircproxy-1.0.3 (14 April 2002)
 
+  30 Oct 2002; Jon Nall <nall@gentoo.org> dircproxy-1.0.3.ebuild :
+
+  Added ~ppc to KEYWORDS
+
   14 April 2002; Bart Verwilst <verwilst@gentoo.org> Changelog :
 
   Initial ebuild, dircproxy version 1.0.3.. Enjoy!
diff --git a/net-irc/dircproxy/Manifest b/net-irc/dircproxy/Manifest
index e69de29bb2d1..3c7599c7a623 100644
--- a/net-irc/dircproxy/Manifest
+++ b/net-irc/dircproxy/Manifest
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b5b146316ebd465c2a50aeb027d3444f dircproxy-1.0.5.ebuild 603
+MD5 e2c689795c2e7ac99e6c00329d834b52 dircproxy-1.1.0-r1.ebuild 718
+MD5 12a0503ba065c77aa56fcabc458c072c ChangeLog 2762
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+MD5 8735716fa2ac751e4b10e7f38cd1bd38 files/digest-dircproxy-1.0.5 67
+MD5 3305b6d2321a112b03180bef0a02b0d6 files/digest-dircproxy-1.1.0-r1 67
+MD5 d020302a46b1d425abe235ba16582a03 files/1.1.0-less-lag-on-attach.patch 1506
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFChl9W06ebR+OMO78RAr4lAKCWEhu+lFuKa9JmwnH6FVs151TMewCfYGSh
+Zxvy97NdrMdCoPdT8srLDBg=
+=HLN7
+-----END PGP SIGNATURE-----
diff --git a/net-irc/dircproxy/dircproxy-1.0.5.ebuild b/net-irc/dircproxy/dircproxy-1.0.5.ebuild
index 332533d78f62..ccc08c47d567 100644
--- a/net-irc/dircproxy/dircproxy-1.0.5.ebuild
+++ b/net-irc/dircproxy/dircproxy-1.0.5.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/net-irc/dircproxy/dircproxy-1.0.5.ebuild,v 1.1 2003/02/03 06:50:05 vapier Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/dircproxy/dircproxy-1.0.5.ebuild,v 1.1.1.1 2005/11/30 09:49:01 chriswhite Exp $
 
 DESCRIPTION="an IRC proxy server"
-SRC_URI="http://www.dircproxy.net/download/stable/${P}.tar.gz"
-HOMEPAGE="http://www.dircproxy.net/"
+SRC_URI="http://www.securiweb.net/pub/oss/dircproxy/stable/${P}.tar.gz"
+HOMEPAGE="http://dircproxy.securiweb.net/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc alpha amd64"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_install() {
-	make DESTDIR=${D} install-strip || die
-	dodoc AUTHORS ChangeLog FAQ NEWS PROTOCOL README* TODO
+	make DESTDIR=${D} install || die "make install failed"
+	dodoc AUTHORS ChangeLog FAQ NEWS PROTOCOL README* TODO INSTALL
 }
diff --git a/net-irc/dircproxy/dircproxy-1.1.0-r1.ebuild b/net-irc/dircproxy/dircproxy-1.1.0-r1.ebuild
index 8442e2728fac..30d21034c9d0 100644
--- a/net-irc/dircproxy/dircproxy-1.1.0-r1.ebuild
+++ b/net-irc/dircproxy/dircproxy-1.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/dircproxy/dircproxy-1.1.0-r1.ebuild,v 1.1 2005/01/07 01:08:33 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/dircproxy/dircproxy-1.1.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:49:01 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.securiweb.net/pub/oss/dircproxy/unstable/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha"
+KEYWORDS="~x86 ~ppc ~alpha ~amd64"
 IUSE=""
 
 DEPEND="virtual/libc"
@@ -19,7 +19,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	epatch ${FILESDIR}/${PV}-005-numeric.patch
+	epatch ${FILESDIR}/${PV}-less-lag-on-attach.patch
 }
 
 src_install() {
diff --git a/net-irc/echat/ChangeLog b/net-irc/echat/ChangeLog
index 37de7788b2a3..30d8e2b1f2c6 100644
--- a/net-irc/echat/ChangeLog
+++ b/net-irc/echat/ChangeLog
@@ -1,6 +1,39 @@
 # ChangeLog for net-irc/echat
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/echat/ChangeLog,v 1.1 2003/10/05 21:05:11 zul Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/echat/ChangeLog,v 1.1.1.1 2005/11/30 09:48:58 chriswhite Exp $
+
+  10 May 2005; Sven Wegener <swegener@gentoo.org> echat-0.02-r1.ebuild,
+  echat-0.04_beta1.ebuild:
+  Updated SRC_URI and HOMEPAGE to new upstream location.
+
+  09 Jul 2004; Sven Wegener <swegener@gentoo.org> echat-0.02-r1.ebuild,
+  echat-0.04_beta1.ebuild:
+  Tidied the ebuilds.
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  echat-0.04_beta1.ebuild:
+  Masked echat-0.04_beta1.ebuild testing for ppc
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> echat-0.04_beta1.ebuild:
+  Add inherit eutils
+
+  15 Apr 2004; Michael McCabe <randy@gentoo.org> echat-0.04_beta1.ebuild:
+  adding s390 keywords
+
+*echat-0.04_beta1 (06 Mar 2004)
+
+  06 Mar 2004; Chuck Short <zul@gentoo.org> echat-0.02-r1.ebuild,
+  echat-0.04_beta1.ebuild, files/echat-0.04_beta1-reuseaddr.patch:
+  Marked stable for x86.
+
+*echat-0.04_beta1 (06 Mar 2004)
+
+  06 Mar 2004; Chuck Short <zul@gentoo.org> echat-0.04_beta1.ebuild,
+  files/echat-0.04_beta1-reuseaddr.patch:
+  Version bump, closes #42983.
+
+  03 Jan 2004; Chuck Short <zul@gentoo.org> echat-0.02-r1.ebuild:
+  Header updates
 
 *echat-0.02-r1 (05 Oct 2003)
 
diff --git a/net-irc/echat/Manifest b/net-irc/echat/Manifest
index 84e5b04fdf8b..e35c406617bc 100644
--- a/net-irc/echat/Manifest
+++ b/net-irc/echat/Manifest
@@ -1,2 +1,17 @@
-MD5 8b06192c511314d91d0f4e079e568aef echat-0.02-r1.ebuild 1074
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1d5def84cd730347d8b6ae4778577ec8 echat-0.02-r1.ebuild 1138
+MD5 15035afa5f996dbb4efde1b1e04a83f0 echat-0.04_beta1.ebuild 1273
+MD5 32a4fb34643b6559522dd424b1869c50 ChangeLog 1500
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 MD5 5fa3227cc2576d01c8b99ee7f8c04796 files/digest-echat-0.02-r1 63
+MD5 8fff8efb34c084ead4f39fc1bba1729e files/echat-0.04_beta1-reuseaddr.patch 445
+MD5 0ee2a29acc7312480dae3765e0c30014 files/digest-echat-0.04_beta1 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCgTeBI1lqEGTUzyQRAoK/AKDdgs6ngUCkaVckhsoTis2xA96TVQCfSEsF
+2RXWyV9o8g5murMnPc3DlxE=
+=oAVd
+-----END PGP SIGNATURE-----
diff --git a/net-irc/echat/echat-0.02-r1.ebuild b/net-irc/echat/echat-0.02-r1.ebuild
index 3de6d0800d78..5750b382759f 100644
--- a/net-irc/echat/echat-0.02-r1.ebuild
+++ b/net-irc/echat/echat-0.02-r1.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/echat/echat-0.02-r1.ebuild,v 1.1 2003/10/05 21:05:11 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/echat/echat-0.02-r1.ebuild,v 1.1.1.1 2005/11/30 09:48:58 chriswhite Exp $
 
 DESCRIPTION="Console vypress chat clone for *nix like systems."
-HOMEPAGE="http://deep.perm.ru/echat/"
-SRC_URI="http://deep.perm.ru/files/echat/${P}f2.tar.gz"
+HOMEPAGE="http://echat.deep.perm.ru/"
+SRC_URI="http://echat.deep.perm.ru/files/${P}f2.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
-DEPEND=">=sys-apps/sed-4
-		sys-libs/ncurses"
 RDEPEND="sys-libs/ncurses"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
 
 S=${WORKDIR}/${P}f2
 
diff --git a/net-irc/echat/echat-0.04_beta1.ebuild b/net-irc/echat/echat-0.04_beta1.ebuild
index 9bf7f9d94d93..ab1c13f5b183 100644
--- a/net-irc/echat/echat-0.04_beta1.ebuild
+++ b/net-irc/echat/echat-0.04_beta1.ebuild
@@ -1,19 +1,24 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/echat/echat-0.04_beta1.ebuild,v 1.1 2004/03/06 13:40:09 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/echat/echat-0.04_beta1.ebuild,v 1.1.1.1 2005/11/30 09:48:58 chriswhite Exp $
+
+inherit eutils
+
+MY_P=${P/_}
 
 DESCRIPTION="Console vypress chat clone for *nix like systems."
-HOMEPAGE="http://deep.perm.ru/echat/"
-SRC_URI="http://files.akl.lt/~x11/${P}.tar.gz
-	    http://gsk.vtu.lt:8080/~arturaz/soft/${P}.tar.gz"
+HOMEPAGE="http://echat.deep.perm.ru/"
+SRC_URI="http://echat.deep.perm.ru/files/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~s390 ~ppc"
 IUSE=""
 
-DEPEND=">=sys-apps/sed-4
-		sys-libs/ncurses"
 RDEPEND="sys-libs/ncurses"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A}
@@ -48,6 +53,5 @@ src_install() {
 	insinto /etc
 	newins dot.echatrc.sample echatrc
 	doman *.1
-	exeinto /usr/bin/
-	doexe ec
+	dobin ec
 }
diff --git a/net-irc/echat/files/digest-echat-0.04_beta1 b/net-irc/echat/files/digest-echat-0.04_beta1
index 5aee6694d2cb..9a3c771a08e3 100644
--- a/net-irc/echat/files/digest-echat-0.04_beta1
+++ b/net-irc/echat/files/digest-echat-0.04_beta1
@@ -1 +1 @@
-MD5 3c3b803f10e559b2a187846f15c1efac echat-0.04_beta1.tar.gz 56055
+MD5 dda3891d08f04dd266858380d404af15 echat-0.04beta1.tar.gz 56540
diff --git a/net-irc/eggdrop/ChangeLog b/net-irc/eggdrop/ChangeLog
index 8668c88cf9b3..a36b715a9b06 100644
--- a/net-irc/eggdrop/ChangeLog
+++ b/net-irc/eggdrop/ChangeLog
@@ -1,9 +1,206 @@
 # ChangeLog for net-irc/eggdrop
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/eggdrop/ChangeLog,v 1.1 2003/07/29 01:12:51 gregf Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/eggdrop/ChangeLog,v 1.1.1.1 2005/11/30 09:48:59 chriswhite Exp $
+
+  27 Sep 2005; Sven Wegener <swegener@gentoo.org> eggdrop-1.6.17-r2.ebuild:
+  Use an updated patchset that fixes bug #107413.
+
+  28 Aug 2005; Simon Stelling <blubb@gentoo.org> eggdrop-1.6.17-r2.ebuild:
+  stable on amd64
+
+  25 Aug 2005; Sven Wegener <swegener@gentoo.org> eggdrop-1.6.17-r2.ebuild:
+  Added support for the vanilla USE flag.
+
+  25 Aug 2005; Aron Griffis <agriffis@gentoo.org> eggdrop-1.6.17-r2.ebuild:
+  stable on ia64
+
+  14 Aug 2005; Sven Wegener <swegener@gentoo.org> eggdrop-1.6.17-r2.ebuild:
+  Bump the patchset revision, only change is the removal of a complete module.
+
+  06 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  eggdrop-1.6.17-r2.ebuild:
+  Stable on alpha.
+
+  11 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  eggdrop-1.6.17-r2.ebuild:
+  Stable on sparc
+
+  07 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  eggdrop-1.6.17-r2.ebuild:
+  ppc stable
+
+  07 Jul 2005; Sven Wegener <swegener@gentoo.org> eggdrop-1.6.17-r2.ebuild:
+  Marked stable on x86.
+
+*eggdrop-1.6.17-r2 (03 Apr 2005)
+
+  03 Apr 2005; Sven Wegener <swegener@gentoo.org> files/eggdrop-installer,
+  eggdrop-1.6.17.ebuild, -eggdrop-1.6.17-r1.ebuild,
+  +eggdrop-1.6.17-r2.ebuild:
+  Revision bump for an updated patchset. Only change is the removal of the
+  longer handles patch, because it breaks linking with other bots that are not
+  patched, bug 86579. Rewrote the eggdrop-installer script.
+
+  03 Apr 2005; Sven Wegener <swegener@gentoo.org>
+  -files/eggdrop-1.6.15-botchk.patch, -files/eggdrop-1.6.15-config.patch,
+  -files/eggdrop-1.6.15-configure-in.patch,
+  -files/eggdrop-1.6.15-mysql-use_ssl-fix.patch,
+  -files/eggdrop-1.6.15-potential-undef-tm-struct.patch,
+  -eggdrop-1.6.15.ebuild, -eggdrop-1.6.15-r1.ebuild:
+  Removed old ebuilds and files.
+
+  03 Apr 2005; Hardave Riar <hardave@gentoo.org> eggdrop-1.6.17.ebuild:
+  Stable on mips.
+
+*eggdrop-1.6.17-r1 (05 Mar 2005)
+
+  05 Mar 2005; Sven Wegener <swegener@gentoo.org> +eggdrop-1.6.17-r1.ebuild,
+  eggdrop-1.6.17.ebuild:
+  Revision bump for an updated patchset. It contains new releases of some
+  modules and fixes for bug #66390 and bug #77399.
+
+  25 Feb 2005; Aron Griffis <agriffis@gentoo.org> eggdrop-1.6.17.ebuild:
+  stable on ia64
+
+  01 Jan 2005; Sven Wegener <swegener@gentoo.org> eggdrop-1.6.15-r1.ebuild,
+  eggdrop-1.6.17.ebuild:
+  Changed SRC_URI to use mirror://gentoo/ for the patchset.
+
+  22 Nov 2004; Karol Wojtaszek <sekretarz@gentoo.org> eggdrop-1.6.17.ebuild:
+  Stable on amd64, bug #71997
+
+  11 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> eggdrop-1.6.17.ebuild:
+  Stable on alpha.
+
+  31 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> eggdrop-1.6.17.ebuild:
+  ~alpha keyword.
+
+  17 Oct 2004; Sven Wegener <swegener@gentoo.org> -eggdrop-1.6.15-r2.ebuild,
+  -eggdrop-1.6.16-r1.ebuild:
+  Removed old ebuilds.
+
+  09 Oct 2004; Jason Wever <weeve@gentoo.org> eggdrop-1.6.17.ebuild:
+  Stable on sparc.
+
+  01 Oct 2004; Sven Wegener <swegener@gentoo.org> eggdrop-1.6.17.ebuild:
+  Marked stable on x86.
+
+  12 Sep 2004; Sven Wegener <swegener@gentoo.org> files/eggdrop-installer:
+  Trimmed trailing whitespace in eggdrop-installer script.
+
+  12 Sep 2004; Sven Wegener <swegener@gentoo.org> files/eggdrop-installer:
+  Added documentation to eggdrop-installer about how to create the user file and
+  how to start the bot correctly. Closes bug #63578.
+
+*eggdrop-1.6.17 (28 Aug 2004)
+
+  28 Aug 2004; Sven Wegener <swegener@gentoo.org> +eggdrop-1.6.17.ebuild:
+  Version bump.
+
+  22 Aug 2004; Jason Wever <weeve@gentoo.org> eggdrop-1.6.16-r1.ebuild:
+  Stable on sparc.
+
+  14 Aug 2004; Sven Wegener <swegener@gentoo.org> :
+  Corrected metadata.xml to match DTD.
+
+*eggdrop-1.6.16-r1 (09 Aug 2004)
+
+  09 Aug 2004; Sven Wegener <swegener@gentoo.org> +eggdrop-1.6.16-r1.ebuild,
+  -eggdrop-1.6.16.ebuild:
+  Revision bump for an updated patchset. Closes bug #59747 and #59748. Thanks to
+  Will Buckner <wcc@techmonkeys.org> for reporting both.
+
+  06 Aug 2004; Sven Wegener <swegener@gentoo.org>
+  -files/eggdrop1.6.15-ssl.fixed.diff, eggdrop-1.6.15-r1.ebuild,
+  eggdrop-1.6.15-r2.ebuild, eggdrop-1.6.16.ebuild:
+  Removed large files from FILESDIR. Marked 1.6.16 stable on x86.
+
+*eggdrop-1.6.16 (05 Jul 2004)
+
+  05 Jul 2004; Sven Wegener <swegener@gentoo.org> files/eggdrop-installer,
+  +eggdrop-1.6.16.ebuild:
+  Version bump. Thanks to Joost Hillen <neeneelaatmaar@gmx.net> for notification
+  in bug #55704.
+
+  09 Jun 2004; Chuck Short <zul@gentoo.org> eggdrop-1.6.15-r1.ebuild,
+  eggdrop-1.6.15-r2.ebuild, eggdrop-1.6.15.ebuild:
+  Changed pre_pkg to pkg_setup. Closes #53275.
+
+  07 Jun 2004; Aron Griffis <agriffis@gentoo.org> eggdrop-1.6.15-r1.ebuild,
+  eggdrop-1.6.15-r2.ebuild, eggdrop-1.6.15.ebuild:
+  Fix typo: pkg_postinfo -> pkg_postinst; fix other minor ebuild errors
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  eggdrop-1.6.15-r1.ebuild, eggdrop-1.6.15-r2.ebuild, eggdrop-1.6.15.ebuild:
+  Masked eggdrop-1.6.15.ebuild stable for ppc
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  eggdrop-1.6.15-r1.ebuild, eggdrop-1.6.15-r2.ebuild:
+  Masked eggdrop-1.6.15-r2.ebuild testing for ppc
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  eggdrop-1.6.15-r1.ebuild:
+  Masked eggdrop-1.6.15-r1.ebuild stable for ppc
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> eggdrop-1.6.15-r1.ebuild,
+  eggdrop-1.6.15-r2.ebuild, eggdrop-1.6.15.ebuild:
+  Add inherit eutils
+
+  15 Apr 2004; Jon Portnoy <avenj@gentoo.org> eggdrop-1.6.15-r2.ebuild :
+  AMD64 keywords.
+
+  09 Mar 2004; <agriffis@gentoo.org> eggdrop-1.6.15-r1.ebuild:
+  stable on alpha and ia64
+
+  03 Feb 2004; Chuck Short <zul@gentoo.org> eggdrop-1.6.15-r2.ebuild,
+  files/eggdrop-1.6.15-mysql-use_ssl-fix.patch:
+  Re-enabled mysql support. Patch thanks to Sven Wegener
+  <sven.wegener -at- stealer.net>. Closes #40330.
+
+*eggdrop-1.6.15-r2 (02 Feb 2004)
+
+  02 Feb 2004; Chuck Short <zul@gentoo.org> eggdrop-1.6.15-r2.ebuild,
+  files/eggdrop-installer, files/eggdrop1.6.15-ssl.fixed.diff:
+  New release, added ssl support, disabled mysql support temporarily.
+  Updated eggdrop-installer. Closes #39587.
+
+  12 Jan 2004; Chuck Short <zul@gentoo.org> files/eggdrop-installer:
+  Added some more error checking to eggdrop-installer.
+
+  05 Jan 2004; Jason Wever <weeve@gentoo.org> eggdrop-1.6.15-r1.ebuild:
+  Marked stable on sparc.
+
+  03 Jan 2004; Chuck Short <zul@gentoo.org> eggdrop-1.6.15-r1.ebuild,
+  eggdrop-1.6.15.ebuild:
+  header updates
+
+  16 Dec 2003; Chuck Short <zul@gentoo.org> eggdrop-1.6.15-r1.ebuild:
+  Marked stable for x86.
+
+*eggdrop-1.6.15-r1 (24 Nov 2003)
+
+  24 Nov 2003; Chuck Short <zul@gentoo.org> eggdrop-1.6.15-r1.ebuild,
+  eggdrop-1.6.15.ebuild:
+  Fixed configure and aclocal.m4 for new coreutils version.
+  This update uses Tony Vroon's <tony@vroon.org>
+  Closes #32694.
+
+  08 Nov 2003; Chuck Short <zul@gentoo.org> files/eggdrop-installer:
+  Fixed typo in eggdrop-installer, closes #32980.
+
+  12 Oct 2003; Chuck Short <zul@gentoo.org> eggdrop-1.6.15.ebuild,
+  files/eggdrop-installer:
+  Eggdrop-installer enhancements, closes bug #30703.
+  Marked stable.
+
+  03 Oct 2003; Chuck Short <zul@gentoo.org> eggdrop-1.6.15.ebuild:
+  Added ~ia64 to keywords.
 
 *eggdrop-1.6.15 (28 Jul 2003)
 
+  30 Sep 2003; Joshua Kinard <kumba@gentoo.org> eggdrop-1.6.15.ebuild:
+  Added ~sparc & ~mips to KEYWORDS
+
   28 Jul 2003; Greg Fitzgerald <gregf@gentoo.org> eggdrop-1.6.15.ebuild,
   files/eggdrop-installer:
   Initial Release. This closes bug #18461 Credit to both Curtis Hogg
diff --git a/net-irc/eggdrop/Manifest b/net-irc/eggdrop/Manifest
index 22043038bbfe..46bd90e19d5d 100644
--- a/net-irc/eggdrop/Manifest
+++ b/net-irc/eggdrop/Manifest
@@ -1,4 +1,17 @@
-MD5 35b1d0ac69161e9bc2fc8f3ae0a1a552 eggdrop-1.6.15.ebuild 1511
-MD5 da23aa8b8f624a673906efa97b75350b ChangeLog 396
-MD5 e9830c3f4fb21aa6a8651d6e47bae613 files/digest-eggdrop-1.6.15 65
-MD5 39427a479d743e7e81bba1f9d58b2bae files/eggdrop-installer 2313
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b9a66a2e9203e0631c715349b4fafab3 ChangeLog 7717
+MD5 2c865a6a06ced0c9ffe598fb49d8da3b eggdrop-1.6.17-r2.ebuild 2529
+MD5 62f31d8a6a61e414ccdf004363b59563 eggdrop-1.6.17.ebuild 2188
+MD5 6b09026c13cde0090d7b943e6a4e1535 files/digest-eggdrop-1.6.17 145
+MD5 f39e3b8e1b567cd847c89b93b483dc2b files/digest-eggdrop-1.6.17-r2 145
+MD5 d1c7b90b504d49b5f9f19cab742f227c files/eggdrop-installer 2268
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDOcz5I1lqEGTUzyQRAlFLAJ4uRoVcVzds4LgLoeboUdH5O0WL0QCg3AMs
+i2g+iey3virBhDooW8Dr/LM=
+=MRJg
+-----END PGP SIGNATURE-----
diff --git a/net-irc/eggdrop/eggdrop-1.6.17-r2.ebuild b/net-irc/eggdrop/eggdrop-1.6.17-r2.ebuild
index b1266885ca4c..6266e1788488 100644
--- a/net-irc/eggdrop/eggdrop-1.6.17-r2.ebuild
+++ b/net-irc/eggdrop/eggdrop-1.6.17-r2.ebuild
@@ -1,32 +1,42 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/eggdrop/eggdrop-1.6.17-r2.ebuild,v 1.1 2005/04/03 20:58:39 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/eggdrop/eggdrop-1.6.17-r2.ebuild,v 1.1.1.1 2005/11/30 09:48:59 chriswhite Exp $
 
 inherit eutils
 
 MY_P="eggdrop${PV}"
-PATCHSET_V="1.2"
+PATCHSET_V="1.4"
 
 DESCRIPTION="An IRC bot extensible with C or Tcl."
 HOMEPAGE="http://www.eggheads.org/"
 SRC_URI="ftp://ftp.eggheads.org/pub/eggdrop/source/1.6/${MY_P}.tar.gz
 	mirror://gentoo/${P}-patches-${PATCHSET_V}.tar.bz2
-	mirror://dev.gentoo.org/~swegener/distfiles/${P}-patches-${PATCHSET_V}.tar.bz2"
-KEYWORDS="~x86 ~sparc ~mips ~ia64 ~amd64 ~ppc ~alpha"
+	http://dev.gentoo.org/~swegener/distfiles/${P}-patches-${PATCHSET_V}.tar.bz2"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="debug static mysql postgres ssl"
+IUSE="debug static mysql postgres ssl vanilla"
 
 DEPEND="dev-lang/tcl
-	mysql? ( dev-db/mysql )
-	postgres? ( dev-db/postgresql )
-	ssl? ( dev-libs/openssl )"
+	!vanilla? (
+		mysql? ( dev-db/mysql )
+		postgres? ( dev-db/postgresql )
+		ssl? ( dev-libs/openssl )
+	)"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}"/${MY_P}
 
 src_unpack()  {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
+
+	if use vanilla
+	then
+		einfo "Excluding patches that install additional modules, this effectively"
+		einfo "disables the mysql, postgres and ssl USE flags."
+		echo
+		rm "${WORKDIR}"/patch/[12345678]*.patch
+	fi
 
 	EPATCH_SUFFIX="patch" epatch || die "epatch failed"
 }
@@ -37,7 +47,7 @@ src_compile() {
 	use mysql    || ( echo mysql ; echo mystats ) >>disabled_modules
 	use postgres || echo pgstats >>disabled_modules
 
-	econf $(use_with ssl) || die "./configure failed"
+	econf $(use_with ssl) || die "econf failed"
 
 	make config || die "module config failed"
 
@@ -57,24 +67,27 @@ src_compile() {
 
 src_install() {
 	local a b
-	make DEST=${D}/opt/eggdrop install || die "make install failed"
+	make DEST="${D}"/opt/eggdrop install || die "make install failed"
 
 	for a in doc/*
 	do
 		[ -f ${a} ] && dodoc ${a}
 	done
 
-	cd ${S}/src/mod
+	cd "${S}"/src/mod
 	for a in *.mod
 	do
 		for b in README UPDATES INSTALL TODO CONTENTS
 		do
-			[ -f ${a}/${b} ] && newdoc ${a}/${b} ${b}.${a}
+			[[ -f ${a}/${b} ]] && newdoc ${a}/${b} ${b}.${a}
 		done
 	done
 
-	cd ${S}
-	dodoc \
+	cd "${S}"
+
+	dodoc text/motd.*
+
+	use vanilla || dodoc \
 		src/mod/botnetop.mod/botnetop.conf \
 		src/mod/gseen.mod/gseen.conf \
 		src/mod/mc_greet.mod/mc_greet.conf \
@@ -82,12 +95,11 @@ src_install() {
 		src/mod/away.mod/away.doc \
 		src/mod/rcon.mod/matchbot.tcl \
 		src/mod/mystats.mod/tools/mystats.{conf,sql} \
-		src/mod/pgstats.mod/tools/{pgstats.conf,setup.sql} \
-		text/motd.*
+		src/mod/pgstats.mod/tools/{pgstats.conf,setup.sql}
 
-	dohtml ${S}/doc/html/*.html
+	dohtml doc/html/*.html
 
-	dobin ${FILESDIR}/eggdrop-installer
+	dobin "${FILESDIR}"/eggdrop-installer
 	doman doc/man1/eggdrop.1
 }
 
diff --git a/net-irc/eggdrop/eggdrop-1.6.17.ebuild b/net-irc/eggdrop/eggdrop-1.6.17.ebuild
index 0ecafed5087a..8bbe4bb725fd 100644
--- a/net-irc/eggdrop/eggdrop-1.6.17.ebuild
+++ b/net-irc/eggdrop/eggdrop-1.6.17.ebuild
@@ -1,23 +1,23 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/eggdrop/eggdrop-1.6.17.ebuild,v 1.1 2004/08/28 20:42:37 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/eggdrop/eggdrop-1.6.17.ebuild,v 1.1.1.1 2005/11/30 09:48:59 chriswhite Exp $
 
 inherit eutils
 
-MY_P=eggdrop${PV}
-PATCHSET_V=1.0
+MY_P="eggdrop${PV}"
+PATCHSET_V="1.0"
 
 DESCRIPTION="An IRC bot extensible with C or Tcl."
 HOMEPAGE="http://www.eggheads.org/"
 SRC_URI="ftp://ftp.eggheads.org/pub/eggdrop/source/1.6/${MY_P}.tar.gz
-	http://gentoo.mirror.at.stealer.net/files/${P}-patches-${PATCHSET_V}.tar.bz2"
-KEYWORDS="~x86 ~sparc ~mips ~ia64 ~amd64 ~ppc"
+	mirror://gentoo/${P}-patches-${PATCHSET_V}.tar.bz2"
+KEYWORDS="x86 sparc mips ia64 amd64 ppc alpha"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug static mysql postgres ssl"
 
 DEPEND="dev-lang/tcl
-	mysql? ( dev-db/mysql )
+	mysql? ( <dev-db/mysql-4.1 )
 	postgres? ( dev-db/postgresql )
 	ssl? ( dev-libs/openssl )"
 
@@ -40,15 +40,18 @@ src_compile() {
 
 	make config || die "module config failed"
 
-	if use static && use debug; then
+	if use static && use debug
+	then
 		target="sdebug"
-	elif use static; then
+	elif use static
+	then
 		target="static"
-	elif use debug; then
+	elif use debug
+	then
 		target="debug"
 	fi
 
-	emake -j1 CFLGS="${MY_CFLAGS}" ${target} || die "emake ${target} failed"
+	emake -j1 ${target} || die "emake ${target} failed"
 }
 
 src_install() {
@@ -57,19 +60,19 @@ src_install() {
 
 	for a in doc/*
 	do
-		[ -f $a ] && dodoc $a
+		[ -f ${a} ] && dodoc ${a}
 	done
 
-	cd src/mod
+	cd ${S}/src/mod
 	for a in *.mod
 	do
 		for b in README UPDATES INSTALL TODO CONTENTS
 		do
-			[ -f $a/$b ] && newdoc $a/$b $b.$a
+			[ -f ${a}/${b} ] && newdoc ${a}/${b} ${b}.${a}
 		done
 	done
-	cd ${S}
 
+	cd ${S}
 	dodoc \
 		src/mod/botnetop.mod/botnetop.conf \
 		src/mod/gseen.mod/gseen.conf \
@@ -81,10 +84,7 @@ src_install() {
 		src/mod/pgstats.mod/tools/pgstats.{conf,php,sql} \
 		text/motd.*
 
-	for a in doc/html/*
-	do
-		[ -f $a ] && dohtml $a
-	done
+	dohtml ${S}/doc/html/*.html
 
 	dobin ${FILESDIR}/eggdrop-installer
 	doman doc/man1/eggdrop.1
diff --git a/net-irc/eggdrop/files/digest-eggdrop-1.6.17-r2 b/net-irc/eggdrop/files/digest-eggdrop-1.6.17-r2
index 8c1a4c1d5518..3f1c7059fe7a 100644
--- a/net-irc/eggdrop/files/digest-eggdrop-1.6.17-r2
+++ b/net-irc/eggdrop/files/digest-eggdrop-1.6.17-r2
@@ -1,2 +1,2 @@
+MD5 538c39376b3fc2fcc897226ab434eebc eggdrop-1.6.17-patches-1.4.tar.bz2 319594
 MD5 95b3744a45ac1420cf08d88ee0ed0b6c eggdrop1.6.17.tar.gz 1021902
-MD5 46fbe146c406bd2fb49d25a3c7edd494 eggdrop-1.6.17-patches-1.2.tar.bz2 320542
diff --git a/net-irc/eggdrop/files/eggdrop-installer b/net-irc/eggdrop/files/eggdrop-installer
index 6cc25c48a347..72e4960c7b62 100644
--- a/net-irc/eggdrop/files/eggdrop-installer
+++ b/net-irc/eggdrop/files/eggdrop-installer
@@ -1,79 +1,84 @@
 #!/bin/bash
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/eggdrop/files/eggdrop-installer,v 1.1.1.1 2005/11/30 09:48:59 chriswhite Exp $
 
 source /etc/init.d/functions.sh || {
-  echo "$0: Could not source /etc/init.d/functions.sh!"
-  exit 1
+	echo "${0}: Could not source /etc/init.d/functions.sh!"
+	exit 1
 }
 
 # Checks to see if user is trying to install eggdrop as root.
 root_check() {
-
-echo "Installing Eggdrop"
-if [ "$HOME" = "/root" ] || [ `whoami` == "root" ];
-then
-   einfo "You should not be installing eggdrop as root."
-   einfo ""
-   einfo "Installing eggdrop as root leaves your computer vulnerable"
-   einfo "to attack from other irc clients. Please use the eggdrop-installer"
-   einfo "script as the user who you wish to run eggdrop with"
-   exit 1
-else
-  install_eggdrop
-fi
-
+	if [ "${HOME}" = "/root" ] || [ "$(whoami)" = "root" ]
+	then
+		ewarn "You should not be installing eggdrop as root."
+		ewarn
+		ewarn "Installing eggdrop as root leaves your computer vulnerable"
+		ewarn "to attack from other irc clients. Please use the eggdrop-installer"
+		ewarn "script as the user who you wish to run eggdrop with"
+		exit 1
+	fi
 }
 
 # Usage information
 usage() {
-cat << "USAGE_END"
-Usage: eggbot-installer [bot-name]
+	cat <<USAGE_END
+Usage: eggdrop-installer <bot-name>
 Install eggdrop for a specific user, creating the directories and files
 needed for eggdrop to run securely and safely.
 USAGE_END
-
-exit 1
+	exit 1
 }
 
-install_eggdrop()
-{
-   if [ ! -d $HOME/.eggdrop ]
-   then
-       mkdir -p $HOME/.eggdrop
-   fi
-      einfo "Creating directories for your $bot_name ..."
-      mkdir -p $HOME/.eggdrop/$bot_name 
-      mkdir -p $HOME/.eggdrop/$bot_name/logs 
-      mkdir -p $HOME/.eggdrop/$bot_name/filesys 
-      mkdir -p $HOME/.eggdrop/$bot_name/filesys/incoming 
-      mkdir -p $HOME/.eggdrop/$bot_name/text 
-      mkdir -p $HOME/.eggdrop/$bot_name/scripts
+# Install eggdrop
+install_eggdrop() {
+	einfo "Installing Eggdrop"
+	einfo
+
+	root_check
 
-      einfo "Creating symlinks to required files for your bot to run ...."
-      ln -s /opt/eggdrop/help $HOME/.eggdrop/$bot_name/help
-      ln -s /opt/eggdrop/language $HOME/.eggdrop/$bot_name/language
-      ln -s /opt/eggdrop/modules $HOME/.eggdrop/$bot_name/modules
+	if [ -d "${bot_dir}" ]
+	then
+		einfo "Already found a bot home directory for ${bot_name}"
+		exit 1
+	fi
 
-      einfo "Copying motd and banner ... "
-      cp /opt/eggdrop/text/* $HOME/.eggdrop/$bot_name/text
+	einfo "Creating directories for your eggdrop..."
+	for dir in logs filesys/incoming text tmp scripts var
+	do
+		mkdir -p "${bot_dir}/${dir}"
+	done
 
-      # I changed this from a symlink to a direct copy because the user
-      # might not have write permissions to /opt/eggdrop/scripts
-      # as well as they might have their own custom scripts. - zul<chuck_short@rogers.com>
-      cp /opt/eggdrop/scripts/* $HOME/.eggdrop/$bot_name/scripts
+	einfo "Creating symlinks to required files for your bot to run..."
+	for file in help language modules eggdrop
+	do
+		ln -s "/opt/eggdrop/${file}" "${bot_dir}/${file}"
+	done
 
-      einfo "Finished..."
-      
-      einfo "Please edit your $HOME/.eggdrop/$botname/eggdrop.conf "
-      einfo "If you need any help pleaese refer to the man page, or "
-      einfo "eggdrop website at http://www.egghelper.org"
-      
-      cp /opt/eggdrop/eggdrop.conf $HOME/.eggdrop/$bot_name/eggdrop.conf
+	einfo "Copying motd, banner, scripts and config file..."
+	cp /opt/eggdrop/text/* "${bot_dir}/text"
+	cp /opt/eggdrop/scripts/* "${bot_dir}/scripts"
+	cp /opt/eggdrop/eggdrop.conf "${bot_dir}/eggdrop.conf"
+
+	einfo "Finished..."
+	einfo
+	einfo "Please edit your ${bot_dir}/eggdrop.conf!"
+	einfo
+	einfo "The bot needs to be run from the ${bot_dir} directory."
+	einfo "Run 'cd ${bot_dir} && ./eggdrop -m eggdrop.conf'"
+	einfo "to create the user file and then remove the -m command line option"
+	einfo "to start your eggdrop bot."
+	einfo
+	einfo "If you need any help pleaese refer to the man page, or"
+	einfo "eggdrop website at http://www.egghelper.org/"
 }
 
-if [ ! -n "$1" ]
+if [ -z "${1}" ]
 then
-  usage
-else 
-  bot_name="$1"
-  root_check
+	usage
+else
+	bot_name="${1}"
+	bot_dir="${HOME}/.eggdrop/${bot_name}"
+	install_eggdrop
 fi
diff --git a/net-irc/emech/ChangeLog b/net-irc/emech/ChangeLog
index 5b2398e8069e..03ec9999c49d 100644
--- a/net-irc/emech/ChangeLog
+++ b/net-irc/emech/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for net-irc/emech
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/emech/ChangeLog,v 1.1 2004/07/30 00:00:49 swegener Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/emech/ChangeLog,v 1.1.1.1 2005/11/30 09:48:54 chriswhite Exp $
+
+*emech-3.0 (01 Aug 2005)
+
+  01 Aug 2005; Sven Wegener <swegener@gentoo.org> +emech-3.0.ebuild:
+  Version bump.
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> emech-2.8.5.1.ebuild:
+  Stable on ppc.
+
+  04 Sep 2004; Sven Wegener <swegener@gentoo.org> emech-2.8.5.1.ebuild:
+  Marked stable on x86.
+
+  03 Aug 2004; David Holm <dholm@gentoo.org> emech-2.8.5.1.ebuild:
+  Added to ~ppc.
 
 *emech-2.8.5.1 (30 Jul 2004)
 
diff --git a/net-irc/emech/Manifest b/net-irc/emech/Manifest
index b8ce23f573f1..a9aa0f18249a 100644
--- a/net-irc/emech/Manifest
+++ b/net-irc/emech/Manifest
@@ -1,2 +1,16 @@
-MD5 066188d8d119406d3721fb0561d9ccdc emech-2.8.5.1.ebuild 426
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 30062d4bbbf3246e2fccf3cfb129631b ChangeLog 750
+MD5 448f534e313933e0d0dcab586e4285f8 emech-2.8.5.1.ebuild 1244
+MD5 d8b0ae178976ee303e6a4aafd5d001e0 emech-3.0.ebuild 1746
 MD5 b60e84a422092ec3fcf1c2d21bc4e113 files/digest-emech-2.8.5.1 66
+MD5 40532dbc16711345af7716a9dd5909d1 files/digest-emech-3.0 61
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC7nh5I1lqEGTUzyQRAhZeAKCwE6MOLyYV04DFuvTC0BTBWwdZUgCgmdrl
+utoVNoGMy+y5NechPl7jDT0=
+=mqe6
+-----END PGP SIGNATURE-----
diff --git a/net-irc/emech/emech-2.8.5.1.ebuild b/net-irc/emech/emech-2.8.5.1.ebuild
index 05ad36099963..323b688eac92 100644
--- a/net-irc/emech/emech-2.8.5.1.ebuild
+++ b/net-irc/emech/emech-2.8.5.1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/emech/emech-2.8.5.1.ebuild,v 1.1 2004/07/30 00:00:49 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/emech/emech-2.8.5.1.ebuild,v 1.1.1.1 2005/11/30 09:48:54 chriswhite Exp $
 
 DESCRIPTION="The EnergyMech is a UNIX compatible IRC bot programmed in the C language"
 HOMEPAGE="http://www.energymech.net/"
 SRC_URI="http://www.energymech.net/files/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc"
 IUSE="debug session"
 
 DEPEND=""
diff --git a/net-irc/emech/emech-3.0.ebuild b/net-irc/emech/emech-3.0.ebuild
index 1275d720cc1e..48553103b1d0 100644
--- a/net-irc/emech/emech-3.0.ebuild
+++ b/net-irc/emech/emech-3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/emech/emech-3.0.ebuild,v 1.1 2005/08/01 19:30:36 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/emech/emech-3.0.ebuild,v 1.1.1.1 2005/11/30 09:48:54 chriswhite Exp $
 
 inherit toolchain-funcs
 
diff --git a/net-irc/epic4/ChangeLog b/net-irc/epic4/ChangeLog
index 33cd8ac69d7b..28ba9a5c03a6 100644
--- a/net-irc/epic4/ChangeLog
+++ b/net-irc/epic4/ChangeLog
@@ -1,8 +1,252 @@
 # ChangeLog for net-irc/epic4
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/ChangeLog,v 1.1 2002/02/01 21:53:32 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/ChangeLog,v 1.1.1.1 2005/11/30 09:48:52 chriswhite Exp $
 
-*epic4-1.0.1-r1 (1 Feb 2002)
+  24 Aug 2005; Aron Griffis <agriffis@gentoo.org> epic4-2.2.ebuild:
+  stable on ia64
+
+  02 Aug 2005; Simon Stelling <blubb@gentoo.org> epic4-2.2.ebuild:
+  stable on amd64
+
+  20 Jul 2005; Sven Wegener <swegener@gentoo.org> epic4-2.0-r1.ebuild,
+  epic4-2.2.ebuild:
+  Typo fix, thanks to Erik McNellis in bug #98863.
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> epic4-2.2.ebuild:
+  Stable on ppc.
+
+  14 May 2005; Guy Martin <gmsoft@gentoo.org> epic4-2.2.ebuild:
+  Stable on hppa.
+
+  25 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> epic4-2.2.ebuild:
+  Stable on sparc
+
+  25 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> epic4-2.2.ebuild:
+  Stable on alpha.
+
+  22 Apr 2005; Sven Wegener <swegener@gentoo.org> epic4-2.2.ebuild:
+  Marked stable on x86.
+
+  01 Mar 2005; Sven Wegener <swegener@gentoo.org> epic4-2.0-r1.ebuild,
+  epic4-2.2.ebuild:
+  Added some built_with_use magic to make sure perl has been compiled with
+  USE="-ithreads".
+
+*epic4-2.2 (17 Feb 2005)
+
+  17 Feb 2005; Sven Wegener <swegener@gentoo.org> -epic4-2.1.1.ebuild,
+  +epic4-2.2.ebuild:
+  Version bump.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*epic4-2.1.1 (13 Nov 2004)
+
+  13 Nov 2004; Sven Wegener <swegener@gentoo.org>
+  -files/epic4-1.0.1-gcc33.patch, -epic4-1.1.14-r1.ebuild,
+  -epic4-1.2.6.ebuild, +epic4-2.1.1.ebuild:
+  Version bump. Removed old ebuilds.
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> epic4-2.0-r1.ebuild:
+  Stable on amd64.
+
+  24 Sep 2004; Sven Wegener <swegener@gentoo.org> -epic4-1.1.14.ebuild,
+  -epic4-1.1.16.ebuild:
+  Removed old ebuilds.
+
+*epic4-2.0-r1 (02 Aug 2004)
+
+  17 Aug 2004; Alexander Plank <alexander@gentoo.org> epic4-2.0.ebuild:
+  add macos keyword. compiles and works
+    
+  02 Aug 2004; Sven Wegener <swegener@gentoo.org> epic4-1.2.6.ebuild,
+  +epic4-2.0-r1.ebuild, -epic4-2.0.ebuild:
+  Revision bump for updated help files and permission issue (bug #59075).
+  Changed the chown from user.group to user:group.
+
+  29 Jul 2004; Guy Martin <gmsoft@gentoo.org> epic4-2.0.ebuild:
+  Stable on hppa.
+
+  10 Jul 2004; Sven Wegener <swegener@gentoo.org>
+  +files/2.0-toggle-stop-screen.patch, epic4-1.1.14-r1.ebuild,
+  epic4-1.1.14.ebuild, epic4-1.1.16-r1.ebuild, epic4-1.1.16.ebuild,
+  epic4-1.2.6.ebuild, epic4-2.0.ebuild:
+  Tidied the ebuilds. Added small upstream patch for 2.0, which only affects a
+  small group of users, so no bump. Marked 2.0 stable on x86.
+
+  05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> epic4-2.0.ebuild:
+  Stable on alpha.
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  epic4-1.1.10.ebuild, epic4-1.1.11.ebuild, epic4-1.1.12.ebuild,
+  epic4-1.1.14-r1.ebuild, epic4-1.1.14.ebuild:
+  Masked epic4-1.1.14.ebuild stable for ppc
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  epic4-1.1.10.ebuild, epic4-1.1.11.ebuild, epic4-1.1.12.ebuild,
+  epic4-1.1.14-r1.ebuild:
+  Masked epic4-1.1.14-r1.ebuild stable for ppc
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  epic4-1.1.10.ebuild, epic4-1.1.11.ebuild, epic4-1.1.12.ebuild:
+  Masked epic4-1.1.12.ebuild stable for ppc
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  epic4-1.1.10.ebuild, epic4-1.1.11.ebuild:
+  Masked epic4-1.1.11.ebuild stable for ppc
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  epic4-1.1.10.ebuild:
+  Masked epic4-1.1.10.ebuild stable for ppc
+
+  01 May 2004; Jon Portnoy <avenj@gentoo.org> epic4-2.0.ebuild :
+  AMD64 keywords.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> epic4-1.1.16-r1.ebuild,
+  epic4-1.2.6.ebuild, epic4-2.0.ebuild:
+  Add inherit eutils
+
+  22 Apr 2004; Ciaran McCreesh <ciaranm@gentoo.org> epic4-2.0.ebuild:
+  Stable on sparc
+
+  02 Apr 2004; Ciaran McCreesh <ciaranm@gentoo.org> epic4-2.0.ebuild:
+  Added ~sparc, thanks to TheDave in #gentoo-sparc
+
+*epic4-2.0 (11 Mar 2004)
+
+  11 Mar 2004; Chuck Short <zul@gentoo.org> epic4-2.0.ebuild:
+  Version bump, closes #44270.
+
+*epic4-1.2.6 (05 Feb 2004)
+
+  05 Feb 2004; Chuck Short <zul@gentoo.org> :
+  Version bump, updated SRC_URI. Closes #40349.
+
+*epic4-1.1.16-r1 (03 Jan 2004)
+
+  11 Jan 2003; Guy martin <gmsoft@gentoo.org> epic4-1.1.16-r1.ebuild :
+  Marked stable on hppa.
+
+  03 Jan 2004; Chuck Short <zul@gentoo.org> epic4-1.1.10.ebuild,
+  epic4-1.1.11.ebuild, epic4-1.1.12.ebuild, epic4-1.1.14-r1.ebuild,
+  epic4-1.1.14.ebuild, epic4-1.1.16-r1.ebuild, epic4-1.1.16.ebuild,
+  files/epic-defaultserver.patch:
+  Ebuild clean ups, added patch so that epic defaults to irc.freenode.net first.
+
+  16 Dec 2003; Chuck Short <zul@gentoo.org> epic4-1.1.16.ebuild:
+  Marked stable on x86, ia64, and amd64.
+
+  10 Dec 2003; Jon Portnoy <avenj@gentoo.org> epic4-1.1.16.ebuild :
+  AMD64 keyworded.
+
+*epic4-1.1.14-r1 (05 Dec 2003)
+
+  05 Dec 2003; Chuck Short <zul@gentoo.org> epic4-1.1.12.ebuild,
+  epic4-1.1.14-r1.ebuild, epic4-1.1.16.ebuild:
+  Fixed chown syntax.
+
+*epic4-1.1.16 (21 Nov 2003)
+
+  21 Nov 2003; Chuck Short <zul@gentoo.org> epic4-1.1.16.ebuild:
+  New version.
+
+*epic4-1.1.14 (13 Nov 2003)
+
+  13 Nov 2003; Chuck Short <zul@gentoo.org> epic4-1.1.14.ebuild:
+  Marked stable for x86 and ia64.
+
+  13 Nov 2003; Chuck Short <zul@gentoo.org> epic4-1.1.12.ebuild:
+  Remove /usr/share/epic/help/Makefile and /usr/share/epic/help/CVS
+  as per #33235.
+
+  07 Oct 2003; Tavis Ormandy <taviso@gentoo.org> epic4-1.1.12.ebuild:
+  added ~alpha keyword.
+
+  31 Jul 2003; Greg Fitzgerald <gregf@gentoo.org> epic4-1.0.1-r1.ebuild,
+  epic4-1.0.1-r2.ebuild, epic4-1.1.7-r1.ebuild, epic4-1.1.7.ebuild:
+  Removed ebuilds effected by security hole.
+
+*epic4-1.1.12 (31 Jul 2003)
+
+  01 Nov 2003; Guy Martin <gmsoft@gentoo.org> epic4-1.1.12.ebuild :
+  Added hppa to KEYWORDS.
+
+  31 Jul 2003; Greg Fitzgerald <gregf@gentoo.org> epic4-1.1.12.ebuild:
+  Version bump. Fixes bug #21809.
+
+  18 Jul 2003; Martin Schlemmer <azarah@gentoo.org> epic4-1.0.1-r2.ebuild,
+  files/epic4-1.0.1-gcc33.patch:
+  Fix compile issues with gcc-3.3 - macro handling related to spaces in
+  front of the ## operand changed.
+
+*epic4-1.1.11 (13 Apr 2003)
+
+  04 May 2003; Jon Portnoy <avenj@gentoo.org> epic4-1.1.11.ebuild :
+  Ebuild now respects tcltk USE flag for tcl support.
+
+  13 Apr 2003; Jon Portnoy <avenj@gentoo.org> epic4-1.1.11.ebuild :
+  Version bump, fixes bug #19092.
+
+  24 Mar 2003; Daniel Ahlberg <aliz@gentoo.org> *.ebuild :
+  Changed SRC_URI from epicsol.org to prbh.org due to persistent DoS attacks. From nsx in #gentoo.
+
+*epic4-1.1.10 (09 Feb 2003)
+
+  03 Dec 2002; John M. Burks <nsx@rm-f.net> epic4-1.1.10.ebuild :
+  Added new version.  Also added --without-tcl, since it won't compile
+  properly if you do have tcl on your system.
+
+  10 Feb 2003; Jon Portnoy <avenj@gentoo.org> epic4-1.1.10.ebuild :
+  Minor fix to the 'local' script submitted by John M. Burks
+  <nsx@rm-f.net>
+
+*epic4-1.1.7-r1 (22 Oct 2002)
+
+  03 Dec 2002; John M. Burks <nsx@rm-f.net> epic4-1.1.7-r1.ebuild :
+  Changed optimization flags to -O.  This was requested by hop himself.
+  Also changed the url for the help file to the most recent help file
+  available.  Added global script.
+
+  07 Dec 2002; Jack Morgan <jmorgan@gentoo.org> epic4-1.0.1-r1.ebuild :
+  Changed sparc64 to sparc keyword
+
+  15 Nov 2002; phoen][x <phoenix@gentoo.org> epic4-1.1.7.ebuild :
+
+  Used flag-o-matic to replace "-O3" with "-O2". Seems like epic4
+  did not ork on a p3 with "-O3" (check bug #10642) - bitchx has 
+  the same problem, that's why i tried to fix epic with the same solution.
+
+  30 Oct 2002; Jon Nall <nall@gentoo.org> epic4-1.1.7.ebuild :
+
+  Added ~ppc to KEYWORDS
+
+  22 Oct 2002; Martin Schlemmer <azarah@gentoo.org> epic4-1.1.7.ebuild :
+
+  Update version.  Add "ipv6", "perl" and "ssl" USE flags.
+
+*epic4-1.1.6-r1 (21 Oct 2002)
+
+  15 Nov 2002; phoen][x <phoenix@gentoo.org> epic4-1.1.6-r1.ebuild,
+  files/digest-epic4-1.1.6-r1 :
+
+  Removed this ebuild from the tree.
+
+  21 Oct 2002; phoen][x <phoenix@gentoo.org> epic4-1.1.6-r1.ebuild,
+  files/digest-epic4-1.1.6-r1 :
+
+  Bumped to new version. Removed the "ppc" flag from KEYWORDS.
+
+*epic4-1.0.1-r2 (1 Feb 2002)
+
+  09 Feb 2003; John M. Burks <nsx@rm-f.net> : Use -O, always.  Also updated
+  url for the newest help file available.  Also added a global script.
+
+  15 Nov 2002; phoen][x <phoenix@gentoo.org> epic4-1.0.1-r1.ebuild :
+
+  Used flag-o-matic to replace "-O3" with "-O2". Seems like epic4
+  did not ork on a p3 with "-O3" (check bug #10642) - bitchx has 
+  the same problem, that's why i tried to fix epic with the same solution.
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
@@ -11,3 +255,9 @@
   comments should well explained and written in clean English. The details about
   writing correct changelogs are explained in the skel.ChangeLog file which you
   can find in the root directory of the portage repository.
+
+*epic4-1.0.1-r1 (24 Mar 2003)
+ 
+  13 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
diff --git a/net-irc/epic4/Manifest b/net-irc/epic4/Manifest
index 7b98b0bd29b1..4c0fad5d21cf 100644
--- a/net-irc/epic4/Manifest
+++ b/net-irc/epic4/Manifest
@@ -1,14 +1,21 @@
-MD5 de9ccf8101452fdb26f24d817829911f ChangeLog 2833
-MD5 75544b79d292a2ff9be99c4c50d9bfad epic4-1.0.1-r1.ebuild 1068
-MD5 8ba4ab73d80b324a49ecb94ec8f82198 epic4-1.1.7.ebuild 1454
-MD5 8f20db4ad2544034beab4e99de66ec0c epic4-1.0.1-r2.ebuild 1551
-MD5 32acafaa952f6ae27c7207fad09bf625 epic4-1.1.10.ebuild 2092
-MD5 d38e0deae457dd661ceb3db43cfb26d8 epic4-1.1.7-r1.ebuild 1940
-MD5 2a53a442625b58d4c3c5c7cebafca7f6 epic4-1.1.11.ebuild 1840
-MD5 03a79394216d45e22c33ba93ac2cd364 files/digest-epic4-1.0.1-r1 129
-MD5 1a7ec7aadf77db45a41d52234bd5bef6 files/digest-epic4-1.1.7 130
-MD5 bec8cf892d8ff8ac39c9518af074a288 files/digest-epic4-1.0.1-r2 134
-MD5 2289cb86bb8dc556621d35033fe11471 files/digest-epic4-1.1.10 136
-MD5 2e444ba876c4db6cd445faba18dc5bd6 files/digest-epic4-1.1.7-r1 135
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 339eee79345ae2da8c723ca1688716e2 ChangeLog 9200
+MD5 0482a9daf7e246c66859edbbaffc3d67 epic4-1.1.16-r1.ebuild 2070
+MD5 e4c12d859ec24fec1886a4b1ee13325c epic4-2.0-r1.ebuild 2334
+MD5 df52c5bf4a161ebab07e071238ab400a epic4-2.2.ebuild 2192
+MD5 202b467aa8e4fa72afb00aa40b4f423d files/2.0-toggle-stop-screen.patch 1628
+MD5 8668b72bb8d4af8c83ddcbb8fc606022 files/digest-epic4-1.1.16-r1 136
+MD5 cbb9caa10a6573474c6e18ca5e01b85e files/digest-epic4-2.0-r1 133
+MD5 5d98357a61d5adf165c257471d1d41b3 files/digest-epic4-2.2 133
+MD5 a0a06abf43f925f0472c026573bf622f files/epic-defaultserver.patch 620
 MD5 1d5075abb862c8b98c2b16df96e37407 files/local 21043
-MD5 aa8d68a42c147390f37438a6e8171fd1 files/digest-epic4-1.1.11 136
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDJDixI1lqEGTUzyQRAq6/AKDQIRowXZdTUHkpJFJZ7jK2GBY81gCfYA70
+B0X2JsdGMFxP6AsAObNMHSs=
+=Y4xN
+-----END PGP SIGNATURE-----
diff --git a/net-irc/epic4/epic4-1.1.16-r1.ebuild b/net-irc/epic4/epic4-1.1.16-r1.ebuild
index 1ccd670c9cb6..31813f0ef6a5 100644
--- a/net-irc/epic4/epic4-1.1.16-r1.ebuild
+++ b/net-irc/epic4/epic4-1.1.16-r1.ebuild
@@ -1,27 +1,27 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/epic4-1.1.16-r1.ebuild,v 1.1 2004/01/03 17:40:05 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/epic4-1.1.16-r1.ebuild,v 1.1.1.1 2005/11/30 09:48:53 chriswhite Exp $
 
-IUSE="ipv6 perl ssl tcltk"
+inherit flag-o-matic eutils
 
 DESCRIPTION="Epic4 IRC Client"
+HOMEPAGE="http://epicsol.org/"
 SRC_URI="ftp://prbh.org/pub/epic/EPIC4-ALPHA/${P}.tar.bz2
-	 ftp://prbh.org/pub/epic/EPIC4-PRODUCTION/epic4-help-20030114.tar.gz"
-HOMEPAGE="http://epicsol.org"
+	ftp://prbh.org/pub/epic/EPIC4-PRODUCTION/epic4-help-20030114.tar.gz"
 
-SLOT="0"
 LICENSE="as-is"
-KEYWORDS="~x86 ~ppc ia64 ~alpha ~hppa amd64"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ia64 ~alpha hppa amd64"
+IUSE="ipv6 perl ssl tcltk"
 
 DEPEND=">=sys-libs/ncurses-5.2
 	perl? ( >=dev-lang/perl-5.6.1 )
 	ssl? ( >=dev-libs/openssl-0.9.5 )
 	tcltk? ( dev-lang/tcl )"
 
-inherit flag-o-matic
-replace-flags "-O?" "-O"
-
 src_compile() {
+	replace-flags "-O?" "-O"
+
 	myconf=""
 
 	epatch ${FILESDIR}/epic-defaultserver.patch
@@ -33,12 +33,12 @@ src_compile() {
 
 	econf \
 		--libexecdir=/usr/lib/misc \
-		${myconf} || die
+		${myconf} || die "econf failed"
 
-	make || die
+	make || die "make failed"
 }
 
-src_install () {
+src_install() {
 	einstall \
 		sharedir=${D}/usr/share \
 		libexecdir=${D}/usr/lib/misc || die
@@ -68,7 +68,7 @@ pkg_postinst() {
 	einfo "file.  If you want to prevent this file from being installed"
 	einfo "in the future, simply create an empty file with this name."
 
-	if [ ! -e /usr/share/epic/script/local ]; then
-		cp ${FILESDIR}/local /usr/share/epic/script/
+	if [ ! -f ${ROOT}/usr/share/epic/script/local ]; then
+		cp ${FILESDIR}/local ${ROOT}/usr/share/epic/script/
 	fi
 }
diff --git a/net-irc/epic4/epic4-2.0-r1.ebuild b/net-irc/epic4/epic4-2.0-r1.ebuild
index 15bdb3c48f69..396bc18730ef 100644
--- a/net-irc/epic4/epic4-2.0-r1.ebuild
+++ b/net-irc/epic4/epic4-2.0-r1.ebuild
@@ -1,23 +1,31 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/epic4-2.0-r1.ebuild,v 1.1 2004/08/02 21:12:09 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/epic4-2.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:48:53 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
 DESCRIPTION="Epic4 IRC Client"
 HOMEPAGE="http://epicsol.org/"
 SRC_URI="ftp://ftp.epicsol.org/pub/epic/EPIC4-PRODUCTION/${P}.tar.bz2
-	 ftp://prbh.org/pub/epic/EPIC4-PRODUCTION/epic4-help-20040801.tar.gz"
+	ftp://prbh.org/pub/epic/EPIC4-PRODUCTION/epic4-help-20040801.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~ia64 alpha hppa sparc ~amd64"
+KEYWORDS="x86 ppc ~ia64 alpha hppa sparc amd64 ppc-macos"
 IUSE="ipv6 perl ssl"
 
 DEPEND=">=sys-libs/ncurses-5.2
 	perl? ( >=dev-lang/perl-5.6.1 )
 	ssl? ( >=dev-libs/openssl-0.9.5 )"
 
+pkg_setup() {
+	if use perl && built_with_use dev-lang/perl ithreads
+	then
+		error "You need perl compiled with USE=\"-ithreads\" to be able to compile epic4."
+		die "perl with USE=\"-ithreads\" needed"
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
diff --git a/net-irc/epic4/epic4-2.2.ebuild b/net-irc/epic4/epic4-2.2.ebuild
index 657d269c6abf..95aa63051c8d 100644
--- a/net-irc/epic4/epic4-2.2.ebuild
+++ b/net-irc/epic4/epic4-2.2.ebuild
@@ -1,25 +1,33 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/epic4-2.2.ebuild,v 1.1 2005/02/17 03:16:05 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/epic4-2.2.ebuild,v 1.1.1.1 2005/11/30 09:48:52 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
-HELP_V="20040801"
+HELP_V="20050315"
 
 DESCRIPTION="Epic4 IRC Client"
 HOMEPAGE="http://epicsol.org/"
 SRC_URI="ftp://ftp.epicsol.org/pub/epic/EPIC4-PRODUCTION/${P}.tar.bz2
-	 ftp://prbh.org/pub/epic/EPIC4-PRODUCTION/epic4-help-${HELP_V}.tar.gz"
+	ftp://prbh.org/pub/epic/EPIC4-PRODUCTION/epic4-help-${HELP_V}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~ia64 ~alpha ~hppa ~sparc ~amd64 ~ppc-macos"
+KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc-macos sparc x86"
 IUSE="ipv6 perl ssl"
 
 DEPEND=">=sys-libs/ncurses-5.2
 	perl? ( >=dev-lang/perl-5.6.1 )
 	ssl? ( >=dev-libs/openssl-0.9.5 )"
 
+pkg_setup() {
+	if use perl && built_with_use dev-lang/perl ithreads
+	then
+		error "You need perl compiled with USE=\"-ithreads\" to be able to compile epic4."
+		die "perl with USE=\"-ithreads\" needed"
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -55,7 +63,8 @@ src_install () {
 		*.txt colors EPIC* IRCII_VERSIONS local_vars missing new-load \
 		nicknames outputhelp SILLINESS TS4
 
-	mv ${WORKDIR}/help/* ${D}/usr/share/epic/help
+	insinto /usr/share/epic/help
+	doins -r ${WORKDIR}/help/* || die "doins failed"
 }
 
 pkg_postinst() {
diff --git a/net-irc/epic4/files/digest-epic4-2.2 b/net-irc/epic4/files/digest-epic4-2.2
index e5666ef06d10..c48eabe180ed 100644
--- a/net-irc/epic4/files/digest-epic4-2.2
+++ b/net-irc/epic4/files/digest-epic4-2.2
@@ -1,2 +1,2 @@
 MD5 e4d5d799b43f3c7882e8e7616099d4fc epic4-2.2.tar.bz2 623254
-MD5 c283d1c17826708bc265e3f91b860f54 epic4-help-20040801.tar.gz 302562
+MD5 9888d1af465ca72bf9a02487264071a5 epic4-help-20050315.tar.gz 332502
diff --git a/net-irc/epic4/files/local b/net-irc/epic4/files/local
index 3e6777bc4395..5621702142b3 100644
--- a/net-irc/epic4/files/local
+++ b/net-irc/epic4/files/local
@@ -1,3 +1,7 @@
+if (fexist(~/.ircrc) == -1 && fexist(~/.epicrc == -1)) {
+# set this if you want logging
+# assign win_logdir logs
+
 # uncomment this if you don't want time stamping
 # timestamp off
 
@@ -15,6 +19,7 @@ bind ^[6 parse_command window swap 6
 bind ^[7 parse_command window swap 7
 bind ^[8 parse_command window swap 8
 bind ^[9 parse_command window swap 9
+bind ^[0 parse_command window swap 10
 
 
 # *** variable sets ***
@@ -24,10 +29,39 @@ set dcc_auto_send_rejects off
 set dcc_timeout 60
 set dcc_sliding_window 1000
 set auto_rejoin off
+set log_rewrite $log_format($1-)
+set mangle_logfiles all
 set mirc_broken_dcc_resume on
 set status_format 16,12%T [%R] %=%@%N%*%#%S%H%B%Q%A%C%+%I%O%M%F%L %D
 
 
+# make sure that our logging directory exists
+
+if (!(win_logdir == [])) {
+	@mkdir($win_logdir)
+}
+
+
+# create status and msg windows, if necessary
+
+if (winnam(status) == []) {
+	window 1 name status level CRAP,PUBLIC,WALLS,WALLOPS,SNOTES,CTCP,USERLOG1,USERLOG2,USERLOG3,USERLOG4
+	if (!(win_logdir == [])) {
+		^window logfile $win_logdir/status.log log on
+	}
+	@ setitem(my_wins 0 blank_item)
+	@ setitem(my_wins 1 status)
+}
+
+if (winnam(queries) == []) {
+	window new name queries level msgs,actions,dcc hide
+	if (!(win_logdir == [])) {
+		^window queries logfile $win_logdir/msg.log log on
+	}
+	@ setitem(my_wins 2 queries)
+}
+
+
 # *** aliases ***
 
 alias ban {
@@ -154,6 +188,26 @@ alias format_idle_time {
 	return ${[$0] % 60} seconds
 }
 
+alias j jnw
+
+alias jnw {
+	@:ref_num = matchitem(my_wins $0))
+
+	if ( (ref_num < 3) || (winnum($ref_num) == -1) ) {
+		window new hide
+		window swap last
+		if (!(win_logdir == [])) {
+			^window logfile $win_logdir/$0.log log on
+		}
+		@ setitem(my_wins $winnum(0) $0)
+	} {
+		window swap $ref_num
+	}
+	//join $*
+}
+
+alias join jnw
+
 alias k {
 	kick $C $*
 }
@@ -163,6 +217,14 @@ alias kb {
 	k $*
 }
 
+alias log_format {
+	if ( left(1 $0) == [\(] ) {
+		return $strftime($time() (%m/%d/%Y %I:%M:%S %P)) $2-
+	} else {
+		return $strftime($time() (%m/%d/%Y %I:%M:%S %P)) $0-
+	}
+}
+
 alias memoserv { quote memoserv $* }
 
 alias mdop {
@@ -227,7 +289,9 @@ alias scan {
 		      } {
 			if (n2) {
 			  @:num += 2
-			 } { @:num++ }
+			} {
+			  @:num++
+			}
 		      }
 		    }
 	}
@@ -557,10 +621,36 @@ on ^333 "*" {
 	xecho -w $winchan($1) $ts()$banner Topic set by $2 $strftime($3 %c)
 }
 
+on ^353 "*" {
+	xecho -w $winchan($2)
+	xecho -w $winchan($2) -b 16Users on $2:
+	fe ($3-) n1 n2 n3 n4 {
+		xecho -w $winchan($2) 14|  13$[17]n1 $[17]n2 $[17]n3 $[17]n414  |
+		if (n4) {
+		  @total_nicks += 4
+		} {
+		  if (n3) {
+		    @total_nicks += 3
+		  } {
+		    if (n2) {
+		      @total_nicks += 2
+		    } {
+		      @total_nicks++
+		    }
+		  }
+		}
+	}
+}
+
+on ^366 "*" {
+	xecho -w $winchan($1) Total number of users on $1: $total_nicks
+	xecho -w $winchan($1)
+	@total_nicks = 0
+}
+
 on ^367 "*" {
 	xecho -w 1 $banner $1 $2 $3 $strftime($4 %c)
 }
-
 # tabkey.jm: a full-featured tab key module for epic
 #
 # written by nsx
@@ -607,7 +697,8 @@ on ^367 "*" {
 # If our fragment does not begin with '#' or '&', nickname completion is
 # attempted.  This matches the word fragment against all nicknames in the
 # current channel.  If no matches are found, we then match the word fragment
-# against all nicknames in all other channels we're on.
+# against all nicknames in all other channels we're on and nicknames in our
+# notify list that are presently online.
 #
 # If there was multiple matches for the word fragment, we replace the word
 # fragment with the common prefix for these matches, if any.  We also display
@@ -641,6 +732,9 @@ on ^367 "*" {
 # For each DCC CHAT connection that takes place, we add the other party to
 # our nickname history.
 #
+# For each notify signon, we add the nickname that signed on to our nickname
+# history.
+#
 # Each time a nickname is added to our nickname history, we first remove any
 # prior occurrences of the nickname that may exist.  We then check to see if
 # our nickname history is at its capacity (10 nicknames).  If it is, the oldest
@@ -817,9 +911,14 @@ alias nick_complete {
 	if (frag_matches == []) {
 		^local nick_list
 
-		fe ($remw($C $mychannels())) channel {
-			@push(nick_list $onchannel($channel))
+		fe ($remw($C $mychannels())) nick_name {
+			@push(nick_list $onchannel($nick_name))
+		}
+
+		fe ($notify(on)) nick_name {
+			@push(nick_list $nick_name)
 		}
+
 		@:nick_list = uniq($nick_list)
 		@:frag_matches = pattern($word_frag% $nick_list)
 	}
@@ -873,6 +972,10 @@ on #^msg 10 "*" {
 	@add_nickname($0)
 }
 
+on #^notify_signon 10 "*" {
+	@add_nickname($0)
+}
+
 on #^send_dcc_chat 10 "*" {
 	@add_nickname(=$0)
 }
@@ -880,3 +983,4 @@ on #^send_dcc_chat 10 "*" {
 on #^send_msg 10 "*" {
 	@add_nickname($0)
 }
+}
diff --git a/net-irc/epic5/ChangeLog b/net-irc/epic5/ChangeLog
index c67de15f7c66..02016b3b6b7c 100644
--- a/net-irc/epic5/ChangeLog
+++ b/net-irc/epic5/ChangeLog
@@ -1,6 +1,31 @@
 # ChangeLog for net-irc/epic5
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/epic5/ChangeLog,v 1.1 2004/06/20 02:30:19 swegener Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/epic5/ChangeLog,v 1.1.1.1 2005/11/30 09:48:52 chriswhite Exp $
+
+  08 Jul 2005; David Holm <dholm@gentoo.org> epic5-0.0.5.ebuild:
+  Added to ~ppc.
+
+*epic5-0.0.5 (07 Jul 2005)
+
+  07 Jul 2005; Sven Wegener <swegener@gentoo.org> -epic5-0.0.4.ebuild,
+  +epic5-0.0.5.ebuild:
+  Version bump.
+
+  22 Apr 2005; Alin Nastac <mrness@gentoo.org> epic5-0.0.4.ebuild:
+  net-misc/dante -> net-proxy/dante
+
+*epic5-0.0.4 (10 Apr 2005)
+
+  10 Apr 2005; Sven Wegener <swegener@gentoo.org>
+  -files/0.0.3-ipv6-fix.patch, -epic5-0.0.3.ebuild, +epic5-0.0.4.ebuild:
+  Version bump.
+
+*epic5-0.0.3 (17 Feb 2005)
+
+  17 Feb 2005; Sven Wegener <swegener@gentoo.org>
+  -files/0.0.2-segfault-fix.patch, +files/0.0.3-ipv6-fix.patch,
+  -epic5-0.0.2.ebuild, +epic5-0.0.3.ebuild:
+  Version bump.
 
 *epic5-0.0.2 (20 Jun 2004)
 
diff --git a/net-irc/epic5/Manifest b/net-irc/epic5/Manifest
index 553bee5e543d..6489effbfcdc 100644
--- a/net-irc/epic5/Manifest
+++ b/net-irc/epic5/Manifest
@@ -1,4 +1,5 @@
-MD5 69cf0b49889785312c28a067de2ad6b2 epic5-0.0.2.ebuild 1928
-MD5 a0a06abf43f925f0472c026573bf622f files/epic-defaultserver.patch 620
-MD5 cbc7070ed83fbc5bd12ecea5821f6e74 files/digest-epic5-0.0.2 64
-MD5 1d5075abb862c8b98c2b16df96e37407 files/local 21043
+MD5 ba573f8c1348fcb367a1bb049259754f ChangeLog 1128
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+MD5 ff5c6d764dcff80c62e1ab421a86e502 epic5-0.0.5.ebuild 1340
+MD5 6aa61e3d4cb005aac02541c2d2d1fff1 files/epic-defaultserver.patch 610
+MD5 221f4dbd04ae28838381e7eeda7210d6 files/digest-epic5-0.0.5 64
diff --git a/net-irc/epic5/epic5-0.0.5.ebuild b/net-irc/epic5/epic5-0.0.5.ebuild
index e39f57536ae9..6463a5f248c0 100644
--- a/net-irc/epic5/epic5-0.0.5.ebuild
+++ b/net-irc/epic5/epic5-0.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/epic5/epic5-0.0.5.ebuild,v 1.1 2005/07/07 15:58:31 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/epic5/epic5-0.0.5.ebuild,v 1.1.1.1 2005/11/30 09:48:52 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.epicsol.org/pub/epic/EPIC5-ALPHA/${P}.tar.bz2"
 HOMEPAGE="http://epicsol.org/"
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 IUSE="ipv6 perl ssl tcltk socks5"
 
 DEPEND=">=sys-libs/ncurses-5.2
diff --git a/net-irc/ezbounce/ChangeLog b/net-irc/ezbounce/ChangeLog
index c99bce5fdb5d..cda786d579ea 100644
--- a/net-irc/ezbounce/ChangeLog
+++ b/net-irc/ezbounce/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for net-irc/ezbounce
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ezbounce/ChangeLog,v 1.1 2003/11/22 02:00:01 zul Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ezbounce/ChangeLog,v 1.1.1.1 2005/11/30 09:48:57 chriswhite Exp $
+
+  12 Sep 2004; Sven Wegener <swegener@gentoo.org> ezbounce-1.04a.ebuild:
+  Modified ebuild to install sample configuration files. Closes bug #63780.
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  ezbounce-1.04a.ebuild:
+  Masked ezbounce-1.04a.ebuild testing for ppc
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> ezbounce-1.04a.ebuild:
+  Add inherit eutils
+
+  04 Jan 2004; Chuck Short <zul@gentoo.org> ezbounce-1.04a.ebuild:
+  Marked stable, updated header.
 
 *ezbounce-1.04a (21 Nov 2003)
 
diff --git a/net-irc/ezbounce/Manifest b/net-irc/ezbounce/Manifest
index 4becfcbd50bd..914c2bca02d1 100644
--- a/net-irc/ezbounce/Manifest
+++ b/net-irc/ezbounce/Manifest
@@ -1,2 +1,15 @@
-MD5 38f5f27665515b524b8de649ddfba903 ezbounce-1.04a.ebuild 665
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6f851d845e72186a1bcd2c916feb8907 ChangeLog 925
+MD5 76896e5070f62fda4201255663b9c7d2 ezbounce-1.04a.ebuild 803
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 MD5 77781fdeabcd004ae4478c14971a9644 files/digest-ezbounce-1.04a 66
+MD5 2c41dd7703df2b1d7c993f8665105122 files/ezbounce-1.04a-crash-fix.patch 945
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBRIH8I1lqEGTUzyQRAj9dAJ9qPVQRlzVgW5im+ujWGAvFgPERjgCfZ1WR
+zxiw9z7MQo7LfWeBxcavKMQ=
+=LqsF
+-----END PGP SIGNATURE-----
diff --git a/net-irc/ezbounce/ezbounce-1.04a.ebuild b/net-irc/ezbounce/ezbounce-1.04a.ebuild
index 2228dfa244d7..169fdb4cf29f 100644
--- a/net-irc/ezbounce/ezbounce-1.04a.ebuild
+++ b/net-irc/ezbounce/ezbounce-1.04a.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ezbounce/ezbounce-1.04a.ebuild,v 1.1 2003/11/22 02:00:01 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ezbounce/ezbounce-1.04a.ebuild,v 1.1.1.1 2005/11/30 09:48:58 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="ezbounce is a small IRC bouncer"
 HOMEPAGE="http://druglord.freelsd.org/ezbounce/"
@@ -8,7 +10,7 @@ SRC_URI="http://druglord.freelsd.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 
 IUSE="ssl"
 DEPEND=">=net-misc/mdidentd-1.04a
@@ -31,6 +33,6 @@ src_compile() {
 
 src_install() {
 	dobin ezbounce
-	dodoc README
+	dodoc CHANGES TODO README ezb.conf sample.*
 	doman misc/ezbounce.1
 }
diff --git a/net-irc/iip/ChangeLog b/net-irc/iip/ChangeLog
index a67ee9b57f2d..f70892907a7d 100644
--- a/net-irc/iip/ChangeLog
+++ b/net-irc/iip/ChangeLog
@@ -1,6 +1,41 @@
 # ChangeLog for net-irc/iip
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/iip/ChangeLog,v 1.1 2003/09/27 22:51:07 zul Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/iip/ChangeLog,v 1.1.1.1 2005/11/30 09:48:56 chriswhite Exp $
+
+  27 Jul 2004; Sven Wegener <swegener@gentoo.org> iip-1.1.0.ebuild,
+  iip-1.2.ebuild:
+  Removed the enewuser command in src_install for bug #58526. The created user
+  isn't used later on. Made iip-1.1.0 CFLAGS aware. Added dev-lang/perl to build
+  time dependencies for 1.2.0 as pod2man is needed to create the man page.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> iip-1.1.0.ebuild,
+  iip-1.2.ebuild:
+  virtual/glibc -> virtual/libc
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> iip-1.1.0.ebuild,
+  iip-1.2.ebuild:
+  Masked iip-1.2.ebuild testing for ppc
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> iip-1.1.0.ebuild:
+  Masked iip-1.1.0.ebuild testing for ppc
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> iip-1.1.0.ebuild,
+  iip-1.2.ebuild:
+  Add inherit eutils
+
+  23 Jan 2004; Chuck Short <zul@gentoo.org> iip-1.2.ebuild:
+  Ebuild clean ups fixes sandbox issues. closes 38855.
+
+*iip-1.2 (22 Jan 2004)
+
+  22 Jan 2004; <zul@gentoo.org> iip-1.2.ebuild:
+  Added sed to remove -Werror in src/Makefile. Closes #38855.
+
+  18 Jan 2004; Chuck Short <zul@gentoo.org> iip-1.1.0.ebuild:
+  Version bump, closes #35805.
+
+  04 Jan 2004; Chuck Short <zul@gentoo.org> iip-1.1.0.ebuild:
+  Updated header.
 
 *iip-1.1.0 (27 Sep 2003)
 
diff --git a/net-irc/iip/Manifest b/net-irc/iip/Manifest
index d212d74cd26d..a6303dce761b 100644
--- a/net-irc/iip/Manifest
+++ b/net-irc/iip/Manifest
@@ -1,2 +1,16 @@
-MD5 cbff1e5ad317bd4970cdd49358daa9c4 iip-1.1.0.ebuild 687
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b9fd0a64281812ea5286bb2fd611e7e9 ChangeLog 1687
+MD5 830d7f87c1677d10dff173631e3a0ddb iip-1.1.0.ebuild 951
+MD5 35e841307a152be82d8e9f0bab392625 iip-1.2.ebuild 829
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 MD5 6c9503150f532297b61909618997f875 files/digest-iip-1.1.0 58
+MD5 4a0260da2d54bb5646ddc91b604ce49b files/digest-iip-1.2 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.4 (GNU/Linux)
+
+iD8DBQFBBpDCAXomK8S72HoRApvCAJ0Tc6+zJb0v+AyHNbHvTqO6WLk0iwCfVXTS
+gUw6wCSM4gWsF3SYj+z5pyU=
+=q12S
+-----END PGP SIGNATURE-----
diff --git a/net-irc/iip/iip-1.1.0.ebuild b/net-irc/iip/iip-1.1.0.ebuild
index 145b5a76e4be..a46c78ce820d 100644
--- a/net-irc/iip/iip-1.1.0.ebuild
+++ b/net-irc/iip/iip-1.1.0.ebuild
@@ -1,31 +1,41 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/iip/iip-1.1.0.ebuild,v 1.1 2003/09/27 22:51:07 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/iip/iip-1.1.0.ebuild,v 1.1.1.1 2005/11/30 09:48:56 chriswhite Exp $
 
-S="${WORKDIR}/${P}/src"
-DESCRIPTION="Proxy server for encrypted anonymous irc-like network"
+DESCRIPTION="Proxy server for encrypted anonymous IRC-like network"
 HOMEPAGE="http://www.invisiblenet.net/iip/"
 SRC_URI="mirror://sourceforge/invisibleip/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 IUSE=""
 
-DEPEND="virtual/glibc"
-RDEPEND=""
+S="${WORKDIR}/${P}/src"
+
+RDEPEND="virtual/libc"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+src_unpack() {
+	unpack ${A}
+
+	sed -i -e "s/-g -Wall -O2/${CFLAGS}/" ${S}/Makefile || die "sed failed"
+}
 
 src_compile() {
-	emake || die
+	emake || die "emake failed"
 }
 
 src_install() {
-	ehome=/home/iip
-	enewuser iip
-	dodir /usr/man/man1
-	dodir /usr/bin
-	dodir /usr/share/iip
-	make PREFIX=${D}usr INSTALLFILEPATH=${D}usr/share/iip/ install || die
+	dodir /usr/bin /usr/share/man/man1
+
+	make \
+		PREFIX=${D}/usr \
+		INSTALLMANDST=${D}/usr/share/man/man1/ \
+		INSTALLFILEPATH=${D}/usr/share/iip/ \
+		INSTALLUSER=root \
+		install || die "make install failed"
+
 	cd ${WORKDIR}/${P}
-	dodoc AUTHORS  CHANGELOG  COPYING  INSTALL  README
+	dodoc AUTHORS CHANGELOG README
 }
-
diff --git a/net-irc/iip/iip-1.2.ebuild b/net-irc/iip/iip-1.2.ebuild
index 3d0d4bb4cba2..ff56251394c5 100644
--- a/net-irc/iip/iip-1.2.ebuild
+++ b/net-irc/iip/iip-1.2.ebuild
@@ -1,36 +1,36 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/iip/iip-1.2.ebuild,v 1.1 2004/01/19 01:32:48 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/iip/iip-1.2.ebuild,v 1.1.1.1 2005/11/30 09:48:56 chriswhite Exp $
 
-MY_P="iip-1.2-dev1"
+MY_P="${P}-dev1"
 
-DESCRIPTION="Proxy server for encrypted anonymous irc-like network"
+DESCRIPTION="Proxy server for encrypted anonymous IRC-like network"
 HOMEPAGE="http://www.invisiblenet.net/iip/"
 SRC_URI="mirror://sourceforge/invisibleip/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 IUSE=""
 
-DEPEND="virtual/glibc
-		dev-libs/openssl"
-RDEPEND=""
+RDEPEND="virtual/libc
+	dev-libs/openssl"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	>=sys-apps/sed-4"
 
 S="${WORKDIR}/${MY_P}"
 
 src_compile() {
-	econf || die
-	emake || die
+	econf || die "econf failed"
+
+	sed -i \
+		-e "s:-Werror::" ${S}/src/Makefile || \
+		die "sed Makefile failed"
+
+	emake || die "emake failed"
 }
 
 src_install() {
-	einstall || die
-	ehome=/home/iip
-	enewuser iip
-	dodir /usr/man/man1
-	dodir /usr/bin
-	dodir /usr/share/iip
-	make PREFIX=${D}/usr INSTALLFILEPATH=${D}/usr/share/iip/ install || die
-	dodoc AUTHORS  CHANGELOG  COPYING  INSTALL  README
+	make DESTDIR=${D} install || die "make install failed"
+	dodoc AUTHORS README
 }
-
diff --git a/net-irc/irc-client/ChangeLog b/net-irc/irc-client/ChangeLog
index 1c5aaf0bfa0a..a2399056d1cd 100644
--- a/net-irc/irc-client/ChangeLog
+++ b/net-irc/irc-client/ChangeLog
@@ -1,6 +1,36 @@
 # ChangeLog for net-irc/irc-client
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irc-client/ChangeLog,v 1.1 2003/09/10 23:56:26 zul Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irc-client/ChangeLog,v 1.1.1.1 2005/11/30 09:48:54 chriswhite Exp $
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  irc-client-2.10.3_p3.ebuild:
+  Stable on ppc.
+
+  13 Jul 2004; Sven Wegener <swegener@gentoo.org> irc-client-2.10.3_p3.ebuild:
+  Updated SRC_URI.
+
+*irc-client-2.10.3_p7 (13 Jul 2004)
+
+  13 Jul 2004; Sven Wegener <swegener@gentoo.org>
+  +irc-client-2.10.3_p7.ebuild:
+  Version bump.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  irc-client-2.10.3_p3.ebuild:
+  virtual/glibc -> virtual/libc
+
+  21 Jun 2004; Sven Wegener <swegener@gentoo.org> +metadata.xml,
+  irc-client-2.10.3_p3.ebuild:
+  Removed RDEPEND="${DEPEND}" and added metadata.xml.
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  irc-client-2.10.3_p3.ebuild:
+  Masked irc-client-2.10.3_p3.ebuild testing for ppc
+
+*irc-client-2.10.3_p3 (29 Jan 2004)
+
+  29 Jan 2004; Chuck Short <zul@gentoo.org> irc-client-2.10.3_p3.ebuild:
+  Header cleanups, marked stable for x86.
 
   10 Sep 2003; Chuck Short <zul@gentoo.org> :
   Initial Version, ebuild written by Jesus Perez <jesus.pr@worldonline.es>
diff --git a/net-irc/irc-client/Manifest b/net-irc/irc-client/Manifest
index a5750ec7abf1..9def773e63e1 100644
--- a/net-irc/irc-client/Manifest
+++ b/net-irc/irc-client/Manifest
@@ -1,2 +1,6 @@
-MD5 88eabe7a9031e19fac5077fd0ccd5d7b irc-client-2.10.3_p3.ebuild 1214
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+MD5 b8e8ef7ce27c6526730b7f0607e867e6 ChangeLog 1255
+MD5 87b4dd1c2ecbab3350f2f3d7eaf986cc irc-client-2.10.3_p7.ebuild 987
+MD5 88e9932652b735171c864c361b52acb8 irc-client-2.10.3_p3.ebuild 1198
+MD5 04e939ae7f9a5e836ed87d73fab65d98 files/digest-irc-client-2.10.3_p7 60
 MD5 11c6c72ebc4796aa655378f37a51cfa6 files/digest-irc-client-2.10.3_p3 60
diff --git a/net-irc/irc-client/irc-client-2.10.3_p3.ebuild b/net-irc/irc-client/irc-client-2.10.3_p3.ebuild
index 33f11193b0f2..ae969c30f10c 100644
--- a/net-irc/irc-client/irc-client-2.10.3_p3.ebuild
+++ b/net-irc/irc-client/irc-client-2.10.3_p3.ebuild
@@ -1,31 +1,27 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irc-client/irc-client-2.10.3_p3.ebuild,v 1.1 2003/09/10 23:56:26 zul Exp $
-			   
-MY_P=irc
-MY_PV=2.10.3p3
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irc-client/irc-client-2.10.3_p3.ebuild,v 1.1.1.1 2005/11/30 09:48:54 chriswhite Exp $
+
+MY_P=irc${PV/_/}
+
 DESCRIPTION="A simplistic RFC compliant IRC client"
 HOMEPAGE="http://www.irc.org"
-SRC_URI="ftp://ftp.irc.org/irc/server/${MY_P}${MY_PV}.tgz
-		 ftp://ftp.funet.fi/pub/unix/irc/server/${MY_P}${MY_PV}.tgz"
+SRC_URI="ftp://ftp.irc.org/irc/server/${MY_P}.tgz"
 LICENSE="GPL-1"
 SLOT="0"
 
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc"
 IUSE="ipv6"
 
-DEPEND="virtual/glibc
-		sys-libs/ncurses
-		sys-libs/zlib"
+DEPEND="virtual/libc
+	sys-libs/ncurses
+	sys-libs/zlib"
 
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}${MY_PV}
+S=${WORKDIR}/${MY_P}
 
 src_compile () {
-
 	use ipv6 && myconf="--with-ip6" || myconf="--without-ip6"
-	
+
 	./configure \
 		--prefix=/usr \
 		--host=${CHOST} \
@@ -34,14 +30,13 @@ src_compile () {
 		--localstatedir=/var/run/ircd \
 		$myconf || die "Configure failed"
 
-	# irc doesnt recognize the proper CHOST properly in some cases. 
+	# irc doesnt recognize the proper CHOST properly in some cases.
 	# Cheap hack to get it working properly. - zul
-	cd `support/config.guess` 
+	cd `support/config.guess`
 	emake client || die "client build failed"
 }
 
 src_install() {
-
 	# See note above.
 	cd `support/config.guess`
 	make \
diff --git a/net-irc/irc-client/irc-client-2.10.3_p7.ebuild b/net-irc/irc-client/irc-client-2.10.3_p7.ebuild
index fc1aca61255d..e7392f7125bc 100644
--- a/net-irc/irc-client/irc-client-2.10.3_p7.ebuild
+++ b/net-irc/irc-client/irc-client-2.10.3_p7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irc-client/irc-client-2.10.3_p7.ebuild,v 1.1 2004/07/12 22:36:38 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irc-client/irc-client-2.10.3_p7.ebuild,v 1.1.1.1 2005/11/30 09:48:54 chriswhite Exp $
 
 inherit gnuconfig
 
diff --git a/net-irc/irc-server/ChangeLog b/net-irc/irc-server/ChangeLog
index 5a2f40a86a2e..93881af4806f 100644
--- a/net-irc/irc-server/ChangeLog
+++ b/net-irc/irc-server/ChangeLog
@@ -1,6 +1,43 @@
 # ChangeLog for net-irc/irc-server
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irc-server/ChangeLog,v 1.1 2003/10/04 00:52:26 gregf Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irc-server/ChangeLog,v 1.1.1.1 2005/11/30 09:49:01 chriswhite Exp $
+
+*irc-server-2.11.1_p1 (02 Sep 2005)
+
+  02 Sep 2005; Sven Wegener <swegener@gentoo.org>
+  -files/2.10.3_p7-gentoo.patch, files/2.10.3_p3-gentoo.patch,
+  files/ircd.rc, irc-server-2.10.3_p3.ebuild, -irc-server-2.10.3_p7.ebuild,
+  +irc-server-2.11.1_p1.ebuild:
+  Version bump.
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  irc-server-2.10.3_p3.ebuild:
+  Stable on ppc.
+
+  09 Oct 2004; Sven Wegener <swegener@gentoo.org> files/ircd.rc:
+  Modified to 'use net' not 'need net' in init script. Closes bug #66467.
+
+  13 Jul 2004; Sven Wegener <swegener@gentoo.org> files/ircd.rc,
+  irc-server-2.10.3_p3.ebuild, irc-server-2.10.3_p7.ebuild:
+  Updated SRC_URI and dependencies.
+
+  21 Jun 2004; Sven Wegener <swegener@gentoo.org> +metadata.xml:
+  Added metadata.xml
+
+*irc-server-2.10.3_p7 (08 Jun 2004)
+
+  08 Jun 2004; <mkennedy@gentoo.org> +files/2.10.3_p3-gentoo.patch,
+  +files/2.10.3_p7-gentoo.patch, irc-server-2.10.3_p3.ebuild,
+  +irc-server-2.10.3_p7.ebuild:
+  New upstream version; GCC 3.4 fixes for 2.10.3_p7 and 2.10.3_p3;
+  Dont hardcode version numbers in ebuilds.
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  irc-server-2.10.3_p3.ebuild:
+  Masked irc-server-2.10.3_p3.ebuild testing for ppc
+
+  20 Jan 2004; Martin Holzer <mholzer@gentoo.org> irc-server-2.10.3_p3.ebuild:
+  chaning fowner syntax. Closes 38033
 
 *irc-server-2.10.3_p3 (03 Oct 2003)
 
diff --git a/net-irc/irc-server/Manifest b/net-irc/irc-server/Manifest
index 3d8240ec3498..e982055f5431 100644
--- a/net-irc/irc-server/Manifest
+++ b/net-irc/irc-server/Manifest
@@ -1,3 +1,18 @@
-MD5 7c99a2155bffaa04fbff8b5c17a40172 irc-server-2.10.3_p3.ebuild 3019
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 726af43dc5bea80777797a7e608571e4 ChangeLog 1704
+MD5 d8e0fcddf6464c4c642ba71a17a38a63 files/2.10.3_p3-gentoo.patch 475
 MD5 11c6c72ebc4796aa655378f37a51cfa6 files/digest-irc-server-2.10.3_p3 60
-MD5 6e86745a672407755d050a20b426dc8e files/ircd.rc 261
+MD5 1a0f39bf6f7f28f39ae4100a87ab5214 files/digest-irc-server-2.11.1_p1 60
+MD5 673a6626002a9bbdfc068c055f6a1adb files/ircd.rc 476
+MD5 b5b8033ea9f6fd0085c6537bffe0792e irc-server-2.10.3_p3.ebuild 2541
+MD5 7855e995cde3c8ebeace1a8679415286 irc-server-2.11.1_p1.ebuild 2514
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGGuPI1lqEGTUzyQRApJcAJ9AIHBs1T9PEBJVmQd9gCC1BsUfRwCguETi
+hWaHOW6gAP8Mg8YMByFZ9ks=
+=xonv
+-----END PGP SIGNATURE-----
diff --git a/net-irc/irc-server/files/2.10.3_p3-gentoo.patch b/net-irc/irc-server/files/2.10.3_p3-gentoo.patch
index f5f18b09e1be..36f558a70470 100644
--- a/net-irc/irc-server/files/2.10.3_p3-gentoo.patch
+++ b/net-irc/irc-server/files/2.10.3_p3-gentoo.patch
@@ -9,4 +9,3 @@ diff -ur irc2.10.3p3.orig/contrib/tkserv/tkserv.c irc2.10.3p3/contrib/tkserv/tks
      }
  
      retv = retv < 0 ? 0 : retv;    /* errors do not allow authorization */
-Only in irc2.10.3p3/contrib/tkserv: tkserv.c~
diff --git a/net-irc/irc-server/files/ircd.rc b/net-irc/irc-server/files/ircd.rc
index 37ad5cc0e79f..d20258688660 100644
--- a/net-irc/irc-server/files/ircd.rc
+++ b/net-irc/irc-server/files/ircd.rc
@@ -1,7 +1,10 @@
 #!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irc-server/files/ircd.rc,v 1.1.1.1 2005/11/30 09:49:01 chriswhite Exp $
 
 depend() {
-	need net
+	use net
 }
 
 start() {
diff --git a/net-irc/irc-server/irc-server-2.10.3_p3.ebuild b/net-irc/irc-server/irc-server-2.10.3_p3.ebuild
index 5bc30bf72e60..4fb63afbc425 100644
--- a/net-irc/irc-server/irc-server-2.10.3_p3.ebuild
+++ b/net-irc/irc-server/irc-server-2.10.3_p3.ebuild
@@ -1,60 +1,45 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irc-server/irc-server-2.10.3_p3.ebuild,v 1.1 2003/10/04 00:52:26 gregf Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irc-server/irc-server-2.10.3_p3.ebuild,v 1.1.1.1 2005/11/30 09:49:01 chriswhite Exp $
+
+inherit eutils versionator flag-o-matic
+
+MY_P=irc${PV/_/}
 
 DESCRIPTION="RFC compliant IRC server"
-HOMEPAGE="http://www.irc.org"
-SRC_URI="ftp://ftp.irc.org/irc/server/irc2.10.3p3.tgz
-	ftp://ftp.funet.fi/pub/unix/irc/server/irc2.10.3p3.tgz"
+HOMEPAGE="http://www.irc.org/"
+SRC_URI="ftp://ftp.irc.org/irc/server/${MY_P}.tgz
+	ftp://ftp.irc.org/irc/server/Old/irc$(get_version_component_range 1-2)/${MY_P}.tgz"
+
 LICENSE="GPL-1"
 SLOT="0"
-
-# The only architecture I can test
-KEYWORDS="x86"
+KEYWORDS="~x86 ~ppc"
 IUSE="zlib ipv6"
 
-DEPEND="sys-libs/glibc
-	sys-libs/ncurses
+RDEPEND="sys-libs/ncurses
 	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	sys-apps/sed
+	sys-apps/grep"
 
-RDEPEND="sys-apps/sed
-	sys-apps/grep
-	sys-apps/textutils"
+S=${WORKDIR}/${MY_P}
 
-S=${WORKDIR}/irc2.10.3p3
+pkg_setup() {
+	enewgroup ircd
+	enewuser ircd -1 -1 -1 ircd
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PV}-gentoo.patch
+}
 
 src_compile () {
+	append-ldflags -lm
 
-	IRCUID=`grep ^ircd: /etc/passwd | cut -d : -f 3`
-	IRCGID=`grep ^ircd: /etc/group | cut -d : -f 3`
-	if [ -z "$IRCGID" ]
-	then
-		IRCGID=`grep ^ircd: /etc/passwd | cut -d : -f 4`
-	fi
-
-	if [ -z "$IRCUID" ]
-	then
-		IRCUID=0
-		until [ -z "`cut -d : -f 3 /etc/passwd | grep $IRCUID`" ]
-		do
-			IRCUID=$RANDOM
-		done
-	fi
-
-	if [ -z "$IRCGID" ]
-	then
-		IRCGID=0
-		until [ -z "`cut -d : -f 3 /etc/group | grep $IRCGID`" ]
-		do
-			IRCGID=$RANDOM
-		done
-	fi
-
-	echo -n "$IRCUID" > ${T}/user
-	echo -n "$IRCGID" > ${T}/group
-
-	cd ${S}/support
-	sed \
+	sed -i \
 		-e "s/^#undef\tOPER_KILL$/#define\tOPER_KILL/" \
 		-e "s/^#undef\tOPER_RESTART$/#define\tOPER_RESTART/" \
 		-e "s/^#undef TIMEDKLINES$/#define\tTIMEDKLINES\t60/" \
@@ -64,61 +49,54 @@ src_compile () {
 		-e "s/^#undef\tIRC_UID$/#define\tIRC_UID\t$IRCUID/" \
 		-e "s/^#undef\tIRC_GID$/#define\tIRC_GID\t$IRCGID/" \
 		-e "s/^#undef USE_SERVICES$/#define\tUSE_SERVICES/" \
-		config.h.dist > config.h.dist~
-	mv -f config.h.dist~ config.h.dist
-
-	use zlib && sed -e "s/^#undef\tZIP_LINKS$/#define\tZIP_LINKS/" config.h.dist > config.h.dist~
-	mv -f config.h.dist~ config.h.dist
+		"${S}"/config.h.dist
 
-	cd ..
+	use zlib && sed -i -e "s/^#undef\tZIP_LINKS$/#define\tZIP_LINKS/" ${S}/config.h.dist
 
-	use zlib && myconf="--with-zlib" || myconf="--without-zlib"
-	use ipv6 && myconf="$myconf --with-ip6" || myconf="$myconf --without-ip6"
-
-	./configure \
-		--prefix=/usr \
-		--host=i686-pc-linux-gnu \
-		'--mandir=${prefix}/share/man' \
+	econf \
 		--sysconfdir=/etc/ircd \
 		--localstatedir=/var/run/ircd \
 		--logdir=/var/log \
-		$myconf || die
+		--mandir='${prefix}/share/man' \
+		$(use_with zlib) \
+		$(use_with ipv6 ip6) \
+		|| die "econf failed"
 
-	cd `support/config.guess`
-	emake ircd iauth chkconf ircd-mkpasswd ircdwatch tkserv || die
+	cd $(support/config.guess)
+	emake ircd iauth chkconf ircd-mkpasswd ircdwatch tkserv || die "emake failed"
 }
 
 src_install() {
+	cd $(support/config.guess)
 
-	cd `support/config.guess`
 	make \
-		prefix=${D}/usr \
-		ircd_conf_dir=${D}/etc/ircd \
-		ircd_var_dir=${D}/var/run/ircd \
-		ircd_log_dir=${D}/var/log \
-		install-server install-tkserv || die
+		prefix="${D}"/usr \
+		ircd_conf_dir="${D}"/etc/ircd \
+		ircd_var_dir="${D}"/var/run/ircd \
+		ircd_log_dir="${D}"/var/log \
+		install-server \
+		install-tkserv \
+		|| die "make install failed"
 
-	fowners `cat ${T}/user`.`cat ${T}/group` /var/run/ircd
+	fowners ircd:ircd /var/run/ircd
 
 	cd ../doc
-	dodoc *-New alt-irc-faq Authors BUGS ChangeLog Etiquette example.conf \
+	dodoc \
+		*-New alt-irc-faq Authors BUGS ChangeLog Etiquette example.conf \
 		iauth-internals.txt INSTALL.appendix INSTALL.* LICENSE \
 		m4macros README RELEASE* rfc* SERVICE*
+
 	docinto Juped
 	dodoc Juped/Advertisement Juped/ChangeLog.* Juped/INSTALL
+
 	docinto Juped/US-Admin
 	dodoc Juped/US-Admin/Networking
+
 	docinto Nets
 	dodoc Nets/IRCNet
+
 	docinto Nets/Europe
 	dodoc Nets/Europe/*
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/ircd.rc ircd
-
-}
-
-pkg_postinst() {
-	groupadd -g `cat ${T}/group` -o ircd
-	useradd -c "IRCd server user" -d /etc/ircd -g `cat ${T}/group` -o -s /bin/false -u `cat ${T}/user` ircd
+	newinitd "${FILESDIR}"/ircd.rc ircd
 }
diff --git a/net-irc/irc-server/irc-server-2.11.1_p1.ebuild b/net-irc/irc-server/irc-server-2.11.1_p1.ebuild
index 5ebb0fdac3e3..c48a30203464 100644
--- a/net-irc/irc-server/irc-server-2.11.1_p1.ebuild
+++ b/net-irc/irc-server/irc-server-2.11.1_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irc-server/irc-server-2.11.1_p1.ebuild,v 1.1 2005/09/02 15:10:50 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irc-server/irc-server-2.11.1_p1.ebuild,v 1.1.1.1 2005/11/30 09:49:01 chriswhite Exp $
 
 inherit eutils versionator flag-o-matic
 
diff --git a/net-irc/ircd-hybrid/ChangeLog b/net-irc/ircd-hybrid/ChangeLog
index c5ea5c8be929..0a47ce042ee6 100644
--- a/net-irc/ircd-hybrid/ChangeLog
+++ b/net-irc/ircd-hybrid/ChangeLog
@@ -1,6 +1,78 @@
 # ChangeLog for net-irc/ircd-hybrid
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ircd-hybrid/ChangeLog,v 1.1 2003/12/17 02:37:44 zul Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircd-hybrid/ChangeLog,v 1.1.1.1 2005/11/30 09:49:03 chriswhite Exp $
+
+  03 Nov 2005; Sven Wegener <swegener@gentoo.org> ircd-hybrid-7.0.3.ebuild,
+  ircd-hybrid-7.1.0.ebuild, ircd-hybrid-7.1.1.ebuild:
+  ebuild config -> emerge --config, bug #109482.
+
+*ircd-hybrid-7.1.1 (10 Aug 2005)
+
+  10 Aug 2005; Sven Wegener <swegener@gentoo.org> +ircd-hybrid-7.1.1.ebuild:
+  Version bump, bug #101156.
+
+  21 Jul 2005; Sven Wegener <swegener@gentoo.org> ircd-hybrid-7.1.0.ebuild:
+  Some modifications suggested in bug #98493.
+
+*ircd-hybrid-7.1.0 (20 Jul 2005)
+
+  20 Jul 2005; Sven Wegener <swegener@gentoo.org> +files/init.d_ircd-7.1.0,
+  +files/7.1.0-default-config.patch, files/conf.d_ircd, files/init.d_ircd,
+  +ircd-hybrid-7.1.0.ebuild:
+  Version bump, bug #98493.
+
+  17 Oct 2004; Sven Wegener <swegener@gentoo.org> -files/config-ipv4.diff,
+  -files/config-ipv6.diff, -files/ircd-hybrid-7.0.diff,
+  -ircd-hybrid-7.0-r1.ebuild, -ircd-hybrid-7.0.ebuild:
+  Removed old ebuilds and files.
+
+  16 Oct 2004; Mike Frysinger <vapier@gentoo.org> ircd-hybrid-7.0.3.ebuild:
+  Rename mkpasswd #6428.
+
+*ircd-hybrid-7.0.3 (27 Sep 2004)
+
+  27 Sep 2004; Sven Wegener <swegener@gentoo.org>
+  +files/config-ipv4-7.0.3.diff, +files/config-ipv6-7.0.3.diff,
+  files/init.d_ircd, +files/ircd-hybrid-7.0.3.diff, +ircd-hybrid-7.0.3.ebuild:
+  Version bump. Closes bug #10275 and #59076.
+
+  06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> ircd-hybrid-7.0-r1.ebuild,
+  ircd-hybrid-7.0.ebuild:
+  Switch to use epause and ebeep, bug #62950
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ircd-hybrid-7.0-r1.ebuild, ircd-hybrid-7.0.ebuild:
+  virtual/glibc -> virtual/libc
+
+  27 Jun 2004; Aron Griffis <agriffis@gentoo.org> ircd-hybrid-7.0-r1.ebuild,
+  ircd-hybrid-7.0.ebuild:
+  QA - fix use invocation
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  ircd-hybrid-7.0-r1.ebuild, ircd-hybrid-7.0.ebuild:
+  Masked ircd-hybrid-7.0.ebuild testing for ppc
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  ircd-hybrid-7.0-r1.ebuild:
+  Masked ircd-hybrid-7.0-r1.ebuild testing for ppc
+
+  15 May 2004; Chuck Short <zul@gentoo.org> ircd-hybrid-7.0-r1.ebuild:
+  Fixed typo. Closes #51058.
+
+*ircd-hybrid-7.0-r1 (19 Apr 2004)
+
+  19 Apr 2004; Chuck Short <zul@gentoo.org> ircd-hybrid-7.0-r1.ebuild:
+  New release with improvements from ali3nx < mikecrgd @ telus.net >.
+  Closes #46853.
+
+  01 Apr 2004; Chuck Short <zul@gentoo.org> ircd-hybrid-7.0.ebuild:
+  Updated header.
+
+  01 Apr 2004; Chuck Short <zul@gentoo.org> :
+  Change permission of init script.
+
+  31 Dec 2003; Aron Griffis <agriffis@gentoo.org> ircd-hybrid-7.0.ebuild:
+  Add ~alpha
 
 *ircd-hybrid-7.0 (16 Dec 2003)
 
diff --git a/net-irc/ircd-hybrid/Manifest b/net-irc/ircd-hybrid/Manifest
index 7248f1933267..81b3d2e50ac7 100644
--- a/net-irc/ircd-hybrid/Manifest
+++ b/net-irc/ircd-hybrid/Manifest
@@ -1,2 +1,15 @@
-MD5 35d10135d058abfe76566c2ecf654ff0 ircd-hybrid-7.0.ebuild 8246
-MD5 c45ce5f5427c5d0fcbbc5561c79efbfe files/digest-ircd-hybrid-7.0 65
+MD5 ae60a5db0a137c69941b946d3634dbfd ChangeLog 3071
+MD5 2cc5330c07947c6e3ac113d1e1e8bc6b files/7.1.0-default-config.patch 1230
+MD5 d7fb2ea1489aabedba9a5ec2f160eb23 files/conf.d_ircd 410
+MD5 3fa170737a52ed587dfede306e503dcd files/config-ipv4-7.0.3.diff 4227
+MD5 a60d0a00176f6ce75b380697db667e95 files/config-ipv6-7.0.3.diff 4227
+MD5 12b134810a484d2ec3480bd5cdf8be76 files/digest-ircd-hybrid-7.0.3 67
+MD5 be5e20539ebf85497a86bff5595ea2f6 files/digest-ircd-hybrid-7.1.0 67
+MD5 3ec327ab8324e319cc99f8f97c53bdd2 files/digest-ircd-hybrid-7.1.1 67
+MD5 8950404b48f4f9a7455cf911bd1b94c1 files/init.d_ircd 1439
+MD5 d9588c0a65883956055e2b4481ec9a67 files/init.d_ircd-7.1.0 662
+MD5 8281bd4963f1a3b0168065602952946f files/ircd-hybrid-7.0.3.diff 2606
+MD5 02bd08bf8f847628314107453e4159b1 ircd-hybrid-7.0.3.ebuild 10107
+MD5 ef8d5a4a643df4fd25944866e827ec43 ircd-hybrid-7.1.0.ebuild 4873
+MD5 6a826cd20d07c860921bef601f124e15 ircd-hybrid-7.1.1.ebuild 4011
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
diff --git a/net-irc/ircd-hybrid/files/conf.d_ircd b/net-irc/ircd-hybrid/files/conf.d_ircd
index 7d7b9a44c336..b5a64d3b3fec 100644
--- a/net-irc/ircd-hybrid/files/conf.d_ircd
+++ b/net-irc/ircd-hybrid/files/conf.d_ircd
@@ -1,5 +1,6 @@
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ircd-hybrid/files/conf.d_ircd,v 1.1 2003/12/17 02:37:45 zul Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircd-hybrid/files/conf.d_ircd,v 1.1.1.1 2005/11/30 09:49:03 chriswhite Exp $
 
 # Config file for /etc/init.d/ircd
 
diff --git a/net-irc/ircd-hybrid/files/init.d_ircd b/net-irc/ircd-hybrid/files/init.d_ircd
index 301a02f89bed..9feb1490266f 100644
--- a/net-irc/ircd-hybrid/files/init.d_ircd
+++ b/net-irc/ircd-hybrid/files/init.d_ircd
@@ -1,49 +1,65 @@
 #!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ircd-hybrid/files/init.d_ircd,v 1.1 2003/12/17 02:37:45 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircd-hybrid/files/init.d_ircd,v 1.1.1.1 2005/11/30 09:49:03 chriswhite Exp $
 
-depend()
-{
+opts="${opts} rehash"
+
+ipv4pid="/var/run/ircd/ircd-ipv4.pid"
+ipv6pid="/var/run/ircd/ircd-ipv6.pid"
+
+depend() {
 	need net
 }
 
-start()
-{
-	if [ "${IPV4_OPTS}" != "no" ]; then
+start() {
+	if [ "${IPV4_OPTS}" != "no" ]
+	then
 		ebegin "Starting IRCd-Hybrid7 IPv4 daemon"
-		start-stop-daemon --start --quiet --background --chuid ircd --exec \
-\
+		start-stop-daemon --start --quiet --background --chuid hybrid --exec \
 			/usr/sbin/ircd-ipv4 -- ${IPV4_OPTS}
-
 		eend $?
 	fi
 
-	if [ -x "/usr/sbin/ircd-ipv6" -a "${IPV6_OPTS}" != "no" ]; then
+	if [ -x "/usr/sbin/ircd-ipv6" -a "${IPV6_OPTS}" != "no" ]
+	then
 		ebegin "Starting IRCd-Hybrid7 IPv6 daemon"
-		start-stop-daemon --start --quiet --background --chuid ircd --exec \
-\
+		start-stop-daemon --start --quiet --background --chuid hybrid --exec \
 			/usr/sbin/ircd-ipv6 -- ${IPV6_OPTS}
-
 		eend $?
 	fi
 }
 
-stop()
-{
-	local ipv4pid="/var/run/ircd/ircd-ipv4.pid"
-	local ipv6pid="/var/run/ircd/ircd-ipv6.pid"
-
-	if [ -r "${ipv4pid}" ]; then
+stop() {
+	if [ -r "${ipv4pid}" ]
+	then
 		ebegin "Stopping IRCd-Hybrid7 IPv4 daemon"
 		start-stop-daemon --stop --quiet --pidfile="${ipv4pid}"
 		eend $?
 		rm -f "${ipv4pid}"
 	fi
 
-	if [ -r "${ipv6pid}" ]; then
+	if [ -r "${ipv6pid}" ]
+	then
 		ebegin "Stopping IRCd-Hybrid7 IPv6 daemon"
 		start-stop-daemon --stop --quiet --pidfile="${ipv6pid}"
 		eend $?
 		rm -f "${ipv6pid}"
 	fi
 }
+
+rehash() {
+	if [ -r "${ipv4pid}" ]
+	then
+		ebegin "Rehashing IRCd-Hybrid7 IPv4 daemon"
+		kill -s SIGHUP $(cat "${ipv4pid}")
+		eend $?
+	fi
+
+	if [ -r "${ipv6pid}" ]
+	then
+		ebegin "Rehashing IRCd-Hybrid7 IPv6 daemon"
+		kill -s SIGHUP $(cat "${ipv6pid}")
+		eend $?
+	fi
+}
diff --git a/net-irc/ircd-hybrid/files/init.d_ircd-7.1.0 b/net-irc/ircd-hybrid/files/init.d_ircd-7.1.0
index 57bbcae9965a..96a8d8a8a840 100644
--- a/net-irc/ircd-hybrid/files/init.d_ircd-7.1.0
+++ b/net-irc/ircd-hybrid/files/init.d_ircd-7.1.0
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ircd-hybrid/files/init.d_ircd-7.1.0,v 1.1 2005/07/20 19:11:02 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircd-hybrid/files/init.d_ircd-7.1.0,v 1.1.1.1 2005/11/30 09:49:03 chriswhite Exp $
 
 opts="${opts} rehash"
 
diff --git a/net-irc/ircd-hybrid/ircd-hybrid-7.0.3.ebuild b/net-irc/ircd-hybrid/ircd-hybrid-7.0.3.ebuild
index 668c134a2c8d..aa37e76a8ab0 100644
--- a/net-irc/ircd-hybrid/ircd-hybrid-7.0.3.ebuild
+++ b/net-irc/ircd-hybrid/ircd-hybrid-7.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ircd-hybrid/ircd-hybrid-7.0.3.ebuild,v 1.1 2004/09/27 00:35:13 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircd-hybrid/ircd-hybrid-7.0.3.ebuild,v 1.1.1.1 2005/11/30 09:49:03 chriswhite Exp $
 
 inherit eutils fixheadtails
 
@@ -32,9 +32,9 @@ HOMEPAGE="http://ircd-hybrid.com/"
 SRC_URI="mirror://sourceforge/ircd-hybrid/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~alpha"
+KEYWORDS="~x86 ~alpha ~ppc"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	zlib? ( >=sys-libs/zlib-1.1.4-r2 )
 	ssl? ( >=dev-libs/openssl-0.9.7d )
 	|| ( >=dev-libs/libelf-0.8.2 >=dev-libs/elfutils-0.94-r1 )
@@ -242,6 +242,7 @@ src_install()
 		includedir=${D}/usr/include/ircd-hybrid-7 \
 		mandir=${D}/usr/share/man/man8/ \
 		install || die "ipv4 install failed"
+	mv ${D}/usr/sbin/{,ircd-}mkpasswd #6428
 
 	# Rename the binary according to config-ipv4.diff.
 	mv ${D}/usr/sbin/ircd ${D}/usr/sbin/ircd-ipv4
@@ -334,7 +335,7 @@ pkg_postinst() {
 	if use ssl
 	then
 		einfo "To create a rsa keypair for crypted links execute:"
-		einfo "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
+		einfo "emerge --config =${CATEGORY}/${PF}"
 	fi
 }
 
diff --git a/net-irc/ircd-hybrid/ircd-hybrid-7.1.0.ebuild b/net-irc/ircd-hybrid/ircd-hybrid-7.1.0.ebuild
index 634640b2b3c1..e71e0c2ab25b 100644
--- a/net-irc/ircd-hybrid/ircd-hybrid-7.1.0.ebuild
+++ b/net-irc/ircd-hybrid/ircd-hybrid-7.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ircd-hybrid/ircd-hybrid-7.1.0.ebuild,v 1.1 2005/07/20 19:11:02 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircd-hybrid/ircd-hybrid-7.1.0.ebuild,v 1.1.1.1 2005/11/30 09:49:03 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
@@ -12,12 +12,11 @@ ENABLE_SMALL_NETWORK=1
 ENABLE_POLL=1
 ENABLE_SELECT=0
 ENABLE_EFNET=0
-ENABLE_RTSIGIO=0
 ENABLE_SHARED=1
 ENABLE_DEVPOLL=0
 ENABLE_KQUEUE=0
 
-IUSE="debug ipv6 ssl static zlib"
+IUSE="debug ssl static zlib"
 
 DESCRIPTION="IRCD-Hybrid - High Performance Internet Relay Chat"
 HOMEPAGE="http://ircd-hybrid.com/"
@@ -92,13 +91,6 @@ src_compile() {
 	else
 		myconf="${myconf} --disable-efnet"
 	fi
-	if [ ${ENABLE_RTSIGIO} -eq 1 ]
-	then
-		einfo "Configuring with Superior RTSIGIO."
-		myconf="${myconf} --enable-rtsigio"
-	else
-		myconf="${myconf} --disable-rtsigio"
-	fi
 	if [ ${ENABLE_SHARED} -eq 1 ]
 	then
 		einfo "Configuring with shared modules."
@@ -124,7 +116,6 @@ src_compile() {
 		--with-nicklen=${MAX_NICK_LENGTH} \
 		--with-topiclen=${MAX_TOPIC_LENGTH} \
 		--with-maxconn=${MAX_CLIENTS} \
-		$(use_enable ipv6) \
 		$(use_enable zlib) \
 		$(use_enable ssl openssl) \
 		$(use_enable !static shared-modules) \
@@ -172,7 +163,7 @@ pkg_postinst() {
 	if use ssl
 	then
 		einfo "To create an RSA keypair for crypted links execute:"
-		einfo "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
+		einfo "emerge --config =${CATEGORY}/${PF}"
 	fi
 }
 
diff --git a/net-irc/ircd-hybrid/ircd-hybrid-7.1.1.ebuild b/net-irc/ircd-hybrid/ircd-hybrid-7.1.1.ebuild
index e4597400aea2..d6eafc7a95a1 100644
--- a/net-irc/ircd-hybrid/ircd-hybrid-7.1.1.ebuild
+++ b/net-irc/ircd-hybrid/ircd-hybrid-7.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ircd-hybrid/ircd-hybrid-7.1.1.ebuild,v 1.1 2005/08/10 21:16:54 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircd-hybrid/ircd-hybrid-7.1.1.ebuild,v 1.1.1.1 2005/11/30 09:49:03 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
@@ -129,7 +129,7 @@ pkg_postinst() {
 	if use ssl
 	then
 		einfo "To create an RSA keypair for crypted links execute:"
-		einfo "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
+		einfo "emerge --config =${CATEGORY}/${PF}"
 	fi
 }
 
diff --git a/net-irc/ircii/ChangeLog b/net-irc/ircii/ChangeLog
index 461d85272bc0..0513db95f4ef 100644
--- a/net-irc/ircii/ChangeLog
+++ b/net-irc/ircii/ChangeLog
@@ -1,6 +1,70 @@
 # ChangeLog for net-irc/ircii
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ircii/ChangeLog,v 1.1 2003/07/22 06:02:06 gregf Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircii/ChangeLog,v 1.1.1.1 2005/11/30 09:48:58 chriswhite Exp $
+
+  09 Mar 2005; Lina Pezzella <j4rg0n@gentoo.org> ircii-20040820.ebuild:
+  Stable ppc-macos
+
+  09 Feb 2005; Lina Pezzella <j4rg0n@gentoo.org> ircii-20040820.ebuild:
+  Unstable ppc-macos
+
+  13 Nov 2004; Sven Wegener <swegener@gentoo.org> -ircii-20030709-r2.ebuild,
+  ircii-20040820.ebuild:
+  Removed old ebuild.
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> ircii-20040820.ebuild:
+  Stable on amd64.
+
+  01 Oct 2004; Sven Wegener <swegener@gentoo.org> -ircii-20040216.ebuild,
+  ircii-20040820.ebuild:
+  Marked stable on x86. Removed old ebuild.
+
+*ircii-20040820 (24 Aug 2004)
+
+  24 Aug 2004; Sven Wegener <swegener@gentoo.org> ircii-20040216.ebuild,
+  +ircii-20040820.ebuild:
+  Version bump and SRC_URI update.
+
+  09 Jul 2004; Sven Wegener <swegener@gentoo.org> ircii-20030709-r2.ebuild:
+  Updated SRC_URI.
+
+*ircii-20040216 (08 Jul 2004)
+
+  08 Jul 2004; Sven Wegener <swegener@gentoo.org> +ircii-20040216.ebuild:
+  Version bump.
+
+  08 Jul 2004; Sven Wegener <swegener@gentoo.org> metadata.xml,
+  -ircii-20030709-r1.ebuild, -ircii-20030709.ebuild:
+  Removed older ebuilds and assigned to the net-irc herd.
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  ircii-20030709-r2.ebuild:
+  Masked ircii-20030709-r2.ebuild testing for ppc
+
+  29 Jan 2004; Chuck Short <zul@gentoo.org> ircii-20030709-r1.ebuild,
+  ircii-20030709-r2.ebuild, ircii-20030709.ebuild:
+  Header clean ups.
+
+  04 Nov 2003; Chuck Short <zul@gentoo.org> ircii-20030709-r2.ebuild:
+  Marked stable on x86 and amd64.
+
+  28 Oct 2003; Todd Sunderlin <todd@gentoo.org> ircii-20030709-r2.ebuild:
+  added ~sparc keyword
+
+  01 Oct 2003; Chuck Short <zul@gentoo.org> ircii-20030709-r1.ebuild,
+  ircii-20030709-r2.ebuild, ircii-20030709.ebuild:
+  Added ~amd64 to keywords.
+
+*ircii-20030709-r2 (13 Sep 2003)
+
+  13 Sep 2003; Mamoru KOMACHI <usata@gentoo.org> ircii-20030709-r2.ebuild:
+  Fixed mandir.  Thanks to splite <splite-gentoo@sigint.cs.purdue.edu>
+  for reporting the bug in #28551
+
+*ircii-20030709-r1 (31 Jul 2003)
+
+  31 Jul 2003; Greg Fitzgerald <gregf@gentoo.org> ircii-20030709-r1.ebuild:
+  Fixed depends, added einstall. This closes bug #25348.
 
 *ircii-20030709 (22 Jul 2003)
 
diff --git a/net-irc/ircii/Manifest b/net-irc/ircii/Manifest
index 9dda91ab0176..ca961ce26e4a 100644
--- a/net-irc/ircii/Manifest
+++ b/net-irc/ircii/Manifest
@@ -1,2 +1,4 @@
-MD5 b90e27534c4441e54b47dfc0a84129e3 ircii-20030709.ebuild 797
-MD5 954a7ad41538e4a5f68b720074da0891 files/digest-ircii-20030709 67
+MD5 391097d60a8a2c5d000a3451479cbfab ChangeLog 2448
+MD5 18ccf7679f9610d8be1725e40bbb77cf ircii-20040820.ebuild 833
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+MD5 d050eac938d29febadf6f5cc939f0f03 files/digest-ircii-20040820 67
diff --git a/net-irc/ircii/ircii-20040820.ebuild b/net-irc/ircii/ircii-20040820.ebuild
index d5578ae249ef..cef924f6ed99 100644
--- a/net-irc/ircii/ircii-20040820.ebuild
+++ b/net-irc/ircii/ircii-20040820.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ircii/ircii-20040820.ebuild,v 1.1 2004/08/24 02:05:14 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircii/ircii-20040820.ebuild,v 1.1.1.1 2005/11/30 09:48:58 chriswhite Exp $
 
 IUSE="ipv6"
 
@@ -14,17 +14,17 @@ DEPEND="${RDEPEND}
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc"
+KEYWORDS="x86 amd64 ~sparc ~ppc ppc-macos"
 
 src_compile() {
-	# `use_with socks socks5` <- isn't socks5 working?
-	econf `use_enable ipv6` || die "econf failed"
-	emake || die "make failed"
+	econf $(use_enable ipv6) || die "econf failed"
+	emake || die "emake failed"
 }
 
 src_install() {
 	make DESTDIR=${D} install || die "make install failed"
 
 	dodoc ChangeLog INSTALL NEWS README \
-		doc/Copyright doc/crypto doc/VERSIONS doc/ctcp
+		doc/Copyright doc/crypto doc/VERSIONS doc/ctcp \
+		|| die "dodoc failed"
 }
diff --git a/net-irc/ircii/metadata.xml b/net-irc/ircii/metadata.xml
index 20ce219711a2..6ef15e900f17 100644
--- a/net-irc/ircii/metadata.xml
+++ b/net-irc/ircii/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
+<herd>net-irc</herd>
 </pkgmetadata>
diff --git a/net-irc/ircmap/ChangeLog b/net-irc/ircmap/ChangeLog
index 2f9ed0dd2df9..7365f62e439d 100644
--- a/net-irc/ircmap/ChangeLog
+++ b/net-irc/ircmap/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for net-irc/ircmap
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ircmap/ChangeLog,v 1.1 2002/12/12 17:42:33 phoenix Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircmap/ChangeLog,v 1.1.1.1 2005/11/30 09:48:55 chriswhite Exp $
+
+  14 Feb 2005; Sven Wegener <swegener@gentoo.org> ircmap-0.99.ebuild:
+  Removed ${D} from insinto.
+
+  24 Jul 2004; Sven Wegener <swegener@gentoo.org> ircmap-0.99.ebuild:
+  Tidied the ebuild.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> ircmap-0.99.ebuild:
+  virtual/glibc -> virtual/libc
+
+  23 Mar 2004; Martin Holzer <mholzer@gentoo.org> ircmap-0.99.ebuild:
+  fixing depend qa issue. see 45343.
+
+  29 Jan 2004; Chuck Short <zul@gentoo.org> ircmap-0.99.ebuild:
+  Header cleanups.
 
 *ircmap-0.99 (12 Dec 2002)
 
diff --git a/net-irc/ircmap/Manifest b/net-irc/ircmap/Manifest
index e69de29bb2d1..070751ff84c4 100644
--- a/net-irc/ircmap/Manifest
+++ b/net-irc/ircmap/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f88e973ea2173f73947347f9f93d1315 ircmap-0.99.ebuild 1345
+MD5 7669a52d388f26a70c0adbecb3918eaa ChangeLog 917
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+MD5 d17873231bc2757495c032cf2b08a946 files/digest-ircmap-0.99 57
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCERc8I1lqEGTUzyQRAmXCAJ93GqAIiG6whMtVqgXIU+kAxG93oACg1bgc
+E1T2gFiFvtjUdp49lZkdVFw=
+=s2I7
+-----END PGP SIGNATURE-----
diff --git a/net-irc/ircmap/ircmap-0.99.ebuild b/net-irc/ircmap/ircmap-0.99.ebuild
index e2f4bac03049..f2281f5e86dc 100644
--- a/net-irc/ircmap/ircmap-0.99.ebuild
+++ b/net-irc/ircmap/ircmap-0.99.ebuild
@@ -1,38 +1,39 @@
-# Copyright 2002 Paul Belt
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ircmap/ircmap-0.99.ebuild,v 1.1 2002/12/12 17:42:33 phoenix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircmap/ircmap-0.99.ebuild,v 1.1.1.1 2005/11/30 09:48:55 chriswhite Exp $
 
-IUSE=""
-
-DESCRIPTION="This script connects to the specified IRC server and creates a
-diagram of the network performing LINKS command."
+DESCRIPTION="This script connects to the specified IRC server and creates a diagram of the network performing LINKS command."
 HOMEPAGE="http://pasky.ji.cz/~pasky/irc/"
 SRC_URI="http://pasky.ji.cz/~pasky/irc/${PN}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-RDEPEND="virtual/glibc
-         media-gfx/graphviz"
-DEPEND="${RDEPEND}"
+KEYWORDS="x86"
+IUSE=""
+
+RDEPEND="virtual/libc
+	media-gfx/graphviz
+	dev-lang/perl"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
 S=${WORKDIR}/${PN}
 
 src_compile() {
-	for myfile in ircmapC ircmapR-aa ircmapR-gvdot ircmapR-ircnet ircmapS
-	do
-		mv ${myfile}.pl ${myfile}.unpatched
-			sed -e 's!/home/pasky/ircmap!/usr/lib/perl5/site_perl/5.6.1/ircmap!' \
-			${myfile}.unpatched > ${myfile}.pl
-		rm ${myfile}.unpatched
-	done
-}
+	eval `perl -V:installprivlib`
 
+	sed -i \
+		-e "s:/home/pasky/ircmap:${installprivlib}/ircmap:" \
+		{ircmapC,ircmapR-aa,ircmapR-gvdot,ircmapR-ircnet,ircmapS}.pl
+}
 
 src_install () {
 	dodoc README
 	dobin ircmapS.pl ircmapC.pl ircmapR-aa.pl ircmapR-gvdot.pl ircmapR-ircnet.pl
 
-	mkdir -p ${D}/usr/lib/perl5/site_perl/5.6.1/ircmap
-	cp IHash.pm ${D}/usr/lib/perl5/site_perl/5.6.1/ircmap/
+	eval `perl -V:installprivlib`
+
+	insinto /${installprivlib}/ircmap
+	doins IHash.pm
 }
 
 pkg_postinst() {
diff --git a/net-irc/ircservices/ChangeLog b/net-irc/ircservices/ChangeLog
index bbcf9ad732b9..393e77be05c2 100644
--- a/net-irc/ircservices/ChangeLog
+++ b/net-irc/ircservices/ChangeLog
@@ -1,6 +1,111 @@
 # ChangeLog for net-irc/ircservices
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ircservices/ChangeLog,v 1.1 2004/08/14 21:38:26 swegener Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircservices/ChangeLog,v 1.1.1.1 2005/11/30 09:49:04 chriswhite Exp $
+
+*ircservices-5.0.54 (31 Aug 2005)
+
+  31 Aug 2005; Sven Wegener <swegener@gentoo.org>
+  +ircservices-5.0.54.ebuild:
+  Version bump.
+
+  11 Aug 2005; Sven Wegener <swegener@gentoo.org> ircservices-5.0.53.ebuild:
+  Use get_libdir when creating directories.
+
+  10 Aug 2005; Sven Wegener <swegener@gentoo.org>
+  +files/5.0.53-fPIC-configure.patch, ircservices-5.0.53.ebuild:
+  Added -fPIC patch for bug #101542.
+
+  07 Jul 2005; Sven Wegener <swegener@gentoo.org>
+  -ircservices-5.0.51.ebuild, ircservices-5.0.53.ebuild:
+  Marked stable on x86.
+
+  16 May 2005; Sven Wegener <swegener@gentoo.org> ircservices-5.0.51.ebuild,
+  ircservices-5.0.53.ebuild:
+  Added cross-compile support.
+
+*ircservices-5.0.53 (16 May 2005)
+
+  16 May 2005; Sven Wegener <swegener@gentoo.org>
+  -ircservices-5.0.45.ebuild, ircservices-5.0.51.ebuild,
+  +ircservices-5.0.53.ebuild:
+  Version bump. Marked 5.0.51 stable on x86.
+
+*ircservices-5.0.51 (03 Apr 2005)
+
+  03 Apr 2005; Sven Wegener <swegener@gentoo.org>
+  -ircservices-5.0.50.ebuild, +ircservices-5.0.51.ebuild:
+  Version bump, bug #87763.
+
+*ircservices-5.0.50 (02 Apr 2005)
+
+  02 Apr 2005; Sven Wegener <swegener@gentoo.org>
+  -ircservices-5.0.49.ebuild, +ircservices-5.0.50.ebuild:
+  Version bump.
+
+  14 Mar 2005; Sven Wegener <swegener@gentoo.org> ircservices-5.0.45.ebuild,
+  ircservices-5.0.49.ebuild:
+  Strip -Os from CFLAGS for bug #85160.
+
+*ircservices-5.0.49 (11 Mar 2005)
+
+  11 Mar 2005; Sven Wegener <swegener@gentoo.org>
+  -ircservices-5.0.44.ebuild, ircservices-5.0.45.ebuild,
+  +ircservices-5.0.49.ebuild:
+  Version bump, bug #84852. Marked 5.0.45 stable on x86.
+
+*ircservices-5.0.45 (10 Feb 2005)
+
+  10 Feb 2005; Sven Wegener <swegener@gentoo.org>
+  +ircservices-5.0.45.ebuild:
+  Version bump.
+
+  21 Jan 2005; Sven Wegener <swegener@gentoo.org>
+  -ircservices-5.0.41.ebuild, -ircservices-5.0.42.ebuild,
+  ircservices-5.0.44.ebuild:
+  Marked stable on x86. Removed old ebuilds.
+
+*ircservices-5.0.44 (13 Dec 2004)
+
+  13 Dec 2004; Sven Wegener <swegener@gentoo.org> ircservices-5.0.42.ebuild,
+  +ircservices-5.0.44.ebuild:
+  Version bump. Closes bug #74298.
+
+*ircservices-5.0.42 (05 Dec 2004)
+
+  05 Dec 2004; Sven Wegener <swegener@gentoo.org> ircservices-5.0.41.ebuild,
+  +ircservices-5.0.42.ebuild:
+  Version bump. Changed SRC_URI of 5.0.41 to our distfiles mirrors as upstream
+  only has latest stable version available.
+
+  13 Nov 2004; Sven Wegener <swegener@gentoo.org> ircservices-5.0.41.ebuild:
+  Marked stable on x86.
+
+  24 Oct 2004; Sven Wegener <swegener@gentoo.org>
+  -ircservices-5.0.40.ebuild, ircservices-5.0.41.ebuild:
+  Removed old ebuild. Replaced -O[0-9] with -O[3-9] to catch only values above 2.
+
+  15 Oct 2004; David Holm <dholm@gentoo.org> ircservices-5.0.41.ebuild:
+  Added to ~ppc.
+
+*ircservices-5.0.41 (03 Oct 2004)
+
+  03 Oct 2004; Sven Wegener <swegener@gentoo.org>
+  -ircservices-5.0.37.ebuild, +ircservices-5.0.41.ebuild:
+  Version bump. Removed old ebuild.
+
+*ircservices-5.0.40 (08 Sep 2004)
+
+  08 Sep 2004; Sven Wegener <swegener@gentoo.org> ircservices-5.0.37.ebuild,
+  +ircservices-5.0.40.ebuild:
+  Version bump. Made some trivial changes to the older ebuild.
+
+  15 Aug 2004; Sven Wegener <swegener@gentoo.org> +files/ircservices.conf.d,
+  files/ircservices.init.d, ircservices-5.0.37.ebuild:
+  Made the dependency on a local ircd to be up optional via
+  /etc/conf.d/ircservices.
+
+  15 Aug 2004; Sven Wegener <swegener@gentoo.org> files/ircservices.init.d:
+  Fixed init script.
 
 *ircservices-5.0.37 (14 Aug 2004)
 
diff --git a/net-irc/ircservices/Manifest b/net-irc/ircservices/Manifest
index 7c86c6ebe977..1765a9a9a7dc 100644
--- a/net-irc/ircservices/Manifest
+++ b/net-irc/ircservices/Manifest
@@ -1,3 +1,10 @@
-MD5 0c3e4057d437c320f9270c42fbc4991c ircservices-5.0.37.ebuild 2280
-MD5 c891b332d6d323281a6b4ddca13577a1 files/ircservices.init.d 639
-MD5 96e095ebc3d215946583a75e1e3bef1c files/digest-ircservices-5.0.37 71
+MD5 a76b4a63f77cd490010a5ab69d018084 ChangeLog 3889
+MD5 0dc39b8e38a74a2fca213bf4e2f63d3e files/5.0.37-fPIC.patch 1172
+MD5 4378abfaa42b42cf88d1448f7be7d5ce files/5.0.53-fPIC-configure.patch 635
+MD5 29f1a5443fdb20cb212af83299e49fd8 files/digest-ircservices-5.0.53 71
+MD5 8ca20f7c34571d05359169b1ce456e2a files/digest-ircservices-5.0.54 71
+MD5 53b4476f6787f6aa0072d2b7374ab4c2 files/ircservices.conf.d 327
+MD5 fd2df3bf979010c19ad2e4ec09853c7f files/ircservices.init.d 700
+MD5 67e2839da7b8960eec6cf1e208d57ef8 ircservices-5.0.53.ebuild 2991
+MD5 52b060cfd91a6cd792e985a00e5fedbf ircservices-5.0.54.ebuild 2992
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
diff --git a/net-irc/ircservices/files/ircservices.conf.d b/net-irc/ircservices/files/ircservices.conf.d
index ee9a22073b06..8a6b8eccf43a 100644
--- a/net-irc/ircservices/files/ircservices.conf.d
+++ b/net-irc/ircservices/files/ircservices.conf.d
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ircservices/files/ircservices.conf.d,v 1.1 2004/08/14 22:55:05 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircservices/files/ircservices.conf.d,v 1.1.1.1 2005/11/30 09:49:04 chriswhite Exp $
 
 # Se this to true to have ircservices depend on a local ircd to be up
 LOCALIRCD="false"
diff --git a/net-irc/ircservices/files/ircservices.init.d b/net-irc/ircservices/files/ircservices.init.d
index 5e19f2a7f27f..ade1b2e254da 100644
--- a/net-irc/ircservices/files/ircservices.init.d
+++ b/net-irc/ircservices/files/ircservices.init.d
@@ -1,11 +1,16 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ircservices/files/ircservices.init.d,v 1.1 2004/08/14 21:38:26 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircservices/files/ircservices.init.d,v 1.1.1.1 2005/11/30 09:49:04 chriswhite Exp $
 
 depend() {
-	need net
-	use ircd
+	if [ "${LOCALIRCD}" = true ]
+	then
+		need net ircd
+	else
+		need net
+		use ircd
+	fi
 }
 
 start() {
@@ -19,7 +24,7 @@ start() {
 
 stop() {
 	ebegin "Stopping IRC Services"
-	kill <$(/var/lib/ircservices/ircservices.pid)
+	start-stop-daemon --stop --quiet --pidfile /var/lib/ircservices/ircservices.pid
 	eend $?
 	rm -f /var/lib/ircservices/ircservices.pid
 }
diff --git a/net-irc/ircservices/ircservices-5.0.53.ebuild b/net-irc/ircservices/ircservices-5.0.53.ebuild
index fec630d71f54..3763f61de981 100644
--- a/net-irc/ircservices/ircservices-5.0.53.ebuild
+++ b/net-irc/ircservices/ircservices-5.0.53.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ircservices/ircservices-5.0.53.ebuild,v 1.1 2005/05/16 15:36:11 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircservices/ircservices-5.0.53.ebuild,v 1.1.1.1 2005/11/30 09:49:04 chriswhite Exp $
 
-inherit eutils fixheadtails flag-o-matic
+inherit eutils fixheadtails flag-o-matic toolchain-funcs
 
 DESCRIPTION="ChanServ, NickServ & MemoServ with support for several IRC daemons"
 HOMEPAGE="http://www.ircservices.za.net/"
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.esper.net/${PN}/${P}.tar.gz
 	mirror://gentoo/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 IUSE=""
 
 DEPEND=""
@@ -20,6 +20,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/5.0.37-fPIC.patch
+	epatch "${FILESDIR}"/5.0.53-fPIC-configure.patch
 
 	ht_fix_file configure
 	sed -i -e "s/HEAD -1/HEAD -n 1/" configure
@@ -31,6 +32,7 @@ src_compile() {
 	replace-flags "-O[3-9s]" "-O2"
 
 	./configure \
+		-cc "$(tc-getCC)" \
 		-cflags "${CFLAGS}" \
 		-bindest /usr/bin \
 		-datdest /var/lib/ircservices \
@@ -39,7 +41,7 @@ src_compile() {
 }
 
 src_install() {
-	dodir /usr/bin /{etc,{usr,var}/lib,usr/share}/ircservices || die "dodir failed"
+	dodir /usr/bin /{etc,usr/{$(get_libdir),share},var/lib}/ircservices || die "dodir failed"
 	keepdir /var/log/ircservices || die "keepdir failed"
 	fperms 700 /{etc,var/lib}/ircservices || die "fperms failed"
 
diff --git a/net-irc/ircservices/ircservices-5.0.54.ebuild b/net-irc/ircservices/ircservices-5.0.54.ebuild
index 46f775fac4c0..30bd0c4a7001 100644
--- a/net-irc/ircservices/ircservices-5.0.54.ebuild
+++ b/net-irc/ircservices/ircservices-5.0.54.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ircservices/ircservices-5.0.54.ebuild,v 1.1 2005/08/31 17:31:35 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircservices/ircservices-5.0.54.ebuild,v 1.1.1.1 2005/11/30 09:49:04 chriswhite Exp $
 
 inherit eutils fixheadtails flag-o-matic toolchain-funcs
 
diff --git a/net-irc/ircstats/ChangeLog b/net-irc/ircstats/ChangeLog
index 83ff183c54f0..35e04dfeed16 100644
--- a/net-irc/ircstats/ChangeLog
+++ b/net-irc/ircstats/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for net-irc/ircstats
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ircstats/ChangeLog,v 1.1 2005/08/18 00:59:02 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircstats/ChangeLog,v 1.1.1.1 2005/11/30 09:48:51 chriswhite Exp $
 
 *ircstats-1.0 (18 Aug 2005)
 
diff --git a/net-irc/ircstats/Manifest b/net-irc/ircstats/Manifest
index 09d9ca29971b..a0f9e5489930 100644
--- a/net-irc/ircstats/Manifest
+++ b/net-irc/ircstats/Manifest
@@ -1,4 +1,14 @@
-MD5 94457c0bd21fe31d673519dbac3ea180 ChangeLog 335
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 444914d5d6d10559ec68834065f5e954 ChangeLog 425
 MD5 4202e9cb2fe43f966c1cb844532ccddb files/digest-ircstats-1.0 60
-MD5 176dd5e6b43bd78f89ea8febabb90e21 ircstats-1.0.ebuild 859
+MD5 3c8c4918194892138f83c5225d94f907 ircstats-1.0.ebuild 959
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDA91rI1lqEGTUzyQRAgXXAJ4p24rqSIJoYHnpIHu0TQWmjwLRVgCfVEFo
+j794l9JIsjT47kMoX7usqgs=
+=En6m
+-----END PGP SIGNATURE-----
diff --git a/net-irc/ircstats/ircstats-1.0.ebuild b/net-irc/ircstats/ircstats-1.0.ebuild
index caca36288619..52f45da4be91 100644
--- a/net-irc/ircstats/ircstats-1.0.ebuild
+++ b/net-irc/ircstats/ircstats-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ircstats/ircstats-1.0.ebuild,v 1.1 2005/08/18 00:59:02 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircstats/ircstats-1.0.ebuild,v 1.1.1.1 2005/11/30 09:48:51 chriswhite Exp $
 
 inherit toolchain-funcs
 
diff --git a/net-irc/irssi-svn/ChangeLog b/net-irc/irssi-svn/ChangeLog
index 32e48d5d3576..9e6588d58f49 100644
--- a/net-irc/irssi-svn/ChangeLog
+++ b/net-irc/irssi-svn/ChangeLog
@@ -1,6 +1,41 @@
 # ChangeLog for net-irc/irssi-svn
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi-svn/ChangeLog,v 1.1 2005/05/14 23:09:36 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi-svn/ChangeLog,v 1.1.1.1 2005/11/30 09:49:01 chriswhite Exp $
+
+  30 Jul 2005; Aaron Walker <ka0ttic@gentoo.org> irssi-svn-0.3.ebuild:
+  Added ~mips.
+
+  28 Jun 2005; Sven Wegener <swegener@gentoo.org> irssi-svn-0.3.ebuild:
+  Added NOCONFIGURE=1 to avoid running configure during bootstrap.
+
+  26 Jun 2005; Jason Wever <weeve@gentoo.org> irssi-svn-0.3.ebuild:
+  Added ~sparc keyword wrt bug #96775.
+
+  25 Jun 2005; Rene Nussbaumer <killerfox@gentoo.org> irssi-svn-0.3.ebuild:
+  Added to ~hppa.
+
+  23 Jun 2005; Olivier Crête <tester@gentoo.org> irssi-svn-0.3.ebuild:
+  Marked ~amd64
+
+  22 Jun 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  irssi-svn-0.3.ebuild:
+  Added to ~ppc
+
+  22 Jun 2005; Fernando J. Pereda <ferdy@gentoo.org> irssi-svn-0.3.ebuild:
+  marked ~alpha, wrt bug #96775
+
+  13 Jun 2005; Sven Wegener <swegener@gentoo.org> irssi-svn-0.3.ebuild:
+  Irssi uses extern inlines and that needs at least -O in CFLAGS.
+
+  19 May 2005; Sven Wegener <swegener@gentoo.org> irssi-svn-0.3.ebuild:
+  Added a call to fixlocalpod to fix the collision-protect bug #68367.
+
+  17 May 2005; Sven Wegener <swegener@gentoo.org> irssi-svn-0.3.ebuild:
+  Removed unneeded --with-glib2 and added missing openssl dependency. Thanks
+  to Emanuele Giaquinta.
+
+  15 May 2005; Sven Wegener <swegener@gentoo.org> irssi-svn-0.3.ebuild:
+  Removed obsolete gettext dependency.
 
 *irssi-svn-0.3 (14 May 2005)
 
diff --git a/net-irc/irssi-svn/Manifest b/net-irc/irssi-svn/Manifest
index f03803a8ef6d..e80f9d66e6b3 100644
--- a/net-irc/irssi-svn/Manifest
+++ b/net-irc/irssi-svn/Manifest
@@ -1,2 +1,14 @@
-MD5 d740e702c9206a70b9e50339e91d4dea irssi-svn-0.1.ebuild 1272
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-irssi-svn-0.1 0
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 db91d236948e4b0c82636bea6a204ea0 ChangeLog 1725
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-irssi-svn-0.3 0
+MD5 1f857b595e8a3f376d2ee5ee9489ba7c irssi-svn-0.3.ebuild 1499
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDEKFGI1lqEGTUzyQRAofLAJ9lejPjezZqa6J6tOlix4YfD0oyRACgy7Xr
+uVjoVz8vSjKrxbv4R8GDI+U=
+=IViu
+-----END PGP SIGNATURE-----
diff --git a/net-irc/irssi-svn/irssi-svn-0.3.ebuild b/net-irc/irssi-svn/irssi-svn-0.3.ebuild
index 6b82775178d6..0ffc79c334dd 100644
--- a/net-irc/irssi-svn/irssi-svn-0.3.ebuild
+++ b/net-irc/irssi-svn/irssi-svn-0.3.ebuild
@@ -1,35 +1,36 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi-svn/irssi-svn-0.3.ebuild,v 1.1 2005/05/14 23:09:36 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi-svn/irssi-svn-0.3.ebuild,v 1.1.1.1 2005/11/30 09:49:01 chriswhite Exp $
 
-inherit subversion perl-module
+inherit subversion perl-module flag-o-matic
 
 ESVN_REPO_URI="http://svn.irssi.org/repos/irssi/trunk/"
 ESVN_PROJECT="irssi"
-ESVN_BOOTSTRAP="./autogen.sh"
+ESVN_BOOTSTRAP="NOCONFIGURE=1 ./autogen.sh"
 
 DESCRIPTION="A modular textUI IRC client with IPv6 support"
 HOMEPAGE="http://irssi.org/"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
 IUSE="ipv6 perl ssl"
 
 RDEPEND=">=dev-libs/glib-2.2.1
 	sys-libs/ncurses
 	perl? ( dev-lang/perl )
+	ssl? ( dev-libs/openssl )
 	!net-irc/irssi
 	!net-irc/irssi-cvs"
 DEPEND="${RDEPEND}
+	dev-lang/perl
 	www-client/lynx
-	nls? ( sys-devel/gettext )
 	>=sys-devel/autoconf-2.58"
 
 src_compile() {
-	export WANT_AUTOCONF=2.5
+	# Irssi uses extern inlines and that needs at least -O
+	is-flag "-O*" || append-flags -O
 
 	econf \
-		--with-glib2 \
 		--with-proxy \
 		--with-ncurses \
 		$(use_with perl) \
@@ -56,6 +57,8 @@ src_install() {
 		gnulocaledir="${D}"/usr/share/locale \
 		install || die "make install failed"
 
+	use perl && fixlocalpod
+
 	prepalldocs
 	dodoc AUTHORS ChangeLog README TODO NEWS
 	dohtml -r "${S}"/docs/. || die "dohtml failed"
diff --git a/net-irc/irssi/ChangeLog b/net-irc/irssi/ChangeLog
index 00ecadf8137d..b49bd628ddf4 100644
--- a/net-irc/irssi/ChangeLog
+++ b/net-irc/irssi/ChangeLog
@@ -1,13 +1,282 @@
 # ChangeLog for net-irc/irssi
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/ChangeLog,v 1.1 2002/02/01 21:53:32 gbevin Exp $
-
-*irssi-0.7.98.4 (1 Feb 2002)
-
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  comments should well explained and written in clean English. The details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/ChangeLog,v 1.1.1.1 2005/11/30 09:48:55 chriswhite Exp $
+
+  13 Nov 2005; Sven Wegener <swegener@gentoo.org>
+  +files/0.8.9-gcc4-fix.patch, irssi-0.8.9-r1.ebuild:
+  Apply the gcc4 patch to 0.8.9 too, bug #110361.
+
+*irssi-0.8.10_rc7 (10 Nov 2005)
+
+  10 Nov 2005; Sven Wegener <swegener@gentoo.org> +irssi-0.8.10_rc7.ebuild:
+  Version bump.
+
+  14 Oct 2005; Sven Wegener <swegener@gentoo.org> irssi-0.8.10_rc6.ebuild:
+  Remove unused configure options and no longer needed perl build-time
+  dependency.
+
+*irssi-0.8.10_rc6 (13 Oct 2005)
+
+  13 Oct 2005; Sven Wegener <swegener@gentoo.org>
+  -files/irssi-0.8.10_rc5-gcc4.patch, -irssi-0.8.10_rc5-r1.ebuild,
+  +irssi-0.8.10_rc6.ebuild:
+  Version bump.
+
+  13 Jun 2005; Sven Wegener <swegener@gentoo.org> irssi-0.8.9-r1.ebuild,
+  irssi-0.8.10_rc5-r1.ebuild:
+  Irssi uses extern inlines and that needs at least -O in CFLAGS.
+
+  19 May 2005; Sven Wegener <swegener@gentoo.org> irssi-0.8.9-r1.ebuild,
+  irssi-0.8.10_rc5-r1.ebuild:
+  Added a call to fixlocalpod to fix the collision-protect bug #68367.
+
+  17 May 2005; Sven Wegener <swegener@gentoo.org>
+  +files/irssi-0.8.10_rc5-gcc4.patch, irssi-0.8.10_rc5-r1.ebuild:
+  Pull in gcc-4 patch from upstream svn. Closes bug #92918.
+
+  15 May 2005; Sven Wegener <swegener@gentoo.org> irssi-0.8.9-r1.ebuild,
+  irssi-0.8.10_rc5-r1.ebuild:
+  Removed obsolete gettext support.
+
+  14 May 2005; Sven Wegener <swegener@gentoo.org> irssi-0.8.9-r1.ebuild,
+  irssi-0.8.10_rc5-r1.ebuild:
+  Added blocker for net-irc/irssi-svn
+
+  22 Apr 2005; Alin Nastac <mrness@gentoo.org> irssi-0.8.9-r1.ebuild,
+  irssi-0.8.10_rc5-r1.ebuild:
+  net-misc/dante -> net-proxy/dante
+
+  06 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> irssi-0.8.9-r1.ebuild:
+  Apply socks patch to 0.8.9 too to fix LiveCD
+
+  01 Mar 2005; Sven Wegener <swegener@gentoo.org>
+  +files/irssi-socks-fix.patch, irssi-0.8.10_rc5-r1.ebuild,
+  -irssi-0.8.10_rc5.ebuild:
+  Added a patch that fixes wrong include order if socks support is enabled.
+  Closes bug #83522.
+
+  22 Jan 2005; Sven Wegener <swegener@gentoo.org>
+  irssi-0.8.10_rc5-r1.ebuild:
+  Added a call to syntax.pl to generate updated help files.
+
+*irssi-0.8.10_rc5-r1 (21 Jan 2005)
+
+  21 Jan 2005; Sven Wegener <swegener@gentoo.org>
+  +irssi-0.8.10_rc5-r1.ebuild:
+  Pull in all CVS changes from 0.8.10_rc5 to now. Includes several bugfixes
+  (logging, memleak and more), updated help (recode) and some new features.
+  Read upstream's ChangeLog for more information. Closes bug #78917.
+
+  07 Jan 2005; Sven Wegener <swegener@gentoo.org> irssi-0.8.10_rc5.ebuild:
+  Removed blockers on irssi-charconv and irssi-recode.
+
+  13 Nov 2004; Sven Wegener <swegener@gentoo.org>
+  -files/irssi-0.8.6-configure.patch, -files/irssi-0.8.8-configure.patch,
+  irssi-0.8.10_rc5.ebuild, -irssi-0.8.6-r6.ebuild, irssi-0.8.9-r1.ebuild,
+  -irssi-0.8.9.ebuild:
+  Moved all stable KEYWORDS to 0.8.9-r1 to allow the removal of old ebuilds.
+
+  07 Nov 2004; Joshua Kinard <kumba@gentoo.org> irssi-0.8.9-r1.ebuild:
+  Marked stable on mips.
+
+  31 Oct 2004; Kito <kito@gentoo.org> irssi-0.8.10_rc5.ebuild:
+  added ~ppc-macos
+
+*irssi-0.8.10_rc5 (12 Sep 2004)
+
+  12 Sep 2004; Sven Wegener <swegener@gentoo.org> +irssi-0.8.10_rc5.ebuild:
+  Version bump to 0.8.10_rc5. This version has the features of
+  net-irc/irssi-charconv and net-irc/irssi-recode integrated, so we block them.
+  Closes bug #63367.
+
+*irssi-0.8.9-r1 (24 Jul 2004)
+
+  24 Jul 2004; Sven Wegener <swegener@gentoo.org>
+  +files/irssi-0.8.9-64bit-exec-fix.patch, +irssi-0.8.9-r1.ebuild:
+  Added backported fix from upstream CVS, which fixes the /exec command bug on
+  64-bit arches. Closes bug #57785.
+
+  08 Jul 2004; Sven Wegener <swegener@gentoo.org> -irssi-0.8.6-r5.ebuild,
+  irssi-0.8.6-r6.ebuild, irssi-0.8.9.ebuild:
+  Updated dependencies and ebuild cleanup.
+
+  18 Jun 2004; Sven Wegener <swegener@gentoo.org> irssi-0.8.9.ebuild:
+  Added dev-libs/glib to RDEPEND. Closes bug #54323.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> irssi-0.8.6-r5.ebuild,
+  irssi-0.8.6-r6.ebuild:
+  Add inherit eutils
+
+  12 Apr 2004; <randy@gentoo.org> irssi-0.8.9.ebuild:
+  Adding s390 keywords
+
+  05 Mar 2004; Tom Gall <tgall@gentoo.org> irssi-0.8.9.ebuild:
+  marked stable on ppc64
+
+  21 Feb 2004; Seemant Kulleen <seemant@gentoo.org> irssi-0.8.9.ebuild:
+  added perl, ssl and socks to RDEPENDS for livecd irssi to run properly
+
+  15 Jan 2004; Jon Portnoy <avenj@gentoo.org> irssi-0.8.9.ebuild :
+  Stable on AMD64.
+
+  09 Jan 2004; Jason Wever <weeve@gentoo.org> irssi-0.8.9.ebuild:
+  Marked stable on sparc.
+
+  09 Jan 2004; root <root@gentoo.org> irssi-0.8.9.ebuild:
+  Marked stable on hppa.
+
+  05 Jan 2004; Aron Griffis <agriffis@gentoo.org> irssi-0.8.9.ebuild:
+  Use glib2 (this ebuild accidentally regressed from 0.8.6-r6).  Don't
+  build the bot, which is apparently broken and unsupported.  Mark
+  stable on x86, alpha and ia64.  These changes fix bugs 33603, 35614
+  and 35532 and follow discussion with Greg F. in December.
+
+  12 Dec 2003; Greg Fitzgerald <gregf@gentoo.org> irssi-0.8.9.ebuild:
+  Fixed patch problem, closes bug #35657
+
+*irssi-0.8.9 (11 Dec 2003)
+
+  11 Dec 2003; Greg Fitzgerald <gregf@gentoo.org> irssi-0.8.8-r1.ebuild,
+  irssi-0.8.8.ebuild, irssi-0.8.9.ebuild:
+  Version Bump, fixes ssl bug #35532
+
+  11 Dec 2003; Greg Fitzgerald <gregf@gentoo.org> irssi-0.8.8-r1.ebuild,
+  irssi-0.8.8.ebuild:
+  Removed because of remoate crash bug
+
+*irssi-0.8.8-r1 (26 Nov 2003)
+
+  26 Nov 2003; Greg Fitzgerald <gregf@gentoo.org> irssi-0.8.8-r1.ebuild:
+  Force glib2, removed bot (obsolete).
+
+*irssi-0.8.6-r6 (26 Nov 2003)
+
+  26 Nov 2003; Greg Fitzgerald <gregf@gentoo.org> irssi-0.8.6-r6.ebuild:
+  Removed --with-bot, no used anymore and it was broken. Forced usage of glib2.
+  This closes bug #33603.
+
+  23 Nov 2003; Martin Holzer <mholzer@gentoo.org> irssi-0.8.8.ebuild,
+  files/irssi-0.8.8-configure.patch:
+  fixing head -1 issue. Closes #34186.
+
+*irssi-0.8.8 (23 Nov 2003)
+
+  23 Nov 2003; Greg Fitzgerald <gregf@gentoo.org> irssi-0.8.8.ebuild:
+  Version bump.
+
+*irssi-0.8.6-r5 (11 Nov 2003)
+
+  11 Nov 2003; Chuck Short <zul@gentoo.org> irssi-0.8.6-r5.ebuild:
+  New version, fixes use handling and new socks functionaility at compile time.
+  Ebuild submitted by Aron Griffis <agriffis@gentoo.org>
+  Closes bug #33230.
+
+*irssi-0.8.6-r4 (05 Oct 2003)
+
+  05 Oct 2003; Greg Fitzgerald <gregf@gentoo.org> irssi-0.8.6-r4.ebuild:
+  Fix for use=perl, this closes bug #30029
+
+  01 Oct 2003; Tavis Ormandy <taviso@gentoo.org> irssi-0.8.6-r3.ebuild:
+  Stable on alpha
+
+*irssi-0.8.6-r3 (30 Sep 2003)
+
+  30 Sep 2003; Joshua Kinard <kumba@gentoo.org> irssi-0.8.6-r3.ebuild:
+  Changed ~mips to mips in KEYWORDS
+
+  18 Sep 2003; Jon Portnoy <avenj@gentoo.org> :
+  ia64 keywords.
+
+  21 Aug 2003; <chuck@gentoo.org> :
+  Added SSL suport, closes bug #26343.
+
+*irssi-0.8.6-r2 (10 Feb 2003)
+
+  07 Aug 2003; Tavis Ormandy <taviso@gentoo.org> irssi-0.8.6-r2.ebuild:
+  stable on alpha
+
+  18 Jul 2003; Olivier Crete <tester@gentoo.org> irssi-0.8.6-r2.ebuild,
+  files/irssi-0.8.6-configure.patch:
+  Fix tail use to make it posix compliant
+
+  18 Jul 2003; John Mylchreest <johnm@gentoo.org>; irssi-0.8.6-r2.ebuild:
+  adding irssi-cvs block
+
+  19 Jun 2003; <msterret@gentoo.org> irssi-0.8.6-r2.ebuild:
+  Ugly hack to work around compression of the html files. (bug 23048)
+
+  01 Jun 2003; Joshua Kinard <kumba@gentoo.org> irssi-0.8.6-r2.ebuild:
+  Added ~mips to KEYWORDS
+
+  11 Feb 2003; Guy Martin <gmsoft@gentoo.org> irssi-0.8.6-r2.ebuild :
+  Added hppa to keywords.
+
+  04 Apr 2003; Jason Wever <weeve@gentoo.org> irssi-0.8.6-r2.ebuild:
+  Changed ~sparc keyword to sparc.
+
+  10 Feb 2003; Peter Johanson <latexer@gentoo.org> :
+  Added ~alpha to KEYWORDS.
+
+  10 Feb 2002; Tobias Eichert <viz@gentoo.org> :
+  Removed older irssi ebuilds and revisions to
+  make the directory more concise..now we
+  have an ebuild for irssi-0.8.5 and irssi-0.8.6.
+  Changed =dev-libs/glib-2.2* dependency to
+  >=dev-libs/glib-1.2.
+  Changed "~x86" to "x86" in KEYWORDS.
+
+  10 Feb 2003; Tobias Eichert <viz@gentoo.org> irssi-0.8.6-r2.ebuild:
+  Removed glib-1.2* as a dependency. Therefor added glib-2.2*.
+  Closes bug #13991.
+
+*irssi-0.8.6-r1 (22 Dec 2002)
+
+  22 Dec 2002; Maik Schreiber <blizzy@gentoo.org> : Obey USE="-ssl" (bug
+  #12566).
+
+  21 Dec 2002; Maik Schreiber <blizzy@gentoo.org> irssi-0.8.6.ebuild: Changed
+  "~x86" to "x86" in KEYWORDS.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*irssi-0.8.6 (19 Nov 2002)
+
+  19 Nov 2002; Maik Schreiber <blizzy@gentoo.org> : New version.
+
+  20 Oct 2002; Mike Frysinger <vapier@gentoo.org> irssi-0.8.5-r2.ebuild :
+  Added 'prepalldocs' to src_install since `make install` was putting them there
+
+  16 Sep 2002; Maarten Thibaut <murphy@gentoo.org> irssi-0.8.5-r2.ebuild :
+  Added sparc/sparc64 keywords.
+
+  13 Sep 2002; Michael Cummings <mcummings@gentoo.org>: Corrected perl
+  syntax to use perl eclass for perl Makefile.PL actions, bug 7868.
+
+*irssi-0.8.5-r2 (12 Sep 2002)
+
+  10 Feb 2003; Peter Johanson <latexer@gentoo.org> :
+  Added ~alpha to KEYWORDS.
+
+  12 Sep 2002; Daniel Robbins <drobbins@gentoo.org>: new rev bump with
+  configuration flag fixes: several use/configure combos were toggled, the
+  ebuild had "--enable-perl" instead of "--with-perl", etc. Lamer's socks
+  stuff has been commented out for the time being so that I can unmask
+  this now (but is being kept so that it can be uncommented later.)
+
+*irssi-0.8.5-r1 (15 Jul 2002)
+
+  24 Jul 2002; Mark Guertin <gerk@gentoo.org>: Added ppc to keywords
+
+  15 Jul 2002; Ben Lutgens <lamer@gentoo.org> ChangeLog: Incremented the
+  version number. Anyone with socks in use gets an additional depend on
+  net-misc/dante-1.1.13. It's needed for libsocks.so and socks.h (otherwise
+  toggling the option --with-socks does no good) needs more socks testing
+  however so it's getting masked)
+
+*irssi-0.8.5 (23 Jun 2002)
+
+  23 Jun 2002; lamer <lamer@gentoo.org>: Updated to latest version from
+  upstream. Fixes a topic string overflow DoS attack. Upgrade now.
+
+  11 Apr 2002; Spider <spider@gentoo.org>: Update all glib dependencies to use
+  glib-1.2*  in preparation of unmasking the glib-2.0.1 packages
diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index e69de29bb2d1..4d7c32a33c70 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -0,0 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3128dcf7f045e723a4da06d946dca758 ChangeLog 10272
+MD5 f6b8616b8bf8962bd0d491c457733ea5 files/0.8.9-gcc4-fix.patch 309
+MD5 86c23e50268afba6a28bd266bc1d0915 files/digest-irssi-0.8.10_rc6 69
+MD5 c503196f97b13bdcdca0c1acce6bad6e files/digest-irssi-0.8.10_rc7 69
+MD5 d8d32d5f69fd1bccf2928c4bad648cd6 files/digest-irssi-0.8.9-r1 64
+MD5 6613882c525a6f1db208af7fe5905336 files/irssi-0.8.9-64bit-exec-fix.patch 499
+MD5 c3b74cff45778ccaab4b0c05f85139cd files/irssi-socks-fix.patch 551
+MD5 2bd16fabdc8db3900096c2fa6232394b irssi-0.8.10_rc6.ebuild 1991
+MD5 8d333de931e2ed167c3833728289ca3f irssi-0.8.10_rc7.ebuild 1991
+MD5 23bd14008db42e94626d8fc02d72db6e irssi-0.8.9-r1.ebuild 2250
+MD5 66fbf3744370d75438e10d4d8b6a3900 metadata.xml 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDdzAXI1lqEGTUzyQRAvDWAKC77gBpYlmCnZ8MKS1PnJPW7T3YlwCfXQcL
+1xgvpT0KuyLECQADt5RK2LM=
+=Vwzw
+-----END PGP SIGNATURE-----
diff --git a/net-irc/irssi/irssi-0.8.10_rc6.ebuild b/net-irc/irssi/irssi-0.8.10_rc6.ebuild
index c17227f29cb2..183de3dbbf40 100644
--- a/net-irc/irssi/irssi-0.8.10_rc6.ebuild
+++ b/net-irc/irssi/irssi-0.8.10_rc6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/irssi-0.8.10_rc6.ebuild,v 1.1 2005/10/13 13:09:27 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/irssi-0.8.10_rc6.ebuild,v 1.1.1.1 2005/11/30 09:48:55 chriswhite Exp $
 
 inherit perl-module eutils flag-o-matic
 
@@ -23,7 +23,7 @@ RDEPEND="!net-irc/irssi-cvs
 	perl? ( dev-lang/perl )
 	socks5? ( >=net-proxy/dante-1.1.13 )"
 DEPEND="${RDEPEND}
-	dev-lang/perl
+	>=dev-util/pkgconfig-0.9.0
 	>=sys-apps/sed-4"
 
 S="${WORKDIR}"/${MY_P}
@@ -53,18 +53,13 @@ src_compile() {
 	fi
 
 	econf \
-		--with-glib2 \
-		--without-servertest \
 		--with-proxy \
 		--with-ncurses \
 		$(use_with perl) \
 		$(use_enable ipv6) \
 		$(use_with socks5 socks) \
-		${myconf} || die "./configure failed"
+		${myconf} || die "econf failed"
 	emake || die "emake failed"
-
-	# Generate updated help
-	./syntax.pl
 }
 
 src_install() {
diff --git a/net-irc/irssi/irssi-0.8.10_rc7.ebuild b/net-irc/irssi/irssi-0.8.10_rc7.ebuild
index 64f1353bf1f5..93da66f4a974 100644
--- a/net-irc/irssi/irssi-0.8.10_rc7.ebuild
+++ b/net-irc/irssi/irssi-0.8.10_rc7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/irssi-0.8.10_rc7.ebuild,v 1.1 2005/11/10 12:28:04 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/irssi-0.8.10_rc7.ebuild,v 1.1.1.1 2005/11/30 09:48:55 chriswhite Exp $
 
 inherit perl-module eutils flag-o-matic
 
diff --git a/net-irc/irssi/irssi-0.8.9-r1.ebuild b/net-irc/irssi/irssi-0.8.9-r1.ebuild
index 9efea1929d0f..afdcdd3560dc 100644
--- a/net-irc/irssi/irssi-0.8.9-r1.ebuild
+++ b/net-irc/irssi/irssi-0.8.9-r1.ebuild
@@ -1,51 +1,52 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/irssi-0.8.9-r1.ebuild,v 1.1 2004/07/23 22:39:14 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/irssi-0.8.9-r1.ebuild,v 1.1.1.1 2005/11/30 09:48:55 chriswhite Exp $
 
-IUSE="nls ipv6 perl ssl socks5"
+inherit perl-module eutils flag-o-matic
 
-inherit perl-module eutils
-
-DESCRIPTION="A modular textUI IRC client with IPv6 support."
-SRC_URI="http://irssi.org/files/${P}.tar.bz2"
+DESCRIPTION="A modular textUI IRC client with IPv6 support"
 HOMEPAGE="http://irssi.org/"
+SRC_URI="http://irssi.org/files/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc sparc alpha hppa mips amd64 ia64 ppc64 s390 arm"
+IUSE="ipv6 perl ssl socks5"
 
 RDEPEND="!net-irc/irssi-cvs
+	!net-irc/irssi-svn
 	>=dev-libs/glib-2.2.1
 	sys-libs/ncurses
 	ssl? ( dev-libs/openssl )
 	perl? ( dev-lang/perl )
-	socks5? ( >=net-misc/dante-1.1.13 )"
+	socks5? ( >=net-proxy/dante-1.1.13 )"
 DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
 	>=sys-apps/sed-4"
 
-SLOT="0"
-LICENSE="GPL-2"
-# Original KEYWORDS="x86 ppc sparc alpha hppa ~mips amd64 ia64 ppc64 s390"
-# All other KEYWORDS were removed because this ebuild only contains an 64-bit arch fix.
-KEYWORDS="amd64 ia64 ppc64"
-
 src_unpack() {
 	unpack ${A}
 
 	# Ugly hack to work around compression of the html files.
 	# Remove this if prepalldocs is changed to avoid gzipping html files.
-	cd ${S} && \
+	cd "${S}" && \
 	sed -i \
 		-e 's/[^ 	]\+\.html//g' docs/Makefile.in || \
 			die "sed doc/Makefile.in failed"
 
-	epatch ${FILESDIR}/${P}-64bit-exec-fix.patch
+	epatch "${FILESDIR}"/${P}-64bit-exec-fix.patch
+	epatch "${FILESDIR}"/${PV}-gcc4-fix.patch
+	epatch "${FILESDIR}"/irssi-socks-fix.patch
 }
 
 src_compile() {
+	# Irssi uses extern inlines and that needs at least -O
+	is-flag "-O*" || append-flags -O
+
 	# Note: there is an option to build a GUI for irssi, but according
 	# to the website the GUI is no longer developed, so that option is
 	# not used here.
 	local myconf="--with-glib2 --without-servertest --with-proxy --with-ncurses"
 
-	myconf="${myconf} `use_enable nls`"
 	myconf="${myconf} `use_with perl`"
 	myconf="${myconf} `use_enable ipv6`"
 	myconf="${myconf} `use_with socks5 socks`"
@@ -60,24 +61,25 @@ src_compile() {
 }
 
 src_install() {
-	myflags=""
-
-	if use perl; then
-		cd ${S}/src/perl/common; perl-module_src_prep
-		cd ${S}/src/perl/irc;    perl-module_src_prep
-		cd ${S}/src/perl/textui; perl-module_src_prep
-		cd ${S}/src/perl/ui;     perl-module_src_prep
-		cd ${S}
+	if use perl
+	then
+		for dir in "${S}"/src/perl/{common,irc,textui,ui}
+		do
+			cd "${dir}"
+			perl-module_src_prep
+		done
+		cd "${S}"
 	fi
 
-	make DESTDIR=${D} \
+	make \
+		DESTDIR="${D}" \
 		docdir=/usr/share/doc/${PF} \
-		gnulocaledir=${D}/usr/share/locale \
-		${myflags} \
-		install || die
+		gnulocaledir="${D}"/usr/share/locale \
+		install || die "make install failed"
+
+	use perl && fixlocalpod
 
 	prepalldocs
-	dodoc AUTHORS ChangeLog README TODO NEWS
-	cd ${S}/docs
-	dohtml -r . || die "dohtml failed"
+	dodoc AUTHORS ChangeLog README TODO NEWS || die "dodoc failed"
+	dohtml -r ${S}/docs/. || die "dohtml failed"
 }
diff --git a/net-irc/irssi/metadata.xml b/net-irc/irssi/metadata.xml
index 6ef15e900f17..8938c398a02d 100644
--- a/net-irc/irssi/metadata.xml
+++ b/net-irc/irssi/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>net-irc</herd>
+<maintainer>
+	<email>gregf@gentoo.org</email>
+	<name>Greg Fitzgerald</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-irc/irssistats/ChangeLog b/net-irc/irssistats/ChangeLog
index 24cd98a5da02..0a4da63e589a 100644
--- a/net-irc/irssistats/ChangeLog
+++ b/net-irc/irssistats/ChangeLog
@@ -1,6 +1,31 @@
 # ChangeLog for net-irc/irssistats
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irssistats/ChangeLog,v 1.1 2004/03/22 13:48:55 zul Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssistats/ChangeLog,v 1.1.1.1 2005/11/30 09:48:58 chriswhite Exp $
+
+  16 May 2005; Sven Wegener <swegener@gentoo.org> irssistats-0.70.ebuild:
+  Moved to toolchain-funcs.eclass for bug #92745.
+
+*irssistats-0.70 (07 Apr 2005)
+
+  07 Apr 2005; Sven Wegener <swegener@gentoo.org> -irssistats-0.6.ebuild,
+  irssistats-0.62.ebuild, +irssistats-0.70.ebuild:
+  Version bump, bug #87964. Marked 0.62 stable on x86.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  irssistats-0.6.ebuild:
+  virtual/glibc -> virtual/libc
+
+*irssistats-0.62 (20 Jun 2004)
+
+  20 Jun 2004; Sven Wegener <swegener@gentoo.org> +irssistats-0.62.ebuild:
+  Version bump. Made CFLAGS aware.
+
+  19 Jun 2004; Jason Wever <weeve@gentoo.org> irssistats-0.6.ebuild:
+  Added ~sparc keyword.
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  irssistats-0.6.ebuild:
+  Masked irssistats-0.6.ebuild testing for ppc
 
 *irssistats-0.6 (22 Mar 2004)
 
diff --git a/net-irc/irssistats/Manifest b/net-irc/irssistats/Manifest
index 70d88e2c5e0c..8b1674603a9e 100644
--- a/net-irc/irssistats/Manifest
+++ b/net-irc/irssistats/Manifest
@@ -1,2 +1,16 @@
-MD5 764de3c28bc736f85bb1c5a5490887d3 irssistats-0.6.ebuild 523
-MD5 9b72aab830f6ca744bbacdc2ec51b5a8 files/digest-irssistats-0.6 65
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1606f755271869e2b5dae335234e30b3 irssistats-0.62.ebuild 703
+MD5 d5bb67703033a323cb1c0a5c8ad078dc irssistats-0.70.ebuild 704
+MD5 d3865529a3546dd4143fd520bf15aef7 ChangeLog 1174
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+MD5 375b9d27e7a283d6ba2816d0f5239d3f files/digest-irssistats-0.62 66
+MD5 23c040f3a9c452c62190bcef3fa2a219 files/digest-irssistats-0.70 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCh+pnI1lqEGTUzyQRArmnAJ9eU7EbkjLmnvXHLP3D80Q0/7g1ugCgqb9Y
+4t4p+AwRG/jCLYLRs/40Nrw=
+=KcSn
+-----END PGP SIGNATURE-----
diff --git a/net-irc/irssistats/irssistats-0.62.ebuild b/net-irc/irssistats/irssistats-0.62.ebuild
index 5e895f1f1a3b..8d8464ce846d 100644
--- a/net-irc/irssistats/irssistats-0.62.ebuild
+++ b/net-irc/irssistats/irssistats-0.62.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irssistats/irssistats-0.62.ebuild,v 1.1 2004/06/20 03:50:16 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssistats/irssistats-0.62.ebuild,v 1.1.1.1 2005/11/30 09:48:58 chriswhite Exp $
 
-inherit gcc
+inherit toolchain-funcs
 
 DESCRIPTION="Generates HTML IRC stats based on irssi logs."
 HOMEPAGE="http://royale.zerezo.com/irssistats/"
@@ -11,13 +11,13 @@ SRC_URI="http://royale.zerezo.com/irssistats/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ~ppc ~sparc"
 IUSE=""
 
 DEPEND=""
 
 src_compile() {
-	$(gcc-getCC) -o irssistats ${CFLAGS} irssistats.c
+	$(tc-getCC) -o irssistats ${CFLAGS} irssistats.c || die "compile failed"
 }
 
 src_install() {
diff --git a/net-irc/irssistats/irssistats-0.70.ebuild b/net-irc/irssistats/irssistats-0.70.ebuild
index 735cbce2cae0..4ba0a0417d55 100644
--- a/net-irc/irssistats/irssistats-0.70.ebuild
+++ b/net-irc/irssistats/irssistats-0.70.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irssistats/irssistats-0.70.ebuild,v 1.1 2005/04/07 19:40:14 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssistats/irssistats-0.70.ebuild,v 1.1.1.1 2005/11/30 09:48:58 chriswhite Exp $
 
-inherit gcc
+inherit toolchain-funcs
 
 DESCRIPTION="Generates HTML IRC stats based on irssi logs."
 HOMEPAGE="http://royale.zerezo.com/irssistats/"
@@ -17,7 +17,7 @@ IUSE=""
 DEPEND=""
 
 src_compile() {
-	$(gcc-getCC) -o irssistats ${CFLAGS} irssistats.c || die "compile failed"
+	$(tc-getCC) -o irssistats ${CFLAGS} irssistats.c || die "compile failed"
 }
 
 src_install() {
diff --git a/net-irc/jircii/ChangeLog b/net-irc/jircii/ChangeLog
index 74c09c44b287..2fb9b505bfc1 100644
--- a/net-irc/jircii/ChangeLog
+++ b/net-irc/jircii/ChangeLog
@@ -1,6 +1,132 @@
 # ChangeLog for net-irc/jircii
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/jircii/ChangeLog,v 1.1 2004/07/12 20:34:07 swegener Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/jircii/ChangeLog,v 1.1.1.1 2005/11/30 09:48:59 chriswhite Exp $
+
+*jircii-37 (14 Jul 2005)
+
+  14 Jul 2005; Sven Wegener <swegener@gentoo.org> +jircii-37.ebuild:
+  Version bump.
+
+*jircii-35 (12 Jun 2005)
+
+  12 Jun 2005; Sven Wegener <swegener@gentoo.org> -jircii-34.ebuild,
+  +jircii-35.ebuild:
+  Version bump.
+
+*jircii-34 (08 May 2005)
+
+  08 May 2005; Sven Wegener <swegener@gentoo.org> -jircii-24.ebuild,
+  -jircii-33.ebuild, +jircii-34.ebuild:
+  Version bump.
+
+*jircii-33 (03 May 2005)
+
+  03 May 2005; Sven Wegener <swegener@gentoo.org> jircii-31.ebuild,
+  +jircii-33.ebuild:
+  Version bump. Marked 31 stable on x86.
+
+*jircii-31 (10 Apr 2005)
+
+  10 Apr 2005; Sven Wegener <swegener@gentoo.org> -jircii-30.ebuild,
+  +jircii-31.ebuild:
+  Version bump.
+
+*jircii-30 (14 Mar 2005)
+
+  14 Mar 2005; Sven Wegener <swegener@gentoo.org> -jircii-27.ebuild,
+  -jircii-28.ebuild, -jircii-29.ebuild, +jircii-30.ebuild:
+  Version bump. Removed beta ebuilds.
+
+*jircii-29 (08 Mar 2005)
+
+  08 Mar 2005; Sven Wegener <swegener@gentoo.org> +jircii-29.ebuild:
+  Version bump.
+
+*jircii-28 (13 Feb 2005)
+
+  13 Feb 2005; Sven Wegener <swegener@gentoo.org> +jircii-28.ebuild:
+  Version bump.
+
+*jircii-27 (30 Jan 2005)
+
+  30 Jan 2005; Sven Wegener <swegener@gentoo.org> -jircii-18.ebuild,
+  -jircii-23.ebuild, jircii-24.ebuild, +jircii-27.ebuild:
+  Version bump. Marked 24 stable on x86.
+
+*jircii-24 (19 Dec 2004)
+
+  19 Dec 2004; Sven Wegener <swegener@gentoo.org> +jircii-24.ebuild:
+  Version bump.
+
+  08 Dec 2004; Sven Wegener <swegener@gentoo.org> -jircii-14.ebuild:
+  Removed old ebuild.
+
+  05 Dec 2004; Sven Wegener <swegener@gentoo.org> jircii-18.ebuild:
+  Marked stable on x86.
+
+*jircii-23 (26 Nov 2004)
+
+  26 Nov 2004; Sven Wegener <swegener@gentoo.org> -jircii-22.ebuild,
+  +jircii-23.ebuild:
+  Version bump. Removed old ebuild.
+
+*jircii-22 (22 Nov 2004)
+
+  22 Nov 2004; Sven Wegener <swegener@gentoo.org> -jircii-20.ebuild,
+  +jircii-22.ebuild:
+  Version bump. Removed old ebuild.
+
+*jircii-20 (12 Nov 2004)
+
+  12 Nov 2004; Sven Wegener <swegener@gentoo.org> +jircii-20.ebuild:
+  Version bump.
+
+*jircii-18 (31 Oct 2004)
+
+  31 Oct 2004; Sven Wegener <swegener@gentoo.org> jircii-14.ebuild,
+  -jircii-15.ebuild, -jircii-16.ebuild, -jircii-17.ebuild,
+  +jircii-18.ebuild:
+  Version bump. Removed old beta ebuilds.
+
+*jircii-17 (24 Oct 2004)
+
+  24 Oct 2004; Sven Wegener <swegener@gentoo.org> +jircii-17.ebuild:
+  Version bump.
+
+*jircii-16 (17 Oct 2004)
+
+  17 Oct 2004; Sven Wegener <swegener@gentoo.org> +jircii-16.ebuild:
+  Version bump.
+
+*jircii-15 (03 Oct 2004)
+
+  03 Oct 2004; Sven Wegener <swegener@gentoo.org> +jircii-15.ebuild:
+  Version bump.
+
+  12 Sep 2004; Sven Wegener <swegener@gentoo.org> jircii-14.ebuild:
+  Marked stable on x86.
+
+*jircii-14 (08 Aug 2004)
+
+  08 Aug 2004; Sven Wegener <swegener@gentoo.org> +jircii-14.ebuild,
+  -jircii-1_beta10.ebuild, -jircii-1_beta11.ebuild, -jircii-1_beta13.ebuild:
+  Version bump. Changed version numbering scheme.
+
+*jircii-1_beta13 (06 Aug 2004)
+
+  06 Aug 2004; Sven Wegener <swegener@gentoo.org> +jircii-1_beta13.ebuild:
+  Version bump.
+
+*jircii-1_beta11 (19 Jul 2004)
+
+  19 Jul 2004; Sven Wegener <swegener@gentoo.org> +jircii-1_beta11.ebuild:
+  Version bump.
+
+  17 Jul 2004; David Holm <dholm@gentoo.org> jircii-1_beta10.ebuild:
+  Added to ~ppc.
+
+  13 Jul 2004; Sven Wegener <swegener@gentoo.org> jircii-1_beta10.ebuild:
+  Use exec in wrapper script.
 
 *jircii-1_beta10 (12 Jul 2004)
 
diff --git a/net-irc/jircii/Manifest b/net-irc/jircii/Manifest
index 29819342efde..14b5c0606298 100644
--- a/net-irc/jircii/Manifest
+++ b/net-irc/jircii/Manifest
@@ -1,4 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ae1b699ef2ea75fbc538ab4778bc68ba ChangeLog 3692
+MD5 0184f40c46c47706a6515deb35b0258d files/digest-jircii-31 56
+MD5 d9e9e4acc91d477dc170856e6e66a8d4 files/digest-jircii-35 57
+MD5 779bb7bc35f9517a9ea3fe8f74e3b8e8 files/digest-jircii-37 57
+MD5 66189a4b2c99031ee124971e05780668 jircii-31.ebuild 772
+MD5 85b9cd2d01d162234579d1063399652a jircii-35.ebuild 773
+MD5 e17b9d47d9853f2f7eb282a875593599 jircii-37.ebuild 773
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
-MD5 d7fdacc6b9023e38f3d96fccc92a1205 jircii-1_beta10.ebuild 601
-MD5 f7f791c79bd3bd8c36e819b2e4677542 ChangeLog 280
-MD5 5a682c4fc15f917267eb0ae6db777ac0 files/digest-jircii-1_beta10 57
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC1u/xI1lqEGTUzyQRAm90AKCt7trUI6953cT5mr4oPQodp3L/6wCdHwia
+z+qH32rSiBBP4D3IwNZPJ3U=
+=T6Iu
+-----END PGP SIGNATURE-----
diff --git a/net-irc/jircii/jircii-31.ebuild b/net-irc/jircii/jircii-31.ebuild
index a02c8a176467..310657c9de0a 100644
--- a/net-irc/jircii/jircii-31.ebuild
+++ b/net-irc/jircii/jircii-31.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/jircii/jircii-31.ebuild,v 1.1 2005/04/10 11:44:45 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/jircii/jircii-31.ebuild,v 1.1.1.1 2005/11/30 09:48:59 chriswhite Exp $
 
 DESCRIPTION="jIRCii - IRC client written in Java"
 HOMEPAGE="http://jirc.hick.org/"
 SRC_URI="http://jirc.hick.org/download/jerkr${PV}.tgz"
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 IUSE=""
 
 RDEPEND="virtual/jre"
diff --git a/net-irc/jircii/jircii-35.ebuild b/net-irc/jircii/jircii-35.ebuild
index 9fe51b8c1920..107d936bcabc 100644
--- a/net-irc/jircii/jircii-35.ebuild
+++ b/net-irc/jircii/jircii-35.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/jircii/jircii-35.ebuild,v 1.1 2005/06/12 23:09:36 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/jircii/jircii-35.ebuild,v 1.1.1.1 2005/11/30 09:48:59 chriswhite Exp $
 
 DESCRIPTION="jIRCii - IRC client written in Java"
 HOMEPAGE="http://jirc.hick.org/"
diff --git a/net-irc/jircii/jircii-37.ebuild b/net-irc/jircii/jircii-37.ebuild
index 01cca1ebb9c5..596d85aaaa67 100644
--- a/net-irc/jircii/jircii-37.ebuild
+++ b/net-irc/jircii/jircii-37.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/jircii/jircii-37.ebuild,v 1.1 2005/07/14 23:06:11 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/jircii/jircii-37.ebuild,v 1.1.1.1 2005/11/30 09:48:59 chriswhite Exp $
 
 DESCRIPTION="jIRCii - IRC client written in Java"
 HOMEPAGE="http://jirc.hick.org/"
diff --git a/net-irc/konversation/ChangeLog b/net-irc/konversation/ChangeLog
index 94b504cc7a95..62080f1686a4 100644
--- a/net-irc/konversation/ChangeLog
+++ b/net-irc/konversation/ChangeLog
@@ -1,6 +1,116 @@
 # ChangeLog for net-irc/konversation
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/ChangeLog,v 1.1 2003/01/19 16:05:52 verwilst Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/ChangeLog,v 1.1.1.1 2005/11/30 09:48:57 chriswhite Exp $
+
+  13 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  konversation-0.18.ebuild:
+  Stable on ppc.
+
+  12 Jul 2005; Danny van Dyk <kugelfang@gentoo.org>
+  konversation-0.18.ebuild:
+  Marked stable on amd64.
+
+  07 Jul 2005; Sven Wegener <swegener@gentoo.org> konversation-0.18.ebuild:
+  Marked stable on x86.
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  konversation-0.17.ebuild:
+  Stable on ppc.
+
+  08 Jun 2005; Sven Wegener <swegener@gentoo.org>
+  konversation-0.15.1.ebuild, konversation-0.17.ebuild,
+  konversation-0.18.ebuild:
+  Updated HOMEPAGE for bug #95441.
+
+*konversation-0.18 (07 Jun 2005)
+
+  07 Jun 2005; Sven Wegener <swegener@gentoo.org>
+  konversation-0.15.1.ebuild, -konversation-0.16.ebuild,
+  konversation-0.17.ebuild, +konversation-0.18.ebuild:
+  Version bump. Marked 0.17 stable on x86.
+
+*konversation-0.17 (08 Apr 2005)
+
+  08 Apr 2005; Sven Wegener <swegener@gentoo.org> +konversation-0.17.ebuild:
+  Version bump, bug #88342.
+
+*konversation-0.16 (24 Mar 2005)
+
+  24 Mar 2005; Sven Wegener <swegener@gentoo.org>
+  konversation-0.15.1.ebuild, +konversation-0.16.ebuild:
+  Version bump.
+
+  24 Feb 2005; Malcolm Lashley <malc@gentoo.org> konversation-0.15.1.ebuild:
+  Stable on amd64 - bug #83098
+
+  21 Jan 2005; Sven Wegener <swegener@gentoo.org> -konversation-0.10.ebuild,
+  -konversation-0.13.ebuild, -konversation-0.14.ebuild,
+  -konversation-0.15.ebuild:
+  Removed old vulnerable ebuilds.
+
+  21 Jan 2005; Lars Weiler <pylon@gentoo.org> konversation-0.15.1.ebuild:
+  Stable on ppc; bug #78712.
+
+  20 Jan 2005; Sven Wegener <swegener@gentoo.org>
+  konversation-0.15.1.ebuild:
+  Stable on x86.
+
+*konversation-0.15.1 (19 Jan 2005)
+
+  19 Jan 2005; Sven Wegener <swegener@gentoo.org>
+  +konversation-0.15.1.ebuild:
+  Version bump for security bug #78712.
+
+  31 Dec 2004; Jason Wever <weeve@gentoo.org> konversation-0.15.ebuild:
+  Added ~sparc keyword.
+
+*konversation-0.15 (01 Dec 2004)
+
+  01 Dec 2004; Carsten Lohrke <carlo@gentoo.org> +konversation-0.15.ebuild:
+  versionbump
+
+*konversation-0.14 (07 Jul 2004)
+
+  07 Jul 2004; Tom Martin <slarti@gentoo.org> konversation-0.14.ebuild:
+  Version bump.
+
+  29 Jun 2004; Carsten Lohrke <carlo@gentoo.org> konversation-0.10.ebuild,
+  konversation-0.13.ebuild:
+  QA: inherit kde-base -> inherit kde, IUSE
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  konversation-0.13.ebuild:
+  Masked konversation-0.13.ebuild stable for ppc
+
+  29 Feb 2004; Caleb Tennis <caleb@gentoo.org> konversation-0.12.ebuild,
+  konversation-0.13.ebuild:
+  x86 stable
+
+*konversation-0.13 (19 Nov 2003)
+
+  19 Nov 2003; Greg Fitzgerald <gregf@gentoo.org> konversation-0.13.ebuild:
+  Version bump.
+
+*konversation-0.12 (17 Jun 2003)
+
+  17 Jun 2003; Caleb Tennis <caleb@gentoo.org> konversation-0.12.ebuild:
+  version bump.  Closes bug #21691
+
+*konversation-0.10 (24 Feb 2003)
+
+  24 Feb 2003; Hannes Mehnert <hannes@gentoo.org> konversation-0.10.ebuild:
+  version bump
+
+*konversation-0.9 (07 Feb 2003)
+
+  15 Feb 2003; Mark Guertin <gerk@gentoo.org> konversation-0.9.ebuild :
+  set ~ppc in keywords
+
+  13 Feb 2003; Seemant Kulleen <seemant@gentoo.org> konversation-0.9.ebuild :
+  nls fixes
+
+  07 Feb 2003; Hannes Mehnert <hannes@gentoo.org> konversation-0.9.ebuild:
+  version bump
 
 *konversation (19 January 2002) Bart Verwilst <verwilst@gentoo.org>
 
diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
index e69de29bb2d1..20776ae95f2f 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -0,0 +1,8 @@
+MD5 943c1c08b2bae6ad084ba17ec78c9aef konversation-0.15.1.ebuild 553
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+MD5 38f59222d2ad3b46c6415993f9b104d2 ChangeLog 3535
+MD5 5c2465682f4ca3cf97f010f6263cf29a konversation-0.17.ebuild 550
+MD5 bbaafb1a59ed3b1f8589ad6aeb77b780 konversation-0.18.ebuild 549
+MD5 f2c8957a5d97179e302ff2660560d146 files/digest-konversation-0.18 71
+MD5 16524313d45151786b72dee746cc8804 files/digest-konversation-0.15.1 73
+MD5 c1371c333bb8d481fd2d8416a2b7669b files/digest-konversation-0.17 71
diff --git a/net-irc/konversation/files/digest-konversation-0.18 b/net-irc/konversation/files/digest-konversation-0.18
index 4d91e474fb1f..9f09e1661aa6 100644
--- a/net-irc/konversation/files/digest-konversation-0.18
+++ b/net-irc/konversation/files/digest-konversation-0.18
@@ -1 +1 @@
-MD5 dfbf351ebc899293275a8caf9f6ff96a konversation-0.18.tar.bz2 5506820
+MD5 87eceaaad4223d17380cd1f8dfe8123f konversation-0.18.tar.bz2 5220074
diff --git a/net-irc/konversation/konversation-0.15.1.ebuild b/net-irc/konversation/konversation-0.15.1.ebuild
index ec3e50b107c3..7661248ce9b0 100644
--- a/net-irc/konversation/konversation-0.15.1.ebuild
+++ b/net-irc/konversation/konversation-0.15.1.ebuild
@@ -1,21 +1,21 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/konversation-0.15.1.ebuild,v 1.1 2005/01/19 22:44:03 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/konversation-0.15.1.ebuild,v 1.1.1.1 2005/11/30 09:48:57 chriswhite Exp $
 
 inherit kde
 
 DESCRIPTION="A user friendly IRC Client for KDE3.x"
-HOMEPAGE="http://konversation.sourceforge.net/"
+HOMEPAGE="http://konversation.kde.org/"
 SRC_URI="http://download.berlios.de/${PN}/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+KEYWORDS="x86 ppc amd64 ~sparc"
 IUSE="nls"
 
 need-kde 3
 
 src_install() {
 	kde_src_install
-	use nls || rm -rf ${D}/usr/share/locale
+	use nls || rm -rf "${D}"/usr/share/locale
 }
diff --git a/net-irc/konversation/konversation-0.17.ebuild b/net-irc/konversation/konversation-0.17.ebuild
index ee06a9dd18f5..3a7a6b4ab676 100644
--- a/net-irc/konversation/konversation-0.17.ebuild
+++ b/net-irc/konversation/konversation-0.17.ebuild
@@ -1,21 +1,21 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/konversation-0.17.ebuild,v 1.1 2005/04/08 14:05:47 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/konversation-0.17.ebuild,v 1.1.1.1 2005/11/30 09:48:57 chriswhite Exp $
 
 inherit kde
 
 DESCRIPTION="A user friendly IRC Client for KDE3.x"
-HOMEPAGE="http://www.konversation.org/"
+HOMEPAGE="http://konversation.kde.org/"
 SRC_URI="http://download.berlios.de/${PN}/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+KEYWORDS="~amd64 ppc ~sparc x86"
 IUSE="nls"
 
 need-kde 3
 
 src_install() {
 	kde_src_install
-	use nls || rm -rf ${D}/usr/share/locale
+	use nls || rm -rf "${D}"/usr/share/locale
 }
diff --git a/net-irc/konversation/konversation-0.18.ebuild b/net-irc/konversation/konversation-0.18.ebuild
index 1a8edfa4b7aa..28e2cbe92e2d 100644
--- a/net-irc/konversation/konversation-0.18.ebuild
+++ b/net-irc/konversation/konversation-0.18.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/konversation-0.18.ebuild,v 1.1 2005/06/07 15:18:55 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/konversation-0.18.ebuild,v 1.1.1.1 2005/11/30 09:48:57 chriswhite Exp $
 
 inherit kde
 
 DESCRIPTION="A user friendly IRC Client for KDE3.x"
-HOMEPAGE="http://www.konversation.org/"
+HOMEPAGE="http://konversation.kde.org/"
 SRC_URI="http://download.berlios.de/${PN}/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE="nls"
 
 need-kde 3
diff --git a/net-irc/kvirc/ChangeLog b/net-irc/kvirc/ChangeLog
index efdf199dfdde..4e8a976dccda 100644
--- a/net-irc/kvirc/ChangeLog
+++ b/net-irc/kvirc/ChangeLog
@@ -1,6 +1,132 @@
 # ChangeLog for net-irc/kvirc
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/ChangeLog,v 1.1 2002/02/01 21:53:32 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/ChangeLog,v 1.1.1.1 2005/11/30 09:48:57 chriswhite Exp $
+
+  07 Jul 2005; Caleb Tennis <caleb@gentoo.org> kvirc-3.2.0.ebuild:
+  Fix qt dep
+
+  07 Jun 2005; Sven Wegener <swegener@gentoo.org> -kvirc-3.0.1-r1.ebuild:
+  Removed old ebuild.
+
+  22 May 2005; Tobias Scherbaum <dertobi123@gentoo.org> kvirc-3.2.0.ebuild:
+  Stable on ppc.
+
+  16 May 2005; Marcus D. Hanwell <cryos@gentoo.org> kvirc-3.2.0.ebuild:
+  Stable on amd64 and x86.
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> kvirc-3.0.1-r1.ebuild:
+  Stable on ppc.
+
+  07 Mar 2005; Sven Wegener <swegener@gentoo.org> kvirc-3.0.1-r1.ebuild,
+  kvirc-3.2.0.ebuild:
+  Include patch by Szymon Stefanek <devnull@omnikron.net> from bug #84281 that
+  fixes kvirc to not link against the already installed libkvilib from
+  previous versions.
+
+*kvirc-3.2.0 (04 Mar 2005)
+
+  04 Mar 2005; Sven Wegener <swegener@gentoo.org> kvirc-3.0.1-r1.ebuild,
+  +kvirc-3.2.0.ebuild:
+  Version bump, bug #83559.
+
+  24 Feb 2005; Gregorio Guidi <greg_g@gentoo.org> kvirc-3.0.1-r1.ebuild,
+  -kvirc-3.0.1.ebuild:
+  Stable on x86.
+
+*kvirc-3.0.1-r1 (29 Jan 2005)
+
+  29 Jan 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kvirc-3.0.1-kdedir-fix.patch, +kvirc-3.0.1-r1.ebuild:
+  Proper use of kde eclasses, and added patch to make sure kvirc does not
+  install anything in /usr/kde*.
+
+  29 Aug 2004; Sven Wegener <swegener@gentoo.org> -kvirc-3.0.0.ebuild,
+  -kvirc-3.0.0_beta2-r1.ebuild:
+  Removed old ebuilds.
+
+  24 Aug 2004; Heinrich Wendel <lanius@gentoo.org> kvirc-3.0.1.ebuild:
+  mark stable on x86
+
+  08 Jul 2004; Sven Wegener <swegener@gentoo.org> kvirc-3.0.0_beta2-r1.ebuild:
+  Sync'ed IUSE to the flags used by the ebuild.
+
+*kvirc-3.0.1 (09 Jun 2004)
+
+  09 Jun 2004; Carsten Lohrke <carlo@gentoo.org> kvirc-3.0.0.ebuild,
+  kvirc-3.0.1.ebuild:
+  version bump, added ~sparc keyword
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> kvirc-3.0.0.ebuild:
+  Masked kvirc-3.0.0.ebuild testing for ppc
+
+  21 Apr 2004; Bryan Stine <battousai@gentoo.org>; kvirc-3.0.0.ebuild:
+  Version bump to 3.0.0 release. This has a cleaned up ebuild and better
+  dependencies. This fixes bug #48255. Thanks to Alessandro Rossini
+  <aronnax@openlug.org> and Daniel Black <dragonheart@gentoo.org>.
+
+  03 Jan 2004; Caleb Tennis <caleb@gentoo.org> kvirc-3.0.0_beta1-r1.ebuild,
+  kvirc-3.0.0_beta2-r1.ebuild:
+  Change dep to get away from need-qt syntax
+  Mark x86 stable (though the ebuild is really old)
+
+  05 Dec 2003; Chuck Short <zul@gentoo.org> kvirc-3.0.0_beta1-r1.ebuild,
+  kvirc-3.0.0_beta2-r1.ebuild:
+  Added ~amd64 to keywords, closes bug #34986.
+
+*kvirc-3.0.0_beta2-r1 (22 May 2003)
+
+  22 May 2003; Paul de Vrieze <pauldv@gentoo.org> kvirc-3.0.0_beta1-r1.ebuild,
+  kvirc-3.0.0_beta2-r1.ebuild:
+  Disable the use of assembly, as it appears to be instable.
+
+  30 Apr 2003; Caleb Tennis <caleb@gentoo.org> kvirc-3.0.0_beta2.ebuild :
+  
+  Minor change to ivp6 config in ebuild to allow it to work properly for
+  users wanting ipv6 - by Simon Koch (skock@palisadescomputing.net).
+  Fixes bug #15954.
+
+*kvirc-3.0.0_beta2 (10 Jan 2003)
+
+  10 Jan 2003; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  A new version. KDE support and ssl support now work properly. This should
+  be a lot better than beta1, and more stable than the cvs snapshot.
+
+  26 Dec 2002; Dan Armak <danarmak@gentoo.org> kvirc-3.0.0_pre20021217.ebuild  :
+
+  Some fixes.
+
+*kvirc-3.0.0_beta1-r1 (22 May 2003)
+ 
+  13 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
+*kvirc-3.0.0_pre20021217 (19 Dec 2002)
+
+  26 Jan 2003; Jon Nall <nall@gentoo.org> kvirc-3.0.0_pre20021217.ebuild :
+  added ~ppc
+
+  19 Dec 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  A cvs snapshot, maksed for now. I hope it will fix bug #7131.
+
+  28 Jul 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Use correct slots.
+
+*kvirc-3.0.0_beta1 (01 Jul 2002)
+
+  01 Jul 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  This is the 3.0.0 beta1 release. It compiles under gcc 3.x (fix bug #4127),
+  adds working kde support which can be turned on and off, antialiasing and
+  many other goodies.
+  
+  Note: the ebuild with version number 3.0.0 which existed for a long time
+  was actually the 'xmas' release, a prerelease of 3.0.0 which should have
+  been marked e.g. 3.0.0_alpha1. As it is, portage will not automatically
+  update an already-installed 'xmas' kvirc to beta1, but you are encouraged
+  to do so.
 
 *kvirc-3.0.0 (1 Feb 2002)
 
@@ -11,3 +137,9 @@
   comments should well explained and written in clean English. The details about
   writing correct changelogs are explained in the skel.ChangeLog file which you
   can find in the root directory of the portage repository.
+
+*kvirc-2.1.1-r1 (13 Feb 2003)
+ 
+  13 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest
index ac4f45237ff8..e7689b77f044 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -1,9 +1,5 @@
-MD5 9febff29e6230f09548e68f4806dbb88 kvirc-3.0.0_pre20021217.ebuild 2272
-MD5 c9bf29cf6982c94ec0e8250044ad503b kvirc-3.0.0_beta2.ebuild 2369
-MD5 f821a2b98a00986befb800cd43dc554a kvirc-3.0.0_beta1.ebuild 2159
-MD5 0475bf039b145b5ab8480c6fba3f3ced ChangeLog 2170
-MD5 8d327394e3a0456ed2913718f096d79a kvirc-2.1.1-r1.ebuild 1040
-MD5 61edbd9f57dbf08ef506bd7867a0c2da files/digest-kvirc-2.1.1-r1 65
-MD5 4cea7b0d2f1dad834e7758adaebc9d73 files/digest-kvirc-3.0.0_beta1 70
-MD5 68d2153371007bdad609f225fdba63be files/digest-kvirc-3.0.0_beta2 70
-MD5 419067fcdc6443b92b211410c356035b files/digest-kvirc-3.0.0_pre20021217 68
+MD5 3f68bd1ff4531f5bda12a7575dd29b7d ChangeLog 5128
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+MD5 a4bb3791ea5dae3402c891437b2a671a kvirc-3.2.0.ebuild 2028
+MD5 3c9f45c4095361cc93e1f1c6d0617275 files/digest-kvirc-3.2.0 141
+MD5 3f438009c2c1f4441adb149e10e746df files/kvirc-3.0.1-kdedir-fix.patch 1953
diff --git a/net-irc/kvirc/files/digest-kvirc-3.2.0 b/net-irc/kvirc/files/digest-kvirc-3.2.0
index 746b04c725d8..608aa4740fbd 100644
--- a/net-irc/kvirc/files/digest-kvirc-3.2.0
+++ b/net-irc/kvirc/files/digest-kvirc-3.2.0
@@ -1 +1,2 @@
 MD5 e783827fda3832fc3fb50e7a41ed627d kvirc-3.2.0.tar.bz2 3704445
+MD5 be1db10f4eb16910ff1df4c4fcec5278 kvirc-3.2.0-linking-fix.patch.bz2 4266
diff --git a/net-irc/kvirc/kvirc-3.2.0.ebuild b/net-irc/kvirc/kvirc-3.2.0.ebuild
index 9e26fd9dba24..449eb3f5f135 100644
--- a/net-irc/kvirc/kvirc-3.2.0.ebuild
+++ b/net-irc/kvirc/kvirc-3.2.0.ebuild
@@ -1,25 +1,26 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-3.2.0.ebuild,v 1.1 2005/03/04 20:42:41 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-3.2.0.ebuild,v 1.1.1.1 2005/11/30 09:48:57 chriswhite Exp $
 
 inherit eutils kde-functions
 
 DESCRIPTION="An advanced IRC Client"
 HOMEPAGE="http://www.kvirc.net/"
-SRC_URI="ftp://ftp.kvirc.net/pub/kvirc/${PV}/source/${P}.tar.bz2 \
-	ftp://ftp.kvirc.de/pub/kvirc/${PV}/source/${P}.tar.bz2 \
-	ftp://kvirc.firenze.linux.it/pub/kvirc/${PV}/source/${P}.tar.bz2"
+SRC_URI="ftp://ftp.kvirc.net/pub/kvirc/${PV}/source/${P}.tar.bz2
+	ftp://ftp.kvirc.de/pub/kvirc/${PV}/source/${P}.tar.bz2
+	ftp://kvirc.firenze.linux.it/pub/kvirc/${PV}/source/${P}.tar.bz2
+	mirror://gentoo/${P}-linking-fix.patch.bz2"
 
 LICENSE="kvirc"
 SLOT="3"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
+KEYWORDS="x86 amd64 ppc ~sparc"
 IUSE="debug esd ipv6 kde oss ssl"
 
 RDEPEND="esd? ( media-sound/esound )
 	ssl? ( dev-libs/openssl )
 	oss? ( media-libs/audiofile )
 	kde? ( >=kde-base/kdelibs-3 )
-	>=x11-libs/qt-3"
+	=x11-libs/qt-3*"
 
 DEPEND="${RDEPEND}
 	sys-apps/gawk
@@ -33,6 +34,7 @@ src_unpack() {
 	cd ${S}
 
 	epatch ${FILESDIR}/kvirc-3.0.1-kdedir-fix.patch
+	epatch ${WORKDIR}/${P}-linking-fix.patch
 }
 
 src_compile() {
diff --git a/net-irc/loqui/ChangeLog b/net-irc/loqui/ChangeLog
index 8cc3832ec76b..ca333c979d9a 100644
--- a/net-irc/loqui/ChangeLog
+++ b/net-irc/loqui/ChangeLog
@@ -1,6 +1,152 @@
 # ChangeLog for net-irc/loqui
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/loqui/ChangeLog,v 1.1 2003/09/08 01:09:12 zul Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/loqui/ChangeLog,v 1.1.1.1 2005/11/30 09:48:54 chriswhite Exp $
+
+*loqui-0.4.4 (29 Oct 2005)
+
+  29 Oct 2005; Sven Wegener <swegener@gentoo.org> +loqui-0.4.4.ebuild:
+  Version bump, bug #109668
+
+  25 Sep 2005; Sven Wegener <swegener@gentoo.org> -loqui-0.3.9.ebuild:
+  Removed old ebuild.
+
+  02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> loqui-0.4.1.ebuild:
+  Stable on ppc.
+
+  01 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org> loqui-0.4.1.ebuild:
+  Stable on sparc
+
+*loqui-0.4.2 (31 Aug 2005)
+
+  31 Aug 2005; Sven Wegener <swegener@gentoo.org> -loqui-0.4.0.ebuild,
+  loqui-0.4.1.ebuild, +loqui-0.4.2.ebuild:
+  Version bump. Marked 0.4.1 stable on x86. Added missing dev-util/pkgconfig
+  dependency.
+
+*loqui-0.4.1 (21 Jul 2005)
+
+  21 Jul 2005; Sven Wegener <swegener@gentoo.org> +loqui-0.4.1.ebuild:
+  Version bump, bug #99812.
+
+*loqui-0.4.0 (07 Jul 2005)
+
+  07 Jul 2005; Sven Wegener <swegener@gentoo.org> -loqui-0.4.0_pre2.ebuild,
+  +loqui-0.4.0.ebuild:
+  Version bump, bug #98213.
+
+  09 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> loqui-0.3.9.ebuild:
+  Stable on sparc
+
+*loqui-0.4.0_pre2 (07 Jun 2005)
+
+  07 Jun 2005; Sven Wegener <swegener@gentoo.org> -loqui-0.4.0_pre1.ebuild,
+  +loqui-0.4.0_pre2.ebuild:
+  Version bump.
+
+*loqui-0.4.0_pre1 (19 May 2005)
+
+  19 May 2005; Sven Wegener <swegener@gentoo.org> loqui-0.3.9.ebuild,
+  +loqui-0.4.0_pre1.ebuild:
+  Version bump, bug #93165.
+
+  30 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> loqui-0.3.9.ebuild:
+  Keyworded ~sparc
+
+  22 Apr 2005; Sven Wegener <swegener@gentoo.org> -loqui-0.3.6.ebuild:
+  Removed old ebuild.
+
+  08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> loqui-0.3.9.ebuild:
+  Stable on ppc.
+
+  21 Jan 2005; Sven Wegener <swegener@gentoo.org> -loqui-0.3.8.ebuild,
+  loqui-0.3.9.ebuild:
+  Marked stable on x86. Removed old ebuild.
+
+*loqui-0.3.9 (13 Nov 2004)
+
+  13 Nov 2004; Sven Wegener <swegener@gentoo.org> -loqui-0.2.5.ebuild,
+  -loqui-0.3.7.ebuild, loqui-0.3.8.ebuild, +loqui-0.3.9.ebuild:
+  Version bump. Marked 0.3.8 stable on x86. Removed old ebuilds.
+
+*loqui-0.3.8 (12 Sep 2004)
+
+  12 Sep 2004; Sven Wegener <swegener@gentoo.org> +loqui-0.3.8.ebuild:
+  Version bump.
+
+*loqui-0.3.7 (17 Jul 2004)
+
+  17 Jul 2004; Sven Wegener <swegener@gentoo.org> loqui-0.3.6.ebuild,
+  +loqui-0.3.7.ebuild:
+  Version bump. Removed old ebuilds. Marked 0.3.6 stable in x86.
+
+  10 Jul 2004; Sven Wegener <swegener@gentoo.org> loqui-0.2.4.ebuild,
+  loqui-0.2.5.ebuild, loqui-0.3.3.ebuild:
+  Tidied the ebuilds. Marked 0.3.3 stable on x86.
+
+*loqui-0.3.6 (17 Jun 2004)
+
+  17 Jun 2004; Sven Wegener <swegener@gentoo.org> -loqui-0.2.2.ebuild,
+  -loqui-0.2.3.ebuild, loqui-0.3.3.ebuild, +loqui-0.3.6.ebuild:
+  Version bump, closes bug #53776. Removed the dependency on dev-perl/XML-Parser
+  for loqui-0.3.* as they build fine without it. Removed some older ebuilds.
+
+*loqui-0.3.3 (09 Jun 2004)
+
+  09 Jun 2004; Chuck Short <zul@gentoo.org> loqui-0.3.3.ebuild:
+  Version bump, closes #50912.
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> loqui-0.2.2.ebuild,
+  loqui-0.2.3.ebuild, loqui-0.2.4.ebuild, loqui-0.2.5.ebuild:
+  Masked loqui-0.2.5.ebuild stable for ppc
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> loqui-0.2.2.ebuild,
+  loqui-0.2.3.ebuild, loqui-0.2.4.ebuild:
+  Masked loqui-0.2.4.ebuild stable for ppc
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> loqui-0.2.2.ebuild,
+  loqui-0.2.3.ebuild:
+  Masked loqui-0.2.3.ebuild stable for ppc
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> loqui-0.2.2.ebuild:
+  Masked loqui-0.2.2.ebuild stable for ppc
+
+  23 Mar 2004; Chuck Short <zul@gentoo.org> loqui-0.1.18.ebuild, loqui-0.1.19.ebuild:
+  Removed old versions.
+
+*loqui-0.2.5 (11 Mar 2004)
+
+  11 Mar 2004; Chuck Short <zul@gentoo.org> loqui-0.2.5.ebuild:
+  Version bump, closes #44031.
+
+*loqui-0.2.4 (05 Mar 2004)
+
+  05 Mar 2004; Chuck Short <zul@gentoo.org> loqui-0.2.4.ebuild:
+  Version bump, closes #43488.
+
+  05 Mar 2004; Chuck Short <zul@gentoo.org> loqui-0.2.3.ebuild:
+  Marked stable for x86.
+
+*loqui-0.2.3 (20 Feb 2004)
+
+  20 Feb 2004; Chuck Short <zul@gentoo.org> loqui-0.2.3.ebuild:
+  Version bump, closes #42158.
+
+*loqui-0.2.2 (05 Feb 2004)
+
+  05 Feb 2004; Chuck Short <zul@gentoo.org> loqui-0.1.18.ebuild,
+  loqui-0.1.19.ebuild, loqui-0.2.2.ebuild:
+  Header fixes.
+
+*loqui-0.2.2 (05 Feb 2004)
+
+  05 Feb 2004; Chuck Short <zul@gentoo.org> loqui-0.2.2.ebuild:
+  Version bump, added depend on dev-perl/XML-Parser.
+  Closes #40290.
+
+*loqui-0.1.19 (30 Sep 2003)
+
+  30 Sep 2003; Chuck Short <zul@gentoo.org> metadata.xml:
+  Version bump, closed bug #29979.
 
 *loqui-0.1.18 (07 Sep 2003)
 
diff --git a/net-irc/loqui/Manifest b/net-irc/loqui/Manifest
index de0cf4c72505..89a039efd191 100644
--- a/net-irc/loqui/Manifest
+++ b/net-irc/loqui/Manifest
@@ -1,2 +1,18 @@
-MD5 eb824d9799e74cd912a5eac5b85441e1 loqui-0.1.18.ebuild 733
-MD5 e0135eb102bab306c893a922886c36cb files/digest-loqui-0.1.18 64
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 04a0feee44c3b077a42b51931b9348c4 ChangeLog 4923
+MD5 c1bb1a08be714780754a25f709e9248d files/digest-loqui-0.4.1 63
+MD5 184c6bfc7d517359d3db520bcdf34c69 files/digest-loqui-0.4.2 63
+MD5 0bbf6974979324a1d8f91ac0a7f19580 files/digest-loqui-0.4.4 63
+MD5 ba8299b362fade9175bdf77f9d6c1095 loqui-0.4.1.ebuild 832
+MD5 e8ecb2d5cd681aba6d4e3cc6a09052a7 loqui-0.4.2.ebuild 836
+MD5 3efa4caea13acd332fbd62b3ce627b2c loqui-0.4.4.ebuild 836
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDYtITI1lqEGTUzyQRAujnAJ4zrDSLB6lDTq2lEvWOLn7uAmcWpwCguYVy
+6dnYeZw2a6rcr9HuTnosG18=
+=gmsq
+-----END PGP SIGNATURE-----
diff --git a/net-irc/loqui/loqui-0.4.1.ebuild b/net-irc/loqui/loqui-0.4.1.ebuild
index c8260708ebce..608b81e8d8dc 100644
--- a/net-irc/loqui/loqui-0.4.1.ebuild
+++ b/net-irc/loqui/loqui-0.4.1.ebuild
@@ -1,26 +1,23 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/loqui/loqui-0.4.1.ebuild,v 1.1 2005/07/21 23:20:44 swegener Exp $
-
-MY_P="${P/_}"
+# $Header: /var/cvsroot/gentoo-x86/net-irc/loqui/loqui-0.4.1.ebuild,v 1.1.1.1 2005/11/30 09:48:54 chriswhite Exp $
 
 DESCRIPTION="Loqui is a graphical IRC client for GNOME2 on UNIX like operating system."
-SRC_URI="http://loqui.good-day.net/src/${MY_P}.tar.gz"
+SRC_URI="http://loqui.good-day.net/src/${P}.tar.gz"
 HOMEPAGE="http://loqui.good-day.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="ppc sparc x86"
 IUSE="nls"
 
 RDEPEND=">=dev-libs/glib-2.2.1
 	>=x11-libs/gtk+-2.4
 	>=net-libs/gnet-2.0.3"
 DEPEND="${RDEPEND}
+	dev-util/pkgconfig
 	nls? ( sys-devel/gettext )"
 
-S="${WORKDIR}"/${MY_P}
-
 src_compile() {
 	econf $(use_enable nls) || die "Configure failed"
 	emake || die "Compile failed"
diff --git a/net-irc/loqui/loqui-0.4.2.ebuild b/net-irc/loqui/loqui-0.4.2.ebuild
index 7009bf468413..a6df35a8f1d4 100644
--- a/net-irc/loqui/loqui-0.4.2.ebuild
+++ b/net-irc/loqui/loqui-0.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/loqui/loqui-0.4.2.ebuild,v 1.1 2005/08/31 17:04:27 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/loqui/loqui-0.4.2.ebuild,v 1.1.1.1 2005/11/30 09:48:54 chriswhite Exp $
 
 DESCRIPTION="Loqui is a graphical IRC client for GNOME2 on UNIX like operating system."
 SRC_URI="http://loqui.good-day.net/src/${P}.tar.gz"
diff --git a/net-irc/loqui/loqui-0.4.4.ebuild b/net-irc/loqui/loqui-0.4.4.ebuild
index 0ad646d9d029..62ad4040f25b 100644
--- a/net-irc/loqui/loqui-0.4.4.ebuild
+++ b/net-irc/loqui/loqui-0.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/loqui/loqui-0.4.4.ebuild,v 1.1 2005/10/29 01:36:10 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/loqui/loqui-0.4.4.ebuild,v 1.1.1.1 2005/11/30 09:48:54 chriswhite Exp $
 
 DESCRIPTION="Loqui is a graphical IRC client for GNOME2 on UNIX like operating system."
 SRC_URI="http://loqui.good-day.net/src/${P}.tar.gz"
diff --git a/net-irc/lostirc/ChangeLog b/net-irc/lostirc/ChangeLog
index c7d90d018694..463693fdcf52 100644
--- a/net-irc/lostirc/ChangeLog
+++ b/net-irc/lostirc/ChangeLog
@@ -1,13 +1,246 @@
 # ChangeLog for net-irc/lostirc
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/lostirc/ChangeLog,v 1.1 2002/06/01 05:01:07 stroke Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/lostirc/ChangeLog,v 1.1.1.1 2005/11/30 09:48:54 chriswhite Exp $
 
+  18 Aug 2005; Sven Wegener <swegener@gentoo.org> -lostirc-0.4.4.ebuild:
+  Removed old ebuild.
+
+  12 Aug 2005; Luis Medinas <metalgod@gentoo.org> lostirc-0.4.6.ebuild:
+  Marked Stable on AMD64.
+
+  08 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> lostirc-0.4.6.ebuild:
+  Stable on sparc
+
+  07 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  lostirc-0.4.6.ebuild:
+  ppc stable
+
+  07 Jul 2005; Sven Wegener <swegener@gentoo.org> lostirc-0.4.6.ebuild:
+  Marked stable on x86.
+
+*lostirc-0.4.6 (07 Jun 2005)
+
+  07 Jun 2005; Sven Wegener <swegener@gentoo.org> -lostirc-0.4.5.ebuild,
+  +lostirc-0.4.6.ebuild:
+  Version bump, bug #95339.
+
+*lostirc-0.4.5 (14 May 2005)
+
+  14 May 2005; Sven Wegener <swegener@gentoo.org> +lostirc-0.4.5.ebuild:
+  Version bump, bug #92590.
+
+  26 Apr 2005; Sven Wegener <swegener@gentoo.org> lostirc-0.4.4.ebuild:
+  Adjusted gtkmm dependency for bug #90225. Thanks to Mark Rosenstand.
+
+  27 Mar 2005; Sven Wegener <swegener@gentoo.org> -lostirc-0.3.3.ebuild:
+  Removed old ebuild.
+
+  20 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> lostirc-0.4.4.ebuild:
+  stable on amd64 wrt #65804
+
+  20 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> lostirc-0.4.4.ebuild:
+  Stable on ppc.
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> lostirc-0.4.4.ebuild:
+  Stable on SPARC wrt bug #65804.
+
+  18 Mar 2005; Sven Wegener <swegener@gentoo.org> -lostirc-0.4.3.ebuild,
+  lostirc-0.4.4.ebuild:
+  Unconditionally install one .desktop file, bug #81915. Marked 0.4.4 stable
+  on x86, bug #65804.
+
+*lostirc-0.4.4 (04 Feb 2005)
+
+  04 Feb 2005; Sven Wegener <swegener@gentoo.org> +lostirc-0.4.4.ebuild:
+  Version bump, bug #80738.
+
+  13 Nov 2004; Sven Wegener <swegener@gentoo.org> -lostirc-0.4.2.ebuild:
+  Removed old ebuild.
+
+  17 Oct 2004; Sven Wegener <swegener@gentoo.org> -lostirc-0.3.2.ebuild,
+  -lostirc-0.4.0.ebuild, -lostirc-0.4.1.ebuild:
+  Removed old ebuilds.
+
+  16 Oct 2004; Sven Wegener <swegener@gentoo.org> lostirc-0.3.3.ebuild:
+  Updated dependencies. Thanks to Antonio <netbix@tiscali.it> in bug #67775.
+
+  15 Oct 2004; Sven Wegener <swegener@gentoo.org> lostirc-0.3.2.ebuild,
+  lostirc-0.3.3.ebuild, lostirc-0.4.0.ebuild, lostirc-0.4.1.ebuild,
+  lostirc-0.4.2.ebuild, lostirc-0.4.3.ebuild:
+  Added missing KEYWORDS that were removed because of missing KEYWORDS in
+  dependencies. Removed RESTRICT="nomirror".
+
+*lostirc-0.4.3 (15 Oct 2004)
+
+  15 Oct 2004; Sven Wegener <swegener@gentoo.org> +lostirc-0.4.3.ebuild:
+  Version bump.
+
+*lostirc-0.4.2 (08 Sep 2004)
+
+  08 Sep 2004; Sven Wegener <swegener@gentoo.org> +lostirc-0.4.2.ebuild:
+  Version bump. Thanks to Morten Brix Pedersen <morten@wtf.dk> for notification
+  in bug #63345.
+
+*lostirc-0.4.1 (14 Aug 2004)
+
+  14 Aug 2004; Sven Wegener <swegener@gentoo.org> +lostirc-0.4.1.ebuild:
+  Version bump. Thanks to Morten Brix Pedersen <morten@wtf.dk> for notification
+  in bug #59108.
+
+  17 Jul 2004; Sven Wegener <swegener@gentoo.org> -lostirc-0.2.7.ebuild,
+  lostirc-0.3.3.ebuild, lostirc-0.4.0.ebuild:
+  Removed old ebuild. Marked 0.3.3 stable on x86 and re-added missing KEYWORDS
+  to 0.4.0.
+
+  17 Jun 2004; Sven Wegener <swegener@gentoo.org> lostirc-0.2.7.ebuild,
+  lostirc-0.3.2.ebuild, lostirc-0.3.3.ebuild:
+  Removed S=${WORKDIR}/${P}
+
+*lostirc-0.4.0 (17 Jun 2004)
+
+  17 Jun 2004; Sven Wegener <swegener@gentoo.org> +lostirc-0.4.0.ebuild:
+  Version bump. Thanks to Morten Brix Pedersen <morten@wtf.dk> for notification
+  in bug #53149. Added support for USE="debug".
+
+  30 May 2004; Yi Qiang <khai@gentoo.org> lostirc-0.2.7.ebuild,
+  lostirc-0.3.2.ebuild, lostirc-0.3.3.ebuild:
+  fixed gtkmm deps
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  lostirc-0.2.7.ebuild, lostirc-0.3.2.ebuild:
+  Masked lostirc-0.3.2.ebuild stable for ppc
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  lostirc-0.2.7.ebuild:
+  Masked lostirc-0.2.7.ebuild stable for ppc
+
+  11 May 2004; Jason Wever <weeve@gentoo.org> lostirc-0.3.3.ebuild:
+  Added ~sparc keyword.
+
+  11 Apr 2004; Danny van Dyk <kugelfangk@gentoo.org> lostirc-0.3.3.ebuild:
+  marked ~amd64
+
+*lostirc-0.3.3 (23 Mar 2004)
+
+  23 Mar 2004; Chuck Short <zul@gentoo.org> lostirc-0.3.3.ebuild:
+  Version bump, closes #45500.
+
+*lostirc-0.3.2 (06 Mar 2004)
+
+  06 Mar 2004; Chuck Short <zul@gentoo.org> lostirc-0.3.2.ebuild:
+  Version bump, closes #43371.
+
+  06 Mar 2004; Chuck Short <zul@gentoo.org> lostirc-0.3.1.ebuild:
+  Makred stable for x86.
+
+*lostirc-0.3.1 (12 Jan 2004)
+
+  12 Jan 2004; Chuck Short <zul@gentoo.org> lostirc-0.2.3.ebuild,
+  lostirc-0.2.4.ebuild, lostirc-0.2.5.ebuild, lostirc-0.2.6.ebuild,
+  lostirc-0.2.7.ebuild, lostirc-0.3.0.ebuild, lostirc-0.3.1.ebuild:
+  Header cleanups as well.
+
+  12 Jan 2004; Chuck Short <zul@gentoo.org> :
+  Version bump, closes #22639.
+
+*lostirc-0.3.0 (03 Dec 2003)
+
+  03 Dec 2003; Chuck Short <zul@gentoo.org> lostirc-0.2.7.ebuild,
+  lostirc-0.3.0.ebuild:
+  New released
+  0.2.7 marked stable for x86
+  ebuild cleanups
+
+*lostirc-0.2.7 (31 Jul 2003)
+
+  31 Jul 2003; Greg Fitzgerald <gregf@gentoo.org> lostirc-0.2.7.ebuild:
+  Updated ebuild for lostirc. This closes bug #25369 submitted by christoph
+  wegener <c.wegener@itcampus.de>
+
+*lostirc-0.2.6 (13 Jul 2003)
+
+  13 Jul 2003; Martin Holzer <mholzer@gentoo.org> lostirc-0.2.1.ebuild,
+  lostirc-0.2.2.ebuild, lostirc-0.2.3.ebuild, lostirc-0.2.4.ebuild,
+  lostirc-0.2.5.ebuild, lostirc-0.2.6.ebuild:
+  update x11-libs/gtkmm to dev-cpp/gtkmm
+
+  14 May 2003; jje <jje@gentoo.org> lostirc-0.2.5.ebuild:
+  Fixed deps. 
+  
+  Submitted by: robh <robh@gentoo.org>
+
+*lostirc-0.2.5 (07 Feb 2003)
+
+  07 Feb 2003; phoen][x <phoenix@gentoo.org> lostirc-0.2.5.ebuild,
+  files/digest-lostirc-0.2.5 :
+  Bumped to new version. This closes bug #14896.
+
+*lostirc-0.2.4 (07 Feb 2003)
+
+  07 Feb 2003; phoen][x <phoenix@gentoo.org> lostirc-0.2.4.ebuild,
+  files/digest-lostirc-0.2.4 :
+  Bumped to new version. This closes bug #12857.
+
+*lostirc-0.2.3 (21 Dec 2002)
+
+  07 Feb 2003; phoen][x <phoenix@gentoo.org> lostirc-0.2.3.ebuild,
+  files/digest-lostirc-0.2.3 :
+  Put this ebuild into the stable x86 profile.
+
+  21 Dec 2002; phoen][x <phoenix@gentoo.org> lostirc-0.2.3.ebuild,
+  files/digest-lostirc-0.2.3 :
+  Bumped to new version. Bug #10569 again :) 
+  Thanks to Morten Brix Pedersen <morten@wtf.dk> for the update.
+
+*lostirc-0.2.2 (01 Dec 2002)
+
+  21 Dec 2002; phoen][x <phoenix@gentoo.org> lostirc-0.2.2.ebuild,
+  files/digest-lostirc-0.2.2 :
+  Put into the stable x86 profile.
+
+  01 Dec 2002; phoen][x <phoenix@gentoo.org> lostirc-0.2.2.ebuild,
+  files/digest-lostirc-0.2.2 :
+  Bumped to new version. Yeah, bug #10569 again - thanks to
+  Morten Brix Pedersen <morten@wtf.dk> for the update. :)
+
+*lostirc-0.2.1 (28 Nov 2002)
+
+  28 Nov 2002; phoen][x <phoenix@gentoo.org> lostirc-0.2.1.ebuild,
+  files/digest-lostirc-0.2.1 :
+  Bumped to new version. This finally closes bug #10569 - thanks to
+  Morten Brix Pedersen <morten@wtf.dk> for the contribution.
+
+*lostirc-0.2.0 (15 Nov 2002)
+
+  21 Dec 2002; phoen][x <phoenix@gentoo.org> lostirc-0.2.0.ebuild,
+  files/digest-lostirc-0.2.0 :
+  Removed from the tree.
+
+  15 Nov 2002; phoen][x <phoenix@gentoo.org> lostirc-0.2.0.ebuild,
+  files/digest-lostirc-0.2.0 :
+  Bumped to new version. Removed "ppc" from KEYWORDS.
+
+*lostirc-0.1.4 (13 Jul 2002)
+
+  15 Nov 2002; phoen][x <phoenix@gentoo.org> lostirc-0.1.4.ebuild,
+  files/digest-lostirc-0.1.4 :
+  Removed from the tree.
+
+  15 Nov 2002; phoen][x <phoenix@gentoo.org> lostirc-0.1.4.ebuild:
+  Added IUSE="".
+
+  13 Jul 2002; Gabriele Giorgetti <stroke@gentoo.org> lostirc-0.1.4.ebuild: 
+  new version
+ 
 *lostirc-0.1.0 (01 June 2002)
 
-  01 June 2002; Lasse Mikkelsen <lbm@fatalerror.dk> lostirc-0.1.0.ebuild:
+  15 Nov 2002; phoen][x <phoenix@gentoo.org> lostirc-0.1.0.ebuild,
+  files/digest-lostirc-0.1.0:
+  Removed from the tree.
+
+  15 Nov 2002; phoen][x <phoenix@gentoo.org> lostirc-0.1.0.ebuild:
+  Added IUSE="".
 
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  comments should well explained and written in clean English. The details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
+  01 June 2002; Gabriele Giorgetti <stroke@gentoo.org> lostirc-0.1.0.ebuild:
+  Initial CVS commit.
+  Ebuild written by: Lasse Mikkelsen <lbm@fatalerror.dk>  
diff --git a/net-irc/lostirc/Manifest b/net-irc/lostirc/Manifest
index 7e3f23572e98..7d039d769c79 100644
--- a/net-irc/lostirc/Manifest
+++ b/net-irc/lostirc/Manifest
@@ -1,11 +1,14 @@
-MD5 5d99fd36549753270d15784b7b6f0b51 ChangeLog 2742
-MD5 65f9649bf18c6cc64dc466f338ce82d2 lostirc-0.2.1.ebuild 871
-MD5 4f14fd076d3647999924a70ff076d5a4 lostirc-0.2.2.ebuild 617
-MD5 08c2214faa7c6324d328d762dca1733b lostirc-0.2.3.ebuild 632
-MD5 a51cdcc10add1b1af6ffa9ff12d4f1d2 lostirc-0.2.4.ebuild 633
-MD5 83b47ac59e6627c631c0f8571a6f6d1d lostirc-0.2.5.ebuild 630
-MD5 e138e8c5152942c385b261876f050d0a files/digest-lostirc-0.2.1 65
-MD5 1a9fa20aef7d9a2edefedaffdbd73b70 files/digest-lostirc-0.2.2 65
-MD5 6d024fccbfa473f557df28846ad9427a files/digest-lostirc-0.2.3 65
-MD5 ec3e532fb997534700e71043a8a39c2a files/digest-lostirc-0.2.4 65
-MD5 8ca8907fb49c76d33cac1b2db9d16186 files/digest-lostirc-0.2.5 65
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e784783596d3c639b2750953dd798979 ChangeLog 8124
+MD5 259ee51ebd15d7c9f73b59915b29d9ca files/digest-lostirc-0.4.6 65
+MD5 53d11ab57dd4e042d338d33a2a8bd55f lostirc-0.4.6.ebuild 836
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDA+uXI1lqEGTUzyQRAidkAJ4oRMK63y9/ani0LXv02t8786/fVgCfbEuY
+3lFWAI39A+GNtYKGwJ5XyHs=
+=CRdD
+-----END PGP SIGNATURE-----
diff --git a/net-irc/lostirc/lostirc-0.4.6.ebuild b/net-irc/lostirc/lostirc-0.4.6.ebuild
index 7e4fd2fc2ed4..17e5e77f1629 100644
--- a/net-irc/lostirc/lostirc-0.4.6.ebuild
+++ b/net-irc/lostirc/lostirc-0.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/lostirc/lostirc-0.4.6.ebuild,v 1.1 2005/06/07 12:54:31 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/lostirc/lostirc-0.4.6.ebuild,v 1.1.1.1 2005/11/30 09:48:54 chriswhite Exp $
 
 inherit base
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://lostirc.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+KEYWORDS="amd64 ppc sparc x86"
 
 RDEPEND=">=dev-cpp/gtkmm-2.4
 	>=dev-cpp/glibmm-2.4.4
diff --git a/net-irc/metadata.xml b/net-irc/metadata.xml
index 0be8f7f7359d..f120581239de 100644
--- a/net-irc/metadata.xml
+++ b/net-irc/metadata.xml
@@ -5,5 +5,28 @@
 		The net-irc category contains IRC (Internet Relay Chat) clients and
 		servers.
 	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie net-irc enthält Clients und Server für den Internet
+		Relay Chat (IRC).
+	</longdescription>
+	<longdescription lang="es">
+		La categoría net-irc contiene clientes y servidores IRC.
+	</longdescription>
+	<longdescription lang="ja">
+		net-ircカテゴリーにはインターネット・リレー・チャットの
+		クライアントとサーバーが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De net-irc categorie bevat clients &amp; servers voor IRC (Internet Relay Chat).
+	</longdescription>
+	<longdescription lang="sk">
+		Kategória net-irc obsahuje klientské a serverové programy pre IRC (Internet Relay Chat).
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm net-irc chứa các client và server IRC (Internet Relay Chat).
+	</longdescription>
+	<longdescription lang="it">
+		La categoria net-irc contiene client e server per IRC (Internet Relay Chat).
+	</longdescription>
 </catmetadata>
 
diff --git a/net-irc/miau/ChangeLog b/net-irc/miau/ChangeLog
index 331e4a9f3950..eab4feb538e9 100644
--- a/net-irc/miau/ChangeLog
+++ b/net-irc/miau/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for net-irc/miau
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/miau/ChangeLog,v 1.1 2004/10/09 23:05:59 swegener Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/miau/ChangeLog,v 1.1.1.1 2005/11/30 09:48:54 chriswhite Exp $
+
+  27 Aug 2005; Sven Wegener <swegener@gentoo.org> -miau-0.5.3.ebuild,
+  miau-0.5.4.ebuild:
+  Stable on x86.
+
+  08 Jul 2005; David Holm <dholm@gentoo.org> miau-0.5.4.ebuild:
+  Added to ~ppc.
+
+*miau-0.5.4 (07 Jul 2005)
+
+  07 Jul 2005; Sven Wegener <swegener@gentoo.org> miau-0.5.3.ebuild,
+  +miau-0.5.4.ebuild:
+  Version bump, bug #93928.
+
+  17 Oct 2004; Sven Wegener <swegener@gentoo.org> miau-0.5.3.ebuild:
+  Fixed typo in HOMEPAGE.
 
 *miau-0.5.3 (10 Oct 2004)
 
diff --git a/net-irc/miau/Manifest b/net-irc/miau/Manifest
index 4b0ad3aed433..909a4144d6dd 100644
--- a/net-irc/miau/Manifest
+++ b/net-irc/miau/Manifest
@@ -1,2 +1,14 @@
-MD5 b1acbc280a84a9ae2c5c71c5f1a2a653 miau-0.5.3.ebuild 1539
-MD5 d0f670c0da18c03d20ee0adbbdb6a6e3 files/digest-miau-0.5.3 62
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f7bf503ddb6db44ab43b284f2db02179 ChangeLog 785
+MD5 2d1cd3b2769a6108d363cc178fb6f3c1 files/digest-miau-0.5.4 62
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+MD5 ae74f11651ce37f616d1f0185122c8e0 miau-0.5.4.ebuild 1449
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDD9BKI1lqEGTUzyQRAl1PAJwLWm4crxuPrYdEDshDpShMSoLVIQCgr+1n
+sPcdh51jZOsbcpn6QMqO6ls=
+=e7Sb
+-----END PGP SIGNATURE-----
diff --git a/net-irc/miau/miau-0.5.4.ebuild b/net-irc/miau/miau-0.5.4.ebuild
index 26551c662d72..d0a37c323ad4 100644
--- a/net-irc/miau/miau-0.5.4.ebuild
+++ b/net-irc/miau/miau-0.5.4.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/miau/miau-0.5.4.ebuild,v 1.1 2005/07/07 16:27:50 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/miau/miau-0.5.4.ebuild,v 1.1.1.1 2005/11/30 09:48:54 chriswhite Exp $
 
 DESCRIPTION="Persistent IRC bouncer with multi-client support - a fork of muh"
 HOMEPAGE="http://miau.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc x86"
 IUSE="debug ipv6"
 
 DEPEND=""
diff --git a/net-irc/muh/ChangeLog b/net-irc/muh/ChangeLog
index 88920a9cf49a..423e46bda2f9 100644
--- a/net-irc/muh/ChangeLog
+++ b/net-irc/muh/ChangeLog
@@ -1,6 +1,38 @@
 # ChangeLog for net-irc/muh
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/muh/ChangeLog,v 1.1 2003/09/30 19:14:16 hhg Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/muh/ChangeLog,v 1.1.1.1 2005/11/30 09:48:56 chriswhite Exp $
+
+*muh-2.2 (13 Nov 2005)
+
+  13 Nov 2005; Sven Wegener <swegener@gentoo.org> -muh-2.2_beta1.ebuild,
+  +muh-2.2.ebuild:
+  Version bump, bug #110720.
+
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  08 Aug 2004; Tom Martin <slarti@gentoo.org> muh-2.1_rc1.ebuild,
+  muh-2.2_beta1.ebuild:
+  Typo in DESCRIPTION: Persistant -> Persistent. Bug 59717.
+
+*muh-2.2_beta1 (23 Jun 2004)
+
+  23 Jun 2004; Sven Wegener <swegener@gentoo.org> +muh-2.2_beta1.ebuild:
+  Version bump. Thanks to Hinrik Örn Sigurðsson <flanders@simnet.is> in bug
+  #54703. Added support for the ipv6 USE flag.
+
+  05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> muh-2.1_rc1.ebuild:
+  Stable on alpha.
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> muh-2.1_rc1.ebuild:
+  Masked muh-2.1_rc1.ebuild stable for ppc
+
+  18 Nov 2003; Hallgrimur H. Gunnarsson <hhg@gentoo.org> muh-2.1_rc1.ebuild:
+  Marked stable on x86
+
+  02 Oct 2003; Hallgrimur H. Gunnarsson <hhg@gentoo.org> muh-2.1_rc1.ebuild:
+  added a notice about the config file -- suggested by Ævar Arnfjörð Bjarmason
+  <avar@simnet.is>, see bug #30035
 
 *muh-2.1_rc1 (30 Sep 2003)
 
diff --git a/net-irc/muh/Manifest b/net-irc/muh/Manifest
index 9bad311f2c7e..7c1ee8065668 100644
--- a/net-irc/muh/Manifest
+++ b/net-irc/muh/Manifest
@@ -1,4 +1,16 @@
-MD5 848d37e4b4f681fce78ef569b8e35399 muh-2.1_rc1.ebuild 559
-MD5 da7dbee115397b6e308fe911595bd5ea metadata.xml 328
-MD5 48a18ce395b6dd8ace5754f0bb985c91 ChangeLog 266
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 356ea5a555371875df080e853151b5cd ChangeLog 1492
 MD5 23e0c42c9152a26274c01bbf269cf489 files/digest-muh-2.1_rc1 62
+MD5 b6c957be91591adfabbb23180d452e58 files/digest-muh-2.2 59
+MD5 b6349308b0057ef8c7cc6c3b44f6a534 metadata.xml 225
+MD5 8dbc3e3f09f5a1b40a3f5cb45bba4343 muh-2.1_rc1.ebuild 787
+MD5 d2ea8a6ad395712ee58d915e82b92b07 muh-2.2.ebuild 912
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDdzKAI1lqEGTUzyQRAivOAJ0QpzqAdTGNkKi39n03REWCPssVJACfU7Lf
+u+O2eYcJX6wav6XJBr90H1M=
+=LOJC
+-----END PGP SIGNATURE-----
diff --git a/net-irc/muh/metadata.xml b/net-irc/muh/metadata.xml
index 326204732e5c..f324dbe6106c 100644
--- a/net-irc/muh/metadata.xml
+++ b/net-irc/muh/metadata.xml
@@ -2,11 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>net-irc</herd>
-<maintainer>
-    <email>hhg@gentoo.org</email>
-    <name>Hallgrimur H. Gunnarsson</name>
-</maintainer>
 <longdescription>
-    Persistant IRC bouncer.
+    Persistent IRC bouncer.
 </longdescription>
 </pkgmetadata>
diff --git a/net-irc/muh/muh-2.1_rc1.ebuild b/net-irc/muh/muh-2.1_rc1.ebuild
index 46bfc728fd3e..576a491938e6 100644
--- a/net-irc/muh/muh-2.1_rc1.ebuild
+++ b/net-irc/muh/muh-2.1_rc1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/muh/muh-2.1_rc1.ebuild,v 1.1 2003/09/30 19:14:16 hhg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/muh/muh-2.1_rc1.ebuild,v 1.1.1.1 2005/11/30 09:48:56 chriswhite Exp $
 
 MY_P=${P/_/}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Persistant IRC bouncer"
+
+DESCRIPTION="Persistent IRC bouncer"
 HOMEPAGE="http://mind.riot.org/muh/"
 IUSE=""
 
@@ -12,14 +12,20 @@ SRC_URI="mirror://sourceforge/muh/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~arm"
+KEYWORDS="x86 ppc ~sparc alpha ~hppa ~mips"
 
-src_compile() {
-	econf || die "configure failed"
-	emake || die "compile failed"
-}
+S="${WORKDIR}"/${MY_P}
 
 src_install() {
 	einstall install || die "install failed"
 	dodoc AUTHORS COPYING INSTALL ChangeLog
 }
+
+pkg_postinst() {
+	einfo
+	einfo "You'll need to configure muh before running it"
+	einfo "Put your config in ~/.muh/muhrc"
+	einfo "A sample config is /usr/share/muhrc"
+	einfo "For more information, see the documentation"
+	einfo
+}
diff --git a/net-irc/muh/muh-2.2.ebuild b/net-irc/muh/muh-2.2.ebuild
index 3d416175174e..676f98c27d85 100644
--- a/net-irc/muh/muh-2.2.ebuild
+++ b/net-irc/muh/muh-2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/muh/muh-2.2.ebuild,v 1.1 2005/11/13 12:32:55 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/muh/muh-2.2.ebuild,v 1.1.1.1 2005/11/30 09:48:56 chriswhite Exp $
 
 DESCRIPTION="Persistent IRC bouncer"
 HOMEPAGE="http://mind.riot.org/muh/"
diff --git a/net-irc/nebula/ChangeLog b/net-irc/nebula/ChangeLog
index 3f63a4f1eb73..53202ce85080 100644
--- a/net-irc/nebula/ChangeLog
+++ b/net-irc/nebula/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-irc/nebula
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/nebula/ChangeLog,v 1.1 2005/03/04 22:06:21 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/nebula/ChangeLog,v 1.1.1.1 2005/11/30 09:48:58 chriswhite Exp $
+
+*nebula-0.5 (22 Aug 2005)
+
+  22 Aug 2005; Sven Wegener <swegener@gentoo.org> +nebula-0.5.ebuild:
+  Version bump, bug #102959.
+
+  09 Jun 2005; Sven Wegener <swegener@gentoo.org> nebula-0.4.ebuild:
+  Stable on x86, bug #95583.
 
 *nebula-0.4 (04 Mar 2005)
 
diff --git a/net-irc/nebula/Manifest b/net-irc/nebula/Manifest
index e69de29bb2d1..9488f3d3a08c 100644
--- a/net-irc/nebula/Manifest
+++ b/net-irc/nebula/Manifest
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a947dabd6e75fc0e21d8860ad2c75b3e ChangeLog 623
+MD5 c3b249d96c7f2b19b55b1b161d82c0f7 files/digest-nebula-0.4 62
+MD5 9f871a2a0eabd4765920ac49ee0d33f9 files/digest-nebula-0.5 62
+MD5 03e3ca111731dac759186976b8900259 metadata.xml 539
+MD5 21762ffc25176423e1c379f94b83166d nebula-0.4.ebuild 587
+MD5 d85f10794d1d10377c1d810702995c32 nebula-0.5.ebuild 588
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDCVObI1lqEGTUzyQRAo8EAKDWVvFw5g9S93b3tnh2cAFozzQFvgCdGLiN
+s8yLhzGx6yYg9ojaMR1/dbY=
+=SEqE
+-----END PGP SIGNATURE-----
diff --git a/net-irc/nebula/nebula-0.4.ebuild b/net-irc/nebula/nebula-0.4.ebuild
index a47b19202760..b63a885fdb8b 100644
--- a/net-irc/nebula/nebula-0.4.ebuild
+++ b/net-irc/nebula/nebula-0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/nebula/nebula-0.4.ebuild,v 1.1 2005/03/04 22:06:21 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/nebula/nebula-0.4.ebuild,v 1.1.1.1 2005/11/30 09:48:58 chriswhite Exp $
 
 DESCRIPTION="An IRC client for X11 and Motif"
 HOMEPAGE="http://nebula-irc.sourceforge.net/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/nebula-irc/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 DEPEND="virtual/x11
 	x11-libs/openmotif"
diff --git a/net-irc/nebula/nebula-0.5.ebuild b/net-irc/nebula/nebula-0.5.ebuild
index 71618984f72f..b24f42d40e62 100644
--- a/net-irc/nebula/nebula-0.5.ebuild
+++ b/net-irc/nebula/nebula-0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/nebula/nebula-0.5.ebuild,v 1.1 2005/08/22 04:24:46 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/nebula/nebula-0.5.ebuild,v 1.1.1.1 2005/11/30 09:48:58 chriswhite Exp $
 
 DESCRIPTION="An IRC client for X11 and Motif"
 HOMEPAGE="http://nebula-irc.sourceforge.net/"
diff --git a/net-irc/ngircd/ChangeLog b/net-irc/ngircd/ChangeLog
index d2b4cf52896d..11838c011265 100644
--- a/net-irc/ngircd/ChangeLog
+++ b/net-irc/ngircd/ChangeLog
@@ -1,6 +1,65 @@
 # ChangeLog for net-irc/ngircd
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ngircd/ChangeLog,v 1.1 2004/04/19 21:43:27 zul Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ngircd/ChangeLog,v 1.1.1.1 2005/11/30 09:48:59 chriswhite Exp $
+
+*ngircd-0.9.2 (13 Nov 2005)
+
+  13 Nov 2005; Sven Wegener <swegener@gentoo.org> +ngircd-0.9.2.ebuild:
+  Version bump, bug #111003.
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> ngircd-0.8.3.ebuild:
+  Stable on ppc.
+
+  14 Feb 2005; Sven Wegener <swegener@gentoo.org> ngircd-0.8.3.ebuild:
+  Added missing inherit eutils, bug #82006.
+
+  04 Feb 2005; Sven Wegener <swegener@gentoo.org> -ngircd-0.8.2.ebuild:
+  Removed old ebuild.
+
+*ngircd-0.8.3 (03 Feb 2005)
+
+  03 Feb 2005; Sven Wegener <swegener@gentoo.org> +ngircd-0.8.3.ebuild:
+  Version bump, bug #80595.
+
+  28 Jan 2005; Sven Wegener <swegener@gentoo.org> files/ngircd.init.d,
+  -ngircd-0.8.0.ebuild, -ngircd-0.8.1.ebuild:
+  Removed old vulnerable ebuilds.
+
+*ngircd-0.8.2 (27 Jan 2005)
+
+  27 Jan 2005; Sven Wegener <swegener@gentoo.org> +ngircd-0.8.2.ebuild:
+  Version bump, security bug #79705. Stable on x86.
+
+*ngircd-0.8.1 (31 Dec 2004)
+
+  31 Dec 2004; Sven Wegener <swegener@gentoo.org> +ngircd-0.8.1.ebuild:
+  Version bump. Bug #76064 by Daniel Webert.
+
+  29 Aug 2004; Sven Wegener <swegener@gentoo.org> -ngircd-0.7.7.ebuild:
+  Removed old ebuild.
+
+  14 Aug 2004; Sven Wegener <swegener@gentoo.org> ngircd-0.8.0.ebuild:
+  Marked stable on x86.
+
+  06 Aug 2004; Malcolm Lashley <malc@gentoo.org> ngircd-0.8.0.ebuild:
+  ~amd64 closes bug #58427
+
+*ngircd-0.8.0 (09 Jul 2004)
+
+  09 Jul 2004; Sven Wegener <swegener@gentoo.org> +files/ngircd.init.d,
+  +ngircd-0.8.0.ebuild:
+  Version bump and added init script.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> ngircd-0.7.7.ebuild:
+  virtual/glibc -> virtual/libc
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> ngircd-0.7.7.ebuild:
+  Add die following econf for bug 48950
+
+*ngircd-0.7.7 (20 Apr 2004)
+
+  20 Apr 2004; David Holm <dholm@gentoo.org> ngircd-0.7.7.ebuild:
+  Added to ~ppc.
 
   19 Apr 2004; Chuck Short <zul@gentoo.org> :
   Initial version, ebuild written by me. Closes #47945.
diff --git a/net-irc/ngircd/Manifest b/net-irc/ngircd/Manifest
index b906d12e1f30..5880aa1567c9 100644
--- a/net-irc/ngircd/Manifest
+++ b/net-irc/ngircd/Manifest
@@ -1,2 +1,17 @@
-MD5 0b82c885562d7b79b03ee5660f200884 ngircd-0.7.7.ebuild 501
-MD5 a3a523dfbf1853555c797713c5c45866 files/digest-ngircd-0.7.7 64
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 977fd34d014ddb23f7d71961ab0481c3 ChangeLog 2114
+MD5 fc2670f2b2116c79574e78c6b04bf721 files/digest-ngircd-0.8.3 64
+MD5 7d700a26d0f0cf189a5676b1111beb5d files/digest-ngircd-0.9.2 64
+MD5 8a38f32703577610207bcdfbe516a38d files/ngircd.init.d 521
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+MD5 02e523c1ceef14fa72b871fc3e2cb764 ngircd-0.8.3.ebuild 1311
+MD5 453272ee727396bd991a577ca86e5e05 ngircd-0.9.2.ebuild 1305
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDdyfjI1lqEGTUzyQRAhtbAKCMA/5tSz8DOz16TfRkgl90bpKedwCgscgk
+iFMrphGUO76RViaCjTb147s=
+=L5sW
+-----END PGP SIGNATURE-----
diff --git a/net-irc/ngircd/files/ngircd.init.d b/net-irc/ngircd/files/ngircd.init.d
index 0e8617fa3678..f95031f8324d 100644
--- a/net-irc/ngircd/files/ngircd.init.d
+++ b/net-irc/ngircd/files/ngircd.init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ngircd/files/ngircd.init.d,v 1.1 2004/07/08 22:59:54 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ngircd/files/ngircd.init.d,v 1.1.1.1 2005/11/30 09:48:59 chriswhite Exp $
 
 depend() {
 	need net
diff --git a/net-irc/ngircd/ngircd-0.8.3.ebuild b/net-irc/ngircd/ngircd-0.8.3.ebuild
index 42fdad2e2c37..74e2149aa215 100644
--- a/net-irc/ngircd/ngircd-0.8.3.ebuild
+++ b/net-irc/ngircd/ngircd-0.8.3.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ngircd/ngircd-0.8.3.ebuild,v 1.1 2005/02/03 17:44:49 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ngircd/ngircd-0.8.3.ebuild,v 1.1.1.1 2005/11/30 09:48:59 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="A IRC server written from scratch."
 HOMEPAGE="http://arthur.ath.cx/~alex/ngircd/"
@@ -10,7 +12,7 @@ SRC_URI="ftp://download.berlios.de/pub/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~amd64"
+KEYWORDS="x86 ppc ~amd64"
 
 IUSE="zlib tcpd debug"
 
diff --git a/net-irc/ngircd/ngircd-0.9.2.ebuild b/net-irc/ngircd/ngircd-0.9.2.ebuild
index c418aaee938d..c26db7d9aa64 100644
--- a/net-irc/ngircd/ngircd-0.9.2.ebuild
+++ b/net-irc/ngircd/ngircd-0.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ngircd/ngircd-0.9.2.ebuild,v 1.1 2005/11/13 11:47:35 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ngircd/ngircd-0.9.2.ebuild,v 1.1.1.1 2005/11/30 09:48:59 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-irc/nikibot/ChangeLog b/net-irc/nikibot/ChangeLog
index 6553c4f6e8eb..2a984cff3489 100644
--- a/net-irc/nikibot/ChangeLog
+++ b/net-irc/nikibot/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-irc/nikibot
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/nikibot/ChangeLog,v 1.1 2004/07/23 23:06:08 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/nikibot/ChangeLog,v 1.1.1.1 2005/11/30 09:48:54 chriswhite Exp $
+
+  14 Nov 2004; Sven Wegener <swegener@gentoo.org> nikibot-0.8.ebuild:
+  Fixed digest.
 
 *nikibot-0.8 (24 Jul 2004)
 
diff --git a/net-irc/nikibot/Manifest b/net-irc/nikibot/Manifest
index 8f16a879c04c..69b0679e4987 100644
--- a/net-irc/nikibot/Manifest
+++ b/net-irc/nikibot/Manifest
@@ -1,2 +1,14 @@
-MD5 b0941d8e22026e079084fe4498d1a189 nikibot-0.8.ebuild 506
-MD5 09b16226667a32e820a6b039baad50e8 files/digest-nikibot-0.8 64
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7746cd3edf228132b09388bc2bfb2475 ChangeLog 495
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+MD5 a5ceecbc546e0d58e5aa72795a9d1046 nikibot-0.8.ebuild 762
+MD5 358bf978000b3461815e6843498f3bf2 files/digest-nikibot-0.8 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBl5ROI1lqEGTUzyQRAhvOAKCDa++a/3v2I2Uho++u0eRuOn4iqwCggXX1
+a17YnTMN/BEdeiwxUWn0cLI=
+=+jkf
+-----END PGP SIGNATURE-----
diff --git a/net-irc/nikibot/files/digest-nikibot-0.8 b/net-irc/nikibot/files/digest-nikibot-0.8
index ce8d69c72bbb..b1d59afd7025 100644
--- a/net-irc/nikibot/files/digest-nikibot-0.8
+++ b/net-irc/nikibot/files/digest-nikibot-0.8
@@ -1 +1 @@
-MD5 1b2bb6d25bbe2d5cd3487a99252713d3 nikibot-0.8.tar.bz2 201445
+MD5 16a1e33c27cddee21446f85862a470db nikibot-0.8.tar.bz2 201651
diff --git a/net-irc/nikibot/nikibot-0.8.ebuild b/net-irc/nikibot/nikibot-0.8.ebuild
index a1a721addef8..cdb9452ff10b 100644
--- a/net-irc/nikibot/nikibot-0.8.ebuild
+++ b/net-irc/nikibot/nikibot-0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/nikibot/nikibot-0.8.ebuild,v 1.1 2004/07/23 23:06:08 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/nikibot/nikibot-0.8.ebuild,v 1.1.1.1 2005/11/30 09:48:54 chriswhite Exp $
 
 DESCRIPTION="An IRC-Bot with lua script interface"
 HOMEPAGE="http://sourceforge.net/projects/nikibot/"
@@ -25,6 +25,6 @@ src_unpack() {
 src_install() {
 	make DESTDIR=${D} install || die "make install failed"
 
-	dodoc README test.lua
-	dohtml html/*
+	dodoc README test.lua || die "dodoc failed"
+	dohtml html/* || die "dohtml failed"
 }
diff --git a/net-irc/ninja/ChangeLog b/net-irc/ninja/ChangeLog
index a295b51ccfcc..1cb1e45e240e 100644
--- a/net-irc/ninja/ChangeLog
+++ b/net-irc/ninja/ChangeLog
@@ -1,8 +1,50 @@
 # ChangeLog for net-irc/ninja
-# Copyright 2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ninja/ChangeLog,v 1.1 2003/05/12 19:55:30 avenj Exp $
+# Copyright 2003-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ninja/ChangeLog,v 1.1.1.1 2005/11/30 09:48:53 chriswhite Exp $
 
-*ninja-1.5.9_pre9.ebuild (12 May  2003)
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  ninja-1.5.9_pre12.ebuild:
+  Stable on ppc.
+
+  13 Nov 2004; Sven Wegener <swegener@gentoo.org> -ninja-1.5.9_pre9.ebuild:
+  Removed old ebuild.
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> ninja-1.5.9_pre12.ebuild:
+  Stable on amd64.
+
+  14 Aug 2004; Sven Wegener <swegener@gentoo.org> ninja-1.5.9_pre12.ebuild:
+  Marked stable on x86.
+
+*ninja-1.5.9_pre12 (09 Jul 2004)
+
+  09 Jul 2004; Sven Wegener <swegener@gentoo.org> +ninja-1.5.9_pre12.ebuild,
+  ninja-1.5.9_pre9.ebuild:
+  Updated SRC_URI and version bump.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ninja-1.5.9_pre9.ebuild:
+  virtual/glibc -> virtual/libc
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  ninja-1.5.9_pre9.ebuild:
+  Masked ninja-1.5.9_pre9.ebuild testing for ppc
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> ninja-1.5.9_pre9.ebuild:
+  Add die following econf for bug 48950
+
+  14 Mar 2004; Jon Portnoy <avenj@gentoo.org> ninja-1.5.9_pre9.ebuild :
+  Fixed PV issue.
+
+  14 Feb 2004; Jason Wever <weeve@gentoo.org> ninja-1.5.9_pre9.ebuild:
+  Added ~sparc keyword.
+
+  05 Dec 2003; Chuck Short <zul@gentoo.org> ninja-1.5.9_pre9.ebuild:
+  Ebuild clean up.
+
+  18 Oct 2003; Chuck Short <zul@gentoo.org> ninja-1.5.9_pre9.ebuild:
+  Marked stable on x86, added amd64 to keywords.
+
+*ninja-1.5.9_pre9 (12 May  2003)
 
   12 May 2003; Jon Portnoy <avenj@gentoo.org> ebuild-1.5.9_pre9.ebuild :
   Initial import. Ebuild submitted by Burton Samograd
diff --git a/net-irc/ninja/Manifest b/net-irc/ninja/Manifest
index 7e5ee9f3ea26..504d570832fc 100644
--- a/net-irc/ninja/Manifest
+++ b/net-irc/ninja/Manifest
@@ -1,3 +1,4 @@
-MD5 901b7320eef886a6fa7bc48448e6ea4a ninja-1.5.9_pre9.ebuild 679
-MD5 0048df8018bbe387f553ba97e8a0ada6 ChangeLog 330
-MD5 02be0e2b992a6b7f6fedeaf868630586 files/digest-ninja-1.5.9_pre9 67
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+MD5 37454524592ab888b67efccad66c3619 ChangeLog 1742
+MD5 b96852930cb438f91691e69c8942a5bb ninja-1.5.9_pre12.ebuild 675
+MD5 fb1cc2d1a486b3113135d305d05e2292 files/digest-ninja-1.5.9_pre12 68
diff --git a/net-irc/ninja/ninja-1.5.9_pre12.ebuild b/net-irc/ninja/ninja-1.5.9_pre12.ebuild
index 322017d3b85b..392abb523145 100644
--- a/net-irc/ninja/ninja-1.5.9_pre12.ebuild
+++ b/net-irc/ninja/ninja-1.5.9_pre12.ebuild
@@ -1,15 +1,17 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ninja/ninja-1.5.9_pre12.ebuild,v 1.1 2004/07/08 22:13:53 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ninja/ninja-1.5.9_pre12.ebuild,v 1.1.1.1 2005/11/30 09:48:53 chriswhite Exp $
 
 S=${WORKDIR}/${P/_*/}
+
 DESCRIPTION="Ninja IRC Client"
 HOMEPAGE="http://ninja.qoop.org/"
 SRC_URI="ftp://qoop.org/ninja/stable/${P/_/}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc"
+KEYWORDS="x86 amd64 ~sparc ppc"
 IUSE="ncurses ipv6 ssl"
+
 DEPEND="virtual/libc
 	ncurses? ( sys-libs/ncurses )
 	ssl?  ( dev-libs/openssl )"
diff --git a/net-irc/oer-mysql/ChangeLog b/net-irc/oer-mysql/ChangeLog
index 2159bb08eac1..68a31186361e 100644
--- a/net-irc/oer-mysql/ChangeLog
+++ b/net-irc/oer-mysql/ChangeLog
@@ -1,6 +1,34 @@
 # ChangeLog for net-irc/oer-mysql
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/oer-mysql/ChangeLog,v 1.1 2003/12/28 23:06:52 zul Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/oer-mysql/ChangeLog,v 1.1.1.1 2005/11/30 09:48:59 chriswhite Exp $
+
+  11 Sep 2005; Sven Wegener <swegener@gentoo.org> -oer-mysql-1.0.42.ebuild,
+  oer-mysql-1.0.43.ebuild:
+  Stable on x86.
+
+*oer-mysql-1.0.43 (16 Dec 2004)
+
+  16 Dec 2004; Sven Wegener <swegener@gentoo.org> +oer-mysql-1.0.43.ebuild:
+  Version bump.
+
+  24 Nov 2004; Sven Wegener <swegener@gentoo.org> oer-mysql-1.0.42.ebuild:
+  Fixed SRC_URI to match real file name.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  oer-mysql-1.0.42.ebuild:
+  virtual/glibc -> virtual/libc
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  oer-mysql-1.0.42.ebuild:
+  Masked oer-mysql-1.0.42.ebuild testing for ppc
+
+  23 Mar 2004; Martin Holzer <mholzer@gentoo.org> oer-mysql-1.0.42.ebuild:
+  fixing depend qa issue. see 45343.
+
+  15 Mar 2004; Chuck Short <zul@gentoo.org> oer-mysql-1.0.42.ebuild:
+  Marked stable for x86
+  Updated headers
+  use MY_P for a custom name not PN.
 
 *oer-mysql-1.0.42 (28 Dec 2003)
 
diff --git a/net-irc/oer-mysql/Manifest b/net-irc/oer-mysql/Manifest
index 906b74d81a90..549d571e1811 100644
--- a/net-irc/oer-mysql/Manifest
+++ b/net-irc/oer-mysql/Manifest
@@ -1,2 +1,14 @@
-MD5 ae0eb4cf7f07dd0e3e6f41947af1c849 oer-mysql-1.0.42.ebuild 2345
-MD5 d2054296b7eda8cf7e857eedf0af8a7b files/digest-oer-mysql-1.0.42 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 65ac586f7a99a873076af7f7b5a127b0 ChangeLog 1267
+MD5 8e47665b13a96c5d6a0b7bff3fe82c27 files/digest-oer-mysql-1.0.43 68
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+MD5 4d234ca4ccf4368724dbec01df620f89 oer-mysql-1.0.43.ebuild 1390
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDJDixI1lqEGTUzyQRApANAJ4pRHLMz4tVqFDfgYshWUYAQC64/wCdE+uW
+g6IDj65BkHjCyLJJ/o0XUUE=
+=iIHj
+-----END PGP SIGNATURE-----
diff --git a/net-irc/oer-mysql/oer-mysql-1.0.43.ebuild b/net-irc/oer-mysql/oer-mysql-1.0.43.ebuild
index 295982ae28db..fffabae09f25 100644
--- a/net-irc/oer-mysql/oer-mysql-1.0.43.ebuild
+++ b/net-irc/oer-mysql/oer-mysql-1.0.43.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/oer-mysql/oer-mysql-1.0.43.ebuild,v 1.1 2004/12/16 03:26:53 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/oer-mysql/oer-mysql-1.0.43.ebuild,v 1.1.1.1 2005/11/30 09:48:59 chriswhite Exp $
 
 inherit fixheadtails versionator
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://oer.equnet.org/"
 SRC_URI="http://oer.equnet.org/testing/${MY_PN}-$(replace_version_separator 2 -).tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 IUSE="debug static"
 
 RDEPEND="virtual/libc
diff --git a/net-irc/oer/ChangeLog b/net-irc/oer/ChangeLog
index 749fc89c0e7d..45c2ed2687a7 100644
--- a/net-irc/oer/ChangeLog
+++ b/net-irc/oer/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for net-irc/oer
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/oer/ChangeLog,v 1.1 2004/06/17 22:33:17 swegener Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/oer/ChangeLog,v 1.1.1.1 2005/11/30 09:49:01 chriswhite Exp $
+
+*oer-1.0.66 (16 Dec 2004)
+
+  16 Dec 2004; Sven Wegener <swegener@gentoo.org> oer-1.0.64.ebuild,
+  oer-1.0.65.ebuild, +oer-1.0.66.ebuild:
+  Version bump. Switched to use versionator.eclass.
+
+*oer-1.0.65 (13 Nov 2004)
+
+  13 Nov 2004; Sven Wegener <swegener@gentoo.org> +oer-1.0.65.ebuild:
+  Version bump.
+
+  22 Jul 2004; Sven Wegener <swegener@gentoo.org> oer-1.0.64.ebuild:
+  Marked stable on x86.
+
+  18 Jun 2004; David Holm <dholm@gentoo.org> oer-1.0.64.ebuild:
+  Added to ~ppc.
 
 *oer-1.0.64 (18 Jun 2004)
 
diff --git a/net-irc/oer/Manifest b/net-irc/oer/Manifest
index 463c1584b48e..352771c73e55 100644
--- a/net-irc/oer/Manifest
+++ b/net-irc/oer/Manifest
@@ -1,3 +1,19 @@
-MD5 2d3349f486b731f8e3229803480970d2 oer-1.0.64.ebuild 967
-MD5 734b0897c2e042b8c0d75bb79c00f733 files/1.0.64-basename.patch 240
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 31f0c5fd20f090bad5ecfa5d18883e7b oer-1.0.64.ebuild 1094
+MD5 19ed33e25e27ccef19437f261b0c17be oer-1.0.66.ebuild 1104
+MD5 6912822eb694b0d9b9c49be9b0c665eb oer-1.0.65.ebuild 1096
+MD5 56f3b38cf8e457e3cec5315836a55d53 ChangeLog 929
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 MD5 8d109710bda2d73afccad03fc696cd33 files/digest-oer-1.0.64 62
+MD5 1960f058e88c3a3db3ff4a533bc4ee59 files/digest-oer-1.0.65 62
+MD5 f68b3896a4f6a0d925f39fadbc6663e1 files/digest-oer-1.0.66 62
+MD5 734b0897c2e042b8c0d75bb79c00f733 files/1.0.64-basename.patch 240
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBwPkxI1lqEGTUzyQRAlx1AJ0c9NKb4pqoQ+zZVKtnkTkuWs6QpACeNIlp
+ipECmmloCLTn4i32fGqmEp4=
+=kqtR
+-----END PGP SIGNATURE-----
diff --git a/net-irc/oer/oer-1.0.64.ebuild b/net-irc/oer/oer-1.0.64.ebuild
index 4ec32d5534b3..b4e64531974c 100644
--- a/net-irc/oer/oer-1.0.64.ebuild
+++ b/net-irc/oer/oer-1.0.64.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/oer/oer-1.0.64.ebuild,v 1.1 2004/06/17 22:33:17 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/oer/oer-1.0.64.ebuild,v 1.1.1.1 2005/11/30 09:49:01 chriswhite Exp $
 
-inherit fixheadtails eutils
+inherit fixheadtails eutils versionator
 
 DESCRIPTION="Free to use GPL'd IRC bot"
 HOMEPAGE="http://oer.equnet.org/"
-SRC_URI="http://oer.equnet.org/${PN}-1.0-64.tar.gz"
+SRC_URI="http://oer.equnet.org/${PN}-$(replace_version_separator 2 -).tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
 IUSE=""
 
 DEPEND=""
diff --git a/net-irc/oer/oer-1.0.65.ebuild b/net-irc/oer/oer-1.0.65.ebuild
index c1a66e3d0cf0..9733af335622 100644
--- a/net-irc/oer/oer-1.0.65.ebuild
+++ b/net-irc/oer/oer-1.0.65.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/oer/oer-1.0.65.ebuild,v 1.1 2004/11/13 00:05:28 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/oer/oer-1.0.65.ebuild,v 1.1.1.1 2005/11/30 09:49:01 chriswhite Exp $
 
-inherit fixheadtails eutils
+inherit fixheadtails eutils versionator
 
 DESCRIPTION="Free to use GPL'd IRC bot"
 HOMEPAGE="http://oer.equnet.org/"
-SRC_URI="http://oer.equnet.org/${PN}-1.0-65.tar.gz"
+SRC_URI="http://oer.equnet.org/${PN}-$(replace_version_separator 2 -).tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
diff --git a/net-irc/oer/oer-1.0.66.ebuild b/net-irc/oer/oer-1.0.66.ebuild
index 702fb3e037ee..dafaa7fe37ba 100644
--- a/net-irc/oer/oer-1.0.66.ebuild
+++ b/net-irc/oer/oer-1.0.66.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/oer/oer-1.0.66.ebuild,v 1.1 2004/12/16 02:55:39 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/oer/oer-1.0.66.ebuild,v 1.1.1.1 2005/11/30 09:49:01 chriswhite Exp $
 
 inherit fixheadtails eutils versionator
 
diff --git a/net-irc/onis/ChangeLog b/net-irc/onis/ChangeLog
index f528208a4f09..88191520a0db 100644
--- a/net-irc/onis/ChangeLog
+++ b/net-irc/onis/ChangeLog
@@ -1,6 +1,30 @@
 # ChangeLog for net-irc/onis
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/onis/ChangeLog,v 1.1 2004/06/28 23:44:05 swegener Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/onis/ChangeLog,v 1.1.1.1 2005/11/30 09:49:04 chriswhite Exp $
+
+*onis-0.8.0 (22 Apr 2005)
+
+  22 Apr 2005; Sven Wegener <swegener@gentoo.org> onis-0.6.1.ebuild,
+  +onis-0.8.0.ebuild:
+  Version bump.
+
+  08 Dec 2004; Sven Wegener <swegener@gentoo.org> onis-0.6.1.ebuild:
+  dev-lang/perl also belongs in DEPEND.
+
+  08 Sep 2004; Sven Wegener <swegener@gentoo.org> -onis-0.6.0.ebuild,
+  onis-0.6.1.ebuild:
+  Marked stable on x86. Removed old ebuild.
+
+*onis-0.6.1 (06 Aug 2004)
+
+  06 Aug 2004; Sven Wegener <swegener@gentoo.org> +onis-0.6.1.ebuild:
+  Version bump.
+
+  30 Jul 2004; Sven Wegener <swegener@gentoo.org> onis-0.6.0.ebuild:
+  Marked stable on x86.
+
+  29 Jun 2004; David Holm <dholm@gentoo.org> onis-0.6.0.ebuild:
+  Added to ~ppc.
 
 *onis-0.6.0 (29 Jun 2004)
 
diff --git a/net-irc/onis/Manifest b/net-irc/onis/Manifest
index 333ff0fc7e4d..e9613184e0c2 100644
--- a/net-irc/onis/Manifest
+++ b/net-irc/onis/Manifest
@@ -1,4 +1,17 @@
-MD5 1ccab2e2d400426d880cbca07be7a2a7 onis-0.6.0.ebuild 936
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0858bb50914d35ff6fbdc8db6c66586a onis-0.8.0.ebuild 1094
+MD5 10e5c33af7d6f4a83c2e3dcca9217566 onis-0.6.1.ebuild 1029
+MD5 1f690c2f0c46dd42935a9e50858c0744 ChangeLog 1053
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 MD5 9b0ece7b82c71aae249b8e7bc1e4a40c files/0.6.0-nochdir.patch 258
-MD5 f614a635ad9550dce02407f2e9fc811c files/digest-onis-0.6.0 62
+MD5 e83837edd6b3989aa23c4ab7a7d5b2c0 files/digest-onis-0.6.1 62
+MD5 a112767994663370dfdfc7d7f05ea4dd files/digest-onis-0.8.0 62
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCaRaMI1lqEGTUzyQRAmnrAKDO1nzKBSemUGbeUkkOsAYyfoh6QgCg0iwx
+gxRny1zpSPhDU9NiAQjpddM=
+=k7QO
+-----END PGP SIGNATURE-----
diff --git a/net-irc/onis/onis-0.6.1.ebuild b/net-irc/onis/onis-0.6.1.ebuild
index 9f2eb2df20b1..dc67fd7ffeec 100644
--- a/net-irc/onis/onis-0.6.1.ebuild
+++ b/net-irc/onis/onis-0.6.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/onis/onis-0.6.1.ebuild,v 1.1 2004/08/05 23:28:07 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/onis/onis-0.6.1.ebuild,v 1.1.1.1 2005/11/30 09:49:04 chriswhite Exp $
 
 inherit eutils
 
@@ -9,11 +9,12 @@ HOMEPAGE="http://verplant.org/onis/"
 SRC_URI="http://verplant.org/${PN}/${P}.tar.bz2"
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 IUSE=""
 
 RDEPEND="dev-lang/perl"
-DEPEND=">=sys-apps/sed-4"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
 
 src_unpack() {
 	unpack ${A}
@@ -25,7 +26,7 @@ src_unpack() {
 }
 
 src_install () {
-	eval `perl -V:installprivlib`
+	eval $(perl -V:installprivlib)
 
 	dobin onis
 
diff --git a/net-irc/onis/onis-0.8.0.ebuild b/net-irc/onis/onis-0.8.0.ebuild
index a421ce0e8f2b..64af8a89e998 100644
--- a/net-irc/onis/onis-0.8.0.ebuild
+++ b/net-irc/onis/onis-0.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/onis/onis-0.8.0.ebuild,v 1.1 2005/04/22 15:21:29 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/onis/onis-0.8.0.ebuild,v 1.1.1.1 2005/11/30 09:49:04 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-irc/pisg/ChangeLog b/net-irc/pisg/ChangeLog
index 5dd323485996..7c83da53e950 100644
--- a/net-irc/pisg/ChangeLog
+++ b/net-irc/pisg/ChangeLog
@@ -1,6 +1,184 @@
 # ChangeLog for net-irc/pisg
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/pisg/ChangeLog,v 1.1 2004/01/19 01:14:35 zul Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/pisg/ChangeLog,v 1.1.1.1 2005/11/30 09:48:59 chriswhite Exp $
+
+  02 Oct 2005; Michael Hanselmann <hansmi@gentoo.org> pisg-0.67.ebuild:
+  Stable on ppc.
+
+  25 Sep 2005; Sven Wegener <swegener@gentoo.org> pisg-0.67.ebuild:
+  Stable on x86.
+
+*pisg-0.67 (19 Aug 2005)
+
+  19 Aug 2005; Sven Wegener <swegener@gentoo.org> +pisg-0.67.ebuild:
+  Version bump.
+
+  07 Jul 2005; Sven Wegener <swegener@gentoo.org>
+  -files/0.56-network-option-fix.patch, -pisg-0.65.ebuild:
+  Removed old ebuild.
+
+  07 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org> pisg-0.66.ebuild:
+  ppc stable
+
+  25 Jun 2005; Sven Wegener <swegener@gentoo.org> pisg-0.66.ebuild:
+  Marked stable on x86.
+
+  18 Jun 2005; Sven Wegener <swegener@gentoo.org> -pisg-0.64.ebuild:
+  Removed old ebuild.
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> pisg-0.65.ebuild:
+  Stable on ppc.
+
+  16 May 2005; Sven Wegener <swegener@gentoo.org> pisg-0.64.ebuild,
+  pisg-0.65.ebuild, pisg-0.66.ebuild:
+  Marked 0.65 stable on x86. Don't use globbing when using doins.
+
+*pisg-0.66 (12 May 2005)
+
+  12 May 2005; Sven Wegener <swegener@gentoo.org> +pisg-0.66.ebuild:
+  Version bump.
+
+  22 Apr 2005; Sven Wegener <swegener@gentoo.org> -pisg-0.63.ebuild:
+  Removed old ebuild.
+
+  20 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> pisg-0.64.ebuild:
+  Stable on ppc.
+
+*pisg-0.65 (16 Apr 2005)
+
+  16 Apr 2005; Thomas Matthijs <axxo@gentoo.org> +pisg-0.65.ebuild:
+  version bump
+
+  10 Apr 2005; Sven Wegener <swegener@gentoo.org> -pisg-0.62.ebuild,
+  pisg-0.64.ebuild:
+  Marked stable on x86. Removed old ebuild.
+
+  08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> pisg-0.63.ebuild:
+  Stable on ppc.
+
+*pisg-0.64 (24 Feb 2005)
+
+  24 Feb 2005; Sven Wegener <swegener@gentoo.org> +pisg-0.64.ebuild:
+  Version bump.
+
+  17 Feb 2005; Sven Wegener <swegener@gentoo.org> pisg-0.63.ebuild:
+  Marked stable on x86.
+
+  21 Jan 2005; Sven Wegener <swegener@gentoo.org> -pisg-0.57.ebuild:
+  Removed old ebuild.
+
+  21 Jan 2005; Lars Weiler <pylon@gentoo.org> pisg-0.62.ebuild:
+  Stable on ppc.
+
+*pisg-0.63 (12 Jan 2005)
+
+  12 Jan 2005; Sven Wegener <swegener@gentoo.org> pisg-0.62.ebuild,
+  +pisg-0.63.ebuild:
+  Version bump. Marked 0.62 stable on x86.
+
+*pisg-0.62 (11 Dec 2004)
+
+  11 Dec 2004; Sven Wegener <swegener@gentoo.org> +pisg-0.62.ebuild:
+  Version bump.
+
+  08 Dec 2004; Sven Wegener <swegener@gentoo.org> pisg-0.57.ebuild,
+  pisg-0.61.ebuild:
+  dev-lang/perl also belongs in DEPEND.
+
+  05 Dec 2004; Sven Wegener <swegener@gentoo.org> -pisg-0.60.ebuild,
+  pisg-0.61.ebuild:
+  Marked stable on x86. Removed old ebuild.
+
+  13 Nov 2004; Sven Wegener <swegener@gentoo.org> -pisg-0.58.ebuild,
+  -pisg-0.59.ebuild, pisg-0.60.ebuild:
+  Marked 0.60 stable on x86. Removed old ebuilds.
+
+  12 Nov 2004; Simon Stelling <blubb@gentoo.org> pisg-0.61.ebuild:
+  added ~amd64
+
+*pisg-0.61 (31 Oct 2004)
+
+  31 Oct 2004; Sven Wegener <swegener@gentoo.org> +pisg-0.61.ebuild:
+  Version bump.
+
+*pisg-0.60 (15 Oct 2004)
+
+  15 Oct 2004; Sven Wegener <swegener@gentoo.org> -pisg-0.51.ebuild,
+  pisg-0.58.ebuild, +pisg-0.60.ebuild:
+  Version bump. Marked 0.58 stable on x86. Removed old ebuild.
+
+*pisg-0.59 (03 Oct 2004)
+
+  03 Oct 2004; Sven Wegener <swegener@gentoo.org> +pisg-0.59.ebuild:
+  Version bump.
+
+  01 Oct 2004; Sven Wegener <swegener@gentoo.org> -pisg-0.56.ebuild,
+  pisg-0.57.ebuild:
+  Marked stable on x86. Removed old ebuild.
+
+*pisg-0.58 (09 Sep 2004)
+
+  09 Sep 2004; Sven Wegener <swegener@gentoo.org> +pisg-0.58.ebuild:
+  Version bump.
+
+*pisg-0.57 (28 Aug 2004)
+
+  28 Aug 2004; Sven Wegener <swegener@gentoo.org> pisg-0.51.ebuild,
+  pisg-0.56.ebuild, +pisg-0.57.ebuild:
+  Version bump.
+
+  17 Jul 2004; Sven Wegener <swegener@gentoo.org> -pisg-0.52.ebuild,
+  -pisg-0.55.ebuild, pisg-0.56.ebuild:
+  Removed old ebuilds and marked 0.56 stable on x86.
+
+  26 Jun 2004; Sven Wegener <swegener@gentoo.org>
+  -files/0.50-network-option-fix.patch, -pisg-0.50.ebuild, pisg-0.51.ebuild,
+  pisg-0.52.ebuild, pisg-0.55.ebuild, pisg-0.56.ebuild:
+  Updated dependencies. Thanks to dju` <dju@elegiac.net> in bug #55172. Removed
+  older ebuilds.
+
+*pisg-0.56 (19 Jun 2004)
+
+  19 Jun 2004; Sven Wegener <swegener@gentoo.org>
+  +files/0.56-network-option-fix.patch, +pisg-0.56.ebuild:
+  Version bump
+
+  17 Jun 2004; Sven Wegener <swegener@gentoo.org> pisg-0.52.ebuild,
+  pisg-0.55.ebuild:
+  Fixed permission issue.
+
+*pisg-0.55 (09 Jun 2004)
+
+  09 Jun 2004; Chuck Short <zul@gentoo.org> pisg-0.55.ebuild:
+  Version bump, closes #52461.
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> pisg-0.50.ebuild,
+  pisg-0.51.ebuild, pisg-0.52.ebuild:
+  Masked pisg-0.52.ebuild testing for ppc
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> pisg-0.50.ebuild,
+  pisg-0.51.ebuild:
+  Masked pisg-0.51.ebuild stable for ppc
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> pisg-0.50.ebuild:
+  Masked pisg-0.50.ebuild stable for ppc
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> pisg-0.50.ebuild:
+  Add inherit eutils
+
+*pisg-0.52 (16 Mar 2004)
+
+  16 Mar 2004; Chuck Short <zul@gentoo.org> pisg-0.52.ebuild:
+  Version bump, closes #44762.
+  Fixes permission issue.
+
+  16 Mar 2004; Chuck Short <zul@gentoo.org> pisg-0.51.ebuild:
+  Marked stable for x86.
+
+*pisg-0.51 (11 Feb 2004)
+
+  11 Feb 2004; Chuck Short <zul@gentoo.org> pisg-0.51.ebuild:
+  Version bump, closes #40962.
 
 *pisg-0.50 (18 Jan 2004)
 
diff --git a/net-irc/pisg/Manifest b/net-irc/pisg/Manifest
index cd005dc20ed0..ca9ab553d06c 100644
--- a/net-irc/pisg/Manifest
+++ b/net-irc/pisg/Manifest
@@ -1,2 +1,6 @@
-MD5 f0f94e65c9330c3c30350009a61a0f20 pisg-0.50.ebuild 987
-MD5 4122e1015b1785c4ba317d53a3f95dec files/digest-pisg-0.50 61
+MD5 d7971d880590cc5d81b2386823a35261 ChangeLog 5691
+MD5 9eca5760bc6d3ef523ad2ab2105057cf files/digest-pisg-0.66 61
+MD5 8440de9590c3152ca4805125cec2fdf7 files/digest-pisg-0.67 61
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+MD5 ced3de30422c6414d0838a684929509b pisg-0.66.ebuild 1227
+MD5 cbd9b064210b1a86934c0dc50eb661b2 pisg-0.67.ebuild 1225
diff --git a/net-irc/pisg/pisg-0.66.ebuild b/net-irc/pisg/pisg-0.66.ebuild
index c829ed54f7be..f767fba56672 100644
--- a/net-irc/pisg/pisg-0.66.ebuild
+++ b/net-irc/pisg/pisg-0.66.ebuild
@@ -1,15 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/pisg/pisg-0.66.ebuild,v 1.1 2005/05/12 16:06:16 swegener Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/net-irc/pisg/pisg-0.66.ebuild,v 1.1.1.1 2005/11/30 09:48:59 chriswhite Exp $
 
 DESCRIPTION="Perl IRC Statistics Generator"
 HOMEPAGE="http://pisg.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="x86 ppc ~amd64"
 
 IUSE=""
 
@@ -20,7 +18,7 @@ DEPEND="dev-lang/perl
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	sed -i \
 		-e 's!lang\.txt!/usr/share/pisg/lang.txt!' \
@@ -35,7 +33,7 @@ src_install () {
 	dobin pisg || die "dobin failed"
 
 	insinto "${installvendorlib}"
-	doins -r modules/* || die "doins failed"
+	doins -r modules/. || die "doins failed"
 
 	insinto /usr/share/pisg
 	doins -r gfx layout lang.txt || die "doins failed"
diff --git a/net-irc/pisg/pisg-0.67.ebuild b/net-irc/pisg/pisg-0.67.ebuild
index 6910e8b2e2e4..dba2e1ed7b1f 100644
--- a/net-irc/pisg/pisg-0.67.ebuild
+++ b/net-irc/pisg/pisg-0.67.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/pisg/pisg-0.67.ebuild,v 1.1 2005/08/19 15:28:54 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/pisg/pisg-0.67.ebuild,v 1.1.1.1 2005/11/30 09:48:59 chriswhite Exp $
 
 DESCRIPTION="Perl IRC Statistics Generator"
 HOMEPAGE="http://pisg.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ppc x86"
 
 IUSE=""
 
diff --git a/net-irc/ptlink-ircd/ChangeLog b/net-irc/ptlink-ircd/ChangeLog
index 14d6f7b66724..a8bc915762d3 100644
--- a/net-irc/ptlink-ircd/ChangeLog
+++ b/net-irc/ptlink-ircd/ChangeLog
@@ -1,6 +1,42 @@
-# ChangeLog for net-irc/ptlink
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ptlink-ircd/ChangeLog,v 1.1 2004/07/10 22:24:03 swegener Exp $
+# ChangeLog for net-irc/ptlink-ircd
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ptlink-ircd/ChangeLog,v 1.1.1.1 2005/11/30 09:48:52 chriswhite Exp $
+
+*ptlink-ircd-6.19.3 (30 Jan 2005)
+
+  30 Jan 2005; Sven Wegener <swegener@gentoo.org>
+  +ptlink-ircd-6.19.3.ebuild:
+  Version bump.
+
+*ptlink-ircd-6.19.2 (12 Dec 2004)
+
+  12 Dec 2004; Sven Wegener <swegener@gentoo.org>
+  +ptlink-ircd-6.19.2.ebuild:
+  Version bump.
+
+  25 Nov 2004; Sven Wegener <swegener@gentoo.org>
+  -ptlink-ircd-6.18.2.ebuild, ptlink-ircd-6.19.1.ebuild:
+  Added support for the ssl USE flag. Removed old ebuild.
+
+  25 Nov 2004; Sven Wegener <swegener@gentoo.org> ptlink-ircd-6.18.2.ebuild,
+  ptlink-ircd-6.19.1.ebuild:
+  Disabled ipv6 support as upstream considers it unstable.
+
+*ptlink-ircd-6.19.1 (14 Nov 2004)
+
+  14 Nov 2004; Sven Wegener <swegener@gentoo.org>
+  -ptlink-ircd-6.18.1.ebuild, ptlink-ircd-6.18.2.ebuild,
+  +ptlink-ircd-6.19.1.ebuild:
+  Version bump. Removed old ebuild.
+
+*ptlink-ircd-6.18.2 (18 Oct 2004)
+
+  18 Oct 2004; Sven Wegener <swegener@gentoo.org>
+  +ptlink-ircd-6.18.2.ebuild:
+  Version bump.
+
+  11 Jul 2004; Sven Wegener <swegener@gentoo.org> files/ptlink-ircd.init.d:
+  Added provide ircd to init script.
 
 *ptlink-ircd-6.18.1 (11 Jul 2004)
 
diff --git a/net-irc/ptlink-ircd/Manifest b/net-irc/ptlink-ircd/Manifest
index 22b60bb9874a..e5c04dc483b7 100644
--- a/net-irc/ptlink-ircd/Manifest
+++ b/net-irc/ptlink-ircd/Manifest
@@ -1,5 +1,20 @@
-MD5 0dbf3318d186ef66ae58bce495769953 ptlink-ircd-6.18.1.ebuild 2028
-MD5 8187678ecf0609db4cee0146e1ce4f44 ChangeLog 475
-MD5 a8424a92a1aef170448f005a3d91aa7e files/digest-ptlink-ircd-6.18.1 64
-MD5 113f812e28fe81327a9cef0e4b59e73c files/ptlink-ircd.confd 313
-MD5 e6822b72ea093625708040c81a585985 files/ptlink-ircd.rc 634
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2fd459f0721bd8f0040bb1da6970a054 ptlink-ircd-6.19.1.ebuild 2829
+MD5 01388e84b2ba46b60b1bebcf2727e3a1 ptlink-ircd-6.19.3.ebuild 2837
+MD5 b0c6b815f3b267c536a51a74673be6e8 ChangeLog 2490
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+MD5 6380a14fea6e47481d90290ac3b47dec ptlink-ircd-6.19.2.ebuild 2829
+MD5 325989fdc4f21ef76dd79f9935d69d40 files/ptlink-ircd.conf.d 288
+MD5 4dbd2aee0a36aec736d1053386573b5d files/ptlink-ircd.init.d 625
+MD5 503187bb419b16029524331e913585bd files/digest-ptlink-ircd-6.19.1 64
+MD5 227124f267bb0b27bcf37ac5429024b1 files/digest-ptlink-ircd-6.19.2 64
+MD5 60b5d5479e9764b1a4edfa9690b95f4d files/digest-ptlink-ircd-6.19.3 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFB/NfYI1lqEGTUzyQRAmO5AKDcWiCqCghlm/ls0HvhEkGBo9eZsgCfZxhU
+hNeETTeZDvYfljP44Za4lcY=
+=vME9
+-----END PGP SIGNATURE-----
diff --git a/net-irc/ptlink-ircd/files/ptlink-ircd.conf.d b/net-irc/ptlink-ircd/files/ptlink-ircd.conf.d
index f1903262f11d..dcbe09add7a1 100644
--- a/net-irc/ptlink-ircd/files/ptlink-ircd.conf.d
+++ b/net-irc/ptlink-ircd/files/ptlink-ircd.conf.d
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ptlink-ircd/files/ptlink-ircd.conf.d,v 1.1 2004/07/10 22:24:03 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ptlink-ircd/files/ptlink-ircd.conf.d,v 1.1.1.1 2005/11/30 09:48:52 chriswhite Exp $
 
 # User to run ptlink-ircd as
 PTLINKIRCD_USER="ptlink-ircd"
diff --git a/net-irc/ptlink-ircd/files/ptlink-ircd.init.d b/net-irc/ptlink-ircd/files/ptlink-ircd.init.d
index e656b18d0e67..0c67149c2eda 100644
--- a/net-irc/ptlink-ircd/files/ptlink-ircd.init.d
+++ b/net-irc/ptlink-ircd/files/ptlink-ircd.init.d
@@ -1,11 +1,12 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ptlink-ircd/files/ptlink-ircd.init.d,v 1.1 2004/07/10 22:24:03 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ptlink-ircd/files/ptlink-ircd.init.d,v 1.1.1.1 2005/11/30 09:48:52 chriswhite Exp $
 
 depend() {
 	need net
 	use dns
+	provide ircd
 }
 
 start() {
diff --git a/net-irc/ptlink-ircd/ptlink-ircd-6.19.1.ebuild b/net-irc/ptlink-ircd/ptlink-ircd-6.19.1.ebuild
index 41814e9afad1..03ce10be9c41 100644
--- a/net-irc/ptlink-ircd/ptlink-ircd-6.19.1.ebuild
+++ b/net-irc/ptlink-ircd/ptlink-ircd-6.19.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ptlink-ircd/ptlink-ircd-6.19.1.ebuild,v 1.1 2004/11/14 15:39:28 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ptlink-ircd/ptlink-ircd-6.19.1.ebuild,v 1.1.1.1 2005/11/30 09:48:52 chriswhite Exp $
 
-inherit eutils
+inherit eutils ssl-cert
 
 MY_P="PTlink${PV}"
 
@@ -13,8 +13,9 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc"
 
-IUSE="ipv6"
-DEPEND="sys-libs/zlib"
+IUSE="ssl"
+DEPEND="sys-libs/zlib
+	ssl? ( dev-libs/openssl )"
 
 S=${WORKDIR}/${MY_P}
 
@@ -25,7 +26,8 @@ src_unpack() {
 
 src_compile() {
 	econf \
-		$(use_enable ipv6) \
+		--disable-ipv6 \
+		$(use_with ssl ssl openssl) \
 		|| die "econf failed"
 	emake CFLAGS="${CFLAGS}" || die "emake failed"
 }
@@ -55,13 +57,22 @@ src_install() {
 
 	newinitd ${FILESDIR}/ptlink-ircd.init.d ptlink-ircd || die "newinitd failed"
 	newconfd ${FILESDIR}/ptlink-ircd.conf.d ptlink-ircd || die "newconfd failed"
+
+	use ssl && (
+		insinto /etc/ptlink-ircd
+		docert server || die "docert failed"
+		mv ${D}/etc/ptlink-ircd/server.crt ${D}/etc/ptlink-ircd/server.cert.pem
+		mv ${D}/etc/ptlink-ircd/server.csr ${D}/etc/ptlink-ircd/server.req.pem
+		mv ${D}/etc/ptlink-ircd/server.key ${D}/etc/ptlink-ircd/server.key.pem
+	)
 }
 
 pkg_postinst() {
 	enewuser ptlink-ircd
 
 	chown ptlink-ircd \
-		${ROOT}/{etc,var/{log,lib}}/ptlink-ircd
+		${ROOT}/{etc,var/{log,lib}}/ptlink-ircd \
+		${ROOT}/etc/ptlink-ircd/server.key.pem
 
 	einfo
 	einfo "PTlink IRCd will run without configuration, although this is strongly"
diff --git a/net-irc/ptlink-ircd/ptlink-ircd-6.19.2.ebuild b/net-irc/ptlink-ircd/ptlink-ircd-6.19.2.ebuild
index e985ef4b1f3b..8fc1cfa18ed8 100644
--- a/net-irc/ptlink-ircd/ptlink-ircd-6.19.2.ebuild
+++ b/net-irc/ptlink-ircd/ptlink-ircd-6.19.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ptlink-ircd/ptlink-ircd-6.19.2.ebuild,v 1.1 2004/12/12 16:56:54 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ptlink-ircd/ptlink-ircd-6.19.2.ebuild,v 1.1.1.1 2005/11/30 09:48:52 chriswhite Exp $
 
 inherit eutils ssl-cert
 
diff --git a/net-irc/ptlink-ircd/ptlink-ircd-6.19.3.ebuild b/net-irc/ptlink-ircd/ptlink-ircd-6.19.3.ebuild
index 82d1b52175b1..acaef1e9f38a 100644
--- a/net-irc/ptlink-ircd/ptlink-ircd-6.19.3.ebuild
+++ b/net-irc/ptlink-ircd/ptlink-ircd-6.19.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ptlink-ircd/ptlink-ircd-6.19.3.ebuild,v 1.1 2005/01/30 12:49:18 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ptlink-ircd/ptlink-ircd-6.19.3.ebuild,v 1.1.1.1 2005/11/30 09:48:52 chriswhite Exp $
 
 inherit eutils ssl-cert
 
diff --git a/net-irc/ptlink-opm/ChangeLog b/net-irc/ptlink-opm/ChangeLog
index af67ba34f756..44cbd5661751 100644
--- a/net-irc/ptlink-opm/ChangeLog
+++ b/net-irc/ptlink-opm/ChangeLog
@@ -1,6 +1,38 @@
 # ChangeLog for net-irc/ptlink-opm
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ptlink-opm/ChangeLog,v 1.1 2004/07/10 22:50:41 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ptlink-opm/ChangeLog,v 1.1.1.1 2005/11/30 09:49:04 chriswhite Exp $
+
+  25 Nov 2004; Sven Wegener <swegener@gentoo.org> -ptlink-opm-1.3.0.ebuild,
+  ptlink-opm-1.3.1.ebuild:
+  There's no need to override path.h because the configure script has options
+  for it.
+
+  25 Nov 2004; Sven Wegener <swegener@gentoo.org> ptlink-opm-1.3.0.ebuild,
+  ptlink-opm-1.3.1.ebuild:
+  Modified to install scan_rules.dconf in /etc/ptlink-opm.
+
+*ptlink-opm-1.3.1 (14 Nov 2004)
+
+  14 Nov 2004; Sven Wegener <swegener@gentoo.org> -ptlink-opm-1.1.1.ebuild,
+  ptlink-opm-1.3.0.ebuild, +ptlink-opm-1.3.1.ebuild:
+  Version bump. Removed old ebuild.
+
+*ptlink-opm-1.3.0 (18 Oct 2004)
+
+  18 Oct 2004; Sven Wegener <swegener@gentoo.org> +ptlink-opm-1.3.0.ebuild:
+  Version bump.
+
+  06 Aug 2004; Sven Wegener <swegener@gentoo.org> ptlink-opm-1.1.1.ebuild:
+  Added sed-4 dependency.
+
+  17 Jul 2004; David Holm <dholm@gentoo.org> ptlink-opm-1.1.1.ebuild:
+  Added to ~ppc.
+
+  11 Jul 2004; Sven Wegener <swegener@gentoo.org> files/ptlink-opm.init.d:
+  Added use ircd to init script.
+
+  11 Jul 2004; Sven Wegener <swegener@gentoo.org> ptlink-opm-1.1.1.ebuild:
+  We need to inherit eutils for enewuser.
 
 *ptlink-opm-1.1.1 (11 Jul 2004)
 
diff --git a/net-irc/ptlink-opm/Manifest b/net-irc/ptlink-opm/Manifest
index 860914d298a5..b46ad4f36854 100644
--- a/net-irc/ptlink-opm/Manifest
+++ b/net-irc/ptlink-opm/Manifest
@@ -1,2 +1,16 @@
-MD5 69ad8b25a6d3e01c30b8856f770eea64 ptlink-opm-1.1.1.ebuild 1746
-MD5 55de0a052638e8efbbcfbd39b00b699b files/digest-ptlink-opm-1.1.1 67
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0e5821c45f1f4efd6b6beabd4927c21f ptlink-opm-1.3.1.ebuild 1321
+MD5 924f4b0e0ae768c35b7887c8124a7c9f ChangeLog 1529
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+MD5 70ece3a2f3634a46cf1f6c6d07791b5f files/digest-ptlink-opm-1.3.1 67
+MD5 1cfbc36b60e8ae51e840e337eae1fe32 files/ptlink-opm.conf.d 283
+MD5 5239c77a2d0978ebdefdda450b1f13dd files/ptlink-opm.init.d 546
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBplLWI1lqEGTUzyQRAgSLAKC3uTDlf38NG+Cr6xfUHdXzQQh9FgCdEBUH
+lWAGfaVNDyDJgc39e/I5QYg=
+=iZ0n
+-----END PGP SIGNATURE-----
diff --git a/net-irc/ptlink-opm/files/ptlink-opm.conf.d b/net-irc/ptlink-opm/files/ptlink-opm.conf.d
index 524ca831f9d8..6dc4023a9775 100644
--- a/net-irc/ptlink-opm/files/ptlink-opm.conf.d
+++ b/net-irc/ptlink-opm/files/ptlink-opm.conf.d
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ptlink-opm/files/ptlink-opm.conf.d,v 1.1 2004/07/10 22:50:41 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ptlink-opm/files/ptlink-opm.conf.d,v 1.1.1.1 2005/11/30 09:49:04 chriswhite Exp $
 
 # User to run ptlink-opm as
 PTLINKOPM_USER="ptlink-opm"
diff --git a/net-irc/ptlink-opm/files/ptlink-opm.init.d b/net-irc/ptlink-opm/files/ptlink-opm.init.d
index 07db385f76fe..3f6eb0fef365 100644
--- a/net-irc/ptlink-opm/files/ptlink-opm.init.d
+++ b/net-irc/ptlink-opm/files/ptlink-opm.init.d
@@ -1,11 +1,11 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ptlink-opm/files/ptlink-opm.init.d,v 1.1 2004/07/10 22:50:41 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ptlink-opm/files/ptlink-opm.init.d,v 1.1.1.1 2005/11/30 09:49:04 chriswhite Exp $
 
 depend() {
 	need net
-	use dns
+	use dns ircd
 }
 
 start() {
diff --git a/net-irc/ptlink-opm/ptlink-opm-1.3.1.ebuild b/net-irc/ptlink-opm/ptlink-opm-1.3.1.ebuild
index 24b5be3b5750..c367f503c95d 100644
--- a/net-irc/ptlink-opm/ptlink-opm-1.3.1.ebuild
+++ b/net-irc/ptlink-opm/ptlink-opm-1.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ptlink-opm/ptlink-opm-1.3.1.ebuild,v 1.1 2004/11/14 15:41:35 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ptlink-opm/ptlink-opm-1.3.1.ebuild,v 1.1.1.1 2005/11/30 09:49:04 chriswhite Exp $
 
 inherit eutils
 
@@ -19,33 +19,23 @@ DEPEND=">=sys-apps/sed-4"
 
 S=${WORKDIR}/${MY_P}
 
-src_unpack() {
-	unpack ${A}
-	sed -i \
-		-e 's:ptopm\.dconf:/etc/ptlink-opm/ptopm.dconf:' \
-		-e 's:ptopm\.log:log/ptopm.log:' \
-		${S}/src/ptopm.c
-}
-
 src_compile() {
-	econf || die "econf failed"
-
-	# Now we're going to override the paths setup by configure
-	echo "#define BINPATH \"/usr/bin\"" > include/path.h
-	echo "#define VARPATH \"/var/lib/ptlink-opm\"" >> include/path.h
-	echo "#define ETCPATH \"/etc\"" >> include/path.h
-
+	econf \
+		--sysconfdir=/etc/ptlink-opm \
+		--localstatedir=/var/lib/ptlink-opm \
+		|| die "econf failed"
 	emake || die "emake failed"
 }
 
 src_install() {
 	newbin src/ptopm ptlink-opm || die "newbin failed"
 
-	keepdir /var/{lib,log}/ptlink-opm || die "keepdir failed"
-	dosym /var/log/ptlink-opm /var/lib/ptlink-opm/log || die "dosym failed"
-
 	insinto /etc/ptlink-opm
 	newins samples/ptopm.dconf.sample ptopm.dconf || die "newins failed"
+	doins samples/scan_rules.dconf || die "doins failed"
+
+	keepdir /var/{lib,log}/ptlink-opm || die "keepdir failed"
+	dosym /var/log/ptlink-opm /var/lib/ptlink-opm/log || die "dosym failed"
 
 	dodoc CHANGES README || die "dodoc failed"
 
diff --git a/net-irc/ptlink-services/ChangeLog b/net-irc/ptlink-services/ChangeLog
index d4fd47cbf749..869c8a5f2850 100644
--- a/net-irc/ptlink-services/ChangeLog
+++ b/net-irc/ptlink-services/ChangeLog
@@ -1,6 +1,41 @@
 # ChangeLog for net-irc/ptlink-services
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ptlink-services/ChangeLog,v 1.1 2004/07/10 23:09:39 swegener Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ptlink-services/ChangeLog,v 1.1.1.1 2005/11/30 09:48:56 chriswhite Exp $
+
+*ptlink-services-2.26.1 (10 Apr 2005)
+
+  10 Apr 2005; Sven Wegener <swegener@gentoo.org>
+  ptlink-services-2.25.1.ebuild, ptlink-services-2.26.ebuild,
+  +ptlink-services-2.26.1.ebuild:
+  Version bump.
+
+*ptlink-services-2.26 (15 Mar 2005)
+
+  15 Mar 2005; Sven Wegener <swegener@gentoo.org>
+  +ptlink-services-2.26.ebuild:
+  Version bump.
+
+  22 Nov 2004; Sven Wegener <swegener@gentoo.org>
+  ptlink-services-2.25.1.ebuild:
+  Fixed MySQL support. Modified to install domain.def. Thanks to Daniel
+  'Fremen' Llewellyn <daniel@mainframe.ath.cx> in bug #71961.
+
+  14 Nov 2004; Sven Wegener <swegener@gentoo.org>
+  -ptlink-services-2.24.1.ebuild:
+  Removed old ebuild.
+
+*ptlink-services-2.25.1 (18 Oct 2004)
+
+  18 Oct 2004; Sven Wegener <swegener@gentoo.org>
+  +ptlink-services-2.25.1.ebuild:
+  Version bump.
+
+  17 Jul 2004; David Holm <dholm@gentoo.org> ptlink-services-2.24.1.ebuild:
+  Added to ~ppc.
+
+  11 Jul 2004; Sven Wegener <swegener@gentoo.org>
+  files/ptlink-services.init.d:
+  Added use ircd to init script.
 
 *ptlink-services-2.24.1 (11 Jul 2004)
 
diff --git a/net-irc/ptlink-services/Manifest b/net-irc/ptlink-services/Manifest
index e4a007da5694..139831971cba 100644
--- a/net-irc/ptlink-services/Manifest
+++ b/net-irc/ptlink-services/Manifest
@@ -1,2 +1,20 @@
-MD5 25aa94d58fd060d68231e2b0200731de ptlink-services-2.24.1.ebuild 418
-MD5 1781889575de92eacb29dd5d2e58cfe1 files/digest-ptlink-services-2.24.1 73
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 50136a9db664198e69ddf08109585c09 ptlink-services-2.26.ebuild 2088
+MD5 dfeb950cb40602e339daed80c97cb892 ptlink-services-2.25.1.ebuild 2086
+MD5 ad72c521d878eae6f40794edf6550303 ptlink-services-2.26.1.ebuild 2164
+MD5 660a21e51c42321117e3370438a32852 ChangeLog 1477
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+MD5 3585e53e707b0ab0a38b56eda84c4fe1 files/digest-ptlink-services-2.25.1 73
+MD5 3c890cb51331ff65716b41079986c9c5 files/digest-ptlink-services-2.26.1 77
+MD5 6292e2ff1036f5e444ff2285313e0303 files/ptlink-services.conf.d 308
+MD5 f4d76c1e161415ae8fc240e81b671a28 files/digest-ptlink-services-2.26 75
+MD5 c6208b2429d4184be4ebc50272f7853a files/ptlink-services.init.d 581
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD4DBQFCWQ9NI1lqEGTUzyQRAi8FAJi+orzoh1Vv+Wea5B6EpQLzPS8YAKDVQTIN
+FqqmFAsTaYuVy8yG8ET4PA==
+=QXuP
+-----END PGP SIGNATURE-----
diff --git a/net-irc/ptlink-services/files/ptlink-services.conf.d b/net-irc/ptlink-services/files/ptlink-services.conf.d
index 9ab7e59508f8..258ce2b5f707 100644
--- a/net-irc/ptlink-services/files/ptlink-services.conf.d
+++ b/net-irc/ptlink-services/files/ptlink-services.conf.d
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ptlink-services/files/ptlink-services.conf.d,v 1.1 2004/07/10 23:09:39 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ptlink-services/files/ptlink-services.conf.d,v 1.1.1.1 2005/11/30 09:48:56 chriswhite Exp $
 
 # User to run ptlink-services as
 PTLINKSERVICES_USER="ptlink-services"
diff --git a/net-irc/ptlink-services/files/ptlink-services.init.d b/net-irc/ptlink-services/files/ptlink-services.init.d
index 63a5a5ca9a96..0e72f77f4ce8 100644
--- a/net-irc/ptlink-services/files/ptlink-services.init.d
+++ b/net-irc/ptlink-services/files/ptlink-services.init.d
@@ -1,11 +1,11 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ptlink-services/files/ptlink-services.init.d,v 1.1 2004/07/10 23:09:39 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ptlink-services/files/ptlink-services.init.d,v 1.1.1.1 2005/11/30 09:48:56 chriswhite Exp $
 
 depend() {
 	need net
-	use dns
+	use dns ircd
 }
 
 start() {
diff --git a/net-irc/ptlink-services/ptlink-services-2.25.1.ebuild b/net-irc/ptlink-services/ptlink-services-2.25.1.ebuild
index db82e38f6d06..f61cfa9a3e21 100644
--- a/net-irc/ptlink-services/ptlink-services-2.25.1.ebuild
+++ b/net-irc/ptlink-services/ptlink-services-2.25.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ptlink-services/ptlink-services-2.25.1.ebuild,v 1.1 2004/10/18 16:20:04 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ptlink-services/ptlink-services-2.25.1.ebuild,v 1.1.1.1 2005/11/30 09:48:56 chriswhite Exp $
 
 inherit fixheadtails eutils
 
@@ -28,7 +28,7 @@ src_unpack() {
 }
 
 src_compile() {
-	econf || die "econf failed"
+	econf $(use_with mysql) || die "econf failed"
 
 	# Now we're going to override the paths setup by configure
 	echo "#define BINPATH \"/usr/bin\"" > include/path.h
@@ -40,30 +40,29 @@ src_compile() {
 }
 
 src_install() {
-	newbin src/services ptlink-services
+	newbin src/services ptlink-services || die "newbin failed"
 
 	keepdir /var/{lib,log}/ptlink-services
 	dosym /var/log/ptlink-services /var/lib/ptlink-services/logs
 
 	insinto /usr/share/ptlink-services/languages
 	for file in src/lang/*.l ; do
-		doins src/lang/$(basename ${file} .l)
-		doins src/lang/$(basename ${file} .l).auth
-		doins src/lang/$(basename ${file} .l).setemail
+		doins \
+			src/lang/$(basename ${file} .l) \
+			src/lang/$(basename ${file} .l).auth \
+			src/lang/$(basename ${file} .l).setemail || die "doins failed"
 	done
 	dosym /usr/share/ptlink-services/languages /var/lib/ptlink-services
 
 	insinto /etc/ptlink-services
-	newins data/example.conf services.conf
-	doins data/create_tables.sql
+	newins data/example.conf services.conf || die "newins failed"
+	doins data/create_tables.sql data/domain.def || die "doins failed"
 
-	dohtml html_manual/*
-	dodoc CHANGES FAQ FEATURES README
+	dohtml html_manual/* || die "dohtml failed"
+	dodoc CHANGES FAQ FEATURES README || die "dodoc failed"
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/ptlink-services.init.d ptlink-services
-	insinto /etc/conf.d
-	newins ${FILESDIR}/ptlink-services.conf.d ptlink-services
+	newinitd ${FILESDIR}/ptlink-services.init.d ptlink-services
+	newconfd ${FILESDIR}/ptlink-services.conf.d ptlink-services
 }
 
 pkg_postinst() {
diff --git a/net-irc/ptlink-services/ptlink-services-2.26.1.ebuild b/net-irc/ptlink-services/ptlink-services-2.26.1.ebuild
index 24fdd5e9c3f7..a2b1a76199cc 100644
--- a/net-irc/ptlink-services/ptlink-services-2.26.1.ebuild
+++ b/net-irc/ptlink-services/ptlink-services-2.26.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ptlink-services/ptlink-services-2.26.1.ebuild,v 1.1 2005/04/10 11:34:20 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ptlink-services/ptlink-services-2.26.1.ebuild,v 1.1.1.1 2005/11/30 09:48:56 chriswhite Exp $
 
 inherit fixheadtails eutils versionator
 
diff --git a/net-irc/ptlink-services/ptlink-services-2.26.ebuild b/net-irc/ptlink-services/ptlink-services-2.26.ebuild
index 031b87583b56..f1f293fbd92d 100644
--- a/net-irc/ptlink-services/ptlink-services-2.26.ebuild
+++ b/net-irc/ptlink-services/ptlink-services-2.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ptlink-services/ptlink-services-2.26.ebuild,v 1.1 2005/03/15 00:20:54 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ptlink-services/ptlink-services-2.26.ebuild,v 1.1.1.1 2005/11/30 09:48:56 chriswhite Exp $
 
 inherit fixheadtails eutils
 
@@ -47,9 +47,10 @@ src_install() {
 
 	insinto /usr/share/ptlink-services/languages
 	for file in src/lang/*.l ; do
-		doins src/lang/$(basename ${file} .l) || die "doins failed"
-		doins src/lang/$(basename ${file} .l).auth || die "doins failed"
-		doins src/lang/$(basename ${file} .l).setemail || die "doins failed"
+		doins \
+			src/lang/$(basename ${file} .l) \
+			src/lang/$(basename ${file} .l).auth \
+			src/lang/$(basename ${file} .l).setemail || die "doins failed"
 	done
 	dosym /usr/share/ptlink-services/languages /var/lib/ptlink-services
 
diff --git a/net-irc/quirc/ChangeLog b/net-irc/quirc/ChangeLog
index 82c58aa1fb0e..cabdc732b9fe 100644
--- a/net-irc/quirc/ChangeLog
+++ b/net-irc/quirc/ChangeLog
@@ -1,10 +1,50 @@
 # ChangeLog for net-irc/quirc
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quirc/ChangeLog,v 1.1 2002/04/25 20:40:20 seemant Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quirc/ChangeLog,v 1.1.1.1 2005/11/30 09:48:52 chriswhite Exp $
+
+  13 Nov 2004; Sven Wegener <swegener@gentoo.org>
+  -files/0.9.83-r1-gentoo.diff, -quirc-0.9.83-r1.ebuild,
+  quirc-0.9.84.ebuild:
+  Marked stable on x86. Removed old ebuild.
+
+  12 Sep 2004; Sven Wegener <swegener@gentoo.org> quirc-0.9.84.ebuild:
+  Accidently dropped one keyword, re-added it.
+
+*quirc-0.9.84 (01 Sep 2004)
+
+  01 Sep 2004; Sven Wegener <swegener@gentoo.org> -files/0.9.83-gentoo.diff,
+  -quirc-0.9.82.ebuild, quirc-0.9.83-r1.ebuild, -quirc-0.9.83.ebuild,
+  +quirc-0.9.84.ebuild:
+  Version bump. Fixes bug #62350. Removed old ebuilds and updated dependencies.
+
+  19 Jun 2004; Sven Wegener <swegener@gentoo.org> quirc-0.9.82.ebuild,
+  quirc-0.9.83-r1.ebuild, quirc-0.9.83.ebuild:
+  Added IUSE=""
+
+  18 Jun 2004; Sven Wegener <swegener@gentoo.org> quirc-0.9.82.ebuild,
+  quirc-0.9.83-r1.ebuild, quirc-0.9.83.ebuild:
+  Removed S=${WORKDIR}/${P}, use epatch, added inherit eutils and updated
+  Copyright years.
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  quirc-0.9.83-r1.ebuild:
+  Masked quirc-0.9.83-r1.ebuild testing for ppc
+
+*quirc-0.9.83-r1 (06 Nov 2002)
+
+  06 Nov 2002; Nick Hadaway <raker@gentoo.org> quirc-0.9.83-r1.ebuild,
+  files/digest-quirc-0.9.83-r1, files/0.9.83-r1-gentoo.diff :
+  Improved patch based on suggestions by Jay Nation.
+
+*quirc-0.9.83 (21 Oct 2002)
+
+  21 Oct 20002; Nick Hadaway <raker@gentoo.org> quirc-0.9.83.ebuild,
+  files/digest-quirc-0.9.83, files/0.9.83-gentoo.diff :
+  Version bump to fix some minor bugs.  Added a diff to fix c++ code.
+  Currently marked unstable.  See bug #9303
 
 *quirc-0.9.82 (25 Apr 2002)
 
   25 Apr 2002; Semant Kulleen <seemant@gentoo.org> quirc-0.9.82.ebuild
   files/digest-quirc-0.9.82
-
   New package added to portage.
diff --git a/net-irc/quirc/Manifest b/net-irc/quirc/Manifest
index e69de29bb2d1..017b31f7a0da 100644
--- a/net-irc/quirc/Manifest
+++ b/net-irc/quirc/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1a412f24a86d69591d0c3959163a105d ChangeLog 1906
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+MD5 e199213b15a2ca3a070c390f59ff33b1 quirc-0.9.84.ebuild 1054
+MD5 fed44d930ac667edf7467fcf51e31f64 files/digest-quirc-0.9.84 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBlVPuI1lqEGTUzyQRAum+AKCcqX2/7G7Z22yNZEBe9Wm/N9IO/QCfdbWr
+vqRRetAn9lyxrAtleSnoUdE=
+=OB6R
+-----END PGP SIGNATURE-----
diff --git a/net-irc/quirc/quirc-0.9.84.ebuild b/net-irc/quirc/quirc-0.9.84.ebuild
index 960115d0464d..aed702369da8 100644
--- a/net-irc/quirc/quirc-0.9.84.ebuild
+++ b/net-irc/quirc/quirc-0.9.84.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quirc/quirc-0.9.84.ebuild,v 1.1 2004/09/01 02:35:17 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quirc/quirc-0.9.84.ebuild,v 1.1.1.1 2005/11/30 09:48:52 chriswhite Exp $
 
 DESCRIPTION="A GUI IRC client scriptable in Tcl/Tk"
 SRC_URI="http://quirc.org/${P}.tar.gz"
@@ -11,12 +11,10 @@ DEPEND="dev-lang/tcl
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
 IUSE=""
 
 src_compile() {
-	export CXX="g++"
-
 	econf \
 		--datadir=/usr/share/quirc \
 		|| die "econf failed"
@@ -25,17 +23,19 @@ src_compile() {
 }
 
 src_install () {
-	dodbin quirc
+	dobin quirc || die "dobin failed"
 
 	insinto /usr/share/quirc
-	doins data/*.tcl data/quedit data/fontsel data/servers data/VERSION
+	doins data/*.tcl data/quedit data/fontsel data/servers data/VERSION \
+		|| die "doins failed"
 
 	insinto /usr/share/quirc/common
-	doins ${S}/data/common/*.tcl
+	doins ${S}/data/common/*.tcl || die "doins failed"
 
 	insinto /usr/share/quirc/themes
-	doins ${S}/data/themes/*.tcl
+	doins ${S}/data/themes/*.tcl || die "doins failed"
 
 	# this package installs docs, but we would rather do that ourselves
-	dodoc README NEWS INSTALL FAQ ChangeLog* COPYING AUTHORS doc/*.txt
+	dodoc README NEWS INSTALL FAQ ChangeLog* COPYING AUTHORS doc/*.txt \
+		|| die "dodoc failed"
 }
diff --git a/net-irc/rbot/ChangeLog b/net-irc/rbot/ChangeLog
index 3a5582d0d0e9..21fe78eb48db 100644
--- a/net-irc/rbot/ChangeLog
+++ b/net-irc/rbot/ChangeLog
@@ -1,6 +1,43 @@
 # ChangeLog for net-irc/rbot
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/rbot/ChangeLog,v 1.1 2003/10/05 20:43:39 zul Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/rbot/ChangeLog,v 1.1.1.1 2005/11/30 09:48:57 chriswhite Exp $
+
+  06 Oct 2005; Caleb Tennis <caleb@gentoo.org> rbot-0.9.7.ebuild:
+  Change dep to ruby 1.8
+
+  17 Sep 2005; Sven Wegener <swegener@gentoo.org> rbot-0.9.7.ebuild:
+  Only install html API documentation with USE=doc
+
+  07 Jul 2005; Sven Wegener <swegener@gentoo.org> -rbot-0.9.6.ebuild:
+  Removed old ebuild.
+
+  03 May 2005; Sven Wegener <swegener@gentoo.org> rbot-0.9.6.ebuild,
+  rbot-0.9.7.ebuild:
+  Adjusted dependencies to not pull in dev-ruby/rexml. Instead we depend (by
+  default) on >=virtual/ruby-1.8 that already includes rexml, but the
+  combination of =virtual/ruby-1.6* with dev-ruby/shim-ruby18 or
+  dev-ruby/rexml is also fine. Closes bug #89164.
+
+  22 Apr 2005; Sven Wegener <swegener@gentoo.org> rbot-0.9.7.ebuild:
+  Marked stable on x86.
+
+  18 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> rbot-0.9.7.ebuild:
+  added ~amd64 to KEYWORDS, fixes #89165
+
+  10 Oct 2004; Jason Wever <weeve@gentoo.org> rbot-0.9.7.ebuild:
+  Added ~sparc keyword.
+
+*rbot-0.9.7 (17 Jul 2004)
+
+  17 Jul 2004; Sven Wegener <swegener@gentoo.org> rbot-0.9.6.ebuild,
+  +rbot-0.9.7.ebuild:
+  Version bump. Marked 0.9.6 stable on x86.
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> rbot-0.9.6.ebuild:
+  Masked rbot-0.9.6.ebuild testing for ppc
+
+  12 Apr 2004; Mamoru KOMACHI <usata@gentoo.org> rbot-0.9.6.ebuild:
+  virtual/ruby fix
 
 *rbot-0.9.6 (05 Oct 2003)
 
diff --git a/net-irc/rbot/Manifest b/net-irc/rbot/Manifest
index 78b530ccaf47..48d5a8f5feeb 100644
--- a/net-irc/rbot/Manifest
+++ b/net-irc/rbot/Manifest
@@ -1,2 +1,4 @@
-MD5 8df6f706e6467570119b82ff7cdd043e rbot-0.9.6.ebuild 908
-MD5 53971baa1052d065a78ed3a35daedd0b files/digest-rbot-0.9.6 62
+MD5 8576e264b3174f29f0c2fbf51dd31a2c ChangeLog 1684
+MD5 b54404b694144667970666b4bcdaf706 files/digest-rbot-0.9.7 62
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+MD5 65a37925c459ef399040d69ccac32b97 rbot-0.9.7.ebuild 1062
diff --git a/net-irc/rbot/rbot-0.9.7.ebuild b/net-irc/rbot/rbot-0.9.7.ebuild
index 7c539f02f3cd..38da46957f6f 100644
--- a/net-irc/rbot/rbot-0.9.7.ebuild
+++ b/net-irc/rbot/rbot-0.9.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/rbot/rbot-0.9.7.ebuild,v 1.1 2004/07/17 14:32:32 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/rbot/rbot-0.9.7.ebuild,v 1.1.1.1 2005/11/30 09:48:57 chriswhite Exp $
 
 DESCRIPTION="rbot is a ruby IRC bot"
 HOMEPAGE="http://www.linuxbrit.co.uk/rbot/"
@@ -8,36 +8,34 @@ SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE="spell"
+KEYWORDS="x86 ~ppc ~sparc ~amd64"
+IUSE="doc spell"
 
-RDEPEND="virtual/ruby
+RDEPEND=">=virtual/ruby-1.8
 	dev-ruby/ruby-bdb
-	dev-ruby/rexml
 	spell? ( app-text/ispell )"
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
 
 	sed -i -e s:rbotconf:/etc/rbot: ${S}/rbot.rb || die "sed failed"
 }
 
 src_install() {
-	local SITERUBY=$(ruby -r rbconfig -e 'print Config::CONFIG["sitelibdir"]')
+	local SITERUBY="$(ruby -r rbconfig -e 'print Config::CONFIG["sitelibdir"]')"
 
-	newbin rbot.rb rbot
+	newbin rbot.rb rbot || die "newbin failed"
 
-	dodir ${SITERUBY}
-	cp -a rbot ${D}/${SITERUBY} || die
+	insinto "${SITERUBY}"
+	doins -r rbot || die "doins failed"
 
-	dodir /etc/rbot
-	cp -r rbotconf/* ${D}/etc/rbot || die
+	insinto /etc/rbot
+	doins rbotconf/* || die "doins failed"
 
 	dodoc AUTHORS ChangeLog INSTALL REQUIREMENTS TODO
-	dohtml -r doc/*
+	use doc && dohtml -r doc/*
 }
 
 pkg_postinst() {
diff --git a/net-irc/rhapsody/ChangeLog b/net-irc/rhapsody/ChangeLog
index 4d0759c22e43..790ffb471527 100644
--- a/net-irc/rhapsody/ChangeLog
+++ b/net-irc/rhapsody/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for net-irc/rhapsody
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/rhapsody/ChangeLog,v 1.1 2005/03/16 18:45:23 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/rhapsody/ChangeLog,v 1.1.1.1 2005/11/30 09:48:57 chriswhite Exp $
+
+*rhapsody-0.26b (27 Aug 2005)
+
+  27 Aug 2005; Sven Wegener <swegener@gentoo.org> +rhapsody-0.26b.ebuild:
+  Version bump.
+
+  24 Aug 2005; Olivier Crête <tester@gentoo.org> rhapsody-0.25b.ebuild:
+  Marked ~amd64, thanks to Jim Laflin for testing
+
+  05 Jul 2005; Sven Wegener <swegener@gentoo.org> rhapsody-0.25b.ebuild:
+  Marked stable on x86.
+
+*rhapsody-0.25b (25 May 2005)
+
+  25 May 2005; Sven Wegener <swegener@gentoo.org> -rhapsody-0.24b.ebuild,
+  +rhapsody-0.25b.ebuild:
+  Version bump.
 
 *rhapsody-0.24b (16 Mar 2005)
 
diff --git a/net-irc/rhapsody/Manifest b/net-irc/rhapsody/Manifest
index a5e14c307fb1..8794f1b7ca99 100644
--- a/net-irc/rhapsody/Manifest
+++ b/net-irc/rhapsody/Manifest
@@ -1,2 +1,16 @@
-MD5 7bed8bb45c495c5ca456d776a0eb341a rhapsody-0.24b.ebuild 520
-MD5 996627b6aab99379e2a240f5d035b108 files/digest-rhapsody-0.24b 62
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 45d533c9dbd4bc0cd2c9f46d2702f241 ChangeLog 925
+MD5 3a2b468779604a1a628024050d312e27 files/digest-rhapsody-0.25b 63
+MD5 151e1d318392d5b6e0e4430c6c6c5493 files/digest-rhapsody-0.26b 63
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+MD5 0f3345922570734ce2dd9264ebf8241c rhapsody-0.25b.ebuild 827
+MD5 ce080146e62e0b0e11f0ea48c96daad0 rhapsody-0.26b.ebuild 830
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDD83NI1lqEGTUzyQRAqARAKCHu9B1i9ZYb+/a/PVq/yDrA79N1gCeMp84
+ukYzXtexUJsWp1UeaCdlTok=
+=NiY0
+-----END PGP SIGNATURE-----
diff --git a/net-irc/rhapsody/rhapsody-0.25b.ebuild b/net-irc/rhapsody/rhapsody-0.25b.ebuild
index 0bff34f4eb5e..00f06bcafa07 100644
--- a/net-irc/rhapsody/rhapsody-0.25b.ebuild
+++ b/net-irc/rhapsody/rhapsody-0.25b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/rhapsody/rhapsody-0.25b.ebuild,v 1.1 2005/05/25 18:13:31 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/rhapsody/rhapsody-0.25b.ebuild,v 1.1.1.1 2005/11/30 09:48:57 chriswhite Exp $
 
 inherit toolchain-funcs
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 DEPEND=">=sys-libs/ncurses-5.0"
@@ -22,7 +22,9 @@ src_compile() {
 
 src_install() {
 	dobin rhapsody || die "dobin failed"
+
 	insinto /usr/share/rhapsody/help
 	doins help/*.hlp || die "doins failed"
+
 	dodoc docs/CHANGELOG || die "dodoc failed"
 }
diff --git a/net-irc/rhapsody/rhapsody-0.26b.ebuild b/net-irc/rhapsody/rhapsody-0.26b.ebuild
index 13218522bd93..7ce82b3caca2 100644
--- a/net-irc/rhapsody/rhapsody-0.26b.ebuild
+++ b/net-irc/rhapsody/rhapsody-0.26b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/rhapsody/rhapsody-0.26b.ebuild,v 1.1 2005/08/27 02:19:42 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/rhapsody/rhapsody-0.26b.ebuild,v 1.1.1.1 2005/11/30 09:48:57 chriswhite Exp $
 
 inherit toolchain-funcs
 
diff --git a/net-irc/savirc/ChangeLog b/net-irc/savirc/ChangeLog
index 9ef8a6983401..40afe56a3d14 100644
--- a/net-irc/savirc/ChangeLog
+++ b/net-irc/savirc/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-irc/savirc
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/savirc/ChangeLog,v 1.1 2004/09/27 00:59:49 swegener Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/savirc/ChangeLog,v 1.1.1.1 2005/11/30 09:49:04 chriswhite Exp $
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> savirc-1.99.ebuild:
+  Stable on ppc.
+
+  17 Feb 2005; Sven Wegener <swegener@gentoo.org> savirc-1.99.ebuild:
+  Changed tarball from .gz to .bz2.
+
+  13 Nov 2004; Sven Wegener <swegener@gentoo.org> savirc-1.99.ebuild:
+  Marked stable on x86.
+
+  17 Oct 2004; David Holm <dholm@gentoo.org> savirc-1.99.ebuild:
+  Added to ~ppc.
 
 *savirc-1.99 (27 Sep 2004)
 
diff --git a/net-irc/savirc/Manifest b/net-irc/savirc/Manifest
index e9278f7795b2..f933440c7e98 100644
--- a/net-irc/savirc/Manifest
+++ b/net-irc/savirc/Manifest
@@ -1,2 +1,4 @@
-MD5 24bed8a42b4a46e8e9b9874f37ffc812 savirc-1.99.ebuild 515
-MD5 8e574f5b3c6cf4c43645647f58c23ea1 files/digest-savirc-1.99 63
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+MD5 5b90d693b0c0b84b72aefa7ea7ff8f9a ChangeLog 786
+MD5 d398563819d9b6f5ee75569421ed3882 savirc-1.99.ebuild 604
+MD5 fce718870194389baf6714aa25440fbf files/digest-savirc-1.99 64
diff --git a/net-irc/savirc/files/digest-savirc-1.99 b/net-irc/savirc/files/digest-savirc-1.99
index 364a0832a668..9e866fc5819c 100644
--- a/net-irc/savirc/files/digest-savirc-1.99
+++ b/net-irc/savirc/files/digest-savirc-1.99
@@ -1 +1 @@
-MD5 00e32ccffd083feafa97b36efad7f7ac savirc-1.99.tar.gz 285209
+MD5 250217154afa9e04497e328ec17fd1ed savirc-1.99.tar.bz2 260625
diff --git a/net-irc/savirc/savirc-1.99.ebuild b/net-irc/savirc/savirc-1.99.ebuild
index 5f709184410e..73ec4678d066 100644
--- a/net-irc/savirc/savirc-1.99.ebuild
+++ b/net-irc/savirc/savirc-1.99.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/savirc/savirc-1.99.ebuild,v 1.1 2004/09/27 00:59:49 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/savirc/savirc-1.99.ebuild,v 1.1.1.1 2005/11/30 09:49:04 chriswhite Exp $
 
 DESCRIPTION="User friendly IRC client with unicode support and tcl/tk scripting"
-SRC_URI="http://www.savirc.com/Downloads/savirc-Lin/${P}.tar.gz"
+SRC_URI="http://www.savirc.com/Downloads/savirc-Lin/${P}.tar.bz2"
 HOMEPAGE="http://www.savirc.com/"
 
-KEYWORDS="~x86"
+KEYWORDS="ppc x86"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
diff --git a/net-irc/scrollz/ChangeLog b/net-irc/scrollz/ChangeLog
index a1a3fe423fa3..41bc286b2502 100644
--- a/net-irc/scrollz/ChangeLog
+++ b/net-irc/scrollz/ChangeLog
@@ -1,11 +1,85 @@
 # ChangeLog for net-irc/scrollz
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/scrollz/ChangeLog,v 1.1 2002/12/11 16:39:24 phoenix Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/scrollz/ChangeLog,v 1.1.1.1 2005/11/30 09:48:54 chriswhite Exp $
+
+  02 Sep 2005; Fabian Groffen <grobian@gentoo.org>
+  +files/scrollz-1.9.5-gcc4.patch, scrollz-1.9.5.ebuild:
+  Adding a GCC4 compilation patch and marking ~ppc-macos (bug #90165)
+
+  27 Aug 2005; Sven Wegener <swegener@gentoo.org> -scrollz-1.9.ebuild:
+  Remmove old ebuild.
+
+  24 Aug 2005; Aron Griffis <agriffis@gentoo.org> scrollz-1.9.5.ebuild:
+  stable on ia64
+
+  18 Aug 2005; Sven Wegener <swegener@gentoo.org> -scrollz-1.9.3.ebuild,
+  -scrollz-1.9.4-r1.ebuild:
+  Removed old ebuilds.
+
+  15 Aug 2005; Luis Medinas <metalgod@gentoo.org> scrollz-1.9.5.ebuild:
+  Marked Stable on AMD64.
+
+  05 Jul 2005; Sven Wegener <swegener@gentoo.org> scrollz-1.9.5.ebuild:
+  Marked stable on x86.
+
+*scrollz-1.9.5 (14 May 2005)
+
+  14 May 2005; Sven Wegener <swegener@gentoo.org> +scrollz-1.9.5.ebuild:
+  Version bump, bug #92618.
+
+  07 Apr 2005; Simon Stelling <blubb@gentoo.org> scrollz-1.9.4-r1.ebuild:
+  stable on amd64
+
+  17 Feb 2005; Sven Wegener <swegener@gentoo.org> scrollz-1.9.4-r1.ebuild:
+  Marked stable on x86.
+
+*scrollz-1.9.4-r1 (01 Jan 2005)
+
+  01 Jan 2005; Sven Wegener <swegener@gentoo.org> +scrollz-1.9.4-r1.ebuild,
+  -scrollz-1.9.4.ebuild:
+  Revision bump. The old 1.9.4 was a beta release, this -r1 is the real 1.9.4
+  release.
+
+*scrollz-1.9.4 (13 Nov 2004)
+
+  13 Nov 2004; Sven Wegener <swegener@gentoo.org> +scrollz-1.9.4.ebuild:
+  Version bump.
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> scrollz-1.9.3.ebuild:
+  Stable on amd64.
+
+  17 Jul 2004; Sven Wegener <swegener@gentoo.org> scrollz-1.9.3.ebuild:
+  Marked stable on x86.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> scrollz-1.9.3.ebuild,
+  scrollz-1.9.ebuild:
+  virtual/glibc -> virtual/libc
+
+*scrollz-1.9.3 (20 Jun 2004)
+
+  20 Jun 2004; Sven Wegener <swegener@gentoo.org> +scrollz-1.9.3.ebuild:
+  Version bump.
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> scrollz-1.9.ebuild:
+  Masked scrollz-1.9.ebuild testing for ppc
+
+  16 Dec 2003; Chuck Short <zul@gentoo.org> scrollz-1.9.ebuild:
+  Marked stable for amd64 and ia64.
+
+  18 Oct 2003; Chuck Short <zul@gentoo.org> scrollz-1.9.ebuild:
+  Added ~amd64 to keywords.
+
+  05 Oct 2003; Chuck Short <zul@gentoo.org> scrollz-1.9.ebuild:
+  Added ~ia64 to keywords.
+
+*scrollz-1.9 (29 Jun 2003)
+
+  29 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump for Manel Miravalls Joan <manelmiravalls@hotmail.com>.
 
 *scrollz-1.8m (11 Dec 2002)
 
   11 Dec 2002; phoen][x <phoenix@gentoo.org> scrollz-1.8m.ebuild, 
   files/digest-scrollz-1.8m:
   Initial import.  Ebuild submitted by Cory Visi <cory@visi.name>.
-  Thanks for the contribution. This closes bug 9808. 
-k
+  Thanks for the contribution. This closes bug 9808.
diff --git a/net-irc/scrollz/Manifest b/net-irc/scrollz/Manifest
index e69de29bb2d1..460dfee8983c 100644
--- a/net-irc/scrollz/Manifest
+++ b/net-irc/scrollz/Manifest
@@ -0,0 +1,5 @@
+MD5 5c3b9a13b489d533cb39ae07754f9593 scrollz-1.9.5.ebuild 1146
+MD5 bedba1a9033a40bf64b11b529ea3bba9 ChangeLog 2808
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+MD5 20e8698cbd256ce79b493107ca25feca files/digest-scrollz-1.9.5 65
+MD5 7a16999fdfb8da867520ddf7016d8887 files/scrollz-1.9.5-gcc4.patch 758
diff --git a/net-irc/scrollz/scrollz-1.9.5.ebuild b/net-irc/scrollz/scrollz-1.9.5.ebuild
index a7d86660672a..deb066c98719 100644
--- a/net-irc/scrollz/scrollz-1.9.5.ebuild
+++ b/net-irc/scrollz/scrollz-1.9.5.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/scrollz/scrollz-1.9.5.ebuild,v 1.1 2005/05/14 17:50:56 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/scrollz/scrollz-1.9.5.ebuild,v 1.1.1.1 2005/11/30 09:48:54 chriswhite Exp $
+
+inherit eutils
 
 MY_P=ScrollZ-${PV}
 
@@ -10,13 +12,19 @@ HOMEPAGE="http://www.scrollz.com/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ia64 ~amd64 ~ppc"
+KEYWORDS="amd64 ia64 ~ppc ~ppc-macos x86"
 IUSE="ipv6 socks5 ssl"
 
 DEPEND="virtual/libc
 	ssl? ( dev-libs/openssl )"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}"/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	# Darwin/OSX has GCC4 and needs this
+	epatch ${FILESDIR}/${P}-gcc4.patch
+}
 
 src_compile() {
 	econf \
@@ -31,8 +39,8 @@ src_compile() {
 src_install() {
 	dodir /usr/share/man/man1
 	einstall \
-		sharedir=${D}/usr/share \
-		mandir=${D}/usr/share/man/man1 \
+		sharedir="${D}"/usr/share \
+		mandir="${D}"/usr/share/man/man1 \
 		install \
 		|| die "einstall failed"
 	dodoc ChangeLog* README* || die "dodoc failed"
diff --git a/net-irc/srvx/ChangeLog b/net-irc/srvx/ChangeLog
index 0dc55af2793c..c5c6c43a169a 100644
--- a/net-irc/srvx/ChangeLog
+++ b/net-irc/srvx/ChangeLog
@@ -1,6 +1,40 @@
 # ChangeLog for net-irc/srvx
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/srvx/ChangeLog,v 1.1 2004/12/16 01:16:32 swegener Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/srvx/ChangeLog,v 1.1.1.1 2005/11/30 09:48:57 chriswhite Exp $
+
+  23 Aug 2005; Sven Wegener <swegener@gentoo.org> srvx-1.3.0.2005_p9.ebuild:
+  Change shell from /bin/false to -1 for bug #103421.
+
+  17 Feb 2005; Sven Wegener <swegener@gentoo.org>
+  -srvx-1.3.0.2005_p6.ebuild, -srvx-1.3_p84.ebuild:
+  Removed old ebuilds.
+
+*srvx-1.3.0.2005_p9 (30 Jan 2005)
+
+  30 Jan 2005; Sven Wegener <swegener@gentoo.org>
+  +srvx-1.3.0.2005_p9.ebuild:
+  Version bump, bug #79553.
+
+*srvx-1.3.0.2005_p6 (23 Jan 2005)
+
+  23 Jan 2005; Sven Wegener <swegener@gentoo.org>
+  -srvx-1.3.0.2005_p2.ebuild, +srvx-1.3.0.2005_p6.ebuild:
+  Version bump, bug #79221.
+
+*srvx-1.3.0.2005_p2 (07 Jan 2005)
+
+  07 Jan 2005; Sven Wegener <swegener@gentoo.org>
+  +srvx-1.3.0.2005_p2.ebuild:
+  Version bump, bug #76704.
+
+  21 Dec 2004; Sven Wegener <swegener@gentoo.org> srvx-1.3_p84.ebuild:
+  Added additional SRC_URI location.
+
+*srvx-1.3_p84 (16 Dec 2004)
+
+  16 Dec 2004; Sven Wegener <swegener@gentoo.org> -srvx-1.3_p81.ebuild,
+  +srvx-1.3_p84.ebuild:
+  Version bump. Closes bug #74599.
 
 *srvx-1.3_p81 (16 Dec 2004)
 
diff --git a/net-irc/srvx/Manifest b/net-irc/srvx/Manifest
index 6e98951767d0..d5080aa87c4f 100644
--- a/net-irc/srvx/Manifest
+++ b/net-irc/srvx/Manifest
@@ -1,4 +1,16 @@
-MD5 7736e83c68b551c9d41b3e074b06061d srvx-1.3_p81.ebuild 1607
-MD5 0d582b44bab205a00d62c782262f4ae9 files/srvx.conf.d 258
-MD5 de211fe696c2a2dbecfb4da5a78d1868 files/srvx.init.d 463
-MD5 5f7549515b6dc034cf12895a20d7214f files/digest-srvx-1.3_p81 65
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 37dda3b945e431bb552ff4a4520b8140 ChangeLog 1383
+MD5 c080346a3c81d359b1f73630f9e2faa0 files/digest-srvx-1.3.0.2005_p9 71
+MD5 87389b529c1211f35ea5953858755262 files/srvx.conf.d 282
+MD5 9e5ed894ae56b7b15fe1b8e98397fd07 files/srvx.init.d 551
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+MD5 8799d61e1776abee4279e465c31950fb srvx-1.3.0.2005_p9.ebuild 2378
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDCx+4I1lqEGTUzyQRArNhAKDZxIZ1p5zP0AaihWrHkzxKGfTsQwCghXgH
+9AQNVgU2VfBX12CuWjm29PU=
+=C2BO
+-----END PGP SIGNATURE-----
diff --git a/net-irc/srvx/files/srvx.conf.d b/net-irc/srvx/files/srvx.conf.d
index 86e4968b6634..34e11019df82 100644
--- a/net-irc/srvx/files/srvx.conf.d
+++ b/net-irc/srvx/files/srvx.conf.d
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/srvx/files/srvx.conf.d,v 1.1 2004/12/16 01:16:32 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/srvx/files/srvx.conf.d,v 1.1.1.1 2005/11/30 09:48:57 chriswhite Exp $
 
 # user and group to run srvx as
 SRVX_USER="srvx"
diff --git a/net-irc/srvx/files/srvx.init.d b/net-irc/srvx/files/srvx.init.d
index d267536e3467..14a012448ef5 100644
--- a/net-irc/srvx/files/srvx.init.d
+++ b/net-irc/srvx/files/srvx.init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/srvx/files/srvx.init.d,v 1.1 2004/12/16 01:16:32 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/srvx/files/srvx.init.d,v 1.1.1.1 2005/11/30 09:48:57 chriswhite Exp $
 
 depend() {
 	use dns net
diff --git a/net-irc/srvx/srvx-1.3.0.2005_p9.ebuild b/net-irc/srvx/srvx-1.3.0.2005_p9.ebuild
index 07e8e08c9a75..efec622eb8aa 100644
--- a/net-irc/srvx/srvx-1.3.0.2005_p9.ebuild
+++ b/net-irc/srvx/srvx-1.3.0.2005_p9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/srvx/srvx-1.3.0.2005_p9.ebuild,v 1.1 2005/01/30 13:31:46 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/srvx/srvx-1.3.0.2005_p9.ebuild,v 1.1.1.1 2005/11/30 09:48:57 chriswhite Exp $
 
 inherit eutils
 
@@ -21,7 +21,7 @@ DEPEND=">=sys-devel/automake-1.8
 	>=sys-devel/autoconf-2.59"
 RDEPEND=""
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}"/${MY_P}
 
 src_compile() {
 	local PROTOCOL="p10" MALLOC="system" DEBUG=""
@@ -65,16 +65,16 @@ src_install() {
 		docs/{access-levels,cookies,helpserv,ircd-modes}.txt \
 		|| die "dodoc failed"
 
-	newinitd ${FILESDIR}/srvx.init.d srvx || die "newinitd failed"
-	newconfd ${FILESDIR}/srvx.conf.d srvx || die "newconfd failed"
+	newinitd "${FILESDIR}"/srvx.init.d srvx || die "newinitd failed"
+	newconfd "${FILESDIR}"/srvx.conf.d srvx || die "newconfd failed"
 }
 
 pkg_setup() {
 	enewgroup srvx
-	enewuser srvx -1 /bin/false /var/lib/srvx srvx
+	enewuser srvx -1 -1 /var/lib/srvx srvx
 }
 
 pkg_postinst() {
-	chown -R srvx:srvx ${ROOT}/etc/srvx ${ROOT}/var/lib/srvx
-	chmod 0700 ${ROOT}/etc/srvx ${ROOT}/var/lib/srvx
+	chown -R srvx:srvx "${ROOT}"/etc/srvx "${ROOT}"/var/lib/srvx
+	chmod 0700 "${ROOT}"/etc/srvx "${ROOT}"/var/lib/srvx
 }
diff --git a/net-irc/supybot/ChangeLog b/net-irc/supybot/ChangeLog
index 32276b4f06ef..cd14f354d2ba 100644
--- a/net-irc/supybot/ChangeLog
+++ b/net-irc/supybot/ChangeLog
@@ -1,6 +1,60 @@
 # ChangeLog for net-irc/supybot
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/supybot/ChangeLog,v 1.1 2004/02/28 21:50:03 liquidx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/supybot/ChangeLog,v 1.1.1.1 2005/11/30 09:49:01 chriswhite Exp $
+
+*supybot-0.83.1 (05 Nov 2005)
+
+  05 Nov 2005; Alastair Tse <liquidx@gentoo.org> supybot-0.83.0_rc3.ebuild,
+  +supybot-0.83.1.ebuild:
+  version bump. modified sqlite dep to =dev-python/pysqlite-1\* (#99567)
+
+*supybot-0.83.0_rc3 (25 Jun 2005)
+
+  25 Jun 2005; Alastair Tse <liquidx@gentoo.org> -supybot-0.77.0.ebuild,
+  -supybot-0.80.0_pre2.ebuild, supybot-0.80.1.ebuild,
+  +supybot-0.83.0_rc3.ebuild:
+  version bump (#95186)
+
+  29 May 2005; Sven Wegener <swegener@gentoo.org>
+  -files/supybot-0.77.2-cvsadditions-2004-06-10.patch,
+  supybot-0.77.2.ebuild:
+  Moved large patch from files/ to mirrors.
+
+*supybot-0.80.1 (04 Feb 2005)
+
+  04 Feb 2005; Fernando Serboncini <fserb@gentoo.org>
+  +supybot-0.80.1.ebuild:
+  Version bump
+
+*supybot-0.80.0_pre2 (26 Oct 2004)
+
+  26 Oct 2004; Alastair Tse <liquidx@gentoo.org> supybot-0.77.0.ebuild,
+  supybot-0.77.2.ebuild, +supybot-0.80.0_pre2.ebuild:
+  made sqlite optional (#62236), version bump (#62101)
+
+  10 Sep 2004; Hasan Khalil <gongloo@gentoo.org> supybot-0.77.2.ebuild:
+  Stable macos.
+
+  29 Jun 2004; Sven Wegener <swegener@gentoo.org>
+  files/supybot-0.77.2-cvsadditions-2004-06-10.patch:
+  Cleared up the CRLF vs. LF mess in the CVS patch.
+
+  28 Jun 2004; Alastair Tse <liquidx@gentoo.org>
+  files/supybot-0.77.2-cvsadditions-2004-06-10.patch:
+  sanitize patch so it doesn't get mangled by cvs (#55319)
+
+*supybot-0.77.2 (26 Jun 2004)
+
+  26 Jun 2004; Alastair Tse <liquidx@gentoo.org>
+  +files/supybot-0.77.2-cvsadditions-2004-06-10.patch, +supybot-0.77.2.ebuild:
+  version bump, added cvs bug fix patch recommended by the developers (#53438)
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  supybot-0.77.0.ebuild:
+  Masked supybot-0.77.0.ebuild testing for ppc
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> supybot-0.77.0.ebuild:
+  Add inherit eutils
 
 *supybot-0.77.0 (28 Feb 2004)
 
diff --git a/net-irc/supybot/Manifest b/net-irc/supybot/Manifest
index dcc1110b3b2f..96344b3a1a13 100644
--- a/net-irc/supybot/Manifest
+++ b/net-irc/supybot/Manifest
@@ -1,5 +1,21 @@
-MD5 7a9c94ae0be7ceeaceda448edab07f43 ChangeLog 411
-MD5 eccd3e44b1e8fc954692d4faf329cf38 metadata.xml 218
-MD5 e5d24310612caaef6e3b91206aeac494 supybot-0.77.0.ebuild 906
-MD5 67a13f83c4ad67ef8e6e25c06b67cf3e files/digest-supybot-0.77.0 67
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 22805bc56d5c56233b874e5ff2e546ed ChangeLog 2222
+MD5 e3869089e6a6a46323a95659f1fbcd02 files/digest-supybot-0.77.2 158
+MD5 42b11d8290fbd3908d3a434cf0987f3b files/digest-supybot-0.80.1 67
+MD5 d4ac0c8b972cdb7979ccc792a86dc44e files/digest-supybot-0.83.0_rc3 70
+MD5 eb7d5c8309f6c3273ea196c3301f2a5f files/digest-supybot-0.83.1 67
 MD5 e723df2ced2db8d65e4b8ed5026d2b2b files/supybot-0.77.0-setup.py.patch 629
+MD5 eccd3e44b1e8fc954692d4faf329cf38 metadata.xml 218
+MD5 c4776a9dac5b002f4da907bf0a1820f4 supybot-0.77.2.ebuild 1130
+MD5 a1976b9e5cd7e7028d5346bb3f7369e4 supybot-0.80.1.ebuild 925
+MD5 3f84dc645ccc8d68644e56aeb864bd73 supybot-0.83.0_rc3.ebuild 925
+MD5 9d333411e5a4e05813bd346de2863ab9 supybot-0.83.1.ebuild 938
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDbN839ZFPrqoILX8RAlzCAKCPXEH6OC6gltilesMyU0YCYrrf8ACghOxO
+PFC9j9b3W7dg1nfG0g5bZoI=
+=OON0
+-----END PGP SIGNATURE-----
diff --git a/net-irc/supybot/files/digest-supybot-0.77.2 b/net-irc/supybot/files/digest-supybot-0.77.2
index 81179ee1a174..f91a71c8002b 100644
--- a/net-irc/supybot/files/digest-supybot-0.77.2
+++ b/net-irc/supybot/files/digest-supybot-0.77.2
@@ -1 +1,2 @@
 MD5 a46bd9904175c8db17b6ed771cd9ee68 Supybot-0.77.2.tar.bz2 322690
+MD5 8fb0ddda5c29c479aa4c5631b2652db5 supybot-0.77.2-cvsadditions-2004-06-10.patch.bz2 7325
diff --git a/net-irc/supybot/supybot-0.77.2.ebuild b/net-irc/supybot/supybot-0.77.2.ebuild
index 450b796704ee..8eb6e9660b6b 100644
--- a/net-irc/supybot/supybot-0.77.2.ebuild
+++ b/net-irc/supybot/supybot-0.77.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/supybot/supybot-0.77.2.ebuild,v 1.1 2004/06/26 19:49:29 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/supybot/supybot-0.77.2.ebuild,v 1.1.1.1 2005/11/30 09:49:01 chriswhite Exp $
 
 inherit distutils eutils
 
@@ -8,15 +8,16 @@ MY_P=${P/s/S}
 
 DESCRIPTION="Python based extensible IRC infobot and channel bot"
 HOMEPAGE="http://supybot.sf.net/"
-SRC_URI="mirror://sourceforge/supybot/${MY_P}.tar.bz2"
+SRC_URI="mirror://sourceforge/supybot/${MY_P}.tar.bz2
+	mirror://gentoo/${P}-cvsadditions-2004-06-10.patch.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
+KEYWORDS="~x86 ~ppc ppc-macos"
+IUSE="sqlite"
 
 DEPEND=">=dev-lang/python-2.3
-	>=dev-python/pysqlite-0.4.3"
+	sqlite? ( >=dev-python/pysqlite-0.4.3 )"
 
 S=${WORKDIR}/${MY_P}
 
@@ -25,7 +26,7 @@ DOCS="ACKS BUGS LICENSE TODO"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}; epatch ${FILESDIR}/${P}-cvsadditions-2004-06-10.patch
+	cd ${S}; epatch ${WORKDIR}/${P}-cvsadditions-2004-06-10.patch
 }
 
 src_install() {
diff --git a/net-irc/supybot/supybot-0.80.1.ebuild b/net-irc/supybot/supybot-0.80.1.ebuild
index 2dcdce23df8e..39a580244505 100644
--- a/net-irc/supybot/supybot-0.80.1.ebuild
+++ b/net-irc/supybot/supybot-0.80.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/supybot/supybot-0.80.1.ebuild,v 1.1 2005/02/04 05:09:27 fserb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/supybot/supybot-0.80.1.ebuild,v 1.1.1.1 2005/11/30 09:49:01 chriswhite Exp $
 
 inherit distutils eutils
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/supybot/${MY_P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~ppc-macos"
+KEYWORDS="~ppc ~ppc-macos x86"
 IUSE="sqlite"
 
 DEPEND=">=dev-lang/python-2.3
diff --git a/net-irc/supybot/supybot-0.83.0_rc3.ebuild b/net-irc/supybot/supybot-0.83.0_rc3.ebuild
index 1eb83c10a957..e95076b4c7a8 100644
--- a/net-irc/supybot/supybot-0.83.0_rc3.ebuild
+++ b/net-irc/supybot/supybot-0.83.0_rc3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/supybot/supybot-0.83.0_rc3.ebuild,v 1.1 2005/06/25 17:18:05 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/supybot/supybot-0.83.0_rc3.ebuild,v 1.1.1.1 2005/11/30 09:49:01 chriswhite Exp $
 
 inherit distutils eutils
 
@@ -17,7 +17,7 @@ KEYWORDS="~x86 ~ppc ~ppc-macos"
 IUSE="sqlite"
 
 DEPEND=">=dev-lang/python-2.3
-	sqlite? ( >=dev-python/pysqlite-0.4.3 )"
+	sqlite? ( <dev-python/pysqlite-1.1 )"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/net-irc/supybot/supybot-0.83.1.ebuild b/net-irc/supybot/supybot-0.83.1.ebuild
index 843ac93656c2..08fabfb7416e 100644
--- a/net-irc/supybot/supybot-0.83.1.ebuild
+++ b/net-irc/supybot/supybot-0.83.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/supybot/supybot-0.83.1.ebuild,v 1.1 2005/11/05 16:13:02 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/supybot/supybot-0.83.1.ebuild,v 1.1.1.1 2005/11/30 09:49:01 chriswhite Exp $
 
 inherit distutils eutils
 
diff --git a/net-irc/tirc/ChangeLog b/net-irc/tirc/ChangeLog
index 84eee00b99d8..d4ddec24c0da 100644
--- a/net-irc/tirc/ChangeLog
+++ b/net-irc/tirc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-irc/tirc
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/tirc/ChangeLog,v 1.1 2004/07/16 11:55:56 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/tirc/ChangeLog,v 1.1.1.1 2005/11/30 09:48:59 chriswhite Exp $
+
+  17 Jul 2004; David Holm <dholm@gentoo.org> tirc-0.54_alpha.ebuild:
+  Added to ~ppc.
 
 *tirc-0.54_alpha (16 Jul 2004)
 
diff --git a/net-irc/tirc/Manifest b/net-irc/tirc/Manifest
index 7261b7a7c8c3..6a1f4ba1026b 100644
--- a/net-irc/tirc/Manifest
+++ b/net-irc/tirc/Manifest
@@ -1,2 +1,4 @@
-MD5 d254945b4436d68450f80b7155ecb91f tirc-0.54_alpha.ebuild 420
+MD5 ed77c4cbf5dd63dde2590fc92444afea ChangeLog 448
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+MD5 a2e7369ed7ec540500b6be1c2a55a84b tirc-0.54_alpha.ebuild 835
 MD5 cc590714f6d205652bdefd4263666731 files/digest-tirc-0.54_alpha 70
diff --git a/net-irc/tirc/tirc-0.54_alpha.ebuild b/net-irc/tirc/tirc-0.54_alpha.ebuild
index 2ab780b17c4e..e23444a1348d 100644
--- a/net-irc/tirc/tirc-0.54_alpha.ebuild
+++ b/net-irc/tirc/tirc-0.54_alpha.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/tirc/tirc-0.54_alpha.ebuild,v 1.1 2004/07/16 11:55:56 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/tirc/tirc-0.54_alpha.ebuild,v 1.1.1.1 2005/11/30 09:48:59 chriswhite Exp $
 
 MY_P=${P/_alpha/a}-patched
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://home.mayn.de/jean-luc/alt/tirc/"
 SRC_URI="http://home.mayn.de/jean-luc/alt/tirc/${MY_P}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 IUSE="debug"
 
 DEPEND="sys-libs/ncurses"
diff --git a/net-irc/ultimate/ChangeLog b/net-irc/ultimate/ChangeLog
index 94b511aa0948..9c36ba813854 100644
--- a/net-irc/ultimate/ChangeLog
+++ b/net-irc/ultimate/ChangeLog
@@ -1,6 +1,66 @@
 # ChangeLog for net-irc/ultimate
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ultimate/ChangeLog,v 1.1 2003/10/25 01:44:43 zul Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ultimate/ChangeLog,v 1.1.1.1 2005/11/30 09:48:55 chriswhite Exp $
+
+  30 Jun 2005; Sven Wegener <swegener@gentoo.org> ultimate-2.8.9.ebuild:
+  Added cross-compile support.
+
+*ultimate-3.0.1 (12 Apr 2005)
+*ultimate-2.8.9 (12 Apr 2005)
+
+  12 Apr 2005; Sven Wegener <swegener@gentoo.org> +ultimate-2.8.9.ebuild,
+  -ultimate-3.0.0.ebuild, +ultimate-3.0.1.ebuild:
+  Version bump.
+
+*ultimate-3.0.0 (19 Mar 2005)
+
+  19 Mar 2005; Sven Wegener <swegener@gentoo.org>
+  -ultimate-3.0.0_rc3.ebuild, +ultimate-3.0.0.ebuild:
+  Version bump.
+
+*ultimate-3.0.0_rc3 (14 Mar 2005)
+
+  14 Mar 2005; Sven Wegener <swegener@gentoo.org> -ultimate-2.8.7.ebuild,
+  ultimate-2.8.8.ebuild, -ultimate-3.0.0_rc2.ebuild,
+  +ultimate-3.0.0_rc3.ebuild:
+  Version bump. Marked 2.8.8 stable on x86. Removed old ebuilds.
+
+*ultimate-3.0.0_rc2 (30 Jan 2005)
+
+  30 Jan 2005; Sven Wegener <swegener@gentoo.org>
+  +files/3.0.0_rc2-config.patch, +files/ultimateircd.rc-3.0.0,
+  +ultimate-3.0.0_rc2.ebuild:
+  Version bump.
+
+  09 Oct 2004; Sven Wegener <swegener@gentoo.org> files/ultimateircd.rc:
+  Modified to 'use net' not 'need net' in init script. Closes bug #66467.
+
+*ultimate-2.8.8 (17 Jul 2004)
+
+  17 Jul 2004; Sven Wegener <swegener@gentoo.org> files/ultimateircd.conf,
+  files/ultimateircd.rc, ultimate-2.8.7.ebuild, +ultimate-2.8.8.ebuild:
+  Version bump.
+
+  09 Jul 2004; Sven Wegener <swegener@gentoo.org> ultimate-2.8.7.ebuild:
+  Marked stable on x86.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ultimate-2.8.7.ebuild:
+  virtual/glibc -> virtual/libc
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  ultimate-2.8.7.ebuild:
+  Masked ultimate-2.8.7.ebuild testing for ppc
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> ultimate-2.8.7.ebuild:
+  Add inherit eutils
+
+  14 Feb 2004; Jason Wever <weeve@gentoo.org> ultimate-2.8.7.ebuild:
+  Added ~sparc keyword.
+
+  27 Oct 2003; Chuck Short <zul@gentoo.org> files/ultimateircd.conf,
+  files/ultimateircd.rc:
+  Updated init scripts, closes bug #31958.
 
 *ultimate-2.8.7 (24 Oct 2003)
 
diff --git a/net-irc/ultimate/Manifest b/net-irc/ultimate/Manifest
index 88cac3a7b13b..07fcf8890ae9 100644
--- a/net-irc/ultimate/Manifest
+++ b/net-irc/ultimate/Manifest
@@ -1,6 +1,24 @@
-MD5 aa6f72eb1712ed87a04940daab10fb4d ultimate-2.8.7.ebuild 3099
-MD5 0e80c10558167e161746bfc5d3a443e1 files/ultimateircd.rc 179
-MD5 8af0419297384fbb53922f83cc7d85df files/setup.h 483
-MD5 0e80c10558167e161746bfc5d3a443e1 files/ultimateircd.conf 179
-MD5 ce59cd0657a697f03f1798d4ab24192a files/digest-ultimate-2.8.7 65
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3b5a1fed11c6a9fb34438161e58336ad ChangeLog 2370
+MD5 e2df540e88be963a3ecf45f87a90a02a files/3.0.0_rc2-config.patch 1318
 MD5 772b4c0818bb9082f29f266cb6c3c3ad files/Ultimate-2.8.7-gentoo.patch 434
+MD5 34e0a1838e8d580f55fe9f5edbc376f7 files/digest-ultimate-2.8.8 66
+MD5 3160677c4e97604f8a0e806152ad616d files/digest-ultimate-2.8.9 66
+MD5 e6678ca31704573f81b635d8b5724bd0 files/digest-ultimate-3.0.1 66
+MD5 8af0419297384fbb53922f83cc7d85df files/setup.h 483
+MD5 f44ee9942e8af5087a6dc454861907fb files/ultimateircd.conf 283
+MD5 1792351e18191c6d3cce474a960a3757 files/ultimateircd.rc 514
+MD5 1311e8806bd4488867ed82cdc19c7ca3 files/ultimateircd.rc-3.0.0 561
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+MD5 90c61a090ed4f4114bd060e0ae5a1245 ultimate-2.8.8.ebuild 2798
+MD5 a0209bfb3b92e990726357407534acb0 ultimate-2.8.9.ebuild 2832
+MD5 ddf45e2de343c6df515d452ca756c73c ultimate-3.0.1.ebuild 1554
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCxA8OI1lqEGTUzyQRAgPjAJ0QKdZb7mlG8IxUlnt5S6DUKRc+7wCg1pAr
+B0vQJDcRCkslyR24GHQz2xw=
+=EfTO
+-----END PGP SIGNATURE-----
diff --git a/net-irc/ultimate/files/digest-ultimate-2.8.8 b/net-irc/ultimate/files/digest-ultimate-2.8.8
index 232bf066ceca..904ea8d35f1c 100644
--- a/net-irc/ultimate/files/digest-ultimate-2.8.8
+++ b/net-irc/ultimate/files/digest-ultimate-2.8.8
@@ -1 +1 @@
-MD5 da1a968a520781d31518a75b264cd50c Ultimate2.8.8.tar.gz 409797
+MD5 11062079b4f9f050e4d36353b78d6f87 Ultimate2.8.8.tar.bz2 331120
diff --git a/net-irc/ultimate/files/ultimateircd.conf b/net-irc/ultimate/files/ultimateircd.conf
index 7c610df832f1..104e0b77e869 100644
--- a/net-irc/ultimate/files/ultimateircd.conf
+++ b/net-irc/ultimate/files/ultimateircd.conf
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ultimate/files/ultimateircd.conf,v 1.1.1.1 2005/11/30 09:48:56 chriswhite Exp $
 
-# user to run ptlinkircd as
-PTLINKIRCD_USER="nobody"
+# user to run ultimate-ircd as
+ULTIMATEIRCD_USER="nobody"
diff --git a/net-irc/ultimate/files/ultimateircd.rc b/net-irc/ultimate/files/ultimateircd.rc
index 7c610df832f1..f0bfc14a9749 100644
--- a/net-irc/ultimate/files/ultimateircd.rc
+++ b/net-irc/ultimate/files/ultimateircd.rc
@@ -1,6 +1,21 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ultimate/files/ultimateircd.rc,v 1.1.1.1 2005/11/30 09:48:56 chriswhite Exp $
 
-# user to run ptlinkircd as
-PTLINKIRCD_USER="nobody"
+depend() {
+	use dns net
+}
+
+start() {
+	ebegin "Starting ultimate-ircd"
+	start-stop-daemon --start --quiet --exec /usr/bin/ultimate-ircd \
+		--chuid ${ULTIMATEIRCD_USER} &>/dev/null
+	eend $?
+}
+
+stop() {
+	ebegin "Shutting down ultimate-ircd"
+	killall ultimate-ircd
+	eend $?
+}
diff --git a/net-irc/ultimate/files/ultimateircd.rc-3.0.0 b/net-irc/ultimate/files/ultimateircd.rc-3.0.0
index 140b97a412da..1dacf338baaa 100644
--- a/net-irc/ultimate/files/ultimateircd.rc-3.0.0
+++ b/net-irc/ultimate/files/ultimateircd.rc-3.0.0
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ultimate/files/ultimateircd.rc-3.0.0,v 1.1 2005/01/30 14:39:34 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ultimate/files/ultimateircd.rc-3.0.0,v 1.1.1.1 2005/11/30 09:48:56 chriswhite Exp $
 
 depend() {
 	use dns net
diff --git a/net-irc/ultimate/ultimate-2.8.8.ebuild b/net-irc/ultimate/ultimate-2.8.8.ebuild
index 85a7f103013f..9e48cd0ba977 100644
--- a/net-irc/ultimate/ultimate-2.8.8.ebuild
+++ b/net-irc/ultimate/ultimate-2.8.8.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ultimate/ultimate-2.8.8.ebuild,v 1.1 2004/07/17 12:27:10 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ultimate/ultimate-2.8.8.ebuild,v 1.1.1.1 2005/11/30 09:48:55 chriswhite Exp $
 
 inherit eutils
 
 MY_P="${P/ultimate-/Ultimate}"
-DESCRIPTION="And IRCd server based on DALnet's DreamForge IRCd."
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-RESTRICT="nomirror"
+DESCRIPTION="An IRCd server based on DALnet's DreamForge IRCd."
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 HOMEPAGE="http://www.shadow-realm.org/"
 
-KEYWORDS="~x86 ~sparc ~ppc"
+KEYWORDS="x86 ~sparc ~ppc"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="debug"
diff --git a/net-irc/ultimate/ultimate-2.8.9.ebuild b/net-irc/ultimate/ultimate-2.8.9.ebuild
index ff9539ce3b19..a8cc8d0f2d54 100644
--- a/net-irc/ultimate/ultimate-2.8.9.ebuild
+++ b/net-irc/ultimate/ultimate-2.8.9.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ultimate/ultimate-2.8.9.ebuild,v 1.1 2005/04/12 21:51:25 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ultimate/ultimate-2.8.9.ebuild,v 1.1.1.1 2005/11/30 09:48:55 chriswhite Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 MY_P="${P/ultimate-/Ultimate}"
 DESCRIPTION="An IRCd server based on DALnet's DreamForge IRCd."
@@ -69,7 +69,7 @@ src_unpack() {
 }
 
 src_compile() {
-	emake || die "Make failed"
+	emake CC="$(tc-getCC)" || die "Make failed"
 }
 
 src_install() {
diff --git a/net-irc/ultimate/ultimate-3.0.1.ebuild b/net-irc/ultimate/ultimate-3.0.1.ebuild
index 9046ac86eb7c..eb4c81c89128 100644
--- a/net-irc/ultimate/ultimate-3.0.1.ebuild
+++ b/net-irc/ultimate/ultimate-3.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ultimate/ultimate-3.0.1.ebuild,v 1.1 2005/04/12 21:51:25 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ultimate/ultimate-3.0.1.ebuild,v 1.1.1.1 2005/11/30 09:48:55 chriswhite Exp $
 
 inherit eutils fixheadtails
 
diff --git a/net-irc/unrealircd/ChangeLog b/net-irc/unrealircd/ChangeLog
index e13fc3439c3f..356c7b470709 100644
--- a/net-irc/unrealircd/ChangeLog
+++ b/net-irc/unrealircd/ChangeLog
@@ -1,8 +1,158 @@
 # ChangeLog for net-irc/unrealircd
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/ChangeLog,v 1.1 2003/02/01 04:47:09 vapier Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/ChangeLog,v 1.1.1.1 2005/11/30 09:48:56 chriswhite Exp $
+
+  14 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  unrealircd-3.2.3-r1.ebuild:
+  Keyworded ~sparc wrt #107146
+
+  15 Aug 2005; Luis Medinas <metalgod@gentoo.org>
+  unrealircd-3.2.3-r1.ebuild:
+  Added ~amd64 keywords.
+
+  14 Aug 2005; Sven Wegener <swegener@gentoo.org>
+  unrealircd-3.2.3-r1.ebuild:
+  Make ebuild multilib friendly.
+
+  15 Aug 2005; Luis Medinas <metalgod@gentoo.org>
+  unrealircd-3.2.3-r1.ebuild:
+  Added ~amd64 keywords.
+
+  29 Jun 2005; Sven Wegener <swegener@gentoo.org>
+  unrealircd-3.2.3-r1.ebuild:
+  Updated the curl check to also check for the ipv6 USE flag.
+
+*unrealircd-3.2.3-r1 (03 May 2005)
+
+  03 May 2005; Sven Wegener <swegener@gentoo.org>
+  +unrealircd-3.2.3-r1.ebuild:
+  Revision bump. Added support for the curl USE flag that allows
+  network-based configuration includes. Closes bug #86307.
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org>
+  unrealircd-3.2.3.ebuild:
+  Stable on ppc.
+
+  26 Apr 2005; Sven Wegener <swegener@gentoo.org> unrealircd-3.2.3.ebuild:
+  Set ownership of configuration files the right way. Fixes bug #90075.
+
+  22 Apr 2005; Sven Wegener <swegener@gentoo.org> unrealircd-3.2.3.ebuild:
+  Marked stable on x86.
+
+*unrealircd-3.2.3 (14 Mar 2005)
+
+  14 Mar 2005; Sven Wegener <swegener@gentoo.org> +unrealircd-3.2.3.ebuild:
+  Version bump.
+
+  18 Jan 2005; Sven Wegener <swegener@gentoo.org>
+  -unrealircd-3.2.1-r1.ebuild, -unrealircd-3.2.2.ebuild:
+  Removed old vulnerable ebuilds.
+
+*unrealircd-3.2.2b (18 Jan 2005)
+
+  18 Jan 2005; Sven Wegener <swegener@gentoo.org> +unrealircd-3.2.2b.ebuild:
+  Version bump for security bug #78524. Marked stable on x86.
+
+*unrealircd-3.2.2 (05 Dec 2004)
+
+  05 Dec 2004; Sven Wegener <swegener@gentoo.org>
+  unrealircd-3.2.1-r1.ebuild, +unrealircd-3.2.2.ebuild:
+  Version bump.
+
+  17 Oct 2004; Sven Wegener <swegener@gentoo.org>
+  -files/3.1.5.1-Config.patch, -files/3.1.6-Config.patch,
+  -unrealircd-3.1.5.1.ebuild, -unrealircd-3.1.6.ebuild:
+  Removed old ebuilds and files.
+
+  09 Oct 2004; Sven Wegener <swegener@gentoo.org> files/unrealircd.rc:
+  Modified to 'use net' not 'need net' in init script. Closes bug #66467.
+
+  03 Oct 2004; Sven Wegener <swegener@gentoo.org>
+  unrealircd-3.2.1-r1.ebuild:
+  Marked stable on x86.
+
+  15 Aug 2004; Sven Wegener <swegener@gentoo.org> files/unrealircd.rc,
+  unrealircd-3.2.1-r1.ebuild, -unrealircd-3.2.1.ebuild:
+  Updated init script with reload support.
+
+  14 Aug 2004; Sven Wegener <swegener@gentoo.org> unrealircd-3.2.1-r1.ebuild:
+  Modified the ebuild to install configuration files for aliases and networks
+  and always enable the channel owner and admin prefixes.
+
+  14 Aug 2004; Sven Wegener <swegener@gentoo.org> unrealircd-3.2.1-r1.ebuild:
+  Added info to pkg_postinst().
+
+*unrealircd-3.2.1-r1 (14 Aug 2004)
+
+  14 Aug 2004; Sven Wegener <swegener@gentoo.org> +unrealircd-3.2.1-r1.ebuild:
+  Revision bump. Made the hub support optional and added support for the ipv6
+  USE flag.
+
+  25 Jul 2004; Sven Wegener <swegener@gentoo.org> unrealircd-3.2.1.ebuild:
+  Fixed wrong path in ircdchk cron script.
+
+  24 Jul 2004; Sven Wegener <swegener@gentoo.org> unrealircd-3.2.1.ebuild:
+  Configuration files need to be owned by user unrealircd.
+
+  24 Jul 2004; Sven Wegener <swegener@gentoo.org> files/unrealircd.rc,
+  unrealircd-3.2.1.ebuild:
+  Fixed typo in init script and modified ebuild to install cron example scripts.
+
+*unrealircd-3.2.1 (24 Jul 2004)
+
+  24 Jul 2004; Sven Wegener <swegener@gentoo.org> -files/mkunrealircd-cert,
+  files/unrealircd.confd, files/unrealircd.rc, +unrealircd-3.2.1.ebuild,
+  -unrealircd-3.2_rc2.ebuild:
+  Version bump. Closes bug #48965 and bug #41919. Switched from
+  mkunrealircd-cert to ssl-cert.eclass.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> unrealircd-3.1.5.1.ebuild,
+  unrealircd-3.1.6.ebuild, unrealircd-3.2_rc2.ebuild:
+  Add inherit eutils
+
+  23 Apr 2004; David Holm <dholm@gentoo.org> unrealircd-3.2_rc2.ebuild:
+  Added to ~ppc.
+
+*unrealircd-3.2_rc2 (22 Apr 2004)
+
+  22 Apr 2004; Chuck Short <zul@gentoo.org> unrealircd-3.2_rc1.ebuild,
+  unrealircd-3.2_rc2.ebuild:
+  RemoRemoved 3.2rc1 in place for rc1.
+
+  22 Apr 2004; Chuck Short <zul@gentoo.org> unrealircd-3.2_rc1.ebuild:
+  Updated ebuild.
+  Closes #42396.
+
+  13 Apr 2004; Chuck Short <zul@gentoo.org> files/mkunrealircd-cert:
+  Fix mkunrealircd-cert. Closes #42396.
+
+  06 Mar 2004; Chuck Short <zul@gentoo.org> files/mkunrealircd-cert:
+  Updated mkunrealircd-cert script.
+
+  05 Mar 2004; Chuck Short <zul@gentoo.org> unrealircd-3.2_rc1.ebuild:
+  DPATH and SPATH is hardcoded with the PORTDIR_TMP. Closes #42396.
+
+  04 Mar 2004; Chuck Short <zul@gentoo.org> unrealircd-3.2_rc1.ebuild:
+  Ebuild improvements. Closes #42396.
+
+*unrealircd-3.2_rc1 (20 Feb 2004)
+
+  20 Feb 2004; Chuck Short <zul@gentoo.org> unrealircd-3.1.5.1.ebuild,
+  unrealircd-3.1.6.ebuild, unrealircd-3.2_rc1.ebuild:
+  Updated headers, version bump. Closes #41919.
+
+*unrealircd-3.1.6 (02 Jul 2003)
+
+  02 Jul 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump + patches to fix compat with newer glibc #23825.
 
 *unrealircd-3.1.5.1 (31 Jan 2003)
 
+  02 Jul 2003; Mike Frysinger <vapier@gentoo.org> :
+  Patches to fix compat with newer glibc #23825.
+
+  25 Mar 2003; Seemant Kulleen <seemant@gentoo.org> unrealircd-3.1.5.1.ebuild:
+  openssl USE is actually ssl
+
   31 Jan 2003; Mike Frysinger <vapier@gentoo.org> :
   Initial import.  Ebuild submitted by me.
diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index e69de29bb2d1..665ee83dd9f1 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1ae96562a4da6eb96a325484356f1e75 ChangeLog 5579
+MD5 0c44732c1496b1645f59af5da99b3bb4 files/digest-unrealircd-3.2.3 64
+MD5 0c44732c1496b1645f59af5da99b3bb4 files/digest-unrealircd-3.2.3-r1 64
+MD5 d9a803f03c66dbd732f2ffb356cb589a files/unrealircd.confd 499
+MD5 9758629d4e608b7a45c17c340c9b4f13 files/unrealircd.rc 640
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+MD5 4482a3a47adb97b1a1722aff18e91a90 unrealircd-3.2.3-r1.ebuild 3909
+MD5 e383b823dba7444bc7987c02eea26996 unrealircd-3.2.3.ebuild 3416
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDT8RrKRy60XGEcJIRAs7QAJ9oCiyNYfDBqy13TbZy93rfbIoQEwCfeE4J
+OrcYIej4LMbk7F8mR24GoiE=
+=REaE
+-----END PGP SIGNATURE-----
diff --git a/net-irc/unrealircd/files/unrealircd.confd b/net-irc/unrealircd/files/unrealircd.confd
index 37135d437b66..78fae8e0523c 100644
--- a/net-irc/unrealircd/files/unrealircd.confd
+++ b/net-irc/unrealircd/files/unrealircd.confd
@@ -1,15 +1,14 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/files/unrealircd.confd,v 1.1 2003/02/01 04:47:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/files/unrealircd.confd,v 1.1.1.1 2005/11/30 09:48:56 chriswhite Exp $
 
 # user to run unrealircd as
-UNREALIRCD_USER="UserBah"
+UNREALIRCD_USER="unrealircd"
 
 # extra options to pass to unrealircd ...
 # useful if you want to specify conf files other
 # than the default
 #
-# [-f config]
 # [-h servername]
 # [-p portnumber]
 # [-x loglevel]
diff --git a/net-irc/unrealircd/files/unrealircd.rc b/net-irc/unrealircd/files/unrealircd.rc
index 8de0dc468d84..acfba2ea3993 100644
--- a/net-irc/unrealircd/files/unrealircd.rc
+++ b/net-irc/unrealircd/files/unrealircd.rc
@@ -1,17 +1,19 @@
 #!/sbin/runscript
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/files/unrealircd.rc,v 1.1 2003/02/01 04:47:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/files/unrealircd.rc,v 1.1.1.1 2005/11/30 09:48:56 chriswhite Exp $
+
+opts="reload start stop"
 
 depend() {
-	need net
-	use dns
+	use dns net
+	provide ircd
 }
 
 start() {
 	ebegin "Starting unrealircd"
 	start-stop-daemon --start --quiet --exec /usr/bin/unrealircd \
-		--chuid ${UNREALIRCD_USER} -- ${UNREALIRCD_OPTS}
+		--chuid ${UNREALIRCD_USER} -- ${UNREALIRCD_OPTS} &>/dev/null
 	eend $?
 }
 
@@ -20,3 +22,9 @@ stop() {
 	killall unrealircd
 	eend $?
 }
+
+reload() {
+	ebegin "Re-Loading unrealircd"
+	killall -1 unrealircd
+	eend $?
+}
diff --git a/net-irc/unrealircd/unrealircd-3.2.3-r1.ebuild b/net-irc/unrealircd/unrealircd-3.2.3-r1.ebuild
index c5f93a3e157e..2ae661de37f0 100644
--- a/net-irc/unrealircd/unrealircd-3.2.3-r1.ebuild
+++ b/net-irc/unrealircd/unrealircd-3.2.3-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/unrealircd-3.2.3-r1.ebuild,v 1.1 2005/05/03 22:17:13 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/unrealircd-3.2.3-r1.ebuild,v 1.1.1.1 2005/11/30 09:48:56 chriswhite Exp $
 
-inherit eutils ssl-cert versionator
+inherit eutils ssl-cert versionator multilib
 
 MY_P=Unreal${PV}
 
@@ -14,7 +14,7 @@ SRC_URI="http://unrealircd.funny4chat.de/downloads/${MY_P}.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="hub ipv6 ssl zlib curl"
 
 RDEPEND="ssl? ( dev-libs/openssl )
@@ -25,10 +25,11 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/Unreal$(get_version_component_range 1-2)"
 
 pkg_setup() {
-	if use curl && ! built_with_use net-misc/curl ares
+	if use curl && ( ! built_with_use net-misc/curl ares || built_with_use net-misc/curl ipv6 )
 	then
 		eerror "You need net-misc/curl compiled with the ares USE flag to be able to use"
-		eerror "net-irc/unrealircd with the curl USE flag."
+		eerror "net-irc/unrealircd with the curl USE flag. Please note that ares support"
+		eerror "for net-misc/curl is incompatible with the ipv6 USE flag."
 		die "need net-misc/curl with ares support"
 	fi
 
@@ -83,7 +84,7 @@ src_install() {
 
 	newbin src/ircd unrealircd || die "newbin failed"
 
-	exeinto /usr/lib/unrealircd/modules
+	exeinto /usr/$(get_libdir)/unrealircd/modules
 	doexe src/modules/*.so || die "doexe failed"
 
 	dodir /etc/unrealircd || die "dodir failed"
@@ -103,7 +104,7 @@ src_install() {
 	doins networks/*.network || die "doins failed"
 
 	sed -i \
-		-e s:src/modules:/usr/lib/unrealircd/modules: \
+		-e s:src/modules:/usr/$(get_libdir)/unrealircd/modules: \
 		-e s:ircd\\.log:/var/log/unrealircd/ircd.log: \
 		${D}/etc/unrealircd/unrealircd.conf
 
@@ -120,7 +121,7 @@ src_install() {
 	chown -R unrealircd ${D}/{etc,var/{lib,log,run}}/unrealircd
 }
 
-pkg_postins() {
+pkg_postinst() {
 	einfo
 	einfo "UnrealIRCd will not run until you've set up /etc/unrealircd/unrealircd.conf"
 	einfo
diff --git a/net-irc/unrealircd/unrealircd-3.2.3.ebuild b/net-irc/unrealircd/unrealircd-3.2.3.ebuild
index d075487de858..b62173bdf595 100644
--- a/net-irc/unrealircd/unrealircd-3.2.3.ebuild
+++ b/net-irc/unrealircd/unrealircd-3.2.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/unrealircd-3.2.3.ebuild,v 1.1 2005/03/14 21:43:25 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/unrealircd-3.2.3.ebuild,v 1.1.1.1 2005/11/30 09:48:56 chriswhite Exp $
 
-inherit eutils ssl-cert
+inherit eutils ssl-cert versionator
 
 MY_P=Unreal${PV}
 
@@ -14,7 +14,7 @@ SRC_URI="http://unrealircd.funny4chat.de/downloads/${MY_P}.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc"
 IUSE="hub ipv6 ssl zlib"
 
 RDEPEND="ssl? ( dev-libs/openssl )
@@ -22,7 +22,11 @@ RDEPEND="ssl? ( dev-libs/openssl )
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
-S=${WORKDIR}/Unreal3.2
+S="${WORKDIR}/Unreal$(get_version_component_range 1-2)"
+
+pkg_setup() {
+	enewuser unrealircd
+}
 
 src_unpack() {
 	unpack ${A}
@@ -105,15 +109,10 @@ src_install() {
 	newconfd ${FILESDIR}/unrealircd.confd unrealircd || die "newconfd failed"
 
 	fperms 700 /etc/unrealircd
+	chown -R unrealircd ${D}/{etc,var/{lib,log,run}}/unrealircd
 }
 
 pkg_postinst() {
-	enewuser unrealircd
-	chown unrealircd \
-		${ROOT}/{etc,var/{lib,log,run}}/unrealircd \
-		${ROOT}/etc/unrealircd/server.cert.{key,pem} \
-		${ROOT}/etc/unrealircd/*.conf
-
 	einfo
 	einfo "UnrealIRCd will not run until you've set up /etc/unrealircd/unrealircd.conf"
 	einfo
diff --git a/net-irc/vyqchat/ChangeLog b/net-irc/vyqchat/ChangeLog
index c966a91f7599..d34dd57ec9d2 100644
--- a/net-irc/vyqchat/ChangeLog
+++ b/net-irc/vyqchat/ChangeLog
@@ -1,6 +1,42 @@
 # ChangeLog for net-irc/vyqchat
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/vyqchat/ChangeLog,v 1.1 2003/10/05 17:40:22 gregf Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/vyqchat/ChangeLog,v 1.1.1.1 2005/11/30 09:48:56 chriswhite Exp $
+
+  07 Jul 2005; Caleb Tennis <caleb@gentoo.org> vyqchat-0.1.1.ebuild,
+  vyqchat-0.2.3.ebuild, vyqchat-0.2.6.ebuild:
+  Fix qt dep
+
+  22 Aug 2004; Sven Wegener <swegener@gentoo.org> vyqchat-0.2.6.ebuild:
+  Update timestamps to avoid running autotools at compile time. Closes bug
+  #60541.
+
+*vyqchat-0.2.6 (24 Jul 2004)
+
+  24 Jul 2004; Sven Wegener <swegener@gentoo.org> vyqchat-0.1.1.ebuild,
+  vyqchat-0.2.3.ebuild, +vyqchat-0.2.6.ebuild:
+  Version bump and tidied the ebuilds.
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  vyqchat-0.2.3.ebuild:
+  Masked vyqchat-0.2.3.ebuild testing for ppc
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> vyqchat-0.2.3.ebuild:
+  Add inherit eutils
+
+  19 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> vyqchat-0.1.1.ebuild,
+  vyqchat-0.2.3.ebuild:
+  fix bad depend again; tidy
+
+  19 Mar 2004; Chuck Short <zul@gentoo.org> vyqchat-0.1.1.ebuild,
+  vyqchat-0.2.3.ebuild:
+  Fixed header, fixed bad DEPEND.
+
+*vyqchat-0.2.3 (28 Dec 2003)
+
+  28 Dec 2003; Chuck Short <zul@gentoo.org> vyqchat-0.1.1.ebuild,
+  vyqchat-0.2.3.ebuild, files/vyqchat_packet_id.patch:
+  0.1.1 marked stable 0.2.3 version bump, added patch, removed emake because it
+  did not compile properly.
 
 *vyqchat-0.1.1 (05 Oct 2003)
 
diff --git a/net-irc/vyqchat/Manifest b/net-irc/vyqchat/Manifest
index a431007e4a06..1e7711c797a5 100644
--- a/net-irc/vyqchat/Manifest
+++ b/net-irc/vyqchat/Manifest
@@ -1,4 +1,19 @@
-MD5 db4a8804aa78ebfb2460d0330e174bb9 vyqchat-0.1.1.ebuild 729
-MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
-MD5 5ddf2327b27fe3bd50c82179c7275fdf ChangeLog 264
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d0e0b07777b10ccd6f789133c6ef4bff ChangeLog 1559
 MD5 26be75128cee034d9b8356e30f45e32e files/digest-vyqchat-0.1.1 65
+MD5 0287c53dce94dacfc511965ed235b5a7 files/digest-vyqchat-0.2.3 65
+MD5 2c357d5224aead46484cb334cfaba4f4 files/digest-vyqchat-0.2.6 133
+MD5 2364595e42a9358d185885b6f050c8d2 files/vyqchat_packet_id.patch 348
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+MD5 98bb528328cc04720a57e6b1f893417e vyqchat-0.1.1.ebuild 729
+MD5 eb03c125030e89375beee7a0f036b78c vyqchat-0.2.3.ebuild 834
+MD5 d5058045a967ef0d5ab13b51963c90ad vyqchat-0.2.6.ebuild 952
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDJDixI1lqEGTUzyQRAu//AKCn5ZiiJRonUdauQTHBTE7H0b0MZwCfW/nb
+LlFspsFCy4disbupBUY6Tbk=
+=rYB2
+-----END PGP SIGNATURE-----
diff --git a/net-irc/vyqchat/vyqchat-0.1.1.ebuild b/net-irc/vyqchat/vyqchat-0.1.1.ebuild
index 32ceb93be130..b3c78c15b64a 100644
--- a/net-irc/vyqchat/vyqchat-0.1.1.ebuild
+++ b/net-irc/vyqchat/vyqchat-0.1.1.ebuild
@@ -1,32 +1,29 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/vyqchat/vyqchat-0.1.1.ebuild,v 1.1 2003/10/05 17:40:22 gregf Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/vyqchat/vyqchat-0.1.1.ebuild,v 1.1.1.1 2005/11/30 09:48:56 chriswhite Exp $
 
 DESCRIPTION="QT based Vypress Chat clone for X."
 HOMEPAGE="http://linux.bydg.org/~yogin/"
 SRC_URI="http://linux.bydg.org/~yogin/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 IUSE="arts"
 
-DEPEND=">=qt-3.0
-		arts? ( kde-base/arts )"
-RDEPEND="${DEPEND}"
-S=${WORKDIR}/${P}
+DEPEND="=x11-libs/qt-3*
+	arts? ( kde-base/arts )"
 
 src_compile() {
-	local myconf
-	use arts && myconf="--with-arts"
-	./configure  --host=${CHOST} \
-  	--prefix=/usr --infodir=/usr/share/info \
-    --mandir=/usr/share/man --with-x \
-	--with-Qt-dir=/usr/qt/3 ${myconf} || die "./configure failed"
-	emake || die
+	econf \
+		--with-x \
+		--with-Qt-dir=/usr/qt/3 \
+		$(use_with arts) \
+		|| die "econf failed"
+	emake || die "emake failed"
 }
 
 src_install() {
-	einstall || die
-	dodoc README THANKS NEWS
+	make DESTDIR=${D} install || die "make install failed"
+	dodoc README THANKS NEWS || die "dodoc failed"
 }
diff --git a/net-irc/vyqchat/vyqchat-0.2.3.ebuild b/net-irc/vyqchat/vyqchat-0.2.3.ebuild
index 14a964ae9bad..8dbed74ef1de 100644
--- a/net-irc/vyqchat/vyqchat-0.2.3.ebuild
+++ b/net-irc/vyqchat/vyqchat-0.2.3.ebuild
@@ -1,35 +1,38 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/vyqchat/vyqchat-0.2.3.ebuild,v 1.1 2003/12/28 20:32:03 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/vyqchat/vyqchat-0.2.3.ebuild,v 1.1.1.1 2005/11/30 09:48:56 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="QT based Vypress Chat clone for X."
 HOMEPAGE="http://linux.bydg.org/~yogin/"
 SRC_URI="http://linux.bydg.org/~yogin/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 
 IUSE="arts"
 
-DEPEND=">=qt-3.0
-		arts? ( kde-base/arts )"
-RDEPEND="${DEPEND}"
-S=${WORKDIR}/${P}
+DEPEND="=x11-libs/qt-3*
+	arts? ( kde-base/arts )"
 
-src_compile() {
-	local myconf
+src_unpack() {
+	unpack ${A}
+	cd ${S}
 
 	epatch ${FILESDIR}/vyqchat_packet_id.patch
+}
 
-	use arts && myconf="--with-arts"
-	./configure  --host=${CHOST} \
-		--prefix=/usr --infodir=/usr/share/info \
-		--mandir=/usr/share/man --with-x \
-		--with-Qt-dir=/usr/qt/3 ${myconf} || die "./configure failed"
-	make || die
+src_compile() {
+	econf \
+		--with-x \
+		--with-Qt-dir=/usr/qt/3 \
+		$(use_with arts) \
+		|| die "econf failed"
+	make || die "make failed"
 }
 
 src_install() {
-	einstall || die
-	dodoc README THANKS NEWS
+	make DESTDIR=${D} install || die "make install failed"
+	dodoc README THANKS NEWS || die "dodoc failed"
 }
diff --git a/net-irc/vyqchat/vyqchat-0.2.6.ebuild b/net-irc/vyqchat/vyqchat-0.2.6.ebuild
index 9fda67fb8e94..4b534f0134bd 100644
--- a/net-irc/vyqchat/vyqchat-0.2.6.ebuild
+++ b/net-irc/vyqchat/vyqchat-0.2.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/vyqchat/vyqchat-0.2.6.ebuild,v 1.1 2004/07/24 01:14:16 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/vyqchat/vyqchat-0.2.6.ebuild,v 1.1.1.1 2005/11/30 09:48:56 chriswhite Exp $
 
 DESCRIPTION="QT based Vypress Chat clone for X."
 HOMEPAGE="http://linux.bydg.org/~yogin/"
@@ -12,13 +12,17 @@ KEYWORDS="~x86 ~ppc"
 
 IUSE="arts"
 
-DEPEND=">=x11-libs/qt-3.0
+DEPEND="=x11-libs/qt-3*
 	arts? ( kde-base/arts )"
 
 src_unpack() {
 	unpack ${A}
 
 	mv -f ${WORKDIR}/${PN}/* ${S}
+
+	# Package has borked timestamps, bug #60541
+	cd ${S}
+	touch aclocal.m4 configure Makefile.in config.h.in
 }
 
 src_compile() {
@@ -26,7 +30,7 @@ src_compile() {
 		--with-x \
 		--with-Qt-dir=/usr/qt/3 \
 		$(use_with arts) \
-		 || die "econf failed"
+		|| die "econf failed"
 	make || die "make failed"
 }
 
diff --git a/net-irc/weechat/ChangeLog b/net-irc/weechat/ChangeLog
index 55fc32bd2c70..14c00fc756ec 100644
--- a/net-irc/weechat/ChangeLog
+++ b/net-irc/weechat/ChangeLog
@@ -1,6 +1,121 @@
 # ChangeLog for net-irc/weechat
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/ChangeLog,v 1.1 2003/10/17 02:20:10 zul Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/ChangeLog,v 1.1.1.1 2005/11/30 09:48:52 chriswhite Exp $
+
+*weechat-0.1.6 (12 Nov 2005)
+
+  12 Nov 2005; Sven Wegener <swegener@gentoo.org> +weechat-0.1.6.ebuild:
+  Version bump.
+
+  25 Sep 2005; Sven Wegener <swegener@gentoo.org> -weechat-0.1.3.ebuild,
+  -weechat-0.1.4.ebuild:
+  Removed old ebuilds.
+
+*weechat-0.1.5 (24 Sep 2005)
+
+  24 Sep 2005; Sven Wegener <swegener@gentoo.org> weechat-0.1.4-r1.ebuild,
+  +weechat-0.1.5.ebuild:
+  Version bump. 0.1.4-r1 stable on x86.
+
+*weechat-0.1.4-r1 (25 Aug 2005)
+
+  25 Aug 2005; Sven Wegener <swegener@gentoo.org> +weechat-0.1.4-r1.ebuild:
+  Added support for the ssl USE flag, bug #103699.
+
+  01 Aug 2005; Sven Wegener <swegener@gentoo.org> -weechat-0.1.1.ebuild,
+  -weechat-0.1.2.1.ebuild:
+  Removed old ebuilds.
+
+  31 Jul 2005; Sven Wegener <swegener@gentoo.org> weechat-0.1.3.ebuild:
+  Marked stable on x86.
+
+*weechat-0.1.4 (30 Jul 2005)
+
+  30 Jul 2005; Sven Wegener <swegener@gentoo.org> +weechat-0.1.4.ebuild:
+  Version bump.
+
+  07 Jul 2005; Sven Wegener <swegener@gentoo.org> weechat-0.1.2.1.ebuild:
+  Marked stable on x86.
+
+*weechat-0.1.3 (03 Jul 2005)
+
+  03 Jul 2005; Sven Wegener <swegener@gentoo.org> +weechat-0.1.3.ebuild:
+  Version bump.
+
+*weechat-0.1.2.1 (07 Jun 2005)
+
+  07 Jun 2005; Sven Wegener <swegener@gentoo.org> -weechat-0.1.0.ebuild,
+  weechat-0.1.1.ebuild, +weechat-0.1.2.1.ebuild:
+  Version bump, bug #93523. Marked 0.1.1 stable on x86.
+
+  22 Apr 2005; Sven Wegener <swegener@gentoo.org> -weechat-0.0.9.ebuild:
+  Removed old ebuild.
+
+*weechat-0.1.1 (10 Apr 2005)
+
+  10 Apr 2005; Sven Wegener <swegener@gentoo.org> weechat-0.1.0.ebuild,
+  +weechat-0.1.1.ebuild:
+  Version bump. Marked 0.1.0 stable on x86.
+
+  17 Feb 2005; Sven Wegener <swegener@gentoo.org> -weechat-0.0.6.ebuild:
+  Removed old ebuild.
+
+*weechat-0.1.0 (13 Feb 2005)
+
+  13 Feb 2005; Sven Wegener <swegener@gentoo.org> +weechat-0.1.0.ebuild:
+  Version bump.
+
+  07 Feb 2005; Sven Wegener <swegener@gentoo.org> weechat-0.0.9.ebuild:
+  Marked stable on x86.
+
+*weechat-0.0.9 (02 Jan 2005)
+
+  02 Jan 2005; Sven Wegener <swegener@gentoo.org> -weechat-0.0.8.ebuild,
+  +weechat-0.0.9.ebuild:
+  Version bump, bug #76392.
+
+*weechat-0.0.8 (05 Dec 2004)
+
+  05 Dec 2004; Sven Wegener <swegener@gentoo.org> +weechat-0.0.8.ebuild:
+  Version bump. Only includes the ncurses interface as it's the only one being
+  actively developed by upstream maintainers.
+
+  17 Jul 2004; Sven Wegener <swegener@gentoo.org> -weechat-0.0.2.ebuild,
+  -weechat-0.0.3-r1.ebuild, -weechat-0.0.3.ebuild, weechat-0.0.6.ebuild:
+  Removed old ebuilds. Marked 0.0.6 stable on x86.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  weechat-0.0.3-r1.ebuild, weechat-0.0.3.ebuild:
+  virtual/glibc -> virtual/libc
+
+*weechat-0.0.6 (18 Jun 2004)
+
+  18 Jun 2004; Sven Wegener <swegener@gentoo.org> +weechat-0.0.6.ebuild:
+  Version bump. Made CFLAGS aware and added support for the following USE flags:
+  debug, gtk (dropped gtk2 as it's only for using gtk+-2 over gtk+-1.2), perl
+  and ncurses.
+
+  18 Jun 2004; Sven Wegener <swegener@gentoo.org> metadata.xml,
+  weechat-0.0.2.ebuild, weechat-0.0.3-r1.ebuild, weechat-0.0.3.ebuild:
+  Removed S=${WORKDIR}/${P} and assigned to the net-irc herd
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  weechat-0.0.3-r1.ebuild:
+  Masked weechat-0.0.3-r1.ebuild testing for ppc
+
+  10 Dec 2003; Chuck Short <zul@gentoo.org> weechat-0.0.3-r1.ebuild:
+  Typos fixed.
+
+*weechat-0.0.3-r1 (09 Dec 2003)
+
+  09 Dec 2003; Chuck Short <zul@gentoo.org> weechat-0.0.3-r1.ebuild:
+  Added gtk2 support.
+
+*weechat-0.0.3 (09 Dec 2003)
+
+  09 Dec 2003; Chuck Short <zul@gentoo.org> weechat-0.0.2.ebuild,
+  weechat-0.0.3.ebuild:
+  Version bump, previous version marked stable.
 
 *weechat-0.0.2 (16 Oct 2003)
 
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index 7234f2bc78c0..4354df0fea85 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,3 +1,18 @@
-MD5 afddc95d6155ff2c3f42a36223810892 weechat-0.0.2.ebuild 509
-MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
-MD5 26ab708340fd29aff65a984428e2cbf3 files/digest-weechat-0.0.2 65
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6cd24e4aa4694275997c076c9bf8a1ab ChangeLog 4030
+MD5 8c846b3638336433f2ed2b6347f395da files/digest-weechat-0.1.4-r1 66
+MD5 18c2d69cbabcd2a000e05325e95a7a09 files/digest-weechat-0.1.5 66
+MD5 3364fc93ef3709ea1841f63b43b905f4 files/digest-weechat-0.1.6 66
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+MD5 4660abee3ad4b4bb9726ad949053ae39 weechat-0.1.4-r1.ebuild 918
+MD5 8a36aff291b094d56ae553c3cf3933c7 weechat-0.1.5.ebuild 916
+MD5 47e0a2d2024ec0e216603142fdd89503 weechat-0.1.6.ebuild 969
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDdUuKI1lqEGTUzyQRAmNVAJ9/eOwnwKuipcuf5q0X1hyZ+2BnswCeNioc
+HQcC7sMnGsRPrCcUTR6EmRI=
+=76+e
+-----END PGP SIGNATURE-----
diff --git a/net-irc/weechat/metadata.xml b/net-irc/weechat/metadata.xml
index 20ce219711a2..6ef15e900f17 100644
--- a/net-irc/weechat/metadata.xml
+++ b/net-irc/weechat/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
+<herd>net-irc</herd>
 </pkgmetadata>
diff --git a/net-irc/weechat/weechat-0.1.4-r1.ebuild b/net-irc/weechat/weechat-0.1.4-r1.ebuild
index 97819326491c..82393042be49 100644
--- a/net-irc/weechat/weechat-0.1.4-r1.ebuild
+++ b/net-irc/weechat/weechat-0.1.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-0.1.4-r1.ebuild,v 1.1 2005/08/25 20:29:14 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-0.1.4-r1.ebuild,v 1.1.1.1 2005/11/30 09:48:52 chriswhite Exp $
 
 DESCRIPTION="Portable and multi-interface IRC client."
 HOMEPAGE="http://weechat.flashtux.org/"
@@ -8,7 +8,7 @@ SRC_URI="http://weechat.flashtux.org/download/${P}.tar.bz2"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 IUSE="debug perl python ssl"
 
 DEPEND="sys-libs/ncurses
diff --git a/net-irc/weechat/weechat-0.1.5.ebuild b/net-irc/weechat/weechat-0.1.5.ebuild
index 6b128c9fccb0..62304c89a5c6 100644
--- a/net-irc/weechat/weechat-0.1.5.ebuild
+++ b/net-irc/weechat/weechat-0.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-0.1.5.ebuild,v 1.1 2005/09/24 13:18:28 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-0.1.5.ebuild,v 1.1.1.1 2005/11/30 09:48:52 chriswhite Exp $
 
 DESCRIPTION="Portable and multi-interface IRC client."
 HOMEPAGE="http://weechat.flashtux.org/"
diff --git a/net-irc/weechat/weechat-0.1.6.ebuild b/net-irc/weechat/weechat-0.1.6.ebuild
index 6c904147d6f7..c471370e94e5 100644
--- a/net-irc/weechat/weechat-0.1.6.ebuild
+++ b/net-irc/weechat/weechat-0.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-0.1.6.ebuild,v 1.1 2005/11/12 01:55:11 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-0.1.6.ebuild,v 1.1.1.1 2005/11/30 09:48:52 chriswhite Exp $
 
 DESCRIPTION="Portable and multi-interface IRC client."
 HOMEPAGE="http://weechat.flashtux.org/"
diff --git a/net-irc/xchat-gnome/ChangeLog b/net-irc/xchat-gnome/ChangeLog
index 41ba7fec92dd..c260de010ad5 100644
--- a/net-irc/xchat-gnome/ChangeLog
+++ b/net-irc/xchat-gnome/ChangeLog
@@ -1,6 +1,29 @@
 # ChangeLog for net-irc/xchat-gnome
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/ChangeLog,v 1.1 2005/05/14 23:01:57 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/ChangeLog,v 1.1.1.1 2005/11/30 09:48:58 chriswhite Exp $
+
+*xchat-gnome-0.6 (03 Nov 2005)
+
+  03 Nov 2005; Sven Wegener <swegener@gentoo.org> +xchat-gnome-0.6.ebuild:
+  Version bump, bug #110766
+
+*xchat-gnome-0.5 (28 Aug 2005)
+
+  28 Aug 2005; Tony Vroon <chainsaw@gentoo.org> +xchat-gnome-0.5.ebuild:
+  Version bump.
+
+  26 Jun 2005; Tony Vroon <chainsaw@gentoo.org> xchat-gnome-0.4.ebuild:
+  Mark ~ppc.
+
+  21 Jun 2005; Sven Wegener <swegener@gentoo.org> xchat-gnome-0.4.ebuild:
+  Additional dependencies for bug #96689.
+
+  18 May 2005; <dang@gentoo.org> xchat-gnome-0.4.ebuild:
+  Add ~amd64
+
+  15 May 2005; Sven Wegener <swegener@gentoo.org> xchat-gnome-0.4.ebuild:
+  Disabled the gtk and text frontends, if users want them they should use
+  plain net-irc/xchat instead.
 
 *xchat-gnome-0.4 (14 May 2005)
 
diff --git a/net-irc/xchat-gnome/Manifest b/net-irc/xchat-gnome/Manifest
index e69de29bb2d1..4100dc392516 100644
--- a/net-irc/xchat-gnome/Manifest
+++ b/net-irc/xchat-gnome/Manifest
@@ -0,0 +1,8 @@
+MD5 7e70c0c7efa546c90458e5832f63a3d5 ChangeLog 1130
+MD5 6b74f53c26e12ea2bc55b54b33ada601 files/digest-xchat-gnome-0.4 69
+MD5 ba4f8ea248bc0fbcb776188ff3378f5f files/digest-xchat-gnome-0.5 69
+MD5 96c43ae259f40b55469226fdc18f26c9 files/digest-xchat-gnome-0.6 69
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+MD5 ea5d21ed4c3fafc70d7aa442f7a64730 xchat-gnome-0.4.ebuild 1667
+MD5 56cd43f4d2579e3c7e7b26beb3c9b5fe xchat-gnome-0.5.ebuild 1667
+MD5 09539bbeae697f7de7b0352190ca4d02 xchat-gnome-0.6.ebuild 1739
diff --git a/net-irc/xchat-gnome/xchat-gnome-0.4.ebuild b/net-irc/xchat-gnome/xchat-gnome-0.4.ebuild
index 1eff1f8cadd1..633d78229608 100644
--- a/net-irc/xchat-gnome/xchat-gnome-0.4.ebuild
+++ b/net-irc/xchat-gnome/xchat-gnome-0.4.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/xchat-gnome-0.4.ebuild,v 1.1 2005/05/14 23:01:57 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/xchat-gnome-0.4.ebuild,v 1.1.1.1 2005/11/30 09:48:58 chriswhite Exp $
+
+inherit gnome2
 
 DESCRIPTION="GNOME frontend for the popular X-Chat IRC client"
 HOMEPAGE="http://xchat-gnome.navi.cx/"
@@ -8,10 +10,15 @@ SRC_URI="http://flapjack.navi.cx/releases/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64 ~ppc"
 IUSE="perl tcltk python ssl mmx ipv6 nls"
 
 RDEPEND=">=dev-libs/glib-2.0.3
+	>=gnome-base/libgnome-2
+	>=gnome-base/gconf-2
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/libglade-2
+	>=gnome-base/gnome-vfs-2
 	ssl? ( >=dev-libs/openssl-0.9.6d )
 	perl? ( >=dev-lang/perl-5.6.1 )
 	python? ( dev-lang/python )
@@ -23,7 +30,11 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 src_compile() {
+	# We disable gtkfe and textfe, if you want them please use net-irc/xchat instead!
 	econf \
+		--disable-textfe \
+		--disable-gtkfe \
+		--enable-gnomefe \
 		$(use_enable ssl openssl) \
 		$(use_enable perl) \
 		$(use_enable python) \
@@ -31,17 +42,24 @@ src_compile() {
 		$(use_enable mmx) \
 		$(use_enable ipv6) \
 		$(use_enable nls) \
-		$(use_enable xft) \
 		|| die "econf failed"
 	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "make install"
+	make DESTDIR="${D}" install || die "make install"
+
+	rm -f \
+		"${D}"/usr/share/applications/xchat.desktop \
+		"${D}"/usr/share/pixmaps/xchat.png
 
 	# install plugin development header
 	insinto /usr/include/xchat
 	doins src/common/xchat-plugin.h || die "doins failed"
 
-	dodoc ChangeLog README* || die "dodoc failed"
+	dodoc src/fe-gnome/{BUGS,ChangeLog,TODO} || die "dodoc failed"
+}
+
+pkg_postinst() {
+	gnome2_gconf_install
 }
diff --git a/net-irc/xchat-gnome/xchat-gnome-0.5.ebuild b/net-irc/xchat-gnome/xchat-gnome-0.5.ebuild
index 1c7bfa5cc000..d67192cc2fa3 100644
--- a/net-irc/xchat-gnome/xchat-gnome-0.5.ebuild
+++ b/net-irc/xchat-gnome/xchat-gnome-0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/xchat-gnome-0.5.ebuild,v 1.1 2005/08/28 12:06:10 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/xchat-gnome-0.5.ebuild,v 1.1.1.1 2005/11/30 09:48:58 chriswhite Exp $
 
 inherit gnome2
 
diff --git a/net-irc/xchat-gnome/xchat-gnome-0.6.ebuild b/net-irc/xchat-gnome/xchat-gnome-0.6.ebuild
index 38416cfffb43..d7d31fa93433 100644
--- a/net-irc/xchat-gnome/xchat-gnome-0.6.ebuild
+++ b/net-irc/xchat-gnome/xchat-gnome-0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/xchat-gnome-0.6.ebuild,v 1.1 2005/11/03 07:33:46 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/xchat-gnome-0.6.ebuild,v 1.1.1.1 2005/11/30 09:48:58 chriswhite Exp $
 
 inherit gnome2
 
diff --git a/net-irc/xchat-systray/ChangeLog b/net-irc/xchat-systray/ChangeLog
index 0e05dbbecb2e..312f86005630 100644
--- a/net-irc/xchat-systray/ChangeLog
+++ b/net-irc/xchat-systray/ChangeLog
@@ -1,6 +1,106 @@
 # ChangeLog for net-irc/xchat-systray
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-systray/ChangeLog,v 1.1 2003/08/30 17:34:03 brad Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-systray/ChangeLog,v 1.1.1.1 2005/11/30 09:49:02 chriswhite Exp $
+
+  25 Oct 2005; Luis Medinas <metalgod@gentoo.org>
+  xchat-systray-2.4.5-r2.ebuild:
+  Marked Stable on amd64.
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org>
+  xchat-systray-2.4.5-r2.ebuild:
+  Mark 2.4.5-r2 stable on alpha
+
+  11 Sep 2005; Guy Martin <gmsoft@gentoo.org> xchat-systray-2.4.5-r2.ebuild:
+  Stable on hppa.
+
+  07 Jul 2005; Sven Wegener <swegener@gentoo.org>
+  xchat-systray-2.4.5-r2.ebuild:
+  Marked stable on x86.
+
+  21 Jun 2005; Sven Wegener <swegener@gentoo.org>
+  xchat-systray-2.4.5-r1.ebuild, xchat-systray-2.4.5-r2.ebuild:
+  Adjusted dependencies to work with net-irc/xchat-gnome.
+
+*xchat-systray-2.4.5-r2 (09 Jun 2005)
+
+  09 Jun 2005; Sven Wegener <swegener@gentoo.org>
+  +files/2.4.5-default-icons.patch, +xchat-systray-2.4.5-r2.ebuild:
+  Revision bump to pull in a patch that uses the packaged icons as a default
+  setting and fallback, if the user supplied directory is not accessible.
+
+  08 Jun 2005; Sven Wegener <swegener@gentoo.org>
+  xchat-systray-2.4.5-r1.ebuild:
+  Adjusted the pkg_postinst message a bit, bug #95460.
+
+  16 May 2005; Sven Wegener <swegener@gentoo.org>
+  xchat-systray-2.4.5-r1.ebuild:
+  General cleanup.
+
+  01 Jan 2005; Sven Wegener <swegener@gentoo.org>
+  xchat-systray-2.4.5-r1.ebuild:
+  Added more error checking. Use doins -r to install files.
+
+  26 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xchat-systray-2.4.5-r1.ebuild:
+  Multilib fixin.
+
+  12 Sep 2004; Sven Wegener <swegener@gentoo.org> -xchat-systray-2.3.1.ebuild,
+  -xchat-systray-2.4.0.ebuild:
+  Removed old ebuilds.
+
+  05 Sep 2004; Guy Martin <gmsoft@gentoo.org> xchat-systray-2.4.5-r1.ebuild:
+  Stable on hppa.
+
+*xchat-systray-2.4.5-r1 (25 Aug 2004)
+
+  25 Aug 2004; Sven Wegener <swegener@gentoo.org>
+  +files/2.4.5-segfault-fix.patch, +xchat-systray-2.4.5-r1.ebuild,
+  -xchat-systray-2.4.5.ebuild:
+  Revision bump for a patch that fixes segfaults on executing browser, mail
+  client and multimedia player. Closes bug #61521.
+
+  24 Aug 2004; Sven Wegener <swegener@gentoo.org> xchat-systray-2.4.5.ebuild:
+  Stable on x86.
+
+  06 Aug 2004; Sven Wegener <swegener@gentoo.org> xchat-systray-2.4.5.ebuild:
+  Added IUSE=""
+
+  24 Jul 2004; Sven Wegener <swegener@gentoo.org> xchat-systray-2.4.0.ebuild:
+  Stable on x86.
+
+  23 Jul 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  xchat-systray-2.4.5.ebuild:
+  KEYWORDED to ~amd64.
+
+*xchat-systray-2.4.5 (21 Jul 2004)
+
+  21 Jul 2004; Sven Wegener <swegener@gentoo.org> +xchat-systray-2.4.5.ebuild:
+  Version bump, closes bug #55610.
+
+  21 Jul 2004; Sven Wegener <swegener@gentoo.org> xchat-systray-2.3.1.ebuild,
+  xchat-systray-2.4.0.ebuild:
+  Don't override "MAKEOPTS". Moved net-irc/xchat into "RDEPEND" and "DEPEND".
+  Made CFLAGS aware.
+
+  21 Jul 2004; Sven Wegener <swegener@gentoo.org> metadata.xml:
+  Moved package to the net-irc herd.
+
+  21 Jun 2004; Sven Wegener <swegener@gentoo.org> xchat-systray-2.3.1.ebuild,
+  xchat-systray-2.4.0.ebuild:
+  Added IUSE=""
+
+  11 Jan 2004; Markus Nigbur <pyrania@gentoo.org> xchat-systray-2.3.1.ebuild,
+  xchat-systray-2.4.0.ebuild:
+  SLOT fix in 2.3.1. Added ~ppc, ~sparc, ~alpha and ~hppa to 2.4.0.
+
+*xchat-systray-2.4.0 (04 Jan 2004)
+
+  04 Jan 2004; Markus Nigbur <pyrania@gentoo.org> xchat-systray-2.3.1.ebuild,
+  xchat-systray-2.4.0.ebuild:
+  Version bump, header update and ebuild cleanups.
+
+  22 Sep 2003; <paul@gentoo.org> metadata.xml:
+  Fix metadata.xml
 
 *xchat-systray-2.3.1 (30 Aug 2003)
 
diff --git a/net-irc/xchat-systray/Manifest b/net-irc/xchat-systray/Manifest
index 2ded3087b11f..81e0434f1b02 100644
--- a/net-irc/xchat-systray/Manifest
+++ b/net-irc/xchat-systray/Manifest
@@ -1,2 +1,16 @@
-MD5 d64fdca0d64aa63dd704ea743d3a25cd xchat-systray-2.3.1.ebuild 763
-MD5 9a65d335f20aacff5764eae11d496abc files/digest-xchat-systray-2.3.1 77
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7bd259fae282f903024293a3b3637c36 ChangeLog 3758
+MD5 6a371b158e1a26ecf0077fa030a6b316 files/2.4.5-default-icons.patch 1717
+MD5 f9fec2befb2bf0b3888f017d37a36a17 files/2.4.5-segfault-fix.patch 702
+MD5 c7f2d25da598195290d93a826f3a99c3 files/digest-xchat-systray-2.4.5-r2 86
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+MD5 91ff5370bda99a17f838e8ef6e740a3c xchat-systray-2.4.5-r2.ebuild 1246
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDXjp8wUpWvClEHQoRAuUSAJ4j4BtlHoLgNCoo8ZfOGZEGkAWBKgCfY79x
+ARdFlqHdH+MPFJQMPGcXLqM=
+=v6hT
+-----END PGP SIGNATURE-----
diff --git a/net-irc/xchat-systray/metadata.xml b/net-irc/xchat-systray/metadata.xml
index f68c4ced170f..6ef15e900f17 100644
--- a/net-irc/xchat-systray/metadata.xml
+++ b/net-irc/xchat-systray/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>brad@gentoo.org</maintainer>
+<herd>net-irc</herd>
 </pkgmetadata>
diff --git a/net-irc/xchat-systray/xchat-systray-2.4.5-r2.ebuild b/net-irc/xchat-systray/xchat-systray-2.4.5-r2.ebuild
index 24d6327b3828..c9bf3a907b67 100644
--- a/net-irc/xchat-systray/xchat-systray-2.4.5-r2.ebuild
+++ b/net-irc/xchat-systray/xchat-systray-2.4.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-systray/xchat-systray-2.4.5-r2.ebuild,v 1.1 2005/06/09 16:37:16 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-systray/xchat-systray-2.4.5-r2.ebuild,v 1.1.1.1 2005/11/30 09:49:02 chriswhite Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -12,12 +12,15 @@ HOMEPAGE="http://blight.altervista.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~hppa"
+KEYWORDS="alpha amd64 hppa ~ppc ~sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.0.3
 	>=x11-libs/gtk+-2.0.3
-	>=net-irc/xchat-2.0.3"
+	|| (
+		>=net-irc/xchat-2.0.3
+		>=net-irc/xchat-gnome-0.4
+	)"
 
 DEPEND="${RDEPEND}
 	sys-devel/gettext
@@ -47,13 +50,3 @@ src_install() {
 
 	dodoc Docs/{ChangeLog,README,TODO} || die "dodoc failed"
 }
-
-pkg_postinst() {
-	einfo
-	einfo "The icons have been installed in /usr/share/xchat-systray"
-	einfo
-	einfo "The icons path is a per-user setting and you need to set it or the icons"
-	einfo "will not show up in the menu. Please go to 'Systray settings' and set"
-	einfo "'Select icons path' to /usr/share/xchat-systray to set the icons path."
-	einfo
-}
diff --git a/net-irc/xchat-xsys/ChangeLog b/net-irc/xchat-xsys/ChangeLog
index 83088c1cab00..b047f0b79c1b 100644
--- a/net-irc/xchat-xsys/ChangeLog
+++ b/net-irc/xchat-xsys/ChangeLog
@@ -1,6 +1,176 @@
 # ChangeLog for net-irc/xchat-xsys
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-xsys/ChangeLog,v 1.1 2004/10/30 22:21:17 chainsaw Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-xsys/ChangeLog,v 1.1.1.1 2005/11/30 09:49:02 chriswhite Exp $
+
+  14 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  xchat-xsys-2.0.9.ebuild:
+  Back to ~sparc wrt #112452
+
+  14 Nov 2005; Brent Baude <ranger@gentoo.org> xchat-xsys-2.0.9.ebuild:
+  marking xchat-xsys-2.0.9 ~ppc64 for bug request 112452
+
+*xchat-xsys-2.0.9 (13 Nov 2005)
+
+  13 Nov 2005; <chainsaw@gentoo.org> +xchat-xsys-2.0.9.ebuild:
+  Version bump, now with support for audacious. Had to drop ~alpha, ~ppc64 &
+  ~sparc keywords because of this.
+
+*xchat-xsys-2.0.8-r1 (17 Oct 2005)
+
+  17 Oct 2005; Tony Vroon <chainsaw@gentoo.org>
+  +files/2.0.8-pciutils-headerchange.patch, -xchat-xsys-2.0.8.ebuild,
+  +xchat-xsys-2.0.8-r1.ebuild:
+  Add patch to deal with incompatible header changes in version 2.2.0 of
+  pciutils.
+
+  29 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  xchat-xsys-2.0.8.ebuild:
+  Stable on sparc
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> xchat-xsys-2.0.7.ebuild:
+  Mark 2.0.7 stable on alpha
+
+  10 Sep 2005; Tony Vroon <chainsaw@gentoo.org> xchat-xsys-2.0.7.ebuild:
+  Stable on amd64.
+
+  03 Sep 2005; Markus Rothe <corsair@gentoo.org> xchat-xsys-2.0.7.ebuild:
+  Stable on ppc64
+
+  26 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  xchat-xsys-2.0.8.ebuild:
+  Keyworded ~sparc
+
+*xchat-xsys-2.0.8 (25 Aug 2005)
+
+  25 Aug 2005; Tony Vroon <chainsaw@gentoo.org> xchat-xsys-2.0.7.ebuild,
+  +xchat-xsys-2.0.8.ebuild:
+  Version bump to 2.0.8; sparc support by gustavoz. 2.0.7 stable on x86.
+
+  21 Jul 2005; Markus Rothe <corsair@gentoo.org> xchat-xsys-2.0.6-r1.ebuild:
+  Stable on ppc64
+
+  18 Jul 2005; Tony Vroon <chainsaw@gentoo.org>
+  +files/2.0.7-glib_version.patch, xchat-xsys-2.0.7.ebuild:
+  Make the XMMS side of things actually work, thanks to a patch from Morten
+  Cools <morten@cools.no>; closes bug #99460.
+
+*xchat-xsys-2.0.7 (17 Jul 2005)
+
+  17 Jul 2005; Tony Vroon <chainsaw@gentoo.org> -xchat-xsys-2.0.5.ebuild,
+  xchat-xsys-2.0.6-r1.ebuild, +xchat-xsys-2.0.7.ebuild:
+  Version bump. 2.0.6-r1 stable on x86, old ebuild cleaned.
+
+  21 Jun 2005; Sven Wegener <swegener@gentoo.org> xchat-xsys-2.0.5.ebuild,
+  xchat-xsys-2.0.6-r1.ebuild:
+  Adjusted dependencies to work with net-irc/xchat-gnome.
+
+*xchat-xsys-2.0.6-r1 (20 Jun 2005)
+
+  20 Jun 2005; Tony Vroon <chainsaw@gentoo.org>
+  +files/2.0.6-localisation.patch, -xchat-xsys-2.0.6.ebuild,
+  +xchat-xsys-2.0.6-r1.ebuild:
+  Bump to close bug #96586; patch forces LC_ALL=C on df call.
+
+*xchat-xsys-2.0.6 (19 Jun 2005)
+
+  19 Jun 2005; Tony Vroon <chainsaw@gentoo.org>
+  -files/1.9.3-ppc-support.patch,
+  -files/1.9.3-sysfs-instead-of-lspci-2.patch, -xchat-xsys-1.9.3-r1.ebuild,
+  -xchat-xsys-2.0.0-r1.ebuild, -xchat-xsys-2.0.2.ebuild,
+  -xchat-xsys-2.0.4.ebuild, xchat-xsys-2.0.5.ebuild,
+  +xchat-xsys-2.0.6.ebuild:
+  Version bump, no longer requires a 2.6 kernel. 2.0.5 stable on x86. Clean up
+  old ebuilds.
+
+  14 Jun 2005; Markus Rothe <corsair@gentoo.org> xchat-xsys-2.0.5.ebuild:
+  Added ~ppc64
+
+  13 Jun 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  xchat-xsys-2.0.5.ebuild:
+  keyworded ~alpha
+
+*xchat-xsys-2.0.5 (13 Jun 2005)
+
+  13 Jun 2005; Tony Vroon <chainsaw@gentoo.org> +xchat-xsys-2.0.5.ebuild:
+  Version bump. PCI parser probes higher bus numbers for ppc64. Experimental
+  support for ppc64, ia64 & hppa architectures. Please test.
+
+*xchat-xsys-2.0.4 (06 Jun 2005)
+
+  06 Jun 2005; Tony Vroon <chainsaw@gentoo.org> +xchat-xsys-2.0.4.ebuild:
+  Version bump. New matching code in use.
+
+*xchat-xsys-2.0.2 (30 May 2005)
+
+  30 May 2005; Tony Vroon <chainsaw@gentoo.org> +xchat-xsys-2.0.2.ebuild:
+  Version bump. Buttons near nicklist now optional.
+
+*xchat-xsys-2.0.0-r1 (20 May 2005)
+
+  20 May 2005; Tony Vroon <chainsaw@gentoo.org> -xchat-xsys-2.0.0.ebuild,
+  +xchat-xsys-2.0.0-r1.ebuild:
+  Honour user CFLAGS, get pci.ids path right.
+
+*xchat-xsys-2.0.0 (20 May 2005)
+
+  20 May 2005; Tony Vroon <chainsaw@gentoo.org> +xchat-xsys-2.0.0.ebuild:
+  Version bump. Took upstream maintainership.
+
+  16 May 2005; Sven Wegener <swegener@gentoo.org>
+  -files/1.9.1-bmp-support.patch, -files/1.9.3-sysfs-instead-of-lspci.patch,
+  -xchat-xsys-1.9.3.ebuild, xchat-xsys-1.9.3-r1.ebuild:
+  Removed old ebuild. Some general cleanup.
+
+*xchat-xsys-1.9.3-r1 (14 May 2005)
+
+  14 May 2005; Tony Vroon <chainsaw@gentoo.org>
+  +files/1.9.3-sysfs-instead-of-lspci-2.patch,
+  +files/1.9.3-ppc-support.patch, -xchat-xsys-1.9.1.ebuild,
+  -xchat-xsys-1.9.1-r1.ebuild, xchat-xsys-1.9.3.ebuild,
+  +xchat-xsys-1.9.3-r1.ebuild:
+  1.9.3 stable on x86. Add -r1 with ppc support. Old ebuilds cleaned.
+
+  17 Apr 2005; Tony Vroon <chainsaw@gentoo.org>
+  files/1.9.3-sysfs-instead-of-lspci.patch:
+  Improved /sys parser with higher yield, will also pick up PCI adapters and
+  integrated video adapters. Unmasking.
+
+  17 Apr 2005; Tony Vroon <chainsaw@gentoo.org>
+  files/1.9.3-sysfs-instead-of-lspci.patch:
+  Update sysfs patch, avoid matching incorrect data in pci.ids. Still masked.
+
+*xchat-xsys-1.9.3 (16 Apr 2005)
+
+  16 Apr 2005; Tony Vroon <chainsaw@gentoo.org>
+  +files/1.9.3-sysfs-instead-of-lspci.patch, +xchat-xsys-1.9.3.ebuild:
+  Version bump, with experimental patch to remove the lspci dependancy and use
+  sysfs tree walking instead.
+
+*xchat-xsys-1.9.1-r1 (16 Jan 2005)
+
+  16 Jan 2005; Tony Vroon <chainsaw@gentoo.org>
+  +files/1.9.1-bmp-support.patch, -xchat-xsys-1.0.6.ebuild,
+  -xchat-xsys-1.9.0.ebuild, +xchat-xsys-1.9.1-r1.ebuild,
+  xchat-xsys-1.9.1.ebuild:
+  Added BMP/XMMS support via infopipe. 1.9.1 stable on x86. Old ebuilds cleaned.
+
+*xchat-xsys-1.9.1 (26 Dec 2004)
+
+  26 Dec 2004; Tony Vroon <chainsaw@gentoo.org> +xchat-xsys-1.9.1.ebuild:
+  Version bump.
+
+  26 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xchat-xsys-1.9.0.ebuild:
+  Added to ~amd64.  multilib aware.
+
+*xchat-xsys-1.9.0 (19 Dec 2004)
+
+  19 Dec 2004; Tony Vroon <chainsaw@gentoo.org> +xchat-xsys-1.9.0.ebuild:
+  Version bump to 1.9.0 release by Michael Shoup, beta for version 2. Not all
+  features are available yet.
+
+  16 Dec 2004; Tony Vroon <chainsaw@gentoo.org> xchat-xsys-1.0.6.ebuild:
+  Stable on x86.
 
 *xchat-xsys-1.0.6 (30 Oct 2004)
 
diff --git a/net-irc/xchat-xsys/Manifest b/net-irc/xchat-xsys/Manifest
index a7d5d4d16de4..e507740e594b 100644
--- a/net-irc/xchat-xsys/Manifest
+++ b/net-irc/xchat-xsys/Manifest
@@ -1,2 +1,23 @@
-MD5 4ed100130cccedcce926191ffc5d84ef xchat-xsys-1.0.6.ebuild 877
-MD5 d17f93776f6856c326d07b3ac7526e14 files/digest-xchat-xsys-1.0.6 62
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e67b7128df0a8928c0d1021dcb77fb75 xchat-xsys-2.0.7.ebuild 1240
+MD5 0cb58eb8786af66b2eeb6a1acd2369ab xchat-xsys-2.0.9.ebuild 1324
+MD5 a563d391446bb6552d5122e71ae33f2f xchat-xsys-2.0.8-r1.ebuild 1262
+MD5 b971879c0dd67f09cf96bf9d7b5b895a xchat-xsys-2.0.6-r1.ebuild 1115
+MD5 4980e7204404ae2f2b49a513d4501789 ChangeLog 6320
+MD5 42cef2da59c81f792584c3f9048a1930 metadata.xml 250
+MD5 f0b1aadf9019a28c3ba07db0e7d4dba5 files/2.0.6-localisation.patch 357
+MD5 842385c4ed19ac2862c9357e7692236b files/digest-xchat-xsys-2.0.7 62
+MD5 14cb2e91d7498a94eb0e67414e913265 files/digest-xchat-xsys-2.0.9 62
+MD5 1de97edb2d041cca4334dd08150c8223 files/2.0.8-pciutils-headerchange.patch 2227
+MD5 cfd00aeca2a4bbf333f23e4f44bb9feb files/digest-xchat-xsys-2.0.6-r1 62
+MD5 449c51eef89c22687a69cacd25d18068 files/digest-xchat-xsys-2.0.8-r1 62
+MD5 9265f3c810174109111187f857dfdb8f files/2.0.7-glib_version.patch 728
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDeMSwKRy60XGEcJIRAinYAJ0QrONue2kVskJNaA+O0AklkMfp4wCfS/7m
+xDIF2u+zQ6nGXdsUskB06iw=
+=fROR
+-----END PGP SIGNATURE-----
diff --git a/net-irc/xchat-xsys/xchat-xsys-2.0.6-r1.ebuild b/net-irc/xchat-xsys/xchat-xsys-2.0.6-r1.ebuild
index b590704d3604..f96d226fc218 100644
--- a/net-irc/xchat-xsys/xchat-xsys-2.0.6-r1.ebuild
+++ b/net-irc/xchat-xsys/xchat-xsys-2.0.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-xsys/xchat-xsys-2.0.6-r1.ebuild,v 1.1 2005/06/20 18:49:00 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-xsys/xchat-xsys-2.0.6-r1.ebuild,v 1.1.1.1 2005/11/30 09:49:02 chriswhite Exp $
 
 inherit toolchain-funcs eutils
 
@@ -12,10 +12,13 @@ HOMEPAGE="http://dev.gentoo.org/~chainsaw/xsys/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ppc64 x86"
 IUSE="bmp xmms buttons"
 
-DEPEND=">=net-irc/xchat-2.4.0
+DEPEND="|| (
+		>=net-irc/xchat-2.4.0
+		>=net-irc/xchat-gnome-0.4
+	)
 	sys-apps/pciutils
 	bmp? ( media-plugins/bmp-infopipe )
 	xmms? ( media-plugins/xmms-infopipe )"
diff --git a/net-irc/xchat-xsys/xchat-xsys-2.0.7.ebuild b/net-irc/xchat-xsys/xchat-xsys-2.0.7.ebuild
index 8626a3d15eb5..57cd904cda99 100644
--- a/net-irc/xchat-xsys/xchat-xsys-2.0.7.ebuild
+++ b/net-irc/xchat-xsys/xchat-xsys-2.0.7.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-xsys/xchat-xsys-2.0.7.ebuild,v 1.1 2005/07/17 18:45:37 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-xsys/xchat-xsys-2.0.7.ebuild,v 1.1.1.1 2005/11/30 09:49:02 chriswhite Exp $
 
 inherit toolchain-funcs eutils
 
 MY_P="${P/xchat-/}"
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="Sysinfo plugin for X-Chat."
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2 http://dev.gentoo.org/~chainsaw/xsys/download/${MY_P}.tar.bz2"
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
 HOMEPAGE="http://dev.gentoo.org/~chainsaw/xsys/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="alpha amd64 ~ppc ppc64 x86"
 IUSE="bmp xmms buttons"
 
 DEPEND="|| (
@@ -32,6 +32,7 @@ src_unpack() {
 	if use bmp; then
 		sed -i -e "s:# FOR BMP # ::g" ${S}/Makefile
 	elif use xmms; then
+		epatch ${FILESDIR}/${PV}-glib_version.patch
 		sed -i -e "s:# FOR XMMS # ::g" ${S}/Makefile
 	fi
 }
diff --git a/net-irc/xchat-xsys/xchat-xsys-2.0.8-r1.ebuild b/net-irc/xchat-xsys/xchat-xsys-2.0.8-r1.ebuild
index eaac062c441f..3a020a54e72c 100644
--- a/net-irc/xchat-xsys/xchat-xsys-2.0.8-r1.ebuild
+++ b/net-irc/xchat-xsys/xchat-xsys-2.0.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-xsys/xchat-xsys-2.0.8-r1.ebuild,v 1.1 2005/10/17 18:24:03 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-xsys/xchat-xsys-2.0.8-r1.ebuild,v 1.1.1.1 2005/11/30 09:49:02 chriswhite Exp $
 
 inherit toolchain-funcs eutils
 
diff --git a/net-irc/xchat-xsys/xchat-xsys-2.0.9.ebuild b/net-irc/xchat-xsys/xchat-xsys-2.0.9.ebuild
index 895dfada27bf..aa610da1772e 100644
--- a/net-irc/xchat-xsys/xchat-xsys-2.0.9.ebuild
+++ b/net-irc/xchat-xsys/xchat-xsys-2.0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-xsys/xchat-xsys-2.0.9.ebuild,v 1.1 2005/11/13 22:09:53 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-xsys/xchat-xsys-2.0.9.ebuild,v 1.1.1.1 2005/11/30 09:49:02 chriswhite Exp $
 
 inherit toolchain-funcs eutils
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://dev.gentoo.org/~chainsaw/xsys/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="audacious bmp buttons xmms"
 
 DEPEND="|| (
diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index 79ffca9f9d3a..f55cadaed140 100644
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,13 +1,801 @@
 # ChangeLog for net-irc/xchat
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.1 2002/02/01 21:53:33 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.1.1.1 2005/11/30 09:48:51 chriswhite Exp $
 
-*xchat-1.8.7-r1 (1 Feb 2002)
+  16 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> xchat-2.4.5.ebuild:
+  -sparc wrt #109744
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  11 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> xchat-2.4.5.ebuild:
+  Stable on hppa, ppc.
+
+  05 Nov 2005; Stephen P. Becker <geoman@gentoo.org> xchat-2.6.0.ebuild:
+  added ~mips keyword, bug 111322
+
+  04 Nov 2005; Sven Wegener <swegener@gentoo.org>
+  +files/xc260-fix-fetext.diff, xchat-2.6.0.ebuild:
+  Pull in a patch from upstream to fix text frontend building.
+
+*xchat-2.6.0 (03 Nov 2005)
+
+  03 Nov 2005; Sven Wegener <swegener@gentoo.org>
+  -xchat-2.5.0_pre20051013.ebuild, +xchat-2.6.0.ebuild:
+  Version bump.
+
+  19 Oct 2005; Ferris McCormick <fmccor@gentoo.org> xchat-2.4.5.ebuild:
+  Reverting to ~sparc for more testing.  On a few systems, under as yet unknown
+  context, xchat-2.4.5 generates a Bus Error when it tries to connect.  Details
+  not yet known.
+
+  18 Oct 2005; Luis Medinas <metalgod@gentoo.org> xchat-2.4.5.ebuild:
+  Marked Stable on amd64.
+
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org> xchat-2.4.5.ebuild:
+  Mark 2.4.5 stable on alpha
+
+  13 Oct 2005; Aron Griffis <agriffis@gentoo.org> xchat-2.4.5.ebuild:
+  Mark 2.4.5 stable on ia64
+
+  13 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> xchat-2.4.5.ebuild:
+  Stable on sparc
+
+  13 Oct 2005; Sven Wegener <swegener@gentoo.org> xchat-2.4.5.ebuild:
+  Stable on x86.
+
+*xchat-2.5.0_pre20051013 (13 Oct 2005)
+
+  13 Oct 2005; Sven Wegener <swegener@gentoo.org>
+  -files/2.4.4-plugin-fixes.patch, -xchat-2.4.4-r2.ebuild,
+  +xchat-2.5.0_pre20051013.ebuild:
+  Version bump, CVS development snapshot.
+
+*xchat-2.4.5 (12 Sep 2005)
+
+  12 Sep 2005; Sven Wegener <swegener@gentoo.org>
+  +files/xc245-fix-te-notify.diff, +xchat-2.4.5.ebuild:
+  Version bump, bug #105463.
+
+  27 Aug 2005; Sven Wegener <swegener@gentoo.org>
+  -files/2.4.1-fe-text.patch, -files/2.4.1-close-fds-on-exec.patch,
+  -xchat-2.4.1-r1.ebuild:
+  Remove old ebuild.
+
+*xchat-2.4.4-r2 (27 Aug 2005)
+
+  27 Aug 2005; Sven Wegener <swegener@gentoo.org> -xchat-2.4.4.ebuild,
+  -xchat-2.4.4-r1.ebuild, +xchat-2.4.4-r2.ebuild:
+  Pull in some perl scripting fixes from upstream CVS.
+
+  24 Aug 2005; Aron Griffis <agriffis@gentoo.org> xchat-2.4.3.ebuild:
+  stable on ia64
+
+*xchat-2.4.4-r1 (20 Jul 2005)
+
+  20 Jul 2005; Sven Wegener <swegener@gentoo.org>
+  +files/2.4.4-plugin-fixes.patch, +xchat-2.4.4-r1.ebuild:
+  Revision bump to pull in two fixes for plugins from upstream CVS.
+
+  12 Jul 2005; Stephen P. Becker <geoman@gentoo.org> xchat-2.4.3.ebuild:
+  stable on mips
+
+  21 Jun 2005; Sven Wegener <swegener@gentoo.org> xchat-2.4.1-r1.ebuild,
+  xchat-2.4.3.ebuild, xchat-2.4.4.ebuild:
+  Added blocker on net-irc/xchat-gnome.
+
+*xchat-2.4.4 (21 Jun 2005)
+
+  21 Jun 2005; Sven Wegener <swegener@gentoo.org>
+  +files/xchat-dccserver-0.5.patch, +xchat-2.4.4.ebuild:
+  Version bump, bug #96687.
+
+  13 Jun 2005; Fernando J. Pereda <ferdy@gentoo.org> xchat-2.4.3.ebuild:
+  alpha stable
+
+  06 Jun 2005; Markus Rothe <corsair@gentoo.org> xchat-2.4.3.ebuild:
+  Stable on ppc64
+
+  31 May 2005; Herbie Hopkins <herbs@gentoo.org> xchat-2.4.3.ebuild:
+  Multilib fix, use libdir/xchat as xchatlibdir.
+
+  11 May 2005; Joseph Jezak <josejx@gentoo.org> xchat-2.4.3.ebuild:
+  Marked ppc stable.
+
+  08 May 2005; Rene Nussbaumer <killerfox@gentoo.org> xchat-2.4.3.ebuild:
+  Stable on hppa
+
+  08 May 2005; Herbie Hopkins <herbs@gentoo.org> xchat-2.4.3.ebuild:
+  Stable on amd64.
+
+  03 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> xchat-2.4.3.ebuild:
+  Stable on sparc
+
+  03 May 2005; Sven Wegener <swegener@gentoo.org> xchat-2.4.3.ebuild:
+  Marked stable on x86.
+
+  03 Apr 2005; Sven Wegener <swegener@gentoo.org> -xchat-2.0.9.ebuild,
+  -xchat-2.4.0.ebuild:
+  Removed old ebuilds.
+
+  03 Apr 2005; Hardave Riar <hardave@gentoo.org> xchat-2.4.1-r1.ebuild:
+  Stable on mips.
+
+  01 Apr 2005; Sven Wegener <swegener@gentoo.org> xchat-2.4.3.ebuild:
+  Added fallback download location.
+
+*xchat-2.4.3 (31 Mar 2005)
+
+  31 Mar 2005; Sven Wegener <swegener@gentoo.org>
+  -files/xc242-slist-nosel.diff, -files/xc242-whois-spec.diff,
+  -xchat-2.4.2-r1.ebuild, +xchat-2.4.3.ebuild:
+  Version bump, bug #87416.
+
+*xchat-2.4.2-r1 (25 Mar 2005)
+
+  25 Mar 2005; Sven Wegener <swegener@gentoo.org>
+  +files/xc242-whois-spec.diff, +files/xc242-slist-nosel.diff,
+  -xchat-2.4.2.ebuild, +xchat-2.4.2-r1.ebuild:
+  Revision bump to include two patches from upstream. Thanks to Martin Wienold
+  <martin.wienold@uni-dortmund.de> in bug #86617.
+
+*xchat-2.4.2 (19 Mar 2005)
+
+  19 Mar 2005; Sven Wegener <swegener@gentoo.org> +xchat-2.4.2.ebuild:
+  Version bump.
+
+*xchat-2.4.1-r1 (04 Mar 2005)
+
+  04 Mar 2005; Sven Wegener <swegener@gentoo.org>
+  +files/2.4.1-close-fds-on-exec.patch, +xchat-2.4.1-r1.ebuild,
+  -xchat-2.4.1.ebuild:
+  Revision bump to distribute a fix that closes all file descriptors except
+  stdin, stdout and stderr when using the /exec command. This stops child
+  processes from having access to our network sockets and open log files.
+  Closes bug #83683.
+
+  25 Feb 2005; Aron Griffis <agriffis@gentoo.org> xchat-2.4.1.ebuild:
+  stable on ia64 #71997
+
+  22 Feb 2005; Mike Doty <kingtaco@gentoo.org> xchat-2.4.1.ebuild:
+  stable on amd64. bug 71997
+
+  20 Feb 2005; Joseph Jezak <josejx@gentoo.org> xchat-2.4.1.ebuild:
+  Marked ppc stable for bug #71997
+
+  22 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> xchat-2.4.1.ebuild:
+  Stable on alpha.
+
+  11 Jan 2005; Guy Martin <gmsoft@gentoo.org> xchat-2.4.1.ebuild:
+  Stable on hppa.
+
+  10 Jan 2005; Markus Rothe <corsair@gentoo.org> xchat-2.4.1.ebuild:
+  Stable on ppc64
+
+  03 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> xchat-2.4.1.ebuild:
+  Stable on sparc
+
+  01 Jan 2005; Sven Wegener <swegener@gentoo.org> xchat-2.4.1.ebuild:
+  Marked stable on x86.
+
+  05 Dec 2004; Sven Wegener <swegener@gentoo.org>
+  -files/2.0.10-preeditstring.patch, -files/xc2010-fixfocus.diff,
+  -files/xc2010-fixtabcomp3.diff:
+  Remove old patches too.
+
+  05 Dec 2004; Sven Wegener <swegener@gentoo.org> -xchat-2.0.10-r3.ebuild,
+  -xchat-2.0.8-r1.ebuild:
+  Removed old ebuilds.
+
+  27 Nov 2004; Sven Wegener <swegener@gentoo.org>
+  +files/2.4.1-fe-text.patch, xchat-2.4.1.ebuild:
+  Added backported fix from upstream that fixes compilation of the text
+  frontend. Thanks to Matteo Settenvini <msettenvini@tin.it> in bug #72534.
+
+  26 Nov 2004; Sven Wegener <swegener@gentoo.org> -xchat-2.4.0-r1.ebuild,
+  xchat-2.4.1.ebuild:
+  Switch to use mirror:// syntax. Removed ebuild with xosd USE flag support
+  because xchatosd currently has issues.
+
+*xchat-2.4.1 (24 Nov 2004)
+
+  24 Nov 2004; Sven Wegener <swegener@gentoo.org> +xchat-2.4.1.ebuild:
+  Version bump. Thanks to Lars (Polynomial-C) <polynomial-C@gmx.de> for
+  notification. Closes bug #72291.
+
+  22 Nov 2004; Stephen P. Becker <geoman@gentoo.org> xchat-2.4.0-r1.ebuild,
+  xchat-2.4.0.ebuild:
+  2.4.0 stable, 2.4.0-r1 testing on mips
+
+  22 Nov 2004; Markus Rothe <corsair@gentoo.org> xchat-2.4.0.ebuild:
+  Stable on ppc64; bug #71997
+
+*xchat-2.4.0-r1 (22 Nov 2004)
+
+  22 Nov 2004; Sven Wegener <swegener@gentoo.org> +xchat-2.4.0-r1.ebuild:
+  New revision that adds support for the xosd USE flag by pulling in
+  net-irc/xchatosd as a PDEPEND.
+
+  31 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> xchat-2.4.0.ebuild:
+  Stable on alpha.
+
+  17 Oct 2004; Dylan Carlson <absinthe@gentoo.org> xchat-2.4.0.ebuild:
+  stable on amd64.
+
+  05 Oct 2004; Guy Martin <gmsoft@gentoo.org> xchat-2.4.0.ebuild:
+  Stable on hppa.
+
+  01 Oct 2004; Gustavo Zacarias <gustavoz@gentoo.org> xchat-2.4.0.ebuild:
+  Stable on sparc
+
+  01 Oct 2004; Sven Wegener <swegener@gentoo.org> xchat-2.4.0.ebuild:
+  Marked stable on x86.
+
+  24 Sep 2004; Sven Wegener <swegener@gentoo.org> -xchat-2.0.7-r1.ebuild:
+  Removed old ebuild.
+
+  08 Sep 2004; Sven Wegener <swegener@gentoo.org> xchat-2.0.10-r3.ebuild,
+  xchat-2.0.7-r1.ebuild, xchat-2.0.8-r1.ebuild, xchat-2.0.9.ebuild,
+  xchat-2.4.0.ebuild:
+  Merged two IUSE lines into one.
+
+  05 Sep 2004; Guy Martin <gmsoft@gentoo.org> xchat-2.0.10-r3.ebuild:
+  Stable on hppa.
+
+  24 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> xchat-2.0.10-r3.ebuild:
+  Stable on sparc
+
+  24 Aug 2004; Sven Wegener <swegener@gentoo.org> xchat-2.0.10-r3.ebuild:
+  Marked stable on x86.
+
+  15 Aug 2004; Sven Wegener <swegener@gentoo.org> xchat-2.4.0.ebuild:
+  Added ~ppc64 keywords as it's not been in the development series but has been
+  added to the latest stable ones.
+
+  15 Aug 2004; Sven Wegener <swegener@gentoo.org> xchat-2.4.0.ebuild:
+  Added pkg_postinst() info about new default theme.
+
+*xchat-2.4.0 (15 Aug 2004)
+
+  15 Aug 2004; Sven Wegener <swegener@gentoo.org> -xchat-2.1.1.ebuild,
+  +xchat-2.4.0.ebuild:
+  Version bump. Removed development series ebuilds.
+
+  12 Aug 2004; Travis Tilley <lv@gentoo.org> xchat-2.0.9.ebuild:
+  stable on amd64
+
+*xchat-2.1.1 (06 Aug 2004)
+
+  06 Aug 2004; Sven Wegener <swegener@gentoo.org> -xchat-2.1.0.ebuild,
+  +xchat-2.1.1.ebuild:
+  Version bump in the development series.
+
+  05 Aug 2004; Guy Martin <gmsoft@gentoo.org> xchat-2.0.9.ebuild:
+  Stable on hppa.
+
+*xchat-2.0.10-r3 (31 Jul 2004)
+
+  31 Jul 2004; Sven Wegener <swegener@gentoo.org>
+  +files/2.0.10-preeditstring.patch, -files/xc2010-fixtabcomp2.diff,
+  +files/xc2010-fixtabcomp3.diff, -xchat-2.0.10-r2.ebuild,
+  +xchat-2.0.10-r3.ebuild:
+  Another revision bump for an updated tab completion patch. This should close
+  bug #58666 (Tab completion is quirky in XChat) by David Lloyd
+  <dmlloyd@tds.net>. Added backported patch from upstream CVS which fixes bug
+  #56324 (xchat 2.0.10 cjk preedit string bug) by Jung Tae-young
+  <master@mytears.org>.
+
+  31 Jul 2004; Tom Gall <tgall@gentoo.org> xchat-2.0.10-r2.ebuild:
+  stable on ppc64, bug #57121
+
+*xchat-2.1.0 (24 Jul 2004)
+
+  24 Jul 2004; Sven Wegener <swegener@gentoo.org> +xchat-2.1.0.ebuild:
+  Added the development version of xchat. Will stay package.mask'ed until new
+  stable series is released from upstream.
+
+  21 Jul 2004; Sven Wegener <swegener@gentoo.org> xchat-2.0.10-r2.ebuild,
+  xchat-2.0.7-r1.ebuild, xchat-2.0.8-r1.ebuild, xchat-2.0.9.ebuild:
+  Moved sys-devel/gettext into DEPEND as it's only used at build time.
+
+  19 Jul 2004; Jason Wever <weeve@gentoo.org> xchat-2.0.9.ebuild:
+  Stable on sparc.
+
+  19 Jul 2004; Sven Wegener <swegener@gentoo.org> xchat-2.0.10-r2.ebuild:
+  Added support for the /dccserver command via the local USE flag xchatdccserver.
+
+*xchat-2.0.10-r2 (18 Jul 2004)
+
+  18 Jul 2004; Sven Wegener <swegener@gentoo.org>
+  -files/xc2010-fixtabcomp.diff, +files/xc2010-fixtabcomp2.diff,
+  -xchat-2.0.10-r1.ebuild, +xchat-2.0.10-r2.ebuild:
+  Another revision bump for an updated tab completion patch. Closes bug #57427
+  by Martin Wienold <LLoydBates@gmx.de>.
+
+  17 Jul 2004; Sven Wegener <swegener@gentoo.org> xchat-2.0.10-r1.ebuild:
+  Added info about '/set completion_amount 0' to pkg_postinst.
+
+  17 Jul 2004; Sven Wegener <swegener@gentoo.org> +files/xc2010-fixfocus.diff,
+  -xchat-1.8.11.ebuild, xchat-2.0.10-r1.ebuild, -xchat-2.0.10.ebuild,
+  xchat-2.0.9.ebuild:
+  Removed old ebuilds. Added a patch for 2.0.10 which fixes a crash on obscure
+  window managers. Marked 2.0.9 stable on x86.
+
+*xchat-2.0.10-r1 (06 Jul 2004)
+
+  06 Jul 2004; Sven Wegener <swegener@gentoo.org>
+  +files/xc2010-fixtabcomp.diff, +xchat-2.0.10-r1.ebuild:
+  Added fix for tab completion bug. Thanks to Martin Wienold <LLoydBates@gmx.de>
+  for reporting it in bug #56272.
+
+*xchat-2.0.10 (03 Jul 2004)
+
+  03 Jul 2004; Sven Wegener <swegener@gentoo.org>
+  -files/xchat-2.0.6-fix_dccsend.patch, -xchat-2.0.1-r1.ebuild,
+  -xchat-2.0.1.ebuild, +xchat-2.0.10.ebuild, -xchat-2.0.6-r1.ebuild,
+  -xchat-2.0.6-r2.ebuild, -xchat-2.0.7.ebuild, -xchat-2.0.8.ebuild:
+  Version bump. Closes bug #55861. Removed older ebuilds.
+
+  23 Jun 2004; Sven Wegener <swegener@gentoo.org> xchat-2.0.1-r1.ebuild,
+  xchat-2.0.1.ebuild, xchat-2.0.6-r1.ebuild, xchat-2.0.6-r2.ebuild,
+  xchat-2.0.7-r1.ebuild, xchat-2.0.7.ebuild, xchat-2.0.8-r1.ebuild,
+  xchat-2.0.8.ebuild:
+  Do not override MAKEOPTS, pass options directly to emake.
+
+  19 Jun 2004; Jason Wever <weeve@gentoo.org> xchat-1.8.11-r1.ebuild:
+  Stable on sparc.
+
+  18 Jun 2004; Sven Wegener <swegener@gentoo.org> xchat-1.8.11-r1.ebuild,
+  xchat-1.8.11.ebuild:
+  Removed S=${WORKDIR}/${P}
+
+  10 Jun 2004; Aron Griffis <agriffis@gentoo.org> xchat-1.8.11-r1.ebuild,
+  xchat-1.8.11.ebuild:
+  Fix use invocation
+
+*xchat-2.0.9 (09 Jun 2004)
+
+  09 Jun 2004; Chuck Short <zul@gentoo.org> xchat-2.0.9.ebuild:
+  Version bump, closes #53061.
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  xchat-1.8.11-r1.ebuild, xchat-1.8.11.ebuild, xchat-2.0.6-r1.ebuild,
+  xchat-2.0.6-r2.ebuild, xchat-2.0.7-r1.ebuild, xchat-2.0.7.ebuild:
+  Masked xchat-2.0.7.ebuild stable for ppc
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  xchat-1.8.11-r1.ebuild, xchat-1.8.11.ebuild, xchat-2.0.6-r1.ebuild,
+  xchat-2.0.6-r2.ebuild, xchat-2.0.7-r1.ebuild:
+  Masked xchat-2.0.7-r1.ebuild stable for ppc
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  xchat-1.8.11-r1.ebuild, xchat-1.8.11.ebuild, xchat-2.0.6-r1.ebuild,
+  xchat-2.0.6-r2.ebuild:
+  Masked xchat-2.0.6-r2.ebuild stable for ppc
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  xchat-1.8.11-r1.ebuild, xchat-1.8.11.ebuild, xchat-2.0.6-r1.ebuild:
+  Masked xchat-2.0.6-r1.ebuild stable for ppc
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  xchat-1.8.11-r1.ebuild, xchat-1.8.11.ebuild:
+  Masked xchat-1.8.11.ebuild stable for ppc
+
+  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  xchat-1.8.11-r1.ebuild:
+  Masked xchat-1.8.11-r1.ebuild stable for ppc
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> xchat-2.0.1-r1.ebuild,
+  xchat-2.0.1.ebuild, xchat-2.0.6-r1.ebuild, xchat-2.0.6-r2.ebuild,
+  xchat-2.0.7-r1.ebuild, xchat-2.0.7.ebuild, xchat-2.0.8-r1.ebuild,
+  xchat-2.0.8.ebuild:
+  Add inherit eutils
+
+  15 Apr 2004; Guy Martin <gmsoft@gentoo.org> xchat-2.0.8-r1.ebuild:
+  Marked stable on hppa.
+
+  15 Apr 2004; Chuck Short <zul@gentoo.org> xchat-2.0.8-r1.ebuild:
+  Marked stable for x86.
+
+  15 Apr 2004; <kloeri@gentoo.org> xchat-2.0.8-r1.ebuild:
+  Stable on Alpha.
+
+  14 Apr 2004; Stephen P. Becker <geoman@gentoo.org> xchat-2.0.8-r1.ebuild:
+  Marked stable on mips to satisfy bug 46856.
+
+  14 Apr 2004; Luca Barbato <lu_zero@gentoo.org> xchat-2.0.8-r1.ebuild:
+  Marked ppc
+
+  14 Apr 2004; Jon Portnoy <avenj@gentoo.org> xchat-2.0.8-r1.ebuild :
+  Stable on AMD64.
+
+  14 Apr 2004; Gustavo Zacarias <gustavoz@gentoo.org> xchat-2.0.8-r1.ebuild:
+  stable on sparc wrt bug #46856
+
+*xchat-2.0.8-r1 (11 Apr 2004)
+*xchat-1.8.11-r1 (11 Apr 2004)
+*xchat-2.0.7-r1 (11 Apr 2004)
+
+  11 Apr 2004; Chuck Short <zul@gentoo.org> xchat-1.8.11-r1.ebuild,
+  xchat-2.0.1-r1.ebuild, xchat-2.0.6-r2.ebuild, xchat-2.0.7-r1.ebuild,
+  xchat-2.0.8-r1.ebuild:
+  Proper security bump.
+
+  05 Apr 2004; Guy Martin <gmsoft@gentoo.org> xchat-2.0.7.ebuild:
+  Marked stable on hppa.
+
+  05 Apr 2004; Chuck Short <zul@gentoo.org> xchat-1.8.11.ebuild,
+  xchat-2.0.1.ebuild, xchat-2.0.6-r1.ebuild, xchat-2.0.7.ebuild,
+  xchat-2.0.8.ebuild, files/xc208-fixsocks5.diff:
+  Added patch to fix sock5 vulnerabiltiy for users using a proxy. Applied patch 
+  to affected versions.
+
+*xchat-2.0.8 (29 Mar 2004)
+
+  29 Mar 2004; Chuck Short <zul@gentoo.org> xchat-2.0.8.ebuild:
+  Version bump, closes #45574.
+
+  13 Mar 2004; Stephen P. Becker <geoman@gentoo.org> xchat-2.0.7.ebuild:
+  Added ~mips keyword.
+
+  12 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org> xchat-2.0.7.ebuild:
+  stable on sparc
+
+  22 Jan 2004; Aron Griffis <agriffis@gentoo.org> xchat-2.0.7.ebuild:
+  stable on alpha and ia64
+
+  08 Jan 2004; <gustavoz@gentoo.org> xchat-2.0.6-r1.ebuild:
+  going stable for sparc
+
+  07 Jan 2004; Jon Portnoy <avenj@gentoo.org> xchat-2.0.6-r1.ebuild :
+  Stable on AMD64.
+
+  07 Jan 2004; Markus Nigbur <pyrania@gentoo.org> xchat-2.0.6-r1.ebuild,
+  xchat-2.0.7.ebuild:
+  Keyworded 2.0.6-r1 x86 and 2.0.7 ~ppc, ~alpha, ~amd64
+
+  07 Jan 2004; <gustavoz@gentoo.org> xchat-2.0.7.ebuild:
+  keyworded ~sparc and ~hppa
+
+  05 Jan 2004; Jason Wever <weeve@gentoo.org> xchat-2.0.5-r1.ebuild:
+  Marked stable on sparc.
+
+*xchat-2.0.7 (04 Jan 2004)
+
+  04 Jan 2004; Markus Nigbur<pyrania@gentoo.org> xchat-1.8.11.ebuild, xchat-2.0.1.ebuild,
+  xchat-2.0.3-r1.ebuild, xchat-2.0.4.ebuild, xchat-2.0.5-r1.ebuild,
+  xchat-2.0.6-r1.ebuild:
+  Header update.
+
+  04 Jan 2004; Markus Nigbur <pyrania@gentoo.org> xchat-2.0.7.ebuild:
+  Version Bump.
+
+  15 Dec 2003; Guy Martin <gmsoft@gentoo.org> xchat-2.0.6-r1.ebuild:
+  Marked stable on hppa.
+
+*xchat-2.0.6-r1 (12 Dec 2003)
+
+  12 Dec 2003; <solar@gentoo.org> xchat-2.0.6-r1.ebuild,
+  files/xchat-2.0.6-fix_dccsend.patch:
+  fix denial of service bug in dcc.c
+
+*xchat-2.0.6 (28 Nov 2003)
+
+  28 Nov 2003; foser <foser@gentoo.org> xchat-2.0.6.ebuild :
+  New release
+
+*xchat-2.0.5-r1 (23 Nov 2003)
+
+  23 Nov 2003; Chuck Short <zul@gentoo.org> xchat-2.0.5-r1.ebuild,
+  files/xc205-fix-emptyword.diff, files/xc205-fix64bit.diff:
+  New version, adds latest patches.
+  Ebuild originally submitted by Bluefox Phoenix Lucid <bluefoxicy@linux.net>
+  Closes bug number 34060.
+
+  05 Oct 2003; foser <foser@gentoo.org> xchat-2.0.{4,5}.ebuild :
+  Fix USE depend (#29942)
+
+  28 Sep 2003; Markus Nigbur <pyrania@gentoo.org> xchat-2.0.5.ebuild:
+  Added ~amd64 keyword. request by brad@mainstreetsoftworks.com in bug #29808.
+
+*xchat-2.0.5 (25 Sep 2003)
+
+  25 Sep 2003; foser <foser@gentoo.org> xchat-2.0.5.ebuild :
+  New version
+
+  04 Sep 2003; Mike Gardiner <obz@gentoo.org> xchat-2.0.4.ebuild:
+  Added local use flags to 2.0.4 for enabling the text frontend, and disabling
+  the gtk front end. Testing at the moment, can be backported
+
+  21 Aug 2003; Mike Gardiner <obz@gentoo.org> xchat-2.0.4.ebuild:
+  Added --enable-textfe, see bug #26427
+
+  14 Aug 2003; Jason Wever <weeve@gentoo.org> xchat-2.0.3-r1.ebuild:
+  Changed ~sparc keyword to sparc.
+
+  13 Aug 2003; Jason Wever <weeve@gentoo.org> xchat-2.0.3-r1.ebuild,
+  xchat-2.0.4.ebuild:
+  Added a replace-flags statement to hopefully fix a seg fault on sparcs.
+
+  06 Aug 2003; Alastair Tse <liquidx@gentoo.org> xchat-2.0.3-r1.ebuild,
+  xchat-2.0.4.ebuild:
+  added workaround for PYTHONPATH problems (#25943)
+
+*xchat-2.0.4 (31 Jul 2003)
+
+  13 Aug 2003; Guy Martin <gmsoft@gentoo.org> xchat-2.0.4.ebuild :
+  Added hppa to KEYWORDS.
+
+  31 Jul 2003; foser <foser@gentoo.org> xchat-2.0.4.ebuild :
+  New version, brought to our attention in #25612
+
+  30 Jul 2003; Aron Griffis <agriffis@gentoo.org> xchat-2.0.3-r1.ebuild:
+  Mark stable on alpha
+
+  30 Jul 2003; Brad Laue <brad@gentoo.org> xchat-2.0.3-r1.ebuild:
+  Mark stable on x86.
+
+*xchat-2.0.3-r1 (08 Jul 2003)
+
+  14 Jul 2003; Mike Frysinger <vapier@gentoo.org> :
+  Update myopts setting to use_enable and add nls support.
+
+  08 Jul 2003; foser <foser@gentoo.org> xchat-2.0.3-r1.ebuild :
+  Added dcc patch, should fix possible dcc problems
+
+  09 Jul 2003; Alastair Tse <liquidx@gentoo.org> xchat-2.0.0.ebuild,
+  xchat-2.0.1.ebuild, xchat-2.0.2-r2.ebuild:
+  added pkgconfig deps
+
+*xchat-2.0.3 (29 Jun 2003)
+
+  29 Jun 2003; foser <foser@gentoo.org> xchat-2.0.3.ebuild :
+  New version, removed nls use dep, added patch to fix mmx segfault
+
+*xchat-2.0.2-r2 (26 May 2003)
+
+  08 Jun 2003; foser <foser@gentoo.org> xchat-2.0.2-r2.ebuild :
+  Fixed gtk dependancy to follow USE flag, removed xchat link
+
+  26 May 2003; Alastair Tse <liquidx@gentoo.org> xchat-2.0.2-r2.ebuild,
+  files/xc202-fixdetach.diff, files/xc202-fixurlg.diff:
+  add post-release stable patches from xchat.org (#21459)
+
+*xchat-2.0.2-r1 (16 May 2003)
+
+  16 May 2003; foser <foser@gentoo.org> xchat-2.0.2-r1.ebuild :
+  Install xchat-plugin.h header for plugin development (#19906)
+
+*xchat-2.0.2 (21 Apr 2003)
+
+  
+  21 Apr 2003; Jon Portnoy <avenj@gentoo.org> xchat-2.0.2.ebuild:
+  Version bump.
+
+
+  10 Mar 2003; Olivier Reisch <doctomoe@gentoo.org> xchat-2.0.0.ebuild:
+  Mark stable on ppc
+
+*xchat-2.0.1 (03 Mar 2003)
+
+  22 Mar 2003; Graham Forest <vladimir@gentoo.org> xchat-2.0.1.ebuild:
+  set ppc in keywords
+
+  03 Mar 2003; Brandon Low <lostlogic@gentoo.org> xchat-2.0.1.ebuild:
+  Bump to latest gtk2 release and remove all other old unstable gtk2 releases
+
+*xchat-2.0.0 (11 Feb 2003)
+
+  09 Mar 2003; Aron Griffis <agriffis@gentoo.org> xchat-2.0.0.ebuild:
+  Mark stable on alpha
+
+  11 Feb 2003; foser <foser@gentoo.org> xchat-2.0.0.ebuild :
+  First stable gtk2 release
+
+*xchat-2.0.0pr1-r1 (02 Feb 2003)
+  
+  02 Feb 2003; Spider <spider@gentoo.org> xchat-2.0.0pr1-r1.ebuild :
+  added a patch to have tabs on left/right.
+  made that patch merged with gtk scrollbuttons
+  fixed it as per zed's comments on xchat-discuss
+  
+*xchat-2.0.0pre1 (26 Jan 2003)
+
+  01 Feb 2003; foser <foser@gentoo.org> xchat-2.0.0_pre1.ebuild :
+  Added patch to use gtk default scrollbutton icons
+
+  27 Jan 2003; foser <foser@gentoo.org> xchat-2.0.0_pre1.ebuild :
+  cleanups, added tcltk USE
+
+  26 Jan 2003; Thomas Raschbacher <lordvan@gentoo.org> xchat-2.0.0_pre1.ebuild:
+  new version
+
+*xchat-1.8.11 (23 Jan 2003)
+
+  13 Jul 2003; Alastair Tse <liquidx@gentoo.org> xchat-1.8.11.ebuild:
+  use econf and DESTDIR to prevent installing stuff in /usr/etc
+
+  25 Mar 2003; Seemant Kulleen <seemant@gentoo.org> xchat-1.8.10-r1.ebuild,
+  xchat-1.8.10.ebuild, xchat-1.8.10.ebuild, xchat-1.8.11.ebuild:
+  made gtk an optional USE based dep
+
+  09 Mar 2003; Aron Griffis <agriffis@gentoo.org> xchat-1.8.11.ebuild:
+  Mark stable on alpha
+
+  23 Jan 2003; foser <foser@gentoo.org> xchat-1.8.11.ebuild :
+  New version, with patch, now slotted  (#13607)
+
+*xchat-1.9.8 (03 Jan 2003)
+
+  03 Dec 2002; foser <foser@gentoo.org> xchat-1.9.8.ebuild :
+  New version, fixed deps. Removed nls related stuff, pango is default now and should take care of it
+
+  16 Dec 2002; Aron Griffis <agriffis@gentoo.org> xchat-1.8.10-r1.ebuild xchat-1.9.7.ebuild:
+  Added ~alpha to KEYWORDS in both stable and devel versions
+
+*xchat-1.9.7 (13 Dec 2002)
+
+  13 Dec 2002; foser <foser@gentoo.org> xchat-1.9.7.ebuild :
+  New version
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*xchat-1.9.6 (26 Nov 2002)
+
+  04 Dec 2002; foser <foser@gentoo.org> xchat-1.9.6.ebuild :
+  Readded, disabled the segfaulting japanese conv support
+
+  26 Nov 2002; foser <foser@gentoo.org> xchat-1.9.6.ebuild :
+  New version
+
+*xchat-1.9.5-r2 (20 Nov 2002)
+
+  20 Nov 2002; foser <foser@gentoo.org> xchat-1.9.5-r2.ebuild :
+  Added private chat logging patch
+
+*xchat-1.9.5-r1 (19 Nov 2002)
+
+  19 Nov 2002; foser <foser@gentoo.org> xchat-1.9.5-r1.ebuild :
+  They fixed the plugins, removed the symlinks to make them work again
+
+*xchat-1.9.5 (17 Nov 2002)
+
+  17 Nov 2002; foser <foser@gentoo.org> xchat-1.9.5.ebuild :
+  New version, removed most of the menu item placement hacks
+
+*xchat-1.9.4-r1 (08 Nov 2002)
+
+  08 Nov 2002; foser <foser@gentoo.org> xchat-1.9.4-r1.ebuild :
+  Added a modified scrolling tabs patch
+
+*xchat-1.9.4 (05 Nov 2002)
+
+  05 Nov 2002; foser <foser@gentoo.org> xchat-1.9.4.ebuild :
+  New version, moved to slot 2
+  IMPORTANT : xchat-1.8 should move to slot 1 next revision/release 
+ 
+*xchat-1.9.3-r3.ebuild (02 Nov 2002)
+
+  02 Nov 2002; foser <foser@gentoo.org> xchat-1.9.3-r3.ebuild :
+  Fixed launcher
+  Added tint transparancy patch
+  Added option for disabling xft (bug #9973)
+
+*xchat-1.9.3-r2.ebuild (20 Oct 2002)
+
+  20 Oct 2002; foser <foser@gentoo.org> xchat-1.9.3-r2.ebuild :
+  Now really fixing plugins 
+  Added a patch to prevent problems with gnome2.1 and up
+
+*xchat-1.9.3-r1.ebuild (11 Oct 2002)
+
+  11 Oct 2002; Brandon Low <lostlogic@gentoo.org> xchat-1.9.3-r1.ebuild:
+
+  Fix for location and name of plugins now installed to /usr/lib/xchat-2
+
+*xchat-1.9.3.ebuild (11 Oct 2002)
+
+  11 Oct 2002; Brandon Low <lostlogic@gentoo.org> xchat-1.9.3.ebuild:
   
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  comments should well explained and written in clean English. The details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
+  Add another masked version in the gtk2 series.
+
+*xchat-1.8.10-r1 (29 Sep 2002)
+
+  30 Sep 2002; Ryan Phillips <rphillips@gentoo.org> xchat-1.8.10-r1.ebuild :
+
+  Deleted the patch after talking to seemant... We have decided on /etc/X11/applnk
+  to be the standard place
+
+  30 Sep 2002; Ryan Phillips <rphillips@gentoo.org> xchat-1.8.10-r1.ebuild :
+
+  Added patch for the installation of the desktop file
+
+  29 Sep 2002; Ryan Phillips <rphillips@gentoo.org> xchat-1.8.10-r1.ebuild :
+
+  Bret Towe reimplemented the xchat perl/gnome ebuild
+
+*xchat-1.8.10 (05 Sep 2002) 
+  05 Sep 2002; Spider <spider@gentoo.org> xchat-1.8.10.ebuild :
+  added an upstream patch to fix /me  in queries sending messages to oneself
+
+
+  05 Sep 2002; Spider <spider@gentoo.org> xchat-1.8.10.ebuild :
+  removed the perl/gnome code. this should be reimplemented.
+  updated the version
+  removed euIRC patch
+
+  
+*xchat-1.9.2-r1.ebuild (06 Aug 2002)
+
+  31 Aug 2002; Jack Morgan <jmorgan@gentoo.org> xchat-1.9.2-r1.ebuild/xchat-1.8.9-r3.ebuild:
+  Added sparc/sparc64 keywords
+
+  06 Aug 2002; Brandon Low <lostlogic@gentoo.org> xchat-1.9.2-r1.ebuild:
+  Fix some bad things, including sandboxing problems, blah.
+
+*xchat-1.8.9-r3 (21 Jul 2002)
+
+  05 Sep 2002; Ryan Phillips <rphillips@gentoo.org> xchat-1.8.9-r3.ebuild :
+
+  updated the perl/gnome patch
+
+  26 Aug 2002; Ryan Phillips <rphillips@gentoo.org> xchat-1.8.9-r3.ebuild :
+
+  Disabled gnome support if perl flag in set.  This fixes bug #6504
+
+  21 Jul 2002; Spider <spider@gentoo.org> xchat-1.8.9-r3.ebuild :
+  Applied patch for euirc networks bug #4776
+  
+*xchat-1.9.2.ebuild (09 Jul 2002)
+  09 Jul 2002; Gabriele Giorgetti <stroke@gentoo.org> xchat-1.9.2.ebuild:
+  new unstable version, still masked. Added KEYWORDS, missing ssl support,
+  renabled python support and updated dependences. 
+  Stale ebuilds removed.
+
+xchat-1.8.9-r2 (28 Jun 2002)
+  28 Jun 2002; Spider <spider@gentoo.org> xchat-1.8.9-r2.ebuild :
+  removed the gnome-core dependency and updated it to use gnome-panel-1.4.1
+  
+*xchat-1.8.9-r1 (27 Jun 2002)
+
+  27 Jun 2002; Seemant Kulleen <seemant@gentoo.org> xchat-1.8.9-r1.ebuild
+  files/digest-xchat-1.8.9-r1 :
+
+  cleaned up, so things are not installed in /share
+
+*xchat-1.9.1.ebuild (11 Jun 2002)
+  11 Jun 2002; Gabriele Giorgetti <stroke@gentoo.org> xchat-1.9.1.ebuild:
+  new version
+
+*xchat-20020527 (29 May 2002)
+  29 May 2002; Spider <spider@gentoo.org> xchat-20020527.ebuild
+  new snapshot 
+
+*xchat-20020519 (27 May 2002)
+  27 May 2002; Spider <spider@gentoo.org> xchat-20020519.ebuild
+  xchat ebuild written to work with GNOME2 or just GTK+2
+  ebuild wrote by Gabriele Giorgetti <g.gabriele79@genie.it> | stroke on #gentoo
+  hacked on and verified... 
+  should be masked
+  
+*xchat-1.8.9.ebuild (21 May 2002)
+
+  21 May 2002; Bruce A. Locke <blocke@shivan.org> xchat-1.8.9.ebuild :
+
+  Version update and .desktop file cleanup
+
+*xchat-1.8.8-r1 ( 30 Mar 2002)
+
+  17 Apr 2002; Seemant Kulleen <seemant@gentoo.org> xchat-1.8.8-r1.ebuild :
+
+  gdk-pixbuf is now in gnome USE.
+
+
+  30 Mar 2002; Seemant Kulleen <seemant@gentoo.org> xchat-1.8.8-r1.ebuild :
+
+  Separated out gdk-pixbuf from gnome USE.  Also, the CFLAGS for ORBit is 
+  dependent on the gnome USE toggle.
+
+*xchat-1.8.8 (10 Mar 2002)
+
+  10 Mar 2002; Bruce A. Locke <blocke@shivan.org> xchat-1.8.8.ebuild :
+
+  Updated xchat to 1.8.8
+
diff --git a/net-irc/xchat/Manifest b/net-irc/xchat/Manifest
index f842a829a139..95910c75cc78 100644
--- a/net-irc/xchat/Manifest
+++ b/net-irc/xchat/Manifest
@@ -1,12 +1,25 @@
-MD5 b6e6e2cb2e7b37fef8525f7bcb20eba6 xchat-2.0.1.ebuild 1984
-MD5 5e5d21a6b4e47c04f504c69b4272b029 xchat-1.8.11.ebuild 2285
-MD5 d4b23b8ff3dd54a2ca5560884c64bf7f xchat-2.0.0.ebuild 1909
-MD5 d6896c2421454aab5a0cefef7bed9946 xchat-1.8.10-r1.ebuild 2307
-MD5 647286df81518f7a39a19799ee25509c ChangeLog 7340
-MD5 acbd4afdd7d00bceb3816147eb508e4b files/digest-xchat-2.0.0 64
-MD5 1ee812a2b3e28e3866413e75a80ff983 files/digest-xchat-2.0.1 64
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f70fee92ab2e258ea7be208d0ddfa4b6 xchat-2.4.3.ebuild 2266
+MD5 35173b2dddf35bc467c4aa72d784a741 xchat-2.4.5.ebuild 2301
+MD5 4634f562e01b219d3bcfb0ae6acb8397 xchat-1.8.11-r1.ebuild 2264
+MD5 9f17701ead780ffcd7c34dc23b28e13b ChangeLog 27172
+MD5 fb5772136a872c08434566d4f0bcdc7f metadata.xml 179
+MD5 95d53db19acfbc8d85a8ac0c8d695133 xchat-2.6.0.ebuild 2261
+MD5 21bc6820aa6d0c8722509a74c7fccb3d files/digest-xchat-2.4.3 134
+MD5 c5d53c24b3ebfec1f168930213f55fea files/digest-xchat-2.4.5 65
+MD5 02c31b272038e119a3ce2d4a79897f72 files/digest-xchat-2.6.0 64
 MD5 a8f607d224408d4a27777d2ffce8beac files/xc1811fixststint.diff 422
-MD5 011b499714e85d4177185aabaeb1db15 files/00_all_tabs-leftright-and-gtk-icons.patch 13367
-MD5 9636578d0e88ec0185c97a30edb81ce5 files/xc1810fixme3.diff 1025
-MD5 7c2450584076659603dc908ffc53b537 files/digest-xchat-1.8.10-r1 65
-MD5 e2b99b2d2dfc54ba96e560c0ed8392df files/digest-xchat-1.8.11 65
+MD5 17073299c8c2c65062ad2e77cd03b841 files/xc245-fix-te-notify.diff 403
+MD5 6bfc06df4986a7fb482525e1dfd8fa21 files/xc260-fix-fetext.diff 1123
+MD5 31de685eff3d16d9466416434c9fd6c3 files/xc208-fixsocks5.diff 688
+MD5 ee98eba7f1061680d8d0582a10d72cb7 files/xchat-dccserver-0.5.patch 11776
+MD5 e2b99b2d2dfc54ba96e560c0ed8392df files/digest-xchat-1.8.11-r1 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDe3gTKRy60XGEcJIRAvc1AJ0SXqgZTn+R6wB2DGbYdY6eyFmm+gCdF7cH
+jMwXRd+P2nP9CeiCEgT4biU=
+=E/T3
+-----END PGP SIGNATURE-----
diff --git a/net-irc/xchat/metadata.xml b/net-irc/xchat/metadata.xml
index da6fd63d0085..c0a6a3d63d43 100644
--- a/net-irc/xchat/metadata.xml
+++ b/net-irc/xchat/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
+<herd>net-irc</herd>
 </pkgmetadata>
diff --git a/net-irc/xchat/xchat-1.8.11-r1.ebuild b/net-irc/xchat/xchat-1.8.11-r1.ebuild
index efd438abb1c4..dc8436c5788c 100644
--- a/net-irc/xchat/xchat-1.8.11-r1.ebuild
+++ b/net-irc/xchat/xchat-1.8.11-r1.ebuild
@@ -1,19 +1,18 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-1.8.11-r1.ebuild,v 1.1 2004/04/11 12:50:07 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-1.8.11-r1.ebuild,v 1.1.1.1 2005/11/30 09:48:51 chriswhite Exp $
 
 inherit eutils
 
-IUSE="ssl nls mmx gnome ipv6 python kde gtk perl"
+IUSE="gnome gtk ipv6 mmx nls perl python ssl"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="X-Chat is a graphical IRC client for UNIX operating systems."
 SRC_URI="http://www.xchat.org/files/source/1.8/${P}.tar.bz2"
 HOMEPAGE="http://www.xchat.org/"
 
 SLOT="1"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc alpha"
+KEYWORDS="x86 ppc sparc alpha"
 
 RDEPEND="gtk? ( =x11-libs/gtk+-1.2* )
 	python? ( >=dev-lang/python-2.2-r7 )
@@ -46,10 +45,10 @@ src_compile() {
 
 	local myopts myflags
 
-	if [ ! `use perl` ]; then
+	if ! use perl; then
 		use gnome \
 			&& myopts="${myopts} --enable-gnome --enable-panel" \
-			   CFLAGS="${CFLAGS} -I/usr/include/orbit-1.0" \
+				CFLAGS="${CFLAGS} -I/usr/include/orbit-1.0" \
 			|| myopts="${myopts} --enable-gtkfe --disable-gnome --disable-zvt --disable-gdk-pixbuf"
 	else
 		myopts="${myopts} --disable-gnome"
@@ -80,7 +79,7 @@ src_compile() {
 
 	use python \
 		&& myflags="`python-config`" \
-	 	&& myopts="${myopts} --enable-python"
+		&& myopts="${myopts} --enable-python"
 
 
 	econf ${myopts} || die
diff --git a/net-irc/xchat/xchat-2.4.3.ebuild b/net-irc/xchat/xchat-2.4.3.ebuild
index 7da5b2454578..3b79333a3996 100644
--- a/net-irc/xchat/xchat-2.4.3.ebuild
+++ b/net-irc/xchat/xchat-2.4.3.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.4.3.ebuild,v 1.1 2005/03/31 15:04:42 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.4.3.ebuild,v 1.1.1.1 2005/11/30 09:48:51 chriswhite Exp $
 
-inherit flag-o-matic eutils
+inherit flag-o-matic eutils versionator
 
 DESCRIPTION="Graphical IRC client"
-SRC_URI="mirror://sourceforge/xchat/${P}.tar.bz2
+SRC_URI="http://www.xchat.org/files/source/$(get_version_component_range 1-2)/${P}.tar.bz2
 	xchatdccserver? ( http://dfx.at/xchat/xchat-dccserver-0.4.patch )"
 HOMEPAGE="http://www.xchat.org/"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~x86 ~sparc ~hppa ~ppc ~alpha ~amd64 ~ia64 ~mips ~ppc64"
+KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
 IUSE="perl tcltk python ssl mmx ipv6 nls xchattext xchatnogtk xchatdccserver"
 
 # Added for to fix a sparc seg fault issue by Jason Wever <weeve@gentoo.org>
@@ -25,7 +25,8 @@ RDEPEND=">=dev-libs/glib-2.0.3
 	ssl? ( >=dev-libs/openssl-0.9.6d )
 	perl? ( >=dev-lang/perl-5.6.1 )
 	python? ( dev-lang/python )
-	tcltk? ( dev-lang/tcl )"
+	tcltk? ( dev-lang/tcl )
+	!net-irc/xchat-gnome"
 
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.7
@@ -37,6 +38,12 @@ src_unpack() {
 	cd ${S}
 
 	use xchatdccserver && epatch ${DISTDIR}/xchat-dccserver-0.4.patch
+
+	# use libdir/xchat/plugins as the plugin directory
+	if [ $(get_libdir) != "lib" ] ; then
+		sed -i -e 's:${prefix}/lib/xchat:${libdir}/xchat:' \
+			${S}/configure{,.in} || die
+	fi
 }
 
 src_compile() {
diff --git a/net-irc/xchat/xchat-2.4.5.ebuild b/net-irc/xchat/xchat-2.4.5.ebuild
index 5011cd55d545..ec543d65332f 100644
--- a/net-irc/xchat/xchat-2.4.5.ebuild
+++ b/net-irc/xchat/xchat-2.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.4.5.ebuild,v 1.1 2005/09/12 00:22:04 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.4.5.ebuild,v 1.1.1.1 2005/11/30 09:48:51 chriswhite Exp $
 
 inherit flag-o-matic eutils versionator
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.xchat.org/"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ~ppc64 -sparc x86"
 IUSE="perl tcltk python ssl mmx ipv6 nls xchattext xchatnogtk xchatdccserver"
 
 # Added for to fix a sparc seg fault issue by Jason Wever <weeve@gentoo.org>
@@ -24,7 +24,7 @@ RDEPEND=">=dev-libs/glib-2.0.3
 	!xchatnogtk? ( >=x11-libs/gtk+-2.0.3 )
 	ssl? ( >=dev-libs/openssl-0.9.6d )
 	perl? ( >=dev-lang/perl-5.6.1 )
-	python? ( dev-lang/python )
+	python? ( >=dev-lang/python-2.2 )
 	tcltk? ( dev-lang/tcl )
 	!net-irc/xchat-gnome"
 
diff --git a/net-irc/xchat/xchat-2.6.0.ebuild b/net-irc/xchat/xchat-2.6.0.ebuild
index 28c681175c9a..5e2d0a26dcfd 100644
--- a/net-irc/xchat/xchat-2.6.0.ebuild
+++ b/net-irc/xchat/xchat-2.6.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.6.0.ebuild,v 1.1 2005/11/03 07:20:07 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.6.0.ebuild,v 1.1.1.1 2005/11/30 09:48:51 chriswhite Exp $
 
-inherit versionator
+inherit eutils versionator
 
 DESCRIPTION="Graphical IRC client"
 SRC_URI="http://www.xchat.org/files/source/$(get_version_component_range 1-2)/${P}.tar.bz2
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.xchat.org/"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="perl dbus tcltk python ssl mmx ipv6 nls xchattext xchatnogtk"
 
 # Added for to fix a sparc seg fault issue by Jason Wever <weeve@gentoo.org>
@@ -37,6 +37,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	epatch "${FILESDIR}"/xc260-fix-fetext.diff
+
 	# use libdir/xchat/plugins as the plugin directory
 	if [ $(get_libdir) != "lib" ] ; then
 		sed -i -e 's:${prefix}/lib/xchat:${libdir}/xchat:' \
@@ -50,6 +52,7 @@ src_compile() {
 	unset PYTHONPATH
 
 	econf \
+		--enable-shm \
 		$(use_enable ssl openssl) \
 		$(use_enable perl) \
 		$(use_enable python) \
diff --git a/net-irc/xchatosd/ChangeLog b/net-irc/xchatosd/ChangeLog
index 5a65916e17fa..6b490941a74b 100644
--- a/net-irc/xchatosd/ChangeLog
+++ b/net-irc/xchatosd/ChangeLog
@@ -1,6 +1,75 @@
 # ChangeLog for net-irc/xchatosd
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchatosd/ChangeLog,v 1.1 2004/08/13 12:11:07 swegener Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchatosd/ChangeLog,v 1.1.1.1 2005/11/30 09:48:56 chriswhite Exp $
+
+  24 Aug 2005; Aron Griffis <agriffis@gentoo.org> xchatosd-5.19.ebuild:
+  stable on ia64
+
+  06 Aug 2005; Sven Wegener <swegener@gentoo.org> -xchatosd-5.18.ebuild:
+  Removed old ebuild.
+
+  01 Aug 2005; Sven Wegener <swegener@gentoo.org> xchatosd-5.19.ebuild:
+  Stable on x86.
+
+*xchatosd-5.19 (28 Jun 2005)
+
+  28 Jun 2005; Sven Wegener <swegener@gentoo.org> +xchatosd-5.19.ebuild:
+  Version bump.
+
+  21 Jun 2005; Sven Wegener <swegener@gentoo.org> xchatosd-5.18.ebuild:
+  Adjusted dependencies to work with net-irc/xchat-gnome.
+
+  22 Apr 2005; Sven Wegener <swegener@gentoo.org>
+  -files/5.12-return-values.patch, -xchatosd-5.12.ebuild,
+  xchatosd-5.18.ebuild:
+  Removed old ebuild.
+
+  10 Apr 2005; Sven Wegener <swegener@gentoo.org> xchatosd-5.18.ebuild:
+  Marked stable on x86.
+
+  25 Feb 2005; Aron Griffis <agriffis@gentoo.org> xchatosd-5.18.ebuild:
+  add ~ia64
+
+*xchatosd-5.18 (20 Feb 2005)
+
+  20 Feb 2005; Sven Wegener <swegener@gentoo.org>
+  -files/5.17-iconv-fix.patch, -files/5.17-return-values.patch,
+  -xchatosd-5.17-r1.ebuild, +xchatosd-5.18.ebuild:
+  Version bump.
+
+*xchatosd-5.17-r1 (20 Feb 2005)
+
+  20 Feb 2005; Sven Wegener <swegener@gentoo.org>
+  +files/5.17-return-values.patch, +xchatosd-5.17-r1.ebuild,
+  -xchatosd-5.17.ebuild:
+  Added a patch that fixes wrong return value checking. Closes bug #82546.
+
+*xchatosd-5.17 (17 Feb 2005)
+
+  17 Feb 2005; Sven Wegener <swegener@gentoo.org>
+  +files/5.17-iconv-fix.patch, +xchatosd-5.17.ebuild:
+  Version bump.
+
+  26 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xchatosd-5.12.ebuild:
+  Multilib fixin.
+
+  04 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xchatosd-5.12.ebuild:
+  Added to ~amd64.
+
+  04 Dec 2004; Sven Wegener <swegener@gentoo.org>
+  +files/5.12-return-values.patch, xchatosd-5.12.ebuild:
+  Added a patch that fixes wrong return value checking. Closes bug #72481.
+
+  01 Oct 2004; Sven Wegener <swegener@gentoo.org> xchatosd-5.12.ebuild:
+  Marked stable on x86.
+
+  31 Aug 2004; David Holm <dholm@gentoo.org> xchatosd-5.12.ebuild:
+  Added to ~ppc.
+
+  13 Aug 2004; Sven Wegener <swegener@gentoo.org> xchatosd-5.12.ebuild:
+  Removed RESTRICT="nomirror"
 
 *xchatosd-5.12 (13 Aug 2004)
 
diff --git a/net-irc/xchatosd/Manifest b/net-irc/xchatosd/Manifest
index 8af5ce542450..be953f5ffe64 100644
--- a/net-irc/xchatosd/Manifest
+++ b/net-irc/xchatosd/Manifest
@@ -1,3 +1,4 @@
-MD5 dea48b228d5f908e4ebc70bdda90c643 xchatosd-5.12.ebuild 425
-MD5 77f28003a573245696aa05a94ea6c786 files/digest-xchatosd-0.18 61
-MD5 81c1e430042db312cd8ebfcde85c3a25 files/digest-xchatosd-5.12 63
+MD5 a4c7f90ee206ff97099238e72f170c26 xchatosd-5.19.ebuild 1175
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+MD5 59732dfc29ce09f8cd43926da5c795af ChangeLog 2510
+MD5 7c7bda25fddb101d0ca9ced34251e234 files/digest-xchatosd-5.19 64
diff --git a/net-irc/xchatosd/xchatosd-5.19.ebuild b/net-irc/xchatosd/xchatosd-5.19.ebuild
index e8c336006183..cce365adda49 100644
--- a/net-irc/xchatosd/xchatosd-5.19.ebuild
+++ b/net-irc/xchatosd/xchatosd-5.19.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchatosd/xchatosd-5.19.ebuild,v 1.1 2005/06/28 12:14:01 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchatosd/xchatosd-5.19.ebuild,v 1.1.1.1 2005/11/30 09:48:56 chriswhite Exp $
 
-inherit eutils toolchain-funcs flag-o-matic
+inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="On-Screen Display for XChat"
 HOMEPAGE="http://sourceforge.net/projects/xchatosd/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~ia64"
+KEYWORDS="~amd64 ia64 ~ppc x86"
 IUSE="iconv"
 
 RDEPEND=">=x11-libs/xosd-2.2.5
diff --git a/net-irc/xdcc-fetch/ChangeLog b/net-irc/xdcc-fetch/ChangeLog
index 57dbae5e249f..8a9ebbb085a9 100644
--- a/net-irc/xdcc-fetch/ChangeLog
+++ b/net-irc/xdcc-fetch/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-irc/xdcc-fetch
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xdcc-fetch/ChangeLog,v 1.1 2005/04/07 20:32:25 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xdcc-fetch/ChangeLog,v 1.1.1.1 2005/11/30 09:48:52 chriswhite Exp $
+
+  16 May 2005; Sven Wegener <swegener@gentoo.org> xdcc-fetch-1.409.ebuild:
+  Marked stable on x86.
 
 *xdcc-fetch-1.409 (07 Apr 2005)
 
diff --git a/net-irc/xdcc-fetch/Manifest b/net-irc/xdcc-fetch/Manifest
index d353862c8012..981dc4f486ff 100644
--- a/net-irc/xdcc-fetch/Manifest
+++ b/net-irc/xdcc-fetch/Manifest
@@ -1,2 +1,14 @@
-MD5 be451168e33b2cdcb4dfbb03d7aba7f2 xdcc-fetch-1.409.ebuild 686
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 aea8fe0af36114e145e3d8533eca815f xdcc-fetch-1.409.ebuild 899
+MD5 b6f8aaa0047d3a35bac9d58d60e1cfb5 ChangeLog 495
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 MD5 d1669fd6cc6cbbc86ba2f794c6b5273d files/digest-xdcc-fetch-1.409 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCiMDLI1lqEGTUzyQRAtafAJ911GQowvgUlw+cLRoQ/EBkF+n/gQCffj9a
+tmPNDrJRYJwt2RpFhbdKJUg=
+=njPG
+-----END PGP SIGNATURE-----
diff --git a/net-irc/xdcc-fetch/xdcc-fetch-1.409.ebuild b/net-irc/xdcc-fetch/xdcc-fetch-1.409.ebuild
index 0465be996caf..79990a4ac1b0 100644
--- a/net-irc/xdcc-fetch/xdcc-fetch-1.409.ebuild
+++ b/net-irc/xdcc-fetch/xdcc-fetch-1.409.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xdcc-fetch/xdcc-fetch-1.409.ebuild,v 1.1 2005/04/07 20:32:25 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xdcc-fetch/xdcc-fetch-1.409.ebuild,v 1.1.1.1 2005/11/30 09:48:52 chriswhite Exp $
 
 inherit eutils
 
@@ -12,14 +12,14 @@ SRC_URI="mirror://sourceforge/xdccfetch/${MY_PN}-${PV}.tar.gz"
 LICENSE="BSD"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 IUSE=""
 
 DEPEND=">=dev-lang/ruby-1.8
 	>=dev-ruby/fxruby-1.2"
 
-S=${WORKDIR}/${MY_PN}
+S="${WORKDIR}"/${MY_PN}
 
 src_install() {
 	exeinto /usr/share/${PN}