From 492f47ea34e5b844c712f6bd96eccd885a7401c3 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 24 Aug 2010 22:52:09 +0000 Subject: Redo autotool generation now that upstream uses python/autogen #334333. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- sys-boot/grub/ChangeLog | 5 ++++- sys-boot/grub/Manifest | 10 +++++----- sys-boot/grub/grub-9999.ebuild | 10 ++++------ 3 files changed, 13 insertions(+), 12 deletions(-) (limited to 'sys-boot') diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog index ca9249ff5810..a1a5713633e2 100644 --- a/sys-boot/grub/ChangeLog +++ b/sys-boot/grub/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-boot/grub # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.142 2010/08/22 19:58:14 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.143 2010/08/24 22:52:09 vapier Exp $ + + 24 Aug 2010; Mike Frysinger grub-9999.ebuild: + Redo autotool generation now that upstream uses python/autogen #334333. 22 Aug 2010; Mike Frysinger grub-9999.ebuild: Force recent unifont version #333343 by tormen. diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest index 4066df602462..b6a4c0e1c57c 100644 --- a/sys-boot/grub/Manifest +++ b/sys-boot/grub/Manifest @@ -38,13 +38,13 @@ EBUILD grub-0.97-r8.ebuild 8871 RMD160 c6255b0e4de7b0c03611e7227d5fb3ce48db5cce EBUILD grub-0.97-r9.ebuild 8975 RMD160 14ff47a8de303aa73e2571ee1fcb1aae3f433be0 SHA1 46676679d76ba268bc650fbdb183893298f38c7c SHA256 3bc4b98c9e451a601eb120327bb5273629471cf6cc01c363ac4f9bfd52e0276a EBUILD grub-0.97.ebuild 4527 RMD160 bc8dec8916cd52bbd0403d3e504f8a407d9e897c SHA1 7fc00e33d980842ed65b242ac53522b51894fa7c SHA256 2c20b9c10a242d15b17b48d73e5136c7f350cd313f77dd177c54a08f663be02a EBUILD grub-1.98.ebuild 2966 RMD160 63d5199e13c846ccc2a257ed66660c60859e40fa SHA1 0eaf688ac4eae081564d9a45cc7f55462c40bf32 SHA256 347de9c95cbf56754fccc6f47f340245bf15b630a4992ffe1f15ddb9fe71f004 -EBUILD grub-9999.ebuild 3004 RMD160 c07a88e39b4ea69f85234a871c32a3cab959c0e1 SHA1 34292a19849f4f8c0ded5f9e00853f6e359c13ea SHA256 a54fbaba4ac04c2355c3bada7162544b3b40be4d80378257635a09bed02a76c8 -MISC ChangeLog 29544 RMD160 274de2b1e6ae7e08f1cd8ae17571fb754d38393e SHA1 1e9e1e371bb4239c4ebc51cc387cbe5057770e43 SHA256 540007a611ecd1fd6c1e30ad6ec514f0bdf52c7d719dac84f8e99a5d170b2d9c +EBUILD grub-9999.ebuild 2994 RMD160 4b20e1e5ee4aa3df18a39e5c6bc1c19d1df88e0a SHA1 e4b823c306b84defe48a22b5d0601e7e150f916a SHA256 90317b69b81814be4a07f1a127e2c0dd3ff2c4eb560817259e9a97c306fe0b02 +MISC ChangeLog 29687 RMD160 6fb159fd1d3965256af33f30b547e5e270c27316 SHA1 c38750cc1b77e6856f4af63da0146d7fb8e67130 SHA256 5f0b34fe55d273d06adb612dbbaeb0140d62328f5854bf9aef5a39062663a94c MISC metadata.xml 262 RMD160 afabce9377772aefb54102e9ef237de6bb1561f5 SHA1 c38f9b99d8a84beb40c114283d8d7ddd4ac43d9e SHA256 35a9c56d9c8418806062854a360c27690d25159524df71f28bbd4d644e8706f3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iF4EAREIAAYFAkxxggoACgkQTwhj9JtAlp5lngD/S7wzWSTh6N/S9NeITLDty/DG -qMMzTm1Uim7WMaQf9j8BAIOZLOk0bfB8VlRQeljfvqnCxwxn4pploHmxl3omfRg+ -=cbgU +iF4EAREIAAYFAkx0TQYACgkQTwhj9JtAlp58nQEAoWEyNtu6fE28/tWNdwakzfFc +x/HAJkjPZxbT2nnGsUcA/3Jt61lN8ZjX/EDfL6sbIUcPZPBAk2/7KUDrHgI4e5zh +=aPgl -----END PGP SIGNATURE----- diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild index 05de1490426d..d77266efff02 100644 --- a/sys-boot/grub/grub-9999.ebuild +++ b/sys-boot/grub/grub-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 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.24 2010/08/22 19:58:14 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.25 2010/08/24 22:52:09 vapier Exp $ # XXX: need to implement a grub.conf migration in pkg_postinst before we ~arch @@ -27,7 +27,8 @@ RDEPEND=">=sys-libs/ncurses-5.2-r5 dev-libs/lzo truetype? ( media-libs/freetype >=media-fonts/unifont-5 )" DEPEND="${RDEPEND} - dev-lang/ruby" + >=sys-devel/autogen-5.10 + >=dev-lang/python-2.5.2" PROVIDE="virtual/bootloader" export STRIP_MASK="*/grub/*/*.mod" @@ -46,10 +47,7 @@ src_unpack() { # autogen.sh does more than just run autotools # need to eautomake due to weirdness #296013 if [[ ${PV} == "9999" ]] ; then - sed -i \ - -e '/^\(auto\|ac\)/s:^:e:' \ - -e "s:^eautomake:`which automake`:" \ - autogen.sh + sed -i -e '/^autoreconf/s:^:e:' autogen.sh || die (. ./autogen.sh) || die fi } -- cgit v1.2.3-65-gdbad