ltsp-server: Version bump to 5.2.5.

6 files changed, 9 insertions, 248 deletions

diff --git a/net-misc/ltsp-server/ChangeLog b/net-misc/ltsp-server/ChangeLog
index ee52434..6174dc9 100644
--- a/net-misc/ltsp-server/ChangeLog
+++ b/net-misc/ltsp-server/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*ltsp-server-5.2.5 (08 12 2010)
+
+  08 12 2010; Wim Muskee wimmuskee@gmail.com ltsp-server-5.2.5:
+  Version bump, removing genkernel dependency.
+
 *ltsp-server-5.2.4-r1 (06 08 2010)
 
   06 08 2010; Wim Muskee wimmuskee@gmail.com ltsp-server-5.2.4-r1:
diff --git a/net-misc/ltsp-server/Manifest b/net-misc/ltsp-server/Manifest
index ee4f368..d661757 100644
--- a/net-misc/ltsp-server/Manifest
+++ b/net-misc/ltsp-server/Manifest
@@ -1,9 +1,6 @@
-AUX ltsp-server-5.2.3-r1-layman.patch 571 RMD160 e091d7abb916f85d562e4b54b56c4e66dae7b36c SHA1 b82d5ff71a827be5c0cd32be242b4e225a8e2a98 SHA256 41aa4d61f01dbfdfa8f809cedb25fc0eb19983e5948085d7d05417ffe3aff250
 AUX ltsp-server-5.2.4-r1-layman.patch 972 RMD160 e310bd9a1a746d6743ae751d12ba55a269e579dc SHA1 4d426a3497b6ffa0292de8b630e45ddb2898b5b5 SHA256 c5048cf1b9fff4308d3c5dcda605c8da65f843f6281513855598b6098f4cbc10
-EBUILD ltsp-server-5.2.2.ebuild 2272 RMD160 44821f991c2546e893e3fa5efd47e778d96c58cb SHA1 2c1871f76135c42ff57f8bbaa8db987ebeda93f1 SHA256 1c90bd3f06e8af413f6110327154aea5cf88aa80b3a1e7501ffeee1ec20da74e
-EBUILD ltsp-server-5.2.3-r1.ebuild 2324 RMD160 5ed72c044337309b33650d8f0c32d27f83875da9 SHA1 66fca1a4f5b08e1378a7012ed582f6e3e81a06cf SHA256 a026c8eca0b5d4ce4a61d94300cddd487eeadac1963886f11445b4acd82ceb9a
 EBUILD ltsp-server-5.2.4-r1.ebuild 2324 RMD160 d29fe8eb8e71eaa7d23c38b163a039064b8ff4b9 SHA1 4b5acc829665337b5fc5eb1b57ce00d3850b886a SHA256 b063af7147f93778b4991850d01ec6718380a2b385f82236ba99686d16807358
-EBUILD ltsp-server-5.2.4.ebuild 2272 RMD160 6a286c6413bc5a699ae26304a303d98364ca6354 SHA1 0521994dc352a75505dbcc298da730be65ff1878 SHA256 8e538f3559f4a4d2eeb64a2911a4a3f2b367959586aa247d0f66019e17e1ffd3
+EBUILD ltsp-server-5.2.5.ebuild 2249 RMD160 a0b0179bd185269d75a0f7c3eba55927bed34f9a SHA1 3eda88018414a192fd5bf1d1b84cd275208060f8 SHA256 85b926d69de669c85ad5397a8f02d74fe17984f652d1956b2c3494fa55be4740
 EBUILD ltsp-server-9999.ebuild 2246 RMD160 11d8c1a52dea01d81c96af1faefa8b2e6d75e3d8 SHA1 1fb3da71e22773d61b2ba451b2b064b4814b22d1 SHA256 cac45056c155d9108163a183c00065428ba20bb05be18b365909e7d48dfa5a63
-MISC ChangeLog 1704 RMD160 1a1182239e5f92d1e88284c668bff575794626a5 SHA1 2da79a764e92760c088192f544d09c6daa0d6a15 SHA256 2b5ccbfcf523b7ef0494074628c0f354e3683cd22f0a020b0b388f063c370515
+MISC ChangeLog 1849 RMD160 77ea3862da6edaba57fb61b8f32c5d20d2110acd SHA1 ba57b683c07e6f57198d4a87579b75ab20ef5f21 SHA256 e977d1707580854a1dd56d76e101dced8b00caa5ed4dc567d9e4bde81e0e1393
 MISC metadata.xml 418 RMD160 d07ff50aee16b42f0c514f082c19ab3b0cfc8430 SHA1 571c6b7d459fe60fe64ffa557e3f5556a5b6c698 SHA256 0e33cdaaa303808a7c0a0fd7f2e49bb818996007c99cbd1e0f0240db439810d3
