ltsp-server: Version bump to 5.2.6.

4 files changed, 11 insertions, 28 deletions

diff --git a/net-misc/ltsp-server/ChangeLog b/net-misc/ltsp-server/ChangeLog
index 6174dc9..b655a50 100644
--- a/net-misc/ltsp-server/ChangeLog
+++ b/net-misc/ltsp-server/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for net-misc/ltsp-server
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*ltsp-server-5.2.6 (02 03 2011)
+
+  02 03 2011; Wim Muskee wimmuskee@gmail.com ltsp-server-5.2.6:
+  Version bump.
+
 *ltsp-server-5.2.5 (08 12 2010)
 
   08 12 2010; Wim Muskee wimmuskee@gmail.com ltsp-server-5.2.5:
diff --git a/net-misc/ltsp-server/Manifest b/net-misc/ltsp-server/Manifest
index d661757..7d347f6 100644
--- a/net-misc/ltsp-server/Manifest
+++ b/net-misc/ltsp-server/Manifest
@@ -1,6 +1,5 @@
-AUX ltsp-server-5.2.4-r1-layman.patch 972 RMD160 e310bd9a1a746d6743ae751d12ba55a269e579dc SHA1 4d426a3497b6ffa0292de8b630e45ddb2898b5b5 SHA256 c5048cf1b9fff4308d3c5dcda605c8da65f843f6281513855598b6098f4cbc10
-EBUILD ltsp-server-5.2.4-r1.ebuild 2324 RMD160 d29fe8eb8e71eaa7d23c38b163a039064b8ff4b9 SHA1 4b5acc829665337b5fc5eb1b57ce00d3850b886a SHA256 b063af7147f93778b4991850d01ec6718380a2b385f82236ba99686d16807358
 EBUILD ltsp-server-5.2.5.ebuild 2249 RMD160 a0b0179bd185269d75a0f7c3eba55927bed34f9a SHA1 3eda88018414a192fd5bf1d1b84cd275208060f8 SHA256 85b926d69de669c85ad5397a8f02d74fe17984f652d1956b2c3494fa55be4740
+EBUILD ltsp-server-5.2.6.ebuild 2249 RMD160 067872cd89b2c9a807ff5bf582bca09c90dfd0e2 SHA1 fd33994cd08ec69e1fd2e163b0320ed49113c82c SHA256 d8a316758c70cb1baf4fe44db3eeb040bc5931278f6cfac22bb96c03b24d18ce
 EBUILD ltsp-server-9999.ebuild 2246 RMD160 11d8c1a52dea01d81c96af1faefa8b2e6d75e3d8 SHA1 1fb3da71e22773d61b2ba451b2b064b4814b22d1 SHA256 cac45056c155d9108163a183c00065428ba20bb05be18b365909e7d48dfa5a63
-MISC ChangeLog 1849 RMD160 77ea3862da6edaba57fb61b8f32c5d20d2110acd SHA1 ba57b683c07e6f57198d4a87579b75ab20ef5f21 SHA256 e977d1707580854a1dd56d76e101dced8b00caa5ed4dc567d9e4bde81e0e1393
+MISC ChangeLog 1963 RMD160 69673cd5e8132808993cc18329fa37d2dc274275 SHA1 36d4ecc96138e77c4c01bf4db4b8c2a8f488eb13 SHA256 77a4bb13fdb366521113c523b59dba45dc95a69040fa5e2d6ca9225839273e28
 MISC metadata.xml 418 RMD160 d07ff50aee16b42f0c514f082c19ab3b0cfc8430 SHA1 571c6b7d459fe60fe64ffa557e3f5556a5b6c698 SHA256 0e33cdaaa303808a7c0a0fd7f2e49bb818996007c99cbd1e0f0240db439810d3
diff --git a/net-misc/ltsp-server/files/ltsp-server-5.2.4-r1-layman.patch b/net-misc/ltsp-server/files/ltsp-server-5.2.4-r1-layman.patch
deleted file mode 100644
index a665677..0000000
--- a/net-misc/ltsp-server/files/ltsp-server-5.2.4-r1-layman.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- server/configs/quickstart/profile.qs.orig	2010-08-06 23:50:59.000000000 +0200
-+++ server/configs/quickstart/profile.qs	2010-08-06 23:58:14.000000000 +0200
-@@ -82,11 +82,11 @@
- 	spawn "mount /usr/portage/packages/$ARCH ${chroot_dir}/usr/portage/packages -o bind"
- 	echo "${chroot_dir}/usr/portage/packages" >> /tmp/install.umount
- 
--	# bind mounting portage local, for overlay packages
-+	# bind mounting layman, for overlay packages
- 	# TODO: remove this mounting when the ltsp ebuilds are in the tree
--	spawn "mkdir ${chroot_dir}/usr/local/portage"
--	spawn "mount /usr/local/portage ${chroot_dir}/usr/local/portage -o bind"
--	echo "${chroot_dir}/usr/local/portage" >> /tmp/install.umount
-+	spawn "mkdir -p ${chroot_dir}/var/lib/layman"
-+	spawn "mount /var/lib/layman ${chroot_dir}/var/lib/layman -o bind"
-+	echo "${chroot_dir}/var/lib/layman" >> /tmp/install.umount
- 
- 	if [ -n "${MIRRORS}" ]; then
- 		echo "GENTOO_MIRRORS="${MIRRORS}"" >> ${chroot_dir}/etc/make.conf
diff --git a/net-misc/ltsp-server/ltsp-server-5.2.4-r1.ebuild b/net-misc/ltsp-server/ltsp-server-5.2.6.ebuild
index dd1d98f..6413bf3 100644
--- a/net-misc/ltsp-server/ltsp-server-5.2.4-r1.ebuild
+++ b/net-misc/ltsp-server/ltsp-server-5.2.6.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="1"
 
-EBZR_REVISION="1771"
+EBZR_REVISION="1806"
 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
@@ -48,8 +47,6 @@ RDEPEND="!net-misc/ltsp-client
 
 src_unpack() {
 	bzr_src_unpack
-	cd "${S}"
-	epatch "${FILESDIR}/${PF}-layman.patch"
 }
 
 src_install() {
@@ -102,7 +99,7 @@ src_install() {
 	if use examples; then
 		docinto examples
 		dodoc server/doc/examples/*
-	fi;
+	fi
 }
 
 pkg_postinst(){