[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2022-01-29  6:20 Sam James
  0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2022-01-29  6:20 UTC (permalink / raw
  To: gentoo-commits

commit:     4a60b4b2e933461519049e8ed72eeb87cb109116
Author:     Martin Gysel <me <AT> bearsh <DOT> org>
AuthorDate: Thu Jan 20 19:28:39 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 29 06:19:22 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a60b4b2

dev-vcs/git-cola: version bump to 3.12.0

Closes: https://bugs.gentoo.org/831630
Signed-off-by: Martin Gysel <me <AT> bearsh.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-vcs/git-cola/Manifest               |   1 +
 dev-vcs/git-cola/git-cola-3.12.0.ebuild | 109 ++++++++++++++++++++++++++++++++
 2 files changed, 110 insertions(+)

diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index f160122dd063..6d06c491524e 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1,2 +1,3 @@
 DIST git-cola-3.10.1.tar.gz 996036 BLAKE2B 2d705b853cf67a0f437d8dc77d46d5804124af600f872717c832843586d3c739e67a79ebe50ba2a8db38afd4217a7bb94db9cb8e27d51a00087ced340f4877d6 SHA512 79496023bfaa05049079eec2cdaf8449a6598faebedb4a13acf178209edc63e725eb1b003700a1dcfee09072d34e5a49d7053f070e45b498562cc124cd0582d4
 DIST git-cola-3.11.0.tar.gz 997046 BLAKE2B 7a8270c30e0cbd919dcd6f8e38ca420257630717e535ef11ed337fde2461b544453b20363906a5b769cd23d96ca77ce72d71729f46ae6abada83ae4d33628cbc SHA512 f05862b9b27ff5dfe9b220bbee4f3f455a7ce98acaa0bb0a8cdbb44f8cb97ce265df036ba48d5abb0bf46a91fd782cd73a67ca544b4662d36e8023e92c80b541
+DIST git-cola-3.12.0.tar.gz 1004892 BLAKE2B 9396768256341e59500dffc95136e710b2d3d1c9d5cb4d70fc7fba8e81e16a3656006b5558dae417fbbad7baf1373d953708006b96a8873f68502ea469462326 SHA512 4b8ec716f572682747f43ae1a9232612d95d44384d28bbf97ef461a93546cdfcc81125f816b4c8ea5efcf4d23f42edeb8a89df3c7167ceac4709eeeaf49965a9

diff --git a/dev-vcs/git-cola/git-cola-3.12.0.ebuild b/dev-vcs/git-cola/git-cola-3.12.0.ebuild
new file mode 100644
index 000000000000..1aa8af03490f
--- /dev/null
+++ b/dev-vcs/git-cola/git-cola-3.12.0.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_SINGLE_IMPL=true
+DISTUTILS_USE_SETUPTOOLS=no
+inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils
+
+DESCRIPTION="The highly caffeinated git GUI"
+HOMEPAGE="https://git-cola.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/QtPy[gui,network,${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+	')
+	dev-vcs/git
+"
+BDEPEND="sys-devel/gettext
+	$(python_gen_cond_dep "
+		doc? ( dev-python/sphinx[\${PYTHON_USEDEP}] )
+		test? (
+			${VIRTUALX_DEPEND}
+			dev-python/pytest[\${PYTHON_USEDEP}]
+			dev-python/pytest-flake8[\${PYTHON_USEDEP}]
+			dev-python/mock[\${PYTHON_USEDEP}]
+			dev-python/PyQt5[\${PYTHON_USEDEP},gui,widgets]
+		)
+	")
+"
+
+python_prepare_all() {
+	# make sure that tests also use the system provided QtPy
+	rm -r qtpy || die
+
+	rm share/git-cola/bin/*askpass* || die
+
+	# don't install docs into wrong location
+	sed -i -e '/doc/d' setup.py || die
+
+	# fix doc directory reference
+	sed -i \
+		-e "s/'doc', 'git-cola'/'doc', '${PF}'/" \
+		cola/resources.py || die
+
+	# fix ssh-askpass directory reference
+	sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	DISTUTILS_ARGS=( --no-vendor-libs --no-private-libs )
+}
+
+python_compile_all() {
+	cd share/doc/${PN}/ || die
+	if use doc ; then
+		emake all
+	else
+		sed \
+			-e '/^install:/s:install-html::g' \
+			-e '/^install:/s:install-man::g' \
+			-i Makefile || die
+	fi
+}
+
+python_test() {
+	GIT_CONFIG_NOSYSTEM=true \
+	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C.utf8" \
+	virtx epytest cola test
+}
+
+python_install_all() {
+	cd share/doc/${PN}/ || die
+	emake \
+		DESTDIR="${D}" \
+		docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		prefix="${EPREFIX}/usr" \
+		install
+
+	# remove empty bin folder
+	rm -R "${ED}"/usr/share/git-cola/bin || die
+
+	use doc || HTML_DOCS=( "${FILESDIR}"/index.html )
+
+	distutils-r1_python_install_all
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2024-10-02 18:10 Andreas Sturmlechner
  0 siblings, 0 replies; 60+ messages in thread
From: Andreas Sturmlechner @ 2024-10-02 18:10 UTC (permalink / raw
  To: gentoo-commits

commit:     9baac046e97c5b86902e9582a63e9e289fff13fe
Author:     David Roman <davidroman96 <AT> gmail <DOT> com>
AuthorDate: Wed Oct  2 17:47:30 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Oct  2 18:09:15 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9baac046

dev-vcs/git-cola: use pyqt6, remove pyqt5 and pyside support

Signed-off-by: David Roman <droman <AT> ifae.es>
Closes: https://github.com/gentoo/gentoo/pull/38853
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-vcs/git-cola/git-cola-4.8.2-r1.ebuild | 72 +++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)

diff --git a/dev-vcs/git-cola/git-cola-4.8.2-r1.ebuild b/dev-vcs/git-cola/git-cola-4.8.2-r1.ebuild
new file mode 100644
index 000000000000..c4cf267205ec
--- /dev/null
+++ b/dev-vcs/git-cola/git-cola-4.8.2-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+DISTUTILS_SINGLE_IMPL=true
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 readme.gentoo-r1 virtualx xdg
+
+DESCRIPTION="The highly caffeinated git GUI"
+HOMEPAGE="https://git-cola.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/polib[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/QtPy[pyqt6,gui,network,${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+	')
+	dev-vcs/git
+"
+BDEPEND="
+	sys-devel/gettext
+	$(python_gen_cond_dep "
+		dev-python/setuptools-scm[\${PYTHON_USEDEP}]
+		test? (
+			dev-python/pytest[\${PYTHON_USEDEP}]
+			dev-python/QtPy[pyqt6,gui,network,\${PYTHON_USEDEP}]
+		)
+	")
+"
+
+distutils_enable_sphinx docs \
+	'dev-python/rst-linker'
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i "s|doc/git-cola =|doc/${PF} =|" setup.cfg || die
+	# remove bundled qtpy and polib
+	rm -Rf qtpy cola/polib.py || die
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	cd "${T}" || die
+	GIT_CONFIG_NOSYSTEM=true LC_ALL="C.utf8" \
+	epytest "${S}"/test
+}
+
+src_compile() {
+	SETUPTOOLS_SCM_PRETEND_VERSION=${PV} distutils-r1_src_compile
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	# patch the binaries to use desired qtpy backend
+	sed -i "s|import sys|import sys\nimport os\nos.environ['QT_API'] = 'pyqt6'\n|" "${D}"/usr/bin/* || die
+
+	readme.gentoo_create_doc
+}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2024-10-02 18:10 Andreas Sturmlechner
  0 siblings, 0 replies; 60+ messages in thread
From: Andreas Sturmlechner @ 2024-10-02 18:10 UTC (permalink / raw
  To: gentoo-commits

commit:     85b7f2ba9b62b9db1e3325fd2e683563bd6abdbc
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  2 18:07:41 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Oct  2 18:09:37 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85b7f2ba

dev-vcs/git-cola: drop 4.8.2

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-vcs/git-cola/git-cola-4.8.2.ebuild | 88 ----------------------------------
 dev-vcs/git-cola/metadata.xml          |  6 ---
 2 files changed, 94 deletions(-)

diff --git a/dev-vcs/git-cola/git-cola-4.8.2.ebuild b/dev-vcs/git-cola/git-cola-4.8.2.ebuild
deleted file mode 100644
index 1e6aa2ca09cf..000000000000
--- a/dev-vcs/git-cola/git-cola-4.8.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-DISTUTILS_SINGLE_IMPL=true
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 readme.gentoo-r1 virtualx xdg
-
-DESCRIPTION="The highly caffeinated git GUI"
-HOMEPAGE="https://git-cola.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+pyqt5 pyqt6 pyside2 pyside6"
-
-REQUIRED_USE="
-	|| ( pyqt5 pyqt6 pyside2 pyside6 )
-"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/polib[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		pyqt5? ( dev-python/QtPy[pyqt5,gui,network,${PYTHON_USEDEP}] )
-		pyqt6? ( dev-python/QtPy[pyqt6,gui,network,${PYTHON_USEDEP}] )
-		pyside2? ( dev-python/QtPy[pyside2,gui,network,${PYTHON_USEDEP}] )
-		pyside6? ( dev-python/QtPy[pyside6,gui,network,${PYTHON_USEDEP}] )
-		dev-python/send2trash[${PYTHON_USEDEP}]
-	')
-	dev-vcs/git
-"
-BDEPEND="
-	sys-devel/gettext
-	$(python_gen_cond_dep "
-		dev-python/setuptools-scm[\${PYTHON_USEDEP}]
-		test? (
-			${VIRTUALX_DEPEND}
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			pyqt5? ( dev-python/QtPy[\${PYTHON_USEDEP},pyqt5,gui,network] )
-			pyqt6? ( dev-python/QtPy[\${PYTHON_USEDEP},pyqt6,gui,network] )
-			pyside2? ( dev-python/QtPy[\${PYTHON_USEDEP},pyside2,gui,network] )
-			pyside6? ( dev-python/QtPy[\${PYTHON_USEDEP},pyside6,gui,network] )
-		)
-	")
-"
-
-distutils_enable_sphinx docs \
-	'dev-python/rst-linker'
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i "s|doc/git-cola =|doc/${PF} =|" setup.cfg || die
-	# remove bundled qtpy and polib
-	rm -Rf "${S}"/qtpy "${S}"/cola/polib.py || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	cd "${T}" || die
-	GIT_CONFIG_NOSYSTEM=true LC_ALL="C.utf8" \
-	epytest "${S}"/test
-}
-
-src_compile() {
-	SETUPTOOLS_SCM_PRETEND_VERSION=${PV} distutils-r1_src_compile
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	# patch the binaries to use desired qtpy backend
-	local qt_api=$(use pyqt5 && echo "pyqt5" || (
-		use pyqt6 && echo "pyqt6" || (
-		use pyside2 && echo "pyside2" || echo "pyside6"
-	)))
-	sed -i "s|import sys|import sys\nimport os\nos.environ['QT_API'] = '${qt_api}'\n|" "${D}"/usr/bin/* || die
-
-	readme.gentoo_create_doc
-}

diff --git a/dev-vcs/git-cola/metadata.xml b/dev-vcs/git-cola/metadata.xml
index f723b2794ff6..b01ac73fc379 100644
--- a/dev-vcs/git-cola/metadata.xml
+++ b/dev-vcs/git-cola/metadata.xml
@@ -16,10 +16,4 @@
 	<upstream>
 		<remote-id type="github">git-cola/git-cola</remote-id>
 	</upstream>
-	<use>
-		<flag name="pyqt5">Use <pkg>dev-python/PyQt5</pkg> as Qt backend</flag>
-		<flag name="pyqt6">Use <pkg>dev-python/PyQt6</pkg> as Qt backend</flag>
-		<flag name="pyside2">Use <pkg>dev-python/pyside2</pkg> as Qt backend</flag>
-		<flag name="pyside6">Use <pkg>dev-python/pyside6</pkg> as Qt backend</flag>
-	</use>
 </pkgmetadata>


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2024-10-01 18:32 Andreas Sturmlechner
  0 siblings, 0 replies; 60+ messages in thread
From: Andreas Sturmlechner @ 2024-10-01 18:32 UTC (permalink / raw
  To: gentoo-commits

commit:     053db8aca7cc3f7d16a79269301ee1fbbc4abc8e
Author:     David Roman <droman <AT> ifae <DOT> es>
AuthorDate: Tue Sep 10 12:47:39 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct  1 18:31:02 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=053db8ac

dev-vcs/git-cola: add 4.8.2

Closes: https://bugs.gentoo.org/926353
Signed-off-by: David Roman <droman <AT> ifae.es>
Closes: https://github.com/gentoo/gentoo/pull/38550
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-vcs/git-cola/Manifest              |  1 +
 dev-vcs/git-cola/git-cola-4.8.2.ebuild | 88 ++++++++++++++++++++++++++++++++++
 dev-vcs/git-cola/metadata.xml          |  6 +++
 3 files changed, 95 insertions(+)

diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 1008de4d8dbb..5e5aabe85934 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1 +1,2 @@
 DIST git-cola-4.5.0.tar.gz 1233372 BLAKE2B da9bbe2d1e49b5ebc49ae6ddecf72a73b4b262de2de6c5a9ef77d9946a338bb393154e91e8431dc11fc08f72e3fcfd19d424d68c2b846d05c0a87393f8cc33ac SHA512 99a17bf0398dc3049417b6af6f3fc3bc20682186859879c6fc3d2b8f9a8b3599612c555b40f76dd226323cefab0dec0b4424a566dc74637449743f675cb56817
+DIST git-cola-4.8.2.tar.gz 1251173 BLAKE2B 758b34e271883c5493e9a219e7f9970c1ca2e0cdb97bbab50828ea53ae2bae223692a06c353d0b017af2e82b3855708ebd2937d9656b373b8d45ab457ac50b7b SHA512 0b924837e8e5dcaa9687ffdff779bd3ed9f629713826f6c537d6470fdaed84bab3cec793aa9f1cf0e7bce3c4dae60c838822005efa93236b5964c8be74ef33cc

diff --git a/dev-vcs/git-cola/git-cola-4.8.2.ebuild b/dev-vcs/git-cola/git-cola-4.8.2.ebuild
new file mode 100644
index 000000000000..b584bdddea8c
--- /dev/null
+++ b/dev-vcs/git-cola/git-cola-4.8.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+DISTUTILS_SINGLE_IMPL=true
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 readme.gentoo-r1 virtualx xdg
+
+DESCRIPTION="The highly caffeinated git GUI"
+HOMEPAGE="https://git-cola.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+pyqt5 pyqt6 pyside2 pyside6"
+
+REQUIRED_USE="
+	|| ( pyqt5 pyqt6 pyside2 pyside6 )
+"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/polib[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		pyqt5? ( dev-python/QtPy[pyqt5,gui,network,${PYTHON_USEDEP}] )
+		pyqt6? ( dev-python/QtPy[pyqt6,gui,network,${PYTHON_USEDEP}] )
+		pyside2? ( dev-python/QtPy[pyside2,gui,network,${PYTHON_USEDEP}] )
+		pyside6? ( dev-python/QtPy[pyside6,gui,network,${PYTHON_USEDEP}] )
+		dev-python/send2trash[${PYTHON_USEDEP}]
+	')
+	dev-vcs/git
+"
+BDEPEND="
+	sys-devel/gettext
+	$(python_gen_cond_dep "
+		dev-python/setuptools-scm[\${PYTHON_USEDEP}]
+		test? (
+			${VIRTUALX_DEPEND}
+			dev-python/pytest[\${PYTHON_USEDEP}]
+			pyqt5? ( dev-python/QtPy[\${PYTHON_USEDEP},pyqt5,gui,network] )
+			pyqt6? ( dev-python/QtPy[\${PYTHON_USEDEP},pyqt6,gui,network] )
+			pyside2? ( dev-python/QtPy[\${PYTHON_USEDEP},pyside2,gui,network] )
+			pyside6? ( dev-python/QtPy[\${PYTHON_USEDEP},pyside6,gui,network] )
+		)
+	")
+"
+
+distutils_enable_sphinx docs \
+	'dev-python/rst-linker'
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i "s|doc/git-cola =|doc/${PF} =|" setup.cfg || die
+	# remove bundled qtpy and polib
+	rm -Rf "${S}"/qtpy "${S}"/cola/polib.py || die
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	cd "${T}" || die
+	GIT_CONFIG_NOSYSTEM=true LC_ALL="C.utf8" \
+	epytest "${S}"/test
+}
+
+src_compile() {
+	SETUPTOOLS_SCM_PRETEND_VERSION=${PV} distutils-r1_src_compile
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	# patch the binaries to use desired qtpy backend
+	local qt_api=$(use pyqt5 && echo "pyqt5" || (
+		use pyqt6 && echo "pyqt6" || (
+		use pyside2 && echo "pyside2" || echo "pyside6"
+	)))
+	sed -i "s|import sys|import sys\nimport os\nos.environ['QT_API'] = '${qt_api}'\n|" "${D}"/usr/bin/* || die
+
+	readme.gentoo_create_doc
+}

diff --git a/dev-vcs/git-cola/metadata.xml b/dev-vcs/git-cola/metadata.xml
index b01ac73fc379..f723b2794ff6 100644
--- a/dev-vcs/git-cola/metadata.xml
+++ b/dev-vcs/git-cola/metadata.xml
@@ -16,4 +16,10 @@
 	<upstream>
 		<remote-id type="github">git-cola/git-cola</remote-id>
 	</upstream>
+	<use>
+		<flag name="pyqt5">Use <pkg>dev-python/PyQt5</pkg> as Qt backend</flag>
+		<flag name="pyqt6">Use <pkg>dev-python/PyQt6</pkg> as Qt backend</flag>
+		<flag name="pyside2">Use <pkg>dev-python/pyside2</pkg> as Qt backend</flag>
+		<flag name="pyside6">Use <pkg>dev-python/pyside6</pkg> as Qt backend</flag>
+	</use>
 </pkgmetadata>


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2024-10-01 18:32 Andreas Sturmlechner
  0 siblings, 0 replies; 60+ messages in thread
From: Andreas Sturmlechner @ 2024-10-01 18:32 UTC (permalink / raw
  To: gentoo-commits

commit:     38ed7a87be1cc19d90f1be78876bc3d77c4406a5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  1 18:30:14 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct  1 18:31:02 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38ed7a87

dev-vcs/git-cola: re-add keyword 4.8.2 for ~x86

See also: https://github.com/gentoo/gentoo/pull/38550
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-vcs/git-cola/git-cola-4.8.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-vcs/git-cola/git-cola-4.8.2.ebuild b/dev-vcs/git-cola/git-cola-4.8.2.ebuild
index b584bdddea8c..1e6aa2ca09cf 100644
--- a/dev-vcs/git-cola/git-cola-4.8.2.ebuild
+++ b/dev-vcs/git-cola/git-cola-4.8.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="+pyqt5 pyqt6 pyside2 pyside6"
 
 REQUIRED_USE="


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2024-10-01 18:32 Andreas Sturmlechner
  0 siblings, 0 replies; 60+ messages in thread
From: Andreas Sturmlechner @ 2024-10-01 18:32 UTC (permalink / raw
  To: gentoo-commits

commit:     5a662aa3a656f2fa1fa8016aea91854ebe282588
Author:     David Roman <droman <AT> ifae <DOT> es>
AuthorDate: Tue Sep 10 12:17:01 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct  1 18:31:02 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a662aa3

dev-vcs/git-cola: drop 4.1.0, 4.2.1-r1, 4.4.1

Signed-off-by: David Roman <droman <AT> ifae.es>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-vcs/git-cola/Manifest                 |  3 --
 dev-vcs/git-cola/git-cola-4.1.0.ebuild    | 79 ------------------------------
 dev-vcs/git-cola/git-cola-4.2.1-r1.ebuild | 80 -------------------------------
 dev-vcs/git-cola/git-cola-4.4.1.ebuild    | 67 --------------------------
 4 files changed, 229 deletions(-)

diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 21d6ba773b12..1008de4d8dbb 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1,4 +1 @@
-DIST git-cola-4.1.0.tar.gz 1140393 BLAKE2B 3236e06f86d23a7311e3cd639cbf2adcecb18810abcae938d1ff7cf25b477d814e614fffa20ce39dd9a2c6ab4f8e6b6b67f3ad3144163abe6530ac227313ca98 SHA512 4d2617947d4dbf3273f02c072de5ede10a656981f3653273780e2c1b1d3d613cd359fbb93cfb0a1d5de24b0c90818503cd9041ad3fa1a05b2ecd2db305bbe1a0
-DIST git-cola-4.2.1.tar.gz 1191680 BLAKE2B 8dd9d4b52672e32deba2f54e7f9141d3364dcbf3a823b05e766f333063a26cc49ea9e5e2f43f9492447b6b7344c930a2a1160653fb2699ff7d23cb22783f4cd1 SHA512 1a9d63c985d3566f81edd3ed3debc4d499fa5147650d479f3b1bc833d08836a17d63a8eb23c1cd5c2c31f6f7202219fb77cacb628df8f85dd3d367dcdd110891
-DIST git-cola-4.4.1.tar.gz 1212338 BLAKE2B 8f95720fa8af0acdecf744f657808b969f914bfd1cb2ccd2ed3af35f2811ab8aca7022ba888e0fc447a685af4c7dba27a0f0305f0b2d07cc31ccd22953d4fa14 SHA512 3e4e1cb8cd148b34e663c72c6b3d1e887815b5a86558ffbf13a19a5dfd3fb6b37c123290dc514b6f098893587dc67ca34424aaad5482768795e353f0efe92797
 DIST git-cola-4.5.0.tar.gz 1233372 BLAKE2B da9bbe2d1e49b5ebc49ae6ddecf72a73b4b262de2de6c5a9ef77d9946a338bb393154e91e8431dc11fc08f72e3fcfd19d424d68c2b846d05c0a87393f8cc33ac SHA512 99a17bf0398dc3049417b6af6f3fc3bc20682186859879c6fc3d2b8f9a8b3599612c555b40f76dd226323cefab0dec0b4424a566dc74637449743f675cb56817

diff --git a/dev-vcs/git-cola/git-cola-4.1.0.ebuild b/dev-vcs/git-cola/git-cola-4.1.0.ebuild
deleted file mode 100644
index 09761dd50b1e..000000000000
--- a/dev-vcs/git-cola/git-cola-4.1.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_SINGLE_IMPL=true
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils
-
-DESCRIPTION="The highly caffeinated git GUI"
-HOMEPAGE="https://git-cola.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]
-		dev-python/QtPy[gui,network,${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-	')
-	dev-vcs/git
-"
-BDEPEND="
-	sys-devel/gettext
-	$(python_gen_cond_dep "
-		dev-python/setuptools-scm[\${PYTHON_USEDEP}]
-		test? (
-			${VIRTUALX_DEPEND}
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			dev-python/PyQt5[\${PYTHON_USEDEP},gui,widgets]
-		)
-	")
-"
-
-distutils_enable_sphinx docs \
-	'dev-python/rst-linker'
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i "s|doc/git-cola =|doc/${PF} =|" setup.cfg || die
-	sed -i -e 's:--flake8::' pytest.ini || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	cd "${T}" || die
-	GIT_CONFIG_NOSYSTEM=true LC_ALL="C.utf8" \
-	epytest "${S}"/test
-}
-
-src_compile() {
-	SETUPTOOLS_SCM_PRETEND_VERSION=${PV} distutils-r1_src_compile
-}
-
-src_install() {
-	distutils-r1_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}

diff --git a/dev-vcs/git-cola/git-cola-4.2.1-r1.ebuild b/dev-vcs/git-cola/git-cola-4.2.1-r1.ebuild
deleted file mode 100644
index 6edb3f03319f..000000000000
--- a/dev-vcs/git-cola/git-cola-4.2.1-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_SINGLE_IMPL=true
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils
-
-DESCRIPTION="The highly caffeinated git GUI"
-HOMEPAGE="https://git-cola.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]
-		dev-python/QtPy[gui,network,${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-	')
-	dev-vcs/git
-"
-BDEPEND="
-	sys-devel/gettext
-	$(python_gen_cond_dep "
-		dev-python/setuptools-scm[\${PYTHON_USEDEP}]
-		test? (
-			${VIRTUALX_DEPEND}
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			dev-python/PyQt5[\${PYTHON_USEDEP},gui,widgets]
-		)
-	")
-"
-# https://bugs.gentoo.org/920534
-PATCHES=( "${FILESDIR}/${P}-fix-setuptools.patch" )
-
-distutils_enable_sphinx docs \
-	'dev-python/rst-linker'
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i "s|doc/git-cola =|doc/${PF} =|" setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	cd "${T}" || die
-	GIT_CONFIG_NOSYSTEM=true LC_ALL="C.utf8" \
-	epytest "${S}"/test
-}
-
-src_compile() {
-	SETUPTOOLS_SCM_PRETEND_VERSION=${PV} distutils-r1_src_compile
-}
-
-src_install() {
-	distutils-r1_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}

diff --git a/dev-vcs/git-cola/git-cola-4.4.1.ebuild b/dev-vcs/git-cola/git-cola-4.4.1.ebuild
deleted file mode 100644
index fe84fd6d276d..000000000000
--- a/dev-vcs/git-cola/git-cola-4.4.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_SINGLE_IMPL=true
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 readme.gentoo-r1 virtualx xdg
-
-DESCRIPTION="The highly caffeinated git GUI"
-HOMEPAGE="https://git-cola.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]
-		dev-python/QtPy[gui,network,${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-	')
-	dev-vcs/git
-"
-BDEPEND="
-	sys-devel/gettext
-	$(python_gen_cond_dep "
-		dev-python/setuptools-scm[\${PYTHON_USEDEP}]
-		test? (
-			${VIRTUALX_DEPEND}
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			dev-python/PyQt5[\${PYTHON_USEDEP},gui,widgets]
-		)
-	")
-"
-
-distutils_enable_sphinx docs \
-	'dev-python/rst-linker'
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i "s|doc/git-cola =|doc/${PF} =|" setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	cd "${T}" || die
-	GIT_CONFIG_NOSYSTEM=true LC_ALL="C.utf8" \
-	epytest "${S}"/test
-}
-
-src_compile() {
-	SETUPTOOLS_SCM_PRETEND_VERSION=${PV} distutils-r1_src_compile
-}
-
-src_install() {
-	distutils-r1_src_install
-	readme.gentoo_create_doc
-}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2024-04-23  6:38 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2024-04-23  6:38 UTC (permalink / raw
  To: gentoo-commits

commit:     aa554e49ba8dde457426d51bbda3c7c8bc9be8d4
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 23 06:37:42 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Apr 23 06:38:07 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa554e49

dev-vcs/git-cola: Stabilize 4.5.0 amd64, #930423

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-vcs/git-cola/git-cola-4.5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-vcs/git-cola/git-cola-4.5.0.ebuild b/dev-vcs/git-cola/git-cola-4.5.0.ebuild
index 50363b9e7adb..b1495dcaf476 100644
--- a/dev-vcs/git-cola/git-cola-4.5.0.ebuild
+++ b/dev-vcs/git-cola/git-cola-4.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2024-04-23  1:31 Sam James
  0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2024-04-23  1:31 UTC (permalink / raw
  To: gentoo-commits

commit:     077de8e2eca7f1b014ad43cca0f6e275a3992db0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 23 01:30:54 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 23 01:30:54 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=077de8e2

dev-vcs/git-cola: Stabilize 4.5.0 x86, #930423

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-vcs/git-cola/git-cola-4.5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-vcs/git-cola/git-cola-4.5.0.ebuild b/dev-vcs/git-cola/git-cola-4.5.0.ebuild
index 198112123abf..50363b9e7adb 100644
--- a/dev-vcs/git-cola/git-cola-4.5.0.ebuild
+++ b/dev-vcs/git-cola/git-cola-4.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2024-01-28 10:22 Yixun Lan
  0 siblings, 0 replies; 60+ messages in thread
From: Yixun Lan @ 2024-01-28 10:22 UTC (permalink / raw
  To: gentoo-commits

commit:     071e77401276c1b094a40e6bb8b6ee4d2fc76eb8
Author:     Martin Gysel <me <AT> bearsh <DOT> org>
AuthorDate: Sat Jan 27 13:27:31 2024 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Sun Jan 28 10:21:44 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=071e7740

dev-vcs/git-cola: add 4.5.0

Closes: https://bugs.gentoo.org/923027
Closes: https://github.com/gentoo/gentoo/pull/35043
Signed-off-by: Martin Gysel <me <AT> bearsh.org>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 dev-vcs/git-cola/Manifest              |  1 +
 dev-vcs/git-cola/git-cola-4.5.0.ebuild | 67 ++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+)

diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 07c8df143593..21d6ba773b12 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1,3 +1,4 @@
 DIST git-cola-4.1.0.tar.gz 1140393 BLAKE2B 3236e06f86d23a7311e3cd639cbf2adcecb18810abcae938d1ff7cf25b477d814e614fffa20ce39dd9a2c6ab4f8e6b6b67f3ad3144163abe6530ac227313ca98 SHA512 4d2617947d4dbf3273f02c072de5ede10a656981f3653273780e2c1b1d3d613cd359fbb93cfb0a1d5de24b0c90818503cd9041ad3fa1a05b2ecd2db305bbe1a0
 DIST git-cola-4.2.1.tar.gz 1191680 BLAKE2B 8dd9d4b52672e32deba2f54e7f9141d3364dcbf3a823b05e766f333063a26cc49ea9e5e2f43f9492447b6b7344c930a2a1160653fb2699ff7d23cb22783f4cd1 SHA512 1a9d63c985d3566f81edd3ed3debc4d499fa5147650d479f3b1bc833d08836a17d63a8eb23c1cd5c2c31f6f7202219fb77cacb628df8f85dd3d367dcdd110891
 DIST git-cola-4.4.1.tar.gz 1212338 BLAKE2B 8f95720fa8af0acdecf744f657808b969f914bfd1cb2ccd2ed3af35f2811ab8aca7022ba888e0fc447a685af4c7dba27a0f0305f0b2d07cc31ccd22953d4fa14 SHA512 3e4e1cb8cd148b34e663c72c6b3d1e887815b5a86558ffbf13a19a5dfd3fb6b37c123290dc514b6f098893587dc67ca34424aaad5482768795e353f0efe92797
+DIST git-cola-4.5.0.tar.gz 1233372 BLAKE2B da9bbe2d1e49b5ebc49ae6ddecf72a73b4b262de2de6c5a9ef77d9946a338bb393154e91e8431dc11fc08f72e3fcfd19d424d68c2b846d05c0a87393f8cc33ac SHA512 99a17bf0398dc3049417b6af6f3fc3bc20682186859879c6fc3d2b8f9a8b3599612c555b40f76dd226323cefab0dec0b4424a566dc74637449743f675cb56817

diff --git a/dev-vcs/git-cola/git-cola-4.5.0.ebuild b/dev-vcs/git-cola/git-cola-4.5.0.ebuild
new file mode 100644
index 000000000000..198112123abf
--- /dev/null
+++ b/dev-vcs/git-cola/git-cola-4.5.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_SINGLE_IMPL=true
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 readme.gentoo-r1 virtualx xdg
+
+DESCRIPTION="The highly caffeinated git GUI"
+HOMEPAGE="https://git-cola.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]
+		dev-python/QtPy[gui,network,${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+	')
+	dev-vcs/git
+"
+BDEPEND="
+	sys-devel/gettext
+	$(python_gen_cond_dep "
+		dev-python/setuptools-scm[\${PYTHON_USEDEP}]
+		test? (
+			${VIRTUALX_DEPEND}
+			dev-python/pytest[\${PYTHON_USEDEP}]
+			dev-python/PyQt5[\${PYTHON_USEDEP},gui,widgets]
+		)
+	")
+"
+
+distutils_enable_sphinx docs \
+	'dev-python/rst-linker'
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i "s|doc/git-cola =|doc/${PF} =|" setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	cd "${T}" || die
+	GIT_CONFIG_NOSYSTEM=true LC_ALL="C.utf8" \
+	epytest "${S}"/test
+}
+
+src_compile() {
+	SETUPTOOLS_SCM_PRETEND_VERSION=${PV} distutils-r1_src_compile
+}
+
+src_install() {
+	distutils-r1_src_install
+	readme.gentoo_create_doc
+}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2023-12-23 17:38 Sam James
  0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2023-12-23 17:38 UTC (permalink / raw
  To: gentoo-commits

commit:     94431a6e5e7fdbee9569af095e0b37025bd02f85
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 23 17:36:22 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 23 17:37:58 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94431a6e

dev-vcs/git-cola: backport PythonMissingSCMDependency fix

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-vcs/git-cola/git-cola-4.1.0.ebuild    | 6 ++++--
 dev-vcs/git-cola/git-cola-4.2.1-r1.ebuild | 6 ++++--
 dev-vcs/git-cola/git-cola-4.4.1.ebuild    | 3 ++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/dev-vcs/git-cola/git-cola-4.1.0.ebuild b/dev-vcs/git-cola/git-cola-4.1.0.ebuild
index b4db3a7d1dfa..09761dd50b1e 100644
--- a/dev-vcs/git-cola/git-cola-4.1.0.ebuild
+++ b/dev-vcs/git-cola/git-cola-4.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 DISTUTILS_SINGLE_IMPL=true
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils
@@ -29,8 +29,10 @@ RDEPEND="
 	')
 	dev-vcs/git
 "
-BDEPEND="sys-devel/gettext
+BDEPEND="
+	sys-devel/gettext
 	$(python_gen_cond_dep "
+		dev-python/setuptools-scm[\${PYTHON_USEDEP}]
 		test? (
 			${VIRTUALX_DEPEND}
 			dev-python/pytest[\${PYTHON_USEDEP}]

diff --git a/dev-vcs/git-cola/git-cola-4.2.1-r1.ebuild b/dev-vcs/git-cola/git-cola-4.2.1-r1.ebuild
index 14d1a8b01c21..6edb3f03319f 100644
--- a/dev-vcs/git-cola/git-cola-4.2.1-r1.ebuild
+++ b/dev-vcs/git-cola/git-cola-4.2.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 DISTUTILS_SINGLE_IMPL=true
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils
@@ -29,8 +29,10 @@ RDEPEND="
 	')
 	dev-vcs/git
 "
-BDEPEND="sys-devel/gettext
+BDEPEND="
+	sys-devel/gettext
 	$(python_gen_cond_dep "
+		dev-python/setuptools-scm[\${PYTHON_USEDEP}]
 		test? (
 			${VIRTUALX_DEPEND}
 			dev-python/pytest[\${PYTHON_USEDEP}]

diff --git a/dev-vcs/git-cola/git-cola-4.4.1.ebuild b/dev-vcs/git-cola/git-cola-4.4.1.ebuild
index c2bc009b2da0..fe84fd6d276d 100644
--- a/dev-vcs/git-cola/git-cola-4.4.1.ebuild
+++ b/dev-vcs/git-cola/git-cola-4.4.1.ebuild
@@ -26,7 +26,8 @@ RDEPEND="
 	')
 	dev-vcs/git
 "
-BDEPEND="sys-devel/gettext
+BDEPEND="
+	sys-devel/gettext
 	$(python_gen_cond_dep "
 		dev-python/setuptools-scm[\${PYTHON_USEDEP}]
 		test? (


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2023-12-23 17:31 Sam James
  0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2023-12-23 17:31 UTC (permalink / raw
  To: gentoo-commits

commit:     5cdb2bd751685b03b615e6da5dcc18eab5467d00
Author:     Martin Gysel <me <AT> bearsh <DOT> org>
AuthorDate: Sat Dec 23 14:37:52 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 23 17:30:24 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cdb2bd7

dev-vcs/git-cola: add 4.4.1

Bug: https://bugs.gentoo.org/920572
Bug: https://bugs.gentoo.org/920534
Signed-off-by: Martin Gysel <me <AT> bearsh.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-vcs/git-cola/Manifest              |  1 +
 dev-vcs/git-cola/git-cola-4.4.1.ebuild | 66 ++++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+)

diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 2e80cc913ec8..17b7fa3feb36 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -2,3 +2,4 @@ DIST git-cola-4.0.1.tar.gz 1018819 BLAKE2B 523264bbee38526d12db5ad975d78c72ef6c0
 DIST git-cola-4.1.0.tar.gz 1140393 BLAKE2B 3236e06f86d23a7311e3cd639cbf2adcecb18810abcae938d1ff7cf25b477d814e614fffa20ce39dd9a2c6ab4f8e6b6b67f3ad3144163abe6530ac227313ca98 SHA512 4d2617947d4dbf3273f02c072de5ede10a656981f3653273780e2c1b1d3d613cd359fbb93cfb0a1d5de24b0c90818503cd9041ad3fa1a05b2ecd2db305bbe1a0
 DIST git-cola-4.2.1.tar.gz 1191680 BLAKE2B 8dd9d4b52672e32deba2f54e7f9141d3364dcbf3a823b05e766f333063a26cc49ea9e5e2f43f9492447b6b7344c930a2a1160653fb2699ff7d23cb22783f4cd1 SHA512 1a9d63c985d3566f81edd3ed3debc4d499fa5147650d479f3b1bc833d08836a17d63a8eb23c1cd5c2c31f6f7202219fb77cacb628df8f85dd3d367dcdd110891
 DIST git-cola-4.3.1.tar.gz 1205221 BLAKE2B 01a481569f603f2760d2200467721ccff0a03931ecc762d320be8c7071b81539b3d1bab089284168bfba2d34ab210366c59bf252b3a028ccd1733d0899a724dc SHA512 35d1fd877a27199ee3fbf6cf6ded0754370c23b6d198eb79422f95c21e2c8cb058671af27776c9c207bdb0d6fa0114ddc713654a2e91b2931c5000a9e5573f6c
+DIST git-cola-4.4.1.tar.gz 1212338 BLAKE2B 8f95720fa8af0acdecf744f657808b969f914bfd1cb2ccd2ed3af35f2811ab8aca7022ba888e0fc447a685af4c7dba27a0f0305f0b2d07cc31ccd22953d4fa14 SHA512 3e4e1cb8cd148b34e663c72c6b3d1e887815b5a86558ffbf13a19a5dfd3fb6b37c123290dc514b6f098893587dc67ca34424aaad5482768795e353f0efe92797

diff --git a/dev-vcs/git-cola/git-cola-4.4.1.ebuild b/dev-vcs/git-cola/git-cola-4.4.1.ebuild
new file mode 100644
index 000000000000..c2bc009b2da0
--- /dev/null
+++ b/dev-vcs/git-cola/git-cola-4.4.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_SINGLE_IMPL=true
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 readme.gentoo-r1 virtualx xdg
+
+DESCRIPTION="The highly caffeinated git GUI"
+HOMEPAGE="https://git-cola.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]
+		dev-python/QtPy[gui,network,${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+	')
+	dev-vcs/git
+"
+BDEPEND="sys-devel/gettext
+	$(python_gen_cond_dep "
+		dev-python/setuptools-scm[\${PYTHON_USEDEP}]
+		test? (
+			${VIRTUALX_DEPEND}
+			dev-python/pytest[\${PYTHON_USEDEP}]
+			dev-python/PyQt5[\${PYTHON_USEDEP},gui,widgets]
+		)
+	")
+"
+
+distutils_enable_sphinx docs \
+	'dev-python/rst-linker'
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i "s|doc/git-cola =|doc/${PF} =|" setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	cd "${T}" || die
+	GIT_CONFIG_NOSYSTEM=true LC_ALL="C.utf8" \
+	epytest "${S}"/test
+}
+
+src_compile() {
+	SETUPTOOLS_SCM_PRETEND_VERSION=${PV} distutils-r1_src_compile
+}
+
+src_install() {
+	distutils-r1_src_install
+	readme.gentoo_create_doc
+}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2023-12-23 17:31 Sam James
  0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2023-12-23 17:31 UTC (permalink / raw
  To: gentoo-commits

commit:     7f91475ee303adfa0ccc204753ca8ce01d6209d5
Author:     Martin Gysel <me <AT> bearsh <DOT> org>
AuthorDate: Sat Dec 23 14:41:17 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 23 17:30:40 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f91475e

dev-vcs/git-cola: drop 4.3.1

Bug: https://bugs.gentoo.org/920534
Signed-off-by: Martin Gysel <me <AT> bearsh.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-vcs/git-cola/Manifest              |  1 -
 dev-vcs/git-cola/git-cola-4.3.1.ebuild | 67 ----------------------------------
 2 files changed, 68 deletions(-)

diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 17b7fa3feb36..b67cd6d63bd8 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1,5 +1,4 @@
 DIST git-cola-4.0.1.tar.gz 1018819 BLAKE2B 523264bbee38526d12db5ad975d78c72ef6c0dae98566f5a8b5d51b115d222c8aa6daab838ba67fa4c697391c8f58d4b05ddb7920bf65913d217f562aabd352f SHA512 c02150997982c1f8ce65a5f021364fc4c346339f5be4104f82ba6f7688cc05bad3d764e2cf920a22c5f209dc4b857c789907ff58c0d2809bc7ca7c3481b045fd
 DIST git-cola-4.1.0.tar.gz 1140393 BLAKE2B 3236e06f86d23a7311e3cd639cbf2adcecb18810abcae938d1ff7cf25b477d814e614fffa20ce39dd9a2c6ab4f8e6b6b67f3ad3144163abe6530ac227313ca98 SHA512 4d2617947d4dbf3273f02c072de5ede10a656981f3653273780e2c1b1d3d613cd359fbb93cfb0a1d5de24b0c90818503cd9041ad3fa1a05b2ecd2db305bbe1a0
 DIST git-cola-4.2.1.tar.gz 1191680 BLAKE2B 8dd9d4b52672e32deba2f54e7f9141d3364dcbf3a823b05e766f333063a26cc49ea9e5e2f43f9492447b6b7344c930a2a1160653fb2699ff7d23cb22783f4cd1 SHA512 1a9d63c985d3566f81edd3ed3debc4d499fa5147650d479f3b1bc833d08836a17d63a8eb23c1cd5c2c31f6f7202219fb77cacb628df8f85dd3d367dcdd110891
-DIST git-cola-4.3.1.tar.gz 1205221 BLAKE2B 01a481569f603f2760d2200467721ccff0a03931ecc762d320be8c7071b81539b3d1bab089284168bfba2d34ab210366c59bf252b3a028ccd1733d0899a724dc SHA512 35d1fd877a27199ee3fbf6cf6ded0754370c23b6d198eb79422f95c21e2c8cb058671af27776c9c207bdb0d6fa0114ddc713654a2e91b2931c5000a9e5573f6c
 DIST git-cola-4.4.1.tar.gz 1212338 BLAKE2B 8f95720fa8af0acdecf744f657808b969f914bfd1cb2ccd2ed3af35f2811ab8aca7022ba888e0fc447a685af4c7dba27a0f0305f0b2d07cc31ccd22953d4fa14 SHA512 3e4e1cb8cd148b34e663c72c6b3d1e887815b5a86558ffbf13a19a5dfd3fb6b37c123290dc514b6f098893587dc67ca34424aaad5482768795e353f0efe92797

diff --git a/dev-vcs/git-cola/git-cola-4.3.1.ebuild b/dev-vcs/git-cola/git-cola-4.3.1.ebuild
deleted file mode 100644
index 4f9e775c09e5..000000000000
--- a/dev-vcs/git-cola/git-cola-4.3.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_SINGLE_IMPL=true
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 readme.gentoo-r1 virtualx xdg
-
-DESCRIPTION="The highly caffeinated git GUI"
-HOMEPAGE="https://git-cola.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]
-		dev-python/QtPy[gui,network,${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-	')
-	dev-vcs/git
-"
-BDEPEND="sys-devel/gettext
-	$(python_gen_cond_dep "
-		test? (
-			${VIRTUALX_DEPEND}
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			dev-python/PyQt5[\${PYTHON_USEDEP},gui,widgets]
-		)
-	")
-"
-
-distutils_enable_sphinx docs \
-	'dev-python/rst-linker'
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i "s|doc/git-cola =|doc/${PF} =|" setup.cfg || die
-	# https://github.com/git-cola/git-cola/pull/1336
-	sed -E -i 's|root \+ os.sep|str\(root\)|' extras/sphinxtogithub/sphinxtogithub.py || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	cd "${T}" || die
-	GIT_CONFIG_NOSYSTEM=true LC_ALL="C.utf8" \
-	epytest "${S}"/test
-}
-
-src_compile() {
-	SETUPTOOLS_SCM_PRETEND_VERSION=${PV} distutils-r1_src_compile
-}
-
-src_install() {
-	distutils-r1_src_install
-	readme.gentoo_create_doc
-}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2023-12-23 17:31 Sam James
  0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2023-12-23 17:31 UTC (permalink / raw
  To: gentoo-commits

commit:     609303a19ef83a6d354fef99244f812ce7b512cc
Author:     Martin Gysel <me <AT> bearsh <DOT> org>
AuthorDate: Sat Dec 23 14:49:34 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 23 17:30:41 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=609303a1

dev-vcs/git-cola: drop 4.0.1

Signed-off-by: Martin Gysel <me <AT> bearsh.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-vcs/git-cola/Manifest              |  1 -
 dev-vcs/git-cola/git-cola-4.0.1.ebuild | 79 ----------------------------------
 2 files changed, 80 deletions(-)

diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index b67cd6d63bd8..07c8df143593 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1,4 +1,3 @@
-DIST git-cola-4.0.1.tar.gz 1018819 BLAKE2B 523264bbee38526d12db5ad975d78c72ef6c0dae98566f5a8b5d51b115d222c8aa6daab838ba67fa4c697391c8f58d4b05ddb7920bf65913d217f562aabd352f SHA512 c02150997982c1f8ce65a5f021364fc4c346339f5be4104f82ba6f7688cc05bad3d764e2cf920a22c5f209dc4b857c789907ff58c0d2809bc7ca7c3481b045fd
 DIST git-cola-4.1.0.tar.gz 1140393 BLAKE2B 3236e06f86d23a7311e3cd639cbf2adcecb18810abcae938d1ff7cf25b477d814e614fffa20ce39dd9a2c6ab4f8e6b6b67f3ad3144163abe6530ac227313ca98 SHA512 4d2617947d4dbf3273f02c072de5ede10a656981f3653273780e2c1b1d3d613cd359fbb93cfb0a1d5de24b0c90818503cd9041ad3fa1a05b2ecd2db305bbe1a0
 DIST git-cola-4.2.1.tar.gz 1191680 BLAKE2B 8dd9d4b52672e32deba2f54e7f9141d3364dcbf3a823b05e766f333063a26cc49ea9e5e2f43f9492447b6b7344c930a2a1160653fb2699ff7d23cb22783f4cd1 SHA512 1a9d63c985d3566f81edd3ed3debc4d499fa5147650d479f3b1bc833d08836a17d63a8eb23c1cd5c2c31f6f7202219fb77cacb628df8f85dd3d367dcdd110891
 DIST git-cola-4.4.1.tar.gz 1212338 BLAKE2B 8f95720fa8af0acdecf744f657808b969f914bfd1cb2ccd2ed3af35f2811ab8aca7022ba888e0fc447a685af4c7dba27a0f0305f0b2d07cc31ccd22953d4fa14 SHA512 3e4e1cb8cd148b34e663c72c6b3d1e887815b5a86558ffbf13a19a5dfd3fb6b37c123290dc514b6f098893587dc67ca34424aaad5482768795e353f0efe92797

diff --git a/dev-vcs/git-cola/git-cola-4.0.1.ebuild b/dev-vcs/git-cola/git-cola-4.0.1.ebuild
deleted file mode 100644
index 6c564782c500..000000000000
--- a/dev-vcs/git-cola/git-cola-4.0.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_SINGLE_IMPL=true
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils
-
-DESCRIPTION="The highly caffeinated git GUI"
-HOMEPAGE="https://git-cola.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]
-		dev-python/QtPy[gui,network,${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-	')
-	dev-vcs/git
-"
-BDEPEND="sys-devel/gettext
-	$(python_gen_cond_dep "
-		test? (
-			${VIRTUALX_DEPEND}
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			dev-python/PyQt5[\${PYTHON_USEDEP},gui,widgets]
-		)
-	")
-"
-
-# right now, dev-python/jaraco-packaging is mask, so we cannot generate docs
-#distutils_enable_sphinx docs \
-#	'>=dev-python/jaraco-packaging-9' \
-#	'dev-python/rst-linker'
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i "s|doc/git-cola =|doc/${PF} =|" setup.cfg || die
-	sed -i -e 's:--flake8::' pytest.ini || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	cd "${T}" || die
-	GIT_CONFIG_NOSYSTEM=true LC_ALL="C.utf8" \
-	epytest "${S}"/test
-}
-
-src_compile() {
-	SETUPTOOLS_SCM_PRETEND_VERSION=${PV} distutils-r1_src_compile
-}
-
-src_install() {
-	distutils-r1_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2023-08-27 15:23 Arthur Zamarin
  0 siblings, 0 replies; 60+ messages in thread
From: Arthur Zamarin @ 2023-08-27 15:23 UTC (permalink / raw
  To: gentoo-commits

commit:     fe9523c4ea7f929acb16c2e2e79832627e047561
Author:     Martin Gysel <me <AT> bearsh <DOT> org>
AuthorDate: Tue Aug 22 18:34:25 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Aug 27 15:23:30 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe9523c4

dev-vcs/git-cola: add 4.3.1

- switch from xdg-utls  to xdg
- remove test declaration as already done by distutils_enable_tests
- adjust python versions
thanks to arthurzam for suggestion the above changes

Closes: https://bugs.gentoo.org/912845
Signed-off-by: Martin Gysel <me <AT> bearsh.org>
Closes: https://github.com/gentoo/gentoo/pull/32414
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-vcs/git-cola/Manifest              |  1 +
 dev-vcs/git-cola/git-cola-4.3.1.ebuild | 67 ++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+)

diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 42d893e8a9d0..2e80cc913ec8 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1,3 +1,4 @@
 DIST git-cola-4.0.1.tar.gz 1018819 BLAKE2B 523264bbee38526d12db5ad975d78c72ef6c0dae98566f5a8b5d51b115d222c8aa6daab838ba67fa4c697391c8f58d4b05ddb7920bf65913d217f562aabd352f SHA512 c02150997982c1f8ce65a5f021364fc4c346339f5be4104f82ba6f7688cc05bad3d764e2cf920a22c5f209dc4b857c789907ff58c0d2809bc7ca7c3481b045fd
 DIST git-cola-4.1.0.tar.gz 1140393 BLAKE2B 3236e06f86d23a7311e3cd639cbf2adcecb18810abcae938d1ff7cf25b477d814e614fffa20ce39dd9a2c6ab4f8e6b6b67f3ad3144163abe6530ac227313ca98 SHA512 4d2617947d4dbf3273f02c072de5ede10a656981f3653273780e2c1b1d3d613cd359fbb93cfb0a1d5de24b0c90818503cd9041ad3fa1a05b2ecd2db305bbe1a0
 DIST git-cola-4.2.1.tar.gz 1191680 BLAKE2B 8dd9d4b52672e32deba2f54e7f9141d3364dcbf3a823b05e766f333063a26cc49ea9e5e2f43f9492447b6b7344c930a2a1160653fb2699ff7d23cb22783f4cd1 SHA512 1a9d63c985d3566f81edd3ed3debc4d499fa5147650d479f3b1bc833d08836a17d63a8eb23c1cd5c2c31f6f7202219fb77cacb628df8f85dd3d367dcdd110891
+DIST git-cola-4.3.1.tar.gz 1205221 BLAKE2B 01a481569f603f2760d2200467721ccff0a03931ecc762d320be8c7071b81539b3d1bab089284168bfba2d34ab210366c59bf252b3a028ccd1733d0899a724dc SHA512 35d1fd877a27199ee3fbf6cf6ded0754370c23b6d198eb79422f95c21e2c8cb058671af27776c9c207bdb0d6fa0114ddc713654a2e91b2931c5000a9e5573f6c

diff --git a/dev-vcs/git-cola/git-cola-4.3.1.ebuild b/dev-vcs/git-cola/git-cola-4.3.1.ebuild
new file mode 100644
index 000000000000..4f9e775c09e5
--- /dev/null
+++ b/dev-vcs/git-cola/git-cola-4.3.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+DISTUTILS_SINGLE_IMPL=true
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 readme.gentoo-r1 virtualx xdg
+
+DESCRIPTION="The highly caffeinated git GUI"
+HOMEPAGE="https://git-cola.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]
+		dev-python/QtPy[gui,network,${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+	')
+	dev-vcs/git
+"
+BDEPEND="sys-devel/gettext
+	$(python_gen_cond_dep "
+		test? (
+			${VIRTUALX_DEPEND}
+			dev-python/pytest[\${PYTHON_USEDEP}]
+			dev-python/PyQt5[\${PYTHON_USEDEP},gui,widgets]
+		)
+	")
+"
+
+distutils_enable_sphinx docs \
+	'dev-python/rst-linker'
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i "s|doc/git-cola =|doc/${PF} =|" setup.cfg || die
+	# https://github.com/git-cola/git-cola/pull/1336
+	sed -E -i 's|root \+ os.sep|str\(root\)|' extras/sphinxtogithub/sphinxtogithub.py || die
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	cd "${T}" || die
+	GIT_CONFIG_NOSYSTEM=true LC_ALL="C.utf8" \
+	epytest "${S}"/test
+}
+
+src_compile() {
+	SETUPTOOLS_SCM_PRETEND_VERSION=${PV} distutils-r1_src_compile
+}
+
+src_install() {
+	distutils-r1_src_install
+	readme.gentoo_create_doc
+}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2023-07-24 21:02 Sam James
  0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2023-07-24 21:02 UTC (permalink / raw
  To: gentoo-commits

commit:     5735a22f0301773b7fba341af989e1802da56bce
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 24 21:02:25 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 24 21:02:25 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5735a22f

dev-vcs/git-cola: Stabilize 4.2.1 x86, #908205

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-vcs/git-cola/git-cola-4.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-vcs/git-cola/git-cola-4.2.1.ebuild b/dev-vcs/git-cola/git-cola-4.2.1.ebuild
index 88aae6ea5233..79239901785f 100644
--- a/dev-vcs/git-cola/git-cola-4.2.1.ebuild
+++ b/dev-vcs/git-cola/git-cola-4.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2023-07-24 14:18 Arthur Zamarin
  0 siblings, 0 replies; 60+ messages in thread
From: Arthur Zamarin @ 2023-07-24 14:18 UTC (permalink / raw
  To: gentoo-commits

commit:     3b6eb84a18c029d8f12f9e20cf6f773f9c08eda8
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 24 14:18:25 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 24 14:18:25 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b6eb84a

dev-vcs/git-cola: Stabilize 4.2.1 amd64, #908205

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-vcs/git-cola/git-cola-4.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-vcs/git-cola/git-cola-4.2.1.ebuild b/dev-vcs/git-cola/git-cola-4.2.1.ebuild
index 3a75dac7a188..88aae6ea5233 100644
--- a/dev-vcs/git-cola/git-cola-4.2.1.ebuild
+++ b/dev-vcs/git-cola/git-cola-4.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2023-04-20 12:22 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2023-04-20 12:22 UTC (permalink / raw
  To: gentoo-commits

commit:     6e0b94e8614a2583d29fc1bdd15c4fe02a6abb58
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 20 12:21:44 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Apr 20 12:22:01 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e0b94e8

dev-vcs/git-cola: Stabilize 4.1.0 x86, #904284

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-vcs/git-cola/git-cola-4.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-vcs/git-cola/git-cola-4.1.0.ebuild b/dev-vcs/git-cola/git-cola-4.1.0.ebuild
index 8df7a421ca10..b4db3a7d1dfa 100644
--- a/dev-vcs/git-cola/git-cola-4.1.0.ebuild
+++ b/dev-vcs/git-cola/git-cola-4.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2023-04-19  9:33 Arthur Zamarin
  0 siblings, 0 replies; 60+ messages in thread
From: Arthur Zamarin @ 2023-04-19  9:33 UTC (permalink / raw
  To: gentoo-commits

commit:     76d1fe7af6cb51ba833500cf33d9dc31a9b4f72c
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 19 09:33:18 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 19 09:33:18 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76d1fe7a

dev-vcs/git-cola: Stabilize 4.1.0 amd64, #904284

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-vcs/git-cola/git-cola-4.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-vcs/git-cola/git-cola-4.1.0.ebuild b/dev-vcs/git-cola/git-cola-4.1.0.ebuild
index 1238acfabdb8..8df7a421ca10 100644
--- a/dev-vcs/git-cola/git-cola-4.1.0.ebuild
+++ b/dev-vcs/git-cola/git-cola-4.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2023-04-15 12:23 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2023-04-15 12:23 UTC (permalink / raw
  To: gentoo-commits

commit:     cd14bfcaa1cde3c41ed4c926a27857a3c170d95e
Author:     Martin Gysel <me <AT> bearsh <DOT> org>
AuthorDate: Sun Apr  2 13:37:29 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Apr 15 12:21:54 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd14bfca

dev-vcs/git-cola: add 4.2.1

Closes: https://bugs.gentoo.org/903699
Signed-off-by: Martin Gysel <me <AT> bearsh.org>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-vcs/git-cola/Manifest              |  1 +
 dev-vcs/git-cola/git-cola-4.2.1.ebuild | 76 ++++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+)

diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 17a62a8b71c2..bf7e34b4e5fb 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1,3 +1,4 @@
 DIST git-cola-4.0.1.tar.gz 1018819 BLAKE2B 523264bbee38526d12db5ad975d78c72ef6c0dae98566f5a8b5d51b115d222c8aa6daab838ba67fa4c697391c8f58d4b05ddb7920bf65913d217f562aabd352f SHA512 c02150997982c1f8ce65a5f021364fc4c346339f5be4104f82ba6f7688cc05bad3d764e2cf920a22c5f209dc4b857c789907ff58c0d2809bc7ca7c3481b045fd
 DIST git-cola-4.0.3.tar.gz 1131525 BLAKE2B 042ec4e0db5f9a9f947de3dcedc13c6dd2464ee29a9363f48b50622e88fbb878ed1034ff915e7a87b4a835f71dc11051e4649837e5f6de3ffe6bd84fea055d23 SHA512 06c032a9522dfefe4e95f64b00c79169da0bb68a4fc9966ac442da62cefc26a89155690b4b7bbe1fe79f8225d36e2459333bedb0cc0ef7e23521725607d9bc3b
 DIST git-cola-4.1.0.tar.gz 1140393 BLAKE2B 3236e06f86d23a7311e3cd639cbf2adcecb18810abcae938d1ff7cf25b477d814e614fffa20ce39dd9a2c6ab4f8e6b6b67f3ad3144163abe6530ac227313ca98 SHA512 4d2617947d4dbf3273f02c072de5ede10a656981f3653273780e2c1b1d3d613cd359fbb93cfb0a1d5de24b0c90818503cd9041ad3fa1a05b2ecd2db305bbe1a0
+DIST git-cola-4.2.1.tar.gz 1191680 BLAKE2B 8dd9d4b52672e32deba2f54e7f9141d3364dcbf3a823b05e766f333063a26cc49ea9e5e2f43f9492447b6b7344c930a2a1160653fb2699ff7d23cb22783f4cd1 SHA512 1a9d63c985d3566f81edd3ed3debc4d499fa5147650d479f3b1bc833d08836a17d63a8eb23c1cd5c2c31f6f7202219fb77cacb628df8f85dd3d367dcdd110891

diff --git a/dev-vcs/git-cola/git-cola-4.2.1.ebuild b/dev-vcs/git-cola/git-cola-4.2.1.ebuild
new file mode 100644
index 000000000000..3a75dac7a188
--- /dev/null
+++ b/dev-vcs/git-cola/git-cola-4.2.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_SINGLE_IMPL=true
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils
+
+DESCRIPTION="The highly caffeinated git GUI"
+HOMEPAGE="https://git-cola.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]
+		dev-python/QtPy[gui,network,${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+	')
+	dev-vcs/git
+"
+BDEPEND="sys-devel/gettext
+	$(python_gen_cond_dep "
+		test? (
+			${VIRTUALX_DEPEND}
+			dev-python/pytest[\${PYTHON_USEDEP}]
+			dev-python/PyQt5[\${PYTHON_USEDEP},gui,widgets]
+		)
+	")
+"
+
+distutils_enable_sphinx docs \
+	'dev-python/rst-linker'
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i "s|doc/git-cola =|doc/${PF} =|" setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	cd "${T}" || die
+	GIT_CONFIG_NOSYSTEM=true LC_ALL="C.utf8" \
+	epytest "${S}"/test
+}
+
+src_compile() {
+	SETUPTOOLS_SCM_PRETEND_VERSION=${PV} distutils-r1_src_compile
+}
+
+src_install() {
+	distutils-r1_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2023-04-15 12:23 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2023-04-15 12:23 UTC (permalink / raw
  To: gentoo-commits

commit:     7602fc3351f58cea401e2fd3f911cc36bb92d06b
Author:     Martin Gysel <me <AT> bearsh <DOT> org>
AuthorDate: Sun Apr  2 13:39:04 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Apr 15 12:21:54 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7602fc33

dev-vcs/git-cola: drop 4.0.3

Signed-off-by: Martin Gysel <me <AT> bearsh.org>
Closes: https://github.com/gentoo/gentoo/pull/30442
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-vcs/git-cola/Manifest              |  1 -
 dev-vcs/git-cola/git-cola-4.0.3.ebuild | 79 ----------------------------------
 2 files changed, 80 deletions(-)

diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index bf7e34b4e5fb..42d893e8a9d0 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1,4 +1,3 @@
 DIST git-cola-4.0.1.tar.gz 1018819 BLAKE2B 523264bbee38526d12db5ad975d78c72ef6c0dae98566f5a8b5d51b115d222c8aa6daab838ba67fa4c697391c8f58d4b05ddb7920bf65913d217f562aabd352f SHA512 c02150997982c1f8ce65a5f021364fc4c346339f5be4104f82ba6f7688cc05bad3d764e2cf920a22c5f209dc4b857c789907ff58c0d2809bc7ca7c3481b045fd
-DIST git-cola-4.0.3.tar.gz 1131525 BLAKE2B 042ec4e0db5f9a9f947de3dcedc13c6dd2464ee29a9363f48b50622e88fbb878ed1034ff915e7a87b4a835f71dc11051e4649837e5f6de3ffe6bd84fea055d23 SHA512 06c032a9522dfefe4e95f64b00c79169da0bb68a4fc9966ac442da62cefc26a89155690b4b7bbe1fe79f8225d36e2459333bedb0cc0ef7e23521725607d9bc3b
 DIST git-cola-4.1.0.tar.gz 1140393 BLAKE2B 3236e06f86d23a7311e3cd639cbf2adcecb18810abcae938d1ff7cf25b477d814e614fffa20ce39dd9a2c6ab4f8e6b6b67f3ad3144163abe6530ac227313ca98 SHA512 4d2617947d4dbf3273f02c072de5ede10a656981f3653273780e2c1b1d3d613cd359fbb93cfb0a1d5de24b0c90818503cd9041ad3fa1a05b2ecd2db305bbe1a0
 DIST git-cola-4.2.1.tar.gz 1191680 BLAKE2B 8dd9d4b52672e32deba2f54e7f9141d3364dcbf3a823b05e766f333063a26cc49ea9e5e2f43f9492447b6b7344c930a2a1160653fb2699ff7d23cb22783f4cd1 SHA512 1a9d63c985d3566f81edd3ed3debc4d499fa5147650d479f3b1bc833d08836a17d63a8eb23c1cd5c2c31f6f7202219fb77cacb628df8f85dd3d367dcdd110891

diff --git a/dev-vcs/git-cola/git-cola-4.0.3.ebuild b/dev-vcs/git-cola/git-cola-4.0.3.ebuild
deleted file mode 100644
index 4042b1f292ad..000000000000
--- a/dev-vcs/git-cola/git-cola-4.0.3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_SINGLE_IMPL=true
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils
-
-DESCRIPTION="The highly caffeinated git GUI"
-HOMEPAGE="https://git-cola.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]
-		dev-python/QtPy[gui,network,${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-	')
-	dev-vcs/git
-"
-BDEPEND="sys-devel/gettext
-	$(python_gen_cond_dep "
-		test? (
-			${VIRTUALX_DEPEND}
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			dev-python/PyQt5[\${PYTHON_USEDEP},gui,widgets]
-		)
-	")
-"
-
-# right now, dev-python/jaraco-packaging is mask, so we cannot generate docs
-#distutils_enable_sphinx docs \
-#	'>=dev-python/jaraco-packaging-9' \
-#	'dev-python/rst-linker'
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i "s|doc/git-cola =|doc/${PF} =|" setup.cfg || die
-	sed -i -e 's:--flake8::' pytest.ini || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	cd "${T}" || die
-	GIT_CONFIG_NOSYSTEM=true LC_ALL="C.utf8" \
-	epytest "${S}"/test
-}
-
-src_compile() {
-	SETUPTOOLS_SCM_PRETEND_VERSION=${PV} distutils-r1_src_compile
-}
-
-src_install() {
-	distutils-r1_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2023-01-25 17:41 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2023-01-25 17:41 UTC (permalink / raw
  To: gentoo-commits

commit:     c0bfdfba190dc0ff2a989152db3eb14792f5c170
Author:     Martin Gysel <me <AT> bearsh <DOT> org>
AuthorDate: Mon Jan 16 17:47:42 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Jan 25 17:41:44 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0bfdfba

dev-vcs/git-cola: drop 3.12.0, 4.0.2

Signed-off-by: Martin Gysel <me <AT> bearsh.org>
Closes: https://github.com/gentoo/gentoo/pull/29116
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-vcs/git-cola/Manifest               |   2 -
 dev-vcs/git-cola/git-cola-3.12.0.ebuild | 111 --------------------------------
 dev-vcs/git-cola/git-cola-4.0.2.ebuild  |  79 -----------------------
 3 files changed, 192 deletions(-)

diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 036671e0e7f5..17a62a8b71c2 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1,5 +1,3 @@
-DIST git-cola-3.12.0.tar.gz 1004892 BLAKE2B 9396768256341e59500dffc95136e710b2d3d1c9d5cb4d70fc7fba8e81e16a3656006b5558dae417fbbad7baf1373d953708006b96a8873f68502ea469462326 SHA512 4b8ec716f572682747f43ae1a9232612d95d44384d28bbf97ef461a93546cdfcc81125f816b4c8ea5efcf4d23f42edeb8a89df3c7167ceac4709eeeaf49965a9
 DIST git-cola-4.0.1.tar.gz 1018819 BLAKE2B 523264bbee38526d12db5ad975d78c72ef6c0dae98566f5a8b5d51b115d222c8aa6daab838ba67fa4c697391c8f58d4b05ddb7920bf65913d217f562aabd352f SHA512 c02150997982c1f8ce65a5f021364fc4c346339f5be4104f82ba6f7688cc05bad3d764e2cf920a22c5f209dc4b857c789907ff58c0d2809bc7ca7c3481b045fd
-DIST git-cola-4.0.2.tar.gz 1022362 BLAKE2B 6f1d6aa6fa6c308f28150018eea8a110c2ceb35ac5e904844568a503e1ebfdb07d9d79b7fa6542aa734c62ae5e5b2e41bb26c99b23a7a84067c102598354cec1 SHA512 01a68caf12bff400b243a57a9b5a5f07c2c1bd1b90d50acc75806ffdd9377409a56dd591311667afab7508f1ff0d88e31744c1990db3f5f6ce9d977f3fa4068e
 DIST git-cola-4.0.3.tar.gz 1131525 BLAKE2B 042ec4e0db5f9a9f947de3dcedc13c6dd2464ee29a9363f48b50622e88fbb878ed1034ff915e7a87b4a835f71dc11051e4649837e5f6de3ffe6bd84fea055d23 SHA512 06c032a9522dfefe4e95f64b00c79169da0bb68a4fc9966ac442da62cefc26a89155690b4b7bbe1fe79f8225d36e2459333bedb0cc0ef7e23521725607d9bc3b
 DIST git-cola-4.1.0.tar.gz 1140393 BLAKE2B 3236e06f86d23a7311e3cd639cbf2adcecb18810abcae938d1ff7cf25b477d814e614fffa20ce39dd9a2c6ab4f8e6b6b67f3ad3144163abe6530ac227313ca98 SHA512 4d2617947d4dbf3273f02c072de5ede10a656981f3653273780e2c1b1d3d613cd359fbb93cfb0a1d5de24b0c90818503cd9041ad3fa1a05b2ecd2db305bbe1a0

diff --git a/dev-vcs/git-cola/git-cola-3.12.0.ebuild b/dev-vcs/git-cola/git-cola-3.12.0.ebuild
deleted file mode 100644
index 29c89753a8ec..000000000000
--- a/dev-vcs/git-cola/git-cola-3.12.0.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_SINGLE_IMPL=true
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils
-
-DESCRIPTION="The highly caffeinated git GUI"
-HOMEPAGE="https://git-cola.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/QtPy[gui,network,${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-	')
-	dev-vcs/git
-"
-BDEPEND="sys-devel/gettext
-	$(python_gen_cond_dep "
-		doc? ( dev-python/sphinx[\${PYTHON_USEDEP}] )
-		test? (
-			${VIRTUALX_DEPEND}
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			dev-python/mock[\${PYTHON_USEDEP}]
-			dev-python/PyQt5[\${PYTHON_USEDEP},gui,widgets]
-		)
-	")
-"
-
-python_prepare_all() {
-	# make sure that tests also use the system provided QtPy
-	rm -r qtpy || die
-
-	rm share/git-cola/bin/*askpass* || die
-
-	# don't install docs into wrong location
-	sed -i -e '/doc/d' setup.py || die
-
-	# fix doc directory reference
-	sed -i \
-		-e "s/'doc', 'git-cola'/'doc', '${PF}'/" \
-		cola/resources.py || die
-
-	# fix ssh-askpass directory reference
-	sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die
-
-	# disable flake8 testing, it's not useful for ebuilds
-	sed -i -e 's:--flake8::' pytest.ini || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	DISTUTILS_ARGS=( --no-vendor-libs --no-private-libs )
-}
-
-python_compile_all() {
-	cd share/doc/${PN}/ || die
-	if use doc ; then
-		emake all
-	else
-		sed \
-			-e '/^install:/s:install-html::g' \
-			-e '/^install:/s:install-man::g' \
-			-i Makefile || die
-	fi
-}
-
-python_test() {
-	GIT_CONFIG_NOSYSTEM=true \
-	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C.utf8" \
-	virtx epytest cola test
-}
-
-python_install_all() {
-	cd share/doc/${PN}/ || die
-	emake \
-		DESTDIR="${D}" \
-		docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		prefix="${EPREFIX}/usr" \
-		install
-
-	# remove empty bin folder
-	rm -R "${ED}"/usr/share/git-cola/bin || die
-
-	use doc || HTML_DOCS=( "${FILESDIR}"/index.html )
-
-	distutils-r1_python_install_all
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}

diff --git a/dev-vcs/git-cola/git-cola-4.0.2.ebuild b/dev-vcs/git-cola/git-cola-4.0.2.ebuild
deleted file mode 100644
index 4042b1f292ad..000000000000
--- a/dev-vcs/git-cola/git-cola-4.0.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_SINGLE_IMPL=true
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils
-
-DESCRIPTION="The highly caffeinated git GUI"
-HOMEPAGE="https://git-cola.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]
-		dev-python/QtPy[gui,network,${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-	')
-	dev-vcs/git
-"
-BDEPEND="sys-devel/gettext
-	$(python_gen_cond_dep "
-		test? (
-			${VIRTUALX_DEPEND}
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			dev-python/PyQt5[\${PYTHON_USEDEP},gui,widgets]
-		)
-	")
-"
-
-# right now, dev-python/jaraco-packaging is mask, so we cannot generate docs
-#distutils_enable_sphinx docs \
-#	'>=dev-python/jaraco-packaging-9' \
-#	'dev-python/rst-linker'
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i "s|doc/git-cola =|doc/${PF} =|" setup.cfg || die
-	sed -i -e 's:--flake8::' pytest.ini || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	cd "${T}" || die
-	GIT_CONFIG_NOSYSTEM=true LC_ALL="C.utf8" \
-	epytest "${S}"/test
-}
-
-src_compile() {
-	SETUPTOOLS_SCM_PRETEND_VERSION=${PV} distutils-r1_src_compile
-}
-
-src_install() {
-	distutils-r1_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2023-01-25 17:41 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2023-01-25 17:41 UTC (permalink / raw
  To: gentoo-commits

commit:     f64de191349095b3a12463c2f6432c23a73f845e
Author:     Martin Gysel <me <AT> bearsh <DOT> org>
AuthorDate: Sun Jan 15 11:40:44 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Jan 25 17:41:43 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f64de191

dev-vcs/git-cola: add 4.1.0

add python 3.11 support
reenable docs generation

Closes: https://bugs.gentoo.org/890927
Signed-off-by: Martin Gysel <me <AT> bearsh.org>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-vcs/git-cola/Manifest              |  1 +
 dev-vcs/git-cola/git-cola-4.1.0.ebuild | 77 ++++++++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+)

diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index bcce2ff071ce..036671e0e7f5 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -2,3 +2,4 @@ DIST git-cola-3.12.0.tar.gz 1004892 BLAKE2B 9396768256341e59500dffc95136e710b2d3
 DIST git-cola-4.0.1.tar.gz 1018819 BLAKE2B 523264bbee38526d12db5ad975d78c72ef6c0dae98566f5a8b5d51b115d222c8aa6daab838ba67fa4c697391c8f58d4b05ddb7920bf65913d217f562aabd352f SHA512 c02150997982c1f8ce65a5f021364fc4c346339f5be4104f82ba6f7688cc05bad3d764e2cf920a22c5f209dc4b857c789907ff58c0d2809bc7ca7c3481b045fd
 DIST git-cola-4.0.2.tar.gz 1022362 BLAKE2B 6f1d6aa6fa6c308f28150018eea8a110c2ceb35ac5e904844568a503e1ebfdb07d9d79b7fa6542aa734c62ae5e5b2e41bb26c99b23a7a84067c102598354cec1 SHA512 01a68caf12bff400b243a57a9b5a5f07c2c1bd1b90d50acc75806ffdd9377409a56dd591311667afab7508f1ff0d88e31744c1990db3f5f6ce9d977f3fa4068e
 DIST git-cola-4.0.3.tar.gz 1131525 BLAKE2B 042ec4e0db5f9a9f947de3dcedc13c6dd2464ee29a9363f48b50622e88fbb878ed1034ff915e7a87b4a835f71dc11051e4649837e5f6de3ffe6bd84fea055d23 SHA512 06c032a9522dfefe4e95f64b00c79169da0bb68a4fc9966ac442da62cefc26a89155690b4b7bbe1fe79f8225d36e2459333bedb0cc0ef7e23521725607d9bc3b
+DIST git-cola-4.1.0.tar.gz 1140393 BLAKE2B 3236e06f86d23a7311e3cd639cbf2adcecb18810abcae938d1ff7cf25b477d814e614fffa20ce39dd9a2c6ab4f8e6b6b67f3ad3144163abe6530ac227313ca98 SHA512 4d2617947d4dbf3273f02c072de5ede10a656981f3653273780e2c1b1d3d613cd359fbb93cfb0a1d5de24b0c90818503cd9041ad3fa1a05b2ecd2db305bbe1a0

diff --git a/dev-vcs/git-cola/git-cola-4.1.0.ebuild b/dev-vcs/git-cola/git-cola-4.1.0.ebuild
new file mode 100644
index 000000000000..1238acfabdb8
--- /dev/null
+++ b/dev-vcs/git-cola/git-cola-4.1.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_SINGLE_IMPL=true
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils
+
+DESCRIPTION="The highly caffeinated git GUI"
+HOMEPAGE="https://git-cola.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]
+		dev-python/QtPy[gui,network,${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+	')
+	dev-vcs/git
+"
+BDEPEND="sys-devel/gettext
+	$(python_gen_cond_dep "
+		test? (
+			${VIRTUALX_DEPEND}
+			dev-python/pytest[\${PYTHON_USEDEP}]
+			dev-python/PyQt5[\${PYTHON_USEDEP},gui,widgets]
+		)
+	")
+"
+
+distutils_enable_sphinx docs \
+	'dev-python/rst-linker'
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i "s|doc/git-cola =|doc/${PF} =|" setup.cfg || die
+	sed -i -e 's:--flake8::' pytest.ini || die
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	cd "${T}" || die
+	GIT_CONFIG_NOSYSTEM=true LC_ALL="C.utf8" \
+	epytest "${S}"/test
+}
+
+src_compile() {
+	SETUPTOOLS_SCM_PRETEND_VERSION=${PV} distutils-r1_src_compile
+}
+
+src_install() {
+	distutils-r1_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2022-11-22 13:55 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2022-11-22 13:55 UTC (permalink / raw
  To: gentoo-commits

commit:     93a58003c97f0f7f9ec18cd541b431b601d822e9
Author:     Martin Gysel <me <AT> bearsh <DOT> org>
AuthorDate: Sat Nov 12 10:04:00 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Nov 22 13:55:00 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93a58003

dev-vcs/git-cola: add 4.0.3

Closes: https://bugs.gentoo.org/881063
Signed-off-by: Martin Gysel <me <AT> bearsh.org>
Closes: https://github.com/gentoo/gentoo/pull/28243
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-vcs/git-cola/Manifest              |  1 +
 dev-vcs/git-cola/git-cola-4.0.3.ebuild | 79 ++++++++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+)

diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index b5948d6a2fb9..bcce2ff071ce 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1,3 +1,4 @@
 DIST git-cola-3.12.0.tar.gz 1004892 BLAKE2B 9396768256341e59500dffc95136e710b2d3d1c9d5cb4d70fc7fba8e81e16a3656006b5558dae417fbbad7baf1373d953708006b96a8873f68502ea469462326 SHA512 4b8ec716f572682747f43ae1a9232612d95d44384d28bbf97ef461a93546cdfcc81125f816b4c8ea5efcf4d23f42edeb8a89df3c7167ceac4709eeeaf49965a9
 DIST git-cola-4.0.1.tar.gz 1018819 BLAKE2B 523264bbee38526d12db5ad975d78c72ef6c0dae98566f5a8b5d51b115d222c8aa6daab838ba67fa4c697391c8f58d4b05ddb7920bf65913d217f562aabd352f SHA512 c02150997982c1f8ce65a5f021364fc4c346339f5be4104f82ba6f7688cc05bad3d764e2cf920a22c5f209dc4b857c789907ff58c0d2809bc7ca7c3481b045fd
 DIST git-cola-4.0.2.tar.gz 1022362 BLAKE2B 6f1d6aa6fa6c308f28150018eea8a110c2ceb35ac5e904844568a503e1ebfdb07d9d79b7fa6542aa734c62ae5e5b2e41bb26c99b23a7a84067c102598354cec1 SHA512 01a68caf12bff400b243a57a9b5a5f07c2c1bd1b90d50acc75806ffdd9377409a56dd591311667afab7508f1ff0d88e31744c1990db3f5f6ce9d977f3fa4068e
+DIST git-cola-4.0.3.tar.gz 1131525 BLAKE2B 042ec4e0db5f9a9f947de3dcedc13c6dd2464ee29a9363f48b50622e88fbb878ed1034ff915e7a87b4a835f71dc11051e4649837e5f6de3ffe6bd84fea055d23 SHA512 06c032a9522dfefe4e95f64b00c79169da0bb68a4fc9966ac442da62cefc26a89155690b4b7bbe1fe79f8225d36e2459333bedb0cc0ef7e23521725607d9bc3b

diff --git a/dev-vcs/git-cola/git-cola-4.0.3.ebuild b/dev-vcs/git-cola/git-cola-4.0.3.ebuild
new file mode 100644
index 000000000000..68d4675e79db
--- /dev/null
+++ b/dev-vcs/git-cola/git-cola-4.0.3.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_SINGLE_IMPL=true
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils
+
+DESCRIPTION="The highly caffeinated git GUI"
+HOMEPAGE="https://git-cola.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]
+		dev-python/QtPy[gui,network,${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+	')
+	dev-vcs/git
+"
+BDEPEND="sys-devel/gettext
+	$(python_gen_cond_dep "
+		test? (
+			${VIRTUALX_DEPEND}
+			dev-python/pytest[\${PYTHON_USEDEP}]
+			dev-python/PyQt5[\${PYTHON_USEDEP},gui,widgets]
+		)
+	")
+"
+
+# right now, dev-python/jaraco-packaging is mask, so we cannot generate docs
+#distutils_enable_sphinx docs \
+#	'>=dev-python/jaraco-packaging-9' \
+#	'dev-python/rst-linker'
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i "s|doc/git-cola =|doc/${PF} =|" setup.cfg || die
+	sed -i -e 's:--flake8::' pytest.ini || die
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	cd "${T}" || die
+	GIT_CONFIG_NOSYSTEM=true LC_ALL="C.utf8" \
+	epytest "${S}"/test
+}
+
+src_compile() {
+	SETUPTOOLS_SCM_PRETEND_VERSION=${PV} distutils-r1_src_compile
+}
+
+src_install() {
+	distutils-r1_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2022-10-11 13:36 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2022-10-11 13:36 UTC (permalink / raw
  To: gentoo-commits

commit:     c85f1820af3625c79bcf8f5818a38f024bd90893
Author:     Martin Gysel <me <AT> bearsh <DOT> org>
AuthorDate: Thu Sep 29 18:18:00 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 13:36:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c85f1820

dev-vcs/git-cola: drop 3.10.1, 3.11.0

Signed-off-by: Martin Gysel <me <AT> bearsh.org>
Closes: https://github.com/gentoo/gentoo/pull/27531
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-vcs/git-cola/Manifest               |   2 -
 dev-vcs/git-cola/git-cola-3.10.1.ebuild | 111 --------------------------------
 dev-vcs/git-cola/git-cola-3.11.0.ebuild | 111 --------------------------------
 3 files changed, 224 deletions(-)

diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 7b0483c63eca..b5948d6a2fb9 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1,5 +1,3 @@
-DIST git-cola-3.10.1.tar.gz 996036 BLAKE2B 2d705b853cf67a0f437d8dc77d46d5804124af600f872717c832843586d3c739e67a79ebe50ba2a8db38afd4217a7bb94db9cb8e27d51a00087ced340f4877d6 SHA512 79496023bfaa05049079eec2cdaf8449a6598faebedb4a13acf178209edc63e725eb1b003700a1dcfee09072d34e5a49d7053f070e45b498562cc124cd0582d4
-DIST git-cola-3.11.0.tar.gz 997046 BLAKE2B 7a8270c30e0cbd919dcd6f8e38ca420257630717e535ef11ed337fde2461b544453b20363906a5b769cd23d96ca77ce72d71729f46ae6abada83ae4d33628cbc SHA512 f05862b9b27ff5dfe9b220bbee4f3f455a7ce98acaa0bb0a8cdbb44f8cb97ce265df036ba48d5abb0bf46a91fd782cd73a67ca544b4662d36e8023e92c80b541
 DIST git-cola-3.12.0.tar.gz 1004892 BLAKE2B 9396768256341e59500dffc95136e710b2d3d1c9d5cb4d70fc7fba8e81e16a3656006b5558dae417fbbad7baf1373d953708006b96a8873f68502ea469462326 SHA512 4b8ec716f572682747f43ae1a9232612d95d44384d28bbf97ef461a93546cdfcc81125f816b4c8ea5efcf4d23f42edeb8a89df3c7167ceac4709eeeaf49965a9
 DIST git-cola-4.0.1.tar.gz 1018819 BLAKE2B 523264bbee38526d12db5ad975d78c72ef6c0dae98566f5a8b5d51b115d222c8aa6daab838ba67fa4c697391c8f58d4b05ddb7920bf65913d217f562aabd352f SHA512 c02150997982c1f8ce65a5f021364fc4c346339f5be4104f82ba6f7688cc05bad3d764e2cf920a22c5f209dc4b857c789907ff58c0d2809bc7ca7c3481b045fd
 DIST git-cola-4.0.2.tar.gz 1022362 BLAKE2B 6f1d6aa6fa6c308f28150018eea8a110c2ceb35ac5e904844568a503e1ebfdb07d9d79b7fa6542aa734c62ae5e5b2e41bb26c99b23a7a84067c102598354cec1 SHA512 01a68caf12bff400b243a57a9b5a5f07c2c1bd1b90d50acc75806ffdd9377409a56dd591311667afab7508f1ff0d88e31744c1990db3f5f6ce9d977f3fa4068e

diff --git a/dev-vcs/git-cola/git-cola-3.10.1.ebuild b/dev-vcs/git-cola/git-cola-3.10.1.ebuild
deleted file mode 100644
index 4bc81af9e798..000000000000
--- a/dev-vcs/git-cola/git-cola-3.10.1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_SINGLE_IMPL=true
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils
-
-DESCRIPTION="The highly caffeinated git GUI"
-HOMEPAGE="https://git-cola.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt5[network,${PYTHON_USEDEP}]
-		dev-python/QtPy[gui,${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-	')
-	dev-vcs/git
-"
-BDEPEND="sys-devel/gettext
-	$(python_gen_cond_dep "
-		doc? ( dev-python/sphinx[\${PYTHON_USEDEP}] )
-		test? (
-			${VIRTUALX_DEPEND}
-			dev-python/mock[\${PYTHON_USEDEP}]
-			dev-python/nose[\${PYTHON_USEDEP}]
-			dev-python/PyQt5[\${PYTHON_USEDEP},gui,widgets]
-			dev-python/pytest[\${PYTHON_USEDEP}]
-		)
-	")
-"
-
-python_prepare_all() {
-	# make sure that tests also use the system provided QtPy
-	rm -r qtpy || die
-
-	rm share/git-cola/bin/*askpass* || die
-
-	# don't install docs into wrong location
-	sed -i -e '/doc/d' setup.py || die
-
-	# fix doc directory reference
-	sed -i \
-		-e "s/'doc', 'git-cola'/'doc', '${PF}'/" \
-		cola/resources.py || die
-
-	# fix ssh-askpass directory reference
-	sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	DISTUTILS_ARGS=( --no-vendor-libs --no-private-libs )
-}
-
-python_compile_all() {
-	cd share/doc/${PN}/ || die
-	if use doc ; then
-		emake all
-	else
-		sed \
-			-e '/^install:/s:install-html::g' \
-			-e '/^install:/s:install-man::g' \
-			-i Makefile || die
-	fi
-}
-
-python_test() {
-	GIT_CONFIG_NOSYSTEM=true \
-	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C.utf8" \
-	virtx nosetests --verbose --with-id --with-doctest \
-		--exclude=sphinxtogithub
-}
-
-python_install_all() {
-	cd share/doc/${PN}/ || die
-	emake \
-		DESTDIR="${D}" \
-		docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		prefix="${EPREFIX}/usr" \
-		install
-
-	# remove empty bin folder
-	rm -R "${ED}"/usr/share/git-cola/bin || die
-
-	use doc || HTML_DOCS=( "${FILESDIR}"/index.html )
-
-	distutils-r1_python_install_all
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}

diff --git a/dev-vcs/git-cola/git-cola-3.11.0.ebuild b/dev-vcs/git-cola/git-cola-3.11.0.ebuild
deleted file mode 100644
index ebab708004f6..000000000000
--- a/dev-vcs/git-cola/git-cola-3.11.0.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_SINGLE_IMPL=true
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils
-
-DESCRIPTION="The highly caffeinated git GUI"
-HOMEPAGE="https://git-cola.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/QtPy[gui,network,${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-	')
-	dev-vcs/git
-"
-BDEPEND="sys-devel/gettext
-	$(python_gen_cond_dep "
-		doc? ( dev-python/sphinx[\${PYTHON_USEDEP}] )
-		test? (
-			${VIRTUALX_DEPEND}
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			dev-python/mock[\${PYTHON_USEDEP}]
-			dev-python/PyQt5[\${PYTHON_USEDEP},gui,widgets]
-		)
-	")
-"
-
-python_prepare_all() {
-	# make sure that tests also use the system provided QtPy
-	rm -r qtpy || die
-
-	rm share/git-cola/bin/*askpass* || die
-
-	# don't install docs into wrong location
-	sed -i -e '/doc/d' setup.py || die
-
-	# fix doc directory reference
-	sed -i \
-		-e "s/'doc', 'git-cola'/'doc', '${PF}'/" \
-		cola/resources.py || die
-
-	# fix ssh-askpass directory reference
-	sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die
-
-	# disable flake8 testing, it's not useful for ebuilds
-	sed -i -e 's:--flake8::' pytest.ini || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	DISTUTILS_ARGS=( --no-vendor-libs --no-private-libs )
-}
-
-python_compile_all() {
-	cd share/doc/${PN}/ || die
-	if use doc ; then
-		emake all
-	else
-		sed \
-			-e '/^install:/s:install-html::g' \
-			-e '/^install:/s:install-man::g' \
-			-i Makefile || die
-	fi
-}
-
-python_test() {
-	GIT_CONFIG_NOSYSTEM=true \
-	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C.utf8" \
-	virtx epytest cola test
-}
-
-python_install_all() {
-	cd share/doc/${PN}/ || die
-	emake \
-		DESTDIR="${D}" \
-		docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		prefix="${EPREFIX}/usr" \
-		install
-
-	# remove empty bin folder
-	rm -R "${ED}"/usr/share/git-cola/bin || die
-
-	use doc || HTML_DOCS=( "${FILESDIR}"/index.html )
-
-	distutils-r1_python_install_all
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2022-10-11 13:36 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2022-10-11 13:36 UTC (permalink / raw
  To: gentoo-commits

commit:     95d5fae0501bae58b7a4ba5c1943d7e8f4b2ccf9
Author:     Martin Gysel <me <AT> bearsh <DOT> org>
AuthorDate: Thu Sep 29 18:10:30 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 13:36:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95d5fae0

dev-vcs/git-cola: bump to 4.0.2

Closes: https://bugs.gentoo.org/873511
Signed-off-by: Martin Gysel <me <AT> bearsh.org>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-vcs/git-cola/Manifest              |  1 +
 dev-vcs/git-cola/git-cola-4.0.2.ebuild | 79 ++++++++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+)

diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 5b47987d3cdc..7b0483c63eca 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -2,3 +2,4 @@ DIST git-cola-3.10.1.tar.gz 996036 BLAKE2B 2d705b853cf67a0f437d8dc77d46d5804124a
 DIST git-cola-3.11.0.tar.gz 997046 BLAKE2B 7a8270c30e0cbd919dcd6f8e38ca420257630717e535ef11ed337fde2461b544453b20363906a5b769cd23d96ca77ce72d71729f46ae6abada83ae4d33628cbc SHA512 f05862b9b27ff5dfe9b220bbee4f3f455a7ce98acaa0bb0a8cdbb44f8cb97ce265df036ba48d5abb0bf46a91fd782cd73a67ca544b4662d36e8023e92c80b541
 DIST git-cola-3.12.0.tar.gz 1004892 BLAKE2B 9396768256341e59500dffc95136e710b2d3d1c9d5cb4d70fc7fba8e81e16a3656006b5558dae417fbbad7baf1373d953708006b96a8873f68502ea469462326 SHA512 4b8ec716f572682747f43ae1a9232612d95d44384d28bbf97ef461a93546cdfcc81125f816b4c8ea5efcf4d23f42edeb8a89df3c7167ceac4709eeeaf49965a9
 DIST git-cola-4.0.1.tar.gz 1018819 BLAKE2B 523264bbee38526d12db5ad975d78c72ef6c0dae98566f5a8b5d51b115d222c8aa6daab838ba67fa4c697391c8f58d4b05ddb7920bf65913d217f562aabd352f SHA512 c02150997982c1f8ce65a5f021364fc4c346339f5be4104f82ba6f7688cc05bad3d764e2cf920a22c5f209dc4b857c789907ff58c0d2809bc7ca7c3481b045fd
+DIST git-cola-4.0.2.tar.gz 1022362 BLAKE2B 6f1d6aa6fa6c308f28150018eea8a110c2ceb35ac5e904844568a503e1ebfdb07d9d79b7fa6542aa734c62ae5e5b2e41bb26c99b23a7a84067c102598354cec1 SHA512 01a68caf12bff400b243a57a9b5a5f07c2c1bd1b90d50acc75806ffdd9377409a56dd591311667afab7508f1ff0d88e31744c1990db3f5f6ce9d977f3fa4068e

diff --git a/dev-vcs/git-cola/git-cola-4.0.2.ebuild b/dev-vcs/git-cola/git-cola-4.0.2.ebuild
new file mode 100644
index 000000000000..68d4675e79db
--- /dev/null
+++ b/dev-vcs/git-cola/git-cola-4.0.2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_SINGLE_IMPL=true
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils
+
+DESCRIPTION="The highly caffeinated git GUI"
+HOMEPAGE="https://git-cola.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]
+		dev-python/QtPy[gui,network,${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+	')
+	dev-vcs/git
+"
+BDEPEND="sys-devel/gettext
+	$(python_gen_cond_dep "
+		test? (
+			${VIRTUALX_DEPEND}
+			dev-python/pytest[\${PYTHON_USEDEP}]
+			dev-python/PyQt5[\${PYTHON_USEDEP},gui,widgets]
+		)
+	")
+"
+
+# right now, dev-python/jaraco-packaging is mask, so we cannot generate docs
+#distutils_enable_sphinx docs \
+#	'>=dev-python/jaraco-packaging-9' \
+#	'dev-python/rst-linker'
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i "s|doc/git-cola =|doc/${PF} =|" setup.cfg || die
+	sed -i -e 's:--flake8::' pytest.ini || die
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	cd "${T}" || die
+	GIT_CONFIG_NOSYSTEM=true LC_ALL="C.utf8" \
+	epytest "${S}"/test
+}
+
+src_compile() {
+	SETUPTOOLS_SCM_PRETEND_VERSION=${PV} distutils-r1_src_compile
+}
+
+src_install() {
+	distutils-r1_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2022-09-08  7:26 Agostino Sarubbo
  0 siblings, 0 replies; 60+ messages in thread
From: Agostino Sarubbo @ 2022-09-08  7:26 UTC (permalink / raw
  To: gentoo-commits

commit:     63d1cce1f6185f2b122c7a9e39a854f6cdf54d71
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  8 07:25:48 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Sep  8 07:25:48 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63d1cce1

dev-vcs/git-cola: x86 stable wrt bug #868771

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-vcs/git-cola/git-cola-4.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-vcs/git-cola/git-cola-4.0.1.ebuild b/dev-vcs/git-cola/git-cola-4.0.1.ebuild
index 18fdcca3cf77..7ec17c13b1c8 100644
--- a/dev-vcs/git-cola/git-cola-4.0.1.ebuild
+++ b/dev-vcs/git-cola/git-cola-4.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2022-09-07  1:50 Sam James
  0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2022-09-07  1:50 UTC (permalink / raw
  To: gentoo-commits

commit:     677ba6dd58251471cb4f245eebbb4643a7857e98
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  7 01:48:35 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Sep  7 01:48:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=677ba6dd

dev-vcs/git-cola: Stabilize 4.0.1 amd64, #868771

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-vcs/git-cola/git-cola-4.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-vcs/git-cola/git-cola-4.0.1.ebuild b/dev-vcs/git-cola/git-cola-4.0.1.ebuild
index 68d4675e79db..18fdcca3cf77 100644
--- a/dev-vcs/git-cola/git-cola-4.0.1.ebuild
+++ b/dev-vcs/git-cola/git-cola-4.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2022-07-02 17:35 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2022-07-02 17:35 UTC (permalink / raw
  To: gentoo-commits

commit:     487b734c23a776d353b472c06ddb0f5d0cb07b1c
Author:     Martin Gysel <me <AT> bearsh <DOT> org>
AuthorDate: Thu Jun  9 19:15:39 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jul  2 17:35:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=487b734c

dev-vcs/git-cola: version bump to 4.0.1, migrate to pep517 builds

Closes: https://bugs.gentoo.org/850784

Signed-off-by: Martin Gysel <me <AT> bearsh.org>
Closes: https://github.com/gentoo/gentoo/pull/25838
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-vcs/git-cola/Manifest              |  1 +
 dev-vcs/git-cola/git-cola-4.0.1.ebuild | 78 ++++++++++++++++++++++++++++++++++
 2 files changed, 79 insertions(+)

diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 6d06c491524e..5b47987d3cdc 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1,3 +1,4 @@
 DIST git-cola-3.10.1.tar.gz 996036 BLAKE2B 2d705b853cf67a0f437d8dc77d46d5804124af600f872717c832843586d3c739e67a79ebe50ba2a8db38afd4217a7bb94db9cb8e27d51a00087ced340f4877d6 SHA512 79496023bfaa05049079eec2cdaf8449a6598faebedb4a13acf178209edc63e725eb1b003700a1dcfee09072d34e5a49d7053f070e45b498562cc124cd0582d4
 DIST git-cola-3.11.0.tar.gz 997046 BLAKE2B 7a8270c30e0cbd919dcd6f8e38ca420257630717e535ef11ed337fde2461b544453b20363906a5b769cd23d96ca77ce72d71729f46ae6abada83ae4d33628cbc SHA512 f05862b9b27ff5dfe9b220bbee4f3f455a7ce98acaa0bb0a8cdbb44f8cb97ce265df036ba48d5abb0bf46a91fd782cd73a67ca544b4662d36e8023e92c80b541
 DIST git-cola-3.12.0.tar.gz 1004892 BLAKE2B 9396768256341e59500dffc95136e710b2d3d1c9d5cb4d70fc7fba8e81e16a3656006b5558dae417fbbad7baf1373d953708006b96a8873f68502ea469462326 SHA512 4b8ec716f572682747f43ae1a9232612d95d44384d28bbf97ef461a93546cdfcc81125f816b4c8ea5efcf4d23f42edeb8a89df3c7167ceac4709eeeaf49965a9
+DIST git-cola-4.0.1.tar.gz 1018819 BLAKE2B 523264bbee38526d12db5ad975d78c72ef6c0dae98566f5a8b5d51b115d222c8aa6daab838ba67fa4c697391c8f58d4b05ddb7920bf65913d217f562aabd352f SHA512 c02150997982c1f8ce65a5f021364fc4c346339f5be4104f82ba6f7688cc05bad3d764e2cf920a22c5f209dc4b857c789907ff58c0d2809bc7ca7c3481b045fd

diff --git a/dev-vcs/git-cola/git-cola-4.0.1.ebuild b/dev-vcs/git-cola/git-cola-4.0.1.ebuild
new file mode 100644
index 000000000000..dc640bd0539b
--- /dev/null
+++ b/dev-vcs/git-cola/git-cola-4.0.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_SINGLE_IMPL=true
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils
+
+DESCRIPTION="The highly caffeinated git GUI"
+HOMEPAGE="https://git-cola.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/QtPy[gui,network,${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+	')
+	dev-vcs/git
+"
+BDEPEND="sys-devel/gettext
+	$(python_gen_cond_dep "
+		test? (
+			${VIRTUALX_DEPEND}
+			dev-python/pytest[\${PYTHON_USEDEP}]
+			dev-python/PyQt5[\${PYTHON_USEDEP},gui,widgets]
+		)
+	")
+"
+
+# right now, dev-python/jaraco-packaging is mask, so we cannot generate docs
+#distutils_enable_sphinx docs \
+#	'>=dev-python/jaraco-packaging-9' \
+#	'dev-python/rst-linker'
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i "s|doc/git-cola =|doc/${PF} =|" setup.cfg || die
+	sed -i -e 's:--flake8::' pytest.ini || die
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	cd "${T}" || die
+	GIT_CONFIG_NOSYSTEM=true LC_ALL="C.utf8" \
+	epytest "${S}"/test
+}
+
+src_compile() {
+	SETUPTOOLS_SCM_PRETEND_VERSION=${PV} distutils-r1_src_compile
+}
+
+src_install() {
+	distutils-r1_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2022-07-02 17:35 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2022-07-02 17:35 UTC (permalink / raw
  To: gentoo-commits

commit:     1f260c7ef9ff470022b17a5813f0eb12fcb0fec7
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  2 17:24:44 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jul  2 17:35:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f260c7e

dev-vcs/git-cola: add a missing RDEPEND to 4.0.1

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-vcs/git-cola/git-cola-4.0.1.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-vcs/git-cola/git-cola-4.0.1.ebuild b/dev-vcs/git-cola/git-cola-4.0.1.ebuild
index dc640bd0539b..68d4675e79db 100644
--- a/dev-vcs/git-cola/git-cola-4.0.1.ebuild
+++ b/dev-vcs/git-cola/git-cola-4.0.1.ebuild
@@ -23,6 +23,7 @@ RDEPEND="
 	$(python_gen_cond_dep '
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]
 		dev-python/QtPy[gui,network,${PYTHON_USEDEP}]
 		dev-python/send2trash[${PYTHON_USEDEP}]
 	')


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2022-04-25 10:30 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2022-04-25 10:30 UTC (permalink / raw
  To: gentoo-commits

commit:     4b4430381a5c89a76617d56fc937076daa8d9a17
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 25 10:29:24 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Apr 25 10:30:02 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b443038

dev-vcs/git-cola: Stabilize 3.12.0 x86, #829839

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-vcs/git-cola/git-cola-3.12.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-vcs/git-cola/git-cola-3.12.0.ebuild b/dev-vcs/git-cola/git-cola-3.12.0.ebuild
index e6e2d34dee48..8e125f2c8bc9 100644
--- a/dev-vcs/git-cola/git-cola-3.12.0.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.12.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 RESTRICT="!test? ( test )"


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2022-04-25  9:12 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2022-04-25  9:12 UTC (permalink / raw
  To: gentoo-commits

commit:     e57f1e2a288b9d5f8b4b29bcc530ba7efb5aec8b
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 25 09:11:02 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Apr 25 09:12:24 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e57f1e2a

dev-vcs/git-cola: Stabilize 3.12.0 amd64, #829839

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-vcs/git-cola/git-cola-3.12.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-vcs/git-cola/git-cola-3.12.0.ebuild b/dev-vcs/git-cola/git-cola-3.12.0.ebuild
index 51817bdd4a3b..e6e2d34dee48 100644
--- a/dev-vcs/git-cola/git-cola-3.12.0.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc test"
 
 RESTRICT="!test? ( test )"


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2022-01-29  6:20 Sam James
  0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2022-01-29  6:20 UTC (permalink / raw
  To: gentoo-commits

commit:     d0aa62f8e2540b8d4e6dde951b7415e0e5fbd7e3
Author:     Martin Gysel <me <AT> bearsh <DOT> org>
AuthorDate: Mon Jan 24 20:05:20 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 29 06:19:22 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0aa62f8

dev-vcs/git-cola: Disable pytest-flake8

see also https://github.com/gentoo/gentoo/pull/23927

Signed-off-by: Martin Gysel <me <AT> bearsh.org>
Closes: https://github.com/gentoo/gentoo/pull/23887
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-vcs/git-cola/git-cola-3.12.0.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev-vcs/git-cola/git-cola-3.12.0.ebuild b/dev-vcs/git-cola/git-cola-3.12.0.ebuild
index 1aa8af03490f..51817bdd4a3b 100644
--- a/dev-vcs/git-cola/git-cola-3.12.0.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.12.0.ebuild
@@ -34,7 +34,6 @@ BDEPEND="sys-devel/gettext
 		test? (
 			${VIRTUALX_DEPEND}
 			dev-python/pytest[\${PYTHON_USEDEP}]
-			dev-python/pytest-flake8[\${PYTHON_USEDEP}]
 			dev-python/mock[\${PYTHON_USEDEP}]
 			dev-python/PyQt5[\${PYTHON_USEDEP},gui,widgets]
 		)
@@ -58,6 +57,9 @@ python_prepare_all() {
 	# fix ssh-askpass directory reference
 	sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die
 
+	# disable flake8 testing, it's not useful for ebuilds
+	sed -i -e 's:--flake8::' pytest.ini || die
+
 	distutils-r1_python_prepare_all
 }
 


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2022-01-24 22:14 Michał Górny
  0 siblings, 0 replies; 60+ messages in thread
From: Michał Górny @ 2022-01-24 22:14 UTC (permalink / raw
  To: gentoo-commits

commit:     324a8d53a06fd585035fc0ce7ed19873a47d4c51
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 23 15:17:28 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jan 24 22:09:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=324a8d53

dev-vcs/git-cola: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-vcs/git-cola/Manifest            |   2 -
 dev-vcs/git-cola/git-cola-3.8.ebuild | 114 -----------------------------------
 dev-vcs/git-cola/git-cola-3.9.ebuild | 110 ---------------------------------
 3 files changed, 226 deletions(-)

diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 7008ac23a0cc..f160122dd063 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1,4 +1,2 @@
 DIST git-cola-3.10.1.tar.gz 996036 BLAKE2B 2d705b853cf67a0f437d8dc77d46d5804124af600f872717c832843586d3c739e67a79ebe50ba2a8db38afd4217a7bb94db9cb8e27d51a00087ced340f4877d6 SHA512 79496023bfaa05049079eec2cdaf8449a6598faebedb4a13acf178209edc63e725eb1b003700a1dcfee09072d34e5a49d7053f070e45b498562cc124cd0582d4
 DIST git-cola-3.11.0.tar.gz 997046 BLAKE2B 7a8270c30e0cbd919dcd6f8e38ca420257630717e535ef11ed337fde2461b544453b20363906a5b769cd23d96ca77ce72d71729f46ae6abada83ae4d33628cbc SHA512 f05862b9b27ff5dfe9b220bbee4f3f455a7ce98acaa0bb0a8cdbb44f8cb97ce265df036ba48d5abb0bf46a91fd782cd73a67ca544b4662d36e8023e92c80b541
-DIST git-cola-3.8.tar.gz 980190 BLAKE2B 0502701c63f370b304a83094b2154757d1810216e82882472c7eac9633ac26eaa75974af05c32c18203d03b67a027655ea85c0e335915f204f668fcc86ed9c3f SHA512 9ae04dfef3b5bc64452a8df43e7afa93091f282097447208dadbd17522b62e5c43f7afce3eecc59fc4e38863496cdb41ac8b0453bbf327121629fbde20e45bb0
-DIST git-cola-3.9.tar.gz 992335 BLAKE2B ab591d953173aa69773a82eb91ebcc6fa5bc5e31efa78ad27f3e1e57e22c4222d70914f059dffb0b05b2b366d3208e127ad123ccfeb1b4c1b648daae0bf53352 SHA512 91f4bb40c166669e05136985920113d7482a396a46adf45fcf05e8ee56677fee7ebfb6a793face79737a17be42aa5e32b216a30847e8e4a5b8dc5b3b4eba5395

diff --git a/dev-vcs/git-cola/git-cola-3.8.ebuild b/dev-vcs/git-cola/git-cola-3.8.ebuild
deleted file mode 100644
index d467fc38d90b..000000000000
--- a/dev-vcs/git-cola/git-cola-3.8.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_SINGLE_IMPL=true
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils
-
-DESCRIPTION="The highly caffeinated git GUI"
-HOMEPAGE="https://git-cola.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt5[network,${PYTHON_USEDEP}]
-		dev-python/QtPy[gui,${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-	')
-	dev-vcs/git
-"
-BDEPEND="sys-devel/gettext
-	$(python_gen_cond_dep "
-		doc? ( dev-python/sphinx[\${PYTHON_USEDEP}] )
-		test? (
-			${VIRTUALX_DEPEND}
-			dev-python/mock[\${PYTHON_USEDEP}]
-			dev-python/nose[\${PYTHON_USEDEP}]
-			dev-python/pytest[\${PYTHON_USEDEP}]
-		)
-	")
-"
-
-python_prepare_all() {
-	# make sure that tests also use the system provided QtPy
-	rm -r qtpy || die
-
-	rm share/git-cola/bin/*askpass* || die
-
-	# don't install docs into wrong location
-	sed -i -e '/doc/d' setup.py || die
-
-	# fix doc directory reference
-	sed -i \
-		-e "s/'doc', 'git-cola'/'doc', '${PF}'/" \
-		cola/resources.py || die
-
-	# fix ssh-askpass directory reference
-	sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=( --no-vendor-libs --no-private-libs )
-}
-
-python_compile_all() {
-	cd share/doc/${PN}/ || die
-	if use doc ; then
-		emake all
-	else
-		sed \
-			-e '/^install:/s:install-html::g' \
-			-e '/^install:/s:install-man::g' \
-			-i Makefile || die
-	fi
-}
-
-python_test() {
-	GIT_CONFIG_NOSYSTEM=true \
-	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="en_US.utf8" \
-	virtx nosetests --verbose --with-id --with-doctest \
-		--exclude=sphinxtogithub
-}
-
-src_install() {
-	distutils-r1_src_install
-}
-
-python_install_all() {
-	cd share/doc/${PN}/ || die
-	emake \
-		DESTDIR="${D}" \
-		docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		prefix="${EPREFIX}/usr" \
-		install
-
-	# remove empty bin folder
-	rm -R "${ED}"/usr/share/git-cola/bin
-
-	use doc || HTML_DOCS=( "${FILESDIR}"/index.html )
-
-	distutils-r1_python_install_all
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}

diff --git a/dev-vcs/git-cola/git-cola-3.9.ebuild b/dev-vcs/git-cola/git-cola-3.9.ebuild
deleted file mode 100644
index ef74afe09e0a..000000000000
--- a/dev-vcs/git-cola/git-cola-3.9.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_SINGLE_IMPL=true
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils
-
-DESCRIPTION="The highly caffeinated git GUI"
-HOMEPAGE="https://git-cola.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt5[network,${PYTHON_USEDEP}]
-		dev-python/QtPy[gui,${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-	')
-	dev-vcs/git
-"
-BDEPEND="sys-devel/gettext
-	$(python_gen_cond_dep "
-		doc? ( dev-python/sphinx[\${PYTHON_USEDEP}] )
-		test? (
-			${VIRTUALX_DEPEND}
-			dev-python/mock[\${PYTHON_USEDEP}]
-			dev-python/nose[\${PYTHON_USEDEP}]
-			dev-python/pytest[\${PYTHON_USEDEP}]
-		)
-	")
-"
-
-python_prepare_all() {
-	# make sure that tests also use the system provided QtPy
-	rm -r qtpy || die
-
-	rm share/git-cola/bin/*askpass* || die
-
-	# don't install docs into wrong location
-	sed -i -e '/doc/d' setup.py || die
-
-	# fix doc directory reference
-	sed -i \
-		-e "s/'doc', 'git-cola'/'doc', '${PF}'/" \
-		cola/resources.py || die
-
-	# fix ssh-askpass directory reference
-	sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=( --no-vendor-libs --no-private-libs )
-}
-
-python_compile_all() {
-	cd share/doc/${PN}/ || die
-	if use doc ; then
-		emake all
-	else
-		sed \
-			-e '/^install:/s:install-html::g' \
-			-e '/^install:/s:install-man::g' \
-			-i Makefile || die
-	fi
-}
-
-python_test() {
-	GIT_CONFIG_NOSYSTEM=true \
-	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C.utf8" \
-	virtx nosetests --verbose --with-id --with-doctest \
-		--exclude=sphinxtogithub
-}
-
-python_install_all() {
-	cd share/doc/${PN}/ || die
-	emake \
-		DESTDIR="${D}" \
-		docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		prefix="${EPREFIX}/usr" \
-		install
-
-	# remove empty bin folder
-	rm -R "${ED}"/usr/share/git-cola/bin || die
-
-	use doc || HTML_DOCS=( "${FILESDIR}"/index.html )
-
-	distutils-r1_python_install_all
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2022-01-24 22:14 Michał Górny
  0 siblings, 0 replies; 60+ messages in thread
From: Michał Górny @ 2022-01-24 22:14 UTC (permalink / raw
  To: gentoo-commits

commit:     5c13687575b70fdba9b0978c63efaca007dcb5a8
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 23 15:18:54 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jan 24 22:09:39 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c136875

dev-vcs/git-cola: Disable pytest-flake8

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-vcs/git-cola/git-cola-3.11.0.ebuild | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev-vcs/git-cola/git-cola-3.11.0.ebuild b/dev-vcs/git-cola/git-cola-3.11.0.ebuild
index 1aa8af03490f..ebab708004f6 100644
--- a/dev-vcs/git-cola/git-cola-3.11.0.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -34,7 +34,6 @@ BDEPEND="sys-devel/gettext
 		test? (
 			${VIRTUALX_DEPEND}
 			dev-python/pytest[\${PYTHON_USEDEP}]
-			dev-python/pytest-flake8[\${PYTHON_USEDEP}]
 			dev-python/mock[\${PYTHON_USEDEP}]
 			dev-python/PyQt5[\${PYTHON_USEDEP},gui,widgets]
 		)
@@ -58,6 +57,9 @@ python_prepare_all() {
 	# fix ssh-askpass directory reference
 	sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die
 
+	# disable flake8 testing, it's not useful for ebuilds
+	sed -i -e 's:--flake8::' pytest.ini || die
+
 	distutils-r1_python_prepare_all
 }
 


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2021-12-07  6:26 Agostino Sarubbo
  0 siblings, 0 replies; 60+ messages in thread
From: Agostino Sarubbo @ 2021-12-07  6:26 UTC (permalink / raw
  To: gentoo-commits

commit:     f089203a809c64d10c8fd37ecee8ea45834d27de
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  7 06:25:23 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Dec  7 06:25:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f089203a

dev-vcs/git-cola: x86 stable wrt bug #823098

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-vcs/git-cola/git-cola-3.10.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-vcs/git-cola/git-cola-3.10.1.ebuild b/dev-vcs/git-cola/git-cola-3.10.1.ebuild
index 5445b39c1f59..4bc81af9e798 100644
--- a/dev-vcs/git-cola/git-cola-3.10.1.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.10.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 RESTRICT="!test? ( test )"


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2021-12-05  5:18 Sam James
  0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2021-12-05  5:18 UTC (permalink / raw
  To: gentoo-commits

commit:     f87cd6ceb07ca79505e30c2f1eec9017cf01c3cc
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  5 05:18:16 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec  5 05:18:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f87cd6ce

dev-vcs/git-cola: Stabilize 3.10.1 amd64, #823098

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-vcs/git-cola/git-cola-3.10.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-vcs/git-cola/git-cola-3.10.1.ebuild b/dev-vcs/git-cola/git-cola-3.10.1.ebuild
index 0d5c7bc503d4..5445b39c1f59 100644
--- a/dev-vcs/git-cola/git-cola-3.10.1.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.10.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc test"
 
 RESTRICT="!test? ( test )"


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2021-11-22 14:03 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2021-11-22 14:03 UTC (permalink / raw
  To: gentoo-commits

commit:     4de4de2910abb3a38f80cfee3ce99c8f4a179c9b
Author:     Martin Gysel <me <AT> bearsh <DOT> org>
AuthorDate: Wed Nov 10 20:22:09 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Nov 22 14:03:39 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4de4de29

dev-vcs/git-cola: version bump to 3.11.0

use pytest/pytest-flake8 instead of nose for tests

Closes: https://bugs.gentoo.org/822972
Signed-off-by: Martin Gysel <me <AT> bearsh.org>
Closes: https://github.com/gentoo/gentoo/pull/22892
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-vcs/git-cola/Manifest               |   1 +
 dev-vcs/git-cola/git-cola-3.11.0.ebuild | 109 ++++++++++++++++++++++++++++++++
 2 files changed, 110 insertions(+)

diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index ccbe0eb15520..7008ac23a0cc 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1,3 +1,4 @@
 DIST git-cola-3.10.1.tar.gz 996036 BLAKE2B 2d705b853cf67a0f437d8dc77d46d5804124af600f872717c832843586d3c739e67a79ebe50ba2a8db38afd4217a7bb94db9cb8e27d51a00087ced340f4877d6 SHA512 79496023bfaa05049079eec2cdaf8449a6598faebedb4a13acf178209edc63e725eb1b003700a1dcfee09072d34e5a49d7053f070e45b498562cc124cd0582d4
+DIST git-cola-3.11.0.tar.gz 997046 BLAKE2B 7a8270c30e0cbd919dcd6f8e38ca420257630717e535ef11ed337fde2461b544453b20363906a5b769cd23d96ca77ce72d71729f46ae6abada83ae4d33628cbc SHA512 f05862b9b27ff5dfe9b220bbee4f3f455a7ce98acaa0bb0a8cdbb44f8cb97ce265df036ba48d5abb0bf46a91fd782cd73a67ca544b4662d36e8023e92c80b541
 DIST git-cola-3.8.tar.gz 980190 BLAKE2B 0502701c63f370b304a83094b2154757d1810216e82882472c7eac9633ac26eaa75974af05c32c18203d03b67a027655ea85c0e335915f204f668fcc86ed9c3f SHA512 9ae04dfef3b5bc64452a8df43e7afa93091f282097447208dadbd17522b62e5c43f7afce3eecc59fc4e38863496cdb41ac8b0453bbf327121629fbde20e45bb0
 DIST git-cola-3.9.tar.gz 992335 BLAKE2B ab591d953173aa69773a82eb91ebcc6fa5bc5e31efa78ad27f3e1e57e22c4222d70914f059dffb0b05b2b366d3208e127ad123ccfeb1b4c1b648daae0bf53352 SHA512 91f4bb40c166669e05136985920113d7482a396a46adf45fcf05e8ee56677fee7ebfb6a793face79737a17be42aa5e32b216a30847e8e4a5b8dc5b3b4eba5395

diff --git a/dev-vcs/git-cola/git-cola-3.11.0.ebuild b/dev-vcs/git-cola/git-cola-3.11.0.ebuild
new file mode 100644
index 000000000000..1aa8af03490f
--- /dev/null
+++ b/dev-vcs/git-cola/git-cola-3.11.0.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_SINGLE_IMPL=true
+DISTUTILS_USE_SETUPTOOLS=no
+inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils
+
+DESCRIPTION="The highly caffeinated git GUI"
+HOMEPAGE="https://git-cola.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/QtPy[gui,network,${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+	')
+	dev-vcs/git
+"
+BDEPEND="sys-devel/gettext
+	$(python_gen_cond_dep "
+		doc? ( dev-python/sphinx[\${PYTHON_USEDEP}] )
+		test? (
+			${VIRTUALX_DEPEND}
+			dev-python/pytest[\${PYTHON_USEDEP}]
+			dev-python/pytest-flake8[\${PYTHON_USEDEP}]
+			dev-python/mock[\${PYTHON_USEDEP}]
+			dev-python/PyQt5[\${PYTHON_USEDEP},gui,widgets]
+		)
+	")
+"
+
+python_prepare_all() {
+	# make sure that tests also use the system provided QtPy
+	rm -r qtpy || die
+
+	rm share/git-cola/bin/*askpass* || die
+
+	# don't install docs into wrong location
+	sed -i -e '/doc/d' setup.py || die
+
+	# fix doc directory reference
+	sed -i \
+		-e "s/'doc', 'git-cola'/'doc', '${PF}'/" \
+		cola/resources.py || die
+
+	# fix ssh-askpass directory reference
+	sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	DISTUTILS_ARGS=( --no-vendor-libs --no-private-libs )
+}
+
+python_compile_all() {
+	cd share/doc/${PN}/ || die
+	if use doc ; then
+		emake all
+	else
+		sed \
+			-e '/^install:/s:install-html::g' \
+			-e '/^install:/s:install-man::g' \
+			-i Makefile || die
+	fi
+}
+
+python_test() {
+	GIT_CONFIG_NOSYSTEM=true \
+	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C.utf8" \
+	virtx epytest cola test
+}
+
+python_install_all() {
+	cd share/doc/${PN}/ || die
+	emake \
+		DESTDIR="${D}" \
+		docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		prefix="${EPREFIX}/usr" \
+		install
+
+	# remove empty bin folder
+	rm -R "${ED}"/usr/share/git-cola/bin || die
+
+	use doc || HTML_DOCS=( "${FILESDIR}"/index.html )
+
+	distutils-r1_python_install_all
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2021-09-21  7:03 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2021-09-21  7:03 UTC (permalink / raw
  To: gentoo-commits

commit:     76ae2163e484fc413a786a1bb58d0ffa425e78c8
Author:     Martin Gysel <me <AT> bearsh <DOT> org>
AuthorDate: Wed Sep 15 19:16:45 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Sep 21 07:03:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76ae2163

dev-vcs/git-cola: remove old

Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Martin Gysel <me <AT> bearsh.org>
Closes: https://github.com/gentoo/gentoo/pull/22302
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-vcs/git-cola/Manifest               |   1 -
 dev-vcs/git-cola/git-cola-3.5-r1.ebuild | 116 --------------------------------
 2 files changed, 117 deletions(-)

diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index c2b90a62781..ccbe0eb1552 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1,4 +1,3 @@
 DIST git-cola-3.10.1.tar.gz 996036 BLAKE2B 2d705b853cf67a0f437d8dc77d46d5804124af600f872717c832843586d3c739e67a79ebe50ba2a8db38afd4217a7bb94db9cb8e27d51a00087ced340f4877d6 SHA512 79496023bfaa05049079eec2cdaf8449a6598faebedb4a13acf178209edc63e725eb1b003700a1dcfee09072d34e5a49d7053f070e45b498562cc124cd0582d4
-DIST git-cola-3.5.tar.gz 970155 BLAKE2B ae602d4de0e6fac9d2817100bee8923d8f550d0bb83ddafd806ccdfbd0a77c65bfb60ff03a9399c6b60d5d4683eb6d46ee41eaa43faf2e2ac092b34c9151c999 SHA512 532e24092a72486171345aeb0e7610eb49c4062b64395988c6c4965cac6e9ffaed1268c30a0a525d4d99404f626d9e505a4be148d376994d4326e3ca873e2793
 DIST git-cola-3.8.tar.gz 980190 BLAKE2B 0502701c63f370b304a83094b2154757d1810216e82882472c7eac9633ac26eaa75974af05c32c18203d03b67a027655ea85c0e335915f204f668fcc86ed9c3f SHA512 9ae04dfef3b5bc64452a8df43e7afa93091f282097447208dadbd17522b62e5c43f7afce3eecc59fc4e38863496cdb41ac8b0453bbf327121629fbde20e45bb0
 DIST git-cola-3.9.tar.gz 992335 BLAKE2B ab591d953173aa69773a82eb91ebcc6fa5bc5e31efa78ad27f3e1e57e22c4222d70914f059dffb0b05b2b366d3208e127ad123ccfeb1b4c1b648daae0bf53352 SHA512 91f4bb40c166669e05136985920113d7482a396a46adf45fcf05e8ee56677fee7ebfb6a793face79737a17be42aa5e32b216a30847e8e4a5b8dc5b3b4eba5395

diff --git a/dev-vcs/git-cola/git-cola-3.5-r1.ebuild b/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
deleted file mode 100644
index 4dae0de9e54..00000000000
--- a/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_8 )
-DISTUTILS_SINGLE_IMPL=true
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils
-
-DESCRIPTION="The highly caffeinated git GUI"
-HOMEPAGE="https://git-cola.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt5[network,${PYTHON_USEDEP}]
-		dev-python/QtPy[gui,${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-	')
-	dev-vcs/git"
-BDEPEND="sys-devel/gettext
-	$(python_gen_cond_dep "
-		doc? ( dev-python/sphinx[\${PYTHON_USEDEP}] )
-		test? (
-			${VIRTUALX_DEPEND}
-			dev-python/mock[\${PYTHON_USEDEP}]
-			dev-python/nose[\${PYTHON_USEDEP}]
-		)
-	")"
-
-PATCHES=( "${FILESDIR}/${P}-py3.8-line-buffering.patch" )
-
-python_prepare_all() {
-	# make sure that tests also use the system provided QtPy
-	rm -r qtpy || die
-
-	rm share/git-cola/bin/*askpass* || die
-
-	# don't install docs into wrong location
-	sed -i -e '/doc/d' setup.py || die
-
-	# fix doc directory reference
-	sed -i \
-		-e "s/'doc', 'git-cola'/'doc', '${PF}'/" \
-		cola/resources.py || die
-
-	# fix ssh-askpass directory reference
-	sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=( --no-vendor-libs )
-}
-
-python_compile_all() {
-	cd share/doc/${PN}/ || die
-	if use doc ; then
-		emake all
-	else
-		sed \
-			-e '/^install:/s:install-html::g' \
-			-e '/^install:/s:install-man::g' \
-			-i Makefile || die
-	fi
-}
-
-python_test() {
-	GIT_CONFIG_NOSYSTEM=true \
-	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="en_US.utf8" \
-	virtx nosetests --verbose --with-id --with-doctest \
-		--exclude=sphinxtogithub
-}
-
-src_install() {
-	distutils-r1_src_install
-}
-
-python_install_all() {
-	cd share/doc/${PN}/ || die
-	emake \
-		DESTDIR="${D}" \
-		docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		prefix="${EPREFIX}/usr" \
-		install
-
-	python_fix_shebang "${ED}/usr/share/git-cola/bin/git-xbase" "${ED}"/usr/bin/git-cola
-	python_optimize "${ED}/usr/share/git-cola/lib/cola"
-
-	# fix appdata installation
-	mv "${D}"/usr/share/appdata "${D}"/usr/share/metainfo || die "moving appdata failed"
-
-	use doc || HTML_DOCS=( "${FILESDIR}"/index.html )
-
-	distutils-r1_python_install_all
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2021-09-21  7:03 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2021-09-21  7:03 UTC (permalink / raw
  To: gentoo-commits

commit:     2791d82a051a0cbc03907f5f0e96028d9ad03679
Author:     Martin Gysel <me <AT> bearsh <DOT> org>
AuthorDate: Wed Sep 15 19:13:26 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Sep 21 07:03:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2791d82a

dev-vcs/git-cola: bump version to 3.10.1, EAPI-8, python-3.10

Closes: https://bugs.gentoo.org/813255
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Martin Gysel <me <AT> bearsh.org>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-vcs/git-cola/Manifest               |   1 +
 dev-vcs/git-cola/git-cola-3.10.1.ebuild | 110 ++++++++++++++++++++++++++++++++
 2 files changed, 111 insertions(+)

diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 6a5e83767cc..c2b90a62781 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1,3 +1,4 @@
+DIST git-cola-3.10.1.tar.gz 996036 BLAKE2B 2d705b853cf67a0f437d8dc77d46d5804124af600f872717c832843586d3c739e67a79ebe50ba2a8db38afd4217a7bb94db9cb8e27d51a00087ced340f4877d6 SHA512 79496023bfaa05049079eec2cdaf8449a6598faebedb4a13acf178209edc63e725eb1b003700a1dcfee09072d34e5a49d7053f070e45b498562cc124cd0582d4
 DIST git-cola-3.5.tar.gz 970155 BLAKE2B ae602d4de0e6fac9d2817100bee8923d8f550d0bb83ddafd806ccdfbd0a77c65bfb60ff03a9399c6b60d5d4683eb6d46ee41eaa43faf2e2ac092b34c9151c999 SHA512 532e24092a72486171345aeb0e7610eb49c4062b64395988c6c4965cac6e9ffaed1268c30a0a525d4d99404f626d9e505a4be148d376994d4326e3ca873e2793
 DIST git-cola-3.8.tar.gz 980190 BLAKE2B 0502701c63f370b304a83094b2154757d1810216e82882472c7eac9633ac26eaa75974af05c32c18203d03b67a027655ea85c0e335915f204f668fcc86ed9c3f SHA512 9ae04dfef3b5bc64452a8df43e7afa93091f282097447208dadbd17522b62e5c43f7afce3eecc59fc4e38863496cdb41ac8b0453bbf327121629fbde20e45bb0
 DIST git-cola-3.9.tar.gz 992335 BLAKE2B ab591d953173aa69773a82eb91ebcc6fa5bc5e31efa78ad27f3e1e57e22c4222d70914f059dffb0b05b2b366d3208e127ad123ccfeb1b4c1b648daae0bf53352 SHA512 91f4bb40c166669e05136985920113d7482a396a46adf45fcf05e8ee56677fee7ebfb6a793face79737a17be42aa5e32b216a30847e8e4a5b8dc5b3b4eba5395

diff --git a/dev-vcs/git-cola/git-cola-3.10.1.ebuild b/dev-vcs/git-cola/git-cola-3.10.1.ebuild
new file mode 100644
index 00000000000..0cde8ccf38f
--- /dev/null
+++ b/dev-vcs/git-cola/git-cola-3.10.1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_SINGLE_IMPL=true
+DISTUTILS_USE_SETUPTOOLS=no
+inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils
+
+DESCRIPTION="The highly caffeinated git GUI"
+HOMEPAGE="https://git-cola.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/PyQt5[network,${PYTHON_USEDEP}]
+		dev-python/QtPy[gui,${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+	')
+	dev-vcs/git
+"
+BDEPEND="sys-devel/gettext
+	$(python_gen_cond_dep "
+		doc? ( dev-python/sphinx[\${PYTHON_USEDEP}] )
+		test? (
+			${VIRTUALX_DEPEND}
+			dev-python/mock[\${PYTHON_USEDEP}]
+			dev-python/nose[\${PYTHON_USEDEP}]
+			dev-python/pytest[\${PYTHON_USEDEP}]
+		)
+	")
+"
+
+python_prepare_all() {
+	# make sure that tests also use the system provided QtPy
+	rm -r qtpy || die
+
+	rm share/git-cola/bin/*askpass* || die
+
+	# don't install docs into wrong location
+	sed -i -e '/doc/d' setup.py || die
+
+	# fix doc directory reference
+	sed -i \
+		-e "s/'doc', 'git-cola'/'doc', '${PF}'/" \
+		cola/resources.py || die
+
+	# fix ssh-askpass directory reference
+	sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	DISTUTILS_ARGS=( --no-vendor-libs --no-private-libs )
+}
+
+python_compile_all() {
+	cd share/doc/${PN}/ || die
+	if use doc ; then
+		emake all
+	else
+		sed \
+			-e '/^install:/s:install-html::g' \
+			-e '/^install:/s:install-man::g' \
+			-i Makefile || die
+	fi
+}
+
+python_test() {
+	GIT_CONFIG_NOSYSTEM=true \
+	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C.utf8" \
+	virtx nosetests --verbose --with-id --with-doctest \
+		--exclude=sphinxtogithub
+}
+
+python_install_all() {
+	cd share/doc/${PN}/ || die
+	emake \
+		DESTDIR="${D}" \
+		docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		prefix="${EPREFIX}/usr" \
+		install
+
+	# remove empty bin folder
+	rm -R "${ED}"/usr/share/git-cola/bin || die
+
+	use doc || HTML_DOCS=( "${FILESDIR}"/index.html )
+
+	distutils-r1_python_install_all
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2021-09-21  7:03 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2021-09-21  7:03 UTC (permalink / raw
  To: gentoo-commits

commit:     d4334ae4d78309e1e742e400caa993a0c564d3f4
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 21 06:58:33 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Sep 21 07:03:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4334ae4

dev-vcs/git-cola: add a missing test-dep for 3.10.1

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-vcs/git-cola/git-cola-3.10.1.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-vcs/git-cola/git-cola-3.10.1.ebuild b/dev-vcs/git-cola/git-cola-3.10.1.ebuild
index 0cde8ccf38f..0d5c7bc503d 100644
--- a/dev-vcs/git-cola/git-cola-3.10.1.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.10.1.ebuild
@@ -36,6 +36,7 @@ BDEPEND="sys-devel/gettext
 			${VIRTUALX_DEPEND}
 			dev-python/mock[\${PYTHON_USEDEP}]
 			dev-python/nose[\${PYTHON_USEDEP}]
+			dev-python/PyQt5[\${PYTHON_USEDEP},gui,widgets]
 			dev-python/pytest[\${PYTHON_USEDEP}]
 		)
 	")


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2021-03-05 18:36 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2021-03-05 18:36 UTC (permalink / raw
  To: gentoo-commits

commit:     db5b4850fd48a33675977f8fdab6a320dcdd9500
Author:     David Roman <davidroman96 <AT> gmail <DOT> com>
AuthorDate: Tue Mar  2 21:28:46 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Mar  5 18:36:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db5b4850

dev-vcs/git-cola: verbump to 3.9

Closes: https://bugs.gentoo.org/760582
Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: David Roman <davidroman96 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/19743
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-vcs/git-cola/Manifest            |   1 +
 dev-vcs/git-cola/git-cola-3.9.ebuild | 110 +++++++++++++++++++++++++++++++++++
 2 files changed, 111 insertions(+)

diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 3751edc0caa..6a5e83767cc 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1,2 +1,3 @@
 DIST git-cola-3.5.tar.gz 970155 BLAKE2B ae602d4de0e6fac9d2817100bee8923d8f550d0bb83ddafd806ccdfbd0a77c65bfb60ff03a9399c6b60d5d4683eb6d46ee41eaa43faf2e2ac092b34c9151c999 SHA512 532e24092a72486171345aeb0e7610eb49c4062b64395988c6c4965cac6e9ffaed1268c30a0a525d4d99404f626d9e505a4be148d376994d4326e3ca873e2793
 DIST git-cola-3.8.tar.gz 980190 BLAKE2B 0502701c63f370b304a83094b2154757d1810216e82882472c7eac9633ac26eaa75974af05c32c18203d03b67a027655ea85c0e335915f204f668fcc86ed9c3f SHA512 9ae04dfef3b5bc64452a8df43e7afa93091f282097447208dadbd17522b62e5c43f7afce3eecc59fc4e38863496cdb41ac8b0453bbf327121629fbde20e45bb0
+DIST git-cola-3.9.tar.gz 992335 BLAKE2B ab591d953173aa69773a82eb91ebcc6fa5bc5e31efa78ad27f3e1e57e22c4222d70914f059dffb0b05b2b366d3208e127ad123ccfeb1b4c1b648daae0bf53352 SHA512 91f4bb40c166669e05136985920113d7482a396a46adf45fcf05e8ee56677fee7ebfb6a793face79737a17be42aa5e32b216a30847e8e4a5b8dc5b3b4eba5395

diff --git a/dev-vcs/git-cola/git-cola-3.9.ebuild b/dev-vcs/git-cola/git-cola-3.9.ebuild
new file mode 100644
index 00000000000..11cb88f55b7
--- /dev/null
+++ b/dev-vcs/git-cola/git-cola-3.9.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_SINGLE_IMPL=true
+DISTUTILS_USE_SETUPTOOLS=no
+inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils
+
+DESCRIPTION="The highly caffeinated git GUI"
+HOMEPAGE="https://git-cola.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+		dev-python/PyQt5[network,${PYTHON_USEDEP}]
+		dev-python/QtPy[gui,${PYTHON_MULTI_USEDEP}]
+		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
+	')
+	dev-vcs/git
+"
+BDEPEND="sys-devel/gettext
+	$(python_gen_cond_dep "
+		doc? ( dev-python/sphinx[\${PYTHON_MULTI_USEDEP}] )
+		test? (
+			${VIRTUALX_DEPEND}
+			dev-python/mock[\${PYTHON_MULTI_USEDEP}]
+			dev-python/nose[\${PYTHON_MULTI_USEDEP}]
+			dev-python/pytest[\${PYTHON_MULTI_USEDEP}]
+		)
+	")
+"
+
+python_prepare_all() {
+	# make sure that tests also use the system provided QtPy
+	rm -r qtpy || die
+
+	rm share/git-cola/bin/*askpass* || die
+
+	# don't install docs into wrong location
+	sed -i -e '/doc/d' setup.py || die
+
+	# fix doc directory reference
+	sed -i \
+		-e "s/'doc', 'git-cola'/'doc', '${PF}'/" \
+		cola/resources.py || die
+
+	# fix ssh-askpass directory reference
+	sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	mydistutilsargs=( --no-vendor-libs --no-private-libs )
+}
+
+python_compile_all() {
+	cd share/doc/${PN}/ || die
+	if use doc ; then
+		emake all
+	else
+		sed \
+			-e '/^install:/s:install-html::g' \
+			-e '/^install:/s:install-man::g' \
+			-i Makefile || die
+	fi
+}
+
+python_test() {
+	GIT_CONFIG_NOSYSTEM=true \
+	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C.utf8" \
+	virtx nosetests --verbose --with-id --with-doctest \
+		--exclude=sphinxtogithub
+}
+
+python_install_all() {
+	cd share/doc/${PN}/ || die
+	emake \
+		DESTDIR="${D}" \
+		docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		prefix="${EPREFIX}/usr" \
+		install
+
+	# remove empty bin folder
+	rm -R "${ED}"/usr/share/git-cola/bin || die
+
+	use doc || HTML_DOCS=( "${FILESDIR}"/index.html )
+
+	distutils-r1_python_install_all
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2021-02-25  8:19 Sam James
  0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2021-02-25  8:19 UTC (permalink / raw
  To: gentoo-commits

commit:     07ae956910ad816daa1a03683198c1530d9382e0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 25 08:19:40 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 25 08:19:40 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07ae9569

dev-vcs/git-cola: Stabilize 3.8 x86, #758959

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-vcs/git-cola/git-cola-3.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-vcs/git-cola/git-cola-3.8.ebuild b/dev-vcs/git-cola/git-cola-3.8.ebuild
index 09638531c42..f8f01dccb51 100644
--- a/dev-vcs/git-cola/git-cola-3.8.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 RESTRICT="!test? ( test )"


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2021-02-24 20:35 Sam James
  0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2021-02-24 20:35 UTC (permalink / raw
  To: gentoo-commits

commit:     ff85d06f3d1078a67f1cab2307765f741e823cb5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 24 20:35:37 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 24 20:35:37 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff85d06f

dev-vcs/git-cola: Stabilize 3.8 amd64, #758959

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-vcs/git-cola/git-cola-3.8.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-vcs/git-cola/git-cola-3.8.ebuild b/dev-vcs/git-cola/git-cola-3.8.ebuild
index bf6122a84dc..09638531c42 100644
--- a/dev-vcs/git-cola/git-cola-3.8.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc test"
 
 RESTRICT="!test? ( test )"


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2020-12-21 19:58 Sam James
  0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2020-12-21 19:58 UTC (permalink / raw
  To: gentoo-commits

commit:     2627d2aaadd4e414ac5e662533e600c8e64244c2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 21 19:58:10 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 21 19:58:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2627d2aa

dev-vcs/git-cola: fully drop prefix keywords

Let us know if you want to use this and we can restore them.

Closes: https://bugs.gentoo.org/760806
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-vcs/git-cola/git-cola-3.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-vcs/git-cola/git-cola-3.5-r1.ebuild b/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
index a977e0dd5d2..c415d2c177d 100644
--- a/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 RESTRICT="!test? ( test )"


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2020-12-18  6:55 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2020-12-18  6:55 UTC (permalink / raw
  To: gentoo-commits

commit:     859185d324616886faaa394dff9eaedb7f666618
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 18 06:54:27 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Dec 18 06:54:27 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=859185d3

dev-vcs/git-cola: add py-3.7 for 3.5

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-vcs/git-cola/git-cola-3.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-vcs/git-cola/git-cola-3.5-r1.ebuild b/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
index e6a1500ea82..a977e0dd5d2 100644
--- a/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_SINGLE_IMPL=true
 DISTUTILS_USE_SETUPTOOLS=no
 inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2020-12-07  9:25 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2020-12-07  9:25 UTC (permalink / raw
  To: gentoo-commits

commit:     619c78bf0d82c6020aca73752509cdcf32eb7717
Author:     Martin Gysel <me <AT> bearsh <DOT> org>
AuthorDate: Sun Nov 29 13:26:16 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Dec  7 09:17:58 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=619c78bf

dev-vcs/git-cola: add PyQt5 dep

also add GIT_CONFIG_NOSYSTEM=true to tests

Closes: https://bugs.gentoo.org/737678
Closes: https://bugs.gentoo.org/739026

Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Martin Gysel <me <AT> bearsh.org>
Closes: https://github.com/gentoo/gentoo/pull/18445
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-vcs/git-cola/git-cola-3.5-r1.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev-vcs/git-cola/git-cola-3.5-r1.ebuild b/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
index 2626644a02d..0c0122bcd5b 100644
--- a/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
@@ -22,6 +22,7 @@ RDEPEND="
 	$(python_gen_cond_dep '
 		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
 		dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+		dev-python/PyQt5[network,${PYTHON_USEDEP}]
 		dev-python/QtPy[gui,${PYTHON_MULTI_USEDEP}]
 		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
 	')
@@ -73,6 +74,7 @@ python_compile_all() {
 }
 
 python_test() {
+	GIT_CONFIG_NOSYSTEM=true \
 	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="en_US.utf8" \
 	virtx nosetests --verbose --with-id --with-doctest \
 		--exclude=sphinxtogithub


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2020-12-07  9:25 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2020-12-07  9:25 UTC (permalink / raw
  To: gentoo-commits

commit:     8958277d505585586c9b5c7aeb54a22bd4e45bcb
Author:     Martin Gysel <me <AT> bearsh <DOT> org>
AuthorDate: Sun Nov 29 13:24:06 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Dec  7 09:17:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8958277d

dev-vcs/git-cola: bump to v3.8

Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Martin Gysel <me <AT> bearsh.org>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-vcs/git-cola/Manifest            |   1 +
 dev-vcs/git-cola/git-cola-3.8.ebuild | 114 +++++++++++++++++++++++++++++++++++
 dev-vcs/git-cola/metadata.xml        |  19 ++++--
 3 files changed, 130 insertions(+), 4 deletions(-)

diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 2138bce0be7..3751edc0caa 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1 +1,2 @@
 DIST git-cola-3.5.tar.gz 970155 BLAKE2B ae602d4de0e6fac9d2817100bee8923d8f550d0bb83ddafd806ccdfbd0a77c65bfb60ff03a9399c6b60d5d4683eb6d46ee41eaa43faf2e2ac092b34c9151c999 SHA512 532e24092a72486171345aeb0e7610eb49c4062b64395988c6c4965cac6e9ffaed1268c30a0a525d4d99404f626d9e505a4be148d376994d4326e3ca873e2793
+DIST git-cola-3.8.tar.gz 980190 BLAKE2B 0502701c63f370b304a83094b2154757d1810216e82882472c7eac9633ac26eaa75974af05c32c18203d03b67a027655ea85c0e335915f204f668fcc86ed9c3f SHA512 9ae04dfef3b5bc64452a8df43e7afa93091f282097447208dadbd17522b62e5c43f7afce3eecc59fc4e38863496cdb41ac8b0453bbf327121629fbde20e45bb0

diff --git a/dev-vcs/git-cola/git-cola-3.8.ebuild b/dev-vcs/git-cola/git-cola-3.8.ebuild
new file mode 100644
index 00000000000..7bf45f51a19
--- /dev/null
+++ b/dev-vcs/git-cola/git-cola-3.8.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_SINGLE_IMPL=true
+DISTUTILS_USE_SETUPTOOLS=no
+inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils
+
+DESCRIPTION="The highly caffeinated git GUI"
+HOMEPAGE="https://git-cola.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+		dev-python/PyQt5[network,${PYTHON_USEDEP}]
+		dev-python/QtPy[gui,${PYTHON_MULTI_USEDEP}]
+		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
+	')
+	dev-vcs/git
+"
+BDEPEND="sys-devel/gettext
+	$(python_gen_cond_dep "
+		doc? ( dev-python/sphinx[\${PYTHON_MULTI_USEDEP}] )
+		test? (
+			${VIRTUALX_DEPEND}
+			dev-python/mock[\${PYTHON_MULTI_USEDEP}]
+			dev-python/nose[\${PYTHON_MULTI_USEDEP}]
+			dev-python/pytest[\${PYTHON_MULTI_USEDEP}]
+		)
+	")
+"
+
+python_prepare_all() {
+	# make sure that tests also use the system provided QtPy
+	rm -r qtpy || die
+
+	rm share/git-cola/bin/*askpass* || die
+
+	# don't install docs into wrong location
+	sed -i -e '/doc/d' setup.py || die
+
+	# fix doc directory reference
+	sed -i \
+		-e "s/'doc', 'git-cola'/'doc', '${PF}'/" \
+		cola/resources.py || die
+
+	# fix ssh-askpass directory reference
+	sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	mydistutilsargs=( --no-vendor-libs --no-private-libs )
+}
+
+python_compile_all() {
+	cd share/doc/${PN}/ || die
+	if use doc ; then
+		emake all
+	else
+		sed \
+			-e '/^install:/s:install-html::g' \
+			-e '/^install:/s:install-man::g' \
+			-i Makefile || die
+	fi
+}
+
+python_test() {
+	GIT_CONFIG_NOSYSTEM=true \
+	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="en_US.utf8" \
+	virtx nosetests --verbose --with-id --with-doctest \
+		--exclude=sphinxtogithub
+}
+
+src_install() {
+	distutils-r1_src_install
+}
+
+python_install_all() {
+	cd share/doc/${PN}/ || die
+	emake \
+		DESTDIR="${D}" \
+		docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		prefix="${EPREFIX}/usr" \
+		install
+
+	# remove empty bin folder
+	rm -Rf "${ED}"/usr/share/git-cola/bin
+
+	use doc || HTML_DOCS=( "${FILESDIR}"/index.html )
+
+	distutils-r1_python_install_all
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}

diff --git a/dev-vcs/git-cola/metadata.xml b/dev-vcs/git-cola/metadata.xml
index 3ae0e4fb147..4f507e2ec3d 100644
--- a/dev-vcs/git-cola/metadata.xml
+++ b/dev-vcs/git-cola/metadata.xml
@@ -1,8 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">git-cola/git-cola</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>davidroman96@gmail.com</email>
+		<name>David Roman</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>me@bearsh.org</email>
+		<name>Martin Gysel</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">git-cola/git-cola</remote-id>
+	</upstream>
 </pkgmetadata>


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2020-12-07  9:25 Joonas Niilola
  0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2020-12-07  9:25 UTC (permalink / raw
  To: gentoo-commits

commit:     e84e7f95a97aa336b8ac5a008e34947d67cfaa48
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  7 09:18:37 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Dec  7 09:18:37 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e84e7f95

dev-vcs/git-cola: remove -f switch from rm

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-vcs/git-cola/git-cola-3.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-vcs/git-cola/git-cola-3.8.ebuild b/dev-vcs/git-cola/git-cola-3.8.ebuild
index 7bf45f51a19..7180c6fb668 100644
--- a/dev-vcs/git-cola/git-cola-3.8.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.8.ebuild
@@ -97,7 +97,7 @@ python_install_all() {
 		install
 
 	# remove empty bin folder
-	rm -Rf "${ED}"/usr/share/git-cola/bin
+	rm -R "${ED}"/usr/share/git-cola/bin
 
 	use doc || HTML_DOCS=( "${FILESDIR}"/index.html )
 


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2020-03-22 14:07 Agostino Sarubbo
  0 siblings, 0 replies; 60+ messages in thread
From: Agostino Sarubbo @ 2020-03-22 14:07 UTC (permalink / raw
  To: gentoo-commits

commit:     92ba604a7aee671e387677ff7ceadcc8137c3be8
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 22 14:07:37 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Mar 22 14:07:37 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92ba604a

dev-vcs/git-cola: x86 stable wrt bug #712242

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-vcs/git-cola/git-cola-3.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-vcs/git-cola/git-cola-3.5-r1.ebuild b/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
index 0ffc73c8602..2626644a02d 100644
--- a/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 RESTRICT="!test? ( test )"


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2020-03-14 19:46 Agostino Sarubbo
  0 siblings, 0 replies; 60+ messages in thread
From: Agostino Sarubbo @ 2020-03-14 19:46 UTC (permalink / raw
  To: gentoo-commits

commit:     c0866b12b70a92368ae179f8fcb5c1bc5baa9c97
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 14 19:45:29 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Mar 14 19:46:15 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0866b12

dev-vcs/git-cola: amd64 stable wrt bug #712242

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-vcs/git-cola/git-cola-3.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-vcs/git-cola/git-cola-3.5-r1.ebuild b/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
index 9a1bb3679f7..0ffc73c8602 100644
--- a/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 RESTRICT="!test? ( test )"


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2020-01-21 19:46 Andreas Sturmlechner
  0 siblings, 0 replies; 60+ messages in thread
From: Andreas Sturmlechner @ 2020-01-21 19:46 UTC (permalink / raw
  To: gentoo-commits

commit:     d1719ec3fcde531879371c15fb589464bc3a0484
Author:     Martin Gysel <me <AT> bearsh <DOT> org>
AuthorDate: Mon Nov  4 20:32:34 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 21 19:46:42 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1719ec3

dev-vcs/git-cola: 3.5 version bump

- xdg_desktop_database_update added in pkg_postinst() and pkg_postrm()
- add RESTRICT="!test? ( test )"
- add BDEPEND variable

Closes: https://bugs.gentoo.org/699332
Signed-off-by: Martin Gysel <me <AT> bearsh.org>
Closes: https://github.com/gentoo/gentoo/pull/13550
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-vcs/git-cola/Manifest            |   1 +
 dev-vcs/git-cola/git-cola-3.5.ebuild | 104 +++++++++++++++++++++++++++++++++++
 2 files changed, 105 insertions(+)

diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 6318f76f93f..254c0bbae08 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1,2 +1,3 @@
 DIST git-cola-2.11.tar.gz 1179769 BLAKE2B db2926b8137b2bb11cc9698b37156d8b0c8f72068061d7d1598b2e3237e44764c2914923103aaaa704babe26cf7a7c16bbe28a61770d98954f776b8ce955658a SHA512 99b865d7a49dcb041e54811141d242386642b5ed6fc12fa7a03431eb9b905cb88d88c4892dc432dd59e8ae3c85f20cc40f4bfb9b6ff002f4e5a4cfc0bdc4c72c
 DIST git-cola-3.2.tar.gz 1208723 BLAKE2B e0375502c7b760a35217c48708e34ba061934f968e6720c3560603b5a76c9474a3a8426f2120ee853a9ac475fc9cbc33ee6ee9a946336e1f28a89d541785c535 SHA512 ca171549dad692088e337efad6f480103a41a1a94f57ae66c15fab3d69e3b18ecc28ac1178886fedd6d969f783e8d5feb4922539c1739ce52c0c0ac59dc941ee
+DIST git-cola-3.5.tar.gz 970155 BLAKE2B ae602d4de0e6fac9d2817100bee8923d8f550d0bb83ddafd806ccdfbd0a77c65bfb60ff03a9399c6b60d5d4683eb6d46ee41eaa43faf2e2ac092b34c9151c999 SHA512 532e24092a72486171345aeb0e7610eb49c4062b64395988c6c4965cac6e9ffaed1268c30a0a525d4d99404f626d9e505a4be148d376994d4326e3ca873e2793

diff --git a/dev-vcs/git-cola/git-cola-3.5.ebuild b/dev-vcs/git-cola/git-cola-3.5.ebuild
new file mode 100644
index 00000000000..9fb8610abf7
--- /dev/null
+++ b/dev-vcs/git-cola/git-cola-3.5.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_SINGLE_IMPL=true
+inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils
+
+DESCRIPTION="The highly caffeinated git GUI"
+HOMEPAGE="https://git-cola.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/QtPy[gui,${PYTHON_USEDEP}]
+	dev-python/send2trash[${PYTHON_USEDEP}]
+	dev-vcs/git"
+BDEPEND="sys-devel/gettext
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${VIRTUALX_DEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# make sure that tests also use the system provided QtPy
+	rm -r qtpy || die
+
+	rm share/git-cola/bin/*askpass* || die
+
+	# don't install docs into wrong location
+	sed -i -e '/doc/d' setup.py || die
+
+	# fix doc directory reference
+	sed -i \
+		-e "s/'doc', 'git-cola'/'doc', '${PF}'/" \
+		cola/resources.py || die
+
+	# fix ssh-askpass directory reference
+	sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	mydistutilsargs=( --no-vendor-libs )
+}
+
+python_compile_all() {
+	cd share/doc/${PN}/ || die
+	if use doc ; then
+		emake all
+	else
+		sed \
+			-e '/^install:/s:install-html::g' \
+			-e '/^install:/s:install-man::g' \
+			-i Makefile || die
+	fi
+}
+
+python_test() {
+	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="en_US.utf8" \
+	virtx nosetests --verbose --with-id --with-doctest \
+		--exclude=sphinxtogithub
+}
+
+src_install() {
+	distutils-r1_src_install
+}
+
+python_install_all() {
+	cd share/doc/${PN}/ || die
+	emake \
+		DESTDIR="${D}" \
+		docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		prefix="${EPREFIX}/usr" \
+		install
+
+	python_fix_shebang "${ED}/usr/share/git-cola/bin/git-xbase" "${ED}"/usr/bin/git-cola
+	python_optimize "${ED}/usr/share/git-cola/lib/cola"
+
+	use doc || HTML_DOCS=( "${FILESDIR}"/index.html )
+
+	distutils-r1_python_install_all
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2020-01-16  6:05 Michał Górny
  0 siblings, 0 replies; 60+ messages in thread
From: Michał Górny @ 2020-01-16  6:05 UTC (permalink / raw
  To: gentoo-commits

commit:     631d0c8e9000b0229f52fd90863ce30fb457ef01
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 16 05:48:52 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jan 16 06:05:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=631d0c8e

dev-vcs/git-cola: Remove Python 2

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-vcs/git-cola/git-cola-2.11.ebuild | 3 +--
 dev-vcs/git-cola/git-cola-3.2.ebuild  | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dev-vcs/git-cola/git-cola-2.11.ebuild b/dev-vcs/git-cola/git-cola-2.11.ebuild
index 65a5d6cbed6..d97f4818b85 100644
--- a/dev-vcs/git-cola/git-cola-2.11.ebuild
+++ b/dev-vcs/git-cola/git-cola-2.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 DISTUTILS_SINGLE_IMPL=true
 
 inherit distutils-r1 readme.gentoo-r1 virtualx
@@ -29,7 +29,6 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	doc? (
 		dev-python/sphinx[${PYTHON_USEDEP}]
-		python_targets_python2_7? ( dev-python/sphinxtogithub[$(python_gen_usedep 'python2*')] )
 		)
 	test? ( dev-python/nose[${PYTHON_USEDEP}] ${VIRTUALX_DEPEND} )
 "

diff --git a/dev-vcs/git-cola/git-cola-3.2.ebuild b/dev-vcs/git-cola/git-cola-3.2.ebuild
index 1bb68c4eb5e..de021727cff 100644
--- a/dev-vcs/git-cola/git-cola-3.2.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 DISTUTILS_SINGLE_IMPL=true
 
 inherit distutils-r1 readme.gentoo-r1 virtualx
@@ -27,7 +27,6 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	doc? (
 		dev-python/sphinx[${PYTHON_USEDEP}]
-		python_targets_python2_7? ( dev-python/sphinxtogithub[$(python_gen_usedep 'python2*')] )
 		)
 	test? (
 		${VIRTUALX_DEPEND}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2018-11-20  7:43 Tiziano Müller
  0 siblings, 0 replies; 60+ messages in thread
From: Tiziano Müller @ 2018-11-20  7:43 UTC (permalink / raw
  To: gentoo-commits

commit:     5730e72e97baac827442e8e37820257372d2ae37
Author:     Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 20 07:35:08 2018 +0000
Commit:     Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Tue Nov 20 07:42:43 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5730e72e

dev-vcs/git-cola: version bump to 3.2

Closes: https://bugs.gentoo.org/655908
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Tiziano Müller <dev-zero <AT> gentoo.org>

 dev-vcs/git-cola/Manifest            |  1 +
 dev-vcs/git-cola/git-cola-3.2.ebuild | 98 ++++++++++++++++++++++++++++++++++++
 2 files changed, 99 insertions(+)

diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 64328eade56..6318f76f93f 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1 +1,2 @@
 DIST git-cola-2.11.tar.gz 1179769 BLAKE2B db2926b8137b2bb11cc9698b37156d8b0c8f72068061d7d1598b2e3237e44764c2914923103aaaa704babe26cf7a7c16bbe28a61770d98954f776b8ce955658a SHA512 99b865d7a49dcb041e54811141d242386642b5ed6fc12fa7a03431eb9b905cb88d88c4892dc432dd59e8ae3c85f20cc40f4bfb9b6ff002f4e5a4cfc0bdc4c72c
+DIST git-cola-3.2.tar.gz 1208723 BLAKE2B e0375502c7b760a35217c48708e34ba061934f968e6720c3560603b5a76c9474a3a8426f2120ee853a9ac475fc9cbc33ee6ee9a946336e1f28a89d541785c535 SHA512 ca171549dad692088e337efad6f480103a41a1a94f57ae66c15fab3d69e3b18ecc28ac1178886fedd6d969f783e8d5feb4922539c1739ce52c0c0ac59dc941ee

diff --git a/dev-vcs/git-cola/git-cola-3.2.ebuild b/dev-vcs/git-cola/git-cola-3.2.ebuild
new file mode 100644
index 00000000000..02897b8b6a9
--- /dev/null
+++ b/dev-vcs/git-cola/git-cola-3.2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+DISTUTILS_SINGLE_IMPL=true
+
+inherit distutils-r1 readme.gentoo-r1 virtualx
+
+DESCRIPTION="The highly caffeinated git GUI"
+HOMEPAGE="https://git-cola.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="dev-python/QtPy[gui,${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/send2trash[${PYTHON_USEDEP}]
+	dev-vcs/git"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		python_targets_python2_7? ( dev-python/sphinxtogithub[$(python_gen_usedep 'python2*')] )
+		)
+	test? (
+		${VIRTUALX_DEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		)"
+
+python_prepare_all() {
+	# make sure that tests also use the system provided QtPy
+	rm -r qtpy || die
+
+	rm share/git-cola/bin/*askpass* || die
+
+	# don't install docs into wrong location
+	sed -i -e '/doc/d' setup.py || die
+
+	# fix doc directory reference
+	sed -i \
+		-e "s/'doc', 'git-cola'/'doc', '${PF}'/" \
+		cola/resources.py || die
+
+	# fix ssh-askpass directory reference
+	sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	mydistutilsargs=( --no-vendor-libs )
+}
+
+python_compile_all() {
+	cd share/doc/${PN}/ || die
+	if use doc ; then
+		emake all
+	else
+		sed \
+			-e '/^install:/s:install-html::g' \
+			-e '/^install:/s:install-man::g' \
+			-i Makefile || die
+	fi
+}
+
+python_test() {
+	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="en_US.utf8" \
+	virtx nosetests --verbose --with-id --with-doctest \
+		--exclude=sphinxtogithub
+}
+
+src_install() {
+	distutils-r1_src_install
+}
+
+python_install_all() {
+	cd share/doc/${PN}/ || die
+	emake \
+		DESTDIR="${D}" \
+		docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		prefix="${EPREFIX}/usr" \
+		install
+
+	python_fix_shebang "${ED}/usr/share/git-cola/bin/git-xbase" "${ED}"/usr/bin/git-cola
+	python_optimize "${ED}/usr/share/git-cola/lib/cola"
+
+	use doc || HTML_DOCS=( "${FILESDIR}"/index.html )
+
+	distutils-r1_python_install_all
+	readme.gentoo_create_doc
+}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2018-06-26 19:04 Pacho Ramos
  0 siblings, 0 replies; 60+ messages in thread
From: Pacho Ramos @ 2018-06-26 19:04 UTC (permalink / raw
  To: gentoo-commits

commit:     b25a262c8a54906e5eb65df2695143343dab7a12
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 26 18:52:49 2018 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Tue Jun 26 19:04:09 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b25a262c

dev-vcs/git-cola: Support python3.6

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-vcs/git-cola/git-cola-2.11.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-vcs/git-cola/git-cola-2.11.ebuild b/dev-vcs/git-cola/git-cola-2.11.ebuild
index 78f74ae2c03..2eb369d1340 100644
--- a/dev-vcs/git-cola/git-cola-2.11.ebuild
+++ b/dev-vcs/git-cola/git-cola-2.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 DISTUTILS_SINGLE_IMPL=true
 
 inherit distutils-r1 readme.gentoo-r1 virtualx


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2017-09-25 14:10 Pacho Ramos
  0 siblings, 0 replies; 60+ messages in thread
From: Pacho Ramos @ 2017-09-25 14:10 UTC (permalink / raw
  To: gentoo-commits

commit:     d1889de66897b301453199477889b32dc5d2bd7a
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 25 14:10:15 2017 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Mon Sep 25 14:10:33 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1889de6

dev-vcs/git-cola: amd64/x86 stable, bug #625078

Package-Manager: Portage-2.3.10, Repoman-2.3.3

 dev-vcs/git-cola/git-cola-2.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-vcs/git-cola/git-cola-2.11.ebuild b/dev-vcs/git-cola/git-cola-2.11.ebuild
index 149e64908a5..78f74ae2c03 100644
--- a/dev-vcs/git-cola/git-cola-2.11.ebuild
+++ b/dev-vcs/git-cola/git-cola-2.11.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 # Since PyQt5 is preferred at runtime if installed, depend on that


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2016-12-25 23:48 Manuel Rüger
  0 siblings, 0 replies; 60+ messages in thread
From: Manuel Rüger @ 2016-12-25 23:48 UTC (permalink / raw
  To: gentoo-commits

commit:     aef1da7dacd9663234379e5787cd74bf10da3140
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 25 23:48:12 2016 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Sun Dec 25 23:48:32 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aef1da7d

dev-vcs/git-cola: Remove myself as a maintainer

Package-Manager: portage-2.3.3

 dev-vcs/git-cola/metadata.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dev-vcs/git-cola/metadata.xml b/dev-vcs/git-cola/metadata.xml
index 41c9fab..a9e87ce 100644
--- a/dev-vcs/git-cola/metadata.xml
+++ b/dev-vcs/git-cola/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>mrueg@gentoo.org</email>
-    <name>Manuel Rüger</name>
-  </maintainer>
-  <maintainer type="person">
     <email>dev-zero@gentoo.org</email>
     <name>Tiziano Müller</name>
   </maintainer>


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2016-01-10 11:56 Manuel Rüger
  0 siblings, 0 replies; 60+ messages in thread
From: Manuel Rüger @ 2016-01-10 11:56 UTC (permalink / raw
  To: gentoo-commits

commit:     7b90990fddf5491a519c15055f6352296de9ce4c
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 10 11:54:55 2016 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Sun Jan 10 11:54:55 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b90990f

dev-vcs/git-cola: Add myself as a maintainer

Package-Manager: portage-2.2.26

 dev-vcs/git-cola/metadata.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dev-vcs/git-cola/metadata.xml b/dev-vcs/git-cola/metadata.xml
index 583b3d3..64b20cc 100644
--- a/dev-vcs/git-cola/metadata.xml
+++ b/dev-vcs/git-cola/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
+    <email>mrueg@gentoo.org</email>
+    <name>Manuel Rüger</name>
+  </maintainer>
+  <maintainer>
     <email>dev-zero@gentoo.org</email>
     <name>Tiziano Müller</name>
   </maintainer>


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2015-11-11  9:02 Justin Lecher
  0 siblings, 0 replies; 60+ messages in thread
From: Justin Lecher @ 2015-11-11  9:02 UTC (permalink / raw
  To: gentoo-commits

commit:     28ebe8ba57a4be877828fe5d01cc29b80fc10fff
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 11 08:52:01 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Nov 11 09:02:00 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28ebe8ba

dev-vcs/git-cola: Version Bump

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 dev-vcs/git-cola/Manifest            |  1 +
 dev-vcs/git-cola/git-cola-2.4.ebuild | 97 ++++++++++++++++++++++++++++++++++++
 2 files changed, 98 insertions(+)

diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 00611fa..c27708f 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1,2 +1,3 @@
 DIST git-cola-2.2.1.tar.gz 996484 SHA256 df0a3e1d3c49629926f2e30f55d635eca3c8da12e96232196b307613fa4b3aec SHA512 a91fe706ea150d9bd9a05a9d494c63d373cae0154deca8e40e30fc20e70be32d4fd1f021a971c067d46ab24f472965a12c115eeb4bd94e4f62c21e546d89c109 WHIRLPOOL ac68a558775bc5fdf3a168416132dedbeffe554f6f60f50b7e33f0d17d67aa829318b7a0df2607b47e41b8823d60e206e0544e03382eae7651b9ca1c3b9dfc09
 DIST git-cola-2.3.tar.gz 1005858 SHA256 3319810c16f6864deb5f94f533c7cfd17f30961595454da7c3c75879f56511b3 SHA512 2be0e971cd23aa0a1f8ec92ffd05f64cdd0ee34fb1e3c9bd3a98df0556968e9613d6494002e973db8de8ab389c48205ab1db42823d46e523c24a029cf25e3023 WHIRLPOOL 177996e40cc83dd2d2fe9db1ac97ba318d9d311779415e8e4327f3824a7c19f36f592ed1d6118e5a2d46a594a8dd681d0a2e2e54f2846c3636d9f4f3d8f196f5
+DIST git-cola-2.4.tar.gz 987829 SHA256 ef735431a2e58bac7671c4b9ab4fbb369195b16987fe9d3d931a9097c06c7f36 SHA512 702d5c7322a21e5807354d3b3b7b31fd5cef3c12c3294e2ad57add99f586277d4805e85122682acde40e6243529588e62762f9483d807ed12340057c6a37a0cc WHIRLPOOL de95800c0d8f67d301a102a8f623945170ca5961cde91fdabf2dd396f2470e52e8b51dde1f65b5aed408ebc3cd6802426c7bd3b9cd86db53b2965067d2646f47

diff --git a/dev-vcs/git-cola/git-cola-2.4.ebuild b/dev-vcs/git-cola/git-cola-2.4.ebuild
new file mode 100644
index 0000000..6ac0dca
--- /dev/null
+++ b/dev-vcs/git-cola/git-cola-2.4.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+DISTUTILS_SINGLE_IMPL=true
+
+inherit distutils-r1 readme.gentoo virtualx
+
+DESCRIPTION="The highly caffeinated git GUI"
+HOMEPAGE="https://git-cola.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/pyinotify[${PYTHON_USEDEP}]
+	dev-python/send2trash[${PYTHON_USEDEP}]
+	dev-python/PyQt4[${PYTHON_USEDEP}]
+	dev-vcs/git"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		python_targets_python2_7? ( dev-python/sphinxtogithub[$(python_gen_usedep 'python2*')] )
+		)
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.1-disable-live-tests.patch
+)
+
+python_prepare_all() {
+	rm share/git-cola/bin/*askpass* || die
+
+	# remove broken tests
+	rm test/i18n_test.py || die
+
+	# don't install docs into wrong location
+	sed -i -e '/doc/d' setup.py || die
+
+	# fix doc directory reference
+	sed -i \
+		-e "s/'doc', 'git-cola'/'doc', '${PF}'/" \
+		cola/resources.py || die
+
+	# fix ssh-askpass directory reference
+	sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	cd share/doc/${PN}/ || die
+	if use doc; then
+		emake all
+	else
+		sed \
+			-e '/^install:/s:install-html::g' \
+			-e '/^install:/s:install-man::g' \
+			-i Makefile || die
+	fi
+}
+
+python_test() {
+	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C" \
+	VIRTUALX_COMMAND="nosetests --verbose --with-id --with-doctest \
+		--exclude=sphinxtogithub" \
+	virtualmake
+}
+
+src_install() {
+	distutils-r1_src_install
+}
+
+python_install_all() {
+	cd share/doc/${PN}/ || die
+	emake \
+		DESTDIR="${D}" \
+		docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		prefix="${EPREFIX}/usr" \
+		install
+
+	python_fix_shebang "${ED}/usr/share/git-cola/bin/git-xbase" "${ED}"/usr/bin/git-cola
+	python_optimize "${ED}/usr/share/git-cola/lib/cola"
+
+	use doc || HTML_DOCS=( "${FILESDIR}"/index.html )
+
+	distutils-r1_python_install_all
+	readme.gentoo_create_doc
+}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2015-09-19 13:30 Agostino Sarubbo
  0 siblings, 0 replies; 60+ messages in thread
From: Agostino Sarubbo @ 2015-09-19 13:30 UTC (permalink / raw
  To: gentoo-commits

commit:     245d3d8800275bbd411319ba3cfcec3c6f4fda7b
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 19 13:30:47 2015 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Sep 19 13:30:47 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=245d3d88

dev-vcs/git-cola: amd64 stable wrt bug #560446

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"

 dev-vcs/git-cola/git-cola-2.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-vcs/git-cola/git-cola-2.2.1.ebuild b/dev-vcs/git-cola/git-cola-2.2.1.ebuild
index 0990e9d..e3bf99f 100644
--- a/dev-vcs/git-cola/git-cola-2.2.1.ebuild
+++ b/dev-vcs/git-cola/git-cola-2.2.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 RDEPEND="


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

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/
@ 2015-09-14 12:49 Justin Lecher
  0 siblings, 0 replies; 60+ messages in thread
From: Justin Lecher @ 2015-09-14 12:49 UTC (permalink / raw
  To: gentoo-commits

commit:     b0a935dc136549cf9036580dcd445a2d7e0d9595
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 14 12:49:42 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Sep 14 12:49:48 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0a935dc

dev-vcs/git-cola: Version Bump

Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 dev-vcs/git-cola/Manifest            |  1 +
 dev-vcs/git-cola/git-cola-2.3.ebuild | 97 ++++++++++++++++++++++++++++++++++++
 2 files changed, 98 insertions(+)

diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 25d590c..a0fa8dc 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1,2 +1,3 @@
 DIST git-cola-2.1.2.tar.gz 960514 SHA256 f0465f74858fc78b1b30e06856cdd6b5fa5f0cb9587b5c7e9b489f4d0e4d8f8d SHA512 79eae7937db148cde22b3d5dc1564180c3919965c35c11853270525be4eb19c7f223ddc215ba8122ed8bcb70e0e6ec57948f1e02aeeae1a9c3e7c98efef1e42d WHIRLPOOL 8797f0f0d02eaea1c7e1ef5544fc7e5e2bf6ca738cff721ce56db194de8cd94a3e825bf557f478237d75c5cf782ed43cdafc7a7afdaf1417fa4f3d8b65bcb756
 DIST git-cola-2.2.1.tar.gz 996484 SHA256 df0a3e1d3c49629926f2e30f55d635eca3c8da12e96232196b307613fa4b3aec SHA512 a91fe706ea150d9bd9a05a9d494c63d373cae0154deca8e40e30fc20e70be32d4fd1f021a971c067d46ab24f472965a12c115eeb4bd94e4f62c21e546d89c109 WHIRLPOOL ac68a558775bc5fdf3a168416132dedbeffe554f6f60f50b7e33f0d17d67aa829318b7a0df2607b47e41b8823d60e206e0544e03382eae7651b9ca1c3b9dfc09
+DIST git-cola-2.3.tar.gz 1005858 SHA256 3319810c16f6864deb5f94f533c7cfd17f30961595454da7c3c75879f56511b3 SHA512 2be0e971cd23aa0a1f8ec92ffd05f64cdd0ee34fb1e3c9bd3a98df0556968e9613d6494002e973db8de8ab389c48205ab1db42823d46e523c24a029cf25e3023 WHIRLPOOL 177996e40cc83dd2d2fe9db1ac97ba318d9d311779415e8e4327f3824a7c19f36f592ed1d6118e5a2d46a594a8dd681d0a2e2e54f2846c3636d9f4f3d8f196f5

diff --git a/dev-vcs/git-cola/git-cola-2.3.ebuild b/dev-vcs/git-cola/git-cola-2.3.ebuild
new file mode 100644
index 0000000..e65d904
--- /dev/null
+++ b/dev-vcs/git-cola/git-cola-2.3.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+DISTUTILS_SINGLE_IMPL=true
+
+inherit distutils-r1 readme.gentoo virtualx
+
+DESCRIPTION="The highly caffeinated git GUI"
+HOMEPAGE="https://git-cola.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/pyinotify[${PYTHON_USEDEP}]
+	dev-python/send2trash[${PYTHON_USEDEP}]
+	dev-python/PyQt4[${PYTHON_USEDEP}]
+	dev-vcs/git"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		python_targets_python2_7? ( dev-python/sphinxtogithub[$(python_gen_usedep 'python2*')] )
+		)
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.1-disable-live-tests.patch
+)
+
+python_prepare_all() {
+	rm share/git-cola/bin/*askpass* || die
+
+	# remove broken tests
+	rm test/i18n_test.py || die
+
+	# don't install docs into wrong location
+	sed -i -e '/doc/d' setup.py || die
+
+	# fix doc directory reference
+	sed -i \
+		-e "s/'doc', 'git-cola'/'doc', '${PF}'/" \
+		cola/resources.py || die
+
+	# fix ssh-askpass directory reference
+	sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	cd share/doc/${PN}/ || die
+	if use doc; then
+		emake all
+	else
+		sed \
+			-e '/^install:/s:install-html::g' \
+			-e '/^install:/s:install-man::g' \
+			-i Makefile || die
+	fi
+}
+
+python_test() {
+	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C" \
+	VIRTUALX_COMMAND="nosetests --verbose --with-id --with-doctest \
+		--exclude=sphinxtogithub" \
+	virtualmake
+}
+
+src_install() {
+	distutils-r1_src_install
+}
+
+python_install_all() {
+	cd share/doc/${PN}/ || die
+	emake \
+		DESTDIR="${D}" \
+		docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		prefix="${EPREFIX}/usr" \
+		install
+
+	python_fix_shebang "${ED}/usr/share/git-cola/bin/git-xbase"
+	python_optimize "${ED}/usr/share/git-cola/lib/cola"
+
+	use doc || HTML_DOCS=( "${FILESDIR}"/index.html )
+
+	distutils-r1_python_install_all
+	readme.gentoo_create_doc
+}


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

end of thread, other threads:[~2024-10-02 18:10 UTC | newest]

Thread overview: 60+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-29  6:20 [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2024-10-02 18:10 Andreas Sturmlechner
2024-10-02 18:10 Andreas Sturmlechner
2024-10-01 18:32 Andreas Sturmlechner
2024-10-01 18:32 Andreas Sturmlechner
2024-10-01 18:32 Andreas Sturmlechner
2024-04-23  6:38 Joonas Niilola
2024-04-23  1:31 Sam James
2024-01-28 10:22 Yixun Lan
2023-12-23 17:38 Sam James
2023-12-23 17:31 Sam James
2023-12-23 17:31 Sam James
2023-12-23 17:31 Sam James
2023-08-27 15:23 Arthur Zamarin
2023-07-24 21:02 Sam James
2023-07-24 14:18 Arthur Zamarin
2023-04-20 12:22 Joonas Niilola
2023-04-19  9:33 Arthur Zamarin
2023-04-15 12:23 Joonas Niilola
2023-04-15 12:23 Joonas Niilola
2023-01-25 17:41 Joonas Niilola
2023-01-25 17:41 Joonas Niilola
2022-11-22 13:55 Joonas Niilola
2022-10-11 13:36 Joonas Niilola
2022-10-11 13:36 Joonas Niilola
2022-09-08  7:26 Agostino Sarubbo
2022-09-07  1:50 Sam James
2022-07-02 17:35 Joonas Niilola
2022-07-02 17:35 Joonas Niilola
2022-04-25 10:30 Joonas Niilola
2022-04-25  9:12 Joonas Niilola
2022-01-29  6:20 Sam James
2022-01-24 22:14 Michał Górny
2022-01-24 22:14 Michał Górny
2021-12-07  6:26 Agostino Sarubbo
2021-12-05  5:18 Sam James
2021-11-22 14:03 Joonas Niilola
2021-09-21  7:03 Joonas Niilola
2021-09-21  7:03 Joonas Niilola
2021-09-21  7:03 Joonas Niilola
2021-03-05 18:36 Joonas Niilola
2021-02-25  8:19 Sam James
2021-02-24 20:35 Sam James
2020-12-21 19:58 Sam James
2020-12-18  6:55 Joonas Niilola
2020-12-07  9:25 Joonas Niilola
2020-12-07  9:25 Joonas Niilola
2020-12-07  9:25 Joonas Niilola
2020-03-22 14:07 Agostino Sarubbo
2020-03-14 19:46 Agostino Sarubbo
2020-01-21 19:46 Andreas Sturmlechner
2020-01-16  6:05 Michał Górny
2018-11-20  7:43 Tiziano Müller
2018-06-26 19:04 Pacho Ramos
2017-09-25 14:10 Pacho Ramos
2016-12-25 23:48 Manuel Rüger
2016-01-10 11:56 Manuel Rüger
2015-11-11  9:02 Justin Lecher
2015-09-19 13:30 Agostino Sarubbo
2015-09-14 12:49 Justin Lecher

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