public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/anaconda-overlay:master commit in: app-misc/sabayonlive-tools/, app-misc/anaconda-runtime/, ...
@ 2011-07-21 12:30 Wiktor W Brodlo
  0 siblings, 0 replies; only message in thread
From: Wiktor W Brodlo @ 2011-07-21 12:30 UTC (permalink / raw
  To: gentoo-commits

commit:     a82b4bf062ad8919030f56ea0dfc07eb5d6b9f93
Author:     wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Jul 21 12:30:03 2011 +0000
Commit:     Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Jul 21 12:30:03 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda-overlay.git;a=commit;h=a82b4bf0

Removal of app-misc/sabayonlive-tools (useless)

---
 app-misc/anaconda-runtime/Manifest                 |    2 +-
 .../anaconda-runtime/anaconda-runtime-0.1.ebuild   |    1 -
 app-misc/sabayonlive-tools/Manifest                |   21 -
 app-misc/sabayonlive-tools/files/2.3/bashlogin     |    6 -
 app-misc/sabayonlive-tools/files/2.3/cdeject       |   23 -
 app-misc/sabayonlive-tools/files/2.3/installer-gui |   25 -
 .../sabayonlive-tools/files/2.3/installer-text     |   21 -
 .../files/2.3/livecd-functions.sh                  |  626 --------------------
 app-misc/sabayonlive-tools/files/2.3/livespawn     |   10 -
 app-misc/sabayonlive-tools/files/2.3/logscript.sh  |  111 ----
 app-misc/sabayonlive-tools/files/2.3/net-setup     |   65 --
 .../sabayonlive-tools/files/2.3/opengl-activator   |  318 ----------
 .../files/2.3/sabayon-functions.sh                 |  176 ------
 .../sabayonlive-tools/files/2.3/sabayon-live-check |   27 -
 .../files/2.3/sabayon-welcome-loader               |   10 -
 .../files/2.3/sabayon-welcome-loader.desktop       |    7 -
 app-misc/sabayonlive-tools/files/2.3/sabayonlive   |  212 -------
 app-misc/sabayonlive-tools/files/2.3/sabutil       |  607 -------------------
 .../sabayonlive-tools/files/2.3/vga-cmd-parser     |   53 --
 .../files/2.3/x-setup-configuration                |   46 --
 .../sabayonlive-tools/files/2.3/x-setup-init.d     |   38 --
 .../files/2.3/xorg.conf.d/90-synaptics.conf        |   58 --
 .../sabayonlive-tools/files/2.3/xorg.conf.sabayon  |  100 ----
 .../sabayonlive-tools-2.3-r6.ebuild                |   79 ---
 24 files changed, 1 insertions(+), 2641 deletions(-)

diff --git a/app-misc/anaconda-runtime/Manifest b/app-misc/anaconda-runtime/Manifest
index 048963f..eae2115 100644
--- a/app-misc/anaconda-runtime/Manifest
+++ b/app-misc/anaconda-runtime/Manifest
@@ -1 +1 @@
-EBUILD anaconda-runtime-0.1.ebuild 1090 RMD160 7f1e301539f0cda8ab81c7985724fd77d84ff82d SHA1 4f6408a827f78309b975325409760d0e7f63c4ec SHA256 b59d5b5e504617211385b00df7d489730fdbc23646152e9ddc8350cb5be89b38
+EBUILD anaconda-runtime-0.1.ebuild 1054 RMD160 3c4938762e49819e0705b902c967193edcf3fb8b SHA1 25777467d60f15a0376c08fa01a2e74f4c021ed2 SHA256 0f53a0755da5fabc2bf817dae45a364a6dca5a4e9c2492fe565dc55b61b70fca

diff --git a/app-misc/anaconda-runtime/anaconda-runtime-0.1.ebuild b/app-misc/anaconda-runtime/anaconda-runtime-0.1.ebuild
index 8b5a690..76918f0 100644
--- a/app-misc/anaconda-runtime/anaconda-runtime-0.1.ebuild
+++ b/app-misc/anaconda-runtime/anaconda-runtime-0.1.ebuild
@@ -14,7 +14,6 @@ SLOT="0"
 DEPEND=""
 RDEPEND="app-admin/system-config-date
 	app-admin/system-config-users
-	>=app-misc/sabayonlive-tools-2.1.1
 	=app-misc/gentoo-version-11
 	app-text/xmlto
 	dev-libs/elfutils

diff --git a/app-misc/sabayonlive-tools/Manifest b/app-misc/sabayonlive-tools/Manifest
deleted file mode 100644
index 24fd6a4..0000000
--- a/app-misc/sabayonlive-tools/Manifest
+++ /dev/null
@@ -1,21 +0,0 @@
-AUX 2.3/bashlogin 116 RMD160 062793c374232791032bbe55dc94dabaa3898b5a SHA1 49153f7aca57ccc85db283e2bc7610d1879e630c SHA256 9385b60eb67e44d36e7806968df3af7dadd57e7e2a392ba4e3b588e51e8fc29d
-AUX 2.3/cdeject 567 RMD160 a1cca9ffb4f0ecda50f3bd691605d8840a428c78 SHA1 cca61a0625cbbd060f486d6fc9555805842fde45 SHA256 87b2b6f61d6afc109818b12fac463b4603e2329b15575b72e72eb20eaafcfcce
-AUX 2.3/installer-gui 450 RMD160 fadb50aba2399eed0d0d53b8a16d1d89ffe80dd4 SHA1 4f0482ecfd37cfa9320c632082ab3c2ce03bb220 SHA256 fddf08a1927675965346db5cf9f5995f7bb8a639b55796d047a4881566d0ab05
-AUX 2.3/installer-text 348 RMD160 c64e3041d84b5b92caecbe15cc2a51ee74212cf2 SHA1 6b2183a796fcb80802f9b4bff5b29403dc7b69ce SHA256 dd00f047dbb313eac3121cbf8725e0233e2a3bd5957ae655a7b366329fff34c8
-AUX 2.3/livecd-functions.sh 17237 RMD160 ebbf2bef331d38b639e6af8fff0192f31f6bea34 SHA1 be3be36b4d893753f6c71df824e36e6082d35c37 SHA256 4c3823304bfe54118a75e5ead890b74cbf2078e879695c33d2eef8d805ce0608
-AUX 2.3/livespawn 193 RMD160 44ff80224d903d3ca08dfca0dafd9443f4282f24 SHA1 30654a58cc30444b06f3f20f5418bd00989a4045 SHA256 256c51d66e8bcaa82e9a52ebf70fe947000dc43c2d9df0c73d045f624e615cbe
-AUX 2.3/logscript.sh 3554 RMD160 6e044507b919a6ebad8795dafb9307a95eebae03 SHA1 20bd627eaf803dd31c90c94510d639919df59344 SHA256 64cf1c3a480f2677c9f2742bd0a476ddda796c0106724dce1f09c6ed004e5d72
-AUX 2.3/net-setup 1529 RMD160 1a0f42dd2ef4b2c94d40bc2b94176c9d2a15d2f7 SHA1 b11d433afba664770e6c99c681f8c99d8c71230e SHA256 41f5fdf35752837e69e958b7082339146c2c8e2e3470add2cd2eab4092d50d9a
-AUX 2.3/opengl-activator 10039 RMD160 5259240fa99173901530a8d6ed1fc20cbeb8db4d SHA1 80b9e8b4536d3f1cf29dc890a908f23980907319 SHA256 0090240f1c8cba0d9dae59dac4b472e4b73fc41e64cb178e786d1093af565eaf
-AUX 2.3/sabayon-functions.sh 4996 RMD160 5966058bd1043e0e2e6ba467e73b01072b24d365 SHA1 73a07825d820c28408479d398991558fa5536394 SHA256 15fed9c5a5ccc750c1a3d63283926a9c95d02b434955e913b1d19a1c6da9aafb
-AUX 2.3/sabayon-live-check 1049 RMD160 cad4c414558a297332409fc807e5be1c0ace6e97 SHA1 65795c09bfc01e28e1d27778ff2e50d1928cb016 SHA256 ca4d2f7b734970df90b651e41b580dfb23a9a04d3c89309fee2b4a6541081b5a
-AUX 2.3/sabayon-welcome-loader 291 RMD160 ddc6ff805322b63a17495e641ff4d6484e598227 SHA1 d2ccba8580abab1c0cb436a8589360ce78df6545 SHA256 4e4769a0cb0ad3f48f561b0eb82b05214da9d640da170a9c7cd3531051622ca6
-AUX 2.3/sabayon-welcome-loader.desktop 162 RMD160 4fe1c8c6b26196d9671b4e683e4cf73fad87fc9f SHA1 8b09704511035ae21a32b8b735040530b6437de9 SHA256 37cc2ff95764baa148a68f6669be56bd9d6fa6bc805242dcfa8e0fd8d49a44d0
-AUX 2.3/sabayonlive 5362 RMD160 06cae4c7c1bfffc5127d373f01b16e7a2256f640 SHA1 3c47f2f05ebb77fc9547b54400a1b5c2387a7a76 SHA256 afd3fdc6ba8d0740965660f43e7d01c27347e5a6dd71389a625c9d05d8515f9e
-AUX 2.3/sabutil 16102 RMD160 94d00c1636af145d8ddc78c47cf405718cc8fb7f SHA1 d89d9c7bd120c251583f79679a5b863504fe75e3 SHA256 f153fa74729b9512f1673733d530ed8db57cc94a1807033d7064a1bc384b17e7
-AUX 2.3/vga-cmd-parser 1382 RMD160 75a4ba47833ec376fa91938c9553e68c058629da SHA1 3976899be5f88ee5e072d06e551252026ac36a3a SHA256 9b4faeac836b52a0a6550a48babeed40c00ea2cad7674bb1ad037c04791a7ebc
-AUX 2.3/x-setup-configuration 1715 RMD160 3e23b5ff233edf252d72a4093699881ea346d581 SHA1 425c8e3cd33adf9e0515297715c01d570f8f5b7a SHA256 92f4f6a27bd3d36e3c51103443b2091ccc096fb957dcc6c81539b1808ce93806
-AUX 2.3/x-setup-init.d 1246 RMD160 61f29d2f88d2c2bcc3cc8a3c80cf7807d01b1a47 SHA1 29ed0308d1ad6888589014cdf4e7772c145de3a7 SHA256 1b7ea99b27ec09e51a45207d275a2317b4ba06be1334ae17c27140a02a0762dd
-AUX 2.3/xorg.conf.d/90-synaptics.conf 1524 RMD160 7271e7d1294b32da149ba02acf6695119560d770 SHA1 f83b8ce206b2e68a259ab310db5d98518d36b84b SHA256 97e451a157b38aa718bcb22afb1b5d4ee308937f544653341b856bf8d6791e94
-AUX 2.3/xorg.conf.sabayon 2194 RMD160 2fe1b4f00d479f9de294e696c0c90535ee6fe3f0 SHA1 b4286c8391e8090220608dc48b068315b1701aef SHA256 f303a9f2ad64b71c5707548437fed3f556cb25617624891c8b71899988a7d22d
-EBUILD sabayonlive-tools-2.3-r6.ebuild 1887 RMD160 700207c1a6810a2aeb5ea6a938daa11371e66878 SHA1 255d92e4d7f9f90330d677455d6d42dab3c43953 SHA256 e6c25ef3d02c6dfae56b2bd078fd62267e1fa6563c43881429cef682ed84dcc3

diff --git a/app-misc/sabayonlive-tools/files/2.3/bashlogin b/app-misc/sabayonlive-tools/files/2.3/bashlogin
deleted file mode 100755
index 3468918..0000000
--- a/app-misc/sabayonlive-tools/files/2.3/bashlogin
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-cat /etc/motd 2>/dev/null
-cd /root
-[[ -e .bash_profile ]] && source .bash_profile
-exec -l /bin/bash -i

diff --git a/app-misc/sabayonlive-tools/files/2.3/cdeject b/app-misc/sabayonlive-tools/files/2.3/cdeject
deleted file mode 100644
index 6d56f04..0000000
--- a/app-misc/sabayonlive-tools/files/2.3/cdeject
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/runscript
-# Copyright (c) 2010 Fabio Erculiani <lxnay@sabayon.org>
-# All rights reserved. Released under the 2-clause BSD license.
-
-description="Eject LiveCD/DVD at live system shutdown/reboot"
-
-depend()
-{
-	after *
-}
-
-start()
-{
-	is_live=$(cat /proc/cmdline | grep cdroot)
-	if [ -n "${is_live}" ]; then
-		cdrom_dev=$(cat /proc/mounts | grep " /mnt/cdrom " | cut -d" " -f 1)
-		# check if /mnt/cdrom device is a cdrom device
-		if [ "${cdrom_dev}" = /dev/sr* ] || [ "${cdrom_dev}" = /dev/cdrom* ]; then
-			eject -mp "${cdrom_dev}" &> /dev/null
-		fi
-	fi
-	eend 0
-}

diff --git a/app-misc/sabayonlive-tools/files/2.3/installer-gui b/app-misc/sabayonlive-tools/files/2.3/installer-gui
deleted file mode 100755
index 941b46a..0000000
--- a/app-misc/sabayonlive-tools/files/2.3/installer-gui
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/runscript
-# Copyright 2006 Sabayon Linux
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-    before xdm      
-    after sabayonlive
-}
-
-start() {
-
-	source /sbin/sabayon-functions.sh
-
-        if sabayon_is_gui_install; then
-                ebegin "Sabayon Linux GUI Installer service"
-		# Enable autologin
-		sabayon_setup_autologin
-		# Setup GUI installer
-		sabayon_setup_gui_installer
-		eend 0
-	fi
-
-	return 0
-
-}

diff --git a/app-misc/sabayonlive-tools/files/2.3/installer-text b/app-misc/sabayonlive-tools/files/2.3/installer-text
deleted file mode 100755
index df3521f..0000000
--- a/app-misc/sabayonlive-tools/files/2.3/installer-text
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/runscript
-# Copyright 2006 Sabayon Linux
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-    after *      
-}
-
-start() {
-
-	source /sbin/sabayon-functions.sh
-
-	if sabayon_is_text_install; then
-                ebegin "Sabayon Linux Text Installer service"
-	        eend 0
-		sabayon_setup_text_installer
-	fi
-
-
-
-}

