Added 0.3 and 0.3.1 ebuilds and removed 0.2 since it is no longer used.

(Portage version: 2.1_pre4-r1)

9 files changed, 105 insertions, 10 deletions

diff --git a/sys-apps/gli/ChangeLog b/sys-apps/gli/ChangeLog
index 8cfffcf10999..2908788e127d 100644
--- a/sys-apps/gli/ChangeLog
+++ b/sys-apps/gli/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-apps/gli
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gli/ChangeLog,v 1.2 2005/12/25 16:50:11 flameeyes Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gli/ChangeLog,v 1.3 2006/03/13 16:27:35 wolf31o2 Exp $
+
+*gli-0.3.1 (13 Mar 2006)
+*gli-0.3 (13 Mar 2006)
+
+  13 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/installer-dialog.desktop, +files/installer-faq.desktop,
+  +files/installer-gtk.desktop, -gli-0.2.ebuild, +gli-0.3.ebuild,
+  +gli-0.3.1.ebuild:
+  Added 0.3 and 0.3.1 ebuilds and removed 0.2 since it is no longer used.
 
   25 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> gli-0.2.ebuild:
   Use root:0, not root:root.
diff --git a/sys-apps/gli/files/digest-gli-0.2 b/sys-apps/gli/files/digest-gli-0.2
deleted file mode 100644
index 74c243733d6e..000000000000
--- a/sys-apps/gli/files/digest-gli-0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f1c8321896df2bca6a9bc41d889c74c4 installer-0.2.tar.bz2 476765
diff --git a/sys-apps/gli/files/digest-gli-0.3 b/sys-apps/gli/files/digest-gli-0.3
new file mode 100644
index 000000000000..2e8c84d3ec74
--- /dev/null
+++ b/sys-apps/gli/files/digest-gli-0.3
@@ -0,0 +1 @@
+MD5 44040a7779cd29fcd98ea74fbbbf7969 installer-0.3.tar.bz2 790095
diff --git a/sys-apps/gli/files/digest-gli-0.3.1 b/sys-apps/gli/files/digest-gli-0.3.1
new file mode 100644
index 000000000000..733e9442fa7c
--- /dev/null
+++ b/sys-apps/gli/files/digest-gli-0.3.1
@@ -0,0 +1,3 @@
+MD5 4d420be09bac0ad1b23afd8f0e01a903 installer-0.3.1.tar.bz2 792577
+RMD160 110c9b1373ad024e1d18306c88de9432655d0835 installer-0.3.1.tar.bz2 792577
+SHA256 dbc853aa136447b0d3d66b1251a17beec23ea95f1b1aabb506c92768d01aa384 installer-0.3.1.tar.bz2 792577
diff --git a/sys-apps/gli/files/installer-dialog.desktop b/sys-apps/gli/files/installer-dialog.desktop
new file mode 100644
index 000000000000..f35f1d8be586
--- /dev/null
+++ b/sys-apps/gli/files/installer-dialog.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Exec=installer-dialog
+TryExec=
+X-GNOME-DocPath=
+Terminal=true
+Name=Gentoo Linux Installer (Command Line)
+GenericName=Gentoo Linux Installer (Command Line)
+Comment=This link starts the command line version of the Gentoo Linux Installer in a terminal.
+Icon=gli-dialog.png
diff --git a/sys-apps/gli/files/installer-faq.desktop b/sys-apps/gli/files/installer-faq.desktop
new file mode 100644
index 000000000000..df2e7dc341ea
--- /dev/null
+++ b/sys-apps/gli/files/installer-faq.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Link
+URL=http://www.gentoo.org/proj/en/releng/installer/faq.xml
+TryExec=
+X-GNOME-DocPath=
+Terminal=false
+Name=Gentoo Linux Installer FAQ
+GenericName=Gentoo Linux Installer FAQ
+Comment=This is a link to the Gentoo Linux Installer Frequently Asked Questions.  Please click here before filing any bugs or asking questions on IRC or the mailing list.
+Icon=gedit-icon.png
diff --git a/sys-apps/gli/files/installer-gtk.desktop b/sys-apps/gli/files/installer-gtk.desktop
new file mode 100644
index 000000000000..4eb432310201
--- /dev/null
+++ b/sys-apps/gli/files/installer-gtk.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Exec=installer-gtk
+TryExec=
+X-GNOME-DocPath=
+Name=Gentoo Linux Installer (GTK+)
+GenericName=Gentoo Linux Installer (GTK+)
+Comment=This link starts the GTK+ version of the Gentoo Linux Installer.
+Icon=gli.png
diff --git a/sys-apps/gli/gli-0.2.ebuild b/sys-apps/gli/gli-0.3.1.ebuild
index 2474877f5c28..5c4649c80674 100644
--- a/sys-apps/gli/gli-0.2.ebuild
+++ b/sys-apps/gli/gli-0.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.2.ebuild,v 1.2 2005/12/25 16:50:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gli/gli-0.3.1.ebuild,v 1.1 2006/03/13 16:27:35 wolf31o2 Exp $
 
 inherit eutils
 
