several fixes

7 files changed, 71 insertions, 16 deletions

diff --git a/net-misc/ltsp-core/ChangeLog b/net-misc/ltsp-core/ChangeLog
index 9c9a28b31120..e8c2258982c8 100644
--- a/net-misc/ltsp-core/ChangeLog
+++ b/net-misc/ltsp-core/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/ltsp-core
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ltsp-core/ChangeLog,v 1.8 2003/06/26 07:56:50 frame Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ltsp-core/ChangeLog,v 1.9 2003/07/31 23:01:39 lanius Exp $
+
+*ltsp-core-3.0.9-r3 (01 Aug 2003)
+
+  01 Aug 2003; lanius@gentoo.org ltsp-core-3.0.7-r1.ebuild,
+  ltsp-core-3.0.9-r1.ebuild, ltsp-core-3.0.9-r2.ebuild,
+  ltsp-core-3.0.9-r3.ebuild, files/INSTALL.Gentoo:
+  - added sandbox info
+  - workaround for config overwrite n update
+  - added -r3 with new kernel image
 
 *ltsp-core-3.0.9-r2 (26 June 2003)
 
diff --git a/net-misc/ltsp-core/Manifest b/net-misc/ltsp-core/Manifest
index 1126b5bc1915..08baa1cafae0 100644
--- a/net-misc/ltsp-core/Manifest
+++ b/net-misc/ltsp-core/Manifest
@@ -1,7 +1,7 @@
-MD5 cb8849ef35a58b7924e728cef3fceb96 ChangeLog 3961
-MD5 2fb59708633a7382e82cccfc9685a35b ltsp-core-3.0.9-r3.ebuild 11103
-MD5 12c005f6ef1ba8815aba8a443fd46e99 ltsp-core-3.0.9-r1.ebuild 10797
-MD5 423c590b191d6672ad64fa03aaf92f55 ltsp-core-3.0.9-r2.ebuild 11102
+MD5 18cf2201994dd52ff9615c30f01cf5be ChangeLog 4268
+MD5 bed210d8108a46d1a278be6e312178e1 ltsp-core-3.0.9-r3.ebuild 11049
+MD5 51203bb9e63b073384568ab5ab5a902a ltsp-core-3.0.9-r1.ebuild 11046
+MD5 1a918b390a43f0e1d8fb3fe712efc52e ltsp-core-3.0.9-r2.ebuild 11048
 MD5 10154264d52ad4921f51eeaee61e1ef3 files/INSTALL.Gentoo 3790
 MD5 1d8daed9b6e2768685b56bb3740d6af1 files/Xaccess 2057
 MD5 a4b38d8b3e2c77d7bc1029c9aaf5c459 files/Xsetup_workstation 421
diff --git a/net-misc/ltsp-core/files/INSTALL.Gentoo b/net-misc/ltsp-core/files/INSTALL.Gentoo
index 70ef31458c31..70336e0b36dc 100644
--- a/net-misc/ltsp-core/files/INSTALL.Gentoo
+++ b/net-misc/ltsp-core/files/INSTALL.Gentoo
@@ -34,7 +34,10 @@
 	  | TFTP FROM XINETD -------------| /etc/init.d/xinetd start -----------------------------| 
 	  |-------------------------------| rc-update add xinetd default (for start at boot) -----| 
 	  |---------------------------------------------------------------------------------------| 
+	  | NFS --------------------------| /etc/init.d/nfs start --------------------------------|
+	  |-------------------------------| rc-update add nfs default (for start at boot) --------|
+	  |---------------------------------------------------------------------------------------|
 	 *******************************************************************************************
 	  | FOR MORE INFORMATION AND COMPLETE SET OF DOCUMENTATION GO TO WWW.LTSP.ORG  ***********| 
 	 *******************************************************************************************
