Adding updated installer versions from 2006.1 snapshot.

Package-Manager: portage-2.1.1_pre5-r1

11 files changed, 347 insertions, 72 deletions

diff --git a/sys-apps/gli/ChangeLog b/sys-apps/gli/ChangeLog
index 583e3970a227..5511ccc8679f 100644
--- a/sys-apps/gli/ChangeLog
+++ b/sys-apps/gli/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/gli
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gli/ChangeLog,v 1.6 2006/06/08 20:55:45 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gli/ChangeLog,v 1.7 2006/08/21 21:38:58 wolf31o2 Exp $
+
+*gli-0.4.2 (21 Aug 2006)
+*gli-0.4.1 (21 Aug 2006)
+*gli-0.4 (21 Aug 2006)
+
+  21 Aug 2006; Chris Gianelloni <wolf31o2@gentoo.org> files/installer,
+  gli-0.3.2.ebuild, +gli-0.4.ebuild, +gli-0.4.1.ebuild, +gli-0.4.2.ebuild:
+  Adding updated installer versions from 2006.1 snapshot.
 
 *gli-0.3.2 (08 Jun 2006)
 
diff --git a/sys-apps/gli/Manifest b/sys-apps/gli/Manifest
index 6c2519605e39..a7d293bac850 100644
--- a/sys-apps/gli/Manifest
+++ b/sys-apps/gli/Manifest
@@ -9,10 +9,10 @@ AUX gli.png 3267 RMD160 616f635c9a9635aed746a19c93cfface68dbade0 SHA1 b641637dd7
 MD5 0a56b52ef225619f925a691fc5dcc867 files/gli.png 3267
 RMD160 616f635c9a9635aed746a19c93cfface68dbade0 files/gli.png 3267
 SHA256 6a822e2ca9a086be313df5de377ff256aa934b8bbcdc6815c5bfa23ab9886f0d files/gli.png 3267
-AUX installer 3013 RMD160 d5c13148f0b2e1c4a82aefbbcf15d360a3ef416b SHA1 88caa590b1ffcd0c0b392d146349fa706a2e24d7 SHA256 c7bd3cd2db971f0d123390997bd5413be9516f322bcf2398910eb77ac177a1da
-MD5 41de6d6bf6ddfb3932b45320c9dc38dd files/installer 3013
-RMD160 d5c13148f0b2e1c4a82aefbbcf15d360a3ef416b files/installer 3013
-SHA256 c7bd3cd2db971f0d123390997bd5413be9516f322bcf2398910eb77ac177a1da files/installer 3013
+AUX installer 3436 RMD160 c3eb817fd7aa25c2b0b0279a046e73ecd8134246 SHA1 492da7753c5d4eee32c2ce1292bb08a7d8d154a0 SHA256 1e4e15f10af0e72c016eda07d9e891a16d1a15b0990bdc206957f0ccafaa9ce8
+MD5 498c1e670c67166f3106ee30ba88eef7 files/installer 3436
+RMD160 c3eb817fd7aa25c2b0b0279a046e73ecd8134246 files/installer 3436
+SHA256 1e4e15f10af0e72c016eda07d9e891a16d1a15b0990bdc206957f0ccafaa9ce8 files/installer 3436
 AUX installer-dialog 121 RMD160 5494098275520314af6593125cb1813c500c6b39 SHA1 da111ea9682129eefb93b14664c04929de2f38bc SHA256 126c160c2352d7b12da09a3afebbddf244cdfb3d7e48e8730797ece1886ca637
 MD5 f533352d962fe012f5afc114e23fc3b0 files/installer-dialog 121
 RMD160 5494098275520314af6593125cb1813c500c6b39 files/installer-dialog 121
@@ -34,24 +34,39 @@ MD5 eb2c0dade30f4f1b1f85e9ea0d8d8aa6 files/installer-gtk.desktop 268
 RMD160 4f9a88c0eb01358810b0eff10bba7388a5bb40e2 files/installer-gtk.desktop 268
 SHA256 b5a81d9f95b0017635be280ac1e4f342576d66b454e0ae2273fa7309a319d762 files/installer-gtk.desktop 268
 DIST installer-0.3.1.tar.bz2 792577 RMD160 110c9b1373ad024e1d18306c88de9432655d0835 SHA256 dbc853aa136447b0d3d66b1251a17beec23ea95f1b1aabb506c92768d01aa384
