Clean up and document the ebuild a bit.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 26 insertions, 17 deletions

diff --git a/sys-boot/gnu-efi/ChangeLog b/sys-boot/gnu-efi/ChangeLog
index 57c410636cf8..5c8210367065 100644
--- a/sys-boot/gnu-efi/ChangeLog
+++ b/sys-boot/gnu-efi/ChangeLog
@@ -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@gentoo.org> gnu-efi-3.0i.ebuild:
+  Clean up and document the ebuild a bit.
 
   24 Jul 2010; Raúl Porcel <armin76@gentoo.org> -gnu-efi-3.0e.ebuild,
   gnu-efi-3.0i.ebuild:
diff --git a/sys-boot/gnu-efi/Manifest b/sys-boot/gnu-efi/Manifest
index 6ba294294f8b..6ed9e784f6bb 100644
--- a/sys-boot/gnu-efi/Manifest
+++ b/sys-boot/gnu-efi/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX gnu-efi-3.0a-lds-redhat.patch 881 RMD160 86746f8664fcd068466112502fc89a9f228dcfd1 SHA1 1ee0363dc26736de1a301bfb4c94561cbb651515 SHA256 1e7d9bd7717d9315a96f237e4e4a3ea3b6ffb7e61c3e4de1fca74e8e11b58a9b
 AUX gnu-efi-3.0a-lds.patch 995 RMD160 037cf3e08911a01e13846e5adb9c3e56354bc544 SHA1 01f2256709aad74fba97911f5b278cd4d7b37c87 SHA256 d5e07eb3d5172e62be1f8e766709e93c7bff1b7f5aee47cd4fac888036bc886d
 DIST gnu-efi-3.0a.tar.gz 119079 RMD160 83c80920a160ffd95801d9495573621a9a10df33 SHA1 62d8b77f3feb69f19946ba1a2cd2e0ea014905b4 SHA256 661b94996c184216dfd678b8a1ab82bd6afb82c55320841ba9c74db7aebb828a
@@ -6,6 +9,13 @@ DIST gnu-efi_3.0i-2.diff.gz 4838 RMD160 b6113d71f3ec616e55840ce89848fcc335074e8a
 DIST gnu-efi_3.0i.orig.tar.gz 135068 RMD160 c73924116b56e8d4394bdb17cf08a267b6c33f97 SHA1 a4f9bd00e777452648e0d57b32080e63f54f2ee1 SHA256 13bea8e387984e04d93e14004a2e24539802fb2bd42cac112c8a816395d95366
 EBUILD gnu-efi-3.0a-r1.ebuild 910 RMD160 8761f497060049baa5338199194b2685c1c772aa SHA1 e91bf107a7bf35e2a77c85e4384d5bd82e3393be SHA256 63de65c337180c22148ba900ab84887e24830d57981e1497d50c1163b5ed0fcc
 EBUILD gnu-efi-3.0g.ebuild 887 RMD160 6a40ece1c4c61f162e8e54b6a123eeb253f0f57a SHA1 06e8c362478b8357c15d2bd34a20018eec3c1b25 SHA256 0a42051d1ec1d5149423ef7b444484f35bd7c9705363e52c57332424a2ba4ed3
-EBUILD gnu-efi-3.0i.ebuild 1230 RMD160 ca80ff95e4d5d5dc2ea4379ae784aa4aecdb9b64 SHA1 af70e21aa7d02cd89a097ca96ce75f4dc7a6137b SHA256 9e73850481d6980aa956929b515f165f10aac8f15ba7b56e112e1693df7fe3f7
-MISC ChangeLog 2117 RMD160 7c6e2f8a3222178b162f880f2e438cc4ef0f62f5 SHA1 e5d57e1b240e1eb6a24a86418c430062d74e3cf4 SHA256 8e259617a8bb4bf16337de4f67ebfae4b36151b6d2512c1c343cfd2af647e96e
+EBUILD gnu-efi-3.0i.ebuild 1051 RMD160 021e7c59b15e452282151aa11251f7ba0e2f8631 SHA1 5a9cd73023da1222570d942cc08247c51b29c965 SHA256 8a5be77766c87ed07cb7962864a4351e0e00a73678b9f85db5722f78b729928b
+MISC ChangeLog 2230 RMD160 20838ea20ef5bbbf4141f5c042ef0e18da7f8db4 SHA1 d390cd67ad96a6d3da4cd39c848f9eb565923c91 SHA256 7457edbdabbaf1a8c7ba8bc373a2bdd13f4b2815597990f95341d981eed574e9
 MISC metadata.xml 157 RMD160 d78bc90d4c0fdb88250c9822e913c6f0159b2e8b SHA1 337a3ca895783b15c7f1fdf721f88b41a4b2e94e SHA256 7e261fbe78f2088ab2a27fe3bd23a4224dde9a11031edcb4b7bb95dd3ba1fe4a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iF4EAREIAAYFAkx5kQIACgkQTwhj9JtAlp6L8wEAp1S06c0bw8vzYkkEfABerOxW
+qIj3O3PnUPJDEOdN2d4A/iD1LcvTO5pq4MM7CbkofFjCezH3sN3jFyBW/PssPtQV
+=H8T5
+-----END PGP SIGNATURE-----
diff --git a/sys-boot/gnu-efi/gnu-efi-3.0i.ebuild b/sys-boot/gnu-efi/gnu-efi-3.0i.ebuild
index 9ca8dcbec5bc..a32f39b7f637 100644
--- a/sys-boot/gnu-efi/gnu-efi-3.0i.ebuild
+++ b/sys-boot/gnu-efi/gnu-efi-3.0i.ebuild
@@ -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 @@ DEPEND="sys-apps/pciutils"
 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 @@ src_compile() {
 		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
 }