-	 	
+
diff --git a/net-misc/ltsp-core/files/digest-ltsp-core-3.0.7-r1 b/net-misc/ltsp-core/files/digest-ltsp-core-3.0.9-r3
index 827e4cc08713..ba635b0f0383 100644
--- a/net-misc/ltsp-core/files/digest-ltsp-core-3.0.7-r1
+++ b/net-misc/ltsp-core/files/digest-ltsp-core-3.0.9-r3
@@ -1,6 +1,6 @@
-MD5 a890d19de7a182ab53e02faa056d7649 ltsp_core-3.0.7-i386.tgz 1461144
-MD5 5c7defaea1de847e6c14f31d9e5302c7 ltsp_kernel-3.0.5-i386.tgz 5144448
-MD5 491ebf4539c2932933efc26a06f85d1a ltsp_x_core-3.0.1-i386.tgz 10959730
+MD5 4838e28c19a475e8cdd8d0b731b22264 ltsp_core-3.0.9-i386.tgz 1464997
+MD5 53aad6653b77fd09c1f2fdbedf0ca469 ltsp_kernel-3.0.10-i386.tgz 11303562
+MD5 94dc471e8537d47568f35044b1bcfd4a ltsp_x_core-3.0.4-i386.tgz 13144315
 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
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
index 2ff791a97888..c696c3708313 100644
--- a/net-misc/ltsp-core/ltsp-core-3.0.9-r1.ebuild
+++ b/net-misc/ltsp-core/ltsp-core-3.0.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ltsp-core/ltsp-core-3.0.9-r1.ebuild,v 1.2 2003/06/25 14:55:45 frame Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ltsp-core/ltsp-core-3.0.9-r1.ebuild,v 1.3 2003/07/31 23:01:40 lanius Exp $
 
 
 IUSE="gnome kde"
@@ -203,6 +203,16 @@ modify_gdm_gdm_conf()
 	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"
@@ -285,6 +295,8 @@ src_install() {
 	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() {
@@ -321,6 +333,9 @@ pkg_postinst() {
 	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-r2.ebuild b/net-misc/ltsp-core/ltsp-core-3.0.9-r2.ebuild
index 33ba08ffb021..b6b3140e763f 100644
--- a/net-misc/ltsp-core/ltsp-core-3.0.9-r2.ebuild
+++ b/net-misc/ltsp-core/ltsp-core-3.0.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ltsp-core/ltsp-core-3.0.9-r2.ebuild,v 1.1 2003/06/26 07:56:50 frame Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ltsp-core/ltsp-core-3.0.9-r2.ebuild,v 1.2 2003/07/31 23:01:40 lanius Exp $
 
 
 IUSE="gnome kde"
@@ -203,6 +203,16 @@ modify_gdm_gdm_conf()
 	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"
@@ -285,6 +295,8 @@ src_install() {
 	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() {
diff --git a/net-misc/ltsp-core/ltsp-core-3.0.7-r1.ebuild b/net-misc/ltsp-core/ltsp-core-3.0.9-r3.ebuild
index b1c3909d8e41..1a4ff788940f 100644
--- a/net-misc/ltsp-core/ltsp-core-3.0.7-r1.ebuild
+++ b/net-misc/ltsp-core/ltsp-core-3.0.9-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ltsp-core/ltsp-core-3.0.7-r1.ebuild,v 1.4 2003/04/15 14:34:00 frame Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ltsp-core/ltsp-core-3.0.9-r3.ebuild,v 1.1 2003/07/31 23:01:40 lanius Exp $
 
 
 IUSE="gnome kde"
@@ -8,9 +8,9 @@ IUSE="gnome kde"
 S=${WORKDIR}/${P}
 DESCRIPTION="LTSP - Linux Terminal Server Project"
 HOMEPAGE="http://www.ltsp.org/"
-SRC_URI="mirror://sourceforge/ltsp/ltsp_core-3.0.7-i386.tgz
-	mirror://sourceforge/ltsp/ltsp_kernel-3.0.5-i386.tgz
-	mirror://sourceforge/ltsp/ltsp_x_core-3.0.1-i386.tgz
+SRC_URI="mirror://sourceforge/ltsp/ltsp_core-3.0.9-i386.tgz
+	mirror://sourceforge/ltsp/ltsp_kernel-3.0.10-i386.tgz
+	mirror://sourceforge/ltsp/ltsp_x_core-3.0.4-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
@@ -40,7 +40,7 @@ DEPEND="${RDEPEND}"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 
 ltsp_strip_config() {
 	local SOURCE="/"$1
@@ -203,6 +203,16 @@ modify_gdm_gdm_conf()
 	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"
@@ -285,6 +295,8 @@ src_install() {
 	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() {
@@ -321,7 +333,11 @@ pkg_postinst() {
 	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 "*******************************************************************************************"	
 }
+