public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:dev commit in: dev-util/devscripts/
@ 2021-07-05  8:44 Alessandro Barbieri
  0 siblings, 0 replies; 4+ messages in thread
From: Alessandro Barbieri @ 2021-07-05  8:44 UTC (permalink / raw
  To: gentoo-commits

commit:     9e94b5e1cb4ff0eefd1a7d26c9cfb8677879c019
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Mon Jul  5 08:41:17 2021 +0000
Commit:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Mon Jul  5 08:41:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9e94b5e1

dev-util/devscripts: add 2.21.3

Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 dev-util/devscripts/Manifest                 |   1 +
 dev-util/devscripts/devscripts-2.21.3.ebuild | 120 +++++++++++++++++++++++++++
 2 files changed, 121 insertions(+)

diff --git a/dev-util/devscripts/Manifest b/dev-util/devscripts/Manifest
index a372dd94f..457d5db0b 100644
--- a/dev-util/devscripts/Manifest
+++ b/dev-util/devscripts/Manifest
@@ -1 +1,2 @@
 DIST devscripts_2.21.2.tar.xz 980516 BLAKE2B 907f2f4e258a8396ad0a28eead1e2058b8e19be205f024ea80c0fbd9621d5ca4299844fe83d66cac7f653a917705d9c36eddb9d51454a7fbb9d7e2b52bc994ff SHA512 a6765d807dc0c2ef7a3d8c59e1262bfe7542c3ca52cda3c1910af253925cb105a9d1bf272c76a86f0b3cdda9c8a4e2d29a660437f73087dd70ee8a444bbedb01
+DIST devscripts_2.21.3.tar.xz 980408 BLAKE2B 99207ed58c0fdc592ce491ddda79a2ecb22a8975ef70828749bf58dff9cc94f63779025b3f0326d0c2c49ca768a7e651b1f9e7843e6da298c25340916334de25 SHA512 84122dd36de7961c26044ac8b8eeee2c0aae1dd4a811b5f0d522fe43488dad2872aa044ad1f38a78e49f9d13d8c19eb583a8082d636caeebb188f1dd4f1caec7

diff --git a/dev-util/devscripts/devscripts-2.21.3.ebuild b/dev-util/devscripts/devscripts-2.21.3.ebuild
new file mode 100644
index 000000000..03de260d6
--- /dev/null
+++ b/dev-util/devscripts/devscripts-2.21.3.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL=true
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Scripts to make the life of a Debian Package maintainer easier"
+HOMEPAGE="https://salsa.debian.org/debian/devscripts"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="python test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	dev-lang/perl:=
+	dev-perl/File-DesktopEntry
+	dev-perl/File-DirList
+	dev-perl/File-HomeDir
+	dev-perl/File-Touch
+	dev-perl/IPC-Run
+	dev-perl/Moo
+	dev-perl/libwww-perl
+	dev-util/distro-info
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${CDEPEND}
+	test? (
+		app-arch/zip
+		dev-perl/Git-Wrapper
+		dev-perl/GitLab-API-v4
+		dev-perl/List-Compare
+		dev-perl/Software-License
+		dev-perl/String-ShellQuote
+		dev-perl/UNIVERSAL-require
+		dev-python/pyftpdlib[${PYTHON_USEDEP}]
+		dev-python/python-debian[${PYTHON_USEDEP}]
+		dev-util/shunit2
+		dev-vcs/subversion
+		sys-libs/libfaketime
+		virtual/perl-DB_File
+	)
+"
+RDEPEND="${CDEPEND}
+	app-arch/dpkg
+	app-crypt/gnupg
+	app-text/wdiff
+	dev-util/debhelper
+	dev-util/patchutils
+	sys-apps/fakeroot
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/distutils-r1.patch"
+	"${FILESDIR}/Remove-failing-tests.patch"
+	"${FILESDIR}/Replace-Debian-xsl-stylesheets-paths-with-Gentoos.patch"
+)
+
+DISTUTILS_S="${S}"/scripts
+
+src_prepare() {
+	default
+
+	# Avoid file collision with app-shells/bash-completion
+	rm "${DISTUTILS_S}"/bts.bash_completion || die
+}
+
+src_configure() {
+	default
+
+	if use python; then
+		pushd "${DISTUTILS_S}" > /dev/null || die
+		distutils-r1_src_configure
+		popd > /dev/null || die
+	fi
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		pushd "${DISTUTILS_S}" > /dev/null || die
+		distutils-r1_src_compile
+		popd > /dev/null || die
+	fi
+}
+
+src_install() {
+	dodir /usr/bin
+	default
+
+	if use python; then
+		pushd "${DISTUTILS_S}" > /dev/null || die
+		distutils-r1_src_install
+		popd > /dev/null || die
+	fi
+
+	mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die
+
+	# "incorrect name, no completions for command defined"
+	rm "${ED}"/usr/share/bash-completion/completions/{debcheckout,pkgnames} || die
+}
+
+src_test() {
+	default
+
+	if use python; then
+		pushd "${DISTUTILS_S}" > /dev/null || die
+		distutils-r1_src_test
+		popd > /dev/null || die
+	fi
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: dev-util/devscripts/
@ 2021-12-01 19:49 Andrew Ammerlaan
  0 siblings, 0 replies; 4+ messages in thread
From: Andrew Ammerlaan @ 2021-12-01 19:49 UTC (permalink / raw
  To: gentoo-commits

commit:     99835817e46b4bec6ec7fa748af5a94ce173715f
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  1 19:49:07 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Dec  1 19:49:07 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=99835817

dev-util/devscripts: drop py3.8

py3.8 dropped on dep python-debian

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-util/devscripts/devscripts-2.21.2.ebuild | 2 +-
 dev-util/devscripts/devscripts-2.21.3.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/devscripts/devscripts-2.21.2.ebuild b/dev-util/devscripts/devscripts-2.21.2.ebuild
index 3cfa68704..cc8992264 100644
--- a/dev-util/devscripts/devscripts-2.21.2.ebuild
+++ b/dev-util/devscripts/devscripts-2.21.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_9 )
 DISTUTILS_OPTIONAL=true
 
 inherit distutils-r1

diff --git a/dev-util/devscripts/devscripts-2.21.3.ebuild b/dev-util/devscripts/devscripts-2.21.3.ebuild
index 03de260d6..db63f9def 100644
--- a/dev-util/devscripts/devscripts-2.21.3.ebuild
+++ b/dev-util/devscripts/devscripts-2.21.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_OPTIONAL=true
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_9 )
 
 inherit distutils-r1
 


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: dev-util/devscripts/
@ 2022-03-20  1:30 Alessandro Barbieri
  0 siblings, 0 replies; 4+ messages in thread
