public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:dev commit in: dev-util/osc/
@ 2020-12-26 20:33 Alessandro Barbieri
  0 siblings, 0 replies; 6+ messages in thread
From: Alessandro Barbieri @ 2020-12-26 20:33 UTC (permalink / raw
  To: gentoo-commits

commit:     86d6663954ac1affe897e4c444a4ff509a3d9d43
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sat Dec 26 20:31:21 2020 +0000
Commit:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Sat Dec 26 20:33:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=86d66639

dev-util/osc: install fish comp, use eclass for bashcomp

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 dev-util/osc/{osc-9999.ebuild => osc-0.171.0-r1.ebuild} | 9 +++++----
 dev-util/osc/osc-9999.ebuild                            | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/dev-util/osc/osc-9999.ebuild b/dev-util/osc/osc-0.171.0-r1.ebuild
similarity index 87%
copy from dev-util/osc/osc-9999.ebuild
copy to dev-util/osc/osc-0.171.0-r1.ebuild
index 7969127a..02af4e71 100644
--- a/dev-util/osc/osc-9999.ebuild
+++ b/dev-util/osc/osc-0.171.0-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="xml"
 DISTUTILS_SINGLE_IMPL=1
 
-inherit distutils-r1
+inherit bash-completion-r1 distutils-r1
 
 DESCRIPTION="Command line tool for Open Build Service"
 HOMEPAGE="
@@ -55,11 +55,12 @@ 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
+	rm -f "${ED}/usr/share/doc/${PN}"*/TODO* || die
+	newbashcomp dist/complete.sh "${PN}"
 	insinto /usr/lib/osc
 	newins dist/osc.complete complete
 	insinto /usr/share/zsh/site-functions
 	newins "${FILESDIR}/osc.zsh_completion" _osc
+	insinto /usr/share/fish/vendor_completions.d
+	doins osc.fish
 }

diff --git a/dev-util/osc/osc-9999.ebuild b/dev-util/osc/osc-9999.ebuild
index 7969127a..02af4e71 100644
--- a/dev-util/osc/osc-9999.ebuild
+++ b/dev-util/osc/osc-9999.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="xml"
 DISTUTILS_SINGLE_IMPL=1
 
-inherit distutils-r1
+inherit bash-completion-r1 distutils-r1
 
 DESCRIPTION="Command line tool for Open Build Service"
 HOMEPAGE="
@@ -55,11 +55,12 @@ 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
+	rm -f "${ED}/usr/share/doc/${PN}"*/TODO* || die
+	newbashcomp dist/complete.sh "${PN}"
 	insinto /usr/lib/osc
 	newins dist/osc.complete complete
 	insinto /usr/share/zsh/site-functions
 	newins "${FILESDIR}/osc.zsh_completion" _osc
+	insinto /usr/share/fish/vendor_completions.d
+	doins osc.fish
 }


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: dev-util/osc/
@ 2023-04-12  4:04 Jonas Frei
  0 siblings, 0 replies; 6+ messages in thread
From: Jonas Frei @ 2023-04-12  4:04 UTC (permalink / raw
  To: gentoo-commits

commit:     92b8cd8d49637754c6ea92588587b603013d088d
Author:     Jonas Frei <freijon <AT> pm <DOT> me>
AuthorDate: Wed Apr 12 04:03:33 2023 +0000
Commit:     Jonas Frei <freijon <AT> pm <DOT> me>
CommitDate: Wed Apr 12 04:03:33 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=92b8cd8d

dev-util/osc: EAPI 7->8

Signed-off-by: Jonas Frei <freijon <AT> pm.me>

 dev-util/osc/{osc-0.173.0.ebuild => osc-0.173.0-r1.ebuild} | 4 ++--
 dev-util/osc/osc-9999.ebuild                               | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-util/osc/osc-0.173.0.ebuild b/dev-util/osc/osc-0.173.0-r1.ebuild
similarity index 97%
rename from dev-util/osc/osc-0.173.0.ebuild
rename to dev-util/osc/osc-0.173.0-r1.ebuild
index 1dc986843..0e6605a3d 100644
--- a/dev-util/osc/osc-0.173.0.ebuild
+++ b/dev-util/osc/osc-0.173.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_9 )
 PYTHON_REQ_USE="xml"

