*** empty log message ***

author: Chris White <chriswhite@gentoo.org> 2005-11-30 10:04:41 +0000
committer: Chris White <chriswhite@gentoo.org> 2005-11-30 10:04:41 +0000
commit: 6367d64b0f4015b22f6b2fd52baa03c209140207 (patch)
tree: 8b32c9c20b3e92522c9c6a7faeea93780140e41d /net-libs
parent: (no commit message) (diff)
download: gentoo-2-6367d64b0f4015b22f6b2fd52baa03c209140207.tar.gz
gentoo-2-6367d64b0f4015b22f6b2fd52baa03c209140207.tar.bz2
gentoo-2-6367d64b0f4015b22f6b2fd52baa03c209140207.zip
360 files changed, 7227 insertions, 1367 deletions
diff --git a/net-libs/adns/ChangeLog b/net-libs/adns/ChangeLog
index 7b8e439cb4b6..aecdb3091876 100644
--- a/net-libs/adns/ChangeLog
+++ b/net-libs/adns/ChangeLog
@@ -1,11 +1,53 @@
 # ChangeLog for net-libs/adns
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-libs/adns/ChangeLog,v 1.1 2002/02/01 21:53:34 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/adns/ChangeLog,v 1.1.1.1 2005/11/30 10:02:52 chriswhite Exp $
 
+  22 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> adns-1.1.ebuild:
+  Stable on ppc.
+
+  22 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org> adns-1.1.ebuild:
+  Multilib fixes.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  02 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> +files/adns-gcc34.patch,
+  adns-1.0.ebuild:
+  Add gcc-3.4 patch from bug 66034.
+
+  20 Jul 2004; Tom Gall <tgall@gentoo.org> adns-1.1.ebuild:
+  stable on ppc64, bug #57164
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> adns-1.1.ebuild:
+  virtual/glibc -> virtual/libc
+
+  28 Apr 2004; Mike Frysinger <vapier@gentoo.org> :
+  Add gcc-3.4 patch #49239 by Robert Moss.
+
+  12 Apr 2004; Chris Aniszczyk <zx@gentoo.org> adns-1.0.ebuild,
+  adns-1.1.ebuild:
+  Marking stable on hppa, some minor fixes
+
+  29 Mar 2004; Aron Griffis <agriffis@gentoo.org> adns-1.1.ebuild:
+  stable on alpha and ia64
+
+*adns-1.1 (22 Nov 2003)
+
+  22 Nov 2003; Seemant Kulleen <seemant@gentoo.org> adns-1.1.ebuild:
+  version bump, thanks to: Stephane LOEUILLET <bug-gentoo@leroutier.net> in bug
+  #33864
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *adns-1.0 (1 Feb 2002)
 
+  12 Dec 2002; Nick Hadaway <raker@gentoo.org> adns-1.0.ebuild :
+  Added a fix for a missing symlink as reported on bug #7999
+
+  13 Aug 2002; Pieter Van den Abeele <pvdabeel@gentoo.org> :
+  Added ppc keyword
+
   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-libs/adns/Manifest b/net-libs/adns/Manifest
index e69de29bb2d1..5624eec343b2 100644
--- a/net-libs/adns/Manifest
+++ b/net-libs/adns/Manifest
@@ -0,0 +1,6 @@
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 4ccd6d3063acc98127092004194a588e ChangeLog 2064
+MD5 9b2a6020cf4d7f36fd36742747971208 adns-1.1.ebuild 874
+MD5 76b3ed702ddc4890c7035d83a27aa42b files/adns-gcc34.patch 433
+MD5 02d0728348754d60e1859fdb915fe6bf files/digest-adns-1.1 60
+MD5 583cad2ed3b8db07cc660368048e3fdf files/1.1-gcc34.patch 472
diff --git a/net-libs/adns/adns-1.1.ebuild b/net-libs/adns/adns-1.1.ebuild
index 3247f2a2b5e8..1f9f73f648e3 100644
--- a/net-libs/adns/adns-1.1.ebuild
+++ b/net-libs/adns/adns-1.1.ebuild
@@ -1,32 +1,32 @@
-# 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-libs/adns/adns-1.1.ebuild,v 1.1 2003/11/22 08:48:58 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/adns/adns-1.1.ebuild,v 1.1.1.1 2005/11/30 10:02:52 chriswhite Exp $
+
+inherit eutils multilib
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Advanced, easy to use, asynchronous-capable DNS client library and utilities"
 HOMEPAGE="http://www.chiark.greenend.org.uk/~ian/adns/"
 SRC_URI="ftp://ftp.chiark.greenend.org.uk/users/ian/adns/${P}.tar.gz"
 
-
-SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~arm ~ia64 ~amd64"
-
-DEPEND="virtual/glibc"
-
-src_compile() {
+SLOT="0"
+KEYWORDS="x86 ppc sparc alpha hppa ~mips ia64 amd64 ppc64"
+IUSE=""
 
-	econf || die
-	emake || die
+DEPEND="virtual/libc"
+RDEPEND=""
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-gcc34.patch
 }
 
 src_install () {
-	dodir /usr/{include,bin,lib}
-	make prefix=${D}/usr install || die
-	dodoc README GPL-vs-LGPL COPYING TODO
+	dodir /usr/{include,bin,$(get_libdir)}
+	make prefix=${D}/usr lib_dir=${D}/usr/$(get_libdir) install || die
+	dodoc README TODO
 	dohtml *.html
 
-	cd ${D}/usr/lib
-	dosym libadns.so.1 /usr/lib/libadns.so
+	dosym libadns.so.1 /usr/$(get_libdir)/libadns.so
 }
diff --git a/net-libs/aqbanking/ChangeLog b/net-libs/aqbanking/ChangeLog
index 6f5f17407830..e46700a00821 100644
--- a/net-libs/aqbanking/ChangeLog
+++ b/net-libs/aqbanking/ChangeLog
@@ -1,6 +1,72 @@
 # ChangeLog for net-libs/aqbanking
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/aqbanking/ChangeLog,v 1.1 2004/12/21 17:02:40 hanno Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/aqbanking/ChangeLog,v 1.1.1.1 2005/11/30 10:02:53 chriswhite Exp $
+
+  18 Nov 2005; Hanno Boeck <hanno@gentoo.org> aqbanking-1.6.0_beta.ebuild:
+  Add -j1 to MAKEOPTS (parallel build fails on some systems).
+
+  28 Sep 2005; Hanno Boeck <hanno@gentoo.org> aqbanking-1.6.0_beta.ebuild:
+  Commenting out gtk2-useflag, doesn't build without X.
+
+*aqbanking-1.6.0_beta (26 Sep 2005)
+
+  26 Sep 2005; Hanno Boeck <hanno@gentoo.org> +aqbanking-1.6.0_beta.ebuild:
+  Update to new aqbanking (includes aqhbci-*).
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> aqbanking-1.1.0.ebuild:
+  add ~ia64
+
+*aqbanking-1.1.0 (12 Jul 2005)
+
+  12 Jul 2005; Hanno Boeck <hanno@gentoo.org> +aqbanking-1.1.0.ebuild:
+  Version bump.
+
+*aqbanking-1.0.8 (13 Apr 2005)
+
+  13 Apr 2005; Hanno Boeck <hanno@gentoo.org> +aqbanking-1.0.8.ebuild:
+  Version bump.
+
+*aqbanking-1.0.6 (13 Mar 2005)
+
+  13 Mar 2005; Hanno Boeck <hanno@gentoo.org> +aqbanking-1.0.6.ebuild:
+  Version bump.
+
+  14 Feb 2005; Simon Stelling <blubb@gentoo.org>
+  aqbanking-1.0.4_beta.ebuild:
+  added ~amd64
+
+  05 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
+  aqbanking-1.0.4_beta.ebuild:
+  ~alpha keyword.
+
+*aqbanking-1.0.4_beta (31 Jan 2005)
+
+  31 Jan 2005; Hanno Boeck <hanno@gentoo.org> +aqbanking-1.0.4_beta.ebuild:
+  Version bump.
+
+  30 Jan 2005; Jason Wever <weeve@gentoo.org> aqbanking-1.0.2_beta.ebuild:
+  Added ~sparc keyword wrt bug #73702.
+
+*aqbanking-1.0.2_beta (23 Jan 2005)
+
+  23 Jan 2005; Hanno Boeck <hanno@gentoo.org> +aqbanking-1.0.2_beta.ebuild:
+  Version bump.
+
+*aqbanking-0.9.9 (13 Jan 2005)
+
+  13 Jan 2005; Hanno Boeck <hanno@gentoo.org> +aqbanking-0.9.9.ebuild:
+  Version bump.
+
+  03 Jan 2005; Chris White <chriswhite@gentoo.org> aqbanking-0.9.8.ebuild:
+  ~ppc towards bug #73702.
+
+  27 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> aqbanking-0.9.8.ebuild:
+  ~alpha keyword.
+
+*aqbanking-0.9.8 (26 Dec 2004)
+
+  26 Dec 2004; Jason Wever <weeve@gentoo.org> aqbanking-0.9.8.ebuild:
+  Added ~sparc keyword wrt bug #73702.
 
   21 Dec 2004; Hanno Boeck <hanno@gentoo.org> :
   Initial commit (thanks to Florian Mueller in bug #72470).
diff --git a/net-libs/aqbanking/Manifest b/net-libs/aqbanking/Manifest
index 7287af3f2ba3..be0e14b29b9f 100644
--- a/net-libs/aqbanking/Manifest
+++ b/net-libs/aqbanking/Manifest
@@ -1,4 +1,28 @@
-MD5 71b189e554c001026395feeae9d6c6f8 aqbanking-0.9.8.ebuild 630
-MD5 b924191af5ec272812795f9d8a774d03 ChangeLog 317
-MD5 a72a06a37ca4e5905085ebff07fe9e9e metadata.xml 217
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d3b719b68814ce8f81a1a45976b79406 ChangeLog 2231
+MD5 f65433b0b235b8c43a7e8417cdc13ae4 aqbanking-0.9.8.ebuild 636
+MD5 100bb6380f9d2d61ae4e192bd7319655 aqbanking-0.9.9.ebuild 636
+MD5 ea0f8d12435c101c9871905e9b7e363f aqbanking-1.0.2_beta.ebuild 676
+MD5 a5113a43fcff2982153ac16bf3ea2cc6 aqbanking-1.0.4_beta.ebuild 700
+MD5 d647d450699249f5b8bd88ec36e551a2 aqbanking-1.0.6.ebuild 671
+MD5 b9d23b01ec5b6687b608a00fc7c9dbd8 aqbanking-1.0.8.ebuild 672
+MD5 b5d6686a322b925b38807145c19c9201 aqbanking-1.1.0.ebuild 678
+MD5 6f5701b64d9c3629fd675320c4a24bf4 aqbanking-1.6.0_beta.ebuild 1619
 MD5 1871394417ac872fb0070b0a2f25379a files/digest-aqbanking-0.9.8 67
+MD5 ac162c61869cdb978111c926abc743e9 files/digest-aqbanking-0.9.9 67
+MD5 218018d23612c389cdd79f33864104b9 files/digest-aqbanking-1.0.2_beta 71
+MD5 a53a4f54cb527b20065aa6f3f150dde1 files/digest-aqbanking-1.0.4_beta 71
+MD5 1093fd6e52214774401a58c75b9162b4 files/digest-aqbanking-1.0.6 67
+MD5 1c5b8e47920f4e3b5dd255a10e7d3b3c files/digest-aqbanking-1.0.8 67
+MD5 90a0a0c187db03c2eddcf192c4432ceb files/digest-aqbanking-1.1.0 68
+MD5 ff9a0f1595c29d0edd0398dcceafaa63 files/digest-aqbanking-1.6.0_beta 72
+MD5 a72a06a37ca4e5905085ebff07fe9e9e metadata.xml 217
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfbppr2QksT29OyARAqq0AKCUUQY84BAd9wD5N2OIE7Ijftb6NQCdFO3J
+8N9P9pe+Tg4bcACLBcKVMOA=
+=GK7h
+-----END PGP SIGNATURE-----
diff --git a/net-libs/aqbanking/aqbanking-0.9.8.ebuild b/net-libs/aqbanking/aqbanking-0.9.8.ebuild
index 5dfa244d5777..367b28f9548e 100644
--- a/net-libs/aqbanking/aqbanking-0.9.8.ebuild
+++ b/net-libs/aqbanking/aqbanking-0.9.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-libs/aqbanking/aqbanking-0.9.8.ebuild,v 1.1 2004/12/21 17:02:40 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/aqbanking/aqbanking-0.9.8.ebuild,v 1.1.1.1 2005/11/30 10:02:53 chriswhite Exp $
 
 DESCRIPTION="Generic Online Banking Interface"
-HOMEPAGE="http://www.aqmaniac.de/aqbanking/"
+HOMEPAGE="http://www.aquamaniac.de/aqbanking/"
 SRC_URI="mirror://sourceforge/aqbanking/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~sparc ~alpha ~ppc"
 IUSE="debug"
 DEPEND=">=sys-libs/gwenhywfar-1.2"
-S=${WORKDIR}/${P}
 
 src_compile() {
 	econf `use_enable debug` || die
diff --git a/net-libs/aqbanking/aqbanking-0.9.9.ebuild b/net-libs/aqbanking/aqbanking-0.9.9.ebuild
index 2fbf37598666..27417148b8d3 100644
--- a/net-libs/aqbanking/aqbanking-0.9.9.ebuild
+++ b/net-libs/aqbanking/aqbanking-0.9.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-libs/aqbanking/aqbanking-0.9.9.ebuild,v 1.1 2005/01/13 12:07:30 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/aqbanking/aqbanking-0.9.9.ebuild,v 1.1.1.1 2005/11/30 10:02:53 chriswhite Exp $
 
 DESCRIPTION="Generic Online Banking Interface"
 HOMEPAGE="http://www.aquamaniac.de/aqbanking/"
@@ -10,7 +10,6 @@ SLOT="0"
 KEYWORDS="~x86 ~sparc ~alpha ~ppc"
 IUSE="debug"
 DEPEND=">=sys-libs/gwenhywfar-1.4"
-S=${WORKDIR}/${P}
 
 src_compile() {
 	econf `use_enable debug` || die
diff --git a/net-libs/aqbanking/aqbanking-1.0.2_beta.ebuild b/net-libs/aqbanking/aqbanking-1.0.2_beta.ebuild
index a681607eeda4..f92469df80eb 100644
--- a/net-libs/aqbanking/aqbanking-1.0.2_beta.ebuild
+++ b/net-libs/aqbanking/aqbanking-1.0.2_beta.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-libs/aqbanking/aqbanking-1.0.2_beta.ebuild,v 1.1 2005/01/23 01:44:57 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/aqbanking/aqbanking-1.0.2_beta.ebuild,v 1.1.1.1 2005/11/30 10:02:53 chriswhite Exp $
 
 DESCRIPTION="Generic Online Banking Interface"
 HOMEPAGE="http://www.aquamaniac.de/aqbanking/"
 SRC_URI="mirror://sourceforge/aqbanking/${P/_/}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~ppc ~sparc"
 IUSE="debug"
 DEPEND=">=sys-libs/gwenhywfar-1.4
 	app-misc/ktoblzcheck"
diff --git a/net-libs/aqbanking/aqbanking-1.0.4_beta.ebuild b/net-libs/aqbanking/aqbanking-1.0.4_beta.ebuild
index 456aedb4c2c9..f7ec7934466e 100644
--- a/net-libs/aqbanking/aqbanking-1.0.4_beta.ebuild
+++ b/net-libs/aqbanking/aqbanking-1.0.4_beta.ebuild
@@ -1,22 +1,21 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/aqbanking/aqbanking-1.0.4_beta.ebuild,v 1.1 2005/01/31 11:37:12 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/aqbanking/aqbanking-1.0.4_beta.ebuild,v 1.1.1.1 2005/11/30 10:02:53 chriswhite Exp $
 
 DESCRIPTION="Generic Online Banking Interface"
 HOMEPAGE="http://www.aquamaniac.de/aqbanking/"
 SRC_URI="mirror://sourceforge/aqbanking/${P/_/}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
 IUSE="debug"
 DEPEND=">=sys-libs/gwenhywfar-1.7.2
 	app-misc/ktoblzcheck"
 S=${WORKDIR}/${P/_/}
-MAKEOPTS="-j1"
 
 src_compile() {
 	econf `use_enable debug` || die
-	emake || die
+	emake -j1 || die
 }
 
 src_install() {
diff --git a/net-libs/aqbanking/aqbanking-1.0.6.ebuild b/net-libs/aqbanking/aqbanking-1.0.6.ebuild
index d4ece25aa152..0191f40adb59 100644
--- a/net-libs/aqbanking/aqbanking-1.0.6.ebuild
+++ b/net-libs/aqbanking/aqbanking-1.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-libs/aqbanking/aqbanking-1.0.6.ebuild,v 1.1 2005/03/13 22:40:12 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/aqbanking/aqbanking-1.0.6.ebuild,v 1.1.1.1 2005/11/30 10:02:53 chriswhite Exp $
 
 DESCRIPTION="Generic Online Banking Interface"
 HOMEPAGE="http://www.aquamaniac.de/aqbanking/"
@@ -11,12 +11,10 @@ KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
 IUSE="debug"
 DEPEND=">=sys-libs/gwenhywfar-1.9.0
 	app-misc/ktoblzcheck"
-S=${WORKDIR}/${P}
-MAKEOPTS="-j1"
 
 src_compile() {
 	econf `use_enable debug` || die
-	emake || die
+	emake -j1 || die
 }
 
 src_install() {
diff --git a/net-libs/aqbanking/aqbanking-1.0.8.ebuild b/net-libs/aqbanking/aqbanking-1.0.8.ebuild
index 13d5fc8e4afe..0ad4f1515afd 100644
--- a/net-libs/aqbanking/aqbanking-1.0.8.ebuild
+++ b/net-libs/aqbanking/aqbanking-1.0.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-libs/aqbanking/aqbanking-1.0.8.ebuild,v 1.1 2005/04/13 07:03:30 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/aqbanking/aqbanking-1.0.8.ebuild,v 1.1.1.1 2005/11/30 10:02:53 chriswhite Exp $
 
 DESCRIPTION="Generic Online Banking Interface"
 HOMEPAGE="http://www.aquamaniac.de/aqbanking/"
@@ -11,12 +11,10 @@ KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
 IUSE="debug"
 DEPEND=">=sys-libs/gwenhywfar-1.11.0
 	app-misc/ktoblzcheck"
-S=${WORKDIR}/${P}
-MAKEOPTS="-j1"
 
 src_compile() {
 	econf `use_enable debug` || die
-	emake || die
+	emake -j1 || die
 }
 
 src_install() {
diff --git a/net-libs/aqbanking/aqbanking-1.1.0.ebuild b/net-libs/aqbanking/aqbanking-1.1.0.ebuild
index e5108c59dff5..a3133487d579 100644
--- a/net-libs/aqbanking/aqbanking-1.1.0.ebuild
+++ b/net-libs/aqbanking/aqbanking-1.1.0.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-libs/aqbanking/aqbanking-1.1.0.ebuild,v 1.1 2005/07/12 21:51:19 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/aqbanking/aqbanking-1.1.0.ebuild,v 1.1.1.1 2005/11/30 10:02:53 chriswhite Exp $
 
 DESCRIPTION="Generic Online Banking Interface"
 HOMEPAGE="http://www.aquamaniac.de/aqbanking/"
 SRC_URI="mirror://sourceforge/aqbanking/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 IUSE="debug"
 DEPEND=">=sys-libs/gwenhywfar-1.14.0
 	app-misc/ktoblzcheck"
diff --git a/net-libs/aqbanking/aqbanking-1.6.0_beta.ebuild b/net-libs/aqbanking/aqbanking-1.6.0_beta.ebuild
index 70d7b5263f57..8956ea6f71ef 100644
--- a/net-libs/aqbanking/aqbanking-1.6.0_beta.ebuild
+++ b/net-libs/aqbanking/aqbanking-1.6.0_beta.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-libs/aqbanking/aqbanking-1.6.0_beta.ebuild,v 1.1 2005/09/26 16:12:11 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/aqbanking/aqbanking-1.6.0_beta.ebuild,v 1.1.1.1 2005/11/30 10:02:53 chriswhite Exp $
 
 inherit kde-functions
 
@@ -10,18 +10,20 @@ SRC_URI="mirror://sourceforge/aqbanking/${P/_/}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ia64 ~ppc ~sparc ~alpha ~amd64"
-IUSE="debug ofx geldkarte chipcard dtaus hbci kde gtk2 qt python"
+IUSE="debug ofx geldkarte chipcard dtaus hbci kde qt"
 DEPEND=">=sys-libs/gwenhywfar-1.16.0
 	app-misc/ktoblzcheck
-	ofx? >=dev-libs/libofx-0.8
-	geldkarte? >=sys-libs/libchipcard-1.9.15_beta
-	chipcard? >=sys-libs/libchipcard-1.9.15_beta
-	gtk2? >=dev-util/glade-2"
+	ofx? ( >=dev-libs/libofx-0.8 )
+	geldkarte? ( >=sys-libs/libchipcard-1.9.15_beta )
+	chipcard? ( >=sys-libs/libchipcard-1.9.15_beta )"
 
 # ctypes is not yet keyworded on most archs
 #	python? dev-python/ctypes
-S=${WORKDIR}/${P/_/}
+# gtk2 doesn't build without X, not needed at the moment because no app uses it.
+#	gtk2? >=dev-util/glade-2"
 
+S=${WORKDIR}/${P/_/}
+MAKEOPTS="${MAKEOPTS} -j1"
 
 use qt && need-qt 3.1
 use kde && need-kde 3.1
@@ -30,7 +32,8 @@ src_compile() {
 	local FRONTENDS="cbanking"
 	use qt && FRONTENDS="${FRONTENDS} qbanking"
 	use kde && FRONTENDS="${FRONTENDS} kbanking"
-	use gtk2 && FRONTENDS="${FRONTENDS} g2banking"
+
+#	use gtk2 && FRONTENDS="${FRONTENDS} g2banking"
 
 	local BACKENDS=""
 	use hbci && BACKENDS="aqhbci"
diff --git a/net-libs/c-client/ChangeLog b/net-libs/c-client/ChangeLog
index 1cfc481f394c..18a7a175e840 100644
--- a/net-libs/c-client/ChangeLog
+++ b/net-libs/c-client/ChangeLog
@@ -1,9 +1,121 @@
 # ChangeLog for net-libs/c-client
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/ChangeLog,v 1.1 2003/06/08 03:41:35 robbat2 Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/ChangeLog,v 1.1.1.1 2005/11/30 10:03:00 chriswhite Exp $
+
+*c-client-2004g (06 Oct 2005)
+
+  06 Oct 2005; Robin H. Johnson <robbat2@gentoo.org> +c-client-2004g.ebuild:
+  Bug #107562, version bump.
+
+  25 Apr 2005; Bryan Østergaard <kloeri@gentoo.org>
+  c-client-2004a-r1.ebuild:
+  Stable on alpha.
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org> c-client-2004a-r1.ebuild:
+  Stable on ppc64
+
+  08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  c-client-2004a-r1.ebuild:
+  Stable on ppc.
+
+  06 Apr 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  c-client-2004a-r1.ebuild:
+  Marked stable on amd64.
+
+  01 Apr 2005; Aron Griffis <agriffis@gentoo.org> c-client-2004a-r1.ebuild:
+  stable on ia64
+
+  31 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  c-client-2004a-r1.ebuild:
+  Stable on sparc
+
+*c-client-2004c (30 Mar 2005)
+
+  30 Mar 2005; Robin H. Johnson <robbat2@gentoo.org> +c-client-2004c.ebuild:
+  Version bump.
+
+  30 Mar 2005; Robin H. Johnson <robbat2@gentoo.org>
+  c-client-2004a-r1.ebuild:
+  Move 2004a-r1 to stable x86.
+
+  10 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> c-client-2004a-r1.ebuild:
+  Tiny cleanup in symlink creation of the .so.
+
+  20 Feb 2005; Hardave Riar <hardave@gentoo.org> c-client-2004a.ebuild:
+  Stable on mips
+
+*c-client-2004a-r1 (01 Feb 2005)
+
+  01 Feb 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  +files/c-client-2004a-amd64-so-fix.patch, +c-client-2004a-r1.ebuild:
+  Patched Makefile to build a shared library for amd64, allowing PHP 5 with imap
+  to compile. Also fixed the symlinking of c-client.a for multilib archs.
+
+  03 Nov 2004; Bret Curtis <psi29a@gentoo.org> :
+  Addeing to ~mips for testing
+
+*c-client-2004a (02 Oct 2004)
+
+  02 Oct 2004; <iggy@gentoo.org> +c-client-2004a.ebuild:
+  version bump, added pam use flag
+
+  18 Aug 2004; Tom Gall <tgall@gentoo.org> c-client-2002e-r2.ebuild:
+  stable on ppc64
+
+  16 Apr 2004; Michael McCabe <randy@gentoo.org> c-client-2002e-r2.ebuild:
+  adding s390 keywords
+
+*c-client-2002e-r2 (05 Feb 2004)
+
+  05 Feb 2004; Robin H. Johnson <robbat2@gentoo.org> c-client-2002e-r2.ebuild:
+  fix bug #40146, move -fPIC to all arches as it's needed for lots of fixes.
+
+  01 Jan 2004; Jon Portnoy <avenj@gentoo.org> c-client-2002e-r1.ebuild :
+  AMD64 keywords.
+
+  10 Jan 2004; <agriffis@gentoo.org> c-client-2002e-r1.ebuild:
+  stable on ia64
+
+  22 Dec 2003; Robin H. Johnson <robbat2@gentoo.org> c-client-2002d-r1.ebuild,
+  c-client-2002d.ebuild, c-client-2002e-r1.ebuild, c-client-2002e.ebuild:
+  fix bug #35437
+
+*c-client-2002e-r1 (08 Dec 2003)
+
+  08 Dec 2003; Robin H. Johnson <robbat2@gentoo.org> c-client-2002e-r1.ebuild:
+  fix bug #35378 and move new ebuild to stable right away to fix some other
+  glitches
+
+  25 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> metadata.xml:
+  add metadata.xml
+
+*c-client-2002e (25 Oct 2003)
+
+  25 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> c-client-2002e.ebuild:
+  version bump
+
+  25 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> c-client-2002d-r1.ebuild:
+  bump -r1 to stable
+
+*c-client-2002d-r1 (11 Aug 2003)
+
+  11 Aug 2003; Robin H. Johnson <robbat2@gentoo.org> c-client-2002d-r1.ebuild:
+  add more -fPIC support
+
+  02 Aug 2003; Tavis Ormandy <taviso@gentoo.org> c-client-2002d.ebuild:
+  stable on alpha
+
+  12 Jul 2003; Jason Wever <weeve@gentoo.org> c-client-2002d.ebuild:
+  Changed ~sparc keyword to sparc to fix dependency borkage.
+
+  28 Jun 2003; Tavis Ormandy <taviso@gentoo.org> c-client-2002d.ebuild:
+  alpha needs -fPIC
 
 *c-client-2002d (07 Jun 2003)
 
+  20 Jun 2003; Guy Martin <gmsoft@gentoo.org> c-client-2002d.ebuild :
+  Added hppa to KEYWORDS to fix dependencies problem with mod_php.
+
   07 Jun 2003; Robin Johnson <robbat2@gentoo.org> Manifest,
   files/digest-c-client-2002d, files/2002d-Makefile.patch, ChangeLog,
   c-client-2002d.ebuild:
diff --git a/net-libs/c-client/Manifest b/net-libs/c-client/Manifest
index 5d18b32c5c24..2d4c5d79899e 100644
--- a/net-libs/c-client/Manifest
+++ b/net-libs/c-client/Manifest
@@ -1,3 +1,22 @@
-MD5 6df9cd63bf3c9022ffa6078f342fe87e c-client-2002d.ebuild 1589
-MD5 261642cc8a2c80e33293bebbd8e9fa97 files/2002b-Makefile.patch 2203
+MD5 ea43380bced168754a00f131df85b1e5 ChangeLog 4045
+MD5 47ac744573c05e8e5c5dc6b471bde3fa c-client-2002d-r1.ebuild 1869
+MD5 cc926ec2e710759c314acd92cd84b770 c-client-2002d.ebuild 1853
+MD5 81f0f9656a107854fa3ddf25217525a6 c-client-2002e-r1.ebuild 1974
+MD5 e7bce4b8478b1128e86efb8bf43a7d08 c-client-2002e-r2.ebuild 2039
+MD5 5fb5acd5c2e0b78dbaca4aa75cb36b74 c-client-2002e.ebuild 1893
+MD5 4c13a5d66e19772a66b8a407a0d32bb9 c-client-2004a-r1.ebuild 2590
+MD5 ecdbce3ee2598f6cf9d5f037333c9766 c-client-2004a.ebuild 2183
+MD5 6d40d56dec0a2c40e801393e6511e83b c-client-2004c.ebuild 2534
+MD5 08831025d4f5754ca025e7e34b222164 c-client-2004g.ebuild 2533
+MD5 c8cf618ac210e06a1641871b30550e8f files/2002d-Makefile.patch 2174
+MD5 cde23dc2375a8c33998202c8f0c9ae0e files/c-client-2004a-amd64-so-fix.patch 675
 MD5 1fc1132a6fb90046b701e9196e7a96b0 files/digest-c-client-2002d 62
+MD5 1fc1132a6fb90046b701e9196e7a96b0 files/digest-c-client-2002d-r1 62
+MD5 27b9eec6a66d66ef07109f82da8f10ce files/digest-c-client-2002e 62
+MD5 27b9eec6a66d66ef07109f82da8f10ce files/digest-c-client-2002e-r1 62
+MD5 27b9eec6a66d66ef07109f82da8f10ce files/digest-c-client-2002e-r2 62
+MD5 86da98c03bc68723a437d2cf135b0775 files/digest-c-client-2004a 62
+MD5 86da98c03bc68723a437d2cf135b0775 files/digest-c-client-2004a-r1 62
+MD5 464e6baf7e9bdb0bebb80f0810515962 files/digest-c-client-2004c 63
+MD5 5eb8b5fa92f61ec775be70c761ea24ae files/digest-c-client-2004g 62
+MD5 6b964abdc013cf2bb64040e8e33215ae metadata.xml 242
diff --git a/net-libs/c-client/c-client-2002d-r1.ebuild b/net-libs/c-client/c-client-2002d-r1.ebuild
index 8df1cdc30482..b3c5924e3e15 100644
--- a/net-libs/c-client/c-client-2002d-r1.ebuild
+++ b/net-libs/c-client/c-client-2002d-r1.ebuild
@@ -1,57 +1,57 @@
-# 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-libs/c-client/c-client-2002d-r1.ebuild,v 1.1 2003/08/11 09:07:41 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/c-client-2002d-r1.ebuild,v 1.1.1.1 2005/11/30 10:03:00 chriswhite Exp $
+
+inherit flag-o-matic
 
 MY_PN=imap
 MY_P=${MY_PN}-${PV}
 S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="UW IMAP c-client library"
-SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z"
 HOMEPAGE="http://www.washington.edu/imap/"
+SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc hppa alpha"
+KEYWORDS="x86 sparc ppc hppa alpha"
 IUSE="ssl pic"
 
-PROVIDE="virtual/imap-c-client"
 RDEPEND="ssl? ( dev-libs/openssl )
-		 !virtual/imap-c-client"
+	 !virtual/imap-c-client"
 DEPEND="${RDEPEND}
-		>=sys-libs/pam-0.72"
-
-inherit flag-o-matic 
+	>=sys-libs/pam-0.72"
+PROVIDE="virtual/imap-c-client"
 
 src_unpack() {
 	unpack ${A}
 
 	# Tarball packed with bad file perms
-	chmod -R ug+w ${S} 
+	chmod -R ug+w ${S}
 
 	# alpha needs -fPIC
 	use pic || use alpha && append-flags -fPIC
-	
+
 	# Modifications so we can build it optimially and correctly
 	cd ${S}/src/osdep/unix/
 	cp Makefile Makefile.orig
 	sed \
-		-e 's,-g -fno-omit-frame-pointer -O6,${CFLAGS},g' \
-		-e 's,SSLDIR=/usr/local/ssl,SSLDIR=/usr,g' \
-		-e 's,SSLCERTS=$(SSLDIR)/certs,SSLCERTS=/etc/ssl/certs,g' \
+		-e "s:-g -fno-omit-frame-pointer -O6:${CFLAGS}:g" \
+		-e 's:SSLDIR=/usr/local/ssl:SSLDIR=/usr:g' \
+		-e 's:SSLCERTS=$(SSLDIR)/certs:SSLCERTS=/etc/ssl/certs:g' \
 		< Makefile.orig > Makefile
-	
+
 	# Apply a patch to only build the stuff we need for c-client
 	cd ${S}
 	patch < ${FILESDIR}/${PV}-Makefile.patch
-	
+
 	# Remove the pesky checks about SSL stuff
 	cd ${S}
 	cp Makefile Makefile.orig
 	grep -v 'read.*exit 1' <Makefile.orig >Makefile
 }
 
-src_compile() {                           
+src_compile() {
 	if use ssl; then
 		make lnp SSLTYPE=unix || die
 	else
@@ -65,7 +65,7 @@ src_install() {
 	# Library binary
 	dolib.a c-client/c-client.a
 	dosym /usr/lib/c-client.a /usr/lib/libc-client.a
-	
+
 	# Headers
 	insinto /usr/include/imap
 	doins c-client/{c-client,mail,imap4r1,rfc822,linkage,misc,smtp,nntp}.h
diff --git a/net-libs/c-client/c-client-2002d.ebuild b/net-libs/c-client/c-client-2002d.ebuild
index 31de61409e2b..16b17c84ad07 100644
--- a/net-libs/c-client/c-client-2002d.ebuild
+++ b/net-libs/c-client/c-client-2002d.ebuild
@@ -1,52 +1,57 @@
-# 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-libs/c-client/c-client-2002d.ebuild,v 1.1 2003/06/08 03:41:35 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/c-client-2002d.ebuild,v 1.1.1.1 2005/11/30 10:03:00 chriswhite Exp $
+
+inherit flag-o-matic
 
 MY_PN=imap
 MY_P=${MY_PN}-${PV}
 S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="UW IMAP c-client library"
-SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z"
 HOMEPAGE="http://www.washington.edu/imap/"
+SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86 ~sparc ~ppc ~hppa ~alpha"
+KEYWORDS="x86 sparc ~ppc hppa alpha"
 IUSE="ssl"
 
-PROVIDE="virtual/imap-c-client"
 RDEPEND="ssl? ( dev-libs/openssl )
-		 !virtual/imap-c-client"
+	 !virtual/imap-c-client"
 DEPEND="${RDEPEND}
-		>=sys-libs/pam-0.72"
+	>=sys-libs/pam-0.72"
+PROVIDE="virtual/imap-c-client"
 
 src_unpack() {
 	unpack ${A}
 
 	# Tarball packed with bad file perms
-	chmod -R ug+w ${S} 
+	chmod -R ug+w ${S}
+
+	# alpha needs -fPIC
+	use alpha && append-flags -fPIC
 
 	# Modifications so we can build it optimially and correctly
 	cd ${S}/src/osdep/unix/
 	cp Makefile Makefile.orig
 	sed \
-		-e 's,-g -fno-omit-frame-pointer -O6,${CFLAGS},g' \
-		-e 's,SSLDIR=/usr/local/ssl,SSLDIR=/usr,g' \
-		-e 's,SSLCERTS=$(SSLDIR)/certs,SSLCERTS=/etc/ssl/certs,g' \
+		-e "s:-g -fno-omit-frame-pointer -O6:${CFLAGS}:g" \
+		-e 's:SSLDIR=/usr/local/ssl:SSLDIR=/usr:g' \
+		-e 's:SSLCERTS=$(SSLDIR)/certs:SSLCERTS=/etc/ssl/certs:g' \
 		< Makefile.orig > Makefile
-	
+
 	# Apply a patch to only build the stuff we need for c-client
 	cd ${S}
 	patch < ${FILESDIR}/${PV}-Makefile.patch
-	
+
 	# Remove the pesky checks about SSL stuff
 	cd ${S}
 	cp Makefile Makefile.orig
 	grep -v 'read.*exit 1' <Makefile.orig >Makefile
 }
 
-src_compile() {                           
+src_compile() {
 	if use ssl; then
 		make lnp SSLTYPE=unix || die
 	else
@@ -60,7 +65,7 @@ src_install() {
 	# Library binary
 	dolib.a c-client/c-client.a
 	dosym /usr/lib/c-client.a /usr/lib/libc-client.a
-	
+
 	# Headers
 	insinto /usr/include/imap
 	doins c-client/{c-client,mail,imap4r1,rfc822,linkage,misc,smtp,nntp}.h
diff --git a/net-libs/c-client/c-client-2002e-r1.ebuild b/net-libs/c-client/c-client-2002e-r1.ebuild
index aad6bf13e799..b0f7313c746a 100644
--- a/net-libs/c-client/c-client-2002e-r1.ebuild
+++ b/net-libs/c-client/c-client-2002e-r1.ebuild
@@ -1,27 +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-libs/c-client/c-client-2002e-r1.ebuild,v 1.1 2003/12/09 04:02:22 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/c-client-2002e-r1.ebuild,v 1.1.1.1 2005/11/30 10:03:00 chriswhite Exp $
+
+inherit flag-o-matic eutils
 
 MY_PN=imap
 MY_P=${MY_PN}-${PV}
 S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="UW IMAP c-client library"
-SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z"
 HOMEPAGE="http://www.washington.edu/imap/"
+SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86 sparc ppc hppa alpha"
+KEYWORDS="x86 sparc ppc hppa alpha ia64 amd64"
 IUSE="ssl pic"
 
-PROVIDE="virtual/imap-c-client"
 RDEPEND="ssl? ( dev-libs/openssl )
-		 !virtual/imap-c-client"
+	 !virtual/imap-c-client"
 DEPEND="${RDEPEND}
-		>=sys-libs/pam-0.72"
-
-inherit flag-o-matic eutils
+	>=sys-libs/pam-0.72"
+PROVIDE="virtual/imap-c-client"
 
 src_unpack() {
 	unpack ${A}
@@ -30,14 +30,14 @@ src_unpack() {
 	chmod -R ug+w ${S}
 
 	# alpha needs -fPIC
-	use pic || use alpha && append-flags -fPIC
+	use pic || use alpha || use amd64 && append-flags -fPIC
 
 	# Modifications so we can build it optimially and correctly
 	sed \
-		-e "s,BASECFLAGS=\".*\",BASECFLAGS=\"${CFLAGS}\",g" \
-		-e 's,SSLDIR=/usr/local/ssl,SSLDIR=/usr,g' \
-		-e 's,SSLCERTS=$(SSLDIR)/certs,SSLCERTS=/etc/ssl/certs,g' \
-		-i ${S}/src/osdep/unix/Makefile
+		-e "s:BASECFLAGS=\".*\":BASECFLAGS=\"${CFLAGS}\":g" \
+		-e 's:SSLDIR=/usr/local/ssl:SSLDIR=/usr:g' \
+		-e 's:SSLCERTS=$(SSLDIR)/certs:SSLCERTS=/etc/ssl/certs:g' \
+		-i ${S}/src/osdep/unix/Makefile || die "Makefile sed fixing failed"
 
 	# Apply a patch to only build the stuff we need for c-client
 	EPATCH_OPTS="${EPATCH_OPTS} -d ${S}" \
diff --git a/net-libs/c-client/c-client-2002e-r2.ebuild b/net-libs/c-client/c-client-2002e-r2.ebuild
index c9137b5f66fc..261ff8e47102 100644
--- a/net-libs/c-client/c-client-2002e-r2.ebuild
+++ b/net-libs/c-client/c-client-2002e-r2.ebuild
@@ -1,6 +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-libs/c-client/c-client-2002e-r2.ebuild,v 1.1 2004/02/06 05:53:12 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/c-client-2002e-r2.ebuild,v 1.1.1.1 2005/11/30 10:03:00 chriswhite Exp $
+
+inherit flag-o-matic eutils
 
 MY_PN=imap
 MY_P=${MY_PN}-${PV}
@@ -12,16 +14,14 @@ SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86 sparc ppc hppa alpha ia64 amd64"
+KEYWORDS="x86 ppc sparc alpha arm hppa amd64 ia64 s390 ppc64"
 IUSE="ssl"
 
-PROVIDE="virtual/imap-c-client"
 RDEPEND="ssl? ( dev-libs/openssl )
-		 !virtual/imap-c-client"
+	 !virtual/imap-c-client"
 DEPEND="${RDEPEND}
-		>=sys-libs/pam-0.72"
-
-inherit flag-o-matic eutils
+	>=sys-libs/pam-0.72"
+PROVIDE="virtual/imap-c-client"
 
 src_unpack() {
 	unpack ${A}
@@ -70,7 +70,7 @@ src_install() {
 	rm ${D}/usr/include/imap/os_*.h
 
 	# Docs
-	dodoc CPYRIGHT README docs/*.txt docs/CONFIG docs/RELNOTES
+	dodoc README docs/*.txt docs/CONFIG docs/RELNOTES
 
 	docinto rfc
 	dodoc docs/rfc/*.txt
diff --git a/net-libs/c-client/c-client-2002e.ebuild b/net-libs/c-client/c-client-2002e.ebuild
index d7ccc49cfac6..418a08ca4735 100644
--- a/net-libs/c-client/c-client-2002e.ebuild
+++ b/net-libs/c-client/c-client-2002e.ebuild
@@ -1,27 +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-libs/c-client/c-client-2002e.ebuild,v 1.1 2003/10/26 06:46:53 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/c-client-2002e.ebuild,v 1.1.1.1 2005/11/30 10:03:00 chriswhite Exp $
+
+inherit flag-o-matic
 
 MY_PN=imap
 MY_P=${MY_PN}-${PV}
 S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="UW IMAP c-client library"
-SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z"
 HOMEPAGE="http://www.washington.edu/imap/"
+SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z"
 
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~x86 ~sparc ~ppc ~hppa ~alpha"
 IUSE="ssl pic"
 
-PROVIDE="virtual/imap-c-client"
 RDEPEND="ssl? ( dev-libs/openssl )
-		 !virtual/imap-c-client"
+	 !virtual/imap-c-client"
 DEPEND="${RDEPEND}
-		>=sys-libs/pam-0.72"
-
-inherit flag-o-matic
+	>=sys-libs/pam-0.72"
+PROVIDE="virtual/imap-c-client"
 
 src_unpack() {
 	unpack ${A}
@@ -36,9 +36,9 @@ src_unpack() {
 	cd ${S}/src/osdep/unix/
 	cp Makefile Makefile.orig
 	sed \
-		-e 's,-g -fno-omit-frame-pointer -O6,${CFLAGS},g' \
-		-e 's,SSLDIR=/usr/local/ssl,SSLDIR=/usr,g' \
-		-e 's,SSLCERTS=$(SSLDIR)/certs,SSLCERTS=/etc/ssl/certs,g' \
+		-e "s:-g -fno-omit-frame-pointer -O6:${CFLAGS}:g" \
+		-e 's:SSLDIR=/usr/local/ssl:SSLDIR=/usr:g' \
+		-e 's:SSLCERTS=$(SSLDIR)/certs:SSLCERTS=/etc/ssl/certs:g' \
 		< Makefile.orig > Makefile
 
 	# Apply a patch to only build the stuff we need for c-client
diff --git a/net-libs/c-client/c-client-2004a-r1.ebuild b/net-libs/c-client/c-client-2004a-r1.ebuild
index 6b7c20df66b7..cdcef9ff24a4 100644
--- a/net-libs/c-client/c-client-2004a-r1.ebuild
+++ b/net-libs/c-client/c-client-2004a-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-libs/c-client/c-client-2004a-r1.ebuild,v 1.1 2005/02/01 15:33:05 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/c-client-2004a-r1.ebuild,v 1.1.1.1 2005/11/30 10:03:00 chriswhite Exp $
 
 inherit flag-o-matic eutils libtool
 
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64 ~mips"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="ssl pam"
 
 RDEPEND="ssl? ( dev-libs/openssl )
@@ -75,10 +75,10 @@ src_install() {
 
 	# Now the shared library created for amd64
 	if use amd64; then
-		dolib.so c-client/libc-client.so*
+		dolib.so c-client/libc-client.so.1.0.0
 		cd ${D}/usr/$(get_libdir)
 		ln -s libc-client.so.1.0.0 libc-client.so.1
-		ln -s libc-client.so.1 libc-client.so
+		ln -s libc-client.so.1.0.0 libc-client.so
 	fi
 
 	cd ${S}
diff --git a/net-libs/c-client/c-client-2004a.ebuild b/net-libs/c-client/c-client-2004a.ebuild
index fefa6b06ec8f..9ac23c34c72d 100644
--- a/net-libs/c-client/c-client-2004a.ebuild
+++ b/net-libs/c-client/c-client-2004a.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-libs/c-client/c-client-2004a.ebuild,v 1.1 2004/10/02 06:16:57 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/c-client-2004a.ebuild,v 1.1.1.1 2005/11/30 10:03:00 chriswhite Exp $
 
 inherit flag-o-matic eutils libtool
 
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64 mips"
 IUSE="ssl pam"
 
 RDEPEND="ssl? ( dev-libs/openssl )
diff --git a/net-libs/c-client/c-client-2004c.ebuild b/net-libs/c-client/c-client-2004c.ebuild
index 6d888f391c00..f054aeff529a 100644
--- a/net-libs/c-client/c-client-2004c.ebuild
+++ b/net-libs/c-client/c-client-2004c.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-libs/c-client/c-client-2004c.ebuild,v 1.1 2005/03/31 02:39:01 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/c-client-2004c.ebuild,v 1.1.1.1 2005/11/30 10:03:00 chriswhite Exp $
 
 inherit flag-o-matic eutils libtool
 
diff --git a/net-libs/c-client/c-client-2004g.ebuild b/net-libs/c-client/c-client-2004g.ebuild
index 22f689098176..14055010769f 100644
--- a/net-libs/c-client/c-client-2004g.ebuild
+++ b/net-libs/c-client/c-client-2004g.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-libs/c-client/c-client-2004g.ebuild,v 1.1 2005/10/06 20:21:17 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/c-client-2004g.ebuild,v 1.1.1.1 2005/11/30 10:03:00 chriswhite Exp $
 
 inherit flag-o-matic eutils libtool
 
diff --git a/net-libs/ccrtp/ChangeLog b/net-libs/ccrtp/ChangeLog
index c84f4bf1276c..7a3576b900e0 100644
--- a/net-libs/ccrtp/ChangeLog
+++ b/net-libs/ccrtp/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-libs/ccrtp
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ccrtp/ChangeLog,v 1.1 2005/08/21 04:22:57 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ccrtp/ChangeLog,v 1.1.1.1 2005/11/30 10:02:54 chriswhite Exp $
+
+*ccrtp-1.3.5-r1 (07 Nov 2005)
+
+  07 Nov 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/ccrtp-1.3.5-amd64.patch, +ccrtp-1.3.5-r1.ebuild:
+  amd64 patch thanks to Diego - bug #110856
+
+*ccrtp-1.3.5 (17 Oct 2005)
+
+  17 Oct 2005; Daniel Black <dragonheart@gentoo.org> ccrtp-1.3.4.ebuild,
+  +ccrtp-1.3.5.ebuild:
+  version bump
 
 *ccrtp-1.3.4 (21 Aug 2005)
 
diff --git a/net-libs/ccrtp/Manifest b/net-libs/ccrtp/Manifest
index 8a7cca549a0d..5df0aac0d37a 100644
--- a/net-libs/ccrtp/Manifest
+++ b/net-libs/ccrtp/Manifest
@@ -1,4 +1,19 @@
-MD5 d06af36fc88c292fb8c021c63c87ea75 ccrtp-1.3.4.ebuild 512
-MD5 d41d8cd98f00b204e9800998ecf8427e ChangeLog 0
-MD5 c1a6093f6bf43cae3b4360e3620d9992 metadata.xml 252
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3049836e32615aa3838c9cbf7bb4c528 ChangeLog 721
+MD5 179a095c09cbaae39e5732fd2db7f456 ccrtp-1.3.4.ebuild 615
+MD5 e0df19acdb4af8bfad118b85473805db ccrtp-1.3.5-r1.ebuild 702
+MD5 1a11fe5158f0b4fa5c0d52ef0f44e983 ccrtp-1.3.5.ebuild 615
+MD5 2b12c1744c85b868fc95411e96b8f9e2 files/ccrtp-1.3.5-amd64.patch 699
 MD5 e2450d97ee3ec317929ba907208f2a88 files/digest-ccrtp-1.3.4 63
+MD5 46446c015677f6eb590de0f77206674f files/digest-ccrtp-1.3.5 63
+MD5 46446c015677f6eb590de0f77206674f files/digest-ccrtp-1.3.5-r1 63
+MD5 c1a6093f6bf43cae3b4360e3620d9992 metadata.xml 252
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDbyuhmdTrptrqvGERAgFaAJ9f1uS06+8SwQmtEQjG8qE25lawHACfc1+J
+tTXdp9EHrKrRvvlpE3PzxW0=
+=apU7
+-----END PGP SIGNATURE-----
diff --git a/net-libs/ccrtp/ccrtp-1.3.4.ebuild b/net-libs/ccrtp/ccrtp-1.3.4.ebuild
index ab14f3fc507b..8962dff1709d 100644
--- a/net-libs/ccrtp/ccrtp-1.3.4.ebuild
+++ b/net-libs/ccrtp/ccrtp-1.3.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-libs/ccrtp/ccrtp-1.3.4.ebuild,v 1.1 2005/08/21 04:22:57 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ccrtp/ccrtp-1.3.4.ebuild,v 1.1.1.1 2005/11/30 10:02:54 chriswhite Exp $
 
 DESCRIPTION="GNU ccRTP is an implementation of RTP, the real-time transport protocol from the IETF"
 HOMEPAGE="http://www.gnu.org/software/ccrtp/"
@@ -15,6 +15,6 @@ DEPEND=">=dev-cpp/commoncpp2-1.3.0"
 RDEPEND="${DEPEND}"
 
 src_install() {
-	emake DESTDIR=${D} install || die
-	dodoc README ChangeLog INSTALL AUTHORS COPYING NEWS TODO
+	make DESTDIR=${D} install || die
+	dodoc README ChangeLog AUTHORS NEWS TODO
 }
diff --git a/net-libs/ccrtp/ccrtp-1.3.5-r1.ebuild b/net-libs/ccrtp/ccrtp-1.3.5-r1.ebuild
index 38dcd1176009..c955bab2d6e6 100644
--- a/net-libs/ccrtp/ccrtp-1.3.5-r1.ebuild
+++ b/net-libs/ccrtp/ccrtp-1.3.5-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-libs/ccrtp/ccrtp-1.3.5-r1.ebuild,v 1.1 2005/11/07 10:25:23 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ccrtp/ccrtp-1.3.5-r1.ebuild,v 1.1.1.1 2005/11/30 10:02:54 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-libs/ccrtp/ccrtp-1.3.5.ebuild b/net-libs/ccrtp/ccrtp-1.3.5.ebuild
index 9e41e091959b..c156325201da 100644
--- a/net-libs/ccrtp/ccrtp-1.3.5.ebuild
+++ b/net-libs/ccrtp/ccrtp-1.3.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-libs/ccrtp/ccrtp-1.3.5.ebuild,v 1.1 2005/10/17 19:10:43 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ccrtp/ccrtp-1.3.5.ebuild,v 1.1.1.1 2005/11/30 10:02:54 chriswhite Exp $
 
 DESCRIPTION="GNU ccRTP is an implementation of RTP, the real-time transport protocol from the IETF"
 HOMEPAGE="http://www.gnu.org/software/ccrtp/"
diff --git a/net-libs/courier-authlib/ChangeLog b/net-libs/courier-authlib/ChangeLog
index d51e9bf055e5..eea4e364e79b 100644
--- a/net-libs/courier-authlib/ChangeLog
+++ b/net-libs/courier-authlib/ChangeLog
@@ -1,6 +1,224 @@
 # ChangeLog for net-libs/courier-authlib
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/ChangeLog,v 1.1 2004/11/20 00:28:36 swtaylor Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/ChangeLog,v 1.1.1.1 2005/11/30 10:02:58 chriswhite Exp $
+
+  12 Nov 2005; Jason Wever <weeve@gentoo.org>
+  courier-authlib-0.57-r1.ebuild:
+  Stable on SPARC.
+
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org>
+  courier-authlib-0.57-r1.ebuild:
+  Mark 0.57-r1 stable on alpha
+
+  02 Oct 2005; Michael Hanselmann <hansmi@gentoo.org>
+  courier-authlib-0.57-r1.ebuild:
+  Stable on ppc.
+
+  02 Oct 2005; Aron Griffis <agriffis@gentoo.org>
+  courier-authlib-0.57-r1.ebuild:
+  Mark 0.57-r1 stable on ia64
+
+  02 Oct 2005; MATSUU Takuto <matsuu@gentoo.org>
+  courier-authlib-0.57-r1.ebuild:
+  Stable on sh.
+
+  24 Sep 2005; Markus Rothe <corsair@gentoo.org>
+  courier-authlib-0.57-r1.ebuild:
+  Stable on ppc64
+
+  21 Sep 2005; Francesco Riosa <vivo@gentoo.org>
+  courier-authlib-0.57-r1.ebuild:
+  Stable on "x86" and "amd64"
+
+*courier-authlib-0.57-r1 (24 Aug 2005)
+
+  24 Aug 2005; Roy Marples <uberlord@gentoo.org>
+  files/courier-authlib-initd, +courier-authlib-0.57-r1.ebuild:
+  Rev bump for new init script. Fixes #103104
+
+*courier-authlib-0.57 (26 Jul 2005)
+
+  26 Jul 2005; Francesco Riosa <vivo@gentoo.org>
+  +courier-authlib-0.57.ebuild:
+  version bump
+  fix Bug #88415 : courier-authlib-0.5* doesn't compile using mysql when 
+                   LDFLAGS are set in system
+
+*courier-authlib-0.56 (02 Jul 2005)
+
+  02 Jul 2005; Scott W Taylor <swtaylor@gentoo.org>
+  +courier-authlib-0.56.ebuild:
+  bump
+
+  29 May 2005; <solar@gentoo.org> courier-authlib-0.53.ebuild,
+  courier-authlib-0.54.20050224.ebuild, courier-authlib-0.55.20050320.ebuild,
+  courier-authlib-0.55.ebuild:
+  - update courier-authlib to use libc expanded variable elibc_uclibc vs uclibc
+  so USE=-* works
+
+*courier-authlib-0.55.20050320 (21 Mar 2005)
+
+  21 Mar 2005; Scott W Taylor <swtaylor@gentoo.org>
+  -courier-authlib-0.54.ebuild, +courier-authlib-0.55.20050320.ebuild:
+  bump
+
+  20 Mar 2005; Scott W Taylor <swtaylor@gentoo.org>
+  courier-authlib-0.53.ebuild, courier-authlib-0.55.ebuild:
+  promote 0.55, strip -fomit-frame-pointer
+
+  19 Mar 2005; Scott W Taylor <swtaylor@gentoo.org>
+  courier-authlib-0.53.ebuild, courier-authlib-0.54.ebuild,
+  courier-authlib-0.54.20050224.ebuild, courier-authlib-0.55.ebuild:
+  bash cleanup
+
+  17 Mar 2005; Scott W Taylor <swtaylor@gentoo.org>
+  courier-authlib-0.53.ebuild, courier-authlib-0.54.ebuild,
+  courier-authlib-0.54.20050224.ebuild, courier-authlib-0.55.ebuild:
+  install mysql readme file for pgsql users
+
+  15 Mar 2005; Scott W Taylor <swtaylor@gentoo.org>
+  -courier-authlib-0.52-r1.ebuild, courier-authlib-0.53.ebuild,
+  courier-authlib-0.54.ebuild, courier-authlib-0.54.20050224.ebuild,
+  courier-authlib-0.55.ebuild:
+  change vpopmail detection for #85391
+
+*courier-authlib-0.55 (04 Mar 2005)
+
+  04 Mar 2005; Scott W Taylor <swtaylor@gentoo.org>
+  +courier-authlib-0.55.ebuild:
+  bump
+
+*courier-authlib-0.54.20050224 (25 Feb 2005)
+
+  25 Feb 2005; Scott W Taylor <swtaylor@gentoo.org>
+  +courier-authlib-0.54.20050224.ebuild:
+  bump. adds cram-sha256
+
+*courier-authlib-0.54 (13 Feb 2005)
+
+  13 Feb 2005; Scott W Taylor <swtaylor@gentoo.org>
+  +courier-authlib-0.54.ebuild:
+  errata bump
+
+  04 Feb 2005; Scott W Taylor <swtaylor@gentoo.org>
+  files/courier-authlib-initd:
+  add "provide authdaemond" to init script
+
+  31 Jan 2005; Scott W Taylor <swtaylor@gentoo.org>
+  courier-authlib-0.52-r1.ebuild, courier-authlib-0.53.ebuild:
+  changed sed calls for more consistent edits.
+  make sure userdb is found and migrated
+  call makeuserdb after the install, if userdb exists
+
+  30 Jan 2005; Scott W Taylor <swtaylor@gentoo.org>
+  courier-authlib-0.52-r1.ebuild, courier-authlib-0.53.ebuild:
+  mostly cosmetic changes. also puts authldap.schema in /etc/openldap/schema/
+
+  30 Jan 2005; Scott W Taylor <swtaylor@gentoo.org>
+  courier-authlib-0.52-r1.ebuild:
+  initial stable keywording
+
+*courier-authlib-0.53 (30 Jan 2005)
+
+  30 Jan 2005; Scott W Taylor <swtaylor@gentoo.org>
+  +courier-authlib-0.53.ebuild:
+  bump to 0.53
+
+*courier-authlib-0.52-r1 (07 Jan 2005)
+
+  07 Jan 2005; Scott W Taylor <swtaylor@gentoo.org>
+  +courier-authlib-0.52-r1.ebuild:
+  build authshadow (bug 71909) and use /usr/$(get_libdir) for better arch support
+
+  06 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  courier-authlib-0.52.ebuild:
+  multilib and cross-compilation fixes.
+
+  01 Jan 2005; Tuan Van <langthang@gentoo.org> courier-authlib-0.52.ebuild:
+  add "libtoolize --copy --force"
+
+  01 Jan 2005; Tuan Van <langthang@gentoo.org> files/configure-db4.patch:
+  adjust patch for the newer version.
+
+*courier-authlib-0.52 (01 Jan 2005)
+
+  01 Jan 2005; Scott W Taylor <swtaylor@gentoo.org>
+  -courier-authlib-0.51_pre.ebuild, +courier-authlib-0.52.ebuild:
+  courier-authlib 0.52 released
+
+  24 Dec 2004; Markus Rothe <corsair@gentoo.org>
+  courier-authlib-0.51_pre.ebuild:
+  Added ~ppc64 to KEYWORDS; bug #75450
+
+  22 Dec 2004; Tuan Van <langthang@gentoo.org>
+  courier-authlib-0.51_pre.ebuild:
+  arm/hppa/ia64/s390 keywords on behalf of vapier.
+
+  15 Dec 2004; Scott W Taylor <swtaylor@gentoo.org>
+  courier-authlib-0.50.20041203.ebuild:
+  change keepdir in the other one too
+
+  15 Dec 2004; Scott W Taylor <swtaylor@gentoo.org>
+  courier-authlib-0.51_pre.ebuild:
+  keep more specific dir, and one that doesn't collide with courier
+
+  10 Dec 2004; Scott W Taylor <swtaylor@gentoo.org>
+  -courier-authlib-0.50.20041120.ebuild,
+  -courier-authlib-0.50.20041129.ebuild:
+  housecleaning
+
+  09 Dec 2004; Scott W Taylor <swtaylor@gentoo.org>
+  courier-authlib-0.51_pre.ebuild:
+  don't mirror release candidate
+
+*courier-authlib-0.51_pre (09 Dec 2004)
+
+  09 Dec 2004; Scott W Taylor <swtaylor@gentoo.org>
+  +courier-authlib-0.51_pre.ebuild:
+  bump
+
+*courier-authlib-0.50.20041203 (04 Dec 2004)
+
+  04 Dec 2004; Scott W Taylor <swtaylor@gentoo.org>
+  +courier-authlib-0.50.20041203.ebuild:
+  bump
+
+  01 Dec 2004; Scott W Taylor <swtaylor@gentoo.org>
+  courier-authlib-0.50.20041129.ebuild:
+  ~mips
+
+  01 Dec 2004; Scott W Taylor <swtaylor@gentoo.org>
+  -courier-authlib-0.50.20041116.ebuild,
+  courier-authlib-0.50.20041129.ebuild:
+  also check /etc/courier-imap folder for auth*rc configs to migrate
+
+*courier-authlib-0.50.20041129 (01 Dec 2004)
+
+  01 Dec 2004; Scott W Taylor <swtaylor@gentoo.org>
+  +courier-authlib-0.50.20041129.ebuild:
+  bump. fix migration from self
+
+  27 Nov 2004; Scott W Taylor <swtaylor@gentoo.org>
+  files/courier-authlib-initd, courier-authlib-0.50.20041120.ebuild:
+  almost there
+
+  26 Nov 2004; Scott W Taylor <swtaylor@gentoo.org>
+  courier-authlib-0.50.20041120.ebuild:
+  fix postgres
+
+  26 Nov 2004; Scott W Taylor <swtaylor@gentoo.org>
+  files/courier-authlib-initd:
+  fix initd
+
+*courier-authlib-0.50.20041120 (21 Nov 2004)
+
+  21 Nov 2004; Scott W Taylor <swtaylor@gentoo.org>
+  +courier-authlib-0.50.20041120.ebuild:
+  version bump. work in progress.
+
+  20 Nov 2004; Scott W Taylor <swtaylor@gentoo.org>
+  +files/configure-db4.patch, courier-authlib-0.50.20041116.ebuild:
+  work in progress. merging stuff from imap
 
 *courier-authlib-0.50.20041116 (19 Nov 2004)
 
diff --git a/net-libs/courier-authlib/Manifest b/net-libs/courier-authlib/Manifest
index d62545baf9a8..9869890a70e8 100644
--- a/net-libs/courier-authlib/Manifest
+++ b/net-libs/courier-authlib/Manifest
@@ -1,3 +1,18 @@
-MD5 a82bd1f77f821ce3b41422ed28327f4e courier-authlib-0.50.20041116.ebuild 2598
+MD5 c96a2f8ad764e497f97a933f346266b5 ChangeLog 7282
+MD5 ead53e30977f8d368de26fae5a67ad32 courier-authlib-0.53.ebuild 5903
+MD5 616ebeb89647092c49a7c841274a5c6a courier-authlib-0.54.20050224.ebuild 6027
+MD5 f8e2293e9807a0b229675d9a92f9cffa courier-authlib-0.55.20050320.ebuild 6099
+MD5 d59c188617d2aed926a0d49c1fb91f96 courier-authlib-0.55.ebuild 6057
+MD5 57ce08c86fc4d6f703643907b7b11d2d courier-authlib-0.56.ebuild 6093
+MD5 ec18936baf6489bba0fe01833d0d7dab courier-authlib-0.57-r1.ebuild 6088
+MD5 c02fd230688d2f9a2d0f4e8b45a3898e courier-authlib-0.57.ebuild 6089
+MD5 6930587c358320ecb1043761d7ff97f1 files/configure-db4.patch 2544
+MD5 380c06d7560d80b3fcc49f611ec57391 files/courier-authlib-initd 1049
+MD5 73d603079009e02b50f27fcaaf0ee3c0 files/digest-courier-authlib-0.53 74
+MD5 7742690b928fbdc37bd9011257f78abd files/digest-courier-authlib-0.54.20050224 83
+MD5 ed30e0c7061ff7899634145ce73d7b92 files/digest-courier-authlib-0.55 74
+MD5 752436d0238327674728feeee973d102 files/digest-courier-authlib-0.55.20050320 83
+MD5 6fa78b5922594232cd149eb6d6e02b5a files/digest-courier-authlib-0.56 74
+MD5 535d72419715dfcd4a6c00fd8708c63e files/digest-courier-authlib-0.57 74
+MD5 535d72419715dfcd4a6c00fd8708c63e files/digest-courier-authlib-0.57-r1 74
 MD5 1639b87658242c2406f7f7f8deda7388 metadata.xml 334
-MD5 ee0f85c1e7a26c660ce65b08a89fcfbb files/digest-courier-authlib-0.50.20041116 83
diff --git a/net-libs/courier-authlib/courier-authlib-0.53.ebuild b/net-libs/courier-authlib/courier-authlib-0.53.ebuild
index 5ed30355f875..25e83bb20e19 100644
--- a/net-libs/courier-authlib/courier-authlib-0.53.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.53.ebuild
@@ -1,18 +1,19 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/courier-authlib-0.53.ebuild,v 1.1 2005/01/30 19:51:07 swtaylor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/courier-authlib-0.53.ebuild,v 1.1.1.1 2005/11/30 10:02:58 chriswhite Exp $
 
 inherit eutils gnuconfig
 
 DESCRIPTION="courier authentication library"
-[ -z "${PV/?.??/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" || SRC_URI="http://www.courier-mta.org/beta/courier-authlib/${P%%_pre}.tar.bz2"
+[ -z "${PV/?.??/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+[ -z "$SRC_URI" ] && SRC_URI="http://www.courier-mta.org/beta/courier-authlib/${P%%_pre}.tar.bz2"
 HOMEPAGE="http://www.courier-mta.org/"
 S="${WORKDIR}/${P%%_pre}"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sparc ~x86 ~ppc64"
-IUSE="postgres ldap mysql berkdb gdbm pam crypt uclibc debug"
+KEYWORDS="x86 alpha amd64 arm hppa ia64 mips ppc s390 ppc64"
+IUSE="postgres ldap mysql berkdb gdbm pam crypt debug"
 
 DEPEND="virtual/libc
 		gdbm? ( sys-libs/gdbm )
@@ -37,7 +38,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	sed -e"s|^chk_file .* |&\${DESTDIR}|g" -i.orig authmigrate.in
-	use uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
+	use elibc_uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
 	if ! use gdbm ; then
 		epatch ${FILESDIR}/configure-db4.patch
 		export WANT_AUTOCONF="2.5"
@@ -52,8 +53,10 @@ src_unpack() {
 			autoconf ||  die "recreate bdbobj/configure failed"
 		eend $?
 	fi
-	sed -i -e'/for dir in/a\\t\t\/etc\/courier-imap \\' ${S}/authmigrate.in
-	sed -i -e'/for dir in/a\\t\t\/etc\/courier\/authlib \\' ${S}/authmigrate.in
+	sed -i -e'/for dir in/a@@INDENT@@/etc/courier-imap \\' ${S}/authmigrate.in
+	sed -i -e'/for dir in/a@@INDENT@@/etc/courier/authlib \\' ${S}/authmigrate.in
+	sed -i -e"s|@@INDENT@@|		|g" ${S}/authmigrate.in
+	sed -i -e"s|\$sbindir/makeuserdb||g" ${S}/authmigrate.in
 }
 
 src_compile() {
@@ -67,7 +70,7 @@ src_compile() {
 	fi
 	use gdbm && myconf="${myconf} --with-db=gdbm"
 
-	if [ -f /var/vpopmail/etc/lib_deps ]; then
+	if has_version 'net-mail/vpopmail' ; then
 		myconf="${myconf} --with-authvchkpw --without-authmysql --without-authpgsql"
 		use mysql && ewarn "vpopmail found. authmysql will not be built."
 		use postgres && ewarn "vpopmail found. authpgsql will not be built."
@@ -77,7 +80,7 @@ src_compile() {
 
 	use debug && myconf="${myconf} debug=true"
 
-	ewarn "${myconf}"
+	einfo "Configuring courier-authlib: ${myconf}"
 
 	econf \
 		--sysconfdir=/etc/courier \
@@ -104,16 +107,28 @@ orderfirst() {
 	fi
 }
 
+finduserdb() {
+	for dir in \
+		/etc/courier/authlib /etc/courier /etc/courier-imap \
+		/usr/lib/courier/etc /usr/lib/courier-imap/etc \
+		/usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
+		/usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
+		/usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
+	[ -e "$dir/userdb" ] && ( echo "found $dir/userdb" ; \
+		cp -v $dir/userdb ${D}/etc/courier/authlib/ ; continue )
+	done
+}
+
 src_install() {
-	dodir /var/lib/courier/authdaemon
-	dodir /etc/courier/authlib
-	dodir /etc/init.d
+	diropts -o mail -g mail
+	dodir /etc/courier
 	keepdir /var/lib/courier/authdaemon
 	keepdir /etc/courier/authlib
 	emake install DESTDIR="${D}" || die "install"
 	emake install-migrate DESTDIR="${D}" || die "migrate"
+	[ ! -e "${D}/etc/courier/authlib/userdb" ] && finduserdb
 	emake install-configure DESTDIR="${D}" || die "configure"
-	rm ${D}/etc/courier/authlib/*.bak
+	rm -vf ${D}/etc/courier/authlib/*.bak
 	chown mail:mail ${D}/etc/courier/authlib/*
 	for y in ${D}/etc/courier/authlib/*.dist ; do
 		[ ! -e "${y%%.dist}" ] && cp -v ${y} ${y%%.dist}
@@ -124,14 +139,18 @@ src_install() {
 	use mysql && orderfirst authdaemonrc authmodulelist authmysql
 	dodoc AUTHORS COPYING ChangeLog* INSTALL NEWS README
 	dohtml README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html
-	use ldap && dodoc authldap.schema
 	use mysql && ( dodoc README.authmysql.myownquery ; dohtml README.authmysql.html )
-	use postgres && dohtml README.authpostgres.html
+	use postgres && dohtml README.authpostgres.html README.authmysql.html
+	use ldap && ( dodoc README.ldap ; dodir /etc/openldap/schema ; \
+		cp authldap.schema ${D}/etc/openldap/schema/ )
+	dodir /etc/init.d
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/courier-authlib-initd courier-authlib || die "init.d failed"
 }
 
 pkg_postinst() {
+	[ -e /etc/courier/authlib/userdb ] && \
+		( einfo "running makeuserdb" ; makeuserdb )
 	# Suggest cleaning out the following old files
 	list="`find /etc/courier -type f -maxdepth 1 | grep \"^/etc/courier/auth\"`"
 	if [ ! -z "${list}" ] ; then
diff --git a/net-libs/courier-authlib/courier-authlib-0.54.20050224.ebuild b/net-libs/courier-authlib/courier-authlib-0.54.20050224.ebuild
index 9023d71b6a0c..91b7e6cd070d 100644
--- a/net-libs/courier-authlib/courier-authlib-0.54.20050224.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.54.20050224.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-libs/courier-authlib/courier-authlib-0.54.20050224.ebuild,v 1.1 2005/02/25 23:09:36 swtaylor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/courier-authlib-0.54.20050224.ebuild,v 1.1.1.1 2005/11/30 10:02:59 chriswhite Exp $
 
 inherit eutils gnuconfig
 
@@ -13,7 +13,7 @@ S="${WORKDIR}/${P%%_pre}"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sparc ~ppc64"
-IUSE="postgres ldap mysql berkdb gdbm pam crypt uclibc debug"
+IUSE="postgres ldap mysql berkdb gdbm pam crypt debug"
 
 DEPEND="virtual/libc
 		gdbm? ( sys-libs/gdbm )
@@ -38,7 +38,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	sed -e"s|^chk_file .* |&\${DESTDIR}|g" -i.orig authmigrate.in
-	use uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
+	use elibc_uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
 	if ! use gdbm ; then
 		epatch ${FILESDIR}/configure-db4.patch
 		export WANT_AUTOCONF="2.5"
@@ -70,7 +70,7 @@ src_compile() {
 	fi
 	use gdbm && myconf="${myconf} --with-db=gdbm"
 
-	if [ -f /var/vpopmail/etc/lib_deps ]; then
+	if has_version 'net-mail/vpopmail' ; then
 		myconf="${myconf} --with-authvchkpw --without-authmysql --without-authpgsql"
 		use mysql && ewarn "vpopmail found. authmysql will not be built."
 		use postgres && ewarn "vpopmail found. authpgsql will not be built."
@@ -141,7 +141,7 @@ src_install() {
 	dodoc AUTHORS COPYING ChangeLog* INSTALL NEWS README
 	dohtml README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html
 	use mysql && ( dodoc README.authmysql.myownquery ; dohtml README.authmysql.html )
-	use postgres && dohtml README.authpostgres.html
+	use postgres && dohtml README.authpostgres.html README.authmysql.html
 	use ldap && ( dodoc README.ldap ; dodir /etc/openldap/schema ; \
 		cp authldap.schema ${D}/etc/openldap/schema/ )
 	dodir /etc/init.d
diff --git a/net-libs/courier-authlib/courier-authlib-0.55.20050320.ebuild b/net-libs/courier-authlib/courier-authlib-0.55.20050320.ebuild
index d0af5fa9a762..3cfe0ca18f8e 100644
--- a/net-libs/courier-authlib/courier-authlib-0.55.20050320.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.55.20050320.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-libs/courier-authlib/courier-authlib-0.55.20050320.ebuild,v 1.1 2005/03/21 11:09:45 swtaylor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/courier-authlib-0.55.20050320.ebuild,v 1.1.1.1 2005/11/30 10:02:59 chriswhite Exp $
 
 inherit eutils gnuconfig flag-o-matic
 
@@ -13,7 +13,7 @@ S="${WORKDIR}/${P%%_pre}"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sparc ~ppc64"
-IUSE="postgres ldap mysql berkdb gdbm pam crypt uclibc debug"
+IUSE="postgres ldap mysql berkdb gdbm pam crypt debug"
 RESTRICT="nouserpriv"
 
 DEPEND="virtual/libc
@@ -41,7 +41,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	sed -e"s|^chk_file .* |&\${DESTDIR}|g" -i.orig authmigrate.in
-	use uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
+	use elibc_uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
 	if ! use gdbm ; then
 		epatch ${FILESDIR}/configure-db4.patch
 		export WANT_AUTOCONF="2.5"
diff --git a/net-libs/courier-authlib/courier-authlib-0.55.ebuild b/net-libs/courier-authlib/courier-authlib-0.55.ebuild
index b32cf60f7f8f..18773568daaf 100644
--- a/net-libs/courier-authlib/courier-authlib-0.55.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.55.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-libs/courier-authlib/courier-authlib-0.55.ebuild,v 1.1 2005/03/04 09:44:01 swtaylor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/courier-authlib-0.55.ebuild,v 1.1.1.1 2005/11/30 10:02:58 chriswhite Exp $
 
-inherit eutils gnuconfig
+inherit eutils gnuconfig flag-o-matic
 
 DESCRIPTION="courier authentication library"
 [ -z "${PV/?.??/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
@@ -12,8 +12,8 @@ S="${WORKDIR}/${P%%_pre}"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sparc ~ppc64"
-IUSE="postgres ldap mysql berkdb gdbm pam crypt uclibc debug"
+KEYWORDS="x86 alpha amd64 arm hppa ia64 mips ppc s390 sparc ppc64"
+IUSE="postgres ldap mysql berkdb gdbm pam crypt debug"
 
 DEPEND="virtual/libc
 		gdbm? ( sys-libs/gdbm )
@@ -28,6 +28,8 @@ RDEPEND="virtual/libc
 		gdbm? ( sys-libs/gdbm )
 		!gdbm? ( sys-libs/db )"
 
+filter-flags '-fomit-frame-pointer'
+
 src_unpack() {
 	if ! has_version 'dev-tcltk/expect' ; then
 		ewarn 'The dev-tcltk/expect package is not installed.'
@@ -38,7 +40,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	sed -e"s|^chk_file .* |&\${DESTDIR}|g" -i.orig authmigrate.in
-	use uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
+	use elibc_uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
 	if ! use gdbm ; then
 		epatch ${FILESDIR}/configure-db4.patch
 		export WANT_AUTOCONF="2.5"
@@ -70,7 +72,7 @@ src_compile() {
 	fi
 	use gdbm && myconf="${myconf} --with-db=gdbm"
 
-	if [ -f /var/vpopmail/etc/lib_deps ]; then
+	if has_version 'net-mail/vpopmail' ; then
 		myconf="${myconf} --with-authvchkpw --without-authmysql --without-authpgsql"
 		use mysql && ewarn "vpopmail found. authmysql will not be built."
 		use postgres && ewarn "vpopmail found. authpgsql will not be built."
@@ -141,7 +143,7 @@ src_install() {
 	dodoc AUTHORS COPYING ChangeLog* INSTALL NEWS README
 	dohtml README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html
 	use mysql && ( dodoc README.authmysql.myownquery ; dohtml README.authmysql.html )
-	use postgres && dohtml README.authpostgres.html
+	use postgres && dohtml README.authpostgres.html README.authmysql.html
 	use ldap && ( dodoc README.ldap ; dodir /etc/openldap/schema ; \
 		cp authldap.schema ${D}/etc/openldap/schema/ )
 	dodir /etc/init.d
diff --git a/net-libs/courier-authlib/courier-authlib-0.56.ebuild b/net-libs/courier-authlib/courier-authlib-0.56.ebuild
index c21bbb561a01..a79acdd3e5cf 100644
--- a/net-libs/courier-authlib/courier-authlib-0.56.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.56.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-libs/courier-authlib/courier-authlib-0.56.ebuild,v 1.1 2005/07/02 23:45:13 swtaylor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/courier-authlib-0.56.ebuild,v 1.1.1.1 2005/11/30 10:02:58 chriswhite Exp $
 
 inherit eutils gnuconfig flag-o-matic
 
diff --git a/net-libs/courier-authlib/courier-authlib-0.57-r1.ebuild b/net-libs/courier-authlib/courier-authlib-0.57-r1.ebuild
index e06db0e71fe2..956cd60e08ea 100644
--- a/net-libs/courier-authlib/courier-authlib-0.57-r1.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.57-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-libs/courier-authlib/courier-authlib-0.57-r1.ebuild,v 1.1 2005/08/24 08:37:13 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/courier-authlib-0.57-r1.ebuild,v 1.1.1.1 2005/11/30 10:02:58 chriswhite Exp $
 
 inherit eutils gnuconfig flag-o-matic
 
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P%%_pre}"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sparc ~ppc64"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="postgres ldap mysql berkdb gdbm pam crypt debug"
 RESTRICT="nouserpriv"
 
diff --git a/net-libs/courier-authlib/courier-authlib-0.57.ebuild b/net-libs/courier-authlib/courier-authlib-0.57.ebuild
index 6ed18d9821ff..26cb89091cac 100644
--- a/net-libs/courier-authlib/courier-authlib-0.57.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.57.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-libs/courier-authlib/courier-authlib-0.57.ebuild,v 1.1 2005/07/26 23:57:43 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/courier-authlib-0.57.ebuild,v 1.1.1.1 2005/11/30 10:02:58 chriswhite Exp $
 
 inherit eutils gnuconfig flag-o-matic
 
diff --git a/net-libs/courier-authlib/files/configure-db4.patch b/net-libs/courier-authlib/files/configure-db4.patch
index 18b32f88f998..639aa1e7d223 100644
--- a/net-libs/courier-authlib/files/configure-db4.patch
+++ b/net-libs/courier-authlib/files/configure-db4.patch
@@ -10,17 +10,17 @@
  AC_LIBTOOL_DLOPEN
 @@ -284,15 +283,17 @@
  
- 	if test "$db" != "gdbm"
- 	then
--		AC_CHECK_LIB(db, dbopen, [ LIBDB=-ldb ; LIBS="-ldb $LIBS" ],
--			[ AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"],
--			[ AC_CHECK_LIB(db, db_env_create,
--				[ LIBDB=-ldb; LIBS="-ldb $LIBS"]) ]
--				)])
+ if test "$db" != "gdbm"
+ then
+-	AC_CHECK_LIB(db, dbopen, [ LIBDB=-ldb ; LIBS="-ldb $LIBS" ],
+-		[ AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"],
+-		[ AC_CHECK_LIB(db, db_env_create,
+-			[ LIBDB=-ldb; LIBS="-ldb $LIBS"]) ]
+-			)])
 -
--		AC_CHECK_FUNC(dbopen, HAVE_BDB=1)
--		AC_CHECK_FUNC(db_open, HAVE_BDB=1)
--		AC_CHECK_FUNC(db_env_create, HAVE_BDB=1)
+-	AC_CHECK_FUNC(dbopen, HAVE_BDB=1)
+-	AC_CHECK_FUNC(db_open, HAVE_BDB=1)
+-	AC_CHECK_FUNC(db_env_create, HAVE_BDB=1)
 +  for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
 +    do
 + AC_CHECK_LIB($dbname, db_create_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
@@ -32,9 +32,9 @@
 +  AC_CHECK_FUNC(db_create_4001, HAVE_BDB=1)
 +  AC_CHECK_FUNC(db_create_4000, HAVE_BDB=1)
 +  AC_CHECK_FUNC(db_create, HAVE_BDB=1)
- 	fi
+ fi
  
- 	LIBS="$saveLIBS"
+ LIBS="$saveLIBS"
 --- bdbobj/configure.in	2001-09-18 18:26:28.000000000 -0700
 +++ bdbobj/configure.in	2004-08-14 16:15:08.469316646 -0700
 @@ -21,15 +21,19 @@
diff --git a/net-libs/courier-authlib/files/courier-authlib-initd b/net-libs/courier-authlib/files/courier-authlib-initd
index 176489039d28..8850f7093b90 100644
--- a/net-libs/courier-authlib/files/courier-authlib-initd
+++ b/net-libs/courier-authlib/files/courier-authlib-initd
@@ -1,9 +1,10 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/files/courier-authlib-initd,v 1.1 2004/11/20 00:28:36 swtaylor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/files/courier-authlib-initd,v 1.1.1.1 2005/11/30 10:02:59 chriswhite Exp $
 depend() {
 	need net
+	provide authdaemond
 }
 
 checkconfig() {
@@ -17,27 +18,22 @@ setauth() {
 	source /etc/courier/authlib/authdaemonrc
 	AUTHLIB="/usr/lib/courier/courier-authlib"
 	AUTHDAEMOND="authdaemond"
-	#source /etc/courier/authlib/authdaemond.conf
-	#[ -z "$version" ] && version="${AUTHDAEMOND}"
 	pidfile="/var/run/authdaemon.pid"
-	logger="/usr/lib/courier/courierlogger"
+	logger="/usr/sbin/courierlogger"
 }
 
 start() {
 	checkconfig || return 1
 	setauth
-	
-	ebegin "Starting ${AUTHDAEMOND}"
+	ebegin "Starting courier-authlib: ${AUTHDAEMOND}"
 	start-stop-daemon --quiet --start --pidfile "$pidfile" --exec \
-		/usr/bin/env -- - $logger -pid="$pidfile" -start "${AUTHLIB}/${AUTHDAEMOND}" 
+		/usr/bin/env $logger -- -pid="$pidfile" -start "${AUTHLIB}/${AUTHDAEMOND}" 
 	eend $?
 }
 
 stop() {
 	setauth
-	
-	ebegin "Stopping ${AUTHDAEMOND}"
-	start-stop-daemon --quiet --stop \
-		--pidfile "$pidfile"
+	ebegin "Stopping courier-authlib: ${AUTHDAEMOND}"
+	start-stop-daemon --quiet --stop --pidfile "$pidfile"
 	eend $?
 }
diff --git a/net-libs/cvm/ChangeLog b/net-libs/cvm/ChangeLog
index a9ca8a7df100..579944ba16fb 100644
--- a/net-libs/cvm/ChangeLog
+++ b/net-libs/cvm/ChangeLog
@@ -1,6 +1,29 @@
 # ChangeLog for net-libs/cvm
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/cvm/ChangeLog,v 1.1 2004/01/06 00:07:56 robbat2 Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/cvm/ChangeLog,v 1.1.1.1 2005/11/30 10:03:00 chriswhite Exp $
+
+  26 Sep 2005; Robin H. Johnson <robbat2@gentoo.org> cvm-0.32-r1.ebuild:
+  Stable on x86, 150 days in ~x86.
+
+  30 May 2005; Sven Wegener <swegener@gentoo.org> cvm-0.18.ebuild:
+  Moved from gcc.eclass to toolchain-funcs.eclass, bug #92745.
+
+*cvm-0.32-r1 (29 Apr 2005)
+
+  29 Apr 2005; Robin H. Johnson <robbat2@gentoo.org> +cvm-0.32-r1.ebuild:
+  Bug #90077 - better ebuild.
+
+*cvm-0.32 (06 Apr 2005)
+
+  06 Apr 2005; Robin H. Johnson <robbat2@gentoo.org> +metadata.xml,
+  +cvm-0.32.ebuild:
+  Version bump, bug #79653.
+
+  17 Oct 2004; David Holm <dholm@gentoo.org> cvm-0.18.ebuild:
+  Added to ~ppc.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> cvm-0.18.ebuild:
+  virtual/glibc -> virtual/libc
 
 *cvm-0.18 (05 Jan 2004)
 
diff --git a/net-libs/cvm/Manifest b/net-libs/cvm/Manifest
index 523612695a30..c0a67ab35ffe 100644
--- a/net-libs/cvm/Manifest
+++ b/net-libs/cvm/Manifest
@@ -1,2 +1,8 @@
-MD5 8615c8117b07642e32759e783f752330 cvm-0.18.ebuild 1257
+MD5 cfc9024c2e3895d6fb8faa33c7005f2a cvm-0.32-r1.ebuild 1182
+MD5 dd8a3a88d774cc706b7c1b9e62b2482d cvm-0.32.ebuild 1209
+MD5 33732ff6120bb4b3bf1f0de06210ca64 cvm-0.18.ebuild 1282
+MD5 ab967586382d335350a8854cb1c3de66 ChangeLog 1089
+MD5 21cd68602737d7c996bceabf6e62c468 metadata.xml 223
+MD5 51108b9115b8df5073cf8007c873e46f files/digest-cvm-0.32-r1 59
 MD5 dda571945279b300a80ccff143fe6fa7 files/digest-cvm-0.18 59
+MD5 51108b9115b8df5073cf8007c873e46f files/digest-cvm-0.32 59
diff --git a/net-libs/cvm/cvm-0.18.ebuild b/net-libs/cvm/cvm-0.18.ebuild
index 15ccb81ae862..cd9c4059c183 100644
--- a/net-libs/cvm/cvm-0.18.ebuild
+++ b/net-libs/cvm/cvm-0.18.ebuild
@@ -1,19 +1,21 @@
-# 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-libs/cvm/cvm-0.18.ebuild,v 1.1 2004/01/06 00:07:56 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/cvm/cvm-0.18.ebuild,v 1.1.1.1 2005/11/30 10:03:00 chriswhite Exp $
 
-inherit fixheadtails
+inherit fixheadtails toolchain-funcs
 
-S=${WORKDIR}/${P}
 DESCRIPTION="CVM modules for unix and pwfile, plus testclient"
+HOMEPAGE="http://untroubled.org/cvm/"
 SRC_URI="http://untroubled.org/cvm/${P}.tar.gz"
-HOMEPAGE="http://untroubled.org/cvm"
-SLOT="0"
+
 LICENSE="GPL-2"
-KEYWORDS="x86 ~sparc"
-DEPEND="virtual/glibc
+SLOT="0"
+KEYWORDS="x86 ~sparc ~ppc"
+IUSE=""
+
+DEPEND="virtual/libc
 	>=dev-libs/bglibs-1.009"
-RDEPEND="virtual/glibc"
+RDEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
@@ -22,20 +24,19 @@ src_unpack() {
 }
 
 src_compile() {
-	cd ${S}
 	echo "/usr/lib/bglibs/include" > conf-bgincs
 	echo "/usr/lib/bglibs/lib" > conf-bglibs
-	echo "${CC} ${CFLAGS}" > conf-cc
-	echo "${CC} -s" > conf-ld
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
+	echo "$(tc-getCC) -s" > conf-ld
 	make || die
 }
 
-src_install () {
-	into /usr
-	dobin cvm-benchclient cvm-checkpassword cvm-pwfile cvm-testclient cvm-unix
+src_install() {
+	dobin cvm-benchclient cvm-checkpassword cvm-pwfile cvm-testclient cvm-unix || die "dobin failed"
 
 	insinto /usr/include/cvm
 	doins *.h
+	dosym /usr/include/cvm/sasl.h /usr/include/cvm-sasl.h
 
 	newlib.a client.a libcvm-client.a
 	newlib.a udp.a libcvm-udp.a
@@ -44,8 +45,6 @@ src_install () {
 	newlib.a module.a libcvm-module.a
 	newlib.a sasl.a libcvm-sasl.a
 
-	dosym /usr/include/cvm/sasl.h /usr/include/cvm-sasl.h
-
-	dodoc ANNOUNCEMENT COPYING FILES NEWS README TARGETS TODO VERSION
+	dodoc ANNOUNCEMENT FILES NEWS README TARGETS TODO VERSION
 	dohtml *.html
 }
diff --git a/net-libs/cvm/cvm-0.32-r1.ebuild b/net-libs/cvm/cvm-0.32-r1.ebuild
index 3bea9febbef6..018345792181 100644
--- a/net-libs/cvm/cvm-0.32-r1.ebuild
+++ b/net-libs/cvm/cvm-0.32-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-libs/cvm/cvm-0.32-r1.ebuild,v 1.1 2005/04/30 00:09:28 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/cvm/cvm-0.32-r1.ebuild,v 1.1.1.1 2005/11/30 10:03:00 chriswhite Exp $
 
 inherit toolchain-funcs
 
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc"
+KEYWORDS="x86 ~sparc ~ppc"
 IUSE="mysql postgres"
 
 RDEPEND="virtual/libc"
@@ -18,7 +18,7 @@ DEPEND="${RDEPEND}
 		>=dev-libs/bglibs-1.019
 		mysql? ( dev-db/mysql )
 		postgres? ( dev-db/postgresql )"
-		
+
 
 src_compile() {
 	echo "/usr/lib/bglibs/include" > conf-bgincs
diff --git a/net-libs/cvm/cvm-0.32.ebuild b/net-libs/cvm/cvm-0.32.ebuild
index dae0f245b31b..6aed9e4de9dd 100644
--- a/net-libs/cvm/cvm-0.32.ebuild
+++ b/net-libs/cvm/cvm-0.32.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-libs/cvm/cvm-0.32.ebuild,v 1.1 2005/04/06 13:10:09 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/cvm/cvm-0.32.ebuild,v 1.1.1.1 2005/11/30 10:03:00 chriswhite Exp $
 
 inherit fixheadtails toolchain-funcs
 
diff --git a/net-libs/enet/ChangeLog b/net-libs/enet/ChangeLog
index 90d663ee5329..5b04cf6b01c0 100644
--- a/net-libs/enet/ChangeLog
+++ b/net-libs/enet/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for net-libs/enet
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/enet/ChangeLog,v 1.1 2003/07/22 04:16:53 vapier Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/enet/ChangeLog,v 1.1.1.1 2005/11/30 10:02:57 chriswhite Exp $
+
+*enet-0_pre20040813 (13 Aug 2004)
+
+  13 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  enet-0_pre20031103.ebuild, +enet-0_pre20040813.ebuild:
+  new snapshot
+
+  21 Mar 2004; David Holm <dholm@gentoo.org> enet-0_pre20031103.ebuild:
+  Added to ~ppc.
+
+*enet-0_pre20031103 (09 Nov 2003)
+
+  09 Nov 2003; Mike Frysinger <vapier@gentoo.org> :
+  Build process uses auto tools now.  Fixes #33052.
 
 *enet-0_pre20030720 (22 Jul 2003)
 
diff --git a/net-libs/enet/Manifest b/net-libs/enet/Manifest
index 817da3839d3d..cf344fcecf76 100644
--- a/net-libs/enet/Manifest
+++ b/net-libs/enet/Manifest
@@ -1,3 +1,5 @@
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-enet-0_pre20030720 0
-MD5 f37fec40ea01a4c870632ad1bfb5713d ChangeLog 338
-MD5 8d166be1ab09177e39c06952a2ccee88 enet-0_pre20030720.ebuild 678
+MD5 5b148637e7ca32405f29115c88fa02fd ChangeLog 725
+MD5 1ea9b143a0ed5df6a43f7d57fccc3799 enet-0_pre20031103.ebuild 932
+MD5 fc153e111c7e5978842e7404f045c77c enet-0_pre20040813.ebuild 937
+MD5 778c87f97f635c6aa1ba52b9436713e2 files/digest-enet-0_pre20040813 70
+MD5 3718bd8de101c7748ae0d1af31934de3 files/digest-enet-0_pre20031103 70
diff --git a/net-libs/enet/enet-0_pre20031103.ebuild b/net-libs/enet/enet-0_pre20031103.ebuild
index 01e203a7c6f6..39bb0604b85f 100644
--- a/net-libs/enet/enet-0_pre20031103.ebuild
+++ b/net-libs/enet/enet-0_pre20031103.ebuild
@@ -1,6 +1,6 @@
-# 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-libs/enet/enet-0_pre20031103.ebuild,v 1.1 2003/11/09 18:18:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/enet/enet-0_pre20031103.ebuild,v 1.1.1.1 2005/11/30 10:02:57 chriswhite Exp $
 
 #ECVS_SERVER=sferik.cubik.org:/home/enet/cvsroot
 #ECVS_USER=anoncvs
@@ -13,7 +13,11 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+
+DEPEND=">=sys-devel/autoconf-2.58"
+RDEPEND=""
 
 S=${WORKDIR}/${ECVS_MODULE}
 
@@ -23,19 +27,14 @@ src_unpack() {
 	else
 		cvs_src_unpack
 	fi
-	cd ${S}
+	cd "${S}"
 	export WANT_AUTOCONF=2.5
 	aclocal || die "aclocal"
 	automake -a || die "automake"
 	autoconf || die "autoconf"
 }
 
-src_compile() {
-	econf || die
-	emake || die
-}
-
 src_install() {
-	emake install DESTDIR=${D} || die
+	make DESTDIR="${D}" install || die "make install failed"
 	dodoc *.txt README
 }
diff --git a/net-libs/enet/enet-0_pre20040813.ebuild b/net-libs/enet/enet-0_pre20040813.ebuild
index 1491d8381b83..af4c6bf317d8 100644
--- a/net-libs/enet/enet-0_pre20040813.ebuild
+++ b/net-libs/enet/enet-0_pre20040813.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-libs/enet/enet-0_pre20040813.ebuild,v 1.1 2004/08/13 09:19:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/enet/enet-0_pre20040813.ebuild,v 1.1.1.1 2005/11/30 10:02:57 chriswhite Exp $
 
 #ECVS_SERVER=sferik.cubik.org:/home/enet/cvsroot
 #ECVS_USER=anoncvs
diff --git a/net-libs/gecko-sdk/ChangeLog b/net-libs/gecko-sdk/ChangeLog
index 89aa375ae9e9..f7aa895a6700 100644
--- a/net-libs/gecko-sdk/ChangeLog
+++ b/net-libs/gecko-sdk/ChangeLog
@@ -1,6 +1,107 @@
 # ChangeLog for net-libs/gecko-sdk
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gecko-sdk/ChangeLog,v 1.1 2004/10/23 13:57:10 josejx Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gecko-sdk/ChangeLog,v 1.1.1.1 2005/11/30 10:03:02 chriswhite Exp $
+
+  02 Oct 2005; Aron Griffis <agriffis@gentoo.org>
+  gecko-sdk-1.7.12-r1.ebuild:
+  Mark 1.7.12-r1 stable on ia64
+
+  30 Sep 2005; Paul Varner <fuzzyray@gentoo.org> gecko-sdk-1.7.12-r1.ebuild:
+  Stable on x86 Bug #105396
+
+  29 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  gecko-sdk-1.7.12-r1.ebuild:
+  Stable on sparc wrt #105396
+
+  29 Sep 2005; Jose Luis Rivero <yoswink@gentoo.org>
+  gecko-sdk-1.7.12-r1.ebuild:
+  Stable on alpha wrt security bug #105396
+
+  28 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
+  gecko-sdk-1.7.12-r1.ebuild:
+  Stable on hppa, ppc.
+
+  28 Sep 2005; Homer Parker <hparker@gentoo.org> gecko-sdk-1.7.12-r1.ebuild:
+  Stable on amd64.
+
+  28 Sep 2005; Markus Rothe <corsair@gentoo.org> gecko-sdk-1.7.12-r1.ebuild:
+  Stable on ppc64
+
+*gecko-sdk-1.7.12-r1 (28 Sep 2005)
+
+  28 Sep 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/mozilla-rebuild-databases.pl, +gecko-sdk-1.7.12-r1.ebuild:
+  Add fixes from mozilla. Lots of tweaks and install a type of GRE as well so
+  that its possible to build galeon/epiphany against it.
+
+  27 Sep 2005; Martin Schlemmer <azarah@gentoo.org> gecko-sdk-1.7.8.ebuild:
+  Fix missing patch, bug #107371.
+
+*gecko-sdk-1.7.12 (26 Sep 2005)
+
+  26 Sep 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/mozilla-1.7.6-gcc4.patch, +files/mozilla-1.7.6-ppc64.patch,
+  +files/mozilla-1.7.8-amd64.patch,
+  +files/mozilla-1.7.8-objectframefix.diff,
+  +files/mozilla-1.7.12-gtk2xft-link-pangoxft.patch,
+  +files/mozilla-1.7.12-libart-freetype.patch, +files/mozilla-hppa.patch,
+  +files/mozilla-stackgrowth.patch, +gecko-sdk-1.7.12.ebuild:
+  New release, GLSA105396. Use libart rather than cairo, bug #106713. Update
+  gtk2 and xft code from upstream to fix various freetype-2.1.9 issues
+  including printing non-latin. Same for the libart renderer code.
+
+*gecko-sdk-1.7.8 (11 Jul 2005)
+
+  11 Jul 2005; Joseph Jezak <josejx@gentoo.org>
+  -files/gecko-sdk-1.7.5-gcc4.patch, -gecko-sdk-1.7.5.ebuild,
+  +gecko-sdk-1.7.8.ebuild:
+  Updated gecko-sdk ebuild to install into correct lib directory.
+
+  27 Jun 2005; Sven Wegener <swegener@gentoo.org> gecko-sdk-1.7.5.ebuild:
+  Changed 'pgsql?' to 'postgres?' in *DEPEND. Added mozsvg to IUSE.
+
+  27 Jun 2005; Diego Pettenò <flameeyes@gentoo.org> gecko-sdk-1.7.5.ebuild:
+  Add patch to build with gcc4 on amd64 systems as per mozilla-1.7.8. Fixes
+  possible crash dued to faultly logic.
+
+  15 May 2005; Joseph Jezak <josejx@gentoo.org> gecko-sdk-1.7.5.ebuild:
+  Replaced gcc.eclass with toolchain-funcs.eclass. Updated internally to
+  mozilla-1.7.8.
+
+  26 Apr 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/gecko-sdk-1.7.5-gcc4.patch, gecko-sdk-1.7.5.ebuild:
+  Fix building with gcc4.  Patch from halcy0n's overlay.
+
+  15 Apr 2005; Joseph Jezak <josejx@gentoo.org> -gecko-sdk-1.7.3.ebuild,
+  gecko-sdk-1.7.5.ebuild:
+  Updated build to mozilla-1.7.6-r1 for compilation bugs, but I used the same
+  gecko-sdk version number since there is no reason to recompile the SDK.
+
+  23 Mar 2005; Seemant Kulleen <seemant@gentoo.org> gecko-sdk-1.7.5.ebuild:
+  change dep from net-www/mozilla to www-client/mozilla
+
+  27 Feb 2005; Brad Laue <brad@gentoo.org> +files/svg-cairo-0.3.0-fix.patch,
+  gecko-sdk-1.7.5.ebuild:
+  Build fix for Cairo >=0.3.0.
+
+*gecko-sdk-1.7.5 (19 Feb 2005)
+
+  19 Feb 2005; Joseph Jezak <josejx@gentoo.org> +gecko-sdk-1.7.5.ebuild:
+  Updated to mozilla-1.7.5, should fix compile problems.
+
+  29 Dec 2004; Chris White <chriswhite@gentoo.org> gecko-sdk-1.7.3.ebuild:
+  Added to stable as this should have been (ugh).
+
+  03 Dec 2004; Chris White <chriswhite@gentoo.org> gecko-sdk-1.7.3.ebuild:
+  Added ~x86 keywords.
+
+*gecko-sdk-1.7.3 (09 Nov 2004)
+
+  09 Nov 2004; Aron Griffis <agriffis@gentoo.org> gecko-sdk-1.7.3.ebuild:
+  Fix IUSE
+
+  24 Oct 2004; Joseph Jezak <josejx@gentoo.org> :
+  Fixed manifest
 
   23 Oct 2004; Joseph Jezak <josejx@gentoo.org> :
   Initial import, bug #50822
diff --git a/net-libs/gecko-sdk/Manifest b/net-libs/gecko-sdk/Manifest
index fed8a24a9b0b..2a5d3fd47d95 100644
--- a/net-libs/gecko-sdk/Manifest
+++ b/net-libs/gecko-sdk/Manifest
@@ -1,2 +1,17 @@
-MD5 2a2e3f2213f8dbbfd87ca37bdb42be54 gecko-sdk-1.7.3.ebuild 2093
-MD5 640ad02464c41c9b820db9b59c7eeaec files/digest-gecko-sdk-1.7.3 75
+MD5 66c156160ef60780ee4c80a28873e766 metadata.xml 250
+MD5 e0d63b502ecb2e1da22a0e6157373a90 ChangeLog 4097
+MD5 8b22525bd9a836743abec05930d9543f gecko-sdk-1.7.12.ebuild 6945
+MD5 68e8f6854f38d88b6b6f0cd7ded9b721 gecko-sdk-1.7.8.ebuild 6838
+MD5 957bc911c21996313fe6f649558823f9 gecko-sdk-1.7.12-r1.ebuild 8011
+MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-1.7.6-gcc4.patch 1818
+MD5 be67106b98a3cc1562eee877200e6ae0 files/digest-gecko-sdk-1.7.8 280
+MD5 5b22d0e1ea93923e3e66787c286ad86f files/mozilla-1.7.8-objectframefix.diff 673
+MD5 19bfbff741d54e3b35b048ab445096ed files/digest-gecko-sdk-1.7.12-r1 232
+MD5 baddc2dbe81599d1575a4a4f95314377 files/mozilla-rebuild-databases.pl 2412
+MD5 8f8d70da6eb8cf07acbbb85fb0f08636 files/mozilla-hppa.patch 7863
+MD5 c927b56f320d1bacf28c49a7ee3c37ba files/digest-gecko-sdk-1.7.12 376
+MD5 278524216669b594ea5b6468a180ed73 files/mozilla-stackgrowth.patch 931
+MD5 b7c78ba7ca0c519d0f3d2b80ab4cdd74 files/mozilla-1.7.6-ppc64.patch 3651
+MD5 eb21396de389b3ef0277d5f95d59c348 files/mozilla-1.7.8-amd64.patch 4020
+MD5 f7930e7f2cba691a9b6654b61ba1217e files/mozilla-1.7.12-libart-freetype.patch 2412
+MD5 1f71cb3a30531a90fb7d1d3445588ba6 files/mozilla-1.7.12-gtk2xft-link-pangoxft.patch 465
diff --git a/net-libs/gecko-sdk/files/digest-gecko-sdk-1.7.12 b/net-libs/gecko-sdk/files/digest-gecko-sdk-1.7.12
index 93b4ddc41e35..37feb447c491 100644
--- a/net-libs/gecko-sdk/files/digest-gecko-sdk-1.7.12
+++ b/net-libs/gecko-sdk/files/digest-gecko-sdk-1.7.12
@@ -1,6 +1,4 @@
 MD5 f1ad6adbbc0510eb76d352c94c801fac mozilla-1.7.12-source.tar.bz2 30446836
-MD5 64ba4c6e3b52568468c4f6680ec7e679 ipc-1.1.3.tar.gz 102593
-MD5 50c369ce6d6fcb2d275cd30319a601ff enigmail-0.92.0.tar.gz 377123
 MD5 b4355a5746dde47cf0a7981df1dff998 moz_libart_lgpl-2.3.10p1.tar.bz2 103063
 MD5 7960994910bda4c14a52bc119f9ceefc mozilla-jslibmath-alpha.patch 625
 MD5 855fcb4f3e40bbcc608113ceb11e2ceb mozilla-1.7.12-gtk2xft.patch.bz2 40416
diff --git a/net-libs/gecko-sdk/files/digest-gecko-sdk-1.7.8 b/net-libs/gecko-sdk/files/digest-gecko-sdk-1.7.8
index 5048d5eba16d..14b6869931f2 100644
--- a/net-libs/gecko-sdk/files/digest-gecko-sdk-1.7.8
+++ b/net-libs/gecko-sdk/files/digest-gecko-sdk-1.7.8
@@ -1,3 +1,4 @@
 MD5 a6fa13d0c9243060bac6821fcff4b973 mozilla-1.7.8-source.tar.bz2 30449749
 MD5 64ba4c6e3b52568468c4f6680ec7e679 ipc-1.1.3.tar.gz 102593
 MD5 4ab46132f41b4f1718cd4141742f824b enigmail-0.91.0.tar.gz 365622
+MD5 1d6205bf7449fcdcae08cc1db524760d mozilla-firefox-1.0-4ft2.patch.bz2 5601
diff --git a/net-libs/gecko-sdk/gecko-sdk-1.7.12-r1.ebuild b/net-libs/gecko-sdk/gecko-sdk-1.7.12-r1.ebuild
index 7d6d7702e062..97c7b977e7aa 100644
--- a/net-libs/gecko-sdk/gecko-sdk-1.7.12-r1.ebuild
+++ b/net-libs/gecko-sdk/gecko-sdk-1.7.12-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-libs/gecko-sdk/gecko-sdk-1.7.12-r1.ebuild,v 1.1 2005/09/28 11:27:47 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gecko-sdk/gecko-sdk-1.7.12-r1.ebuild,v 1.1.1.1 2005/11/30 10:03:03 chriswhite Exp $
 
 unset ALLOWED_FLAGS  # Stupid extra-functions.sh ... bug 49179
 MOZ_FREETYPE2="no"   # Need to disable for newer .. remove here and in mozconfig
@@ -27,7 +27,7 @@ SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla${MY_PV}
 	mirror://gentoo/mozilla-${PV}-patches-${PVER}.tar.bz2
 	http://dev.gentoo.org/~azarah/mozilla/mozilla-${PV}-patches-${PVER}.tar.bz2"
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 SLOT="0"
 LICENSE="MPL-1.1 NPL-1.1"
 IUSE="crypt gnome java ldap mozcalendar mozdevelop moznocompose moznoirc moznomail mozsvg postgres ssl"
@@ -184,7 +184,7 @@ src_compile() {
 
 src_install() {
 	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/gecko-sdk"
-	
+
 	dodir /usr/$(get_libdir)
 	cp -RL ${S}/dist/sdk ${D}/${MOZILLA_FIVE_HOME}
 	# Also install the embedded dist for galeon, epiphany, etc
diff --git a/net-libs/gecko-sdk/gecko-sdk-1.7.12.ebuild b/net-libs/gecko-sdk/gecko-sdk-1.7.12.ebuild
index 736ff5af9790..8daca4587dd1 100644
--- a/net-libs/gecko-sdk/gecko-sdk-1.7.12.ebuild
+++ b/net-libs/gecko-sdk/gecko-sdk-1.7.12.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-libs/gecko-sdk/gecko-sdk-1.7.12.ebuild,v 1.1 2005/09/26 01:01:15 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gecko-sdk/gecko-sdk-1.7.12.ebuild,v 1.1.1.1 2005/11/30 10:03:02 chriswhite Exp $
 
 unset ALLOWED_FLAGS  # Stupid extra-functions.sh ... bug 49179
 MOZ_FREETYPE2="no"   # Need to disable for newer .. remove here and in mozconfig
diff --git a/net-libs/gecko-sdk/gecko-sdk-1.7.8.ebuild b/net-libs/gecko-sdk/gecko-sdk-1.7.8.ebuild
index ca7c2f3d5214..ee1461313cb8 100644
--- a/net-libs/gecko-sdk/gecko-sdk-1.7.8.ebuild
+++ b/net-libs/gecko-sdk/gecko-sdk-1.7.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-libs/gecko-sdk/gecko-sdk-1.7.8.ebuild,v 1.1 2005/07/11 22:02:57 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gecko-sdk/gecko-sdk-1.7.8.ebuild,v 1.1.1.1 2005/11/30 10:03:02 chriswhite Exp $
 
 unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
 inherit flag-o-matic toolchain-funcs eutils nsplugins mozilla-launcher mozconfig makeedit multilib
@@ -21,7 +21,8 @@ SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla${MY_PV}
 	crypt? ( !moznomail? (
 		http://www.mozilla-enigmail.org/downloads/src/ipc-${IPCVER}.tar.gz
 		http://www.mozilla-enigmail.org/downloads/src/enigmail-${EMVER}.tar.gz
-	) )"
+	) )
+	mirror://gentoo/mozilla-firefox-1.0-4ft2.patch.bz2"
 
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 SLOT="0"
@@ -72,7 +73,7 @@ src_unpack() {
 	# patch out ft caching code since the API changed between releases of
 	# freetype; this enables freetype-2.1.8+ compat.
 	# https://bugzilla.mozilla.org/show_bug.cgi?id=234035#c65
-	epatch ${PORTDIR}/www-client/mozilla/files/mozilla-1.7.3-4ft2.patch
+	epatch ${DISTDIR}/mozilla-firefox-1.0-4ft2.patch.bz2
 
 	# Patch to allow compilation on ppc64 - bug #54843
 	use ppc64 && epatch ${PORTDIR}/www-client/mozilla/files/mozilla-1.7.6-ppc64.patch
diff --git a/net-libs/gnet/ChangeLog b/net-libs/gnet/ChangeLog
index 1f1d1b33ec0e..93b2307d5563 100644
--- a/net-libs/gnet/ChangeLog
+++ b/net-libs/gnet/ChangeLog
@@ -1,6 +1,166 @@
 # ChangeLog for net-libs/gnet
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnet/ChangeLog,v 1.1 2002/02/01 21:53:34 gbevin Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnet/ChangeLog,v 1.1.1.1 2005/11/30 10:02:53 chriswhite Exp $
+
+  13 Sep 2005; <dang@gentoo.org> +files/gnet-2.0.7-amd64-fixes.patch,
+  gnet-2.0.7.ebuild:
+  Fix some int/long mismatches. Fixes bug #105709
+
+  24 Aug 2005; Aron Griffis <agriffis@gentoo.org> gnet-2.0.7.ebuild:
+  stable on ia64
+
+  06 Jun 2005; Markus Rothe <corsair@gentoo.org> gnet-2.0.7.ebuild:
+  Stable on ppc64
+
+  25 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> gnet-2.0.7.ebuild:
+  Stable on alpha.
+
+  20 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> gnet-2.0.7.ebuild:
+  Stable on ppc.
+
+  20 Apr 2005; Simon Stelling <blubb@gentoo.org> gnet-2.0.7.ebuild:
+  stable on amd64
+
+  12 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> gnet-2.0.7.ebuild:
+  Stable on sparc
+
+  09 Apr 2005; Leonardo Boshell <leonardop@gentoo.org> gnet-2.0.7.ebuild:
+  Stable on x86.
+
+  01 Apr 2005; Aron Griffis <agriffis@gentoo.org> gnet-2.0.5.ebuild:
+  stable on ia64
+
+*gnet-2.0.7 (07 Mar 2005)
+
+  07 Mar 2005; Leonardo Boshell <leonardop@gentoo.org> gnet-2.0.7.ebuild:
+  New release. Added `static' USE flag. Patch no longer necessary.
+
+  06 Feb 2005; Markus Rothe <corsair@gentoo.org> gnet-2.0.5.ebuild:
+  Stable on ppc64
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  23 Dec 2004; Markus Rothe <corsair@gentoo.org> gnet-2.0.5.ebuild:
+  Added ~ppc64 to KEYWORDS; bug #75350
+
+  14 Nov 2004; Kito <kito@gentoo.org> gnet-2.0.5.ebuild:
+  added ~ppc-macos
+
+  09 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> gnet-2.0.5.ebuild:
+  Stable on alpha.
+
+  07 Jul 2004; L. Boshell <leonardop@gentoo.org> gnet-2.0.5.ebuild:
+  Include the gtk-doc dependency explicitly. Related to bug #56292.
+
+  20 Apr 2004; Guy Martin <gmsoft@gentoo.org> gnet-2.0.5.ebuild:
+  Marked stable on hppa.
+
+  12 Apr 2004; L. Boshell <leonardop@gentoo.org> gnet-2.0.5.ebuild,
+  gnet-2.0.4.ebuild, gnet-2.0.3.ebuild, gnet-1.1.5.ebuild:
+  Inherit from eutils when necessary. Added IUSE statement.
+
+  11 Apr 2004; Gustavo Zacarias <gustavoz@gentoo.org> gnet-2.0.5.ebuild:
+  stable on sparc
+
+  07 Apr 2004; L. Boshell <leonardop@gentoo.org> gnet-2.0.5.ebuild:
+  Marked stable on x86.
+
+  09 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org> gnet-1.1.9.ebuild,
+  gnet-2.0.4.ebuild:
+  marked stable on sparc
+
+  08 Mar 2004; L. Boshell <leonardop@gentoo.org> gnet-2.0.5.ebuild,
+  gnet-2.0.5-gtkdoc_fix.patch:
+  Patch to build the API docs correctly with gtk-doc-1.2. Closes bug
+  #43942.
+
+*gnet-2.0.5 (06 Mar 2004)
+
+  06 Mar 2004; L. Boshell <leonardop@gentoo.org> gnet-2.0.5.ebuild:
+  New release.
+  
+  06 Mar 2004; L. Boshell <leonardop@gentoo.org> gnet-2.0.4.ebuild:
+  Marked as stable on x86.
+  
+  17 Feb 2004; Aron Griffis <agriffis@gentoo.org> gnet-1.1.9.ebuild,
+  gnet-2.0.4.ebuild:
+  stable on alpha and ia64
+
+  30 Jan 2004; <gustavoz@gentoo.org> gnet-2.0.3.ebuild:
+  keyworded sparc
+
+  06 Jan 2004; Jason Wever <weeve@gentoo.org> gnet-2.0.4.ebuild:
+  Added ~sparc keyword.
+
+  06 Oct 2003; L. Boshell <leonardop@gentoo.org> gnet-2.0.4.ebuild:
+  Change --with-html-dir value so gnet's documentation goes to the same place
+  every gtk-doc-generated library docs go.
+
+*gnet-2.0.4 (30 Jul 2003)
+
+  14 Jul 2003; Alastair Tse <liquidx@gentoo.org> gnet-1.1.9.ebuild:
+  set 1.1.9 back to SLOT=1
+
+  09 Jul 2003; Alastair Tse <liquidx@gentoo.org> gnet-1.1.5.ebuild,
+  gnet-1.1.8.ebuild, gnet-1.1.9.ebuild, gnet-2.0.3.ebuild:
+  dep cleanup
+
+*gnet-2.0.3 (14 May 2003)
+
+  04 Aug 2003; Guy Martin <gmsoft@gentoo.org> gnet-2.0.3.ebuild :
+  Added hppa to KEYWORDS.
+
+  14 May 2003; foser <foser@gentoo.org> gnet-2.0.3.ebuild :
+  New version
+
+*gnet-2.0.2 (07 May 2003)
+
+  07 May 2003; foser <foser@gentoo.org> gnet-2.0.2.ebuild :
+  New version, use gnome2 eclass, SLOT 2
+
+*gnet-1.1.9 (07 May 2003)
+
+  06 Jul 2003; Guy Martin <gmsoft@gentoo.org> gnet-1.1.9.ebuild :
+  Added hppa to KEYWORDS.
+
+  07 May 2003; foser <foser@gentoo.org> gnet-1.1.9.ebuild :
+  New version, removed patch, fixed license
+
+  07 May 2003; foser <foser@gentoo.org> gnet-1.1.{5,8,9}.ebuild :
+  Set SLOT 1
+
+*gnet-1.1.8 (11 mar 2003)
+
+  28 Mar 2003; Jason Wever <weeve@gentoo.org> gnet-1.1.8.ebuild:
+  Added ~sparc to keywords.
+
+  11 mar 2003; <spider@gentoo.org> gnet-1.1.8.ebuild:
+  no changes to the ebuild necessary
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*gnet-1.1.5 (14 Aug 2002)
+
+  05 Apr 2003; Jason Wever <weeve@gentoo.org> gnet-1.1.5.ebuild:
+  Added sparc to keywords.
+
+  14 Aug 2002; Gabriele Giorgetti <stroke@gentoo.org> gnet-1.1.5.ebuild :
+  Version bump.
+
+*gnet-1.1.4 (15 May 2002)
+  15 MAy 2002; Spider <spider@gentoo.org> gnet-1.1.4.ebuild :
+  yet another version bump :)
+  partially lintool friendly this time
+
+*gnet-1.1.3 (26 Apr 2002)
+  26 Apr 2002; Spider <spider@gentoo.org> gnet-1.1.3.ebuild :
+  update version, and dependencies. this code now can use glib 1.2 and/or 2.0
+  
+*gnet-1.1.0 (11 Apr 2002)
+  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
+
 
 *gnet-1.1.0 (1 Feb 2002)
 
diff --git a/net-libs/gnet/Manifest b/net-libs/gnet/Manifest
index e69de29bb2d1..128322bb23f9 100644
--- a/net-libs/gnet/Manifest
+++ b/net-libs/gnet/Manifest
@@ -0,0 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9a2d5bec1f7173bf7ba6c309446a6ddf gnet-1.1.9.ebuild 978
+MD5 8622ff62e90c2e7c596bc0760da9a7f1 gnet-2.0.5.ebuild 810
+MD5 4dc58ec4d92b1da74aad7d69f4fd850c gnet-2.0.7.ebuild 818
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 a5a38e1e7f69d3d07130999eda2cc477 ChangeLog 5634
+MD5 a39e088e927a5d9b2de3794920d01405 files/digest-gnet-1.1.9 62
+MD5 94491a07093f86943ce66996189b4718 files/digest-gnet-2.0.5 62
+MD5 be10a790945382ccd065e826e2798bee files/digest-gnet-2.0.7 62
+MD5 7b1ffb935d29a355ea158d7be3f514ed files/gnet-2.0.5-gtkdoc_fix.patch 665
+MD5 7a97ee54c578392fc9c307fb28992e86 files/gnet-2.0.7-amd64-fixes.patch 6253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDLAeHKf2g/qXtneoRAjuWAJ4vfD8gqfXvdIbV7UCG3OqYLuMOmQCfVHp3
+fh7tPbl05hPYeyhfeao7QPg=
+=RxnG
+-----END PGP SIGNATURE-----
diff --git a/net-libs/gnet/gnet-1.1.9.ebuild b/net-libs/gnet/gnet-1.1.9.ebuild
index 6d5817a1a7a4..f6c4edd40903 100644
--- a/net-libs/gnet/gnet-1.1.9.ebuild
+++ b/net-libs/gnet/gnet-1.1.9.ebuild
@@ -1,18 +1,21 @@
-# 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-libs/gnet/gnet-1.1.9.ebuild,v 1.1 2003/05/07 12:57:32 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnet/gnet-1.1.9.ebuild,v 1.1.1.1 2005/11/30 10:02:53 chriswhite Exp $
 
 DESCRIPTION="GNet network library."
 SRC_URI="http://www.gnetlibrary.org/src/${P}.tar.gz"
 HOMEPAGE="http://www.gnetlibrary.org/"
 
-SLOT="0"
+IUSE=""
+SLOT="1"
 LICENSE="LGPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc hppa amd64 alpha sparc ia64"
 
 # yes, the >= is correct, this software can use both glib 1.2 and 2.0!
-DEPEND=">=dev-libs/glib-1.2.0"
- 
+RDEPEND=">=dev-libs/glib-1.2.0"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
 src_compile() {
 	econf \
 		--with-html-dir=${D}/usr/share/doc/${PF} \
@@ -31,6 +34,6 @@ src_install() {
 		sysconfdir=${D}/etc \
 		localstatedir=${D}/var/lib \
 		install || die
-	
+
 	dodoc AUTHORS BUGS ChangeLog COPYING NEWS README TODO
 }
diff --git a/net-libs/gnet/gnet-2.0.5.ebuild b/net-libs/gnet/gnet-2.0.5.ebuild
index 08505c2b0864..6cba3009fef2 100644
--- a/net-libs/gnet/gnet-2.0.5.ebuild
+++ b/net-libs/gnet/gnet-2.0.5.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-libs/gnet/gnet-2.0.5.ebuild,v 1.1 2004/03/07 00:21:44 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnet/gnet-2.0.5.ebuild,v 1.1.1.1 2005/11/30 10:02:53 chriswhite Exp $
 
-inherit gnome2
+inherit eutils gnome2
 
 DESCRIPTION="GNet network library."
 HOMEPAGE="http://www.gnetlibrary.org/"
@@ -10,12 +10,22 @@ SRC_URI="http://www.gnetlibrary.org/src/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~ia64"
+KEYWORDS="x86 ppc sparc alpha hppa ia64 amd64 ~ppc-macos ppc64"
+
+IUSE="doc"
 
 RDEPEND=">=dev-libs/glib-1.2"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+	dev-util/pkgconfig
+	doc? ( dev-util/gtk-doc )"
 
 G2CONF=" --with-html-dir=${D}/usr/share/gtk-doc/html"
 
 DOCS="AUTHORS BUGS ChangeLog COPYING HACKING NEWS README TODO"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# Fix DocBook conflict. See bug #43942.
+	epatch ${FILESDIR}/${P}-gtkdoc_fix.patch
+}
+\ No newline at end of file
diff --git a/net-libs/gnet/gnet-2.0.7.ebuild b/net-libs/gnet/gnet-2.0.7.ebuild
index 9f3c2a7eaf34..39d5b553e55e 100644
--- a/net-libs/gnet/gnet-2.0.7.ebuild
+++ b/net-libs/gnet/gnet-2.0.7.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-libs/gnet/gnet-2.0.7.ebuild,v 1.1 2005/03/07 18:34:38 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnet/gnet-2.0.7.ebuild,v 1.1.1.1 2005/11/30 10:02:53 chriswhite Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="A simple network library."
 HOMEPAGE="http://www.gnetlibrary.org/"
@@ -10,7 +10,7 @@ SRC_URI="http://www.gnetlibrary.org/src/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~ia64 ~amd64 ~ppc-macos"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc ~ppc-macos ppc64 sparc x86"
 
 IUSE="debug doc static"
 
@@ -22,3 +22,11 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README* TODO"
 
 G2CONF="${G2CONF} $(use_enable static)"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Fix integer size mismatches on 64-bit arches
+	epatch ${FILESDIR}/${P}-amd64-fixes.patch
+}
diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 469e598ae4a0..2f82b94a4ca7 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,326 @@
 # ChangeLog for net-libs/gnutls
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.1 2003/09/02 22:19:58 liquidx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.1.1.1 2005/11/30 10:02:50 chriswhite Exp $
+
+  11 Nov 2005; Daniel Black <dragonheart@gentoo.org> gnutls-1.2.6.ebuild,
+  gnutls-1.2.9.ebuild:
+  really only need lzo-1 dependancy - bug #112139
+
+*gnutls-1.2.9 (10 Nov 2005)
+
+  10 Nov 2005; Marcelo Goes <vanquirius@gentoo.org> -gnutls-1.2.5.ebuild,
+  +gnutls-1.2.9.ebuild:
+  1.2.9 version bump for bug 111928. Depends on libgcrypt-1.2.2 instead of
+  1.2.0. Thanks to Kai <altkai at ml1 dot net>.
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> gnutls-1.2.4.ebuild:
+  Mark 1.2.4 stable on alpha
+
+  05 Sep 2005; Markus Rothe <corsair@gentoo.org> gnutls-1.2.4.ebuild:
+  Stable on ppc64
+
+  24 Aug 2005; Aron Griffis <agriffis@gentoo.org> gnutls-1.2.4.ebuild:
+  stable on ia64
+
+*gnutls-1.2.6 (17 Jul 2005)
+
+  17 Jul 2005; Daniel Black <dragonheart@gentoo.org> +gnutls-1.2.6.ebuild:
+  version bump - gtk-doc fixed
+
+*gnutls-1.2.5 (17 Jul 2005)
+
+  17 Jul 2005; Daniel Black <dragonheart@gentoo.org> +gnutls-1.2.5.ebuild:
+  version bump - still masked due to lzo-2 dependancy
+
+  10 Jul 2005; Lina Pezzella <j4rg0n@gentoo.org> gnutls-1.2.4.ebuild:
+  Testing ppc-macos. Bug #98390. Submitted on behalf of Fabian Groffen.
+
+  05 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org> gnutls-1.2.3.ebuild:
+  Stable on hppa.
+
+  03 Jul 2005; Hardave Riar <hardave@gentoo.org> gnutls-1.0.25.ebuild,
+  gnutls-1.2.3.ebuild:
+  Stable on mips, bug #90726.
+
+  21 Jun 2005; Daniel Black <dragonheart@gentoo.org> gnutls-1.0.25.ebuild,
+  gnutls-1.2.3.ebuild, gnutls-1.2.3-r1.ebuild, gnutls-1.2.4.ebuild:
+  added dropped keywords
+
+  06 Jun 2005; Danny van Dyk <kugelfang@gentoo.org> gnutls-1.2.4.ebuild:
+  Marked ~s390, BUG #93960.
+
+  04 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org> gnutls-1.2.4.ebuild:
+  stable on amd64 wrt #94913
+
+*gnutls-1.2.4 (03 Jun 2005)
+
+  03 Jun 2005; Daniel Black <dragonheart@gentoo.org> +gnutls-1.2.4.ebuild:
+  Version bump - thanks tigger
+
+*gnutls-1.2.3-r1 (04 May 2005)
+
+  04 May 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/gnutls-1.2.3-gcc4.patch, +gnutls-1.2.3-r1.ebuild:
+  Fix building with gcc4.
+
+*gnutls-1.0.17 (01 May 2005)
+
+  01 May 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/gnutls-1.0.17-extra.h.patch, +gnutls-1.0.17.ebuild:
+  re-added files so arm and mips still work
+
+  01 May 2005; Daniel Black <dragonheart@gentoo.org>
+  -files/gnutls-1.0.14-extra.h.patch, -files/gnutls-1.1.23-extra.h.patch,
+  -gnutls-1.0.17.ebuild, -gnutls-1.0.23.ebuild, -gnutls-1.2.0.ebuild,
+  -gnutls-1.2.1.ebuild:
+  prune potentially vulnerable versions
+
+  01 May 2005; Daniel Black <dragonheart@gentoo.org> gnutls-1.2.3.ebuild:
+  Removed crypt flag due to bug #90976. Thanks to Alex Murray
+  <murray.alex@gREMOVETHISmail.com>
+
+  30 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> gnutls-1.2.3.ebuild:
+  alpha + ~ia64 keywords.
+
+  29 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> gnutls-1.0.25.ebuild,
+  gnutls-1.2.3.ebuild:
+  Stable on sparc wrt #90726
+
+  29 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> gnutls-1.0.25.ebuild:
+  Stable on hppa.
+
+  29 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> gnutls-1.0.25.ebuild,
+  gnutls-1.2.3.ebuild:
+  stable on amd64 wrt security bug #90726
+
+  29 Apr 2005; Markus Rothe <corsair@gentoo.org> gnutls-1.2.3.ebuild:
+  Stable on ppc64
+
+  29 Apr 2005; Daniel Black <dragonheart@gentoo.org> gnutls-1.0.25.ebuild,
+  gnutls-1.2.3.ebuild:
+  ppc stable. Fixed bug #90841 (bad quotes by Rork <rork@free.fr>).
+
+  29 Apr 2005; Markus Rothe <corsair@gentoo.org> gnutls-1.0.25.ebuild:
+  Stable on ppc64; bug #90726
+
+  28 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> :
+  Took gnutls-1.2.1 out of package.mask, pointless to mask it now.
+
+*gnutls-1.2.3 (28 Apr 2005)
+*gnutls-1.0.25 (28 Apr 2005)
+
+  28 Apr 2005; Daniel Black <dragonheart@gentoo.org> +gnutls-1.0.25.ebuild,
+  +gnutls-1.2.3.ebuild:
+  Version bumps for security bug #90726
+
+*gnutls-1.2.1 (18 Apr 2005)
+
+  18 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> +gnutls-1.2.1.ebuild:
+  Version bump to 1.2.1. Dropped patch since it seems to have been integrated in
+  upstream. I added it to package.mask for testing, but anyone who feels it
+  works OK can take it out. Fixes bug 89588. Thanks to Erinn Looney-Triggs
+  <erinn.looneytriggs@gmail.com> for reporting.
+
+  01 Apr 2005; Aron Griffis <agriffis@gentoo.org> gnutls-1.0.23.ebuild:
+  stable on ia64
+
+  05 Mar 2005; Markus Rothe <corsair@gentoo.org> gnutls-1.0.23.ebuild:
+  Stable on ppc64
+
+  20 Feb 2005; Aron Griffis <agriffis@gentoo.org> gnutls-1.0.23.ebuild:
+  add ~ia64
+
+  06 Feb 2005; Daniel Black <dragonheart@gentoo.org> gnutls-1.2.0.ebuild:
+  Fixed bad parsing in gtk-doc as per bug #80906. Thanks to Ivan Yosifov 
+  <ivan@yosifov.net> and others for reporting it.
+
+  05 Feb 2005; Daniel Black <dragonheart@gentoo.org> -gnutls-1.1.23-r1.ebuild,
+  -gnutls-1.1.23.ebuild:
+  Removed due to working 1.2.0. Fixes bug #79327.
+
+*gnutls-1.2.0 (05 Feb 2005)
+
+  05 Feb 2005; Daniel Black <dragonheart@gentoo.org> +gnutls-1.2.0.ebuild:
+  version bump as per bug #80809. Thanks to Erinn Looney-Triggs
+  <erinn.looneytriggs@gmail.com>
+
+*gnutls-1.1.23-r1 (24 Jan 2005)
+
+  24 Jan 2005; Christian Parpart <trapni@gentoo.org>
+  +files/gnutls-1.1.23-extra.h.patch, +gnutls-1.1.23-r1.ebuild:
+  added C++ header stubs into extra.h
+
+  24 Jan 2005; Daniel Black <dragonheart@gentoo.org> gnutls-1.0.23.ebuild,
+  gnutls-1.1.23.ebuild:
+  Fixed dependacy on dev-libs/libgcrypt >= 1.2.0 as per bug #79232. Fixed
+  version notices for rebuild. Thanks to Alex Tomkins <tomkins-gb@darkzone.net>
+  for the bug report
+
+*gnutls-1.1.23 (22 Jan 2005)
+
+  22 Jan 2005; Tom Martin <slarti@gentoo.org> +gnutls-1.1.23.ebuild:
+  Version bump.
+
+  15 Jan 2005; Daniel Black <dragonheart@gentoo.org> gnutls-1.0.17.ebuild,
+  gnutls-1.0.23.ebuild:
+  Notices placed about version API change requireing revdep-rebuild as per bug
+  #62283
+
+  07 Jan 2005; Markus Rothe <corsair@gentoo.org> gnutls-1.0.23.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  07 Jan 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/gnutls-1.0.14-extra.h.patch:
+  Over zelously pruned patch. Bug #76890 refers. Thanks to Alex Tomkins
+  <tomkins-gb@darkzone.net> and Dargo (on irc)
+
+  06 Jan 2005; Daniel Black <dragonheart@gentoo.org> gnutls-1.0.17.ebuild,
+  gnutls-1.0.23.ebuild:
+  added dev-libs/libgpg-error to depandencies as per mail by Bussolaro
+  Jean-pierre <jean-pierre.bussolaro@ycom.ch>
+
+*gnutls-1.0.23 (06 Jan 2005)
+
+  06 Jan 2005; Daniel Black <dragonheart@gentoo.org> metadata.xml,
+  -files/gnutls-1.0.14-extra.h.patch, -gnutls-0.8.10.ebuild,
+  -gnutls-0.8.12.ebuild, -gnutls-1.0.14.ebuild, +gnutls-1.0.23.ebuild
+  -gnutls-1.0.4.ebuild:
+  Version bump as per bug #61944. Reported by Daniel Webert
+  <rockoo@rockoo.homelinux.org>. Ebuild by me. Old version cleanout
+  too.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  23 Dec 2004; Daniel Drake <dsd@gentoo.org> gnutls-1.0.17.ebuild:
+  Fix compilation with included minilzo, bug 64622
+
+  26 Sep 2004; Tom Gall <tgall@gentoo.org> gnutls-1.0.17.ebuild:
+  stable on ppc64, bug #59231
+
+  14 Aug 2004; Hardave Riar <hardave@gentoo.org> gnutls-1.0.17.ebuild:
+  Added gnuconfig_update for mips64 support
+
+  14 Aug 2004; Hardave Riar <hardave@gentoo.org> gnutls-1.0.17.ebuild:
+  Stable on mips, bug 59231.
+
+  09 Aug 2004; Guy Martin <gmsoft@gentoo.org> gnutls-1.0.17.ebuild:
+  Stable on hppa.
+
+  07 Aug 2004; <agriffis@gentoo.org> gnutls-1.0.17.ebuild:
+  stable on ia64, security update #59231
+
+  07 Aug 2004; Luca Barbato <lu_zero@gentoo.org> gnutls-1.0.17.ebuild:
+  Stable on ppc
+
+  07 Aug 2004; Luca Barbato <lu_zero@gentoo.org> gnutls-1.0.17.ebuild:
+  Stable on ppc
+
+  07 Aug 2004; Tom Martin <slarti@gentoo.org> gnutls-1.0.17.ebuild:
+  Stable on amd64, bug 59231.
+
+  07 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> gnutls-1.0.17.ebuild:
+  Stable on alpha, bug 59231.
+
+  06 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> gnutls-1.0.17.ebuild:
+  Stable on sparc wrt #59231
+
+  04 Aug 2004; Alastair Tse <liquidx@gentoo.org>
+  files/gnutls-1.0.14-extra.h.patch:
+  fixed extra.h patch
+
+  04 Aug 2004; Alastair Tse <liquidx@gentoo.org> gnutls-1.0.17.ebuild:
+  fixed opencdk dep. people should fix the deps rather than leave comments in
+  the ebuild :)
+
+*gnutls-1.0.17 (04 Aug 2004)
+
+  04 Aug 2004; Alastair Tse <liquidx@gentoo.org> +gnutls-1.0.17.ebuild:
+  version bump. security problems with x509 certificate validation (#59231)
+
+  29 Jul 2004; Stephen P. Becker <geoman@gentoo.org> gnutls-1.0.4.ebuild:
+  Stable on mips.
+
+  24 Jul 2004; Alastair Tse <liquidx@gentoo.org>
+  +files/gnutls-1.0.14-extra.h.patch, gnutls-1.0.14.ebuild:
+  add extern C headers to extra.h (#51206)
+
+  01 Jul 2004; Tom Gall <gentoo.org> gnutls-1.0.14.ebuild:
+  stable on ppc64, bug #54804
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> gnutls-1.0.14.ebuild:
+  virtual/glibc -> virtual/libc
+
+*gnutls-1.0.14 (16 Jun 2004)
+
+  16 Jun 2004; Daniel Black <dragonheart@gentoo.org> +gnutls-1.0.14.ebuild:
+  version bump
+
+  16 Jun 2004; Daniel Black <dragonheart@gentoo.org> gnutls-0.8.12.ebuild,
+  gnutls-1.0.4.ebuild:
+  marked x86 stable to solve bug #53775. Thanks to Susie Edgeworth
+  <arienadean@yahoo.com>.
+
+  10 Jun 2004; Aron Griffis <agriffis@gentoo.org> gnutls-0.8.10.ebuild,
+  gnutls-0.8.12.ebuild, gnutls-1.0.4.ebuild:
+  Fix use invocation
+
+  17 May 2004; Bryan Østergaard <kloeri@gentoo.org> gnutls-1.0.4.ebuild:
+  Add ~alpha.
+
+  02 May 2004; Stephen P. Becker <geoman@gentoo.org> gnutls-1.0.4.ebuild:
+  Added ~mips keyword.
+
+  09 Apr 2004; David Holm <dholm@gentoo.org> gnutls-1.0.4.ebuild:
+  Added to ~ppc.
+
+  29 Feb 2004; Jason Wever <weeve@gentoo.org> gnutls-1.0.4.ebuild:
+  Riders on the ~sparc.
+
+*gnutls-1.0.4 (04 Feb 2004)
+
+  04 Feb 2004; Alastair Tse <liquidx@gentoo.org> gnutls-1.0.4.ebuild:
+  version bump. removed keyword because of major version upgrade. archs should
+  look at marking this ~. added symlink hack to get around breaking apps because
+  of major lib number change, however, the code is still binary compatible.
+
+  04 Jan 2004; Daniel Ahlberg <aliz@gentoo.org> gnutls-0.8.10.ebuild,
+  gnutls-0.8.12.ebuild:
+  Update SRC_URI.
+
+  26 Dec 2003; Jason Wever <weeve@gentoo.org> gnutls-0.8.10.ebuild:
+  Marked stable on sparc.
+
+  16 Dec 2003; Guy Martin <gmsoft@gentoo.org> gnutls-0.8.10.ebuild:
+  Marked stable on hppa.
+
+  14 Dec 2003; Lars Weiler <pylon@gentoo.org> gnutls-0.8.12.ebuild:
+  Make stable on ppc
+
+  13 Dec 2003; Brad House <brad_mssw@gentoo.org> gnutls-0.8.12.ebuild:
+  mark stable on amd64
+
+  10 Dec 2003; <agriffis@gentoo.org> gnutls-0.8.12.ebuild:
+  stable on ia64
+
+*gnutls-0.8.12 (23 Nov 2003)
+
+  23 Nov 2003; Alastair Tse <liquidx@gentoo.org> gnutls-0.8.12.ebuild:
+  fixed opencdk linking due to faulty configure flags. new version now depends
+  on opencdk-0.5.1 (#33930)
+
+  21 Nov 2003; Jason Wever <weeve@gentoo.org> gnutls-0.8.10.ebuild:
+  Added ~sparc keyword.
+
+  20 Oct 2003; Aron Griffis <agriffis@gentoo.org> gnutls-0.8.10.ebuild:
+  Stable on alpha
+
+  13 Oct 2003; Alastair Tse <liquidx@gentoo.org> gnutls-0.8.10.ebuild:
+  stable bump for x86
+
+  06 Sep 2003; Alastair Tse <liquidx@gentoo.org> gnutls-0.8.10.ebuild:
+  put opencdk dep behind crypt USE flag and removed optional lzo support. also
+  changed build to use included libtasn1 instead of dev-libs/libtasn1
 
 *gnutls-0.8.10 (02 Sep 2003)
 
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index d0817f18c94f..fc59d57681c7 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,2 +1,28 @@
-MD5 edbffe8b94ae85bb066d4cf664fb2c31 gnutls-0.8.10.ebuild 763
-MD5 b2ae83a3180a66ab61bdf08669f27399 files/digest-gnutls-0.8.10 66
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 24090bc45e73742f41337de65a8cca01 ChangeLog 11598
+MD5 cfa78b7df28ec06ca09763bd8c908ebc files/digest-gnutls-1.0.17 67
+MD5 ee48c699bf5727fa6284864dc62d1c14 files/digest-gnutls-1.0.25 66
+MD5 5deb0ddb33596df840a663273ddf9c2b files/digest-gnutls-1.2.3 66
+MD5 5deb0ddb33596df840a663273ddf9c2b files/digest-gnutls-1.2.3-r1 66
+MD5 0a6c7f63908a38a6e28d34a68accee2a files/digest-gnutls-1.2.4 66
+MD5 26cd0c7e5a105e72808024e198a3ce35 files/digest-gnutls-1.2.6 66
+MD5 077c38845fca7036f125850ae6bb0ab3 files/digest-gnutls-1.2.9 66
+MD5 29d3e8994448eb3fe1d15c6720621b40 files/gnutls-1.0.17-extra.h.patch 479
+MD5 29d8c263065fa5908f9b6d9e5ea265b7 files/gnutls-1.2.3-gcc4.patch 417
+MD5 08081d2e15793082b967a6f59be65f4f gnutls-1.0.17.ebuild 2420
+MD5 0141dbf41e5461d24ef5bc995e3f4848 gnutls-1.0.25.ebuild 2219
+MD5 4afc7479357b55dc6feca54b9b3f3563 gnutls-1.2.3-r1.ebuild 2433
+MD5 e7d241ccf7c8f5d4b8f1d2cf9fe3c13d gnutls-1.2.3.ebuild 2323
+MD5 a453455113f533dd2f172f8573a3937b gnutls-1.2.4.ebuild 2586
+MD5 2abc4b42e7acb40bfd1a762d06f1088b gnutls-1.2.6.ebuild 1981
+MD5 089f1fd5b71e1af6c09131b0559b8ebc gnutls-1.2.9.ebuild 1981
+MD5 918a1b851dd53568897b4fc7c503912e metadata.xml 276
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDdGOumdTrptrqvGERAun7AJ0c9jRXdhCnd1LmIx4YDgx8xaQZygCfT8pb
+ogK54Z8DdYDBf/YuaTkVwCk=
+=5LY8
+-----END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/gnutls-1.0.17.ebuild b/net-libs/gnutls/gnutls-1.0.17.ebuild
index 1a1a2b775bd8..ecb9de5c09f8 100644
--- a/net-libs/gnutls/gnutls-1.0.17.ebuild
+++ b/net-libs/gnutls/gnutls-1.0.17.ebuild
@@ -1,32 +1,29 @@
-# 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-libs/gnutls/gnutls-1.0.17.ebuild,v 1.1 2004/08/04 13:32:56 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-1.0.17.ebuild,v 1.1.1.1 2005/11/30 10:02:51 chriswhite Exp $
 
-inherit eutils
+inherit eutils gnuconfig
 
 DESCRIPTION="A TLS 1.0 and SSL 3.0 implementation for the GNU project"
 HOMEPAGE="http://www.gnutls.org/"
 SRC_URI="ftp://ftp.gnutls.org/pub/gnutls/${P}.tar.bz2"
 
-IUSE="zlib doc crypt"
-LICENSE="LGPL-2.1 | GPL-2"
 # GPL-2 for the gnutls-extras library and LGPL for the gnutls library.
-
+LICENSE="|| ( LGPL-2.1 GPL-2 )"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~mips ~alpha ~ppc64"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
+IUSE="zlib doc crypt"
 
 RDEPEND=">=dev-libs/libgcrypt-1.1.94
-	crypt? ( >=app-crypt/opencdk-0.5.3 )
+	crypt? ( >=app-crypt/opencdk-0.5.5 )
 	zlib? ( >=sys-libs/zlib-1.1 )
-	virtual/libc"
+	virtual/libc
+	dev-libs/libgpg-error"
 
 # Need masking on ~amd64 ~sparc ~ppc ~mips ~alpha
 #	>=dev-libs/libtasn1-0.2
 #	>=dev-libs/lzo-1.0"
 
-# should be crypt? ( >=app-crypt/opencdk-0.5.5 ) however I did see the source for it
-# ^^ this is what configure expects.
-
 DEPEND="${RDEPEND}
 	sys-apps/gawk
 	sys-apps/grep
@@ -40,10 +37,13 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}/includes/gnutls; epatch ${FILESDIR}/${PN}-1.0.14-extra.h.patch
+	cd ${S}/includes/gnutls; epatch ${FILESDIR}/${P}-extra.h.patch
 }
 
 src_compile() {
+	# Needed for mips and probablly others
+	gnuconfig_update
+
 	#   I think this vvv gets ignored if not present
 	local myconf="--without-included-libtasn1 --without-included-opencdk"
 
@@ -52,7 +52,7 @@ src_compile() {
 
 	econf  \
 		`use_with zlib` \
-		--with-included-minilzo \
+		--with-included-lzo \
 		--with-included-libtasn1 \
 		${myconf} || die
 	emake || die
@@ -73,3 +73,22 @@ src_install() {
 		dodoc doc/examples/*.c
 	fi
 }
+
+pkg_postinst() {
+	ewarn "An API has changed in gnutls. This is why the library has gone from "
+	ewarn "libgnutls.so.10 to libgnutls.so.11."
+	ewarn
+	ewarn "What is required is a revdep-rebuild."
+	ewarn "To show you what is needed to rebuild"
+	ewarn "revdep-rebuild --soname libgnutls.so.10 -- -p"
+	ewarn ""
+	ewarn "Then do:"
+	ewarn "revdep-rebuild --soname libgnutls.so.10"
+	einfo ""
+	einfo "Afterward just try:"
+	einfo "revdep-rebuild -- -p"
+	einfo "to see if there are any other packages broken."
+	einfo "To rebuild these:"
+	einfo "revdep-rebuild"
+
+}
diff --git a/net-libs/gnutls/gnutls-1.0.25.ebuild b/net-libs/gnutls/gnutls-1.0.25.ebuild
index b2fc80bf040f..536c7449fcc8 100644
--- a/net-libs/gnutls/gnutls-1.0.25.ebuild
+++ b/net-libs/gnutls/gnutls-1.0.25.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-libs/gnutls/gnutls-1.0.25.ebuild,v 1.1 2005/04/28 22:14:53 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-1.0.25.ebuild,v 1.1.1.1 2005/11/30 10:02:50 chriswhite Exp $
 
 inherit eutils gnuconfig
 
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1 GPL-2"
 # GPL-2 for the gnutls-extras library and LGPL for the gnutls library.
 
 SLOT="0"
-KEYWORDS="x86 ~sparc ~ppc ~amd64 ~mips ~alpha ~ppc64 ~hppa ia64"
+KEYWORDS="~alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
 
 # Removed keywords awaiting >=dev-libs/libtasn1-0.2.10 keywords (bug #61944)
 # ~ia64
diff --git a/net-libs/gnutls/gnutls-1.2.3-r1.ebuild b/net-libs/gnutls/gnutls-1.2.3-r1.ebuild
index 39fa9b4dbb3c..4bcd848d8729 100644
--- a/net-libs/gnutls/gnutls-1.2.3-r1.ebuild
+++ b/net-libs/gnutls/gnutls-1.2.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-libs/gnutls/gnutls-1.2.3-r1.ebuild,v 1.1 2005/05/04 09:01:22 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-1.2.3-r1.ebuild,v 1.1.1.1 2005/11/30 10:02:50 chriswhite Exp $
 
 inherit eutils gnuconfig
 
@@ -14,7 +14,7 @@ LICENSE="LGPL-2.1 GPL-2"
 # GPL-2 for the gnutls-extras library and LGPL for the gnutls library.
 
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64 ~mips ~alpha ~ppc64 ~ia64"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 # Removed keywords awaiting >=dev-libs/libtasn1-0.2.10 keywords (bug #61944)
 #  ~ia64 ~hppa
diff --git a/net-libs/gnutls/gnutls-1.2.3.ebuild b/net-libs/gnutls/gnutls-1.2.3.ebuild
index a6a6fe4f543b..864da71fd9b4 100644
--- a/net-libs/gnutls/gnutls-1.2.3.ebuild
+++ b/net-libs/gnutls/gnutls-1.2.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-libs/gnutls/gnutls-1.2.3.ebuild,v 1.1 2005/04/28 22:14:53 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-1.2.3.ebuild,v 1.1.1.1 2005/11/30 10:02:51 chriswhite Exp $
 
 inherit eutils gnuconfig
 
@@ -14,19 +14,22 @@ LICENSE="LGPL-2.1 GPL-2"
 # GPL-2 for the gnutls-extras library and LGPL for the gnutls library.
 
 SLOT="0"
-KEYWORDS="x86 ~sparc ~ppc ~amd64 ~mips ~alpha ~ppc64"
+KEYWORDS="alpha amd64 arm hppa ~ia64 mips ppc ppc64 s390 sparc x86"
 
 # Removed keywords awaiting >=dev-libs/libtasn1-0.2.10 keywords (bug #61944)
-# ~ppc64  ~ia64 ~hppa
+#  ~ia64 ~hppa
 
 RDEPEND=">=dev-libs/libgcrypt-1.2.0
-	crypt? ( >=app-crypt/opencdk-0.5.5 )
+	>=app-crypt/opencdk-0.5.5
 	zlib? ( >=sys-libs/zlib-1.1 )
 	virtual/libc
 	>=dev-libs/lzo-1.0
-	>=dev-libs/libtasn1-0.2.10
+	>=dev-libs/libtasn1-0.2.11
 	dev-libs/libgpg-error"
 
+
+#	crypt? ( >=app-crypt/opencdk-0.5.5 )
+
 DEPEND="${RDEPEND}
 	sys-apps/gawk
 	sys-apps/grep
@@ -43,7 +46,7 @@ src_compile() {
 	gnuconfig_update
 
 	local myconf=""
-	use crypt || myconf="${myconf} --disable-extra-pki --disable-openpgp-authentication"
+	# use crypt || myconf="${myconf} --disable-extra-pki --disable-openpgp-authentication"
 
 	econf  \
 		`use_with zlib` \
@@ -76,10 +79,10 @@ pkg_postinst() {
 	ewarn
 	ewarn "What is required is a revdep-rebuild."
 	ewarn "To show you what is needed to rebuild"
-	ewarn "revdep-rebuild --soname-regexp libgnutls.so.1[0-1] -- -p"
+	ewarn 'revdep-rebuild --soname-regexp libgnutls.so.1[0-1] -- -p'
 	ewarn ""
 	ewarn "Then do:"
-	ewarn "revdep-rebuild --soname-regexp libgnutls.so.1[0-1]"
+	ewarn 'revdep-rebuild --soname-regexp libgnutls.so.1[0-1]'
 	einfo ""
 	einfo "Afterward just try:"
 	einfo "revdep-rebuild -- -p"
diff --git a/net-libs/gnutls/gnutls-1.2.4.ebuild b/net-libs/gnutls/gnutls-1.2.4.ebuild
index 1c7acbd8cb42..8fd25ea1c359 100644
--- a/net-libs/gnutls/gnutls-1.2.4.ebuild
+++ b/net-libs/gnutls/gnutls-1.2.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-libs/gnutls/gnutls-1.2.4.ebuild,v 1.1 2005/06/03 13:10:58 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-1.2.4.ebuild,v 1.1.1.1 2005/11/30 10:02:51 chriswhite Exp $
 
 inherit eutils gnuconfig
 
@@ -14,7 +14,7 @@ LICENSE="LGPL-2.1 GPL-2"
 # GPL-2 for the gnutls-extras library and LGPL for the gnutls library.
 
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64 ~mips ~alpha ~ppc64 ~ia64"
+KEYWORDS="alpha amd64 ~hppa ia64 ~mips ~ppc ~ppc-macos ppc64 ~s390 ~sparc ~x86"
 
 # Removed keywords awaiting >=dev-libs/libtasn1-0.2.10 keywords (bug #61944)
 #  ~ia64 ~hppa
@@ -61,7 +61,15 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR=${D} install || die
+	# OSX make doesn't handle -jx with x > 1 correctly here.
+	# Forcing it to be just one process, solves installation
+	# problems that arise here.  Fabian Groffen (2005-07-09)
+	if use ppc-macos; then
+		emake -j1 DESTDIR=${D} install || die
+	else
+		emake DESTDIR=${D} install || die
+	fi
+
 
 	dodoc AUTHORS COPYING COPYING.LIB ChangeLog NEWS \
 		README THANKS doc/TODO
diff --git a/net-libs/gnutls/gnutls-1.2.6.ebuild b/net-libs/gnutls/gnutls-1.2.6.ebuild
index f40ed5796654..a56410c46dbf 100644
--- a/net-libs/gnutls/gnutls-1.2.6.ebuild
+++ b/net-libs/gnutls/gnutls-1.2.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-libs/gnutls/gnutls-1.2.6.ebuild,v 1.1 2005/07/17 00:40:04 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-1.2.6.ebuild,v 1.1.1.1 2005/11/30 10:02:51 chriswhite Exp $
 
 inherit eutils gnuconfig
 
@@ -14,7 +14,7 @@ LICENSE="LGPL-2.1 GPL-2"
 # GPL-2 for the gnutls-extras library and LGPL for the gnutls library.
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sparc ~x86"
 
 # Removed keywords awaiting >=dev-libs/libtasn1-0.2.10 keywords (bug #61944)
 #  ~ia64 ~hppa
@@ -23,7 +23,7 @@ RDEPEND=">=dev-libs/libgcrypt-1.2.0
 	>=app-crypt/opencdk-0.5.5
 	zlib? ( >=sys-libs/zlib-1.1 )
 	virtual/libc
-	>=dev-libs/lzo-2.0
+	>=dev-libs/lzo-1.0
 	>=dev-libs/libtasn1-0.2.11
 	dev-libs/libgpg-error"
 
diff --git a/net-libs/gnutls/gnutls-1.2.9.ebuild b/net-libs/gnutls/gnutls-1.2.9.ebuild
index 39a22a517c8e..63834198d3f7 100644
--- a/net-libs/gnutls/gnutls-1.2.9.ebuild
+++ b/net-libs/gnutls/gnutls-1.2.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-libs/gnutls/gnutls-1.2.9.ebuild,v 1.1 2005/11/10 18:02:22 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-1.2.9.ebuild,v 1.1.1.1 2005/11/30 10:02:50 chriswhite Exp $
 
 inherit eutils gnuconfig
 
@@ -23,7 +23,7 @@ RDEPEND=">=dev-libs/libgcrypt-1.2.2
 	>=app-crypt/opencdk-0.5.5
 	zlib? ( >=sys-libs/zlib-1.1 )
 	virtual/libc
-	>=dev-libs/lzo-2.0
+	>=dev-libs/lzo-1.0
 	>=dev-libs/libtasn1-0.2.11
 	dev-libs/libgpg-error"
 
diff --git a/net-libs/gnutls/metadata.xml b/net-libs/gnutls/metadata.xml
index 76b9f6f406d5..7d6d787403ff 100644
--- a/net-libs/gnutls/metadata.xml
+++ b/net-libs/gnutls/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
+<herd>crypto</herd>
+<maintainer><email>crypto@gentoo.org</email></maintainer>
 <maintainer><email>liquidx@gentoo.org</email></maintainer>
 </pkgmetadata>
diff --git a/net-libs/iax/ChangeLog b/net-libs/iax/ChangeLog
index cb2071dacd05..695d9513c4c1 100644
--- a/net-libs/iax/ChangeLog
+++ b/net-libs/iax/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-libs/iax
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/iax/ChangeLog,v 1.1 2002/11/02 20:55:09 raker Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/iax/ChangeLog,v 1.1.1.1 2005/11/30 10:02:47 chriswhite Exp $
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> iax-0.2.2.ebuild:
+  Stable on ppc.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> iax-0.2.2.ebuild:
+  virtual/glibc -> virtual/libc
+
+  10 May 2004; David Holm <dholm@gentoo.org> iax-0.2.2.ebuild:
+  Added to ~ppc.
 
 *iax-0.2.2 (27 Jul 2002)
 
diff --git a/net-libs/iax/Manifest b/net-libs/iax/Manifest
index e69de29bb2d1..63a7b3414651 100644
--- a/net-libs/iax/Manifest
+++ b/net-libs/iax/Manifest
@@ -0,0 +1,3 @@
+MD5 538350bd8242c667c38f9b2abe874f33 ChangeLog 751
+MD5 b774c2dd4f126aff891f37b357f1cefc iax-0.2.2.ebuild 678
+MD5 e8c40a90bda3cfc1d7b3515d317a317d files/digest-iax-0.2.2 61
diff --git a/net-libs/iax/iax-0.2.2.ebuild b/net-libs/iax/iax-0.2.2.ebuild
index 120f0bea4eeb..239627671e44 100644
--- a/net-libs/iax/iax-0.2.2.ebuild
+++ b/net-libs/iax/iax-0.2.2.ebuild
@@ -1,22 +1,20 @@
-# Copyright 1999-2002 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-libs/iax/iax-0.2.2.ebuild,v 1.1 2002/11/02 20:55:09 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/iax/iax-0.2.2.ebuild,v 1.1.1.1 2005/11/30 10:02:47 chriswhite Exp $
 
 IUSE=""
 
 DESCRIPTION="IAX (Inter Asterisk eXchange) Library"
 HOMEPAGE="http://www.digium.com/"
 LICENSE="LGPL-2"
-DEPEND="virtual/glibc"
-RDEPEND="virtual/glibc"
+DEPEND="virtual/libc"
+RDEPEND="virtual/libc"
 SLOT="0"
 SRC_URI="http://www.digium.com/pub/libiax/${P}.tar.gz"
 
-S=${WORKDIR}/${P}
-
 D_PREFIX=/usr
 
-KEYWORDS="x86"
+KEYWORDS="x86 ppc"
 
 src_compile() {
 	./configure --prefix=${D_PREFIX} --enable-autoupdate
diff --git a/net-libs/jaimlib/ChangeLog b/net-libs/jaimlib/ChangeLog
index bb008dde0289..5fa5a17f427d 100644
--- a/net-libs/jaimlib/ChangeLog
+++ b/net-libs/jaimlib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/jaimlib
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/jaimlib/ChangeLog,v 1.1 2004/07/13 17:11:12 rizzo Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/jaimlib/ChangeLog,v 1.1.1.1 2005/11/30 10:02:54 chriswhite Exp $
+
+  07 Oct 2005; Matthew Kennedy <mkennedy@gentoo.org> jaimlib-0.5.ebuild:
+  Keywording ~amd64.
+
+  17 Jul 2004; David Holm <dholm@gentoo.org> jaimlib-0.5.ebuild:
+  Added to ~ppc.
 
 *jaimlib-0.5 (13 Jul 2004)
 
diff --git a/net-libs/jaimlib/Manifest b/net-libs/jaimlib/Manifest
index ff4ea83e5726..2b66d2060587 100644
--- a/net-libs/jaimlib/Manifest
+++ b/net-libs/jaimlib/Manifest
@@ -1,2 +1,14 @@
-MD5 f3c77b2fa03f71039d4d137af438c027 jaimlib-0.5.ebuild 811
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3a35ad22e1968f7c70718c88a0704243 ChangeLog 588
 MD5 566eaf03894842ad9228b6696d38a793 files/digest-jaimlib-0.5 66
+MD5 47f3111ef403a76a67d175de09f20184 jaimlib-0.5.ebuild 914
+MD5 a574ec2607edf5e80117d65415e01d3c metadata.xml 159
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDRpVTyiNZaEAZA+ARAqu3AJ4xjayeolmYGt0uG1oXHXvphvNxjACff7My
+e6ZdKhedHbgjlJFeDKQE1yk=
+=JhWg
+-----END PGP SIGNATURE-----
diff --git a/net-libs/jaimlib/jaimlib-0.5.ebuild b/net-libs/jaimlib/jaimlib-0.5.ebuild
index 66143456f19a..f94024c77555 100644
--- a/net-libs/jaimlib/jaimlib-0.5.ebuild
+++ b/net-libs/jaimlib/jaimlib-0.5.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-libs/jaimlib/jaimlib-0.5.ebuild,v 1.1 2004/07/13 17:11:12 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/jaimlib/jaimlib-0.5.ebuild,v 1.1.1.1 2005/11/30 10:02:54 chriswhite Exp $
 
 inherit java-pkg
 
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/jaimlib/jaimlibsrc-${PV}.tar.gz"
 HOMEPAGE="http://jaimlib.sourceforge.net"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc ~amd64"
 IUSE="jikes doc"
 
 DEPEND=">=virtual/jdk-1.4
diff --git a/net-libs/jaimlib/metadata.xml b/net-libs/jaimlib/metadata.xml
index c2074f4c2f33..3e2b4181f5be 100644
--- a/net-libs/jaimlib/metadata.xml
+++ b/net-libs/jaimlib/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>net-im</herd>
-<maintainer>
-    <email>rizzo@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/net-libs/libbo2k/ChangeLog b/net-libs/libbo2k/ChangeLog
index 3a3fe2dd71e4..44b15471cfa7 100644
--- a/net-libs/libbo2k/ChangeLog
+++ b/net-libs/libbo2k/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for net-libs/libbo2k
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libbo2k/ChangeLog,v 1.1 2003/09/11 12:27:15 lordvan Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libbo2k/ChangeLog,v 1.1.1.1 2005/11/30 10:02:52 chriswhite Exp $
 
-*libbo2k-0.1.5pre (11 Sep 2003)
+  14 Oct 2004; David Holm <dholm@gentoo.org> libbo2k-0.1.5_pre.ebuild:
+  Added to ~ppc.
+
+*libbo2k-0.1.5_pre (11 Sep 2003)
     11 Sep 2003; Thomas Raschbacher <lordvan@gentoo.org>: libbo2k-0.1.5_pre, ChangeLog, metadata.xml:
-    initial release
-\ No newline at end of file
+    initial release
diff --git a/net-libs/libbo2k/Manifest b/net-libs/libbo2k/Manifest
index 1cf290634ae7..39d8df8c62a5 100644
--- a/net-libs/libbo2k/Manifest
+++ b/net-libs/libbo2k/Manifest
@@ -1,8 +1,4 @@
-MD5 a4de292547a7d4fbe157a4ecb4ce2193 metadata.xml~ 821
-MD5 8d52421dca1f2d3fc106864446cea725 libbo2k-0.1.5pre.ebuild~ 5988
-MD5 125ee013081b112d56a1d15507d72ef2 ChangeLog~ 3674
-MD5 879e7f3b5699cbf2de4d63db899d6b4b libbo2k-0.1.5_pre.ebuild~ 1256
-MD5 e0232e029763f197fa1b67ecc49e100b ChangeLog 278
+MD5 b807bc3c1710d937bef5e230f72e95fd ChangeLog 448
+MD5 5b5721e82da897a330b7d3c97ee513fe libbo2k-0.1.5_pre.ebuild 643
 MD5 f76c9d12df67882110dd661562837477 metadata.xml 328
-MD5 666214447de9ea2320524787fb564ece libbo2k-0.1.5_pre.ebuild 471
 MD5 972d0eb4592433da959fd3ec4a28bf7c files/digest-libbo2k-0.1.5_pre 68
diff --git a/net-libs/libbo2k/libbo2k-0.1.5_pre.ebuild b/net-libs/libbo2k/libbo2k-0.1.5_pre.ebuild
index e6bd46f36f22..0044aa34a61a 100644
--- a/net-libs/libbo2k/libbo2k-0.1.5_pre.ebuild
+++ b/net-libs/libbo2k/libbo2k-0.1.5_pre.ebuild
@@ -1,6 +1,6 @@
-# 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-libs/libbo2k/libbo2k-0.1.5_pre.ebuild,v 1.1 2003/09/11 12:27:15 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libbo2k/libbo2k-0.1.5_pre.ebuild,v 1.1.1.1 2005/11/30 10:02:52 chriswhite Exp $
 MY_PV="0.1.5pre"
 MY_P="${PN}-${MY_PV}"
 DESCRIPTION="Linux BO2K communication library."
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.bo2k.com/"
 SRC_URI="mirror://sourceforge/bo2k/${MY_P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 IUSE=""
 DEPEND=""
 #RDEPEND=""
diff --git a/net-libs/libbt/ChangeLog b/net-libs/libbt/ChangeLog
index 1a77c26c3fbb..fc0ab7103cc5 100644
--- a/net-libs/libbt/ChangeLog
+++ b/net-libs/libbt/ChangeLog
@@ -1,9 +1,37 @@
 # ChangeLog for net-libs/libbt
-# Copyright 1999-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libbt/ChangeLog,v 1.1 2004/04/11 01:09:28 squinky86 Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libbt/ChangeLog,v 1.1.1.1 2005/11/30 10:02:49 chriswhite Exp $
+
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+*libbt-1.04 (30 May 2005)
+
+  30 May 2005; Karol Wojtaszek <sekretarz@gentoo.org> +libbt-1.04.ebuild:
+  Version bump, bug #94300. ~amd64 keyworded
+
+  13 Aug 2004; Jon Hood <squinky86@gentoo.org> -libbt-1.01.ebuild,
+  libbt-1.03.ebuild:
+  Stable on x86, remove old version.
+
+  08 Aug 2004; Tom Martin <slarti@gentoo.org> libbt-1.01.ebuild,
+  libbt-1.03.ebuild:
+  Typo in DESCRIPTION: impementation -> implementation. Bug 59717.
+
+*libbt-1.03 (15 Jul 2004)
+
+  15 Jul 2004; Jon Hood <squinky86@gentoo.org> +files/libbt-headerfix.patch,
+  +libbt-1.03.ebuild:
+  version bump, closes #52484
+
+  15 Jun 2004; Jon Hood <squinky86@gentoo.org> libbt-1.01.ebuild:
+  stable on x86
+
+  11 Apr 2004; David Holm <dholm@gentoo.org> libbt-1.01.ebuild:
+  Added to ~ppc.
 
 *libbt-1.01 (10 Apr 2004)
 
   10 Apr 2004; Jon Hood <squinky86@gentoo.org> libbt-1.01.ebuild:
   Initial ebuild for libbt.
-  Thanks to Jos� Romildo Malaquias for this ebuild
+  Thanks to José Romildo Malaquias for this ebuild
diff --git a/net-libs/libbt/Manifest b/net-libs/libbt/Manifest
index f84e463b0dbf..3b072a72b751 100644
--- a/net-libs/libbt/Manifest
+++ b/net-libs/libbt/Manifest
@@ -1,2 +1,17 @@
-MD5 eb20c20810f6247a303d9806aae5203d libbt-1.01.ebuild 716
-MD5 3972dbce0a1e44a9d2222c0303465795 files/digest-libbt-1.01 62
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 36586c4014caa3ef1d15e2fe35fa2134 libbt-1.04.ebuild 833
+MD5 39f4ee27c1a15e860b2e328dd53bd6cc libbt-1.03.ebuild 908
+MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
+MD5 7a91fc7814a68a0499e6aa51df927690 ChangeLog 1234
+MD5 7e115d3287520d67751b36e03744a51d files/digest-libbt-1.03 62
+MD5 5565843b8d8ecd0caa963e6509efef05 files/libbt-headerfix.patch 1485
+MD5 f1acd2b6045b1bc76d993f0337e6e199 files/digest-libbt-1.04 62
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDK1TfLLFUmVNQ7rkRAvdkAKDCpa73IYuVMYCwntesK++iFX50hACdEAq4
+bKKd7lwgVO98B8qZhNaCdCw=
+=by5S
+-----END PGP SIGNATURE-----
diff --git a/net-libs/libbt/libbt-1.03.ebuild b/net-libs/libbt/libbt-1.03.ebuild
index 1583f901eeee..c192e74f14a0 100644
--- a/net-libs/libbt/libbt-1.03.ebuild
+++ b/net-libs/libbt/libbt-1.03.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libbt/libbt-1.03.ebuild,v 1.1 2004/07/15 08:20:33 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libbt/libbt-1.03.ebuild,v 1.1.1.1 2005/11/30 10:02:49 chriswhite Exp $
 
 inherit eutils
 
-DESCRIPTION="libBT is an impementation of the BitTorrent core protocols in C"
+DESCRIPTION="libBT is an implementation of the BitTorrent core protocols in C"
 HOMEPAGE="http://libbt.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 RESTRICT="nomirror"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 
 IUSE=""
 
diff --git a/net-libs/libbt/libbt-1.04.ebuild b/net-libs/libbt/libbt-1.04.ebuild
index f699a15c1304..2d4227bedec8 100644
--- a/net-libs/libbt/libbt-1.04.ebuild
+++ b/net-libs/libbt/libbt-1.04.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-libs/libbt/libbt-1.04.ebuild,v 1.1 2005/05/29 22:13:16 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libbt/libbt-1.04.ebuild,v 1.1.1.1 2005/11/30 10:02:49 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-libs/libbt/metadata.xml b/net-libs/libbt/metadata.xml
index a6f4b1dc32c6..aa0f3664825f 100644
--- a/net-libs/libbt/metadata.xml
+++ b/net-libs/libbt/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>net-p2p</herd>
-<maintainer>
- <email>squinky86@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/net-libs/libcapsinetwork/ChangeLog b/net-libs/libcapsinetwork/ChangeLog
index bda3d25e4511..e64e7be52af6 100644
--- a/net-libs/libcapsinetwork/ChangeLog
+++ b/net-libs/libcapsinetwork/ChangeLog
@@ -1,9 +1,37 @@
-# ChangeLog for net-libs/libcapsinetwork 
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libcapsinetwork/ChangeLog,v 1.1 2002/08/01 14:54:19 bass Exp $
+# ChangeLog for net-libs/libcapsinetwork
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libcapsinetwork/ChangeLog,v 1.1.1.1 2005/11/30 10:03:00 chriswhite Exp $
 
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+*libcapsinetwork-0.3.0 (19 Jul 2004)
+
+  19 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  +libcapsinetwork-0.3.0.ebuild:
+  version bump
+
+*libcapsinetwork-0.2.5 (29 Jan 2004)
+
+  29 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  libcapsinetwork-0.2.5.ebuild:
+  version bump
+
+*libcapsinetwork-0.2.3 (06 Jan 2003)
+
+  17 Feb 2003; Martin Holzer <mholzer@gentoo.org> libcapsinetwork-0.2.3.ebuild:
+  Didn't want emake, changed to make. Closes #15792.
+
+  06 Jan 2003; Hannes Mehnert <hannes@gentoo.org> libcapsinetwork-0.2.3.ebuild:
+  version bump, thanks to cap@capsi.com (Rob Kaper) (bug #9872)
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *libcapsinetwork-0.1.1 (1 Aug 2002)
 
-  1 Aug 2002; J. Alberto Su�rez L�pez <bass@gentoo.org> libcapsinetwork-0.1.1.ebuild
+  1 Aug 2002; J. Alberto Suárez López <bass@gentoo.org> libcapsinetwork-0.1.1.ebuild
   First realse 
 
diff --git a/net-libs/libcapsinetwork/Manifest b/net-libs/libcapsinetwork/Manifest
index e69de29bb2d1..01c05ab1298b 100644
--- a/net-libs/libcapsinetwork/Manifest
+++ b/net-libs/libcapsinetwork/Manifest
@@ -0,0 +1,5 @@
+MD5 dc9040b2ecc6a3f5399b61fc764b5323 ChangeLog 1229
+MD5 ee045084d57a10b2e0020f54759e0291 libcapsinetwork-0.2.5.ebuild 694
+MD5 c3a1ece51c17e41a2e8108b962eee2c3 libcapsinetwork-0.3.0.ebuild 695
+MD5 833276a2ec2be65c36622b16d8781ec6 files/digest-libcapsinetwork-0.3.0 74
+MD5 fd9c330798219f76fb2190095818f2a0 files/digest-libcapsinetwork-0.2.5 74
diff --git a/net-libs/libcapsinetwork/libcapsinetwork-0.2.5.ebuild b/net-libs/libcapsinetwork/libcapsinetwork-0.2.5.ebuild
index d2544d7825f1..c78cb046a860 100644
--- a/net-libs/libcapsinetwork/libcapsinetwork-0.2.5.ebuild
+++ b/net-libs/libcapsinetwork/libcapsinetwork-0.2.5.ebuild
@@ -1,20 +1,20 @@
-# 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-libs/libcapsinetwork/libcapsinetwork-0.2.5.ebuild,v 1.1 2004/01/29 22:15:09 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libcapsinetwork/libcapsinetwork-0.2.5.ebuild,v 1.1.1.1 2005/11/30 10:03:00 chriswhite Exp $
 
 inherit flag-o-matic
-filter-flags -fomit-frame-pointer
 
 DESCRIPTION="C++ network library to allow fast development of server daemon processes"
 HOMEPAGE="http://unixcode.org/libcapsinetwork/"
 SRC_URI="http://unixcode.org/downloads/${PN}/${P}.tar.bz2"
 
-KEYWORDS="~x86 ~ppc ~sparc"
 LICENSE="LGPL-2.1"
-SLOT="1"
+SLOT="0"
+KEYWORDS="x86 ppc sparc"
 IUSE=""
 
 src_compile() {
+	filter-flags -fomit-frame-pointer
 	econf || die
 	emake -j1 || die "emake failed"
 }
diff --git a/net-libs/libcapsinetwork/libcapsinetwork-0.3.0.ebuild b/net-libs/libcapsinetwork/libcapsinetwork-0.3.0.ebuild
index 7f4d770cd059..f97e64ff7616 100644
--- a/net-libs/libcapsinetwork/libcapsinetwork-0.3.0.ebuild
+++ b/net-libs/libcapsinetwork/libcapsinetwork-0.3.0.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-libs/libcapsinetwork/libcapsinetwork-0.3.0.ebuild,v 1.1 2004/07/19 19:14:18 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libcapsinetwork/libcapsinetwork-0.3.0.ebuild,v 1.1.1.1 2005/11/30 10:03:00 chriswhite Exp $
 
 inherit flag-o-matic
 
diff --git a/net-libs/libeXosip/ChangeLog b/net-libs/libeXosip/ChangeLog
index e8478f021681..4cc376747b51 100644
--- a/net-libs/libeXosip/ChangeLog
+++ b/net-libs/libeXosip/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for net-libs/libeXosip
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libeXosip/ChangeLog,v 1.1 2005/08/21 04:32:53 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libeXosip/ChangeLog,v 1.1.1.1 2005/11/30 10:03:03 chriswhite Exp $
 
 *libeXosip-1.9.1_pre16 (21 Aug 2005)
 *libeXosip-0.9.0 (21 Aug 2005)
diff --git a/net-libs/libeXosip/Manifest b/net-libs/libeXosip/Manifest
index 16c926cdd062..b1ba080a157d 100644
--- a/net-libs/libeXosip/Manifest
+++ b/net-libs/libeXosip/Manifest
@@ -1,6 +1,16 @@
-MD5 acb75871ab3fa8345332bbb893619ce6 libeXosip-0.9.0.ebuild 641
-MD5 71d9cd81caff5091ce09d1d6015b47b8 libeXosip-1.9.1_pre16.ebuild 660
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f3c1617c6d7e8ce6b8bc6d50375cddc7 libeXosip-0.9.0.ebuild 749
+MD5 2cd92225976906fa9c01caa1dd3d754b libeXosip-1.9.1_pre16.ebuild 774
 MD5 c1a6093f6bf43cae3b4360e3620d9992 metadata.xml 252
-MD5 d41d8cd98f00b204e9800998ecf8427e ChangeLog 0
-MD5 10598d0fdff2285a0bbf5bd2d52332a2 files/digest-libeXosip-0.9.0 67
+MD5 09a9ad07fbd1889c7a6dc8908a564e2f ChangeLog 478
 MD5 1bbf2403bbe9a6b2551644d20391d32f files/digest-libeXosip-1.9.1_pre16 74
+MD5 10598d0fdff2285a0bbf5bd2d52332a2 files/digest-libeXosip-0.9.0 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDDG9qmdTrptrqvGERAo5pAJ4poPfU/pywdxMWXEqxM93E8AxPFQCglrvV
+ggx5YxkymnVnKTpm5KQczKE=
+=qJgo
+-----END PGP SIGNATURE-----
diff --git a/net-libs/libeXosip/libeXosip-0.9.0.ebuild b/net-libs/libeXosip/libeXosip-0.9.0.ebuild
index 9fbf576a2aac..00a8eb9dc29c 100644
--- a/net-libs/libeXosip/libeXosip-0.9.0.ebuild
+++ b/net-libs/libeXosip/libeXosip-0.9.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-libs/libeXosip/libeXosip-0.9.0.ebuild,v 1.1 2005/08/21 04:32:53 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libeXosip/libeXosip-0.9.0.ebuild,v 1.1.1.1 2005/11/30 10:03:03 chriswhite Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://savannah.nongnu.org/download/exosip/${P}.tar.gz"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
 LICENSE="GPL-2"
-
+IUSE=""
 DEPEND=">=net-libs/libosip-2.2.0"
 
 src_compile() {
diff --git a/net-libs/libeXosip/libeXosip-1.9.1_pre16.ebuild b/net-libs/libeXosip/libeXosip-1.9.1_pre16.ebuild
index 7fcd86e7443f..619622df212f 100644
--- a/net-libs/libeXosip/libeXosip-1.9.1_pre16.ebuild
+++ b/net-libs/libeXosip/libeXosip-1.9.1_pre16.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-libs/libeXosip/libeXosip-1.9.1_pre16.ebuild,v 1.1 2005/08/21 04:32:53 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libeXosip/libeXosip-1.9.1_pre16.ebuild,v 1.1.1.1 2005/11/30 10:03:03 chriswhite Exp $
 
 MY_P=${PN}2-${PV/_/-}
 DESCRIPTION="eXosip is a library that hides the complexity of using the SIP protocol for mutlimedia session establishement."
@@ -10,7 +10,7 @@ SRC_URI="http://www.antisip.com/download/${MY_P}.tar.gz"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
 LICENSE="GPL-2"
-
+IUSE=""
 DEPEND=">=net-libs/libosip-2.2.0"
 S=${WORKDIR}/${MY_P}
 
diff --git a/net-libs/libesmtp/ChangeLog b/net-libs/libesmtp/ChangeLog
index ad796511df23..b0f6eeb6e3a2 100644
--- a/net-libs/libesmtp/ChangeLog
+++ b/net-libs/libesmtp/ChangeLog
@@ -1,6 +1,89 @@
 # ChangeLog for net-libs/libesmtp
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libesmtp/ChangeLog,v 1.1 2002/02/01 21:53:34 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libesmtp/ChangeLog,v 1.1.1.1 2005/11/30 10:02:48 chriswhite Exp $
+
+  16 May 2005; Andrej Kacian <ticho@gentoo.org> libesmtp-0.8.12.ebuild,
+  libesmtp-1.0-r1.ebuild, libesmtp-1.0.1.ebuild, libesmtp-1.0.3.ebuild:
+  Inherit toolchain-funcs.eclass instead of gcc.eclass. Bug #92745.
+
+  08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> libesmtp-1.0.3.ebuild:
+  Stable on ppc.
+
+  01 Apr 2005; Aron Griffis <agriffis@gentoo.org> libesmtp-1.0.3.ebuild:
+  stable on ia64
+
+  17 Mar 2005; Aron Griffis <agriffis@gentoo.org> libesmtp-1.0.3.ebuild:
+  Add ~ia64 for mail-client/muttng
+
+  22 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> libesmtp-1.0.3.ebuild:
+  Stable on alpha.
+
+  17 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> libesmtp-1.0.3.ebuild:
+  Stable on sparc
+
+  14 Jan 2005; Andrej Kacian <ticho@gentoo.org> libesmtp-1.0.1.ebuild,
+  libesmtp-1.0.3.ebuild:
+  Stable on x86.
+
+*libesmtp-1.0.3 (03 Sep 2004)
+
+  03 Sep 2004; Andrej Kacian <ticho@gentoo.org> metadata.xml,
+  +libesmtp-1.0.3.ebuild:
+  Version bump. Reported by Torsten Stets <mai98bmg@studserv.uni-leipzig.de>,
+  closing #57194. Use ${PN} in SRC_URI and HOMEPAGE for all libesmtp ebuilds.
+
+  13 Apr 2004; Danny van Dyk <kugelfang@gentoo.org> libesmtp-1.0.1.ebuild:
+  marked ~amd64
+
+  06 Feb 2004; Aron Griffis <agriffis@gentoo.org> libesmtp-1.0-r1.ebuild:
+  stable on alpha
+
+  13 Jan 2004; <gustavoz@gentoo.org> libesmtp-1.0-r1.ebuild:
+  stable on sparc
+
+*libesmtp-1.0.1 (10 Nov 2003)
+
+  10 Nov 2003; foser <foser@gentoo.org> libesmtp-1.0.1.ebuild :
+  New version, some minor cleanups
+  Added package to gnome herd for now
+
+  17 Sep 2003; Daniel Ahlberg <aliz@gentoo.org> libesmtp-1.0-r1.ebuild :
+  Added patch to make libesmtp compile with OpenSSL 0.9.7. Closing #21914.
+  Also clean out obsolete ebuilds.
+
+  18 Aug 2003; Aron Griffis <agriffis@gentoo.org> libesmtp-1.0-r1.ebuild:
+  Add ~alpha to KEYWORDS
+
+  08 Aug 2003; Daniel Ahlberg <aliz@gentoo.org> libesmtp-1.0-r1.ebuild :
+  Possible fix for compiling on gcc 3.3.
+
+*libesmtp-1.0-r1 (25 May 2003)
+
+  25 May 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  New ebuild that can be built with gcc-2.95.3. Contribution by Kevin L. Ford <klford@c-bog.com> 
+  in #20199.
+
+*libesmtp-1.0 (09 Mar 2003)
+
+  09 Mar 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*libesmtp-0.8.12 (24 Apr 2002)
+ 
+  20 Oct 2002; Calum Selkirk <cselkirk@gentoo.org> libesmtp-0.8.12.ebuild :
+
+  Added ppc to KEYWORDS.
+
+  24 Apr 2002; Spider <spider@gentoo.org> libesmtp-0.8.12.ebuild:
+  Update again : )
+
+*libesmtp-0.8.9 (21 Apr 2002)
+
+  21 Apr 2002; Ryan Phillips <rphillips@gentoo.org> libesmtp-0.8.9.ebuild
+
+  Copied 0.8.6 ebuild to 0.8.9.  Fixes (#1961)
 
 *libesmtp-0.8.6 (1 Feb 2002)
 
diff --git a/net-libs/libesmtp/Manifest b/net-libs/libesmtp/Manifest
index 6ca1b681585a..c7818ed14734 100644
--- a/net-libs/libesmtp/Manifest
+++ b/net-libs/libesmtp/Manifest
@@ -1,7 +1,21 @@
-MD5 b8d25717087485fc6ac3c33ba4c1d2af ChangeLog 1229
-MD5 9b62da9461e0417514f38309c9950b5e libesmtp-0.8.12.ebuild 957
-MD5 a80a8f0189485f1d6c2d2ca8f316a2b4 libesmtp-1.0.ebuild 953
-MD5 4936649e43646d658a176dfef7dd0ac7 libesmtp-1.0-r1.ebuild 1168
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 fe7313c2c7c21298b458bf779ae52a66 libesmtp-1.0.1.ebuild 1316
+MD5 ac1ca5b43d39d976cf1a621ee545b8a6 libesmtp-1.0-r1.ebuild 1374
+MD5 7c19521148281371ea11a4de16b287c1 ChangeLog 3339
+MD5 bcb0db567cce5ffbbe6fb7b787fc4364 libesmtp-1.0.3.ebuild 1359
+MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 7065f7b7252a510866887d53d1b8b684 libesmtp-0.8.12.ebuild 923
 MD5 395e602b515d970eab3a9d7ef8a2016f files/digest-libesmtp-0.8.12 68
-MD5 b6be4562678d38b5d76400ddc254e37a files/digest-libesmtp-1.0 65
+MD5 d3159044f52697e5328eed2b789f0f8d files/digest-libesmtp-1.0.1 67
+MD5 e7fb7627dfe48ba908ddc22564eead57 files/digest-libesmtp-1.0.3 69
 MD5 b6be4562678d38b5d76400ddc254e37a files/digest-libesmtp-1.0-r1 65
+MD5 43822a1b725899b2ad3fbc20f58ee840 files/libesmtp-1.0-openssl.patch 405
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCiGzCQlM6RnzZP+IRApAcAJ4pXxm/GEJiWWOCjYvzonfcOCAC7gCgslrl
+A+t5U7HKKjT3UX4Adukza/Q=
+=nXUc
+-----END PGP SIGNATURE-----
diff --git a/net-libs/libesmtp/libesmtp-0.8.12.ebuild b/net-libs/libesmtp/libesmtp-0.8.12.ebuild
index a2d47224a295..f50bacff0096 100644
--- a/net-libs/libesmtp/libesmtp-0.8.12.ebuild
+++ b/net-libs/libesmtp/libesmtp-0.8.12.ebuild
@@ -1,21 +1,23 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Bruce A. Locke <blocke@shivan.org>
-# /space/gentoo/cvsroot/gentoo-x86/net-libs/libesmtp/libesmtp-0.8.12.ebuild,v 1.1 2001/12/20 15:35:51 chouser Exp
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libesmtp/libesmtp-0.8.12.ebuild,v 1.1.1.1 2005/11/30 10:02:48 chriswhite Exp $
+
+IUSE="ssl"
 
-A=${P}.tar.bz2
-S=${WORKDIR}/${P}
 DESCRIPTION="libESMTP is a library that implements the client side of the SMTP protocol"
-SRC_URI="http://www.stafford.uklinux.net/libesmtp/${A}"
-HOMEPAGE="http://www.stafford.uklinux.net/libesmtp/index.html"
+SRC_URI="http://www.stafford.uklinux.net/${PN}/${P}.tar.bz2"
+HOMEPAGE="http://www.stafford.uklinux.net/libesmtp/"
 
-DEPEND="virtual/glibc
-	>=sys-devel/libtool-1.3.5-r2
+DEPEND=">=sys-devel/libtool-1.3.5-r2
 	ssl? ( >=dev-libs/openssl-0.9.6b )"
 
+SLOT="0"
+LICENSE="LGPL-2.1 GPL-2"
+KEYWORDS="x86 sparc ppc"
+
 src_compile() {
 	local myconf
-	use ssl || myconf="$myconf --without-openssl"
+	use ssl || myconf="${myconf} --without-openssl"
 
 	./configure --prefix=/usr ${myconf} || die "configure failed"
 	emake || die "emake failed"
@@ -23,6 +25,6 @@ src_compile() {
 
 src_install () {
 	make prefix=${D}/usr install || die "make install failed"
-	dodoc AUTHORS COPYING COPYING.GPL INSTALL ChangeLog NEWS Notes README TODO doc/api.xml
+	dodoc AUTHORS COPYING COPYING.GPL INSTALL ChangeLog NEWS Notes README TODO
+	dohtml doc/api.xml
 }
-
diff --git a/net-libs/libesmtp/libesmtp-1.0-r1.ebuild b/net-libs/libesmtp/libesmtp-1.0-r1.ebuild
index fada2d8101e0..a5840df225fc 100644
--- a/net-libs/libesmtp/libesmtp-1.0-r1.ebuild
+++ b/net-libs/libesmtp/libesmtp-1.0-r1.ebuild
@@ -1,25 +1,30 @@
-# 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-libs/libesmtp/libesmtp-1.0-r1.ebuild,v 1.1 2003/05/25 11:30:15 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libesmtp/libesmtp-1.0-r1.ebuild,v 1.1.1.1 2005/11/30 10:02:48 chriswhite Exp $
 
-
-inherit gcc eutils gnuconfig libtool
+inherit toolchain-funcs eutils gnuconfig libtool
 
 IUSE="ssl"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="libESMTP is a library that implements the client side of the SMTP protocol"
-SRC_URI="http://www.stafford.uklinux.net/libesmtp/${P}.tar.bz2"
+SRC_URI="http://www.stafford.uklinux.net/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://www.stafford.uklinux.net/libesmtp/"
 
 DEPEND=">=sys-devel/libtool-1.4.1
-	ssl? ( >=dev-libs/openssl-0.9.6b )"
+	ssl? ( >=dev-libs/openssl-0.9.6b )
+	>=sys-apps/sed-4"
 
 RDEPEND=""
 
 SLOT="0"
 LICENSE="LGPL-2.1 GPL-2"
-KEYWORDS="~x86 ~sparc ~ppc"
+KEYWORDS="x86 sparc ppc alpha"
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+
+	epatch ${FILESDIR}/${P}-openssl.patch
+}
 
 src_compile() {
 	gnuconfig_update
@@ -27,11 +32,11 @@ src_compile() {
 	elibtoolize
 
 	local myconf
-	
+
 	use ssl || myconf="${myconf} --without-openssl"
-	
+
 	if [ "`gcc-major-version`" -eq "2"  ]; then
-	    myconf="${myconf} --disable-isoc"
+		myconf="${myconf} --disable-isoc"
 	fi
 
 	./configure --prefix=/usr \
@@ -39,6 +44,10 @@ src_compile() {
 		--enable-threads \
 		${myconf} || die "configure failed"
 
+	if [ "`gcc-major-version`" -eq "3" ] && [ "`gcc-minor-version`" -ge "3" ]; then
+		sed -i "s:-Wsign-promo::g" Makefile
+	fi
+
 	emake || die "emake failed"
 }
 
@@ -47,4 +56,3 @@ src_install () {
 	dodoc AUTHORS COPYING COPYING.GPL INSTALL ChangeLog NEWS Notes README TODO
 	dohtml doc/api.xml
 }
-
diff --git a/net-libs/libesmtp/libesmtp-1.0.1.ebuild b/net-libs/libesmtp/libesmtp-1.0.1.ebuild
index 005a3a6b26c0..fbd78f4dea91 100644
--- a/net-libs/libesmtp/libesmtp-1.0.1.ebuild
+++ b/net-libs/libesmtp/libesmtp-1.0.1.ebuild
@@ -1,11 +1,11 @@
-# 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-libs/libesmtp/libesmtp-1.0.1.ebuild,v 1.1 2003/11/10 15:28:42 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libesmtp/libesmtp-1.0.1.ebuild,v 1.1.1.1 2005/11/30 10:02:48 chriswhite Exp $
 
-inherit gcc eutils gnuconfig libtool
+inherit toolchain-funcs eutils gnuconfig libtool
 
 DESCRIPTION="libESMTP is a library that implements the client side of the SMTP protocol"
-SRC_URI="http://www.stafford.uklinux.net/libesmtp/${P}.tar.bz2"
+SRC_URI="http://www.stafford.uklinux.net/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://www.stafford.uklinux.net/libesmtp/"
 LICENSE="LGPL-2.1 GPL-2"
 
@@ -17,7 +17,7 @@ DEPEND="${RDEPEND}
 
 IUSE="ssl"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~alpha"
+KEYWORDS="x86 ~sparc ~ppc ~alpha ~amd64"
 
 src_compile() {
 	gnuconfig_update
@@ -52,4 +52,3 @@ src_install () {
 	dohtml doc/api.xml
 
 }
-
diff --git a/net-libs/libesmtp/libesmtp-1.0.3.ebuild b/net-libs/libesmtp/libesmtp-1.0.3.ebuild
index a77da7b98783..f0efdc2c8b5c 100644
--- a/net-libs/libesmtp/libesmtp-1.0.3.ebuild
+++ b/net-libs/libesmtp/libesmtp-1.0.3.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-libs/libesmtp/libesmtp-1.0.3.ebuild,v 1.1 2004/09/03 01:14:59 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libesmtp/libesmtp-1.0.3.ebuild,v 1.1.1.1 2005/11/30 10:02:48 chriswhite Exp $
 
-inherit gcc eutils gnuconfig libtool
+inherit toolchain-funcs eutils gnuconfig libtool
 
 MY_P="${P}r1"
 DESCRIPTION="libESMTP is a library that implements the client side of the SMTP protocol"
 SRC_URI="http://www.stafford.uklinux.net/${PN}/${MY_P}.tar.bz2"
-HOMEPAGE="http://www.stafford.uklinux.net/${PN}/"
+HOMEPAGE="http://www.stafford.uklinux.net/libesmtp/"
 LICENSE="LGPL-2.1 GPL-2"
 
 RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6b )"
@@ -18,7 +18,7 @@ DEPEND="${RDEPEND}
 
 IUSE="ssl"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~alpha ~amd64"
+KEYWORDS="alpha ~amd64 ia64 ppc sparc x86"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/net-libs/libesmtp/metadata.xml b/net-libs/libesmtp/metadata.xml
index da6fd63d0085..51f94e3fbe0e 100644
--- a/net-libs/libesmtp/metadata.xml
+++ b/net-libs/libesmtp/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>gnome</herd>
+<herd>net-mail</herd>
 </pkgmetadata>
diff --git a/net-libs/libetpan/ChangeLog b/net-libs/libetpan/ChangeLog
index 2aec781b5db9..112a1db3e34a 100644
--- a/net-libs/libetpan/ChangeLog
+++ b/net-libs/libetpan/ChangeLog
@@ -1,6 +1,45 @@
 # ChangeLog for net-libs/libetpan
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libetpan/ChangeLog,v 1.1 2005/06/23 10:33:37 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libetpan/ChangeLog,v 1.1.1.1 2005/11/30 10:02:52 chriswhite Exp $
+
+*libetpan-0.40 (08 Nov 2005)
+
+  08 Nov 2005; Andrej Kacian <ticho@gentoo.org> +libetpan-0.40.ebuild:
+  Version bump.
+
+  24 Oct 2005; Andrej Kacian <ticho@gentoo.org> libetpan-0.39.ebuild:
+  Stable on x86.
+
+*libetpan-0.39 (17 Sep 2005)
+
+  17 Sep 2005; Andrej Kacian <ticho@gentoo.org> +libetpan-0.39.ebuild:
+  Version bump. Added sasl and gnutls USE flags.
+
+  23 Aug 2005; Andrej Kacian <ticho@gentoo.org> -libetpan-0.36.ebuild,
+  -libetpan-0.37.ebuild, libetpan-0.38.ebuild:
+  Stable on x86. Removed previous ebuilds.
+
+  14 Aug 2005; Jason Wever <weeve@gentoo.org> libetpan-0.38.ebuild:
+  Added ~sparc keyword, resolves bug #102313.
+
+  13 Aug 2005; Marius Mauch <genone@gentoo.org> libetpan-0.38.ebuild:
+  added ~amd64 keyword
+
+*libetpan-0.38 (20 Jul 2005)
+
+  20 Jul 2005; Andrej Kacian <ticho@gentoo.org> +libetpan-0.38.ebuild:
+  Version bump.
+
+  05 Jul 2005; David Holm <dholm@gentoo.org> libetpan-0.37.ebuild:
+  Added to ~ppc.
+
+*libetpan-0.37 (04 Jul 2005)
+
+  04 Jul 2005; Andrej Kacian <ticho@gentoo.org> +libetpan-0.37.ebuild:
+  Version bump.
+
+  01 Jul 2005; Andrej Kacian <ticho@gentoo.org> libetpan-0.36.ebuild:
+  Changed DESCRIPTION.
 
 *libetpan-0.36 (23 Jun 2005)
 
diff --git a/net-libs/libetpan/Manifest b/net-libs/libetpan/Manifest
index 08dadf0a8118..44f0d7050523 100644
--- a/net-libs/libetpan/Manifest
+++ b/net-libs/libetpan/Manifest
@@ -1,4 +1,18 @@
-MD5 47b9b635ca75d137213a443205003a32 libetpan-0.36.ebuild 674
-MD5 c49eb4dfdf62bd08f50dfd8792ecd5ef ChangeLog 118
-MD5 5e0dc2567872600024ef5b50b4793f9a metadata.xml 424
-MD5 b97f7371a550f937a4b82ef30079c155 files/digest-libetpan-0.36 66
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 cafc842f290cd09a493b5b0b936b6e03 ChangeLog 1487
+MD5 364e68999c2cd29fbe9da07eb967855b files/digest-libetpan-0.38 66
+MD5 46fdbe475507d8131713621e1ab81620 files/digest-libetpan-0.39 66
+MD5 f266f880385c50a0c68cd4d6d196cb2a files/digest-libetpan-0.40 66
+MD5 3c26af9390d1cdbe31ff6a7d7aeac5c9 libetpan-0.38.ebuild 822
+MD5 3cb0a6298271495cc2f418c33ab81498 libetpan-0.39.ebuild 953
+MD5 51cc8667f71f6382db4e084f572e3630 libetpan-0.40.ebuild 954
+MD5 509fe3ad1d5f4dfbeab7ff814984a262 metadata.xml 612
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDcHyIQlM6RnzZP+IRArVLAJ91FtP9ouq9AfoKuuDEZhnpTEpPMACfZryd
+h1XVU2Ji66jOQ4Mn2+YGzhs=
+=Zsoy
+-----END PGP SIGNATURE-----
diff --git a/net-libs/libetpan/libetpan-0.38.ebuild b/net-libs/libetpan/libetpan-0.38.ebuild
index 90c1d764c7ad..331037c60efc 100644
--- a/net-libs/libetpan/libetpan-0.38.ebuild
+++ b/net-libs/libetpan/libetpan-0.38.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-libs/libetpan/libetpan-0.38.ebuild,v 1.1 2005/07/20 11:45:53 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libetpan/libetpan-0.38.ebuild,v 1.1.1.1 2005/11/30 10:02:52 chriswhite Exp $
 
 DESCRIPTION="A portable, efficient middleware for different kinds of mail access."
 HOMEPAGE="http://libetpan.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 IUSE="berkdb debug ssl"
 
 DEPEND="virtual/libc
diff --git a/net-libs/libetpan/libetpan-0.39.ebuild b/net-libs/libetpan/libetpan-0.39.ebuild
index bc0efad1217e..86fe78d268bd 100644
--- a/net-libs/libetpan/libetpan-0.39.ebuild
+++ b/net-libs/libetpan/libetpan-0.39.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-libs/libetpan/libetpan-0.39.ebuild,v 1.1 2005/09/17 13:08:50 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libetpan/libetpan-0.39.ebuild,v 1.1.1.1 2005/11/30 10:02:52 chriswhite Exp $
 
 DESCRIPTION="A portable, efficient middleware for different kinds of mail access."
 HOMEPAGE="http://libetpan.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 IUSE="berkdb debug gnutls sasl ssl"
 
 DEPEND="virtual/libc
diff --git a/net-libs/libetpan/libetpan-0.40.ebuild b/net-libs/libetpan/libetpan-0.40.ebuild
index dc7c7c511e80..82a21ed6efd8 100644
--- a/net-libs/libetpan/libetpan-0.40.ebuild
+++ b/net-libs/libetpan/libetpan-0.40.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-libs/libetpan/libetpan-0.40.ebuild,v 1.1 2005/11/08 10:22:50 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libetpan/libetpan-0.40.ebuild,v 1.1.1.1 2005/11/30 10:02:52 chriswhite Exp $
 
 DESCRIPTION="A portable, efficient middleware for different kinds of mail access."
 HOMEPAGE="http://libetpan.sourceforge.net"
diff --git a/net-libs/libetpan/metadata.xml b/net-libs/libetpan/metadata.xml
index 9f1329b73205..4d69a0adc65f 100644
--- a/net-libs/libetpan/metadata.xml
+++ b/net-libs/libetpan/metadata.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
-<longdescription>libEtPan ! is a mail purpose library. It will be used for low-level mail handling : network protocols (IMAP/NNTP/POP3/SMTP over TCP/IP and SSL/TCP/IP, already implemented), local storage (mbox/MH/maildir), message / MIME parser</longdescription>
+	<herd>net-mail</herd>
+	<maintainer>
+		<email>ticho@gentoo.org</email>
+		<name>Andrej Kacian</name>
+		<description>net-mail: If I'm not available, feel free to touch this package.</description>
+	</maintainer>
+	<longdescription>libEtPan ! is a mail purpose library. It will be used for low-level mail handling : network protocols (IMAP/NNTP/POP3/SMTP over TCP/IP and SSL/TCP/IP, already implemented), local storage (mbox/MH/maildir), message / MIME parser</longdescription>
 </pkgmetadata>
diff --git a/net-libs/libfwbuilder/ChangeLog b/net-libs/libfwbuilder/ChangeLog
index 9b83bffeabc1..ff6c292ff679 100644
--- a/net-libs/libfwbuilder/ChangeLog
+++ b/net-libs/libfwbuilder/ChangeLog
@@ -1,6 +1,233 @@
 # ChangeLog for net-libs/libfwbuilder
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libfwbuilder/ChangeLog,v 1.1 2002/02/01 21:53:34 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libfwbuilder/ChangeLog,v 1.1.1.1 2005/11/30 10:02:55 chriswhite Exp $
+
+  06 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  libfwbuilder-2.0.9.ebuild:
+  marked ~alpha wrt bug #107450
+
+*libfwbuilder-2.0.9 (20 Sep 2005)
+
+  20 Sep 2005; Benjamin Smee <strerror@gentoo.org>
+  +libfwbuilder-2.0.9.ebuild:
+  version bump
+
+*libfwbuilder-2.0.8 (11 Jul 2005)
+
+  11 Jul 2005; Carsten Lohrke <carlo@gentoo.org> libfwbuilder-2.0.6.ebuild,
+  libfwbuilder-2.0.7.ebuild, +libfwbuilder-2.0.8.ebuild:
+  assure Qt 3 is used to build, version bump
+
+  07 Jul 2005; Caleb Tennis <caleb@gentoo.org> libfwbuilder-2.0.6.ebuild,
+  libfwbuilder-2.0.7.ebuild:
+  Fix qt dep
+
+*libfwbuilder-2.0.7 (12 May 2005)
+
+  12 May 2005; Carsten Lohrke <carlo@gentoo.org>
+  -libfwbuilder-1.0.2-r1.ebuild, -libfwbuilder-2.0.0.ebuild,
+  -libfwbuilder-2.0.1.ebuild, -libfwbuilder-2.0.2.ebuild,
+  -libfwbuilder-2.0.3.ebuild, -libfwbuilder-2.0.4.ebuild,
+  -libfwbuilder-2.0.5.ebuild, +libfwbuilder-2.0.7.ebuild:
+  version bump, clean up
+
+  17 Apr 2005; Eric Shattow <jnc@gentoo.org> libfwbuilder-2.0.6.ebuild:
+  Stable on x86; Bug #85580
+
+  29 Mar 2005; Markus Rothe <corsair@gentoo.org> libfwbuilder-2.0.6.ebuild:
+  Stable on ppc64; bug #85580
+
+  19 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> libfwbuilder-2.0.6.ebuild:
+  stable on amd64 wrt #85580
+
+  19 Mar 2005; Joseph Jezak <josejx@gentoo.org> libfwbuilder-2.0.6.ebuild:
+  Marked ppc stable for bug #85580.
+
+  17 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  libfwbuilder-2.0.6.ebuild:
+  Stable on sparc wrt #85580
+
+*libfwbuilder-2.0.6 (21 Feb 2005)
+
+  21 Feb 2005; Carsten Lohrke <carlo@gentoo.org> +libfwbuilder-2.0.6.ebuild:
+  version bump
+
+  21 Feb 2005; Daniel Black <dragonheart@gentoo.org>
+  libfwbuilder-1.0.2-r1.ebuild, libfwbuilder-1.0.2-r2.ebuild,
+  libfwbuilder-2.0.0.ebuild, libfwbuilder-2.0.1.ebuild,
+  libfwbuilder-2.0.2.ebuild, libfwbuilder-2.0.3.ebuild,
+  libfwbuilder-2.0.4.ebuild, libfwbuilder-2.0.5.ebuild:
+  removing ucd-snmp as per bug #69451
+
+*libfwbuilder-2.0.5 (07 Feb 2005)
+
+  07 Feb 2005; Carsten Lohrke <carlo@gentoo.org> +libfwbuilder-2.0.5.ebuild:
+  version bump
+
+*libfwbuilder-2.0.4 (18 Dec 2004)
+
+  18 Dec 2004; Carsten Lohrke <carlo@gentoo.org> +libfwbuilder-2.0.4.ebuild:
+  version bump
+
+*libfwbuilder-2.0.3 (05 Oct 2004)
+
+  05 Oct 2004; Daniel Ahlberg <aliz@gentoo.org> libfwbuilder-2.0.3.ebuild:
+  Version bump, closing #66116.
+
+  07 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  libfwbuilder-2.0.0.ebuild:
+  Stable on sparc
+
+*libfwbuilder-2.0.2 (01 Sep 2004)
+
+  01 Sep 2004; Daniel Ahlberg <aliz@gentoo.org> libfwbuilder-2.0.0.ebuild,
+  libfwbuilder-2.0.2.ebuild:
+  Version bump and unmask.
+
+  01 Sep 2004; Daniel Ahlberg <aliz@gentoo.org> libfwbuilder-2.0.1.ebuild:
+  Fix DEPEND vars, closing #61991.
+
+*libfwbuilder-2.0.1 (18 Aug 2004)
+
+  18 Aug 2004; Daniel Ahlberg <aliz@gentoo.org> libfwbuilder-2.0.1.ebuild:
+  Version bump, closing #60153.
+
+  06 Aug 2004; Daniel Ahlberg <aliz@gentoo.org> libfwbuilder-2.0.0.ebuild:
+  Added missing arches.
+
+*libfwbuilder-2.0.0 (02 Aug 2004)
+
+  02 Aug 2004; Daniel Ahlberg <aliz@gentoo.org> libfwbuilder-2.0.0.ebuild:
+  Version bump, ebuild contributed by Carsten Lohrke <carlo@gentoo.org> in
+  #58794.
+
+  13 Jun 2004; Jason Wever <weeve@gentoo.org> libfwbuilder-1.0.2-r2.ebuild:
+  Stable on sparc.
+
+  10 Jun 2004; Aron Griffis <agriffis@gentoo.org>
+  libfwbuilder-1.0.1-r1.ebuild:
+  Fix use invocation
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org>
+  libfwbuilder-1.0.1-r1.ebuild:
+  Add inherit eutils
+
+*libfwbuilder-1.0.2-r2 (13 Apr 2004)
+
+  13 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> libfwbuilder-1.0.2-r1.ebuild,
+  libfwbuilder-1.0.2-r2.ebuild:
+  Upstream released a new revision of 1.0.2, but didn't rename source tarball.
+  Change -r1 SRC_URI to point to original release and add -r2 to use the new
+  revision. Closing #47298.
+
+  31 Mar 2004; Lars Weiler <pylon@gentoo.org> libfwbuilder-1.0.2-r1.ebuild:
+  stable on ppc
+
+  18 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> libfwbuilder-1.0.2-r1.ebuild:
+  Inherit eutils for epatch.
+
+  25 Feb 2004; Sven Blumenstein <bazik@gentoo.org>
+  libfwbuilder-1.0.2-r1.ebuild:
+  Stable on sparc.
+
+*libfwbuilder-1.0.2-r1 (13 Jan 2004)
+
+  13 Jan 2004; Daniel Ahlberg <aliz@gentoo.org> libfwbuilder-1.0.2-r1.ebuild:
+  Fix libxml2 >=2.6.4 issues. Also removing static support, closing #34862.
+
+  12 Dec 2003; Daniel Ahlberg <aliz@gentoo.org> libfwbuilder-1.0.1-r1.ebuild, 
+  libfwbuilder-1.0.2.ebuild :
+  Add sys-devel/libtool to dependencies. Closing #35079.
+
+  06 Dec 2003; Jason Wever <weeve@gentoo.org> libfwbuilder-1.0.1-r1.ebuild:
+  Marked stable on sparc.
+
+*libfwbuilder-1.0.2 (26 Nov 2003)
+
+  26 Nov 2003; Daniel Ahlberg <aliz@gentoo.org> libfwbuilder-1.02.ebuild :
+  Version bump.
+
+*libfwbuilder-1.0.1-r1 (13 Nov 2003)
+
+  13 Nov 2003; Daniel Ahlberg <aliz@gentoo.org> libfwbuilder-1.0.1-r1.ebuild :
+  Added patch from upstream CVS. When built against libxml2 2.6.2 fwbuilder would exit with an 
+  error. See upstream #840427.
+
+*libfwbuilder-1.0.1 (19 Sep 2003)
+
+  19 Sep 2003; Daniel Ahlberg <aliz@gentoo.org> libfwbuilder-1.0.1.ebuild:
+  Version bump
+
+  12 Jun 2003; <msterret@gentoo.org> libfwbuilder-0.10.10.ebuild,
+  libfwbuilder-0.10.11.ebuild, libfwbuilder-0.10.12.ebuild,
+  libfwbuilder-0.10.13.ebuild, libfwbuilder-1.0.0.ebuild:
+  fix Header
+
+*libfwbuilder-1.0.0 (27 May 2003)
+
+  27 May 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump and ebuild cleanup.
+
+*libfwbuilder-0.10.13 (01 Mar 2003)
+
+  01 Mar 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump.
+
+  10 Jan 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Removed old files.
+
+*libfwbuilder-0.10.12 (05 Jan 2003)
+
+  05 Jan 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Versionbump.
+
+  05 Jan 2003; Daniel Ahlberg <aliz@gentoo.org> libfwbuilder-0.10.11.ebuild :
+  Marked stable for x86.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*libfwbuilder-0.10.11 (04 Nov 2002)
+
+  04 Nov 2002; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump. Found by AutoBot <autobot@midsouth.rr.com> in #10084.
+
+*libfwbuilder-0.10.10 (03 Oct 2002)
+
+  03 Oct 2002; Mike Frysinger <vapier@gentoo.org> libfwbuilder-0.10.10.ebuild :
+  Version bump for #6926 #8380 #8707 ... also set libsigc++ to =1.0* since newer
+  versions are incompatible
+
+*libfwbuilder-0.10.8-r1 (26 Aug 2002)
+
+  26 Aug 2002; Matthew Kennedy <mkennedy@gentoo.org>
+  libfwbuilder-0.10.8-r1.ebuild, files/digest-libfwbuilder-0.10.8-r1,
+  files/FWReference.cc-gcc3-gentoo.patch, ChangeLog : :
+
+  Created patch to fix broken C++ code (shows up on gcc3.2). Resolves
+  bug #6926.
+
+*libfwbuilder-0.10.8 (05 July 2002)
+
+  05 Aug 2002; Daniel Ahlberg <aliz@gentoo.org> libfwbuilder-0.10.8.ebuild:
+  Version bump, ebuild contributed by Arthus Wanzel <t1ck@bonetmail.com>.
+
+*libfwbuilder-0.10.7 (10 July 2002)
+
+  10 Jul 2002; phoen][x <phoenix@gentoo.org> libfwbuilder-0.10.7.ebuild :
+  Bumped to new version. Thanks to Artur Wanzel <t1ck@bonetmail.com>
+  for the contribution.
+
+*libfwbuilder-0.10.5 (30 Mar 2002)
+
+  30 Mar 2002; Seemant Kulleen <seemant@gentoo.org> libfwbuilder-0.10.5.ebuild :
+  Version bump.
+
+*libfwbuilder-0.10.4 (29 Mar 2002)
+
+  29 Mar 2002; Seemant Kulleen <seemant@gentoo.org> libfwbuilder-0.10.4.ebuild :
+
+  Lars Jensen informed us of the version bump.  Also, cleaned up the ebuild a 
+  little bit.
 
 *libfwbuilder-0.10.0 (1 Feb 2002)
 
diff --git a/net-libs/libfwbuilder/Manifest b/net-libs/libfwbuilder/Manifest
index 496628b3fce4..147f98007313 100644
--- a/net-libs/libfwbuilder/Manifest
+++ b/net-libs/libfwbuilder/Manifest
@@ -1,12 +1,23 @@
-MD5 918f5d58cb6c7fa65880e379095e5c40 ChangeLog 2581
-MD5 fa455bf9cf875a603c20e7fd70f77d83 libfwbuilder-0.10.10.ebuild 1025
-MD5 8f4bf513691818ff7d7f33f61a321ebe libfwbuilder-0.10.11.ebuild 1025
-MD5 212073f2b48c7b3525365882c9df2895 libfwbuilder-0.10.12.ebuild 1018
-MD5 212073f2b48c7b3525365882c9df2895 libfwbuilder-0.10.13.ebuild 1018
-MD5 212073f2b48c7b3525365882c9df2895 libfwbuilder-1.0.0.ebuild 1018
-MD5 5daac120d2120d841c2fae98f236e6a1 files/FWReference.cc-gcc3-gentoo.patch 240
-MD5 608e23e9cf5c678692e850954088ab06 files/digest-libfwbuilder-0.10.10 72
-MD5 c0dd1aa7a50e79514abd40c73fe8c85c files/digest-libfwbuilder-0.10.11 72
-MD5 cbd2384867d6471fe70ad380109763df files/digest-libfwbuilder-0.10.12 72
-MD5 b577ad51988393a1bd1907e923dd1ca7 files/digest-libfwbuilder-1.0.0 70
-MD5 0707dda492023be2d94d15b9879af77c files/digest-libfwbuilder-0.10.13 72
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f3ec80a11a8b755aa603285aaf303172 libfwbuilder-2.0.8.ebuild 804
+MD5 4968e44d4179ddba6e7ad31bb6fb2215 libfwbuilder-2.0.7.ebuild 804
+MD5 7b940aa96bd322bd7f08ec693cb72b1b libfwbuilder-2.0.9.ebuild 811
+MD5 79f3fbdc4294417deabd422ed8ec6a4f libfwbuilder-1.0.2-r2.ebuild 958
+MD5 6002f9ad27ae1f1bedf7e3283ccb9d3e ChangeLog 7927
+MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
+MD5 990394895c89adcecd264ca76a39f1bd libfwbuilder-2.0.6.ebuild 799
+MD5 18d017187b228dd614d7ae00283f788a files/digest-libfwbuilder-1.0.2-r2 72
+MD5 bd7f345d52b044e87b5cea9d1017f4bf files/libfwbuilder-1.0.2-libxml2.patch 2166
+MD5 318eed1dc99e8153d2dfdfd9cca6923e files/digest-libfwbuilder-2.0.6 70
+MD5 5814377092615185560afd95d6514ffe files/digest-libfwbuilder-2.0.7 70
+MD5 d41e02a2b604af59172850a3c1a4d60f files/digest-libfwbuilder-2.0.8 70
+MD5 385e4e0f1c7c8636e0f9b213785ff7c4 files/digest-libfwbuilder-2.0.9 70
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDRZSmViELBEf1JB0RAs7gAJ9IQ76VWSfz2lDS0g6h0xBP/J21mQCfbWTc
+nEoA6vvaPO8IoW5OpgzvjB8=
+=eFjs
+-----END PGP SIGNATURE-----
diff --git a/net-libs/libfwbuilder/files/libfwbuilder-1.0.2-libxml2.patch b/net-libs/libfwbuilder/files/libfwbuilder-1.0.2-libxml2.patch
index 2c612dc5e80f..89137c403a0b 100644
--- a/net-libs/libfwbuilder/files/libfwbuilder-1.0.2-libxml2.patch
+++ b/net-libs/libfwbuilder/files/libfwbuilder-1.0.2-libxml2.patch
@@ -1,14 +1,5 @@
 --- src/fwbuilder/XMLTools.cc	2003-11-12 06:04:04.000000000 +0000
 +++ src/fwbuilder/XMLTools.cc	2004-01-13 08:16:32.790141976 +0000
-@@ -6,7 +6,7 @@
- 
-   Author:  Vadim Kurland     vadim@vk.crocodile.org
- 
--  $Id: libfwbuilder-1.0.2-libxml2.patch,v 1.1 2004/01/13 08:31:23 aliz Exp $
-+  $Id: libfwbuilder-1.0.2-libxml2.patch,v 1.1 2004/01/13 08:31:23 aliz Exp $
- 
- 
-   This program is free software which we release under the GNU General Public
 @@ -374,13 +374,24 @@
  
      try
@@ -38,15 +29,6 @@
 diff -ru /var/tmp/portage/libfwbuilder-1.0.2/work/libfwbuilder-1.0.2/src/fwbuilder/XMLTools.hh ./src/fwbuilder/XMLTools.hh
 --- src/fwbuilder/XMLTools.hh	2003-11-12 06:04:04.000000000 +0000
 +++ src/fwbuilder/XMLTools.hh	2004-01-13 08:16:32.794141003 +0000
-@@ -6,7 +6,7 @@
- 
-   Author:  Vadim Kurland     vadim@vk.crocodile.org
- 
--  $Id: libfwbuilder-1.0.2-libxml2.patch,v 1.1 2004/01/13 08:31:23 aliz Exp $
-+  $Id: libfwbuilder-1.0.2-libxml2.patch,v 1.1 2004/01/13 08:31:23 aliz Exp $
- 
- 
-   This program is free software which we release under the GNU General Public
 @@ -51,7 +51,22 @@
  #define FROMXMLCAST(x) ((const char *)x)
  #define STRTOXMLCAST(x) ((xmlChar *)x.c_str())
diff --git a/net-libs/libfwbuilder/libfwbuilder-1.0.2-r2.ebuild b/net-libs/libfwbuilder/libfwbuilder-1.0.2-r2.ebuild
index 9d8c1582ae8d..78d240f8a0ad 100644
--- a/net-libs/libfwbuilder/libfwbuilder-1.0.2-r2.ebuild
+++ b/net-libs/libfwbuilder/libfwbuilder-1.0.2-r2.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-libs/libfwbuilder/libfwbuilder-1.0.2-r2.ebuild,v 1.1 2004/04/13 12:55:13 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libfwbuilder/libfwbuilder-1.0.2-r2.ebuild,v 1.1.1.1 2005/11/30 10:02:55 chriswhite Exp $
 
 inherit eutils
 
@@ -8,10 +8,10 @@ IUSE="ssl snmp"
 
 DESCRIPTION="A firewall GUI (library functions)"
 SRC_URI="mirror://gentoo/${P}-2.tar.gz
-	gentoo.tamperd.net/distfiles/${P}-2.tar.gz"
+	http://gentoo.tamperd.net/distfiles/${P}-2.tar.gz"
 HOMEPAGE="http://www.fwbuilder.org/"
 
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
+KEYWORDS="x86 sparc amd64 ppc"
 LICENSE="GPL-2"
 SLOT="0"
 
@@ -21,7 +21,7 @@ DEPEND="sys-devel/libtool
 	>=dev-libs/libxml2-2.4.19
 	!=dev-libs/libxml2-2.4.25
 	>=dev-libs/libxslt-1.0.15
-	snmp? ( virtual/snmp )
+	snmp? ( net-analyzer/net-snmp )
 	ssl? ( dev-libs/openssl )"
 
 src_compile() {
diff --git a/net-libs/libfwbuilder/libfwbuilder-2.0.6.ebuild b/net-libs/libfwbuilder/libfwbuilder-2.0.6.ebuild
index c59f80779e76..b2ec151a3082 100644
--- a/net-libs/libfwbuilder/libfwbuilder-2.0.6.ebuild
+++ b/net-libs/libfwbuilder/libfwbuilder-2.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-libs/libfwbuilder/libfwbuilder-2.0.6.ebuild,v 1.1 2005/02/21 20:34:36 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libfwbuilder/libfwbuilder-2.0.6.ebuild,v 1.1.1.1 2005/11/30 10:02:54 chriswhite Exp $
 
 DESCRIPTION="Firewall Builder 2.0 API library and compiler framework"
 HOMEPAGE="http://www.fwbuilder.org/"
@@ -8,16 +8,17 @@ SRC_URI="mirror://sourceforge/fwbuilder/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc"
+KEYWORDS="x86 amd64 sparc ppc ppc64"
 IUSE="snmp ssl"
 
 DEPEND=">=dev-libs/libxml2-2.4.10
 	>=dev-libs/libxslt-1.0.7
 	snmp? ( net-analyzer/net-snmp )
 	ssl? ( dev-libs/openssl )
-	>=x11-libs/qt-3"
+	=x11-libs/qt-3*"
 
 src_compile() {
+	export QMAKE="${QTDIR}/bin/qmake"
 	econf `use_with ssl openssl` `use_with snmp ucdsnmp` || die
 	emake || die
 }
diff --git a/net-libs/libfwbuilder/libfwbuilder-2.0.7.ebuild b/net-libs/libfwbuilder/libfwbuilder-2.0.7.ebuild
index 19de885e3473..11e559f98442 100644
--- a/net-libs/libfwbuilder/libfwbuilder-2.0.7.ebuild
+++ b/net-libs/libfwbuilder/libfwbuilder-2.0.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-libs/libfwbuilder/libfwbuilder-2.0.7.ebuild,v 1.1 2005/05/12 23:32:21 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libfwbuilder/libfwbuilder-2.0.7.ebuild,v 1.1.1.1 2005/11/30 10:02:55 chriswhite Exp $
 
 DESCRIPTION="Firewall Builder 2.0 API library and compiler framework"
 HOMEPAGE="http://www.fwbuilder.org/"
@@ -15,9 +15,10 @@ DEPEND=">=dev-libs/libxml2-2.4.10
 	>=dev-libs/libxslt-1.0.7
 	snmp? ( net-analyzer/net-snmp )
 	ssl? ( dev-libs/openssl )
-	>=x11-libs/qt-3"
+	=x11-libs/qt-3*"
 
 src_compile() {
+	export QMAKE="${QTDIR}/bin/qmake"
 	econf `use_with ssl openssl` `use_with snmp ucdsnmp` || die
 	emake || die
 }
diff --git a/net-libs/libfwbuilder/libfwbuilder-2.0.8.ebuild b/net-libs/libfwbuilder/libfwbuilder-2.0.8.ebuild
index d527b3ba0043..112ab34f6f5c 100644
--- a/net-libs/libfwbuilder/libfwbuilder-2.0.8.ebuild
+++ b/net-libs/libfwbuilder/libfwbuilder-2.0.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-libs/libfwbuilder/libfwbuilder-2.0.8.ebuild,v 1.1 2005/07/11 10:55:37 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libfwbuilder/libfwbuilder-2.0.8.ebuild,v 1.1.1.1 2005/11/30 10:02:54 chriswhite Exp $
 
 DESCRIPTION="Firewall Builder 2.0 API library and compiler framework"
 HOMEPAGE="http://www.fwbuilder.org/"
diff --git a/net-libs/libfwbuilder/libfwbuilder-2.0.9.ebuild b/net-libs/libfwbuilder/libfwbuilder-2.0.9.ebuild
index 218a0f06b1a2..a876ff06815c 100644
--- a/net-libs/libfwbuilder/libfwbuilder-2.0.9.ebuild
+++ b/net-libs/libfwbuilder/libfwbuilder-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-libs/libfwbuilder/libfwbuilder-2.0.9.ebuild,v 1.1 2005/09/20 12:50:53 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libfwbuilder/libfwbuilder-2.0.9.ebuild,v 1.1.1.1 2005/11/30 10:02:55 chriswhite Exp $
 
 DESCRIPTION="Firewall Builder 2.0 API library and compiler framework"
 HOMEPAGE="http://www.fwbuilder.org/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/fwbuilder/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~ppc64"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="snmp ssl"
 
 DEPEND=">=dev-libs/libxml2-2.4.10
diff --git a/net-libs/libgadu/ChangeLog b/net-libs/libgadu/ChangeLog
index 53bf18a3dc06..e0c83a7de08f 100644
--- a/net-libs/libgadu/ChangeLog
+++ b/net-libs/libgadu/ChangeLog
@@ -1,6 +1,42 @@
 # ChangeLog for net-libs/libgadu
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libgadu/ChangeLog,v 1.1 2004/08/22 15:04:54 sekretarz Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libgadu/ChangeLog,v 1.1.1.1 2005/11/30 10:03:00 chriswhite Exp $
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> libgadu-20050719.ebuild:
+  Mark 20050719 stable on alpha
+
+  24 Aug 2005; Aron Griffis <agriffis@gentoo.org> libgadu-20050719.ebuild:
+  stable on ia64
+
+  22 Jul 2005; <sekretarz@gentoo.org> libgadu-20050719.ebuild:
+  Stable on x86
+
+  21 Jul 2005; Jory A. Pratt <anarchy@gentoo.org> libgadu-20050719.ebuild:
+  Stable on ppc
+
+  21 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  libgadu-20050719.ebuild:
+  Stable on hppa. bug #99583
+
+*libgadu-20050719 (20 Jul 2005)
+
+  20 Jul 2005; <sekretarz@gentoo.org> +libgadu-20050719.ebuild:
+  Version bump due security bug, #99583
+
+*libgadu-20041230 (01 Jan 2005)
+
+  01 Jan 2005; Karol Wojtaszek <sekretarz@gentoo.org>
+  +libgadu-20041230.ebuild:
+  Version bump, added threads use flag to enable pthread in resolver
+
+  23 Oct 2004; Simon Stelling <blubb@gentoo.org> libgadu-20040820.ebuild:
+  added ~amd64
+
+  03 Sep 2004; David Holm <dholm@gentoo.org> libgadu-20040820.ebuild:
+  Added to ~ppc.
+
+  24 Aug 2004; Karol Wojtaszek <sekretarz@gentoo.org> libgadu-20040820.ebuild:
+  Corrected DESCRIPTION
 
   22 Aug 2004; Karol Wojtaszek <sekretarz@gentoo.org>
   +libgadu-20040820.ebuild:
diff --git a/net-libs/libgadu/Manifest b/net-libs/libgadu/Manifest
index a81602594bb8..88998052c45f 100644
--- a/net-libs/libgadu/Manifest
+++ b/net-libs/libgadu/Manifest
@@ -1,4 +1,8 @@
-MD5 8efd047e13e479b04a5b19253fa1111c libgadu-20040820.ebuild 787
+MD5 2070522a076878fc1090b87f828c8890 libgadu-20050719.ebuild 833
 MD5 19121381ed6ad2931da6c71c9e6f6eb8 metadata.xml 259
-MD5 5d08133e3d2fcb83a4ea19eb2aaaafad ChangeLog 309
+MD5 281d0b0398d0f9370bd8f0f49ce49173 ChangeLog 1398
+MD5 9997ccdae9388e755318487a2a4cd3b3 libgadu-20041230.ebuild 806
+MD5 f74a89d1595be4a4ef964f496631b272 libgadu-20040820.ebuild 786
 MD5 a8857127732da188032c63ef0436a77a files/digest-libgadu-20040820 68
+MD5 1d7aa323b4e52bbcbb94bc0e48b9aa99 files/digest-libgadu-20041230 68
+MD5 c73d3cc505200af36d8571ebcc202d3d files/digest-libgadu-20050719 68
diff --git a/net-libs/libgadu/libgadu-20040820.ebuild b/net-libs/libgadu/libgadu-20040820.ebuild
index 51f946cfe1d6..9c8e9a5af362 100644
--- a/net-libs/libgadu/libgadu-20040820.ebuild
+++ b/net-libs/libgadu/libgadu-20040820.ebuild
@@ -1,27 +1,22 @@
-# 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-libs/libgadu/libgadu-20040820.ebuild,v 1.1 2004/08/22 15:04:54 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libgadu/libgadu-20040820.ebuild,v 1.1.1.1 2005/11/30 10:03:00 chriswhite Exp $
 
 inherit eutils libtool
 
-DESCRIPTION="This is a sample skeleton ebuild file"
+DESCRIPTION="This library implements the client side of the Gadu-Gadu protocol"
 HOMEPAGE="http://dev.null.pl/ekg"
 SRC_URI="http://dev.gentoo.org/~sekretarz/distfiles/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="x86"
+KEYWORDS="~x86 ~ppc ~amd64"
 
 IUSE="ssl"
 
 DEPEND="ssl? ( >=dev-libs/openssl-0.9.6m )"
 
-#RDEPEND=""
-
-S=${WORKDIR}/${P}
-
 src_compile() {
-	cd ${S}
 	aclocal -I m4
 	autoheader
 	autoconf
diff --git a/net-libs/libgadu/libgadu-20041230.ebuild b/net-libs/libgadu/libgadu-20041230.ebuild
index 80245c5a9809..65b80bf62966 100644
--- a/net-libs/libgadu/libgadu-20041230.ebuild
+++ b/net-libs/libgadu/libgadu-20041230.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-libs/libgadu/libgadu-20041230.ebuild,v 1.1 2004/12/31 23:42:56 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libgadu/libgadu-20041230.ebuild,v 1.1.1.1 2005/11/30 10:03:00 chriswhite Exp $
 
 inherit eutils libtool
 
@@ -16,12 +16,7 @@ IUSE="ssl threads"
 
 DEPEND="ssl? ( >=dev-libs/openssl-0.9.6m )"
 
-#RDEPEND=""
-
-S=${WORKDIR}/${P}
-
 src_compile() {
-	cd ${S}
 	aclocal -I m4
 	autoheader
 	autoconf
diff --git a/net-libs/libgadu/libgadu-20050719.ebuild b/net-libs/libgadu/libgadu-20050719.ebuild
index 6cf2428244cf..85650bddb74a 100644
--- a/net-libs/libgadu/libgadu-20050719.ebuild
+++ b/net-libs/libgadu/libgadu-20050719.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-libs/libgadu/libgadu-20050719.ebuild,v 1.1 2005/07/20 19:22:46 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libgadu/libgadu-20050719.ebuild,v 1.1.1.1 2005/11/30 10:03:00 chriswhite Exp $
 
 inherit eutils libtool
 
@@ -10,7 +10,7 @@ SRC_URI="http://dev.gentoo.org/~sekretarz/distfiles/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="alpha ~amd64 hppa ia64 ~mips ppc ~sparc x86"
 
 IUSE="ssl threads"
 
diff --git a/net-libs/libgmail/ChangeLog b/net-libs/libgmail/ChangeLog
index 9c423f008704..ceb4e90588f1 100644
--- a/net-libs/libgmail/ChangeLog
+++ b/net-libs/libgmail/ChangeLog
@@ -1,6 +1,38 @@
 # ChangeLog for net-libs/libgmail
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libgmail/ChangeLog,v 1.1 2004/09/17 00:51:06 squinky86 Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libgmail/ChangeLog,v 1.1.1.1 2005/11/30 10:02:57 chriswhite Exp $
+
+*libgmail-0.1.3.3 (30 Oct 2005)
+
+  30 Oct 2005; Marcin Kryczek <mkay@gentoo.org> +libgmail-0.1.3.3.ebuild:
+  Version bump
+
+  17 Sep 2005; <mkay@gentoo.org> libgmail-0.1.1.ebuild:
+  Ebuild now uses distutils.eclass
+
+  17 Sep 2005; <mkay@gentoo.org> -libgmail-0.0.8.ebuild,
+  -libgmail-0.0.8-r1.ebuild:
+  Removing old versions, since they doesn't work anymore
+
+*libgmail-0.1.1 (17 Sep 2005)
+
+  17 Sep 2005; <mkay@gentoo.org> +libgmail-0.1.1.ebuild:
+  Version bump to 0.1.1
+
+*libgmail-0.0.8-r1 (27 Jul 2005)
+
+  27 Jul 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +libgmail-0.0.8-r1.ebuild:
+  Adding patches from cvs, attempting to fix bug 96425.
+
+  02 Feb 2005; Jon Hood <squinky86@gentoo.org> libgmail-0.0.8.ebuild:
+  Install one copy of the docs, #79187; thanks James Rowe <jnrowe@ukfsn.org>.
+
+  17 Oct 2004; David Holm <dholm@gentoo.org> libgmail-0.0.8.ebuild:
+  Added to ~ppc.
+
+  09 Oct 2004; Tom Martin <slarti@gentoo.org> libgmail-0.0.8.ebuild:
+  Marked ~amd64.
 
 *libgmail-0.0.8 (16 Sep 2004)
 
diff --git a/net-libs/libgmail/Manifest b/net-libs/libgmail/Manifest
index 679d4e666a53..d83985bb1744 100644
--- a/net-libs/libgmail/Manifest
+++ b/net-libs/libgmail/Manifest
@@ -1,2 +1,6 @@
-MD5 255547e1ba9f1cb2c8f533a2ce43c297 libgmail-0.0.8.ebuild 581
-MD5 625ccc538832a272161e1ea1e68fb0b1 files/digest-libgmail-0.0.8 62
+MD5 e63bcf4d69618da6ea2822b82a7dc0bb ChangeLog 1394
+MD5 3449717d3acbf215d0402da79a9d1dc9 libgmail-0.1.3.3.ebuild 506
+MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
+MD5 6c64a38f1033db7bc35b1506468320ed libgmail-0.1.1.ebuild 504
+MD5 17d62f4f4df6c58ef872e66f116c9a20 files/digest-libgmail-0.1.3.3 67
+MD5 1e62cd3440b1a696b5eae7e3537933f6 files/digest-libgmail-0.1.1 65
diff --git a/net-libs/libgmail/libgmail-0.1.1.ebuild b/net-libs/libgmail/libgmail-0.1.1.ebuild
index 81f49ba57e84..5c3eec9c307b 100644
--- a/net-libs/libgmail/libgmail-0.1.1.ebuild
+++ b/net-libs/libgmail/libgmail-0.1.1.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-libs/libgmail/libgmail-0.1.1.ebuild,v 1.1 2005/09/17 13:37:10 mkay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libgmail/libgmail-0.1.1.ebuild,v 1.1.1.1 2005/11/30 10:02:57 chriswhite Exp $
 
-inherit python eutils
+inherit distutils
 
 DESCRIPTION="Python bindings to access Google's gmail service"
 HOMEPAGE="http://libgmail.sourceforge.net/"
@@ -14,16 +14,6 @@ KEYWORDS="~x86 ~amd64 ~ppc"
 
 IUSE=""
 
-DEPEND=""
-
-RDEPEND="dev-python/logging
+DEPEND="dev-python/logging
 	virtual/python"
 
-src_install() {
-	python_version
-	exeinto /usr/lib/python${PYVER}/site-packages
-	doexe libgmail.py
-	insinto /usr/lib/python${PYVER}/site-packages
-	doins lgconstants.py
-	dodoc CHANGELOG README
-}
diff --git a/net-libs/libgmail/libgmail-0.1.3.3.ebuild b/net-libs/libgmail/libgmail-0.1.3.3.ebuild
index 2589161399af..bf303fc84e30 100644
--- a/net-libs/libgmail/libgmail-0.1.3.3.ebuild
+++ b/net-libs/libgmail/libgmail-0.1.3.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-libs/libgmail/libgmail-0.1.3.3.ebuild,v 1.1 2005/10/30 12:56:06 mkay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libgmail/libgmail-0.1.3.3.ebuild,v 1.1.1.1 2005/11/30 10:02:57 chriswhite Exp $
 
 inherit distutils
 
diff --git a/net-libs/libgmail/metadata.xml b/net-libs/libgmail/metadata.xml
index a6f4b1dc32c6..aa0f3664825f 100644
--- a/net-libs/libgmail/metadata.xml
+++ b/net-libs/libgmail/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>net-p2p</herd>
-<maintainer>
- <email>squinky86@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/net-libs/libgsasl/ChangeLog b/net-libs/libgsasl/ChangeLog
index 47ea80180409..b62fbf967111 100644
--- a/net-libs/libgsasl/ChangeLog
+++ b/net-libs/libgsasl/ChangeLog
@@ -1,9 +1,103 @@
 # ChangeLog for net-libs/libgsasl
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libgsasl/ChangeLog,v 1.1 2004/07/06 00:38:42 langthang Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libgsasl/ChangeLog,v 1.1.1.1 2005/11/30 10:02:49 chriswhite Exp $
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> libgsasl-0.2.4.ebuild:
+  Mark 0.2.4 stable on alpha
+
+  24 Aug 2005; Aron Griffis <agriffis@gentoo.org> libgsasl-0.2.4.ebuild:
+  stable on ia64
+
+  05 Jul 2005; Tom Martin <slarti@gentoo.org> libgsasl-0.2.4.ebuild:
+  Marked ~ia64.
+
+  02 May 2005; Michael Hanselmann <hansmi@gentoo.org> libgsasl-0.2.4.ebuild:
+  Stable on ppc.
+
+  02 May 2005; Elfyn McBratney <beu@gentoo.org> libgsasl-0.2.4.ebuild:
+  Stable on x86.
+
+  19 Apr 2005; Tom Martin <slarti@gentoo.org> -libgsasl-0.2.0.ebuild:
+  Version purge.
+
+  19 Apr 2005; Markus Rothe <corsair@gentoo.org> libgsasl-0.2.4.ebuild:
+  Stable on ppc64
+
+  19 Apr 2005; Tom Martin <slarti@gentoo.org> libgsasl-0.2.4.ebuild:
+  Stable on amd64 and sparc.
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org> libgsasl-0.2.3.ebuild:
+  Stable on ppc64
+
+  07 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> libgsasl-0.2.4.ebuild:
+  ~alpha keyword.
+
+  10 Mar 2005; Tom Martin <slarti@gentoo.org> libgsasl-0.2.4.ebuild:
+  Marked ~sparc
+
+  22 Jan 2005; Tom Martin <slarti@gentoo.org> -libgsasl-0.1.4.ebuild:
+  Purge old versions.
+
+  22 Jan 2005; Andrej Kacian <ticho@gentoo.org> libgsasl-0.2.3.ebuild:
+  Stable on x86.
+
+  22 Jan 2005; Lars Weiler <pylon@gentoo.org> libgsasl-0.2.3.ebuild:
+  Stable on ppc.
+
+  22 Jan 2005; Tom Martin <slarti@gentoo.org> libgsasl-0.2.3.ebuild:
+  Minor QA fix in 0.2.3.ebuild -- changing .tar.bz2 to .tar.gz.
+
+*libgsasl-0.2.4 (22 Jan 2005)
+
+  22 Jan 2005; Tom Martin <slarti@gentoo.org> libgsasl-0.2.3.ebuild,
+  +libgsasl-0.2.4.ebuild:
+  Version bump, stabilise older version on amd64.
+
+  03 Jan 2005; Markus Rothe <corsair@gentoo.org> libgsasl-0.2.0.ebuild,
+  libgsasl-0.2.3.ebuild:
+  Stable on ppc64
+
+  25 Dec 2004; Andrej Kacian <ticho@gentoo.org> libgsasl-0.2.0.ebuild:
+  Stable on x86.
+
+*libgsasl-0.2.3 (25 Dec 2004)
+
+  25 Dec 2004; Tom Martin <slarti@gentoo.org> libgsasl-0.2.0.ebuild,
+  +libgsasl-0.2.3.ebuild:
+  Version bump, stabilise 0.2.0 on amd64.
+
+  23 Dec 2004; Markus Rothe <corsair@gentoo.org> libgsasl-0.2.0.ebuild:
+  Added ~ppc64 to KEYWORDS; bug #74100
+
+  27 Nov 2004; Tom Martin <slarti@gentoo.org> -libgsasl-0.1.1.ebuild:
+  Removing old version.
+
+  27 Nov 2004; Andrej Kacian <ticho@gentoo.org> libgsasl-0.1.4.ebuild:
+  Stable on x86.
+
+*libgsasl-0.2.0 (13 Nov 2004)
+
+  13 Nov 2004; Tom Martin <slarti@gentoo.org> metadata.xml,
+  libgsasl-0.1.4.ebuild, +libgsasl-0.2.0.ebuild:
+  Taking over as maintainer. Version bump -> 0.2.0.
+
+*libgsasl-0.1.4 (11 Oct 2004)
+
+  11 Oct 2004; Tom Martin <slarti@gentoo.org> libgsasl-0.1.1.ebuild,
+  +libgsasl-0.1.4.ebuild:
+  Marked 0.1.1 stable on amd64, version bumped -> 0.1.4.
+
+  09 Jul 2004; Michael Hanselmann <hansmi@gentoo.org> libgsasl-0.1.1.ebuild:
+  Added to ~ppc.
+
+  07 Jul 2004; Tom Martin <slarti@gentoo.org> libgsasl-0.1.1.ebuild:
+  Added to ~amd64.
+
+  06 Jul 2004; <langthang@gentoo.org> libgsasl-0.1.1.ebuild:
+  added PROVIDE virtual/gsasl, changed description, re-keyword.
 
 *libgsasl-0.1.1 (05 Jul 2004)
 
-  05 Jul 2004; <tvan@gentoo.org> +metadata.xml, +libgsasl-0.1.1.ebuild:
+  05 Jul 2004; <langthang@gentoo.org> +metadata.xml, +libgsasl-0.1.1.ebuild:
   New ebuild, bug #56015.
 
diff --git a/net-libs/libgsasl/Manifest b/net-libs/libgsasl/Manifest
index 1ba4210d76cd..f6f1d924ecea 100644
--- a/net-libs/libgsasl/Manifest
+++ b/net-libs/libgsasl/Manifest
@@ -1,2 +1,6 @@
-MD5 a3c6d3f639fbc6968f39f50a0ce76151 libgsasl-0.1.1.ebuild 956
-MD5 da9b047fe6bfeac4c642a3f358211c69 files/digest-libgsasl-0.1.1 66
+MD5 9a3024665c04c1eb6ef0f20c66b451dc metadata.xml 252
+MD5 c0ad4122bb58a605afc3c246c4bd40cf ChangeLog 3296
+MD5 2dd2d43ecc04d42052657a68edb439b1 libgsasl-0.2.4.ebuild 1011
+MD5 121d0da270bdcd8b605ef51b7480e572 libgsasl-0.2.3.ebuild 992
+MD5 97551928059d3959ba1761d0f332c010 files/digest-libgsasl-0.2.4 66
+MD5 4d2845818e9cc61826d46c6e42fa316d files/digest-libgsasl-0.2.3 66
diff --git a/net-libs/libgsasl/libgsasl-0.2.3.ebuild b/net-libs/libgsasl/libgsasl-0.2.3.ebuild
index 1657f3e79a08..42470ba1d86a 100644
--- a/net-libs/libgsasl/libgsasl-0.2.3.ebuild
+++ b/net-libs/libgsasl/libgsasl-0.2.3.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-libs/libgsasl/libgsasl-0.2.3.ebuild,v 1.1 2004/12/25 13:09:52 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libgsasl/libgsasl-0.2.3.ebuild,v 1.1.1.1 2005/11/30 10:02:49 chriswhite Exp $
 
 DESCRIPTION="The GNU SASL library"
 HOMEPAGE="http://www.gnu.org/software/gsasl/"
-SRC_URI="ftp://alpha.gnu.org/pub/gnu/gsasl/${P}.tar.gz"
+SRC_URI="http://josefsson.org/gsasl/releases/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 # TODO: check http://www.gnu.org/software/gsasl/#dependencies for more
 # 	optional external libraries.
-# KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="x86 amd64 ppc ppc64"
 IUSE="kerberos nls static"
 PROVIDE="virtual/gsasl"
 DEPEND="virtual/libc
@@ -29,6 +28,6 @@ src_compile() {
 }
 
 src_install() {
-	einstall || die "einstall failed"
+	make DESTDIR=${D} install || die "installation failed"
 	dodoc ABOUT-NLS AUTHORS ChangeLog NEWS README README-alpha THANKS
 }
diff --git a/net-libs/libgsasl/libgsasl-0.2.4.ebuild b/net-libs/libgsasl/libgsasl-0.2.4.ebuild
index d7369cfdb581..029f96797209 100644
--- a/net-libs/libgsasl/libgsasl-0.2.4.ebuild
+++ b/net-libs/libgsasl/libgsasl-0.2.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-libs/libgsasl/libgsasl-0.2.4.ebuild,v 1.1 2005/01/22 16:07:17 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libgsasl/libgsasl-0.2.4.ebuild,v 1.1.1.1 2005/11/30 10:02:49 chriswhite Exp $
 
 DESCRIPTION="The GNU SASL library"
 HOMEPAGE="http://www.gnu.org/software/gsasl/"
@@ -9,7 +9,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 # TODO: check http://www.gnu.org/software/gsasl/#dependencies for more
 # 	optional external libraries.
-KEYWORDS="~x86 ~amd64 ~ppc ~ppc64"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE="kerberos nls static"
 PROVIDE="virtual/gsasl"
 DEPEND="virtual/libc
diff --git a/net-libs/libgsasl/metadata.xml b/net-libs/libgsasl/metadata.xml
index 72d13b3fbb02..a4fb47854028 100644
--- a/net-libs/libgsasl/metadata.xml
+++ b/net-libs/libgsasl/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>net-mail</herd>
 	<maintainer>
-		<email>langthang@gentoo.org</email>
-		<name>Tuan Van</name>
+		<email>slarti@gentoo.org</email>
+		<name>Tom Martin</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/net-libs/libhttpd-persistent/ChangeLog b/net-libs/libhttpd-persistent/ChangeLog
index a3a0894c28bc..9e7225b49b8f 100644
--- a/net-libs/libhttpd-persistent/ChangeLog
+++ b/net-libs/libhttpd-persistent/ChangeLog
@@ -1,6 +1,58 @@
 # ChangeLog for net-libs/libhttpd-persistent
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libhttpd-persistent/ChangeLog,v 1.1 2004/03/31 01:57:46 eradicator Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libhttpd-persistent/ChangeLog,v 1.1.1.1 2005/11/30 10:02:49 chriswhite Exp $
+
+  16 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  libhttpd-persistent-1.3p-r8.ebuild:
+  Use CXXFLAGS.
+
+  19 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  libhttpd-persistent-1.3p-r8.ebuild:
+  Using toolchain-funcs for the rest of the toolchain commands now, too.
+
+  19 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -libhttpd-persistent-1.3p-r6.ebuild, -libhttpd-persistent-1.3p-r7.ebuild:
+  Removing old versions.  Using toolchain-funs eclass now where it works.
+
+  22 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  libhttpd-persistent-1.3p-r8.ebuild:
+  Stable amd64, sparc, x86.
+
+  01 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  libhttpd-persistent-1.3p-r7.ebuild:
+  Stable amd64 sparc x86.
+
+*libhttpd-persistent-1.3p-r8 (18 Aug 2004)
+
+  18 Aug 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +libhttpd-persistent-1.3p-r8.ebuild:
+  Version bump closes bug #55201
+
+*libhttpd-persistent-1.3p-r7 (07 Jul 2004)
+
+  07 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +libhttpd-persistent-1.3p-r7.ebuild:
+  Version bump closes bug #55201.  ~sparc.
+
+  04 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  libhttpd-persistent-1.3p-r6.ebuild:
+  just discard borked upstream Makefile and do it in ebuild...
+
+  05 Jul 2004; Danny van Dyk <kugelfang@gentoo.org>
+  libhttpd-persistent-1.3p-r6.ebuild:
+  Tidied up the build process for the shared object. Works now on amd64.
+
+  04 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  libhttpd-persistent-1.3p-r6.ebuild:
+  ~sparc and added || dies
+
+  29 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  libhttpd-persistent-1.3p-r6.ebuild:
+  Stable x86.
+
+  31 Mar 2004; David Holm <dholm@gentoo.org>
+  libhttpd-persistent-1.3p-r6.ebuild:
+  Added to ~ppc.
 
 *libhttpd-persistent-1.3p-r6 (30 Mar 2004)
 
diff --git a/net-libs/libhttpd-persistent/Manifest b/net-libs/libhttpd-persistent/Manifest
index 73f01c1f7b50..20a52bcf0ab7 100644
--- a/net-libs/libhttpd-persistent/Manifest
+++ b/net-libs/libhttpd-persistent/Manifest
@@ -1,4 +1,14 @@
-MD5 370bd18743276db92149dd3f31201bba libhttpd-persistent-1.3p-r6.ebuild 1024
-MD5 c3fc81bceacf13b29112d5d9068abaf6 metadata.xml 481
-MD5 5ab6353f33f9a78535cb44453a2031ec ChangeLog 1113
-MD5 3d54fde5d128291ea5a6ae6dd4f9d840 files/digest-libhttpd-persistent-1.3p-r6 64
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 82f0c2b352024220768d82465b665fca ChangeLog 3090
+MD5 d59fcbd11fe6a68bf60fcba57b403351 files/digest-libhttpd-persistent-1.3p-r8 64
+MD5 456f70e8b34e7dd53c7896012b6648fd libhttpd-persistent-1.3p-r8.ebuild 1924
+MD5 34371b0b6264e8222d4666bf5895f5f7 metadata.xml 432
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDUuUrOpjtAl+gMRURAkmQAJ0VydNCPtEr3WtGMym99Moxw/qK6gCgm/LK
+yMYWGvNQM/SzQAMQFnEPTMY=
+=oR7y
+-----END PGP SIGNATURE-----
diff --git a/net-libs/libhttpd-persistent/libhttpd-persistent-1.3p-r8.ebuild b/net-libs/libhttpd-persistent/libhttpd-persistent-1.3p-r8.ebuild
index c925dedc54eb..431f926abe3f 100644
--- a/net-libs/libhttpd-persistent/libhttpd-persistent-1.3p-r8.ebuild
+++ b/net-libs/libhttpd-persistent/libhttpd-persistent-1.3p-r8.ebuild
@@ -1,6 +1,10 @@
-# 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-libs/libhttpd-persistent/libhttpd-persistent-1.3p-r8.ebuild,v 1.1 2004/08/18 20:56:46 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libhttpd-persistent/libhttpd-persistent-1.3p-r8.ebuild,v 1.1.1.1 2005/11/30 10:02:49 chriswhite Exp $
+
+IUSE=""
+
+inherit toolchain-funcs
 
 MY_P="libhttpd-1.3p-h"
 S="${WORKDIR}/libhttpd-1.3-persistent-h"
@@ -8,10 +12,11 @@ S="${WORKDIR}/libhttpd-1.3-persistent-h"
 DESCRIPTION="libhttpd-persistent is a modified version of David Hughes' libhttpd."
 HOMEPAGE="http://www.deleet.de/projekte/daap/daapd/"
 SRC_URI="http://www.deleet.de/projekte/daap/daapd/${MY_P}.tgz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
-IUSE=""
+KEYWORDS="x86 ~ppc amd64 sparc"
+
 DEPEND=""
 
 src_compile() {
@@ -21,19 +26,25 @@ src_compile() {
 	cd ${S}/src
 
 	CFILES="protocol.c api.c version.c ip_acl.c select.c"
+	LOFILES=${CFILES//.c/.lo}
 	OFILES=${CFILES//.c/.o}
 
 	for FILE in ${CFILES}; do
-		echo g++ ${CFLAGS} -D_OS_UNIX -fPIC -c ${FILE}
-		g++ ${CFLAGS} -D_OS_UNIX -fPIC -c ${FILE} || die
+		echo $(tc-getCXX) ${CXXFLAGS} -D_OS_UNIX -c ${FILE} -o ${FILE//.c/.o}
+		$(tc-getCXX) ${CXXFLAGS} -D_OS_UNIX -c ${FILE} -o ${FILE//.c/.o} || die
+		echo $(tc-getCXX) ${CXXFLAGS} -D_OS_UNIX -fPIC -c ${FILE} -o ${FILE//.c/.lo}
+		$(tc-getCXX) ${CXXFLAGS} -D_OS_UNIX -fPIC -c ${FILE} -o ${FILE//.c/.lo} || die
 	done
 
-	echo "linking"
-	ar rc libhttpd-persistent.a ${OFILES} || die
-	ranlib libhttpd-persistent.a || die
+	echo $(tc-getAR) rc libhttpd-persistent.a ${OFILES} || die
+	$(tc-getAR) rc libhttpd-persistent.a ${OFILES} || die
+	echo $(tc-getRANLIB) libhttpd-persistent.a || die
+	$(tc-getRANLIB) libhttpd-persistent.a || die
 
-	g++ -shared -Wl,-shared,-soname,libhttpd-persistent.so \
-		${OFILES} -o libhttpd-persistent.so || die
+	echo $(tc-getCXX) -shared -Wl,-shared,-soname,libhttpd-persistent.so \
+		${LOFILES} -o libhttpd-persistent.so || die
+	$(tc-getCXX) -shared -Wl,-shared,-soname,libhttpd-persistent.so \
+		${LOFILES} -o libhttpd-persistent.so || die
 }
 
 src_install() {
diff --git a/net-libs/libical-moz/ChangeLog b/net-libs/libical-moz/ChangeLog
index a9b678f86b45..e9d2ace2a68f 100644
--- a/net-libs/libical-moz/ChangeLog
+++ b/net-libs/libical-moz/ChangeLog
@@ -1,7 +1,22 @@
 # ChangeLog for net-libs/libical-moz
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libical-moz/ChangeLog,v 1.1 2002/02/01 21:53:34 gbevin Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libical-moz/ChangeLog,v 1.1.1.1 2005/11/30 10:02:56 chriswhite Exp $
 
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  libical-moz-0.23.ebuild:
+  virtual/glibc -> virtual/libc
+
+  05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> libical-moz-0.23.ebuild:
+  Stable on alpha.
+
+  14 Jul 2003; Aron Griffis <agriffis@gentoo.org> libical-moz-0.23.ebuild:
+  Add ~alpha to KEYWORDS
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *libical-moz-0.23 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
diff --git a/net-libs/libical-moz/Manifest b/net-libs/libical-moz/Manifest
index e69de29bb2d1..3c6f04bbdc44 100644
--- a/net-libs/libical-moz/Manifest
+++ b/net-libs/libical-moz/Manifest
@@ -0,0 +1,3 @@
+MD5 518339eb071da781e02c40f86fa192bd libical-moz-0.23.ebuild 775
+MD5 5f104dd0d57289e8ae1f5af1ccb8476e ChangeLog 1180
+MD5 8daff3148d1b156287396b63012bb055 files/digest-libical-moz-0.23 68
diff --git a/net-libs/libical-moz/files/digest-libical-moz-0.23 b/net-libs/libical-moz/files/digest-libical-moz-0.23
index 6bfe4c31efe1..31ef1fd23c36 100644
--- a/net-libs/libical-moz/files/digest-libical-moz-0.23
+++ b/net-libs/libical-moz/files/digest-libical-moz-0.23
@@ -1 +1 @@
-MD5 e6749253bf3ed1bf80ecdab35769c685 libical-0.23-moz.tar.gz 770048
+MD5 e6749253bf3ed1bf80ecdab35769c685 libical-0.23-moz.tar.gz 767658
diff --git a/net-libs/libical-moz/libical-moz-0.23.ebuild b/net-libs/libical-moz/libical-moz-0.23.ebuild
index 5a151b9ea331..b05d1dc49423 100644
--- a/net-libs/libical-moz/libical-moz-0.23.ebuild
+++ b/net-libs/libical-moz/libical-moz-0.23.ebuild
@@ -1,34 +1,26 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Geert Bevin <gbevin@theleaf.be>
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libical-moz/libical-moz-0.23.ebuild,v 1.1 2002/01/07 12:42:47 gbevin Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libical-moz/libical-moz-0.23.ebuild,v 1.1.1.1 2005/11/30 10:02:56 chriswhite Exp $
 
 S=${WORKDIR}/libical-0.23-moz
 DESCRIPTION="libical is used by the mozilla calendar component"
-SRC_URI="http://www.oeone.com/files/libical-0.23-moz.tar.gz"
+SRC_URI="http://www.oeone.com/files/libical-${PV}-moz.tar.gz"
 HOMEPAGE="http://www.mozilla.org/projects/calendar/installation.html"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
-RDEPEND="virtual/glibc"
-	
-src_unpack() {
-
-	unpack ${A}
-
-}
+LICENSE="|| ( MPL-1.1 LGPL-2 )"
+SLOT="0"
+KEYWORDS="x86 sparc alpha"
+IUSE=""
 
 src_compile() {
-
 	cd ${S}
 	./autogen.sh --prefix=/usr --disable-python-bindings || die
 	emake || die
-
 }
 
-src_install () {
-
+src_install() {
 	make DESTDIR=${D} install || die
-
+	dodoc AUTHORS ChangeLog LICENSE NEWS README TEST THANKS TODO
 }
-
diff --git a/net-libs/libicq2000/ChangeLog b/net-libs/libicq2000/ChangeLog
index cf8e72a8253f..a8e327a1cc55 100644
--- a/net-libs/libicq2000/ChangeLog
+++ b/net-libs/libicq2000/ChangeLog
@@ -1,7 +1,30 @@
 # ChangeLog for net-libs/libicq2000
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libicq2000/ChangeLog,v 1.1 2002/04/17 20:50:20 spider Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libicq2000/ChangeLog,v 1.1.1.1 2005/11/30 10:02:47 chriswhite Exp $
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*libicq2000-0.3.2 (04 Aug 2002)
+  
+  04 Aug 2002; phoen][x <phoenix@gentoo.org> libicq2000-0.3.2.ebuild
+  files/digest-libicq2000-0.3.2 :
+
+  Bumped to new version (bug #5974)
+  Thanks to Marcel Karras <toka@freebits.de> for the contribution.
+
+*libicq2000-0.3.1 (05 Jun 2002)
+
+  05 Jun 2002; Spider <spider@gentoo.org> :
+  fixed libsigc++ dependency
+  
+*libicq2000-0.3.1 (27 Apr 2002)
+
+  27 Apr 2002; Spider <spider@gentoo.org> libicq2000-0.3.1.ebuild
+  new version, get it while its fresh....   
 
 *libicq2000-0.3.0 (17 Apr 2002)
+
   17 Apr 2002; Spider <spider@gentoo.org> libicq2000-0.3.0.ebuild
   initial release due to ickle 0.3.0 
+  updating the current release with a dodoc line, seems i missed it,
+  doesn't warrant a -r though
diff --git a/net-libs/libicq2000/Manifest b/net-libs/libicq2000/Manifest
index e69de29bb2d1..efddde33e9a1 100644
--- a/net-libs/libicq2000/Manifest
+++ b/net-libs/libicq2000/Manifest
@@ -0,0 +1,5 @@
+MD5 99978d66196e48c5bc8528491335efd2 libicq2000-0.3.2.ebuild 830
+MD5 870039976d65e42c436c6743b11079b7 libicq2000-0.3.1.ebuild 794
+MD5 f4866099db896073dcd67c471b657d3c ChangeLog 1027
+MD5 754dad162d8f3f05316f0a238a1246b6 files/digest-libicq2000-0.3.1 68
+MD5 e85f2411810c7e5cdfbfc2baffd818a0 files/digest-libicq2000-0.3.2 68
diff --git a/net-libs/libicq2000/files/digest-libicq2000-0.3.1 b/net-libs/libicq2000/files/digest-libicq2000-0.3.1
index b2f5f2ec39a5..9ea23ac1a125 100644
--- a/net-libs/libicq2000/files/digest-libicq2000-0.3.1
+++ b/net-libs/libicq2000/files/digest-libicq2000-0.3.1
@@ -1 +1 @@
-MD5 e06aba738552e42bf7dd12eecee888b5 libicq2000-0.3.1.tar.gz 514023
+MD5 62cca3234d1575af90ab96dc60f73ba6 libicq2000-0.3.1.tar.gz 514043
diff --git a/net-libs/libicq2000/libicq2000-0.3.1.ebuild b/net-libs/libicq2000/libicq2000-0.3.1.ebuild
index b05a902c8652..c35d9b92b4bd 100644
--- a/net-libs/libicq2000/libicq2000-0.3.1.ebuild
+++ b/net-libs/libicq2000/libicq2000-0.3.1.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# Author: Spider <spider@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libicq2000/libicq2000-0.3.1.ebuild,v 1.1 2002/04/27 07:13:18 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libicq2000/libicq2000-0.3.1.ebuild,v 1.1.1.1 2005/11/30 10:02:47 chriswhite Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="ICQ 200x compatible ICQ libraries."
-SRC_URI="http://prdownloads.sourceforge.net/libicq2000/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/libicq2000/${P}.tar.gz"
 HOMEPAGE="http://ickle.sf.net"
-SLOT="0"
 
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="x86 sparc "
+IUSE=""
 
-DEPEND=">=dev-libs/libsigc++-1.0.4"
+DEPEND="=dev-libs/libsigc++-1.0*"
 
 src_compile() {
 	./configure --host=${CHOST} \
diff --git a/net-libs/libicq2000/libicq2000-0.3.2.ebuild b/net-libs/libicq2000/libicq2000-0.3.2.ebuild
index 3518faa12a0c..813f434be4df 100644
--- a/net-libs/libicq2000/libicq2000-0.3.2.ebuild
+++ b/net-libs/libicq2000/libicq2000-0.3.2.ebuild
@@ -1,15 +1,15 @@
-# 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-libs/libicq2000/libicq2000-0.3.2.ebuild,v 1.1 2002/08/04 15:00:49 phoenix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libicq2000/libicq2000-0.3.2.ebuild,v 1.1.1.1 2005/11/30 10:02:47 chriswhite Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="ICQ 200x compatible ICQ libraries."
 SRC_URI="mirror://sourceforge/libicq2000/${P}.tar.gz"
 HOMEPAGE="http://ickle.sf.net"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="x86"
+KEYWORDS="x86 sparc "
+IUSE=""
 
 DEPEND="=dev-libs/libsigc++-1.0*"
 
diff --git a/net-libs/libident/ChangeLog b/net-libs/libident/ChangeLog
index 0aeca17e7f91..6a4738f7ccaa 100644
--- a/net-libs/libident/ChangeLog
+++ b/net-libs/libident/ChangeLog
@@ -1,6 +1,45 @@
 # ChangeLog for net-libs/libident
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libident/ChangeLog,v 1.1 2003/05/13 14:30:17 twp Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libident/ChangeLog,v 1.1.1.1 2005/11/30 10:02:57 chriswhite Exp $
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> libident-0.32.ebuild:
+  Mark 0.32 stable on alpha
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> libident-0.22.ebuild:
+  Stable on ppc.
+
+  24 Apr 2005; Simon Stelling <blubb@gentoo.org> libident-0.22.ebuild:
+  stable on amd64
+
+  01 Apr 2005; Aron Griffis <agriffis@gentoo.org> libident-0.32.ebuild:
+  stable on ia64
+
+  05 Mar 2005; Markus Rothe <corsair@gentoo.org> libident-0.32.ebuild:
+  Stable on ppc64
+
+  01 Jan 2005; Markus Rothe <corsair@gentoo.org> libident-0.32.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+*libident-0.32 (01 Jan 2005)
+
+  01 Jan 2005; MATSUU Takuto <matsuu@gentoo.org> +libident-0.32.ebuild:
+  Version bumped.
+  Fixed HOMEPAGE and SRC_URI.
+
+  09 Aug 2004; Tom Martin <slarti@gentoo.org> libident-0.22.ebuild:
+  Marked ~amd64, added -fPIC to CFLAGS so it builds.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> libident-0.22.ebuild:
+  virtual/glibc -> virtual/libc
+
+  17 Apr 2004; David Holm <dholm@gentoo.org> libident-0.22.ebuild:
+  Added to ~ppc.
+
+  15 Apr 2004; Michael McCabe <randy@gentoo.org> libident-0.22.ebuild:
+  adding s390 keywords
+
+  17 Feb 2004; Aron Griffis <agriffis@gentoo.org> libident-0.22.ebuild:
+  stable on alpha and ia64
 
 *libident-0.22 (13 May 2003)
 
diff --git a/net-libs/libident/Manifest b/net-libs/libident/Manifest
index eff8d132dd20..0e55f785cf1d 100644
--- a/net-libs/libident/Manifest
+++ b/net-libs/libident/Manifest
@@ -1,3 +1,6 @@
-MD5 8dbc8e888deedbc6b5ba82fbe967d233 libident-0.22.ebuild 575
-MD5 19b730540fc2473bb89b04e8111a2f39 .libident-0.22.ebuild.swp 12288
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 b13a4cd8b8313f4d85cf89ddc4549988 ChangeLog 1601
+MD5 3cb9f94bca29e790f56ecbd06e3b2485 libident-0.32.ebuild 690
+MD5 5f0e4849c9a09c65a148d7312585994f libident-0.22.ebuild 716
+MD5 903bf677625739ff6766b4f570237bbc files/digest-libident-0.32 66
 MD5 5a23249eaedb219866d8a766a145994c files/digest-libident-0.22 64
diff --git a/net-libs/libident/libident-0.22.ebuild b/net-libs/libident/libident-0.22.ebuild
index 5fabf1047431..dd2d3077ef6e 100644
--- a/net-libs/libident/libident-0.22.ebuild
+++ b/net-libs/libident/libident-0.22.ebuild
@@ -1,17 +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-libs/libident/libident-0.22.ebuild,v 1.1 2003/05/13 14:30:17 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libident/libident-0.22.ebuild,v 1.1.1.1 2005/11/30 10:02:57 chriswhite Exp $
 
 DESCRIPTION="A small library to interface to the Ident protocol server"
 HOMEPAGE="ftp://ftp.lysator.liu.se/pub/ident/libs"
 SRC_URI="ftp://ftp.lysator.liu.se/pub/ident/libs/${P}.tar.gz"
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~arm ~hppa ~mips ~sparc ~x86"
-DEPEND="virtual/glibc"
+KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc s390 ~sparc x86"
+IUSE=""
+DEPEND="virtual/libc"
 
 src_compile() {
-	emake CFLAGS="${CFLAGS} -DHAVE_ANSIHEADERS" all || die
+	emake CFLAGS="${CFLAGS} -fPIC -DHAVE_ANSIHEADERS" all || die
 }
 
 src_install() {
diff --git a/net-libs/libident/libident-0.32.ebuild b/net-libs/libident/libident-0.32.ebuild
index 63cc161214fc..549cf3d422a7 100644
--- a/net-libs/libident/libident-0.32.ebuild
+++ b/net-libs/libident/libident-0.32.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-libs/libident/libident-0.32.ebuild,v 1.1 2005/01/01 06:41:03 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libident/libident-0.32.ebuild,v 1.1.1.1 2005/11/30 10:02:57 chriswhite Exp $
 
 DESCRIPTION="A small library to interface to the Ident protocol server"
 HOMEPAGE="http://www.simphalempin.com/dev/libident/"
@@ -8,7 +8,7 @@ SRC_URI="http://people.via.ecp.fr/~rem/libident/${P}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~hppa ~mips ~sparc ~x86 ~ia64 ~s390 ~ppc ~amd64"
+KEYWORDS="alpha ~amd64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 DEPEND="virtual/libc"
diff --git a/net-libs/libksnmp/ChangeLog b/net-libs/libksnmp/ChangeLog
index 540ced63b6b5..fa79158b2e1c 100644
--- a/net-libs/libksnmp/ChangeLog
+++ b/net-libs/libksnmp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-libs/libksnmp
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libksnmp/ChangeLog,v 1.1 2005/04/22 11:37:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libksnmp/ChangeLog,v 1.1.1.1 2005/11/30 10:02:48 chriswhite Exp $
+
+  08 May 2005; Gregorio Guidi <greg_g@gentoo.org> libksnmp-0.3.ebuild:
+  Correct dependencies.
 
 *libksnmp-0.3 (22 Apr 2005)
 
diff --git a/net-libs/libksnmp/Manifest b/net-libs/libksnmp/Manifest
index 4016dd74afb0..edc9232e5615 100644
--- a/net-libs/libksnmp/Manifest
+++ b/net-libs/libksnmp/Manifest
@@ -1,3 +1,4 @@
 MD5 b0ffbf580d1e24034c2f2cfbd21a0692 metadata.xml 350
-MD5 26efd24a09fe62cc8c4e95b9facb7658 libksnmp-0.3.ebuild 741
+MD5 a7e719e4cf5f70743b26abc7a873da1e libksnmp-0.3.ebuild 696
+MD5 b5e158e5515cbe9b2c95b899a4984c90 ChangeLog 613
 MD5 d47188a90249e0d000d5495a123582e1 files/digest-libksnmp-0.3 66
diff --git a/net-libs/libksnmp/libksnmp-0.3.ebuild b/net-libs/libksnmp/libksnmp-0.3.ebuild
index 5d2a91bd9dd6..943a48dc3711 100644
--- a/net-libs/libksnmp/libksnmp-0.3.ebuild
+++ b/net-libs/libksnmp/libksnmp-0.3.ebuild
@@ -1,23 +1,21 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libksnmp/libksnmp-0.3.ebuild,v 1.1 2005/04/22 11:37:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libksnmp/libksnmp-0.3.ebuild,v 1.1.1.1 2005/11/30 10:02:48 chriswhite Exp $
 
 inherit kde
-need-kde 3.1
 
 DESCRIPTION="KDE library to access SNMP statistics"
 HOMEPAGE="http://dev.gentoo.org/~flameeyes/kdeapps.xhtml#libksnmp"
 SRC_URI="http://digilander.libero.it/dgp85/files/${P}.tar.bz2"
-
 LICENSE="LGPL-2.1"
+
 SLOT="0"
-IUSE=""
 KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+DEPEND="net-analyzer/net-snmp"
 
-RDEPEND="${RDEPEND}
-	net-analyzer/net-snmp"
-DEPEND="${DEPEND}
-	doc? ( app-doc/doxygen )"
+need-kde 3.1
 
 src_compile() {
 	kde_src_compile
@@ -35,4 +33,3 @@ src_install() {
 #		dohtml -r ${S}/doc/html
 #	fi
 }
-
diff --git a/net-libs/liblockfile/ChangeLog b/net-libs/liblockfile/ChangeLog
index 356920c1aad6..55ee642c841b 100644
--- a/net-libs/liblockfile/ChangeLog
+++ b/net-libs/liblockfile/ChangeLog
@@ -1,9 +1,101 @@
 # ChangeLog for net-libs/liblockfile
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-libs/liblockfile/ChangeLog,v 1.1 2002/02/01 21:53:34 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/liblockfile/ChangeLog,v 1.1.1.1 2005/11/30 10:03:01 chriswhite Exp $
 
+  10 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> liblockfile-1.06.ebuild:
+  Stable on mips.
+
+  23 Jun 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  -files/liblockfile-1.03-gcc33.patch, -liblockfile-1.03-r1.ebuild,
+  -liblockfile-1.03-r2.ebuild:
+  remove older versions
+
+  23 Jun 2005; <plasmaroo@gentoo.org> liblockfile-1.06.ebuild:
+  Stable on IA64.
+
+  19 Jun 2005; Simon Stelling <blubb@gentoo.org> liblockfile-1.06.ebuild:
+  stable on amd64
+
+  18 Jun 2005; Markus Rothe <corsair@gentoo.org> liblockfile-1.06.ebuild:
+  Stable on ppc64
+
+  18 Jun 2005; Markus Rothe <corsair@gentoo.org> liblockfile-1.06.ebuild:
+  Stable on ppc64
+
+  18 Jun 2005; Stephanie Lockwood-Childs <wormo@gentoo.org>
+  liblockfile-1.06.ebuild:
+  stable on ppc, bug #96349
+
+  17 Jun 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  liblockfile-1.06.ebuild:
+  Stable on hppa. bug #96349
+
+  15 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  liblockfile-1.06.ebuild:
+  Stable on sparc
+
+  10 Jun 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  liblockfile-1.06.ebuild:
+  x86 and alpha stable
+
+  30 May 2005; Sven Wegener <swegener@gentoo.org>
+  liblockfile-1.03-r1.ebuild, liblockfile-1.03-r2.ebuild:
+  Moved from gcc.eclass to toolchain-funcs.eclass, bug #92745.
+
+  23 May 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  liblockfile-1.06.ebuild:
+  Don't use lazy bindings on dotlockfile
+
+*liblockfile-1.06 (18 May 2005)
+
+  18 May 2005; Fernando J. Pereda <ferdy@gentoo.org> +metadata.xml,
+  -liblockfile-1.03.ebuild, liblockfile-1.03-r2.ebuild,
+  +liblockfile-1.06.ebuild:
+  version bump wrt #66617. remove 1.03. Add missing metadata.
+
+  01 Apr 2005; Aron Griffis <agriffis@gentoo.org> liblockfile-1.03-r2.ebuild:
+  stable on ia64
+
+  19 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  liblockfile-1.03-r1.ebuild, liblockfile-1.03-r2.ebuild:
+  Marking 1.03-r2 stable amd64.  See bug #82304.
+
+*liblockfile-1.03-r2 (26 Jan 2005)
+
+  26 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +liblockfile-1.03-r2.ebuild:
+  Revbump for get_libdir fix and building shared lib.
+
+  15 Jul 2004; Tom Gall <tgall@gentoo.org> liblockfile-1.03-r1.ebuild:
+  stable on ppc64, bug #55668
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  liblockfile-1.03-r1.ebuild, liblockfile-1.03.ebuild:
+  virtual/glibc -> virtual/libc
+
+  25 Mar 2004; Joshua Kinard <kumba@gentoo.org> liblockfile-1.03-r1.ebuild,
+  liblockfile-1.03.ebuild:
+  Added ~mips to KEYWORDS.
+
+*liblockfile-1.03-r1 (28 Jul 2003)
+
+  03 Jul 2003; Guy Martin <gmsoft@gentoo.org> liblockfile-1.03-r1.ebuild :
+  Added hppa to KEYWORDS.
+
+  28 Jul 2003; Martin Schlemmer <azarah@gentoo.org>
+  liblockfile-1.03-r1.ebuild, files/liblockfile-1.03-gcc33.patch:
+  Fix gcc-3.3 issues.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *liblockfile-1.03 (1 Feb 2002)
 
+  14 Apr 2003; Aron Griffis <agriffis@gentoo.org> liblockfile-1.03.ebuild:
+  Mark stable on alpha
+
+  28 Sep 2002; Owen Stampflee <owen@gentoo.org> :
+  Added PPC to KEYWORDS.
+
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/net-libs/liblockfile/Manifest b/net-libs/liblockfile/Manifest
index e69de29bb2d1..f2de0035baff 100644
--- a/net-libs/liblockfile/Manifest
+++ b/net-libs/liblockfile/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 54ba812290d981dff554188bdbfa4910 liblockfile-1.06.ebuild 848
+MD5 8dbf56108a3d1becd7621e560807e32f ChangeLog 3636
+MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 5237ea115f3e61f8b3eed57a52002c05 files/digest-liblockfile-1.06 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFC+eQaEZCkKN40op4RAjZsAKCevDkBo+eEwkELPFGegr/LawXiJACdH+g+
+KL0MUdX62Z4z8geVfmy+GQc=
+=KASG
+-----END PGP SIGNATURE-----
diff --git a/net-libs/liblockfile/liblockfile-1.06.ebuild b/net-libs/liblockfile/liblockfile-1.06.ebuild
index 2504d1baad8c..830a05d07995 100644
--- a/net-libs/liblockfile/liblockfile-1.06.ebuild
+++ b/net-libs/liblockfile/liblockfile-1.06.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-libs/liblockfile/liblockfile-1.06.ebuild,v 1.1 2005/05/18 10:56:10 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/liblockfile/liblockfile-1.06.ebuild,v 1.1.1.1 2005/11/30 10:03:01 chriswhite Exp $
 
 inherit eutils multilib
 
@@ -12,10 +12,12 @@ DEPEND="virtual/libc"
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
 IUSE=""
 
 src_compile() {
+	# Do not use lazy bindings on setXid files
+	sed -i -e 's~-o dotlockfile~-Wl,-z,now &~g' Makefile.in
 	econf --with-mailgroup=mail --enable-shared || die
 	emake || die
 }
diff --git a/net-libs/libmonetra/ChangeLog b/net-libs/libmonetra/ChangeLog
index 360d4b22fa9d..64acb17ffad0 100644
--- a/net-libs/libmonetra/ChangeLog
+++ b/net-libs/libmonetra/ChangeLog
@@ -1,6 +1,64 @@
 # ChangeLog for net-libs/libmonetra
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libmonetra/ChangeLog,v 1.1 2004/08/06 16:40:00 robbat2 Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libmonetra/ChangeLog,v 1.1.1.1 2005/11/30 10:02:47 chriswhite Exp $
+
+  15 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  libmonetra-4.2.2.ebuild:
+  Stable on sparc
+
+  02 Oct 2005; Michael Hanselmann <hansmi@gentoo.org>
+  libmonetra-4.2.2.ebuild:
+  Stable on ppc.
+
+  26 Sep 2005; Robin H. Johnson <robbat2@gentoo.org>
+  libmonetra-4.2.2.ebuild:
+  Stable on x86, 238 days in ~x86.
+
+*libmonetra-5.2 (14 Sep 2005)
+
+  14 Sep 2005; Robin H. Johnson <robbat2@gentoo.org> +libmonetra-5.2.ebuild:
+  Bug #105977, version bump.
+
+  17 Apr 2005; Jason Wever <weeve@gentoo.org> libmonetra-4.1.ebuild:
+  Stable on SPARC.
+
+  01 Apr 2005; Aron Griffis <agriffis@gentoo.org> libmonetra-4.2.2.ebuild:
+  stable on ia64
+
+  04 Feb 2005; Marcus D. Hanwell <cryos@gentoo.org> libmonetra-4.1.ebuild:
+  Marked stable on amd64, as required by bug 60442.
+
+*libmonetra-4.2.2 (31 Jan 2005)
+
+  31 Jan 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +libmonetra-4.2.2.ebuild:
+  Bump. Bug #77838.
+
+*libmonetra-4.2 (28 Nov 2004)
+
+  28 Nov 2004; Robin H. Johnson <robbat2@gentoo.org> libmonetra-4.2.ebuild,
+  libmonetra-4.1.ebuild, metadata.xml:
+  Stable 4.1 on x86. Add 4.2 - bug #72784. Add metadata.xml.
+
+  14 Nov 2004; Jason Wever <weeve@gentoo.org> libmonetra-4.1.ebuild:
+  Added ~sparc keyword.
+
+  07 Nov 2004; Markus Rothe <corsair@gentoo.org> libmonetra-4.1.ebuild:
+  Stable on ppc64; bug #60442
+
+  07 Nov 2004; Markus Rothe <corsair@gentoo.org> libmonetra-4.1.ebuild:
+  Marked ~ppc64
+
+  01 Nov 2004; Lars Weiler <pylon@gentoo.org> libmonetra-4.1.ebuild:
+  Stable on ppc for PHP5, Bug #60442.
+
+  14 Aug 2004; David Holm <dholm@gentoo.org> libmonetra-4.1.ebuild:
+  Added to ~ppc.
+
+*libmonetra-4.1 (06 Aug 2004)
+
+  06 Aug 2004; Robin H. Johnson <robbat2@gentoo.org> +libmonetra-4.1.ebuild:
+  new upstream version, including my buildpatch.
 
 *libmonetra-4.0 (06 Aug 2004)
 
diff --git a/net-libs/libmonetra/Manifest b/net-libs/libmonetra/Manifest
index 9232afd36ad6..afb141f490b1 100644
--- a/net-libs/libmonetra/Manifest
+++ b/net-libs/libmonetra/Manifest
@@ -1,2 +1,22 @@
-MD5 b25607570d8c16cb102cc0e6acfb963d libmonetra-4.0.ebuild 641
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 45ca2654ccaad1f9b63c6829299fb99c libmonetra-4.1.ebuild 714
+MD5 be221f3278ed971b1c845f1aca7bfde2 libmonetra-4.0.ebuild 960
+MD5 9c0691df327624ffc735a33ca921494e libmonetra-4.2.ebuild 719
+MD5 ed074d80439c171aaefe1680ed19b9c8 libmonetra-4.2.2.ebuild 777
+MD5 6e467a65bb752da85d5e1ec947722dec libmonetra-5.2.ebuild 782
+MD5 411173e08c0d3d4fba67bfc86e812b52 ChangeLog 2123
+MD5 b0d485ea1a51fb83c70daedef2599272 metadata.xml 279
 MD5 216bca1622db024e6224bc0a9a4e2f09 files/digest-libmonetra-4.0 151
+MD5 712e09b1b696c860918a9f094c669cc2 files/digest-libmonetra-4.1 66
+MD5 1daa2406cd02e4d97c7a5ad0ce3a73ae files/digest-libmonetra-4.2 66
+MD5 a75b0e99a36499e467f105ad03d398cc files/digest-libmonetra-5.2 66
+MD5 c53147f9a93b9a99e18baac2111dd7c6 files/digest-libmonetra-4.2.2 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDefYoKRy60XGEcJIRAhEfAJ9dOgK+xMNe4o3n9xus/ifAnkO9OQCeMV7H
+A0w6X4pLhemQT9LD+ubO7Vk=
+=4E+M
+-----END PGP SIGNATURE-----
diff --git a/net-libs/libmonetra/libmonetra-4.0.ebuild b/net-libs/libmonetra/libmonetra-4.0.ebuild
index 14c590e15001..08c1703d7971 100644
--- a/net-libs/libmonetra/libmonetra-4.0.ebuild
+++ b/net-libs/libmonetra/libmonetra-4.0.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-libs/libmonetra/libmonetra-4.0.ebuild,v 1.1 2004/08/06 16:40:00 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libmonetra/libmonetra-4.0.ebuild,v 1.1.1.1 2005/11/30 10:02:47 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-libs/libmonetra/libmonetra-4.1.ebuild b/net-libs/libmonetra/libmonetra-4.1.ebuild
index 46d190e6dee0..93900d3821a7 100644
--- a/net-libs/libmonetra/libmonetra-4.1.ebuild
+++ b/net-libs/libmonetra/libmonetra-4.1.ebuild
@@ -1,24 +1,22 @@
-# 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-libs/libmonetra/libmonetra-4.1.ebuild,v 1.1 2004/08/06 18:29:57 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libmonetra/libmonetra-4.1.ebuild,v 1.1.1.1 2005/11/30 10:02:47 chriswhite Exp $
 
 inherit eutils
 
-DESCRIPTION="Library to allow connections to an MCVE Credit Card Processing Daemon via SSL, TCP/IP, and drop-files."
+DESCRIPTION="library for connecting to a MCVE Credit Card Processing Daemon via SSL, TCP/IP, and drop-files."
 HOMEPAGE="http://www.mainstreetsoftworks.com/"
 SRC_URI="ftp://ftp.mcve.com/pub/libmcve/${P}.tar.gz
-		http://www.mainstreetsoftworks.com/freedist/${P}.tar.gz"
+	http://www.mainstreetsoftworks.com/freedist/${P}.tar.gz"
+
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~hppa ~ia64 ppc ~s390 x86 ppc64 sparc amd64"
 IUSE=""
-DEPEND="dev-libs/openssl sys-devel/gcc"
 
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
+DEPEND="dev-libs/openssl
+	sys-devel/gcc"
 
 src_install() {
-	einstall || die "einstall failed"
+	make install DESTDIR="${D}" || die "einstall failed"
 }
diff --git a/net-libs/libmonetra/libmonetra-4.2.2.ebuild b/net-libs/libmonetra/libmonetra-4.2.2.ebuild
index 801f4d390f31..81a24f19fb68 100644
--- a/net-libs/libmonetra/libmonetra-4.2.2.ebuild
+++ b/net-libs/libmonetra/libmonetra-4.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-libs/libmonetra/libmonetra-4.2.2.ebuild,v 1.1 2005/01/31 20:21:25 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libmonetra/libmonetra-4.2.2.ebuild,v 1.1.1.1 2005/11/30 10:02:47 chriswhite Exp $
 
 DESCRIPTION="library for connecting to a MCVE Credit Card Processing Daemon via SSL, TCP/IP, and drop-files."
 HOMEPAGE="http://www.mainstreetsoftworks.com/"
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.mcve.com/pub/libmcve/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~arm ~hppa ~ia64 ~ppc ~s390 ~x86 ppc64 ~sparc ~amd64"
+KEYWORDS="alpha ~amd64 arm hppa ia64 ppc ppc64 s390 sparc x86"
 IUSE=""
 RDEPEND="dev-libs/openssl"
 DEPEND="${RDEPEND}
diff --git a/net-libs/libmonetra/libmonetra-4.2.ebuild b/net-libs/libmonetra/libmonetra-4.2.ebuild
index 7f87fa42a37f..c2cf4f9afbf6 100644
--- a/net-libs/libmonetra/libmonetra-4.2.ebuild
+++ b/net-libs/libmonetra/libmonetra-4.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-libs/libmonetra/libmonetra-4.2.ebuild,v 1.1 2004/11/29 07:11:00 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libmonetra/libmonetra-4.2.ebuild,v 1.1.1.1 2005/11/30 10:02:47 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-libs/libmonetra/libmonetra-5.2.ebuild b/net-libs/libmonetra/libmonetra-5.2.ebuild
index 21c450c3f27f..6d779a38b8a2 100644
--- a/net-libs/libmonetra/libmonetra-5.2.ebuild
+++ b/net-libs/libmonetra/libmonetra-5.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-libs/libmonetra/libmonetra-5.2.ebuild,v 1.1 2005/09/14 17:05:44 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libmonetra/libmonetra-5.2.ebuild,v 1.1.1.1 2005/11/30 10:02:47 chriswhite Exp $
 
 DESCRIPTION="library for connecting to a MCVE Credit Card Processing Daemon via SSL, TCP/IP, and drop-files."
 HOMEPAGE="http://www.mainstreetsoftworks.com/"
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.mcve.com/pub/libmcve/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~arm ~hppa ~ia64 ~ppc ~s390 ~x86 ~ppc64 ~sparc ~amd64"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 RDEPEND="dev-libs/openssl"
 DEPEND="${RDEPEND}
diff --git a/net-libs/libnet/ChangeLog b/net-libs/libnet/ChangeLog
index bee98b6b14b9..54b2046eb86a 100644
--- a/net-libs/libnet/ChangeLog
+++ b/net-libs/libnet/ChangeLog
@@ -1,6 +1,155 @@
 # ChangeLog for net-libs/libnet
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnet/ChangeLog,v 1.1 2002/02/01 21:53:34 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnet/ChangeLog,v 1.1.1.1 2005/11/30 10:03:01 chriswhite Exp $
+
+  25 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  libnet-1.0.2a-r3.ebuild:
+  Added to ~hppa.
+
+  27 Jun 2005; Markus Rothe <corsair@gentoo.org> libnet-1.0.2a-r3.ebuild:
+  Stable on ppc64
+
+  15 May 2005; Markus Rothe <corsair@gentoo.org> libnet-1.0.2a-r3.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  13 Apr 2005; Tom Gall <tgall@gentoo.org>
+  libnet-1.1.2.1.ebuild, libnet-1.1.2.1-r1.ebuild:
+  marked stable and ~ppc64 respectively
+
+*libnet-1.1.2.1-r1 (23 Mar 2005)
+
+  23 Mar 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/libnet-1.1.2.1-autotools.patch,
+  +files/libnet-1.1.2.1-fix-chksum.patch, +libnet-1.1.2.1-r1.ebuild:
+  Add patches from debian to generate a libnet.so for linking #82926.
+
+  11 Jan 2005; Daniel Black <dragonheart@gentoo.org> files/1.0.2a-slot.patch:
+  expanded patch to fix selftest routine.
+
+  25 Jul 2004; Lina Pezzella <j4rg0n@gentoo.org>
+  Fixed Manifest.
+
+  25 Jul 2004; Alexander Plank <alexander@gentoo.org> libnet-1.1.2.1.ebuild:
+  Added macos keyword (thanks Ryan Ramsey <admin@v3rt3x.mine.nu>)
+
+  08 May 2004; Joshua Kinard <kumba@gentoo.org> libnet-1.1.2.1.ebuild:
+  Added gnuconfig support for mips.
+
+*libnet-1.1.2.1 (01 Apr 2004)
+
+  01 Apr 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #46327 by Alberto Ornaghi.
+
+*libnet-1.1.2 (28 Mar 2004)
+
+  28 Mar 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #45876 by Alberto Ornaghi.
+
+  05 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org> libnet-1.1.1.ebuild:
+  stable on sparc
+
+  30 Jan 2004; Grant Goodyear <g2boojum@hotmail.com> libnet-1.1.1.ebuild,
+  metadata.xml:
+  Marking 1.1.1 x86 to enable netwox
+
+  17 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  libnet-1.0.2a-r3.ebuild:
+  update SRC_URI for old libnet (bug 38474); tidy
+
+  26 Dec 2003; Jason Wever <weeve@gentoo.org> libnet-1.1.1.ebuild:
+  Added ~sparc keyword.
+
+*libnet-1.1.1 (30 Nov 2003)
+
+  30 Nov 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #34457.
+
+  14 Nov 2003; Brad House <brad_mssw@gentoo.org> libnet-1.1.0-r3.ebuild:
+  mark stable on amd64
+
+  13 Nov 2003; <tuxus@gentoo.org> libnet-1.1.0-r3.ebuild:
+  added mips to KEYWORDS
+
+  04 Nov 2003; Jason Wever <weeve@gentoo.org> libnet-1.0.2a-r3.ebuild:
+  Marked stable too early, changing back to ~sparc.
+
+  01 Nov 2003; Jason Wever <weeve@gentoo.org> libnet-1.0.2a-r3.ebuild:
+  Marked stable on sparc.
+
+  08 Oct 2003; Joel Hill <hillster@gentoo.org> libnet-1.1.0-r3.ebuild:
+  marking stable.
+
+*libnet-1.1.0-r3 (21 Aug 2003)
+
+  21 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  Stick libnet into better SLOT's ... that is, 1.0.x is deprecated so
+  libnet-1.1.x now occupies libnet.a, libnet.h, and libnet-config ... #17772
+
+*libnet-1.0.2a-r3 (21 Aug 2003)
+
+  21 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  While libnet-1.0.x now occupies libnet-1.0.a, libnet-1.0.h, and
+  libnet-1.0-config ... #17772
+
+*libnet-1.1.0-r2 (16 Aug 2003)
+
+  16 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  Rather than using ${PV} for file tagging, use ${SLOT} ...
+  Also, move library to /usr/lib/libnet${SLOT}.a
+
+*libnet-1.1.0-r1 (02 Oct 2002)
+
+  21 May 2003; Tavis Ormandy <taviso@gentoo.org> libnet-1.1.0-r1.ebuild:
+  arking stable on alpha.
+
+  22 Apr 2003; Brandon Low <lostlogic@gentoo.org> libnet-1.1.0-r1.ebuild:
+  Change supersed dependencies
+
+  25 Mar 2003; Aron Griffis <agriffis@gentoo.org> libnet-1.1.0-r1.ebuild:
+  Add ~alpha to KEYWORDS
+
+*libnet-1.0.2a-r2 (02 Oct 2002)
+
+  24 Jul 2003; Hanno Boeck <hanno@gentoo.org> libnet-1.0.2a-r2.ebuild,
+  files/libnet-gcc33-fix:
+  Compile fix for gcc 3.3.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+
+  28 Apr 2003; Zach Welch <zwelch@gentoo.org> libnet-1.0.2a-r2.ebuild:
+  add arm keyword
+
+  02 Oct 2002; Seemant Kulleen <seemant@gentoo.org> libnet-1.0.2a-r2.ebuild
+  files/digest-libnet-1.0.2a-r2 libnet-1.1.0-r1.ebuild
+  files/digest-libnet-1.1.0-r1 :
+
+  Small fixes which include manpage installation and CFLAGS being honoured.
+  Thanks to: kevin@aptbasilicata.it (Maurizio Disimino) j2ee in #-dev in bug
+  #7754.  Now the two are SLOT'd
+
+*libnet-1.1.0 (27 Aug 2002)
+
+  02 Sep 2002: Brandon Low <lostlogic@gentoo.org>
+  This package is NOT backward compatible with previous versoins of libnet.
+  Additionally the install process forgets to install libnet-config which
+  is necessary for library configuration, Added that script, and trying to
+  figure out what is b0rken with this new library.
+
+  27 Aug 2002; Daniel Ahlberg <aliz@gentoo.org:
+  Version bump. Closes #7039. Ebuild contributed by kevin@aptbasilicata.it.
+
+*libnet-1.0.2a-r1 (27 Mar 2002)
+
+  06 Aug 2002; Mark Guertin <gerk@gentoo.org>:
+  Added ppc to keywords
+
+  11 May 2002; Wout Mertens <wmertens@gentoo.org> libnet-1.0.2a-r1.ebuild :
+
+  Made it copy libnet-config as well, so laptop-net builds.
+
+  27 Mar 2002; Seemant Kulleen <seemant@gentoo.org> libnet-1.0.2a-r1.ebuild :
+
+  Updated ebuild syntax, and man pages/LFH fixes by Matthew Kennedy.
 
 *libnet-1.0.2a (1 Feb 2002)
 
diff --git a/net-libs/libnet/Manifest b/net-libs/libnet/Manifest
index bfbb9b78c133..1c3462f18239 100644
--- a/net-libs/libnet/Manifest
+++ b/net-libs/libnet/Manifest
@@ -1,9 +1,10 @@
-MD5 c8bca701f0fe8de3e74f19d19fb9fd47 libnet-1.1.0-r1.ebuild 1277
-MD5 a244002bad54005d1bb1559d222489b8 libnet-1.0.2a-r2.ebuild 951
-MD5 c0e58d2e7339eac7da51c4e4bd2c3fd7 ChangeLog 2146
-MD5 dcc85e6f91bb7bef691701db18ac5b3b libnet-1.0.2a-r1.ebuild 1018
-MD5 2206e4eed47ef9c83c5a58287d60d3b5 libnet-1.1.0.ebuild 935
-MD5 d43e05bf93cf1aa86c23be9c1ab2f009 files/digest-libnet-1.0.2a-r1 58
-MD5 d43e05bf93cf1aa86c23be9c1ab2f009 files/digest-libnet-1.0.2a-r2 58
-MD5 dee8fc87567b0aca2bfdc055d60a5151 files/digest-libnet-1.1.0 64
-MD5 dee8fc87567b0aca2bfdc055d60a5151 files/digest-libnet-1.1.0-r1 64
+MD5 a7ad7692946c746d34a59f083f02150e ChangeLog 5599
+MD5 b682ce1ca3b1ace803fdd64519e455b7 libnet-1.0.2a-r3.ebuild 1615
+MD5 0958d4d7d21ed3915be5ea9b71255c61 libnet-1.1.2.1-r1.ebuild 1087
+MD5 e44a844390f3e185ec4508e0cce5c5f0 metadata.xml 1083
+MD5 2c90cae2a7fff0c8bf6fbee5977bfda0 files/1.0.2a-slot.patch 7696
+MD5 69c5edaa98f4890a0b542a8fe9937383 files/digest-libnet-1.0.2a-r3 65
+MD5 2618eca70575dcefd452e252db8fe704 files/digest-libnet-1.1.2.1-r1 67
+MD5 7e928170600bea8ed4a0d079b83c80ac files/libnet-1.1.2.1-autotools.patch 2180
+MD5 668189bf87cda8daeaf250146bd88331 files/libnet-1.1.2.1-fix-chksum.patch 564
+MD5 503929f0e619836305f1e58a151baee4 files/libnet-gcc33-fix 563
diff --git a/net-libs/libnet/files/1.0.2a-slot.patch b/net-libs/libnet/files/1.0.2a-slot.patch
index af0b92f2c3a1..fa1e5a6508bc 100644
--- a/net-libs/libnet/files/1.0.2a-slot.patch
+++ b/net-libs/libnet/files/1.0.2a-slot.patch
@@ -115,3 +115,80 @@ diff -ur Libnet-1.0.2a.orig/libnet-config.in Libnet-1.0.2a/libnet-config.in
          [--libs]
          [--cflags]
 Only in Libnet-1.0.2a/support/bpf-lkm/OpenBSD: OpenBSD
+--- Libnet-1.0.2a/test/Ethernet/Makefile.in.orig	2000-05-25 09:58:49.000000000 +0930
++++ Libnet-1.0.2a/test/Ethernet/Makefile.in	2005-01-11 23:32:08.825695008 +0930
+@@ -10,7 +10,7 @@
+ CFLAGS      =   @CFLAGS@
+ OBJECTS     =   arp.o tcp.o icmp_mask.o get_address.o poink.o
+ DEFINES     +=  @DEFS@
+-LIBS        =   -L../../lib/ -lnet @ADDITIONAL_LIBS@
++LIBS        =   -L../../lib/ -lnet-1.0 @ADDITIONAL_LIBS@
+ 
+ .c.o:
+ 	$(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
+--- Libnet-1.0.2a/test/ICMP/Makefile.in.orig	2000-05-25 09:58:49.000000000 +0930
++++ Libnet-1.0.2a/test/ICMP/Makefile.in	2005-01-11 23:32:08.826694856 +0930
+@@ -15,7 +15,7 @@
+ 		ping_of_death.o
+ 
+ DEFINES     +=  @DEFS@
+-LIBS        =   -L../../lib/ -lnet @ADDITIONAL_LIBS@
++LIBS        =   -L../../lib/ -lnet-1.0 @ADDITIONAL_LIBS@
+ 
+ .c.o:
+ 	$(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
+--- Libnet-1.0.2a/test/IP/Makefile.in.orig	2000-05-25 09:58:49.000000000 +0930
++++ Libnet-1.0.2a/test/IP/Makefile.in	2005-01-11 23:32:08.826694856 +0930
+@@ -10,7 +10,7 @@
+ OBJECTS     =   
+ 
+ DEFINES     +=  @DEFS@
+-LIBS        =   -L../../lib/ -lnet @ADDITIONAL_LIBS@
++LIBS        =   -L../../lib/ -lnet-1.0 @ADDITIONAL_LIBS@
+ 
+ .c.o:
+ 	$(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
+--- Libnet-1.0.2a/test/OSPF/Makefile.in.orig	2000-05-25 09:58:49.000000000 +0930
++++ Libnet-1.0.2a/test/OSPF/Makefile.in	2005-01-11 23:32:08.826694856 +0930
+@@ -12,7 +12,7 @@
+ 		ospf_request.o   \
+ 
+ DEFINES     +=  @DEFS@
+-LIBS        =   -L../../lib/ -lnet @ADDITIONAL_LIBS@
++LIBS        =   -L../../lib/ -lnet-1.0 @ADDITIONAL_LIBS@
+ 
+ .c.o:
+ 	$(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
+--- Libnet-1.0.2a/test/Random/Makefile.in.orig	2000-05-25 09:58:49.000000000 +0930
++++ Libnet-1.0.2a/test/Random/Makefile.in	2005-01-11 23:32:08.826694856 +0930
+@@ -9,7 +9,7 @@
+ CFLAGS      =   @CFLAGS@
+ OBJECTS     =   prand_trials.o
+ DEFINES     +=  @DEFS@
+-LIBS        =   -L../../lib/ -lnet @ADDITIONAL_LIBS@
++LIBS        =   -L../../lib/ -lnet-1.0 @ADDITIONAL_LIBS@
+ 
+ .c.o:
+ 	$(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
+--- Libnet-1.0.2a/test/TCP/Makefile.in.orig	2000-05-25 09:58:49.000000000 +0930
++++ Libnet-1.0.2a/test/TCP/Makefile.in	2005-01-11 23:32:08.826694856 +0930
+@@ -13,7 +13,7 @@
+                 tcp+data+ipopt.o
+ 
+ DEFINES     +=  @DEFS@
+-LIBS        =   -L../../lib/ -lnet @ADDITIONAL_LIBS@
++LIBS        =   -L../../lib/ -lnet-1.0 @ADDITIONAL_LIBS@
+ 
+ .c.o:
+ 	$(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
+--- Libnet-1.0.2a/test/UDP/Makefile.in.orig	2000-05-25 09:58:49.000000000 +0930
++++ Libnet-1.0.2a/test/UDP/Makefile.in	2005-01-11 23:32:08.827694704 +0930
+@@ -11,7 +11,7 @@
+                 udp+data.o
+ 
+ DEFINES     +=  @DEFS@
+-LIBS        =   -L../../lib/ -lnet @ADDITIONAL_LIBS@
++LIBS        =   -L../../lib/ -lnet-1.0 @ADDITIONAL_LIBS@
+ 
+ .c.o:
+ 	$(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
diff --git a/net-libs/libnet/files/digest-libnet-1.0.2a-r3 b/net-libs/libnet/files/digest-libnet-1.0.2a-r3
index b7debea8cbbc..9a74b0fc1c4b 100644
--- a/net-libs/libnet/files/digest-libnet-1.0.2a-r3
+++ b/net-libs/libnet/files/digest-libnet-1.0.2a-r3
@@ -1 +1 @@
-MD5 ddf53f0f484184390e8c2a1bd0853667 libnet.tar.gz 140191
+MD5 ddf53f0f484184390e8c2a1bd0853667 libnet-1.0.2a.tar.gz 140191
diff --git a/net-libs/libnet/libnet-1.0.2a-r3.ebuild b/net-libs/libnet/libnet-1.0.2a-r3.ebuild
index 13378d277540..37799c14bfa8 100644
--- a/net-libs/libnet/libnet-1.0.2a-r3.ebuild
+++ b/net-libs/libnet/libnet-1.0.2a-r3.ebuild
@@ -1,34 +1,35 @@
-# 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-libs/libnet/libnet-1.0.2a-r3.ebuild,v 1.1 2003/08/21 04:17:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnet/libnet-1.0.2a-r3.ebuild,v 1.1.1.1 2005/11/30 10:03:01 chriswhite Exp $
 
 inherit eutils
 
 DESCRIPTION="library to provide an API for commonly used low-level network functions (mainly packet injection)"
 HOMEPAGE="http://www.packetfactory.net/libnet/"
-SRC_URI="http://www.packetfactory.net/libnet/dist/${PN}.tar.gz"
+SRC_URI="http://www.packetfactory.net/libnet/dist/deprecated/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="1.0"
-KEYWORDS="x86 ppc sparc arm alpha amd64"
+KEYWORDS="alpha amd64 ~hppa ppc ppc64 sparc x86"
+IUSE=""
 
 S=${WORKDIR}/Libnet-${PV}
 
 src_unpack() {
- 	unpack ${A}
-	epatch ${FILESDIR}/libnet-gcc33-fix
-	epatch ${FILESDIR}/${PV}-slot.patch
-	cd ${S}
+	unpack ${A}
+	epatch "${FILESDIR}"/libnet-gcc33-fix
+	epatch "${FILESDIR}"/${PV}-slot.patch
+	cd "${S}"
 	mv libnet-config.in libnet-${SLOT}-config.in || die "moving libnet-config"
-	cd ${S}/include
+	cd "${S}"/include
 	ln -s libnet.h libnet-${SLOT}.h
 	cd libnet
 	for f in *.h ; do
 		ln -s ${f} ${f/-/-${SLOT}-} || die "linking ${f}"
 	done
-	cd ${S}/doc
+	cd "${S}"/doc
 	ln -s libnet.3 libnet-${SLOT}.3 || die "linking manpage"
-	cd ${S}
+	cd "${S}"
 	autoconf || die
 }
 
@@ -38,9 +39,11 @@ src_compile() {
 }
 
 src_install() {
-	make install DESTDIR=${D} || die
+	make DESTDIR="${D}" install || die "make install failed"
+	doman "${D}"/usr/man/man3/libnet-1.0.3
+	rm -r "${D}"/usr/man
 
-	dodoc VERSION doc/{README,TODO*,CHANGELOG*,COPYING}
+	dodoc VERSION doc/{README,TODO*,CHANGELOG*}
 	newdoc README README.1st
 	docinto example ; dodoc example/libnet*
 	docinto Ancillary ; dodoc doc/Ancillary/*
diff --git a/net-libs/libnet/libnet-1.1.2.1-r1.ebuild b/net-libs/libnet/libnet-1.1.2.1-r1.ebuild
index 91fd7d38b5b8..826a42debcfd 100644
--- a/net-libs/libnet/libnet-1.1.2.1-r1.ebuild
+++ b/net-libs/libnet/libnet-1.1.2.1-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-libs/libnet/libnet-1.1.2.1-r1.ebuild,v 1.1 2005/03/23 00:54:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnet/libnet-1.1.2.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:03:01 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.packetfactory.net/libnet/dist/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="1.1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ~ppc-macos ppc64 s390 sh sparc x86"
 IUSE="doc"
 
 DEPEND="sys-devel/autoconf"
diff --git a/net-libs/libnet/metadata.xml b/net-libs/libnet/metadata.xml
index 20ce219711a2..152fa1e19d26 100644
--- a/net-libs/libnet/metadata.xml
+++ b/net-libs/libnet/metadata.xml
@@ -1,5 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
+<herd>netmon</herd>
+<maintainer>
+  <email>vapier@gentoo.org</email>
+</maintainer>
+<longdescription>
+Libnet is a high-level API (toolkit) allowing the application 
+programmer to construct and inject network packets. It provides a 
+portable and simplified interface for low-level network packet 
+shaping, handling and injection. Libnet hides much of the tedium 
+of packet creation from the application programmer such as 
+multiplexing, buffer management, arcane packet header 
+information, byte-ordering, OS-dependent issues, and much more. 
+Libnet features portable packet creation interfaces at the IP 
+layer and link layer, as well as a host of supplementary and 
+complementary functionality. Using libnet, quick and simple 
+packet assembly applications can be whipped up with little 
+effort. With a bit more time, more complex programs can be 
+written (Traceroute and ping were easily rewritten using libnet 
+and libpcap).
+</longdescription>
 </pkgmetadata>
diff --git a/net-libs/libnids/ChangeLog b/net-libs/libnids/ChangeLog
index bcbd69a36e0b..106eb02cdaef 100644
--- a/net-libs/libnids/ChangeLog
+++ b/net-libs/libnids/ChangeLog
@@ -1,11 +1,86 @@
 # ChangeLog for net-libs/libnids
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/ChangeLog,v 1.1 2002/02/01 21:53:34 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/ChangeLog,v 1.1.1.1 2005/11/30 10:02:51 chriswhite Exp $
 
-*libnids-1.16 (1 Feb 2002)
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> libnids-1.18.ebuild:
+  Mark 1.18 stable on alpha
 
+  27 Jun 2005; Marcelo Goes <vanquirius@gentoo.org> libnids-1.20.ebuild:
+  Old HOMEPAGE works again, setting it back.
+
+  27 Jun 2005; Marcelo Goes <vanquirius@gentoo.org> libnids-1.20.ebuild:
+  ~amd64 keyword. Tested using sample programs from samples directory. Also
+  updated the HOMEPAGE, as the current one leads to an online store.
+
+  17 May 2005; Michael Hanselmann <hansmi@gentoo.org> libnids-1.18.ebuild:
+  Stable on ppc.
+
+  20 Mar 2005; Marcelo Goes <vanquirius@gentoo.org> libnids-1.18.ebuild:
+  install_prefix="${D}" for bug 86024.
+  Thanks to Marco Morales <soulse@gmail.com> for reporting.
+
+  11 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> libnids-1.20.ebuild:
+  Re-add install_prefix=${D} for bug 84699.
+
+*libnids-1.20 (24 Feb 2005)
+
+  24 Feb 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/libnids-1.20-chksum.c-ebx.patch, libnids-1.18.ebuild,
+  +libnids-1.20.ebuild:
+  Version bump for bug 81689; also fixed src_install (setting install_prefix
+  to ${D} caused part of ${D} to be installed).
+
+  30 Jan 2005; Daniel Black <dragonheart@gentoo.org> libnids-1.18.ebuild:
+  Transition dependancy from net-libs/libpcap to virtual/libpcap
+
+  17 Dec 2004; Eldad Zack <eldad@gentoo.org> -files/1.16-libnet-1.0.patch,
+  +files/libnids-1.18-chksum.c-ebx.patch, -files/libnids_gcc33_fix,
+  libnids-1.18.ebuild:
+  Cleanup. Added patch to prevent clobbering of ebx, in order to compile cleanly
+  with gcc 3.5. Thanks to Thomas <Thomas.Eschenbacher@gmx.de>. Closes bug
+  #55906.
+
+  03 Sep 2004; Caleb Tennis <caleb@gentoo.org> -libnids-1.16-r1.ebuild,
+  -libnids-1.16.ebuild, -libnids-1.17_rc1.ebuild:
+  removing old versions
+
+  10 Nov 2003; <solar@gentoo.org> libnids-1.18.ebuild:
+  bumping to stable on x86
+
+*libnids-1.18 (04 Nov 2003)
+
+  04 Nov 2003; <solar@gentoo.org> libnids-1.18.ebuild:
+  version bump, security fix #32724
+
+*libnids-1.17_rc1 (21 Aug 2003)
+
+  21 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump.
+
+*libnids-1.16-r1 (21 Aug 2003)
+
+  21 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  Add SLOT support with libnet SLOT support #17772.  This
+  deprecates 1.16 and makes 1.17+ the default.
+
+*libnids-1.16 (01 Feb 2002)
+
+  21 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  Add ~ppc KEYWORDS #27012.
+
+  26 Jul 2003; Hanno Boeck <hanno@gentoo.org> libnids-1.16.ebuild,
+  files/libnids_gcc33_fix.gz:
+  Fix compile errors with gcc 3.3.
+
+  23 Jul 2003; Tavis Ormandy <taviso@gentoo.org> libnids-1.16.ebuild:
+  marking ~alpha
+
+  07 Mar 20003; Martin Holzer <mholzer@gentoo.org> libnids-1.16.ebuild :
+  Fixed Depend to libnet-1.0*. Closes #17017.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
   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-libs/libnids/Manifest b/net-libs/libnids/Manifest
index e69de29bb2d1..34e49e9edc29 100644
--- a/net-libs/libnids/Manifest
+++ b/net-libs/libnids/Manifest
@@ -0,0 +1,8 @@
+MD5 c9a3c259574bc6c3d7583402ad67e763 metadata.xml 311
+MD5 123701cb043e8e8cd4cc7da4226d7293 ChangeLog 3394
+MD5 59862751a513684a6a20ac524d322e09 libnids-1.20.ebuild 900
+MD5 23e6e0bfb9a82f43e087cceb3cd73ea1 libnids-1.18.ebuild 930
+MD5 9562afeb0aef6794b0b94779fab9c381 files/libnids-1.20-chksum.c-ebx.patch 718
+MD5 b8821b8ac4cbf9a8d5c0ce7eadc5f710 files/digest-libnids-1.18 64
+MD5 8c22ab811547cb71906e15bee2d4160e files/digest-libnids-1.20 64
+MD5 4f1acaf2ec159ddfba1e456f21c99112 files/libnids-1.18-chksum.c-ebx.patch 615
diff --git a/net-libs/libnids/libnids-1.18.ebuild b/net-libs/libnids/libnids-1.18.ebuild
index a38bc0f89fc1..56c209044f58 100644
--- a/net-libs/libnids/libnids-1.18.ebuild
+++ b/net-libs/libnids/libnids-1.18.ebuild
@@ -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: /var/cvsroot/gentoo-x86/net-libs/libnids/libnids-1.18.ebuild,v 1.1 2003/11/04 18:14:17 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/libnids-1.18.ebuild,v 1.1.1.1 2005/11/30 10:02:51 chriswhite Exp $
 
 inherit eutils
 
@@ -10,29 +10,24 @@ SRC_URI="http://www.packetfactory.net/Projects/libnids/dist/${P/_}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="1.1"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="alpha ppc ~sparc x86"
+IUSE=""
 
-DEPEND="net-libs/libpcap
+DEPEND="virtual/libpcap
 	>=net-libs/libnet-1.1.0-r3"
 
-S=${WORKDIR}/${P/_rc1}
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	# patch no longer patches clean >=libnids-1.18
-	# epatch ${FILESDIR}/libnids_gcc33_fix
+	epatch ${FILESDIR}/${P}-chksum.c-ebx.patch
 }
 
 src_compile() {
-	econf --enable-shared || die
-	make || die
+	econf --enable-shared || die "econf failed"
+	make || die "emake failed"
 }
 
 src_install() {
-	einstall install_prefix=${D} || die
-	mkdir -p ${D}/usr/include/ ${D}/usr/share/man/man3/
-	cp -dpR ${D}/${D}/* ${D}/
-	rm -rf ${D}/${D} ${D}/var
+	make install_prefix="${D}" install || die "make install failed"
 	dodoc CHANGES COPYING CREDITS MISC README
 }
diff --git a/net-libs/libnids/libnids-1.20.ebuild b/net-libs/libnids/libnids-1.20.ebuild
index 6cedec1f699f..e16ac740f38f 100644
--- a/net-libs/libnids/libnids-1.20.ebuild
+++ b/net-libs/libnids/libnids-1.20.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-libs/libnids/libnids-1.20.ebuild,v 1.1 2005/02/25 00:43:39 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/libnids-1.20.ebuild,v 1.1.1.1 2005/11/30 10:02:51 chriswhite Exp $
 
 inherit eutils
 
 DESCRIPTION="emulates the IP stack of Linux 2.0.x and offers IP defragmentation, TCP stream assembly and TCP port scan detection."
-HOMEPAGE="http://libnids.sourceforget.net"
+HOMEPAGE="http://libnids.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="1.2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="~amd64 ~x86 ~ppc ~sparc ~alpha"
 IUSE=""
 
 DEPEND="virtual/libpcap
@@ -28,6 +28,6 @@ src_compile() {
 }
 
 src_install() {
-	einstall || die "make install failed"
+	make install_prefix="${D}" install || die "make install failed"
 	dodoc CHANGES COPYING CREDITS MISC README
 }
diff --git a/net-libs/libopm/ChangeLog b/net-libs/libopm/ChangeLog
index 4d3254c37ce6..e3aed4aacd69 100644
--- a/net-libs/libopm/ChangeLog
+++ b/net-libs/libopm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/libopm
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libopm/ChangeLog,v 1.1 2004/02/18 00:16:50 zul Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libopm/ChangeLog,v 1.1.1.1 2005/11/30 10:03:02 chriswhite Exp $
+
+  10 May 2005; David Holm <dholm@gentoo.org> libopm-3.1.2.ebuild:
+  Added to ~ppc.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> libopm-3.1.2.ebuild:
+  virtual/glibc -> virtual/libc
 
 *libopm-3.1.2 (17 Feb 2004)
 
diff --git a/net-libs/libopm/Manifest b/net-libs/libopm/Manifest
index 92a220ee492e..51b08a66ac81 100644
--- a/net-libs/libopm/Manifest
+++ b/net-libs/libopm/Manifest
@@ -1,2 +1,4 @@
-MD5 b8090f599a2d2e018102c3a8426a330c libopm-3.1.2.ebuild 724
+MD5 11cee90927406cba168bc98f1a0b312d ChangeLog 590
+MD5 0fbcb85f8bfef7a17c88fc7d54623028 libopm-3.1.2.ebuild 816
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 MD5 36f48b28d0fc536e21e69aa648526fee files/digest-libopm-3.1.2 62
diff --git a/net-libs/libopm/libopm-3.1.2.ebuild b/net-libs/libopm/libopm-3.1.2.ebuild
index 5c026fe90030..c17262ce9801 100644
--- a/net-libs/libopm/libopm-3.1.2.ebuild
+++ b/net-libs/libopm/libopm-3.1.2.ebuild
@@ -1,16 +1,16 @@
-# 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-libs/libopm/libopm-3.1.2.ebuild,v 1.1 2004/02/18 00:16:50 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libopm/libopm-3.1.2.ebuild,v 1.1.1.1 2005/11/30 10:03:02 chriswhite Exp $
 
 DESCRIPTION="Blitzed Open Proxy Monitor Library"
 HOMEPAGE="http://www.blitzed.org/bopm/"
 SRC_URI="http://static.blitzed.org/www.blitzed.org/bopm/files/bopm-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 IUSE="doc"
 
-RDEPEND="virtual/glibc"
+RDEPEND="virtual/libc"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
diff --git a/net-libs/libosip/ChangeLog b/net-libs/libosip/ChangeLog
index b1065ca41282..9ec7c89f4858 100644
--- a/net-libs/libosip/ChangeLog
+++ b/net-libs/libosip/ChangeLog
@@ -1,9 +1,89 @@
 # ChangeLog for net-libs/libosip
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header:
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libosip/ChangeLog,v 1.1.1.1 2005/11/30 10:02:59 chriswhite Exp $
+
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org> libosip-2.2.1.ebuild:
+  Mark 2.2.1 stable on alpha
+
+  23 Sep 2005; Stefan Knoblich <stkn@gentoo.org> libosip-2.2.1.ebuild:
+  Stable on x86.
+
+  02 Sep 2005; <dang@gentoo.org> libosip-2.2.1.ebuild:
+  Marked ~amd64
+
+  15 Jul 2005; Stefan Knoblich <stkn@gentoo.org> libosip-2.2.1.ebuild:
+  Removing threads USE flag and enabling threads support by default, breaks
+  linphone otherwise which needs libosip2 with threads support enabled (closing
+  #99083). Killed myconf variable from src_compile and added missing dodoc in
+  src_install.
+
+*libosip-2.2.1 (14 Jul 2005)
+
+  14 Jul 2005; John Mylchreest <johnm@gentoo.org> -libosip-0.8.8.ebuild,
+  -libosip-0.8.8-r1.ebuild, -libosip-2.0.6.ebuild, -libosip-2.0.7.ebuild,
+  +libosip-2.2.1.ebuild:
+  Bumping to latest version.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  31 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> libosip-2.0.7.ebuild:
+  ~alpha keyword.
+
+  22 Oct 2004; Jason Wever <weeve@gentoo.org> libosip-2.0.7.ebuild:
+  Added ~sparc keyword.
+
+  02 Sep 2004; David Holm <dholm@gentoo.org> libosip-2.0.7.ebuild:
+  Added to ~ppc.
+
+  08 Aug 2004; <stkn@gentoo.org> libosip-0.9.7.ebuild:
+  Shortened description and changed HOMEPAGE, stable on x86
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  libosip-0.8.8-r1.ebuild, libosip-0.8.8.ebuild, libosip-0.9.6.ebuild,
+  libosip-0.9.7.ebuild, libosip-2.0.6.ebuild, libosip-2.0.7.ebuild:
+  virtual/glibc -> virtual/libc
+
+  06 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> libosip-0.9.6.ebuild:
+  Stable on alpha.
+
+*libosip-2.0.7 (31 May 2004)
+
+  31 May 2004; Stefan Knoblich <stkn@gentoo.org> libosip-2.0.7.ebuild:
+  version bump
+
+  12 Apr 2004; Danny van Dyk <kugelfangk@gentoo.org> libosip-0.9.7.ebuild:
+  marked ~amd64
+
+*libosip-2.0.6 (14 Mar 2004)
+
+  14 Mar 2004; Stefan Knoblich <stkn@gentoo.org> libosip-2.0.6.ebuild:
+  Initial import of oSIP version 2 ebuild.
+
+*libosip-0.9.7 (14 Mar 2004)
+
+  14 Mar 2004; Stefan Knoblich <stkn@gentoo.org> libosip-0.8.8-r1.ebuild,
+  libosip-0.8.8.ebuild, libosip-0.9.6.ebuild, libosip-0.9.7.ebuild,
+  metadata.xml:
+  Version bump and assigned to voip herd.
+
+*libosip-0.9.6 (04 May 2003)
+
+  04 May 2003; Martin Holzer <mholzer@gentoo.org> libosip-0.9.6.ebuild:
+  Version bumped. Closes #18506.
+
+*libosip-0.8.8-r1 (20 Mar 2003)
+
+  20 Mar 2003; Seemant Kulleen <seemant@gentoo.org> libosip-0.8.8-r1.ebuild:
+
+  Got rid of pic nonsense
 
 *libosip-0.8.8 (27 aug 2002)
 
+  12 Feb 2003; Seemant Kulleen <seemant@gentoo.org> libosip-0.8.8.ebuild :
+
+  Moved to stable x86 (swedish chef).  Also cleaned up syntax and spacing
+
   27 Aug 2002; Paul Belt <gaarde@gentoo.org> :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/net-libs/libosip/Manifest b/net-libs/libosip/Manifest
index 9afaa8174a3e..59d8a1d5ff1f 100644
--- a/net-libs/libosip/Manifest
+++ b/net-libs/libosip/Manifest
@@ -1,7 +1,18 @@
-MD5 411c1160e49c144901ce5c2c597c1128 ChangeLog 959
-MD5 a85a8cfaa193cc9d253834b804002098 libosip-0.8.8.ebuild 790
-MD5 e57fc12aaf2116a12e65ee54925621c8 libosip-0.8.8-r1.ebuild 793
-MD5 2a1b8948e7b5df013c22eae139b90998 libosip-0.9.6.ebuild 789
-MD5 48b9f7631c15a223b207244d5b9fcd7d files/digest-libosip-0.8.8 65
-MD5 48b9f7631c15a223b207244d5b9fcd7d files/digest-libosip-0.8.8-r1 65
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 de41c503f05f5f99a8635b0e333729a5 metadata.xml 217
+MD5 9c50539aee2c28a817278f3c50ae9878 ChangeLog 3306
+MD5 6db12aae86c36824727616a140006d1c libosip-2.2.1.ebuild 824
+MD5 ac431a00e6d378b190d682af321e6618 libosip-0.9.6.ebuild 774
+MD5 bef19142522b953ef2e7488cb01a82e3 libosip-0.9.7.ebuild 543
+MD5 c31b44fd220e0d9aa00d0639d6a9ff9b files/digest-libosip-0.9.7 65
+MD5 5249f8f6a6158f8730e719f07b021acb files/digest-libosip-2.2.1 66
 MD5 bdae20c3d071939ffd92629f5d3c00f5 files/digest-libosip-0.9.6 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDVGdhJrHF4yAQTrARAjbrAJ9BEiHsy70O8F/weeGOEr5u8U3fWgCgsI1v
+sbDVD2lrnE9zC7YS32BDfJo=
+=RjJ2
+-----END PGP SIGNATURE-----
diff --git a/net-libs/libosip/libosip-0.9.6.ebuild b/net-libs/libosip/libosip-0.9.6.ebuild
index 70a1debfec87..d4b3734df7bc 100644
--- a/net-libs/libosip/libosip-0.9.6.ebuild
+++ b/net-libs/libosip/libosip-0.9.6.ebuild
@@ -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: /var/cvsroot/gentoo-x86/net-libs/libosip/libosip-0.9.6.ebuild,v 1.1 2003/05/04 18:20:25 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libosip/libosip-0.9.6.ebuild,v 1.1.1.1 2005/11/30 10:02:59 chriswhite Exp $
 
 DESCRIPTION="This is the oSIP library (for Open SIP). It has been designed to provide the Internet Community a simple way to support the Session Initiation Protocol.  SIP is described in the RFC2543 which is available at http://www.ietf.org/rfc/rfc2543.txt."
 HOMEPAGE="http://www.linphone.org/?lang=us"
@@ -8,9 +8,10 @@ SRC_URI="http://ftp.gnu.org/gnu/osip/${P}.tar.gz"
 
 SLOT="1"
 LICENSE="LGPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
+KEYWORDS="x86 ~ppc ~sparc alpha ~mips ~hppa"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_install () {
 	einstall || die
diff --git a/net-libs/libosip/libosip-0.9.7.ebuild b/net-libs/libosip/libosip-0.9.7.ebuild
index e7553b204994..57f22c9bb3c4 100644
--- a/net-libs/libosip/libosip-0.9.7.ebuild
+++ b/net-libs/libosip/libosip-0.9.7.ebuild
@@ -1,16 +1,17 @@
-# 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-libs/libosip/libosip-0.9.7.ebuild,v 1.1 2004/03/14 16:09:20 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libosip/libosip-0.9.7.ebuild,v 1.1.1.1 2005/11/30 10:02:59 chriswhite Exp $
 
-DESCRIPTION="This is the oSIP library (for Open SIP). It has been designed to provide the Internet Community a simple way to support the Session Initiation Protocol.  SIP is described in the RFC2543 which is available at http://www.ietf.org/rfc/rfc2543.txt."
-HOMEPAGE="http://www.linphone.org/?lang=us"
+DESCRIPTION="GNU Open SIP (oSIP) library"
+HOMEPAGE="http://www.fsf.org/software/osip/"
 SRC_URI="http://osip.atosc.org/download/osip/${P}.tar.gz"
 
 SLOT="1"
 LICENSE="LGPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~amd64"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_install () {
 	einstall || die
diff --git a/net-libs/libosip/libosip-2.2.1.ebuild b/net-libs/libosip/libosip-2.2.1.ebuild
index 35f86a3563b2..eb3f136ae53c 100644
--- a/net-libs/libosip/libosip-2.2.1.ebuild
+++ b/net-libs/libosip/libosip-2.2.1.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-libs/libosip/libosip-2.2.1.ebuild,v 1.1 2005/07/14 18:49:32 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libosip/libosip-2.2.1.ebuild,v 1.1.1.1 2005/11/30 10:02:59 chriswhite Exp $
 
-IUSE="debug threads"
+IUSE="debug"
 
 MY_MPV=${PV//.*}
 
@@ -12,25 +12,24 @@ SRC_URI="mirror://gnu/osip/libosip2-${PV}.tar.gz"
 S="${WORKDIR}/${PN}${MY_MPV}-${PV}"
 
 SLOT="${MY_MPV}"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="alpha ~amd64 ~ppc ~sparc x86"
 LICENSE="LGPL-2"
 
 DEPEND="virtual/libc"
-#		dev-util/gperf"
 
 src_compile() {
-	local myconf
-#	myconf="--enable-gperf \
-	myconf="--enable-md5 \
-			`use_enable threads mt` \
-			`use_enable debug`"
 
-	econf ${myconf} || die "Failed to econf"
+	econf \
+		--enable-md5 \
+		--enable-mt \
+		`use_enable debug` \
+		|| die "Failed to econf"
+
 	emake || die "Failed to emake"
 }
 
 src_install() {
 	einstall || die "Failed to einstall"
-	dodoc AUTHORS BUGS ChangeLog COPYING FEATURES HISTORY INSTALL NEWS README
-	TODO
+	dodoc AUTHORS BUGS ChangeLog COPYING FEATURES HISTORY INSTALL
+	dodoc README NEWS TODO
 }
diff --git a/net-libs/libotr/ChangeLog b/net-libs/libotr/ChangeLog
index fdd4b7fd3bcc..ff72c3e0ace0 100644
--- a/net-libs/libotr/ChangeLog
+++ b/net-libs/libotr/ChangeLog
@@ -1,6 +1,43 @@
 # ChangeLog for net-libs/libotr
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libotr/ChangeLog,v 1.1 2005/01/21 14:48:42 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libotr/ChangeLog,v 1.1.1.1 2005/11/30 10:02:53 chriswhite Exp $
+
+*libotr-3.0.0 (14 Nov 2005)
+
+  14 Nov 2005; Don Seiler <rizzo@gentoo.org> +libotr-3.0.0.ebuild:
+  Version bump for bug #111645
+
+  01 Aug 2005; Joseph Jezak <josejx@gentoo.org> libotr-2.0.2.ebuild:
+  Marked ~ppc for bug #100396.
+
+  10 Jul 2005; Sven Wegener <swegener@gentoo.org> libotr-1.0.4.ebuild,
+  libotr-2.0.0.ebuild, libotr-2.0.1.ebuild, libotr-2.0.2.ebuild:
+  QA: Removed 'emake || make || die' and variants. Either a package is
+  parallel build safe or it is not. There's nothing like trying and falling
+  back.
+
+*libotr-2.0.2 (17 May 2005)
+
+  17 May 2005; Don Seiler <rizzo@gentoo.org> +libotr-2.0.2.ebuild:
+  Version bump
+
+  30 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> libotr-2.0.1.ebuild:
+  Keyworded ~sparc
+
+*libotr-2.0.1 (17 Feb 2005)
+
+  17 Feb 2005; Don Seiler <rizzo@gentoo.org> +libotr-2.0.1.ebuild:
+  Version bump, closes bug #82285
+
+*libotr-2.0.0 (10 Feb 2005)
+
+  10 Feb 2005; Don Seiler <rizzo@gentoo.org> +libotr-2.0.0.ebuild:
+  Version bump
+
+*libotr-1.0.4 (23 Jan 2005)
+
+  23 Jan 2005; Don Seiler <rizzo@gentoo.org> +libotr-1.0.4.ebuild:
+  Version bump
 
 *libotr-1.0.3 (21 Jan 2005)
 
diff --git a/net-libs/libotr/Manifest b/net-libs/libotr/Manifest
index 8be169e9e00e..7c6b74c09016 100644
--- a/net-libs/libotr/Manifest
+++ b/net-libs/libotr/Manifest
@@ -1,2 +1,12 @@
-MD5 3ddd1980da86c5f72be8bef73f5cb4ec libotr-1.0.3.ebuild 799
-MD5 4b1f1a1f5d8b0a0583a569f0009c7435 files/digest-libotr-1.0.3 63
+MD5 354c4a3f5181e76724e34da44827cf22 libotr-3.0.0.ebuild 788
+MD5 1a63d562da4a5668d7e16ce151232673 ChangeLog 1396
+MD5 6a72458eeb7b7a2993640621d4fa7ad7 libotr-2.0.0.ebuild 779
+MD5 f336d73adb9eb04864ae3f5e98787c12 metadata.xml 223
+MD5 c90715a3123a8698777768fe9f5525d7 libotr-1.0.4.ebuild 779
+MD5 28a0f6549bd851ee71dc274d40f7f163 libotr-2.0.1.ebuild 786
+MD5 4960b7ce7bcd7469b57d90f916c27296 libotr-2.0.2.ebuild 788
+MD5 c4ff03d4f615450bf873ab274cc0ecce files/digest-libotr-3.0.0 64
+MD5 ce21e4bf4ffd89512e4a9e32f0539761 files/digest-libotr-1.0.4 64
+MD5 acbf6ed5147acb3329e98ff711a7262a files/digest-libotr-2.0.0 64
+MD5 f600de0b44d3f4e5416d3b62f3391d48 files/digest-libotr-2.0.1 64
+MD5 9ac9da4794ae9d04101fa632dadcf886 files/digest-libotr-2.0.2 64
diff --git a/net-libs/libotr/libotr-1.0.4.ebuild b/net-libs/libotr/libotr-1.0.4.ebuild
index 6e4ab456d1f5..7cb560bb0f8b 100644
--- a/net-libs/libotr/libotr-1.0.4.ebuild
+++ b/net-libs/libotr/libotr-1.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-libs/libotr/libotr-1.0.4.ebuild,v 1.1 2005/01/24 03:25:27 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libotr/libotr-1.0.4.ebuild,v 1.1.1.1 2005/11/30 10:02:53 chriswhite Exp $
 
 inherit flag-o-matic eutils debug
 
@@ -21,7 +21,7 @@ src_compile() {
 	replace-flags -O? -O2
 
 	econf || die "econf failed"
-	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
+	emake -j1 || die "Make failed"
 }
 
 src_install() {
diff --git a/net-libs/libotr/libotr-2.0.0.ebuild b/net-libs/libotr/libotr-2.0.0.ebuild
index 5698a0194e64..dfc2e331982b 100644
--- a/net-libs/libotr/libotr-2.0.0.ebuild
+++ b/net-libs/libotr/libotr-2.0.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-libs/libotr/libotr-2.0.0.ebuild,v 1.1 2005/02/10 20:33:35 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libotr/libotr-2.0.0.ebuild,v 1.1.1.1 2005/11/30 10:02:53 chriswhite Exp $
 
 inherit flag-o-matic eutils debug
 
@@ -21,7 +21,7 @@ src_compile() {
 	replace-flags -O? -O2
 
 	econf || die "econf failed"
-	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
+	emake -j1 || die "Make failed"
 }
 
 src_install() {
diff --git a/net-libs/libotr/libotr-2.0.1.ebuild b/net-libs/libotr/libotr-2.0.1.ebuild
index 9878c86241bf..9adea7fa8a63 100644
--- a/net-libs/libotr/libotr-2.0.1.ebuild
+++ b/net-libs/libotr/libotr-2.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-libs/libotr/libotr-2.0.1.ebuild,v 1.1 2005/02/17 19:19:53 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libotr/libotr-2.0.1.ebuild,v 1.1.1.1 2005/11/30 10:02:53 chriswhite Exp $
 
 inherit flag-o-matic eutils debug
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.cypherpunks.ca/otr/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86 ~amd64 ~sparc"
 IUSE=""
 
 DEPEND="dev-libs/libgpg-error
@@ -21,7 +21,7 @@ src_compile() {
 	replace-flags -O? -O2
 
 	econf || die "econf failed"
-	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
+	emake -j1 || die "Make failed"
 }
 
 src_install() {
diff --git a/net-libs/libotr/libotr-2.0.2.ebuild b/net-libs/libotr/libotr-2.0.2.ebuild
index d4b6580e6f7f..8270ccbbce04 100644
--- a/net-libs/libotr/libotr-2.0.2.ebuild
+++ b/net-libs/libotr/libotr-2.0.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-libs/libotr/libotr-2.0.2.ebuild,v 1.1 2005/05/17 14:12:09 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libotr/libotr-2.0.2.ebuild,v 1.1.1.1 2005/11/30 10:02:53 chriswhite Exp $
 
 inherit flag-o-matic eutils debug
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.cypherpunks.ca/otr/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~sparc"
+KEYWORDS="~amd64 ppc ~sparc ~x86"
 IUSE=""
 
 DEPEND="dev-libs/libgpg-error
@@ -21,7 +21,7 @@ src_compile() {
 	replace-flags -O? -O2
 
 	econf || die "econf failed"
-	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
+	emake -j1 || die "Make failed"
 }
 
 src_install() {
diff --git a/net-libs/libotr/libotr-3.0.0.ebuild b/net-libs/libotr/libotr-3.0.0.ebuild
index 14d5b96c8ab6..ea652a861613 100644
--- a/net-libs/libotr/libotr-3.0.0.ebuild
+++ b/net-libs/libotr/libotr-3.0.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-libs/libotr/libotr-3.0.0.ebuild,v 1.1 2005/11/14 06:00:04 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libotr/libotr-3.0.0.ebuild,v 1.1.1.1 2005/11/30 10:02:53 chriswhite Exp $
 
 inherit flag-o-matic eutils debug
 
diff --git a/net-libs/libpcap-ringbuffer/ChangeLog b/net-libs/libpcap-ringbuffer/ChangeLog
index 833901e3a147..1c67281b8ed7 100644
--- a/net-libs/libpcap-ringbuffer/ChangeLog
+++ b/net-libs/libpcap-ringbuffer/ChangeLog
@@ -1,6 +1,37 @@
 # ChangeLog for net-libs/libpcap-ringbuffer
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap-ringbuffer/ChangeLog,v 1.1 2005/01/22 07:48:28 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap-ringbuffer/ChangeLog,v 1.1.1.1 2005/11/30 10:03:04 chriswhite Exp $
+
+  11 Jun 2005; David Holm <dholm@gentoo.org>
+  libpcap-ringbuffer-1.0.20050129-r2.ebuild:
+  Added to ~ppc.
+
+*libpcap-ringbuffer-1.0.20050129-r2 (11 Jun 2005)
+
+  11 Jun 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/libpcap-ringbuffer-1.0.20050129-makefile.patch,
+  -libpcap-ringbuffer-1.0.20050129.ebuild,
+  -libpcap-ringbuffer-1.0.20050129-r1.ebuild,
+  +libpcap-ringbuffer-1.0.20050129-r2.ebuild:
+  fixed a few breakages - symlinks in root. Also the ring component didn't
+  seem to be linked in.
+
+*libpcap-ringbuffer-1.0.20050129-r1 (03 Jun 2005)
+
+  03 Jun 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/libpcap-ringbuffer-1.0.20050129-mmap-exec.patch,
+  +libpcap-ringbuffer-1.0.20050129-r1.ebuild:
+  hardened fix for bug #94896
+
+*libpcap-ringbuffer-1.0.20050129 (23 Mar 2005)
+
+  23 Mar 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +libpcap-ringbuffer-1.0.20050129.ebuild:
+  Version bump.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org>
+  libpcap-ringbuffer-1.0.20041001.ebuild:
+  new PROVIDE - virtual/libpcap
 
 *libpcap-ringbuffer-1.0.20041001 (22 Jan 2005)
 
diff --git a/net-libs/libpcap-ringbuffer/Manifest b/net-libs/libpcap-ringbuffer/Manifest
index 476f9c8ab107..8c4b2466e132 100644
--- a/net-libs/libpcap-ringbuffer/Manifest
+++ b/net-libs/libpcap-ringbuffer/Manifest
@@ -1,4 +1,8 @@
-MD5 e23968b0bb4f87db4511475a6d62de47 libpcap-ringbuffer-1.0.20041001.ebuild 1645
+MD5 86f63db5e73fe57db9fd26ab62ef90f1 ChangeLog 1495
+MD5 3518cc7e500dab348a9a4aee5972d7c8 libpcap-ringbuffer-1.0.20041001.ebuild 1659
 MD5 c14eecc39f9e4d6b37b94f4e81df755d metadata.xml 257
-MD5 eb241fb6820fde6d1b4401351a419b25 ChangeLog 366
+MD5 b70b78302675b24cc17b4242cc3d4030 libpcap-ringbuffer-1.0.20050129-r2.ebuild 1702
 MD5 a515448deadd95cb78cacf175a0aeba4 files/digest-libpcap-ringbuffer-1.0.20041001 72
+MD5 2801bbe6917277fe63e0115dac7648b5 files/libpcap-ringbuffer-1.0.20050129-mmap-exec.patch 728
+MD5 88de1c13f5c2a764d4613cd7070766c6 files/digest-libpcap-ringbuffer-1.0.20050129-r2 72
+MD5 13baa2560936dddce623fc3b2d207aa9 files/libpcap-ringbuffer-1.0.20050129-makefile.patch 2426
diff --git a/net-libs/libpcap-ringbuffer/libpcap-ringbuffer-1.0.20041001.ebuild b/net-libs/libpcap-ringbuffer/libpcap-ringbuffer-1.0.20041001.ebuild
index e037542a4a27..30a868481b16 100644
--- a/net-libs/libpcap-ringbuffer/libpcap-ringbuffer-1.0.20041001.ebuild
+++ b/net-libs/libpcap-ringbuffer/libpcap-ringbuffer-1.0.20041001.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-libs/libpcap-ringbuffer/libpcap-ringbuffer-1.0.20041001.ebuild,v 1.1 2005/01/22 07:48:28 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap-ringbuffer/libpcap-ringbuffer-1.0.20041001.ebuild,v 1.1.1.1 2005/11/30 10:03:04 chriswhite Exp $
 
 inherit toolchain-funcs linux-info multilib
 
@@ -16,9 +16,9 @@ KEYWORDS="x86"
 IUSE="ipv6"
 
 DEPEND="virtual/libc
-	!net-libs/libpcap"
+	!virtual/libpcap"
 
-#PROVIDE="virtual/libpcap"
+PROVIDE="virtual/libpcap"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/net-libs/libpcap-ringbuffer/libpcap-ringbuffer-1.0.20050129-r2.ebuild b/net-libs/libpcap-ringbuffer/libpcap-ringbuffer-1.0.20050129-r2.ebuild
index 5c327e636aab..e0c31f3c4637 100644
--- a/net-libs/libpcap-ringbuffer/libpcap-ringbuffer-1.0.20050129-r2.ebuild
+++ b/net-libs/libpcap-ringbuffer/libpcap-ringbuffer-1.0.20050129-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-libs/libpcap-ringbuffer/libpcap-ringbuffer-1.0.20050129-r2.ebuild,v 1.1 2005/06/11 08:27:44 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap-ringbuffer/libpcap-ringbuffer-1.0.20050129-r2.ebuild,v 1.1.1.1 2005/11/30 10:03:04 chriswhite Exp $
 
 inherit toolchain-funcs linux-info multilib eutils
 
@@ -12,7 +12,7 @@ SRC_URI="${HOMEPAGE}${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 IUSE="ipv6"
 
 DEPEND="virtual/libc
diff --git a/net-libs/libpcap/ChangeLog b/net-libs/libpcap/ChangeLog
index aa84bf9fa006..a934fb68da84 100644
--- a/net-libs/libpcap/ChangeLog
+++ b/net-libs/libpcap/ChangeLog
@@ -1,7 +1,176 @@
 # ChangeLog for net-libs/libpcap
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.1 2002/02/01 21:53:34 gbevin Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.1.1.1 2005/11/30 10:03:02 chriswhite Exp $
 
+  24 Sep 2005; Markus Rothe <corsair@gentoo.org> libpcap-0.9.3.ebuild:
+  Stable on ppc64
+
+  17 Sep 2005; Aron Griffis <agriffis@gentoo.org> libpcap-0.9.3.ebuild:
+  Mark 0.9.3 stable on ia64
+
+  16 Sep 2005; <dang@gentoo.org> libpcap-0.9.3.ebuild:
+  Marked stable on amd64
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> libpcap-0.9.3.ebuild:
+  Mark 0.9.3 stable on alpha
+
+  15 Sep 2005; Joseph Jezak <josejx@gentoo.org> libpcap-0.9.3.ebuild:
+  Marked ppc stable.
+
+  13 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org> libpcap-0.9.3.ebuild:
+  Stable on sparc
+
+  12 Sep 2005; Daniel Black <dragonheart@gentoo.org> libpcap-0.9.3.ebuild:
+  x86 stable by popular request - bug #102505
+
+  11 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +files/libpcap-0.9.3-whitespace.diff, libpcap-0.9.3.ebuild:
+  Adding patch to remove whitespace in pcap.h to avoid non-portable whitespace
+  warnings in programs that include it.
+
+  04 Aug 2005; Daniel Black <dragonheart@gentoo.org>
+  libpcap-0.8.3-r1.ebuild, libpcap-0.9.3.ebuild:
+  fixed absolute symlinks as per bug #101216 thanks to Simon Stelling
+
+*libpcap-0.9.3 (15 Jul 2005)
+
+  15 Jul 2005; Aaron Walker <ka0ttic@gentoo.org> +libpcap-0.9.3.ebuild:
+  Version bump for bug 99099.
+
+  06 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  libpcap-0.8.3-r1.ebuild:
+  Check for BSD systems using USERLAND variable.
+
+  06 May 2005; Aaron Walker <ka0ttic@gentoo.org> libpcap-0.8.3-r1.ebuild:
+  Install pcap-int.h on fbsd.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> libpcap-0.8.3-r1.ebuild:
+  new PROVIDE - virtual/libpcap
+
+  22 Jan 2005; Daniel Black <dragonheart@gentoo.org> -libpcap-0.7.2-r1.ebuild,
+  -libpcap-0.7.2.ebuild, -libpcap-0.8.1-r1.ebuild, -libpcap-0.8.1.ebuild,
+  libpcap-0.8.3-r1.ebuild, -libpcap-0.8.3.ebuild:
+  QA fix using toolchain-funcs for gcc. Removed old versions
+
+  19 Jan 2005; Daniel Black <dragonheart@gentoo.org> libpcap-0.8.3-r1.ebuild:
+  Corrected for multilib as per bug #78534. Thanks to Kevin Koltzau
+  <kevin@plop.org>
+
+  17 Jul 2004; Tom Gall <tgall@gentoo.org> libpcap-0.8.3-r1.ebuild:
+  stable on ppc64, bug #56911
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  libpcap-0.7.2-r1.ebuild, libpcap-0.7.2.ebuild, libpcap-0.8.1-r1.ebuild,
+  libpcap-0.8.1.ebuild, libpcap-0.8.3-r1.ebuild, libpcap-0.8.3.ebuild:
+  virtual/glibc -> virtual/libc
+
+  04 Apr 2004; Aron Griffis <agriffis@gentoo.org> libpcap-0.8.3-r1.ebuild:
+  Mark stable on alpha and ia64 for bug 46258
+
+  04 Apr 2004; Jon Portnoy <avenj@gentoo.org> libpcap-0.8.3-r1.ebuild :
+  Stable on AMD64
+
+  03 Apr 2004; Jason Wever <weeve@gentoo.org> libpcap-0.8.3-r1.ebuild:
+  Stable on sparc wrt bug #46258.
+
+  03 Apr 2004; <solar@gentoo.org> libpcap-0.8.3-r1.ebuild:
+  stable on x86
+
+  03 Apr 2004; Lars Weiler <pylon@gentoo.org> libpcap-0.8.3-r1.ebuild:
+  stable on ppc as requested in bug #46258
+
+*libpcap-0.8.3-r1 (31 Mar 2004)
+
+  31 Mar 2004; <solar@gentoo.org> libpcap-0.8.3-r1.ebuild:
+  corrected the naming convention of the shared object in ebuild from 0.6 to 0.8
+  to match current version of libpcap. A revdep-rebuild or equivalent will be
+  required for users that have any port that remains directly linked to the
+  /usr/lib/libpcap.so.0.6 library after the update
+
+*libpcap-0.8.3 (30 Mar 2004)
+
+  30 Mar 2004; Jason Wever <weeve@gentoo.org> libpcap-0.8.3.ebuild:
+  Stable on sparc.
+
+  30 Mar 2004; <solar@gentoo.org> :
+  bumping libpcap to 0.8.3 for tcpdump Bugzilla Bug 46258
+
+*libpcap-0.7.2-r1 (15 Feb 2004)
+*libpcap-0.8.1-r1 (15 Feb 2004)
+
+  15 Feb 2004; Michael Boman <mboman@gentoo.org> libpcap-0.7.2-r1.ebuild,
+  libpcap-0.8.1-r1.ebuild, metadata.xml:
+  Fixing bug #41647, #41648 and #41649
+
+  These ebuilds seems to be unmaintained so i'm making myself the
+  maintainer for now.
+
+  15 Jan 2004; <gustavoz@gentoo.org> libpcap-0.8.1.ebuild:
+  marked hppa and sparc, fixes #38206
+
+*libpcap-0.8.1 (03 Jan 2004)
+
+  03 Jan 2004; Daniel Ahlberg <aliz@gentoo.org> libpcap-0.8.1.ebuild,
+  files/libpcap-0.8.1-fPIC.patch:
+  Version bump. Closing #37092.
+
+  22 Apr 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Unmask to keep libpcap in sync to tcpdump. Closes #19517.
+
+*libpcap-0.7.2 (03 Mar 2003)
+
+  27 Apr 2003; Zach Welch <zwelch@gentoo.org> libpcap-0.7.2.ebuild:
+  add arm keyword
+
+  03 Mar 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump.
+
+  27 Feb 2003; Peter Johanson <latexer@gentoo.org> libpcap-0.7.1-r1.ebuild :
+  Changed to stable on x86
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+
+*libpcap-0.7.1-r2 (3 Jan 2003)
+
+  25 Feb 2003; Guy Martin <gmsoft@gentoo.org> libpcap-0.7.1-r2.ebuild :
+  Added hppa to keywords.
+
+  15 Feb 2003; Nicholas Wourms <dragon@gentoo.org> libpcap-0.7.1-r2.ebuild :
+  Added mips keyword to ebuild.
+
+  10 Feb 2003; Peter Johanson <latexer@gentoo.org> libpcap-0.7.1-r2.ebuild :
+  Added ~alpha to KEYWORDS
+
+  3 Jan 2003; Stefan Jones <cretin@gentoo.org> :
+  Added -fpic to the CFLAGS to aid prelinking.
+
+*libpcap-0.7.1-r1 (31 Aug 2002)
+
+  30 Mar 2003; Christian Birchinger <joker@gentoo.org>
+  libpcap-0.7.1-r1.ebuild:
+  Added sparc stable keyword
+
+  15 Feb 2003; Nicholas Wourms <dragon@gentoo.org> libpcap-0.7.1-r1.ebuild :
+  Added mips keyword to ebuild.
+
+  02 Nov 2002; Calum Selkirk <cselkirk@gentoo.org> libpcap-0.7.1-r1.ebuild :
+
+  Added ~arch so as to remove from package.mask
+
+  31 Aug 2002; Calum Selkirk <cselkirk@gentoo.org> libpcap-0.7.1-r1.ebuild
+  files/digest-libpcap-0.7.1-r1 :
+
+  Added a patch for Prism Header data capture (wireless). This patch allows
+  Airsnort (and other wireless packet sniffers) to work.
+
+*libpcap-0.7.1 (11 May 2002)
+
+  15 Feb 2003; Nicholas Wourms <dragon@gentoo.org> libpcap-0.7.1.ebuild :
+  Added mips keyword to ebuild.
+
+  11 May 2002; Spider <spider@gentoo.org> libpcap-0.7.1.ebuild :
+  version bump for the new tcpdump
+  
 *libpcap-0.6.2-r1 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index c977de36f764..e969817ae155 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -1,9 +1,8 @@
-MD5 57eedd14947e7bc472cc1a1c178ae8fd ChangeLog 2468
-MD5 98281679e41e17adc350ca7401f6ce88 libpcap-0.7.1-r1.ebuild 1212
-MD5 0247fb6ad9785b584cfd74003e02cb21 libpcap-0.7.1-r2.ebuild 1270
-MD5 74da95c601dd9af961c01cb100b70fa0 libpcap-0.7.1.ebuild 1036
-MD5 c083a5d807281e442b7022ec71896b31 libpcap-0.7.2.ebuild 1101
-MD5 7af78828b20794542dc655ab1073ced7 files/digest-libpcap-0.7.1 65
-MD5 2e3122d63322f24aed82850daca7a8e0 files/digest-libpcap-0.7.1-r1 131
-MD5 2e3122d63322f24aed82850daca7a8e0 files/digest-libpcap-0.7.1-r2 131
-MD5 6ccab63a4b33bed475b2c7215a55698d files/digest-libpcap-0.7.2 65
+MD5 6ea835fbbbf60d56cbdcd9a5a427a2c4 ChangeLog 6470
+MD5 2f0cfe611a39b442ed7e9f3427f3c2c8 libpcap-0.8.3-r1.ebuild 1477
+MD5 50057505c6cef15415ae8f8ca7378d82 metadata.xml 261
+MD5 0faa8f1084f0d749a8e7ae64fecd7c8c libpcap-0.9.3.ebuild 1512
+MD5 aa690ff148a4b4bbb5a59276fbb583a8 files/digest-libpcap-0.8.3-r1 65
+MD5 29710cca211a266690d649eff1ffe287 files/libpcap-0.8.1-fPIC.patch 298
+MD5 be632c8eb1c0f14e48313ceb1bc3917d files/digest-libpcap-0.9.3 65
+MD5 daf575fe650740e0e4013da7b86f2b50 files/libpcap-0.9.3-whitespace.diff 679
diff --git a/net-libs/libpcap/files/libpcap-0.8.1-fPIC.patch b/net-libs/libpcap/files/libpcap-0.8.1-fPIC.patch
index c869df632c3a..616cd5b3444c 100644
--- a/net-libs/libpcap/files/libpcap-0.8.1-fPIC.patch
+++ b/net-libs/libpcap/files/libpcap-0.8.1-fPIC.patch
@@ -1,4 +1,4 @@
---- /tmp/Makefile.in	2004-01-03 12:51:50.914715352 +0000
+--- Makefile.in	2004-01-03 12:51:50.914715352 +0000
 +++ Makefile.in	2004-01-03 13:04:17.524952464 +0000
 @@ -48,7 +48,7 @@
  LIBS = @V_LIBS@
diff --git a/net-libs/libpcap/libpcap-0.8.3-r1.ebuild b/net-libs/libpcap/libpcap-0.8.3-r1.ebuild
index 973e1a09a527..0b0d430ec48f 100644
--- a/net-libs/libpcap/libpcap-0.8.3-r1.ebuild
+++ b/net-libs/libpcap/libpcap-0.8.3-r1.ebuild
@@ -1,40 +1,52 @@
-# 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-libs/libpcap/libpcap-0.8.3-r1.ebuild,v 1.1 2004/04/01 02:33:54 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-0.8.3-r1.ebuild,v 1.1.1.1 2005/11/30 10:03:02 chriswhite Exp $
 
-S=${WORKDIR}/${P}
-DESCRIPTION="pcap-Library"
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="A system-independent library for user-level network packet capture"
+HOMEPAGE="http://www.tcpdump.org/"
 SRC_URI="http://www.tcpdump.org/release/${P}.tar.gz
 	http://www.jp.tcpdump.org/release/${P}.tar.gz"
-HOMEPAGE="http://www.tcpdump.org/"
-DEPEND="virtual/glibc"
-SLOT="0"
+
 LICENSE="BSD"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~amd64 ~ia64"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
+IUSE="ipv6"
 
-src_unpack() {
-	unpack ${A} ; cd ${S}
+DEPEND="virtual/libc
+	!virtual/libpcap"
+
+PROVIDE="virtual/libpcap"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
 	epatch ${FILESDIR}/${PN}-0.8.1-fPIC.patch
 }
 
 src_compile() {
-	econf `use_enable ipv6` || die "bad configure"
+	econf $(use_enable ipv6) || die "bad configure"
 	emake || die "compile problem"
 
 	# no provision for this in the Makefile, so...
-	gcc -Wl,-soname,libpcap.so.0 -shared -fPIC -o libpcap.so.${PV:0:3} *.o
-	read
-	assert "couldn't make a shared lib"
+	$(tc-getCC) -Wl,-soname,libpcap.so.0 -shared -fPIC -o libpcap.so.${PV:0:3} *.o \
+		|| die "couldn't make a shared lib"
 }
 
 src_install() {
-	einstall || die
+	einstall || die "make install failed"
+
+	# We need this to build pppd on G/FBSD systems
+	if [[ "${USERLAND}" == "BSD" ]]; then
+		insinto /usr/include
+		doins pcap-int.h || die "failed to install pcap-int.h"
+	fi
 
 	insopts -m 755
-	insinto /usr/lib ; doins libpcap.so.${PV:0:3}
-	dosym /usr/lib/libpcap.so.${PV:0:3} /usr/lib/libpcap.so.0
-	dosym /usr/lib/libpcap.so.${PV:0:3} /usr/lib/libpcap.so
+	insinto /usr/$(get_libdir) ; doins libpcap.so.${PV:0:3}
+	dosym libpcap.so.${PV:0:3} /usr/$(get_libdir)/libpcap.so.0
+	dosym libpcap.so.${PV:0:3} /usr/$(get_libdir)/libpcap.so
 
-	dodoc CREDITS CHANGES FILES README* VERSION LICENSE
+	dodoc CREDITS CHANGES FILES README* VERSION
 }
diff --git a/net-libs/libpcap/libpcap-0.9.3.ebuild b/net-libs/libpcap/libpcap-0.9.3.ebuild
index a34fd1bdda3c..52ea86d196e6 100644
--- a/net-libs/libpcap/libpcap-0.9.3.ebuild
+++ b/net-libs/libpcap/libpcap-0.9.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-libs/libpcap/libpcap-0.9.3.ebuild,v 1.1 2005/07/15 13:25:00 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-0.9.3.ebuild,v 1.1.1.1 2005/11/30 10:03:02 chriswhite Exp $
 
 inherit eutils multilib toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.tcpdump.org/release/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="ipv6"
 
 DEPEND="virtual/libc
@@ -20,8 +20,8 @@ DEPEND="virtual/libc
 PROVIDE="virtual/libpcap"
 
 src_unpack() {
-	unpack ${A}
-	cd ${S}
+	unpack ${A}; cd ${S}
+	epatch ${FILESDIR}/${P}-whitespace.diff
 	epatch ${FILESDIR}/${PN}-0.8.1-fPIC.patch
 }
 
@@ -45,8 +45,8 @@ src_install() {
 
 	insopts -m 755
 	insinto /usr/$(get_libdir) ; doins libpcap.so.${PV:0:3}
-	dosym /usr/$(get_libdir)/libpcap.so.${PV:0:3} /usr/$(get_libdir)/libpcap.so.0
-	dosym /usr/$(get_libdir)/libpcap.so.${PV:0:3} /usr/$(get_libdir)/libpcap.so
+	dosym libpcap.so.${PV:0:3} /usr/$(get_libdir)/libpcap.so.0
+	dosym libpcap.so.${PV:0:3} /usr/$(get_libdir)/libpcap.so
 
 	dodoc CREDITS CHANGES FILES README* VERSION
 }
diff --git a/net-libs/libpcap/metadata.xml b/net-libs/libpcap/metadata.xml
index 949cf489511b..40885d6db36b 100644
--- a/net-libs/libpcap/metadata.xml
+++ b/net-libs/libpcap/metadata.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>mboman@gentoo.org</email>
-  <name>Michael Boman</name>
-  <description>Interim Maintainer</description>
-</maintainer>
-<longdescription>A system-independent library for user-level network packet capture.</longdescription>
+<herd>netmon</herd>
+<longdescription>A system-independent library for user-level network packet capture</longdescription>
 </pkgmetadata>
diff --git a/net-libs/libpcapnav/ChangeLog b/net-libs/libpcapnav/ChangeLog
index 0fe789c61c8a..80d74a40f0e8 100644
--- a/net-libs/libpcapnav/ChangeLog
+++ b/net-libs/libpcapnav/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libpcapnav
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcapnav/ChangeLog,v 1.1 2005/03/16 11:24:29 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcapnav/ChangeLog,v 1.1.1.1 2005/11/30 10:02:48 chriswhite Exp $
+
+*libpcapnav-0.6 (14 May 2005)
+
+  14 May 2005; Marcelo Goes <vanquirius@gentoo.org> +libpcapnav-0.6.ebuild:
+  Version bump.
 
 *libpcapnav-0.5 (16 Mar 2005)
 
diff --git a/net-libs/libpcapnav/Manifest b/net-libs/libpcapnav/Manifest
index d551d4e474c2..6a92d92e488c 100644
--- a/net-libs/libpcapnav/Manifest
+++ b/net-libs/libpcapnav/Manifest
@@ -1,4 +1,6 @@
-MD5 e793e800acf97cb486f1abac0b520641 libpcapnav-0.5.ebuild 665
-MD5 b3522d3f22b2b8bdceb1a7eb060e98e0 ChangeLog 306
+MD5 c0391d9bee1be775bf77a140f6aff285 libpcapnav-0.6.ebuild 779
+MD5 5dac4994d13e15fa3bfd3a366278fd4f libpcapnav-0.5.ebuild 775
+MD5 7cd66a879cd0007a45174afd1debb128 ChangeLog 525
 MD5 637389da071d8ee0c0292695525bc29f metadata.xml 160
 MD5 f4e907703b4719c71b8edeb57a788e04 files/digest-libpcapnav-0.5 66
+MD5 04d75209cd3f0d5b64395383d6616092 files/digest-libpcapnav-0.6 66
diff --git a/net-libs/libpcapnav/libpcapnav-0.5.ebuild b/net-libs/libpcapnav/libpcapnav-0.5.ebuild
index 09fbfa19e46f..e18ccdcd08d3 100644
--- a/net-libs/libpcapnav/libpcapnav-0.5.ebuild
+++ b/net-libs/libpcapnav/libpcapnav-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-libs/libpcapnav/libpcapnav-0.5.ebuild,v 1.1 2005/03/16 11:24:29 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcapnav/libpcapnav-0.5.ebuild,v 1.1.1.1 2005/11/30 10:02:48 chriswhite Exp $
 
 DESCRIPTION="A libpcap wrapper library that allows navigation to arbitrary packets in a tcpdump trace file between reads, using timestamps or percentage offsets."
 HOMEPAGE="http://netdude.sourceforge.net/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/netdude/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
 IUSE="doc"
 
 DEPEND="virtual/libpcap"
diff --git a/net-libs/libpcapnav/libpcapnav-0.6.ebuild b/net-libs/libpcapnav/libpcapnav-0.6.ebuild
index 06b82cad4c82..15418580fd3f 100644
--- a/net-libs/libpcapnav/libpcapnav-0.6.ebuild
+++ b/net-libs/libpcapnav/libpcapnav-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-libs/libpcapnav/libpcapnav-0.6.ebuild,v 1.1 2005/05/15 01:15:49 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcapnav/libpcapnav-0.6.ebuild,v 1.1.1.1 2005/11/30 10:02:48 chriswhite Exp $
 
 DESCRIPTION="A libpcap wrapper library that allows navigation to arbitrary packets in a tcpdump trace file between reads, using timestamps or percentage offsets."
 HOMEPAGE="http://netdude.sourceforge.net/"
diff --git a/net-libs/libpri/ChangeLog b/net-libs/libpri/ChangeLog
index 79029a23e930..c5c9642e66c1 100644
--- a/net-libs/libpri/ChangeLog
+++ b/net-libs/libpri/ChangeLog
@@ -1,6 +1,167 @@
 # ChangeLog for net-libs/libpri
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/ChangeLog,v 1.1 2004/01/04 00:08:17 stkn Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/ChangeLog,v 1.1.1.1 2005/11/30 10:02:56 chriswhite Exp $
+
+  20 Nov 2005; Stefan Knoblich <stkn@gentoo.org> libpri-1.2.0.ebuild:
+  Re-enabled bri support.
+
+*libpri-1.2.0 (18 Nov 2005)
+
+  18 Nov 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/libpri-1.2.0-gentoo.diff, -files/libpri-1.2.0_beta1-gentoo.diff,
+  -libpri-1.2.0_beta1.ebuild, +libpri-1.2.0.ebuild:
+  Version bumped and removed old beta ebuild.
+
+  15 Sep 2005; Stefan Knoblich <stkn@gentoo.org> libpri-1.0.4.ebuild,
+  libpri-1.0.6.ebuild, libpri-1.0.7.ebuild, libpri-1.0.7-r1.ebuild,
+  libpri-1.0.8.ebuild, libpri-1.0.9.ebuild, libpri-1.0.9-r1.ebuild:
+  Fixed SRC_URI.
+
+*libpri-1.2.0_beta1 (27 Aug 2005)
+
+  27 Aug 2005; <stkn@gentoo.org> +files/libpri-1.2.0_beta1-gentoo.diff,
+  +libpri-1.2.0_beta1.ebuild:
+  Added new 1.2.0 beta ebuild.
+
+  27 Aug 2005; <stkn@gentoo.org>
+  -files/libpri-1.2.0_pre20050818-gentoo.diff,
+  -libpri-1.2.0_pre20050818.ebuild:
+  Removing old version.
+
+*libpri-1.2.0_pre20050818 (19 Aug 2005)
+
+  19 Aug 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/libpri-1.2.0_pre20050818-gentoo.diff,
+  +libpri-1.2.0_pre20050818.ebuild:
+  Pre-release version, work-in-progress.
+
+*libpri-1.0.9-r1 (18 Aug 2005)
+
+  18 Aug 2005; <stkn@gentoo.org> libpri-1.0.6.ebuild, libpri-1.0.7.ebuild,
+  libpri-1.0.7-r1.ebuild, libpri-1.0.8.ebuild, libpri-1.0.9.ebuild,
+  +libpri-1.0.9-r1.ebuild:
+  Revision bump (bristuff update) and fixed bristuff part of SRC_URI
+  (after site redesign).
+
+  02 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> libpri-1.0.8.ebuild:
+  Stable on sparc
+
+*libpri-1.0.9 (29 Jul 2005)
+
+  29 Jul 2005; <stkn@gentoo.org> +libpri-1.0.9.ebuild:
+  Version bump.
+
+  28 Jul 2005; <stkn@gentoo.org> -libpri-1.0.0.ebuild, -libpri-1.0.1.ebuild,
+  -libpri-1.0.2.ebuild, -libpri-1.0.3.ebuild:
+  Removing old versions.
+
+  26 Jul 2005; <stkn@gentoo.org> libpri-1.0.8.ebuild:
+  Fixed SRC_URI.
+
+  26 Jul 2005; <stkn@gentoo.org> libpri-1.0.8.ebuild:
+  Stable on x86.
+
+  26 Jul 2005; <stkn@gentoo.org> -libpri-0.4.0.ebuild, -libpri-0.6.0.ebuild:
+  Removed old versions.
+
+  28 Jun 2005; Stefan Knoblich <stkn@gentoo.org> libpri-1.0.7-r1.ebuild:
+  Marking stable on x86.
+
+  25 Jun 2005; Stefan Knoblich <stkn@gentoo.org> libpri-1.0.4.ebuild,
+  libpri-1.0.6.ebuild, libpri-1.0.7-r1.ebuild, libpri-1.0.7.ebuild:
+  Fixed SRC_URI.
+
+*libpri-1.0.8 (25 Jun 2005)
+
+  25 Jun 2005; Stefan Knoblich <stkn@gentoo.org> +libpri-1.0.8.ebuild:
+  Version bump.
+
+  23 Jun 2005; Stefan Knoblich <stkn@gentoo.org> libpri-1.0.7-r1.ebuild:
+  ~* keywords restored for asterisk-1.0.7 security update (bug #96826).
+
+  01 Jun 2005; Stefan Knoblich <stkn@gentoo.org> libpri-1.0.7-r1.ebuild:
+  Bristuff updated to 0.2.0-RC8g.
+
+  12 May 2005; Stefan Knoblich <stkn@gentoo.org> libpri-1.0.7-r1.ebuild:
+  Updated bristuff to 0.2.0-RC8d
+
+  10 May 2005; Stefan Knoblich <stkn@gentoo.org> libpri-1.0.7-r1.ebuild:
+  Updated bristuff to latest version.
+
+*libpri-1.0.7-r1 (07 May 2005)
+
+  07 May 2005; Stefan Knoblich <stkn@gentoo.org> +libpri-1.0.7-r1.ebuild:
+  Updated to bristuff-0.2.0-RC8a.
+
+  05 May 2005; Sven Wegener <swegener@gentoo.org> libpri-1.0.6.ebuild,
+  libpri-1.0.7.ebuild:
+  Added missing parentheses to SRC_URI.
+
+*libpri-1.0.7 (21 Mar 2005)
+
+  21 Mar 2005; Stefan Knoblich <stkn@gentoo.org> +libpri-1.0.7.ebuild:
+  Version bump.
+
+*libpri-1.0.6 (10 Mar 2005)
+
+  10 Mar 2005; Stefan Knoblich <stkn@gentoo.org> +libpri-1.0.6.ebuild:
+  New version. Adds bristuff support.
+
+  21 Feb 2005; Simon Stelling <blubb@gentoo.org> libpri-1.0.4.ebuild:
+  added ~amd64
+
+*libpri-1.0.4 (14 Feb 2005)
+
+  14 Feb 2005; Stefan Knoblich <stkn@gentoo.org> libpri-1.0.3.ebuild,
+  +libpri-1.0.4.ebuild:
+  Version bump and fixed SRC_URI for old version.
+
+  19 Dec 2004; Stefan Knoblich <stkn@gentoo.org> libpri-1.0.2.ebuild:
+  fixed SRC_URI
+
+*libpri-1.0.3 (19 Dec 2004)
+
+  19 Dec 2004; Stefan Knoblich <stkn@gentoo.org> +libpri-1.0.3.ebuild:
+  version bump
+
+  10 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> libpri-1.0.2.ebuild:
+  Keyworded ~sparc
+
+*libpri-1.0.2 (10 Nov 2004)
+
+  10 Nov 2004; <stkn@gentoo.org> libpri-1.0.1.ebuild, +libpri-1.0.2.ebuild:
+  version bump and fixed SRC_URI in 1.0.1 ebuild
+
+*libpri-1.0.1 (24 Oct 2004)
+
+  24 Oct 2004; <stkn@gentoo.org> libpri-1.0.0.ebuild, +libpri-1.0.1.ebuild:
+  version bump and changed SRC_URI in libpri-1.0.0
+
+  14 Oct 2004; David Holm <dholm@gentoo.org> libpri-1.0.0.ebuild:
+  Added to ~ppc.
+
+*libpri-1.0.0 (24 Sep 2004)
+
+  24 Sep 2004; <stkn@gentoo.org> +libpri-1.0.0.ebuild:
+  version bump
+
+  27 Jul 2004; Stefan Knoblich <stkn@gentoo.org> libpri-0.4.0.ebuild:
+  stable on x86
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> libpri-0.4.0.ebuild,
+  libpri-0.6.0.ebuild:
+  virtual/glibc -> virtual/libc
+
+  10 May 2004; David Holm <dholm@gentoo.org> libpri-0.4.0.ebuild:
+  Added to ~ppc.
+
+*libpri-0.6.0 (10 May 2004)
+
+  10 May 2004; Stefan Knoblich <stkn@gentoo.org> libpri-0.6.0.ebuild:
+  version bump.
+
+  19 Feb 2004; Stefan Knoblich <stkn@gentoo.org> libpri-0.4.0.ebuild:
+  fixed SRC_URI
 
 *libpri-0.4.0 (04 Jan 2004)
 
diff --git a/net-libs/libpri/Manifest b/net-libs/libpri/Manifest
index b9f225353867..96131f070a35 100644
--- a/net-libs/libpri/Manifest
+++ b/net-libs/libpri/Manifest
@@ -1,4 +1,19 @@
-MD5 2d69ac76c36d6550c6b7d1a191976aea libpri-0.4.0.ebuild 482
+MD5 d988d508ed6a6b40c542b1af643e2446 libpri-1.0.7-r1.ebuild 1002
+MD5 d4eea14fb867c7510353cd463eae8442 libpri-1.0.8.ebuild 998
+MD5 a513d4137902f80673d22bf86dcccc61 libpri-1.2.0.ebuild 1160
+MD5 a5d65ff8326161e7845e26b721f4d6dd libpri-1.0.9.ebuild 996
+MD5 290ac8efa69f6a6cdcccddac3c963388 libpri-1.0.6.ebuild 1000
+MD5 20a5cc1d89bd50c1ebe632b199707b9f libpri-1.0.7.ebuild 1000
 MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248
-MD5 8b90a7c0dd52357cb6ba366e82ed0031 ChangeLog 402
-MD5 846aaf8d6e64aa71cc5c0cf41b433de9 files/digest-libpri-0.4.0 63
+MD5 b534d3be5b516402c62444526bc2b023 ChangeLog 5317
+MD5 46619e05129738f3b85e97fc2e76d958 libpri-1.0.4.ebuild 598
+MD5 57a84bfa8a8a1dae9eff85b7e259fda4 libpri-1.0.9-r1.ebuild 999
+MD5 3a2b30f73ce69b5676222b6050648531 files/libpri-1.2.0-gentoo.diff 2007
+MD5 d000e51d01723b5cf6acd521740cad5b files/digest-libpri-1.0.9 134
+MD5 854a97c4aecaf1536521b247dcdbd3a1 files/digest-libpri-1.0.4 63
+MD5 434c5302587dc0457610cdb0fa7b3627 files/digest-libpri-1.0.8 134
+MD5 4077c9b011632414cb2cdb36e1b24c27 files/digest-libpri-1.0.6 134
+MD5 460b3c5461f842545b60d6c3f716631b files/digest-libpri-1.0.7 134
+MD5 287da2d882869ddba4be296407e0632f files/digest-libpri-1.0.7-r1 134
+MD5 04841b1acd89fb3086a38ea577643160 files/digest-libpri-1.2.0 135
+MD5 4794bc9f4c11421a31a1d665ee5adef2 files/digest-libpri-1.0.9-r1 134
diff --git a/net-libs/libpri/files/digest-libpri-1.0.7-r1 b/net-libs/libpri/files/digest-libpri-1.0.7-r1
index a05a2a4d27b7..3357f096266c 100644
--- a/net-libs/libpri/files/digest-libpri-1.0.7-r1
+++ b/net-libs/libpri/files/digest-libpri-1.0.7-r1
@@ -1,2 +1,2 @@
 MD5 206406da1d56299c8f0c5010b436eb04 libpri-1.0.7.tar.gz 55767
-MD5 8029d465ffc1ae8fb076a6b7198da03c bristuff-0.2.0-RC8a.tar.gz 133171
+MD5 7a5ff01d3befff1fbd3de1c303cb10d1 bristuff-0.2.0-RC8g.tar.gz 139013
diff --git a/net-libs/libpri/files/digest-libpri-1.2.0 b/net-libs/libpri/files/digest-libpri-1.2.0
index a46c2681f835..acbf972751f0 100644
--- a/net-libs/libpri/files/digest-libpri-1.2.0
+++ b/net-libs/libpri/files/digest-libpri-1.2.0
@@ -1 +1,2 @@
+MD5 884979fbfb75e6cdf7d8bdb66841e728 bristuff-0.3.0-PRE-1.tar.gz 159742
 MD5 e22af697ff4002944436449c1803fc57 libpri-1.2.0.tar.gz 75899
diff --git a/net-libs/libpri/libpri-1.0.4.ebuild b/net-libs/libpri/libpri-1.0.4.ebuild
index e3fa538bf23b..276ae147e8e5 100644
--- a/net-libs/libpri/libpri-1.0.4.ebuild
+++ b/net-libs/libpri/libpri-1.0.4.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-libs/libpri/libpri-1.0.4.ebuild,v 1.1 2005/02/14 19:59:23 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.0.4.ebuild,v 1.1.1.1 2005/11/30 10:02:56 chriswhite Exp $
 
 IUSE=""
 
 DESCRIPTION="Primary Rate ISDN (PRI) library"
 HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="ftp://ftp.asterisk.org/pub/telephony/libpri/libpri-${PV}.tar.gz"
+SRC_URI="ftp://ftp.digium.com/pub/telephony/libpri/old/libpri-${PV}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 
 DEPEND="virtual/libc"
 
diff --git a/net-libs/libpri/libpri-1.0.6.ebuild b/net-libs/libpri/libpri-1.0.6.ebuild
index 4eb280bf8cd7..31af0040adcb 100644
--- a/net-libs/libpri/libpri-1.0.6.ebuild
+++ b/net-libs/libpri/libpri-1.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-libs/libpri/libpri-1.0.6.ebuild,v 1.1 2005/03/10 00:17:27 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.0.6.ebuild,v 1.1.1.1 2005/11/30 10:02:56 chriswhite Exp $
 
 inherit eutils
 
@@ -10,8 +10,8 @@ BRI_VERSION="0.2.0-RC7k"
 
 DESCRIPTION="Primary Rate ISDN (PRI) library"
 HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="ftp://ftp.asterisk.org/pub/telephony/libpri/libpri-${PV}.tar.gz
-	 bri? http://www.junghanns.net/asterisk/downloads/bristuff-${BRI_VERSION}.tar.gz"
+SRC_URI="ftp://ftp.digium.com/pub/telephony/libpri/old/libpri-${PV}.tar.gz
+	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/net-libs/libpri/libpri-1.0.7-r1.ebuild b/net-libs/libpri/libpri-1.0.7-r1.ebuild
index da5d451aa979..a8220ade04e0 100644
--- a/net-libs/libpri/libpri-1.0.7-r1.ebuild
+++ b/net-libs/libpri/libpri-1.0.7-r1.ebuild
@@ -1,22 +1,21 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.0.7-r1.ebuild,v 1.1 2005/05/07 18:16:46 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.0.7-r1.ebuild,v 1.1.1.1 2005/11/30 10:02:56 chriswhite Exp $
 
 inherit eutils
 
 IUSE="bri"
 
-BRI_VERSION="0.2.0-RC8a"
+BRI_VERSION="0.2.0-RC8g"
 
 DESCRIPTION="Primary Rate ISDN (PRI) library"
 HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="ftp://ftp.asterisk.org/pub/telephony/libpri/libpri-${PV}.tar.gz
-	 bri? ( http://www.junghanns.net/asterisk/downloads/bristuff-${BRI_VERSION}.tar.gz )"
+SRC_URI="ftp://ftp.digium.com/pub/telephony/libpri/old/libpri-${PV}.tar.gz
+	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )"
 
 SLOT="0"
 LICENSE="GPL-2"
-#KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-KEYWORDS="-*"
+KEYWORDS="x86 ~ppc ~sparc ~amd64"
 
 DEPEND="virtual/libc"
 
diff --git a/net-libs/libpri/libpri-1.0.7.ebuild b/net-libs/libpri/libpri-1.0.7.ebuild
index e3017f7f62f7..b22b57c757bb 100644
--- a/net-libs/libpri/libpri-1.0.7.ebuild
+++ b/net-libs/libpri/libpri-1.0.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-libs/libpri/libpri-1.0.7.ebuild,v 1.1 2005/03/21 00:37:17 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.0.7.ebuild,v 1.1.1.1 2005/11/30 10:02:56 chriswhite Exp $
 
 inherit eutils
 
@@ -10,8 +10,8 @@ BRI_VERSION="0.2.0-RC7k"
 
 DESCRIPTION="Primary Rate ISDN (PRI) library"
 HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="ftp://ftp.asterisk.org/pub/telephony/libpri/libpri-${PV}.tar.gz
-	 bri? http://www.junghanns.net/asterisk/downloads/bristuff-${BRI_VERSION}.tar.gz"
+SRC_URI="ftp://ftp.digium.com/pub/telephony/libpri/old/libpri-${PV}.tar.gz
+	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/net-libs/libpri/libpri-1.0.8.ebuild b/net-libs/libpri/libpri-1.0.8.ebuild
index 1806dc04c5c3..aef6d2005ccd 100644
--- a/net-libs/libpri/libpri-1.0.8.ebuild
+++ b/net-libs/libpri/libpri-1.0.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-libs/libpri/libpri-1.0.8.ebuild,v 1.1 2005/06/25 08:54:28 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.0.8.ebuild,v 1.1.1.1 2005/11/30 10:02:56 chriswhite Exp $
 
 inherit eutils
 
@@ -10,12 +10,12 @@ BRI_VERSION="0.2.0-RC8h"
 
 DESCRIPTION="Primary Rate ISDN (PRI) library"
 HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="ftp://ftp.asterisk.org/pub/telephony/libpri/libpri-${PV}.tar.gz
-	 bri? ( http://www.junghanns.net/asterisk/downloads/bristuff-${BRI_VERSION}.tar.gz )"
+SRC_URI="ftp://ftp.digium.com/pub/telephony/libpri/old/libpri-${PV}.tar.gz
+	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="x86 ~ppc sparc ~amd64"
 
 DEPEND="virtual/libc"
 
diff --git a/net-libs/libpri/libpri-1.0.9-r1.ebuild b/net-libs/libpri/libpri-1.0.9-r1.ebuild
index fc7f7c807cc2..0bbc1c52fa07 100644
--- a/net-libs/libpri/libpri-1.0.9-r1.ebuild
+++ b/net-libs/libpri/libpri-1.0.9-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-libs/libpri/libpri-1.0.9-r1.ebuild,v 1.1 2005/08/18 17:47:43 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.0.9-r1.ebuild,v 1.1.1.1 2005/11/30 10:02:56 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ BRI_VERSION="0.2.0-RC8n"
 
 DESCRIPTION="Primary Rate ISDN (PRI) library"
 HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="ftp://ftp.asterisk.org/pub/telephony/libpri/libpri-${PV}.tar.gz
+SRC_URI="ftp://ftp.digium.com/pub/telephony/libpri/libpri-${PV}.tar.gz
 	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )"
 
 SLOT="0"
diff --git a/net-libs/libpri/libpri-1.0.9.ebuild b/net-libs/libpri/libpri-1.0.9.ebuild
index 4c6938e4feef..44d87e61b343 100644
--- a/net-libs/libpri/libpri-1.0.9.ebuild
+++ b/net-libs/libpri/libpri-1.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-libs/libpri/libpri-1.0.9.ebuild,v 1.1 2005/07/29 01:15:30 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.0.9.ebuild,v 1.1.1.1 2005/11/30 10:02:56 chriswhite Exp $
 
 inherit eutils
 
@@ -10,8 +10,8 @@ BRI_VERSION="0.2.0-RC8l"
 
 DESCRIPTION="Primary Rate ISDN (PRI) library"
 HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="ftp://ftp.asterisk.org/pub/telephony/libpri/libpri-${PV}.tar.gz
-	 bri? ( http://www.junghanns.net/asterisk/downloads/bristuff-${BRI_VERSION}.tar.gz )"
+SRC_URI="ftp://ftp.digium.com/pub/telephony/libpri/libpri-${PV}.tar.gz
+	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/net-libs/libpri/libpri-1.2.0.ebuild b/net-libs/libpri/libpri-1.2.0.ebuild
index 6b617b023f69..26b529ff00ec 100644
--- a/net-libs/libpri/libpri-1.2.0.ebuild
+++ b/net-libs/libpri/libpri-1.2.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-libs/libpri/libpri-1.2.0.ebuild,v 1.1 2005/11/18 16:24:14 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.2.0.ebuild,v 1.1.1.1 2005/11/30 10:02:57 chriswhite Exp $
 
 inherit eutils
 
@@ -9,19 +9,21 @@ inherit eutils
 # - bristuff (waiting for next upstream release...)
 #
 
-IUSE=""
+IUSE="bri"
 
 MY_P="${P/_/-}"
 
-#BRI_VERSION="0.2.0-RC8h"
+BRI_VERSION="0.3.0-PRE-1"
 
 DESCRIPTION="Primary Rate ISDN (PRI) library"
 HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="http://ftp.digium.com/pub/libpri/${MY_P}.tar.gz"
-#	 bri? ( http://www.junghanns.net/asterisk/downloads/bristuff-${BRI_VERSION}.tar.gz )"
+SRC_URI="http://ftp.digium.com/pub/libpri/${MY_P}.tar.gz
+	bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )"
 
 S="${WORKDIR}/${MY_P}"
 
+S_BRI="${WORKDIR}/bristuff-${BRI_VERSION}"
+
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
@@ -34,10 +36,15 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-1.2.0-gentoo.diff
 
-#	if use bri; then
-#		einfo "Patching libpri w/ BRI stuff (${BRI_VERSION})"
-#		epatch ${WORKDIR}/bristuff-${BRI_VERSION}/patches/libpri.patch
-#	fi
+	if use bri; then
+		einfo "Patching libpri w/ BRI stuff (${BRI_VERSION})"
+
+		# fix a small clash in patches
+		sed -i -e "s:CFLAGS=:CFLAGS+=:" \
+			${S_BRI}/patches/libpri.patch
+
+		epatch ${S_BRI}/patches/libpri.patch
+	fi
 }
 
 src_compile() {
diff --git a/net-libs/librsync/ChangeLog b/net-libs/librsync/ChangeLog
index 9cce4a98f513..34b09f0ff053 100644
--- a/net-libs/librsync/ChangeLog
+++ b/net-libs/librsync/ChangeLog
@@ -1,7 +1,64 @@
 # ChangeLog for net-libs/librsync
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-libs/librsync/ChangeLog,v 1.1 2002/04/29 08:59:14 bangert Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/librsync/ChangeLog,v 1.1.1.1 2005/11/30 10:02:54 chriswhite Exp $
 
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> librsync-0.9.7.ebuild:
+  Mark 0.9.7 stable on alpha
+
+  27 May 2005; Lars Weiler <pylon@gentoo.org> librsync-0.9.7.ebuild:
+  Stable on ppc.
+
+  01 Apr 2005; Aron Griffis <agriffis@gentoo.org> librsync-0.9.7.ebuild:
+  stable on ia64
+
+  24 Feb 2005; Lina Pezzella <j4rg0n@gentoo.org> librsync-0.9.7.ebuild:
+  Stable ppc-macos
+
+  22 Jan 2005; Lina Pezzella <j4rg0n@gentoo.org> librsync-0.9.7.ebuild:
+  Unstable ppc-macos.
+
+  07 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org> librsync-0.9.7.ebuild:
+  Stable on sparc
+
+  24 Nov 2004; Aaron Walker <ka0ttic@gentoo.org> librsync-0.9.7.ebuild:
+  Marked stable on x86.
+
+  15 Nov 2004; Aaron Walker <ka0ttic@gentoo.org> -librsync-0.9.5.1.ebuild,
+  -librsync-0.9.5.ebuild:
+  Tidy up old ebuilds.
+
+*librsync-0.9.7 (25 Oct 2004)
+
+  25 Oct 2004; Aaron Walker <ka0ttic@gentoo.org> +metadata.xml,
+  +librsync-0.9.7.ebuild:
+  Version bump; cleaned up ebuild and added metadata info.
+
+  08 Aug 2004; Danny van Dyk <kugelfang@gentoo.org> librsync-0.9.6.ebuild:
+  Marked ~amd64.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  librsync-0.9.5.1.ebuild, librsync-0.9.5.ebuild, librsync-0.9.6.ebuild:
+  virtual/glibc -> virtual/libc
+
+  11 Jun 2004; David Holm <dholm@gentoo.org> librsync-0.9.6.ebuild:
+  Added to ~ppc.
+
+  24 Mar 2004; Jason Wever <weeve@gentoo.org> librsync-0.9.6.ebuild:
+  Marked stable on sparc.
+
+*librsync-0.9.6 (17 Aug 2003)
+
+  17 Aug 2003; Martin Holzer <mholzer@gentoo.org> librsync-0.9.6.ebuild:
+  Version bumped. Closes #26640. Ebuild submitted by Maik Schreiber
+  <blizzy@blizzy.de>
+
+*librsync-0.9.5.1 (31 May 2003)
+
+  31 May 2003; Martin Holzer <mholzer@gentoo.org> librsync-0.9.5.1.ebuild:
+  Version bumped. Closes #18597.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *librsync-0.9.5 (27 Apr 2002)
 
   27 Apr 2002; Thilo Bangert <bangert@gentoo.org> ChangeLog :
diff --git a/net-libs/librsync/Manifest b/net-libs/librsync/Manifest
index e69de29bb2d1..d55e65571582 100644
--- a/net-libs/librsync/Manifest
+++ b/net-libs/librsync/Manifest
@@ -0,0 +1,6 @@
+MD5 43320660d39f81ba519b1296d4b67ea2 librsync-0.9.6.ebuild 704
+MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254
+MD5 9ec4f65e383dbe6400111b81ab9a3736 ChangeLog 2172
+MD5 c29ee239124bcd60a73ac4ea9f6e9131 librsync-0.9.7.ebuild 679
+MD5 3271b117997d294c547e95009ef7070d files/digest-librsync-0.9.7 66
+MD5 d0c1f5fb5a02f40c16491c2c003dadf5 files/digest-librsync-0.9.6 66
diff --git a/net-libs/librsync/librsync-0.9.6.ebuild b/net-libs/librsync/librsync-0.9.6.ebuild
index 1c355bceadd7..ce6180121fbd 100644
--- a/net-libs/librsync/librsync-0.9.6.ebuild
+++ b/net-libs/librsync/librsync-0.9.6.ebuild
@@ -1,17 +1,17 @@
-# 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-libs/librsync/librsync-0.9.6.ebuild,v 1.1 2003/08/17 14:41:58 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/librsync/librsync-0.9.6.ebuild,v 1.1.1.1 2005/11/30 10:02:54 chriswhite Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Flexible remote checksum-based differencing"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://librsync.sf.net/"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 sparc ~ppc ~amd64"
+IUSE=""
 
 src_compile() {
 	./configure --prefix=/usr --host=${CHOST} --enable-shared || die
diff --git a/net-libs/librsync/librsync-0.9.7.ebuild b/net-libs/librsync/librsync-0.9.7.ebuild
index a4e4a41976a0..254e4a4b671e 100644
--- a/net-libs/librsync/librsync-0.9.7.ebuild
+++ b/net-libs/librsync/librsync-0.9.7.ebuild
@@ -1,18 +1,18 @@
-# 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-libs/librsync/librsync-0.9.7.ebuild,v 1.1 2004/10/25 12:21:29 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/librsync/librsync-0.9.7.ebuild,v 1.1.1.1 2005/11/30 10:02:54 chriswhite Exp $
 
 DESCRIPTION="Flexible remote checksum-based differencing"
+HOMEPAGE="http://librsync.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://librsync.sf.net/"
 
-DEPEND="virtual/libc"
-
-SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+SLOT="0"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ppc ppc-macos ~s390 sparc x86"
 IUSE=""
 
+DEPEND="virtual/libc"
+
 src_compile() {
 	econf --enable-shared || die
 	emake || die
diff --git a/net-libs/libsmi/ChangeLog b/net-libs/libsmi/ChangeLog
index 18669865ec1d..8f6931132626 100644
--- a/net-libs/libsmi/ChangeLog
+++ b/net-libs/libsmi/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-libs/libsmi
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsmi/ChangeLog,v 1.1 2004/07/21 02:39:10 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsmi/ChangeLog,v 1.1.1.1 2005/11/30 10:02:52 chriswhite Exp $
+
+  21 Jul 2004; David Holm <dholm@gentoo.org> libsmi-0.4.2.ebuild:
+  Added to ~ppc.
 
 *libsmi-0.4.2 (20 Jul 2004)
 
diff --git a/net-libs/libsmi/Manifest b/net-libs/libsmi/Manifest
index daf06d704f7d..13bba988c9aa 100644
--- a/net-libs/libsmi/Manifest
+++ b/net-libs/libsmi/Manifest
@@ -1,2 +1,3 @@
-MD5 88db235dc41f5ffa9c01a527ff6eb60b libsmi-0.4.2.ebuild 441
+MD5 2fd08e056a6f18cb42b29aa4086828fd ChangeLog 468
+MD5 0560a7abc6e0388089602e4cb7a4a2a1 libsmi-0.4.2.ebuild 685
 MD5 7528724b6eafea59a37c5d6e7d02f01f files/digest-libsmi-0.4.2 65
diff --git a/net-libs/libsmi/libsmi-0.4.2.ebuild b/net-libs/libsmi/libsmi-0.4.2.ebuild
index 4e7d4c2b0030..ec196cc18045 100644
--- a/net-libs/libsmi/libsmi-0.4.2.ebuild
+++ b/net-libs/libsmi/libsmi-0.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsmi/libsmi-0.4.2.ebuild,v 1.1 2004/07/21 02:39:10 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsmi/libsmi-0.4.2.ebuild,v 1.1.1.1 2005/11/30 10:02:52 chriswhite Exp $
 
 DESCRIPTION="A Library to Access SMI MIB Information"
 SRC_URI="ftp://ftp.ibr.cs.tu-bs.de/pub/local/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.ibr.cs.tu-bs.de/projects/${PN}/"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 IUSE=""
 
 src_compile() {
diff --git a/net-libs/libsoup/ChangeLog b/net-libs/libsoup/ChangeLog
index e73d30ee6982..b7d21208de65 100644
--- a/net-libs/libsoup/ChangeLog
+++ b/net-libs/libsoup/ChangeLog
@@ -1,9 +1,293 @@
 # ChangeLog for net-libs/libsoup
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.1 2003/03/14 00:16:56 liquidx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.1.1.1 2005/11/30 10:02:52 chriswhite Exp $
+
+  11 Nov 2005; Michael Hanselmann <hansmi@gentoo.org>
+  libsoup-2.2.6.1.ebuild:
+  Stable on ppc.
+
+  02 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  libsoup-2.2.6.1.ebuild:
+  Stable on sparc
+
+  01 Nov 2005; John N. Laliberte <allanonjl@gentoo.org>
+  libsoup-2.2.6.1.ebuild:
+  stable on x86
+
+  10 Oct 2005; Hardave Riar <hardave@gentoo.org> libsoup-2.2.3-r1.ebuild:
+  Stable on mips.
+
+*libsoup-2.2.6.1 (26 Aug 2005)
+
+  26 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
+  +libsoup-2.2.6.1.ebuild:
+  New version.
+
+  14 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  libsoup-2.2.3-r1.ebuild:
+  Stable on ppc.
+
+*libsoup-2.2.5 (08 Aug 2005)
+
+  08 Aug 2005; Leonardo Boshell <leonardop@gentoo.org> libsoup-2.2.5.ebuild:
+  New version.
+
+  06 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  libsoup-2.2.3-r1.ebuild:
+  Stable on alpha.
+
+  12 Jul 2005; Stephen P. Becker <geoman@gentoo.org> libsoup-2.2.3.ebuild:
+  stable on mips
+
+  09 Jul 2005; Markus Rothe <corsair@gentoo.org> libsoup-2.2.3-r1.ebuild:
+  Stable on ppc64
+
+  06 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  libsoup-2.2.3-r1.ebuild:
+  Stable on hppa.
+
+  06 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  libsoup-2.2.3-r1.ebuild:
+  Stable on sparc
+
+  06 Jul 2005; Leonardo Boshell <leonardop@gentoo.org>
+  libsoup-2.2.3-r1.ebuild, libsoup-1.99.28-r1.ebuild:
+  Stable on x86.
+
+  05 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org> libsoup-2.2.3.ebuild:
+  Stable on hppa.
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> libsoup-2.2.3.ebuild:
+  Stable on ppc.
+
+  12 Jun 2005; Olivier Crête <tester@gentoo.org> libsoup-2.2.3.ebuild:
+  Stable on amd64
+
+  12 Jun 2005; Bryan Østergaard <kloeri@gentoo.org> libsoup-2.2.3.ebuild:
+  Stable on alpha.
+
+  06 Jun 2005; Markus Rothe <corsair@gentoo.org> libsoup-2.2.3.ebuild:
+  Stable on ppc64
+
+  30 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> libsoup-2.2.3.ebuild:
+  Stable on sparc
+
+*libsoup-2.2.3-r1 (30 May 2005)
+
+  30 May 2005; Leonardo Boshell <leonardop@gentoo.org> libsoup-2.2.3-r1.ebuild:
+  New revision. Implements the 'static' USE flag. Remove useless 'ipv6'
+  flag. Don't inherit from eutils since it's not necessary.
+
+*libsoup-1.99.28-r1 (30 May 2005)
+
+  30 May 2005; Leonardo Boshell <leonardop@gentoo.org>
+  libsoup-1.99.28-r1.ebuild:
+  New revision. Implements the 'static' USE flag.
+
+  30 May 2005; Leonardo Boshell <leonardop@gentoo.org> libsoup-1.99.28.ebuild,
+  files/libsoup-1.99.28-gnutls.patch:
+  Modified gnutls patch so libsoup compiles with recent versions of it.
+  Resolves bug #82654.
+
+  29 May 2005; Leonardo Boshell <leonardop@gentoo.org> libsoup-2.2.3.ebuild:
+  Stable on x86.
+
+  11 May 2005; Guy Martin <gmsoft@gentoo.org> libsoup-2.2.2.ebuild:
+  Stable on hppa.
+
+  08 May 2005; Herbie Hopkins <herbs@gentoo.org> libsoup-2.2.2.ebuild:
+  Stable on amd64.
+
+  29 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> libsoup-2.2.2.ebuild:
+  Stable on sparc
+
+  27 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> libsoup-2.2.2.ebuild:
+  Stable on ia64.
+
+  26 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> libsoup-2.2.2.ebuild:
+  Stable on alpha.
+
+  25 Apr 2005; Mike Gardiner <obz@gentoo.org> libsoup-2.2.2.ebuild:
+  Keyworded ppc x86
+
+*libsoup-2.2.3 (21 Mar 2005)
+
+  21 Mar 2005; Mike Gardiner <obz@gentoo.org> +libsoup-2.2.3.ebuild:
+  New version
+
+  19 Feb 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/libsoup-2.2.2-gnutls.patch, libsoup-2.2.1.ebuild,
+  libsoup-2.2.2.ebuild:
+  Changed to use patch from Martin Wolf <pazo_bug@shiba.dk> in upstream bug
+  http://bugzilla.ximian.com/show_bug.cgi?id=57811 to fix bug #79161
+
+  10 Feb 2005; Daniel Black <dragonheart@gentoo.org> libsoup-2.2.1.ebuild,
+  libsoup-2.2.2.ebuild:
+  Bad sed in last fix - bug #79161 refers.
+
+  04 Feb 2005; Stephen P. Becker <geoman@gentoo.org> libsoup-2.2.1.ebuild:
+  stable on mips
+
+*libsoup-2.2.2 (03 Feb 2005)
+
+  03 Feb 2005; Joe McCann <joem@gentoo.org> +libsoup-2.2.2.ebuild:
+  Version bump
+
+  22 Jan 2005; Scott W Taylor <swtaylor@gentoo.org> libsoup-2.2.1.ebuild:
+  nuke GNUTLS_CERT_NOT_TRUSTED which does not exist in gnutls-1.1.23. closes
+  #79161
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  23 Dec 2004; Guy Martin <gmsoft@gentoo.org> libsoup-2.2.1.ebuild:
+  Stable on hppa.
+
+  17 Dec 2004; Markus Rothe <corsair@gentoo.org> libsoup-2.2.1.ebuild:
+  Stable on ppc64
+
+  11 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> libsoup-2.2.1.ebuild:
+  Stable on alpha.
+
+  26 Nov 2004; Tom Martin <slarti@gentoo.org> libsoup-2.2.1.ebuild:
+  Stable on amd64.
+
+  11 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> libsoup-2.2.1.ebuild:
+  Stable on sparc
+
+  11 Nov 2004; Markus Rothe <corsair@gentoo.org> libsoup-2.2.1.ebuild:
+  Marked ~ppc64
+
+*libsoup-2.2.1 (16 Oct 2004)
+
+  16 Oct 2004; Alastair Tse <liquidx@gentoo.org> +libsoup-2.2.1.ebuild:
+  version bump
+
+  30 Sep 2004; Stephen P. Becker <geoman@gentoo.org> libsoup-2.2.0.ebuild:
+  added ~mips keyword
+
+*libsoup-2.2.0 (13 Sep 2004)
+
+  13 Sep 2004; Brandon Hale <tseng@gentoo.org> +libsoup-2.2.0.ebuild:
+  Version bump, closes bug #62583
+
+*libsoup-2.1.13 (24 Aug 2004)
+
+  24 Aug 2004; Brandon Hale <tseng@gentoo.org> +libsoup-2.1.13.ebuild:
+  Version bump.
+
+*libsoup-2.1.12 (06 Aug 2004)
+
+  06 Aug 2004; Alastair Tse <liquidx@gentoo.org> +libsoup-2.1.12.ebuild:
+  evo-1.5 devel version libraries (#35456)
+
+  27 Jul 2004; <agriffis@gentoo.org> libsoup-1.99.28.ebuild:
+  stable on ia64
+
+  04 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> libsoup-1.99.28.ebuild:
+  Stable on alpha.
+
+  01 Jun 2004; Travis Tilley <lv@gentoo.org> libsoup-1.99.28.ebuild:
+  stable on amd64
+
+  26 May 2004; Guy Martin <gmsoft@gentoo.org> libsoup-1.99.28.ebuild:
+  Marked stable on hppa.
+
+  14 May 2004; Lars Weiler <pylon@gentoo.org> libsoup-1.99.28.ebuild:
+  Stable on ppc
+
+  29 Apr 2004; Gustavo Zacarias <gustavoz@gentoo.org> libsoup-1.99.28.ebuild:
+  Stable on sparc
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> libsoup-1.99.26-r1.ebuild,
+  libsoup-1.99.26.ebuild, libsoup-1.99.28.ebuild:
+  Add inherit eutils
+
+*libsoup-1.99.28 (22 Mar 2004)
+
+  22 Mar 2004; Alastair Tse <liquidx@gentoo.org> libsoup-1.99.28.ebuild:
+  version bump
+
+  04 Feb 2004; Alastair Tse <liquidx@gentoo.org> libsoup-1.99.26-r1.ebuild:
+  added patch to deal with libgcrypt-1.1.91 changes. (#40016,#37732)
+
+  05 Jan 2004; Jason Wever <weeve@gentoo.org> libsoup-1.99.26-r1.ebuild:
+  Marked stable on sparc.
+
+  16 Dec 2003; Guy Martin <gmsoft@gentoo.org> libsoup-1.99.26-r1.ebuild:
+  Marked stable on hppa.
+
+  14 Dec 2003; Lars Weiler <pylon@gentoo.org> libsoup-1.99.26-r1.ebuild:
+  Make stable on ppc
+
+  13 Dec 2003; Brad House <brad_mssw@gentoo.org> libsoup-1.99.26-r1.ebuild:
+  mark stable on amd64
+
+  10 Dec 2003; <agriffis@gentoo.org> libsoup-1.99.26-r1.ebuild:
+  stable on ia64
+
+  06 Dec 2003; foser <foser@gentoo.org> libsoup-1.99.26{-r1}.ebuild :
+  Remove aclocal and automake steps, not needed. Fixes #33999
+
+  28 Nov 2003; Jason Wever <weeve@gentoo.org> libsoup-1.99.26.ebuild:
+  Marked stable on sparc.
+
+  29 Nov 2003; Chuck Short <zul@gentoo.org> libsoup-1.99.26.ebuild:
+  Added ~amd64 to keywords, closes #34442.
+
+*libsoup-1.99.26-r1 (22 Nov 2003)
+
+  22 Nov 2003; Alastair Tse <liquidx@gentoo.org> libsoup-1.99.26-r1.ebuild,
+  files/libsoup-1.99.26-msn.patch:
+  add timeout patch to libsoup so it works with msn servers (#32833)
+  (http://get.bitlbee.org/libsoup/)
+
+  20 Oct 2003; Aron Griffis <agriffis@gentoo.org> libsoup-1.99.26.ebuild:
+  Stable on alpha
+
+  13 Oct 2003; Alastair Tse <liquidx@gentoo.org> libsoup-1.99.26.ebuild:
+  stable bump for x86
+
+  28 Sep 2003; Alastair Tse <liquidx@gentoo.org> libsoup-1.99.26.ebuild,
+  files/libsoup-1.99.26-with_ssl.patch:
+  add patch to switch between openssl and gnutls
+
+*libsoup-1.99.26 (24 Sep 2003)
+
+  24 Sep 2003; Alastair Tse <liquidx@gentoo.org> libsoup-1.99.26.ebuild:
+  version bump
+
+*libsoup-1.99.23 (10 Jun 2003)
+
+  04 Aug 2003; Guy Martin <gmsoft@gentoo.org> libsoup-1.99.23.ebuild :
+  Added hppa to KEYWORDS.
+
+  10 Jun 2003; Alastair Tse <liquidx@gentoo.org> libsoup-1.99.23.ebuild:
+  version bump for evo 1.4
+
+*libsoup-1.99.22 (03 Jun 2003)
+
+  03 Jun 2003; Alastair Tse <liquidx@gentoo.org> libsoup-1.99.22.ebuild:
+  version bump. part of evo 1.3.92 update.
+
+*libsoup-1.99.20 (07 May 2003)
+
+  07 May 2003; Alastair Tse <liquidx@gentoo.org> libsoup-1.99.20.ebuild:
+  version bump
+
+  01 May 2003; Alastair Tse <liquidx@gentoo.org> libsoup-1.99.17.ebuild:
+  remove ssl option. ssl is now compulsory
+
+*libsoup-1.99.17 (21 Apr 2003)
+
+  21 Apr 2003; Alastair Tse <liquidx@gentoo.org> libsoup-1.99.17.ebuild:
+  evo-1.3.2 version bump
 
 *libsoup-1.99.12 (14 Mar 2003)
 
+  19 Mar 2003; Alastair Tse <liquidx@gentoo.org> libsoup-1.99.12.ebuild:
+  sourcing from gnome.org rather than ximian.com
+
   14 Mar 2003; Alastair Tse <liquidx@gentoo.org> libsoup-1.99.12.ebuild:
   inital ebuild. new version of soup that uses glib2 rather than glib1.
 
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 0491c585fba1..45f852d0c72a 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,5 +1,25 @@
-MD5 7c7792576a2bd03216b71619bc9cf86a libsoup-1.99.12.ebuild 915
-MD5 278a23042e874f469929ae1f71dc9ae9 ChangeLog 647
-MD5 c19f4c23386ec82f2f300f354fe5b995 libsoup-1.99.17.ebuild 915
-MD5 a875f4b0842e739f0a797ec0e5a7ad50 files/digest-libsoup-1.99.12 68
-MD5 3b140665fa099254cf9b28eb26948840 files/digest-libsoup-1.99.17 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 46ee7ffc8c1e5014005b6e0905d1140b ChangeLog 9120
+MD5 6c44713499ec52c81ca81ed58a6286bf files/digest-libsoup-1.99.28 68
+MD5 6c44713499ec52c81ca81ed58a6286bf files/digest-libsoup-1.99.28-r1 68
+MD5 ef781f10152707123d5acdcca14603f5 files/digest-libsoup-2.2.3 66
+MD5 ef781f10152707123d5acdcca14603f5 files/digest-libsoup-2.2.3-r1 66
+MD5 3b3d5cd51e4b0262e3cfd334e2566e81 files/digest-libsoup-2.2.6.1 68
+MD5 6128cc7bbf088e07b4040e8296a7c57b files/libsoup-1.99.26-msn.patch 627
+MD5 09a0c3f27613d90ffeb8abb875598ace files/libsoup-1.99.26-with_ssl.patch 2861
+MD5 dc791ddf4cb75ab5325eea016e52e09b files/libsoup-1.99.28-gnutls.patch 1275
+MD5 0ffa00e57cc842e0c26f596d56daee27 libsoup-1.99.28-r1.ebuild 1451
+MD5 ab2763b9426be6cf518c6febf807aca3 libsoup-1.99.28.ebuild 1380
+MD5 17bd009dd39268c10da424baa69eaf3d libsoup-2.2.3-r1.ebuild 755
+MD5 89428354354ead79d37795ca8c257e63 libsoup-2.2.3.ebuild 724
+MD5 f3dbef36ece87749d111599d1bfabfee libsoup-2.2.6.1.ebuild 775
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDeYQOgIKl8Uu19MoRAt+CAJwLRC/MWivdb92ygWdE6UqBP2xbzQCaAt9j
+hMa5FJFL2sCGxyUgQPaUmcQ=
+=MSUE
+-----END PGP SIGNATURE-----
diff --git a/net-libs/libsoup/libsoup-1.99.28-r1.ebuild b/net-libs/libsoup/libsoup-1.99.28-r1.ebuild
index a7580a503220..588791f888ec 100644
--- a/net-libs/libsoup/libsoup-1.99.28-r1.ebuild
+++ b/net-libs/libsoup/libsoup-1.99.28-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-libs/libsoup/libsoup-1.99.28-r1.ebuild,v 1.1 2005/05/30 08:13:24 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-1.99.28-r1.ebuild,v 1.1.1.1 2005/11/30 10:02:52 chriswhite Exp $
 
 inherit gnome.org libtool eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc x86"
 IUSE="gnutls static"
 
 RDEPEND=">=dev-libs/glib-2.0
diff --git a/net-libs/libsoup/libsoup-1.99.28.ebuild b/net-libs/libsoup/libsoup-1.99.28.ebuild
index 7a3b1270a1a2..065aea18451d 100644
--- a/net-libs/libsoup/libsoup-1.99.28.ebuild
+++ b/net-libs/libsoup/libsoup-1.99.28.ebuild
@@ -1,21 +1,20 @@
-# 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-libs/libsoup/libsoup-1.99.28.ebuild,v 1.1 2004/03/22 09:55:30 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-1.99.28.ebuild,v 1.1.1.1 2005/11/30 10:02:52 chriswhite Exp $
 
-inherit gnome.org libtool
+inherit gnome.org libtool eutils
 
 DESCRIPTION="Soup is a SOAP implementation"
 HOMEPAGE="http://www.gnome.org/"
 
-IUSE="gnutls"
-SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="~x86 ~sparc ~ppc ~alpha ~hppa ~ia64 ~amd64"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc sparc x86"
+IUSE="gnutls"
 
 RDEPEND=">=dev-libs/glib-2.0
 	!gnutls? ( dev-libs/openssl )
-	gnutls?  ( net-libs/gnutls )"
-
+	gnutls?  ( >=net-libs/gnutls-1 )"
 DEPEND=">=dev-util/pkgconfig-0.12.0
 	dev-libs/popt
 	sys-devel/automake
@@ -25,7 +24,7 @@ DEPEND=">=dev-util/pkgconfig-0.12.0
 src_unpack() {
 	unpack ${A}
 	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-1.99.26-msn.patch
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-1.99.26-gnutls_1.0.patch
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${P}-gnutls.patch
 	# added --with-ssl=openssl|gnutls to choose between the two.
 	export WANT_AUTOCONF=1.4
 	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-1.99.26-with_ssl.patch
@@ -48,5 +47,5 @@ src_compile() {
 
 src_install() {
 	einstall || die "install failed"
-	dodoc AUTHORS COPYING* ChangeLog README* TODO
+	dodoc AUTHORS ChangeLog README* TODO
 }
diff --git a/net-libs/libsoup/libsoup-2.2.3-r1.ebuild b/net-libs/libsoup/libsoup-2.2.3-r1.ebuild
index 1f22cab3ba01..652769efb31b 100644
--- a/net-libs/libsoup/libsoup-2.2.3-r1.ebuild
+++ b/net-libs/libsoup/libsoup-2.2.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-libs/libsoup/libsoup-2.2.3-r1.ebuild,v 1.1 2005/05/30 08:13:24 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.2.3-r1.ebuild,v 1.1.1.1 2005/11/30 10:02:52 chriswhite Exp $
 
 inherit gnome2
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="LGPL-2"
 SLOT="2.2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha ~amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
 IUSE="doc ssl static"
 
 RDEPEND=">=dev-libs/glib-2
diff --git a/net-libs/libsoup/libsoup-2.2.3.ebuild b/net-libs/libsoup/libsoup-2.2.3.ebuild
index fda8696b3e10..afeb9cc49c02 100644
--- a/net-libs/libsoup/libsoup-2.2.3.ebuild
+++ b/net-libs/libsoup/libsoup-2.2.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-libs/libsoup/libsoup-2.2.3.ebuild,v 1.1 2005/03/21 11:43:56 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.2.3.ebuild,v 1.1.1.1 2005/11/30 10:02:52 chriswhite Exp $
 
 inherit gnome2 eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="LGPL-2"
 SLOT="2.2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
 IUSE="ssl doc ipv6"
 
 RDEPEND=">=dev-libs/glib-2
diff --git a/net-libs/libsoup/libsoup-2.2.6.1.ebuild b/net-libs/libsoup/libsoup-2.2.6.1.ebuild
index 2a3ff161eaaf..687ddbf6fea4 100644
--- a/net-libs/libsoup/libsoup-2.2.6.1.ebuild
+++ b/net-libs/libsoup/libsoup-2.2.6.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-libs/libsoup/libsoup-2.2.6.1.ebuild,v 1.1 2005/08/26 10:35:55 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.2.6.1.ebuild,v 1.1.1.1 2005/11/30 10:02:52 chriswhite Exp $
 
 inherit gnome2
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="LGPL-2"
 SLOT="2.2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~hppa ia64 ~mips ppc ~ppc64 sparc x86"
 IUSE="doc ssl static"
 
 RDEPEND=">=dev-libs/glib-2.4
diff --git a/net-libs/libssh/ChangeLog b/net-libs/libssh/ChangeLog
index 063127ee9eaa..a914518af13f 100644
--- a/net-libs/libssh/ChangeLog
+++ b/net-libs/libssh/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for net-libs/libssh
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/ChangeLog,v 1.1 2004/05/17 03:46:23 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/ChangeLog,v 1.1.1.1 2005/11/30 10:02:58 chriswhite Exp $
+
+  05 Mar 2005; Mike Doty <kingtaco@gentoo.org> :
+  ~amd64 per ka0ttics request
+
+*libssh-0.11 (05 Mar 2005)
+
+  05 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> +libssh-0.11.ebuild:
+  Version bump for bug 84117.
+
+  16 Aug 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml, libssh-0.1.ebuild:
+  Marking stable on x86: currently only net-analyzer/hydra depends on this
+  package. Moving it under the netmon herd.
+
+  23 Jun 2004; David Holm <dholm@gentoo.org> libssh-0.1.ebuild:
+  Added to ~ppc.
+
+  14 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> libssh-0.1.ebuild:
+  fix LICENSE (bug #53926); error check
 
 *libssh-0.1 (17 May 2004)
 
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 64d54f7a797c..491c3fb83559 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,3 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2fa4659593ebfd88a18f9495408c9497 ChangeLog 953
+MD5 07e973007b7ebfc903df656c8635f3bf libssh-0.1.ebuild 828
+MD5 67176a673d5f792bc9cf28e4c632e49b metadata.xml 252
+MD5 f2de24b253e7f13c3fab7c1a2c892615 libssh-0.11.ebuild 609
 MD5 f3008419ae3b4a4b4f9e0781459a4510 files/digest-libssh-0.1 59
-MD5 0687665a63dd7ebfd33938fb9cfb1eea libssh-0.1.ebuild 800
-MD5 4439944984c903b9c7b913d6c99e99c9 ChangeLog 355
+MD5 9c7a7f99638231c3b559910de8c1b897 files/digest-libssh-0.11 60
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFCKfZd0K3RJaeXx6cRAlhxAKDd5vdFvgPp2MunHvkZA67uS7GVCACfd6Ro
+T7fXeXB6p99rF5KVycunSYU=
+=yYUU
+-----END PGP SIGNATURE-----
diff --git a/net-libs/libssh/libssh-0.1.ebuild b/net-libs/libssh/libssh-0.1.ebuild
index 30416de8538e..698bb889c7ee 100644
--- a/net-libs/libssh/libssh-0.1.ebuild
+++ b/net-libs/libssh/libssh-0.1.ebuild
@@ -1,22 +1,22 @@
-# 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-libs/libssh/libssh-0.1.ebuild,v 1.1 2004/05/17 03:46:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.1.ebuild,v 1.1.1.1 2005/11/30 10:02:58 chriswhite Exp $
 
 DESCRIPTION="access a working SSH implementation by means of a library"
 HOMEPAGE="http://0xbadc0de.be/projects/sshlib.html"
 SRC_URI="http://www.0xbadc0de.be/projects/libssh/${P}.tgz"
 
-LICENSE="GPL-2"
+LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="ppc x86"
 IUSE=""
 
 DEPEND="sys-libs/zlib
 	dev-libs/openssl"
 
 src_install() {
-	make install prefix=${D}/usr || die "einstall failed"
-	newbin ssh ${PN}-ssh
+	make prefix="${D}/usr" install || die "make install failed"
+	newbin ssh ${PN}-ssh || die "newbin failed"
 	dosym ${PN}-ssh /usr/bin/${PN}-sftp
 	[ ! -e "${ROOT}/usr/bin/ssh" ] && dosym ${PN}-ssh /usr/bin/ssh
 	[ ! -e "${ROOT}/usr/bin/sftp" ] && dosym ${PN}-ssh /usr/bin/sftp
diff --git a/net-libs/libssh/libssh-0.11.ebuild b/net-libs/libssh/libssh-0.11.ebuild
index be40cf7a3034..a55e7f321063 100644
--- a/net-libs/libssh/libssh-0.11.ebuild
+++ b/net-libs/libssh/libssh-0.11.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-libs/libssh/libssh-0.11.ebuild,v 1.1 2005/03/05 07:46:10 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.11.ebuild,v 1.1.1.1 2005/11/30 10:02:58 chriswhite Exp $
 
 DESCRIPTION="access a working SSH implementation by means of a library"
 HOMEPAGE="http://0xbadc0de.be/?part=libssh"
@@ -8,7 +8,7 @@ SRC_URI="http://www.0xbadc0de.be/libssh/${P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~ppc ~x86 ~amd64"
 IUSE=""
 
 DEPEND="sys-libs/zlib
diff --git a/net-libs/libtlen/ChangeLog b/net-libs/libtlen/ChangeLog
index c1ed05d9cf9b..2ddc89acdc28 100644
--- a/net-libs/libtlen/ChangeLog
+++ b/net-libs/libtlen/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for net-libs/libtlen
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libtlen/ChangeLog,v 1.1 2003/11/15 07:18:55 seemant Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libtlen/ChangeLog,v 1.1.1.1 2005/11/30 10:02:54 chriswhite Exp $
+
+  27 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/20040912-fPIC.patch, libtlen-20040912.ebuild:
+  added fPIC patch for amd64, fixes #77151
+
+*libtlen-20040912 (27 Sep 2004)
+
+  27 Sep 2004; Karol Wojtaszek <sekretarz@gentoo.org>
+  +libtlen-20040912.ebuild:
+  Version bump. Bug #65218
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  libtlen-20031114.ebuild:
+  virtual/glibc -> virtual/libc
+
+  23 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  libtlen-20031114.ebuild:
+  Don't assign default to S
+
+  28 Apr 2004; Michal Januszewski <spock@gentoo.org> libtlen-20031114.ebuild:
+  Stable on x86.
 
 *libtlen-20031114 (14 Nov 2003)
 
diff --git a/net-libs/libtlen/Manifest b/net-libs/libtlen/Manifest
index bc58f37202e9..b10591ecf73d 100644
--- a/net-libs/libtlen/Manifest
+++ b/net-libs/libtlen/Manifest
@@ -1,3 +1,17 @@
-MD5 53d6f47e728956ae82e8be59476e2804 libtlen-20031114.ebuild 580
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a23c418abb228cf592a3dadc71b5196d libtlen-20031114.ebuild 624
+MD5 5b12a2f2761ea1a55e2a8431aad2ce9b libtlen-20040912.ebuild 777
+MD5 51602a58e6309eb5bc105a1af6b06c3b ChangeLog 1361
 MD5 0d17c7911a482bad7ce91a131328ca85 metadata.xml 332
 MD5 b7d1de59611a7229eb27ad2180690817 files/digest-libtlen-20031114 68
+MD5 846ebfd32e7ec9956739409fa3baee5c files/digest-libtlen-20040912 68
+MD5 ff343fdaf1727fc39284f65a82e313f9 files/20040912-fPIC.patch 419
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCRgSA06ebR+OMO78RAgD8AKCVqy9u6cI2RhXMjxpsfU9LorgbfwCfUvgK
+xzwNjaRIHaxMeE8Yy071n+U=
+=zyQE
+-----END PGP SIGNATURE-----
diff --git a/net-libs/libtlen/libtlen-20031114.ebuild b/net-libs/libtlen/libtlen-20031114.ebuild
index 7dca8b7daba0..10f26a58b176 100644
--- a/net-libs/libtlen/libtlen-20031114.ebuild
+++ b/net-libs/libtlen/libtlen-20031114.ebuild
@@ -1,27 +1,25 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU Library General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libtlen/libtlen-20031114.ebuild,v 1.1 2003/11/15 07:18:55 seemant Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libtlen/libtlen-20031114.ebuild,v 1.1.1.1 2005/11/30 10:02:54 chriswhite Exp $
 
-IUSE=""
-
-S=${WORKDIR}/${P}
 DESCRIPTION="Support library for Tlen IMS"
 HOMEPAGE="http://libtlen.eu.org/"
 SRC_URI="http://libtlen.eu.org/snapshots/archive/${P}.tar.gz"
 
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa ~mips ~amd64 ~ia64"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~arm ~amd64 ~ia64"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
-        econf \
-                --enable-shared || die
-        emake CFLAGS="${CFLAGS}" all || die
+	econf \
+		--enable-shared || die
+	emake CFLAGS="${CFLAGS}" all || die
 }
 
 src_install() {
-        einstall || die
-        dodoc ChangeLog
+	einstall || die
+	dodoc ChangeLog
 }
diff --git a/net-libs/libtlen/libtlen-20040912.ebuild b/net-libs/libtlen/libtlen-20040912.ebuild
index 29329ab83b9d..bcc407c46db9 100644
--- a/net-libs/libtlen/libtlen-20040912.ebuild
+++ b/net-libs/libtlen/libtlen-20040912.ebuild
@@ -1,6 +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-libs/libtlen/libtlen-20040912.ebuild,v 1.1 2004/09/26 22:48:51 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libtlen/libtlen-20040912.ebuild,v 1.1.1.1 2005/11/30 10:02:54 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="Support library for Tlen IMS"
 HOMEPAGE="http://libtlen.eu.org/"
@@ -13,10 +15,22 @@ IUSE="doc"
 
 DEPEND="virtual/libc"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	if use amd64; then
+		epatch ${FILESDIR}/${PV}-fPIC.patch
+		aclocal
+		autoconf
+		libtoolize --force --copy
+	fi
+}
+
 src_compile() {
 	econf \
 		--enable-shared || die
-	emake CFLAGS="${CFLAGS}" all || die
+	emake all || die
 }
 
 src_install() {
diff --git a/net-libs/libtorrent/ChangeLog b/net-libs/libtorrent/ChangeLog
index 117bea253b33..72bc67fd3bf1 100644
--- a/net-libs/libtorrent/ChangeLog
+++ b/net-libs/libtorrent/ChangeLog
@@ -1,12 +1,173 @@
 # ChangeLog for net-libs/libtorrent
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libtorrent/ChangeLog,v 1.1 2004/08/18 18:11:16 squinky86 Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libtorrent/ChangeLog,v 1.1.1.1 2005/11/30 10:02:51 chriswhite Exp $
+
+  19 Nov 2005; <dang@gentoo.org> libtorrent-0.7.6.ebuild:
+  Marked stable on amd64
+
+  05 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -libtorrent-0.7.5.ebuild:
+  Remove old version.
+
+*libtorrent-0.7.6 (18 Oct 2005)
+
+  18 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +libtorrent-0.7.6.ebuild:
+  Bumped following upstream.
+
+  13 Oct 2005; Mark Loeser <halcy0n@gentoo.org> libtorrent-0.7.0-r1.ebuild:
+  Stable on x86
+
+  11 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -libtorrent-0.7.2.ebuild, -libtorrent-0.7.3.ebuild,
+  -libtorrent-0.7.4.ebuild:
+  Remove old versions.
+
+*libtorrent-0.7.5 (28 Sep 2005)
+
+  28 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +libtorrent-0.7.5.ebuild:
+  Version bump.
+
+*libtorrent-0.7.4 (18 Sep 2005)
+
+  18 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +libtorrent-0.7.4.ebuild:
+  Update to latest upstream version.
+
+  02 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -files/libtorrent-0.6.3-fbsd.patch, -libtorrent-0.6.4.ebuild,
+  -libtorrent-0.6.7-r1.ebuild, libtorrent-0.7.0-r1.ebuild:
+  Marked 0.7.0-r1 stable on amd64. Removed old ebuilds.
+
+*libtorrent-0.7.3 (02 Sep 2005)
+
+  02 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +libtorrent-0.7.3.ebuild:
+  Updated to latest upstream version.
+
+*libtorrent-0.7.2 (16 Aug 2005)
+
+  16 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -libtorrent-0.7.1.ebuild, +libtorrent-0.7.2.ebuild:
+  Update to bugfix release 0.7.2.
+
+*libtorrent-0.7.1 (13 Aug 2005)
+
+  13 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +libtorrent-0.7.1.ebuild:
+  Updated to latest upstream version. Dropped patch, dropped AM_CFLAGS
+  workaround.
+
+  01 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  libtorrent-0.6.4.ebuild, libtorrent-0.6.7-r1.ebuild,
+  libtorrent-0.7.0-r1.ebuild:
+  Respect user-defined CXXFLAGS, workaround a configure.ac bug.
+
+  31 Jul 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -libtorrent-0.6.5.ebuild, -libtorrent-0.6.6.ebuild,
+  -libtorrent-0.6.7.ebuild:
+  Removed old versions.
+
+*libtorrent-0.7.0-r1 (27 Jul 2005)
+
+  27 Jul 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -files/libtorrent-0.6.2-fbsd.patch, -files/libtorrent-0.6.2-warns.patch,
+  +files/libtorrent-0.7.0-1.diff, -libtorrent-0.7.0.ebuild,
+  +libtorrent-0.7.0-r1.ebuild:
+  Added upstream patch to 0.7.0. Removed old stale patches.
+
+*libtorrent-0.7.0 (19 Jul 2005)
+
+  19 Jul 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +libtorrent-0.7.0.ebuild:
+  New upstream version.
+
+*libtorrent-0.6.7-r1 (16 Jul 2005)
+
+  16 Jul 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +libtorrent-0.6.7-r1.ebuild:
+  Filter -fomit-frame-pointer on x86 as it clash with execeptions handling.
+
+*libtorrent-0.6.7 (07 Jul 2005)
+
+  07 Jul 2005; Diego Pettenò <flameeyes@gentoo.org>
+  libtorrent-0.6.4.ebuild, +libtorrent-0.6.7.ebuild:
+  New upstream version.
+  Marked stable the last version with big bugs fixes.
+  Removed previous versions.
+
+*libtorrent-0.6.6 (26 Jun 2005)
+
+  26 Jun 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +libtorrent-0.6.6.ebuild:
+  New upstream version.
+
+*libtorrent-0.6.5 (15 Jun 2005)
+
+  15 Jun 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +libtorrent-0.6.5.ebuild:
+  New upstream version.
+
+*libtorrent-0.6.4 (08 Jun 2005)
+
+  08 Jun 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -libtorrent-0.3.5.ebuild, -libtorrent-0.3.7.ebuild,
+  -libtorrent-0.4.1.ebuild, +libtorrent-0.6.4.ebuild:
+  Added latest upstream version. Removed pre-split versions.
+
+*libtorrent-0.6.3 (30 May 2005)
+
+  30 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/libtorrent-0.6.3-fbsd.patch, +libtorrent-0.6.3.ebuild:
+  Updated to latest upstream version. Removed -warns patch as it's applied
+  upstream, updated -fbsd patch to apply on this version. Close #94531.
+
+  29 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/libtorrent-0.6.2-warns.patch, libtorrent-0.6.2.ebuild:
+  Added patch to fix warnings (errors) about integer/pointer mismatch.
+
+  25 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/libtorrent-0.6.2-fbsd.patch, libtorrent-0.6.2.ebuild:
+  Added Gentoo/FreeBSD compatibility patch, now libtorrent compile and works
+  there.
+
+*libtorrent-0.6.2 (05 May 2005)
+
+  05 May 2005; Diego Pettenò <flameeyes@gentoo.org> metadata.xml,
+  +libtorrent-0.6.2.ebuild:
+  New upstream version, close #86259. Now the rtorrent console client is in
+  net-p2p/rtorrent.
+
+*libtorrent-0.4.1 (23 Nov 2004)
+
+  23 Nov 2004; Jon Hood <squinky86@gentoo.org> +libtorrent-0.4.1.ebuild:
+  Version bump.
+
+*libtorrent-0.3.7 (18 Oct 2004)
+
+  18 Oct 2004; Jon Hood <squinky86@gentoo.org>
+  -files/libtorrent-0.3.1-client.patch, -libtorrent-0.3.2.ebuild,
+  +libtorrent-0.3.7.ebuild:
+  Version bump, remove old versions.
+
+*libtorrent-0.3.5 (16 Sep 2004)
+
+  16 Sep 2004; Jon Hood <squinky86@gentoo.org> +libtorrent-0.3.5.ebuild:
+  Version bump, fix curl dependency.
+
+  30 Aug 2004; David Holm <dholm@gentoo.org> libtorrent-0.3.2.ebuild:
+  Added to ~ppc.
+
+  18 Aug 2004; Jon Hood <squinky86@gentoo.org> -files/0.3.2-rtorrent.patch,
+  libtorrent-0.3.2.ebuild:
+  Remove patch since Rakshasa upgraded the package with its changes.
 
 *libtorrent-0.3.2 (18 Aug 2004)
 
   18 Aug 2004; Jon Hood <squinky86@gentoo.org> +metadata.xml,
   +files/0.3.2-rtorrent.patch, +files/libtorrent-0.3.1-client.patch,
   +libtorrent-0.3.2.ebuild:
-  Initial import, thanks to Jos� Romildo Malaquias <romildo@uber.com.br> for the
+  Initial import, thanks to José Romildo Malaquias <romildo@uber.com.br> for the
   initial ebuild and Rakshasa <jaris@ifi.uio.no> for the updates, #60674.
 
diff --git a/net-libs/libtorrent/Manifest b/net-libs/libtorrent/Manifest
index 264c1e7c6771..89ccfa1b3e84 100644
--- a/net-libs/libtorrent/Manifest
+++ b/net-libs/libtorrent/Manifest
@@ -1,3 +1,17 @@
-MD5 1522cc754b5e408fabf7c05a3938f2c3 libtorrent-0.3.2.ebuild 497
-MD5 172fe995c5681517637542f5b2a2bf24 files/digest-libtorrent-0.3.2 68
-MD5 459b4193764b0275cdf318933f56240e files/libtorrent-0.3.1-client.patch 664
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 71f8809ac1659bb15878dd0e1bdef78e ChangeLog 5638
+MD5 b6bdcc98c0629e31fa94fb37e01a3926 files/digest-libtorrent-0.7.0-r1 68
+MD5 07f4fde34f29b1823ba3ece4ddfcb022 files/digest-libtorrent-0.7.6 68
+MD5 78f5b0b99807bf88fcc027062fd2572d files/libtorrent-0.7.0-1.diff 579
+MD5 9f1b0c2bcf00b11553b515da4b71dae9 libtorrent-0.7.0-r1.ebuild 1164
+MD5 0a16b0c01dae6c5b1cc6a5cb7f18759e libtorrent-0.7.6.ebuild 918
+MD5 b59f615ff4e1c464f88d1667a66f6b5d metadata.xml 224
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDf5V2omPajV0RnrERAnwWAJ0SQHNnRY0GTeGDX1MAv8NAGagTnQCfXaqj
+/rzI7NsUe/OjFMyudIYSDAI=
+=iS9d
+-----END PGP SIGNATURE-----
diff --git a/net-libs/libtorrent/libtorrent-0.7.0-r1.ebuild b/net-libs/libtorrent/libtorrent-0.7.0-r1.ebuild
index 54dacceff5e1..a818bb086182 100644
--- a/net-libs/libtorrent/libtorrent-0.7.0-r1.ebuild
+++ b/net-libs/libtorrent/libtorrent-0.7.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-libs/libtorrent/libtorrent-0.7.0-r1.ebuild,v 1.1 2005/07/27 07:54:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libtorrent/libtorrent-0.7.0-r1.ebuild,v 1.1.1.1 2005/11/30 10:02:51 chriswhite Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://libtorrent.rakshasa.no/"
 SRC_URI="http://libtorrent.rakshasa.no/downloads/${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 IUSE="debug"
 
@@ -33,7 +33,10 @@ src_compile() {
 		$(use_enable debug) \
 		--disable-dependency-tracking \
 		|| die "econf failed"
-	emake || die "emake failed"
+
+	# This is needed until the proper cflags patch is applied
+	# Saves us from running autoconf and stuff.
+	emake AM_CXXFLAGS="${CXXFLAGS}" || die "emake failed"
 }
 
 src_install() {
diff --git a/net-libs/libtorrent/libtorrent-0.7.6.ebuild b/net-libs/libtorrent/libtorrent-0.7.6.ebuild
index 7289af9b2c0c..c8f0609c5d2a 100644
--- a/net-libs/libtorrent/libtorrent-0.7.6.ebuild
+++ b/net-libs/libtorrent/libtorrent-0.7.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-libs/libtorrent/libtorrent-0.7.6.ebuild,v 1.1 2005/10/18 20:43:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libtorrent/libtorrent-0.7.6.ebuild,v 1.1.1.1 2005/11/30 10:02:51 chriswhite Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://libtorrent.rakshasa.no/"
 SRC_URI="http://libtorrent.rakshasa.no/downloads/${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 
 IUSE="debug"
 
diff --git a/net-libs/libtorrent/metadata.xml b/net-libs/libtorrent/metadata.xml
index a6f4b1dc32c6..9d91bae40246 100644
--- a/net-libs/libtorrent/metadata.xml
+++ b/net-libs/libtorrent/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>net-p2p</herd>
 <maintainer>
- <email>squinky86@gentoo.org</email>
+ <email>flameeyes@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/net-libs/libvncserver/ChangeLog b/net-libs/libvncserver/ChangeLog
index f55d40aa89b1..ab44773fa0fe 100644
--- a/net-libs/libvncserver/ChangeLog
+++ b/net-libs/libvncserver/ChangeLog
@@ -1,6 +1,41 @@
 # ChangeLog for net-libs/libvncserver
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libvncserver/ChangeLog,v 1.1 2003/08/08 01:22:47 vapier Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libvncserver/ChangeLog,v 1.1.1.1 2005/11/30 10:02:53 chriswhite Exp $
+
+*libvncserver-0.8_pre (27 Oct 2005)
+
+  27 Oct 2005; Mike Frysinger <vapier@gentoo.org>
+  +libvncserver-0.8_pre.ebuild:
+  Version bump.
+
+*libvncserver-0.7.1 (17 Jul 2005)
+
+  17 Jul 2005; Mike Frysinger <vapier@gentoo.org>
+  +libvncserver-0.7.1.ebuild:
+  Version bump.
+
+*libvncserver-0.7 (29 Dec 2004)
+
+  29 Dec 2004; Mike Frysinger <vapier@gentoo.org>
+  -files/0.5-optional-configure.ac.patch, -libvncserver-0.6.ebuild,
+  +libvncserver-0.7.ebuild:
+  Version bump for security #76019.
+
+  11 Aug 2004; Tom Martin <slarti@gentoo.org> libvncserver-0.6.ebuild:
+  Marked ~amd64.
+
+  10 Jun 2004; Aron Griffis <agriffis@gentoo.org> libvncserver-0.6.ebuild:
+  Fix use invocation
+
+*libvncserver-0.6 (01 Jan 2003)
+
+  01 Jan 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bumpage #36975.
+
+*libvncserver-0.5-r1 (12 Aug 2003)
+
+  12 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  Make sure storepasswd binary is installed.
 
 *libvncserver-0.5 (07 Aug 2003)
 
diff --git a/net-libs/libvncserver/Manifest b/net-libs/libvncserver/Manifest
index aa0a85dc53f8..78af31523f79 100644
--- a/net-libs/libvncserver/Manifest
+++ b/net-libs/libvncserver/Manifest
@@ -1,4 +1,18 @@
-MD5 6b08c23ec1dc7c14bf1714b076427976 files/0.5-optional-configure.ac.patch 2404
-MD5 fb338b819a13d087d154ab4ebdd81179 files/digest-libvncserver-0.5-r1 68
-MD5 7a93fa28c9551c2a8cb243e2d8b3c282 ChangeLog 486
-MD5 376dde6cf15c04be838f7d2c97d7bf3c libvncserver-0.5-r1.ebuild 1219
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1c621a0ef8cb9cccceadef9b637b24a5 ChangeLog 1259
+MD5 fddfd497cf7b221c2b3256417d745a7d files/digest-libvncserver-0.7 68
+MD5 0bd86686124b788b0a06054f0d3e6685 files/digest-libvncserver-0.7.1 70
+MD5 5c71139f42d69d729e5b91169e7cdb47 files/digest-libvncserver-0.8_pre 71
+MD5 7cb15f047d688b57cafc1e32efceb61a libvncserver-0.7.1.ebuild 1211
+MD5 add0a3ae6abcc02d2ec68c8ae584d359 libvncserver-0.7.ebuild 1204
+MD5 03c7e2beeac77523574d554d409d6951 libvncserver-0.8_pre.ebuild 1186
+MD5 5a0f741917cbfc8c37b0deaf3be3ccb6 metadata.xml 679
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDYWn7gIKl8Uu19MoRAq6aAJwIPatGIF9uAwpQ+wkKGpNA3ur54QCZARvl
+VHhfNhK601etiXFhKk+UGuQ=
+=j/Zq
+-----END PGP SIGNATURE-----
diff --git a/net-libs/libvncserver/libvncserver-0.7.1.ebuild b/net-libs/libvncserver/libvncserver-0.7.1.ebuild
index 53d34de0bd2f..5ed523859005 100644
--- a/net-libs/libvncserver/libvncserver-0.7.1.ebuild
+++ b/net-libs/libvncserver/libvncserver-0.7.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-libs/libvncserver/libvncserver-0.7.1.ebuild,v 1.1 2005/07/17 10:48:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libvncserver/libvncserver-0.7.1.ebuild,v 1.1.1.1 2005/11/30 10:02:53 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-libs/libvncserver/libvncserver-0.7.ebuild b/net-libs/libvncserver/libvncserver-0.7.ebuild
index 5d0e4b393712..17cf485740b7 100644
--- a/net-libs/libvncserver/libvncserver-0.7.ebuild
+++ b/net-libs/libvncserver/libvncserver-0.7.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-libs/libvncserver/libvncserver-0.7.ebuild,v 1.1 2004/12/29 20:01:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libvncserver/libvncserver-0.7.ebuild,v 1.1.1.1 2005/11/30 10:02:53 chriswhite Exp $
 
 inherit eutils
 
@@ -23,7 +23,6 @@ src_unpack() {
 	unpack LibVNCServer-${PV}.tar.gz
 	cd ${S}
 	sed -i \
-		-e "/^CFLAGS/s:-g:${CFLAGS}:" \
 		-e '/^SUBDIRS/s:x11vnc::' \
 		Makefile.in || die "sed foo"
 }
diff --git a/net-libs/libvncserver/libvncserver-0.8_pre.ebuild b/net-libs/libvncserver/libvncserver-0.8_pre.ebuild
index 011050881aec..b8ac4cf04619 100644
--- a/net-libs/libvncserver/libvncserver-0.8_pre.ebuild
+++ b/net-libs/libvncserver/libvncserver-0.8_pre.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-libs/libvncserver/libvncserver-0.8_pre.ebuild,v 1.1 2005/10/27 23:59:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libvncserver/libvncserver-0.8_pre.ebuild,v 1.1.1.1 2005/11/30 10:02:53 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-libs/libwhisker/ChangeLog b/net-libs/libwhisker/ChangeLog
index 6b86c114b2d7..f9c603b32d66 100644
--- a/net-libs/libwhisker/ChangeLog
+++ b/net-libs/libwhisker/ChangeLog
@@ -1,6 +1,59 @@
 # ChangeLog for net-libs/libwhisker
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libwhisker/ChangeLog,v 1.1 2003/10/06 10:43:08 mcummings Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libwhisker/ChangeLog,v 1.1.1.1 2005/11/30 10:03:01 chriswhite Exp $
+
+  13 Mar 2005; Michael Cummings <mcummings@gentoo.org>
+  -libwhisker-1.8.ebuild, -libwhisker-2.1.ebuild, libwhisker-2.2.ebuild:
+  Removing old versions based on keywords
+
+  13 Mar 2005; Michael Cummings <mcummings@gentoo.org>
+  libwhisker-2.2.ebuild:
+  Removing mirror restriction from this library. From RFP: 
+  If you want to tweak wget by using -U parameter so you can straight download 
+  from wiretrip.net, that's fine too.  If you want to download from 
+  sourceforge.net, that's fine too (three?).  I do want to note that I 
+  majorly slack in updating the copy on sourceforge, so it's not as up to 
+  date as wiretrip.net.  And if you want to mirror it on your own servers, 
+  that's fine...just please try to keep it up to date (I always announce new 
+  versions to the libwhisker mailing list, so as long as someone is 
+  monitoring that, it should be fine).
+
+  31 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> libwhisker-2.2.ebuild:
+  Stable on sparc
+
+*libwhisker-2.2 (31 Jan 2005)
+
+  31 Jan 2005; Michael Cummings <mcummings@gentoo.org> +libwhisker-2.2.ebuild:
+  New version of library, upstream bump in -current's version
+
+  19 Nov 2004; Jason Wever <weeve@gentoo.org> libwhisker-1.8.ebuild:
+  Stable on sparc.
+
+*libwhisker-2.1 (21 Sep 2004)
+
+  21 Sep 2004; Michael Cummings <mcummings@gentoo.org> +libwhisker-2.1.ebuild:
+  New version of the ever popular libwhisker. Please read the output before
+  filing a bug - the author of this library has asked that we not mirror or
+  allow wget's of his source code. Do not file (another) bug about this.
+
+  21 Sep 2004; Michael Cummings <mcummings@gentoo.org> :
+  Update digest
+
+  29 Mar 2004; Michael Cummings <mcummings@gentoo.org> libwhisker-1.8.ebuild:
+  fixed SRC_URI
+
+  21 Mar 2004; Michael Boman <mboman@gentoo.org> libwhisker-1.8.ebuild:
+  QA: Unnecessary definition of S and RDEPEND removed. Adding categories to
+  dependencies. See bug 45110 for details.
+
+  14 Mar 2004; Michael Cummings <mcummings@gentoo.org> libwhisker-1.8.ebuild:
+  Swapped depend and rdepend, closing bug 44513
+
+  27 Feb 2004; Michael Cummings <mcummings@gentoo.org> libwhisker-1.8.ebuild:
+  Unmasking after 144 days masked
+
+  29 Nov 2003; <rac@gentoo.org> libwhisker-1.8.ebuild:
+  Fix SRC_URI, digest.  Address bug 34208
 
 *libwhisker-1.8 (06 Oct 2003)
 
diff --git a/net-libs/libwhisker/Manifest b/net-libs/libwhisker/Manifest
index 981c27bc912d..804df5b14398 100644
--- a/net-libs/libwhisker/Manifest
+++ b/net-libs/libwhisker/Manifest
@@ -1,4 +1,14 @@
-MD5 a6f261d7d569e5db1ca87ea3afeecc87 Changelog 236
-MD5 411d6948b4bce61e2f63552f28c3d7d7 libwhisker-1.8.ebuild 1060
-MD5 7ab5d63c89f30cebe0345f50c86839b9 files/digest-libwhisker-1.6 69
-MD5 9ab8ae4fd7fe3481cb4f391ddcf24045 files/digest-libwhisker-1.8 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7846145f236e9a5c7d48e83f9367faea ChangeLog 2730
+MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
+MD5 664007c199f62058f615adcc13d6ed6d libwhisker-2.2.ebuild 810
+MD5 6c96245f6336855a3b683743f59f95f9 files/digest-libwhisker-2.2 70
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD4DBQFCNKP1tG5z4I8BtQoRAmwSAJ9fgkbw5nlHR9MrcPIT67zKqIFzPgCYq23x
+VCMoyc6C2/J8qIwBBkmg/g==
+=5YRx
+-----END PGP SIGNATURE-----
diff --git a/net-libs/libwhisker/libwhisker-2.2.ebuild b/net-libs/libwhisker/libwhisker-2.2.ebuild
index 4bece7335ef6..7c570cad2fb0 100644
--- a/net-libs/libwhisker/libwhisker-2.2.ebuild
+++ b/net-libs/libwhisker/libwhisker-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-libs/libwhisker/libwhisker-2.2.ebuild,v 1.1 2005/01/31 12:17:50 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libwhisker/libwhisker-2.2.ebuild,v 1.1.1.1 2005/11/30 10:03:00 chriswhite Exp $
 
 MY_P="${PN}2-current"
 S="${WORKDIR}/${PN}2-${PV}"
@@ -9,25 +9,12 @@ HOMEPAGE="http://www.wiretrip.net/rfp/"
 SRC_URI="http://www.wiretrip.net/rfp/libwhisker/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc"
+KEYWORDS="x86 ~ppc sparc"
 IUSE="ssl"
 
 DEPEND=">=dev-lang/perl-5.6.1
 		ssl? ( >=dev-perl/Net-SSLeay-1.19 )"
 
-# FOR THE RECORD:
-# The author of libwhisker has explicity asked that we not mirror
-# this package. 
-RESTRICT="fetch"
-
-pkg_nofetch() {
-	einfo "Could not find the libwhisker tarball!"
-	einfo "It could not be fetched normally because http://www.wiretrip.net "
-	einfo "denies the wget User-Agent header."
-	einfo "You can find this library in: "
-	einfo ${SRC_URI}
-}
-
 src_compile() {
 	cd ${S}
 	perl Makefile.pl lib
diff --git a/net-libs/libwww/ChangeLog b/net-libs/libwww/ChangeLog
index b3ebf0ad06f5..30e457ccf1cc 100644
--- a/net-libs/libwww/ChangeLog
+++ b/net-libs/libwww/ChangeLog
@@ -1,6 +1,174 @@
 # ChangeLog for net-libs/libwww
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/ChangeLog,v 1.1 2002/02/01 21:53:34 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/ChangeLog,v 1.1.1.1 2005/11/30 10:02:48 chriswhite Exp $
+
+  20 Nov 2005; Hardave Riar <hardave@gentoo.org> libwww-5.4.0-r4.ebuild:
+  Stable on mips, bug #109040.
+
+  06 Nov 2005; MATSUU Takuto <matsuu@gentoo.org> libwww-5.4.0-r4.ebuild:
+  Stable on sh.
+
+  31 Oct 2005; Brent Baude <ranger@gentoo.org> libwww-5.4.0-r4.ebuild:
+  Marking libwww-5.4.0-r4 ppc64 stable for bug 109040
+
+  31 Oct 2005; Leonardo Boshell <leonardop@gentoo.org>
+  libwww-5.4.0-r4.ebuild:
+  Moved perl dependency from RDEPEND to DEPEND (bug #101073).
+
+  30 Oct 2005; Bryan Østergaard <kloeri@gentoo.org> libwww-5.4.0-r4.ebuild:
+  Stable on ia64.
+
+  29 Oct 2005; Michael Hanselmann <hansmi@gentoo.org>
+  libwww-5.4.0-r4.ebuild:
+  Stable on hppa, ppc. See bug #109040.
+
+  29 Oct 2005; Mark Loeser <halcy0n@gentoo.org> libwww-5.4.0-r4.ebuild:
+  Stable on x86; bug #109040
+
+  28 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org> libwww-5.4.0-r4.ebuild:
+  stable on alpha as per bug #109040
+
+  28 Oct 2005; Simon Stelling <blubb@gentoo.org> libwww-5.4.0-r4.ebuild:
+  stable on amd64 wrt bug 109040
+
+  28 Oct 2005; Fabian Groffen <grobian@gentoo.org> libwww-5.4.0-r4.ebuild:
+  Reverting elibtoolize change, and back to ppc-macos conditional on request of
+  leonardop
+
+  28 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  libwww-5.4.0-r4.ebuild:
+  Stable on sparc wrt #109040
+
+  28 Oct 2005; Fabian Groffen <grobian@gentoo.org> libwww-5.4.0-r4.ebuild:
+  Marked ppc-macos for bug #109040 and removed ppc-macos conditional *libtoolize
+
+  28 Oct 2005; Leonardo Boshell <leonardop@gentoo.org>
+  files/libwww-5.4.0-htbound.patch:
+  Remove CVS expansion string (bug #110662).
+
+*libwww-5.4.0-r4 (27 Oct 2005)
+
+  27 Oct 2005; Leonardo Boshell <leonardop@gentoo.org>
+  +files/libwww-5.4.0-htbound.patch, +libwww-5.4.0-r4.ebuild:
+  Added patch with a new implementation of HTBound.c, fixing several logic
+  errors (bug #109040).
+
+  30 Sep 2005; MATSUU Takuto <matsuu@gentoo.org> libwww-5.4.0-r3.ebuild:
+  Stable on sh.
+
+  22 Jun 2005; Herbie Hopkins <herbs@gentoo.org> libwww-5.4.0-r3.ebuild:
+  Fix multilib issue.
+
+*libwww-5.4.0-r3 (17 May 2005)
+
+  17 May 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +files/libwww-5.4.0-mysql-4.1.patch, +libwww-5.4.0-r3.ebuild:
+  New revision with patch to handle mysql-4.1 support.
+
+  01 Jul 2004; Tom Gall <tgall@gentoo.org> libwww-5.4.0-r2.ebuild:
+  stable on ppc64, bug #54799
+
+  10 May 2004; Mamoru KOMACHI <usata@gentoo.org> libwww-5.4.0-r1.ebuild,
+  libwww-5.4.0-r2.ebuild, files/libwww-5.4.0-disable-ndebug-gentoo.diff:
+  Fixed compile error when -DNDEBUG is set. Thanks to #gentoo.pl Team -
+  sekretarz <sekretarz@dukato.net>, bug #50483. Removed 5.4.0-r1 from
+  the CVS tree.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> libwww-5.4.0-r1.ebuild:
+  Add inherit eutils
+
+  02 Apr 2004; <randy@gentoo.org> libwww-5.4.0-r2.ebuild:
+  adding s390 keywords
+
+  25 Mar 2004; Joshua Kinard <kumba@gentoo.org> libwww-5.4.0-r1.ebuild,
+  libwww-5.4.0-r2.ebuild:
+  Marked stable on mips.
+
+  25 Mar 2004; Mamoru KOMACHI <usata@gentoo.org> libwww-5.4.0-r2.ebuild,
+  files/libwww-5.4.0-automake-gentoo.diff:
+  Added a patch to fix Makefile.am. See bug #41959
+
+  13 Mar 2004; Stephen P. Becker <geoman@gentoo.org> :
+  Added ~mips keyword.
+
+  13 Mar 2004; Mamoru KOMACHI <usata@gentoo.org> libwww-5.4.0-r2.ebuild,
+  files/libwww-5.4.0-autoconf-gentoo.diff:
+  Fixed compile error when stratego is installed. See bug #44037
+
+  09 Mar 2004; <agriffis@gentoo.org> libwww-5.4.0-r2.ebuild:
+  stable on alpha and ia64
+
+  26 Feb 2004; Joshua Kinard <kumba@gentoo.org> libwww-5.4.0-r2.ebuild:
+  Added ~mips to KEYWORDS to satisfy repoman deps.
+
+  20 Feb 2004; Mamoru KOMACHI <usata@gentoo.org> libwww-5.4.0-r2.ebuild:
+  Marked stable on all arches. Closing bug #41959
+
+*libwww-5.4.0-r2 (07 Oct 2003)
+
+  08 Feb 2004; Mike Frysinger <vapier@gentoo.org> :
+  Add debian patch to update to autoconf-2.50 so new libtool works #40892.
+
+  10 Dec 2003; <agriffis@gentoo.org> libwww-5.4.0-r1.ebuild:
+  stable on ia64
+
+  12 Dec 2003; Mamoru KOMACHI <usata@gentoo.org> libwww-5.4.0-r2.ebuild:
+  libwww-5.4.0 doesn't depend on autoconf 2.5 but 2.13. Reverted the
+  change.
+
+  10 Dec 2003; Mamoru KOMACHI <usata@gentoo.org> libwww-5.4.0-r2.ebuild:
+  Forced autoconf version 2.5, bug #35327
+
+  07 Oct 2003; Mike Gardiner <obz@gentoo.org> libwww-5.4.0-r2.ebuild,
+  files/libwww-config-liborder.patch:
+  Added a new revision which includes a patch for the ordering of libraries in
+  libwww-config. This revision has been marked ~ on all archs because this patch
+  needs testing. Thanks to <barrachi@icc.uji.es> for help on bug #30185
+
+*libwww-5.4.0-r1 (05 Sep 2002)
+
+  03 Oct 2003; Mamoru KOMACHI <usata@gentoo.org> libwww-5.4.0-r1.ebuild:
+  Build shared libraries as well as static ones
+
+  02 Oct 2003; Mamoru KOMACHI <usata@gentoo.org> libwww-5.4.0-r1.ebuild,
+  files/libwww-5.4.0-gentoo.diff:
+  Added a patch to fix conflict with stratego. Thanks to Kevin Quick
+  <quick@null.net> for reporting the Bug #30038.
+
+  14 May 2003; Robin Johnson <robbat2@gentoo.org> libwww-5.4.0-r1.ebuild:
+  Add block for !dev-libs/9libs since that causes a compile failure since
+  9libs installs a custom libc.h that breaks things.
+
+  27 Mar 2003; <rac@gentoo.org> libwww-5.4.0-r1.ebuild:
+  remove mysql4 block, as -DUSE_OLD_FUNCTIONS is now defined there
+
+  07 Mar 2003; Martin Holzer <mholzer@gentoo.org> libwww-5.4.0-r1.ebuild :
+  Corrected mysql to <dev-db/mysql-4. Closes #17042.
+
+  25 Feb 2003; Guy Martin <gmsoft@gentoo.org> libwww-5.4.0-r1.ebuild :
+  Added hppa to keywords.
+
+  07 Feb 2003; Matthew Turk <satai@gentoo.org> libwww-5.4.0-r1.ebuild
+  Block >=mysql-4 conditionally on USE=mysql.
+
+  15 Dec 2002; Bjoern Brauel <bjb@gentoo.org> libwww-5.4.0-r1.ebuild :
+  Add alpha to KEYWORDS
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+  
+  05 Sep 2002; Matthew Turk <satai@gentoo.org> libwww-5.4.0-r1.ebuild
+  files/digest-libwww-5.4.0-r1 :
+  
+  Bumped revision to reflect *important* change in the ebuild - now the
+  prefixing works properly, which thus provides a proper libwww-config script.
+  This was broken previously.
+
+*libwww-5.4.0 (19 Jun 2002)
+
+  19 Jun 2002; Seemant Kulleen <seemant@gentoo.org> libwww-5.4.0.ebuild
+  files/digest-libwww-5.4.0 :
+
+  Version bump.
 
 *libwww-5.3.2-r1 (1 Feb 2002)
 
diff --git a/net-libs/libwww/Manifest b/net-libs/libwww/Manifest
index ba8f6c717bcd..581d839813fa 100644
--- a/net-libs/libwww/Manifest
+++ b/net-libs/libwww/Manifest
@@ -1,3 +1,12 @@
-MD5 7e969da97c4df72538eb1166c67636a7 libwww-5.4.0-r1.ebuild 1089
-MD5 57af9c8eaee1b00a0105f9f47b26c4f3 ChangeLog 1994
-MD5 23078d7f8b1327132caea8473ffae786 files/digest-libwww-5.4.0-r1 66
+MD5 02b138b9457d514cb4d8da32d6197a69 ChangeLog 6872
+MD5 078b6239f293e1cc65f3f977b3136317 files/digest-libwww-5.4.0-r3 151
+MD5 4c3f7314020d5a1a6a01463a71b4944c files/digest-libwww-5.4.0-r4 151
+MD5 1866b237427a244b9923469b52f54473 files/libwww-5.4.0-autoconf-gentoo.diff 1089
+MD5 ee0dd3b8a76bf8b9e6d051663119eb40 files/libwww-5.4.0-automake-gentoo.diff 346
+MD5 0851f5aef9f0960efcdcabfdfa960341 files/libwww-5.4.0-disable-ndebug-gentoo.diff 370
+MD5 6853cd848815d9446ef820e3a74878ca files/libwww-5.4.0-htbound.patch 13279
+MD5 b0a8e638d02da0d0284e8555866f1f38 files/libwww-5.4.0-mysql-4.1.patch 1674
+MD5 e99f48d15e0834666b84203b48805872 files/libwww-config-liborder.patch 776
+MD5 4c70dae7ce4964982b3ebe728633f9f0 libwww-5.4.0-r3.ebuild 1943
+MD5 469a45f9eb035116e1c88cfaee53eff7 libwww-5.4.0-r4.ebuild 2145
+MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
diff --git a/net-libs/libwww/files/libwww-5.4.0-htbound.patch b/net-libs/libwww/files/libwww-5.4.0-htbound.patch
index 9801a52ab204..111208a276c9 100644
--- a/net-libs/libwww/files/libwww-5.4.0-htbound.patch
+++ b/net-libs/libwww/files/libwww-5.4.0-htbound.patch
@@ -1,15 +1,6 @@
 diff -NurdB w3c-libwww-5.4.0/Library/src/HTBound.c w3c-libwww-5.4.0-patched/Library/src/HTBound.c
 --- w3c-libwww-5.4.0/Library/src/HTBound.c	1999-02-22 17:10:10.000000000 -0500
 +++ w3c-libwww-5.4.0-patched/Library/src/HTBound.c	2005-10-27 08:23:47.000000000 -0500
-@@ -3,7 +3,7 @@
- **
- **	(c) COPYRIGHT MIT 1995.
- **	Please first read the full copyright statement in the file COPYRIGH.
--**	@(#) $Id: libwww-5.4.0-htbound.patch,v 1.1 2005/10/27 23:31:46 leonardop Exp $
-+**	@(#) HTBound.c,v 1.2 2005/06/06 15:22:10 mrsam Exp
- **
- **	This stream parses a MIME multipart stream and builds a set of new
- **	streams via the stream stack each time we encounter a boundary start.
 @@ -11,9 +11,12 @@
  **
  ** Authors
diff --git a/net-libs/libwww/libwww-5.4.0-r3.ebuild b/net-libs/libwww/libwww-5.4.0-r3.ebuild
index 3bd1f7c70dc2..5a403e442d6e 100644
--- a/net-libs/libwww/libwww-5.4.0-r3.ebuild
+++ b/net-libs/libwww/libwww-5.4.0-r3.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-libs/libwww/libwww-5.4.0-r3.ebuild,v 1.1 2005/05/17 09:18:52 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/libwww-5.4.0-r3.ebuild,v 1.1.1.1 2005/11/30 10:02:48 chriswhite Exp $
 
-inherit eutils
+inherit eutils multilib
 
 MY_P=w3c-${P}
 DESCRIPTION="A general-purpose client side WEB API"
@@ -12,7 +12,7 @@ SRC_URI="http://www.w3.org/Library/Distribution/${MY_P}.tgz
 
 LICENSE="W3C"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ppc-macos s390 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ppc-macos s390 sh sparc x86"
 IUSE="ssl mysql"
 
 RDEPEND="dev-lang/perl
@@ -48,15 +48,20 @@ src_unpack() {
 }
 
 src_compile() {
+	if use mysql ; then
+		myconf="--with-mysql=/usr/$(get_libdir)/mysql/libmysqlclient.a"
+	else
+		myconf="--without-mysql"
+	fi
+
 	econf \
 		--enable-shared \
 		--enable-static \
 		--with-zlib \
 		--with-md5 \
 		--with-expat \
-		$(use_with mysql) \
 		$(use_with ssl) \
-		|| die
+		${myconf} || die
 
 	emake check-am || die
 	use ppc-macos && echo "#undef HAVE_APPKIT_APPKIT_H" >> wwwconf.h
diff --git a/net-libs/libwww/libwww-5.4.0-r4.ebuild b/net-libs/libwww/libwww-5.4.0-r4.ebuild
index ecd9f4b56d18..8501218ba944 100644
--- a/net-libs/libwww/libwww-5.4.0-r4.ebuild
+++ b/net-libs/libwww/libwww-5.4.0-r4.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-libs/libwww/libwww-5.4.0-r4.ebuild,v 1.1 2005/10/27 23:31:46 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/libwww-5.4.0-r4.ebuild,v 1.1.1.1 2005/11/30 10:02:48 chriswhite Exp $
 
 inherit eutils multilib
 
@@ -12,17 +12,17 @@ SRC_URI="http://www.w3.org/Library/Distribution/${MY_P}.tgz
 
 LICENSE="W3C"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc-macos ppc64 s390 sh sparc x86"
 IUSE="mysql ssl"
 
-RDEPEND="dev-lang/perl
-	>=sys-libs/zlib-1.1.4
+RDEPEND=">=sys-libs/zlib-1.1.4
 	mysql? ( >=dev-db/mysql-3.23.26 )
 	ssl? ( >=dev-libs/openssl-0.9.6 )"
 
-DEPEND="!dev-libs/9libs
+DEPEND="${RDEPEND}
+	!dev-libs/9libs
 	>=sys-devel/autoconf-2.13
-	${RDEPEND}"
+	dev-lang/perl"
 
 S=${WORKDIR}/${MY_P}
 
@@ -45,8 +45,9 @@ src_unpack() {
 	export WANT_AUTOMAKE=1.4
 	aclocal || die "aclocal failed"
 
-	if use ppc-macos ; then
-		glibtoolize -c -f || die "libtoolize failed"
+	if use ppc-macos;
+	then
+		glibtoolize -c -f || die "glibtoolize failed"
 	else
 		libtoolize -c -f || die "libtoolize failed"
 	fi
diff --git a/net-libs/libyahoo2/ChangeLog b/net-libs/libyahoo2/ChangeLog
index bb8f11c667f3..307d97611080 100644
--- a/net-libs/libyahoo2/ChangeLog
+++ b/net-libs/libyahoo2/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for net-libs/libyahoo2
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libyahoo2/ChangeLog,v 1.1 2003/10/04 08:01:12 mkennedy Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libyahoo2/ChangeLog,v 1.1.1.1 2005/11/30 10:02:52 chriswhite Exp $
+
+  30 Aug 2004; David Holm <dholm@gentoo.org> libyahoo2-0.7.5.ebuild:
+  Added to ~ppc.
+
+*libyahoo2-0.7.5 (16 Aug 2004)
+
+  16 Aug 2004; <mkennedy@gentoo.org> +libyahoo2-0.7.5.ebuild:
+  New upstream version
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> libyahoo2-0.7.2.ebuild:
+  Add inherit eutils
+
+*libyahoo2-0.7.4 (04 Feb 2004)
+
+  04 Feb 2004; <mkennedy@gentoo.org> libyahoo2-0.7.4.ebuild:
+  New upstream
 
 *libyahoo2-0.7.2 (04 Oct 2003)
 
diff --git a/net-libs/libyahoo2/Manifest b/net-libs/libyahoo2/Manifest
index 1d3eb49032e1..047682559a21 100644
--- a/net-libs/libyahoo2/Manifest
+++ b/net-libs/libyahoo2/Manifest
@@ -1,3 +1,8 @@
-MD5 5a9697c594c7a641c157a249b5c08c2e libyahoo2-0.7.2.ebuild 2178
-MD5 652f011c07ca925858993d5f54bc1f06 libyahoo2-0.7.2.ebuild~ 6006
+MD5 5608c9d02f21cf7b1e77b24314764eb3 ChangeLog 782
+MD5 1987c43b94c48d3a4fb58ed084af1819 libyahoo2-0.7.2.ebuild 863
+MD5 f422969cda3706f4de7ac2e2b9293a53 libyahoo2-0.7.4.ebuild 690
+MD5 7a4f9f95273c89e5c97dbf8cb2bda9fb libyahoo2-0.7.5.ebuild 692
 MD5 3fb42370f3e2bf66f10976db27b319b7 files/digest-libyahoo2-0.7.2 67
+MD5 e321b020b4ac41c36e049ccc91baf204 files/digest-libyahoo2-0.7.4 67
+MD5 de86c0af428d9f917da128e8b15b4e03 files/sample_client.c-gentoo.patch 462
+MD5 9db2f56c7d2fd2fe0cb53e7f5bd6951b files/digest-libyahoo2-0.7.5 67
diff --git a/net-libs/libyahoo2/libyahoo2-0.7.2.ebuild b/net-libs/libyahoo2/libyahoo2-0.7.2.ebuild
index 0fbe7701b2a3..e7cd7dc9defb 100644
--- a/net-libs/libyahoo2/libyahoo2-0.7.2.ebuild
+++ b/net-libs/libyahoo2/libyahoo2-0.7.2.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-libs/libyahoo2/libyahoo2-0.7.2.ebuild,v 1.1 2003/10/04 08:01:12 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libyahoo2/libyahoo2-0.7.2.ebuild,v 1.1.1.1 2005/11/30 10:02:52 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="libyahoo2 is a C library interface to the new Yahoo! Messenger protocol. It supports almost all current features of the protocol."
 HOMEPAGE="http://libyahoo2.sourceforge.net/"
@@ -12,8 +14,6 @@ IUSE=""
 
 DEPEND=""
 
-S=${WORKDIR}/${P}
-
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/sample_client.c-gentoo.patch
diff --git a/net-libs/libyahoo2/libyahoo2-0.7.4.ebuild b/net-libs/libyahoo2/libyahoo2-0.7.4.ebuild
index 7422f58df902..54ad1c24f84c 100644
--- a/net-libs/libyahoo2/libyahoo2-0.7.4.ebuild
+++ b/net-libs/libyahoo2/libyahoo2-0.7.4.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-libs/libyahoo2/libyahoo2-0.7.4.ebuild,v 1.1 2004/02/05 03:13:52 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libyahoo2/libyahoo2-0.7.4.ebuild,v 1.1.1.1 2005/11/30 10:02:52 chriswhite Exp $
 
 DESCRIPTION="libyahoo2 is an interface to the new Yahoo! Messenger protocol."
 HOMEPAGE="http://libyahoo2.sourceforge.net/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/libyahoo2/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-S=${WORKDIR}/${P}
+IUSE=""
 
 src_compile() {
 	econf || die
diff --git a/net-libs/libyahoo2/libyahoo2-0.7.5.ebuild b/net-libs/libyahoo2/libyahoo2-0.7.5.ebuild
index 22e81764c1b1..39ead024517c 100644
--- a/net-libs/libyahoo2/libyahoo2-0.7.5.ebuild
+++ b/net-libs/libyahoo2/libyahoo2-0.7.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libyahoo2/libyahoo2-0.7.5.ebuild,v 1.1 2004/08/16 15:58:25 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libyahoo2/libyahoo2-0.7.5.ebuild,v 1.1.1.1 2005/11/30 10:02:52 chriswhite Exp $
 
 DESCRIPTION="libyahoo2 is an interface to the new Yahoo! Messenger protocol."
 HOMEPAGE="http://libyahoo2.sourceforge.net/"
 SRC_URI="mirror://sourceforge/libyahoo2/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 IUSE=""
 
 src_compile() {
diff --git a/net-libs/linc/ChangeLog b/net-libs/linc/ChangeLog
index a69d344907e5..fd722fc8c232 100644
--- a/net-libs/linc/ChangeLog
+++ b/net-libs/linc/ChangeLog
@@ -1,7 +1,115 @@
 # ChangeLog for net-libs/linc
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/linc/ChangeLog,v 1.1 2002/05/22 23:27:50 spider Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/linc/ChangeLog,v 1.1.1.1 2005/11/30 10:02:56 chriswhite Exp $
 
+  07 Aug 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/linc-1.0.3-m4.patch, linc-1.0.3-r1.ebuild:
+  Fix underquoting in m4 file.
+
+*linc-1.0.3-r1 (27 Apr 2005)
+
+  27 Apr 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/linc-1.0.3-gcc4.patch, +linc-1.0.3-r1.ebuild:
+  Fix building with gcc4.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  06 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> linc-1.0.3.ebuild:
+  Stable on alpha.
+
+  05 Apr 2004; L. Boshell <leonardop@gentoo.org> linc-1.0.3.ebuild,
+  files/linc-1.0.3-gtkdoc_fix.patch:
+  Added patch to avoid a conflict with docbook IDs. Closes bug #46692.
+
+  23 Sep 2003; Bartosch Pixa <darkspecter@gentoo.org> linc-1.0.3.ebuild:
+  set ppc in keywords
+
+  25 Aug 2003; Mike Gardiner <obz@gentoo.org> linc-1.0.3.ebuild:
+  Moved to stable on x86
+
+*linc-1.0.3 (23 jun 2003)
+
+  01 Jul 2003; Guy Martin <gmsoft@gentoo.org> linc-1.0.3.ebuild :
+  Added hppa to KEYWORDS.
+
+  01 Jul 2003; Todd Sunderlin <todd@gentoo.org> linc-1.0.3.ebuild:
+  set stable on sparc
+
+  23 Jun 2003; foser <foser@gentoo.org> linc-1.0.3.ebuild :
+  New version, fix license to be GPL-2
+
+*linc-1.0.2 (19 May 2003)
+
+  19 May 2003; foser <foser@gentoo.org> linc-1.0.2.ebuild :
+  New version
+
+*linc-1.0.1 (21 Jan 2003)
+
+  08 Apr 2003; Todd Sunderlin <todd@gentoo.org> linc-1.0.1.ebuild:
+  Marked stable for sparc.
+
+  21 Feb 2003; Aron Griffis <agriffis@gentoo.org> linc-1.0.1.ebuild :
+  Mark stable on alpha
+
+  21 Jan 2003; foser <foser@gentoo.org> linc-1.0.1.ebuild :
+  New version, minor dep fix
+
+*linc-0.7.1 (09 Jan 2003)
+
+  09 Jan 2003; Martin Holzer <mholzer@gentoo.org> linc-0.7.1.ebuild
+  files/digest-linc-0.7.1 ChangeLog :
+  Version bumped. Closes #13563
+
+*linc-0.5.5 (13 Nov 2002) 
+
+  09 Jan 2003; Martin Holzer <mholzer@gentoo.org> linc-0.5.5.ebuild :
+  Removed Commentar.
+  
+  13 Nov 2002; Spider <spider@gentoo.org> linc-0.5.5.ebuild :
+  new version in the stable tree. now, is this confusing or what?
+  reinstated the USE="ssl" variable as the compile of recent ORBit2 works with
+  linc built without ssl. Tested the combinations for both builds to make sure.  
+ 
+*linc-0.7.0 (27 Oct 2002)
+
+  03 Dec 2002; Jon Nall <nall@gentoo.org> linc-0.7.0.ebuild :
+  keyworded ~ppc
+
+  27 Oct 2002; foser <foser@gentoo.org> linc-0.7.0.ebuild :
+  Gnome 2.1
+
+  28 Oct 2002; foser <foser@gentoo.org> linc-0.7.0.ebuild :
+  Re-enstate ssl USE flag, problems seem to be fixed
+
+*linc-0.5.3 (06 Sep 2002)
+  06 Sep 2002; Spider <spider@gentoo.org> linc-0.5.3.ebuild :
+  new version again
+
+*linc-0.5.2 (05 Aug 2002)
+  05 Aug 2002; Spider <spider@gentoo.org> linc-0.5.2.ebuild :
+  new version again
+
+*linc-0.5.1 (29 Jul 2002)
+  29 Jul 2002; Spider <spider@gentoo.org> linc-0.5.1.ebuild :
+  New version 
+
+linc-0.5.0-r2 (27 Jun 2002)
+  28 Jun 2002; Spider <spider@gentoo.org> linc-0.5.0-r2.ebuild :
+  libtoolizing this and ORBit2 at the same time works.  doing that now.
+
+linc-0.5.0-r1 (27 Jun 2002)
+  27 Jun 2002; Spider <spider@gentoo.org> linc-0.5.0-r1.ebuild :
+  mirror:// and debug.eclass
+
+*linc-0.5.0 (27 May 2002)
+  27 May 2002; Spider <spider@gentoo.org> linc-0.5.0.ebuild :
+  latest release!
+
+
+*linc-0.1.22 (23 May 2002)
+  23 May 2002; Spider <spider@gentoo.org> linc-0.1.22.ebuild :
+  New version released
 
 *linc-0.1.21-r1 (22 May 2002)
   22 May 2002; Spider <spider@gentoo.org> linc-0.1.21-r1.ebuild ChangeLog:
diff --git a/net-libs/linc/Manifest b/net-libs/linc/Manifest
index e69de29bb2d1..e6fa4f97a3cd 100644
--- a/net-libs/linc/Manifest
+++ b/net-libs/linc/Manifest
@@ -0,0 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8ad98291fc91ba6351f053a78134bc30 linc-1.0.3.ebuild 818
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 e94f930f36b710f272bba421e6b20c62 linc-1.0.1.ebuild 954
+MD5 1c4323d04e9965a2be71f9938be2de86 linc-1.0.2.ebuild 691
+MD5 b8928e572db90841287c5eb977ae2d63 linc-1.0.3-r1.ebuild 948
+MD5 c2ea4978b2130a75be470e6dda8a7f64 linc-0.5.3.ebuild 1011
+MD5 2f02db380b73650d4d4bf7974bf5d147 ChangeLog 3701
+MD5 849abb9b4b0efe758a7c605ee6fdcc28 files/digest-linc-1.0.1 63
+MD5 ed76b31cb561c75e5398d4553da01c78 files/digest-linc-1.0.2 63
+MD5 48ccea43586adfdad9518a012e88b843 files/linc-1.0.3-m4.patch 158
+MD5 8faa9984d1b8e8142772156db89c528f files/digest-linc-1.0.3-r1 63
+MD5 8faa9984d1b8e8142772156db89c528f files/digest-linc-1.0.3 63
+MD5 805618d4a68f26f5a476961608ac98d7 files/linc-1.0.3-gtkdoc_fix.patch 384
+MD5 c1565e5184f320c1ff18be5523156022 files/digest-linc-0.5.3 63
+MD5 6f25f55d3514da55b93dc89f12f57924 files/linc-1.0.3-gcc4.patch 446
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFC9VuhgIKl8Uu19MoRAkOZAJoDwlBGD6b+BMLzyjpiMyqHpHPlPgCdEsP9
+Lb4Brctanhhmu9cZ2a2rj8E=
+=cd5T
+-----END PGP SIGNATURE-----
diff --git a/net-libs/linc/linc-0.5.3.ebuild b/net-libs/linc/linc-0.5.3.ebuild
index 39af1f9a91ec..f435b153e1f2 100644
--- a/net-libs/linc/linc-0.5.3.ebuild
+++ b/net-libs/linc/linc-0.5.3.ebuild
@@ -1,18 +1,19 @@
-# 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-libs/linc/linc-0.5.3.ebuild,v 1.1 2002/09/06 04:59:57 spider Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/linc/linc-0.5.3.ebuild,v 1.1.1.1 2005/11/30 10:02:56 chriswhite Exp $
+
+IUSE="doc"
 
 
 inherit libtool
 
-S=${WORKDIR}/${P}
 DESCRIPTION="A library to ease the writing of networked applications"
 SRC_URI="mirror://gnome/2.0.1/sources/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://www.gnome.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="x86"
+KEYWORDS="x86 ppc sparc alpha"
 
 RDEPEND=">=dev-libs/glib-2.0.6
 	>=dev-libs/openssl-0.9.6"
@@ -20,7 +21,7 @@ RDEPEND=">=dev-libs/glib-2.0.6
 DEPEND="${RDEPEND}
 	doc? ( >=dev-util/gtk-doc-0.9-r2 )
 	>=dev-util/pkgconfig-0.12.0"
-	  
+
 src_compile() {
 	elibtoolize
 	local myconf
@@ -28,7 +29,7 @@ src_compile() {
 		&& myconf="${myconf} --enable-gtk-doc" \
 		|| myconf="${myconf} --disable-gtk-doc"
 
-	# if this is disabled (use) ORBit2 will fail to build. Just force it on	
+	# if this is disabled (use) ORBit2 will fail to build. Just force it on
 	myconf="${myconf} --with-openssl"
 
 	econf ${myconf} || die
@@ -37,6 +38,6 @@ src_compile() {
 
 src_install() {
 	einstall || die
-    
- 	dodoc AUTHORS ChangeLog COPYING HACKING MAINTAINERS README* NEWS TODO
+
+	dodoc AUTHORS ChangeLog COPYING HACKING MAINTAINERS README* NEWS TODO
 }
diff --git a/net-libs/linc/linc-1.0.1.ebuild b/net-libs/linc/linc-1.0.1.ebuild
index f543572f6510..21f6d6845878 100644
--- a/net-libs/linc/linc-1.0.1.ebuild
+++ b/net-libs/linc/linc-1.0.1.ebuild
@@ -1,18 +1,17 @@
-# 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-libs/linc/linc-1.0.1.ebuild,v 1.1 2003/01/21 23:49:15 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/linc/linc-1.0.1.ebuild,v 1.1.1.1 2005/11/30 10:02:56 chriswhite Exp $
 
 IUSE="doc ssl"
 
 inherit libtool gnome.org
 
-S=${WORKDIR}/${P}
 DESCRIPTION="A library to ease the writing of networked applications"
 HOMEPAGE="http://www.gnome.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="x86 ppc sparc alpha"
 
 RDEPEND=">=dev-libs/glib-2
 	ssl? ( >=dev-libs/openssl-0.9.6 )"
@@ -20,7 +19,7 @@ RDEPEND=">=dev-libs/glib-2
 DEPEND="${RDEPEND}
 	doc? ( >=dev-util/gtk-doc-0.6 )
 	>=dev-util/pkgconfig-0.12.0"
-	  
+
 src_compile() {
 	elibtoolize
 	local myconf
@@ -38,6 +37,6 @@ src_compile() {
 
 src_install() {
 	einstall || die
-    
- 	dodoc AUTHORS ChangeLog COPYING HACKING MAINTAINERS README* NEWS TODO
+
+	dodoc AUTHORS ChangeLog COPYING HACKING MAINTAINERS README* NEWS TODO
 }
diff --git a/net-libs/linc/linc-1.0.2.ebuild b/net-libs/linc/linc-1.0.2.ebuild
index 5ccfc287a8b3..9e3ce6ff0bd4 100644
--- a/net-libs/linc/linc-1.0.2.ebuild
+++ b/net-libs/linc/linc-1.0.2.ebuild
@@ -1,18 +1,17 @@
-# 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-libs/linc/linc-1.0.2.ebuild,v 1.1 2003/05/20 12:05:42 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/linc/linc-1.0.2.ebuild,v 1.1.1.1 2005/11/30 10:02:56 chriswhite Exp $
 
 IUSE="doc ssl"
 
 inherit libtool gnome2
 
-S=${WORKDIR}/${P}
 DESCRIPTION="A library to ease the writing of networked applications"
 HOMEPAGE="http://www.gnome.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="x86 ~ppc ~sparc ~alpha amd64"
 
 RDEPEND=">=dev-libs/glib-2
 	ssl? ( >=dev-libs/openssl-0.9.6 )"
@@ -21,7 +20,6 @@ DEPEND="${RDEPEND}
 	doc? ( >=dev-util/gtk-doc-0.6 )
 	>=dev-util/pkgconfig-0.12.0"
 
-G2CONF="${G2CONF} $(use_with ssl openssl)"	  
+G2CONF="${G2CONF} $(use_with ssl openssl)"
 
 DOCS="AUTHORS ChangeLog COPYING HACKING MAINTAINERS README* NEWS TODO"
-
diff --git a/net-libs/linc/linc-1.0.3-r1.ebuild b/net-libs/linc/linc-1.0.3-r1.ebuild
index d35b6897cc89..619dc10918df 100644
--- a/net-libs/linc/linc-1.0.3-r1.ebuild
+++ b/net-libs/linc/linc-1.0.3-r1.ebuild
@@ -1,35 +1,35 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/linc/linc-1.0.3-r1.ebuild,v 1.1 2005/04/27 11:31:08 azarah Exp $
-
-IUSE="doc ssl"
+# $Header: /var/cvsroot/gentoo-x86/net-libs/linc/linc-1.0.3-r1.ebuild,v 1.1.1.1 2005/11/30 10:02:56 chriswhite Exp $
 
 inherit eutils gnome2
 
 DESCRIPTION="A library to ease the writing of networked applications"
 HOMEPAGE="http://www.gnome.org/"
 
-SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="doc ssl"
 
 RDEPEND=">=dev-libs/glib-2
 	ssl? ( >=dev-libs/openssl-0.9.6 )"
-
 DEPEND="${RDEPEND}
 	doc? ( >=dev-util/gtk-doc-0.6 )
 	>=dev-util/pkgconfig-0.12.0"
 
 G2CONF="${G2CONF} $(use_with ssl openssl)"
 
-DOCS="AUTHORS ChangeLog COPYING HACKING MAINTAINERS README* NEWS TODO"
+DOCS="AUTHORS ChangeLog HACKING MAINTAINERS README* NEWS TODO"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	# Avoid docbook conflicts. See bug #46692.
-	epatch ${FILESDIR}/${P}-gtkdoc_fix.patch
+	epatch "${FILESDIR}"/${P}-gtkdoc_fix.patch
 	# Fix building with gcc4.
-	epatch ${FILESDIR}/${P}-gcc4.patch
+	epatch "${FILESDIR}"/${P}-gcc4.patch
+	# Make sure we quote enough
+	epatch "${FILESDIR}"/${P}-m4.patch
 }
diff --git a/net-libs/linc/linc-1.0.3.ebuild b/net-libs/linc/linc-1.0.3.ebuild
index 3abd1bddc1a2..19f19def2d23 100644
--- a/net-libs/linc/linc-1.0.3.ebuild
+++ b/net-libs/linc/linc-1.0.3.ebuild
@@ -1,18 +1,17 @@
-# 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-libs/linc/linc-1.0.3.ebuild,v 1.1 2003/06/23 18:01:40 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/linc/linc-1.0.3.ebuild,v 1.1.1.1 2005/11/30 10:02:56 chriswhite Exp $
 
 IUSE="doc ssl"
 
-inherit gnome2
+inherit eutils gnome2
 
-S=${WORKDIR}/${P}
 DESCRIPTION="A library to ease the writing of networked applications"
 HOMEPAGE="http://www.gnome.org/"
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="x86 ppc sparc alpha hppa amd64"
 
 RDEPEND=">=dev-libs/glib-2
 	ssl? ( >=dev-libs/openssl-0.9.6 )"
@@ -21,7 +20,14 @@ DEPEND="${RDEPEND}
 	doc? ( >=dev-util/gtk-doc-0.6 )
 	>=dev-util/pkgconfig-0.12.0"
 
-G2CONF="${G2CONF} $(use_with ssl openssl)"	  
+G2CONF="${G2CONF} $(use_with ssl openssl)"
 
 DOCS="AUTHORS ChangeLog COPYING HACKING MAINTAINERS README* NEWS TODO"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Avoid docbook conflicts. See bug #46692.
+	epatch ${FILESDIR}/${P}-gtkdoc_fix.patch
+}
diff --git a/net-libs/loudmouth/ChangeLog b/net-libs/loudmouth/ChangeLog
index 30e23bb3599c..76859c049bca 100644
--- a/net-libs/loudmouth/ChangeLog
+++ b/net-libs/loudmouth/ChangeLog
@@ -1,6 +1,120 @@
 # ChangeLog for net-libs/loudmouth
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/ChangeLog,v 1.1 2003/07/17 02:13:41 rizzo Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/ChangeLog,v 1.1.1.1 2005/11/30 10:02:57 chriswhite Exp $
+
+*loudmouth-1.0.1 (16 Aug 2005)
+
+  16 Aug 2005; Marinus Schraal <foser@gentoo.org> loudmouth-1.0.1.ebuild :
+  New release
+
+  20 Jul 2005; Olivier Crête <tester@gentoo.org>
+  loudmouth-0.17.2-r2.ebuild:
+  Oops, marked the wrong version stable on amd64, now is the right version
+
+  19 Jul 2005; Olivier Crête <tester@gentoo.org> loudmouth-0.17.1.ebuild:
+  Stable on amd64
+
+  02 May 2005; Jason Wever <weeve@gentoo.org> loudmouth-0.17.2-r2.ebuild:
+  Stable on SPARC.
+
+  30 Apr 2005; Spider <spider@gentoo.org> loudmouth-0.17.2-r2.ebuild:
+  bump to stable x86 to follow gnutls
+
+  02 Apr 2005; Jason Wever <weeve@gentoo.org> loudmouth-0.17.1.ebuild:
+  Stable on SPARC.
+
+*loudmouth-0.17.2-r2 (15 Feb 2005)
+
+  15 Feb 2005; foser <foser@gentoo.org> loudmouth-0.17.2-r2.ebuild :
+  Bump fix, actually apply the patch
+
+*loudmouth-0.17.2-r1 (15 Feb 2005)
+
+  15 Feb 2005; foser <foser@gentoo.org> loudmouth-0.17.2-r1.ebuild :
+  Add patch to fix gnutls deprecated symbol issues (#79309)
+
+*loudmouth-0.17.2 (18 Dec 2004)
+
+  18 Dec 2004; foser <foser@gentoo.org> loudmouth-0.17.2.ebuild :
+  New release
+
+  03 Sep 2004; Tom Martin <slarti@gentoo.org> loudmouth-0.17.1.ebuild:
+  Marked ~amd64, resolves bug 58323. Thanks to Joe Seeder <seeder@pf.pl> for
+  reporting.
+
+*loudmouth-0.17.1 (03 Sep 2004)
+
+  03 Sep 2004; <spider@gentoo.org> loudmouth-0.17.1.ebuild:
+  Update version, some dependency changes and disabling mono bindings. (cannot
+  test them for validity, so they are hard removed. )
+
+  03 Sep 2004; <spider@gentoo.org> loudmouth-0.16.ebuild:
+  stable on x86
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> loudmouth-0.15.ebuild:
+  Add inherit eutils
+
+  09 Apr 2004; David Holm <dholm@gentoo.org> loudmouth-0.16.ebuild:
+  Added to ~ppc.
+
+*loudmouth-0.16 (07 Apr 2004)
+
+  07 Apr 2004; foser <foser@gentoo.org> loudmouth-0.16.ebuild :
+  New release
+
+  29 Feb 2004; Jason Wever <weeve@gentoo.org> loudmouth-0.15.1.ebuild:
+  Come on baby, do the ~sparc.
+
+*loudmouth-0.15.1 (06 Feb 2004)
+
+  06 Feb 2004; <spider@gentoo.org> loudmouth-0.15.1.ebuild:
+  versionbump now that gnutls >1.0 is in the tree.
+
+  06 Feb 2004; Alastair Tse <liquidx@gentoo.org> loudmouth-0.15.ebuild,
+  files/loudmouth-0.15-gnutls_1.0.patch:
+  add workaround for gnutls-1.0 incompatibility
+
+*loudmouth-0.15 (22 Jan 2004)
+
+  22 Jan 2004; <spider@gentoo.org> loudmouth-0.15.ebuild:
+  Update homepage + versionbump
+
+*loudmouth-0.14.1 (07 Dec 2003)
+
+  07 Dec 2003; <spider@gentoo.org> loudmouth-0.14.1.ebuild:
+  Moving to stable x86
+
+  18 Nov 2003; <spider@gentoo.org> :
+  Updated version, removed gnutls patch
+
+*loudmouth-0.14 (03 Oct 2003)
+
+  03 Oct 2003; foser <foser@gentoo.org> loudmouth-0.14.ebuild :
+  New version
+  Added patch to fix possible gnutls problems
+
+*loudmouth-0.13.2-r1 (07 Sep 2003)
+
+  09 Sep 2003; foser <foser@gentoo.org> loudmouth-0.13.2-r1.ebuild :
+  Add 'ssl' to IUSE
+
+  07 Sep 2003; foser <foser@gentoo.org> loudmouth-0.13.2-r1.ebuild :
+  Add ssl support via gnutls
+
+*loudmouth-0.13.2 (18 Aug 2003)
+
+  18 Aug 2003; foser <foser@gentoo.org> loudmouth-0.13.2.ebuild :
+  New version
+
+*loudmouth-0.13.1 (05 Aug 2003)
+
+  05 Aug 2003; foser <foser@gentoo.org> loudmouth-0.13.1.ebuild :
+  New version
+
+*loudmouth-0.12 (26 Jul 2003)
+
+  26 Jul 2003; foser <foser@gentoo.org> loudmouth-0.12.ebuild :
+  Complete rewrite
 
 *loudmouth-0.11 (16 Jul 2003)
 
diff --git a/net-libs/loudmouth/Manifest b/net-libs/loudmouth/Manifest
index 59b3d8150893..cc1f798457b5 100644
--- a/net-libs/loudmouth/Manifest
+++ b/net-libs/loudmouth/Manifest
@@ -1,3 +1,13 @@
-MD5 d63a217268457c041d70556721384a51 loudmouth-0.11.ebuild 650
-MD5 bce08017c41cefa203f70588024d1008 ChangeLog 314
-MD5 bee3ae5412d9ffab4bcd98f650fb2acf files/digest-loudmouth-0.11 66
+MD5 d3a8e167c56545ba1a2aaf703d9c894c loudmouth-0.17.2-r2.ebuild 908
+MD5 b266bb34fcef3783f32a963ecc501ad2 loudmouth-0.17.2.ebuild 795
+MD5 e89c7f9d64ded599dc2950968f7b6ded loudmouth-0.16.ebuild 621
+MD5 d582320844bf973cd01819c5df5b9ad4 loudmouth-1.0.1.ebuild 607
+MD5 76eaff7a9043fef37bbbb8208bef391c ChangeLog 3691
+MD5 0e52ccc8bcf7bed0a04eb40b97cf5952 loudmouth-0.17.1.ebuild 793
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 5c9d9cbecc7012f358b36f0cde4b75a2 files/digest-loudmouth-0.17.1 69
+MD5 a556924d584687a8f363eed4bb9c743f files/digest-loudmouth-0.17.2 69
+MD5 3683fa9c59f744e00481d05e55c763cf files/loudmouth-0.17.2-gnutls_deprecation.patch 782
+MD5 26c44f134406e99f0210b82d0df1d541 files/digest-loudmouth-1.0.1 68
+MD5 a556924d584687a8f363eed4bb9c743f files/digest-loudmouth-0.17.2-r2 69
+MD5 1198670c7a9b3819274997b05c6131ca files/digest-loudmouth-0.16 67
diff --git a/net-libs/loudmouth/loudmouth-0.16.ebuild b/net-libs/loudmouth/loudmouth-0.16.ebuild
index 4ea5cd506e28..6714ee369358 100644
--- a/net-libs/loudmouth/loudmouth-0.16.ebuild
+++ b/net-libs/loudmouth/loudmouth-0.16.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-libs/loudmouth/loudmouth-0.16.ebuild,v 1.1 2004/04/07 10:53:16 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/loudmouth-0.16.ebuild,v 1.1.1.1 2005/11/30 10:02:57 chriswhite Exp $
 
 inherit gnome2
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://loudmouth.imendio.org/"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 ~sparc ~ppc"
 
 IUSE="doc ssl"
 
diff --git a/net-libs/loudmouth/loudmouth-0.17.1.ebuild b/net-libs/loudmouth/loudmouth-0.17.1.ebuild
index f76228170e93..746bc424e810 100644
--- a/net-libs/loudmouth/loudmouth-0.17.1.ebuild
+++ b/net-libs/loudmouth/loudmouth-0.17.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-libs/loudmouth/loudmouth-0.17.1.ebuild,v 1.1 2004/09/02 22:49:14 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/loudmouth-0.17.1.ebuild,v 1.1.1.1 2005/11/30 10:02:57 chriswhite Exp $
 
 inherit gnome2
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://loudmouth.imendio.org/"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc"
+KEYWORDS="amd64 ~ppc sparc x86"
 
 IUSE="doc ssl"
 
diff --git a/net-libs/loudmouth/loudmouth-0.17.2-r2.ebuild b/net-libs/loudmouth/loudmouth-0.17.2-r2.ebuild
index 3b4668a25aea..2988e5ce9b29 100644
--- a/net-libs/loudmouth/loudmouth-0.17.2-r2.ebuild
+++ b/net-libs/loudmouth/loudmouth-0.17.2-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-libs/loudmouth/loudmouth-0.17.2-r2.ebuild,v 1.1 2005/02/15 16:41:59 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/loudmouth-0.17.2-r2.ebuild,v 1.1.1.1 2005/11/30 10:02:57 chriswhite Exp $
 
 inherit gnome2 eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://loudmouth.imendio.org/"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+KEYWORDS="x86 sparc ~ppc amd64"
 
 IUSE="doc ssl"
 
diff --git a/net-libs/loudmouth/loudmouth-0.17.2.ebuild b/net-libs/loudmouth/loudmouth-0.17.2.ebuild
index 3e124d7e3714..4c699a18291a 100644
--- a/net-libs/loudmouth/loudmouth-0.17.2.ebuild
+++ b/net-libs/loudmouth/loudmouth-0.17.2.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-libs/loudmouth/loudmouth-0.17.2.ebuild,v 1.1 2004/12/18 17:03:51 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/loudmouth-0.17.2.ebuild,v 1.1.1.1 2005/11/30 10:02:57 chriswhite Exp $
 
 inherit gnome2
 
diff --git a/net-libs/loudmouth/loudmouth-1.0.1.ebuild b/net-libs/loudmouth/loudmouth-1.0.1.ebuild
index 98a00313c814..c27746dd5690 100644
--- a/net-libs/loudmouth/loudmouth-1.0.1.ebuild
+++ b/net-libs/loudmouth/loudmouth-1.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-libs/loudmouth/loudmouth-1.0.1.ebuild,v 1.1 2005/08/16 13:39:28 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/loudmouth-1.0.1.ebuild,v 1.1.1.1 2005/11/30 10:02:57 chriswhite Exp $
 
 inherit gnome2
 
diff --git a/net-libs/meanwhile/ChangeLog b/net-libs/meanwhile/ChangeLog
index a48274f08539..cb3a74e45c33 100644
--- a/net-libs/meanwhile/ChangeLog
+++ b/net-libs/meanwhile/ChangeLog
@@ -1,6 +1,84 @@
 # ChangeLog for net-libs/meanwhile
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/meanwhile/ChangeLog,v 1.1 2004/06/06 03:11:49 rizzo Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/meanwhile/ChangeLog,v 1.1.1.1 2005/11/30 10:02:57 chriswhite Exp $
+
+*meanwhile-0.5.0 (14 Nov 2005)
+
+  14 Nov 2005; Don Seiler <rizzo@gentoo.org> +meanwhile-0.5.0.ebuild:
+  Version bump.  Closes bug #111271
+
+  08 Nov 2005; Brent Baude <ranger@gentoo.org> meanwhile-0.4.2.ebuild:
+  Marking ppc64 stable after 30 days
+
+  22 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> meanwhile-0.4.2.ebuild:
+  Add missing dependencies.
+
+  19 Aug 2005; Brent Baude <ranger@gentoo.org> meanwhile-0.4.2.ebuild:
+  Marking meanwhile-0.4.2 ~ppc64
+
+  13 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  meanwhile-0.4.2.ebuild:
+  Stable on ppc.
+
+  21 Jul 2005; Don Seiler <rizzo@gentoo.org> -meanwhile-0.3-r2.ebuild,
+  -meanwhile-0.4.0.ebuild, -meanwhile-0.4.1.ebuild, meanwhile-0.4.2.ebuild:
+  Stable 0.4.2 on x86 and cleanup
+
+*meanwhile-0.4.2 (14 Jun 2005)
+
+  14 Jun 2005; Don Seiler <rizzo@gentoo.org> +meanwhile-0.4.2.ebuild:
+  Version bump
+
+*meanwhile-0.4.1 (04 May 2005)
+
+  04 May 2005; Don Seiler <rizzo@gentoo.org> +meanwhile-0.4.1.ebuild:
+  Version bump
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org>
+  meanwhile-0.3-r3.ebuild:
+  Stable on ppc.
+
+  10 Apr 2005; Simon Stelling <blubb@gentoo.org> meanwhile-0.4.0.ebuild:
+  added ~amd64
+
+*meanwhile-0.4.0 (18 Mar 2005)
+
+  18 Mar 2005; Don Seiler <rizzo@gentoo.org> +meanwhile-0.4.0.ebuild:
+  Version bump
+
+  11 Mar 2005; Don Seiler <rizzo@gentoo.org> meanwhile-0.3-r3.ebuild:
+  Stable on x86
+
+*meanwhile-0.3-r3 (07 Mar 2005)
+
+  07 Mar 2005; Don Seiler <rizzo@gentoo.org> +files/mw_debug_glib.diff,
+  +meanwhile-0.3-r3.ebuild:
+  Patch for newer glib functions.  Fixes bug #84413
+
+  16 Jan 2005; Jason Wever <weeve@gentoo.org> meanwhile-0.3-r2.ebuild:
+  Added ~sparc keyword wrt bug #77973.
+
+*meanwhile-0.3-r2 (20 Oct 2004)
+
+  20 Oct 2004; Don Seiler <rizzo@gentoo.org> -meanwhile-0.3-r1.ebuild,
+  +meanwhile-0.3-r2.ebuild:
+  Revision bump to catch different distfile, fixes Bug #68306
+
+  28 Aug 2004; Don Seiler <rizzo@gentoo.org> meanwhile-0.3-r1.ebuild:
+  Stable on x86 and fixing debug inheritance
+
+*meanwhile-0.3-r1 (06 Aug 2004)
+
+  06 Aug 2004; Don Seiler <rizzo@gentoo.org> +meanwhile-0.3-r1.ebuild:
+  pseudo-version bump
+
+*meanwhile-0.3 (28 Jun 2004)
+
+  28 Jun 2004; Don Seiler <rizzo@gentoo.org> +meanwhile-0.3.ebuild:
+  Version bump
+
+  08 Jun 2004; David Holm <dholm@gentoo.org> meanwhile-0.2.ebuild:
+  Added to ~ppc.
 
 *meanwhile-0.2 (05 Jun 2004)
 
diff --git a/net-libs/meanwhile/Manifest b/net-libs/meanwhile/Manifest
index 800fe33fe924..282a53a6d3a4 100644
--- a/net-libs/meanwhile/Manifest
+++ b/net-libs/meanwhile/Manifest
@@ -1,2 +1,9 @@
-MD5 4b4bef936237344200307f149bf29f1a meanwhile-0.2.ebuild 593
-MD5 d5a51ee3f478051f04f7de7057f5b11c files/digest-meanwhile-0.2 65
+MD5 312171a973391d04aa5ca833a68c5b2b ChangeLog 2679
+MD5 804f897fba70678a8e97bc0d51700780 meanwhile-0.5.0.ebuild 911
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 b5b170d60d1f9a7bc8b9ab566c2a2b72 meanwhile-0.3-r3.ebuild 753
+MD5 530b8f05294d8575bef2e6bc1ac9a7ac meanwhile-0.4.2.ebuild 626
+MD5 34c9150946cb37f0b304431f8da6d74e files/digest-meanwhile-0.5.0 67
+MD5 1e608d7c9f446aca8fec518e6e09c98c files/digest-meanwhile-0.3-r3 65
+MD5 54a68b70aac85bd876ebba642621ea12 files/mw_debug_glib.diff 388
+MD5 e36a0161c05416f3c5d2fc09be4f8fc4 files/digest-meanwhile-0.4.2 67
diff --git a/net-libs/meanwhile/meanwhile-0.3-r3.ebuild b/net-libs/meanwhile/meanwhile-0.3-r3.ebuild
index 497ddd85d708..fbcbf1d378aa 100644
--- a/net-libs/meanwhile/meanwhile-0.3-r3.ebuild
+++ b/net-libs/meanwhile/meanwhile-0.3-r3.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-libs/meanwhile/meanwhile-0.3-r3.ebuild,v 1.1 2005/03/07 19:32:39 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/meanwhile/meanwhile-0.3-r3.ebuild,v 1.1.1.1 2005/11/30 10:02:57 chriswhite Exp $
 
 inherit flag-o-matic eutils debug
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://meanwhile.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ppc ~sparc"
 IUSE=""
 
 src_unpack() {
diff --git a/net-libs/meanwhile/meanwhile-0.4.2.ebuild b/net-libs/meanwhile/meanwhile-0.4.2.ebuild
index 4f55c0fc750f..2861a0d56652 100644
--- a/net-libs/meanwhile/meanwhile-0.4.2.ebuild
+++ b/net-libs/meanwhile/meanwhile-0.4.2.ebuild
@@ -1,16 +1,22 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/meanwhile/meanwhile-0.4.2.ebuild,v 1.1 2005/06/14 13:16:24 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/meanwhile/meanwhile-0.4.2.ebuild,v 1.1.1.1 2005/11/30 10:02:57 chriswhite Exp $
 
 DESCRIPTION="Meanwhile (Sametime protocol) library"
 HOMEPAGE="http://meanwhile.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
+LICENSE="LGPL-2"
+
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="~amd64 ppc ppc64 ~sparc x86"
 IUSE=""
 
+RDEPEND=">=dev-libs/glib-2"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
 src_install() {
-	make install DESTDIR=${D} || die "Install failed"
-	dodoc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO
+	make DESTDIR=${D} install || die "install failed"
+	dodoc AUTHORS ChangeLog NEWS README TODO
 }
diff --git a/net-libs/meanwhile/meanwhile-0.5.0.ebuild b/net-libs/meanwhile/meanwhile-0.5.0.ebuild
index 35563c982549..ce44c43ef6f9 100644
--- a/net-libs/meanwhile/meanwhile-0.5.0.ebuild
+++ b/net-libs/meanwhile/meanwhile-0.5.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-libs/meanwhile/meanwhile-0.5.0.ebuild,v 1.1 2005/11/14 18:44:55 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/meanwhile/meanwhile-0.5.0.ebuild,v 1.1.1.1 2005/11/30 10:02:58 chriswhite Exp $
 
 inherit debug
 
diff --git a/net-libs/meanwhile/metadata.xml b/net-libs/meanwhile/metadata.xml
index 73d3c0910ad4..20ce219711a2 100644
--- a/net-libs/meanwhile/metadata.xml
+++ b/net-libs/meanwhile/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>no-herd</herd>
-<maintainer>
-  <email>rizzo@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/net-libs/metadata.xml b/net-libs/metadata.xml
index f76d2305d9cb..722ec46a15d1 100644
--- a/net-libs/metadata.xml
+++ b/net-libs/metadata.xml
@@ -4,5 +4,23 @@
 	<longdescription lang="en">
 		The net-libs category contains libraries which are network-related.
 	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie net-libs enthält Bibliotheken zur Netzwerkprogrammierung.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría net-libs contiene librerías relacionadas con las redes.
+	</longdescription>
+	<longdescription lang="ja">
+		net-libsカテゴリーにはネットワーク関連のライブラリが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De net-libs categorie bevat bibliotheken voor netwerk-gebruik.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm net-libs chứa các thư viện về mạng.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria net-libs contiene librerie per le reti.
+	</longdescription>
 </catmetadata>
 
diff --git a/net-libs/net6/ChangeLog b/net-libs/net6/ChangeLog
index 57db24d0c031..3c2f0a0ca4c9 100644
--- a/net-libs/net6/ChangeLog
+++ b/net-libs/net6/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for net-libs/net6
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/net6/ChangeLog,v 1.1 2005/06/11 19:06:40 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/net6/ChangeLog,v 1.1.1.1 2005/11/30 10:03:04 chriswhite Exp $
+
+*net6-1.2.0 (16 Nov 2005)
+
+  16 Nov 2005; Gustavo Felisberto <humpback@gentoo.org>; +net6-1.2.0.ebuild:
+  Bump to version 1.2. Arch teams please do not mark stable, I'll open a bug
+  when i think it is ready.
+
+  22 Aug 2005; Gustavo Felisberto <humpback@gentoo.org>; -net6-1.0.1.ebuild,
+  net6-1.1.0.ebuild:
+  Stable on x86 and amd64
+
+*net6-1.1.0 (14 Aug 2005)
+
+  14 Aug 2005; Gustavo Felisberto <humpback@gentoo.org>; +net6-1.1.0.ebuild:
+  Version bump.
+
+  15 Jul 2005; Gustavo Felisberto <humpback@gentoo.org>; net6-1.0.1.ebuild:
+  Keywording ~amd64
+
+  11 Jun 2005; David Holm <dholm@gentoo.org> net6-1.0.1.ebuild:
+  Added to ~ppc.
 
 *net6-1.0.1 (11 Jun 2005)
 
diff --git a/net-libs/net6/Manifest b/net-libs/net6/Manifest
index b7ae80f4019d..bc1fab29b142 100644
--- a/net-libs/net6/Manifest
+++ b/net-libs/net6/Manifest
@@ -1,4 +1,16 @@
-MD5 ffac81b94c90e9a653444b61579ddd8d ChangeLog 309
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f736886476306e88ee08e31f3caaab81 ChangeLog 1031
+MD5 092fe9c2d7c04aed2afd539cb4062e73 files/digest-net6-1.1.0 62
+MD5 a18553e9d71e3d569cbd10bc7277fe6c files/digest-net6-1.2.0 62
 MD5 0c1617ed145bf486b4d1a5cbb61476c2 metadata.xml 333
-MD5 65eabb6f496b8c6c9c86961f15de37e2 net6-1.0.1.ebuild 503
-MD5 720b2a63e662d623d04de80211187424 files/digest-net6-1.0.1 62
+MD5 a3c8b1a1a09661798c834a3fd05783be net6-1.1.0.ebuild 607
+MD5 2be2d0e9be4ec627a092f82d97ade1f9 net6-1.2.0.ebuild 609
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDeqRS8zY1VwezZiERAvemAKCU54FxL8fhkVHm0bGaEV+WT9wg9wCgq6pD
+b301f1qwOooFaj1Y6ttnr1s=
+=4dWo
+-----END PGP SIGNATURE-----
diff --git a/net-libs/net6/net6-1.1.0.ebuild b/net-libs/net6/net6-1.1.0.ebuild
index 9e5172b74f0f..8bf589508338 100644
--- a/net-libs/net6/net6-1.1.0.ebuild
+++ b/net-libs/net6/net6-1.1.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2005 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-libs/net6/net6-1.1.0.ebuild,v 1.1 2005/08/14 21:07:47 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/net6/net6-1.1.0.ebuild,v 1.1.1.1 2005/11/30 10:03:04 chriswhite Exp $
 
 DESCRIPTION="Network access framework for IPv4/IPv6 written in c++"
 HOMEPAGE="http://darcs.0x539.de/net6"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="x86 ~ppc amd64"
 IUSE=""
 SRC_URI="http://releases.0x539.de/${PN}/${P}.tar.gz"
 
diff --git a/net-libs/net6/net6-1.2.0.ebuild b/net-libs/net6/net6-1.2.0.ebuild
index 62a04e343d4c..7f2168e27290 100644
--- a/net-libs/net6/net6-1.2.0.ebuild
+++ b/net-libs/net6/net6-1.2.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-libs/net6/net6-1.2.0.ebuild,v 1.1 2005/11/16 03:15:03 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/net6/net6-1.2.0.ebuild,v 1.1.1.1 2005/11/30 10:03:04 chriswhite Exp $
 
 DESCRIPTION="Network access framework for IPv4/IPv6 written in c++"
 HOMEPAGE="http://darcs.0x539.de/net6"
diff --git a/net-libs/netwib/ChangeLog b/net-libs/netwib/ChangeLog
index 707a7abfb6e7..06c59d46b60f 100644
--- a/net-libs/netwib/ChangeLog
+++ b/net-libs/netwib/ChangeLog
@@ -1,6 +1,81 @@
 # ChangeLog for net-libs/netwib
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/netwib/ChangeLog,v 1.1 2003/12/25 21:49:32 vapier Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/netwib/ChangeLog,v 1.1.1.1 2005/11/30 10:02:53 chriswhite Exp $
+
+*netwib-5.31.0 (15 Oct 2005)
+
+  15 Oct 2005; Daniel Black <dragonheart@gentoo.org> -netwib-5.29.0.ebuild,
+  -netwib-5.30.0.ebuild, +netwib-5.31.0.ebuild:
+  version bump and cleanout
+
+  30 Jun 2005; Daniel Black <dragonheart@gentoo.org> netwib-5.30.0.ebuild:
+  fixing install of ${D}/usr/share
+
+  17 Jun 2005; David Holm <dholm@gentoo.org> netwib-5.30.0.ebuild:
+  Added to ~ppc.
+
+*netwib-5.30.0 (17 Jun 2005)
+
+  17 Jun 2005; Marcelo Goes <vanquirius@gentoo.org> -netwib-5.6.0.ebuild,
+  -netwib-5.9.0.ebuild, +netwib-5.30.0.ebuild:
+  Version bump and remove old versions.
+
+  01 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> netwib-5.29.0.ebuild:
+  Added NOTE in ebuild header about netwib, netwox and netwag.
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> netwib-5.28.0.ebuild:
+  Stable on SPARC.
+
+*netwib-5.29.0 (23 Mar 2005)
+
+  23 Mar 2005; Marcelo Goes <vanquirius@gentoo.org> +netwib-5.29.0.ebuild:
+  Version bump.
+
+  25 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> netwib-5.28.0.ebuild:
+  Marked stable on x86.
+
+  30 Jan 2005; Daniel Black <dragonheart@gentoo.org> netwib-5.28.0.ebuild,
+  netwib-5.6.0.ebuild, netwib-5.9.0.ebuild:
+  Transition dependancy from net-libs/libpcap to virtual/libpcap
+
+  22 Jan 2005; Daniel Black <dragonheart@gentoo.org> netwib-5.28.0.ebuild:
+  QA fix - correct man path
+
+*netwib-5.28.0 (13 Jan 2005)
+
+  13 Jan 2005; Daniel Black <dragonheart@gentoo.org> +netwib-5.28.0.ebuild:
+  Version bump as per bug #75621 by Ovidiu Ghinet <oghinet@yahoo.com>
+
+  19 Nov 2004; Jason Wever <weeve@gentoo.org> netwib-5.9.0.ebuild:
+  Stable on sparc.
+
+  12 Jul 2004; Eldad Zack <eldad@gentoo.org> netwib-5.9.0.ebuild:
+  marked x86 stable
+
+  21 May 2004; Jason Wever <weeve@gentoo.org> netwib-5.9.0.ebuild:
+  Added ~sparc keyword.
+
+  21 Mar 2004; Michael Boman <mboman@gentoo.org> netwib-5.6.0.ebuild,
+  netwib-5.9.0.ebuild:
+  QA: IUSE variable was missing.
+
+*netwib-5.9.0 (28 Feb 2004)
+
+  28 Feb 2004; Michael Boman <mboman@gentoo.org> metadata.xml,
+  netwib-5.9.0.ebuild:
+  Bumped to version 5.9.0 (required for bug 42960). Added the software to the
+  netmon herd.
+
+  30 Jan 2004; Grant Goodyear <g2boojum@hotmail.com> metadata.xml,
+  netwib-5.6.0.ebuild:
+  Marking x86 to enable netwox
+
+  05 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> :
+  add missing manifest
+
+  26 Dec 2003; Jason Wever <weeve@gentoo.org> netwib-5.6.0.ebuild:
+  Contrary to popular belief, this does not currently compile against libnet,
+  nor does the appropriate version of libnet have a sparc or ~sparc keyword.
 
 *netwib-5.6.0 (25 Dec 2003)
 
diff --git a/net-libs/netwib/Manifest b/net-libs/netwib/Manifest
index 43fc07f2830c..6f5f28a13c86 100644
--- a/net-libs/netwib/Manifest
+++ b/net-libs/netwib/Manifest
@@ -1,3 +1,16 @@
-MD5 5a135aab5934f9aef6b17f4843522e67 netwib-5.6.0.ebuild 922
-MD5 f3fd3b2e0945ac8b349089a8535c0186 ChangeLog 535
-MD5 209164506df28fd5c7618d5ed6a310f2 files/digest-netwib-5.6.0 65
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5a23bd38084a6958927afa6cf659a0cb ChangeLog 2818
+MD5 8491c5fb01637c29d04c5a7d351c4b20 files/digest-netwib-5.28.0 66
+MD5 a8db8170d7a582992272cecea5df396a files/digest-netwib-5.31.0 137
+MD5 44374bbb178a0c804d74bb54af07cdc2 metadata.xml 258
+MD5 a42aa11e7b51e62f12d5dd24c5b4044e netwib-5.28.0.ebuild 1020
+MD5 e33d7ed7c075bab0fa9c669231181245 netwib-5.31.0.ebuild 1487
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDUIjAmdTrptrqvGERAukwAJsHw3fO/+zDQY46KdaHJ06vn0EXQQCfUo38
+bw9uo0nBaqH8o1g/NF5Bbzw=
+=ijdC
+-----END PGP SIGNATURE-----
diff --git a/net-libs/netwib/metadata.xml b/net-libs/netwib/metadata.xml
index 20ce219711a2..1ac82746ac82 100644
--- a/net-libs/netwib/metadata.xml
+++ b/net-libs/netwib/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
+<herd>netmon</herd>
+<longdescription>Library of Ethernet, IP, UDP, TCP, ICMP, ARP and RARP protocols</longdescription>
 </pkgmetadata>
diff --git a/net-libs/netwib/netwib-5.28.0.ebuild b/net-libs/netwib/netwib-5.28.0.ebuild
index 0c63097b5592..0b6357d32b22 100644
--- a/net-libs/netwib/netwib-5.28.0.ebuild
+++ b/net-libs/netwib/netwib-5.28.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-libs/netwib/netwib-5.28.0.ebuild,v 1.1 2005/01/13 05:19:51 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/netwib/netwib-5.28.0.ebuild,v 1.1.1.1 2005/11/30 10:02:53 chriswhite Exp $
 
 inherit toolchain-funcs
 
@@ -10,10 +10,10 @@ SRC_URI="http://www.laurentconstantin.com/common/netw/netwib/download/v${PV/.*}/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 sparc"
 IUSE=""
 
-DEPEND="net-libs/libpcap
+DEPEND="virtual/libpcap
 	>=net-libs/libnet-1.1.1"
 
 S=${WORKDIR}/${P}-src
@@ -39,4 +39,6 @@ src_install() {
 	dodoc README.TXT doc/*.txt
 	cd src
 	emake install DESTDIR=${D} || die
+	dodir ${D}/usr/share
+	mv ${D}/usr/man ${D}/usr/share
 }
diff --git a/net-libs/netwib/netwib-5.31.0.ebuild b/net-libs/netwib/netwib-5.31.0.ebuild
index 7c383751f716..ae8a1775d4a5 100644
--- a/net-libs/netwib/netwib-5.31.0.ebuild
+++ b/net-libs/netwib/netwib-5.31.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-libs/netwib/netwib-5.31.0.ebuild,v 1.1 2005/10/15 04:25:41 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/netwib/netwib-5.31.0.ebuild,v 1.1.1.1 2005/11/30 10:02:53 chriswhite Exp $
 
 # NOTE: netwib, netwox and netwag go together, bump all or bump none
 
@@ -16,7 +16,7 @@ SRC_URI="http://www.laurentconstantin.com/common/netw/netwib/download/v${PV/.*}/
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~ppc ~sparc ~x86"
-IUSE=""
+IUSE="doc"
 
 DEPEND="virtual/libpcap
 	>=net-libs/libnet-1.1.1"
diff --git a/net-libs/nfsidmap/ChangeLog b/net-libs/nfsidmap/ChangeLog
index 9beee537f2f5..d389116d235e 100644
--- a/net-libs/nfsidmap/ChangeLog
+++ b/net-libs/nfsidmap/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for net-libs/nfsidmap
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/nfsidmap/ChangeLog,v 1.1 2004/12/31 04:28:04 vapier Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nfsidmap/ChangeLog,v 1.1.1.1 2005/11/30 10:03:00 chriswhite Exp $
+
+*nfsidmap-0.10 (15 Mar 2005)
+
+  15 Mar 2005; Mike Frysinger <vapier@gentoo.org> +nfsidmap-0.10.ebuild:
+  Version bump.
+
+*nfsidmap-0.9 (04 Feb 2005)
+
+  04 Feb 2005; Aron Griffis <agriffis@gentoo.org> +nfsidmap-0.9.ebuild:
+  Bump to version 0.9
+
+  08 Jan 2005; Sven Wegener <swegener@gentoo.org> nfsidmap-0.7.ebuild:
+  Added inherit flag-o-matic.
 
 *nfsidmap-0.7 (30 Dec 2004)
 
diff --git a/net-libs/nfsidmap/Manifest b/net-libs/nfsidmap/Manifest
index 714e512d24d7..686fcfd3c7c5 100644
--- a/net-libs/nfsidmap/Manifest
+++ b/net-libs/nfsidmap/Manifest
@@ -1,2 +1,7 @@
-MD5 78d5f16ba6605e36df852e71b870038d nfsidmap-0.7.ebuild 506
-MD5 0a11d058d4338b3bd649a4c402b60b21 files/digest-nfsidmap-0.7 64
+MD5 0dbb1924a44ef13fe804f60da614ee9e nfsidmap-0.10.ebuild 903
+MD5 71b96dd125a2a572d417cab3f802d854 ChangeLog 698
+MD5 a3dd8511b8874ce1b494dce2472c709c metadata.xml 159
+MD5 c9bcc3efd8253fbace1f35b594e86242 nfsidmap-0.9.ebuild 897
+MD5 ee7821d4e0ff21074ca53995ea350187 files/digest-nfsidmap-0.10 65
+MD5 27bfa91df9f2be4c9d5e6e2c5b1ea20e files/digest-nfsidmap-0.9 64
+MD5 002c00b85ac1181c098ab90c84fc1dbf files/nfsidmap-0.9-optional-ldap.patch 1078
diff --git a/net-libs/nfsidmap/nfsidmap-0.10.ebuild b/net-libs/nfsidmap/nfsidmap-0.10.ebuild
index 31dae841851c..49ebf76e6b83 100644
--- a/net-libs/nfsidmap/nfsidmap-0.10.ebuild
+++ b/net-libs/nfsidmap/nfsidmap-0.10.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-libs/nfsidmap/nfsidmap-0.10.ebuild,v 1.1 2005/03/15 04:46:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nfsidmap/nfsidmap-0.10.ebuild,v 1.1.1.1 2005/11/30 10:03:00 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
diff --git a/net-libs/nfsidmap/nfsidmap-0.9.ebuild b/net-libs/nfsidmap/nfsidmap-0.9.ebuild
index 4f7ee27ac163..1423341bde66 100644
--- a/net-libs/nfsidmap/nfsidmap-0.9.ebuild
+++ b/net-libs/nfsidmap/nfsidmap-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-libs/nfsidmap/nfsidmap-0.9.ebuild,v 1.1 2005/02/04 23:32:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nfsidmap/nfsidmap-0.9.ebuild,v 1.1.1.1 2005/11/30 10:03:00 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -19,9 +19,9 @@ RDEPEND="${DEPEND}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
-	epatch ${FILESDIR}/0.7-optional-ldap.patch
+	epatch "${FILESDIR}"/${P}-optional-ldap.patch
 
 	use ldap \
 		&& append-flags -DENABLE_LDAP \
diff --git a/net-libs/obby/ChangeLog b/net-libs/obby/ChangeLog
index 3e2b5a3847e8..b239c5c2f068 100644
--- a/net-libs/obby/ChangeLog
+++ b/net-libs/obby/ChangeLog
@@ -1,6 +1,31 @@
 # ChangeLog for net-libs/obby
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/obby/ChangeLog,v 1.1 2005/06/11 20:14:11 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/obby/ChangeLog,v 1.1.1.1 2005/11/30 10:02:59 chriswhite Exp $
+
+*obby-0.3.0_rc1 (16 Nov 2005)
+
+  16 Nov 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  +obby-0.3.0_rc1.ebuild:
+  Bump to version 0.3.0_rc1. Arch teams please do not mark stable, I'll open a
+  bug when i think it is ready.
+
+*obby-0.2.1 (17 Sep 2005)
+
+  17 Sep 2005; Gustavo Felisberto <humpback@gentoo.org>; -obby-0.1.0.ebuild,
+  obby-0.2.0.ebuild, +obby-0.2.1.ebuild:
+  Removed older version. Bump 0.2.0 to stable on x86 and amd64 and added new
+  0.2.1
+
+*obby-0.2.0 (14 Aug 2005)
+
+  14 Aug 2005; Gustavo Felisberto <humpback@gentoo.org>; +obby-0.2.0.ebuild:
+  Version bump.
+
+  15 Jul 2005; Gustavo Felisberto <humpback@gentoo.org>; obby-0.1.0.ebuild:
+  Keywording ~amd64
+
+  12 Jun 2005; David Holm <dholm@gentoo.org> obby-0.1.0.ebuild:
+  Added to ~ppc.
 
 *obby-0.1.0 (11 Jun 2005)
 
diff --git a/net-libs/obby/Manifest b/net-libs/obby/Manifest
index d8a75f261f41..9f03c262a52f 100644
--- a/net-libs/obby/Manifest
+++ b/net-libs/obby/Manifest
@@ -1,2 +1,18 @@
-MD5 91bcb9092daa6220a4fa5cec105dd66a obby-0.1.0.ebuild 692
-MD5 b77071ad6bce4de65b637205851b7cce files/digest-obby-0.1.0 62
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6a3ef0090707be233e520b560c316237 ChangeLog 1149
+MD5 15fc9f86a11d14a292fd3053fbf31a91 files/digest-obby-0.2.0 62
+MD5 3eb5cfe2654ba837a61ae2da5ce9cc7d files/digest-obby-0.2.1 62
+MD5 e8252c0a107a96ae7618e7f16a637f24 files/digest-obby-0.3.0_rc1 65
+MD5 dd068133bd54bcb0e2d32191cc97a088 metadata.xml 355
+MD5 e05565fc4e92799c0e5dca24f7fbb655 obby-0.2.0.ebuild 793
+MD5 da07f1d796b475dc0fa5cd9c82ca79a2 obby-0.2.1.ebuild 795
+MD5 887eeea14c445c6d4c5db91a996b101b obby-0.3.0_rc1.ebuild 842
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDe5SN8zY1VwezZiERAo4LAJ4uGJ+Rs6h07o5aLaIUiYM79o9vXQCbB4Ag
+mJkvQkOw0QJ8QRJ0FeL4Dmg=
+=gpPM
+-----END PGP SIGNATURE-----
diff --git a/net-libs/obby/obby-0.2.0.ebuild b/net-libs/obby/obby-0.2.0.ebuild
index 784d2760b3f9..89f550254fbf 100644
--- a/net-libs/obby/obby-0.2.0.ebuild
+++ b/net-libs/obby/obby-0.2.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/obby/obby-0.2.0.ebuild,v 1.1 2005/08/14 21:19:32 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/obby/obby-0.2.0.ebuild,v 1.1.1.1 2005/11/30 10:02:59 chriswhite Exp $
 
 DESCRIPTION="Library for collaborative text editing"
 HOMEPAGE="http://darcs.0x539.de/libobby"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="x86 ~ppc amd64"
 IUSE="howl"
 SRC_URI="http://releases.0x539.de/${PN}/${P}.tar.gz"
 
diff --git a/net-libs/obby/obby-0.2.1.ebuild b/net-libs/obby/obby-0.2.1.ebuild
index b5823dd3702f..57d0446a466f 100644
--- a/net-libs/obby/obby-0.2.1.ebuild
+++ b/net-libs/obby/obby-0.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-libs/obby/obby-0.2.1.ebuild,v 1.1 2005/09/18 19:25:14 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/obby/obby-0.2.1.ebuild,v 1.1.1.1 2005/11/30 10:02:59 chriswhite Exp $
 
 DESCRIPTION="Library for collaborative text editing"
 HOMEPAGE="http://darcs.0x539.de/libobby"
diff --git a/net-libs/obby/obby-0.3.0_rc1.ebuild b/net-libs/obby/obby-0.3.0_rc1.ebuild
index d56aff4a72a8..7ec1033af2b5 100644
--- a/net-libs/obby/obby-0.3.0_rc1.ebuild
+++ b/net-libs/obby/obby-0.3.0_rc1.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-libs/obby/obby-0.3.0_rc1.ebuild,v 1.1 2005/11/16 03:25:45 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/obby/obby-0.3.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:02:59 chriswhite Exp $
 
 MY_P=${P/_rc/rc}
 S=${WORKDIR}/${MY_P}
@@ -13,7 +13,7 @@ KEYWORDS="~x86 ~ppc ~amd64"
 IUSE="howl"
 SRC_URI="http://releases.0x539.de/${PN}/${MY_P}.tar.gz"
 
-DEPEND=">=net-libs/net6-1.1.0
+DEPEND=">=net-libs/net6-1.2.0
 		>=dev-libs/libsigc++-2.0
 		>=dev-libs/gmp-4.1.4
 		howl? ( >=net-misc/howl-0.9.8 )"
@@ -21,7 +21,7 @@ DEPEND=">=net-libs/net6-1.1.0
 RDEPEND=""
 
 src_compile() {
-	
+
 	local myconf
 	myconf="${myconf} --disable-tests"
 	use howl && myconf="${myconf} --with-howl"
diff --git a/net-libs/openh323/ChangeLog b/net-libs/openh323/ChangeLog
index 56020fd704a5..65c59603187b 100644
--- a/net-libs/openh323/ChangeLog
+++ b/net-libs/openh323/ChangeLog
@@ -1,6 +1,303 @@
 # ChangeLog for net-libs/openh323
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/ChangeLog,v 1.1 2002/07/03 18:26:49 drobbins Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/ChangeLog,v 1.1.1.1 2005/11/30 10:02:55 chriswhite Exp $
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> openh323-1.15.3.ebuild:
+  Mark 1.15.3 stable on alpha
+
+*openh323-1.15.6 (12 Sep 2005)
+
+  12 Sep 2005; Stefan Knoblich <stkn@gentoo.org> +openh323-1.15.6.ebuild:
+  Version bump, some cleanups and changes of /usr/lib/ symlinks.
+
+  15 Aug 2005; <stkn@gentoo.org> -openh323-1.12.2-r1.ebuild,
+  -openh323-1.13.2.ebuild, -openh323-1.13.2-r1.ebuild,
+  -openh323-1.13.5.ebuild, -openh323-1.15.2.ebuild:
+  Removed obsolete ebuilds.
+
+  06 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  openh323-1.13.2-r2.ebuild:
+  Stable on alpha.
+
+  27 Jul 2005; Pieter Van den Abeele <pvdabeel@gentoo.org>  openh323-1.15.2.ebuild, openh323-1.15.2-r1.ebuild, openh323-1.15.3.ebuild:
+  Marked latest versions stable. Used in the Freescale DES. We're Altivec
+  optimizing the protocol, sound codecs, ...
+
+*openh323-1.15.3 (11 Apr 2005)
+
+  11 Apr 2005; Stefan Knoblich <stkn@gentoo.org> +openh323-1.15.3.ebuild:
+  Version bump.
+
+  10 Apr 2005; Stefan Knoblich <stkn@gentoo.org> -openh323-1.11.7.ebuild,
+  -openh323-1.9.10-r1.ebuild:
+  cleanup part #1
+
+*openh323-1.15.2-r1 (03 Feb 2005)
+
+  03 Feb 2005; Stefan Knoblich <stkn@gentoo.org> +openh323-1.13.2-r2.ebuild,
+  +openh323-1.13.5-r1.ebuild, +openh323-1.15.2-r1.ebuild:
+  Cleanups and important amd64 fixes.
+
+  14 Jan 2005; <avatar@gentoo.org> openh323-1.15.2.ebuild:
+  Added to ~ppc.
+
+  12 Jan 2005; Stefan Knoblich <stkn@gentoo.org> openh323-1.15.2.ebuild:
+  Mirrored now
+
+  10 Jan 2005; Stefan Knoblich <stkn@gentoo.org> openh323-1.13.5.ebuild,
+  openh323-1.15.2.ebuild:
+  Filter -fstack-protector, this may cause problems (bug #75259)
+
+  10 Jan 2005; Stefan Knoblich <stkn@gentoo.org> openh323-1.15.2.ebuild:
+  Marked ~alpha.
+
+  09 Jan 2005; Jason Wever <weeve@gentoo.org> openh323-1.15.2.ebuild:
+  Added ~sparc keyword as it went missing in the version bump.
+
+  08 Jan 2005; Stefan Knoblich <stkn@gentoo.org> openh323-1.15.2.ebuild:
+  removed sample application (simph323, anyone needs that?), parallel building
+  works, libs are now installed as libh323*.so.${PV} (imho more
+  sane than libh323*.so), testing fun on x86 begins
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  29 Dec 2004; Stefan Knoblich <stkn@gentoo.org> openh323-1.15.2.ebuild:
+  cleanup, SRC_URI changed, some parts taken from #69233 submitted by
+  Stefan Schweizer <genstef@gentoo.org>
+
+*openh323-1.15.2 (28 Dec 2004)
+
+  28 Dec 2004; Stefan Knoblich <stkn@gentoo.org>
+  +files/openh323-1.15.2-notrace.diff, +openh323-1.15.2.ebuild:
+  new version, hard-masked for now (needs testing)
+
+  30 Nov 2004; <stkn@gentoo.org> +files/openh323-1.13.2-ixjuser.diff,
+  openh323-1.13.2-r1.ebuild:
+  fixes problem with 2.6 headers (see #72448 for more information),
+  thx to Abdul-Wahid Paterson <aw@lintrix.net> and Bachelier Vincent
+  <vincent_bachelier@yahoo.fr> for this patch
+
+  09 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> openh323-1.13.5.ebuild:
+  ~alpha keyword.
+
+  31 Oct 2004; Joseph Jezak <josejx@gentoo.org> openh323-1.13.5.ebuild:
+  Marked ppc stable.
+
+  23 Oct 2004; Jason Wever <weeve@gentoo.org> openh323-1.13.5.ebuild:
+  Added ~sparc keyword.
+
+  18 Sep 2004; Jason Wever <weeve@gentoo.org> openh323-1.13.2-r1.ebuild:
+  Stable on sparc.
+
+  06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> openh323-1.12.2-r2.ebuild,
+  openh323-1.13.2-r1.ebuild, openh323-1.13.2.ebuild, openh323-1.13.5.ebuild:
+  Switch to use epause and ebeep, bug #62950
+
+  14 Aug 2004; Danny van Dyk <kugelfang@gentoo.org>
+  +files/openh323-1.13.2-gcc34.diff, openh323-1.13.2-r1.ebuild,
+  openh323-1.13.5.ebuild:
+  Fixed BUG #56951. Marked 1.13.2-r1 amd64 and 1.13.5 ~amd64.
+
+  10 Jun 2004; Aron Griffis <agriffis@gentoo.org> openh323-1.11.7.ebuild,
+  openh323-1.12.0-r1.ebuild, openh323-1.12.2-r1.ebuild,
+  openh323-1.12.2-r2.ebuild, openh323-1.13.2-r1.ebuild,
+  openh323-1.13.2.ebuild, openh323-1.13.5.ebuild, openh323-1.9.10-r1.ebuild:
+  Fix use invocation
+
+  07 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> openh323-1.12.2-r2.ebuild:
+  Stable on alpha.
+
+  27 May 2004; Stefan Knoblich <stkn@gentoo.org> openh323-1.13.2-r1.ebuild:
+  openh323-1.13.2-r1 stable on x86
+
+  09 May 2004; David Holm <dholm@gentoo.org> openh323-1.13.5.ebuild:
+  Fixed dependencies, readded to ~ppc.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> openh323-1.13.5.ebuild:
+  Add flag-o-matic for bug 49179
+
+  21 Apr 2004; Stefan Knoblich <stkn@gentoo.org> openh323-1.12.2-r2.ebuild,
+  openh323-1.13.2-r1.ebuild:
+  change dependencies to use only matching pwlib releases (#47929)
+
+*openh323-1.13.5 (11 Apr 2004)
+
+  11 Apr 2004; Stefan Knoblich <stkn@gentoo.org> openh323-1.13.5.ebuild,
+  files/openh323-1.13.5-ffmpeg.diff, files/openh323-1.13.5-include-order.diff:
+  version bump
+
+  30 Mar 2004; Stefan Knoblich <stkn@gentoo.org> openh323-1.12.2-r2.ebuild,
+  openh323-1.13.2-r1.ebuild:
+  openh323-1.12.2-r2 marked stable on x86, added fix for #43981.
+  Both ebuilds should work on amd64 now (symlinks are created correctly)
+
+  30 Mar 2004; Sven Blumenstein <bazik@gentoo.org> openh323-1.12.2-r2.ebuild:
+  Stable on sparc.
+
+  30 Mar 2004; Lars Weiler <pylon@gentoo.org> openh323-1.13.2-r1.ebuild:
+  Added ~ppc on request of cybersystem
+
+  30 Mar 2004; Lars Weiler <pylon@gentoo.org> openh323-1.12.2-r2.ebuild:
+  stable on ppc
+
+  24 Mar 2004; Jason Huebel <jhuebel@gentoo.org> openh323-1.13.2-r1.ebuild:
+  also added ~amd64 to keywords
+
+  24 Mar 2004; Jason Huebel <jhuebel@gentoo.org> openh323-1.13.2-r1.ebuild:
+  added line to append -fPIC to the CPPFLAGS
+
+  19 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  openh323-1.13.2-r1.ebuild:
+  ~sparc lovin
+
+*openh323-1.13.2-r1 (12 Mar 2004)
+
+  12 Mar 2004; Stefan Knoblich <stkn@gentoo.org> openh323-1.13.2-r1.ebuild,
+  openh323-1.13.2.ebuild:
+  this update fixes bug #44125 and a lot of compile time problems, which may be
+  caused by some (major) changes in openh323.
+
+*openh323-1.13.2 (09 Mar 2004)
+
+  09 Mar 2004; Stefan Knoblich <stkn@gentoo.org> openh323-1.13.2.ebuild,
+  files/openh323-1.13.2-ffmpeg.diff, files/openh323-1.13.2-include-order.diff:
+  new version, copyright header updates
+
+  13 Feb 2004; Stefan Knoblich <stkn@gentoo.org> openh323-1.12.2-r2.ebuild:
+  added warning message for >=gcc-3.3.2 users, regarding possible compiler
+  problems (see #39069)
+
+  09 Nov 2003; Jason Wever <weeve@gentoo.org> openh323-1.12.2-r2.ebuild,
+  openh323-1.9.10-r1.ebuild:
+  Masked openh323-1.9.10-r1 on sparc as pwlib-1.3.11* dependency doesn't buid.
+  Added ~sparc keyword to openh323-1.12.2.-r1.
+
+*openh323-1.12.2-r2 (08 Nov 2003)
+
+  08 Nov 2003; <stkn@gentoo.org> openh323-1.12.2-r2.ebuild,
+  files/openh323-1.12.2-ffmpeg.diff, files/openh323-1.12.2-include-order.diff:
+  fixed ffmpeg detection and compiling (#32522 and #32754)
+
+  03 Nov 2003; Stefan Knoblich <stkn@gentoo.org> openh323-1.12.0-r1.ebuild,
+  files/openh323-1.12.0-include-order.diff:
+  change order of include pathes in openh323u.mak, this fixes bug #32522
+
+*openh323-1.12.2-r1 (13 Oct 2003)
+
+  13 Oct 2003; Stefan Knoblich <stkn@gentoo.org> metadata.xml,
+  openh323-1.12.2-r1.ebuild:
+  fixes openh323u.mak include and library path, necessary for openh323.org
+  applications (and others)
+
+  09 Sep 2003; Alastair Tse <liquidx@gentoo.org> openh323-1.12.2.ebuild:
+  installed version.h for gnugk (#28199)
+
+  04 Sep 2003; Alastair Tse <liquidx@gentoo.org> openh323-1.11.7.ebuild,
+  openh323-1.12.0-r1.ebuild, openh323-1.12.2.ebuild,
+  openh323-1.9.10-r1.ebuild:
+  fix deps to specific versions to avoid people shooting themselves in the foot
+  by mixing stable and unstable
+
+  03 Sep 2003; Alastair Tse <liquidx@gentoo.org> openh323-1.12.0-r1.ebuild,
+  openh323-1.12.0.ebuild:
+  stable bump for 1.12.0 plus cleanups
+
+*openh323-1.12.2 (03 Sep 2003)
+
+  03 Sep 2003; Alastair Tse <liquidx@gentoo.org> openh323-1.12.2.ebuild:
+  version bump
+
+  09 Jul 2003; Martin Holzer <mholzer@gentoo.org> openh323-1.12.0-r1.ebuild:
+  Changed ffmpeg cat. Closes #24149
+
+*openh323-1.12.0-r1 (09 Jul 2003)
+
+  09 Jul 2003; Alastair Tse <liquidx@gentoo.org> openh323-1.12.0-r1.ebuild,
+  openh323-1.12.0.ebuild:
+  adds ffmpeg support. also has backwards compatibility symlinks with -r0
+
+  29 Jun 2003; Alastair Tse <liquidx@gentoo.org> openh323-1.11.7.ebuild,
+  openh323-1.12.0.ebuild:
+  fix broken libopenh323 symlink
+
+*openh323-1.12.0 (27 Jun 2003)
+
+  27 Jun 2003; Alastair Tse <liquidx@gentoo.org> openh323-1.12.0.ebuild:
+  version bump. changed build syste. removed arch specific link as make file
+  handles that now. cleaned up extraneous files in /usr/share/openh323
+
+  17 May 2003; Alastair Tse <liquidx@gentoo.org> openh323-1.11.7.ebuild:
+  marked as x86 stable
+
+*openh323-1.11.7 (01 Apr 2003)
+
+  15 Apr 2003; Alastair Tse <liquidx@gentoo.org> openh323-1.11.7.ebuild,
+  files/openh323-1.11.7-emptyMakefile:
+  added Makefile to allow gnugk to compile against openh323 correctly
+
+  01 Apr 2003; Alastair Tse <liquidx@gentoo.org> openh323-1.11.7.ebuild:
+  version bump and additional check for possible broken pwlib makefiles
+
+*openh323-1.11.2 (28 Jan 2003)
+
+  01 Feb 2003; Nick Hadaway <raker@gentoo.org> openh323-1.11.2.ebuild :
+  Marked stable
+
+  28 Jan 2003; Nick Hadaway <raker@gentoo.org> openh323-1.11.2.ebuild,
+  files/digest-openh323-1.11.2 :
+  Version bump for gnomemeeting-0.96
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*openh323-1.9.10-r1 (12 Nov 2002)
+
+  12 Nov 2002; Mat Keadle <mkeadle@gentoo.org>
+  openh323-*.ebuild :
+  
+  Changed any reference to 'Speex' to 'speex'
+
+*openh323-1.9.10-r1 (06 Nov 2002)
+
+  10 Nov 2002; Nick Hadaway <raker@gentoo.org> openh323-1.9.10-r1.ebuild :
+  Add ppc hooks
+
+  06 Nov 2002; Nick Hadaway <raker@gentoo.org> openh323-1.9.10-r1.ebuild,
+  files/digest-openh323-1.9.10-r1 :
+  Added SSL support and tightened dependancy on pwlib.
+
+*openh323-1.9.10 (24 Oct 2002)
+
+  24 Oct 2002; Nick Hadaway <raker@gentoo.org> openh323-1.9.10.ebuild,
+  files/digest-openh323-1.9.10 :
+  Version bump.  Currently marked unstable.  Will be marked stable when
+  gnomemeeting is released into portage.
+
+*openh323-1.9.3 (20 Jul 2002)
+
+  20 Jul 2002; Nick Hadaway <raker@gentoo.org>
+  openh323-1.9.3.ebuild, files/digest-openh323-1.9.3 :
+
+  Updated openh323 to the latest version supported with gnomemeeting.
+  Removed previous versions from cvs.
+
+*openh323-1.8.8 (05 Jul 2002)
+
+  05 Jul 2002; Nick Hadaway <raker@gentoo.org> openh323-1.8.8.ebuild:
+  Like pwlib, openh323.org has removed everything but their devel series
+  from the ftp site.  Now pulling downloads from gnomemeeting.org
+
+*openh323-1.9.2 (05 Jul 2002)
+
+  05 Jul 2002; Nick Hadaway <raker@gentoo.org> openh323-1.9.2.ebuild:
+  Version bump.  Possibly works with gnomemeeting.
+
+*openh323-1.8.11 (03 Jul 2002)
+
+  03 Jul 2002; Daniel Robbins <drobbins@gentoo.org> Adding latest 1.8 version
+  of this ebuild so that we can get the latest gnomemeeting working (doesn't
+  work with 1.9 yet.)  Thanks to Nick Hadaway (raker) for this submission.  Set
+  SLOT to 1.8 and tweaked top comments.
 
 *openh323-1.9.1 (03 Jul 2002)
 
diff --git a/net-libs/openh323/Manifest b/net-libs/openh323/Manifest
index ecbe08b34fd7..486cc2ba7ab3 100644
--- a/net-libs/openh323/Manifest
+++ b/net-libs/openh323/Manifest
@@ -1,12 +1,27 @@
-MD5 cfe00ff3f109ffc28f8d1203b2ea93c6 ChangeLog 2673
-MD5 fd446be456cfda0ff73eda95680623ca openh323-1.9.10-r1.ebuild 1456
-MD5 29666899e624d9e17ddcaed1b01ba8a7 openh323-1.9.10.ebuild 1193
-MD5 3a4979620df3ae6328ecc9d00c5b662a openh323-1.9.3.ebuild 1154
-MD5 fecc436870333270f84e73943b417326 openh323-1.11.7.ebuild 2207
-MD5 518bcc022e33b17140fd3c798e06e723 openh323-1.11.2.ebuild 1424
-MD5 919035124f99513501f60e0206d5db16 files/digest-openh323-1.11.2 68
-MD5 47caff52a16cf5135ad984dcfe022f6a files/digest-openh323-1.9.10 68
-MD5 47caff52a16cf5135ad984dcfe022f6a files/digest-openh323-1.9.10-r1 68
-MD5 9190e8e7ed42ae952b2fd8d8a12e341b files/digest-openh323-1.9.3 67
-MD5 e9ac1227eaf205c20f84a4fc712e8d66 files/digest-openh323-1.11.7 68
+MD5 9c59d13d7b06bc4d44c71723173b32c9 openh323-1.12.2-r2.ebuild 3720
+MD5 5ae9f140fcd4525c88ee9239bd8772a6 metadata.xml 267
+MD5 a94ddb1d91decd0a0787734fc1e27c9d openh323-1.13.2-r2.ebuild 4163
+MD5 4ae7db9510034e77e8fdf76deda14ae7 ChangeLog 11395
+MD5 0fe7f7f9988fabaa2763e35d351fd409 openh323-1.12.0-r1.ebuild 2820
+MD5 c37dead260b91dfc038ead49e10e2b7e openh323-1.15.2-r1.ebuild 4100
+MD5 57b84b4fcd17dda0ae3a0dab79c99366 openh323-1.15.3.ebuild 3973
+MD5 032ccbd847b10acf333607d4b3471924 openh323-1.15.6.ebuild 4043
+MD5 29aa9329620d18452705fa542c6ebfba openh323-1.13.5-r1.ebuild 4188
+MD5 ba6d90bbb25d240c705e30bd55bc8daf files/digest-openh323-1.15.2-r1 73
+MD5 238a3a0b91aabce0a61e0dd5c4b9ee68 files/digest-openh323-1.12.0-r1 68
+MD5 2efc1a39c75805caacb974bfa6208dea files/digest-openh323-1.12.2-r2 68
+MD5 d63db2246a246adf622afeefabbb1e9d files/openh323-1.13.2-include-order.diff 1027
+MD5 8f793eaf228e13d19c7393fe95c8ed19 files/digest-openh323-1.13.2-r2 68
+MD5 767748fd04f2626be4c6914e110a1676 files/openh323-1.12.2-include-order.diff 1361
+MD5 cfdd76561ff2f0a2582f953e56fa4623 files/digest-openh323-1.15.3 68
+MD5 3f59306b619abf22dd5338af0c4c099b files/openh323-1.12.0-include-order.diff 1326
 MD5 c3dd75b2e6b09b4f5cc5b88a12064159 files/openh323-1.11.7-emptyMakefile 8
+MD5 76afb2b1c9c9e4aa4414531ffdd812e9 files/openh323-1.12.2-ffmpeg.diff 1899
+MD5 d63db2246a246adf622afeefabbb1e9d files/openh323-1.13.5-include-order.diff 1027
+MD5 2c75f68b5db8444726ae9342b8a02319 files/openh323-1.13.2-ixjuser.diff 285
+MD5 76afb2b1c9c9e4aa4414531ffdd812e9 files/openh323-1.13.2-ffmpeg.diff 1899
+MD5 73a8df25ace2235307956d67acecb32d files/openh323-1.15.2-notrace.diff 801
+MD5 76afb2b1c9c9e4aa4414531ffdd812e9 files/openh323-1.13.5-ffmpeg.diff 1899
+MD5 e4b00dfe33b6d0574e651c93ceddf59d files/openh323-1.13.2-gcc34.diff 291
+MD5 9519f9e7c6a88c9159cba2345725ed9d files/digest-openh323-1.13.5-r1 73
+MD5 f5617f451bc51bdc25f39d40f32dd7a4 files/digest-openh323-1.15.6 68
diff --git a/net-libs/openh323/metadata.xml b/net-libs/openh323/metadata.xml
index da6fd63d0085..68d17dba0f46 100644
--- a/net-libs/openh323/metadata.xml
+++ b/net-libs/openh323/metadata.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<herd>voip</herd>
 <herd>gnome</herd>
+<maintainer>
+  <email>stkn@gentoo.org</email>
+  <name>Stefan Knoblich</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-libs/openh323/openh323-1.12.0-r1.ebuild b/net-libs/openh323/openh323-1.12.0-r1.ebuild
index a1a61382d440..1e1687cf1e20 100644
--- a/net-libs/openh323/openh323-1.12.0-r1.ebuild
+++ b/net-libs/openh323/openh323-1.12.0-r1.ebuild
@@ -1,6 +1,8 @@
-# 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-libs/openh323/openh323-1.12.0-r1.ebuild,v 1.1 2003/07/09 00:18:23 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.12.0-r1.ebuild,v 1.1.1.1 2005/11/30 10:02:55 chriswhite Exp $
+
+inherit eutils
 
 IUSE="ssl"
 
@@ -11,11 +13,11 @@ SRC_URI="http://www.openh323.org/bin/${PN}_${PV}.tar.gz"
 
 SLOT="0"
 LICENSE="MPL-1.1"
-KEYWORDS="~x86 ~ppc -sparc "
+KEYWORDS="x86 ~ppc -sparc "
 
 DEPEND=">=sys-apps/sed-4
-	>=dev-libs/pwlib-1.5.0
-	>=media-libs/ffmpeg-0.4.7_pre20030624
+	=dev-libs/pwlib-1.5.0*
+	>=media-video/ffmpeg-0.4.7_pre20030624
 	ssl? ( dev-libs/openssl )"
 
 MAKEOPTS="${MAKEOPTS} -j1"
@@ -23,10 +25,10 @@ MAKEOPTS="${MAKEOPTS} -j1"
 pkg_setup() {
 	# to prevent merge problems with broken makefiles from old
 	# pwlib versions, we double-check here.
-	
+
 	if [ "` fgrep '\$(OPENSSLDIR)/include' /usr/share/pwlib/make/unix.mak`" ]
 	then
-		# patch unix.mak so it doesn't require annoying 
+		# patch unix.mak so it doesn't require annoying
 		# unmerge/merge cycle to upgrade
 		einfo "Fixing broken pwlib makefile."
 		cd /usr/share/pwlib/make
@@ -41,6 +43,10 @@ src_unpack() {
 	unpack ${A}
 	# enabling ffmpeg/h263 support
 	cd ${S}; sed -i -e "s:/usr/local/include/ffmpeg:/usr/include/ffmpeg:" configure
+
+	# change search order of include files
+	# fixes bug #32522
+	epatch ${FILESDIR}/openh323-${PV}-include-order.diff
 }
 
 src_compile() {
@@ -52,13 +58,13 @@ src_compile() {
 	# NOTRACE avoid compilation problems, we disable PTRACING using NOTRACE=1
 	makeopts="${makeopts} ASNPARSER=/usr/bin/asnparser NOTRACE=1"
 
-	
-	if [ "`use ssl`" ]; then
+
+	if use ssl; then
 		export OPENSSLFLAG=1
 		export OPENSSLDIR=/usr
 		export OPENSSLLIBS="-lssl -lcrypt"
 	fi
-	
+
 	econf || die
 	emake ${makeopts} opt || die "make failed"
 }
@@ -68,7 +74,7 @@ src_install() {
 	# make NOTRACE=1 opt ==> linux_$ARCH_n
 	# make opt           ==> linux_$ARCH_r
 	OPENH323_ARCH="linux_${ARCH}_n"
-	
+
 	dodir /usr/bin /usr/lib/ /usr/share
 	make PREFIX=${D}/usr install || die "install failed"
 	dobin ${S}/samples/simple/obj_${OPENH323_ARCH}/simph323
@@ -81,7 +87,7 @@ src_install() {
 
 	rm ${D}/usr/lib/libopenh323.so
 	dosym /usr/lib/libh323_${OPENH323_ARCH}.so.${PV} /usr/lib/libopenh323.so
-	
+
 	# for backwards compatibility with _r versioned libraries
 	ALT_ARCH=${OPENH323_ARCH/_n/_r}
 	for pv in ${PV} ${PV%.[0-9]} ${PV%.[0-9]*.[0-9]}; do
@@ -89,7 +95,5 @@ src_install() {
 		dosym /usr/lib/libh323_${OPENH323_ARCH}.so.${PV} /usr/lib/libh323_${ALT_ARCH}.so.${pv}
 	done
 	dosym /usr/lib/libh323_${OPENH323_ARCH}.so.${PV} /usr/lib/libh323_${ALT_ARCH}.so
-	
-}
-
 
+}
diff --git a/net-libs/openh323/openh323-1.12.2-r2.ebuild b/net-libs/openh323/openh323-1.12.2-r2.ebuild
index 5debf7b14c34..059c2356f549 100644
--- a/net-libs/openh323/openh323-1.12.2-r2.ebuild
+++ b/net-libs/openh323/openh323-1.12.2-r2.ebuild
@@ -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: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.12.2-r2.ebuild,v 1.1 2003/11/08 18:33:54 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.12.2-r2.ebuild,v 1.1.1.1 2005/11/30 10:02:55 chriswhite Exp $
 
 inherit eutils
 
@@ -13,10 +13,10 @@ SRC_URI="http://www.openh323.org/bin/${PN}_${PV}.tar.gz"
 
 SLOT="0"
 LICENSE="MPL-1.1"
-KEYWORDS="~x86 ~ppc -sparc"
+KEYWORDS="x86 ppc sparc alpha"
 
 DEPEND=">=sys-apps/sed-4
-	>=dev-libs/pwlib-1.5.2
+	~dev-libs/pwlib-1.5.2
 	>=media-video/ffmpeg-0.4.7
 	ssl? ( dev-libs/openssl )"
 
@@ -37,6 +37,15 @@ pkg_setup() {
 		-e "s:^LDFLAGS.*\+= -L\$(OPENSSLDIR)/lib -L\$(OPENSSLDIR):LDFLAGS +=:" \
 		unix.mak
 	fi
+
+	if has_version ">=sys-devel/gcc-3.3.2"; then
+		ewarn "If you are experiencing problems emerging openh323 with gcc-3.3.x"
+		ewarn "please try using CFLAGS=\"-O1\" when emergeing"
+		ewarn "we are currently investigating this problem..."
+		ewarn ""
+		ewarn "<sleeping 10 seconds...>"
+		epause 10
+	fi
 }
 
 src_unpack() {
@@ -58,9 +67,10 @@ src_compile() {
 	export OPENH323DIR=${S}
 
 	# NOTRACE avoid compilation problems, we disable PTRACING using NOTRACE=1
-	makeopts="${makeopts} ASNPARSER=/usr/bin/asnparser NOTRACE=1"
+	# setting LDFLAGS prevents openh323 from using the wrong libs
+	makeopts="${makeopts} ASNPARSER=/usr/bin/asnparser LDFLAGS=-L${S}/lib NOTRACE=1"
 
-	if [ "`use ssl`" ]; then
+	if use ssl; then
 		export OPENSSLFLAG=1
 		export OPENSSLDIR=/usr
 		export OPENSSLLIBS="-lssl -lcrypt"
@@ -74,7 +84,13 @@ src_install() {
 	local OPENH323_ARCH ALT_ARCH
 	# make NOTRACE=1 opt ==> linux_$ARCH_n
 	# make opt           ==> linux_$ARCH_r
-	OPENH323_ARCH="linux_${ARCH}_n"
+
+	# amd64 needs special treatment
+	if [ ${ARCH} = "amd64" ]; then
+		OPENH323_ARCH="linux_x86_64_n"
+	else
+		OPENH323_ARCH="linux_${ARCH}_n"
+	fi
 
 	dodir /usr/bin /usr/lib/ /usr/share
 	make PREFIX=${D}/usr install || die "install failed"
diff --git a/net-libs/openh323/openh323-1.13.2-r2.ebuild b/net-libs/openh323/openh323-1.13.2-r2.ebuild
index 36d8722c0700..a6fb90dda648 100644
--- a/net-libs/openh323/openh323-1.13.2-r2.ebuild
+++ b/net-libs/openh323/openh323-1.13.2-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-libs/openh323/openh323-1.13.2-r2.ebuild,v 1.1 2005/02/03 20:11:08 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.13.2-r2.ebuild,v 1.1.1.1 2005/11/30 10:02:55 chriswhite Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.gnomemeeting.org/admin/downloads/latest/sources/sources/${P}
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="x86 sparc amd64 ppc"
+KEYWORDS="alpha amd64 ppc sparc x86"
 IUSE="ssl"
 
 DEPEND=">=sys-apps/sed-4
diff --git a/net-libs/openh323/openh323-1.13.5-r1.ebuild b/net-libs/openh323/openh323-1.13.5-r1.ebuild
index cd6b095b848d..9a45b824e8dc 100644
--- a/net-libs/openh323/openh323-1.13.5-r1.ebuild
+++ b/net-libs/openh323/openh323-1.13.5-r1.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.13.5-r1.ebuild,v 1.1 2005/02/03 20:11:08 stkn Exp $
-
-IUSE="ssl"
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.13.5-r1.ebuild,v 1.1.1.1 2005/11/30 10:02:55 chriswhite Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -13,6 +11,7 @@ DESCRIPTION="Open Source implementation of the ITU H.323 teleconferencing protoc
 HOMEPAGE="http://www.openh323.org/"
 SRC_URI="mirror://sourceforge/openh323/${MY_P}-src.tar.gz"
 
+IUSE="ssl"
 SLOT="0"
 LICENSE="MPL-1.1"
 KEYWORDS="~x86 ppc ~amd64 ~sparc ~alpha"
diff --git a/net-libs/openh323/openh323-1.15.2-r1.ebuild b/net-libs/openh323/openh323-1.15.2-r1.ebuild
index 4f59a0c5a2b8..34bdb4899328 100644
--- a/net-libs/openh323/openh323-1.15.2-r1.ebuild
+++ b/net-libs/openh323/openh323-1.15.2-r1.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.15.2-r1.ebuild,v 1.1 2005/02/03 20:11:08 stkn Exp $
-
-IUSE="ssl novideo noaudio debug"
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.15.2-r1.ebuild,v 1.1.1.1 2005/11/30 10:02:56 chriswhite Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -13,9 +11,10 @@ DESCRIPTION="Open Source implementation of the ITU H.323 teleconferencing protoc
 HOMEPAGE="http://www.openh323.org/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src-tar.gz"
 
+IUSE="ssl novideo noaudio debug"
 SLOT="0"
 LICENSE="MPL-1.1"
-KEYWORDS="~x86 ~sparc ~alpha ~ppc ~amd64"
+KEYWORDS="~alpha ~amd64 ppc ~sparc ~x86"
 
 DEPEND=">=sys-apps/sed-4
 	>=dev-libs/pwlib-1.8.3
diff --git a/net-libs/openh323/openh323-1.15.3.ebuild b/net-libs/openh323/openh323-1.15.3.ebuild
index 64ecc4923bea..8e50749309ca 100644
--- a/net-libs/openh323/openh323-1.15.3.ebuild
+++ b/net-libs/openh323/openh323-1.15.3.ebuild
@@ -1,21 +1,19 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.15.3.ebuild,v 1.1 2005/04/10 22:06:02 stkn Exp $
-
-IUSE="ssl novideo noaudio debug"
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.15.3.ebuild,v 1.1.1.1 2005/11/30 10:02:55 chriswhite Exp $
 
 inherit eutils flag-o-matic multilib
 
 MY_P="${PN}-v${PV//./_}"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Open Source implementation of the ITU H.323 teleconferencing protocol"
 HOMEPAGE="http://www.openh323.org/"
 SRC_URI="http://www.gnomemeeting.org/admin/downloads/latest/sources/sources/${P}.tar.gz"
 
+IUSE="ssl novideo noaudio debug"
 SLOT="0"
 LICENSE="MPL-1.1"
-KEYWORDS="~x86 ~sparc ~alpha ~ppc ~amd64"
+KEYWORDS="alpha ~amd64 ppc ~sparc ~x86"
 
 DEPEND=">=sys-apps/sed-4
 	>=dev-libs/pwlib-1.8.4
diff --git a/net-libs/openh323/openh323-1.15.6.ebuild b/net-libs/openh323/openh323-1.15.6.ebuild
index 1bad03656c50..562b27695ae0 100644
--- a/net-libs/openh323/openh323-1.15.6.ebuild
+++ b/net-libs/openh323/openh323-1.15.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-libs/openh323/openh323-1.15.6.ebuild,v 1.1 2005/09/12 20:06:58 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.15.6.ebuild,v 1.1.1.1 2005/11/30 10:02:55 chriswhite Exp $
 
 inherit eutils flag-o-matic multilib
 
diff --git a/net-libs/openhbci-plugin-ddvcard/ChangeLog b/net-libs/openhbci-plugin-ddvcard/ChangeLog
index db14b06a1285..8c8834e48467 100644
--- a/net-libs/openhbci-plugin-ddvcard/ChangeLog
+++ b/net-libs/openhbci-plugin-ddvcard/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for net-libs/openhbci-plugin-ddvcard
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/openhbci-plugin-ddvcard/ChangeLog,v 1.1 2003/07/08 14:48:17 hanno Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openhbci-plugin-ddvcard/ChangeLog,v 1.1.1.1 2005/11/30 10:02:47 chriswhite Exp $
+
+*openhbci-plugin-ddvcard-0.4 (14 Jan 2004)
+
+  14 Jan 2004; Hanno Boeck <hanno@gentoo.org>
+  openhbci-plugin-ddvcard-0.4.ebuild:
+  Version bump. Fixes a bug that can destroy hbci-cards, so please update.
+
+*openhbci-plugin-ddvcard-0.3-r1 (28 Aug 2003)
+
+  28 Aug 2003; Hanno Boeck <hanno@gentoo.org>
+  openhbci-plugin-ddvcard-0.3-r1.ebuild:
+  Bumped version and updated digest, because upstream changed the archive
+  without bumping the version number.
 
 *openhbci-plugin-ddvcard-0.3 (08 Jul 2003)
 
diff --git a/net-libs/openhbci-plugin-ddvcard/Manifest b/net-libs/openhbci-plugin-ddvcard/Manifest
index d84dadbe823b..b9e1eec95f5c 100644
--- a/net-libs/openhbci-plugin-ddvcard/Manifest
+++ b/net-libs/openhbci-plugin-ddvcard/Manifest
@@ -1,3 +1,6 @@
-MD5 2b27eb82b28aaf83a696e600bf1e52dd openhbci-plugin-ddvcard-0.3.ebuild 631
-MD5 b9571dc727336953b0e7a8f424b739c8 ChangeLog 415
-MD5 ce8172834d26e251fc12906320e78725 files/digest-openhbci-plugin-ddvcard-0.3 79
+MD5 4557973f6a32c423c94779190806bc17 openhbci-plugin-ddvcard-0.3-r1.ebuild 636
+MD5 db3e14cb8ce51f9890b7aaab8f408d4a openhbci-plugin-ddvcard-0.4.ebuild 633
+MD5 b26760a40c741cb69e106fe0df92b1c0 ChangeLog 860
+MD5 a72a06a37ca4e5905085ebff07fe9e9e metadata.xml 217
+MD5 22e150d7ecfa8dee1d769d5a43b383aa files/digest-openhbci-plugin-ddvcard-0.4 79
+MD5 ec8ecbc20edf10d9474abd1cc7491d0e files/digest-openhbci-plugin-ddvcard-0.3-r1 79
diff --git a/net-libs/openhbci-plugin-ddvcard/openhbci-plugin-ddvcard-0.3-r1.ebuild b/net-libs/openhbci-plugin-ddvcard/openhbci-plugin-ddvcard-0.3-r1.ebuild
index e72d5e7458d7..ec3d18985bab 100644
--- a/net-libs/openhbci-plugin-ddvcard/openhbci-plugin-ddvcard-0.3-r1.ebuild
+++ b/net-libs/openhbci-plugin-ddvcard/openhbci-plugin-ddvcard-0.3-r1.ebuild
@@ -1,6 +1,6 @@
-# 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-libs/openhbci-plugin-ddvcard/openhbci-plugin-ddvcard-0.3-r1.ebuild,v 1.1 2003/09/26 10:27:14 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openhbci-plugin-ddvcard/openhbci-plugin-ddvcard-0.3-r1.ebuild,v 1.1.1.1 2005/11/30 10:02:47 chriswhite Exp $
 
 DESCRIPTION="Plugin to use DDV cards with openhbci."
 HOMEPAGE="http://openhbci.sourceforge.net/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/openhbci/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
 DEPEND=">=net-libs/openhbci-0.9.13"
diff --git a/net-libs/openhbci-plugin-ddvcard/openhbci-plugin-ddvcard-0.4.ebuild b/net-libs/openhbci-plugin-ddvcard/openhbci-plugin-ddvcard-0.4.ebuild
index 894cafb2c145..2583bbff1cee 100644
--- a/net-libs/openhbci-plugin-ddvcard/openhbci-plugin-ddvcard-0.4.ebuild
+++ b/net-libs/openhbci-plugin-ddvcard/openhbci-plugin-ddvcard-0.4.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-libs/openhbci-plugin-ddvcard/openhbci-plugin-ddvcard-0.4.ebuild,v 1.1 2004/01/14 20:17:08 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openhbci-plugin-ddvcard/openhbci-plugin-ddvcard-0.4.ebuild,v 1.1.1.1 2005/11/30 10:02:47 chriswhite Exp $
 
 DESCRIPTION="Plugin to use DDV cards with openhbci."
 HOMEPAGE="http://openhbci.sourceforge.net/"
diff --git a/net-libs/openhbci/ChangeLog b/net-libs/openhbci/ChangeLog
index 5df29d4cafa0..75bbff10b5fd 100644
--- a/net-libs/openhbci/ChangeLog
+++ b/net-libs/openhbci/ChangeLog
@@ -1,9 +1,96 @@
 # ChangeLog for net-libs/openhbci
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/openhbci/ChangeLog,v 1.1 2003/04/28 01:45:47 liquidx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openhbci/ChangeLog,v 1.1.1.1 2005/11/30 10:02:48 chriswhite Exp $
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org>
+  openhbci-0.9.17-r1.ebuild:
+  Stable on ppc.
+
+*openhbci-0.9.17-r1 (07 Mar 2005)
+
+  07 Mar 2005; Eric Shattow <jnc@gentoo.org> +openhbci-0.9.17-r1.ebuild:
+  Closes #79736
+
+  07 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org> openhbci-0.9.17.ebuild:
+  Stable on sparc
+
+  02 Feb 2005; Hanno Boeck <hanno@gentoo.org> openhbci-0.9.17.ebuild:
+  Mark stable on x86.
+
+*openhbci-0.9.17 (10 Jan 2005)
+
+  10 Jan 2005; Hanno Boeck <hanno@gentoo.org> +openhbci-0.9.17.ebuild:
+  Version bump and compile fix.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  11 Dec 2004; Jason Wever <weeve@gentoo.org> openhbci-0.9.16.ebuild:
+  Stable on sparc.
+
+  31 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> openhbci-0.9.16.ebuild:
+  Stable on alpha.
+
+  02 Oct 2004; Hanno Boeck <hanno@gentoo.org> openhbci-0.9.16.ebuild:
+  Stable on x86.
+
+  19 Sep 2004; Danny van Dyk <kugelfang@gentoo.org> openhbci-0.9.16.ebuild:
+  Marked ~amd64.
+
+*openhbci-0.9.16 (24 Jun 2004)
+
+  24 Jun 2004; Hanno Boeck <hanno@gentoo.org> +files/openhbci_gcc34.gz,
+  +openhbci-0.9.16.ebuild:
+  Version bump and gcc 3.4 fix.
+
+  07 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> openhbci-0.9.14.ebuild:
+  Stable on alpha.
+
+  11 Apr 2004; Jason Wever <weeve@gentoo.org> openhbci-0.9.14.ebuild:
+  Added ~sparc keyword.
+
+  04 Mar 2004; David Holm <dholm@gentoo.org> openhbci-0.9.14.ebuild:
+  Added to ~ppc.
+
+  10 Feb 2004; Hanno Boeck <hanno@gentoo.org> openhbci-0.9.14.ebuild:
+  Marked stable x86.
+
+*openhbci-0.9.14 (14 Jan 2004)
+
+  14 Jan 2004; Hanno Boeck <hanno@gentoo.org> openhbci-0.9.14.ebuild:
+  Version bump.
+
+  09 Jan 2004; Aron Griffis <agriffis@gentoo.org> openhbci-0.9.13.ebuild:
+  stable on alpha
+
+*openhbci-0.9.13 (28 Aug 2003)
+
+  28 Aug 2003; Hanno Boeck <hanno@gentoo.org> openhbci-0.9.13.ebuild:
+  Version bump.
+
+*openhbci-0.9.12 (08 Jul 2003)
+
+  08 Jul 2003; Hanno Boeck <hanno@gentoo.org> metadata.xml,
+  openhbci-0.9.12.ebuild:
+  Version bump.
+
+*openhbci-0.9.11 (11 Jun 2003)
+
+  11 Jun 2003; Hanno Boeck <hanno@gentoo.org> openhbci-0.9.11.ebuild:
+  Version bump, ebuild from Sebastien Champigny (see bug #22313).
+
+*openhbci-0.9.9-r1 (03 Jun 2003)
+
+  03 Jun 2003; Alastair Tse <liquidx@gentoo.org> openhbci-0.9.9-r1.ebuild,
+  files/openhbci-0.9.9-rsa.patch:
+  added added patch to fix crashes with openssl 0.9.6h. thanks to Andreas Grüner
+  <andreas.gruener@tiscali.de> (#21294)
 
 *openhbci-0.9.9 (28 Apr 2003)
 
+  29 Apr 2003; Alastair Tse <liquidx@gentoo.org> openhbci-0.9.9.ebuild:
+  added chipcard support
+
   28 Apr 2003; Alastair Tse <liquidx@gentoo.org> openhbci-0.9.9.ebuild:
   initial ebuild commit. gnucash likes this one.
 
diff --git a/net-libs/openhbci/Manifest b/net-libs/openhbci/Manifest
index ed61f1e27925..e820fd198d5c 100644
--- a/net-libs/openhbci/Manifest
+++ b/net-libs/openhbci/Manifest
@@ -1,3 +1,9 @@
-MD5 267679cbdb6f635aa545c57ba470ff06 openhbci-0.9.9.ebuild 538
-MD5 a77ec516b56277f723b951be45ceab6a ChangeLog 370
-MD5 67fa7d943ed9c7c7e3282e8421d53530 files/digest-openhbci-0.9.9 66
+MD5 e9ac2d8cdf3d1078a36273bf5e6f00a7 openhbci-0.9.17.ebuild 786
+MD5 4c1c1e710ea77d8d7db9906084c4228d metadata.xml 215
+MD5 35c76fed47f1731afd8b55fd9df38df1 ChangeLog 2921
+MD5 be91d97a927ff8e95311da2b820631df openhbci-0.9.17-r1.ebuild 862
+MD5 6c2137a3fc42ee45ef6b1b9b58be1503 openhbci-0.9.16.ebuild 817
+MD5 cc6b8a2880519c38fe6d71e2aa796def files/digest-openhbci-0.9.17 67
+MD5 e3f327c9b6672bdf75575aed1d6326a1 files/digest-openhbci-0.9.16 67
+MD5 cc6b8a2880519c38fe6d71e2aa796def files/digest-openhbci-0.9.17-r1 67
+MD5 5f290d906a9ad365e70e6eedd850db85 files/openhbci_gcc34.gz 315
diff --git a/net-libs/openhbci/metadata.xml b/net-libs/openhbci/metadata.xml
index da6fd63d0085..3540eeda5716 100644
--- a/net-libs/openhbci/metadata.xml
+++ b/net-libs/openhbci/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
+<maintainer><email>hanno@gentoo.org</email></maintainer>
 </pkgmetadata>
diff --git a/net-libs/openhbci/openhbci-0.9.16.ebuild b/net-libs/openhbci/openhbci-0.9.16.ebuild
index f20586b65a7c..8dcf8fea5788 100644
--- a/net-libs/openhbci/openhbci-0.9.16.ebuild
+++ b/net-libs/openhbci/openhbci-0.9.16.ebuild
@@ -1,6 +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-libs/openhbci/openhbci-0.9.16.ebuild,v 1.1 2004/06/24 18:22:43 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openhbci/openhbci-0.9.16.ebuild,v 1.1.1.1 2005/11/30 10:02:47 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="Implementation of the HBCI protocol used by some banks"
 HOMEPAGE="http://openhbci.sourceforge.net/"
@@ -8,7 +10,7 @@ SRC_URI="mirror://sourceforge/openhbci/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~ppc ~sparc"
+KEYWORDS="x86 alpha ppc sparc ~amd64"
 IUSE=""
 
 DEPEND=">=dev-libs/openssl-0.9.6
diff --git a/net-libs/openhbci/openhbci-0.9.17-r1.ebuild b/net-libs/openhbci/openhbci-0.9.17-r1.ebuild
index bafbdc6833c8..626457cb8fd2 100644
--- a/net-libs/openhbci/openhbci-0.9.17-r1.ebuild
+++ b/net-libs/openhbci/openhbci-0.9.17-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-libs/openhbci/openhbci-0.9.17-r1.ebuild,v 1.1 2005/03/08 00:33:57 jnc Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openhbci/openhbci-0.9.17-r1.ebuild,v 1.1.1.1 2005/11/30 10:02:48 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/openhbci/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="x86 ~alpha ~ppc sparc ~amd64"
+KEYWORDS="x86 ~alpha ppc sparc ~amd64"
 IUSE=""
 
 DEPEND=">=dev-libs/openssl-0.9.6"
diff --git a/net-libs/openhbci/openhbci-0.9.17.ebuild b/net-libs/openhbci/openhbci-0.9.17.ebuild
index 3b4290dbe590..9c3dca03b186 100644
--- a/net-libs/openhbci/openhbci-0.9.17.ebuild
+++ b/net-libs/openhbci/openhbci-0.9.17.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-libs/openhbci/openhbci-0.9.17.ebuild,v 1.1 2005/01/10 19:25:46 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openhbci/openhbci-0.9.17.ebuild,v 1.1.1.1 2005/11/30 10:02:47 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/openhbci/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~ppc ~sparc ~amd64"
+KEYWORDS="x86 ~alpha ~ppc sparc ~amd64"
 IUSE=""
 
 DEPEND=">=dev-libs/openssl-0.9.6"
diff --git a/net-libs/openslp/ChangeLog b/net-libs/openslp/ChangeLog
index 2d71a0d5ee68..a1be92803611 100644
--- a/net-libs/openslp/ChangeLog
+++ b/net-libs/openslp/ChangeLog
@@ -1,11 +1,111 @@
 # ChangeLog for net-libs/openslp
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-libs/openslp/ChangeLog,v 1.1 2002/02/01 21:53:34 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openslp/ChangeLog,v 1.1.1.1 2005/11/30 10:03:02 chriswhite Exp $
+
+  02 Oct 2005; MATSUU Takuto <matsuu@gentoo.org> openslp-1.2.1.ebuild:
+  Stable on sh.
+
+  26 Jun 2005; Rene Nussbaumer <killerfox@gentoo.org> openslp-1.2.1.ebuild:
+  Stable on hppa. bug #85347
+
+  01 Apr 2005; Aron Griffis <agriffis@gentoo.org> openslp-1.2.1.ebuild:
+  stable on ia64
+
+  20 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> openslp-1.2.1.ebuild:
+  stable on amd64 wrt #85347
+
+  18 Mar 2005; Alastair Tse <liquidx@gentoo.org> openslp-1.0.11.ebuild,
+  openslp-1.2.1.ebuild:
+  removing tests
+
+  18 Mar 2005; Danny van Dyk <kugelfang@gentoo.org> openslp-1.0.11.ebuild,
+  openslp-1.0.9a.ebuild, openslp-1.2.1.ebuild:
+  Marked -amd64 as they don't pass make check. Additionally package.mask'ed on
+  amd64 and slp USE flag masked as well wrt Security BUG #85347
+
+  17 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> openslp-1.2.1.ebuild:
+  Stable on sparc wrt #85347
+
+  17 Mar 2005; Hardave Riar <hardave@gentoo.org> openslp-1.2.1.ebuild:
+  Stable on mips, bug #85347.
+
+  16 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> openslp-1.2.1.ebuild:
+  Stable on alpha, bug 85347.
+
+  16 Mar 2005; Markus Rothe <corsair@gentoo.org> openslp-1.2.1.ebuild:
+  Stable on ppc64; bug #85347
+
+  16 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> openslp-1.2.1.ebuild:
+  Stable on ppc.
+
+*openslp-1.2.1 (16 Mar 2005)
+
+  16 Mar 2005; Alastair Tse <liquidx@gentoo.org> +openslp-1.2.1.ebuild:
+  version bump. security vunerability fix (SUSE-SA:2005:015) (#85347)
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  openslp-1.0.11.ebuild, openslp-1.0.9a.ebuild:
+  virtual/glibc -> virtual/libc
+
+  12 Jun 2004; Tom Gall <tgall@gentoo.org> openslp-1.0.11.ebuild:
+  stable on ppc64 bug #53766
+
+  11 May 2004; Michael McCabe <randy@gentoo.org> openslp-1.0.11.ebuild:
+  Added s390 keywords
+
+  21 Mar 2004; Joshua Kinard <kumba@gentoo.org> openslp-1.0.11.ebuild,
+  openslp-1.0.9a.ebuild:
+  Marked stable on mips.
+
+  27 Feb 2004; Joshua Kinard <kumba@gentoo.org> openslp-1.0.11.ebuild:
+  Added ~mips to KEYWORDS to satisfy repoman deps.
+
+  28 Jan 2004; Aron Griffis <agriffis@gentoo.org> openslp-1.0.11.ebuild:
+  stable on alpha
+
+  26 Jan 2004; <gustavoz@gentoo.org> openslp-1.0.11.ebuild:
+  stable on sparc
+
+  23 Sep 2003; Bartosch Pixa <darkspecter@gentoo.org> openslp-1.0.11.ebuild:
+  set ppc in keywords
+
+  03 Jul 2003; Nick Hadaway <raker@gentoo.org> openslp-1.0.11.ebuild:
+  Marked stable for x86
+
+*openslp-1.0.11 (26 Mar 2003)
+
+  25 Jul 2003; Guy Martin <gmsoft@gentoo.org> openslp-1.0.11.ebuild :
+  Marked stable on hppa.
+
+  26 Mar 2003; Alastair Tse <liquidx@gentoo.org> openslp-1.0.11.ebuild:
+  version bumpage
+
+  19 Mar 2003; Guy Martin <gmsoft@gentoo.org> openslp-1.0.9a.ebuild :
+  Added hppa to keywords.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*openslp-1.0.9a (2 Nov 2002) 
+
+  02 Nov 2003; Bart Verwilst <verwilst@gentoo.org>
+
+  New version, + fixed license
+
+*openslp-1.0.8a (27 Apr 2002)
+
+  25 Oct 2002; Donny Davies <woodchip@gentoo.org> slpd-init :
+  Created an initscript; as requested in #9256.
+
+  19 Oct 2002; Calum Selkirk <cselkirk@gentoo.org> openslp-1.0.8a.ebuild :
+  Added ppc to KEYWORDS.
+
+  27 Apr 2002; Seemant Kulleen <seemant@gentoo.org> openslp-1.0.8a.ebuild
+  files/digest-openslp-1.0.8a :
+  Thanks to lotia@umich.edu (ali asad lotia) in bug #1508 for the version bump.
 
 *openslp-1.0.4 (1 Feb 2002)
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
+  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-libs/openslp/Manifest b/net-libs/openslp/Manifest
index e69de29bb2d1..764772433388 100644
--- a/net-libs/openslp/Manifest
+++ b/net-libs/openslp/Manifest
@@ -0,0 +1,9 @@
+MD5 03336769f6b7c61f397b7bda8a68cf3a openslp-1.2.1.ebuild 939
+MD5 fb07378e184212e79f4c4008b0e69239 openslp-1.0.11.ebuild 855
+MD5 16d4985dc3bbc616a5d8c0f08d9878fa openslp-1.0.9a.ebuild 705
+MD5 077a4c10c7fa821820e9f9612e0a2ab4 ChangeLog 3998
+MD5 d7f79cffa0ae6dc390e87781e51f4248 metadata.xml 220
+MD5 97a5b3202b42cbb36942b17299b2701d files/digest-openslp-1.2.1 65
+MD5 f87ab978aa65541b72c9aef6e1e5677e files/slpd-init 2294
+MD5 570fc57cfed48b272c0d000a21927d26 files/digest-openslp-1.0.11 66
+MD5 67fd195194d45cffe4a08f4d0d0c5c2f files/digest-openslp-1.0.9a 66
diff --git a/net-libs/openslp/files/slpd-init b/net-libs/openslp/files/slpd-init
index fe07b62707fa..ad035cd12054 100644
--- a/net-libs/openslp/files/slpd-init
+++ b/net-libs/openslp/files/slpd-init
@@ -1,7 +1,7 @@
 #!/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-libs/openslp/files/slpd-init,v 1.1 2002/10/25 15:24:52 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openslp/files/slpd-init,v 1.1.1.1 2005/11/30 10:03:02 chriswhite Exp $
 
 depend() {
 	need net
diff --git a/net-libs/openslp/openslp-1.0.11.ebuild b/net-libs/openslp/openslp-1.0.11.ebuild
index 0e7b51cc9711..914034c5b900 100644
--- a/net-libs/openslp/openslp-1.0.11.ebuild
+++ b/net-libs/openslp/openslp-1.0.11.ebuild
@@ -1,19 +1,25 @@
-# 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-libs/openslp/openslp-1.0.11.ebuild,v 1.1 2003/03/26 22:02:54 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openslp/openslp-1.0.11.ebuild,v 1.1.1.1 2005/11/30 10:03:02 chriswhite Exp $
 
-IUSE=""
+inherit gnuconfig
 
 DESCRIPTION="An open-source implementation of Service Location Protocol"
-HOMEPAGE="http://www.openslp.org"
+HOMEPAGE="http://www.openslp.org/"
 SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
 
-KEYWORDS="~x86 ~sparc ~ppc ~hppa"
-DEPEND="virtual/glibc"
-SLOT="0"
 LICENSE="BSD"
+SLOT="0"
+KEYWORDS="x86 ppc sparc mips alpha arm hppa -amd64 ia64 s390 ppc64"
+IUSE=""
 
+DEPEND="virtual/libc"
 
+src_unpack() {
+	unpack ${A}
+	# needed at least by alpha and amd64
+	gnuconfig_update
+}
 
 src_compile() {
 	econf || die
@@ -22,9 +28,13 @@ src_compile() {
 
 src_install() {
 	einstall || die
-	dodoc AUTHORS FAQ COPYING ChangeLog NEWS README* THANKS
+	dodoc AUTHORS FAQ ChangeLog NEWS README* THANKS
 	rm -rf ${D}/usr/doc
 	dohtml -r .
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/slpd-init slpd
 }
+
+src_test() {
+	return
+}
+\ No newline at end of file
diff --git a/net-libs/openslp/openslp-1.0.9a.ebuild b/net-libs/openslp/openslp-1.0.9a.ebuild
index 9d79c4890f5d..2fa712a20cd6 100644
--- a/net-libs/openslp/openslp-1.0.9a.ebuild
+++ b/net-libs/openslp/openslp-1.0.9a.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2002 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-libs/openslp/openslp-1.0.9a.ebuild,v 1.1 2002/11/02 13:13:45 verwilst Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openslp/openslp-1.0.9a.ebuild,v 1.1.1.1 2005/11/30 10:03:02 chriswhite Exp $
 
 DESCRIPTION="An open-source implementation of Service Location Protocol"
 HOMEPAGE="http://www.openslp.org"
 
-S=${WORKDIR}/${P}
 SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
 
-KEYWORDS="x86 sparc sparc64 ppc"
-DEPEND="virtual/glibc"
+KEYWORDS="x86 sparc ppc hppa -amd64"
+IUSE=""
+DEPEND="virtual/libc"
 
 SLOT="0"
 LICENSE="BSD"
diff --git a/net-libs/openslp/openslp-1.2.1.ebuild b/net-libs/openslp/openslp-1.2.1.ebuild
index 39c26370a475..e0306505be32 100644
--- a/net-libs/openslp/openslp-1.2.1.ebuild
+++ b/net-libs/openslp/openslp-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-libs/openslp/openslp-1.2.1.ebuild,v 1.1 2005/03/16 09:38:10 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openslp/openslp-1.2.1.ebuild,v 1.1.1.1 2005/11/30 10:03:02 chriswhite Exp $
 
 inherit gnuconfig
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 DEPEND="virtual/libc"
@@ -36,3 +36,7 @@ src_install() {
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/slpd-init slpd
 }
+
+src_test() {
+	return
+}
diff --git a/net-libs/ortp/ChangeLog b/net-libs/ortp/ChangeLog
index c6dc8fc147d7..003f093e970f 100644
--- a/net-libs/ortp/ChangeLog
+++ b/net-libs/ortp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/ortp
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ortp/ChangeLog,v 1.1 2005/03/21 01:00:11 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ortp/ChangeLog,v 1.1.1.1 2005/11/30 10:03:02 chriswhite Exp $
+
+*ortp-0.7.1 (12 Nov 2005)
+
+  12 Nov 2005; Daniel Black <dragonheart@gentoo.org> +ortp-0.7.1.ebuild:
+  version bump for lu_zero
 
 *ortp-0.7.0 (21 Mar 2005)
 
diff --git a/net-libs/ortp/Manifest b/net-libs/ortp/Manifest
index 3ddfe2bba7fe..0d3e1ce68a5e 100644
--- a/net-libs/ortp/Manifest
+++ b/net-libs/ortp/Manifest
@@ -1,4 +1,16 @@
-MD5 de41c503f05f5f99a8635b0e333729a5 metadata.xml 217
-MD5 1cf596fbe20d24944893777eb2694e30 ortp-0.7.0.ebuild 726
-MD5 6875e910ab527d9c0a3faf82d497639a ChangeLog 329
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6c23f3a57eacf536a0c41f1190a51b3e ChangeLog 464
 MD5 660a63e2becad860ad090f3dee173513 files/digest-ortp-0.7.0 62
+MD5 958c5d320e01aa49dce21c884ee6378f files/digest-ortp-0.7.1 62
+MD5 de41c503f05f5f99a8635b0e333729a5 metadata.xml 217
+MD5 63a252b926ec94685fb0afeaf3cd20e5 ortp-0.7.0.ebuild 630
+MD5 12b144fc11d0aa774c465b4bef9445ac ortp-0.7.1.ebuild 777
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDdXFFmdTrptrqvGERAqiJAKCX1iWvwAnEGj0GDM9TYtiqsrYeYQCdES8G
+0bRdW3ln6YWnYt9R1Fwy8lQ=
+=kjni
+-----END PGP SIGNATURE-----
diff --git a/net-libs/ortp/ortp-0.7.0.ebuild b/net-libs/ortp/ortp-0.7.0.ebuild
index 9128af9e53c3..65e12b60e801 100644
--- a/net-libs/ortp/ortp-0.7.0.ebuild
+++ b/net-libs/ortp/ortp-0.7.0.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ortp/ortp-0.7.0.ebuild,v 1.1 2005/03/21 01:00:11 stkn Exp $
-
-IUSE=""
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ortp/ortp-0.7.0.ebuild,v 1.1.1.1 2005/11/30 10:03:02 chriswhite Exp $
 
 inherit eutils
 
@@ -10,19 +8,13 @@ DESCRIPTION="Open Real-time Transport Protocol (RTP) stack"
 HOMEPAGE="http://www.linphone.org/ortp/"
 SRC_URI="http://www.linphone.org/ortp/sources/${P}.tar.gz"
 
-S=${WORKDIR}/${P}
-
+IUSE=""
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~amd64"
 
 DEPEND=">=dev-libs/glib-2.0.0"
 
-src_compile() {
-	econf || die "Configure failed"
-	emake || die "Make failed"
-}
-
 src_install() {
 	emake DESTDIR=${D} install || die "Make install failed"
 
diff --git a/net-libs/ortp/ortp-0.7.1.ebuild b/net-libs/ortp/ortp-0.7.1.ebuild
index e62565588159..e9bcf0fa5e6a 100644
--- a/net-libs/ortp/ortp-0.7.1.ebuild
+++ b/net-libs/ortp/ortp-0.7.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-libs/ortp/ortp-0.7.1.ebuild,v 1.1 2005/11/12 04:36:03 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ortp/ortp-0.7.1.ebuild,v 1.1.1.1 2005/11/30 10:03:02 chriswhite Exp $
 
 DESCRIPTION="Open Real-time Transport Protocol (RTP) stack"
 HOMEPAGE="http://www.linphone.org/ortp/"
diff --git a/net-libs/osptoolkit/ChangeLog b/net-libs/osptoolkit/ChangeLog
index d589f8da3b32..898240d25cbc 100644
--- a/net-libs/osptoolkit/ChangeLog
+++ b/net-libs/osptoolkit/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-libs/osptoolkit
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/osptoolkit/ChangeLog,v 1.1 2005/08/19 19:29:22 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/osptoolkit/ChangeLog,v 1.1.1.1 2005/11/30 10:02:54 chriswhite Exp $
+
+  28 Aug 2005; Stefan Knoblich <stkn@gentoo.org> osptoolkit-3.3.1.ebuild:
+  Added multilib support for amd64.
 
 *osptoolkit-3.3.1 (19 Aug 2005)
 
diff --git a/net-libs/osptoolkit/Manifest b/net-libs/osptoolkit/Manifest
index de4be1e00e23..5d8a9a201c33 100644
--- a/net-libs/osptoolkit/Manifest
+++ b/net-libs/osptoolkit/Manifest
@@ -1,2 +1,4 @@
-MD5 47583e5b1384563e0420ca86f199f596 osptoolkit-3.3.1.ebuild 1206
+MD5 138e65c1c5a4271d2732a841525b0149 osptoolkit-3.3.1.ebuild 1470
+MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248
+MD5 66554f0f4bfa5c050d3eb480a826e218 ChangeLog 482
 MD5 0e71c85746f397e8f45ea39c28533814 files/digest-osptoolkit-3.3.1 68
diff --git a/net-libs/osptoolkit/osptoolkit-3.3.1.ebuild b/net-libs/osptoolkit/osptoolkit-3.3.1.ebuild
index 2a95d147d3ce..98723c67a8a9 100644
--- a/net-libs/osptoolkit/osptoolkit-3.3.1.ebuild
+++ b/net-libs/osptoolkit/osptoolkit-3.3.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-libs/osptoolkit/osptoolkit-3.3.1.ebuild,v 1.1 2005/08/19 19:29:22 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/osptoolkit/osptoolkit-3.3.1.ebuild,v 1.1.1.1 2005/11/30 10:02:54 chriswhite Exp $
 
 DESCRIPTION="OSP (Open Settlement Protocol) library"
 HOMEPAGE="http://www.transnexus.com/"
@@ -17,6 +17,14 @@ DEPEND="virtual/libc
 
 S=${WORKDIR}/TK-${PV//./_}-20041213_B
 
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	sed -i -e "s:\$(INSTALL_PATH)/lib:\$(INSTALL_PATH)/\$(LIBDIR):" \
+		src/Makefile
+}
+
 src_compile() {
 	cd ${S}/src
 	emake build || die "emake libosp failed"
@@ -29,10 +37,11 @@ src_compile() {
 }
 
 src_install() {
-	dodir /usr/{lib,include}
+	dodir /usr/include /usr/$(get_libdir)
 
 	cd ${S}/src
-	make INSTALL_PATH=${D}/usr install || die "make install failed"
+	make INSTALL_PATH=${D}/usr LIBDIR=$(get_libdir) \
+		install || die "make install failed"
 
 	sed -i  -e "s:^\(OPENSSL_CONF\).*:\1=/etc/ssl/openssl.cnf:" \
 		-e "s:^\(RANDFILE\).*:\1=/etc/ssl/.rnd:" \
diff --git a/net-libs/roadrunner/ChangeLog b/net-libs/roadrunner/ChangeLog
index aa99d04c988e..8b81f625cf7a 100644
--- a/net-libs/roadrunner/ChangeLog
+++ b/net-libs/roadrunner/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-libs/roadrunner
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/roadrunner/ChangeLog,v 1.1 2004/05/07 00:55:52 dragonheart Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/roadrunner/ChangeLog,v 1.1.1.1 2005/11/30 10:02:59 chriswhite Exp $
+
+  07 Oct 2005; Daniel Black <dragonheart@gentoo.org>
+  roadrunner-0.9.1.ebuild:
+  ppc stable and QA fixes
+
+  24 Jun 2004; David Holm <dholm@gentoo.org> roadrunner-0.9.1.ebuild:
+  Added to ~ppc.
+
+  15 Jun 2004; Daniel Black <dragonheart@gentoo.org> roadrunner-0.9.1.ebuild:
+  x86 stable. Downgraded gtk-doc version dependancy. Replaced einstall with
+  emake DESTDIR=${D}
 
 *roadrunner-0.9.1 (07 May 2004)
 
diff --git a/net-libs/roadrunner/Manifest b/net-libs/roadrunner/Manifest
index 0be1b088fa6e..f627af3f61f4 100644
--- a/net-libs/roadrunner/Manifest
+++ b/net-libs/roadrunner/Manifest
@@ -1,2 +1,14 @@
-MD5 1516a74f1d2134f273a9dc83dce3b8b8 roadrunner-0.9.1.ebuild 1081
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 834d52378377f2ccbf8fbc49326abf21 ChangeLog 790
 MD5 82f78ec5979c1e96787a6983052132dc files/digest-roadrunner-0.9.1 68
+MD5 6d796b061ed1c1337ef157a5f74dab35 metadata.xml 403
+MD5 3d4eb029049e13cc6782d8765b941909 roadrunner-0.9.1.ebuild 1027
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDRjZUmdTrptrqvGERAt0nAJ0R90c2hHeMN5KEeSnmw731zu8NLQCeKtml
+arXMH9MXU61eZM1MvSkF9B0=
+=FzNY
+-----END PGP SIGNATURE-----
diff --git a/net-libs/roadrunner/roadrunner-0.9.1.ebuild b/net-libs/roadrunner/roadrunner-0.9.1.ebuild
index 2c8462409ab4..3639feef3793 100644
--- a/net-libs/roadrunner/roadrunner-0.9.1.ebuild
+++ b/net-libs/roadrunner/roadrunner-0.9.1.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-libs/roadrunner/roadrunner-0.9.1.ebuild,v 1.1 2004/05/07 00:55:52 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/roadrunner/roadrunner-0.9.1.ebuild,v 1.1.1.1 2005/11/30 10:02:59 chriswhite Exp $
 
 
 # EBuild details
@@ -9,34 +9,25 @@ HOMEPAGE="http://rr.codefactory.se"
 SRC_URI="ftp://ftp.codefactory.se/pub/RoadRunner/source/roadrunner/roadrunner-${PV}.tar.gz"
 LICENSE="Roadrunner"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc"
 
 # static	= also build a static library
 # doc		= include documentation
-# debug		= include debug and debug-net
-IUSE="static doc debug"
-
-use debug && RESTRICT="${RESTRICT} nostrip"
+IUSE="static doc"
 
 RDEPEND=">=dev-libs/glib-2.2.1
 	>=dev-libs/libxml2-2.5.11"
 
-# During build we also need pkgconfig and possibly gtk-doc
-DEPEND=">=sys-devel/automake-1.4
-	sys-devel/libtool
-	sys-devel/gcc
-	sys-apps/sed
+DEPEND="sys-apps/sed
 	>=dev-libs/glib-2.2.1
 	>=dev-libs/libxml2-2.5.11
 	>=dev-util/pkgconfig-0.15.0
-	doc? ( >=dev-util/gtk-doc-1.2 )"
+	doc? ( dev-util/gtk-doc )"
 
 src_compile() {
 	econf \
-		`use_enable static` \
-		`use_enable debug` \
-		`use_enable debug debug-net` \
-		`use_enable doc gtk-doc` \
+		$(use_enable static) \
+		$(use_enable doc gtk-doc) \
 		|| die "configure failed"
 
 	emake || die "emake failed"
@@ -44,6 +35,6 @@ src_compile() {
 
 src_install() {
 	# Seems that the Makefiles are OK
-	einstall || die
+	emake DESTDIR=${D} install || die
 }
 
diff --git a/net-libs/rpc2/ChangeLog b/net-libs/rpc2/ChangeLog
index 7f0603f1d3f7..3aa4b07a4440 100644
--- a/net-libs/rpc2/ChangeLog
+++ b/net-libs/rpc2/ChangeLog
@@ -1,7 +1,88 @@
 # ChangeLog for net-libs/rpc2
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/rpc2/ChangeLog,v 1.1 2002/07/23 21:51:59 lostlogic Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rpc2/ChangeLog,v 1.1.1.1 2005/11/30 10:02:52 chriswhite Exp $
 
+  17 Oct 2005; Maurice van der Pot <griffon26@gentoo.org> -rpc2-1.25.ebuild:
+  Removed old version.
+
+*rpc2-1.28 (23 Sep 2005)
+
+  23 Sep 2005; Maurice van der Pot <griffon26@gentoo.org> +rpc2-1.28.ebuild:
+  Added rpc2 1.28 for new coda release 6.0.12
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> rpc2-1.27.ebuild:
+  Mark 1.27 stable on alpha
+
+  24 Aug 2005; Aron Griffis <agriffis@gentoo.org> rpc2-1.27.ebuild:
+  stable on ia64
+
+  07 Jul 2005; Maurice van der Pot <griffon26@gentoo.org> rpc2-1.27.ebuild:
+  Marked stable on x86
+
+  08 Jun 2005; Maurice van der Pot <griffon26@gentoo.org> -rpc2-1.13.ebuild,
+  -rpc2-1.19.ebuild, -rpc2-1.20.ebuild, -rpc2-1.22.ebuild,
+  -rpc2-1.23.ebuild, rpc2-1.25.ebuild, rpc2-1.27.ebuild:
+  Removed old versions. Adapted to changed location of source package.
+
+*rpc2-1.27 (05 May 2005)
+
+  05 May 2005; Maurice van der Pot <griffon26@gentoo.org> +rpc2-1.27.ebuild:
+  Added new release.
+
+  05 Feb 2005; Maurice van der Pot <griffon26@gentoo.org> rpc2-1.25.ebuild:
+  Stable on x86
+
+*rpc2-1.25 (22 Dec 2004)
+
+  22 Dec 2004; Maurice van der Pot <griffon26@gentoo.org> rpc2-1.23.ebuild,
+  +rpc2-1.25.ebuild:
+  Marked rpc2-1.23 stable on x86
+  Added new version rpc2-1.25
+
+*rpc2-1.23 (23 Oct 2004)
+
+  23 Oct 2004; Maurice van der Pot <griffon26@gentoo.org> rpc2-1.22.ebuild,
+  +rpc2-1.23.ebuild:
+  Version bump for new coda release
+  Marked rpc2-1.22 stable on x86
+
+  12 Aug 2004; Maurice van der Pot <griffon26@gentoo.org> metadata.xml:
+  Took over maintenance from Daniel Black <dragonheart@gentoo.org>
+
+  16 Jul 2004; Daniel Black <dragonheart@gentoo.org> rpc2-1.22.ebuild:
+  lwp added to dependancies as per bug #53561. Thanks to Peter Jensen
+  <gentoo-bugs@pekaje.homeip.netre-vax> and <re-vax@wanadoo.fr>.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> rpc2-1.13.ebuild,
+  rpc2-1.19.ebuild, rpc2-1.20.ebuild, rpc2-1.22.ebuild:
+  virtual/glibc -> virtual/libc
+
+*rpc2-1.22 (12 May 2004)
+
+  12 May 2004; Daniel Black <dragonheart@gentoo.org> +metadata.xml,
+  rpc2-1.19.ebuild, rpc2-1.20.ebuild, +rpc2-1.22.ebuild:
+  Version bump. Thanks to Sebastian Dröge <sebastian.droege@gmx.de> in bug
+  #50632. Maintainer changed to me/net-fs.
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> rpc2-1.13.ebuild:
+  Add die following econf for bug 48950
+
+  26 Dec 2003; Jason Wever <weeve@gentoo.org> rpc2-1.13.ebuild:
+  Changed sparc keyword to ~sparc since lwp dependency needed ~sparc keywording.
+
+*rpc2-1.20 (20 Nov 2003)
+
+  20 Nov 2003; Seemant Kulleen <seemant@gentoo.org> rpc2-1.20.ebuild:
+  version bump thanks to Michael C. Ferguson <mcf@augustmail.com> in bug #26132
+
+*rpc2-1.19 (15 Nov 2003)
+
+  15 Nov 2003; Seemant Kulleen <seemant@gentoo.org> rpc2-1.19.ebuild:
+  version bump, as part of coda's version bump to v6, thanks to Michael C.
+  Ferguson <mcf@augustmail.com> in bug #26132
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *rpc2-1.13 (30 Jun 2002)
 
   30 Jun 2002; Greg Briggs <gb006k@mail.rochester.edu> rpc2-1.13.ebuild: Created
diff --git a/net-libs/rpc2/Manifest b/net-libs/rpc2/Manifest
index e69de29bb2d1..fa24307f01e4 100644
--- a/net-libs/rpc2/Manifest
+++ b/net-libs/rpc2/Manifest
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9a5242459ce1751d7870023e38d692b0 ChangeLog 3247
+MD5 d76f83c7ea459ced23c70f97e5d8dc3f files/digest-rpc2-1.27 61
+MD5 7f397cf4cdb57ccdc37cd991c3e22aa4 files/digest-rpc2-1.28 61
+MD5 fdd307ea78fc900a01e57b8151f34d4e metadata.xml 224
+MD5 53eaae10ba9f0a9804d5cab6c48fd23f rpc2-1.27.ebuild 693
+MD5 abaded235389d3007e90a10f79eca90b rpc2-1.28.ebuild 697
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDU/luMGnpIbeahxwRAkjVAJ0VziEDKh6gOg1DmzuJmxDsdcSBGgCgnkSR
+xSJr3u33mwn1TISmY5gGKuk=
+=zUWk
+-----END PGP SIGNATURE-----
diff --git a/net-libs/rpc2/metadata.xml b/net-libs/rpc2/metadata.xml
index c5c06c03d10c..e55bab8edce3 100644
--- a/net-libs/rpc2/metadata.xml
+++ b/net-libs/rpc2/metadata.xml
@@ -3,11 +3,6 @@
 <pkgmetadata>
 <herd>net-fs</herd>
 <maintainer>
-  <email>dragonheart@gentoo.org</email>
-  <description>Maintaining until net-fs gets off its feet</description>
-</maintainer>
-<maintainer>
-  <email>net-fs@gentoo.org</email>
-  <description>Coda is the only package that requires rpc2 as a dependancy</description>
+  <email>griffon26@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/net-libs/rpc2/rpc2-1.27.ebuild b/net-libs/rpc2/rpc2-1.27.ebuild
index 06ed9590d07d..5cad42836099 100644
--- a/net-libs/rpc2/rpc2-1.27.ebuild
+++ b/net-libs/rpc2/rpc2-1.27.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/rpc2/rpc2-1.27.ebuild,v 1.1 2005/05/05 13:19:23 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rpc2/rpc2-1.27.ebuild,v 1.1.1.1 2005/11/30 10:02:52 chriswhite Exp $
 
 DESCRIPTION="Remote procedure call package for IP/UDP (used by Coda)"
 HOMEPAGE="http://www.coda.cs.cmu.edu/"
-SRC_URI="ftp://ftp.coda.cs.cmu.edu/pub/rpc2/src/${P}.tar.gz"
+SRC_URI="http://www.coda.cs.cmu.edu/pub/rpc2/src/${P}.tar.gz"
 IUSE=""
 SLOT="1"
 LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~amd64 ~ia64"
+KEYWORDS="alpha ~amd64 ~hppa ia64 ~mips ~ppc ~sparc x86"
 
-RDEPEND="virtual/libc
-	>=sys-libs/lwp-2.0"
+RDEPEND=">=sys-libs/lwp-2.0"
 
 DEPEND="${RDEPEND}
 	sys-apps/gawk
diff --git a/net-libs/rpc2/rpc2-1.28.ebuild b/net-libs/rpc2/rpc2-1.28.ebuild
index 85eac5c1a447..71e22648448b 100644
--- a/net-libs/rpc2/rpc2-1.28.ebuild
+++ b/net-libs/rpc2/rpc2-1.28.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-libs/rpc2/rpc2-1.28.ebuild,v 1.1 2005/09/25 14:10:45 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rpc2/rpc2-1.28.ebuild,v 1.1.1.1 2005/11/30 10:02:52 chriswhite Exp $
 
 DESCRIPTION="Remote procedure call package for IP/UDP (used by Coda)"
 HOMEPAGE="http://www.coda.cs.cmu.edu/"
diff --git a/net-libs/socket++/ChangeLog b/net-libs/socket++/ChangeLog
index 3db794c16757..ca6b9f654742 100644
--- a/net-libs/socket++/ChangeLog
+++ b/net-libs/socket++/ChangeLog
@@ -1,6 +1,38 @@
 # ChangeLog for net-libs/socket++
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/socket++/ChangeLog,v 1.1 2004/06/23 22:49:49 swegener Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/socket++/ChangeLog,v 1.1.1.1 2005/11/30 10:02:54 chriswhite Exp $
+
+  19 Sep 2005; Mark Loeser <halcy0n@gentoo.org> metadata.xml:
+  Adding to cpp herd
+
+  07 Apr 2005; Aaron Walker <ka0ttic@gentoo.org> socket++-1.12.12-r1.ebuild:
+  Marked stable on x86.
+
+*socket++-1.12.12-r1 (03 Mar 2005)
+
+  03 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> +files/socket++.pc,
+  +socket++-1.12.12-r1.ebuild:
+  Revision bump; added a pkgconfig script to make it easier to use in your apps.
+
+  17 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> socket++-1.12.12.ebuild:
+  Marked stable on x86.
+
+  10 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> metadata.xml,
+  socket++-1.12.12.ebuild:
+  Added IUSE=doc and install HTML docs if set; updated metadata.
+
+*socket++-1.12.12 (16 Dec 2004)
+
+  16 Dec 2004; Sven Wegener <swegener@gentoo.org>
+  -files/1.12.10-gcc34.patch, -socket++-1.12.10.ebuild,
+  +socket++-1.12.12.ebuild:
+  Version bump.
+
+  16 Dec 2004; Sven Wegener <swegener@gentoo.org> metadata.xml,
+  socket++-1.12.10.ebuild:
+  Added WANT_AUTO* to get the right version of the autotools. Added a gcc-3.4
+  patch. Thanks to AJ Armstrong <aja@gentoo.org> and ville
+  <vzheiska@cs.helsinki.fi>.
 
 *socket++-1.12.10 (23 Jun 2004)
 
diff --git a/net-libs/socket++/Manifest b/net-libs/socket++/Manifest
index acf4ad5df0c4..b4b912a29e10 100644
--- a/net-libs/socket++/Manifest
+++ b/net-libs/socket++/Manifest
@@ -1,3 +1,17 @@
-MD5 caa59ceecc537be02e9d5c140ee158df socket++-1.12.10.ebuild 823
-MD5 da8ad71d7af78376b245850cd5e80457 metadata.xml 485
-MD5 e65d70ec3026971e3da1033b7d747c2f files/digest-socket++-1.12.10 67
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4c0a4f8a6e73f3de6ad4c4740fff3936 ChangeLog 1541
+MD5 b94a6a552b626fdf024d33a0c8e3d133 metadata.xml 434
+MD5 e1c8252305a205ccd49f747d61dc25c8 socket++-1.12.12-r1.ebuild 1492
+MD5 1360d743bb45e1d3b05d37297fd01572 socket++-1.12.12.ebuild 1319
+MD5 de72f99bd9ee929dfc53cbfc508c1c24 files/digest-socket++-1.12.12 67
+MD5 de72f99bd9ee929dfc53cbfc508c1c24 files/digest-socket++-1.12.12-r1 67
+MD5 d496b9852363fe4fa43d5fff5ef994b9 files/socket++.pc 196
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDLz29CRZPokWLroQRArH0AKDbCyMhrAmjqRXbsL+bRDaE6MR2WwCgrXY5
+DslDcd5OF9s2YyF6Vqqe8cU=
+=PJ7b
+-----END PGP SIGNATURE-----
diff --git a/net-libs/socket++/metadata.xml b/net-libs/socket++/metadata.xml
index d151fd6c70ab..dc4251ec746c 100644
--- a/net-libs/socket++/metadata.xml
+++ b/net-libs/socket++/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>no-herd</herd>
+	<herd>cpp</herd>
 	<maintainer>
-		<email>bug-wranglers@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
+		<email>ka0ttic@gentoo.org</email>
+		<name>Aaron Walker</name>
 	</maintainer>
 	<longdescription>Socket++ library defines a family of C++ classes that can be used more effectively than directly calling the underlying low-level system functions.</longdescription>
 </pkgmetadata>
diff --git a/net-libs/socket++/socket++-1.12.12-r1.ebuild b/net-libs/socket++/socket++-1.12.12-r1.ebuild
index 357450de2255..1d28c50835bc 100644
--- a/net-libs/socket++/socket++-1.12.12-r1.ebuild
+++ b/net-libs/socket++/socket++-1.12.12-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-libs/socket++/socket++-1.12.12-r1.ebuild,v 1.1 2005/03/04 00:55:42 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/socket++/socket++-1.12.12-r1.ebuild,v 1.1.1.1 2005/11/30 10:02:54 chriswhite Exp $
 
 DESCRIPTION="C++ Socket Library"
 HOMEPAGE="http://www.linuxhacker.at/socketxx/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.linuxhacker.at/linux/downloads/src/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="debug doc"
 
 DEPEND="sys-devel/automake
diff --git a/net-libs/socket++/socket++-1.12.12.ebuild b/net-libs/socket++/socket++-1.12.12.ebuild
index c6c749db4ddd..b64dcb3b47a7 100644
--- a/net-libs/socket++/socket++-1.12.12.ebuild
+++ b/net-libs/socket++/socket++-1.12.12.ebuild
@@ -1,34 +1,49 @@
-# 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-libs/socket++/socket++-1.12.12.ebuild,v 1.1 2004/12/16 09:30:28 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/socket++/socket++-1.12.12.ebuild,v 1.1.1.1 2005/11/30 10:02:54 chriswhite Exp $
 
 DESCRIPTION="C++ Socket Library"
 HOMEPAGE="http://www.linuxhacker.at/socketxx/"
 SRC_URI="http://www.linuxhacker.at/linux/downloads/src/${P}.tar.gz"
+
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE="debug"
+KEYWORDS="x86"
+IUSE="debug doc"
 
-DEPEND="=sys-devel/automake-1.7*
-	=sys-devel/autoconf-2.59*
+DEPEND="sys-devel/automake
+	sys-devel/autoconf
 	sys-devel/libtool
 	sys-apps/texinfo"
 RDEPEND=""
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	WANT_AUTOMAKE=1.7 WANT_AUTOCONF=2.5  ./autogen || die "./autogen failed"
-}
-
 src_compile() {
+	einfo "Running autogen"
+	WANT_AUTOMAKE=1.7 ./autogen || die "autogen failed"
+
 	econf $(use_enable debug) || die "econf failed"
 	emake || die "emake failed"
+
+	if use doc ; then
+		cd ${S}/doc
+		einfo "Building HTML documentation"
+		# the 'html' target in both ${S}/Makefile and ${S}/doc/Makefile
+		# do indeed exist (and succeed when run manually), but fail when
+		# 'make html' is done here, so we call makeinfo ourselves.
+		makeinfo --html -I . -o html socket++.texi || die "makeinfo failed"
+	fi
+}
+
+src_test() {
+	cd ${S}/test
+	make check || die "make check failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "install failed"
+	make DESTDIR="${D}" install || die "install failed"
 	dodoc AUTHORS ChangeLog NEWS README* THANKS || die "dodoc failed"
+
+	if use doc ; then
+		dohtml doc/html/* || die "dohtml failed"
+	fi
 }
diff --git a/net-libs/soup/ChangeLog b/net-libs/soup/ChangeLog
index 102b728f5bbc..92cbb6079d16 100644
--- a/net-libs/soup/ChangeLog
+++ b/net-libs/soup/ChangeLog
@@ -1,6 +1,67 @@
 # ChangeLog for net-libs/soup
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-libs/soup/ChangeLog,v 1.1 2002/04/12 19:27:06 spider Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/soup/ChangeLog,v 1.1.1.1 2005/11/30 10:02:51 chriswhite Exp $
+
+  17 Apr 2005; foser <foser@gentoo.org> soup-0.7.11.ebuild :
+  Add gcc3 patch (#68047)
+
+  17 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org> soup-0.7.11.ebuild:
+  stable on sparc
+
+  16 May 2003; Lars Weiler <pylon@gentoo.org> soup-0.7.11.ebuild:
+  Set ppc in KEYWORDS
+
+  02 May 2003; Alastair Tse <liquidx@gentoo.org> soup-0.7.11.ebuild:
+  explicitly disable apxs support
+
+  29 Apr 2003; Alastair Tse <liquidx@gentoo.org> soup-0.7.11.ebuild:
+  bump 0.7.11 to stable
+
+*soup-0.7.11 (04 Mar 2003)
+
+  06 Jul 2003; Guy Martin <gmsoft@gentoo.org> soup-0.7.11.ebuild :
+  Added hppa top KEYWORDS.
+
+  04 Mar 2003; Alastair Tse <liquidx@gentoo.org> soup-0.7.11.ebuild files/digest-soup-0.7.11 :
+  version bump. #16816.
+
+  14 Jan 2003; foser <foser@gentoo.org> soup-0.7.10.ebuild soup-0.7.4-r1.ebuild :
+  Fixed libxml dep (#13817)
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+
+*soup-0.7.10 (24 Dec 2002)
+
+  09 Apr 2003; Graham Forest <vladimir@gentoo.org> soup-0.7.10.ebuild:
+  Downgraded to ~ppc
+
+  09 Apr 2003; Graham Forest <vladimir@gentoo.org> soup-0.7.10.ebuild:
+  set ppc in keywords
+
+  21 Mar 2003; Jason Wever <weeve@gentoo.org> soup-0.7.10.ebuild:
+  Changed ~sparc keyword to sparc.
+
+  04 Mar 2003; Alastair Tse <liquidx@gentoo.org> soup-0.7.10.ebuild :
+  marking soup as stable
+
+  24 Dec 2002; Stefan Jones <cretin@gentoo.org> :
+  New version, preempt any bugs in evolution with this.
+  
+*soup-0.7.4-r1 (9 Nov 2002)
+
+  9 Nov 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Change it to compile against libxml1, as evo-1.[12] needs it this way,
+  thanks to ska-fan for this bit.
+
+*soup-0.7.4 (28 Sep 2002)
+
+  20 Oct 2002; Calum Selkirk <cselkirk@gentoo.org> soup-0.5.1-r2.ebuild
+  soup-0.7.4.ebuild :
+
+  Added ppc to KEYWORDS.
+
+  28 Sep 2002; Martin Schlemmer <azarah@gentoo.org> :
+  New version.  Update to use gnome.org eclass.  Libtoolize.
 
 *soup-0.5.1-r2 ( 11 Apr 2002 )
   11 Apr 2002; Spider <spider@gentoo.org>
diff --git a/net-libs/soup/Manifest b/net-libs/soup/Manifest
index 5cc9d8b96308..58bf4497c96a 100644
--- a/net-libs/soup/Manifest
+++ b/net-libs/soup/Manifest
@@ -1,7 +1,5 @@
-MD5 33995f35a1e6de1561bc3e9906092521 ChangeLog 1793
-MD5 950ba25cb5178b4689554d23cad70503 soup-0.7.10.ebuild 1130
-MD5 b3e73defb6365c0ae296ca543e7d1e7f soup-0.7.4-r1.ebuild 1124
-MD5 7327685b6e4a413c111aae7155470a40 soup-0.7.11.ebuild 1130
-MD5 f55a1da1657ca61048fb28258f3a4aef files/digest-soup-0.7.10 126
-MD5 291975cff852179904f6f3d1db52aead files/digest-soup-0.7.4-r1 63
+MD5 8cf5ba51aa3880b56dbc19090dbf87ff ChangeLog 2251
+MD5 da6b448cd03bb7e7e630feb9835cd14e soup-0.7.11.ebuild 1319
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 2c257e92617c67cf1c1ec3e0f49da62c files/soup-0.7.11-gcc3.patch 3051
 MD5 37f9be1ab2386e2eed241a1d0ea33dfd files/digest-soup-0.7.11 64
diff --git a/net-libs/soup/soup-0.7.11.ebuild b/net-libs/soup/soup-0.7.11.ebuild
index 0f4e940fec91..325642991eb0 100644
--- a/net-libs/soup/soup-0.7.11.ebuild
+++ b/net-libs/soup/soup-0.7.11.ebuild
@@ -1,12 +1,9 @@
-# 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-libs/soup/soup-0.7.11.ebuild,v 1.1 2003/03/04 18:35:19 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/soup/soup-0.7.11.ebuild,v 1.1.1.1 2005/11/30 10:02:51 chriswhite Exp $
 
-IUSE="ssl doc"
-
-inherit gnome.org libtool
+inherit gnome.org libtool eutils
 
-S="${WORKDIR}/${P}"
 DESCRIPTION="Soup is a SOAP implementation"
 HOMEPAGE="http://www.gnome.org/"
 
@@ -17,9 +14,21 @@ DEPEND=">=dev-util/pkgconfig-0.12.0
 	ssl? ( dev-libs/openssl )
 	doc? ( >=dev-util/gtk-doc-0.9-r2 )"
 
-LICENSE="GPL-2 | LGPL-2"
+IUSE="ssl doc"
+
+LICENSE="|| ( GPL-2 LGPL-2 )"
 SLOT="0"
-KEYWORDS="~x86 ~sparc  ~ppc ~alpha"
+KEYWORDS="x86 sparc ppc ~alpha hppa"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	# fix gcc bailing (#68047)
+	epatch ${FILESDIR}/${P}-gcc3.patch
+
+}
 
 src_compile() {
 	elibtoolize
@@ -33,12 +42,14 @@ src_compile() {
 		&& myconf="${myconf} --enable-gtk-doc" \
 		|| myconf="${myconf} --disable-gtk-doc"
 
-	# there is a --enable-apache here.....
-
+	# disable apache support. too much trouble than
+	# it is worth. it only works with apache1.
+	export ac_cv_path_APXS=no
 	econf \
 		${myconf} \
 		--with-libxml=1 || die
 	# Evolution 1.1 and 1.2 need it with libxml1
+	unset ac_cv_path_APXS
 
 	# dont always work with -j4 -- <azarah@gentoo.org> 9 Nov 2002
 	make || die
@@ -46,6 +57,6 @@ src_compile() {
 
 src_install() {
 	einstall || die
-    
- 	dodoc AUTHORS ABOUT-NLS COPYING* ChangeLog README* INSTALL NEWS TODO
+
+	dodoc AUTHORS ABOUT-NLS COPYING* ChangeLog README* INSTALL NEWS TODO
 }
diff --git a/net-libs/vanessa-mcast/ChangeLog b/net-libs/vanessa-mcast/ChangeLog
index a0aae9ca62da..f9ccca0e2b36 100644
--- a/net-libs/vanessa-mcast/ChangeLog
+++ b/net-libs/vanessa-mcast/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-libs/vanessa-mcast
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/vanessa-mcast/ChangeLog,v 1.1 2004/08/31 15:23:34 tantive Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/vanessa-mcast/ChangeLog,v 1.1.1.1 2005/11/30 10:02:54 chriswhite Exp $
+
+  22 Jan 2005; Christian Zoffoli <xmerlin@gentoo.org> +metadata.xml,
+  vanessa-mcast-1.0.0.ebuild:
+  added metadata.xml, cleaned ebuild for an improved maintainability
+
+  05 Sep 2004; David Holm <dholm@gentoo.org> vanessa-mcast-1.0.0.ebuild:
+  Added to ~ppc.
+
+  04 Sep 2004; Jon Hood <squinky86@gentoo.org> vanessa-mcast-1.0.0.ebuild:
+  Change virtual/glibc --> virtual/libc.
 
 *vanessa-mcast-1.0.0 (31 Aug 2004)
 
diff --git a/net-libs/vanessa-mcast/Manifest b/net-libs/vanessa-mcast/Manifest
index c40feebca0b6..5afe9ff16662 100644
--- a/net-libs/vanessa-mcast/Manifest
+++ b/net-libs/vanessa-mcast/Manifest
@@ -1,2 +1,14 @@
-MD5 c768b143023118a1c193492ba8a0d138 vanessa-mcast-1.0.0.ebuild 558
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f3b52bf605e4b4a40b37317a7abfb470 vanessa-mcast-1.0.0.ebuild 810
+MD5 23abe4f1f53fce21bfa3d2b61641de84 ChangeLog 744
+MD5 4821c19c6bb72e3366ef45d4b9c7a806 metadata.xml 352
 MD5 70541531b1b0af9532df8d120cad5f48 files/digest-vanessa-mcast-1.0.0 71
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFB8bMggMUyd/cdjWsRAu05AJ43DYC3Ply3dCOd4R9wIQKrAXFa3ACeKfmH
+S0QhskjWTFPHcvGA18n4CVs=
+=owBY
+-----END PGP SIGNATURE-----
diff --git a/net-libs/vanessa-mcast/vanessa-mcast-1.0.0.ebuild b/net-libs/vanessa-mcast/vanessa-mcast-1.0.0.ebuild
index f43884c7d52a..c35c8e4a383e 100644
--- a/net-libs/vanessa-mcast/vanessa-mcast-1.0.0.ebuild
+++ b/net-libs/vanessa-mcast/vanessa-mcast-1.0.0.ebuild
@@ -1,23 +1,30 @@
-# 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-libs/vanessa-mcast/vanessa-mcast-1.0.0.ebuild,v 1.1 2004/08/31 15:23:34 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/vanessa-mcast/vanessa-mcast-1.0.0.ebuild,v 1.1.1.1 2005/11/30 10:02:54 chriswhite Exp $
 
+MY_PN="${PN/-/_}"
+MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Multicast Helper Library"
 HOMEPAGE="http://www.vergenet.net/linux/vanessa/"
-SRC_URI="http://www.vergenet.net/linux/vanessa/download/vanessa_mcast/1.0.0/vanessa_mcast-1.0.0.tar.gz"
+SRC_URI="http://www.vergenet.net/linux/vanessa/download/${MY_PN}/${PV}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=dev-libs/vanessa-logger-0.0.6
 	>=net-libs/vanessa-socket-0.0.7"
 
-S=${WORKDIR}/vanessa_mcast-1.0.0
+S=${WORKDIR}/${MY_P}
+
+src_compile() {
+	econf || die "error configure"
+	emake || die "error compiling"
+}
 
 src_install() {
-	einstall || die
+	make DESTDIR=${D} install || die "error installing"
 	dodoc README NEWS AUTHORS TODO INSTALL
 }
diff --git a/net-libs/vanessa-socket/ChangeLog b/net-libs/vanessa-socket/ChangeLog
index 9ffc14fea325..5f5a88671133 100644
--- a/net-libs/vanessa-socket/ChangeLog
+++ b/net-libs/vanessa-socket/ChangeLog
@@ -1,10 +1,38 @@
 # ChangeLog for net-libs/vanessa-socket
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-libs/vanessa-socket/ChangeLog,v 1.1 2003/03/15 07:44:11 george Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/vanessa-socket/ChangeLog,v 1.1.1.1 2005/11/30 10:02:59 chriswhite Exp $
 
-*vanessa-socket-0.0.5_beta4.ebuild (14 Mar 2003)
+  22 Jan 2005; Christian Zoffoli <xmerlin@gentoo.org>
+  vanessa-socket-0.0.7.ebuild:
+  removed lib version patch, I'll try to find a better solution with the author
 
-  14 ��� 2003; George Shapovalov <george@gentoo.org> vanessa-socket-0.0.5_beta4.ebuild, files/digest-vanessa-socket-0.0.5_beta4 :
+  22 Jan 2005; Christian Zoffoli <xmerlin@gentoo.org>
+  +files/vanessa-socket-0.0.7-version.patch, vanessa-socket-0.0.7.ebuild:
+  improved ebuild, added a patch to fix library version
+
+  21 Jan 2005; Christian Zoffoli <xmerlin@gentoo.org>
+  vanessa-socket-0.0.7.ebuild:
+  improved ebuild maintainability
+
+  21 Jan 2005; Christian Zoffoli <xmerlin@gentoo.org> :
+  added metadata.xml
+
+  05 Sep 2004; David Holm <dholm@gentoo.org> vanessa-socket-0.0.7.ebuild:
+  Added to ~ppc.
+
+*vanessa-socket-0.0.7 (25 Aug 2004)
+
+  25 Aug 2004; Michael Imhof <tantive@gentoo.org>
+  +vanessa-socket-0.0.7.ebuild:
+  Version bumped. Closes #51324.
+
+  19 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  vanessa-socket-0.0.5_beta4.ebuild:
+  fix depend (bug #45110); tidy
+
+*vanessa-socket-0.0.5_beta4 (14 Mar 2003)
+
+  14 Mar 2003; George Shapovalov <george@gentoo.org> vanessa-socket-0.0.5_beta4.ebuild, files/digest-vanessa-socket-0.0.5_beta4 :
   initial release (#17402)
   Simplifies TCP/IP socket operations.
   ebuild submitted by Todd Punderson <todd@doonga.net>
diff --git a/net-libs/vanessa-socket/Manifest b/net-libs/vanessa-socket/Manifest
index e69de29bb2d1..256a8af3ebfa 100644
--- a/net-libs/vanessa-socket/Manifest
+++ b/net-libs/vanessa-socket/Manifest
@@ -0,0 +1,7 @@
+MD5 9721c729d773223ab71dc6815ea58e51 ChangeLog 1433
+MD5 c07dd0b4484ef777caabb5492943323d files/digest-vanessa-socket-0.0.5_beta4 77
+MD5 50108b7f705587d089391f402901604a files/digest-vanessa-socket-0.0.7 72
+MD5 b3d1ee6988f7cfc06c311dc79c18bf65 files/vanessa-socket-0.0.7-version.patch 1104
+MD5 4821c19c6bb72e3366ef45d4b9c7a806 metadata.xml 352
+MD5 e156072bfb4de3a1edf5433049b3b7fc vanessa-socket-0.0.5_beta4.ebuild 654
+MD5 2a36fd7e0543d974b9bd254bce158173 vanessa-socket-0.0.7.ebuild 785
diff --git a/net-libs/vanessa-socket/vanessa-socket-0.0.5_beta4.ebuild b/net-libs/vanessa-socket/vanessa-socket-0.0.5_beta4.ebuild
index 5caaced60055..92a71ee31df2 100644
--- a/net-libs/vanessa-socket/vanessa-socket-0.0.5_beta4.ebuild
+++ b/net-libs/vanessa-socket/vanessa-socket-0.0.5_beta4.ebuild
@@ -1,24 +1,21 @@
-# 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-libs/vanessa-socket/vanessa-socket-0.0.5_beta4.ebuild,v 1.1 2003/03/15 07:44:11 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/vanessa-socket/vanessa-socket-0.0.5_beta4.ebuild,v 1.1.1.1 2005/11/30 10:02:59 chriswhite Exp $
 
 DESCRIPTION="Simplifies TCP/IP socket operations."
 HOMEPAGE="http://www.vergenet.net/linux/vanessa/"
 SRC_URI="http://www.vergenet.net/linux/perdition/download/BETA/1.11beta5/vanessa_socket-0.0.5beta4.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
-DEPEND=">=vanessa-logger-0.0.4_beta2"
-S=${WORKDIR}/vanessa_socket-0.0.5beta4
 
-src_compile() {
-	econf
+DEPEND=">=dev-libs/vanessa-logger-0.0.4_beta2"
 
-	emake || die
-}
+S=${WORKDIR}/vanessa_socket-0.0.5beta4
 
 src_install() {
-	einstall
+	einstall || die
 	dodoc README NEWS AUTHORS TODO
 }
diff --git a/net-libs/vanessa-socket/vanessa-socket-0.0.7.ebuild b/net-libs/vanessa-socket/vanessa-socket-0.0.7.ebuild
index 12cd327a791b..b7164f34a4bf 100644
--- a/net-libs/vanessa-socket/vanessa-socket-0.0.7.ebuild
+++ b/net-libs/vanessa-socket/vanessa-socket-0.0.7.ebuild
@@ -1,21 +1,30 @@
-# 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-libs/vanessa-socket/vanessa-socket-0.0.7.ebuild,v 1.1 2004/08/25 14:35:24 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/vanessa-socket/vanessa-socket-0.0.7.ebuild,v 1.1.1.1 2005/11/30 10:02:59 chriswhite Exp $
 
+inherit eutils
+
+MY_PN="${PN/-/_}"
+MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Simplifies TCP/IP socket operations."
 HOMEPAGE="http://www.vergenet.net/linux/vanessa/"
-SRC_URI="http://www.vergenet.net/linux/vanessa/download/vanessa_socket/0.0.7/vanessa_socket-0.0.7.tar.gz"
+SRC_URI="http://www.vergenet.net/linux/vanessa/download/${MY_PN}/${PV}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 IUSE=""
 
 DEPEND=">=dev-libs/vanessa-logger-0.0.6"
 
-S=${WORKDIR}/vanessa_socket-0.0.7
+S=${WORKDIR}/${MY_P}
+
+src_compile() {
+	econf || die "error configure"
+	emake || die "error compiling"
+}
 
 src_install() {
-	einstall || die
+	make DESTDIR=${D} install || die "error installing"
 	dodoc README NEWS AUTHORS TODO
 }
diff --git a/net-libs/wvstreams/ChangeLog b/net-libs/wvstreams/ChangeLog
index 4023c5483b64..13f71886b43e 100644
--- a/net-libs/wvstreams/ChangeLog
+++ b/net-libs/wvstreams/ChangeLog
@@ -1,6 +1,282 @@
 # ChangeLog for net-libs/wvstreams
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.1 2002/04/27 13:18:22 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.1.1.1 2005/11/30 10:02:50 chriswhite Exp $
+
+  11 Nov 2005; Michael Hanselmann <hansmi@gentoo.org>
+  wvstreams-4.0.2-r1.ebuild:
+  Stable on hppa, ppc.
+
+  30 Oct 2005; Luis Medinas <metalgod@gentoo.org> wvstreams-4.0.2-r1.ebuild:
+  Marked Stable on amd64.
+
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org> wvstreams-4.0.2-r1.ebuild:
+  Mark 4.0.2-r1 stable on alpha
+
+  17 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  wvstreams-4.0.2-r1.ebuild:
+  Stable on sparc
+
+  16 Oct 2005; Alin Nastac <mrness@gentoo.org> wvstreams-4.0.1-r2.ebuild,
+  wvstreams-4.0.2.ebuild, wvstreams-4.0.2-r1.ebuild:
+  Fix DEPEND by adding unconditional dependency on openssl (#108095). Mark
+  4.0.2-r1 stable on x86.
+
+  21 Sep 2005; Mark Loeser <halcy0n@gentoo.org> metadata.xml:
+  Adding to cpp herd, marking mrness as primary maintainer
+
+*wvstreams-4.0.2-r1 (07 Sep 2005)
+
+  07 Sep 2005; Alin Nastac <mrness@gentoo.org>
+  +files/wvstreams-4.0.2-external-xplc.patch, +wvstreams-4.0.2-r1.ebuild:
+  Fix configure.ac to use the installed version of dev-libs/xplc
+  instead the bundled version (#103059).
+
+  02 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> wvstreams-4.0.2.ebuild:
+  Stable on alpha.
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  wvstreams-4.0.2.ebuild:
+  Stable on ppc.
+
+  02 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  wvstreams-4.0.2.ebuild:
+  Stable on sparc
+
+  29 May 2005; Alin Nastac <mrness@gentoo.org> wvstreams-4.0.1-r2.ebuild,
+  wvstreams-4.0.2.ebuild:
+  Move to vorbis useflag (#94254).
+
+  22 May 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  wvstreams-4.0.2.ebuild:
+  Stable on hppa
+
+  22 May 2005; Alin Nastac <mrness@gentoo.org> wvstreams-4.0.1-r2.ebuild,
+  wvstreams-4.0.2.ebuild:
+  Add ssl USE flag and fix openssl dependency (#93438). Stable on x86.
+
+  05 May 2005; Sven Wegener <swegener@gentoo.org> wvstreams-4.0.1-r2.ebuild,
+  wvstreams-4.0.2.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org>
+  wvstreams-4.0.1-r2.ebuild:
+  Stable on ppc.
+
+  06 Apr 2005; Alin Nastac <mrness@gentoo.org>
+  -files/wvstreams-4.0-tcl_8_4.patch, -wvstreams-4.0-r1.ebuild:
+  Remove obsolete version
+
+  06 Apr 2005; Simon Stelling <blubb@gentoo.org> wvstreams-4.0.1-r2.ebuild:
+  stable on amd64 wrt bug #84817
+
+  04 Apr 2005; Alin Nastac <mrness@gentoo.org>
+  +files/wvstreams-4.0.1-wireless-user.patch,
+  +files/wvstreams-4.0.2-wireless-user.patch, wvstreams-4.0.1-r2.ebuild,
+  wvstreams-4.0.2.ebuild:
+  Fix compile error regarding __user declaration (#76943).
+
+  03 Apr 2005; Luca Barbato <lu_zero@gentoo.org> wvstreams-4.0.2.ebuild:
+  Updated SRC_URI and moved to vorbis useflag
+
+  30 Mar 2005; Alin Nastac <mrness@gentoo.org>
+  +files/wvstreams-4.0.2-speex-const.patch, wvstreams-4.0.2.ebuild:
+  Fix broken compilation on systems with newer media-libs/speex (#87206).
+
+*wvstreams-4.0.2 (29 Mar 2005)
+
+  29 Mar 2005; Alin Nastac <mrness@gentoo.org>
+  +files/wvstreams-4.0.2-MOC-fix.patch,
+  +files/wvstreams-4.0.2-linux-serial.patch,
+  +files/wvstreams-4.0.2-tcl_8_4.patch, -wvstreams-4.0.1-r1.ebuild,
+  -wvstreams-4.0.1.ebuild, +wvstreams-4.0.2.ebuild:
+  Version bump. Remove old test versions.
+
+  23 Mar 2005; Jason Wever <weeve@gentoo.org> wvstreams-4.0.1-r2.ebuild:
+  Stable on SPARC wrt bug #84817.
+
+  19 Mar 2005; Bryan Østergaard <kloeri@gentoo.org>
+  wvstreams-4.0.1-r2.ebuild:
+  Stable on alpha.
+
+  15 Mar 2005; Alin Nastac <mrness@gentoo.org>
+  +files/wvstreams-4.0.1-without-pam.patch, wvstreams-4.0.1-r2.ebuild:
+  Fix broken build when pam flag isn't set (#84817).
+
+  14 Mar 2005; Michael Hanselmann <hansmi@gentoo.org>
+  wvstreams-4.0.1-r2.ebuild:
+  Stable on hppa.
+
+  11 Mar 2005; Alin Nastac <mrness@gentoo.org> wvstreams-4.0.1-r2.ebuild:
+  Stable on x86.
+
+*wvstreams-4.0.1-r2 (06 Mar 2005)
+
+  06 Mar 2005; Alin Nastac <mrness@gentoo.org>
+  +files/wvstreams-4.0.1-MOC-fix.patch, +wvstreams-4.0.1-r2.ebuild:
+  Fix qt dependencies; this library can't work with qt4 (#84201).
+
+*wvstreams-4.0.1-r1 (17 Feb 2005)
+
+  17 Feb 2005; Alin Nastac <mrness@gentoo.org>
+  +files/wvstreams-4.0.1-linux-serial.patch, +wvstreams-4.0.1-r1.ebuild,
+  wvstreams-4.0.1.ebuild:
+  Add patch derived from debian patch (wwwstreams_4.0.1-1.3) that fixes bugs
+  #79897 and #79913.
+
+  14 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org> wvstreams-4.0.1.ebuild:
+  Stable on sparc wrt #76455
+
+  09 Feb 2005; Alin Nastac <mrness@gentoo.org> wvstreams-4.0.1.ebuild:
+  Mark stable on x86.
+
+  06 Jan 2005; Alin Nastac <mrness@gentoo.org> -files/3.70-gcc3.patch,
+  -files/3.70-openssl.patch, -files/wvcrash-uclibc-gentoo.patch,
+  -files/wvstreams-3.70-gentoo.patch, -files/wvstreams-3.74-fPIC.patch,
+  -files/wvstreams-3.74-makefile.patch, -files/wvstreams-3.75-fPIC.patch,
+  -files/wvstreams-3.75-gcc34.patch, -files/wvstreams-3.75-makefile.patch,
+  -files/wvstreams-3.75-tcl_8_4.patch, -wvstreams-3.70-r2.ebuild,
+  -wvstreams-3.74.ebuild, -wvstreams-3.75-r1.ebuild, -wvstreams-3.75.ebuild:
+  Remove obsolete ebuilds.
+
+  04 Jan 2005; Karol Wojtaszek <sekretarz@gentoo.org>
+  wvstreams-4.0-r1.ebuild:
+  Stable on amd64, bug #72440
+
+*wvstreams-4.0.1 (03 Jan 2005)
+
+  03 Jan 2005; Alin Nastac <mrness@gentoo.org>
+  +files/wvstreams-4.0.1-tcl_8_4.patch, +wvstreams-4.0.1.ebuild:
+  Version bumped.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  27 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
+  wvstreams-4.0-r1.ebuild:
+  Stable on alpha, bug 72440.
+
+  22 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org> wvstreams-4.0-r1.ebuild:
+  Stable on sparc wrt #72440
+
+  18 Dec 2004; Alin Nastac <mrness@gentoo.org> wvstreams-4.0-r1.ebuild,
+  -wvstreams-4.0.ebuild:
+  Stable on x86.
+
+*wvstreams-4.0-r1 (08 Dec 2004)
+
+  08 Dec 2004; Alin Nastac <mrness@gentoo.org> metadata.xml,
+  +wvstreams-4.0-r1.ebuild:
+  Correct flags and dependencies; add doc flag for installing doxygen generated
+  documentation. See bug #70420.
+
+  30 Nov 2004; Alin Nastac <mrness@gentoo.org> wvstreams-4.0.ebuild:
+  Change fam dependency to virtual/fam.
+
+  22 Nov 2004; Guy Martin <gmsoft@gentoo.org> wvstreams-4.0.ebuild:
+  Added -fPIC for all arches. Marked ~hppa.
+
+  21 Nov 2004; Alin Nastac <mrness@gentoo.org> +metadata.xml,
+  wvstreams-4.0.ebuild:
+  Add metadata.xml and correct dependencies.
+
+  20 Nov 2004; Bryan Østergaard,,, <kloeri@gentoo.org> wvstreams-4.0.ebuild:
+  ~alpha keyword.
+
+*wvstreams-3.75-r1 (16 Nov 2004)
+*wvstreams-4.0 (16 Nov 2004)
+
+  16 Nov 2004; Daniel Black <dragonheart@gentoo.org>
+  +files/wvcrash-uclibc-gentoo.patch, +files/wvstreams-4.0-tcl_8_4.patch,
+  +wvstreams-3.75-r1.ebuild, +wvstreams-4.0.ebuild:
+  version bump and uclibc patch from bug #70974. Thanks to Yuri Vasilevski
+  <yvasilev@duke.math.cinvestav.mx> for the patch
+
+  02 Nov 2004; Daniel Black <dragonheart@gentoo.org> wvstreams-3.75.ebuild:
+  Dependancy change of speex to speex? (media-libs/speex
+  !=media-libs/speex-1.1.4) as per bug #69743 . Thanks to Tony Murray
+  <tonymurray@fastmail.fm> for the report and solution
+
+  02 Nov 2004; Karol Wojtaszek,,, <sekretarz@gentoo.org>
+  wvstreams-3.75.ebuild:
+  Removed has_version stuff from global scope. Added to depand tcl-8.4* and
+  autoconf.
+
+  21 Sep 2004; Karol Wojtaszek <sekretarz@gentoo.org>
+  +files/wvstreams-3.75-gcc34.patch, wvstreams-3.74.ebuild,
+  wvstreams-3.75.ebuild:
+  Fixed gcc-3.4 compile issues. Thanks to Chris Arepantis
+  <ChrisArepantis@gmail.com> in bug #62822. Fixed broken header in 3.74 ebuild
+
+*wvstreams-3.75-r1 (12 Aug 2004)
+
+  12 Aug 2004; Daniel Ahlberg <aliz@gentoo.org> wvstreams-3.75-r1.ebuild,
+  wvstreams-3.75.ebuild, files/wvstreams-3.75-fPIC.patch,
+  files/wvstreams-3.75-tcl_8_4.patch:
+  Added tcltk and fftw dependencies. Added swig to dependencies if tcl installed
+  and a patch for fixing tcl 8.4 support. Closing #59601.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  wvstreams-3.70-r2.ebuild, wvstreams-3.74.ebuild, wvstreams-3.75.ebuild:
+  virtual/glibc -> virtual/libc
+
+  28 May 2004; Jon Hood <squinky86@gentoo.org> wvstreams-3.74.ebuild,
+  wvstreams-3.75.ebuild:
+  add "use_with speex" to econf line
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> wvstreams-3.70-r2.ebuild,
+  wvstreams-3.74.ebuild:
+  Add inherit eutils
+
+  04 Apr 2004; David Holm <dholm@gentoo.org> wvstreams-3.75.ebuild:
+  Added to ~ppc.
+
+  04 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> wvstreams-3.75.ebuild:
+  header fix; inherit eutils for epatch; don't use deprecated ? : use syntax
+
+*wvstreams-3.75 (03 Apr 2004)
+
+  03 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> wvstreams-3.75.ebuild:
+  Version bump and fixing speex dependecies when oggvorbis is enabled. Closing
+  #45797.
+
+  24 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> wvstreams-3.74.ebuild,
+  files/wvstreams-3.74-makefile.patch:
+  Fix berkdb linking and making some dependencies required. Closing #42603.
+
+*wvstreams-3.74 (22 Feb 2004)
+
+  22 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> wvstreams-3.74.ebuild:
+  Version bump. ebuild contributed by Peter Colijn <sirjoltalot@yahoo.com> in
+  #33896.
+
+*wvstreams-3.70-r2 (31 Oct 2002)
+
+  25 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  Add gcc3 + openssl patches #28548.
+
+  12 Jun 2003; <msterret@gentoo.org> wvstreams-3.70-r2.ebuild:
+  fix Header
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  28 Jul 2003; Guy Martin <gmsoft@gentoo.org> wvstreams-3.70-r2.ebuild :
+  Added hppa to KEYWORDS and -fPIC to CXXFLAGS for hppa.
+
+  21 Oct 2002; Bjoern Brauel <bjb@gentoo.org> wvstreams-3.70-r2.ebuild
+
+  On Alpha we strictly need to compile wvstreams with -fPIC. 
+  
+*wvstreams-3.70-r2 (05 Jul 2002)
+
+  05 Jul 2002; Brandon Low <lostlogic@gentoo.org> wvstreams-3.70-r2.ebuild
+
+  Fix patch to work with 2.95.3 and 3.1, turn off parallel make for now.
+
+*wvstreams-3.70-r2 (03 Jul 2002)
+
+  03 Jul 2002; Brandon Low <lostlogic@gentoo.org> wvstreams-3.70-r1.ebuild
+
+  Just an update for gcc-3.1 compatiblity don't get excited.
 
 *wvstreams-3.70 (27 Apr 2002)
 
diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest
index e69de29bb2d1..b7fafb1639f1 100644
--- a/net-libs/wvstreams/Manifest
+++ b/net-libs/wvstreams/Manifest
@@ -0,0 +1,19 @@
+MD5 607a0aab122ee80692066f4909d1a240 ChangeLog 10306
+MD5 f4e61e52cab6cac5470b77a7bd3358a9 files/digest-wvstreams-4.0.1-r2 68
+MD5 722051cdd8d4e8747f83c0d512f3ec2a files/digest-wvstreams-4.0.2 68
+MD5 722051cdd8d4e8747f83c0d512f3ec2a files/digest-wvstreams-4.0.2-r1 68
+MD5 16733d2b49133ec4fd75fa7dbca890ea files/wvstreams-4.0.1-MOC-fix.patch 479
+MD5 9c69b24927d041fa398d060e4e5f1bb1 files/wvstreams-4.0.1-linux-serial.patch 7563
+MD5 03b73077a83c635ab211f235c7a429bf files/wvstreams-4.0.1-tcl_8_4.patch 822
+MD5 0cb9b1e5a568cd8f0e5f186a131a74a5 files/wvstreams-4.0.1-wireless-user.patch 466
+MD5 a48902f93ab5425fc59a483df42f3d0a files/wvstreams-4.0.1-without-pam.patch 418
+MD5 16733d2b49133ec4fd75fa7dbca890ea files/wvstreams-4.0.2-MOC-fix.patch 479
+MD5 189d6997246f2943d43b5c18d0a78163 files/wvstreams-4.0.2-external-xplc.patch 1659
+MD5 26127f51d3c7e77edb001d4cb33882d0 files/wvstreams-4.0.2-linux-serial.patch 6412
+MD5 b65b1449a0bc6ff06e8c843b37717f05 files/wvstreams-4.0.2-speex-const.patch 951
+MD5 0b5b1b03e323747aa3ce30492fe18cc1 files/wvstreams-4.0.2-tcl_8_4.patch 1022
+MD5 dbec7770662be21658b4ba9740cf2793 files/wvstreams-4.0.2-wireless-user.patch 466
+MD5 227de7f678ad662524292836709de75f metadata.xml 313
+MD5 5918fbf27cbd22f3a676a5720e82ffb6 wvstreams-4.0.1-r2.ebuild 2169
+MD5 e594922148c5a6f7087f083cf392e55c wvstreams-4.0.2-r1.ebuild 2558
+MD5 dfdaac094acad1dc03d979c2fda35c97 wvstreams-4.0.2.ebuild 2179
diff --git a/net-libs/wvstreams/metadata.xml b/net-libs/wvstreams/metadata.xml
index 1e11e7bbd01b..d974ad958eaa 100644
--- a/net-libs/wvstreams/metadata.xml
+++ b/net-libs/wvstreams/metadata.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-dialup</herd>
+<herd>cpp</herd>
+<maintainer>
+<email>mrness@gentoo.org</email>
+<name>Alin Nastac</name>
+</maintainer>
+<longdescription>A network programming library in C++</longdescription>
 </pkgmetadata>
diff --git a/net-libs/wvstreams/wvstreams-4.0.1-r2.ebuild b/net-libs/wvstreams/wvstreams-4.0.1-r2.ebuild
index f2ac6e6b7312..e978325c996f 100644
--- a/net-libs/wvstreams/wvstreams-4.0.1-r2.ebuild
+++ b/net-libs/wvstreams/wvstreams-4.0.1-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-libs/wvstreams/wvstreams-4.0.1-r2.ebuild,v 1.1 2005/03/06 00:56:40 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.0.1-r2.ebuild,v 1.1.1.1 2005/11/30 10:02:50 chriswhite Exp $
 
 inherit eutils
 
@@ -10,26 +10,25 @@ SRC_URI="http://people.nit.ca/~sfllaw/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="gtk qt oggvorbis speex fam qdbm pam slp doc fftw tcltk debug"
+KEYWORDS="alpha amd64 hppa ppc sparc x86"
+IUSE="gtk qt vorbis speex fam qdbm pam slp doc fftw tcltk debug"
 
 RDEPEND="virtual/libc
+	>=sys-libs/db-3
+	>=sys-libs/zlib-1.1.4
+	>=dev-libs/openssl-0.9.7
 	dev-libs/xplc
 	gtk? ( >=x11-libs/gtk+-2.2.0 )
 	qt? ( =x11-libs/qt-3* )
-	oggvorbis? ( >=media-libs/libogg-1.0
-		>=media-libs/libvorbis-1.0 )
+	vorbis? ( >=media-libs/libvorbis-1.0 )
 	speex? ( media-libs/speex !=media-libs/speex-1.1.4 )
 	fam? ( virtual/fam )
-	>=sys-libs/db-3
 	qdbm? ( dev-db/qdbm )
 	pam? ( >=sys-libs/pam-0.75 )
 	slp? ( >=net-libs/openslp-1.0.9a )
-	>=sys-libs/zlib-1.1.4
-	dev-libs/openssl
 	doc? ( app-doc/doxygen )
 	fftw? ( sci-libs/fftw )
-	tcltk? ( >=dev-lang/tcl-8.4* dev-lang/swig )"
+	tcltk? ( >=dev-lang/tcl-8.4 dev-lang/swig )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -38,7 +37,9 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A} ; cd ${S}
 
-	epatch ${FILESDIR}/${P}-linux-serial.patch || die "failed to patch"
+	epatch ${FILESDIR}/${P}-linux-serial.patch
+	epatch ${FILESDIR}/${P}-wireless-user.patch
+	epatch ${FILESDIR}/${P}-without-pam.patch
 
 	if useq tcltk; then
 		epatch ${FILESDIR}/${P}-tcl_8_4.patch
@@ -58,8 +59,8 @@ src_compile() {
 	fi
 	econf ${myconf} \
 		`use_with gtk` \
-		`use_with oggvorbis ogg` \
-		`use_with oggvorbis vorbis` \
+		`use_with vorbis ogg` \
+		`use_with vorbis` \
 		`use_with speex` \
 		`use_with fam` \
 		`use_with qdbm` \
@@ -70,8 +71,8 @@ src_compile() {
 		`use_enable debug` \
 		--enable-verbose \
 		--with-bdb \
-		--with-openssl \
 		--with-zlib \
+		--with-openssl \
 		--with-xplc \
 		|| die "configure failed"
 	emake CXXOPTS="-fPIC -DPIC" COPTS="-fPIC -DPIC" || die "compile failed"
diff --git a/net-libs/wvstreams/wvstreams-4.0.2-r1.ebuild b/net-libs/wvstreams/wvstreams-4.0.2-r1.ebuild
index 446b45a18c36..69e8ce2816e8 100644
--- a/net-libs/wvstreams/wvstreams-4.0.2-r1.ebuild
+++ b/net-libs/wvstreams/wvstreams-4.0.2-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-libs/wvstreams/wvstreams-4.0.2-r1.ebuild,v 1.1 2005/09/07 20:22:28 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.0.2-r1.ebuild,v 1.1.1.1 2005/11/30 10:02:50 chriswhite Exp $
 
 inherit eutils
 
@@ -10,22 +10,22 @@ SRC_URI="http://www.csclub.uwaterloo.ca/~ja2morri/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="gtk qt vorbis speex fam qdbm pam slp ssl doc fftw tcltk debug"
+KEYWORDS="alpha amd64 hppa ppc sparc x86"
+IUSE="gtk qt vorbis speex fam qdbm pam slp doc fftw tcltk debug"
 
 RDEPEND="virtual/libc
+	>=sys-libs/db-3
+	>=sys-libs/zlib-1.1.4
+	>=dev-libs/openssl-0.9.7
 	dev-libs/xplc
 	gtk? ( >=x11-libs/gtk+-2.2.0 )
 	qt? ( =x11-libs/qt-3* )
 	vorbis? ( >=media-libs/libvorbis-1.0 )
 	speex? ( media-libs/speex !=media-libs/speex-1.1.4 )
 	fam? ( virtual/fam )
-	>=sys-libs/db-3
 	qdbm? ( dev-db/qdbm )
 	pam? ( >=sys-libs/pam-0.75 )
 	slp? ( >=net-libs/openslp-1.0.9a )
-	>=sys-libs/zlib-1.1.4
-	ssl? ( >=dev-libs/openssl-0.9.7 )
 	doc? ( app-doc/doxygen )
 	fftw? ( sci-libs/fftw )
 	tcltk? ( >=dev-lang/tcl-8.4 dev-lang/swig )"
@@ -74,13 +74,13 @@ src_compile() {
 		`use_with qdbm` \
 		`use_with pam` \
 		`use_with fftw` \
-		`use_with ssl openssl` \
 		`use_with slp openslp` \
 		`use_with tcltk tcl` \
 		`use_enable debug` \
 		--enable-verbose \
 		--with-bdb \
 		--with-zlib \
+		--with-openssl \
 		--with-xplc \
 		|| die "configure failed"
 	emake CXXOPTS="-fPIC -DPIC" COPTS="-fPIC -DPIC" || die "compile failed"
diff --git a/net-libs/wvstreams/wvstreams-4.0.2.ebuild b/net-libs/wvstreams/wvstreams-4.0.2.ebuild
index c3dc7616820b..2ea5879cc221 100644
--- a/net-libs/wvstreams/wvstreams-4.0.2.ebuild
+++ b/net-libs/wvstreams/wvstreams-4.0.2.ebuild
@@ -1,35 +1,34 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.0.2.ebuild,v 1.1 2005/03/29 09:20:10 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.0.2.ebuild,v 1.1.1.1 2005/11/30 10:02:50 chriswhite Exp $
 
 inherit eutils
 
 DESCRIPTION="A network programming library in C++"
 HOMEPAGE="http://open.nit.ca/wiki/?page=WvStreams"
-SRC_URI="http://people.nit.ca/~sfllaw/${P}.tar.gz"
+SRC_URI="http://www.csclub.uwaterloo.ca/~ja2morri/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="gtk qt oggvorbis speex fam qdbm pam slp doc fftw tcltk debug"
+KEYWORDS="alpha ~amd64 hppa ppc sparc x86"
+IUSE="gtk qt vorbis speex fam qdbm pam slp doc fftw tcltk debug"
 
 RDEPEND="virtual/libc
+	>=sys-libs/db-3
+	>=sys-libs/zlib-1.1.4
+	>=dev-libs/openssl-0.9.7
 	dev-libs/xplc
 	gtk? ( >=x11-libs/gtk+-2.2.0 )
 	qt? ( =x11-libs/qt-3* )
-	oggvorbis? ( >=media-libs/libogg-1.0
-		>=media-libs/libvorbis-1.0 )
+	vorbis? ( >=media-libs/libvorbis-1.0 )
 	speex? ( media-libs/speex !=media-libs/speex-1.1.4 )
 	fam? ( virtual/fam )
-	>=sys-libs/db-3
 	qdbm? ( dev-db/qdbm )
 	pam? ( >=sys-libs/pam-0.75 )
 	slp? ( >=net-libs/openslp-1.0.9a )
-	>=sys-libs/zlib-1.1.4
-	dev-libs/openssl
 	doc? ( app-doc/doxygen )
 	fftw? ( sci-libs/fftw )
-	tcltk? ( >=dev-lang/tcl-8.4* dev-lang/swig )"
+	tcltk? ( >=dev-lang/tcl-8.4 dev-lang/swig )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -39,6 +38,8 @@ src_unpack() {
 	unpack ${A} ; cd ${S}
 
 	epatch ${FILESDIR}/${P}-linux-serial.patch
+	epatch ${FILESDIR}/${P}-wireless-user.patch
+	epatch ${FILESDIR}/${P}-speex-const.patch
 
 	if useq tcltk; then
 		epatch ${FILESDIR}/${P}-tcl_8_4.patch
@@ -58,8 +59,8 @@ src_compile() {
 	fi
 	econf ${myconf} \
 		`use_with gtk` \
-		`use_with oggvorbis ogg` \
-		`use_with oggvorbis vorbis` \
+		`use_with vorbis ogg` \
+		`use_with vorbis` \
 		`use_with speex` \
 		`use_with fam` \
 		`use_with qdbm` \
@@ -70,8 +71,8 @@ src_compile() {
 		`use_enable debug` \
 		--enable-verbose \
 		--with-bdb \
-		--with-openssl \
 		--with-zlib \
+		--with-openssl \
 		--with-xplc \
 		|| die "configure failed"
 	emake CXXOPTS="-fPIC -DPIC" COPTS="-fPIC -DPIC" || die "compile failed"
diff --git a/net-libs/zapata/ChangeLog b/net-libs/zapata/ChangeLog
index 471bf20ebd71..e6d520187efd 100644
--- a/net-libs/zapata/ChangeLog
+++ b/net-libs/zapata/ChangeLog
@@ -1,6 +1,56 @@
 # ChangeLog for net-libs/zapata
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/zapata/ChangeLog,v 1.1 2004/01/04 00:10:35 stkn Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/zapata/ChangeLog,v 1.1.1.1 2005/11/30 10:02:57 chriswhite Exp $
+
+  26 Jul 2005; <stkn@gentoo.org> -zapata-0.9.1.ebuild, zapata-1.0.1.ebuild:
+  Stable on x86, removed old version.
+
+  25 Jun 2005; Stefan Knoblich <stkn@gentoo.org> zapata-1.0.1.ebuild:
+  Fixed SRC_URI.
+
+  25 Jun 2005; Stefan Knoblich <stkn@gentoo.org> -zapata-1.0.0.ebuild:
+  Removing old ebuild
+
+  21 Apr 2005; Stefan Knoblich <stkn@gentoo.org> zapata-1.0.1.ebuild:
+  Fixed DEPEND to avoid circular dependency, reported by riksta on irc.
+
+  27 Jan 2005; Stefan Knoblich <stkn@gentoo.org> -zapata-0.7.0.ebuild,
+  -zapata-0.8.1.ebuild:
+  removing old versions
+
+*zapata-1.0.1 (24 Oct 2004)
+
+  24 Oct 2004; <stkn@gentoo.org> zapata-1.0.0.ebuild, +zapata-1.0.1.ebuild:
+  version bump and SRC_URI update in 1.0.0
+
+*zapata-1.0.0 (24 Sep 2004)
+
+  24 Sep 2004; <stkn@gentoo.org> +zapata-1.0.0.ebuild:
+  version bump
+
+  26 Jul 2004; Stefan Knoblich <stkn@gentoo.org> zapata-0.9.1.ebuild:
+  stable on x86
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> zapata-0.7.0.ebuild,
+  zapata-0.8.1.ebuild, zapata-0.9.1.ebuild:
+  virtual/glibc -> virtual/libc
+
+*zapata-0.9.1 (10 May 2004)
+
+  10 May 2004; Stefan Knoblich <stkn@gentoo.org> zapata-0.9.1.ebuild,
+  files/zapata-mkdir-usrinclude.patch:
+  version bump.
+
+  17 Mar 2004; Stefan Knoblich <stkn@gentoo.org> zapata-0.8.1.ebuild:
+  fixed SRC_URI
+
+*zapata-0.8.1 (16 Mar 2004)
+
+  16 Mar 2004; Stefan Knoblich <stkn@gentoo.org> zapata-0.8.1.ebuild:
+  version bump
+
+  19 Feb 2004; Stefan Knoblich <stkn@gentoo.org> zapata-0.7.0.ebuild:
+  fixed SRC_URI
 
 *zapata-0.7.0 (04 Jan 2004)
 
diff --git a/net-libs/zapata/Manifest b/net-libs/zapata/Manifest
index 3ab5237a9f2d..96230333e31d 100644
--- a/net-libs/zapata/Manifest
+++ b/net-libs/zapata/Manifest
@@ -1,5 +1,6 @@
+MD5 46ba90e41e9df14cbcbea2be741a2923 zapata-1.0.1.ebuild 735
 MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248
-MD5 696530546bcf1db0b393b63e9e4a9dd3 zapata-0.7.0.ebuild 587
-MD5 66a99fe1d6bd18bf2d5ca90161fb9bba ChangeLog 435
-MD5 8f713c5c619758af0969df6726f1b894 files/digest-zapata-0.7.0 63
+MD5 eb0394a4cb9fa3718eb9cc01b10501e8 ChangeLog 1922
+MD5 b86a45631830a772bfec75e1951a0f43 files/digest-zapata-1.0.1 63
+MD5 98e28c21184c73af63cfa49be07a7392 files/zapata-mkdir-usrinclude.patch 375
 MD5 4b69b1ab63d63b74f00243cd336bc17a files/zapata-mkdir-usrlib.patch 359
diff --git a/net-libs/zapata/zapata-1.0.1.ebuild b/net-libs/zapata/zapata-1.0.1.ebuild
index 60dd753e4ccb..5c060e28b413 100644
--- a/net-libs/zapata/zapata-1.0.1.ebuild
+++ b/net-libs/zapata/zapata-1.0.1.ebuild
@@ -1,21 +1,21 @@
-# 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-libs/zapata/zapata-1.0.1.ebuild,v 1.1 2004/10/24 17:47:28 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/zapata/zapata-1.0.1.ebuild,v 1.1.1.1 2005/11/30 10:02:57 chriswhite Exp $
 
 IUSE=""
 
 inherit eutils
 
 DESCRIPTION="Library of additional telephony related functions"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="ftp://ftp.asterisk.org/pub/telephony/zaptel/zapata-${PV}.tar.gz"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="ftp://ftp.asterisk.org/pub/telephony/zaptel/old/zapata-${PV}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 DEPEND="virtual/libc
-	=net-misc/zaptel-1.0.1"
+	>=net-misc/zaptel-1.0.1"
 
 src_unpack() {
 	unpack ${A}
author	Chris White <chriswhite@gentoo.org>	2005-11-30 10:04:41 +0000
committer	Chris White <chriswhite@gentoo.org>	2005-11-30 10:04:41 +0000
commit	6367d64b0f4015b22f6b2fd52baa03c209140207 (patch)
tree	8b32c9c20b3e92522c9c6a7faeea93780140e41d /net-libs
parent	(no commit message) (diff)
download	gentoo-2-6367d64b0f4015b22f6b2fd52baa03c209140207.tar.gz gentoo-2-6367d64b0f4015b22f6b2fd52baa03c209140207.tar.bz2 gentoo-2-6367d64b0f4015b22f6b2fd52baa03c209140207.zip