Some overlay maintanance.

6 files changed, 7 insertions, 152 deletions

diff --git a/net-misc/ltsp-client/Manifest b/net-misc/ltsp-client/Manifest
index f1b87df..7bae1c8 100644
--- a/net-misc/ltsp-client/Manifest
+++ b/net-misc/ltsp-client/Manifest
@@ -1,7 +1,7 @@
 AUX lts.conf 274 SHA256 76948f0e4a3bf4a2b00d75a6fd39c9dfa662b271980d68d0aea2ad5599c1bf26 SHA512 0643bfbb160fa15e65770f731d61021cce0f2c7c5d6e8528fe719b74669a6c55148b9f819f30dcbb6c29915038888f8f82d19743e26bc581a412525db8c2f451 WHIRLPOOL 71966827597cfce263329d3e197b8e064f49da52247392b5f30fda7fee5dacaac227e1fba596323a910d5e94fa4ab0a0e14c162646c38bc0c09cbe998608af9f
 AUX ltsp-client-5.2.12-ltsdownloadarch.patch 503 SHA256 2f646c6931d1ab787006c879520327cba10029c63b189beefedde8f6f4e052bd SHA512 999e0099f49083d368d0c0176bd521157dd35bde4e376911c4bfbfb38f818995b4ed081a6ed280f266d871abdcfa1b34e2c0ff39b75b0067a04d7487afae9ecf WHIRLPOOL 358c5e9b03b910110d5357385b7f67589a8959c9241c29c34fe332a2bc4561a23b03e44acdcc5059f29c4e435db8991d853f7ae8b3758a07121fb6c44ff3c360
 AUX ltsp-client-5.2.12-setupconfd.patch 845 SHA256 35b43976776b613dc1660f301162cc98073f11bb9f1a4ff5bf7ea2269f947372 SHA512 6765a5ce674dbee253bc3375dfa3aa91f4058d27c1aed1ef6a78407fdebaaa0a703635d181c66adba96fa4206338591b31bba656652601a8a299183f96c05fa1 WHIRLPOOL 75784d6c440b97b2c4e39548ffca20a1246ffd713f0d6b65dab94910738aacc55ef9b02ec16a09651fd9c7e5f44798af828b5b5607807a94af4ef876536426c7
-EBUILD ltsp-client-5.2.12-r2.ebuild 2767 SHA256 8f61b6de22af8965e5268d0b08cfd9ae7f93aa11e152beb2232755028102277f SHA512 246d7beb7355f871bf7132a21a9c0e3a42952217ee53dc3f5ac3708be28374aa73c6f2713bbc4fe7f248ffad6e0266330c2bc5175ca45566b1e9d473666a6cce WHIRLPOOL 46c9a9696c7bed5485528d53f738a7dad716967ddffad254d2f82fe9f3b4e08220b4eab010b34489943a7996211d3ca89356efb2f9d92b04d3c9bc3f1b692abf
-EBUILD ltsp-client-5.4.3.ebuild 3383 SHA256 de13677519909c7d3f7439051acd4c6cc5c3f6daf9ba6aa651a1cc63f6bfceb9 SHA512 8b042a385936eeb646299db1f60de664b1874b473da8bc95329bdf8b0a8623b2737c8827052c1585878bb0f5a75a782074a7c4043afb6fa6f3b3a53f93cc7ee3 WHIRLPOOL 329403c48a824ddd3ba59021f89e8dd5c3cc4040ce43999a5b53eceb03f366956ff4ab6148e341663baa2894afc2c08212cfcc7211e4340d234eace7f2498012
+EBUILD ltsp-client-5.2.12-r2.ebuild 2776 SHA256 73acf8b178a87da8b5263a26616debeae88319e134b89377eb546552c73a192d SHA512 9cab84472a569b3cf3c93f2618dc1fde878493814aae1a6e22ae7422475e338799783ba41a3304b1bff0a1e472f3f00b80d73ad98702b87963f0218e3f7df95b WHIRLPOOL a74bb53c3be3b6f92626b571e02f986d3db9cfff23ef90235a4937918ffa62dd1717c828551eb8f161cde4723437384dd48d77ac407ad829ccce665b9fd47da1
+EBUILD ltsp-client-5.4.3.ebuild 3385 SHA256 2c476cf9eac8057ad562156591cd1e379cea70b5bf09886e78fb902af7267a5c SHA512 2b47b89a82d74078aa2cf7345ef8d060a43c165cc17879a63d0d819f144af471f8a120af3be50c239ce6a82de61a0ef27a394e419306690d0895f1b83fafc1e9 WHIRLPOOL 2278b4f60a700e9e484ca07b0b861e3a3e7ce332f816e0b5c044595b62301080aec6ecbf1a4f613dad88bbd9d2cf8d308504b9537d3933f40a93a3dcaa025d4d
 MISC ChangeLog 4210 SHA256 7ae004077a914dbe52e8973f9d040000c322bcecab427ebb9faff843548cf106 SHA512 d901c350ed3ea52645ccec35dc2c05a58e0acc51abdcd032ff2756b5bb0e15fa971321a95705261b714da31cb4f2c82e2ea5a7d7c8139fdd0bce3b8a46392a66 WHIRLPOOL b3ab60b21deb9e3fd71b3da7acb0c1de4338e0eac7503b6ed7bd21e532e273b04cbcfdbca7b22f109db508ddaa412141c06631c4ec2cd2d67b68b0c2ea5a85cf
 MISC metadata.xml 320 SHA256 9670081c52feee23beefab5469a6711f2daa777140db5298a6393061fb924172 SHA512 809bc83d02bde4f15ca5fe84ac467e3211e5e781c32436fc4c1c6e2ba84ea42d8e4815b013fd223f1533267ef5e18c90b8629ee72551349027159d26806c7233 WHIRLPOOL 0f909bddceb5e570d4df99679f6cdfc73e5f9dd98eaefcb8ec455bf409eec07ee49c3592ce21c7f30069047088ea5f9bc839a95e653da0cb77ba3b8703108652
diff --git a/net-misc/ltsp-client/ltsp-client-5.2.12-r2.ebuild b/net-misc/ltsp-client/ltsp-client-5.2.12-r2.ebuild
index 7b06a3f..f942117 100644
--- a/net-misc/ltsp-client/ltsp-client-5.2.12-r2.ebuild
+++ b/net-misc/ltsp-client/ltsp-client-5.2.12-r2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="2"
 
-inherit bzr
+inherit eutils bzr
 
 EBZR_REVISION="1877"
 EBZR_REPO_URI="http://bazaar.launchpad.net/~ltsp-upstream/ltsp/ltsp-trunk"
@@ -51,7 +51,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${P}-setupconfd.patch"
 }
 
-src_compile() {
+src_configure() {
 	pushd client/getltscfg
 	emake || or die "Could not make getltspcfg"
 	popd
diff --git a/net-misc/ltsp-client/ltsp-client-5.4.3.ebuild b/net-misc/ltsp-client/ltsp-client-5.4.3.ebuild
index 3040fb6..99cddcb 100644
--- a/net-misc/ltsp-client/ltsp-client-5.4.3.ebuild
+++ b/net-misc/ltsp-client/ltsp-client-5.4.3.ebuild
@@ -45,7 +45,7 @@ src_unpack() {
 	bzr_src_unpack
 }
 
-src_compile() {
+src_configure() {
 	pushd client/getltscfg
 	emake || or die "Could not make getltspcfg"
 	popd
diff --git a/net-misc/ltsp-server/Manifest b/net-misc/ltsp-server/Manifest
index 93e2fb7..6f05a67 100644
--- a/net-misc/ltsp-server/Manifest
+++ b/net-misc/ltsp-server/Manifest
@@ -1,4 +1,3 @@
-EBUILD ltsp-server-5.3.7.ebuild 3410 SHA256 8674457ab42e409dfab054c158a1f06f3cf36d836c3fdcd5eff64a0af5a9a7b5 SHA512 fdcb603bba00cf706687be11f316b034068e83530641095ce91a388b745dec5ccf5c0f97ac360c482b79132e1566a82f196c1cf0a7161e06b5e85d21289c1b53 WHIRLPOOL 013d5aa121a8f34e1e0506dc646e2e8217c0a541051d860469787947cbb1a0989e3cc8599c80f054b34a9882347aee8261ef838df958934759670c8c00723791
 EBUILD ltsp-server-5.4.3.ebuild 3866 SHA256 bb414c243f16789c8b7652fd0c26cc0837e746f9f21000186391ad3f5841f5f6 SHA512 6177738ffad8add2ee9de4643ed2af158c15f23227e7e6068c7f2546b378dcaee9bce46f90e28eff1e92800a80998c472c2b6a53725fd4d95d476f45aed9b2ef WHIRLPOOL 4b25983846e81d93ffb1457c5a2421f4fc2dff6c767a099f49eaed8ebf936b1e2305931f21be3d536e03c480acc6150264b5c07586ce61a6570b99b098af6379
 MISC ChangeLog 6562 SHA256 f12f9278091d6562aacf125dbb859aa3efed3dd2f94d38eaeb54cf005d318e6f SHA512 c2fe93044e18f17b1ae11f92b107a91cf4f7bf4e618111dec326452945f54326e6a982a8991c893f48cdca1dfe70c8683f8a454047737f45aca41bc36308a544 WHIRLPOOL 243cff34353e6dc0945dcb73e61a68ced3c291e94596b1162feb303b288958517c99364ae8891a495724bb95511f4dfd95ecb1521f9d42553773b292a45df6d1
 MISC metadata.xml 528 SHA256 4adb661e3ac65b7092ff1360b903e0cfb4039ad305bf08102f16f0a689db1b4c SHA512 5fb79d5101906c1cdfd6cce2543f0e18f10964bb98186aa9b2166d33e917a7878a0eb1ad67d7ef4dfffb83c12cca7bd804f866bba70a201a3e17c8647256c348 WHIRLPOOL 0a9fa3c88a3c817aff74fb5f0cf78bfdf50cac6d0647b0a1fc8ad469539fccea8dcaf16b7e4653b59e1e655c1bb3074c4f9cd6b1a34d4f9c780a0b50d87899c2
diff --git a/net-misc/ltsp-server/ltsp-server-5.3.7.ebuild b/net-misc/ltsp-server/ltsp-server-5.3.7.ebuild
deleted file mode 100644
index a595040..0000000
--- a/net-misc/ltsp-server/ltsp-server-5.3.7.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-EBZR_REVISION="2169"
-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 +pulseaudio +X"
-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/openssh
-	virtual/tftp
-	dhcp? ( || ( net-dns/dnsmasq net-misc/dhcp ) )
-	nfs? (
-		>net-fs/nfs-utils-1.1.5
-	)
-	nbd? (
-		sys-apps/xinetd
-		sys-block/nbd
-		sys-fs/squashfs-tools
-	)
-	pulseaudio? (
-		media-sound/pulseaudio
-	)
-	X? (
-		x11-apps/xdm
-		x11-base/xorg-server
-	)
-	sys-fs/ltspfs
-	sys-apps/lsb-release
-	|| ( >sys-apps/quickstart-0.6 sys-apps/kicktoo )
-	sys-apps/iproute2
-	>=app-portage/layman-1.3
-	sys-boot/syslinux
-	net-misc/ldminfod"
-
-src_unpack() {
-	bzr_src_unpack
-}
-
-src_install() {
-	ltspdir="/usr/share/ltsp"
-
-	# executables
-	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
-	dosbin server/ltsp-chroot
-
-	# plugins and libraries
-	insinto ${ltspdir}
-	doins server/ltsp-server-functions
-	doins server/ltsp-server-common-functions
-	doins server/functions/Gentoo/*
-
-	insinto ${ltspdir}/plugins
-	doins -r server/plugins/*
-
-	# configuration
-	insinto /etc/ltsp
-	doins server/configs/Gentoo/ltsp-build-client.conf
-
-	insinto /etc/ltsp/profiles
-	doins server/configs/Gentoo/*.profile
-	dosym quickstart-5.2.profile /etc/ltsp/profiles/quickstart.profile
-	dosym kicktoo-5.2.profile /etc/ltsp/profiles/kicktoo.profile
-
-	# man pages
-	doman localapps/doc/ltsp-localapps.1
-	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
-	doman server/doc/ltsp-chroot.8
-
-    if use nbd; then
-		dosbin server/ltsp-update-image
-		dosbin server/ltsp-swapfile-delete
-		dosbin server/nbdswapd
-
-		insinto /etc/xinetd.d
-		doins server/xinetd.d/nbdswapd
-		
-		insinto /etc/ltsp
-		doins server/configs/nbdswapd.conf 
-
-		doman server/doc/ltsp-update-image.8
-		doman server/doc/nbdswapd.8
-    fi
-
-    if use doc; then
-		dodoc server/doc/CodingStyle
-		dodoc server/doc/plugins
-	fi
-
-	if use examples; then
-		docinto examples
-		dodoc localapps/doc/examples/*
-		dodoc server/doc/examples/*
-	fi
-}
-
-pkg_postinst(){
-	einfo
-	einfo "You can choose to install a 5.2 or a 5.3 client by pointing"
-	einfo "to it's appropriate build profile in /etc/ltsp/profiles."
-	einfo "The default is set to a 5.2 client."
-	 
-	if use nbd; then
-		einfo
-		einfo "Only NFS is supported for mounting the client chroot."
-		einfo "Mounting swap over NBD is supported."
-	fi
-	
-	if use X; then
-		einfo
-		einfo "Don't forget to install a window manager,"
-		einfo "you can't log in with X onto your server without one."
-	fi
-	
-	ewarn
-	ewarn "In line with upstream, the ltsp-update-kernels tool now also"
-	ewarn "removes old boot files from the tftpdir. It removes all"
-	ewarn "default genkernel generated filenames for which the version"
-	ewarn "is different from the chroot kernel. For details, look at"
-	ewarn "/usr/share/ltsp/ltsp-update-kernels-functions"
-}
-
diff --git a/profiles/ltsp/package.use b/profiles/ltsp/package.use
index 84d84af..4a3f41b 100644
--- a/profiles/ltsp/package.use
+++ b/profiles/ltsp/package.use
@@ -1,5 +1,5 @@
-# req by pulseaudio
-sys-fs/udev extras hwdb
+# req by pulseaudio (hwdb)
+sys-fs/udev hwdb keymap
 
 # req by udev
 sys-apps/pciutils -zlib