diff --git a/net-misc/ltsp-server/files/ltsp-server-5.2.3-r1-layman.patch b/net-misc/ltsp-server/files/ltsp-server-5.2.3-r1-layman.patch
deleted file mode 100644
index 4b0a34e..0000000
--- a/net-misc/ltsp-server/files/ltsp-server-5.2.3-r1-layman.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- server/configs/quickstart/profile.qs.orig	2010-07-28 18:49:55.000000000 +0200
-+++ server/configs/quickstart/profile.qs	2010-07-28 18:50:18.000000000 +0200
-@@ -111,7 +111,7 @@
- 	CONFIG_PROTECT_MASK="/etc /etc/conf.d /etc/init.d"
- 
- 	# TODO: don't add this by default
--	source /usr/local/portage/layman/make.conf
-+	source /var/lib/layman/make.conf
- 	EOF
- 
- 	cat > ${chroot_dir}/etc/fstab <<- EOF
-@@ -199,4 +199,4 @@
- 
- # TODO: test if can be removed when xorg-server 1.8 is stable
- rcadd hald default
--rcadd dbus default
-\ No newline at end of file
-+rcadd dbus default
diff --git a/net-misc/ltsp-server/ltsp-server-5.2.2.ebuild b/net-misc/ltsp-server/ltsp-server-5.2.2.ebuild
deleted file mode 100644
index 32cc938..0000000
--- a/net-misc/ltsp-server/ltsp-server-5.2.2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="1"
-
-EBZR_REVISION="1734"
-EBZR_REPO_URI="http://bazaar.launchpad.net/~ltsp-upstream/ltsp/ltsp-trunk"
-
-inherit bzr
-
-DESCRIPTION="LTSP server"
-HOMEPAGE="http://www.ltsp.org/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# Default to nfs until nbd works
-IUSE="doc dhcp examples nbd +nfs"
-DEPEND=""
-
-# NOTES on the dependencies
-# xdm - we currently have to rely on /usr/lib/X11/xdm/Xsession
-# iproute2 - ltsp-update-sshkeys requires ip
-RDEPEND="!net-misc/ltsp-client
-	x11-apps/xdm
-	media-sound/pulseaudio
-	x11-base/xorg-server
-	net-misc/openssh
-	virtual/tftp
-	dhcp? ( || ( net-misc/dhcp net-dns/dnsmasq ) )
-	nfs? (
-		net-fs/nfs-utils
-		net-nds/portmap
-	)
-	nbd? (
-		sys-apps/xinetd
-		sys-block/nbd
-		sys-fs/squashfs-tools
-	)
-	sys-fs/ltspfs
-	sys-apps/lsb-release
-	sys-kernel/genkernel
-	>sys-apps/quickstart-0.6
-	sys-apps/iproute2
-	>=app-portage/layman-1.2
-	sys-boot/syslinux
-	net-misc/ldminfod"
-
-src_unpack() {
-	bzr_src_unpack
-}
-
-src_install() {
-	ltspdir="/usr/share/ltsp"
-
-	insinto /etc/ltsp/quickstart
-	doins server/configs/quickstart/*
-
-	insinto ${ltspdir}
-	doins ltsp-common-functions
-
-	insinto ${ltspdir}/plugins
-	doins -r server/plugins/*
-
-	dobin localapps/ltsp-localapps
-
-	dosbin server/ltsp-info
-	dosbin server/ltsp-keys
-	dosbin server/ltsp-build-client
-	dosbin server/ltsp-update-kernels
-	dosbin server/ltsp-update-sshkeys
-
-	doman server/doc/ltsp-build-client.8
-	doman server/doc/ltsp-info.1
-	doman server/doc/ltsp-update-kernels.8
-	doman server/doc/ltsp-update-sshkeys.8
-
-    if use nbd; then
-		dosbin server/ltsp-update-image
-		dosbin server/nbdrootd
-		dosbin server/nbdswapd
-
-		insinto /etc/xinetd.d
-		doins server/xinetd.d/nbd*
-
-		doman server/doc/ltsp-update-image.8
-		doman server/doc/nbdrootd.8
-		doman server/doc/nbdswapd.8
-    fi
-
-    if use doc; then
-		dodoc TODO
-		dodoc server/doc/CodingStyle
-		dodoc server/doc/QuickInstall
-		dodoc server/doc/lts-parameters.txt
-		dodoc server/doc/plugins
-		dodoc server/doc/swap
-	fi
-
-	if use examples; then
-		docinto examples
-		dodoc server/doc/examples/*
-	fi;
-}
-
-pkg_postinst(){
-	einfo "Don't forget to install a window manager,"
-	einfo "you can't log in to your ltsp-client without one."
-}
-
diff --git a/net-misc/ltsp-server/ltsp-server-5.2.3-r1.ebuild b/net-misc/ltsp-server/ltsp-server-5.2.3-r1.ebuild
deleted file mode 100644
index 63f9474..0000000
--- a/net-misc/ltsp-server/ltsp-server-5.2.3-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="1"
-
-EBZR_REVISION="1758"
-EBZR_REPO_URI="http://bazaar.launchpad.net/~ltsp-upstream/ltsp/ltsp-trunk"
-
-inherit bzr
-
-DESCRIPTION="LTSP server"
-HOMEPAGE="http://www.ltsp.org/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# Default to nfs until nbd works
-IUSE="doc dhcp examples nbd +nfs"
-DEPEND=""
-
-# NOTES on the dependencies
-# xdm - we currently have to rely on /usr/lib/X11/xdm/Xsession
-# iproute2 - ltsp-update-sshkeys requires ip
-RDEPEND="!net-misc/ltsp-client
-	x11-apps/xdm
-	media-sound/pulseaudio
-	x11-base/xorg-server
-	net-misc/openssh
-	virtual/tftp
-	dhcp? ( || ( net-misc/dhcp net-dns/dnsmasq ) )
-	nfs? (
-		net-fs/nfs-utils
-		net-nds/portmap
-	)
-	nbd? (
-		sys-apps/xinetd
-		sys-block/nbd
-		sys-fs/squashfs-tools
-	)
-	sys-fs/ltspfs
-	sys-apps/lsb-release
-	sys-kernel/genkernel
-	>sys-apps/quickstart-0.6
-	sys-apps/iproute2
-	>=app-portage/layman-1.3
-	sys-boot/syslinux
-	net-misc/ldminfod"
-
-src_unpack() {
-	bzr_src_unpack
-	cd "${S}"
-	epatch "${FILESDIR}/${PF}-layman.patch"
-}
-
-src_install() {
-	ltspdir="/usr/share/ltsp"
-
-	insinto /etc/ltsp/quickstart
-	doins server/configs/quickstart/*
-
-	insinto ${ltspdir}
-	doins ltsp-common-functions
-
-	insinto ${ltspdir}/plugins
-	doins -r server/plugins/*
-
-	dobin localapps/ltsp-localapps
-
-	dosbin server/ltsp-info
-	dosbin server/ltsp-keys
-	dosbin server/ltsp-build-client
-	dosbin server/ltsp-update-kernels
-	dosbin server/ltsp-update-sshkeys
-
-	doman server/doc/ltsp-build-client.8
-	doman server/doc/ltsp-info.1
-	doman server/doc/ltsp-update-kernels.8
-	doman server/doc/ltsp-update-sshkeys.8
-
-    if use nbd; then
-		dosbin server/ltsp-update-image
-		dosbin server/nbdrootd
-		dosbin server/nbdswapd
-
-		insinto /etc/xinetd.d
-		doins server/xinetd.d/nbd*
-
-		doman server/doc/ltsp-update-image.8
-		doman server/doc/nbdrootd.8
-		doman server/doc/nbdswapd.8
-    fi
-
-    if use doc; then
-		dodoc TODO
-		dodoc server/doc/CodingStyle
-		dodoc server/doc/QuickInstall
-		dodoc server/doc/lts-parameters.txt
-		dodoc server/doc/plugins
-		dodoc server/doc/swap
-	fi
-
-	if use examples; then
-		docinto examples
-		dodoc server/doc/examples/*
-	fi;
-}
-
-pkg_postinst(){
-	einfo "Don't forget to install a window manager,"
-	einfo "you can't log in to your ltsp-client without one."
-}
-
diff --git a/net-misc/ltsp-server/ltsp-server-5.2.4.ebuild b/net-misc/ltsp-server/ltsp-server-5.2.5.ebuild
index f1e5e97..12569d5 100644
--- a/net-misc/ltsp-server/ltsp-server-5.2.4.ebuild
+++ b/net-misc/ltsp-server/ltsp-server-5.2.5.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="1"
 
-EBZR_REVISION="1771"
+EBZR_REVISION="1796"
 EBZR_REPO_URI="http://bazaar.launchpad.net/~ltsp-upstream/ltsp/ltsp-trunk"
 
 inherit bzr
@@ -39,7 +39,6 @@ RDEPEND="!net-misc/ltsp-client
 	)
 	sys-fs/ltspfs
 	sys-apps/lsb-release
-	sys-kernel/genkernel
 	>sys-apps/quickstart-0.6
 	sys-apps/iproute2
 	>=app-portage/layman-1.3
@@ -100,7 +99,7 @@ src_install() {
 	if use examples; then
 		docinto examples
 		dodoc server/doc/examples/*
-	fi;
+	fi
 }
 
 pkg_postinst(){