version bump, bug #58876

8 files changed, 273 insertions, 364 deletions

diff --git a/net-misc/ltsp-core/ChangeLog b/net-misc/ltsp-core/ChangeLog
index 3df5e3d7bdd1..9686bcaa52c3 100644
--- a/net-misc/ltsp-core/ChangeLog
+++ b/net-misc/ltsp-core/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/ltsp-core
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ltsp-core/ChangeLog,v 1.19 2004/06/24 23:55:14 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ltsp-core/ChangeLog,v 1.20 2004/08/19 09:28:56 lanius Exp $
+
+*ltsp-core-4.1 (19 Aug 2004)
+
+  19 Aug 2004; Heinrich Wendel <lanius@gentoo.org> ltsp-core-3.0.9-r1.ebuild,
+  ltsp-core-3.0.9-r3.ebuild, ltsp-core-4.1.ebuild:
+  version bump, bug #58876
 
   14 Jun 2004; Aron Griffis <agriffis@gentoo.org> ltsp-core-3.0.9-r1.ebuild,
   ltsp-core-3.0.9-r3.ebuild, ltsp-core-4.0.ebuild:
diff --git a/net-misc/ltsp-core/Manifest b/net-misc/ltsp-core/Manifest
index ba0c850e731b..e640d31e03de 100644
--- a/net-misc/ltsp-core/Manifest
+++ b/net-misc/ltsp-core/Manifest
@@ -1,10 +1,9 @@
-MD5 352c1184399871f44cc4dbe847077352 ltsp-core-3.0.9-r1.ebuild 10954
-MD5 fb69e61c421390c3af078c5e53b1d557 ltsp-core-3.0.9-r3.ebuild 10956
+MD5 b6244910f84ee1af62b2af4636838db2 ltsp-core-3.0.9-r3.ebuild 10955
+MD5 5b7bf6fe6c5469bd4c4f141452c70ae4 ltsp-core-4.1.ebuild 4594
 MD5 c54fc31820ac83eee62a150fc15127c3 ChangeLog 5655
 MD5 3c8886178146b87ef1bf61a9bfba94a0 ltsp-core-4.0.ebuild 4042
 MD5 e93ac4a097b01ca94ac388cc874ad8ac files/tftp 259
 MD5 03109ccf3695c8575faea0892e432db2 files/ltsp.conf 62
-MD5 176cb9dd8ee73be851a6f41201de45d4 files/digest-ltsp-core-3.0.9-r1 1405
 MD5 9bb2a99257dc7f86f92d6a3c4d55ffd1 files/digest-ltsp-core-3.0.9-r3 1407
 MD5 1d8daed9b6e2768685b56bb3740d6af1 files/Xaccess 2057
 MD5 99460aed8423e55d484551404408f7b9 files/install.sh 496
@@ -17,4 +16,5 @@ MD5 a4b38d8b3e2c77d7bc1029c9aaf5c459 files/Xsetup_workstation 421
 MD5 98c1e1d5fd02a42ec01348e7525e8108 files/eb-5.0.9-3c905c-tpo.lzpxe 17191
 MD5 8afc7afa7cf0eb6ef41de9d7e67a92bc files/INSTALL.Gentoo 3887
 MD5 a65f287c2cf9fbd3b9453b4007d8b35f files/digest-ltsp-core-4.0 3772
+MD5 5aa6f9e63ead88e962ba07491b93f200 files/digest-ltsp-core-4.1 4255
 MD5 b716ae3544e8ac3e53f315a1e95f27a0 files/eb-5.0.9-rtl8139.lzpxe 16054