-DIST installer-0.3.2.tar.bz2 792702
+DIST installer-0.3.2.tar.bz2 792702 RMD160 16f8bf621eaa1910682bcea9d4af5ba65375e4be SHA256 a5f8e765999d230a133af848181fb4c90376c038e77cabd70a0e28a02dceff7f
 DIST installer-0.3.tar.bz2 790095 RMD160 bc290dd394c850b1d4658712dd3cf4341353ab80 SHA256 9c07bb79b4ebaf290a704cd21a605cae203eed875f672f36ef3ed103f8b05e7e
+DIST installer-0.4.1.tar.bz2 826093 RMD160 0bf15d21b02361c018cb1138fab0104b109434db SHA1 b67dbdfed28f6d6661f57495bad41fba7aa2d230 SHA256 23376c6d2f924024596e00a5f58f682e30a69e961e2651b992fab49ae240af69
+DIST installer-0.4.2.tar.bz2 826554 RMD160 9ebe95b52a58d2c2d3d50bba2c0fde06539c20b1 SHA1 8bfb2ef1603c4fe24ee922ee0f92e2a1a1b523da SHA256 13f3fc84f0d6ac1a4ff76e1f80addea3cea00a5557a4de07225745b671799763
+DIST installer-0.4.tar.bz2 826177 RMD160 e89499483003bcffebedf426a4504cc92687165a SHA1 eeaffcf9985baa10f255310c38f641b422c18aa6 SHA256 dbc96ee27dfdd53f7ab95a6d3b01a904358f829df5b6e18b73e8a3e684936bef
 EBUILD gli-0.3.1.ebuild 1839 RMD160 62f6a360d2b5e719a485b4278b128d970af2106b SHA1 8336cff98db8f68dbfbb20063208cd553befeff9 SHA256 7108ff288bf6e11f4548114de2e18857e7b661e1409ba8ca632a3ed37912f28d
 MD5 cc41263a103ec596508053c4bdecd35c gli-0.3.1.ebuild 1839
 RMD160 62f6a360d2b5e719a485b4278b128d970af2106b gli-0.3.1.ebuild 1839
 SHA256 7108ff288bf6e11f4548114de2e18857e7b661e1409ba8ca632a3ed37912f28d gli-0.3.1.ebuild 1839
-EBUILD gli-0.3.2.ebuild 1918 RMD160 a6c77bda018c0db5e8c248ee80e2add1e9e9bbc6 SHA1 cb5a41e8ff6525a830e0208b247bb43b745c7bef SHA256 8656219e76921badec31430819f5c1fd67580555beecb017d8c9ea82d053cae2
-MD5 3cb12cbbcd82040e3c32b0fe21919953 gli-0.3.2.ebuild 1918
-RMD160 a6c77bda018c0db5e8c248ee80e2add1e9e9bbc6 gli-0.3.2.ebuild 1918
-SHA256 8656219e76921badec31430819f5c1fd67580555beecb017d8c9ea82d053cae2 gli-0.3.2.ebuild 1918
+EBUILD gli-0.3.2.ebuild 1917 RMD160 4ed987e20cd955060ecf14b70ed146248a67bee6 SHA1 0ee8d7bca397e85ed88b52dd8fab6cc10bec71f1 SHA256 86c0c92b4939c805bc781e5179fa2aeb5cbd2df152f6dfd1dc5221e9cdf86780
+MD5 39cc2f93986b55bb75d074b4e4cb5f02 gli-0.3.2.ebuild 1917
+RMD160 4ed987e20cd955060ecf14b70ed146248a67bee6 gli-0.3.2.ebuild 1917
+SHA256 86c0c92b4939c805bc781e5179fa2aeb5cbd2df152f6dfd1dc5221e9cdf86780 gli-0.3.2.ebuild 1917
 EBUILD gli-0.3.ebuild 1448 RMD160 01e5850bf33ebba3c9d8481901eed7097f07d55b SHA1 fbd8547350ace578dacc52240b41e42cf3e29fd8 SHA256 9e401139bf90357059a43a71acb1cf53821d276f7f4e4614899e230b136d88be
 MD5 2b877681f0fd93d79ec10cd402189913 gli-0.3.ebuild 1448
 RMD160 01e5850bf33ebba3c9d8481901eed7097f07d55b gli-0.3.ebuild 1448
 SHA256 9e401139bf90357059a43a71acb1cf53821d276f7f4e4614899e230b136d88be gli-0.3.ebuild 1448