From: Alessandro Barbieri @ 2022-03-20  1:30 UTC (permalink / raw
  To: gentoo-commits

commit:     98873dec676c81a5bd3cfe353ae190058aa40f6d
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sun Mar 20 01:17:36 2022 +0000
Commit:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Sun Mar 20 01:30:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=98873dec

dev-util/devscripts: add 2.22.1, drop 2.21.2

Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 dev-util/devscripts/Manifest                       |  2 +-
 ...ipts-2.21.2.ebuild => devscripts-2.22.1.ebuild} | 47 ++++++++++++----------
 2 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/dev-util/devscripts/Manifest b/dev-util/devscripts/Manifest
index 457d5db0b..8bfe80aaf 100644
--- a/dev-util/devscripts/Manifest
+++ b/dev-util/devscripts/Manifest
@@ -1,2 +1,2 @@
-DIST devscripts_2.21.2.tar.xz 980516 BLAKE2B 907f2f4e258a8396ad0a28eead1e2058b8e19be205f024ea80c0fbd9621d5ca4299844fe83d66cac7f653a917705d9c36eddb9d51454a7fbb9d7e2b52bc994ff SHA512 a6765d807dc0c2ef7a3d8c59e1262bfe7542c3ca52cda3c1910af253925cb105a9d1bf272c76a86f0b3cdda9c8a4e2d29a660437f73087dd70ee8a444bbedb01
 DIST devscripts_2.21.3.tar.xz 980408 BLAKE2B 99207ed58c0fdc592ce491ddda79a2ecb22a8975ef70828749bf58dff9cc94f63779025b3f0326d0c2c49ca768a7e651b1f9e7843e6da298c25340916334de25 SHA512 84122dd36de7961c26044ac8b8eeee2c0aae1dd4a811b5f0d522fe43488dad2872aa044ad1f38a78e49f9d13d8c19eb583a8082d636caeebb188f1dd4f1caec7
+DIST devscripts_2.22.1.tar.xz 989556 BLAKE2B 2a2e3ca9757c710e181e807f0369c137f21070d86b4c51d8b5132ca4add33677edbd26e04a2faae93e9e4586080286888880ce450119579aa40ad205c8e5d857 SHA512 260603e1a655035c5aca3c9734db1bc6aa7e9aa017ece7e9158c57e06a1ee548922ec2defdd9dcb4560743d78aef08d30695b1bc833bd4d77fe1c7497d157c45

