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.

Package-Manager: portage-2.1.1_pre3-r4

5 files changed, 117 insertions, 8 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/Manifest b/app-misc/livecd-tools/Manifest
index 11b147a09f70..24e6092328d3 100644
--- a/app-misc/livecd-tools/Manifest
+++ b/app-misc/livecd-tools/Manifest
@@ -1,20 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX livecd-tools-1.0.33-openglify.patch 1536 RMD160 01e0e2b9445994791bb1ab19b3e35e6be5bde8a5 SHA1 89c0bf0f2bf45bcf4a53c201572b40187d9cc697 SHA256 a2a06f99bb3fdd0f642d259ebcbdb61d3b0afd0ab408cff1b71fc3a61abdd080
+MD5 a78751d8b4f5392c021399bc2890d090 files/livecd-tools-1.0.33-openglify.patch 1536
+RMD160 01e0e2b9445994791bb1ab19b3e35e6be5bde8a5 files/livecd-tools-1.0.33-openglify.patch 1536
+SHA256 a2a06f99bb3fdd0f642d259ebcbdb61d3b0afd0ab408cff1b71fc3a61abdd080 files/livecd-tools-1.0.33-openglify.patch 1536
 DIST livecd-tools-1.0.30.tar.bz2 9748 RMD160 b0f46ae44ce0aef4e2854eaf7ec866dccd097ff2 SHA1 412f863ca4601808c7aee2e5fe2dbe58850aea99 SHA256 e91d872ae63bfb21240db79d1b5c90206d78202ed4e5af6898c35a29c48f808d
 DIST livecd-tools-1.0.33.tar.bz2 9833 RMD160 16a1d0b5fa15003099cd6a7f3354686beb1f84ea SHA1 d9423efe477316311ec129c34a5278e419797210 SHA256 0359d5c2c03dbd05ce6107f27c9ab8b4100f2342a8f41e4edb016efb484ce890
 EBUILD livecd-tools-1.0.30.ebuild 1172 RMD160 e6bba0f1af085070f7b0317b24d30ca7d7a79604 SHA1 9d78cfcaef05539d07ab6e9d36423f93a8f45818 SHA256 464fa322cc96ec63bed3533f1389f552d325650b5a1d3567a5e1cc54ee74c9f5
 MD5 b333bd11ed7f6fbcaec9073581037f9c livecd-tools-1.0.30.ebuild 1172
 RMD160 e6bba0f1af085070f7b0317b24d30ca7d7a79604 livecd-tools-1.0.30.ebuild 1172
 SHA256 464fa322cc96ec63bed3533f1389f552d325650b5a1d3567a5e1cc54ee74c9f5 livecd-tools-1.0.30.ebuild 1172
+EBUILD livecd-tools-1.0.33-r1.ebuild 1276 RMD160 3ab743e06ce820d5048e01313dd6ef3d928ab21a SHA1 8fa30b078874bb92bc32f28e661df9a1d26744aa SHA256 bee4904cd46ae8223bc4e3829ba3710ab67cc5f432c1c2d7b019b453bf2a6511
+MD5 632e59046e83b51d8b0446c99c7dd062 livecd-tools-1.0.33-r1.ebuild 1276
+RMD160 3ab743e06ce820d5048e01313dd6ef3d928ab21a livecd-tools-1.0.33-r1.ebuild 1276
+SHA256 bee4904cd46ae8223bc4e3829ba3710ab67cc5f432c1c2d7b019b453bf2a6511 livecd-tools-1.0.33-r1.ebuild 1276
 EBUILD livecd-tools-1.0.33.ebuild 1172 RMD160 ec8bfb68d1000091d6cc3c6c7cd4595ef24203ed SHA1 9c41aa5b98343e356b0183862b343d4e5427ae3b SHA256 ec85b2e5335be0262261310a30e2b79694ebdf9056a4c2af0acc10ecb30b572e
 MD5 39ef9e61eebdf86df4366969cc75b3f9 livecd-tools-1.0.33.ebuild 1172
 RMD160 ec8bfb68d1000091d6cc3c6c7cd4595ef24203ed livecd-tools-1.0.33.ebuild 1172
 SHA256 ec85b2e5335be0262261310a30e2b79694ebdf9056a4c2af0acc10ecb30b572e livecd-tools-1.0.33.ebuild 1172
-MISC ChangeLog 15051 RMD160 93ba0b8f0734f8f42cea05ce4d609b22879fe6d9 SHA1 ff00bfd3185f906f18a8df3059a09cac3ef20d62 SHA256 435b99e28c328980139f10ef7a9a56053f71d11c9e56048fdabed9b30c31cde4
-MD5 462ab771e09cf550c4758f18dea991bd ChangeLog 15051
-RMD160 93ba0b8f0734f8f42cea05ce4d609b22879fe6d9 ChangeLog 15051
-SHA256 435b99e28c328980139f10ef7a9a56053f71d11c9e56048fdabed9b30c31cde4 ChangeLog 15051
+MISC ChangeLog 15367 RMD160 32485724f40cb8f0d7efae3acc161f929ae381fb SHA1 128c1d36f9c92f6b559e5fbeb8e431d035ae1279 SHA256 5329006b7d3f5f3c77595c9e6aa101fc34639d07b33c9e217be7f593c5b36d83
+MD5 4212336bb1f01cf1b4bf4fad351174d8 ChangeLog 15367
+RMD160 32485724f40cb8f0d7efae3acc161f929ae381fb ChangeLog 15367
+SHA256 5329006b7d3f5f3c77595c9e6aa101fc34639d07b33c9e217be7f593c5b36d83 ChangeLog 15367
 MISC metadata.xml 159 RMD160 8db5ed254a6b9baf8f53368da9e71c5532a46073 SHA1 1e72098aafb1fa729eba6fc8357c7e732eb79dee SHA256 b6e17484225400d76c65d178bf5a10dc0a8da7f345993c2acc63d1093a77c90d
 MD5 d86e5b5e47260e5a965eae2afe6d6d40 metadata.xml 159
 RMD160 8db5ed254a6b9baf8f53368da9e71c5532a46073 metadata.xml 159
@@ -25,10 +33,13 @@ SHA256 90510729151cb9b2a211c2e6659944c4a2bbd405a74c32a97f9a598598db9897 files/di
 MD5 b05f4b0d4335409de14eb1ef4e538315 files/digest-livecd-tools-1.0.33 256
 RMD160 9ed44efa9695cc21add431942714536251939d65 files/digest-livecd-tools-1.0.33 256
 SHA256 cf421c472ec34f1162f8ffe70e4f962387de7c8e007ae3383bced11dd3d3db18 files/digest-livecd-tools-1.0.33 256
+MD5 b05f4b0d4335409de14eb1ef4e538315 files/digest-livecd-tools-1.0.33-r1 256
+RMD160 9ed44efa9695cc21add431942714536251939d65 files/digest-livecd-tools-1.0.33-r1 256
+SHA256 cf421c472ec34f1162f8ffe70e4f962387de7c8e007ae3383bced11dd3d3db18 files/digest-livecd-tools-1.0.33-r1 256
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEvp1SkT4lNIS36YERAj3CAJ9xZar68J6QOi1DkoV5NDxSum0k2wCglREP
-96J6r7Qs8JA4gHelwJPeDoA=
-=ZEcH
+iD8DBQFEx9I0kT4lNIS36YERAv0hAKCcVNkdmfjEcAXQaaUIIDBfQGguCQCfcbQ7
+6tySoy9DnjpGmRsjM4Suin0=
+=SMLP
 -----END PGP SIGNATURE-----
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
+}