-MISC ChangeLog 1653 RMD160 05d12229c520bbe3bd97fc84a0f41d0e924156c4 SHA1 aefb8dff860cc6ca97d6c96082b2c54d16aec83c SHA256 96bfc8a1f10a667c0c5ad96c079841e0bfe438caea74fd0db9460085fca5ba55
-MD5 9370f8821a653cbe071cc1b39984d2e1 ChangeLog 1653
-RMD160 05d12229c520bbe3bd97fc84a0f41d0e924156c4 ChangeLog 1653
-SHA256 96bfc8a1f10a667c0c5ad96c079841e0bfe438caea74fd0db9460085fca5ba55 ChangeLog 1653
+EBUILD gli-0.4.1.ebuild 2003 RMD160 39acb07ae7c737750ad037adf9afb0175ffb830e SHA1 f030ba9cef97c29aed469022d8816464c925c0ce SHA256 21880c495bfff150a03bf569e74a113b83a240d1ae902f9ff4ec28b84bf94d6b
+MD5 0b1c1f653294fe7949c8244011673315 gli-0.4.1.ebuild 2003
+RMD160 39acb07ae7c737750ad037adf9afb0175ffb830e gli-0.4.1.ebuild 2003
+SHA256 21880c495bfff150a03bf569e74a113b83a240d1ae902f9ff4ec28b84bf94d6b gli-0.4.1.ebuild 2003
+EBUILD gli-0.4.2.ebuild 2003 RMD160 dda3846e91d47d8a9680cac9e16b5345253c4ffe SHA1 9410de442f27898e2a34d368f6061a59dc5348a2 SHA256 d266a56d32951a97b2f708041f77156a017d62a9445bf043fe33e018651b4218
+MD5 45fa176491678e2fa3e60d1e79ea44d7 gli-0.4.2.ebuild 2003
+RMD160 dda3846e91d47d8a9680cac9e16b5345253c4ffe gli-0.4.2.ebuild 2003
+SHA256 d266a56d32951a97b2f708041f77156a017d62a9445bf043fe33e018651b4218 gli-0.4.2.ebuild 2003
+EBUILD gli-0.4.ebuild 2001 RMD160 2ac2b1f0cae9a0c7c5bbf792394d7d6e3492a9d0 SHA1 7573f0d401542cbf006a528b27a2d1b01f80487d SHA256 cc1953721e3f61da0eddabffae01d77e4ffd9bd5524c4eb784161acd6971ca1b
+MD5 a7c4882822afeae3df01705f5c81a430 gli-0.4.ebuild 2001
+RMD160 2ac2b1f0cae9a0c7c5bbf792394d7d6e3492a9d0 gli-0.4.ebuild 2001
+SHA256 cc1953721e3f61da0eddabffae01d77e4ffd9bd5524c4eb784161acd6971ca1b gli-0.4.ebuild 2001
+MISC ChangeLog 1932 RMD160 d418f05bd501768e26aa3dd3aabe19239d547545 SHA1 36cc843b9c4273ec5f56bf267f02a326be43d394 SHA256 5cd4b576e79b52f8187e9c8fd155b984415b32bc1de254026756584615914ed4
+MD5 875d3884938b537ef50d23c3e6fbe250 ChangeLog 1932
+RMD160 d418f05bd501768e26aa3dd3aabe19239d547545 ChangeLog 1932
+SHA256 5cd4b576e79b52f8187e9c8fd155b984415b32bc1de254026756584615914ed4 ChangeLog 1932
 MISC metadata.xml 159 RMD160 8db5ed254a6b9baf8f53368da9e71c5532a46073 SHA1 1e72098aafb1fa729eba6fc8357c7e732eb79dee SHA256 b6e17484225400d76c65d178bf5a10dc0a8da7f345993c2acc63d1093a77c90d
 MD5 d86e5b5e47260e5a965eae2afe6d6d40 metadata.xml 159
 RMD160 8db5ed254a6b9baf8f53368da9e71c5532a46073 metadata.xml 159
