diff options
author | Justin Lecher <jlec@gentoo.org> | 2012-08-31 07:41:17 +0000 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2012-08-31 07:41:17 +0000 |
commit | cec5fc838f2964057eb5f59b4bfb437828c8bdad (patch) | |
tree | 661131183e3f15a59f5302d74f0c7a86c1b69d5c /sci-chemistry/ccp4-apps | |
parent | old (diff) | |
download | gentoo-2-cec5fc838f2964057eb5f59b4bfb437828c8bdad.tar.gz gentoo-2-cec5fc838f2964057eb5f59b4bfb437828c8bdad.tar.bz2 gentoo-2-cec5fc838f2964057eb5f59b4bfb437828c8bdad.zip |
sci-chemistry/ccp4-apps: Rename all manpages in order to avoid conflicts with other packages, #429410
(Portage version: 2.2.0_alpha123/cvs/Linux x86_64, RepoMan options: --force)
Diffstat (limited to 'sci-chemistry/ccp4-apps')
-rw-r--r-- | sci-chemistry/ccp4-apps/ChangeLog | 8 | ||||
-rw-r--r-- | sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r11.ebuild (renamed from sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r10.ebuild) | 15 |
2 files changed, 14 insertions, 9 deletions
diff --git a/sci-chemistry/ccp4-apps/ChangeLog b/sci-chemistry/ccp4-apps/ChangeLog index 679bf9b96603..30aa46af8ff5 100644 --- a/sci-chemistry/ccp4-apps/ChangeLog +++ b/sci-chemistry/ccp4-apps/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-chemistry/ccp4-apps # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ChangeLog,v 1.37 2012/06/01 09:06:21 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ChangeLog,v 1.38 2012/08/31 07:41:17 jlec Exp $ + +*ccp4-apps-6.1.3-r11 (31 Aug 2012) + + 31 Aug 2012; Justin Lecher <jlec@gentoo.org> -ccp4-apps-6.1.3-r10.ebuild, + +ccp4-apps-6.1.3-r11.ebuild: + Rename all manpages in order to avoid conflicts with other packages, #429410 01 Jun 2012; Justin Lecher <jlec@gentoo.org> files/6.1.3-lapack.patch, ccp4-apps-6.1.3-r10.ebuild: diff --git a/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r10.ebuild b/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r11.ebuild index dd8fe0a14aa9..379616c32342 100644 --- a/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r10.ebuild +++ b/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r10.ebuild,v 1.10 2012/06/01 09:06:21 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r11.ebuild,v 1.1 2012/08/31 07:41:17 jlec Exp $ EAPI=3 @@ -340,7 +340,12 @@ src_install() { doins -r "${S}"/share/smartie || die # Install docs and examples - doman "${S}"/man/cat1/* + local _man + pushd "${S}"/man/cat1 > /dev/null + for _man in *; do + newman ${_man} ${_man%??}-ccp4${_man:${#_man}-2:2} + done + popd > /dev/null mv "${S}"/manual/README "${S}"/manual/README-manual dodoc manual/* README CHANGES doc/* examples/README || die @@ -372,12 +377,6 @@ src_install() { dosym ../../share/doc/${PF}/examples /usr/$(get_libdir)/ccp4/examples || die dosym ../../share/doc/${PF}/html /usr/$(get_libdir)/ccp4/html || die - # Fix overlaps with other packages - rm -f "${ED}"/usr/share/man/man1/rasmol.1* "${ED}"/usr/lib/font84.dat || die - mv "${ED}"/usr/share/man/man1/truncate{,-ccp4}.1 || die - mv "${ED}"/usr/share/man/man1/rapper{,-ccp4}.1 || die - mv "${ED}"/usr/share/man/man1/sc{,-ccp4}.1 || die - cat >> "${T}"/baubles <<- EOF #!${EPREFIX}/bin/bash exec $(PYTHON) \${CCP4}/share/ccp4/smartie/baubles.py |