[gentoo-commits] gentoo-x86 commit in sys-boot/gnu-efi: ChangeLog gnu-efi-3.0i.ebuild

[Mike Frysinger (vapier)]

vapier      10/08/28 22:43:29

  Modified:             ChangeLog gnu-efi-3.0i.ebuild
  Log:
  Clean up and document the ebuild a bit.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.18                 sys-boot/gnu-efi/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/gnu-efi/ChangeLog,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ChangeLog	24 Jul 2010 15:40:51 -0000	1.17
+++ ChangeLog	28 Aug 2010 22:43:29 -0000	1.18
@@ -1,6 +1,9 @@
 # ChangeLog for sys-boot/gnu-efi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/gnu-efi/ChangeLog,v 1.17 2010/07/24 15:40:51 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/gnu-efi/ChangeLog,v 1.18 2010/08/28 22:43:29 vapier Exp $
+
+  28 Aug 2010; Mike Frysinger <vapier@g.o> gnu-efi-3.0i.ebuild:
+  Clean up and document the ebuild a bit.
 
   24 Jul 2010; Raúl Porcel <armin76@g.o> -gnu-efi-3.0e.ebuild,
   gnu-efi-3.0i.ebuild:



1.3                  sys-boot/gnu-efi/gnu-efi-3.0i.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/gnu-efi/gnu-efi-3.0i.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/gnu-efi/gnu-efi-3.0i.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/gnu-efi/gnu-efi-3.0i.ebuild?r1=1.2&r2=1.3

Index: gnu-efi-3.0i.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/gnu-efi/gnu-efi-3.0i.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnu-efi-3.0i.ebuild	24 Jul 2010 15:40:51 -0000	1.2
+++ gnu-efi-3.0i.ebuild	28 Aug 2010 22:43:29 -0000	1.3
@@ -1,15 +1,14 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/gnu-efi/gnu-efi-3.0i.ebuild,v 1.2 2010/07/24 15:40:51 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/gnu-efi/gnu-efi-3.0i.ebuild,v 1.3 2010/08/28 22:43:29 vapier Exp $
 
-inherit eutils toolchain-funcs
+inherit eutils
 
 MY_P="${PN}_${PV}"
-
 DESCRIPTION="Library for build EFI Applications"
 HOMEPAGE="http://developer.intel.com/technology/efi"
-SRC_URI="mirror://sourceforge/gnu-efi/${MY_P}.orig.tar.gz"
-SRC_URI="${SRC_URI} mirror://debian/pool/main/g/gnu-efi/gnu-efi_3.0i-2.diff.gz"
+SRC_URI="mirror://sourceforge/gnu-efi/${MY_P}.orig.tar.gz
+	mirror://debian/pool/main/g/gnu-efi/gnu-efi_3.0i-2.diff.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -21,12 +20,7 @@
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
-	ebegin Applying ../*.diff
-	# Using epatch on this is annoying because it wants to create the elilo-3.6/
-	# directory.  Since all the files are new, it doesn't know better.
-	filterdiff -p1 -i debian/\* ../*.diff | patch -s -p1
-	eend $? || return
+	EPATCH_OPTS="-p1" epatch "${WORKDIR}"/*.diff
 }
 
 src_compile() {
@@ -35,12 +29,14 @@
 		ia64)  iarch=ia64 ;;
 		x86)   iarch=ia32 ;;
 		amd64) iarch=x86_64 ;;
-		*)    die "unknown architecture: $ARCH" ;;
+		*)     die "unknown architecture: $ARCH" ;;
 	esac
-	emake CC="$(tc-getCC)" ARCH=${iarch} -j1 || die "emake failed"
+	# The lib subdir uses unsafe archive targets, and
+	# the apps subdir needs gnuefi subdir
+	emake prefix=${CHOST}- ARCH=${iarch} -j1 || die
 }
 
 src_install() {
-	make install INSTALLROOT="${D}"/usr || die "install failed"
+	emake install INSTALLROOT="${D}"/usr || die
 	dodoc README* ChangeLog
 }