@@ -62,13 +77,22 @@ SHA256 81980a412167b0b303049a91843ac089ba6a2594202dec4c8ae5bc00fb913424 files/di
 MD5 9443e4d62aca41832bd3252046884f8c files/digest-gli-0.3.1 250
 RMD160 f5139aed4939729b3df36df7d1bad57a76acbddc files/digest-gli-0.3.1 250
 SHA256 91acb870cbaa7dd6b86a12d30520b9983dfad51b7e6caf991a30502561d445e1 files/digest-gli-0.3.1 250
-MD5 e39183bcc18047cb3ff9ea263d269a5e files/digest-gli-0.3.2 68
-RMD160 bf5edb715a52ad59a4a7c9ba1f784a4473c65eb7 files/digest-gli-0.3.2 68
-SHA256 b194976314b7d8069a51f79343571b38bd7b56ffc903fada52da693efdb574a2 files/digest-gli-0.3.2 68
+MD5 139416e927edb35b5d220c5e11d59f5a files/digest-gli-0.3.2 250
+RMD160 2e55a0826a2bcc2994787840d0f61395dfc5a526 files/digest-gli-0.3.2 250
+SHA256 5b3743d9dcd2d48dfab13ae2b1044716d96bceafdb3f2524ace0f0013eb56642 files/digest-gli-0.3.2 250
+MD5 6b5e1e4f8b026e885980622a1ec8f4eb files/digest-gli-0.4 244
+RMD160 1df70957bb5fe54851bae215044061b14cc3f23c files/digest-gli-0.4 244
+SHA256 4b10c216c4edfecd2ed113d77fbadf11e7412161e89371a417f314d329d31b05 files/digest-gli-0.4 244
+MD5 26ad9f005301f8495e31881e296e963f files/digest-gli-0.4.1 250
+RMD160 1289ca25a5b9deca16306d23097e99cae6d9ac25 files/digest-gli-0.4.1 250
+SHA256 23b51e8c6626c43a56eaae00e786b8401cc894b1bc62f4a43dc33a2ce5d8a4e4 files/digest-gli-0.4.1 250
+MD5 3367071858d1908ea4fc6f7a47fefe08 files/digest-gli-0.4.2 250
+RMD160 e415438419e7354ebf2a74b06ebbd37ebf984c59 files/digest-gli-0.4.2 250
+SHA256 7c53a3a9a52e85a7af7fa20f58d9eb581065d2828e8106c9c5c8c1e4ef278d70 files/digest-gli-0.4.2 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFEiJRUkT4lNIS36YERAh6xAJ0eVDFyiMPdqStKhS29Enn1RBY6WQCfb3R8
-TAwkUuzJNQvEvT1kPXMFZec=
-=eHQU
+iD8DBQFE6igJkT4lNIS36YERArcGAJ4oM2G+t6p48WtIcGAUuZToSaNCpwCfdNhm
+sOR+RJsWgn6Gmw4k/VXndtQ=
+=7C63
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/gli/files/digest-gli-0.3.2 b/sys-apps/gli/files/digest-gli-0.3.2
index d581df6b8fe5..3f4c4b5dd6e1 100644
--- a/sys-apps/gli/files/digest-gli-0.3.2
+++ b/sys-apps/gli/files/digest-gli-0.3.2
@@ -1 +1,3 @@
 MD5 d5ed79473708138cf7d453966c020ecb installer-0.3.2.tar.bz2 792702
