From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5D27315802F for ; Tue, 7 Mar 2023 11:39:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 70E09E07D0; Tue, 7 Mar 2023 11:39:51 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 24323E07E0 for ; Tue, 7 Mar 2023 11:39:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E3E4B3412BA for ; Tue, 7 Mar 2023 11:39:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5CC9F8D3 for ; Tue, 7 Mar 2023 11:39:48 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1678189095.b4386cdacf80445dd7e9820b8f58fa7254bcdd0c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/webapp-config/webapp-config-1.55-r2.ebuild app-admin/webapp-config/webapp-config-9999.ebuild X-VCS-Directories: app-admin/webapp-config/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b4386cdacf80445dd7e9820b8f58fa7254bcdd0c X-VCS-Branch: master Date: Tue, 7 Mar 2023 11:39:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c8b52ea5-6e7d-49e6-9bfd-4b826db18178 X-Archives-Hash: 3313ea42c935392f2be9cf1e8924051f commit: b4386cdacf80445dd7e9820b8f58fa7254bcdd0c Author: Sam James gentoo org> AuthorDate: Tue Mar 7 11:38:15 2023 +0000 Commit: Sam James gentoo org> CommitDate: Tue Mar 7 11:38:15 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4386cda app-admin/webapp-config: enable py3.11 Closes: https://bugs.gentoo.org/896488 Signed-off-by: Sam James gentoo.org> .../webapp-config/webapp-config-1.55-r2.ebuild | 22 ++++++++++++++-------- app-admin/webapp-config/webapp-config-9999.ebuild | 12 ++++++------ 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/app-admin/webapp-config/webapp-config-1.55-r2.ebuild b/app-admin/webapp-config/webapp-config-1.55-r2.ebuild index 9ef0f49f155f..9aad95348cfe 100644 --- a/app-admin/webapp-config/webapp-config-1.55-r2.ebuild +++ b/app-admin/webapp-config/webapp-config-1.55-r2.ebuild @@ -4,12 +4,18 @@ EAPI=7 DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit distutils-r1 prefix -SRC_URI="https://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +if [[ ${PV} = 9999* ]] +then + EGIT_REPO_URI="https://anongit.gentoo.org/proj/${PN}.git" + inherit git-r3 +else + SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +fi DESCRIPTION="Gentoo's installer for web-based applications" HOMEPAGE="https://sourceforge.net/projects/webapp-config/" @@ -32,6 +38,11 @@ python_compile_all() { emake -C doc/ } +python_test() { + PYTHONPATH="." "${EPYTHON}" WebappConfig/tests/external.py -v || + die "Testing failed with ${EPYTHON}" +} + python_install() { # According to this discussion: # http://mail.python.org/pipermail/distutils-sig/2004-February/003713.html @@ -54,11 +65,6 @@ python_install_all() { doman doc/*.[58] } -python_test() { - PYTHONPATH="." "${EPYTHON}" WebappConfig/tests/external.py -v || - die "Testing failed with ${EPYTHON}" -} - pkg_postinst() { elog "Now that you have upgraded webapp-config, you **must** update your" elog "config files in /etc/vhosts/webapp-config before you emerge any" diff --git a/app-admin/webapp-config/webapp-config-9999.ebuild b/app-admin/webapp-config/webapp-config-9999.ebuild index 80bc77e30465..9aad95348cfe 100644 --- a/app-admin/webapp-config/webapp-config-9999.ebuild +++ b/app-admin/webapp-config/webapp-config-9999.ebuild @@ -4,7 +4,7 @@ EAPI=7 DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit distutils-r1 prefix @@ -38,6 +38,11 @@ python_compile_all() { emake -C doc/ } +python_test() { + PYTHONPATH="." "${EPYTHON}" WebappConfig/tests/external.py -v || + die "Testing failed with ${EPYTHON}" +} + python_install() { # According to this discussion: # http://mail.python.org/pipermail/distutils-sig/2004-February/003713.html @@ -60,11 +65,6 @@ python_install_all() { doman doc/*.[58] } -python_test() { - PYTHONPATH="." "${EPYTHON}" WebappConfig/tests/external.py -v || - die "Testing failed with ${EPYTHON}" -} - pkg_postinst() { elog "Now that you have upgraded webapp-config, you **must** update your" elog "config files in /etc/vhosts/webapp-config before you emerge any"