diff --git a/app-misc/sabayonlive-tools/files/2.3/livecd-functions.sh b/app-misc/sabayonlive-tools/files/2.3/livecd-functions.sh
deleted file mode 100755
index 77917db..0000000
--- a/app-misc/sabayonlive-tools/files/2.3/livecd-functions.sh
+++ /dev/null
@@ -1,626 +0,0 @@
-#!/bin/bash
-
-# Global Variables:
-#    CDBOOT                  -- is booting off CD
-#    LIVECD_CONSOLE          -- console that is specified on commandline 
-#                            -- (ttyS0, etc) Only defined if passed to kernel
-#    LIVECD_CONSOLE_BAUD     -- console baudrate specified
-#    LIVECD_CONSOLE_PARITY   -- console parity specified
-#    LIVECD_CONSOLE_DATABITS -- console databits specified
-
-[[ ${RC_GOT_FUNCTIONS} != "yes" ]] && \
-	[[ -e /etc/init.d/functions.sh ]] && \
-	source /etc/init.d/functions.sh
-
-# emulating einfo since it's not always available from functions.sh
-# FIXME: fix functions.sh
-einfo() {
-	[[ -x "/lib/rc/bin/einfo" ]] && /lib/rc/bin/einfo "${1}"\
-		|| echo "* ${1}"
-}
-
-livecd_parse_opt() {
-	case "$1" in
-		*\=*)
-			echo "$1" | cut -f2 -d=
-		;;
-	esac
-}
-
-livecd_check_root() {
-	if [ "$(whoami)" != "root" ]
-	then
-		echo "ERROR: must be root to continue"
-		return 1
-	fi
-}
-
-livecd_get_cmdline() {
-	echo "0" > /proc/sys/kernel/printk
-	CMDLINE=$(cat /proc/cmdline)
-	export CMDLINE
-}
-
-no_gl() {
-#	einfo "If you have a card that you know is supported by either the ATI or"
-#	einfo "NVIDIA binary drivers, please file a bug with the output of lspci"
-#	einfo "on http://bugs.gentoo.org so we can resolve this."
-	GLTYPE=xorg-x11
-}
-
-ati_gl() {
-	einfo "ATI card detected."
-	if [ -e /usr/lib/xorg/modules/drivers/fglrx_drv.so ] \
-	|| [ -e /usr/lib/modules/drivers/fglrx_drv.so ]
-	then
-		GLTYPE=ati
-	else
-		GLTYPE=xorg-x11
-	fi
-}
-
-nv_gl() {
-	einfo "NVIDIA card detected."
-	if [ -e /usr/lib/xorg/modules/drivers/nvidia_drv.so ] \
-	|| [ -e /usr/lib/modules/drivers/nvidia_drv.so ]
-	then
-		GLTYPE=nvidia
-	else
-		GLTYPE=xorg-x11
-	fi
-}
-
-nv_no_gl() {
-	einfo "NVIDIA card detected."
-	echo
-	if [ -e /usr/lib/xorg/modules/drivers/nvidia_drv.so ] \
-	|| [ -e /usr/lib/modules/drivers/nvidia_drv.so ]
-	then
-		einfo "This card is not supported by the latest version of the NVIDIA"
-		einfo "binary drivers.  Switching to the X server's driver instead."
-	fi
-	GLTYPE=xorg-x11
-	sed -i 's/nvidia/nv/' /etc/X11/xorg.conf
-}
-
-get_video_cards() {
-	[ -x /sbin/lspci ] && VIDEO_CARDS="$(/sbin/lspci | grep ' VGA ')"
-	[ -x /usr/sbin/lspci ] && VIDEO_CARDS="$(/usr/sbin/lspci | grep ' VGA ')"
-	#NUM_CARDS="$(echo ${VIDEO_CARDS} | wc -l)"
-	#if [ ${NUM_CARDS} -eq 1 ] # Disabled to support NVIDIA SLI devices
-	#then
-		NVIDIA=$(echo ${VIDEO_CARDS} | grep -i "nVidia Corporation")
-		ATI=$(echo ${VIDEO_CARDS} | grep -i "ATI Technologies")
-		if [ -n "${NVIDIA}" ]
-		then
-			# Always set NVIDIA OpenGL, since it's stupid doing the contrary because:
-			# there's no X.Org free driver that supports OpenGL through MESA
-			nv_gl
-		elif [ -n "${ATI}" ]
-		then
-			ATI_CARD=$(echo ${ATI} | awk 'BEGIN {RS=" "} /(R|RV|RS|M)[0-9]+/ {print $1}')
-			if [ $(echo ${ATI_CARD} | grep S) ]
-			then
-				ATI_CARD_OUT=$(echo ${ATI_CARD} | cut -dS -f2)
-			elif [ $(echo ${ATI_CARD} | grep V) ]
-			then
-				ATI_CARD_OUT=$(echo ${ATI_CARD} | cut -dV -f2)
-			elif [ $(echo ${ATI_CARD} | grep M)  ]
-			then
-				# ATI Technologies Inc. M52 [ ATI Mobility Radeon X1300 ]
-				ATI_CARD_OUT=$(echo ${ATI_CARD} | cut -dM -f2)
-			else
-				ATI_CARD_OUT=$(echo ${ATI_CARD} | cut -dR -f2)
-			fi
-
-			if [ -n "${ATI_CARD_OUT}" ] && [ ${ATI_CARD_OUT} -ge 300 ]
-			then
-				ati_gl
-			elif [ -n "${ATI_CARD_OUT}" ] && [ -n "`echo ${ATI_CARD} | grep M`" ]
-			then
-				# this is an ATI Mxx card
-				ati_gl
-			# >8.29.6 does not support R200 anymore
-			elif [ -n "${ATI_CARD_OUT}" ] && [ ${ATI_CARD_OUT} -ge 200 ]
-			then
-				no_gl
-			else
-				# set ATI OpenGL anyway
-				ati_gl
-			fi
-		else
-			no_gl
-		fi
-	#fi
-}
-
-livecd_config_wireless() {
-	cd /tmp/setup.opts
-	[ -x /usr/sbin/iwconfig ] && iwconfig=/usr/sbin/iwconfig
-	[ -x /sbin/iwconfig ] && iwconfig=/sbin/iwconfig
-	dialog --title "SSID" --inputbox "Please enter your SSID, or leave blank for selecting the nearest open network" 20 50 2> ${iface}.SSID
-	SSID=$(tail -n 1 ${iface}.SSID)
-	if [ -n "${SSID}" ]
-	then
-		dialog --title "WEP (Part 1)" --menu "Does your network use encryption?" 20 60 7 1 "Yes" 2 "No" 2> ${iface}.WEP
-		WEP=$(tail -n 1 ${iface}.WEP)
-		case ${WEP} in
-			1)
-				dialog --title "WEP (Part 2)" --menu "Are you entering your WEP key in HEX or ASCII?" 20 60 7 1 "HEX" 2 "ASCII" 2> ${iface}.WEPTYPE
-				WEP_TYPE=$(tail -n 1 ${iface}.WEPTYPE)
-				case ${WEP_TYPE} in
-					1)
-						dialog --title "WEP (Part 3)" --inputbox "Please enter your WEP key in the form of XXXX-XXXX-XX for 64-bit or XXXX-XXXX-XXXX-XXXX-XXXX-XXXX-XX for 128-bit" 20 50 2> ${iface}.WEPKEY
-						WEP_KEY=$(tail -n 1 ${iface}.WEPKEY)
-						if [ -n "${WEP_KEY}" ]
-						then
-							${iwconfig} ${iface} essid "${SSID}"
-							${iwconfig} ${iface} key "${WEP_KEY}"
-						fi
-					;;
-					2)
-						dialog --title "WEP (Part 3)" --inputbox "Please enter your WEP key in ASCII form.  This should be 5 or 13 characters for either 64-bit or 128-bit encryption, repectively" 20 50 2> ${iface}.WEPKEY
-						WEP_KEY=$(tail -n 1 ${iface}.WEPKEY)
-						if [ -n "${WEP_KEY}" ]
-						then
-							${iwconfig} ${iface} essid "${SSID}"
-							${iwconfig} ${iface} key "s:${WEP_KEY}"
-						fi
-					;;
-				esac
-			;;
-			2)
-				${iwconfig} ${iface} essid "${SSID}"
-				${iwconfig} ${iface} key off
-			;;
-		esac
-	fi
-}
-
-livecd_write_wireless_conf() {
-	cd /tmp/setup.opts
-	SSID=$(tail -n 1 ${iface}.SSID)
-	if [ -n "${SSID}" ]
-	then
-		echo "" >> /etc/conf.d/net
-		echo "# This wireless configuration file was built by net-setup" > /etc/conf.d/net
-		WEP=$(tail -n 1 ${iface}.WEPTYPE)
-		case ${WEP} in
-			1)
-				WEP_TYPE=$(tail -n 1 ${iface}.WEPTYPE)
-				if [ -n "${WEP_TYPE}" ]
-				then
-					WEP_KEY=$(tail -n 1 ${iface}.WEPKEY)
-					if [ -n "${WEP_KEY}" ]
-					then
-						SSID_TRANS=$(echo ${SSID//[![:word:]]/_})
-						case ${WEP_TYPE} in
-							1)
-								echo "key_${SSID_TRANS}=\"${WEP_KEY} enc open\"" >> /etc/conf.d/net
-							;;
-							2)
-								echo "key_${SSID_TRANS}=\"s:${WEP_KEY} enc open\"" >> /etc/conf.d/net
-							;;
-						esac
-					fi
-				fi
-			;;
-			2)
-				:
-			;;
-		esac
-		echo "preferred_aps=( \"${SSID}\" )" >> /etc/conf.d/net
-		echo "associate_order=\"forcepreferredonly\"" >> /etc/conf.d/net
-	fi
-}
-
-livecd_config_ip() {
-	cd /tmp/setup.opts
-	dialog --title "TCP/IP setup" --menu "You can use DHCP to automatically configure a network interface or you can specify an IP and related settings manually. Choose one option:" 20 60 7 1 "Use DHCP to auto-detect my network settings" 2 "Specify an IP address manually" 2> ${iface}.DHCP
-	DHCP=$(tail -n 1 ${iface}.DHCP)
-	case ${DHCP} in
-		1)
-			/sbin/dhclient -q -r -nw ${iface} &
-		;;
-		2)
-			dialog --title "IP address" --inputbox "Please enter an IP address for ${iface}:" 20 50 "192.168.1.1" 2> ${iface}.IP
-			IP=$(tail -n 1 ${iface}.IP)
-			BC_TEMP=$(echo $IP|cut -d . -f 1).$(echo $IP|cut -d . -f 2).$(echo $IP|cut -d . -f 3).255
-			dialog --title "Broadcast address" --inputbox "Please enter a Broadcast address for ${iface}:" 20 50 "${BC_TEMP}" 2> ${iface}.BC
-			BROADCAST=$(tail -n 1 ${iface}.BC)
-			dialog --title "Network mask" --inputbox "Please enter a Network Mask for ${iface}:" 20 50 "255.255.255.0" 2> ${iface}.NM
-			NETMASK=$(tail -n 1 ${iface}.NM)
-			dialog --title "Gateway" --inputbox "Please enter a Gateway for ${iface} (hit enter for none:)" 20 50 2> ${iface}.GW
-			GATEWAY=$(tail -n 1 ${iface}.GW)
-			dialog --title "DNS server" --inputbox "Please enter a name server to use (hit enter for none:)" 20 50 2> ${iface}.DNS
-			DNS=$(tail -n 1 ${iface}.DNS)
-			/sbin/ifconfig ${iface} ${IP} broadcast ${BROADCAST} netmask ${NETMASK}
-			if [ -n "${GATEWAY}" ]
-			then
-				/sbin/route add default gw ${GATEWAY} dev ${iface} netmask 0.0.0.0 metric 1
-			fi
-			if [ -n "${DNS}" ]
-			then
-				dialog --title "DNS Search Suffix" --inputbox "Please enter any domains which you would like to search on DNS queries (hit enter for none:)" 20 50 2> ${iface}.SUFFIX
-				SUFFIX=$(tail -n 1 ${iface}.SUFFIX)
-				echo "nameserver ${DNS}" > /etc/resolv.conf
-				if [ -n "${SUFFIX}" ]
-				then
-					echo "search ${SUFFIX}" >> /etc/resolv.conf
-				fi
-			fi
-		;;
-	esac
-}
-
-livecd_write_net_conf() {
-	cd /tmp/setup.opts
-	echo "# Sabayon Linux static network configuration tool" > /etc/conf.d/net
-	DHCP=$(tail -n 1 ${iface}.DHCP)
-	case ${DHCP} in
-		1)
-			echo "config_${iface}=\"dhcp\"" >> /etc/conf.d/net
-			echo "dhcp_${iface}=\"nosendhost\"" >> /etc/conf.d/net
-		;;
-		2)
-			IP=$(tail -n 1 ${iface}.IP)
-			BROADCAST=$(tail -n 1 ${iface}.BC)
-			NETMASK=$(tail -n 1 ${iface}.NM)
-			GATEWAY=$(tail -n 1 ${iface}.GW)
-			DNS="$(tail -n 1 ${iface}.DNS)"
-			DOMAIN="$(tail -n 1 ${iface}.SUFFIX)"
-			if [ -n "${IP}" -a -n "${BROADCAST}" -a -n "${NETMASK}" ]
-			then
-				echo "config_${iface}=\"${IP} netmask ${NETMASK} broadcast ${BROADCAST}\"" >> /etc/conf.d/net
-				if [ -n "${GATEWAY}" ]
-				then
-					echo "routes_${iface}=\"default via ${GATEWAY}\"" >> /etc/conf.d/net
-				fi
-				if [ -n "${DNS}" ]
-				then
-					echo "dns_servers_${iface}=\"${DNS}\"" >> /etc/conf.d/net
-				fi
-				if [ -n "${DOMAIN}" ]
-				then
-					echo "dns_search_${iface}=\"${DOMAIN}\"" >> /etc/conf.d/net
-				fi
-			fi
-		;;
-	esac
-}
-
-get_ifmac() {
-	local iface=$1
-
-	# Example: 00:01:6f:e1:7a:06
-	cat /sys/class/net/${iface}/address
-}
-
-
-get_ifdriver() {
-	local iface=$1
-
-	# Example: ../../../bus/pci/drivers/forcedeth (wanted: forcedeth)
-	local if_driver=$(readlink /sys/class/net/${iface}/device/driver)
-	basename ${if_driver}
-}
-
-get_ifbus() {
-	local iface=$1
-
-	# Example: ../../../bus/pci (wanted: pci)
-	# Example: ../../../../bus/pci (wanted: pci)
-	# Example: ../../../../../../bus/usb (wanted: usb)
-	local if_bus=$(readlink /sys/class/net/${iface}/device/bus)
-	basename ${if_bus}
-}
-
-get_ifproduct() {
-	local iface=$1
-	local bus=$(get_ifbus ${iface})
-	local if_pciaddr
-	local if_devname
-	local if_usbpath
-	local if_usbmanufacturer
-	local if_usbproduct
-
-	if [[ ${bus} == "pci" ]]
-	then
-		# Example: ../../../devices/pci0000:00/0000:00:0a.0 (wanted: 0000:00:0a.0)
-		# Example: ../../../devices/pci0000:00/0000:00:09.0/0000:01:07.0 (wanted: 0000:01:07.0)
-		if_pciaddr=$(readlink /sys/class/net/${iface}/device)
-		if_pciaddr=$(basename ${if_pciaddr})
-
-		# Example: 00:0a.0 Bridge: nVidia Corporation CK804 Ethernet Controller (rev a3)
-		#  (wanted: nVidia Corporation CK804 Ethernet Controller)
-		if_devname=$(lspci -s ${if_pciaddr})
-		if_devname=${if_devname#*: }
-		if_devname=${if_devname%(rev *)}
-	fi
-
-	if [[ ${bus} == "usb" ]]
-	then
-		if_usbpath=$(readlink /sys/class/net/${iface}/device)
-		if_usbpath=/sys/class/net/${iface}/$(dirname ${if_usbpath})
-		if_usbmanufacturer=$(< ${if_usbpath}/manufacturer)
-		if_usbproduct=$(< ${if_usbpath}/product)
-
-		[[ -n ${if_usbmanufacturer} ]] && if_devname="${if_usbmanufacturer} "
-		[[ -n ${if_usbproduct} ]] && if_devname="${if_devname}${if_usbproduct}"
-	fi
-
-	if [[ ${bus} == "ieee1394" ]]
-	then
-		if_devname="IEEE1394 (FireWire) Network Adapter";
-	fi
-
-	echo ${if_devname}
-}
-
-get_ifdesc() {
-	local iface=$1
-	desc=$(get_ifproduct ${iface})
-	if [[ -n ${desc} ]]
-	then
-		echo $desc
-		return;
-	fi
-
-	desc=$(get_ifdriver ${iface})
-	if [[ -n ${desc} ]]
-	then
-		echo $desc
-		return;
-	fi
-
-	desc=$(get_ifmac ${iface})
-	if [[ -n ${desc} ]]
-	then
-		echo $desc
-		return;
-	fi
-
-	echo "Unknown"
-}
-
-show_ifmenu() {
-	local old_ifs="${IFS}"
-	local opts
-	IFS=""
-	for ifname in $(/sbin/ifconfig -a | grep "^[^ ]"); do
-		ifname="${ifname%% *}"
-		[[ ${ifname} == "lo" ]] && continue
-		opts="${opts} '${ifname}' '$(get_ifdesc ${ifname})'"
-	done
-	IFS="${old_ifs}"
-
-	eval dialog --menu \"Please select the interface that you wish to configure from the list below:\" 0 0 0 $opts 2>iface
-	[[ "$?" == "1" ]] && exit
-
-	iface=$(< iface)
-}
-
-show_ifconfirm() {
-	local iface=$1
-	local if_mac=$(get_ifmac ${iface})
-	local if_driver=$(get_ifdriver ${iface})
-	local if_bus=$(get_ifbus ${iface})
-	local if_product=$(get_ifproduct ${iface})
-
-	local text="Details for network interface ${iface} are shown below.\n\nInterface name: ${iface}\n"
-	[[ -n ${if_product} ]] && text="${text}Device: ${if_product}\n"
-	[[ -n ${if_mac} ]] && text="${text}MAC address: ${if_mac}\n"
-	[[ -n ${if_driver} ]] && text="${text}Driver: ${if_driver}\n"
-	[[ -n ${if_bus} ]] && text="${text}Bus type: ${if_bus}\n"
-	text="${text}\nIs this the interface that you wish to configure?"
-
-	if ! dialog --title "Interface details" --yesno "${text}" 15 70
-	then
-		result="no"
-	else
-		result="yes"
-	fi
-}
-
-livecd_console_settings() {
-	# scan for a valid baud rate
-	case "$1" in
-		300*)
-			LIVECD_CONSOLE_BAUD=300
-		;;
-		600*)
-			LIVECD_CONSOLE_BAUD=600
-		;;
-		1200*)
-			LIVECD_CONSOLE_BAUD=1200
-		;;
-		2400*)
-			LIVECD_CONSOLE_BAUD=2400
-		;;
-		4800*)
-			LIVECD_CONSOLE_BAUD=4800
-		;;
-		9600*)
-			LIVECD_CONSOLE_BAUD=9600
-		;;
-		14400*)
-			LIVECD_CONSOLE_BAUD=14400
-		;;
-		19200*)
-			LIVECD_CONSOLE_BAUD=19200
-		;;
-		28800*)
-			LIVECD_CONSOLE_BAUD=28800
-		;;
-		38400*)
-			LIVECD_CONSOLE_BAUD=38400
-		;;
-		57600*)
-			LIVECD_CONSOLE_BAUD=57600
-		;;
-		115200*)
-			LIVECD_CONSOLE_BAUD=115200
-		;;
-	esac
-	if [ "${LIVECD_CONSOLE_BAUD}" = "" ]
-	then
-		# If it's a virtual console, set baud to 38400, if it's a serial
-		# console, set it to 9600 (by default anyhow)
-		case ${LIVECD_CONSOLE} in 
-			tty[0-9])
-				LIVECD_CONSOLE_BAUD=38400
-			;;
-			*)
-				LIVECD_CONSOLE_BAUD=9600
-			;;
-		esac
-	fi
-	export LIVECD_CONSOLE_BAUD
-
-	# scan for a valid parity
-	# If the second to last byte is a [n,e,o] set parity
-	local parity
-	parity=$(echo $1 | rev | cut -b 2-2)
-	case "$parity" in
-		[neo])
-			LIVECD_CONSOLE_PARITY=$parity
-		;;
-	esac
-	export LIVECD_CONSOLE_PARITY	
-
-	# scan for databits
-	# Only set databits if second to last character is parity
-	if [ "${LIVECD_CONSOLE_PARITY}" != "" ]
-	then
-		LIVECD_CONSOLE_DATABITS=$(echo $1 | rev | cut -b 1)
-	fi
-	export LIVECD_CONSOLE_DATABITS
-	return 0
-}
-
-livecd_read_commandline() {
-	livecd_get_cmdline || return 1
-
-	for x in ${CMDLINE}
-	do
-		case "${x}" in
-			cdroot)
-				CDBOOT="yes"
-				RC_NO_UMOUNTS="^(/|/dev|/dev/pts|/lib/rcscripts/init.d|/proc|/proc/.*|/sys|/mnt/livecd|/newroot)$"
-				export CDBOOT RC_NO_UMOUNTS
-			;;
-			cdroot\=*)
-				CDBOOT="yes"
-				RC_NO_UMOUNTS="^(/|/dev|/dev/pts|/lib/rcscripts/init.d|/proc|/proc/.*|/sys|/mnt/livecd|/newroot)$"
-				export CDBOOT RC_NO_UMOUNTS
-			;;
-			console\=*)
-				local live_console
-				live_console=$(livecd_parse_opt "${x}")
-
-				# Parse the console line. No options specified if
-				# no comma
-				LIVECD_CONSOLE=$(echo ${live_console} | cut -f1 -d,)
-				if [ "${LIVECD_CONSOLE}" = "" ]
-				then
-					# no options specified
-					LIVECD_CONSOLE=${live_console}
-				else
-					# there are options, we need to parse them
-					local livecd_console_opts
-					livecd_console_opts=$(echo ${live_console} | cut -f2 -d,)
-					livecd_console_settings  ${livecd_console_opts}
-				fi
-				export LIVECD_CONSOLE
-			;;
-		esac
-	done
-	return 0
-}
-
-livecd_fix_inittab() {
-	if [ "${CDBOOT}" = "" ]
-	then
-		return 1
-	fi
-
-	# Create a backup
-	cp -f /etc/inittab /etc/inittab.old
-
-	# Comment out current getty settings
-	sed -i -e '/^c[0-9]/ s/^/#/' /etc/inittab
-	sed -i -e '/^s[01]/ s/^/#/' /etc/inittab
-
-	# SPARC & HPPA console magic
-	if [ "${HOSTTYPE}" = "sparc" -o "${HOSTTYPE}" = "hppa" -o "${HOSTTYPE}" = "ppc64" ]
-	then
-		# Mount openprom tree for user debugging purposes
-		if [ "${HOSTTYPE}" = "sparc" ]
-		then
-			mount -t openpromfs none /proc/openprom
-		fi
-
-		# SPARC serial port A, HPPA mux / serial
-		if [ -c "/dev/ttyS0" ]
-		then
-			LIVECD_CONSOLE_BAUD=$(stty -F /dev/ttyS0 speed)
-			echo "s0:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${LIVECD_CONSOLE_BAUD} ttyS0 vt100" >> /etc/inittab
-		fi
-		# HPPA software PDC console (K-models)
-		if [ "${LIVECD_CONSOLE}" = "ttyB0" ]
-		then
-			mknod /dev/ttyB0 c 11 0
-			LIVECD_CONSOLE_BAUD=$(stty -F /dev/ttyB0 speed)
-			echo "b0:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${LIVECD_CONSOLE_BAUD} ttyB0 vt100" >> /etc/inittab
-		fi
-		# FB / STI console
-		if [ -c "/dev/vc/1" -o -c "/dev/tts/1" -o -c "/dev/tty2" ]
-		then
-			MODEL_NAME=$(cat /proc/cpuinfo |grep "model name"|sed 's/.*: //')
-			if [ "${MODEL_NAME}" = "UML" ]
-			then
-			    for x in 0 1 2 3 4 5 6
-			    do
-				    echo "c${x}:12345:respawn:/sbin/mingetty --noclear --autologin root tty${x}" >> /etc/inittab
-			    done
-			else
-			    for x in 1 2 3 4 5 6
-			    do
-				    echo "c${x}:12345:respawn:/sbin/mingetty --noclear --autologin root tty${x}" >> /etc/inittab
-			    done
-			fi
-		fi
-		if [ -c "/dev/hvc0" ]
-		then
-			einfo "Adding hvc console to inittab"
-			echo "s0:12345:respawn:/sbin/agetty -nl /bin/bashlogin 9600 hvc0 vt320" >> /etc/inittab
-		fi
-
-
-	# The rest...
-	else
-		for x in 1 2 3 4 5 6
-		do
-			echo "c${x}:12345:respawn:/sbin/agetty -nl /bin/bashlogin 38400 tty${x} linux" >> /etc/inittab
-		done
-	fi
-
-	# EFI-based machines should automatically hook up their console lines
-	if dmesg | grep -q '^Adding console on'
-	then
-		dmesg | grep '^Adding console on' | while read x; do
-			line=`echo "$x" | cut -d' ' -f4`
-			id=e`echo "$line" | grep -o '.\{1,3\}$'`
-			[ "${line}" = "${LIVECD_CONSOLE}" ] && continue  # already setup above
-			case "$x" in
-				*options\ \'[0-9]*) speed=`echo "$x" | sed "s/.*options '//; s/[^0-9].*//"` ;;
-				*) speed=9600 ;;  # choose a default, only matters if it is serial
-			esac
-			echo "$id:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${speed} ${line} vt100" >> /etc/inittab
-		done
-	fi
-
-	# force reread of inittab
-	kill -HUP 1
-	return 0
-}

