[gentoo-commits] gentoo-x86 commit in sys-boot/grub: metadata.xml ChangeLog grub-9999.ebuild

[gentoo-commits] gentoo-x86 commit in sys-boot/grub: metadata.xml ChangeLog grub-9999.ebuild

[Mike Frysinger (vapier)]

vapier      11/04/03 18:18:13

  Modified:             metadata.xml ChangeLog grub-9999.ebuild
  Log:
  Add support for USE="device-mapper sdl", drop dead configure options, and only depend on autogen for live scm ebuilds #357337 by Jon Severinsson.
  
  (Portage version: 2.2.0_alpha28/cvs/Linux x86_64)

Revision  Changes    Path
1.8                  sys-boot/grub/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/metadata.xml?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/metadata.xml?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/metadata.xml?r1=1.7&r2=1.8

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/metadata.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- metadata.xml	28 Feb 2009 10:26:35 -0000	1.7
+++ metadata.xml	3 Apr 2011 18:18:12 -0000	1.8
@@ -3,6 +3,7 @@
 <pkgmetadata>
 <herd>base-system</herd>
 <use>
+  <flag name='device-mapper'>Enable support for <pkg>sys-fs/device-mapper</pkg></flag>
   <flag name='multislot'>Allow grub1 and grub2 to be installed simultaneously</flag>
 </use>
 </pkgmetadata>



1.153                sys-boot/grub/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.153&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.153&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.152&r2=1.153

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- ChangeLog	3 Apr 2011 18:10:01 -0000	1.152
+++ ChangeLog	3 Apr 2011 18:18:12 -0000	1.153
@@ -1,6 +1,11 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.152 2011/04/03 18:10:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.153 2011/04/03 18:18:12 vapier Exp $
+
+  03 Apr 2011; Mike Frysinger <vapier@gentoo.org> grub-9999.ebuild,
+  metadata.xml:
+  Add support for USE="device-mapper sdl", drop dead configure options, and
+  only depend on autogen for live scm ebuilds #357337 by Jon Severinsson.
 
   03 Apr 2011; Mike Frysinger <vapier@gentoo.org> grub-9999.ebuild,
   +files/defaults:



1.32                 sys-boot/grub/grub-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.32&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.32&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?r1=1.31&r2=1.32

Index: grub-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- grub-9999.ebuild	3 Apr 2011 18:10:01 -0000	1.31
+++ grub-9999.ebuild	3 Apr 2011 18:18:12 -0000	1.32
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.31 2011/04/03 18:10:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.32 2011/04/03 18:18:12 vapier Exp $
 
 # XXX: need to implement a grub.conf migration in pkg_postinst before we ~arch
 
@@ -15,22 +15,24 @@
 		mirror://gentoo/${P}.tar.gz"
 fi
 
-DESCRIPTION="GNU GRUB 2 boot loader"
+DESCRIPTION="GNU GRUB boot loader"
 HOMEPAGE="http://www.gnu.org/software/grub/"
 
 LICENSE="GPL-3"
 use multislot && SLOT="2" || SLOT="0"
 KEYWORDS=""
-IUSE="custom-cflags debug truetype multislot static"
+IUSE="custom-cflags debug device-mapper multislot static sdl truetype"
 
 RDEPEND=">=sys-libs/ncurses-5.2-r5
 	dev-libs/lzo
+	debug? (
+		sdl? ( media-libs/libsdl )
+	)
+	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
 	truetype? ( media-libs/freetype >=media-fonts/unifont-5 )"
 DEPEND="${RDEPEND}
-	>=sys-devel/autogen-5.10
 	>=dev-lang/python-2.5.2"
-[[ ${PV} == "9999" ]] && DEPEND+=" sys-apps/help2man"
-PROVIDE="virtual/bootloader"
+[[ ${PV} == "9999" ]] && DEPEND+=" >=sys-devel/autogen-5.10 sys-apps/help2man"
 
 export STRIP_MASK="*/grub/*/*.mod"
 QA_EXECSTACK="sbin/grub-probe sbin/grub-setup sbin/grub-mkdevicemap bin/grub-script-check bin/grub-fstest"
@@ -62,11 +64,11 @@
 		--bindir=/bin \
 		--libdir=/$(get_libdir) \
 		--disable-efiemu \
+		$(use_enable device-mapper) \
 		$(use_enable truetype grub-mkfont) \
 		$(use_enable debug mm-debug) \
-		$(use_enable debug grub-emu) \
-		$(use_enable debug grub-emu-usb) \
-		$(use_enable debug grub-fstest)
+		$(use sdl && use_enable debug grub-emu-sdl) \
+		$(use_enable debug grub-emu-usb)
 	emake -j1 || die "making regular stuff"
 }