Added an openglify patch to bring it in line with CVS. This should cause it to work properly, even with either modular X or monolithic X.

(Portage version: 2.1.1_pre3-r4)

4 files changed, 99 insertions, 1 deletions

diff --git a/app-misc/livecd-tools/ChangeLog b/app-misc/livecd-tools/ChangeLog
index 3bdb5de40346..d96926fd2041 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.79 2006/07/19 20:59:24 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/livecd-tools/ChangeLog,v 1.80 2006/07/26 20:35:50 wolf31o2 Exp $
+
+*livecd-tools-1.0.33-r1 (26 Jul 2006)
+
+  26 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/livecd-tools-1.0.33-openglify.patch,
+  +livecd-tools-1.0.33-r1.ebuild:
+  Added an openglify patch to bring it in line with CVS. This should cause it
+  to work properly, even with either modular X or monolithic X.
 
 *livecd-tools-1.0.33 (19 Jul 2006)
 
diff --git a/app-misc/livecd-tools/files/digest-livecd-tools-1.0.33-r1 b/app-misc/livecd-tools/files/digest-livecd-tools-1.0.33-r1
new file mode 100644
index 000000000000..4dec57b8875d
--- /dev/null
+++ b/app-misc/livecd-tools/files/digest-livecd-tools-1.0.33-r1
@@ -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-openglify.patch b/app-misc/livecd-tools/files/livecd-tools-1.0.33-openglify.patch
new file mode 100644
index 000000000000..5ced178707a4
--- /dev/null
+++ b/app-misc/livecd-tools/files/livecd-tools-1.0.33-openglify.patch
@@ -0,0 +1,35 @@
+diff -urN livecd-tools-1.0.33.orig/openglify livecd-tools-1.0.33/openglify
+--- livecd-tools-1.0.33.orig/openglify	2006-07-19 16:55:42.000000000 -0400
++++ livecd-tools-1.0.33/openglify	2006-07-20 17:42:38.000000000 -0400
+@@ -9,14 +9,25 @@
+ #move symlinks to a malleable /etc/opengl directory.
+ install -d test/lib/modules/extensions
+ 
+-rm /usr/lib/libGL{,core}.{a,so}* > /dev/null 2>&1
+-rm /usr/lib/modules/extensions/libglx* > /dev/null 2>&1
++rm -f /usr/lib/libGL{,core}.{a,so}* > /dev/null 2>&1
++rm -f /usr/lib/modules/extensions/libglx* > /dev/null 2>&1
++rm -f /usr/lib/xorg/modules/extensions/libglx* > /dev/null 2>&1
+ 
+ ln -sf /etc/opengl/lib/libGL.so /usr/lib/libGL.so
+ ln -sf /etc/opengl/lib/libGL.so.1 /usr/lib/libGL.so.1
+ ln -sf /etc/opengl/lib/libGLcore.so /usr/lib/libGLcore.so
+ ln -sf /etc/opengl/lib/libGLcore.so.1 /usr/lib/libGLcore.so.1
+-ln -sf /etc/opengl/lib/modules/extensions/libglx.so \
+-	/usr/lib/modules/extensions/libglx.so
+-ln -sf /etc/opengl/lib/modules/extensions/libglx.a \
+-	/usr/lib/modules/extensions/libglx.a
++if [ -d /usr/lib/modules/extensions ]
++then
++	ln -sf /etc/opengl/lib/modules/extensions/libglx.so \
++		/usr/lib/modules/extensions/libglx.so
++	ln -sf /etc/opengl/lib/modules/extensions/libglx.a \
++		/usr/lib/modules/extensions/libglx.a
++elif [ -d /usr/lib/xorg/modules/extensions ]
++then
++	ln -sf /etc/opengl/lib/modules/extensions/libglx.so \
++		/usr/lib/xorg/modules/extensions/libglx.so
++	ln -sf /etc/opengl/lib/modules/extensions/libglx.a \
++		/usr/lib/xorg/modules/extensions/libglx.a
++fi
++
diff --git a/app-misc/livecd-tools/livecd-tools-1.0.33-r1.ebuild b/app-misc/livecd-tools/livecd-tools-1.0.33-r1.ebuild
new file mode 100644
index 000000000000..d56b20961a16
--- /dev/null
+++ b/app-misc/livecd-tools/livecd-tools-1.0.33-r1.ebuild
@@ -0,0 +1,52 @@
+# 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-r1.ebuild,v 1.1 2006/07/26 20:35:50 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
+}
+
+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
+}