diff --git a/app-misc/sabayonlive-tools/files/2.3/livespawn b/app-misc/sabayonlive-tools/files/2.3/livespawn
deleted file mode 100644
index 44d7257..0000000
--- a/app-misc/sabayonlive-tools/files/2.3/livespawn
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/python
-import sys, os, subprocess
-args = sys.argv[1:]
-if not args: raise SystemExit(1)
-
-pid = os.fork()
-if pid == 0:
-	p = subprocess.Popen(args)
-	rc = p.wait()
-	raise SystemExit(rc)

diff --git a/app-misc/sabayonlive-tools/files/2.3/logscript.sh b/app-misc/sabayonlive-tools/files/2.3/logscript.sh
deleted file mode 100755
index f49a96a..0000000
--- a/app-misc/sabayonlive-tools/files/2.3/logscript.sh
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/bin/sh
-#requires the following
-# free, hostname, grep, cut, awk, uname
-
-HOSTNAME=`hostname -s`
-IP_ADDRS=`ifconfig | grep 'inet addr' | grep -v '255.0.0.0' | cut -f2 -d':' | awk '{print $1}'`
-IP_ADDRS=`echo $IP_ADDRS | sed 's/\n//g'`
-
-#memory
-MEMORY=`free | grep Mem | awk '{print $2}'`
-
-#cpu info
-CPUS=`cat /proc/cpuinfo | grep processor | wc -l | awk '{print $1}'`
-CPU_MHZ=`cat /proc/cpuinfo | grep MHz | tail -n1 | awk '{print $4}'`
-CPU_TYPE=`cat /proc/cpuinfo | grep vendor_id | tail -n 1 | awk '{print $3}'`
-CPU_TYPE2=`uname -m`
-CPU_TYPE3=`uname -p`
-
-OS_NAME=`uname -s`
-OS_OS=`uname -o`
-OS_KERNEL=`uname -r`
-OS_RELEASE=`cat /etc/sabayon-release`
-OS_EDITION=`cat /etc/sabayon-edition`
-ESELECT_KERNEL=`eselect --no-color kernel list`
-ESELECT_OPENGL=`eselect --no-color opengl list`
-ESELECT_JAVA=`eselect --no-color java-vm list`
-ESELECT_JAVAP=`eselect --no-color java-nsplugin list`
-
-EQUO=`equo --version`
-PORTAGE=`emerge --version`
-
-UPTIME=`uptime`
-MEM=`free -t -m`
-SPACE=`df -TH`
-
-PCIINFO=`lspci | cut -f3 -d':'`
-#Another way to do it
-#PCIINFO=`lspci | cut -f3 -d':'`
-
-LSUSB=`lsusb`
-LSMOD=`lsmod`
-#print it out
-echo "$HOSTNAME"
-echo "--------------------------------------------------------------------"
-echo "Hostname         : $HOSTNAME"
-echo "Host Address     : $IP_ADDRS"
-echo "Main Memory      : $MEMORY"
-echo "Number of CPUs   : $CPUS"
-echo "CPU Type         : $CPU_TYPE2 $CPU_TYPE3 $CPU_MHZ MHz"
-echo "OS Release       : $OS_RELEASE"
-echo "OS Edition       : $OS_EDITION"
-echo "Kernel Name      : $OS_NAME $OS_OS"
-echo "Kernel Version   : $OS_KERNEL"
-echo "Uptime           : $UPTIME"
-echo "--------------------------------------------------------------------"
-echo
-echo "Entropy Version"
-echo "$EQUO"
-echo
-echo "Portage Version"
-echo "$PORTAGE"
-echo "--------------------------------------------------------------------"
-echo
-echo "Kernel List"
-echo "$ESELECT_KERNEL"
-echo "Your Kernel Should Be Set To:"
-echo "$OS_KERNEL"
-echo "Use eselect kernel set #"
-echo "--------------------------------------------------------------------"
-echo
-echo "OpenGL List"
-echo "$ESELECT_OPENGL"
-echo "The above should be set to your video card, see lspci"
-echo "Use eselect opengl set #"
-echo "--------------------------------------------------------------------"
-echo
-echo "Java VM List"
-echo "$ESELECT_JAVA"
-echo "Use java-config --set-system-vm #"
-echo "--------------------------------------------------------------------"
-echo
-echo "Java-nsplugin List"
-echo "$ESELECT_JAVAP"
-echo "Use eselect java-nsplugin set #"
-echo "--------------------------------------------------------------------"
-echo
-echo "Devices - lspci"
-echo "--------------------------------------------------------------------"
-echo "$PCIINFO"
-echo "--------------------------------------------------------------------"
-echo
-echo "Devices - lsmod"
-echo "--------------------------------------------------------------------"
-echo "$LSMOD"
-echo "--------------------------------------------------------------------"
-echo
-echo "Devices - lsusb"
-echo "--------------------------------------------------------------------"
-echo "$LSUSB"
-echo "--------------------------------------------------------------------"
-echo
-echo "Memory"
-echo "--------------------------------------------------------------------"
-echo "$MEM"
-echo "--------------------------------------------------------------------"
-echo
-echo "Disk Space"
-echo "--------------------------------------------------------------------"
-echo "$SPACE"
-echo "--------------------------------------------------------------------"
-echo

