Cleaned out some old crusty package versions, updated my email addresses,

and am comitting tsocks and an updated portagemaster

29 files changed, 122 insertions, 685 deletions

diff --git a/app-admin/portagemaster/files/digest-portagemaster-0.1.5 b/app-admin/portagemaster/files/digest-portagemaster-0.1.5
new file mode 100644
index 000000000000..297782fb73ea
--- /dev/null
+++ b/app-admin/portagemaster/files/digest-portagemaster-0.1.5
@@ -0,0 +1 @@
+MD5 52e248f0d1d918c2ee2057cefcc4554e portagemaster-0.1.5.tar.bz2 69026
diff --git a/app-admin/portagemaster/portagemaster-0.1.5.ebuild b/app-admin/portagemaster/portagemaster-0.1.5.ebuild
new file mode 100644
index 000000000000..e7c11e49babe
--- /dev/null
+++ b/app-admin/portagemaster/portagemaster-0.1.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# /space/gentoo/cvsroot/gentoo-x86/app-admin/portagemaster/portagemaster-0.1.4.ebuild,v 1.1 2002/06/05 06:45:36 rphillips Exp
+
+S=${WORKDIR}/${PN}
+DESCRIPTION="A java portage browser and installer."
+SRC_URI="http://portagemaster.sourceforge.net/packages/portagemaster-${PV}.tar.bz2"
+HOMEPAGE="http://portagemaster.sourceforge.net"
+RDEPEND="virtual/jre"
+
+src_unpack() {
+	unpack ${A}
+}
+
+src_install() {
+	dodir /opt/${PN}
+	cp portagemaster-${PV}.jar ${D}/opt/${PN}
+	
+	into /usr
+	dobin portagemaster
+	ln -s /opt/${PN}/portagemaster-${PV}.jar ${D}/opt/${PN}/portagemaster.jar
+}
+
diff --git a/app-cdr/cdrx/cdrx-0.3.1.ebuild b/app-cdr/cdrx/cdrx-0.3.1.ebuild
index 4888b756bf72..88c515d14a20 100644
--- a/app-cdr/cdrx/cdrx-0.3.1.ebuild
+++ b/app-cdr/cdrx/cdrx-0.3.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# Author Ben Lutgens <blutgens@sistina.com> 
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrx/cdrx-0.3.1.ebuild,v 1.2 2002/05/27 17:27:34 drobbins Exp $
+# Author Ben Lutgens <lamer@gentoo.org> 
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrx/cdrx-0.3.1.ebuild,v 1.3 2002/06/12 03:23:49 lamer Exp $
 
 S=${WORKDIR}
 DESCRIPTION="Menu based front-end to mkisofs and cdrecord"
diff --git a/app-cdr/xcdroast/xcdroast-0.98_alpha10-r1.ebuild b/app-cdr/xcdroast/xcdroast-0.98_alpha10-r1.ebuild
index e3c7d35a7620..2be5b64fb816 100644
--- a/app-cdr/xcdroast/xcdroast-0.98_alpha10-r1.ebuild
+++ b/app-cdr/xcdroast/xcdroast-0.98_alpha10-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Author Ben Lutgens <blutgens@sistina.com> 
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/xcdroast/xcdroast-0.98_alpha10-r1.ebuild,v 1.1 2002/06/05 02:39:55 lostlogic Exp $
+# Author Ben Lutgens <lamer@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/xcdroast/xcdroast-0.98_alpha10-r1.ebuild,v 1.2 2002/06/12 03:23:49 lamer Exp $
 
 S=${WORKDIR}/xcdroast-0.98alpha10
 DESCRIPTION="Menu based front-end to mkisofs and cdrecord"
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.0.6 b/app-crypt/gnupg/files/digest-gnupg-1.0.6
deleted file mode 100644
index 47ec1af10fcd..000000000000
--- a/app-crypt/gnupg/files/digest-gnupg-1.0.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7c319a9e5e70ad9bc3bf0d7b5008a508 gnupg-1.0.6.tar.gz 1941676
diff --git a/app-crypt/gnupg/gnupg-1.0.6.ebuild b/app-crypt/gnupg/gnupg-1.0.6.ebuild
deleted file mode 100644
index db49eca450ca..000000000000
--- a/app-crypt/gnupg/gnupg-1.0.6.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Ben Lutgens
-# $Header: /home/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.0.4.ebuild,v 1.0
-# 2001/04/21 12:45 CST blutgens  Exp $
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="ftp://ftp.gnupg.org/pub/gcrypt/gnupg/${P}.tar.gz"
-S="${WORKDIR}/${P}"
-
-DEPEND="virtual/glibc
-        nls? ( >=sys-devel/gettext-0.10.35 )
-	>=sys-libs/zlib-1.1.3"
-
-src_unpack() {
-    unpack "${A}"
-    cd "${S}"
-    # Fix those $&*%^$%%$ info files
-    patch -p1 < "${FILESDIR}/gnupg-1.0.6.diff"
-}
-
-src_compile() {
-    # Check to see if we're using nls
-    local myconf
-    if [ -z "`use nls`" ]; then
-        myconf="--disable-nls"
-    fi
-
-    ./configure                            \
-        --prefix=/usr                      \
-        --mandir=/usr/share/man            \
-        --infodir=/usr/share/info          \
-        --enable-static-rnd=linux          \
-        --enable-m-guard --host="${CHOST}" \
-	${myconf} || die
-    emake || die
-}
-
-src_install () {
-    make DESTDIR="${D}" install || die
-    dodoc ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS PROJECTS
-    dodoc README TODO VERSION
-    docinto doc
-    cd doc
-    dodoc  FAQ HACKING DETAILS ChangeLog
-    docinto sgml
-    dodoc gpg.sgml gpgv.sgml
-    dohtml faq.html
-    docinto txt
-    dodoc faq.raw
-    chmod +s "${D}/usr/bin/gpg"
-}
-
-pkg_postinst() {
-    einfo "gpg is installed SUID root to make use of protected memory space"
-    einfo "This is needed in order to have a secure place to store your passphrases,"
-    einfo "etc. at runtime but may make some sysadmins nervous"
-}
diff --git a/app-crypt/gnupg/gnupg-1.0.7.ebuild b/app-crypt/gnupg/gnupg-1.0.7.ebuild
index c8d7b621dd26..4ea2dba37705 100644
--- a/app-crypt/gnupg/gnupg-1.0.7.ebuild
+++ b/app-crypt/gnupg/gnupg-1.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Author Ben Lutgens
+# Author Ben Lutgens <lamer@gentoo.org>
 # $Header: /home/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.0.4.ebuild,v 1.0
 # 2001/04/21 12:45 CST blutgens  Exp $
 
diff --git a/app-crypt/gpgme/gpgme-0.2.3.ebuild b/app-crypt/gpgme/gpgme-0.2.3.ebuild
deleted file mode 100644
index 9ffaa8a340d2..000000000000
--- a/app-crypt/gpgme/gpgme-0.2.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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>
-# $Header: /home/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.0.4.ebuild,v 1.0
-# 2001/04/21 12:45 CST blutgens  Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG easier for applications."
-SRC_URI="ftp://ftp.gnupg.org/gcrypt/alpha/gpgme/${P}.tar.gz"
-HOMEPAGE="http://www.gnupg.org/gpgme.html"
-
-DEPEND="virtual/glibc
-        nls? ( >=sys-devel/gettext-0.10.35 )
-		>=sys-libs/zlib-1.1.3 >=app-crypt/gnupg-1.0.6"
-
-RDEPEND=">=app-crypt/gnupg-1.0.6"
-
-src_compile() {
-
-   local myconf
-   if [ -z "`use nls`" ]; then
-	myconf="--disable-nls"
-   fi
-
-   try ./configure --prefix=/usr --mandir=/usr/share/man \
-	 --infodir=/usr/share/info --host=${CHOST} ${myconf}
-   
-   emake || die
-
-}
-
-src_install () {
-
-   make DESTDIR=${D} install || die
-   dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README README-alpha THANKS TODO
-
-}
diff --git a/app-crypt/gpgme/gpgme-0.3.6.ebuild b/app-crypt/gpgme/gpgme-0.3.6.ebuild
index 9ffaa8a340d2..bbd14400d756 100644
--- a/app-crypt/gpgme/gpgme-0.3.6.ebuild
+++ b/app-crypt/gpgme/gpgme-0.3.6.ebuild
@@ -1,8 +1,7 @@
 # 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>
-# $Header: /home/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.0.4.ebuild,v 1.0
-# 2001/04/21 12:45 CST blutgens  Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-0.3.6.ebuild,v 1.2 2002/06/12 03:23:49 lamer Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG easier for applications."
diff --git a/app-crypt/seahorse/seahorse-0.5.0.ebuild b/app-crypt/seahorse/seahorse-0.5.0.ebuild
index abb2b41c11a0..c8af141c39ec 100644
--- a/app-crypt/seahorse/seahorse-0.5.0.ebuild
+++ b/app-crypt/seahorse/seahorse-0.5.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Author Ben Lutgens <blutgens@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-0.5.0.ebuild,v 1.8 2001/11/10 02:40:17 hallski Exp $
+# Author Ben Lutgens <lamer@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-0.5.0.ebuild,v 1.9 2002/06/12 03:23:49 lamer Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="gnome front end to gnupg"
diff --git a/app-misc/screen/screen-3.9.11-r2.ebuild b/app-misc/screen/screen-3.9.11-r2.ebuild
deleted file mode 100644
index 699a5da421e8..000000000000
--- a/app-misc/screen/screen-3.9.11-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Ben Lutgens
-# $Header: /home/cvsroot/gentoo-x86/app-misc/screen.ebuild,v 1.2 2001/04/21
-# 19:25 CST blutgens Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION=" Screen is a full-screen window manager that multiplexes a
-physical terminal between several processes"
-SRC_URI="ftp://ftp.uni-erlangen.de/pub/utilities/screen/${P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/screen/"
-
-DEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.2"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-src_compile() {
-
-	./configure \
-		--prefix=/usr \
-		--host=${CHOST} \
-		--with-sys-screenrc=/etc/screen/screenrc \
-		--mandir=/usr/share \
-		--libexecdir=/usr/lib/misc || die
-	emake || die
-
-}
-
-src_install () {
-
-	dobin screen
-	insinto /usr/share/terminfo
-	doins terminfo/screencap
-	insinto /etc/screen
-	doins etc/screenrc
-	dodoc README ChangeLog INSTALL COPYING TODO NEWS* \
-	doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
-	doman doc/screen.1
-	doinfo doc/screen.info*
-
-}
diff --git a/app-misc/screen/screen-3.9.11-r3.ebuild b/app-misc/screen/screen-3.9.11-r3.ebuild
index 4d11b1ada744..b4d10bc3d705 100644
--- a/app-misc/screen/screen-3.9.11-r3.ebuild
+++ b/app-misc/screen/screen-3.9.11-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Author Ben Lutgens
+# Author Ben Lutgens <lamer@gentoo.org>
 # $Header: /home/cvsroot/gentoo-x86/app-misc/screen.ebuild,v 1.2 2001/04/21
 # 19:25 CST blutgens Exp $
 
