diff options
| author |   Tiago Cunha <tcunha@gentoo.org> | 2008-11-24 23:23:51 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gentoo.org> | 2008-11-24 23:23:51 +0000 |
| commit | e4d17115add7c8d38e146652dbf81c50861565fe (patch) | |
| tree | 11e789730a59a5eaa2d0bb344f114c63e91e5f9b /dev-util/cutils | |
| parent | Bump to 0.1.10. This ebuild is now a meta that pull the split elements of gam... (diff) | |
| download | gentoo-2-e4d17115add7c8d38e146652dbf81c50861565fe.tar.gz gentoo-2-e4d17115add7c8d38e146652dbf81c50861565fe.tar.bz2 gentoo-2-e4d17115add7c8d38e146652dbf81c50861565fe.zip | |
- Add die to the mv, and sed calls.
- Remove the info page to force its regeneration from the texinfo document.
- Simplify patch.
- Use safer patterns in sed.
(Portage version: 2.1.4.5)
Diffstat (limited to 'dev-util/cutils')
| -rw-r--r-- | dev-util/cutils/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-util/cutils/cutils-1.6-r3.ebuild | 25 | ||||
| -rw-r--r-- | dev-util/cutils/files/cutils-infopage.patch | 16 |
3 files changed, 41 insertions, 9 deletions
diff --git a/dev-util/cutils/ChangeLog b/dev-util/cutils/ChangeLog index b50124e788b0..2eabbd031257 100644 --- a/dev-util/cutils/ChangeLog +++ b/dev-util/cutils/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-util/cutils # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cutils/ChangeLog,v 1.24 2008/11/20 02:49:27 tcunha Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cutils/ChangeLog,v 1.25 2008/11/24 23:23:51 tcunha Exp $ + + 24 Nov 2008; Tiago Cunha <tcunha@gentoo.org> +files/cutils-infopage.patch, + cutils-1.6-r3.ebuild: + - Add die to the mv, and sed calls. + - Remove the info page to force its regeneration from the texinfo document. + - Simplify patch. + - Use safer patterns in sed. *cutils-1.6-r3 (20 Nov 2008) diff --git a/dev-util/cutils/cutils-1.6-r3.ebuild b/dev-util/cutils/cutils-1.6-r3.ebuild index c6d756ecc325..71573dca079d 100644 --- a/dev-util/cutils/cutils-1.6-r3.ebuild +++ b/dev-util/cutils/cutils-1.6-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cutils/cutils-1.6-r3.ebuild,v 1.1 2008/11/20 02:49:27 tcunha Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cutils/cutils-1.6-r3.ebuild,v 1.2 2008/11/24 23:23:51 tcunha Exp $ inherit eutils toolchain-funcs @@ -15,13 +15,22 @@ IUSE="" src_unpack() { unpack ${A} - epatch "${FILESDIR}"/${P}-r1-gentoo.diff - cd "${S}"/src/cdecl - mv cdecl.1 cutils-cdecl.1 - for file in "${S}"/doc/*; do - sed -e 's/cdecl/cutils-cdecl/g' -i "${file}" - done - sed -e 's/Xr cdecl/Xr cutils-cdecl/' -i "${S}"/src/cundecl/cundecl.1 + + epatch "${FILESDIR}"/${PN}-infopage.patch + + mv "${S}"/src/cdecl/cdecl.1 \ + "${S}"/src/cdecl/cutils-cdecl.1 || die "mv cdecl failed" + # Force rebuild of cutils.info + rm -f "${S}"/doc/cutils.info + + sed -i "s/cdecl/cutils-cdecl/g" \ + "${S}"/doc/cutils.texi || die "sed cutils.info failed" + sed -i "/PROG/s/cdecl/cutils-cdecl/" \ + "${S}"/src/cdecl/Makefile.in || die "sed cdecl failed" + sed -i "/Xr/s/cdecl/cutils-cdecl/" \ + "${S}"/src/cundecl/cundecl.1 || die "sed cundecl.1 failed" + sed -i "/Nm/s/cdecl/cutils-cdecl/" \ + "${S}"/src/cdecl/cutils-cdecl.1 || die "sed cutils-cdecl.1 failed" } src_compile() { diff --git a/dev-util/cutils/files/cutils-infopage.patch b/dev-util/cutils/files/cutils-infopage.patch new file mode 100644 index 000000000000..2b19aeee2d6e --- /dev/null +++ b/dev-util/cutils/files/cutils-infopage.patch @@ -0,0 +1,16 @@ +# Add category, and entry to the texinfo document. + +--- cutils-1.6/doc/cutils.texi.orig 2008-11-24 23:18:41.732038120 +0000 ++++ cutils-1.6/doc/cutils.texi 2008-11-24 23:18:27.907038555 +0000 +@@ -7,6 +7,11 @@ + @c unwise to comment it out when running a master in case there are + @c overfulls which are deemed okay. + ++@dircategory Programming ++@direntry ++* cutils: (cutils). C language utilities. ++@end direntry ++ + @iftex + @c @finalout + @end iftex |