| 1 |
zmedico 10/08/30 21:55:25 |
| 2 |
|
| 3 |
Modified: portage-9999.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix src_prepare to use the new VERSION sed template in order to substitute man page headers. |
| 6 |
|
| 7 |
(Portage version: 2.2_rc72_p31/cvs/Linux i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.8 sys-apps/portage/portage-9999.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.8&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.8&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.7&r2=1.8 |
| 15 |
|
| 16 |
Index: portage-9999.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v |
| 19 |
retrieving revision 1.7 |
| 20 |
retrieving revision 1.8 |
| 21 |
diff -u -r1.7 -r1.8 |
| 22 |
--- portage-9999.ebuild 14 Aug 2010 18:55:53 -0000 1.7 |
| 23 |
+++ portage-9999.ebuild 30 Aug 2010 21:55:25 -0000 1.8 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2010 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.7 2010/08/14 18:55:53 zmedico Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.8 2010/08/30 21:55:25 zmedico Exp $ |
| 29 |
|
| 30 |
# Require EAPI 2 since we now require at least python-2.6 (for python 3 |
| 31 |
# syntax support) which also requires EAPI 2. |
| 32 |
@@ -89,10 +89,13 @@ |
| 33 |
} |
| 34 |
|
| 35 |
src_prepare() { |
| 36 |
- local _version="'$(cd "${S}/.git" && git describe --tags | sed -e 's|-\([0-9]\+\)-.\+$|_p\1|')'[1:]" |
| 37 |
+ local _version=$(cd "${S}/.git" && git describe --tags | sed -e 's|-\([0-9]\+\)-.\+$|_p\1|') |
| 38 |
+ _version=${_version:1} |
| 39 |
einfo "Setting portage.VERSION to ${_version} ..." |
| 40 |
- sed -i "s/^VERSION=.*/VERSION=${_version}/" pym/portage/__init__.py || \ |
| 41 |
+ sed -e "s/^VERSION=.*/VERSION='${_version}'/" -i pym/portage/__init__.py || \ |
| 42 |
die "Failed to patch portage.VERSION" |
| 43 |
+ sed -e "1s/VERSION/${_version}/" -i man/* || \ |
| 44 |
+ die "Failed to patch VERSION in man page headers" |
| 45 |
|
| 46 |
if use python3; then |
| 47 |
python_convert_shebangs -r 3 . |
| 48 |
|
| 49 |
|
| 50 |
|
| 51 |
1.715 sys-apps/portage/ChangeLog |
| 52 |
|
| 53 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.715&view=markup |
| 54 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.715&content-type=text/plain |
| 55 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.714&r2=1.715 |
| 56 |
|
| 57 |
Index: ChangeLog |
| 58 |
=================================================================== |
| 59 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v |
| 60 |
retrieving revision 1.714 |
| 61 |
retrieving revision 1.715 |
| 62 |
diff -u -r1.714 -r1.715 |
| 63 |
--- ChangeLog 29 Aug 2010 16:53:33 -0000 1.714 |
| 64 |
+++ ChangeLog 30 Aug 2010 21:55:25 -0000 1.715 |
| 65 |
@@ -1,6 +1,10 @@ |
| 66 |
# ChangeLog for sys-apps/portage |
| 67 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 68 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.714 2010/08/29 16:53:33 zmedico Exp $ |
| 69 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.715 2010/08/30 21:55:25 zmedico Exp $ |
| 70 |
+ |
| 71 |
+ 30 Aug 2010; Zac Medico <zmedico@g.o> portage-9999.ebuild: |
| 72 |
+ Fix src_prepare to use the new VERSION sed template in order to substitute |
| 73 |
+ man page headers. |
| 74 |
|
| 75 |
*portage-2.2_rc72 (29 Aug 2010) |
Archives