Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage-utils:master commit in: /
Date: Fri, 31 Jan 2020 13:26:53
Message-Id: 1580477186.214fac0f5b899dbb40f7932f903a2aad4d42f161.grobian@gentoo
1 commit: 214fac0f5b899dbb40f7932f903a2aad4d42f161
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 31 13:26:26 2020 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 31 13:26:26 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=214fac0f
7
8 make-tarball: ensure up-to-date manpages
9
10 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
11
12 make-tarball.sh | 28 ++++++++++++++++------------
13 1 file changed, 16 insertions(+), 12 deletions(-)
14
15 diff --git a/make-tarball.sh b/make-tarball.sh
16 index f1cfb15..22ab910 100755
17 --- a/make-tarball.sh
18 +++ b/make-tarball.sh
19 @@ -27,9 +27,12 @@ git) ver="HEAD" ;;
20 ;;
21 esac
22 p="${TMPDIR:-/var/tmp}/portage-utils-${ver#v}"
23 +pb=${p}_build
24
25 rm -rf "${p}"
26 mkdir "${p}"
27 +rm -rf "${pb}"
28 +mkdir "${pb}"
29
30 einfo "Checking out clean git sources ..."
31 git archive "${ver}" | tar xf - -C "${p}"
32 @@ -42,23 +45,24 @@ sed -i "/^AM_MAINTAINER_MODE/s:(.*)$::" configure.ac
33 rm -rf autom4te.cache
34 popd >/dev/null
35
36 -einfo "Generating tarball ..."
37 -pushd "${p%/*}" >/dev/null
38 -tar --numeric-owner -cf - "${p##*/}" | xz > "${p}".tar.xz
39 -popd >/dev/null
40 -rm -r "${p}"
41 -
42 -einfo "Checking tarball ..."
43 -pushd "${p%/*}" >/dev/null
44 -tar xf "${p}".tar.*
45 -popd >/dev/null
46 -pushd "${p}" >/dev/null
47 +einfo "Checking sources ..."
48 +pushd "${pb}" >/dev/null
49 +tar cf - -C "${p}" . | tar xf -
50 v ./configure -q
51 v ${MAKE} -s
52 v ${MAKE} -s check
53 v ${MAKE} -s DESTDIR="${PWD}"/install install
54 +v ./man/mkman.py
55 +# ensure the tar contains up-to-date manpages
56 +cp -a man/*.1 "${p}"/man
57 popd >/dev/null
58 -rm -rf "${p}"
59 +rm -rf "${pb}"
60 +
61 +einfo "Generating tarball ..."
62 +pushd "${p%/*}" >/dev/null
63 +tar --numeric-owner -cf - "${p##*/}" | xz > "${p}".tar.xz
64 +popd >/dev/null
65 +rm -r "${p}"
66
67 echo
68 einfo "All ready for distribution!"