diff --git a/net-misc/ltsp-core/files/digest-ltsp-core-3.0.9-r1 b/net-misc/ltsp-core/files/digest-ltsp-core-3.0.9-r1
deleted file mode 100644
index a66a4a62797a..000000000000
--- a/net-misc/ltsp-core/files/digest-ltsp-core-3.0.9-r1
+++ /dev/null
@@ -1,19 +0,0 @@
-MD5 4838e28c19a475e8cdd8d0b731b22264 ltsp_core-3.0.9-i386.tgz 1464997
-MD5 5c7defaea1de847e6c14f31d9e5302c7 ltsp_kernel-3.0.5-i386.tgz 5144448
-MD5 491ebf4539c2932933efc26a06f85d1a ltsp_x_core-3.0.1-i386.tgz 10959730
-MD5 8fdd1b1c7dcb046afce99d88fa1576be ltsp_x_fonts-3.0.0-i386.tgz 8960579
-MD5 110d2a17b52c0d7612abe0f3ce9356bc ltsp_x336_3dlabs-3.0.0-i386.tgz 970548
-MD5 1c13359e6d061d7541dff346e2e9e81c ltsp_x336_8514-3.0.0-i386.tgz 776731
-MD5 13a9e7ccfdc06f29f13b09800f0424ab ltsp_x336_agx-3.0.0-i386.tgz 857495
-MD5 522c1585f8f42e1aa011313f7c590201 ltsp_x336_fbdev-3.0.0-i386.tgz 895495
-MD5 0226824dca52c8e090f2cd537b80195e ltsp_x336_i128-3.0.0-i386.tgz 958937
-MD5 f19237df108a434fc0a71ecdab573376 ltsp_x336_mach32-3.0.0-i386.tgz 843662
-MD5 4d8e294f65f9a13f8620a86539b8707b ltsp_x336_mach64-3.0.0-i386.tgz 895762
-MD5 9b0430c26b68a89090c4741c32a20e1d ltsp_x336_mach8-3.0.0-i386.tgz 780781
-MD5 a7ca6c0abe31ca7de39c20d03f52e951 ltsp_x336_mono-3.0.0-i386.tgz 866879
-MD5 1c5a520b7fa31acffa9436914d902f01 ltsp_x336_p9000-3.0.0-i386.tgz 866027
-MD5 2317fd746294a56315d268536f837056 ltsp_x336_s3-3.0.0-i386.tgz 1065793
-MD5 d24ca95a28fb26a7aaa0adf830ff06a9 ltsp_x336_s3v-3.0.0-i386.tgz 954549
-MD5 f07530b143b9652e6b7bf6bb911fe5c8 ltsp_x336_svga-3.0.0-i386.tgz 1468421
-MD5 ef89870555acdbf3632def68088f898d ltsp_x336_vga16-3.0.0-i386.tgz 869214
-MD5 a04cfc0f4b101d9e90ac3af60962d415 ltsp_x336_w32-3.0.0-i386.tgz 796005
diff --git a/net-misc/ltsp-core/files/digest-ltsp-core-4.1 b/net-misc/ltsp-core/files/digest-ltsp-core-4.1
new file mode 100644
index 000000000000..a7ed9b8370b5
--- /dev/null
+++ b/net-misc/ltsp-core/files/digest-ltsp-core-4.1
@@ -0,0 +1,59 @@
+MD5 d05bd09237c47dff67932939df315c8d ltsp-ltsptree-1.7-0-i386.tgz 28693
+MD5 4cefbf8b5e3e7bc70663d4b4394b7c70 ltsp-glibc-1.0-0-i386.tgz 8443373
+MD5 af6b0e30e614447cd63059f546f562f9 ltsp-sysvinit-1.0-0-i386.tgz 14388
+MD5 a89616f07b11f1431cfe66b703a6f5dc ltsp-popt-1.1-0-i386.tgz 103570
+MD5 ff73695714b12b9c0b44f0a3780fb33c ltsp-bash-1.0-0-i386.tgz 341587
+MD5 b5b5427f67663782396fd5f82fd250ce ltsp-busybox-1.0-0-i386.tgz 82569
+MD5 9b291752ff8c9ffcada916fb03aedba4 ltsp-devfsd-1.0-0-i386.tgz 18904
+MD5 25fa2897eaf9a05deee43cf4cca18815 ltsp-getltscfg-1.2-0-i386.tgz 7716
+MD5 0ee010cb390ad0949e8f12c206fb97c9 ltsp-libgcc_s-1.0-0-i386.tgz 79017
+MD5 788a46e75fe728cdb11827fdddeb0e1c ltsp-haltsys-1.0-0-i386.tgz 1532
+MD5 67354659bd1957ef202700179c0ae84f ltsp-e2fsprogs-1.1-0-i386.tgz 721976
+MD5 ca92feb0d71183d2eddf576b7e7b5b55 ltsp-startsess-1.1-0-i386.tgz 2275
+MD5 76d4654d52304ab44adce598085ddfc5 ltsp-lp_server-1.1-0-i386.tgz 10781
+MD5 58cc65bbc02bb856091942d35d138b8a ltsp-ltspinfod-1.1-0-i386.tgz 5358
+MD5 1f1738082abca9f7bf159f383ff84891 ltsp-modutils-1.0-0-i386.tgz 135919
+MD5 e1fa99e575ae6d2085b56d0a177eb5b2 ltsp-ncurses-1.0-0-i386.tgz 795057
+MD5 1ae078d98459bf3ef207a49de17de6e3 ltsp-open-1.1-0-i386.tgz 5087
+MD5 d9fe146f024632171636deae7170e6f7 ltsp-prep_swap-1.0-0-i386.tgz 3066
+MD5 ea42ad81564a4e9515f48e164377b77b ltsp-zlib-1.0-0-i386.tgz 25648
+MD5 9bd4d14407e1f8459454f987071c4456 ltsp-libpng-1.0-0-i386.tgz 197520
+MD5 6167586007f9f353f7129b754299a403 ltsp-pci_scan-1.0-0-i386.tgz 2462
+MD5 33b3ec67b7496518591ff5e1cd4e128c ltsp-pam-1.0-0-i386.tgz 125161
+MD5 a8bd109cc0d30d410b04c948b613a485 ltsp-ssh-1.0-0-i386.tgz 2152929
+MD5 9226d807f49d166efca15fb628da1889 ltsp-net-tools-1.0-0-i386.tgz 17754
+MD5 3ba3608169762e28497f467ec64a887d ltsp-xinetd-1.0-0-i386.tgz 85461
+MD5 b41751c7d90c5064ff1e2fd9f9c5f89f ltsp-ypbind-1.0-0-i386.tgz 17109
+MD5 aa7b593b57e573d838d063792e7b06d7 ltsp-tcp_wrappers-1.0-0-i386.tgz 26568
+MD5 bfc2f2e6045afb27a7f8213532f6af90 ltsp-portmap-1.0-0-i386.tgz 17617
+MD5 51bfd7dddc9a78fd333e3db163d85501 ltsp-rdesktop-1.3-0-i386.tgz 206778
+MD5 df1d2ba1779d7084c143679dbf188e46 ltsp-libvncserver-1.0-0-i386.tgz 76505
+MD5 fbb1e25d94163178528f930a38ddb0b9 ltsp-localdev-1.0-0-i386.tgz 1135
+MD5 1229fa51ac6c70549aed3e15d81218de ltsp-openssl-1.0-0-i386.tgz 1768319
+MD5 ba09745218ef074bd3f8c70f07c11e0e ltsp-samba-1.0-0-i386.tgz 8005444
+MD5 877936daae880072e107cf4ce04cb80a ltsp-util-linux-1.0-0-i386.tgz 3946
+MD5 cc53c7925483376213d3145dddd88330 ltsp-vidlist-1.1-0-i386.tgz 5189
+MD5 ad662a97cda3389b2b1a4440977aa5bb ltsp-aumix-1.0-0-i386.tgz 48345
+MD5 13e79b438885aa790bbb7195563df3e5 ltsp-freetype-1.0-0-i386.tgz 586299
+MD5 fb79db426a2f9f6888430c3c309aa55c ltsp-kernel-1.4-0-i386.tgz 3874772
+MD5 3d4861ab2bd0f8c7819ef9a562286ed3 ltsp-modules-1.4-0-i386.tgz 3923245
+MD5 435d486670bcb254616dfa5a607f8e9e ltsp-gdb-1.0-0-i386.tgz 1604176
+MD5 b3a98509650f587194a1a02ff2c02615 ltsp-strace-1.0-0-i386.tgz 360028
+MD5 45afcb2172955f0a7515ee904c72ae8f ltsp-x-core-1.2-0-i386.tgz 18718396
+MD5 c12e33c855c3f1b40655e933513b965a ltsp-x-fonts-1.0-0-i386.tgz 20135686
+MD5 9ab04043511a9e285534c925f603157d ltsp-x-fonts-100dpi-1.0-0-i386.tgz 12237898
+MD5 8313d15b911860808b4a941464bd8ea9 ltsp-x336_3DLabs-1.0-0-i386.tgz 997270
+MD5 5270bbe28f73f42d101c1903a16eef9a ltsp-x336_8514-1.0-0-i386.tgz 795536
+MD5 473a63d5ee6f3c494e512b19e9a26e2b ltsp-x336_AGX-1.0-0-i386.tgz 880323
+MD5 9aaa87b89b6cc299cd0054665f51a63b ltsp-x336_I128-1.0-0-i386.tgz 983021
+MD5 7fc45ddee8e73e052d75c798ff917f8e ltsp-x336_Mach32-1.0-0-i386.tgz 863864
+MD5 ef0b2ccb98bae0cd5e4919c2c0f1c93f ltsp-x336_Mach64-1.0-0-i386.tgz 918843
+MD5 51b1b144679eabe65cb8560cc243ee91 ltsp-x336_Mach8-1.0-0-i386.tgz 800367
+MD5 e1ea32dcd2f3f6256eece451b0bcbb53 ltsp-x336_Mono-1.0-0-i386.tgz 874917
+MD5 5e79ed4d1d616b376da9962112afbf12 ltsp-x336_P9000-1.0-0-i386.tgz 888427
+MD5 133acac5836e2f1d7fb6aeff0eb6bf6a ltsp-x336_S3_S3V-1.0-0-i386.tgz 2078825
+MD5 e082f4d298a4f135e6db21bb970d95ce ltsp-x336_SVGA-1.0-0-i386.tgz 1509363
+MD5 71f5167a49ead5eee5371926c5c2829f ltsp-x336_VGA16-1.0-0-i386.tgz 891345
+MD5 04578a927b90c27c4b88c5248d660f0c ltsp-x336_W32-1.0-0-i386.tgz 818829
+MD5 2e39198e18c4ce1e48636369cc86151f ltsp-esd-1.0-0-i386.tgz 198156
+MD5 51a1f889b78fde496e2f1a07afcd08b6 ltsp-utils-0.9.tgz 40575
diff --git a/net-misc/ltsp-core/ltsp-core-3.0.9-r1.ebuild b/net-misc/ltsp-core/ltsp-core-3.0.9-r1.ebuild
deleted file mode 100644
index d6e490c06f56..000000000000
--- a/net-misc/ltsp-core/ltsp-core-3.0.9-r1.ebuild
+++ /dev/null
@@ -1,339 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ltsp-core/ltsp-core-3.0.9-r1.ebuild,v 1.12 2004/07/15 03:03:06 agriffis Exp $
-
-
-IUSE="gnome kde"
-
-DESCRIPTION="LTSP - Linux Terminal Server Project"
-HOMEPAGE="http://www.ltsp.org/"
-SRC_URI="mirror://sourceforge/ltsp/ltsp_core-3.0.9-i386.tgz
-	mirror://sourceforge/ltsp/ltsp_kernel-3.0.5-i386.tgz
-	mirror://sourceforge/ltsp/ltsp_x_core-3.0.1-i386.tgz
-	mirror://sourceforge/ltsp/ltsp_x_fonts-3.0.0-i386.tgz
-	mirror://sourceforge/ltsp/ltsp_x336_3dlabs-3.0.0-i386.tgz
-	mirror://sourceforge/ltsp/ltsp_x336_8514-3.0.0-i386.tgz
-	mirror://sourceforge/ltsp/ltsp_x336_agx-3.0.0-i386.tgz
-	mirror://sourceforge/ltsp/ltsp_x336_fbdev-3.0.0-i386.tgz
-	mirror://sourceforge/ltsp/ltsp_x336_i128-3.0.0-i386.tgz
-	mirror://sourceforge/ltsp/ltsp_x336_mach32-3.0.0-i386.tgz
-	mirror://sourceforge/ltsp/ltsp_x336_mach64-3.0.0-i386.tgz
-	mirror://sourceforge/ltsp/ltsp_x336_mach8-3.0.0-i386.tgz
-	mirror://sourceforge/ltsp/ltsp_x336_mono-3.0.0-i386.tgz
-	mirror://sourceforge/ltsp/ltsp_x336_p9000-3.0.0-i386.tgz
-	mirror://sourceforge/ltsp/ltsp_x336_s3-3.0.0-i386.tgz
-	mirror://sourceforge/ltsp/ltsp_x336_s3v-3.0.0-i386.tgz
-	mirror://sourceforge/ltsp/ltsp_x336_svga-3.0.0-i386.tgz
-	mirror://sourceforge/ltsp/ltsp_x336_vga16-3.0.0-i386.tgz
-	mirror://sourceforge/ltsp/ltsp_x336_w32-3.0.0-i386.tgz"
-
-DEPEND="gnome? ( >=gnome-base/gdm-2.4.0.0 )
-	kde? ( >=kde-base/kdebase-3.0.2 )
-	virtual/x11
-	virtual/tftp
-	sys-apps/xinetd
-	net-misc/dhcp
-	net-fs/nfs-utils"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-ltsp_strip_config() {
-	local SOURCE="/"$1
-	local TARGET=${D}/$SOURCE
-	sed -e "/## LTS-begin ##/,/## LTS-end ##/d" < ${SOURCE} >> ${TARGET}
-}
-
-ltsp_copy_config() {
-	local SOURCE="/"$1
-	local TARGET=${D}/$SOURCE
-	if test -f $SOURCE ; then
-		cp $SOURCE $TARGET
-	else
-		echo "!!! No config file named $SOURCE"
-		return 1
-	fi
-}
-
-modify_exports()
-{
-	echo ">>> Modifying /etc/exports ..."
-
-	# get the file
-	ltsp_strip_config /etc/exports
-
-	# insert new data
-	cat >> ${D}/etc/exports <<EOF
-
-## LTS-begin ##
-
-#
-# The lines between the 'LTS-begin' and the 'LTS-end' were added
-# on: `date` by the ltsp installation script.
-# For more information, visit the ltsp homepage
-# at http://www.ltsp.org
-#
-
-/opt/ltsp/i386                  192.168.0.0/255.255.255.0(ro,no_root_squash)
-/var/opt/ltsp/swapfiles         192.168.0.0/255.255.255.0(rw,no_root_squash)
-
-#
-# The following entries need to be uncommented if you want
-# Local App support in ltsp
-#
-#/home                  192.168.0.0/255.255.255.0(rw,no_root_squash)
-
-## LTS-end ##
-EOF
-
-}
-
-modify_xdm_xdm_config()
-{
-	local file=/etc/X11/xdm/xdm-config
-
-	if [ -f $file ] ; then
-		echo ">>> Modifying $file ..."
-
-		# get file
-		ltsp_strip_config $file
-
-		# make temp file
-		mv ${D}$file ${D}$file.temp
-
-		cat >> ${D}$file.temp <<EOF
-
-## LTS-begin ##
-
-#
-# The lines between the 'LTS-begin' and the 'LTS-end' were added
-# on: Mon Jan 21 21:40:50 CST 2002 by the ltsp installation script.
-# For more information, visit the ltsp homepage
-# at http://www.ltsp.org
-#
-
-DisplayManager.*.setup:     /etc/X11/xdm/Xsetup_workstation
-
-## LTS-end ##
-EOF
-
-		# comment out display port line
-		sed -e "s/^DisplayManager\.requestPort/\# DisplayManager.requestPort/" \
-			< ${D}$file.temp >> ${D}$file
-
-		# remove temp file
-		rm -f ${D}$file.temp
-	else
-		echo "!!! $file not installed on system"
-	fi
-}
-
-modify_xdm_Xservers()
-{
-	local file=/etc/X11/xdm/Xservers
-
-	if [ -f $file ] ; then
-		echo ">>> Modifying $file ..."
-
-		# get file
-		ltsp_strip_config $file
-
-		# TODO: put this comment in a more sensical place!!
-		cat >> ${D}$file <<EOF
-
-## LTS-begin ##
-
-# Comment the above line in order to disable xdm for the local machine!
-
-## LTS-end ##
-EOF
-	else
-		echo "!!! $file not installed on system"
-	fi
-}
-
-modify_xdm_kdmrc()
-{
-	local file=/usr/kde/3/share/config/kdm/kdmrc
-
-	if [ -f $file ] ; then
-		echo ">>> Modifying $file ..."
-
-		# get file
-		ltsp_strip_config $file
-
-		# make temp file
-		mv ${D}$file ${D}$file.temp
-
-		# run custom perl script to modify the kdmrc
-		${FILESDIR}/kdmrc.pl < ${D}/$file.temp >> ${D}/$file
-
-		# remove temp file
-		rm -f ${D}$file.temp
-	else
-		echo "!!! $file not installed on system"
-	fi
-
-}
-
-modify_gdm_gdm_conf()
-{
-	local file=/etc/X11/gdm/gdm.conf
-
-	if [ -f $file ] ; then
-		echo ">>> Modifying $file ..."
-
-		# get file
-		ltsp_strip_config $file
-
-		# make temp file
-		mv ${D}$file ${D}$file.temp
-
-		# run custom perl script to modify the gdm.conf
-		${FILESDIR}/gdm.conf.pl < ${D}/$file.temp >> ${D}/$file
-
-		# remove temp file
-		rm -f ${D}$file.temp
-	else
-		echo "!!! $file not installed on system"
-	fi
-}
-
-src_compile() {
-	if [ "`has sandbox ${FEATURES}`" ]; then
-		einfo
-		einfo '!!! You have to add FEATURES="-sandbox" to /etc/make.conf '
-		einfo '              in order to emerge ltsp-core             !!!'
-		einfo
-		die
-	fi
-}
-
-src_install() {
-	local XSERVERS="3dlabs 8514 agx fbdev i128 mach32 mach64 mach8 mono p9000 \
-					s3 s3v svga w32"
-
-	echo ">>> Installing root LTSP directory ..."
-	cd ${WORKDIR}/ltsp_core
-	${FILESDIR}/install.sh i386 ${D}/opt/ltsp/
-	dodoc INSTALL README ${FILESDIR}/INSTALL.Gentoo
-
-	echo ">>> Installing the X core ..."
-	cd ${WORKDIR}/ltsp_x_core
-	${FILESDIR}/install.sh i386 ${D}/opt/ltsp/
-
-	echo ">>> Installing the X fonts ..."
-	cd ${WORKDIR}/ltsp_x_fonts
-	${FILESDIR}/install.sh i386 ${D}/opt/ltsp/
-
-	echo ">>> Installing the LTSP kernel ..."
-	cd ${WORKDIR}/ltsp_kernel
-	${FILESDIR}/install.sh i386 ${D}/opt/ltsp/
-	dodir /tftpboot/lts
-	dodir /tftpboot/pxe
-	cp vmlinuz* ${D}/tftpboot/lts
-	insinto /tftpboot/pxe
-	doins ${FILESDIR}/eb-5.0.9-rtl8139.lzpxe
-	doins ${FILESDIR}/eb-5.0.9-eepro100.lzpxe
-	doins ${FILESDIR}/eb-5.0.9-3c905c-tpo.lzpxe
-
-	echo ">>> Installing the X Servers ..."
-	for d in $XSERVERS ; do
-		cd ${WORKDIR}/ltsp_x336_$d
-		${FILESDIR}/install.sh i386 ${D}/opt/ltsp/
-	done
-
-	# make config dirs
-	dodir /usr/kde/3/share/config/kdm
-	dodir /etc/X11/gdm
-
-	ebegin "Copy the ltsp.conf file ..."
-	insinto /etc
-	doins ${FILESDIR}/ltsp.conf
-	eend
-
-	ebegin "Copying xdm files ..."
-	insinto /etc/X11/xdm
-	doins ${FILESDIR}/{Xsetup_workstation,ltsp.gif,Xaccess}
-	eend
-
-	ebegin "Copying dhcp files ..."
-	insinto /etc/dhcp
-	doins ${FILESDIR}/dhcpd.conf
-	eend
-
-	ebegin "Copying xinetd files ..."
-	insinto /etc/xinetd.d
-	doins ${FILESDIR}/tftp
-	eend
-
-	# modify config files
-	modify_exports
-	modify_xdm_xdm_config
-	modify_xdm_Xservers
-	if use kde; then
-		modify_xdm_kdmrc
-	fi
-
-	# gdm requires a custom config
-	if use gnome; then
-		modify_gdm_gdm_conf
-		ltsp_copy_config /etc/X11/gdm/Default
-
-		if test -f ${D}/etc/X11/gdm/Default -o -L ${D}/etc/X11/gdm/Default; then
-			mv ${D}/etc/X11/gdm/Default ${D}/etc/X11/gdm/\:0
-		fi
-
-		dosym /etc/X11/xdm/Xsetup_workstation /etc/X11/gdm/Default
-	fi
-
-	# ensure that these directories get copied even though they are empty
-	for empty_dir in dev oldroot proc root tmp ; do
-		keepdir /opt/ltsp/i386/${empty_dir}
-	done
-
-	rm -f ${D}/opt/ltsp/i386/etc/lts.conf
-}
-
-pkg_postinst() {
-	einfo "*******************************************************************************************"
-	einfo " | PLEASE LOOK AT THE MERGED CONFIG FILES AND UPDATE/OVERWRITE OLDER CONFS AS NEEDED! ***| "
-	einfo "*******************************************************************************************"
-	einfo " | YOU NEED TO EDIT YOUR UPDATED CONFIGURATION FILES TO COMPLETE THE LTSP INSTALLATION: *| "
-	einfo " |---------------------------------------------------------------------------------------| "
-	einfo " | FILE -------------------------| ACTION -----------------------------------------------| "
-	einfo " |---------------------------------------------------------------------------------------| "
-	einfo " | /etc/exports -----------------| Alter network address/netmask(nfs options) to match --| "
-	einfo " |-------------------------------| your current network/nfs settings --------------------| "
-	einfo " |---------------------------------------------------------------------------------------| "
-	einfo " | /etc/dhcp/dhcpd.conf ---------| Alter it to match your network settings and other ----| "
-	einfo " |-------------------------------| needs. Read comments inside dhcpd.conf for more... ---| "
-	einfo " |---------------------------------------------------------------------------------------| "
-	einfo " | /etc/conf.d/dhcp -------------| Alter IFACE setting if needed ------------------------| "
-	einfo " |---------------------------------------------------------------------------------------| "
-	einfo " | /opt/ltsp/i386/etc/lts.conf --| Alter LTSP config file to match your terminals -------| "
-	einfo " |---------------------------------------------------------------------------------------| "
-	einfo " | /etc/xinetd.d/tftp -----------| Change disable=yes to disable=no ---------------------| "
-	einfo " |---------------------------------------------------------------------------------------| "
-	einfo "*******************************************************************************************"
-	einfo " | YOU NEED TO ACTIVATE THESE SERVICES TO RUN LTSP SERVER: ------------------------------| "
-	einfo " |---------------------------------------------------------------------------------------| "
-	einfo " | SERVICE ----------------------| ACTION -----------------------------------------------| "
-	einfo " |---------------------------------------------------------------------------------------| "
-	einfo " | DHCP -------------------------| /etc/init.d/dhcp start -------------------------------| "
-	einfo " |-------------------------------| rc-update add dhcp default (for start at boot) -------| "
-	einfo " |---------------------------------------------------------------------------------------| "
-	einfo " | XDM --------------------------| /etc/init.d/xdm start --------------------------------| "
-	einfo " |-------------------------------| rc-update add xdm default (for start at boot) --------| "
-	einfo " |---------------------------------------------------------------------------------------| "
-	einfo " | TFTP FROM XINETD -------------| /etc/init.d/xinetd start -----------------------------| "
-	einfo " |-------------------------------| rc-update add xinetd default (for start at boot) -----| "
-	einfo " |---------------------------------------------------------------------------------------| "
-	einfo " | NFS --------------------------| /etc/init.d/nfs start --------------------------------| "
-	einfo " |-------------------------------| rc-update add nfs default (for start at boot) --------| "
-	einfo " |---------------------------------------------------------------------------------------| "
-	einfo "*******************************************************************************************"
-	einfo " | FOR MORE INFORMATION AND COMPLETE SET OF DOCUMENTATION GO TO WWW.LTSP.ORG  ***********| "
-	einfo "*******************************************************************************************"
-}
diff --git a/net-misc/ltsp-core/ltsp-core-3.0.9-r3.ebuild b/net-misc/ltsp-core/ltsp-core-3.0.9-r3.ebuild
index cfdd50a8b4f6..19539dce9e59 100644
--- a/net-misc/ltsp-core/ltsp-core-3.0.9-r3.ebuild
+++ b/net-misc/ltsp-core/ltsp-core-3.0.9-r3.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-misc/ltsp-core/ltsp-core-3.0.9-r3.ebuild,v 1.10 2004/07/15 03:03:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ltsp-core/ltsp-core-3.0.9-r3.ebuild,v 1.11 2004/08/19 09:28:56 lanius Exp $
 
 
 IUSE="gnome kde"
