gentoo auto-resync : 26:05:2024 - 00:07:27

3 files changed, 2 insertions, 90 deletions

diff --git a/app-admin/webapp-config/Manifest b/app-admin/webapp-config/Manifest
index 2a6b0516154d..28b7267921fe 100644
--- a/app-admin/webapp-config/Manifest
+++ b/app-admin/webapp-config/Manifest
@@ -1,6 +1,5 @@
 AUX webapp-config-1.55-py3.122-invalid-escape-sequence.patch 334 BLAKE2B 49579635819c92cbb47b3ed7be47d1e5dd1ad3469de1a89fe5d6ffa26e5e6290d5c090419227c9e572b348cb9297ebd7bfe33bee7e4557d55b348d68731f1aaf SHA512 0163b3cf649b54747cf8fef6b2c91017ab59c92d50c8b96fc5231491e104db20c1de968fa8fc70774f64b91d58c798467d1d0a48093cd7269cbf385aaccd49f5
 DIST webapp-config-1.55.tar.bz2 72583 BLAKE2B be958dc991f0e1f6835d9c29350b7d97e3f23d52971f6013165ce59a8f4b32ac6262c9719956d1bcdbe60797f07d77910b44a749ae545c4dc15f765525144709 SHA512 44294b276fd036908438cd984ebf70433639caa18d8330bab348433b4f39ea2c42c57fa8de4f0a6198f7875429a3ef9ebe61321c288d910f9be8b3414865f438
-EBUILD webapp-config-1.55-r3.ebuild 2454 BLAKE2B 8e4807d5a9daba21868277eb49f877ff9f72f6a435eaba51c32530382a1d347d6c8b2adf600a2b39f825512c7e03cd7a60600f9947b75108869fb9d696dd2671 SHA512 277d1ab115d57eef90c8af161e61be7ec424d0a4578edfadae2d9f06e7f372744d47f863cc5abc5138afca5d7d4d964e6735d6fa54e5b13e386eccd964924908
-EBUILD webapp-config-1.55-r4.ebuild 2540 BLAKE2B 063629d6adb85e9dceca872deb7e379a0a64f13e7bbefec187cd595b2cbb101244ebd345ce71d70a1ae5072dc56ae5fc5f662854e4676170c8ef8a140b1f31c6 SHA512 037e743e26abee10cc660ecb299e23c2ce3919fd37679f980e5c36ca8d02bced50cfd24270f49682ede57fa58bad00026883c97d6fa15b99a1b405617c09b1ed
+EBUILD webapp-config-1.55-r4.ebuild 2539 BLAKE2B a51b5b402da4c937bdbde89420606cf63030996b6c95f16ca7898eade23b4bd0f723615d6bb3cc01e1b4a6feb5fd0cf0ef278a5d8ac9a48fc7d6732512f6c35e SHA512 4d204b12b197b43d530d8194b616e8bb056cae31d1ec7ccf5809733b8238e0b020a59d9464fb306e1c002e9b09c28ee8b3c1703833b8b060873debb7b1d9a139
 EBUILD webapp-config-9999.ebuild 2546 BLAKE2B 22c3c0fbce94c3844327e26c1892b7ca8a68dc35ba35d2f9c7a9d80489570edeeaeb37137be327279dca9e1564a4e7f94a14b5e5e3b8b66329f3d8872bb39409 SHA512 b631235e96df3f31d09c0643982105ba3016f0073b614bc298b5216f8e23735cdd149ec60082b5ef7c5e6fece10d6b9e6abfe7291022fb2ea1dd33bb876d5b90
 MISC metadata.xml 448 BLAKE2B 14bff33f87640b065d72b7bd98742c602e1cd30be80cde6bbc5bd923cb8529f55e4296e83e630e55a9c8342da063dc3762f515bccd2614fc50d68770260fd727 SHA512 20db75371335720225afe0111925fe6ba3979448987a27459786a4490b862073ac23374ba29c218e523ea465fb811c7686d5a36e073a35a2a2b2c4521b6961f2
diff --git a/app-admin/webapp-config/webapp-config-1.55-r3.ebuild b/app-admin/webapp-config/webapp-config-1.55-r3.ebuild
deleted file mode 100644
index befaf688f6f1..000000000000
--- a/app-admin/webapp-config/webapp-config-1.55-r3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 prefix
-
-if [[ ${PV} = 9999* ]]
-then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-DESCRIPTION="Gentoo's installer for web-based applications"
-HOMEPAGE="https://sourceforge.net/projects/webapp-config/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+portage"
-
-DEPEND="app-text/xmlto
-	sys-apps/gentoo-functions"
-RDEPEND="
-	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# make the source from svn mirror the one in the tarball
-	if [[ ${PV} == 9999* ]]; then
-		mkdir ../webapp-config || die "Cannot create temp directory."
-		cp -r * ../webapp-config || die "Cannot copy all into the temp directory."
-		mv ../webapp-config . || die "Cannot move temp directory to its final position."
-
-		# Installation fails if version is 1.55-git
-		sed -e 's/-git//' \
-			-i webapp-config/WebappConfig/version.py \
-			-i WebappConfig/version.py || die "Cannot fix version."
-	fi
-
-	distutils-r1_python_prepare_all
-	eprefixify WebappConfig/eprefix.py config/webapp-config
-}
-
-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
-	# distutils does not provide for specifying two different script install
-	# locations. Since we only install one script here the following should
-	# be ok
-	distutils-r1_python_install --install-scripts="${EPREFIX}/usr/sbin"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# distutils-r1 installs the scripts in /usr/bin in PEP517 mode
-	mv "${ED}"/usr/bin "${ED}"/usr/sbin || die "Cannot rename scripts directory to /usr/sbin"
-
-	insinto /etc/vhosts
-	doins config/webapp-config
-
-	keepdir /usr/share/webapps
-	keepdir /var/db/webapps
-
-	dodoc AUTHORS
-	doman doc/*.[58]
-}
-
-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"
-	elog "packages that use webapp-config."
-}
diff --git a/app-admin/webapp-config/webapp-config-1.55-r4.ebuild b/app-admin/webapp-config/webapp-config-1.55-r4.ebuild
index ee7a145c898c..171bf028c53a 100644
--- a/app-admin/webapp-config/webapp-config-1.55-r4.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.55-r4.ebuild
@@ -14,7 +14,7 @@ then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="Gentoo's installer for web-based applications"