+RMD160 16f8bf621eaa1910682bcea9d4af5ba65375e4be installer-0.3.2.tar.bz2 792702
+SHA256 a5f8e765999d230a133af848181fb4c90376c038e77cabd70a0e28a02dceff7f installer-0.3.2.tar.bz2 792702
diff --git a/sys-apps/gli/files/digest-gli-0.4 b/sys-apps/gli/files/digest-gli-0.4
new file mode 100644
index 000000000000..957f11c00864
--- /dev/null
+++ b/sys-apps/gli/files/digest-gli-0.4
@@ -0,0 +1,3 @@
+MD5 a3794d79f0edc787f3d4fc399e5daf06 installer-0.4.tar.bz2 826177
+RMD160 e89499483003bcffebedf426a4504cc92687165a installer-0.4.tar.bz2 826177
+SHA256 dbc96ee27dfdd53f7ab95a6d3b01a904358f829df5b6e18b73e8a3e684936bef installer-0.4.tar.bz2 826177
diff --git a/sys-apps/gli/files/digest-gli-0.4.1 b/sys-apps/gli/files/digest-gli-0.4.1
new file mode 100644
index 000000000000..2a7ece5be548
--- /dev/null
+++ b/sys-apps/gli/files/digest-gli-0.4.1
@@ -0,0 +1,3 @@
+MD5 e97e83886a975fa42dd3c6dcb7860b50 installer-0.4.1.tar.bz2 826093
+RMD160 0bf15d21b02361c018cb1138fab0104b109434db installer-0.4.1.tar.bz2 826093
+SHA256 23376c6d2f924024596e00a5f58f682e30a69e961e2651b992fab49ae240af69 installer-0.4.1.tar.bz2 826093
diff --git a/sys-apps/gli/files/digest-gli-0.4.2 b/sys-apps/gli/files/digest-gli-0.4.2
new file mode 100644
index 000000000000..89bebfa0c0a1
--- /dev/null
+++ b/sys-apps/gli/files/digest-gli-0.4.2
@@ -0,0 +1,3 @@
+MD5 ba0132c21f27ae3de048645937bf5855 installer-0.4.2.tar.bz2 826554
+RMD160 9ebe95b52a58d2c2d3d50bba2c0fde06539c20b1 installer-0.4.2.tar.bz2 826554
+SHA256 13f3fc84f0d6ac1a4ff76e1f80addea3cea00a5557a4de07225745b671799763 installer-0.4.2.tar.bz2 826554
diff --git a/sys-apps/gli/files/installer b/sys-apps/gli/files/installer
index cc2ac1fce53c..be4f438fade8 100755
--- a/sys-apps/gli/files/installer
+++ b/sys-apps/gli/files/installer
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gli/files/installer,v 1.1 2005/12/19 22:13:07 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gli/files/installer,v 1.2 2006/08/21 21:38:58 wolf31o2 Exp $
 #
 # This is the installer script that we will use to determine whether or not
 # we are running in X or as root.  A good portion of this script was ripped
@@ -10,83 +10,102 @@
 installer_root=/opt/installer
 
 # Allow X
-xhost + 2>/dev/null
+xhost +localhost 2>/dev/null
 
-# patching utf-8 locales
-if test ! ${UTF8FIX} ; then
-LANG=`echo ${LANG} | sed 's/[\@\.].*$//'`
-fi
-
-# Go to the proper setup directory (if not already there)
-#cd `dirname $0`
-cd $installer_root/bin
+# Go to the proper setup directory
+cd ${installer_root}/bin
 
-# call installer with -auth when ran through su/xsu/sudo
+# we call installer with -auth when ran through su/xsu/sudo
 auth=0
-if [ "$1" = "-auth" ]; then
+if [ "${1}" == "-auth" ]
+then
 	auth=1
 	shift
 fi
 
+# TODO: make this actually work
+# we see if we were called with a specific front-end
+#launch=
+#if [ "${1}" == "gtk" ]
+#then
+#	launch=gtk
+#	shift
+#elif [ "${1}" == "dialog" ]
+#then
+#	launch=dialog
+#	shift
+#fi
+
 # Find the installation program
 # try_run INSTALLER_NAME [PARAMETERS_PASSED]
 #   INSTALLER_NAME: installer-gtk or installer-dialog
 #   PARAMETERS_PASSED: additional arguments passed to the setup script
 try_run() {
-	setup=$1
+	setup=${1}
 	shift
 
 	failed=0
-	"$setup" "$@" 2>/dev/null
-	failed="$?"
-	return "$failed"
+	"${setup}" "${@}" 2>/dev/null
+	failed="${?}"
+	return "${failed}"
 }
 
-if [ "$auth" -eq 0 ]; then
-	GOT_ROOT=`id -u`
-	if [ "$GOT_ROOT" != "0" ]; then
+if [ "${auth}" -eq 0 ]
+then
+	GOT_ROOT=$(id -u)
+	if [ "${GOT_ROOT}" != "0" ]
+	then
 		# first we try sudo
-		try_run /usr/bin/sudo env DISPLAY=":0.0" su -c "$installer_root/bin/installer -auth"
-		status="$?"
-		if [ "$status" -eq 0 ]; then
+		try_run /usr/bin/sudo env DISPLAY=":0.0" su -c "${installer_root}/bin/installer -auth ${launch}"
+		status="${?}"
+		if [ "${status}" -eq 0 ]
+		then
 			exit 0