diff --git a/app-text/tkinfo/tkinfo-2.5-r1.ebuild b/app-text/tkinfo/tkinfo-2.5-r1.ebuild
index ee0b83d94a48..980989ffd414 100644
--- a/app-text/tkinfo/tkinfo-2.5-r1.ebuild
+++ b/app-text/tkinfo/tkinfo-2.5-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Author Ben Lutgens <blutgens@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-text/tkinfo/tkinfo-2.5-r1.ebuild,v 1.1 2002/01/15 01:27:50 gbevin Exp $
+# Author Ben Lutgens <lamer@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/app-text/tkinfo/tkinfo-2.5-r1.ebuild,v 1.2 2002/06/12 03:23:50 lamer Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Info Browser in TK"
diff --git a/app-text/tkinfo/tkinfo-2.5.ebuild b/app-text/tkinfo/tkinfo-2.5.ebuild
deleted file mode 100644
index c8ff7f204357..000000000000
--- a/app-text/tkinfo/tkinfo-2.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Ben Lutgens <blutgens@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-text/tkinfo/tkinfo-2.5.ebuild,v 1.2 2001/11/10 02:43:58 hallski Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Info Browser in TK"
-SRC_URI="http://math-www.uni-paderborn.de/~axel/tkinfo/${P}.tar.gz"
-HOMEPAGE="http://math-www.uni-paderborn.de/~axel/tkinfo/"
-
-DEPEND=">=dev-lang/tcl-tk-8.0.5"
-
-
-src_install () {
-
-    dobin tkinfo
-    doman tkinfo.1
-    dodoc README
-
-}
-
-pkg_postinst () {
-
-# Let's check to see if info has been setup completely
-cd /usr/share/info
-if [ -f dir ]; then
-	exit 0;
-else
-	mkinfodir . > dir
-fi
-}
-
diff --git a/dev-util/pharmacy/pharmacy-0.3-r1.ebuild b/dev-util/pharmacy/pharmacy-0.3-r1.ebuild
index f02965226211..c8453e3414c4 100644
--- a/dev-util/pharmacy/pharmacy-0.3-r1.ebuild
+++ b/dev-util/pharmacy/pharmacy-0.3-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Author Ben Lutgens <blutgens@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pharmacy/pharmacy-0.3-r1.ebuild,v 1.3 2002/05/27 17:27:38 drobbins Exp $
+# Author Ben Lutgens <lamer@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pharmacy/pharmacy-0.3-r1.ebuild,v 1.4 2002/06/12 03:23:50 lamer Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Gnome Front-End to CVS"
diff --git a/net-im/everybuddy/everybuddy-0.4.0.ebuild b/net-im/everybuddy/everybuddy-0.4.0.ebuild
index d6e6729e2ae8..bbdbc9d73b94 100644
--- a/net-im/everybuddy/everybuddy-0.4.0.ebuild
+++ b/net-im/everybuddy/everybuddy-0.4.0.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2 
-# Maintainer Bart Verwilst <verwilst@gentoo.org>, Author Ben Lutgens <blutgens@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-im/everybuddy/everybuddy-0.4.0.ebuild,v 1.2 2002/05/23 06:50:15 seemant Exp $
+# Maintainer Bart Verwilst <verwilst@gentoo.org>
+# Author Ben Lutgens <lamer@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/net-im/everybuddy/everybuddy-0.4.0.ebuild,v 1.3 2002/06/12 03:23:50 lamer Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Universal Instant Messaging Client"
diff --git a/net-mail/exim/files/smtp-auth-tls-client-configure b/net-mail/exim/files/smtp-auth-tls-client-configure
deleted file mode 100644
index e1b469532711..000000000000
--- a/net-mail/exim/files/smtp-auth-tls-client-configure
+++ /dev/null
@@ -1,441 +0,0 @@
-#!!# This file is output from the convert4r4 script, which tries
-#!!# to convert Exim 3 configurations into Exim 4 configurations.
-#!!# However, it is not perfect, especially with non-simple
-#!!# configurations. You must check it before running it.
-
-
-#!!# These options specify the Access Control Lists (ACLs) that
-#!!# are used for incoming SMTP messages - after the RCPT and DATA
-#!!# commands, respectively.
-
-acl_smtp_rcpt = check_recipient
-acl_smtp_data = check_message
-
-#!!# This setting defines a named domain list called
-#!!# local_domains, created from the old options that
-#!!# referred to local domains. It will be referenced
-#!!# later on by the syntax "+local_domains".
-#!!# Other domain and host lists may follow.
-
-domainlist local_domains = @ : \
-    localhost : \
-    rtfm.sistina.com
-
-hostlist relay_hosts = localhost
-
-# This is the main exim configuration file.
-# It was originally generated by `eximconfig', part of the exim RPM, but it 
-# may edited by the mail system administrator.
-# This file originally generated by eximconfig at Sat Feb 16 17:35:38 CST 2002
-# See exim info section for details of the things that can be configured here.
-
-# Please see the manual for a complete list
-# of all the runtime configuration options that can be included in a
-# configuration file.
-
-# This file is divided into several parts, all but the last of which are
-# terminated by a line containing the word "end". The parts must appear
-# in the correct order, and all must be present (even if some of them are
-# in fact empty). Blank lines, and lines starting with # are ignored.
-
-######################################################################
-#                    MAIN CONFIGURATION SETTINGS                     #
-######################################################################
-
-# Specify the domain you want to be added to all unqualified addresses
-# here. Unqualified addresses are accepted only from local callers by
-# default. See the receiver_unqualified_{hosts,nets} options if you want
-# to permit unqualified addresses from remote sources. If this option is
-# not set, the primary_hostname value is used for qualification.
-primary_hostname = rtfm.sistina.com
-qualify_domain = sistina.com
-
-# If you want unqualified recipient addresses to be qualified with a different
-# domain to unqualified sender addresses, specify the recipient domain here.
-# If this option is not set, the qualify_domain value is used.
-
-# qualify_recipient =
-
-# Specify your local domains as a colon-separated list here. If this option
-# is not set (i.e. not mentioned in the configuration file), the
-# qualify_recipient value is used as the only local domain. If you do not want
-# to do any local deliveries, uncomment the following line, but do not supply
-# any data for it. This sets local_domains to an empty string, which is not
-# the same as not mentioning it at all. An empty string specifies that there
-# are no local domains; not setting it at all causes the default value (the
-# setting of qualify_recipient) to be used.
-
-
-# Allow mail addressed to our hostname, or to our IP address.
-
-
-# Domains we relay for; that is domains that aren't considered local but we 
-# accept mail for them.
-
-#relay_domains = 
-
-# If this is uncommented, we accept and relay mail for all domains we are 
-# in the DNS as an MX for.
-
-#relay_domains_include_local_mx = true
-
-# No local deliveries will ever be run under the uids of these users (a colon-
-# separated list). An attempt to do so gets changed so that it runs under the
-# uid of "nobody" instead. This is a paranoic safety catch. Note the default
-# setting means you cannot deliver mail addressed to root as if it were a
-# normal user. This isn't usually a problem, as most sites have an alias for
-# root that redirects such mail to a human administrator.
-
-never_users = root
-
-# The setting below causes Exim to do a reverse DNS lookup on all incoming
-# IP calls, in order to get the true host name. If you feel this is too
-# expensive, you can specify the networks for which a lookup is done, or
-# remove the setting entirely.
-
-host_lookup = *
-
-# Exim contains support for the Realtime Blocking List (RBL) that is being 
-# maintained as part of the DNS. See http://maps.vix.com/rbl/ for background.
-# Uncommenting the following line will make Exim reject mail from any
-# host whose IP address is blacklisted in the RBL at maps.vix.com.
-
-#rbl_domains = rbl.maps.vix.com
-#rbl_reject_recipients = false
-#rbl_warn_header = true
-
-# The setting below allows your host to be used as a mail relay only by
-# localhost: it locks out the use of your host as a mail relay by any
-# other host. See the section of the manual entitled "Control of relaying" 
-# for more info.
-
-
-# If you want Exim to support the "percent hack" for all your local domains,
-# uncomment the following line. This is the feature by which mail addressed
-# to x%y@z (where z is one of your local domains) is locally rerouted to
-# x@y and sent on. Otherwise x%y is treated as an ordinary local part
-
-# percent_hack_domains=*
-
-# If this option is set, then any process that is running as one of the
-# listed users may pass a message to Exim and specify the sender's
-# address using the "-f" command line option, without Exim's adding a
-# "Sender" header.
-
-trusted_users = mail
-
-# If this option is true, the SMTP command VRFY is supported on incoming
-# SMTP connections; otherwise it is not.
-
-
-# Some operating systems use the "gecos" field in the system password file
-# to hold other information in addition to users' real names. Exim looks up
-# this field when it is creating "sender" and "from" headers. If these options
-# are set, exim uses "gecos_pattern" to parse the gecos field, and then
-# expands "gecos_name" as the user's name. $1 etc refer to sub-fields matched
-# by the pattern.
-
-gecos_pattern = ^([^,:]*)
-gecos_name = $1
-
-# This sets the maximum number of messages that will be accepted in one
-# connection. The default is 10, which is probably enough for most purposes,
-# but is too low on dialup SMTP systems, which often have many more mails
-# queued for them when they connect.
-
-smtp_accept_queue_per_connection = 100
-
-# Send a mail to the postmaster when a message is frozen. There are many
-# reasons this could happen; one is if exim cannot deliver a mail with no
-# return address (normally a bounce) another that may be common on dialup
-# systems is if a DNS lookup of a smarthost fails. Read the documentation
-# for more details: you might like to look at the auto_thaw option
-
-#!!# freeze_tell_mailmaster replaced by freeze_tell
-freeze_tell = postmaster
-
-# This string defines the contents of the \`Received' message header that
-# is added to each message, except for the timestamp, which is automatically
-# added on at the end, preceded by a semicolon. The string is expanded each
-# time it is used.
-
-received_header_text = "Received: \
-         ${if def:sender_rcvhost {from ${sender_rcvhost}\n\t}\
-         {${if def:sender_ident {from ${sender_ident} }}\
-         ${if def:sender_helo_name {(helo=${sender_helo_name})\n\t}}}}\
-         by ${primary_hostname} \
-         ${if def:received_protocol {with ${received_protocol}}} \
-         (Exim ${version_number} #${compile_number} (Debian))\n\t\
-         id ${message_id}\
-         ${if def:received_for {\n\tfor <$received_for>}}"
-
-#!!#######################################################!!#
-#!!# This new section of the configuration contains ACLs #!!#
-#!!# (Access Control Lists) derived from the Exim 3      #!!#
-#!!# policy control options.                             #!!#
-#!!#######################################################!!#
-
-#!!# These ACLs are crudely constructed from Exim 3 options.
-#!!# They are almost certainly not optimal. You should study
-#!!# them and rewrite as necessary.
-
-begin acl
-
-#!!# ACL that is used after the RCPT command
-check_recipient:
-  # Exim 3 had no checking on -bs messages, so for compatibility
-  # we accept if the source is local SMTP (i.e. not over TCP/IP).
-  # We do this by testing for an empty sending host field.
-  accept  hosts = :
-  accept  domains = +local_domains
-  accept  hosts = +relay_hosts
-  deny    message = relay not permitted
-
-#!!# ACL that is used after the DATA command
-check_message:
-  accept
-
-#####################################################################
-#		AUTHENTICATION CONFIGURATION			    #
-#####################################################################
-
-
-begin authenticators
-
-plain:
-	driver = plaintext
-	public_name = LOGIN
-	client_send = blutgens : quo7quee
-
-
-
-######################################################################
-#                      REWRITE CONFIGURATION                         #
-######################################################################
-
-
-# There are no rewriting specifications in this default configuration file.
-
-
-# This is an example of a useful rewriting rule---it looks up the real
-# address of all local users in a file
-
-# *@rtfm.sistina.com    ${lookup{$1}lsearch{/etc/email-addresses}\
-#						{$value}fail} bcfrF
-
-begin rewrite
-
-*@rtfm.sistina.com $1@sistina.com Ffrs
-
-#!!#######################################################!!#
-#!!# Here follow routers created from the old routers,   #!!#
-#!!# for handling non-local domains.                     #!!#
-#!!#######################################################!!#
-
-begin routers
-
-
-
-######################################################################
-#                      ROUTERS CONFIGURATION                         #
-#            Specifies how remote addresses are handled              #
-######################################################################
-#                          ORDER DOES MATTER                         #
-#  A remote address is passed to each in turn until it is accepted.  #
-######################################################################
-
-# Remote addresses are those with a domain that does not match any item
-# in the "local_domains" setting above.
-
-# Send all mail to a smarthost
-
-smarthost:
-  driver = manualroute
-  domains = ! +local_domains
-  route_list = * mail.sistina.com bydns
-  transport = remote_smtp
-  no_more
-
-
-#!!#######################################################!!#
-#!!# Here follow routers created from the old directors, #!!#
-#!!# for handling local domains.                         #!!#
-#!!#######################################################!!#
-
-
-######################################################################
-#                      DIRECTORS CONFIGURATION                       #
-#             Specifies how local addresses are handled              #
-######################################################################
-#                          ORDER DOES MATTER                         #
-#   A local address is passed to each in turn until it is accepted.  #
-######################################################################
-
-# This allows local delivery to be forced, avoiding alias files and
-# forwarding.
-
-real_local:
-#!!# prefix renamed local_part_prefix
-  driver = accept
-  check_local_user
-  local_part_prefix = real-
-  transport = local_delivery
-
-# This director handles aliasing using a traditional /etc/aliases file.
-# If any of your aliases expand to pipes or files, you will need to set
-# up a user and a group for these deliveries to run under. You can do
-# this by uncommenting the "user" option below (changing the user name
-# as appropriate) and adding a "group" option if necessary.
-
-system_aliases:
-  driver = redirect
-  allow_defer
-  allow_fail
-  data = ${lookup{$local_part}lsearch{/etc/aliases}}
-  file_transport = address_file
-  pipe_transport = address_pipe
-  retry_use_local_part
-# user = list
-# Uncomment the above line if you are running smartlist
-
-# This director handles forwarding using traditional .forward files.
-# It also allows mail filtering when a forward file starts with the 
-# string "# Exim filter": to disable filtering, uncomment the "filter" 
-# option. The check_ancestor option means that if the forward file 
-# generates an address that is an ancestor of the current one, the 
-# current one gets passed on instead. This covers the case where A is 
-# aliased to B and B has a .forward file pointing to A.
-
-# For standard debian setup of one group per user, it is acceptable---normal
-# even---for .forward to be group writable. If you have everyone in one
-# group, you should comment out the "modemask" line. Without it, the exim
-# default of 022 will apply, which is probably what you want.
-
-userforward:
-#!!# filter renamed allow_filter
-  driver = redirect
-  allow_filter
-  check_ancestor
-  check_local_user
-  file = $home/.forward
-  directory_transport = address_directory
-  modemask = 002
-  user = ${local_part}
-  pipe_transport = address_pipe
-  reply_transport = address_reply
-  no_verify
-
-# This director matches local user mailboxes.
-
-localuser:
-  driver = accept
-  check_local_user
-  transport = local_delivery
-
-
-
-######################################################################
-#                      TRANSPORTS CONFIGURATION                      #
-######################################################################
-#                       ORDER DOES NOT MATTER                        #
-#     Only one appropriate transport is called for each delivery.    #
-######################################################################
-
-# This transport is used for local delivery to user mailboxes. On debian
-# systems group mail is used so we can write to the /var/spool/mail
-# directory. (The alternative, which most other unixes use, is to deliver
-# as the user's own group, into a sticky-bitted directory)
-
-begin transports
-
-local_delivery:
-  driver = appendfile
-  envelope_to_add
-  maildir_format
-  directory  = /home/${local_part}/.maildir/
-  group = mail
-  mode = 0660
-  no_mode_fail_narrower
-
-# This transport is used for handling pipe addresses generated by alias
-# or .forward files. It has a conventional name, since it is not actually
-# mentioned elsewhere in this configuration file. (A different name *can*
-# be specified via the "address_pipe_transport" option if you really want
-# to.) If the pipe generates any standard output, it is returned to the sender
-# of the message as a delivery error. Set return_fail_output instead if you
-# want this to happen only when the pipe fails to complete normally.
-
-address_pipe:
-  driver = pipe
-  return_output
-
-# This transport is used for handling file addresses generated by alias
-# or .forward files. It has a conventional name, since it is not actually
-# mentioned elsewhere in this configuration file.
-
-address_file:
-  driver = appendfile
-
-address_directory:
-	driver = appendfile
-	maildir_format
-# This transport is used for handling file addresses generated by alias
-# or .forward files if the path ends in "/", which causes it to be treated
-# as a directory name rather than a file name. Each message is then delivered
-# to a unique file in the directory. If instead you want all such deliveries to
-# be in the "maildir" format that is used by some other mail software,
-# uncomment the final option below. If this is done, the directory specified
-# in the .forward or alias file is the base maildir directory.
-#
-# Should you want to be able to specify either maildir or non-maildir
-# directory-style deliveries, then you must set up yet another transport,
-# called address_directory2. This is used if the path ends in "//" so should
-# be the one used for maildir, as the double slash suggests another level
-# of directory. In the absence of address_directory2, paths ending in //
-# are passed to address_directory.
-
-address_directory:
-#!!# prefix renamed message_prefix
-#!!# suffix renamed message_suffix
-#!!# no_from_hack replaced by check_string
-  driver = appendfile
-  check_string = 
-  message_prefix = ""
-  message_suffix = ""
-#  maildir_format
-
-# This transport is used for handling autoreplies generated by the filtering
-# option of the forwardfile director. It has a conventional name, since it
-# is not actually mentioned elsewhere in this configuration file.
-
-address_reply:
-  driver = autoreply
-
-# This transport is used for delivering messages over SMTP connections.
-remote_smtp:
-#!!# authenticate_hosts renamed hosts_try_auth
-  driver = smtp
-  hosts_try_auth = *
-
-
-
-######################################################################
-#                      RETRY CONFIGURATION                           #
-######################################################################
-
-# This single retry rule applies to all domains and all errors. It specifies
-# retries every 15 minutes for 2 hours, then increasing retry intervals,
-# starting at 2 hours and increasing each time by a factor of 1.5, up to 16
-# hours, then retries every 8 hours until 4 days have passed since the first
-# failed delivery.
-
-# Domain               Error       Retries
-# ------               -----       -------
-
-
-begin retry
-
-*                      *           F,2h,15m; G,16h,2h,1.5; F,4d,8h
-
-
-# End of Exim 4 configuration
diff --git a/net-mail/lbdb/lbdb-0.24.ebuild b/net-mail/lbdb/lbdb-0.24.ebuild
index 9a8b102679fa..e8714bac0d23 100644
--- a/net-mail/lbdb/lbdb-0.24.ebuild
+++ b/net-mail/lbdb/lbdb-0.24.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Author Ben Lutgens <blutgens@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-mail/lbdb/lbdb-0.24.ebuild,v 1.2 2002/04/27 20:23:13 seemant Exp $
+# Author Ben Lutgens <lamer@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/net-mail/lbdb/lbdb-0.24.ebuild,v 1.3 2002/06/12 03:23:50 lamer Exp $
 
 MY_P=${P/-/_}
 S=${WORKDIR}/${P}
diff --git a/net-misc/tsocks/ChangeLog b/net-misc/tsocks/ChangeLog
new file mode 100644
index 000000000000..c8ea7cb7289e
--- /dev/null
+++ b/net-misc/tsocks/ChangeLog
@@ -0,0 +1,12 @@
+# ChangeLog for net-misc/tsocks
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tsocks/ChangeLog,v 1.1 2002/06/12 03:23:50 lamer Exp $
+
+*tsocks-1.8beta4  (10 Jun 2002)
+
+  10 Jun 2002; Ben Lutgens <lamer@gentoo.org> tsocks-1.8_beta4: Ebuild for
+  tsocks submitted to bugs.gentoo.org by a gentoo user *THANKS*
+  bardur-gta@odense.kollegienet.dk. It should be noted that as per the
+  install docs, this stuff gets installed to /lib. Mainly due to the fact
+  that it's often needed before /usr gets mounted. So the old
+  /etc/ld.so.preload trick won't work!
diff --git a/net-misc/tsocks/files/digest-tsocks-1.8_beta4 b/net-misc/tsocks/files/digest-tsocks-1.8_beta4
new file mode 100644
index 000000000000..9f6086e74091
--- /dev/null
+++ b/net-misc/tsocks/files/digest-tsocks-1.8_beta4
@@ -0,0 +1 @@
+MD5 8e8bd8ddf13047f9b9651304bb2ecc54 tsocks-1.8beta4.tar.gz 82206
diff --git a/net-misc/tsocks/tsocks-1.8_beta4.ebuild b/net-misc/tsocks/tsocks-1.8_beta4.ebuild
new file mode 100644
index 000000000000..0776b3fe5b19
--- /dev/null
+++ b/net-misc/tsocks/tsocks-1.8_beta4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# Maintainer: Ben Lutgens <lamer@gentoo.org>
+# Author: Bardur Arantsson <bardur-gta@odense.kollegienet.dk>
+
+DESCRIPTION="Transparent SOCKS v4 proxying library."
+HOMEPAGE="http://tsocks.sourceforge.net/"
+LICENSE="GPL-2"
+DEPEND="virtual/glibc"
+SRC_URI="http://ftp1.sourceforge.net/${PN}/${PN}-1.8beta4.tar.gz"
+
+S=${WORKDIR}/tsocks-1.8
+
+src_compile() {
+	# NOTE: the docs say to install it into /lib. If you put it into
+	# /usr/lib and add it to /etc/ld.so.preload on many systems /usr isn't
+	# mounted in time :-( (Ben Lutgens) <lamer@gentoo.org> 
+	try ./configure \
+		--host=${CHOST} \
+		--prefix=/usr \
+		--with-conf=/etc/socks/tsocks.conf \
+		--mandir=/usr/share/man
+	try emake
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+	insinto /etc/socks
+	doins tsocks.conf.*.example
+	dodoc INSTALL
+	# tsocks script is buggy so we need this symlink
+	dodir /usr/lib
+	dosym /lib/libtsocks.so /usr/lib/libtsocks.so
+}
+
+pkg_postinst () {
+	einfo "Make sure you create /etc/socks/socks.conf from on of the
+	examples in that directory"
+}
diff --git a/net-www/galeon/galeon-1.2.3-r1.ebuild b/net-www/galeon/galeon-1.2.3-r1.ebuild
index cbad2d51e374..eb85ebc14694 100644
--- a/net-www/galeon/galeon-1.2.3-r1.ebuild
+++ b/net-www/galeon/galeon-1.2.3-r1.ebuild
@@ -8,7 +8,7 @@ SRC_URI="http://download.sourceforge.net/${PN}/${P}.tar.gz
 	 mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://galeon.sourceforge.net"
 
-DEPEND="~net-www/mozilla-1.0_rc3
+DEPEND="~net-www/mozilla-1.0-r1
 	>=gnome-base/gnome-libs-1.4.1.4
 	( >=gnome-base/libglade-0.17
 	  <gnome-base/libglade-1.99.0 )
diff --git a/profiles/package.mask b/profiles/package.mask
index fed2a6d7ae33..ae97593075e9 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -648,6 +648,8 @@ dev-lang/tcl-tk
 # spider@gentoo.org ; 21 May 2002; 
 # =x11-libs/gtk+-1.2* doesn't work
 # this is now the gnome2 big bloated mask!
+<<<<<<< package.mask
+=======
 # (gnome-2 that is ;)
 >=x11-libs/gtk-engines-1.9.0
 >=gnome-base/libglade-1.99.10-r1
@@ -733,7 +735,12 @@ gnome-extra/libglademm
 gnome-extra/libgnomecanvasmm
 gnome-extra/libgnomemm
 gnome-extra/libgnomeuimm
+<<<<<<< package.mask
+>>>>>>> 1.738
+
+=======
 #
+>>>>>>> 1.770
 # mkennedy@gentoo.org 14 Apr 2002
 # Beta, so masked for now. See also bug 1662.
 =app-arch/rar-3.0_beta5
diff --git a/sys-apps/pcmcia-cs/pcmcia-cs-3.1.33-r4.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.1.33-r4.ebuild
index d9c21b687378..4c9672307f61 100644
--- a/sys-apps/pcmcia-cs/pcmcia-cs-3.1.33-r4.ebuild
+++ b/sys-apps/pcmcia-cs/pcmcia-cs-3.1.33-r4.ebuild
@@ -2,15 +2,15 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: System Team <system@gentoo.org>
 # Author: Craig Joly <joly@ee.ualberta.ca>, Daniel Robbins <drobbins@gentoo.org>, Karl Trygve Kalleberg <karltk@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.1.33-r4.ebuild,v 1.2 2002/05/27 17:27:39 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.1.33-r4.ebuild,v 1.3 2002/06/12 03:23:50 lamer Exp $
 
 # This ebuild installs ${FILESDIR}/hermes.conf, which you can get from
 # http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/hermes.conf
 
 S=${WORKDIR}/${P}
 DESCRIPTION="PCMCIA tools for Linux"
-SRC_URI="mirror://sourceforge/pcmcia-cs/${P}.tar.gz
-	http://ozlabs.org/people/dgibson/dldwd/orinoco-0.11a.tar.gz"
+SRC_URI="mirror://sourceforge/pcmcia-cs/${P}.tar.gz"
+#	http://ozlabs.org/people/dgibson/dldwd/orinoco-0.11a.tar.gz"
 HOMEPAGE="http://pcmcia-cs.sourceforge.net"
 DEPEND="sys-kernel/linux-headers"
 RDEPEND=""
