aidecoe 15/01/29 13:37:49
Added:
0.19-0001-doc-gzipped-notmuch.3-before-trying-to.patch
0.19-0003-build-eliminate-use-of-python-execfile.patch
0.19-0002-Rename-rst2man-to-rst2man.py-for-Gento.patch
Log:
Apply rst2man related fixes. Fallback from sphinx to rst2man was ending up
with build failure. Rels bug #530522.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key
F0134531E1DBFAB5)
Revision Changes Path
1.1
net-mail/notmuch/files/0.19-0001-doc-gzipped-notmuch.3-before-trying-to.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/notmuch/files/0.19-0001-doc-gzipped-notmuch.3-before-trying-to.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/notmuch/files/0.19-0001-doc-gzipped-notmuch.3-before-trying-to.patch?rev=1.1&content-type=text/plain
Index: 0.19-0001-doc-gzipped-notmuch.3-before-trying-to.patch
===================================================================
>From a95173249ae8811241da7640814934837abce53b Mon Sep 17 00:00:00 2001
From: David Bremner <da...@tethera.net>
Date: Sun, 25 Jan 2015 15:04:51 +0100
Subject: [PATCH] doc: gzipped notmuch.3 before trying to install notmuch.3.gz
If HAVE_SPHINX=0 but HAVE_DOXYGEN=1, then the previous version was
trying to install notmuch.3.gz but only got as far as creating
notmuch.3
---
doc/Makefile.local | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/Makefile.local b/doc/Makefile.local
index e7d0bac..a719d8b 100644
--- a/doc/Makefile.local
+++ b/doc/Makefile.local
@@ -63,7 +63,7 @@ install-man: install-apidocs
ifeq ($(HAVE_DOXYGEN),1)
MAN_GZIP_FILES += ${APIMAN}.gz
apidocs: $(APIMAN)
-install-apidocs: apidocs
+install-apidocs: ${APIMAN}.gz
mkdir -p "$(DESTDIR)$(mandir)/man3"
install -m0644 $(DOCBUILDDIR)/man/man3/*.3.gz
$(DESTDIR)/$(mandir)/man3
--
2.2.2
1.1
net-mail/notmuch/files/0.19-0003-build-eliminate-use-of-python-execfile.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/notmuch/files/0.19-0003-build-eliminate-use-of-python-execfile.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/notmuch/files/0.19-0003-build-eliminate-use-of-python-execfile.patch?rev=1.1&content-type=text/plain
Index: 0.19-0003-build-eliminate-use-of-python-execfile.patch
===================================================================
>From 381385ccb7581bb16b72c23fd804c40b0330fe71 Mon Sep 17 00:00:00 2001
From: David Bremner <da...@tethera.net>
Date: Sat, 3 Jan 2015 14:14:03 +0100
Subject: [PATCH 3/3] build: eliminate use of python execfile command
As discussed in
id:8cc9dd580ad672527e12f43706f9803b2c8e99d8.1405220724.git.wk...@tremily.us,
execfile is unavailable in python3.
The approach of this commit avoids modifying the python module path,
which is arguably preferable since it avoids potentially accidentally
importing a module from the wrong place.
---
devel/release-checks.sh | 2 +-
doc/prerst2man.py | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/devel/release-checks.sh b/devel/release-checks.sh
index 797d62a..ae02f55 100755
--- a/devel/release-checks.sh
+++ b/devel/release-checks.sh
@@ -130,7 +130,7 @@ else
fi
echo -n "Checking that python bindings version is $VERSION... "
-py_version=`python -c "execfile('$PV_FILE'); print __VERSION__"`
+py_version=`python -c "with open('$PV_FILE') as vf: exec(vf.read()); print
__VERSION__"`
if [ "$py_version" = "$VERSION" ]
then
echo Yes.
diff --git a/doc/prerst2man.py b/doc/prerst2man.py
index 22b8258..45dddca 100644
--- a/doc/prerst2man.py
+++ b/doc/prerst2man.py
@@ -10,7 +10,8 @@ outdir = argv[2]
if not isdir(outdir):
makedirs(outdir, 0o755)
-execfile(sourcedir + "/conf.py")
+with open(sourcedir + "/conf.py") as cf:
+ exec(cf.read())
def header(file, startdocname, command, description, authors, section):
--
2.2.2
1.1
net-mail/notmuch/files/0.19-0002-Rename-rst2man-to-rst2man.py-for-Gento.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/notmuch/files/0.19-0002-Rename-rst2man-to-rst2man.py-for-Gento.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/notmuch/files/0.19-0002-Rename-rst2man-to-rst2man.py-for-Gento.patch?rev=1.1&content-type=text/plain
Index: 0.19-0002-Rename-rst2man-to-rst2man.py-for-Gento.patch
===================================================================
>From dcae4803d006af1a7b961a492d65c28a3cffbc3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aide...@aidecoe.name>
Date: Thu, 29 Jan 2015 14:17:01 +0100
Subject: [PATCH 2/2] Rename rst2man to rst2man.py for Gentoo
Gentoo doesn't provide symlink rst2man.py -> rst2man.
---
configure | 2 +-
doc/prerst2man.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index d14e7d1..bf78066 100755
--- a/configure
+++ b/configure
@@ -436,7 +436,7 @@ else
have_sphinx=0
printf "Checking if rst2man is available... "
- if rst2man -V > /dev/null 2>&1; then
+ if rst2man.py -V > /dev/null 2>&1; then
printf "Yes.\n"
have_rst2man=1
else
diff --git a/doc/prerst2man.py b/doc/prerst2man.py
index 437dea9..22b8258 100644
--- a/doc/prerst2man.py
+++ b/doc/prerst2man.py
@@ -59,5 +59,5 @@ for page in man_pages:
outfile.write("".join(lines))
outfile.close()
- system('set -x; rst2man {0} {1}/{2}.{3}'
+ system('set -x; rst2man.py {0} {1}/{2}.{3}'
.format(filename, outdir, page[0], page[4]))
--
2.2.2