@@ -37,7 +37,7 @@ DEPEND="gnome? ( >=gnome-base/gdm-2.4.0.0 )
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 ltsp_strip_config() {
 	local SOURCE="/"$1
diff --git a/net-misc/ltsp-core/ltsp-core-4.1.ebuild b/net-misc/ltsp-core/ltsp-core-4.1.ebuild
new file mode 100644
index 000000000000..7a568894ee6e
--- /dev/null
+++ b/net-misc/ltsp-core/ltsp-core-4.1.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ltsp-core/ltsp-core-4.1.ebuild,v 1.1 2004/08/19 09:28:56 lanius Exp $
+
+IUSE="X debug nas esd audiofile snmp"
+
+DESCRIPTION="LTSP - Linux Terminal Server Project"
+HOMEPAGE="http://www.ltsp.org/"
+
+DEPEND="app-arch/tar
+	virtual/gzip"
+
+RDEPEND="X? ( virtual/x11 )
+	virtual/tftp
+	sys-apps/xinetd
+	net-misc/dhcp
+	net-fs/nfs-utils
+	net-nds/portmap"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+
+S=${WORKDIR}/ltsp
+
+LTSP_CORE="ltsp-ltsptree-1.7-0-i386.tgz
+ltsp-glibc-1.0-0-i386.tgz
+ltsp-sysvinit-1.0-0-i386.tgz
+ltsp-popt-1.1-0-i386.tgz
+ltsp-bash-1.0-0-i386.tgz
+ltsp-busybox-1.0-0-i386.tgz
+ltsp-devfsd-1.0-0-i386.tgz
+ltsp-getltscfg-1.2-0-i386.tgz
+ltsp-libgcc_s-1.0-0-i386.tgz
+ltsp-haltsys-1.0-0-i386.tgz
+ltsp-e2fsprogs-1.1-0-i386.tgz
+ltsp-startsess-1.1-0-i386.tgz
+ltsp-lp_server-1.1-0-i386.tgz
+ltsp-ltspinfod-1.1-0-i386.tgz
+ltsp-modutils-1.0-0-i386.tgz
+ltsp-ncurses-1.0-0-i386.tgz
+ltsp-open-1.1-0-i386.tgz
+ltsp-prep_swap-1.0-0-i386.tgz
+ltsp-zlib-1.0-0-i386.tgz
+ltsp-libpng-1.0-0-i386.tgz
+ltsp-pci_scan-1.0-0-i386.tgz
+ltsp-pam-1.0-0-i386.tgz
+ltsp-ssh-1.0-0-i386.tgz
+ltsp-net-tools-1.0-0-i386.tgz
+ltsp-xinetd-1.0-0-i386.tgz
+ltsp-ypbind-1.0-0-i386.tgz
+ltsp-tcp_wrappers-1.0-0-i386.tgz
+ltsp-portmap-1.0-0-i386.tgz
+ltsp-rdesktop-1.3-0-i386.tgz
+ltsp-libvncserver-1.0-0-i386.tgz
+ltsp-localdev-1.0-0-i386.tgz
+ltsp-openssl-1.0-0-i386.tgz
+ltsp-samba-1.0-0-i386.tgz
+ltsp-util-linux-1.0-0-i386.tgz
+ltsp-vidlist-1.1-0-i386.tgz
+ltsp-aumix-1.0-0-i386.tgz
+ltsp-freetype-1.0-0-i386.tgz"
+
+use snmp && LTSP_CORE="${LTSP_CORE} ltsp-snmpd-1.0-0-i386.tgz"
+
+LTSP_DEBUG="ltsp-gdb-1.0-0-i386.tgz
+ltsp-strace-1.0-0-i386.tgz"
+
+LTSP_X="ltsp-x-core-1.2-0-i386.tgz
+ltsp-x-fonts-1.0-0-i386.tgz
+ltsp-x-fonts-100dpi-1.0-0-i386.tgz
+ltsp-x336_3DLabs-1.0-0-i386.tgz
+ltsp-x336_8514-1.0-0-i386.tgz
+ltsp-x336_AGX-1.0-0-i386.tgz
+ltsp-x336_I128-1.0-0-i386.tgz
+ltsp-x336_Mach32-1.0-0-i386.tgz
+ltsp-x336_Mach64-1.0-0-i386.tgz
+ltsp-x336_Mach8-1.0-0-i386.tgz
+ltsp-x336_Mono-1.0-0-i386.tgz
+ltsp-x336_P9000-1.0-0-i386.tgz
+ltsp-x336_S3_S3V-1.0-0-i386.tgz
+ltsp-x336_SVGA-1.0-0-i386.tgz
+ltsp-x336_VGA16-1.0-0-i386.tgz
+ltsp-x336_W32-1.0-0-i386.tgz"
+
+LTSP_STUFF="ltsp-kernel-1.4-0-i386.tgz
+ltsp-modules-1.4-0-i386.tgz"
+
+LTSP_UTILS="ltsp-utils-0.9.tgz"
+
+KERNEL_VERSION="2.4.26-ltsp-2"
+
+use audiofile && LTSP_SOUND="${LTSP_SOUND} ltsp-audiofile-1.0-0-i386.tgz"
+use esd && LTSP_SOUND="${LTSP_SOUND} ltsp-esd-1.0-0-i386.tgz"
+use nas && LTSP_SOUND="${LTSP_SOUND} ltsp_nasd-1.1-0-i386.tgz"
+
+for FILE in ${LTSP_CORE} ${LTSP_STUFF}
+do
+	SRC_URI="${SRC_URI} http://www.ltsp.org/ltsp-4.1/${FILE}"
+done
+
+for FILE in ${LTSP_DEBUG}
+do
+	SRC_URI="${SRC_URI} debug? ( http://www.ltsp.org/ltsp-4.1/${FILE} )"
+done
+
+for FILE in ${LTSP_X}
+do
+	SRC_URI="${SRC_URI} X? ( http://www.ltsp.org/ltsp-4.1/${FILE} )"
+done
+
+for FILE in ${LTSP_SOUND}
+do
+	SRC_URI="${SRC_URI} http://www.ltsp.org/ltsp-4.1/${FILE}"
+done
+
+SRC_URI="${SRC_URI} mirror://sourceforge/ltsp/${LTSP_UTILS}"
+
+
+src_unpack() {
+	# nothing to unpack
+	mkdir ltsp
+	cd ltsp
+
+	for FILE in ${LTSP_STUFF} ${LTSP_UTILS}
+	do
+		tar -xzf ${DISTDIR}/${FILE}
+	done
+}
+
+src_install() {
+	# now unpack the files
+	# first the core stuff
+	dodir /opt/ltsp-${PV}
+	echo "Installing core packages..."
+	for FILE in ${LTSP_CORE}
+	do
+		tar -xzf ${DISTDIR}/${FILE} -C ${D}/opt/ltsp-${PV} 2> /dev/null
+	done
+
+	# debug stuff
+	if [ `use debug` ]; then
+		echo "Installing debug packages..."
+		for FILE in ${LTSP_DEBUG}
+		do
+			tar -xzf ${DISTDIR}/${FILE} -C ${D}/opt/ltsp-${PV} 2> /dev/null
+		done
+	fi
+
+	# X stuff
+	if [ `use X` ]; then
+		echo "Installing X packages..."
+		for FILE in ${LTSP_X}
+		do
+			tar -xzf ${DISTDIR}/${FILE} -C ${D}/opt/ltsp-${PV} 2> /dev/null
+		done
+	fi
+
+	# kernel stuff
+	echo "Installing kernel packages..."
+	find i386 -print | cpio -pmud --quiet ${D}/opt/ltsp-${PV} 2> /dev/null
+	insinto /tftpboot/lts
+	doins vmlinuz-${KERNEL_VERSION}
+
+	# pxe stuff
+	insinto /tftpboot/pxe
+	doins ${FILESDIR}/eb-5.0.9-rtl8139.lzpxe
+	doins ${FILESDIR}/eb-5.0.9-eepro100.lzpxe
+	doins ${FILESDIR}/eb-5.0.9-3c905c-tpo.lzpxe
+
+	# config stuff
+	cd ltsp-utils
+	echo "Doing several other stuff..."
+	dosbin ltspcfg
+	dosbin ltspinfo
+	dosbin ltspadmin
+	dodoc COPYING
+	cd ..
+
+	# several other stuff
+	rm -fR ${D}/usr/share/
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Either use ltspcfg to configure your stuff, or follow the guide at gentoo.org:"
+	einfo "                   http://www.gentoo.org/doc/en/ltsp.xml                      "
+	einfo
+}
diff --git a/net-misc/ltsp-core/metadata.xml b/net-misc/ltsp-core/metadata.xml
new file mode 100644
index 000000000000..b10a81aadc90
--- /dev/null
+++ b/net-misc/ltsp-core/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">

+<pkgmetadata>

+	<maintainer>

+		<email>lanius@gentoo.org</email>

+	</maintainer>

+	<longdescription>LTSP, the Linux Terminal Server Project, is designed to 

+	allow multiple dummy terminals to run off of one central server. It 

+	includes support for local sound, usb mass media access, CD-ROM access, 

+	floppy access, and a host of other goodies. See http://www.ltsp.org for a 

+	full run-down of this fantastic package. 

+	</longdescription>

+</pkgmetadata>