*** empty log message ***

18 files changed, 127 insertions, 87 deletions

diff --git a/autocompile.sh b/autocompile.sh
index 22197b0b7e06..9b427bebfa35 100755
--- a/autocompile.sh
+++ b/autocompile.sh
@@ -8,7 +8,14 @@ C_OK=$'\e[32m'
 C_NO=$'\e[31m'
 PORTDIR=/usr/portage
 LOGDIR=$ROOT/tmp/portage-log
-STEPS="check fetch clean compile install qmerge clean"
+if [ -z "$CHECK" ]
+then
+  CHECK="yes"
+fi
+if [ -z "$STEPS" ]
+then
+  STEPS="check fetch clean compile install qmerge clean"
+fi
 #STEPS="check unmerge"
 
 do_step() {
@@ -75,9 +82,12 @@ do
   then
 
     # Check if installed
-    if [ -d ${ROOT}/var/db/pkg/$myc/$myp ]
+    if [ "$CHECK" = "yes" ]
     then
-      continue
+        if [ -d ${ROOT}/var/db/pkg/$myc/$myp ]
+        then
+            continue
+        fi
     fi
 
     echo "$C_NORMAL$myp ($myc)"
@@ -102,6 +112,5 @@ do
   else
     echo "!!! $myd does not exists !"
   fi
-  env-update
-  env-update
+  env-update &>/dev/null
 done
\ No newline at end of file
diff --git a/current-packages.new b/current-packages.new
index e175af4b9867..b4bd3dba01da 100644
--- a/current-packages.new
+++ b/current-packages.new
@@ -63,13 +63,13 @@
 ./dev-java/mysql-jdbc/mysql-jdbc-1.2.3-r1.ebuild
 ./dev-java/xt/xt-1.ebuild
 #./dev-lang/entity/entity-pre-0.7.0.ebuild
-./dev-lang/jdk/jdk-1.2.2.ebuild
+./dev-lang/jdk/jdk-1.3.0.ebuild
 ./dev-lang/kaffe/kaffe-1.0.6.ebuild
 ./dev-lang/nasm/nasm-0.98-r1.ebuild
 #./dev-lang/php-4/php-4.0.0-r1.ebuild
 ./dev-lang/php-4/php-4.0.3_p1-r1.ebuild
 ./dev-lang/python/python-1.5.2-r3.ebuild
-./dev-lang/ruby/ruby-1.6.1.ebuild
+./dev-lang/ruby/ruby-1.6.2.ebuild
 ./dev-lang/swig/swig-1.3_alpha5-r1.ebuild
 #./dev-lang/tcl-tk/tcl-tk-8.0.5-r1.ebuild
 ./dev-lang/tcl-tk/tcl-tk-8.1.1-r1.ebuild
@@ -209,7 +209,7 @@
 ./media-gfx/gimp/gimp-1.2.0.ebuild
 ./media-gfx/imagemagick/imagemagick-5.2.5.ebuild
 ./media-libs/aalib/aalib-1.2.ebuild
-./media-libs/alsa-lib/alsa-lib-0.5.9-r2.ebuild
+./media-libs/alsa-lib/alsa-lib-0.5.10.ebuild
 ./media-libs/audiofile/audiofile-0.1.9.ebuild
 ./media-libs/fnlib/fnlib-0.5.ebuild
 ./media-libs/freetype/freetype-1.3.1-r1.ebuild
diff --git a/dev-lang/jdk/files/20jdk b/dev-lang/jdk/files/20jdk
new file mode 100644
index 000000000000..14cee742b091
--- /dev/null
+++ b/dev-lang/jdk/files/20jdk
@@ -0,0 +1,2 @@
+PATH=/opt/java/bin
+ROOTPATH=/opt/java/bin
diff --git a/dev-lang/jdk/jdk-1.3.0.ebuild b/dev-lang/jdk/jdk-1.3.0.ebuild
index f0af18695ad9..fed51462595e 100644
--- a/dev-lang/jdk/jdk-1.3.0.ebuild
+++ b/dev-lang/jdk/jdk-1.3.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 Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/jdk/jdk-1.3.0.ebuild,v 1.1 2001/01/01 17:15:54 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/jdk/jdk-1.3.0.ebuild,v 1.2 2001/01/05 03:21:55 achim Exp $
 
 P=jdk-1.3.0
 A=j2sdk-1.3.0-FCS-linux-i386.tar.bz2
@@ -20,14 +20,18 @@ src_compile() {
 
 src_install() {                               
   dodir /opt/jdk-${PV}
+  dodir /usr
   cp -a ${S}/bin ${D}/opt/jdk-${PV}
   cp -a ${S}/demo ${D}/opt/jdk-${PV}
   cp -a ${S}/include ${D}/opt/jdk-${PV}
   cp -a ${S}/lib ${D}/opt/jdk-${PV}
   cp -a ${S}/jre ${D}/opt/jdk-${PV}
+  cp -a ${S}/man ${D}/usr
   cp    ${S}/src.jar ${D}/opt/jdk-${PV}
   into /usr
-  dodoc COPYRIGHT LICENSE README README.linux 
+  dodoc COPYRIGHT LICENSE README
+  insinto /etc/env.d
+  dosins ${FILESDIR}/20jdk
   docinto html
   dodoc README.html
 }
diff --git a/gnome-base/gconf/gconf-0.11.ebuild b/gnome-base/gconf/gconf-0.11.ebuild
index 6412027bac60..fdf838151777 100644
--- a/gnome-base/gconf/gconf-0.11.ebuild
+++ b/gnome-base/gconf/gconf-0.11.ebuild
@@ -10,7 +10,8 @@ DESCRIPTION="Gconf"
 SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/GConf/${A}"
 HOMEPAGE="http://www.gnome.org/"
 
-DEPEND=">=gnome-base/oaf-0.6.1"
+DEPEND=">=gnome-base/oaf-0.6.1
+	>=x11-libs/gtk+-1.2"
 
 src_unpack() {
   unpack ${A}
diff --git a/media-gfx/imagemagick/files/digest-imagemagick-5.2.7 b/media-gfx/imagemagick/files/digest-imagemagick-5.2.7
new file mode 100644
index 000000000000..2b0e2e65d034
--- /dev/null
+++ b/media-gfx/imagemagick/files/digest-imagemagick-5.2.7
@@ -0,0 +1 @@
+MD5 f6dc45a73416705e975c635e3e58f012 ImageMagick-5.2.7.tar.gz
diff --git a/media-libs/freetype/freetype-2.0.1.ebuild b/media-libs/freetype/freetype-2.0.1.ebuild
index 5efebae12bce..30fbbc936fb1 100644
--- a/media-libs/freetype/freetype-2.0.1.ebuild
+++ b/media-libs/freetype/freetype-2.0.1.ebuild
@@ -1,16 +1,15 @@
 # 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/media-libs/freetype/freetype-2.0.1.ebuild,v 1.2 2000/12/21 11:20:10 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.0.1.ebuild,v 1.3 2001/01/05 03:21:55 achim Exp $
 
 A=${P}.tar.bz2
 S=${WORKDIR}/${P}
 DESCRIPTION="TTF-Library"
-SRC_URI="ftp://ftp.freetype.org/pub/freetype2/"${A}
+SRC_URI="ftp://freetype.sourceforge.net/pub/freetype/freetype2/"${A}
 HOMEPAGE="http://www.freetype.org/"
 
-DEPEND=">=sys-libs/glibc-2.1.3
-	>=x11-base/xfree-4.0.1"
+DEPEND=">=sys-libs/glibc-2.1.3"
 
 src_compile() {                           
   cd ${S}
diff --git a/media-libs/glut/glut-3.7.ebuild b/media-libs/glut/glut-3.7.ebuild
index db35aa21dd33..424c43667298 100644
--- a/media-libs/glut/glut-3.7.ebuild
+++ b/media-libs/glut/glut-3.7.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 Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/glut/glut-3.7.ebuild,v 1.3 2000/12/11 16:37:43 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glut/glut-3.7.ebuild,v 1.4 2001/01/05 03:21:55 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -28,6 +28,8 @@ src_compile() {
     cp linux/Glut.cf .
     cp mkmkfiles.imake mkmkfiles.imake.orig
     sed -e "s:/bin/csh:/bin/tcsh:" mkmkfiles.imake.orig > mkmkfiles.imake
+    cp Imakefile Imakefile.orig
+    sed -e "s:^SUBDIRS.*:SUBDIRS = lib:" Imakefile.orig > Imakefile
     unset LS_COLORS
     try ./mkmkfiles.imake
     cp linux/Makefile lib/glut
@@ -36,6 +38,7 @@ src_compile() {
     ln -s libglut.so.3.7 libglut.so.3
     ln -s libglut.so.3.7 libglut.so
     cd ${S}
+
     try make
 }
 
diff --git a/media-video/avifile/files/digest-avifile-0.53.1 b/media-video/avifile/files/digest-avifile-0.53.1
new file mode 100644
index 000000000000..2871c88d91da
--- /dev/null
+++ b/media-video/avifile/files/digest-avifile-0.53.1
@@ -0,0 +1,2 @@
+MD5 c74597c7b9e987dbcd0317ed26572e7b avifile-0.53.1.tar.gz
+MD5 f8517cf28e33fb09e3f5da58ddcbf78d binaries-001222.zip
diff --git a/media-video/xawtv/files/digest-xawtv-3.27 b/media-video/xawtv/files/digest-xawtv-3.27
new file mode 100644
index 000000000000..b102ba09acf5
--- /dev/null
+++ b/media-video/xawtv/files/digest-xawtv-3.27
@@ -0,0 +1 @@
+MD5 c150d148775c89f9644373cef0104556 xawtv_3.27.tar.gz
diff --git a/media-video/xawtv/xawtv-3.27.ebuild b/media-video/xawtv/xawtv-3.27.ebuild
new file mode 100644
index 000000000000..d0d2d9251525
--- /dev/null
+++ b/media-video/xawtv/xawtv-3.27.ebuild
@@ -0,0 +1,50 @@
+# 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/media-video/xawtv/xawtv-3.27.ebuild,v 1.1 2001/01/05 03:21:55 achim Exp $
+
+A=xawtv_${PV}.tar.gz
+S=${WORKDIR}/${P}
+DESCRIPTION="TV application for the bttv driver"
+SRC_URI="http://www.strusel007.de/linux/xawtv/${A}"
+HOMEPAGE="http://www.strusel007.de/linux/xawtv/"
+
+DEPEND=">=sys-libs/glibc-2.1.3
+	>=sys-libs/gpm-1.19.3
+	>=sys-libs/ncurses-5.1
+	>=media-libs/jpeg-6b
+	>=x11-base/xfree-4.0.1"
+
+src_unpack() {
+  unpack ${A}
+}
+
+src_compile() {                           
+  cd ${S}
+  unset DEPEND
+  try ./configure --host=${CHOST} --prefix=/usr \
+	--enable-jpeg --enable-xfree-ext --enable-xvideo --with-x
+  try make
+}
+
+src_install() {                               
+  cd ${S}
+  try make prefix=${D}/usr install
+ 
+  dodoc COPYING Changes KNOWN_PROBLEMS Miro_gpio.txt Programming-FAQ
+  dodoc README* Sound-FAQ TODO Trouble-Shooting UPDATE_TO_v3.0
+  insinto /usr/local/httpd/cgi-bin
+  insopts -m 755 
+  doins webcam/webcam.cgi
+  dodir /usr/X11R6/lib
+  mv ${D}/usr/lib/X11 ${D}/usr/X11R6/lib
+  
+  rm -rf ${D}/usr/X11R6/lib/X11/fonts/misc/fonts.dir
+  rm -rf ${D}/usr/lib
+}
+
+
+
+
+
+
diff --git a/net-dialup/isdn4k-utils/isdn4k-utils-3.1_p1-r1.ebuild b/net-dialup/isdn4k-utils/isdn4k-utils-3.1_p1-r1.ebuild
index 571a59b9dfa8..19debea59eb0 100644
--- a/net-dialup/isdn4k-utils/isdn4k-utils-3.1_p1-r1.ebuild
+++ b/net-dialup/isdn4k-utils/isdn4k-utils-3.1_p1-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 Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/isdn4k-utils-3.1_p1-r1.ebuild,v 1.6 2000/11/02 08:31:52 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/isdn4k-utils-3.1_p1-r1.ebuild,v 1.7 2001/01/05 03:21:55 achim Exp $
 
 A=isdn4k-utils.v3.1pre1.tar.gz   
 S=${WORKDIR}/isdn4k-utils
@@ -20,7 +20,7 @@ DEPEND=">=sys-apps/bash-2.04
 src_unpack() {
   unpack ${A}
   cd ${S}
-  sed -e "s:CONFIG_KERNELDIR=.*:CONFIG_KERNELDIR='${WORKDIR}/../../linux-UP-2\.2\.17-r3/work/linux':" ${O}/files/${P}.config > .config
+  sed -e "s:CONFIG_KERNELDIR=.*:CONFIG_KERNELDIR='${WORKDIR}/../../linux-2\.4\.0_rc103/work/linux':" ${O}/files/${P}.config > .config
 }
 
 src_compile() {                           
diff --git a/net-print/cups/cups-1.1.4.ebuild b/net-print/cups/cups-1.1.4.ebuild
index 9edb22e2e4a4..1e5e93d911a4 100644
--- a/net-print/cups/cups-1.1.4.ebuild
+++ b/net-print/cups/cups-1.1.4.ebuild
@@ -1,14 +1,13 @@
 # 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-print/cups/cups-1.1.4.ebuild,v 1.5 2000/12/19 00:34:25 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.4.ebuild,v 1.6 2001/01/05 03:21:55 achim Exp $
 
 GPV="4.0.4"
 S=${WORKDIR}/${P}
 S0=${WORKDIR}/print-${GPV}/cups
 DESCRIPTION="The Common Unix Printing System"
-SRC_URI="ftp://ftp.easysw.com/pub/cups/${PV}/${P}-source.tar.bz2
-	 http://download.sourceforge.net/gimp-print/print-${GPV}.tar.gz"
+SRC_URI="ftp://ftp.easysw.com/pub/cups/${PV}/${P}-source.tar.bz2"
 
 HOMEPAGE="http://www.cups.org"
 
@@ -31,10 +30,6 @@ src_compile() {
     sed -e "s:/usr/share/doc/cups:/usr/share/cups/doc:" \
 	Makedefs.orig > Makedefs 
     try make 
-#    cd ${S0}
-#      try ./configure --host=${CHOST} --prefix=/usr --sysconfdir=/etc \
-#	--disable-gimptest
-#    try make
 }
 
 src_install () {
diff --git a/net-www/jakarta/jakarta-3.1-r1.ebuild b/net-www/jakarta/jakarta-3.1-r1.ebuild
index 01d9e029ab24..4629b58d3e87 100644
--- a/net-www/jakarta/jakarta-3.1-r1.ebuild
+++ b/net-www/jakarta/jakarta-3.1-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 Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-www/jakarta/jakarta-3.1-r1.ebuild,v 1.4 2000/11/02 08:31:53 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/jakarta/jakarta-3.1-r1.ebuild,v 1.5 2001/01/05 03:21:55 achim Exp $
 
 P=jakarta-3.1
 A="jakarta-tomcat.tar.gz jakarta-ant.tar.gz"
@@ -13,6 +13,7 @@ HOMEPAGE="http://jakarta.apache.org"
 
 DEPEND=">=sys-apps/bash-2.04
 	>=sys-libs/glibc-2.1.3
+	>=dev-lang/jdk-1.2
 	>=net-www/apache-ssl-1.3"
 
 src_unpack() {
diff --git a/sys-apps/baselayout/files/env-update b/sys-apps/baselayout/files/env-update
index ffd9de97156a..3016783fa728 100755
--- a/sys-apps/baselayout/files/env-update
+++ b/sys-apps/baselayout/files/env-update
@@ -46,7 +46,8 @@ if os.path.exists(portage.root+"etc/ld.so.conf"):
 			continue
 		oldld.append(x[:-1])
 	oldld.sort()
-	os.rename(portage.root+"etc/ld.so.conf",portage.root+"etc/ld.so.conf.bak")
+#	os.rename(portage.root+"etc/ld.so.conf",portage.root+"etc/ld.so.conf.bak")
+# Where is the new ld.so.conf generated? (achim)
 else:
 	oldld=None
 specials["LDPATH"].sort()
@@ -63,8 +64,6 @@ print ">>> Regenerating "+portage.root+"etc/ld.so.cache..."
 commands.getstatusoutput("/sbin/ldconfig -r "+portage.root)
 del specials["LDPATH"]
 
-if portage.root!="/":
-	sys.exit(0)
 
 outfile=open(portage.root+"/etc/profile.env","w")
 
diff --git a/sys-apps/bootdisk/files/mkcd.sh b/sys-apps/bootdisk/files/mkcd.sh
index da818e501ffd..65f86e9f5fb5 100755
--- a/sys-apps/bootdisk/files/mkcd.sh
+++ b/sys-apps/bootdisk/files/mkcd.sh
@@ -51,29 +51,20 @@ mkbootimg() {
         # *********** 1 ************
 
         echo "1. Creating basic dirs"
-        dodirs bin dev initrd lib sbin usr
+        dodirs bin dev initrd lib sbin usr proc
 
         # *********** 2 ************
 
         echo "2. Creating initdisk stuff in initrd first"
         cd ${BOOTIMG}/initrd
-        dodirs dev proc distcd etc root tmp var mnt
+        dodirs dev distcd etc root tmp var mnt
         cd mnt
         dodirs floppy gentoo ram boot
         ln -sf /initrd/distcd .
         cd ..
         ln -sf mnt/boot boot
 
-        # *********** 3 ************
 
-        echo "3. Creating /initrd devices"
-        cd ${BOOTIMG}/initrd/dev
-	mknod -m 666 tty c 5 0
-        mknod -m 600 tty1 c 4 1
-        mknod -m 600 tty2 c 4 2
-	mknod -m 400 initrd b 1 250
-        mkfifo -m 600 initctl
-        mkdir pts
 
         # *********** 4 ************
 
@@ -98,7 +89,7 @@ mkbootimg() {
 
         echo "6. Creating links to initrd"
         cd ${BOOTIMG}
-        for i in etc root tmp var mnt proc
+        for i in etc root tmp var mnt 
         do
             ln -s initrd/$i $i
         done
@@ -114,14 +105,18 @@ mkbootimg() {
 
         # *********** 8 ************
 
-        echo "8. Creating device links to initrd"
-	rm tty1 tty2
-        ln -s ../initrd/pts pts
-#        ln -sf ../initrd/dev/initctl .
-#        ln -sf ../initrd/dev/initrd .
-        ln -sf ../initrd/dev/tty .
-        ln -sf ../initrd/dev/tty1 .
-        ln -sf ../initrd/dev/tty2 .
+        echo "3. Creating /initrd devices"
+        cd ${BOOTIMG}/dev
+	for i in tty tty1 tty2 initrd pts log
+	do
+	  mv $i ../initrd/dev/$i
+	  ln -sf ../initrd/dev/$i $i
+	done
+
+
+# Hmm, shutdown needs write access to /dev/initctl
+# but symlinking it messes up initrd
+
 
 
         # *********** 9 ************
@@ -139,7 +134,7 @@ mkbootimg() {
         doexes agetty cfdisk depmod e2fsck fdisk grub halt ifconfig init insmod \
 	        ldconfig lilo ln lsmod mke2fs mkraid mkreiserfs mkswap portmap \
 	        raidstart reboot resize2fs reiserfsck \
-	        route sfdisk shutdown touch
+	        route sfdisk shutdown touch tcpd
 
         # portmap? removed; Ups added again
         # reiserfsck and resize_reiserfs does not exist in 2.4 so 
@@ -174,7 +169,7 @@ mkbootimg() {
         echo "13. Populating /usr/sbin"
         cd ${BOOTIMG}/usr/sbin
         cp /usr/sbin/rc-update .
-
+	cp ${BOOTDIR}/files/sbin/network .
         # *********** 14 ************
 
         echo "14. Populating /usr/share"
@@ -259,14 +254,14 @@ mkinitrd() {
         echo "3. Populating /dev"
         cd dev
         for i in console fd0 fd0u1440 hda hdb hdc hdd hde hdf hdg hdh loop0 ram0 \
-                scd0 scd1 scd2 scd3 scd4 scd5 scd6 scd7 initrd
+                scd0 scd1 scd2 scd3 scd4 scd5 scd6 scd7 log
         do
             cp -a ${BOOTIMG}/dev/$i .
         done
 	mknod -m 666 tty c 5 0
         mknod -m 600 tty1 c 4 1
         mknod -m 600 tty2 c 4 2
-        mkfifo -m 600 initctl
+	mknod -m 600 initrd b 1 250
         mkdir pts
 	# Just for testing
 	cp -a ${BOOTIMG}/dev/hda2 .
@@ -337,3 +332,4 @@ umount ${BROOT}/mnt
 gzip -9 initdisk
 echo
 
+
diff --git a/sys-kernel/linux/linux-2.4.0_rc103.ebuild b/sys-kernel/linux/linux-2.4.0_rc103.ebuild
index 5a95ce95f8ee..1356466e4c5b 100644
--- a/sys-kernel/linux/linux-2.4.0_rc103.ebuild
+++ b/sys-kernel/linux/linux-2.4.0_rc103.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 Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux/linux-2.4.0_rc103.ebuild,v 1.2 2001/01/02 17:59:47 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux/linux-2.4.0_rc103.ebuild,v 1.3 2001/01/05 03:21:56 achim Exp $
 
 S=${WORKDIR}/linux
 KV=2.4.0-prerelease-ac3
@@ -110,14 +110,6 @@ src_compile() {
 	cd ${S}
 	try make symlinks
 	try make dep
-   	#time to do the special symlink tweak
-	if [ -e /usr/src/linux ]
-	then
-		readlink /usr/src/linux > ${T}/linuxlink
-	fi
-	rm /usr/src/linux
-	( cd /usr/src; ln -s ${S} linux )
-	#symlink tweak in place
 	cd ${S}/fs/reiserfs/utils
 
     try make
@@ -133,29 +125,14 @@ src_compile() {
 		cd ${S}
 		try make bzImage
 		try make modules
-		cd ${S}/extras/NVIDIA_kernel-0.9-5
-		make NVdriver
+		#cd ${S}/extras/NVIDIA_kernel-0.9-5
+		#make NVdriver
 		cd ${S}/extras/alsa-driver-0.5.10
 		try ./configure --with-kernel=${S} --with-isapnp=yes --with-sequencer=yes --with-oss=yes \
-			--with-cards=\   
-			  share,dummy,virmidi,interwave,interwave-stb,\
-                          gusmax,gusextreme,gusclassic,es1688, es18xx,\
-                          sb8,sb16,sbawe,emu10k1,opl3sa2,mozart,\
-                          sonicvibes,ens1370,ens1371,ad1816a,ad1848,\
-                          als100,als4000,azt2320,cs4231,cs4232,cs4236,\
-                          cs4281,cs461x,cs4281,es968,dt0197h,fm801,\
-                          es1938,es1968,opti92x-ad1848,opti92x-cs4231,\
-                          opti93x,serial,trident,sgalaxy,\
-                          hal2,cmi8330,mtpav,rme96,rme9652,ice1712,\
-                          intel8x0,via686a,cmipci,ymfpci,maestro3
+			--with-cards=share,dummy,virmidi,interwave,interwave-stb,gusmax,gusextreme,gusclassic,es1688,es18xx,sb8,sb16,sbawe,emu10k1,opl3sa2,mozart,sonicvibes,ens1370,ens1371,ad1816a,ad1848,als100,als4000,azt2320,cs4231,cs4232,cs4236,cs4281,cs461x,cs4281,es968,dt0197h,fm801,es1938,es1968,opti92x-ad1848,opti92x-cs4231,opti93x,serial,trident,sgalaxy,hal2,cmi8330,mtpav,rme96,rme9652,ice1712,intel8x0,via686a,cmipci,ymfpci,maestro3
 		# "wavefront" is buggy in 0.5.10
 		try make
 	fi
-	#untweak the symlink
-	if [ -e ${T}/linuxlink ]
-	then
-		( cd /usr/src; rm linux; ln -s `cat ${T}/linuxlink` linux )
-	fi
 }
 src_install() {
 	cd ${S}/fs/reiserfs/utils
@@ -196,7 +173,8 @@ src_install() {
 		cd ${S}
 		doins arch/i386/boot/bzImage
 		#grab modules
-		dodir /lib/modules/2.4.0-prerelease-ac1
+		dodir /lib/modules/`/bin/uname -r` 
+		dodir /lib/modules/2.4.0-prerelease-ac3
 		try make INSTALL_MOD_PATH=${D} modules_install
 		#install ALSA modules
 		cd ${S}/extras/alsa-driver-0.5.10
@@ -209,9 +187,9 @@ src_install() {
 		cd include
 		doins asound.h asoundid.h asequencer.h ainstr_*.h
 		#install nvidia driver
-		cd ${S}/extras/NVIDIA_kernel-0.9-5
-		insinto /lib/modules/${KV}/video
-		doins NVdriver
+#		cd ${S}/extras/NVIDIA_kernel-0.9-5
+#		insinto /lib/modules/${KV}/video
+#		doins NVdriver
 		#fix symlink
 		cd ${D}/lib/modules/${KV}
 		rm build
diff --git a/x11-base/xfree/xfree-4.0.2.ebuild b/x11-base/xfree/xfree-4.0.2.ebuild
index 6ef6159b0b7e..653840854106 100644
--- a/x11-base/xfree/xfree-4.0.2.ebuild
+++ b/x11-base/xfree/xfree-4.0.2.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 Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.0.2.ebuild,v 1.6 2000/12/25 16:17:42 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.0.2.ebuild,v 1.7 2001/01/05 03:21:56 achim Exp $
 
 A="X402src-1.tgz X402src-2.tgz X402src-3.tgz truetype.tar.gz"
 S=${WORKDIR}/xc
@@ -9,9 +9,8 @@ DESCRIPTION="Xfree - 4.0.2"
 SRC_PATH0="ftp://ftp.xfree.org/pub/XFree86/4.0.2/source"
 SRC_PATH1="ftp://download.sourceforge.net/pub/mirrors/XFree86/4.0.2/source"
 SRC_URI="$SRC_PATH0/X402src-1.tgz $SRC_PATH0/X402src-2.tgz $SRC_PATH0/X402src-3.tgz
-	 $SRC_PATH1/X402src-1.tgz $SRC_PATH1/X402src-2.tgz $SRC_PATH1/X402src-3.tgz
 	 http://keithp.com/~keithp/fonts/truetype.tar.gz"
-
+#	 $SRC_PATH1/X402src-1.tgz $SRC_PATH1/X402src-2.tgz $SRC_PATH1/X402src-3.tgz
 DEPEND=">=sys-apps/bash-2.04
 	>=media-libs/freetype-2.0.1
 	>=sys-libs/glibc-2.1.3