Gentoo Archives: gentoo-commits

From: Alessandro Barbieri <lssndrbarbieri@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: dev-util/devscripts/, dev-util/devscripts/files/
Date: Sun, 16 May 2021 15:12:24
Message-Id: 1621177938.cba25d034631d28c66dd7799455b3025d09bdfe4.Alessandro-Barbieri@gentoo
1 commit: cba25d034631d28c66dd7799455b3025d09bdfe4
2 Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
3 AuthorDate: Sun May 16 13:49:02 2021 +0000
4 Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
5 CommitDate: Sun May 16 15:12:18 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cba25d03
7
8 dev-util/devscripts: new package
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.3
11 Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
12
13 dev-util/devscripts/Manifest | 1 +
14 dev-util/devscripts/devscripts-2.21.2.ebuild | 119 +++++++++++++++++++++
15 .../devscripts/files/Remove-failing-tests.patch | 22 ++++
16 ...Debian-xsl-stylesheets-paths-with-Gentoos.patch | 42 ++++++++
17 dev-util/devscripts/files/distutils-r1.patch | 26 +++++
18 dev-util/devscripts/metadata.xml | 9 ++
19 6 files changed, 219 insertions(+)
20
21 diff --git a/dev-util/devscripts/Manifest b/dev-util/devscripts/Manifest
22 new file mode 100644
23 index 000000000..a372dd94f
24 --- /dev/null
25 +++ b/dev-util/devscripts/Manifest
26 @@ -0,0 +1 @@
27 +DIST devscripts_2.21.2.tar.xz 980516 BLAKE2B 907f2f4e258a8396ad0a28eead1e2058b8e19be205f024ea80c0fbd9621d5ca4299844fe83d66cac7f653a917705d9c36eddb9d51454a7fbb9d7e2b52bc994ff SHA512 a6765d807dc0c2ef7a3d8c59e1262bfe7542c3ca52cda3c1910af253925cb105a9d1bf272c76a86f0b3cdda9c8a4e2d29a660437f73087dd70ee8a444bbedb01
28
29 diff --git a/dev-util/devscripts/devscripts-2.21.2.ebuild b/dev-util/devscripts/devscripts-2.21.2.ebuild
30 new file mode 100644
31 index 000000000..e5fc18145
32 --- /dev/null
33 +++ b/dev-util/devscripts/devscripts-2.21.2.ebuild
34 @@ -0,0 +1,119 @@
35 +# Copyright 1999-2021 Gentoo Authors
36 +# Distributed under the terms of the GNU General Public License v2
37 +
38 +EAPI=7
39 +
40 +PYTHON_COMPAT=( python3_{7,8,9} )
41 +DISTUTILS_OPTIONAL=true
42 +
43 +inherit distutils-r1
44 +
45 +DESCRIPTION="Scripts to make the life of a Debian Package maintainer easier"
46 +HOMEPAGE="https://salsa.debian.org/debian/devscripts"
47 +SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
48 +
49 +LICENSE="GPL-2+"
50 +SLOT="0"
51 +KEYWORDS="~amd64"
52 +IUSE="python test"
53 +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
54 +RESTRICT="!test? ( test )"
55 +
56 +CDEPEND="
57 + dev-lang/perl:=
58 + dev-perl/File-DesktopEntry
59 + dev-perl/File-DirList
60 + dev-perl/File-HomeDir
61 + dev-perl/File-Touch
62 + dev-perl/IPC-Run
63 + dev-perl/Moo
64 + dev-perl/libwww-perl
65 + dev-util/distro-info
66 + python? ( ${PYTHON_DEPS} )
67 +"
68 +DEPEND="
69 + ${CDEPEND}
70 + app-shells/bash-completion
71 + test? (
72 + app-arch/zip
73 + dev-perl/Git-Wrapper
74 + dev-perl/GitLab-API-v4
75 + dev-perl/List-Compare
76 + dev-perl/Software-License
77 + dev-perl/String-ShellQuote
78 + dev-perl/UNIVERSAL-require
79 + dev-python/flake8[${PYTHON_USEDEP}]
80 + dev-python/pyftpdlib[${PYTHON_USEDEP}]
81 + dev-python/python-debian[${PYTHON_USEDEP}]
82 + dev-util/shunit2
83 + dev-vcs/subversion
84 + sys-libs/libfaketime
85 + virtual/perl-DB_File
86 + )
87 +"
88 +RDEPEND="
89 + ${CDEPEND}
90 + app-arch/dpkg
91 + app-crypt/gnupg
92 + app-text/wdiff
93 + dev-util/debhelper
94 + dev-util/patchutils
95 + sys-apps/fakeroot
96 +"
97 +BDEPEND="virtual/pkgconfig"
98 +
99 +PATCHES=(
100 + "${FILESDIR}/distutils-r1.patch"
101 + "${FILESDIR}/Remove-failing-tests.patch"
102 + "${FILESDIR}/Replace-Debian-xsl-stylesheets-paths-with-Gentoos.patch"
103 +)
104 +
105 +DISTUTILS_S="${S}"/scripts
106 +
107 +src_prepare() {
108 + default
109 +
110 + # Avoid file collision with app-shells/bash-completion
111 + rm "${DISTUTILS_S}"/bts.bash_completion || die
112 +}
113 +
114 +src_configure() {
115 + default
116 +
117 + if use python; then
118 + pushd "${DISTUTILS_S}" > /dev/null || die
119 + distutils-r1_src_configure
120 + popd > /dev/null || die
121 + fi
122 +}
123 +
124 +src_compile() {
125 + default
126 +
127 + if use python; then
128 + pushd "${DISTUTILS_S}" > /dev/null || die
129 + distutils-r1_src_compile
130 + popd > /dev/null || die
131 + fi
132 +}
133 +
134 +src_install() {
135 + dodir /usr/bin
136 + default
137 +
138 + if use python; then
139 + pushd "${DISTUTILS_S}" > /dev/null || die
140 + distutils-r1_src_install
141 + popd > /dev/null || die
142 + fi
143 +}
144 +
145 +src_test() {
146 + default
147 +
148 + if use python; then
149 + pushd "${DISTUTILS_S}" > /dev/null || die
150 + distutils-r1_src_test
151 + popd > /dev/null || die
152 + fi
153 +}
154
155 diff --git a/dev-util/devscripts/files/Remove-failing-tests.patch b/dev-util/devscripts/files/Remove-failing-tests.patch
156 new file mode 100644
157 index 000000000..ed0726a90
158 --- /dev/null
159 +++ b/dev-util/devscripts/files/Remove-failing-tests.patch
160 @@ -0,0 +1,22 @@
161 +--- a/test/Makefile
162 ++++ b/test/Makefile
163 +@@ -3,14 +3,14 @@
164 + perl \
165 + annotate-output \
166 + checkbashisms \
167 +- dd-list \
168 ++ \
169 + debchange \
170 + debdiff \
171 +- debrepro \
172 ++ \
173 + debsign \
174 + mergechanges \
175 +- mk-origtargz \
176 ++ \
177 +- package_lifecycle \
178 ++ \
179 +- sadt \
180 ++ \
181 + uscan \
182 + uscan_ftp \
183
184 diff --git a/dev-util/devscripts/files/Replace-Debian-xsl-stylesheets-paths-with-Gentoos.patch b/dev-util/devscripts/files/Replace-Debian-xsl-stylesheets-paths-with-Gentoos.patch
185 new file mode 100644
186 index 000000000..6b7294041
187 --- /dev/null
188 +++ b/dev-util/devscripts/files/Replace-Debian-xsl-stylesheets-paths-with-Gentoos.patch
189 @@ -0,0 +1,42 @@
190 +--- a/po4a/Makefile
191 ++++ b/po4a/Makefile
192 +@@ -34,8 +34,8 @@
193 + pod2man --utf8 --center=" " --release="$(DESC_$(dir $@))" $< > $@
194 + %.1:: %.dbk translate
195 + xsltproc --nonet \
196 +- /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $<
197 +- # /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/other.xsl
198 ++ /usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl $<
199 ++ # /usr/share/sgml/docbook/xsl-stylesheets/manpages/other.xsl
200 + # (which is imported by the above stylesheet) insists in writing the output
201 + # to where it wants to. we can only move the file ourselves.
202 + # ($* → de/deb-reversion.de)
203 +--- a/scripts/deb-reversion.dbk
204 ++++ b/scripts/deb-reversion.dbk
205 +@@ -5,13 +5,13 @@
206 + <!--
207 +
208 + Process this file with an XSLT processor: `xsltproc \
209 +--''-nonet /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
210 ++-''-nonet /usr/share/sgml/docbook/xsl-stylesheets/\
211 + manpages/docbook.xsl manpage.dbk'. A manual page
212 + <package>.<section> will be generated. You may view the
213 + manual page with: nroff -man <package>.<section> | less'. A
214 + typical entry in a Makefile or Makefile.am is:
215 +
216 +-DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
217 ++DB2MAN=/usr/share/sgml/docbook/xsl-stylesheets/\
218 + manpages/docbook.xsl
219 + XP=xsltproc -''-nonet
220 +
221 +--- a/scripts/Makefile
222 ++++ b/scripts/Makefile
223 +@@ -87,7 +87,7 @@
224 + pod2man --utf8 --center=" " --release="Debian Utilities" $< > $@
225 + %.1: %.dbk
226 + xsltproc --nonet -o $@ \
227 +- /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $<
228 ++ /usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl $<
229 +
230 + # Syntax checker
231 + test_sh: $(SH_CHECKS)
232
233 diff --git a/dev-util/devscripts/files/distutils-r1.patch b/dev-util/devscripts/files/distutils-r1.patch
234 new file mode 100644
235 index 000000000..7b6b526f0
236 --- /dev/null
237 +++ b/dev-util/devscripts/files/distutils-r1.patch
238 @@ -0,0 +1,26 @@
239 +--- a/scripts/Makefile
240 ++++ b/scripts/Makefile
241 +@@ -99,7 +99,6 @@
242 + perl -I ../lib -c $<; \
243 +
244 + test_py: $(VERSION_FILE)
245 +- $(foreach python,$(shell py3versions -r ../debian/control),$(python) setup.py test$(\n))
246 +
247 + debbisect.1: debbisect
248 + help2man \
249 +@@ -131,7 +130,6 @@
250 + cp $< $@
251 +
252 + clean:
253 +- python3 setup.py clean -a
254 + find -name '*.pyc' -delete
255 + find -name __pycache__ -delete
256 + rm -rf devscripts.egg-info $(BC_BUILD_DIR) .pylint.d
257 +@@ -142,7 +140,6 @@
258 + test: test_pl test_sh test_py
259 +
260 + install: all
261 +- python3 setup.py install --root="$(DESTDIR)" --no-compile --install-layout=deb
262 + cp $(SCRIPTS) $(DESTDIR)$(BINDIR)
263 + ln -sf edit-patch $(DESTDIR)$(BINDIR)/add-patch
264 + install -d $(DESTDIR)$(COMPL_DIR)
265
266 diff --git a/dev-util/devscripts/metadata.xml b/dev-util/devscripts/metadata.xml
267 new file mode 100644
268 index 000000000..a6ffcfbc7
269 --- /dev/null
270 +++ b/dev-util/devscripts/metadata.xml
271 @@ -0,0 +1,9 @@
272 +<?xml version="1.0" encoding="UTF-8"?>
273 +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
274 +<pkgmetadata>
275 + <maintainer type="person">
276 + <description>comaintainers welcome</description>
277 + <email>lssndrbarbieri@×××××.com</email>
278 + <name>Alessandro Barbieri</name>
279 + </maintainer>
280 +</pkgmetadata>