Version bump. This version includes a patch to prefer eselect opengl over opengl-update.

(Portage version: 2.1.1_pre4-r1)

4 files changed, 84 insertions, 1 deletions

diff --git a/app-misc/livecd-tools/ChangeLog b/app-misc/livecd-tools/ChangeLog
index d96926fd2041..77818984b821 100644
--- a/app-misc/livecd-tools/ChangeLog
+++ b/app-misc/livecd-tools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-misc/livecd-tools
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/livecd-tools/ChangeLog,v 1.80 2006/07/26 20:35:50 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/livecd-tools/ChangeLog,v 1.81 2006/08/01 19:40:32 wolf31o2 Exp $
+
+*livecd-tools-1.0.33-r2 (01 Aug 2006)
+
+  01 Aug 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/livecd-tools-1.0.33-eselect.patch, -livecd-tools-1.0.33.ebuild,
+  -livecd-tools-1.0.33-r1.ebuild, +livecd-tools-1.0.33-r2.ebuild:
+  Version bump. This version includes a patch to prefer eselect opengl over
+  opengl-update.
 
 *livecd-tools-1.0.33-r1 (26 Jul 2006)
 
diff --git a/app-misc/livecd-tools/files/digest-livecd-tools-1.0.33-r2 b/app-misc/livecd-tools/files/digest-livecd-tools-1.0.33-r2
new file mode 100644
index 000000000000..4dec57b8875d
--- /dev/null
+++ b/app-misc/livecd-tools/files/digest-livecd-tools-1.0.33-r2
@@ -0,0 +1,3 @@
+MD5 6f91dbc3d4d2b3410a507b75574f5b7f livecd-tools-1.0.33.tar.bz2 9833
+RMD160 16a1d0b5fa15003099cd6a7f3354686beb1f84ea livecd-tools-1.0.33.tar.bz2 9833
+SHA256 0359d5c2c03dbd05ce6107f27c9ab8b4100f2342a8f41e4edb016efb484ce890 livecd-tools-1.0.33.tar.bz2 9833
diff --git a/app-misc/livecd-tools/files/livecd-tools-1.0.33-eselect.patch b/app-misc/livecd-tools/files/livecd-tools-1.0.33-eselect.patch
new file mode 100644
index 000000000000..caa04e2de825
--- /dev/null
+++ b/app-misc/livecd-tools/files/livecd-tools-1.0.33-eselect.patch
@@ -0,0 +1,19 @@
+diff -urN livecd-tools-1.0.33.orig/x-setup livecd-tools-1.0.33/x-setup
+--- livecd-tools-1.0.33.orig/x-setup	2006-07-19 16:55:42.000000000 -0400
++++ livecd-tools-1.0.33/x-setup	2006-08-01 15:33:10.000000000 -0400
+@@ -38,12 +38,12 @@
+ if [ -x /usr/sbin/opengl-update-livecd ]
+ then
+ 	/usr/sbin/opengl-update-livecd $GLTYPE
+-elif [ -x /usr/sbin/opengl-update ]
+-then
+-	/usr/sbin/opengl-update --dst-prefix=/etc/opengl $GLTYPE
+ elif [ -x /usr/bin/eselect -a -e /usr/share/eselect/modules/opengl.eselect ]
+ then
+ 	/usr/bin/eselect opengl set $GLTYPE --dst-prefix=/etc/opengl
++elif [ -x /usr/sbin/opengl-update ]
++then
++	/usr/sbin/opengl-update --dst-prefix=/etc/opengl $GLTYPE
+ else
+ 	echo "ERROR: no opengl-update script can be located"
+ 	exit 1
diff --git a/app-misc/livecd-tools/livecd-tools-1.0.33-r2.ebuild b/app-misc/livecd-tools/livecd-tools-1.0.33-r2.ebuild
new file mode 100644
index 000000000000..fe319b5eb5fd
--- /dev/null
+++ b/app-misc/livecd-tools/livecd-tools-1.0.33-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/livecd-tools/livecd-tools-1.0.33-r2.ebuild,v 1.1 2006/08/01 19:40:32 wolf31o2 Exp $
+
+inherit eutils
+
+DESCRIPTION="Gentoo LiveCD tools for autoconfiguration of hardware"
+HOMEPAGE="http://www.gentoo.org"
+SRC_URI="http://dev.gentoo.org/~wolf31o2/sources/${PN}/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+#KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
+IUSE="opengl X"
+
+OPENGL_DEPEND="virtual/opengl
+	x11-misc/mkxf86config
+	|| (
+		app-admin/eselect-opengl
+		>=x11-base/opengl-update-2.2.1 )"
+
+RDEPEND="dev-util/dialog
+	sys-apps/pciutils
+	sys-apps/gawk
+	x86? ( opengl? ( ${OPENGL_DEPEND} )
+		X? ( x11-misc/mkxf86config ) )
+	amd64? ( opengl? ( ${OPENGL_DEPEND} )
+		X? ( >=x11-misc/mkxf86config-0.9.2 ) )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-openglify.patch
+	epatch "${FILESDIR}"/${P}-eselect.patch
+}
+
+src_install() {
+	doinitd autoconfig
+	newinitd spind.init spind
+	if use x86 || use amd64
+	then
+		if use opengl
+		then
+			dosbin x-setup openglify
+			newinitd x-setup.init x-setup
+		fi
+	fi
+	dosbin net-setup spind
+	into /
+	dobin bashlogin
+	dosbin livecd-functions.sh
+}