Glibc-2.2 Updates

1 files changed, 27 insertions, 13 deletions

diff --git a/current-packages b/current-packages
index 33fc5af8dc6b..87e65296405f 100644
--- a/current-packages
+++ b/current-packages
@@ -128,7 +128,6 @@
 ./app-text/freefonts/freefonts-0.10.ebuild
 ./app-text/sharefonts/sharefonts-0.10.ebuild
 ./app-text/jadetex/jadetex-2.20.ebuild
-./app-text/sgml-common/sgml-common-0.3.ebuild
 ./app-text/ghostscript/ghostscript-6.23-r2.ebuild
 ./app-text/html-xml-utils/html-xml-utils-1.3.ebuild
 ./app-text/metamail/metamail-2.7-r1.ebuild
@@ -136,10 +135,11 @@
 ./app-text/pspell/pspell-0.11.2.ebuild
 ./app-text/rcs/rcs-5.7.ebuild
 ./app-text/sablotron/sablotron-0.44.ebuild
+./app-text/sgml-common/sgml-common-0.3.ebuild
 ./app-text/sgml2x/sgml2x-0.11-r1.ebuild
 ./app-text/tetex/tetex-1.0.7-r1.ebuild
 ./app-text/ttf2pt1/ttf2pt1-3.3.0.ebuild
-./dev-db/berkley-db/berkley-db-3.1.17.ebuild
+#./dev-db/berkley-db/berkley-db-3.1.17.ebuild
 ./dev-db/mysql/mysql-3.23.26.ebuild
 ./dev-java/fesi/fesi-1.ebuild
 ./dev-java/jndi/jndi-1.2.1-r1.ebuild
@@ -150,7 +150,7 @@
 #./dev-lang/php-4/php-4.0.0-r1.ebuild
 ./dev-lang/php-4/php-4.0.3_p1.ebuild
 ./dev-lang/python/python-1.5.2-r2.ebuild
-./dev-lang/tcl-tk-8.0/tcl-tk-8.0.5-r1.ebuild
+#./dev-lang/tcl-tk-8.0/tcl-tk-8.0.5-r1.ebuild
 ./dev-lang/tcl-tk-8.1/tcl-tk-8.1.1-r1.ebuild
 ./dev-libs/g-wrap/g-wrap-0.9.5.ebuild
 ./dev-libs/glib/glib-1.2.8-r1.ebuild
@@ -193,10 +193,10 @@
 ./dev-perl/perl-tk/perl-tk800-022.ebuild
 ./dev-python/gnome-python/gnome-python-1.0.53-r1.ebuild
 ./dev-util/cvs/cvs-1.11.ebuild
-./dev-util/guile/guile-1.4-r1.ebuild
+./dev-util/guile/guile-1.4-r2.ebuild
 ./dev-util/lincvs/lincvs-0.3_beta1.ebuild
 ./dev-util/sel/sel-0.08.2.ebuild
-./dev-util/strace/strace-4.2.ebuild
+./dev-util/strace/strace-4.2-r2.ebuild
 ./dev-util/yacc/yacc-1.9.1-r1.ebuild
 ./media-gfx/aview/aview-1.2.ebuild
 ./media-gfx/autotrace/autotrace-0.24a.ebuild
@@ -209,6 +209,7 @@
 ./media-libs/alsa-lib/alsa-lib-0.5.9.ebuild
 ./media-libs/audiofile/audiofile-0.1.9.ebuild
 ./media-libs/avifile/avifile-0.48.ebuild
+#./media-libs/avifile/avifile-0.49.ebuild
 ./media-libs/fnlib/fnlib-0.5.ebuild
 ./media-libs/freetype/freetype-1.3.1-r1.ebuild
 ./media-libs/giflib/giflib-4.1.0-r1.ebuild
@@ -219,7 +220,12 @@
 ./media-libs/libmikmod/libmikmod-3.1.9-r1.ebuild
 ./media-libs/libmng/libmng-0.9.3.ebuild
 ./media-libs/libpng/libpng-1.0.8-r1.ebuild
+<<<<<<< current-packages
+#./media-libs/libpng/libpng-1.0.7.ebuild
+./media-libs/libsdl/libsdl-1.1.6.ebuild
+=======
 ./media-libs/libsdl/libsdl-1.1.6.ebuild
+>>>>>>> 1.112
 #./media-libs/libungif/libungif-4.1.0_beta1-r1.ebuild
 ./media-libs/mesa/mesa-glu-3.2.1.ebuild
 ./media-libs/mpeg-lib/mpeg-lib-1.3.1.ebuild
@@ -254,7 +260,7 @@
 ./net-analyzer/ethereal/ethereal-0.8.12.ebuild
 ./net-analyzer/nessus/nessus-1.0.5.ebuild
 ./net-analyzer/ngrep/ngrep-1.38-r1.ebuild
-./net-analyzer/ntop/ntop-1.3.1-r1.ebuild
+./net-analyzer/ntop/ntop-1.3.1-r2.ebuild
 ./net-analyzer/rrdtool/rrdtool-1.0.28.ebuild
 ./net-analyzer/tcpdump/tcpdump-3.5.2.ebuild
 ./net-analyzer/tcpstat/tcpstat-1.3.ebuild
