Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/build-docbook-catalog:master commit in: /
Date: Sun, 03 Oct 2021 04:01:12
Message-Id: 1633233473.bd29656622f75011e723c71880ebba5844f7f518.vapier@gentoo
1 commit: bd29656622f75011e723c71880ebba5844f7f518
2 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 3 03:57:53 2021 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 3 03:57:53 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/build-docbook-catalog.git/commit/?id=bd296566
7
8 update README & dist process
9
10 Now that we're in git, we can simplify things a lot.
11
12 Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>
13
14 Makefile | 14 +++-----------
15 README | 29 ++++-------------------------
16 build-docbook-catalog | 9 ++-------
17 3 files changed, 9 insertions(+), 43 deletions(-)
18
19 diff --git a/Makefile b/Makefile
20 index b920de3..cb8634a 100644
21 --- a/Makefile
22 +++ b/Makefile
23 @@ -1,6 +1,5 @@
24 -PN = build-docbook-catalog
25 -PV = $(shell awk '/^\# .Header:/{print $$4;exit}' build-docbook-catalog)
26 -P = $(PN)-$(PV)
27 +# Copyright 2004-2021 Gentoo Foundation
28 +# Distributed under the terms of the GNU General Public License v2
29
30 all:
31
32 @@ -14,11 +13,4 @@ install:
33 install -d $(DESTDIR)$(SBINDIR)
34 install -m 755 build-docbook-catalog $(DESTDIR)$(SBINDIR)
35
36 -dist:
37 - rm -rf $(P)
38 - mkdir -p $(P)
39 - cp -pPR build-docbook-catalog Makefile README $(P)/
40 - tar --posix --owner 0 --group 0 -cf - $(P) | xz -9 > $(P).tar.xz
41 - rm -rf $(P)
42 -
43 -.PHONY: all clean dist install
44 +.PHONY: all clean install
45
46 diff --git a/README b/README
47 index 8c3716d..8e1e345 100644
48 --- a/README
49 +++ b/README
50 @@ -1,31 +1,10 @@
51 -$Header: /usr/local/src/gentoo/gentoo-src/cvsroot/gentoo-src/build-docbook-catalog/README,v 1.2 2012/03/27 22:36:51 vapier Exp $
52 -
53 This is the source for app-text/build-docbook-catalog, which is a
54 script to regenerate the xml docbook catalog.
55
56 You can find it here:
57 - http://sources.gentoo.org/gentoo-src/build-docbook-catalog/
58 -
59 -To make a release of this script, do the following:
60 -
61 -1. Commit your changes, create the tarball, and post it:
62 -
63 - make dist
64 - cp build-docbook-catalog-*.tar.xz /usr/portage/distfiles/
65 - scp build-docbook-catalog-*.tar.xz dev.gentoo.org:/space/distfiles-local/
66 -
67 -2. Make a new version of the build-docbook-catalog ebuild:
68 -
69 - ego build-docbook-catalog
70 - cp $(ls -t1 *.ebuild | head -n 1) build-docbook-catalog-${rev}.ebuild
71 - ekeyword ~all build-docbook-catalog-${rev}.ebuild
72 -
73 -3. Do the normal steps to generate a digest, mark the previous version
74 - stable, use echangelog to add a ChangeLog entry, etc.
75 + https://gitweb.gentoo.org/proj/build-docbook-catalog.git/
76
77 - cvs add build-docbook-catalog-${rev}.ebuild
78 - ebuild build-docbook-catalog-${rev}.ebuild digest
79 - echangelog
80 - repoman commit -m "version bump to ${rev}"
81 +To make a release of this script, create a new git tag.
82 + git tag v2.0
83
84 -vim:sw=4 expandtab
85 +We pull tarballs from the git site now. So update the ebuild like normal.
86
87 diff --git a/build-docbook-catalog b/build-docbook-catalog
88 index b420541..9064d72 100755
89 --- a/build-docbook-catalog
90 +++ b/build-docbook-catalog
91 @@ -1,13 +1,7 @@
92 #!/bin/bash
93 -# $Header: /usr/local/src/gentoo/gentoo-src/cvsroot/gentoo-src/build-docbook-catalog/build-docbook-catalog,v 1.21 2016/05/23 15:53:13 haubi Exp $
94 -#
95 -# build-docbook-catalog: populate /etc/xml/docbook based in
96 -# installed docbook-xml-dtd versions.
97 -#
98 -# Copyright 2004-2012 Gentoo Foundation
99 +# Copyright 2004-2021 Gentoo Foundation
100 # Distributed under the terms of the GNU General Public License v2
101 # written by Aron Griffis
102 -#
103
104 EPREFIX=
105 ROOTCONFDIR="${EPREFIX}"/etc/xml
106 @@ -28,6 +22,7 @@ GETOPT=getopt
107 usage() {
108 cat <<-EOF
109 Usage: ${ZERO} [options]
110 + Regenerate the XML docbook catalog under ${ROOTCONFDIR}.
111
112 Options:
113 -r, --root ROOT path to work on