@@ -18,6 +18,7 @@ RDEPEND=">=dev-python/pyparted-1.6.6
 	gtk? ( >=dev-python/pygtk-2.4.0 )
 	=dev-python/pythondialog-2.7*
 	sys-fs/e2fsprogs
+	sys-fs/hfsutils
 	sys-fs/ntfsprogs
 	sys-fs/reiserfsprogs
 	sys-fs/dosfstools"
@@ -35,7 +36,6 @@ src_install() {
 	doexe ${FILESDIR}/installer-dialog ${FILESDIR}/installer \
 		|| die "copying dialog/installer scripts"
 	chown -R root:0 ${Ddir}
-	dodir /usr/sbin
 	dodir /usr/bin
 	if use gtk; then
 		doexe ${FILESDIR}/installer-gtk || die "copying gtk script"
@@ -43,8 +43,7 @@ src_install() {
 	fi
 	make_wrapper installer-dialog ./installer-dialog ${dir}/bin
 	make_wrapper installer ./installer ${dir}/bin
-	doicon ${FILESDIR}/gli.png
-	doicon ${FILESDIR}/gli-dialog.png
-	make_desktop_entry installer "Gentoo Linux Installer" gli.png
-		"Gentoo Linux Installer (Command Line)" gli-dialog.png
+	doicon ${FILESDIR}/gli.png ${FILESDIR}/gli-dialog.png
+	domenu ${FILESDIR}/installer-gtk.desktop \
+		${FILESDIR}/installer-dialog.desktop
 }
diff --git a/sys-apps/gli/gli-0.3.ebuild b/sys-apps/gli/gli-0.3.ebuild
new file mode 100644
index 000000000000..d01cc7bdb0d7
--- /dev/null
+++ b/sys-apps/gli/gli-0.3.ebuild
@@ -0,0 +1,49 @@
+# 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.ebuild,v 1.1 2006/03/13 16:27:35 wolf31o2 Exp $
+
+inherit 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="~amd64 ~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/hfsutils
+	sys-fs/ntfsprogs
+	sys-fs/reiserfsprogs
+	sys-fs/dosfstools"
+
+S=${WORKDIR}/installer/src
+
+dir=/opt/installer
+Ddir=${D}/${dir}
+
+src_install() {
+	dodir ${dir}
+	exeinto ${dir}/bin
+	use !gtk && rm -rf ${S}/fe/gtk
+	cp -a ${S}/* ${Ddir}
+	doexe ${FILESDIR}/installer-dialog ${FILESDIR}/installer \
+		|| die "copying dialog/installer scripts"
+	chown -R root:0 ${Ddir}
+	dodir /usr/bin
+	if use gtk; then
+		doexe ${FILESDIR}/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
+}