diff --git a/dev-util/devscripts/devscripts-2.21.2.ebuild b/dev-util/devscripts/devscripts-2.22.1.ebuild
similarity index 63%
rename from dev-util/devscripts/devscripts-2.21.2.ebuild
rename to dev-util/devscripts/devscripts-2.22.1.ebuild
index cc8992264..528027700 100644
--- a/dev-util/devscripts/devscripts-2.21.2.ebuild
+++ b/dev-util/devscripts/devscripts-2.22.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_9 )
 DISTUTILS_OPTIONAL=true
+PYTHON_COMPAT=( python3_{9..10} )
 
-inherit distutils-r1
+inherit bash-completion-r1 distutils-r1
 
 DESCRIPTION="Scripts to make the life of a Debian Package maintainer easier"
 HOMEPAGE="https://salsa.debian.org/debian/devscripts"
@@ -16,8 +16,6 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="python test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
 
 CDEPEND="
 	dev-lang/perl:=
@@ -31,7 +29,9 @@ CDEPEND="
 	dev-util/distro-info
 	python? ( ${PYTHON_DEPS} )
 "
-DEPEND="${CDEPEND}
+DEPEND="
+	${CDEPEND}
+	app-text/docbook-xsl-stylesheets
 	test? (
 		app-arch/zip
 		dev-perl/Git-Wrapper
@@ -48,7 +48,8 @@ DEPEND="${CDEPEND}
 		virtual/perl-DB_File
 	)
 "
-RDEPEND="${CDEPEND}
+RDEPEND="
+	${CDEPEND}
 	app-arch/dpkg
 	app-crypt/gnupg
 	app-text/wdiff
@@ -58,19 +59,24 @@ RDEPEND="${CDEPEND}
 "
 BDEPEND="virtual/pkgconfig"
 
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( python )
+"
+RESTRICT="!test? ( test )"
 PATCHES=(
 	"${FILESDIR}/distutils-r1.patch"
 	"${FILESDIR}/Remove-failing-tests.patch"
 	"${FILESDIR}/Replace-Debian-xsl-stylesheets-paths-with-Gentoos.patch"
 )
 