diff --git a/dev-util/osc/osc-9999.ebuild b/dev-util/osc/osc-9999.ebuild
index 1dc986843..0e6605a3d 100644
--- a/dev-util/osc/osc-9999.ebuild
+++ b/dev-util/osc/osc-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_9 )
 PYTHON_REQ_USE="xml"


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: dev-util/osc/
@ 2023-04-12  4:04 Jonas Frei
  0 siblings, 0 replies; 6+ messages in thread
From: Jonas Frei @ 2023-04-12  4:04 UTC (permalink / raw
  To: gentoo-commits

commit:     2861fbb99dc3fb8bd4b2b5459dd9b163948b2ad8
Author:     Jonas Frei <freijon <AT> pm <DOT> me>
AuthorDate: Wed Apr 12 03:58:28 2023 +0000
Commit:     Jonas Frei <freijon <AT> pm <DOT> me>
CommitDate: Wed Apr 12 04:01:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2861fbb9

dev-util/osc: Make use of 'shell-completion' eclass

Signed-off-by: Jonas Frei <freijon <AT> pm.me>

 dev-util/osc/osc-0.173.0.ebuild | 8 +++-----
 dev-util/osc/osc-9999.ebuild    | 8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/dev-util/osc/osc-0.173.0.ebuild b/dev-util/osc/osc-0.173.0.ebuild
index f9f6b56e8..1dc986843 100644
--- a/dev-util/osc/osc-0.173.0.ebuild
+++ b/dev-util/osc/osc-0.173.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_9 )
 PYTHON_REQ_USE="xml"
 DISTUTILS_SINGLE_IMPL=1
 
-inherit bash-completion-r1 distutils-r1
+inherit distutils-r1 shell-completion
 
 DESCRIPTION="Command line tool for Open Build Service"
 HOMEPAGE="
@@ -61,8 +61,6 @@ src_install() {
 	newbashcomp dist/complete.sh "${PN}"
 	insinto /usr/lib/osc
 	newins dist/osc.complete complete
-	insinto /usr/share/zsh/site-functions
-	newins "${FILESDIR}/osc.zsh_completion" _osc
-	insinto /usr/share/fish/vendor_completions.d
-	doins osc.fish
+	newzshcomp "${FILESDIR}/${PN}.zsh_completion" "_${PN}"
+	dofishcomp "${PN}.fish"
 }

diff --git a/dev-util/osc/osc-9999.ebuild b/dev-util/osc/osc-9999.ebuild
index f9f6b56e8..1dc986843 100644
--- a/dev-util/osc/osc-9999.ebuild
+++ b/dev-util/osc/osc-9999.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_9 )
 PYTHON_REQ_USE="xml"
 DISTUTILS_SINGLE_IMPL=1
 
-inherit bash-completion-r1 distutils-r1
+inherit distutils-r1 shell-completion
 
 DESCRIPTION="Command line tool for Open Build Service"
 HOMEPAGE="
@@ -61,8 +61,6 @@ src_install() {
 	newbashcomp dist/complete.sh "${PN}"
 	insinto /usr/lib/osc
 	newins dist/osc.complete complete
-	insinto /usr/share/zsh/site-functions
-	newins "${FILESDIR}/osc.zsh_completion" _osc
-	insinto /usr/share/fish/vendor_completions.d
-	doins osc.fish
+	newzshcomp "${FILESDIR}/${PN}.zsh_completion" "_${PN}"
+	dofishcomp "${PN}.fish"
 }


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: dev-util/osc/
@ 2020-12-26  9:09 Theo Anderson
  0 siblings, 0 replies; 6+ messages in thread