diff --git a/app-misc/sabayonlive-tools/files/2.3/net-setup b/app-misc/sabayonlive-tools/files/2.3/net-setup
deleted file mode 100755
index e84de48..0000000
--- a/app-misc/sabayonlive-tools/files/2.3/net-setup
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2005 Gentoo Foundation
-# Copyright 2006-2008 Fabio Erculiani
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/livecd-tools/net-setup,v 1.19 2006/05/30 20:20:11 wolf31o2 Exp $
-
-if [ -f /sbin/livecd-functions.sh ]
-then
-	source /sbin/livecd-functions.sh
-else
-	echo "ERROR: /sbin/livecd-functions.sh could not be loaded!"
-	exit 1
-fi
-
-if [ ! -x $(which dialog) ]
-then
-	echo "ERROR: The dialog utility is required for net-setup.  Exiting!"
-	exit 1
-fi
-
-livecd_check_root || exit 1
-
-# Hide any potential error messages from the readlink/dirname/etc calls below
-exec 2>/dev/null
-
-if [ -z "${1}" ]
-then
-	show_ifmenu
-	echo $iface
-else
-	iface="${1}"
-fi
-
-[ ! -d /tmp/setup.opts ] && mkdir /tmp/setup.opts
-cd /tmp/setup.opts
-
-while true; do
-	show_ifconfirm $iface
-	[[ $result == "yes" ]] && break
-	show_ifmenu
-done
-
-# Show stderr again
-exec 2>/dev/stderr
-
-dialog --title "Network setup" --menu "This script is designed to setup both wired and wireless network settings.  All questions below apply to the ${iface} interface only.  Choose one option:" 20 60 7 1 "My network is wireless" 2 "My network is wired" 2> ${iface}.WIRED_WIRELESS
-WIRED_WIRELESS=$(tail -n 1 ${iface}.WIRED_WIRELESS)
-case ${WIRED_WIRELESS} in
-	1)
-		livecd_config_wireless
-		livecd_config_ip
-		livecd_write_wireless_conf
-		;;
-	2)
-		livecd_config_ip
-		;;
-	*)
-		exit 0
-		;;
-esac
-livecd_write_net_conf
-
-echo "Type \"ifconfig\" to make sure the interface was configured correctly."
-
-# vim: ts=4

diff --git a/app-misc/sabayonlive-tools/files/2.3/opengl-activator b/app-misc/sabayonlive-tools/files/2.3/opengl-activator
deleted file mode 100755
index 387dd10..0000000
--- a/app-misc/sabayonlive-tools/files/2.3/opengl-activator
+++ /dev/null
@@ -1,318 +0,0 @@
-#!/bin/sh
-# Forked from eselect opengl Gentoo module - this is reaaaaaaaaaally faster
-# this is used only at Live time, to avoid the use of Portage
-# Copyright 2006-2008 Fabio Erculiani
-
-# Our data
-ENV_FILE="/etc/env.d/03opengl"
-PREFIX="/usr"
-DST_PREFIX="/usr"
-USE_PROFILE_HEADERS="no"
-ES_VALID_MULTILIB_DIRS="lib lib32 lib64"
-
-# list_libdirs PUBLIC
-# Returns a space separated list of libdirs available on this machine
-list_libdirs() {
-    local dir libdirs
-    libdirs=""
-    for dir in ${ES_VALID_MULTILIB_DIRS} ; do
-        if grep -q "^/${dir}\(\|/\)$" /etc/ld.so.conf &> /dev/null ; then
-            libdirs=( ${libdirs[@]} ${dir} )
-        fi
-    done
-    if [[ -z ${libdirs[@]} ]] ; then
-    	# Broken or non-existing ld.so.conf
-    	libdirs=( /lib* )
-	libdirs=( ${libdirs[@]/\/lib/lib} )
-    fi
-    echo "${libdirs[@]}"
-}
-
-# has test list
-# Return true if list contains test
-has() {
-    local test=${1} item
-    shift
-    for item in $@ ; do
-        [[ ${item} == ${test} ]] && return 0
-    done
-    return 1
-}
-
-# is_function function PUBLIC
-# Test whether function exists
-is_function() {
-    [[ $(type -t "${1}" ) == "function" ]]
-}
-
-# is_number PUBLIC
-# Returns true if and only if $1 is a positive whole number
-is_number() {
-    [[ -n ${1} ]] && [[ -z ${1//[[:digit:]]} ]]
-}
-
-get_current_implementation() {
-	local ret
-	local ldpath=$(cat ${ENV_FILE} | grep LDPATH | cut -d'"' -f 2)
-	
-	local opengl_profile=$(cat ${ENV_FILE} | grep OPENGL_PROFILE | cut -d'"' -f 2)
-        
-	if [[ -n ${opengl_profile} ]] ; then
-		ret="${opengl_profile}"
-	elif [[ -n ${ldpath} ]] ; then
-		ret="${ldpath%%:*}"
-		ret="${ret##*opengl/}"
-		ret="${ret%/lib*}"
-	fi
-
-	echo ${ret}
-}
-
-get_implementations() {
-	local ret dir
-	for x in $(list_libdirs) ; do
-		for dir in "${PREFIX}/${x}"/opengl/* ; do
-			[[ -d ${dir} && $(basename "${dir}") != "global" ]] || continue
-			has $(basename "${dir}") ${ret} && continue
-			ret=${ret:+${ret} }$(basename "${dir}")
-		done
-	done
-
-	echo ${ret}
-}
-
-setup_lib_symlinks() {
-	local profile_libdir=${1}
-	local libdir=${2}
-	local file
-	local rootfile
-
-	mkdir -p "${libdir}" || echo "Failed to create ${libdir}"
-
-	pushd "${libdir}" &> /dev/null
-		# First remove old symlinks
-		for file in libGL{,core}.{a,so,la} ; do
-			rm -f "${file}" || echo -q "Failed to delete ${file}"
-		done
-
-		# Note that we don't do .so*, just .so on purpose.  The
-		# loader knows to look in the profile dir, and the
-		# linked just needs the .so
-		for file in ${profile_libdir}/libGL{,core}.{so,a,la}; do
-			rootfile="${file}"
-			[[ -f ${file} ]] || continue
-			if [[ -f $(basename "${file}") ]] ; then
-				rm -f "$(basename "${file}")" || echo -q "Failed to delete ${libdir}/$(basename "${file}")"
-			fi
-
-			# Fix libtool archives (#48297)
-			if [[ ${file%.la} != ${file} ]] ; then
-				sed "s:${profile_libdir}:${libdir}:g" "${file}" > "$(basename "${file}")" || echo "Failed to create ${libdir}/$(basename "${file}")"
-			else
-				ln -s "${rootfile}" || echo "Failed to create ${libdir}/$(basename "${file}")"
-			fi
-		done
-	popd &> /dev/null
-}
-
-set_new_implementation() {
-	local gl_implem=${1}
-	local avail_implems=$(get_implementations)
-
-	# Set a sane umask... bug #83115
-	umask 022
-
-	if ! has ${gl_implem} ${avail_implems}; then
-		echo "Invalid profile selected."
-		exit 1
-	fi
-
-	echo -n "Switching to ${gl_implem} OpenGL interface..."
-
-		local libdir
-		for libdir in $(list_libdirs); do
-			[[ ${ROOT} != / ]] && libdir=${libdir//${ROOT}}
-
-			# First make sure we have an opengl directory and this is a real lib dir, not a symlink
-			[[ -d ${PREFIX}/${libdir}/opengl && ! -h ${PREFIX}/${libdir} ]] || continue
-
-			# Fallback on xorg-x11 if we don't have this implementation for this libdir.
-			local gl_local
-			if [[ ! -d ${PREFIX}/${libdir}/opengl/"${gl_implem}" ]] ; then
-				gl_local="xorg-x11"
-			else
-				gl_local="${gl_implem}"
-			fi
-
-			setup_lib_symlinks "${PREFIX}/${libdir}/opengl/${gl_local}/lib" "${DST_PREFIX}/${libdir}"
-		
-			if [[ -e ${PREFIX}/${libdir}/opengl/${gl_local}/lib/tls ]] ; then
-				setup_lib_symlinks "${PREFIX}/${libdir}/opengl/${gl_local}/lib/tls" "${DST_PREFIX}/${libdir}/tls"
-			fi
-
-			local moduledir
-			if [[ -e ${DST_PREFIX}/${libdir}/xorg/modules ]] ; then
-				moduledir="xorg/modules"
-			else
-				moduledir="modules"
-			fi
-
-			if [[ -e ${PREFIX}/${libdir}/opengl/${gl_local}/extensions ]] ; then
-				mkdir -p "${DST_PREFIX}/${libdir}/${moduledir}/extensions" || echo "Failed to create ${DST_PREFIX}/${libdir}/${moduledir}/extensions"
-				pushd "${DST_PREFIX}/${libdir}/${moduledir}/extensions" &> /dev/null
-					# First remove old symlinks
-					for file in lib{wfb,glx,dri,dri2}.{a,so,la}; do
-						rm -f "${file}" || echo "Failed to delete ${DST_PREFIX}/${libdir}/${moduledir}/extensions/${file}"
-					done
-
-					for file in ${PREFIX}/${libdir}/opengl/${gl_local}/extensions/*.{so,a,la}; do
-						[[ -f ${file} ]] || continue
-						if [[ -f $(basename "${file}") ]] ; then
-							rm -f "$(basename "${file}")" || echo "Failed to delete ${DST_PREFIX}/${libdir}/${moduledir}/extensions/$(basename "${file}")"
-						fi
-
-						# Fix libtool archives (#48297)
-						if [[ ${file%.la} != ${file} ]] ; then
-							sed "s:${PREFIX}/[^/]*/opengl/[^/]*/lib:${DST_PREFIX}/${libdir}:g" "${file}" > "$(basename "${file}")" || echo "Failed to create ${DST_PREFIX}/${libdir}/${moduledir}/extensions/$(basename "${file}")"
-						else
-							ln -s "${file}" || echo "Failed to create ${libdir}/$(basename "${file}")"
-						fi
-					done
-				popd &> /dev/null
-			fi
-
-			# Setup the includes
-			mkdir -p "${DST_PREFIX}/include/GL" || echo "Failed to create ${DST_PREFIX}/include/GL"
-			pushd "${DST_PREFIX}/include/GL" &> /dev/null
-				for file in gl.h glx.h glxtokens.h glext.h glxext.h glxmd.h glxproto.h; do
-					# IMPORTANT
-					# It is preferable currently to use the standard glext.h file
-					# however if an OpenGL provider must use a self produced glext.h
-					# then it should be installed to ${gl_implem}/include and the user
-					# can add the --impl-headers option to select it.
-
-					if [[ "${USE_PROFILE_HEADERS}" == "yes" ]] ; then
-						# Check the profile first.
-						if [[ -e ${PREFIX}/${libdir}/opengl/${gl_implem}/include/${file} ]] ; then
-							if [[ -f ${file} || ( -L ${file} && ! -e ${file} ) ]] ; then
-								rm -f "${file}" || echo "Failed to delete ${DST_PREFIX}/include/GL/$(basename "${file}")"
-							fi
-
-							ln -s ${PREFIX}/${libdir}/opengl/${gl_implem}/include/${file} || echo "Failed to create ${DST_PREFIX}/include/GL/$(basename "${file}")"
-							continue
-						fi
-					fi
-
-					if [[ -e ${PREFIX}/${libdir}/opengl/global/include/${file} ]] ; then
-						if [[ -f ${file} || ( -L ${file} && ! -e ${file} ) ]] ; then
-							rm -f "${file}" || echo "Failed to delete ${DST_PREFIX}/include/GL/$(basename "${file}")"
-						fi
-
-						ln -s ${PREFIX}/${libdir}/opengl/global/include/${file} || echo "Failed to create ${DST_PREFIX}/include/GL/$(basename "${file}")"
-					elif [[ -e ${PREFIX}/${libdir}/opengl/${gl_implem}/include/${file} ]] ; then
-						if [[ -f ${file} || ( -L ${file} && ! -e ${file} ) ]] ; then
-							rm -f "${file}" || echo "Failed to delete ${DST_PREFIX}/include/GL/$(basename "${file}")"
-						fi
-
-						ln -s ${PREFIX}/${libdir}/opengl/${gl_implem}/include/${file} || echo "Failed to create ${DST_PREFIX}/include/GL/$(basename "${file}")"
-					elif [[ -e ${PREFIX}/${libdir}/opengl/xorg-x11/include/${file} ]] ; then
-						if [[ -f ${file} || ( -L ${file} && ! -e ${file} ) ]] ; then
-							rm -f "${file}" || echo "Failed to delete ${DST_PREFIX}/include/GL/$(basename "${file}")"
-						fi
-
-						ln -s ${PREFIX}/${libdir}/opengl/xorg-x11/include/${file} || echo "Failed to create ${DST_PREFIX}/include/GL/$(basename "${file}")"
-					fi
-				done
-			popd &> /dev/null
-
-			# Setup the $LDPATH
-			ldpath="${ldpath:+${ldpath}:}${PREFIX}/${libdir}/opengl/${gl_local}/lib"
-
-		done
-
-		sed -i '/LDPATH=.*/d' ${ENV_FILE}
-		echo "LDPATH=\"${ldpath}\"" >> ${ENV_FILE}
-		oldldpath=$(cat /etc/profile.env|grep LDPATH | cut -d"'" -f2)
-
-		sed -i '/export LDPATH=.*/d' /etc/profile.env
-		sed -i '/setenv LDPATH=.*/d' /etc/csh.env
-		sed -i '/export LD_LIBRARY_PATH=.*/d' /etc/profile.env
-		sed -i '/setenv LD_LIBRARY_PATH=.*/d' /etc/csh.env
-		sed -i "s/OPENGL_PROFILE=.*/OPENGL_PROFILE='${gl_implem}'/"  /etc/profile.env
-		sed -i "s/OPENGL_PROFILE=.*/OPENGL_PROFILE='${gl_implem}'/"  /etc/csh.env
-		sed -i '/LD_LIBRARY_PATH=.*/d' ${ENV_FILE}
-		sed -i "s/OPENGL_PROFILE=.*/OPENGL_PROFILE=\"${gl_implem}\"/"  ${ENV_FILE}
-
-		echo "export LDPATH='"${ldpath}":"${oldldpath}"'" >> /etc/profile.env
-		echo "setenv LDPATH='"${ldpath}":"${oldldpath}"'" >> /etc/csh.env
-		echo "export LD_LIBRARY_PATH='"${ldpath}"'" >> /etc/profile.env
-		echo "setenv LD_LIBRARY_PATH='"${ldpath}"'" >> /etc/csh.env
-		echo 'LD_LIBRARY_PATH="'${ldpath}'"' >> ${ENV_FILE}
-
-
-		source /etc/profile &> /dev/null
-	echo " done"
-}
-
-do_set() {
-	local action="error"
-	local current=$(get_current_implementation)
-	local available=$(get_implementations)
-	local new
-
-	while [[ ${#@} -gt 0 ]] ; do
-		local opt=${1}
-		shift
-		case ${opt} in
-			*)
-				action="set-implementation"
-				if has ${opt} ${available}; then
-					new="${opt}"
-				else
-					echo "Unrecognized option: ${opt}"
-				fi
-			;;
-		esac
-	done
-
-	case ${action} in
-		set-implementation)
-			if [[ -n ${new} ]] ; then
-				set_new_implementation ${new}
-                                rc=$?
-				sed -i "s/opengl\/xorg-x11\//opengl\/${new}\//" /etc/ld.so.conf
-				sed -i "s/opengl\/ati\//opengl\/${new}\//" /etc/ld.so.conf
-				sed -i "s/opengl\/nvidia\//opengl\/${new}\//" /etc/ld.so.conf
-				ldconfig -X &> /dev/null
-				return ${rc}
-			else
-				echo "Please specify an implementation to set"
-			fi
-		;;
-		*)
-			echo "Invalid usage of set action."
-		;;
-	esac
-
-}
-
-do_show() {
-	local current=$(get_current_implementation)
-	echo ${current}
-}
-
-is_live=$(cat /proc/cmdline | grep cdroot)
-
-if [ -n "$is_live" ]; then
-	if [ "$1" == "show" ]; then
-		do_show
-	else
-		do_set $@
-	fi
-else
-	if [ "$1" == "show" ]; then
-		eselect opengl show
-	else
-		eselect opengl set $@
-	fi
-fi

diff --git a/app-misc/sabayonlive-tools/files/2.3/sabayon-functions.sh b/app-misc/sabayonlive-tools/files/2.3/sabayon-functions.sh
deleted file mode 100755
index a0799ba..0000000
--- a/app-misc/sabayonlive-tools/files/2.3/sabayon-functions.sh
+++ /dev/null
@@ -1,176 +0,0 @@
-#!/bin/bash
-
-GDM_FILE="/usr/share/gdm/defaults.conf"
-CUSTOM_GDM_FILE="/etc/gdm/custom.conf"
-KDM_FILE="/usr/share/config/kdm/kdmrc"
-LXDM_FILE="/etc/lxdm/lxdm.conf"
-OEM_FILE="/etc/oemlive.sh"
-OEM_FILE_NEW="/etc/oem/liveboot.sh"
-LIVE_USER_GROUPS="audio cdrom cdrw clamav console entropy games haldaemon \
-kvm lp lpadmin messagebus plugdev polkituser portage pulse pulse-access pulse-rt \
-scanner usb users uucp vboxguest vboxusers video wheel"
-LIVE_USER=${SABAYON_USER:-sabayonuser}
-
-sabayon_setup_autologin() {
-	# GDM - GNOME
-	if [ -f "${GDM_FILE}" ]; then
-		sed -i "s/^AutomaticLoginEnable=.*/AutomaticLoginEnable=true/" ${GDM_FILE}
-		sed -i "s/^AutomaticLogin=.*/AutomaticLogin=${LIVE_USER}/" ${GDM_FILE}
-
-		sed -i "s/^TimedLoginEnable=.*/TimedLoginEnable=true/" ${GDM_FILE}
-		sed -i "s/^TimedLogin=.*/TimedLogin=${LIVE_USER}/" ${GDM_FILE}
-		sed -i "s/^TimedLoginDelay=.*/TimedLoginDelay=0/" ${GDM_FILE}
-
-	elif [ -f "${CUSTOM_GDM_FILE}" ]; then
-		sed -i "s:\[daemon\]:\[daemon\]\nAutomaticLoginEnable=true\nAutomaticLogin=${LIVE_USER}\nTimedLoginEnable=true\nTimedLogin=${LIVE_USER}\nTimedLoginDelay=0:" \
-			"${CUSTOM_GDM_FILE}"
-	fi
-
-	# KDM - KDE
-	if [ -f "$KDM_FILE" ]; then
-		sed -i "s/AutoLoginEnable=.*/AutoLoginEnable=true/" $KDM_FILE
-		sed -i "s/AutoLoginUser=.*/AutoLoginUser=${LIVE_USER}/" $KDM_FILE
-		sed -i "s/AutoLoginDelay=.*/AutoLoginDelay=0/" $KDM_FILE
-		sed -i "s/AutoLoginAgain=.*/AutoLoginAgain=true/" $KDM_FILE
-
-		sed -i "s/AllowRootLogin=.*/AllowRootLogin=true/" $KDM_FILE
-		sed -i "s/AllowNullPasswd=.*/AllowNullPasswd=true/" $KDM_FILE
-		sed -i "s/AllowShutdown=.*/AllowShutdown=All/" $KDM_FILE
-
-		sed -i "/^#.*AutoLoginEnable=/ s/^#//" $KDM_FILE
-		sed -i "/^#.*AutoLoginUser=/ s/^#//" $KDM_FILE
-		sed -i "/^#.*AutoLoginDelay=/ s/^#//" $KDM_FILE
-		sed -i "/^#.*AutoLoginAgain=/ s/^#//" $KDM_FILE
-
-		sed -i "/^#AllowRootLogin=/ s/^#//" $KDM_FILE
-		sed -i "/^#AllowNullPasswd=/ s/^#//" $KDM_FILE
-		sed -i "/^#AllowShutdown=/ s/^#//" $KDM_FILE
-	fi
-
-	# LXDM
-	if [ -f "$LXDM_FILE" ]; then
-		sed -i "s/autologin=.*/autologin=${LIVE_USER}/" $LXDM_FILE
-		sed -i "/^#.*autologin=/ s/^#//" $LXDM_FILE
-	fi
-}
-
-sabayon_disable_autologin() {
-	# GDM - GNOME
-	if [ -f "${GDM_FILE}" ]; then
-		sed -i "s/^AutomaticLoginEnable=.*/AutomaticLoginEnable=false/" ${GDM_FILE}
-	fi
-
-	# KDM - KDE
-	KDM_FILE="/usr/share/config/kdm/kdmrc"
-	if [ -f "$KDM_FILE" ]; then
-		sed -i "s/AutoLoginEnable=.*/AutoLoginEnable=false/" $KDM_FILE
-	fi
-}
-
-sabayon_setup_live_user() {
-	local live_user="${1}"
-	local live_uid="${2}"
-	if [ -z "${live_user}" ]; then
-		live_user="${LIVE_USER}"
-	fi
-	if [ -n "${live_uid}" ]; then
-		live_uid="-u ${live_uid}"
-	fi
-	id ${live_user} &> /dev/null
-	if [ "${?}" != "0" ]; then
-		local live_groups=""
-		local avail_groups=$(cat /etc/group | cut -d":" -f 1 | xargs echo)
-		for a_group in ${avail_groups}; do
-			for p_group in ${LIVE_USER_GROUPS}; do
-				if [ "${p_group}" = "${a_group}" ]; then
-					if [ -z "${live_groups}" ]; then
-						live_groups="${p_group}"
-					else
-						live_groups="${live_groups},${p_group}"
-					fi
-				fi
-			done
-		done
-		# then setup live user, that is missing
-		useradd -d "/home/${live_user}" -g root -G ${live_groups} \
-			-m -N -p "" -s /bin/bash ${live_uid} "${live_user}"
-		return 0
-	fi
-	return 1
-}
-
-sabayon_setup_motd() {
-	echo -e "\n\tWelcome to `cat /etc/sabayon-edition`\n\t`uname -p`\n\t`uname -o` `uname -r`\n" > /etc/motd
-}
-
-sabayon_setup_vt_autologin() {
-	source /sbin/livecd-functions.sh
-	export CDBOOT=1
-	livecd_fix_inittab
-}
-
-sabayon_setup_oem_livecd() {
-	if [ -x "${OEM_LIVE_NEW}" ]; then
-		${OEM_FILE_NEW} || return 1
-	elif [ -x "${OEM_LIVE}" ]; then
-		${OEM_FILE} || return 1
-	fi
-	return 0
-}
-
-sabayon_is_live() {
-	local cmdl=$(cat /proc/cmdline | grep cdroot)
-	if [ -n "${cmdl}" ]; then
-		return 0
-	else
-		return 1
-	fi
-}
-
-sabayon_setup_gui_installer() {
-	# Configure Fluxbox
-	local dmrc_file="/home/${LIVE_USER}/.dmrc"
-	local flux_dir="/home/${LIVE_USER}/.fluxbox"
-	local flux_startup_file="${flux_dir}/startup"
-	if [ ! -d "${flux_dir}" ]; then
-		mkdir "${flux_dir}" && chown "${LIVE_USER}" "${flux_dir}"
-	fi
-	echo "[Desktop]" > "${dmrc_file}"
-	echo "Session=fluxbox" >> "${dmrc_file}"
-	chown sabayonuser "${dmrc_file}"
-	sed -i "/installer --fullscreen/ s/^# //" "${flux_startup_file}"
-}
-
-sabayon_setup_text_installer() {
-	# switch to verbose mode
-	splash_manager -c set -t default -m v &> /dev/null
-	reset
-	chvt 1
-	clear
-	echo "Welcome to Sabayon Linux Text installation." >> /etc/motd
-	echo "root password: root" >> /etc/motd
-	echo "to run the installation type: installer <and PRESS ENTER>" >> /etc/motd
-}
-
-sabayon_is_text_install() {
-	local _is_install=$(cat /proc/cmdline | grep installer-text)
-	if [ -n "${_is_install}" ]; then
-		return 0
-	else
-		return 1
-	fi
-}
-
-sabayon_is_gui_install() {
-	local _is_install=$(cat /proc/cmdline | grep installer-gui)
-	if [ -n "${_is_install}" ]; then
-		return 0
-	else
-		return 1
-	fi
-}
-
-sabayon_is_live_install() {
-	( sabayon_is_text_install || sabayon_is_gui_install ) && return 0
-	return 1
-}

diff --git a/app-misc/sabayonlive-tools/files/2.3/sabayon-live-check b/app-misc/sabayonlive-tools/files/2.3/sabayon-live-check
deleted file mode 100644
index 2b1ef61..0000000
--- a/app-misc/sabayonlive-tools/files/2.3/sabayon-live-check
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# sabayon_livechk.sh
-#
-# Checks the integrity of a LiveCD/DVD by passing the
-# contents of the image through a md5sum (to be compared
-# with an documented value elsewhere).
-#
-
-if ( ! isoinfo -d -i /dev/cdrom >>/dev/null 2>/dev/null ); then
-       echo "CDROM/DVD image not found!"
-       exit 1
-fi
-
-echo -e "Checking image integrity, please allow several minutes...\n"
-echo "You can check for errors by running 'tail /var/log/messages'"
-echo "in another console window.  If you encounter multiple device"
-echo "errors with you cdrom, this probably indicates the test is failing."
-echo "You may type 'Ctrl-c' to abort the check."
-
-BLOCK_SIZE=`isoinfo -d -i /dev/cdrom | grep "Logical block size is" | cut -d: -f2 | sed 's/^[ ]//g'`
-VOL_SIZE=`isoinfo -d -i /dev/cdrom | grep "Volume size is" | cut -d: -f2 | sed 's/^[ ]//g'`
-dd if=/dev/cdrom bs=$BLOCK_SIZE count=$VOL_SIZE conv=notrunc,noerror | md5sum
-
-echo "Compare the above value with the value supplied in"
-echo "the release notes for this version at:"
-echo "http://www.sabayon.org/"

diff --git a/app-misc/sabayonlive-tools/files/2.3/sabayon-welcome-loader b/app-misc/sabayonlive-tools/files/2.3/sabayon-welcome-loader
deleted file mode 100755
index 0bb12f2..0000000
--- a/app-misc/sabayonlive-tools/files/2.3/sabayon-welcome-loader
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-SABAYON_LOADER="/usr/bin/xdg-open"
-SABAYON_URL=${SABAYON_URL:-http://www.sabayon.org?install_welcome=1}
-
-# load Sabayon URL
-[[ -x "${SABAYON_LOADER}" ]] && ${SABAYON_LOADER} ${SABAYON_URL} &
-
-# remove myself from autostart
-rm ~/.config/autostart/sabayon-welcome-loader.desktop -f

diff --git a/app-misc/sabayonlive-tools/files/2.3/sabayon-welcome-loader.desktop b/app-misc/sabayonlive-tools/files/2.3/sabayon-welcome-loader.desktop
deleted file mode 100644
index e5ea4b3..0000000
--- a/app-misc/sabayonlive-tools/files/2.3/sabayon-welcome-loader.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=sabayon-loader
-Exec=sabayon-welcome-loader
-Icon=system-run
-Comment=Sabayon Linux post-install Welcome Screen
-Terminal=false

diff --git a/app-misc/sabayonlive-tools/files/2.3/sabayonlive b/app-misc/sabayonlive-tools/files/2.3/sabayonlive
deleted file mode 100755
index 7ee4659..0000000
--- a/app-misc/sabayonlive-tools/files/2.3/sabayonlive
+++ /dev/null
@@ -1,212 +0,0 @@
-#!/sbin/runscript
-# Copyright 2004-2009 Fabio Erculiani
-# Distributed under the terms of the GNU General Public License v2 
-
-. /sbin/sabayon-functions.sh
-
-depend() {
-	after x-setup
-	before hald
-	before xdm
-}
-
-prepare_fluxbox_locked_autologin() {
-
-	# change default wm to fluxbox
-	echo "[Desktop]" > /home/${LIVE_USER}/.dmrc
-	echo "Session=fluxbox" >> /home/${LIVE_USER}/.dmrc
-	chown ${LIVE_USER} /home/${LIVE_USER}/.dmrc
-	# Change passwords for security
-	echo root:\`pwgen -s 16\` | chpasswd  > /dev/null 2>&1
-	echo ${LIVE_USER}:\`pwgen -s 16\` | chpasswd  > /dev/null 2>&1
-
-}
-
-my_setup_desktop() {
-
-	# create LIVE_USER if it does not exist
-	sabayon_setup_live_user "${LIVE_USER}" "1000"
-	if [ "${?}" = "1" ]; then
-		# if user is already available, then setup skel
-		# Copy ${LIVE_USER} directory
-		rm -rf /home/${LIVE_USER}
-		cp /etc/skel /home/${LIVE_USER} -Rp
-		chown ${LIVE_USER}:users /home/${LIVE_USER} -R
-	fi
-
-	liveinst_desktop="/usr/share/applications/liveinst.desktop"
-	liveinst_desktop_name="$(basename ${liveinst_desktop})"
-	if [ -f "${liveinst_desktop}" ]; then
-		[[ -d "/home/${LIVE_USER}/Desktop" ]] || mkdir -p /home/${LIVE_USER}/Desktop 
-		cp "${liveinst_desktop}" /home/${LIVE_USER}/Desktop
-		chown ${LIVE_USER}:users /home/${LIVE_USER}/Desktop -R
-		chmod +x /home/${LIVE_USER}/Desktop/${liveinst_desktop_name}
-		rm -f /etc/skel/Desktop/Anaconda*.desktop
-		rm -f /home/${LIVE_USER}/Desktop/Anaconda*.desktop
-	fi
-
-	# Disable memory eating services
-	rm -f /etc/xdg/autostart/hplip-systray.desktop
-	rm -f /etc/xdg/autostart/beagle-search-autostart.desktop
-	rm -f /etc/xdg/autostart/tracker*.desktop
-	rm -f /etc/xdg/autostart/magneto.desktop
-	rm -f /etc/xdg/autostart/beagled-autostart.desktop
-	rm -f /usr/share/autostart/magneto.desktop
-	rm -f /usr/share/autostart/nepomukserver.desktop
-
-        # Remove broken entries in /etc/mtab
-        sed -i '/.*newroot.*/d' /etc/mtab
-
-	# Create /media for removable devices
-	if [ ! -d /media ]; then
-		mkdir /media
-		chmod 755 /media
-	fi
-
-	# Add sudo to gparted exec=
-	gparted_file="/home/${LIVE_USER}/Desktop/gparted.desktop"
-	if [ -f "${gparted_file}" ]; then
-		sed -i 's/Exec=/Exec=sudo /' "${gparted_file}"
-	fi
-
-	# create /overlay, this way df -h won't bitch
-	[[ -d "/overlay" ]] || mkdir /overlay
-
-}
-
-my_setup_password() {
-
-	cmdline_autoscramble_exist=$(cat /proc/cmdline | grep autoscramble)
-	if [ -n "$cmdline_autoscramble_exist" ]; then
-		echo
-		echo -e "\E[33;36m * \E[0m\E[01;36m Autoscrambling root passwords for   S E C U R I T Y"
-		echo root:\`pwgen -s 16\` | chpasswd  > /dev/null 2>&1
-		echo ${LIVE_USER}:\`pwgen -s 16\` | chpasswd  > /dev/null 2>&1
-		echo
-	fi
-
-}
-
-my_setup_keymap() {
-
-	# Check if KEYMAP is forced by cmdline
-	cmdline_keymap_exist=$(cat /proc/cmdline | grep -i "KEYMAP=")
-	cmdline_keymap_isolinux_exist=$(cat /proc/cmdline | grep -i "console-setup/layoutcode=")
-
-	if [ -n "$cmdline_keymap_isolinux_exist" ]; then
-		cmdline_keymap_exist="console-setup"
-	fi
-
-        if [ -n "$cmdline_keymap_exist" ];then
-
-		if [ "$cmdline_keymap_exist" == "console-setup" ]; then
-			# detect keymap
-			for word in `cat /proc/cmdline` ; do
-				case $word in
-					console-setup/layoutcode=*)
-					keymap_toset=$(echo $word | cut -d "=" -f 2)
-					;;
-					console-setup/modelcode=*)
-					keymap_toset_model="-$(echo $word | cut -d "=" -f 2)"
-					;;
-				esac
-			done
-		else
-
-			# detect keymap
-			for word in `cat /proc/cmdline` ; do
-				case $word in
-					KEYMAP=*)
-					keymap_toset=$(echo $word | cut -d "=" -f 2)
-					;;
-					keymap=*)
-					keymap_toset=$(echo $word | cut -d "=" -f 2)
-					;;
-				esac
-			done
-
-		fi
-
-		if [ -n "$keymap_toset" ]; then
-			aggregated_keymap="${keymap_toset}${keymap_toset_model}"
-			/sbin/keyboard-setup-2 ${aggregated_keymap} all &> /dev/null
-			if [ "${?}" = "0" ]; then
-				/etc/init.d/keymaps restart --nodeps
-			fi
-		fi
-	
-	fi
-
-}
-
-my_wait_opengl_config() {
-
-	echo -en "\E[33;36m * \E[0m \E[01;32m Waiting for Graphical Configurator to finish... \E[0m"
-	while [ -e "/etc/x-setup-configuration-running" ]
-           do
-	      # waiting...
-	      sleep 1
-	   done
-	echo -e "Done"
-
-}
-
-my_setup_locale() {
-
-        cmdline_lang_exist=$(cat /proc/cmdline | grep -i "lang=")
-        cmdline_locale_exist=$(cat /proc/cmdline | grep -i "locale=")
-
-	if [ -n "$cmdline_locale_exist" ]; then
-		cmdline_lang_exist="locale-setup"
-	fi
-
-        if [ -n "$cmdline_lang_exist" ];then
-
-		if [ "$cmdline_lang_exist" == "locale-setup" ]; then
-			# detect keymap
-			for word in `cat /proc/cmdline` ; do
-				case $word in
-					locale=*)
-					lang_toset=$(echo $word | cut -d "=" -f 2)
-					;;
-				esac
-			done
-		else
-			for word in `cat /proc/cmdline` ; do
-				case $word in
-					LANG=*)
-					lang_toset=$(echo $word | cut -d "=" -f 2)
-					;;
-					lang=*)
-					lang_toset=$(echo $word | cut -d "=" -f 2)
-					;;
-				esac
-			done
-		fi
-		
-		# Setup Language
-		if [ -n "$lang_toset" ]; then
-			/sbin/language-setup $lang_toset &> /dev/null
-		fi
-
-        fi
-
-}
-
-start() {
-
-	my_setup_desktop
-	my_setup_password
-	my_setup_keymap
-	my_wait_opengl_config
-	# MOVED HERE TO AVOID RACE CONDITIONS ON WRITING /etc/profile.env variables
-	# Check if LANG is forced by cmdline
-	my_setup_locale
-	# setup autologin for all the supported Login managers
-	sabayon_setup_autologin
-	# override autostart stuff if required:
-	sabayon_setup_motd
-	sabayon_setup_vt_autologin
-	sabayon_setup_oem_livecd
-
-}

diff --git a/app-misc/sabayonlive-tools/files/2.3/sabutil b/app-misc/sabayonlive-tools/files/2.3/sabutil
deleted file mode 100755
index b118940..0000000
--- a/app-misc/sabayonlive-tools/files/2.3/sabutil
+++ /dev/null
@@ -1,607 +0,0 @@
-#!/bin/bash 
-
-# 3.09.2010 Enlik <sn at ubucentrum.net>
-# Some fixes for sabutil script from app-misc/sabayonlive-tools-2.2-r5.
-# Feel free to remove this notice, any part of it or any line I made.
-
-USER=$(users)
-HOMEDIR=/home/`cat /etc/passwd | grep 1000 | cut -d: -f1`/
-echo "$HOMEDIR"
-
-SYS=/sbin
-echo "$SYS"
- 
- function menu
-{
-     clear
-     selection=""
-     until  [[ "$selection" = "0" ]] ; do
-	 echo ""
-         echo "Current Operating System:" $(cat /etc/sabayon-release)
-         echo "Current Edition:" $(cat /etc/sabayon-edition)
-         echo
-	 echo "$myname"
-         
- 
-	 echo ""
-	 echo "1 - Backup & edit xorg.conf "
-	 echo "2 - Restore original xorg.conf"
-	 echo "3 - Regenerate Sabayon xorg.conf"
-	 echo "4 - Backup & edit grub.cfg"
-	 echo "5 - Restore original grub.cfg"
-	 echo "6 - Package Management."
-         echo "----------------------------------------"
-         echo "View and AutoPaste:"
-         echo " "
-         echo "01 - Pastebin Xorg.0.log"
-         echo "02 - Pastebin .xsession-errors"
-         echo "03 - Pastebin dmesg"
-         echo "04 - Pastebin messages"
-         echo "05 - Pastebin rc.log"
-         echo "06 - Pastebin grub.cfg" 
-         echo "07 - Pastebin fdisk -l"
-         echo "08 - Pastebin kdm.log"
-         echo "09 - Pastebin Hardware Info"
-         echo ""
-	 echo "0 - Exit"
-	 echo ""
-	 echo -n "Enter selection: "
-	 read selection
-	 echo ""
- 
- 
-	 case "$selection" in
-	     1 ) xorg_backup ; press_enter ; nano /etc/X11/xorg.conf; press_enter ;;
-	     2 ) xorg_restore ; press_enter ;;
-	     3 ) xorg_regen ; press_enter ;;
-	     4 ) grub_backup ; press_enter ; nano /boot/grub/grub.cfg; press_enter ;;
-	     5 ) grub_restore ; press_enter ;;
-	     6 ) packages ; press_enter ;;
-             01 ) xorglog ; press_enter ;;
-	     02 ) xsessionerrors ; press_enter ;;
-             03 ) dmesg ; press_enter ;;
-             04 ) messages ; press_enter ;;
-             05 ) rclog ; press_enter ;;
-             06 ) grub ; press_enter ;;
-             07 ) fdisk ; press_enter ;;
-             08 ) kdm ; press_enter ;;
-             09 ) system ; press_enter ;;
-
-
-             0 ) exit ;;
-	     * ) echo "Please be sensible - choose a number that exists in the menu"; press_enter
-	 esac
-     done
- 
- }
- 
- 
- 
- function press_enter
-{ 
-     echo ""
-     echo -n "Press Enter to continue"
-     read
-     clear
- }
- 
- function xorg_regen
-{
-    if [[ ! -f "/etc/X11/xorg.conf.sabayon" ]]; then
-	cat > /etc/X11/xorg.conf.sabayon <<EOF
-Section "Module"
-    SubSection  "extmod"
-       Option    "omit xfree86-dga"
-    EndSubSection
-    Load        "i2c"
-    Load        "ddc"
-    Load        "synaptics"
-    Load        "vbe"
-#   Load        "dri"
-EndSection
-
-
-Section "ServerFlags"
-     Option     "AllowMouseOpenFail" "true"
-EndSection
-
-Section "InputDevice"
-    Identifier          "Synaptics1"
-    Driver              "synaptics"
-    Option              "SendCoreEvents"        "true"
-    Option              "Device"                "/dev/psaux"
-    Option              "Protocol"              "auto-dev"
-    Option              "HorizScrollDelta"      "0"
-    Option              "SHMConfig"             "on"
-    # For ALPS/MacBook TouchPads
-    #Option             "MaxSpeed"              "0.7"
-    #Option             "MinSpeed"              "0.18"
-    #Option             "AccelFactor"           "0.08"
-    #Option             "TopEdge"               "120"
-    #Option             "LeftEdge"              "120"
-    #Option             "BottomEdge"            "830"
-    #Option             "RightEdge"             "650"
-    #Option             "FingerLow"             "25"
-    #Option             "FingerHigh"            "30"
-    # MacBook touchpad
-    #Option             "MaxTapTime"            "180"
-    #Option             "MaxTapMove"            "220"
-    #Option             "MaxDoubleTapTime"      "180"
-    #Option             "VertScrollDelta"       "20"
-    #Option             "HorizScrollDelta"      "50"
-    #Option             "TapButton2"            "3"
-    #Option             "TapButton3"            "2"
-    #Option             "VertTwoFingerScroll"   "1"
-
-    # Do you keep moving the mouse while typing? Try this trick.
-    #synclient TouchpadOff=1 disable your synaptics touchpad
-    #synclient TouchpadOff=0 enable your synaptics touchpad
-EndSection
-
-
-# **********************************************************************
-# Core Pointer's InputDevice section
-# **********************************************************************
-
-Section "InputDevice"
-    Identifier  "Mouse1"
-    Driver      "mouse"
-    Option      "Device"        "/dev/psaux"
-EndSection
-
-# **********************************************************************
-# Monitor section
-# **********************************************************************
-
-# Any number of monitor sections may be present
-
-Section "Monitor"
-    Identifier  "Generic Monitor"
-    VertRefresh 43 - 60
-    HorizSync   28 - 80
-EndSection
-
-# **********************************************************************
-# Graphics device section
-# **********************************************************************
-
-# Any number of graphics device sections may be present
-
-Section "Device"
-    Identifier  "VESA"
-    Driver      "vesa" # do not remove vesa
-    #Option "RenderAccel" "on"
-    #Option "XAANoOffscreenPixmaps"
-    #Option "BusType" "PCI"
-    #Option "ColorTiling" "on"
-    #Option "EnablePageFlip" "on"
-    Option "UseEvents" "True"
-EndSection
-
-
-# **********************************************************************
-# Screen sections.
-# **********************************************************************
-
-Section "Screen"
-
-# The Identifier, Device and Monitor lines must be present
-
-    Identifier  "Screen 1"
-    Device      "VESA"
-    Monitor     "Generic Monitor"
-    #Option "AddARGBGLXVisuals" "true"
-
-# The favoured Depth and/or Bpp may be specified here
-
-    DefaultDepth 24
-
-    SubSection "Display"
-        Depth           8
-        ViewPort        0 0
-        #Modes          "1024x768" "800x600" "640x480"
-    EndSubsection
-
-    SubSection "Display"
-        Depth           16
-        ViewPort        0 0
-        #Modes          "1024x768" "800x600" "640x480"
-    EndSubsection
-
-    SubSection "Display"
-        Depth           24
-        ViewPort        0 0
-        #Modes          "1024x768" "800x600" "640x480"
-    EndSubsection
-
-
-EndSection
-
-
-Section "ServerLayout"
-# The Identifier line must be present
-
-    Identifier  "Main Layout"
-    Screen 0    "Screen 1"
-    InputDevice "Mouse1" "CorePointer"
-    #InputDevice "Synaptics1" "SendCoreEvents"
-
-EndSection
-
-Section "DRI"
-    Mode 0666
-EndSection
-
-Section "Extensions"
-   #Option "Composite" "Enable"
-EndSection
-EOF
-    fi
-	
-	mv -f /etc/X11/xorg.conf /etc/X11/xorg.conf.old
-	/usr/sbin/x-setup-configuration
-
-}
- 
- function xorg_backup
- { 
-     if [[ -f /etc/X11/xorg.conf.BKUP ]]; then 
-	 echo "xorg.conf backup already exists, so the new one wasn't made."
-	 echo "Now off we go to edit the file...."
-     else
-	 cp /etc/X11/xorg.conf /etc/X11/xorg.conf.BKUP
-	 echo "Making backup of xorg.conf as /etc/X11/xorg.conf.BKUP"
-	 echo ""
-	 echo "INTEL graphics users please read the url below before proceding"
-	 echo ""
-	 echo "http://gentoo-wiki.com/HOWTO_Intel_Onboard_Graphics_Notebooks_Native_Resolution"
-	 
-     fi
- 
- }
- 
- 
- function xorg_restore
- { 
-     if [[ -f /etc/X11/xorg.conf.BKUP ]]; then
-	 echo "xorg.conf backup (/etc/X11/xorg.conf.BKUP) exists, whew!"
-	 cp /etc/X11/xorg.conf.BKUP /etc/X11/xorg.conf
-	 echo ""
-	 echo "The original xorg.conf has been restored"
-     else
-         echo "UH OH!! The backup /etc/X11/xorg.conf.BKUP hasn't been made."
-	 echo "Don't panic, you can copy the file from the Live DVD/CD."
-     fi
- 
- }
- 
- 
- 
- function grub_backup
- {
-     if [[ -f /boot/grub/grub.cfg.BKUP ]]; then
-	 echo "grub.cfg backup already exists, so the new one wasn't made."
-	 echo "Now off we go to edit the file...."
-     else
-	 cp /boot/grub/grub.cfg /boot/grub/grub.cfg.BKUP
-	 echo "Making backup of grub.cfg as /boot/grub/grub.cfg.BKUP"
-	 echo ""
-     fi
- 
- }
- 
- 
- function grub_restore
- {
-     if [[ -f /boot/grub/grub.cfg.BKUP ]]
-     then
-	 echo "grub.cfg backup (/boot/grub/grub.cfg.BKUP) exists, whew!"
-	 cp /boot/grub/grub.cfg.BKUP /boot/grub/grub.cfg
-	 echo ""
-	 echo "The original grub.cfg has been restored"
-     else
-	 echo "UH OH!! The backup script /boot/grub/grub.cfg.BKUP hasn't been made."
-	 echo "Don't panic, you can use the Sabayon installer to repair GRUB."
-     fi
- 
- }
-
- function horner
- {
- 
- # Quick system info gatherer written for Sabayon GNU/Linux
- #(http://sabayonlinux.org)
- # Copyright 2008 Richard Edward Horner
- # Last modified 2008-11-26
- # Please send all comments, suggestions, bugs and patches to (rich AT
- #richhorner DOT com)
- 
- # This program is free software: you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
- # the Free Software Foundation, either version 3 of the License, or
- # (at your option) any later version.
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- # GNU General Public License for more details.
- #
- # You should have received a copy of the GNU General Public License
- # along with this program.  If not, see <http://www.gnu.org/licenses/>.
- 
- HOSTNAME=`hostname`
- RELEASE=`cat /etc/sabayon-release`
- CPU=`uname -p`
- KERNEL=`uname -r`
- KERN_ARCH=`uname -m`
- DISK=`df -lT --exclude-type=tmpfs --exclude-type=rootfs | awk 'BEGIN { total = 0; used = 0 } { if (NR > 1) { total += $3; used += $4 } } END { printf "%.1f/%.1fGB", used / 1000000, total / 1000000 }'`
- MEMORY=`cat /proc/meminfo | awk '{ if ($1 == "MemTotal:") { memtot = $2/1000 } else if ($1 == "MemFree:") { memfree = $2/1000 } } END { printf "%d/%dM", memfree, memtot }'`
- DAYS=`cat /proc/uptime | awk '{ printf "%.1f", $1/86400 }'`
- PROCS=`ps aux | awk 'END { print NR - 2 }'`
- RENDERER=`glxinfo | awk -F : '{ if ($1 == "OpenGL renderer string") print $2 }'`
- 
- echo "Sysinfo for '$HOSTNAME': $RELEASE with $KERN_ARCH kernel $KERNEL
- on $CPU, HD: $DISK, MEM: $MEMORY, Renderer: $RENDERER, $PROCS procs,
- up $DAYS days"
-
- } 
-
- # pastebunz seems to have some limit on max pasted lines, so this would be handy...
- function files_pastebin_linelimit
- {
-     # args: limit file(s) to pastebin
-     # example: file_pastebin_linelimit file1 "file name" file3 ...
-     # first arg: 0 means no limit
-     # By Enlik <sn at ubucentrum.net>
-     local TMPFILE=~/newbietmp
-     local LINESLIMIT
-     local LLIMIT_H
-     
-     if [[ $# -le 1 ]]; then
-         echo "Warning: no files to paste (in files_pastebin_linelimit)." >&2
-         return 2
-     fi
-     
-     let LINESLIMIT=$1
-     shift
-     # If there is a limit of lines, we need to make space for file name and blank
-     # lines to be pasted. Otherwise we have as much space as we want.
-     if [[ $LINESLIMIT -eq 0 ]]; then
-         LLIMIT_H="+1"
-     else
-         LLIMIT_H=$(( LINESLIMIT - 3 ))
-     fi
-     
-     >"$TMPFILE" || {
-         echo "Oh no! I can't create temporary file... Aborting." >&2
-         return 3
-     }
-     
-     for file in "$@"; do
-	echo " $file"
-	echo ""
-	if [[ -r $file ]]; then
-	     # This tail guarantees that LAST file name is visible (unless the limit is really small, <= 2 lines)
-	     # (previous one(s) can be wiped by tail due to limit of lines).
-	     # The file name is always visible if there's only one specified
-	     # as argument (unless the limit value is really small, as above).
-	     # All file names are always visible if there's no limit
-	     # of lines, or the limit is big enough.
-	     cat "$file" | tail -n $LLIMIT_H
-	else
-	     echo "THIS FILE COULDN'T BE READ." 
-	fi
-	echo ""
-     done >> "$TMPFILE"
-     if [[ $LINESLIMIT -eq 0 ]]; then
-	cat "$TMPFILE" | pastebunz
-     else
-	cat "$TMPFILE" | tail -n $LINESLIMIT | pastebunz
-     fi
-     echo "** Please see the link above! **"
-     
-     rm "$TMPFILE"
-     return 0
- }
- 
- function files_pastebin
- {
-     files_pastebin_linelimit 0 "$@"
- }
-
- function pastebinner
- {
-     >~/newbietmp || {
-	 echo "Oh no! I can't create temporary file... Aborting."
-	 return 1
-     }
-     horner >> ~/newbietmp
- 
-    echo "
- /usr/sbin/lspci
- " >> ~/newbietmp
-     lspci >> ~/newbietmp
-
-     echo "
- /usr/sbin/lsusb
- " >> ~/newbietmp
-     lsusb >> ~/newbietmp
-
-     echo "
- 
- /bin/lsmod
- " >> ~/newbietmp
-     lsmod >> ~/newbietmp
-     
-     echo "
- uname -r
- " >> ~/newbietmp
-     uname -r >> ~/newbietmp
-    
-     echo "
- eselect kernel list
- " >> ~/newbietmp
-     eselect --no-color kernel list >> ~/newbietmp
-    
-     echo "
- eselect opengl list
- " >> ~/newbietmp
-     eselect --no-color opengl list >> ~/newbietmp
-    
-     echo "
- eselect java-vm list
- " >> ~/newbietmp
-     eselect --no-color java-vm list >> ~/newbietmp
-    
-     echo "
- xorg.conf
- " >> ~/newbietmp
-     
-     
-     cat /etc/X11/xorg.conf >> ~/newbietmp
-     
-     cat ~/newbietmp
-     cat ~/newbietmp | pastebunz
-     echo "*** Please see the link above. ***"
-     rm ~/newbietmp
- }
- 
- function packages
- {
-     clear
-     echo "Warning - this function is not implemented."
-     echo "You may play with the menu though. ;)"
-     pack_sel=
-     until [[ "$pack_sel" = "3" ]]; do
- 
-	 echo "PACKAGE MANAGEMENT SUB-MENU"
-	 echo ""
-	 echo "1 - Portage - Source based packages"
-	 echo "2 - Entropy - Binary based packages"
-	 echo ""
-	 echo "3 - MAIN MENU"
- 
-	 echo ""
-	 echo -n "Enter selection: "
-	 read pack_sel
-	 echo ""
-	 case "$pack_sel" in
-	     1 ) echo "portage"; press_enter ;;
-	     2 ) echo "entropy"; press_enter ;;
-	     3 ) echo "returning to MAIN MENU" ;;
-	     * ) echo "Please be sensible - choose a number that exists in the menu"; press_enter ;;
-	 esac
-     done
- 
- }
-
-function system
- {
-     local PASTE_TMP=/tmp/sabutil-tmp
-     
-     >"$PASTE_TMP" || {
-	     echo "Oh no! I can't create temporary file... Aborting."
-	     return 1
-	 }
-    
-     echo "
-     sh $SYS/logscript.sh
-     " >> "$PASTE_TMP"
-     sh "$SYS/logscript.sh" >> "$PASTE_TMP"
-    
-     cat "$PASTE_TMP"
-     cat "$PASTE_TMP" | pastebunz
-     echo "*** Please see the link above. ***"
-     rm "$PASTE_TMP"
-    
-}
-
-function xorglog
- {
-     cat /var/log/Xorg.0.log
-     files_pastebin_linelimit 150 /var/log/Xorg.0.log
- } 
- 
-function xsessionerrors
- {
-     cat "$HOMEDIR/.xsession-errors" | tail -n 10
-     files_pastebin_linelimit 150 "$HOMEDIR/.xsession-errors"
- }
-
- function dmesg
- {
-     cat /var/log/dmesg
-     files_pastebin_linelimit 150 /var/log/dmesg
- }
- 
- function grub
- {
-     cat /boot/grub/grub.cfg
-     files_pastebin /boot/grub/grub.cfg
- }
- 
-function fdisk
- {
-     local FDISK_TMP=/tmp/sabutil-tmp
-
-     >"$FDISK_TMP" || {
-	     echo "Oh no! I can't create temporary file... Aborting."
-	     return 1
-	 }
-	 
-     (
-     echo "
-     fdisk -l
-     ";
-     fdisk -l;
-     ) > "$FDISK_TMP"
-     
-     cat "$FDISK_TMP"
-     cat "$FDISK_TMP" | pastebunz
-     echo "*** Please see the link above. ***"
-     rm "$FDISK_TMP"
- }
- 
-function messages
- {
-     cat /var/log/messages
-     files_pastebin_linelimit 150 /var/log/messages
- }
- 
-function kdm
- {
-     cat /var/log/kdm.log
-     files_pastebin_linelimit 150 /var/log/kdm.log
- }
-
-function rclog
- {
-     if [[ -f /var/log/rc.log ]]; then
-	 cat /var/log/rc.log | tail -n 10
-	 files_pastebin_linelimit 150 /var/log/rc.log
-     else
-         echo "You Don't Have rc.log enabled in your /etc/rc.log"
-         echo " To enable, edit /etc/rc.log change NO to YES for rc_logger= "
-         echo ""
-     fi
- }
-
- clear
- myname="Pick A Choice From Menu Below"
-
- if [[ $1 = "menu" ]]; then
-     if [[ $EUID -ne 0 ]] && [[ $EUID -ne 1000 ]]; then
-         echo "$myname"
-         echo ""
-         echo "This script should be run as root, or by someone in the root group.  Some commands will not work for you." 1>&2
-     fi
-     menu
- elif [[ $1 = "--help" || $1 = "-h" ]]; then
-    echo "usage:"
-    echo "$0 - will print some basic system infos"
-    echo "$0 menu - will show you menu"
- else
-     horner
- fi
-
-

diff --git a/app-misc/sabayonlive-tools/files/2.3/vga-cmd-parser b/app-misc/sabayonlive-tools/files/2.3/vga-cmd-parser
deleted file mode 100644
index 1e44317..0000000
--- a/app-misc/sabayonlive-tools/files/2.3/vga-cmd-parser
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/python
-# Copyright 2008 Fabio Erculiani, Sabayon Linux Chief Architect
-# parses vga= parameters from cmdline given by isolinux and returns the right resolution
-# Shut up!
-
-res_map = {
-	"0x385": ("640x400",24),
-	"0x312": ("640x480",24),
-	"0x315": ("800x600",24),
-	"0x318": ("1024x768",24),
-	"0x31b": ("1280x1024",24),
-	"0x330": ("640x400",16),
-	"0x33E": ("640x400",24),
-	"0x331": ("640x480",16),
-	"0x33F": ("640x480",24),
-	"0x332": ("800x600",16),
-	"0x340": ("800x600",24),
-	"0x333": ("1024x768",16),
-	"0x341": ("1024x768",24),
-	"0x334": ("1152x864",16),
-	"0x342": ("1152x864",24),
-	"0x335": ("1280x960",16),
-	"0x343": ("1280x960",24),
-	"0x336": ("1280x1024",16),
-	"0x344": ("1280x1024",24),
-	"0x337": ("1400x1050",16),
-	"0x345": ("1400x1050",24),
-	"0x338": ("1600x1200",16),
-	"0x346": ("1600x1200",24),
-	"0x339": ("1792x1344",16),
-	"0x347": ("1792x1344",24),
-	"0x33A": ("1856x1392",16),
-	"0x348": ("1856x1392",24),
-	"0x33B": ("1920x1440",16),
-	"0x349": ("1920x1440",24),
-	"0x33C": ("2048x1536",16),
-	"0x34A": ("2048x1536",24)
-}
-
-f = open("/proc/cmdline")
-cmdline = f.readline().strip().split()
-cmdline.reverse()
-for item in cmdline:
-	if item.startswith("vga="):
-		item_split = item.split("=")
-		if len(item_split) == 2:
-			data = item_split[1]
-			try:
-				if res_map.get(data) != None:
-					print res_map[data][0],res_map[data][1]
-				break
-			except TypeError:
-				pass

diff --git a/app-misc/sabayonlive-tools/files/2.3/x-setup-configuration b/app-misc/sabayonlive-tools/files/2.3/x-setup-configuration
deleted file mode 100644
index 174759d..0000000
--- a/app-misc/sabayonlive-tools/files/2.3/x-setup-configuration
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-# get livecd functions
-source /sbin/livecd-functions.sh
-source /sbin/sabayon-functions.sh
-
-runtime_linking_proprietary_drivers() {
-	if [ -d "/lib/nvidia" ] || [ -d "/lib/fglrx" ]; then
-		current_arch=$(uname -m)
-		if [ "$current_arch" == "x86_64" ]; then
-			ld_arch="elf_x86_64"
-		elif [ "$current_arch" == "i686" ]; then
-			ld_arch="elf_i386"
-		fi
-		lspci_vga=$(lspci | grep ' VGA ')
-		mount -t tmpfs none /lib/modules/$(uname -r)/video
-		if [ -n "`echo $lspci_vga | grep -i nvidia`" ]; then
-			ld -m $ld_arch -r -o /lib/modules/$(uname -r)/video/nvidia.ko /lib/nvidia/nvidia.o /lib/nvidia/nvidia.mod.o
-			depmod -a &> /dev/null
-		elif [ -n "`echo $lspci_vga | grep -i ati`" ]; then
-			ld -m $ld_arch -r -o /lib/modules/$(uname -r)/video/fglrx.ko /lib/fglrx/fglrx.o /lib/fglrx/fglrx.mod.o
-			depmod -a &> /dev/null
-		elif [ -n "`echo $lspci_vga | grep -i unknown`" ]; then
-			ld -m $ld_arch -r -o /lib/modules/$(uname -r)/video/nvidia.ko /lib/nvidia/nvidia.o /lib/nvidia/nvidia.mod.o
-			ld -m $ld_arch -r -o /lib/modules/$(uname -r)/video/fglrx.ko /lib/fglrx/fglrx.o /lib/fglrx/fglrx.mod.o
-			depmod -a &> /dev/null
-		elif [ -z "$lspci_vga" ]; then
-			ld -m $ld_arch -r -o /lib/modules/$(uname -r)/video/nvidia.ko /lib/nvidia/nvidia.o /lib/nvidia/nvidia.mod.o
-			ld -m $ld_arch -r -o /lib/modules/$(uname -r)/video/fglrx.ko /lib/fglrx/fglrx.o /lib/fglrx/fglrx.mod.o
-			depmod -a &> /dev/null
-		fi
-	fi
-}
-
-# create seed
-rm -f /etc/x-setup-configuration-running
-touch /etc/x-setup-configuration-running
-
-# Prepare Video Cards Proprietary Drivers
-if sabayon_is_live; then
-	runtime_linking_proprietary_drivers
-fi
-/sbin/gpu-configuration &> /dev/null
-
-# delete seed
-rm -f /etc/x-setup-configuration-running

diff --git a/app-misc/sabayonlive-tools/files/2.3/x-setup-init.d b/app-misc/sabayonlive-tools/files/2.3/x-setup-init.d
deleted file mode 100755
index 24f12ce..0000000
--- a/app-misc/sabayonlive-tools/files/2.3/x-setup-init.d
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/sbin/runscript
-# Copyright 2009 Fabio Erculiani - Sabayon Linux
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-    after mtab
-    before hostname
-    before xdm
-}
-
-
-start() {
-
-    is_live=$(cat /proc/cmdline | grep "cdroot")
-    do_redetect=$(cat /proc/cmdline | grep "gpudetect")
-    if [ -n "$is_live" ]; then
-        ebegin "Configuring GPU Hardware Acceleration and Input devices"
-        start-stop-daemon --start --background --pidfile /var/run/x-setup.pid --make-pidfile --exec /usr/sbin/x-setup-configuration
-        eend 0
-    else
-        ebegin "Configuring GPU Hardware Acceleration and Input devices for the first time"
-        if [ -e /first_time_run ] || [ ! -e /etc/gpu-detector.conf ] || [ -n "$do_redetect" ]; then
-            # store config file
-            lspci | grep ' VGA ' > /etc/gpu-detector.conf
-            /usr/sbin/x-setup-configuration
-            eend 0
-            return 0
-        fi
-
-        lspci_vga=$(lspci | grep ' VGA ')
-        if [ "$lspci_vga" != "`cat /etc/gpu-detector.conf`" ] || [ ! -f /etc/X11/xorg.conf ]; then
-            /usr/sbin/x-setup-configuration &> /dev/null
-            lspci | grep ' VGA ' > /etc/gpu-detector.conf
-        fi
-        eend 0
-    fi
-
-}

diff --git a/app-misc/sabayonlive-tools/files/2.3/xorg.conf.d/90-synaptics.conf b/app-misc/sabayonlive-tools/files/2.3/xorg.conf.d/90-synaptics.conf
deleted file mode 100644
index 245b245..0000000
--- a/app-misc/sabayonlive-tools/files/2.3/xorg.conf.d/90-synaptics.conf
+++ /dev/null
@@ -1,58 +0,0 @@
-Section "InputClass"
-	Identifier "touchpad catchall"
-	Driver "synaptics"
-	MatchIsTouchpad "on"
-	MatchDevicePath "/dev/input/event*"
-
-	# No longer needed, see bug 1922#12
-	# Option "SHMConfig" "1"
-	# More harm than good? see bug 1922#12
-	# Option "MaxTapMove" "2000"
-	Option "VertEdgeScroll" "1"
-	Option "VertTwoFingerScroll" "1"
-	Option "HorizTwoFingerScroll" "1"
-	Option "CircularScrolling" "0"
-	Option "TapButton1" "1"
-	Option "TapButton2" "2"
-	Option "TapButton3" "3"
-	
-EndSection
-
-# Apple MacBook Touchpad
-Section "InputClass"
-	Identifier "touchpad catchall"
-	Driver "synaptics"
-	MatchIsTouchpad "on"
-	MatchDevicePath "/dev/input/event*"
-	MatchProduct "bcm5974"
-	Option "ClickFinger1" "1"
-	Option "ClickFinger2" "3"
-	Option "ClickFinger3" "2"
-	Option "HorizEdgeScroll" "0"
-	Option "VertEdgeScroll" "0"
-	Option "VertEdgeScroll" "1"
-	Option "VertTwoFingerScroll" "1"
-	Option "HorizTwoFingerScroll" "1"
-	Option "HorizScrollDelta" "0"
-	Option "VertScrollDelta" "40"
-	Option "PressureMotionMinZ" "10"
-	Option "FingerLow" "16"
-	Option "FingerHigh" "80"
-	Option "FingerPress" "256"
-	Option "PalmDetect" "1"
-	Option "PalmMinWidth" "10"
-	Option "PalmMinZ" "200"
-	Option "MinSpeed" "0.8"
-	Option "MaxSpeed" "1.2"
-	Option "AccelFactor" "0.10"
-	Option "MaxTapMove" "25"
-	Option "MaxTapTime" "223"
-	Option "MaxDoubleTapTime" "200"
-	Option "TapButton1" "0"
-	Option "TapButton2" "0"
-	Option "TapButton3" "0"
-	Option "RTCornerButton" "0"
-	Option "RBCornerButton" "0"
-	Option "LTCornerButton" "0"
-	Option "LBCornerButton" "0"
-EndSection

diff --git a/app-misc/sabayonlive-tools/files/2.3/xorg.conf.sabayon b/app-misc/sabayonlive-tools/files/2.3/xorg.conf.sabayon
deleted file mode 100644
index bc6135c..0000000
--- a/app-misc/sabayonlive-tools/files/2.3/xorg.conf.sabayon
+++ /dev/null
@@ -1,100 +0,0 @@
-Section "Module"
-    SubSection  "extmod"
-       Option    "omit xfree86-dga"
-    EndSubSection
-    Load	"i2c"
-    Load	"ddc"
-    Load	"vbe"
-#   Load        "dri"
-EndSection
-
-
-Section "ServerFlags"
-     Option 	"AllowMouseOpenFail" "true"
-EndSection
-
-# **********************************************************************
-# Monitor section
-# **********************************************************************
-
-# Any number of monitor sections may be present
-
-Section "Monitor"
-    Identifier	"Generic Monitor"
-    VertRefresh 43 - 60
-    HorizSync	28 - 80
-EndSection
-
-# **********************************************************************
-# Graphics device section
-# **********************************************************************
-
-# Any number of graphics device sections may be present
-
-Section "Device"
-    Identifier  "VESA"
-    Driver      "vesa" # do not remove vesa
-    #Option "RenderAccel" "on"
-    #Option "XAANoOffscreenPixmaps"
-    #Option "BusType" "PCI"
-    #Option "ColorTiling" "on"
-    #Option "EnablePageFlip" "on"
-    Option "UseEvents" "True"
-EndSection
-
-
-# **********************************************************************
-# Screen sections.
-# **********************************************************************
-
-Section "Screen"
-
-# The Identifier, Device and Monitor lines must be present
-
-    Identifier	"Screen 1"
-    Device	"VESA"
-    Monitor	"Generic Monitor"
-    #Option "AddARGBGLXVisuals" "true"
-
-# The favoured Depth and/or Bpp may be specified here
-
-    DefaultDepth 24
-
-    SubSection "Display"
-        Depth		8
-        ViewPort	0 0
-        #Modes		"1024x768" "800x600" "640x480"
-    EndSubsection
-
-    SubSection "Display"
-        Depth           16
-        ViewPort        0 0
-        #Modes		"1024x768" "800x600" "640x480"
-    EndSubsection
-
-    SubSection "Display"
-        Depth           24
-        ViewPort        0 0
-        #Modes		"1024x768" "800x600" "640x480"
-    EndSubsection
-
-
-EndSection
-
-
-Section "ServerLayout"
-# The Identifier line must be present
-
-    Identifier	"Main Layout"
-    Screen 0 	"Screen 1"
-
-EndSection
-
-Section "DRI"
-    Mode 0666
-EndSection
-
-Section "Extensions"
-   #Option "Composite" "Enable"
-EndSection
-

diff --git a/app-misc/sabayonlive-tools/sabayonlive-tools-2.3-r6.ebuild b/app-misc/sabayonlive-tools/sabayonlive-tools-2.3-r6.ebuild
deleted file mode 100644
index 4633dd8..0000000
--- a/app-misc/sabayonlive-tools/sabayonlive-tools-2.3-r6.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 2004-2011 Sabayon
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils
-
-DESCRIPTION="Sabayon Live tools for autoconfiguration of the system"
-HOMEPAGE="http://www.sabayon.org"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="!app-misc/livecd-tools
-	app-admin/eselect-opengl
-	dev-util/dialog
-	sys-apps/gawk
-	sys-apps/pciutils
-	>=sys-apps/keyboard-configuration-helpers-2.6"
-
-src_unpack() {
-	cd "${WORKDIR}"
-	cp "${FILESDIR}"/${PV}/*-functions.sh . -p
-	cp "${FILESDIR}"/${PV}/net-setup . -p
-	cp "${FILESDIR}"/${PV}/x-setup-init.d . -p
-	cp "${FILESDIR}"/${PV}/installer-gui . -p
-	cp "${FILESDIR}"/${PV}/installer-text . -p
-	cp "${FILESDIR}"/${PV}/x-setup-configuration . -p
-	cp "${FILESDIR}"/${PV}/bashlogin . -p
-	cp "${FILESDIR}"/${PV}/opengl-activator . -p
-	cp "${FILESDIR}"/${PV}/sabayonlive . -p
-	cp "${FILESDIR}"/${PV}/vga-cmd-parser . -p
-	cp "${FILESDIR}"/${PV}/logscript.sh . -p
-	cp "${FILESDIR}"/${PV}/sabutil . -p
-	cp "${FILESDIR}"/${PV}/livespawn . -p
-	cp "${FILESDIR}"/${PV}/sabayon-live-check . -p
-	cp "${FILESDIR}"/${PV}/sabayon-welcome-loader* . -p
-	cp "${FILESDIR}"/${PV}/cdeject . -p
-}
-
-src_install() {
-
-	cd "${WORKDIR}"
-
-	dosbin x-setup-configuration
-	newinitd x-setup-init.d x-setup
-
-	dosbin net-setup
-	into /
-	dosbin *-functions.sh
-	dosbin logscript.sh
-	dobin bashlogin
-	dobin vga-cmd-parser
-	exeinto /usr/bin
-	doexe opengl-activator
-	doexe livespawn
-	doexe sabutil
-	doexe sabayon-live-check
-	doexe sabayon-welcome-loader
-
-	dodir /etc/sabayon
-	insinto /etc/sabayon
-	doins sabayon-welcome-loader.desktop
-
-	#insinto /etc/X11
-	#doins xorg.conf.sabayon
-
-	dodir /usr/share/X11/xorg.conf.d
-	insinto /usr/share/X11/xorg.conf.d
-	doins "${FILESDIR}/${PV}/xorg.conf.d/"*
-
-	newinitd sabayonlive sabayonlive
-	newinitd installer-gui installer-gui
-	newinitd installer-text installer-text
-	newinitd cdeject cdeject
-
-}
-



^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2011-07-21 12:30 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-21 12:30 [gentoo-commits] proj/anaconda-overlay:master commit in: app-misc/sabayonlive-tools/, app-misc/anaconda-runtime/, Wiktor W Brodlo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox