| 1 |
flameeyes 11/11/02 15:09:11 |
| 2 |
|
| 3 |
Modified: grub-1.99-r2.ebuild grub-9999.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix info manual (was referencing old name); factor out autoreconf handling if we were to execute that on a non-live ebuild. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha72/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.6 sys-boot/grub/grub-1.99-r2.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild?rev=1.6&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild?rev=1.6&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild?r1=1.5&r2=1.6 |
| 15 |
|
| 16 |
Index: grub-1.99-r2.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild,v |
| 19 |
retrieving revision 1.5 |
| 20 |
retrieving revision 1.6 |
| 21 |
diff -u -r1.5 -r1.6 |
| 22 |
--- grub-1.99-r2.ebuild 4 Oct 2011 18:23:19 -0000 1.5 |
| 23 |
+++ grub-1.99-r2.ebuild 2 Nov 2011 15:09:11 -0000 1.6 |
| 24 |
@@ -1,13 +1,14 @@ |
| 25 |
# Copyright 1999-2011 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild,v 1.5 2011/10/04 18:23:19 scarabeus Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild,v 1.6 2011/11/02 15:09:11 flameeyes Exp $ |
| 29 |
|
| 30 |
EAPI=4 |
| 31 |
|
| 32 |
if [[ ${PV} == "9999" ]] ; then |
| 33 |
EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/grub/trunk/grub/" |
| 34 |
- LIVE_ECLASS="autotools bzr" |
| 35 |
+ LIVE_ECLASS="bzr" |
| 36 |
SRC_URI="" |
| 37 |
+ DO_AUTORECONF="true" |
| 38 |
else |
| 39 |
MY_P=${P/_/\~} |
| 40 |
SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz |
| 41 |
@@ -15,7 +16,7 @@ |
| 42 |
S=${WORKDIR}/${MY_P} |
| 43 |
fi |
| 44 |
|
| 45 |
-inherit mount-boot eutils flag-o-matic pax-utils toolchain-funcs ${LIVE_ECLASS} |
| 46 |
+inherit mount-boot eutils flag-o-matic pax-utils toolchain-funcs ${DO_AUTORECONF:+autotools} ${LIVE_ECLASS} |
| 47 |
unset LIVE_ECLASS |
| 48 |
|
| 49 |
DESCRIPTION="GNU GRUB boot loader" |
| 50 |
@@ -58,8 +59,9 @@ |
| 51 |
>=dev-lang/python-2.5.2 |
| 52 |
sys-devel/flex |
| 53 |
virtual/yacc |
| 54 |
+ sys-apps/texinfo |
| 55 |
" |
| 56 |
-if [[ ${PV} == "9999" ]]; then |
| 57 |
+if [[ -n ${DO_AUTORECONF} ]] ; then |
| 58 |
DEPEND+=" >=sys-devel/autogen-5.10 sys-apps/help2man" |
| 59 |
else |
| 60 |
DEPEND+=" app-arch/xz-utils" |
| 61 |
@@ -170,8 +172,15 @@ |
| 62 |
|
| 63 |
epatch_user |
| 64 |
|
| 65 |
+ # fix texinfo file name, as otherwise the grub2.info file will be |
| 66 |
+ # useless |
| 67 |
+ sed -i \ |
| 68 |
+ -e '/setfilename/s:grub.info:grub2.info:' \ |
| 69 |
+ -e 's:(grub):(grub2):' \ |
| 70 |
+ "${S}"/docs/grub.texi |
| 71 |
+ |
| 72 |
# autogen.sh does more than just run autotools |
| 73 |
- if [[ ${PV} == "9999" ]] ; then |
| 74 |
+ if [[ -n ${DO_AUTORECONF} ]] ; then |
| 75 |
sed -i -e '/^autoreconf/s:^:set +e; e:' autogen.sh || die |
| 76 |
(. ./autogen.sh) || die |
| 77 |
fi |
| 78 |
|
| 79 |
|
| 80 |
|
| 81 |
1.45 sys-boot/grub/grub-9999.ebuild |
| 82 |
|
| 83 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.45&view=markup |
| 84 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.45&content-type=text/plain |
| 85 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?r1=1.44&r2=1.45 |
| 86 |
|
| 87 |
Index: grub-9999.ebuild |
| 88 |
=================================================================== |
| 89 |
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v |
| 90 |
retrieving revision 1.44 |
| 91 |
retrieving revision 1.45 |
| 92 |
diff -u -r1.44 -r1.45 |
| 93 |
--- grub-9999.ebuild 4 Oct 2011 18:23:19 -0000 1.44 |
| 94 |
+++ grub-9999.ebuild 2 Nov 2011 15:09:11 -0000 1.45 |
| 95 |
@@ -1,13 +1,14 @@ |
| 96 |
# Copyright 1999-2011 Gentoo Foundation |
| 97 |
# Distributed under the terms of the GNU General Public License v2 |
| 98 |
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.44 2011/10/04 18:23:19 scarabeus Exp $ |
| 99 |
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.45 2011/11/02 15:09:11 flameeyes Exp $ |
| 100 |
|
| 101 |
EAPI=4 |
| 102 |
|
| 103 |
if [[ ${PV} == "9999" ]] ; then |
| 104 |
EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/grub/trunk/grub/" |
| 105 |
- LIVE_ECLASS="autotools bzr" |
| 106 |
+ LIVE_ECLASS="bzr" |
| 107 |
SRC_URI="" |
| 108 |
+ DO_AUTORECONF="true" |
| 109 |
else |
| 110 |
MY_P=${P/_/\~} |
| 111 |
SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz |
| 112 |
@@ -15,7 +16,7 @@ |
| 113 |
S=${WORKDIR}/${MY_P} |
| 114 |
fi |
| 115 |
|
| 116 |
-inherit mount-boot eutils flag-o-matic pax-utils toolchain-funcs ${LIVE_ECLASS} |
| 117 |
+inherit mount-boot eutils flag-o-matic pax-utils toolchain-funcs ${DO_AUTORECONF:+autotools} ${LIVE_ECLASS} |
| 118 |
unset LIVE_ECLASS |
| 119 |
|
| 120 |
DESCRIPTION="GNU GRUB boot loader" |
| 121 |
@@ -58,8 +59,9 @@ |
| 122 |
>=dev-lang/python-2.5.2 |
| 123 |
sys-devel/flex |
| 124 |
virtual/yacc |
| 125 |
+ sys-apps/texinfo |
| 126 |
" |
| 127 |
-if [[ ${PV} == "9999" ]]; then |
| 128 |
+if [[ -n ${DO_AUTORECONF} ]] ; then |
| 129 |
DEPEND+=" >=sys-devel/autogen-5.10 sys-apps/help2man" |
| 130 |
else |
| 131 |
DEPEND+=" app-arch/xz-utils" |
| 132 |
@@ -166,8 +168,15 @@ |
| 133 |
|
| 134 |
epatch_user |
| 135 |
|
| 136 |
+ # fix texinfo file name, as otherwise the grub2.info file will be |
| 137 |
+ # useless |
| 138 |
+ sed -i \ |
| 139 |
+ -e '/setfilename/s:grub.info:grub2.info:' \ |
| 140 |
+ -e 's:(grub):(grub2):' \ |
| 141 |
+ "${S}"/docs/grub.texi |
| 142 |
+ |
| 143 |
# autogen.sh does more than just run autotools |
| 144 |
- if [[ ${PV} == "9999" ]] ; then |
| 145 |
+ if [[ -n ${DO_AUTORECONF} ]] ; then |
| 146 |
sed -i -e '/^autoreconf/s:^:set +e; e:' autogen.sh || die |
| 147 |
(. ./autogen.sh) || die |
| 148 |
fi |
| 149 |
|
| 150 |
|
| 151 |
|
| 152 |
1.170 sys-boot/grub/ChangeLog |
| 153 |
|
| 154 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.170&view=markup |
| 155 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.170&content-type=text/plain |
| 156 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.169&r2=1.170 |
| 157 |
|
| 158 |
Index: ChangeLog |
| 159 |
=================================================================== |
| 160 |
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v |
| 161 |
retrieving revision 1.169 |
| 162 |
retrieving revision 1.170 |
| 163 |
diff -u -r1.169 -r1.170 |
| 164 |
--- ChangeLog 4 Oct 2011 18:23:19 -0000 1.169 |
| 165 |
+++ ChangeLog 2 Nov 2011 15:09:11 -0000 1.170 |
| 166 |
@@ -1,6 +1,11 @@ |
| 167 |
# ChangeLog for sys-boot/grub |
| 168 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 169 |
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.169 2011/10/04 18:23:19 scarabeus Exp $ |
| 170 |
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.170 2011/11/02 15:09:11 flameeyes Exp $ |
| 171 |
+ |
| 172 |
+ 02 Nov 2011; Diego E. Pettenò <flameeyes@g.o> grub-1.99-r2.ebuild, |
| 173 |
+ grub-9999.ebuild: |
| 174 |
+ Fix info manual (was referencing old name); factor out autoreconf handling if |
| 175 |
+ we were to execute that on a non-live ebuild. |
| 176 |
|
| 177 |
04 Oct 2011; Tomáš Chvátal <scarabeus@g.o> grub-1.99-r2.ebuild, |
| 178 |
grub-9999.ebuild: |
Archives