From: Theo Anderson @ 2020-12-26  9:09 UTC (permalink / raw
  To: gentoo-commits

commit:     504d36625790e8b716983ebcad6df80f3f6ae4b9
Author:     Theo Anderson <telans <AT> posteo <DOT> de>
AuthorDate: Sat Dec 26 08:53:30 2020 +0000
Commit:     Theo Anderson <telans <AT> posteo <DOT> de>
CommitDate: Sat Dec 26 09:09:39 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=504d3662

dev-util/osc: bump to 0.171.0

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Theo Anderson <telans <AT> posteo.de>

 dev-util/osc/Manifest                                |  1 +
 dev-util/osc/{osc-9999.ebuild => osc-0.171.0.ebuild} | 17 ++++++++---------
 dev-util/osc/osc-9999.ebuild                         | 17 ++++++++---------
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/dev-util/osc/Manifest b/dev-util/osc/Manifest
index 4bfd5cd4..64b38634 100644
--- a/dev-util/osc/Manifest
+++ b/dev-util/osc/Manifest
@@ -1 +1,2 @@
 DIST osc-0.169.1.tar.gz 357179 BLAKE2B d65b6b238aff7cd9c4e5e1509318bfcb4bccdb00c363485c4ae106fab40051f9e5f5b4b76baca3ac25b0cf64d66d0003b3580fcd930511aa6ea7c8d36d7f50e7 SHA512 9429864bcc61c47505c8924cdf35164289f55adf890bc6f28e3fb6063438a53722384594512e3c12662dffc1d31b84f2b292af873d72b3de552a27aa4403ab16
+DIST osc-0.171.0.tar.gz 360391 BLAKE2B acc4687c1b084e6ec997e4c4215fe940f9f850ec2ded849676e86bd2b133367459fcbe90a2d3adea1ace249eaa6efed24e107a8f899698836feb33d6eed38ecb SHA512 21a2ef400a64b88c5f588aa80667f2bbb8dbfaf78b55b041d9db4f5cd92548ff8339d5add86ffbf597d913bb804f87c28d68cb2cb2f6923facdddb8044974bf3

diff --git a/dev-util/osc/osc-9999.ebuild b/dev-util/osc/osc-0.171.0.ebuild
similarity index 90%
copy from dev-util/osc/osc-9999.ebuild
copy to dev-util/osc/osc-0.171.0.ebuild
index ace0feb5..7969127a 100644
--- a/dev-util/osc/osc-9999.ebuild
+++ b/dev-util/osc/osc-0.171.0.ebuild
@@ -3,29 +3,29 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+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
-	EGIT_REPO_URI="https://github.com/openSUSE/${PN}.git"
+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
-	SRC_URI="https://github.com/openSUSE/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	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"
 
@@ -36,7 +36,6 @@ RDEPEND="
 	')
 	${PYTHON_SINGLE_DEPS}
 "
-
 BDEPEND="
 	$(python_gen_cond_dep '
 		>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]

diff --git a/dev-util/osc/osc-9999.ebuild b/dev-util/osc/osc-9999.ebuild
index ace0feb5..7969127a 100644
--- a/dev-util/osc/osc-9999.ebuild
+++ b/dev-util/osc/osc-9999.ebuild
@@ -3,29 +3,29 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+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
-	EGIT_REPO_URI="https://github.com/openSUSE/${PN}.git"
+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
-	SRC_URI="https://github.com/openSUSE/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	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"
 
@@ -36,7 +36,6 @@ RDEPEND="
 	')
 	${PYTHON_SINGLE_DEPS}
 "
-
 BDEPEND="
 	$(python_gen_cond_dep '
 		>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: dev-util/osc/
@ 2020-07-12 11:57 Andrew Ammerlaan
  2020-07-12 11:40 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
  0 siblings, 1 reply; 6+ messages in thread
From: Andrew Ammerlaan @ 2020-07-12 11:57 UTC (permalink / raw
  To: gentoo-commits

commit:     8ffcbba913184b6964ce93020e9c5b4ca2e7e0da
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Sun Jul 12 11:39:48 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sun Jul 12 11:39:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8ffcbba9

dev-util/osc: re-add symlinked 9999 ebuild

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 dev-util/osc/osc-9999.ebuild | 67 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 66 insertions(+), 1 deletion(-)

diff --git a/dev-util/osc/osc-9999.ebuild b/dev-util/osc/osc-9999.ebuild
deleted file mode 120000
index bbd5538..0000000
--- a/dev-util/osc/osc-9999.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-osc-0.169.1.ebuild
\ No newline at end of file

diff --git a/dev-util/osc/osc-9999.ebuild b/dev-util/osc/osc-9999.ebuild
new file mode 100644
index 0000000..1b9a14e
--- /dev/null
+++ b/dev-util/osc/osc-9999.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,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
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: dev-util/osc/
@ 2020-07-12 11:29 Andrew Ammerlaan
  0 siblings, 0 replies; 6+ messages in thread
From: Andrew Ammerlaan @ 2020-07-12 11:29 UTC (permalink / raw
  To: gentoo-commits

commit:     0d55fe4286cdc29205a82278d2c2efa30ad8d980
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Sun Jul 12 11:29:12 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sun Jul 12 11:29:12 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0d55fe42

dev-util/osc: fixup ebuild

-removed symlink
-tests need config file, so restricted
-move keywords into first if statement
-cleanup inherit line
-fix indentation
-quote unquoted variable

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 dev-util/osc/Manifest           |  2 +-
 dev-util/osc/metadata.xml       |  2 --
 dev-util/osc/osc-0.169.1.ebuild | 64 +++++++++++++++++++----------------------
 3 files changed, 31 insertions(+), 37 deletions(-)

diff --git a/dev-util/osc/Manifest b/dev-util/osc/Manifest
index 43866cf..4bfd5cd 100644
--- a/dev-util/osc/Manifest
+++ b/dev-util/osc/Manifest
@@ -1 +1 @@
-DIST 0.169.1.tar.gz 357179 BLAKE2B d65b6b238aff7cd9c4e5e1509318bfcb4bccdb00c363485c4ae106fab40051f9e5f5b4b76baca3ac25b0cf64d66d0003b3580fcd930511aa6ea7c8d36d7f50e7 SHA512 9429864bcc61c47505c8924cdf35164289f55adf890bc6f28e3fb6063438a53722384594512e3c12662dffc1d31b84f2b292af873d72b3de552a27aa4403ab16
+DIST osc-0.169.1.tar.gz 357179 BLAKE2B d65b6b238aff7cd9c4e5e1509318bfcb4bccdb00c363485c4ae106fab40051f9e5f5b4b76baca3ac25b0cf64d66d0003b3580fcd930511aa6ea7c8d36d7f50e7 SHA512 9429864bcc61c47505c8924cdf35164289f55adf890bc6f28e3fb6063438a53722384594512e3c12662dffc1d31b84f2b292af873d72b3de552a27aa4403ab16

diff --git a/dev-util/osc/metadata.xml b/dev-util/osc/metadata.xml
index 0bcb748..5e122db 100644
--- a/dev-util/osc/metadata.xml
+++ b/dev-util/osc/metadata.xml
@@ -9,5 +9,3 @@
     Subversion-like client for Open Build Service - http://open-build-service.org/ It serves as client for the source code repository part of the build service, and it is used to edit metadata or query about build results.
   </longdescription>
 </pkgmetadata>
-
-<!-- vim:set sts=2 ts=2 sw=2 et: -->

diff --git a/dev-util/osc/osc-0.169.1.ebuild b/dev-util/osc/osc-0.169.1.ebuild
index cac3c5d..1b9a14e 100644
--- a/dev-util/osc/osc-0.169.1.ebuild
+++ b/dev-util/osc/osc-0.169.1.ebuild
@@ -5,66 +5,62 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,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"
-	EXTRA_ECLASS="git-r3"
+
+	inherit git-r3
 else
-	SRC_URI="https://github.com/openSUSE/${PN}/archive/${PV}.tar.gz"
+	SRC_URI="https://github.com/openSUSE/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	OBS_PROJECT="openSUSE:Tools"
-fi
-
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 ${EXTRA_ECLASS}
-unset EXTRA_ECLASS
 
-DESCRIPTION="Command line tool for Open Build Service"
-HOMEPAGE="https://en.opensuse.org/openSUSE:OSC"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
 
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ "${PV}" == "9999" ]] || \
-KEYWORDS="~amd64 ~x86"
+# 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_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}]
-                ')
-        )
-"
+	$(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
-
-src_prepare() {
-	distutils-r1_src_prepare
-}
+# 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*
+	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
+	newins "${FILESDIR}/osc.zsh_completion" _osc
 }
-
-# vim:set sts=2 ts=2 sw=2 et:


^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-04-12  4:04 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-26 20:33 [gentoo-commits] repo/proj/guru:dev commit in: dev-util/osc/ Alessandro Barbieri
  -- strict thread matches above, loose matches on Subject: below --
2023-04-12  4:04 Jonas Frei
2023-04-12  4:04 Jonas Frei
2020-12-26  9:09 Theo Anderson
2020-07-12 11:57 [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
2020-07-12 11:40 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
2020-07-12 11:29 Andrew Ammerlaan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox