From ff4963f2db76e15fbd42878df664dcfccc439ff5 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Tue, 22 Feb 2011 12:12:31 -0500 Subject: [PATCH] Updated be ebuild for rst2man man page generation. --- ChangeLog | 9 +++++++-- Manifest | 5 ++--- be-9999.ebuild | 9 ++++----- files/be-9999-install-dir.patch | 13 ------------- 4 files changed, 13 insertions(+), 23 deletions(-) delete mode 100644 files/be-9999-install-dir.patch diff --git a/ChangeLog b/ChangeLog index 720b95a..611d30f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,13 @@ # ChangeLog for dev-util/be -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*be-9999 (22 Feb 2011) + 31 Dec 2010; W. Trevor King be-9999.ebuild, be-9999-install-dir.patch : + - Updated ebuild for rst2man man page generation. + - Remove be-9999-install-dir.patch because we don't use the + Makefile for installation. + *be-9999 (31 Dec 2010) 31 Dec 2010; W. Trevor King be-9999.ebuild : Fix repoman-reported issues with 9999. diff --git a/Manifest b/Manifest index 7a32370..e351060 100644 --- a/Manifest +++ b/Manifest @@ -1,4 +1,3 @@ -AUX be-9999-install-dir.patch 286 RMD160 5c537f541844f28a622602832116ab17b23b4c09 SHA1 f7c026ee31eec665f31ddfcd0c7d70e2521b7f34 SHA256 121b29b8705c5b175dbe6fef5d9be9643fd580b9cc29b2b1c312f7fa35ef4887 -EBUILD be-9999.ebuild 1243 RMD160 b58eb8552b4e81b456f341092cf34336019417b2 SHA1 1f4dcbe5495a5c53731719e15ec0364bd677bd14 SHA256 cd585aefe55dae577c3146190ee2d3e65829d327f438133a9c295cd4d5ab272b -MISC ChangeLog 2143 RMD160 7951224a245e5ebd5f0a56fd75b8e53256dcbeb5 SHA1 d497e3ce043c8f5cd05fcca158357c988b27a9e8 SHA256 a3076db7f739842495d75eff6de97f3de5f3dbd16020af4b936ecd583889ea66 +EBUILD be-9999.ebuild 1200 RMD160 987e0f099477a9219357cfef324cce3bc2dc4d71 SHA1 6768b29ed688db5797c06bca5dc17e7e460ae7ff SHA256 24ec3ff02a7075125713914c8449754ab4eecf53a116a0aee527ddbd23fac763 +MISC ChangeLog 2368 RMD160 82d9f97444ccb94af4bc070ce59ad8c7e1f65524 SHA1 174c995d8bfc68f1865b2919144edaeefb836819 SHA256 ffd1d4032974e8e80676fd162f02f27c364532a07125411623a65e51df249650 MISC metadata.xml 321 RMD160 f1c228ca9454d018e84c7fa458cd8a1ddb4a22a0 SHA1 a21e5950c45f5bb268ab86c06f2d52c7a95d15fa SHA256 217043d3419af1b60adbd5e4028a57f1b1de1eebbe44afa9befe33faac60db37 diff --git a/be-9999.ebuild b/be-9999.ebuild index 2e35129..30c7999 100644 --- a/be-9999.ebuild +++ b/be-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -31,8 +31,7 @@ RDEPEND="dev-lang/python dev-python/pyyaml" DEPEND="${RDEPEND} dev-vcs/git - dev-libs/libxslt - app-text/docbook-xsl-ns-stylesheets" + dev-python/docutils" src_unpack() { if [[ ${PV} == "9999" ]] ; then @@ -44,13 +43,13 @@ src_unpack() { } src_prepare() { - epatch "${FILESDIR}/${P}"-install-dir.patch distutils_src_prepare } src_compile() { make libbe/_version.py || die "_version.py generation failed" - make doc/man/be.1 || die "be.1 generation failed" + emake RST2MAN="/usr/bin/rst2man.py" doc/man/be.1 \ + || die "be.1 generation failed" distutils_src_compile } diff --git a/files/be-9999-install-dir.patch b/files/be-9999-install-dir.patch deleted file mode 100644 index 8376322..0000000 --- a/files/be-9999-install-dir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -u be/Makefile be-patched/Makefile ---- a/Makefile 2009-11-24 13:11:42.000000000 -0500 -+++ b/Makefile 2009-11-30 20:32:38.000000000 -0500 -@@ -38,8 +38,7 @@ - - RM = rm - --#PREFIX = /usr/local --PREFIX = ${HOME} -+PREFIX = ${DESTDIR}/usr - INSTALL_OPTIONS = "--prefix=${PREFIX}" - - -- 2.26.2