-		elif [ "$status" -eq 1 ]; then
-			try_run /usr/bin/gnomesu -u root -c "sh $installer_root/bin/installer -auth"
+		elif [ "${status}" -eq 1 ]
+		then
+			try_run /usr/bin/gnomesu -u root -c "sh ${installer_root}/bin/installer -auth ${launch}"
 			status="$?"
-			# If try_run successfully executed gnomesu, it will return gnomesu's
-			# exit code.
-			if [ "$status" -eq 0 ]; then
+			# If try_run successfully executed gnomesu, it will return
+			# gnomesu's exit code.
+			if [ "${status}" -eq 0 ]
+			then
 				exit 0
-			elif [ "$status" -eq 1 ]; then
-				try_run /usr/bin/xsu -e -a -u root -c "sh $installer_root/bin/installer -auth"
-				status="$?"
+			elif [ "${status}" -eq 1 ]
+			then
+				try_run /usr/bin/xsu -e -a -u root -c "sh ${installer_root}/bin/installer -auth ${launch}"
+				status="${?}"
 				# xsu returns 2 if ran and cancelled (i.e. the user 'doesn't
 				# want' to auth).  it will return 0 if the command was executed
 				# correctly
 				# summing up, if we get 1, something failed
-				if [ "$status" -eq 0 ]; then
+				if [ "${status}" -eq 0 ]
+				then
 					exit 0
-				elif [ "$status" -eq 1 ]; then
+				elif [ "${status}" -eq 1 ]
+				then
 					# xsu wasn't found, or failed to run
 					# if xsu actually ran and the auth was cancelled,
 					# $status is 2
 					echo "You need to run this installation as the super user."
 					echo "Please enter the root password."
-					try_run /bin/su root -c "export DISPLAY=$DISPLAY;sh $installer_root/bin/installer -auth"
-					status="$?"
-					if [ "$status" -eq 0 ]; then
+					try_run /bin/su root -c "export DISPLAY=${DISPLAY};sh ${installer_root}/bin/installer -auth ${launch}"
+					status="${?}"
+					if [ "${status}" -eq 0 ]
+					then
 						# the auth command was properly executed
 						exit 0
 					else
 						exit 1
 					fi
-				elif [ "$status" -eq 3 ]; then
+				elif [ "${status}" -eq 3 ]
+				then
 					# the auth failed or was canceled
 					# we don't want to even start the setup if not root
 					echo "Please run this installation as the super user"
 					exit 1
 				fi
-			elif [ "$status" -eq 3 ]; then
+			elif [ "${status}" -eq 3 ]
+			then
 				echo "Please run this installation as the super user"
 				exit 1
 			fi
@@ -94,15 +113,27 @@ if [ "$auth" -eq 0 ]; then
 	fi
 fi
 
-# Try to run the installer
-try_run /usr/bin/installer-gtk $args $*
-status=$?
-if [ $status -eq 1 ]; then
-	try_run /usr/bin/installer-dialog $args $* || {
-		if [ $status -ne 2 ]; then
-			echo "The setup program seems to have failed"
-		fi
-		status=1
-	}
-fi		
-exit $status
+#if [ -z "${launch}" ]
+#then
+	# Try to run the gtk installer
+	try_run /usr/bin/installer-gtk ${*}
+	status=${?}
+	if [ ${status} -eq 1 ]
+	then
+		try_run /usr/bin/installer-dialog ${*} || {
+			if [ ${status} -ne 2 ]
+			then
+				echo "The setup program seems to have failed"
+			fi
+			status=1
+		}
+	fi
+#else
+	# Try to run the installer script asked for when launched
+#	try_run /usr/bin/installer-${launch} ${*} || {
+#		echo "The setup program seems to have failed"
+#		status=1
+#	}
+#fi
+
+exit ${status}
diff --git a/sys-apps/gli/gli-0.3.2.ebuild b/sys-apps/gli/gli-0.3.2.ebuild
index d0c3fe5d326b..aec114c585bc 100644
--- a/sys-apps/gli/gli-0.3.2.ebuild
+++ b/sys-apps/gli/gli-0.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gli/gli-0.3.2.ebuild,v 1.1 2006/06/08 20:55:45 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gli/gli-0.3.2.ebuild,v 1.2 2006/08/21 21:38:58 wolf31o2 Exp $
 
 inherit python eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://dev.gentoo.org/~agaffney/${PN}/releases/installer-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc ~x86"
 IUSE="gtk"
 
 RDEPEND=">=dev-python/pyparted-1.6.6
diff --git a/sys-apps/gli/gli-0.4.1.ebuild b/sys-apps/gli/gli-0.4.1.ebuild
new file mode 100644
index 000000000000..ea0f1fec590c
--- /dev/null
+++ b/sys-apps/gli/gli-0.4.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gli/gli-0.4.1.ebuild,v 1.1 2006/08/21 21:38:58 wolf31o2 Exp $
+
+inherit python eutils
+
+DESCRIPTION="Gentoo Linux Installer"
+HOMEPAGE="http://www.gentoo.org/proj/en/releng/installer/"
+#SRC_URI="http://dev.gentoo.org/~agaffney/gli/snapshots/installer-${PV}.tar.bz2"
+SRC_URI="http://dev.gentoo.org/~agaffney/${PN}/releases/installer-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE="gtk"
+
+RDEPEND=">=dev-python/pyparted-1.6.6
+	gtk? ( >=dev-python/pygtk-2.4.0 )
+	=dev-python/pythondialog-2.7*
+	sys-fs/e2fsprogs
+	sys-fs/ntfsprogs
+	sys-fs/reiserfsprogs
+	sys-fs/dosfstools
+	ppc? (
+		sys-fs/hfsutils
+		sys-fs/hfsplusutils )
+	x86? (
+		sys-fs/hfsutils
+		sys-fs/hfsplusutils )"
+
+S=${WORKDIR}/installer
+
+dir=/opt/installer
+Ddir=${D}/${dir}
+
+src_install() {
+	dodir ${dir}
+	exeinto ${dir}/bin
+	use !gtk && rm -rf ${S}/src/fe/gtk
+	# We need to make sure we get our scripts
+	doexe ${S}/bin/installer ${S}/bin/installer-dialog || \
+		die "copying installer scripts"
+	cp -a ${S}/src/* ${Ddir}
+	chown -R root:0 ${Ddir}
+	dodir /usr/bin
+	if use gtk; then
+		doexe ${S}/bin/installer-gtk || die "copying gtk script"
+		make_wrapper installer-gtk ./installer-gtk ${dir}/bin
+	fi
+	make_wrapper installer-dialog ./installer-dialog ${dir}/bin
+	make_wrapper installer ./installer ${dir}/bin
+	doicon ${FILESDIR}/gli.png ${FILESDIR}/gli-dialog.png
+	domenu ${FILESDIR}/installer-gtk.desktop \
+		${FILESDIR}/installer-dialog.desktop \
+		${FILESDIR}/installer-faq.desktop
+}
+
+pkg_postinst() {
+	python_mod_optimize ${dir}
+	einfo "The Gentoo Linux Installer is currently only usable for two situations."
+	einfo "The first is for building an install profile."
+	einfo "The second is for installing using official Gentoo release media."
+	echo
+	ewarn "If you are trying to use the installer for anything else, please"
+	ewarn "file patches with any bugs."
+	echo
+}
diff --git a/sys-apps/gli/gli-0.4.2.ebuild b/sys-apps/gli/gli-0.4.2.ebuild
new file mode 100644
index 000000000000..5671c6afa32e
--- /dev/null
+++ b/sys-apps/gli/gli-0.4.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gli/gli-0.4.2.ebuild,v 1.1 2006/08/21 21:38:58 wolf31o2 Exp $
+
+inherit python eutils
+
+DESCRIPTION="Gentoo Linux Installer"
+HOMEPAGE="http://www.gentoo.org/proj/en/releng/installer/"
+#SRC_URI="http://dev.gentoo.org/~agaffney/gli/snapshots/installer-${PV}.tar.bz2"
+SRC_URI="http://dev.gentoo.org/~agaffney/${PN}/releases/installer-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE="gtk"
+
+RDEPEND=">=dev-python/pyparted-1.6.6
+	gtk? ( >=dev-python/pygtk-2.4.0 )
+	=dev-python/pythondialog-2.7*
+	sys-fs/e2fsprogs
+	sys-fs/ntfsprogs
+	sys-fs/reiserfsprogs
+	sys-fs/dosfstools
+	ppc? (
+		sys-fs/hfsutils
+		sys-fs/hfsplusutils )
+	x86? (
+		sys-fs/hfsutils
+		sys-fs/hfsplusutils )"
+
+S=${WORKDIR}/installer
+
+dir=/opt/installer
+Ddir=${D}/${dir}
+
+src_install() {
+	dodir ${dir}
+	exeinto ${dir}/bin
+	use !gtk && rm -rf ${S}/src/fe/gtk
+	# We need to make sure we get our scripts
+	doexe ${S}/bin/installer ${S}/bin/installer-dialog || \
+		die "copying installer scripts"
+	cp -a ${S}/src/* ${Ddir}
+	chown -R root:0 ${Ddir}
+	dodir /usr/bin
+	if use gtk; then
+		doexe ${S}/bin/installer-gtk || die "copying gtk script"
+		make_wrapper installer-gtk ./installer-gtk ${dir}/bin
+	fi
+	make_wrapper installer-dialog ./installer-dialog ${dir}/bin
+	make_wrapper installer ./installer ${dir}/bin
+	doicon ${FILESDIR}/gli.png ${FILESDIR}/gli-dialog.png
+	domenu ${FILESDIR}/installer-gtk.desktop \
+		${FILESDIR}/installer-dialog.desktop \
+		${FILESDIR}/installer-faq.desktop
+}
+
+pkg_postinst() {
+	python_mod_optimize ${dir}
+	einfo "The Gentoo Linux Installer is currently only usable for two situations."
+	einfo "The first is for building an install profile."
+	einfo "The second is for installing using official Gentoo release media."
+	echo
+	ewarn "If you are trying to use the installer for anything else, please"
+	ewarn "file patches with any bugs."
+	echo
+}
diff --git a/sys-apps/gli/gli-0.4.ebuild b/sys-apps/gli/gli-0.4.ebuild
new file mode 100644
index 000000000000..2a93b95195e0
--- /dev/null
+++ b/sys-apps/gli/gli-0.4.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gli/gli-0.4.ebuild,v 1.1 2006/08/21 21:38:58 wolf31o2 Exp $
+
+inherit python eutils
+
+DESCRIPTION="Gentoo Linux Installer"
+HOMEPAGE="http://www.gentoo.org/proj/en/releng/installer/"
+#SRC_URI="http://dev.gentoo.org/~agaffney/gli/snapshots/installer-${PV}.tar.bz2"
+SRC_URI="http://dev.gentoo.org/~agaffney/${PN}/releases/installer-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE="gtk"
+
+RDEPEND=">=dev-python/pyparted-1.6.6
+	gtk? ( >=dev-python/pygtk-2.4.0 )
+	=dev-python/pythondialog-2.7*
+	sys-fs/e2fsprogs
+	sys-fs/ntfsprogs
+	sys-fs/reiserfsprogs
+	sys-fs/dosfstools
+	ppc? (
+		sys-fs/hfsutils
+		sys-fs/hfsplusutils )
+	x86? (
+		sys-fs/hfsutils
+		sys-fs/hfsplusutils )"
+
+S=${WORKDIR}/installer
+
+dir=/opt/installer
+Ddir=${D}/${dir}
+
+src_install() {
+	dodir ${dir}
+	exeinto ${dir}/bin
+	use !gtk && rm -rf ${S}/src/fe/gtk
+	# We need to make sure we get our scripts
+	doexe ${S}/bin/installer ${S}/bin/installer-dialog || \
+		die "copying installer scripts"
+	cp -a ${S}/src/* ${Ddir}
+	chown -R root:0 ${Ddir}
+	dodir /usr/bin
+	if use gtk; then
+		doexe ${S}/bin/installer-gtk || die "copying gtk script"
+		make_wrapper installer-gtk ./installer-gtk ${dir}/bin
+	fi
+	make_wrapper installer-dialog ./installer-dialog ${dir}/bin
+	make_wrapper installer ./installer ${dir}/bin
+	doicon ${FILESDIR}/gli.png ${FILESDIR}/gli-dialog.png
+	domenu ${FILESDIR}/installer-gtk.desktop \
+		${FILESDIR}/installer-dialog.desktop \
+		${FILESDIR}/installer-faq.desktop
+}
+
+pkg_postinst() {
+	python_mod_optimize ${dir}
+	einfo "The Gentoo Linux Installer is currently only usable for two situations."
+	einfo "The first is for building an install profile."
+	einfo "The second is for installing using official Gentoo release media."
+	echo
+	ewarn "If you are trying to use the installer for anything else, please"
+	ewarn "file patches with any bugs."
+	echo
+}