-DISTUTILS_S="${S}"/scripts
+DISTUTILS_S="${S}/scripts"
 
 src_prepare() {
 	default
 
 	# Avoid file collision with app-shells/bash-completion
-	rm "${DISTUTILS_S}"/bts.bash_completion || die
+	rm "${DISTUTILS_S}/bts.bash_completion" || die
 }
 
 src_configure() {
@@ -78,7 +84,7 @@ src_configure() {
 
 	if use python; then
 		pushd "${DISTUTILS_S}" > /dev/null || die
-		distutils-r1_src_configure
+		python_foreach_impl distutils-r1_src_configure
 		popd > /dev/null || die
 	fi
 }
@@ -88,7 +94,7 @@ src_compile() {
 
 	if use python; then
 		pushd "${DISTUTILS_S}" > /dev/null || die
-		distutils-r1_src_compile
+		python_foreach_impl distutils-r1_src_compile
 		popd > /dev/null || die
 	fi
 }
@@ -99,22 +105,21 @@ src_install() {
 
 	if use python; then
 		pushd "${DISTUTILS_S}" > /dev/null || die
-		distutils-r1_src_install
+		python_foreach_impl distutils-r1_src_install
 		popd > /dev/null || die
 	fi
 
-	mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die
+	mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${PF}" || die
 
-	# "incorrect name, no completions for command defined"
-	rm "${ED}"/usr/share/bash-completion/completions/{debcheckout,pkgnames} || die
+	rm "${ED}/usr/share/bash-completion/completions/debcheckout" || die
+	mv "${ED}"/usr/share/bash-completion/completions/{pkgnames,debsnap} || die
+	bashcomp_alias debsnap wnpp-alert wnpp-check mk-build-deps rmadison mass-bug dd-list build-rdeps who-uploads transition-check getbuildlog grep-excuses rc-alert whodepends dget pts-subscribe pts-unsubscribe
 }
 
 src_test() {
 	default
 
-	if use python; then
-		pushd "${DISTUTILS_S}" > /dev/null || die
-		distutils-r1_src_test
-		popd > /dev/null || die
-	fi
+	pushd "${DISTUTILS_S}" > /dev/null || die
+	python_foreach_impl distutils-r1_src_test
+	popd > /dev/null || die
 }


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: dev-util/devscripts/
@ 2022-05-02 20:01 Alessandro Barbieri
  0 siblings, 0 replies; 4+ messages in thread
From: Alessandro Barbieri @ 2022-05-02 20:01 UTC (permalink / raw
  To: gentoo-commits

commit:     354a3e8ba8c62da9d2549bdc127087ba89d5d691
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Mon May  2 08:14:45 2022 +0000
Commit:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Mon May  2 20:01:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=354a3e8b

dev-util/devscripts: conflict with checkbashisms

Closes: https://bugs.gentoo.org/842111
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 dev-util/devscripts/devscripts-2.22.1-r1.ebuild | 126 ++++++++++++++++++++++++
 1 file changed, 126 insertions(+)

diff --git a/dev-util/devscripts/devscripts-2.22.1-r1.ebuild b/dev-util/devscripts/devscripts-2.22.1-r1.ebuild
new file mode 100644
index 000000000..11fcf9f20
--- /dev/null
+++ b/dev-util/devscripts/devscripts-2.22.1-r1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL=true
+PYTHON_COMPAT=( python3_{9..10} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Scripts to make the life of a Debian Package maintainer easier"
+HOMEPAGE="https://salsa.debian.org/debian/devscripts"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="python test"
+
+CDEPEND="
+	dev-lang/perl:=
+	dev-perl/File-DesktopEntry
+	dev-perl/File-DirList
+	dev-perl/File-HomeDir
+	dev-perl/File-Touch
+	dev-perl/IPC-Run
+	dev-perl/Moo
+	dev-perl/libwww-perl
+	dev-util/distro-info
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="
+	${CDEPEND}
+	app-text/docbook-xsl-stylesheets
+	test? (
+		app-arch/zip
+		dev-perl/Git-Wrapper
+		dev-perl/GitLab-API-v4
+		dev-perl/List-Compare
+		dev-perl/Software-License
+		dev-perl/String-ShellQuote
+		dev-perl/UNIVERSAL-require
+		dev-python/pyftpdlib[${PYTHON_USEDEP}]
+		dev-python/python-debian[${PYTHON_USEDEP}]
+		dev-util/shunit2
+		dev-vcs/subversion
+		sys-libs/libfaketime
+		virtual/perl-DB_File
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	app-arch/dpkg
+	app-crypt/gnupg
+	app-text/wdiff
+	!dev-util/checkbashisms
+	dev-util/debhelper
+	dev-util/patchutils
+	sys-apps/fakeroot
+"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( python )
+"
+RESTRICT="!test? ( test )"
+PATCHES=(
+	"${FILESDIR}/distutils-r1.patch"
+	"${FILESDIR}/Remove-failing-tests.patch"
+	"${FILESDIR}/Replace-Debian-xsl-stylesheets-paths-with-Gentoos.patch"
+)
+
+DISTUTILS_S="${S}/scripts"
+
+src_prepare() {
+	default
+
+	# Avoid file collision with app-shells/bash-completion
+	rm "${DISTUTILS_S}/bts.bash_completion" || die
+}
+
+src_configure() {
+	default
+
+	if use python; then
+		pushd "${DISTUTILS_S}" > /dev/null || die
+		python_foreach_impl distutils-r1_src_configure
+		popd > /dev/null || die
+	fi
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		pushd "${DISTUTILS_S}" > /dev/null || die
+		python_foreach_impl distutils-r1_src_compile
+		popd > /dev/null || die
+	fi
+}
+
+src_install() {
+	dodir /usr/bin
+	default
+
+	if use python; then
+		pushd "${DISTUTILS_S}" > /dev/null || die
+		python_foreach_impl distutils-r1_src_install
+		popd > /dev/null || die
+	fi
+
+	mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${PF}" || die
+
+	rm "${ED}/usr/share/bash-completion/completions/debcheckout" || die
+	mv "${ED}"/usr/share/bash-completion/completions/{pkgnames,debsnap} || die
+	bashcomp_alias debsnap wnpp-alert wnpp-check mk-build-deps rmadison mass-bug dd-list build-rdeps who-uploads transition-check getbuildlog grep-excuses rc-alert whodepends dget pts-subscribe pts-unsubscribe
+}
+
+src_test() {
+	default
+
+	pushd "${DISTUTILS_S}" > /dev/null || die
+	python_foreach_impl distutils-r1_src_test
+	popd > /dev/null || die
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2022-05-02 20:01 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-02 20:01 [gentoo-commits] repo/proj/guru:dev commit in: dev-util/devscripts/ Alessandro Barbieri
  -- strict thread matches above, loose matches on Subject: below --
2022-03-20  1:30 Alessandro Barbieri
2021-12-01 19:49 Andrew Ammerlaan
2021-07-05  8:44 Alessandro Barbieri

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