Rearranged the dependencies since gawk and pciutils are now used outside of just...

Package-Manager: portage-2.1.1_pre1-r1

diff --git a/app-misc/livecd-tools/ChangeLog b/app-misc/livecd-tools/ChangeLog
index 7462e7ae0ac8c827cbe8ff6658d19656bcb4563c..0ca3e406deca64f45d168743598dea7489241305 100644 (file)
--- a/app-misc/livecd-tools/ChangeLog
+++ b/app-misc/livecd-tools/ChangeLog
@@ -1,6 +1,12 @@
 # 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.75 2006/06/09 01:06:42 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/livecd-tools/ChangeLog,v 1.76 2006/06/21 15:49:51 wolf31o2 Exp $
+
+  21 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  -livecd-tools-1.0.29.ebuild, livecd-tools-1.0.30.ebuild:
+  Rearranged the dependencies since gawk and pciutils are now used outside of
+  just video card detection. Also, cleaned up the X USE flag usage, since only
+  autoconfig uses mkxf86config if USE=-opengl. Cleaning up older ebuilds.
 
   09 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   livecd-tools-1.0.30.ebuild:

diff --git a/app-misc/livecd-tools/livecd-tools-1.0.30.ebuild b/app-misc/livecd-tools/livecd-tools-1.0.30.ebuild
index 6cac3d68c71908fd02d221cf01b1474bec498c22..42ff86c402c19daff39b46e1f3b12d9f9d92dae0 100644 (file)
--- a/app-misc/livecd-tools/livecd-tools-1.0.30.ebuild
+++ b/app-misc/livecd-tools/livecd-tools-1.0.30.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/app-misc/livecd-tools/livecd-tools-1.0.30.ebuild,v 1.2 2006/06/09 01:06:42 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/livecd-tools/livecd-tools-1.0.30.ebuild,v 1.3 2006/06/21 15:49:51 wolf31o2 Exp $
 
 DESCRIPTION="Gentoo LiveCD tools for autoconfiguration of hardware"
 HOMEPAGE="http://www.gentoo.org"
@@ -13,27 +13,29 @@ 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? ( sys-apps/pciutils
-                       x11-misc/mkxf86config
-                       sys-apps/gawk ) )
+               X? ( x11-misc/mkxf86config ) )
        amd64? ( opengl? ( ${OPENGL_DEPEND} )
-               X? ( sys-apps/pciutils
-                       >=x11-misc/mkxf86config-0.9.2
-                       sys-apps/gawk ) )"
+               X? ( >=x11-misc/mkxf86config-0.9.2 ) )"
 
 src_install() {
        doinitd autoconfig
        newinitd spind.init spind
        if use x86 || use amd64
        then
-               use X && dosbin x-setup && newinitd x-setup.init x-setup
-               use opengl && dosbin openglify
+               if use opengl
+               then
+                       dosbin x-setup openglify
+                       newinitd x-setup.init x-setup
+               fi
        fi
        dosbin net-setup spind
        into /