Do not run make in images/ since that tries to run lilo.

Package-Manager: portage-2.2.0_alpha30/cvs/Linux i686

4 files changed, 23 insertions, 15 deletions

diff --git a/sys-boot/lilo/ChangeLog b/sys-boot/lilo/ChangeLog
index 7288e1492647..9771bb7b8f77 100644
--- a/sys-boot/lilo/ChangeLog
+++ b/sys-boot/lilo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-boot/lilo
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.66 2011/04/23 16:12:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.67 2011/04/23 16:35:21 jer Exp $
+
+  23 Apr 2011; Jeroen Roovers <jer@gentoo.org> lilo-23.1-r1.ebuild,
+  lilo-23.2-r1.ebuild:
+  Do not run make in images/ since that tries to run lilo.
 
 *lilo-23.2-r1 (23 Apr 2011)
 *lilo-23.1-r1 (23 Apr 2011)
diff --git a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest
index 4d99fa767554..48d56b7bc389 100644
--- a/sys-boot/lilo/Manifest
+++ b/sys-boot/lilo/Manifest
@@ -15,14 +15,14 @@ DIST lilo-23.2.tar.gz 580758 RMD160 b49f17c981f68edc413a111a918bc894069dc818 SHA
 EBUILD lilo-22.8-r2.ebuild 4644 RMD160 497b5ddbbee1f5ea5e624648b665b62aba31da7e SHA1 e8a17207551ccb3579d8de410c58ddd67e1f1ebc SHA256 fb4b0768a487f017159c25f41e1889c86446767cd42fc94c127482305280b978
 EBUILD lilo-23.0-r1.ebuild 4189 RMD160 bae1ff2d9f95df2704e322b907749a89ccea170b SHA1 71b0762ad8cb674df70791cef68ce1c16a306762 SHA256 101c886bc7ee74b91b3525698a94610fc3264be3ea3b1b59b1f52fdfbff28253
 EBUILD lilo-23.0.ebuild 4156 RMD160 d1df82f641f85388b8bcdf4dd589f2d69e6f5e0b SHA1 6242e8982f7218a0b28c11b2cb04e2af38ada6a8 SHA256 462431277d4d1c02a11f867877182a8a1252cfecde64829bee8635716f44e24f
-EBUILD lilo-23.1-r1.ebuild 4215 RMD160 83c8cdbe8d209efb9ea7fac808683a64b3d27bcf SHA1 90b925c55f6fdc142643c963c9d2a7a3d86a3e19 SHA256 84a8d1c8952940eb05cd71de2eca3d92f9b7cc3739870d3547d129bf26a0243e
-EBUILD lilo-23.2-r1.ebuild 4215 RMD160 79513fa90b7a19e4364b0e85331c4c6d0604a6ae SHA1 dd439b106327dfc9234bcc0a3ef8ecd52bb1fa7f SHA256 85ab4136f5fbd6ba6bcdc404f232425d4461067e95a37a1c5049ec12e06c780b
-MISC ChangeLog 12210 RMD160 c906ae7ea8d8905e5f8199d32d8b32c94749e5a0 SHA1 b05a47d291d3ed7258380aea4d12c36a8181dc94 SHA256 e5322b10993ac8a3f7bd7abb83e9dd50510fb53cefa602049293c20e3b7a0054
+EBUILD lilo-23.1-r1.ebuild 4301 RMD160 abe43e5b03add25143dbe0ea83183ef64604e969 SHA1 c4d3590a2f580ca2177210181aceee9fbd02d127 SHA256 beff79e9b0b128c1d5865cb3a11f5ace007d8d1a0cdad0eea38974dbada71cd1
+EBUILD lilo-23.2-r1.ebuild 4301 RMD160 4c4fd932963a1d9a80c805fff8050a9be72b68bc SHA1 b0f29ea6c83527c732de3468a7a596a376bd7848 SHA256 70e3f2e9666149e770e557049a3ccfd46356bd618645d4e01693f484cdd0e8c7
+MISC ChangeLog 12361 RMD160 2ec88041e8e0b15ac54dc4bd2c2c8f444f8dccc5 SHA1 9de54486b5a9358fc90744e22aef78281646ee80 SHA256 761dd7ffc604194f64c1a939083d981f8d6925e09cec2eff6231cfdd345cbdfb
 MISC metadata.xml 432 RMD160 d682f284a9d36c260ecadaa417d5d6bf90feaf28 SHA1 f4a911b85e20f52f3eb331e96452e1ab124a4d8a SHA256 3a671e8b2935ef34a76a3c0d144acbc0459ac41811bc769450fd402ea94648b2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2y+l0ACgkQVWmRsqeSphMFxACfSWxjaJ6cIBrnXzJpXhUvUocs
