*** empty log message ***

6 files changed, 96 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 5e386b312403..17b278692485 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+<<<<<<< ChangeLog
+28.09.2000
+
+	- New kde-apps/kmago 0.1		(achim)
+	  [ Download App ]
+	- New gcc-2.96-snapshot			(achim)
+	  [ Not default ]
+	- New glibc-2.1.94			(achim)
+	  [ Not default ]
+	- Update binutils 2.10.0.24 -> 2.10.0.26(achim)
+	- Update linux 2.2.17-r1 -> r2		(achim)
+	  [ New reiserfs version ]
+	- Update linux 2.4.0-test9-pre7		(achim)
+	  [ Not default ]
+26.09.2000
+
+	- Update openssl 0.9.5a -> 0.9.6	(achim)
+	- Update modutils 2.3.16 -> 2.3.17	(achim)
+	- Update gimp 1.1.25 -> 1.1.26		(achim)
+21.09.2000
+=======
 25.09.2000
 	- Updated megatouch (sys-apps/portage) 	(drobbins)
 	- Minor syntax fix for qmail-mysql	(drobbins)
@@ -6,10 +27,18 @@
 	- Added sys-apps/ed (GNU ed 0.2)	(drobbins)
 	- Removed app-editors/ed		(drobbins)
 	- New sys-apps/bootdisk			(drobbins)
-
+>>>>>>> 1.70
+
+<<<<<<< ChangeLog
+	- Update sawfish 0.30.3 -> 0.31		(achim)
+	- Update rep-gtk 0.13a -> 0.14		(achim)
+	- Update librep 0.12.4 -> 0.13		(achim)
+	- Update cvs 1.10.8 -> 1.11		(achim)
+=======
 21.09.2000
 	- sys-apps/bash now compiles statically	(drobbins)
 	- Fixes for portage			(drobbins)
+>>>>>>> 1.70
 	- Update gimp-print 4.0a3 -> 4.0b1	(achim)
 
 20.09.2000
diff --git a/current-packages b/current-packages
index d8e35fc9f421..9ac24871ba7a 100644
--- a/current-packages
+++ b/current-packages
@@ -24,7 +24,7 @@
 ./sys-apps/logrotate/logrotate-3.3-r1.ebuild
 ./sys-apps/man/man-1.5.1h-r1.ebuild
 ./sys-apps/mkisofs/mkisofs-1.13-r1.ebuild
-./sys-apps/modutils/modutils-2.3.16.ebuild
+./sys-apps/modutils/modutils-2.3.17.ebuild
 ./sys-apps/most/most-4.9.0-r1.ebuild
 ./sys-apps/net-tools/net-tools-1.57-r1.ebuild
 ./sys-apps/netkit-base/netkit-base-0.17-r1.ebuild
@@ -54,7 +54,7 @@
 ./sys-devel/automake/automake-1.4-r1.ebuild
 ./sys-devel/bc/bc-1.05a-r1.ebuild
 ./sys-devel/bin86/bin86-0.15.1.ebuild
-./sys-devel/binutils/binutils-2.10.0.24.ebuild
+./sys-devel/binutils/binutils-2.10.0.26.ebuild
 ./sys-devel/bison/bison-1.28-r1.ebuild
 ./sys-devel/flex/flex-2.5.4a-r1.ebuild
 ./sys-devel/gcc/gcc-2.95.2-r1.ebuild
@@ -66,7 +66,7 @@
 ./sys-devel/patch/patch-2.5.4-r1.ebuild
 ./sys-devel/perl/perl-5.6.0-r1.ebuild
 ./sys-devel/python-basic/python-basic-1.5.2-r1.ebuild
-./sys-kernel/linux-UP-2.2.17/linux-UP-2.2.17-r1.ebuild
+./sys-kernel/linux-UP-2.2.17/linux-UP-2.2.17-r2.ebuild
 ./sys-libs/cracklib/cracklib-2.7-r1.ebuild
 ./sys-libs/gdbm/gdbm-1.8.0-r1.ebuild
 ./sys-libs/gettext/gettext-0.10.35-r1.ebuild
@@ -134,10 +134,10 @@
 ./dev-libs/glib/glib-1.2.8-r1.ebuild
 ./dev-libs/gmp/gmp-3.1.ebuild
 ./dev-libs/libpcre/libpcre-3.2-r1.ebuild
-./dev-libs/librep/librep-0.12.4-r1.ebuild
+./dev-libs/librep/librep-0.13.ebuild
 ./dev-libs/libunicode/libunicode-0.7.ebuild
-./dev-libs/openssl/openssl-0.9.5a-r1.ebuild
-./dev-libs/rep-gtk/rep-gtk-0.13a.ebuild
+./dev-libs/openssl/openssl-0.9.6-r1.ebuild
+./dev-libs/rep-gtk/rep-gtk-0.14.ebuild
 ./dev-libs/slib/slib-2.3.8.ebuild
 ./dev-libs/swig/swig-1.3_alpha4.ebuild
 ./dev-perl/Digest-MD5/Digest-MD5-2.09.ebuild
@@ -163,7 +163,7 @@
 ./dev-perl/PDL/PDL-2.1.1.ebuild
 ./dev-perl/Parse-RecDescent/Parse-RecDescent-1.79.ebuild
 ./dev-python/gnome-python/gnome-python-1.0.53-r1.ebuild
-./dev-util/cvs/cvs-1.10.8-r1.ebuild
+./dev-util/cvs/cvs-1.11.ebuild
 ./dev-util/guile/guile-1.4-r1.ebuild
 ./dev-util/lincvs/lincvs-0.2.5.ebuild
 ./dev-utils/sel/sel-0.08.2.ebuild
@@ -171,7 +171,7 @@
 ./dev-util/yacc/yacc-1.9.1-r1.ebuild
 ./media-gfx/autotrace/autotrace-0.24a.ebuild
 ./media-gfx/gimp-print/gimp-print-4.0_beta1.ebuild
-./media-gfx/gimp/gimp-1.1.25.ebuild
+./media-gfx/gimp/gimp-1.1.26.ebuild
 ./media-gfx/imagemagick/imagemagick-5.2.4.ebuild
 ./media-libs/alsa-lib/alsa-lib-0.5.9.ebuild
 ./media-libs/audiofile/audiofile-0.1.9.ebuild
@@ -285,7 +285,7 @@
 ./x11-wm/WindowMaker/WindowMaker-0.62.1-r1.ebuild
 ./x11-wm/enlightenment/enlightenment-0.16.4-r1.ebuild
 ./x11-wm/openmotif/openmotif-MLI-2.1.30.ebuild
-./x11-wm/sawfish/sawfish-0.30.3-r1.ebuild
+./x11-wm/sawfish/sawfish-0.31.ebuild
 ./gnome-base/ORBit/ORBit-0.5.3.ebuild
 ./gnome-base/bonobo/bonobo-0.15.ebuild
 ./gnome-base/control-center/control-center-1.2.1.ebuild
@@ -339,6 +339,7 @@
 ./kde-apps/kdepim/kdepim-1.94.ebuild
 ./kde-apps/kdeutils/kdeutils-1.94.ebuild
 ./kde-apps/kdoc/kdoc-1.94.ebuild
+./kde-apps/kmago/kmago-0.1.ebuild
 ./kde-apps/koffice/koffice-1.94.ebuild
 ./kde-apps/krusader/kruasader-0.65.1.ebuild
 
diff --git a/kde-apps/kmago/files/digest-kmago-0.1 b/kde-apps/kmago/files/digest-kmago-0.1
new file mode 100644
index 000000000000..cf184b25ce7d
--- /dev/null
+++ b/kde-apps/kmago/files/digest-kmago-0.1
@@ -0,0 +1 @@
+MD5 c91f2846f962916146db7c2e7e8ee349 kmago-0.1.tgz
diff --git a/kde-apps/kmago/kmago-0.1.ebuild b/kde-apps/kmago/kmago-0.1.ebuild
new file mode 100644
index 000000000000..f006c6efc5e9
--- /dev/null
+++ b/kde-apps/kmago/kmago-0.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Achim Gottinger <achim@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/kde-apps/kmago/kmago-0.1.ebuild,v 1.1 2000/09/28 02:40:56 achim Exp $
+
+A=${P}.tgz
+S=${WORKDIR}/${P}
+DESCRIPTION="A Download Apllication for KDE2 based on wget"
+SRC_URI="http://download.sourceforge.net/kmago/${A}"
+HOMEPAGE="http://kmago.sourceforge.net"
+
+
+src_compile() {
+
+    cd ${S}
+    try ./configure --prefix=/opt/kde --host=${CHOST}
+    try make
+
+}
+
+src_install () {
+
+    cd ${S}
+    try make DESTDIR=${D} install
+    dodoc AUTHORS COPYING ChangeLog NEWS README TODO
+}
+
diff --git a/net-misc/kmago/files/digest-kmago-0.1 b/net-misc/kmago/files/digest-kmago-0.1
new file mode 100644
index 000000000000..cf184b25ce7d
--- /dev/null
+++ b/net-misc/kmago/files/digest-kmago-0.1
@@ -0,0 +1 @@
+MD5 c91f2846f962916146db7c2e7e8ee349 kmago-0.1.tgz
diff --git a/net-misc/kmago/kmago-0.1.ebuild b/net-misc/kmago/kmago-0.1.ebuild
new file mode 100644
index 000000000000..6ed73ced8f2b
--- /dev/null
+++ b/net-misc/kmago/kmago-0.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Achim Gottinger <achim@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/net-misc/kmago/kmago-0.1.ebuild,v 1.1 2000/09/28 02:40:56 achim Exp $
+
+A=${P}.tgz
+S=${WORKDIR}/${P}
+DESCRIPTION="A Download Apllication for KDE2 based on wget"
+SRC_URI="http://download.sourceforge.net/kmago/${A}"
+HOMEPAGE="http://kmago.sourceforge.net"
+
+
+src_compile() {
+
+    cd ${S}
+    try ./configure --prefix=/opt/kde --host=${CHOST}
+    try make
+
+}
+
+src_install () {
+
+    cd ${S}
+    try make DESTDIR=${D} install
+    dodoc AUTHORS COPYING ChangeLog NEWS README TODO
+}
+