@@ -18,17 +18,17 @@ RDEPEND=""
 # Note: To use this ebuild, you should have the usr/src/linux symlink to 
 # the kernel directory that pcmcia-cs should use for configuration.
 
-src_unpack() {
-	unpack ${P}.tar.gz
-	unpack orinoco-0.11a.tar.gz
-	cd ${S}
-	mv ../orinoco-0.11a/hermes*.{c,h} \
-		../orinoco-0.11a/orinoco*.{c,h} \
-		../orinoco-0.11a/ieee802_11.h wireless/
-	cp Configure Configure.orig
-	sed -e 's:usr/man:usr/share/man:g' Configure.orig > Configure
-	#man pages will now install into /usr/share/man
-}
+#src_unpack() {
+#	unpack ${P}.tar.gz
+#	unpack orinoco-0.11a.tar.gz
+#	cd ${S}
+#	mv ../orinoco-0.11a/hermes*.{c,h} \
+#		../orinoco-0.11a/orinoco*.{c,h} \
+#		../orinoco-0.11a/ieee802_11.h wireless/
+#	cp Configure Configure.orig
+#	sed -e 's:usr/man:usr/share/man:g' Configure.orig > Configure
+#	#man pages will now install into /usr/share/man
+#}
 
 src_compile() {
 	local myconf
@@ -90,7 +90,7 @@ src_install () {
 	newins ${FILESDIR}/pcmcia.conf pcmcia
 
 	exeinto /etc/pcmcia
-	doexe ${FILESDIR}/network
+#	doexe ${FILESDIR}/network
 
 	# install our own init script
 	exeinto /etc/init.d
diff --git a/x11-misc/gkrellm-volume/gkrellm-volume-0.8-r1.ebuild b/x11-misc/gkrellm-volume/gkrellm-volume-0.8-r1.ebuild
index 8542470f0451..d087cfcf06e2 100644
--- a/x11-misc/gkrellm-volume/gkrellm-volume-0.8-r1.ebuild
+++ b/x11-misc/gkrellm-volume/gkrellm-volume-0.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Author Ben Lutgens <blutgens@gentoo.org?
+# Author Ben Lutgens <lamer@gentoo.org>
 # $Header: /home/cvsroot/gentoo-x86/app-misc/gkrellm-volume-0.8.ebuild,v 1.0 
 # 26 Apr 2001 21:30 CST blutgens Exp $
 
diff --git a/x11-misc/gkrellmms/gkrellmms-0.5.5-r1.ebuild b/x11-misc/gkrellmms/gkrellmms-0.5.5-r1.ebuild
deleted file mode 100644
index aa8aa96dc8dd..000000000000
--- a/x11-misc/gkrellmms/gkrellmms-0.5.5-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Ben Lutgens <blutgens@gentoo.org>, updated for new Gkrellm by Seemant
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/gkrellmms/gkrellmms-0.5.5-r1.ebuild,v 1.3 2002/04/14 15:52:14 seemant Exp $
-
-S=${WORKDIR}/${PN}
-DESCRIPTION="A sweet plugin to controll xmms from gkrellm"
-SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"
-HOMEPAGE="http://gkrellm.luon.net/gkrellm/Plugins.html"
-
-DEPEND=">=app-admin/gkrellm-1.2.9
-        >=media-sound/xmms-1.2.4"
-
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	patch -p0 < ${FILESDIR}/${PN}-patch-0.5.5 || die
-}
-
-src_compile() {
-	
-	emake || die
-
-}
-
-src_install () {
-
-    exeinto /usr/lib/gkrellm/plugins
-    doexe gkrellmms.so
-    dodoc README ChangeLog FAQ Themes
-}
diff --git a/x11-misc/gkrellmms/gkrellmms-0.5.6.ebuild b/x11-misc/gkrellmms/gkrellmms-0.5.6.ebuild
index 09ff6c59bfa3..d6b1f6bd0846 100644
--- a/x11-misc/gkrellmms/gkrellmms-0.5.6.ebuild
+++ b/x11-misc/gkrellmms/gkrellmms-0.5.6.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Author Ben Lutgens <blutgens@gentoo.org>, updated for new Gkrellm by Seemant
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/gkrellmms/gkrellmms-0.5.6.ebuild,v 1.1 2002/05/28 03:05:29 seemant Exp $
+# Author Ben Lutgens <lamer@gentoo.org>, updated for new Gkrellm by Seemant
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gkrellmms/gkrellmms-0.5.6.ebuild,v 1.2 2002/06/12 03:23:50 lamer Exp $
 
 S=${WORKDIR}/${PN}
 DESCRIPTION="A sweet plugin to controll xmms from gkrellm"
diff --git a/x11-misc/gkrellmwireless/gkrellmwireless-0.2.2.ebuild b/x11-misc/gkrellmwireless/gkrellmwireless-0.2.2.ebuild
index 201db30eae7b..39cfb35cb594 100644
--- a/x11-misc/gkrellmwireless/gkrellmwireless-0.2.2.ebuild
+++ b/x11-misc/gkrellmwireless/gkrellmwireless-0.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Author Ben Lutgens <blutgens@gentoo.org>
+# Author Ben Lutgens <lamer@gentoo.org>
 # $Header: /home/cvsroot/gentoo-x86/app-misc/gkrellm-volume-0.8.ebuild,v 1.0 
 # 26 Apr 2001 21:30 CST blutgens Exp $
 
diff --git a/x11-misc/gkrellweather/gkrellweather-0.2.7-r2.ebuild b/x11-misc/gkrellweather/gkrellweather-0.2.7-r2.ebuild
index 2852d5189f0c..1f44d3c8a9cd 100644
--- a/x11-misc/gkrellweather/gkrellweather-0.2.7-r2.ebuild
+++ b/x11-misc/gkrellweather/gkrellweather-0.2.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Author Ben Lutgens <blutgens@gentoo.org>
+# Author Ben Lutgens <lamer@gentoo.org>
 # $Header: /home/cvsroot/gentoo-x86/app-misc/gkrellm-volume-0.8.ebuild,v 1.0 
 # 26 Apr 2001 21:30 CST blutgens Exp $