[gentoo-commits] repo/proj/guru:dev commit in: dev-util/osc/files/, dev-util/osc/

[Anna Vyalkova]

commit:     932dc50d00b99beb4ff226e39ffba209983959ea
Author:     Anna Vyalkova <cyber <AT> sysrq <DOT> in>
AuthorDate: Wed May  5 05:09:29 2021 +0000
Commit:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Wed May  5 05:09:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=932dc50d

dev-util/osc: bump to 0.172, drop old

Include a patch to disable compressing manpage with gzip at build
time.

Closes: https://bugs.gentoo.org/780960
Signed-off-by: Anna Vyalkova <cyber <AT> sysrq.in>

 dev-util/osc/Manifest                              |  3 +-
 dev-util/osc/files/osc-no-man-compression.patch    | 31 ++++++++++
 dev-util/osc/osc-0.169.1.ebuild                    | 66 ----------------------
 dev-util/osc/osc-0.171.0.ebuild                    | 65 ---------------------
 .../{osc-0.171.0-r1.ebuild => osc-0.172.0.ebuild}  |  2 +
 dev-util/osc/osc-9999.ebuild                       |  2 +
 6 files changed, 36 insertions(+), 133 deletions(-)

diff --git a/dev-util/osc/Manifest b/dev-util/osc/Manifest
index 64b38634d..4c01f835d 100644
--- a/dev-util/osc/Manifest
+++ b/dev-util/osc/Manifest
@@ -1,2 +1 @@
-DIST osc-0.169.1.tar.gz 357179 BLAKE2B d65b6b238aff7cd9c4e5e1509318bfcb4bccdb00c363485c4ae106fab40051f9e5f5b4b76baca3ac25b0cf64d66d0003b3580fcd930511aa6ea7c8d36d7f50e7 SHA512 9429864bcc61c47505c8924cdf35164289f55adf890bc6f28e3fb6063438a53722384594512e3c12662dffc1d31b84f2b292af873d72b3de552a27aa4403ab16
-DIST osc-0.171.0.tar.gz 360391 BLAKE2B acc4687c1b084e6ec997e4c4215fe940f9f850ec2ded849676e86bd2b133367459fcbe90a2d3adea1ace249eaa6efed24e107a8f899698836feb33d6eed38ecb SHA512 21a2ef400a64b88c5f588aa80667f2bbb8dbfaf78b55b041d9db4f5cd92548ff8339d5add86ffbf597d913bb804f87c28d68cb2cb2f6923facdddb8044974bf3
+DIST osc-0.172.0.tar.gz 360976 BLAKE2B 99f625c4d702127dd54dd7b64027b217f0f5e7272a9104115201d01733ec5c230e465a572eaafb41bbc4c4e46f6a237dc3ed9d425f9837eb78a589c9badaf80e SHA512 3c7d6f37472d6805e1aafc7f2fb20bf841ac894d51f5bcb8026d9109cf8898104decb52ab9f99169cdd27724e9549edef134c8eaf24d206bd4e3317c7c249401

diff --git a/dev-util/osc/files/osc-no-man-compression.patch b/dev-util/osc/files/osc-no-man-compression.patch
new file mode 100644
index 000000000..0b8dcf7ef
--- /dev/null
+++ b/dev-util/osc/files/osc-no-man-compression.patch
@@ -0,0 +1,31 @@
+--- a/setup.py
++++ b/setup.py
+@@ -3,7 +3,6 @@
+ from distutils.core import setup
+ import distutils.core
+ from distutils.command import build, install_data
+-import gzip
+ import os.path
+ import sys
+ 
+@@ -29,9 +28,9 @@
+     def build_man_page(self):
+         """
+         """
+-        man_path = os.path.join(self.build_base, 'osc.1.gz')
++        man_path = os.path.join(self.build_base, 'osc.1')
+         distutils.log.info('generating %s' % man_path)
+-        outfile = gzip.open(man_path, 'wt')
++        outfile = open(man_path, 'w')
+         osccli = commandline.Osc(stdout=outfile)
+         # FIXME: we cannot call the main method because osc expects an ~/.oscrc
+         # file (this would break builds in environments like the obs)
+@@ -100,7 +99,7 @@
+ 
+ data_files = []
+ if sys.platform[:3] != 'win':
+-    data_files.append((os.path.join('share', 'man', 'man1'), ['osc.1.gz']))
++    data_files.append((os.path.join('share', 'man', 'man1'), ['osc.1']))
+ 
+ with open("README") as fh:
+     long_description = fh.read()

diff --git a/dev-util/osc/osc-0.169.1.ebuild b/dev-util/osc/osc-0.169.1.ebuild
deleted file mode 100644
index ace0feb56..000000000
--- a/dev-util/osc/osc-0.169.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-PYTHON_REQ_USE="xml"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="Command line tool for Open Build Service"
-HOMEPAGE="https://en.opensuse.org/openSUSE:OSC https://github.com/openSUSE/osc"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/openSUSE/${PN}.git"
-
-	inherit git-r3
-else
-	SRC_URI="https://github.com/openSUSE/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	OBS_PROJECT="openSUSE:Tools"
-
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-# Test require config file: osc.oscerr.NoConfigfile
-RESTRICT="test"
-
-RDEPEND="
-	app-arch/rpm[python,${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/m2crypto[${PYTHON_USEDEP}]
-	')
-	${PYTHON_SINGLE_DEPS}
-"
-
-BDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	')
-	test? (
-		${RDEPEND}
-		$(python_gen_cond_dep '
-			dev-python/path-py[${PYTHON_USEDEP}]
-	')
-)"
-
-distutils_enable_tests pytest
-# Bug: https://bugs.gentoo.org/704520
-#distutils_enable_sphinx docs dev-python/alabaster
-
-src_install() {
-	distutils-r1_src_install
-
-	dosym osc-wrapper.py /usr/bin/osc
-	rm -f "${ED}/usr/share/doc/${PN}"*/TODO*
-	insinto /usr/share/bash-completion/completions
-	newins dist/complete.sh osc
-	insinto /usr/lib/osc
-	newins dist/osc.complete complete
-	insinto /usr/share/zsh/site-functions
-	newins "${FILESDIR}/osc.zsh_completion" _osc
-}

diff --git a/dev-util/osc/osc-0.171.0.ebuild b/dev-util/osc/osc-0.171.0.ebuild
deleted file mode 100644
index 7969127ae..000000000
--- a/dev-util/osc/osc-0.171.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="xml"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="Command line tool for Open Build Service"
-HOMEPAGE="
-	https://en.opensuse.org/openSUSE:OSC
-	https://github.com/openSUSE/osc
-"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/openSUSE/${PN}.git"
-else
-	OBS_PROJECT="openSUSE:Tools"
-	SRC_URI="https://github.com/openSUSE/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-# Test require config file: osc.oscerr.NoConfigfile
-RESTRICT="test"
-
-RDEPEND="
-	app-arch/rpm[python,${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/m2crypto[${PYTHON_USEDEP}]
-	')
-	${PYTHON_SINGLE_DEPS}
-"
-BDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	')
-	test? (
-		${RDEPEND}
-		$(python_gen_cond_dep '
-			dev-python/path-py[${PYTHON_USEDEP}]
-	')
-)"
-
-distutils_enable_tests pytest
-# Bug: https://bugs.gentoo.org/704520
-#distutils_enable_sphinx docs dev-python/alabaster
-
-src_install() {
-	distutils-r1_src_install
-
-	dosym osc-wrapper.py /usr/bin/osc
-	rm -f "${ED}/usr/share/doc/${PN}"*/TODO*
-	insinto /usr/share/bash-completion/completions
-	newins dist/complete.sh osc
-	insinto /usr/lib/osc
-	newins dist/osc.complete complete
-	insinto /usr/share/zsh/site-functions
-	newins "${FILESDIR}/osc.zsh_completion" _osc
-}

diff --git a/dev-util/osc/osc-0.171.0-r1.ebuild b/dev-util/osc/osc-0.172.0.ebuild
similarity index 96%
rename from dev-util/osc/osc-0.171.0-r1.ebuild
rename to dev-util/osc/osc-0.172.0.ebuild
index 02af4e71b..d85b0bb5d 100644
--- a/dev-util/osc/osc-0.171.0-r1.ebuild
+++ b/dev-util/osc/osc-0.172.0.ebuild
@@ -47,6 +47,8 @@ BDEPEND="
 	')
 )"
 
+PATCHES=( "${FILESDIR}"/${PN}-no-man-compression.patch )
+
 distutils_enable_tests pytest
 # Bug: https://bugs.gentoo.org/704520
 #distutils_enable_sphinx docs dev-python/alabaster

diff --git a/dev-util/osc/osc-9999.ebuild b/dev-util/osc/osc-9999.ebuild
index 02af4e71b..d85b0bb5d 100644
--- a/dev-util/osc/osc-9999.ebuild
+++ b/dev-util/osc/osc-9999.ebuild
@@ -47,6 +47,8 @@ BDEPEND="
 	')
 )"
 
+PATCHES=( "${FILESDIR}"/${PN}-no-man-compression.patch )
+
 distutils_enable_tests pytest
 # Bug: https://bugs.gentoo.org/704520
 #distutils_enable_sphinx docs dev-python/alabaster