-W3UAn3mrUMPh+wHtfU61wReu5uVhK4GG
-=eute
+iEYEARECAAYFAk2y/84ACgkQVWmRsqeSphMxwACfeBnNEH7gV9Rc5VOv074Lte5k
+tg4An3/X8c1tOYnjU8NyrqNS/2dTgtDI
+=EUGn
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/lilo/lilo-23.1-r1.ebuild b/sys-boot/lilo/lilo-23.1-r1.ebuild
index d0bfb4ac56c8..6121b8412546 100644
--- a/sys-boot/lilo/lilo-23.1-r1.ebuild
+++ b/sys-boot/lilo/lilo-23.1-r1.ebuild
@@ -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/lilo/lilo-23.1-r1.ebuild,v 1.1 2011/04/23 16:12:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-23.1-r1.ebuild,v 1.2 2011/04/23 16:35:21 jer Exp $
 
 EAPI="2"
 
@@ -22,13 +22,12 @@ SLOT="0"
 LICENSE="BSD GPL-2"
 KEYWORDS="-* ~amd64 ~x86"
 
-DEPEND=">=sys-devel/bin86-0.15.5"
+DEPEND=">=sys-devel/bin86-0.15.5
+	app-arch/sharutils"
 RDEPEND="device-mapper? ( || (
 	>=sys-fs/lvm2-2.02.45
 	>=sys-fs/device-mapper-1.02.12 ) )"
 
-S="${WORKDIR}/${PN}-23.0"
-
 src_prepare() {
 	# this patch is needed when booting PXE and the device you're using
 	# emulates vga console via serial console.
@@ -36,8 +35,11 @@ src_prepare() {
 	use pxeserial && epatch "${FILESDIR}/${PN}-22.8-novga.patch"
 
 	# Do not strip and have parallel make
+	# FIXME: images/Makefile does weird stuff
 	sed -i Makefile src/Makefile \
 		-e '/strip/d;s|^	make|	$(MAKE)|g' \
+		-e '/images install/d' \
+		-e '/images all/d' \
 		|| die "sed strip failed"
 }
 
diff --git a/sys-boot/lilo/lilo-23.2-r1.ebuild b/sys-boot/lilo/lilo-23.2-r1.ebuild
index 8a63ec2c2f3c..262021c108c7 100644
--- a/sys-boot/lilo/lilo-23.2-r1.ebuild
+++ b/sys-boot/lilo/lilo-23.2-r1.ebuild
@@ -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/lilo/lilo-23.2-r1.ebuild,v 1.1 2011/04/23 16:12:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-23.2-r1.ebuild,v 1.2 2011/04/23 16:35:21 jer Exp $
 
 EAPI="2"
 
@@ -22,13 +22,12 @@ SLOT="0"
 LICENSE="BSD GPL-2"
 KEYWORDS="-* ~amd64 ~x86"
 
-DEPEND=">=sys-devel/bin86-0.15.5"
+DEPEND=">=sys-devel/bin86-0.15.5
+	app-arch/sharutils"
 RDEPEND="device-mapper? ( || (
 	>=sys-fs/lvm2-2.02.45
 	>=sys-fs/device-mapper-1.02.12 ) )"
 
-S="${WORKDIR}/${PN}-23.0"
-
 src_prepare() {
 	# this patch is needed when booting PXE and the device you're using
 	# emulates vga console via serial console.
@@ -36,8 +35,11 @@ src_prepare() {
 	use pxeserial && epatch "${FILESDIR}/${PN}-22.8-novga.patch"
 
 	# Do not strip and have parallel make
+	# FIXME: images/Makefile does weird stuff
 	sed -i Makefile src/Makefile \
 		-e '/strip/d;s|^	make|	$(MAKE)|g' \
+		-e '/images install/d' \
+		-e '/images all/d' \
 		|| die "sed strip failed"
 }