@@ -277,13 +283,13 @@
 ./net-libs/libwww/libwww-5.3.1.ebuild
 ./net-libs/nss_ldap/nss_ldap-113.ebuild
 ./net-libs/pam_ldap/pam_ldap-70.ebuild
-./net-mail/amavis/amavis-0.2.1.ebuild
-./net-mail/exim/exim-3.16.ebuild
+./net-mail/amavis/amavis-0.2.1-r2.ebuild
+#./net-mail/exim/exim-3.16.ebuild
 ./net-mail/fetchmail/fetchmail-5.5.1.ebuild
 ./net-mail/maildrop/maildrop/1.2.2.ebuild
 ./net-mail/mutt/mutt-1.2.5-r1.ebuild
-./net-mail/pine-maildir/pine-maildir-4.21-r1.ebuild
-./net-mail/pine/pine-4.21-r1.ebuild
+./net-mail/pine-maildir/pine-maildir-4.21-r2.ebuild
+./net-mail/pine/pine-4.21-r2.ebuild
 #./net-mail/qmail-ldap/qmail-ldap-1.03.20000701-r1.ebuild
 #./net-mail/qmail-mysql/qmail-mysql-1.03-r1.ebuild
 ./net-mail/qmail/qmail-1.03-r1.ebuild
@@ -299,7 +305,7 @@
 ./net-misc/netkit-rsh/netkit-rsh-0.17-r1.ebuild
 ./net-misc/netkit-talk/netkit-talk-0.17-r1.ebuild
 ./net-misc/netkit-telnetd/netkit-telnetd-0.17-r1.ebuild
-./net-misc/netkit-timed/netkit-timed-0.17-r1.ebuild
+./net-misc/netkit-timed/netkit-timed-0.17-r2.ebuild
 ./net-misc/nut/nut-0.44.1.ebuild
 ./net-misc/openssh/openssh-2.2.0_p1.ebuild
 ./net-misc/rsync/rsync-2.4.6.ebuild
@@ -347,15 +353,22 @@
 ./gnome-base/ORBit/ORBit-0.5.3.ebuild
 ./gnome-base/bonobo/bonobo-0.18.ebuild
 #./gnome-base/bonobo/bonobo-0.20.ebuild
+#./gnome-base/bonobo/bonobo-0.26.ebuild
 ./gnome-base/control-center/control-center-1.2.2.ebuild
+#./gnome-base/control-center/control-center-1.3.1.ebuild
 ./gnome-base/gconf/gconf-0.8.ebuild
+#./gnome-base/gconf/gconf-0.9.ebuild
 ./gnome-base/gdk-pixbuf/gdk-pixbuf-0.9.0.ebuild
 ./gnome-base/gnome-applets/gnome-applets-1.2.2.ebuild
+#./gnome-base/gnome-applets/gnome-applets-1.2.3.ebuild
 ./gnome-base/gnome-core/gnome-core-1.2.2.1.ebuild
+#./gnome-base/gnome-core/gnome-core-1.2.3.ebuild
 ./gnome-base/gnome-libs/gnome-libs-1.2.4.ebuild
+#./gnome-base/gnome-libs/gnome-libs-1.2.8.ebuild
 ./gnome-base/gnome-print/gnome-print-0.24.ebuild
 ./gnome-base/gnome-vfs/gnome-vfs-0.3.1.ebuild
 ./gnome-base/gtkhtml/gtkhtml-0.6.1.ebuild
+#./gnome-base/gtkhtml/gtkhtml-0.7.ebuild
 ./gnome-base/libghttp/libghttp-1.0.7.ebuild
 ./gnome-base/libglade/libglade-0.14.ebuild
 ./gnome-base/libgtop/libgtop-1.0.9.ebuild
@@ -366,6 +379,7 @@
 ./gnome-libs/gal/gal-0.1.ebuild
 ./gnome-libs/libgda/libgda-0.1.0.ebuild
 ./gnome-libs/libole2/libole2-0.1.6.ebuild
+#./gnome-libs/libole2/libole2-0.1.7.ebuild
 ./gnome-libs/libunicode/libunicode-0.4.ebuild
 ./gnome-apps/bug-buddy/bug-buddy-1.1.ebuild
 ./gnome-apps/ee/ee-0.3.12.ebuild
@@ -386,7 +400,7 @@
 ./gnome-apps/gupsc/gupsc-0.3.0.ebuild
 ./gnome-apps/medusa/medusa-0.2.ebuild
 ./gnome-apps/nautilus/nautilus-0.1.0.ebuild
-./gnome-apps/nmap/nmap-2.53.ebuild
+./gnome-apps/nmap/nmap-2.53-r2.ebuild
 ./gnome-apps/powershell/powershell-0.80.ebuild
 ./gnome-apps/users-guide/users-guide-1.2.ebuild
 ./gnome-office/abiword/abiword-0.7.11.ebuild
@@ -408,6 +422,6 @@
 ./kde-apps/kdepim/kdepim-2.0.ebuild
 ./kde-apps/kdeutils/kdeutils-2.0.ebuild
 ./kde-apps/kdoc/kdoc-2.0.ebuild
-./kde-apps/kmago/kmago-0.3.1.ebuild
+./kde-apps/kmago/kmago-0.5.ebuild
 ./kde-apps/koffice/koffice-2.0.ebuild
 ./kde-apps/krusader/krusader-0.65.1.ebuild