[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/files/, app-admin/webapp-config/
commit: e0dec3d48e60d0f4d1e19a0da482933394639649 Author: Viorel Munteanu gentoo org> AuthorDate: Mon Apr 15 17:28:06 2024 + Commit: Viorel Munteanu gentoo org> CommitDate: Mon Apr 15 17:43:32 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0dec3d4 app-admin/webapp-config: enable py3.12 Closes: https://bugs.gentoo.org/929277 Signed-off-by: Viorel Munteanu gentoo.org> .../webapp-config-1.55-py3.122-invalid-escape-sequence.patch | 11 +++ ...webapp-config-.ebuild => webapp-config-1.55-r4.ebuild} | 8 ++-- app-admin/webapp-config/webapp-config-.ebuild | 8 ++-- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/app-admin/webapp-config/files/webapp-config-1.55-py3.122-invalid-escape-sequence.patch b/app-admin/webapp-config/files/webapp-config-1.55-py3.122-invalid-escape-sequence.patch new file mode 100644 index ..cb1ba1a8593e --- /dev/null +++ b/app-admin/webapp-config/files/webapp-config-1.55-py3.122-invalid-escape-sequence.patch @@ -0,0 +1,11 @@ +--- a/WebappConfig/protect.py b/WebappConfig/protect.py +@@ -78,7 +78,7 @@ + + numbers = [] + prefix = self.protect_prefix +-rep = re.compile(prefix.replace('.','\.') + '(\d{4})_') ++rep = re.compile(prefix.replace('.',r'\.') + r'(\d{4})_') + + for i in entries: + rem = rep.match(i) diff --git a/app-admin/webapp-config/webapp-config-.ebuild b/app-admin/webapp-config/webapp-config-1.55-r4.ebuild similarity index 93% copy from app-admin/webapp-config/webapp-config-.ebuild copy to app-admin/webapp-config/webapp-config-1.55-r4.ebuild index 76caefb23e6d..cc2e8028b578 100644 --- a/app-admin/webapp-config/webapp-config-.ebuild +++ b/app-admin/webapp-config/webapp-config-1.55-r4.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 prefix @@ -29,6 +29,10 @@ DEPEND="app-text/xmlto RDEPEND=" portage? ( sys-apps/portage[${PYTHON_USEDEP}] )" +PATCHES=( + "${FILESDIR}"/webapp-config-1.55-py3.122-invalid-escape-sequence.patch +) + python_prepare_all() { # make the source from svn mirror the one in the tarball if [[ ${PV} == * ]]; then diff --git a/app-admin/webapp-config/webapp-config-.ebuild b/app-admin/webapp-config/webapp-config-.ebuild index 76caefb23e6d..cc2e8028b578 100644 --- a/app-admin/webapp-config/webapp-config-.ebuild +++ b/app-admin/webapp-config/webapp-config-.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 prefix @@ -29,6 +29,10 @@ DEPEND="app-text/xmlto RDEPEND=" portage? ( sys-apps/portage[${PYTHON_USEDEP}] )" +PATCHES=( + "${FILESDIR}"/webapp-config-1.55-py3.122-invalid-escape-sequence.patch +) + python_prepare_all() { # make the source from svn mirror the one in the tarball if [[ ${PV} == * ]]; then
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: 81b2d6a0a5d9d914498c79954938c1088831376a Author: Viorel Munteanu gentoo org> AuthorDate: Sun Aug 27 05:58:21 2023 + Commit: Viorel Munteanu gentoo org> CommitDate: Sun Aug 27 05:58:21 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81b2d6a0 app-admin/webapp-config: drop 1.55-r2 Signed-off-by: Viorel Munteanu gentoo.org> .../webapp-config/webapp-config-1.55-r2.ebuild | 72 -- 1 file changed, 72 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 deleted file mode 100644 index daf5ce1eeff8.. --- a/app-admin/webapp-config/webapp-config-1.55-r2.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{9..11} ) - -inherit distutils-r1 prefix - -if [[ ${PV} = * ]] -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 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() { - 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 - - 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." -}
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: 42a5ec791744f08f7458f3c74decda57c5cbb39d Author: Sam James gentoo org> AuthorDate: Sat Aug 26 18:13:40 2023 + Commit: Sam James gentoo org> CommitDate: Sat Aug 26 18:13:40 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42a5ec79 app-admin/webapp-config: Stabilize 1.55-r3 x86, #913079 Signed-off-by: Sam James gentoo.org> app-admin/webapp-config/webapp-config-1.55-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-admin/webapp-config/webapp-config-1.55-r3.ebuild b/app-admin/webapp-config/webapp-config-1.55-r3.ebuild index e37a1a16530b..befaf688f6f1 100644 --- a/app-admin/webapp-config/webapp-config-1.55-r3.ebuild +++ b/app-admin/webapp-config/webapp-config-1.55-r3.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"
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: e65f96600ca72e74dff46bf62cce3bc69acfc77e Author: Sam James gentoo org> AuthorDate: Sat Aug 26 18:11:41 2023 + Commit: Sam James gentoo org> CommitDate: Sat Aug 26 18:11:41 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e65f9660 app-admin/webapp-config: Stabilize 1.55-r3 sparc, #913079 Signed-off-by: Sam James gentoo.org> app-admin/webapp-config/webapp-config-1.55-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-admin/webapp-config/webapp-config-1.55-r3.ebuild b/app-admin/webapp-config/webapp-config-1.55-r3.ebuild index a52223305033..e37a1a16530b 100644 --- a/app-admin/webapp-config/webapp-config-1.55-r3.ebuild +++ b/app-admin/webapp-config/webapp-config-1.55-r3.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"
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: 7834a0071e5da664da154e6f79dac180472b11f4 Author: Sam James gentoo org> AuthorDate: Sat Aug 26 18:09:14 2023 + Commit: Sam James gentoo org> CommitDate: Sat Aug 26 18:09:14 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7834a007 app-admin/webapp-config: Stabilize 1.55-r3 ppc, #913079 Signed-off-by: Sam James gentoo.org> app-admin/webapp-config/webapp-config-1.55-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-admin/webapp-config/webapp-config-1.55-r3.ebuild b/app-admin/webapp-config/webapp-config-1.55-r3.ebuild index a832a7660326..a52223305033 100644 --- a/app-admin/webapp-config/webapp-config-1.55-r3.ebuild +++ b/app-admin/webapp-config/webapp-config-1.55-r3.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"
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: cac82a502717dd0f847ff1cf2e1bbd554b64079a Author: Sam James gentoo org> AuthorDate: Sat Aug 26 18:09:13 2023 + Commit: Sam James gentoo org> CommitDate: Sat Aug 26 18:09:13 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cac82a50 app-admin/webapp-config: Stabilize 1.55-r3 arm64, #913079 Signed-off-by: Sam James gentoo.org> app-admin/webapp-config/webapp-config-1.55-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-admin/webapp-config/webapp-config-1.55-r3.ebuild b/app-admin/webapp-config/webapp-config-1.55-r3.ebuild index 207f9f0bca50..a832a7660326 100644 --- a/app-admin/webapp-config/webapp-config-1.55-r3.ebuild +++ b/app-admin/webapp-config/webapp-config-1.55-r3.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"
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: cd911c8c5d71ecb6407d0934edbb0fcd0d8aca3e Author: Sam James gentoo org> AuthorDate: Sat Aug 26 18:09:10 2023 + Commit: Sam James gentoo org> CommitDate: Sat Aug 26 18:09:10 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd911c8c app-admin/webapp-config: Stabilize 1.55-r3 amd64, #913079 Signed-off-by: Sam James gentoo.org> app-admin/webapp-config/webapp-config-1.55-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-admin/webapp-config/webapp-config-1.55-r3.ebuild b/app-admin/webapp-config/webapp-config-1.55-r3.ebuild index 76caefb23e6d..b62ae6e00a8c 100644 --- a/app-admin/webapp-config/webapp-config-1.55-r3.ebuild +++ b/app-admin/webapp-config/webapp-config-1.55-r3.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"
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: 9e9c89bdbabd9372214557ed91f5129942a89fd9 Author: Sam James gentoo org> AuthorDate: Sat Aug 26 18:09:12 2023 + Commit: Sam James gentoo org> CommitDate: Sat Aug 26 18:09:12 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e9c89bd app-admin/webapp-config: Stabilize 1.55-r3 arm, #913079 Signed-off-by: Sam James gentoo.org> app-admin/webapp-config/webapp-config-1.55-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-admin/webapp-config/webapp-config-1.55-r3.ebuild b/app-admin/webapp-config/webapp-config-1.55-r3.ebuild index c21d7f4b0d25..207f9f0bca50 100644 --- a/app-admin/webapp-config/webapp-config-1.55-r3.ebuild +++ b/app-admin/webapp-config/webapp-config-1.55-r3.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"
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: 445ed4fdee27b29d6c31c184d03defc145f0147f Author: Sam James gentoo org> AuthorDate: Sat Aug 26 18:09:11 2023 + Commit: Sam James gentoo org> CommitDate: Sat Aug 26 18:09:11 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=445ed4fd app-admin/webapp-config: Stabilize 1.55-r3 ppc64, #913079 Signed-off-by: Sam James gentoo.org> app-admin/webapp-config/webapp-config-1.55-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-admin/webapp-config/webapp-config-1.55-r3.ebuild b/app-admin/webapp-config/webapp-config-1.55-r3.ebuild index b62ae6e00a8c..c21d7f4b0d25 100644 --- a/app-admin/webapp-config/webapp-config-1.55-r3.ebuild +++ b/app-admin/webapp-config/webapp-config-1.55-r3.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"
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: af245d8864b6b5954b911a94dae3adcc178df684 Author: Viorel Munteanu gentoo org> AuthorDate: Fri Mar 10 11:07:37 2023 + Commit: Viorel Munteanu gentoo org> CommitDate: Sat Jul 8 07:44:11 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af245d88 app-admin/webapp-config: EAPI 7 -> 8 Bump to EAPI 8 Switch to PEP517 build mode Fix SRC_URI (upload tarball from cache to devspace) Sync (and fix) live Closes: https://bugs.gentoo.org/711750 Closes: https://bugs.gentoo.org/909862 Closes: https://github.com/gentoo/gentoo/pull/30041 Signed-off-by: Viorel Munteanu gentoo.org> ...ig-.ebuild => webapp-config-1.55-r3.ebuild} | 27 +- app-admin/webapp-config/webapp-config-.ebuild | 27 +- 2 files changed, 42 insertions(+), 12 deletions(-) diff --git a/app-admin/webapp-config/webapp-config-.ebuild b/app-admin/webapp-config/webapp-config-1.55-r3.ebuild similarity index 61% copy from app-admin/webapp-config/webapp-config-.ebuild copy to app-admin/webapp-config/webapp-config-1.55-r3.ebuild index 9aad95348cfe..76caefb23e6d 100644 --- a/app-admin/webapp-config/webapp-config-.ebuild +++ b/app-admin/webapp-config/webapp-config-1.55-r3.ebuild @@ -1,20 +1,20 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..11} ) inherit distutils-r1 prefix if [[ ${PV} = * ]] then - EGIT_REPO_URI="https://anongit.gentoo.org/proj/${PN}.git; + EGIT_REPO_URI="https://anongit.gentoo.org/git/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" + 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" @@ -30,6 +30,18 @@ RDEPEND=" portage? ( sys-apps/portage[${PYTHON_USEDEP}] )" python_prepare_all() { + # make the source from svn mirror the one in the tarball + if [[ ${PV} == * ]]; 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 } @@ -55,6 +67,9 @@ python_install() { 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 diff --git a/app-admin/webapp-config/webapp-config-.ebuild b/app-admin/webapp-config/webapp-config-.ebuild index 9aad95348cfe..76caefb23e6d 100644 --- a/app-admin/webapp-config/webapp-config-.ebuild +++ b/app-admin/webapp-config/webapp-config-.ebuild @@ -1,20 +1,20 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..11} ) inherit distutils-r1 prefix if [[ ${PV} = * ]] then - EGIT_REPO_URI="https://anongit.gentoo.org/proj/${PN}.git; + EGIT_REPO_URI="https://anongit.gentoo.org/git/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" + 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" @@ -30,6 +30,18 @@ RDEPEND=" portage? ( sys-apps/portage[${PYTHON_USEDEP}] )" python_prepare_all() { + # make the source from svn mirror the one in the tarball + if [[ ${PV} == * ]]; 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
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: 6a020e6830fc325d3d9176afc393f6de3f2950ba Author: Sam James gentoo org> AuthorDate: Tue Mar 7 11:53:30 2023 + Commit: Sam James gentoo org> CommitDate: Tue Mar 7 11:53:30 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a020e68 app-admin/webapp-config: restore stable keywords Lost in syncing with live. Fixes: b4386cdacf80445dd7e9820b8f58fa7254bcdd0c Signed-off-by: Sam James gentoo.org> app-admin/webapp-config/webapp-config-1.55-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 9aad95348cfe..daf5ce1eeff8 100644 --- a/app-admin/webapp-config/webapp-config-1.55-r2.ebuild +++ b/app-admin/webapp-config/webapp-config-1.55-r2.ebuild @@ -14,7 +14,7 @@ then 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" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi DESCRIPTION="Gentoo's installer for web-based applications"
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: b4386cdacf80445dd7e9820b8f58fa7254bcdd0c Author: Sam James gentoo org> AuthorDate: Tue Mar 7 11:38:15 2023 + Commit: Sam James gentoo org> CommitDate: Tue Mar 7 11:38:15 2023 + 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-.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} = * ]] +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-.ebuild b/app-admin/webapp-config/webapp-config-.ebuild index 80bc77e30465..9aad95348cfe 100644 --- a/app-admin/webapp-config/webapp-config-.ebuild +++ b/app-admin/webapp-config/webapp-config-.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"
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: 4df458eab7f5fe4a8ba64f8c9eba705a879c109b Author: Arthur Zamarin gentoo org> AuthorDate: Sat Mar 4 05:47:22 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Mar 4 05:47:22 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4df458ea app-admin/webapp-config: Stabilize 1.55-r2 arm64, #899210 Signed-off-by: Arthur Zamarin gentoo.org> app-admin/webapp-config/webapp-config-1.55-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 18008064976c..9ef0f49f155f 100644 --- a/app-admin/webapp-config/webapp-config-1.55-r2.ebuild +++ b/app-admin/webapp-config/webapp-config-1.55-r2.ebuild @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{9..10} ) 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" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" DESCRIPTION="Gentoo's installer for web-based applications" HOMEPAGE="https://sourceforge.net/projects/webapp-config/;
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: 471bbf284655cc9d99c0302aa15545b6d72f9b19 Author: Sam James gentoo org> AuthorDate: Sat Oct 1 01:01:26 2022 + Commit: Sam James gentoo org> CommitDate: Sat Oct 1 01:01:26 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=471bbf28 app-admin/webapp-config: use HTTPS for EGIT_REPO_URI Signed-off-by: Sam James gentoo.org> app-admin/webapp-config/webapp-config-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-admin/webapp-config/webapp-config-.ebuild b/app-admin/webapp-config/webapp-config-.ebuild index 3b46bc38c9e2..8d1031b56f77 100644 --- a/app-admin/webapp-config/webapp-config-.ebuild +++ b/app-admin/webapp-config/webapp-config-.ebuild @@ -10,7 +10,7 @@ inherit distutils-r1 prefix if [[ ${PV} = * ]] then - EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git" + 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;
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: 9ae623f3ddc853b9c23bbcea97f17fb835e8786f Author: Yu Gu gmail com> AuthorDate: Tue Sep 13 13:53:48 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Wed Sep 14 15:24:02 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ae623f3 app-admin/webapp-config: Keyword 1.55-r2 riscv, #869923 Signed-off-by: Yu Gu gmail.com> Signed-off-by: Jakov Smolić gentoo.org> app-admin/webapp-config/webapp-config-1.55-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 92a1e109e75f..e393f7f7b140 100644 --- a/app-admin/webapp-config/webapp-config-1.55-r2.ebuild +++ b/app-admin/webapp-config/webapp-config-1.55-r2.ebuild @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{7..10} ) 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 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" DESCRIPTION="Gentoo's installer for web-based applications" HOMEPAGE="https://sourceforge.net/projects/webapp-config/;
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: 240c343ac6ed50b3b236e80287fd7497af826bab Author: Craig Andrews gentoo org> AuthorDate: Wed Feb 2 13:15:24 2022 + Commit: Craig Andrews gentoo org> CommitDate: Wed Feb 2 13:15:42 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=240c343a app-admin/webapp-config: Python 3.10 compatibility Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Craig Andrews gentoo.org> app-admin/webapp-config/webapp-config-1.55-r2.ebuild | 4 ++-- app-admin/webapp-config/webapp-config-.ebuild| 4 ++-- 2 files changed, 4 insertions(+), 4 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 08e686f810cf..92a1e109e75f 100644 --- a/app-admin/webapp-config/webapp-config-1.55-r2.ebuild +++ b/app-admin/webapp-config/webapp-config-1.55-r2.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{7..10} ) inherit distutils-r1 prefix diff --git a/app-admin/webapp-config/webapp-config-.ebuild b/app-admin/webapp-config/webapp-config-.ebuild index 611a6da21acf..3b46bc38c9e2 100644 --- a/app-admin/webapp-config/webapp-config-.ebuild +++ b/app-admin/webapp-config/webapp-config-.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{7..10} ) inherit distutils-r1 prefix
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: c635d2a90dbfe922ee4f6a81ecef09470b2441ce Author: Anthony G. Basile gentoo org> AuthorDate: Sat Sep 18 19:16:10 2021 + Commit: Anthony G. Basile gentoo org> CommitDate: Sat Sep 18 19:16:10 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c635d2a9 app-admin/webapp-config: remove myself as maintainer Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Anthony G. Basile gentoo.org> app-admin/webapp-config/metadata.xml | 4 1 file changed, 4 deletions(-) diff --git a/app-admin/webapp-config/metadata.xml b/app-admin/webapp-config/metadata.xml index a644e2509f8..219d282568b 100644 --- a/app-admin/webapp-config/metadata.xml +++ b/app-admin/webapp-config/metadata.xml @@ -1,10 +1,6 @@ https://www.gentoo.org/dtd/metadata.dtd;> - - bluen...@gentoo.org - Anthony G. Basile - web-a...@gentoo.org Gentoo Webapps
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: b98629e8da336b3c9a8bf40b6d1868c0349b8864 Author: Michał Górny gentoo org> AuthorDate: Wed Apr 7 08:04:45 2021 + Commit: Michał Górny gentoo org> CommitDate: Wed Apr 7 08:06:32 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b98629e8 app-admin/webapp-config: Bump to EAPI 7 Closes: https://bugs.gentoo.org/756874 Closes: https://bugs.gentoo.org/745879 Signed-off-by: Michał Górny gentoo.org> ...{webapp-config-1.55-r1.ebuild => webapp-config-1.55-r2.ebuild} | 8 app-admin/webapp-config/webapp-config-.ebuild | 8 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app-admin/webapp-config/webapp-config-1.55-r1.ebuild b/app-admin/webapp-config/webapp-config-1.55-r2.ebuild similarity index 91% rename from app-admin/webapp-config/webapp-config-1.55-r1.ebuild rename to app-admin/webapp-config/webapp-config-1.55-r2.ebuild index 49c4a106875..08e686f810c 100644 --- a/app-admin/webapp-config/webapp-config-1.55-r1.ebuild +++ b/app-admin/webapp-config/webapp-config-1.55-r2.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 +DISTUTILS_USE_SETUPTOOLS=no PYTHON_COMPAT=( python3_{7..9} ) inherit distutils-r1 prefix @@ -51,12 +52,11 @@ python_install_all() { dodoc AUTHORS doman doc/*.[58] - dohtml doc/*.[58].html } python_test() { - PYTHONPATH="." "${PYTHON}" WebappConfig/tests/external.py \ - || die "Testing failed with ${EPYTHON}" + PYTHONPATH="." "${EPYTHON}" WebappConfig/tests/external.py -v || + die "Testing failed with ${EPYTHON}" } pkg_postinst() { diff --git a/app-admin/webapp-config/webapp-config-.ebuild b/app-admin/webapp-config/webapp-config-.ebuild index 37cef6a134c..611a6da21ac 100644 --- a/app-admin/webapp-config/webapp-config-.ebuild +++ b/app-admin/webapp-config/webapp-config-.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 +DISTUTILS_USE_SETUPTOOLS=no PYTHON_COMPAT=( python3_{7..9} ) inherit distutils-r1 prefix @@ -57,12 +58,11 @@ python_install_all() { dodoc AUTHORS doman doc/*.[58] - dohtml doc/*.[58].html } python_test() { - PYTHONPATH="." "${PYTHON}" WebappConfig/tests/external.py \ - || die "Testing failed with ${EPYTHON}" + PYTHONPATH="." "${EPYTHON}" WebappConfig/tests/external.py -v || + die "Testing failed with ${EPYTHON}" } pkg_postinst() {
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: 2b881484623db07e2f0b371f3faf7515cbe51d8a Author: Matt Turner gentoo org> AuthorDate: Mon Mar 8 20:40:18 2021 + Commit: Matt Turner gentoo org> CommitDate: Mon Mar 8 20:40:42 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b881484 app-admin/webapp-config: Add Python 3.9 compat Signed-off-by: Matt Turner gentoo.org> app-admin/webapp-config/webapp-config-1.55-r1.ebuild | 4 ++-- app-admin/webapp-config/webapp-config-.ebuild| 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app-admin/webapp-config/webapp-config-1.55-r1.ebuild b/app-admin/webapp-config/webapp-config-1.55-r1.ebuild index 3ef9aa06291..41fa3a45483 100644 --- a/app-admin/webapp-config/webapp-config-1.55-r1.ebuild +++ b/app-admin/webapp-config/webapp-config-1.55-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -PYTHON_COMPAT=( python{3_7,3_8} ) +PYTHON_COMPAT=( python3_{7..9} ) inherit distutils-r1 prefix diff --git a/app-admin/webapp-config/webapp-config-.ebuild b/app-admin/webapp-config/webapp-config-.ebuild index 82ce38d5fbd..37cef6a134c 100644 --- a/app-admin/webapp-config/webapp-config-.ebuild +++ b/app-admin/webapp-config/webapp-config-.ebuild @@ -3,7 +3,7 @@ EAPI=5 -PYTHON_COMPAT=( python{3_7,3_8} ) +PYTHON_COMPAT=( python3_{7..9} ) inherit distutils-r1 prefix
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: d7e60a6f1d0d155eac833795557bdddbce844ca5 Author: Sam James gentoo org> AuthorDate: Thu Feb 18 19:16:11 2021 + Commit: Sam James gentoo org> CommitDate: Thu Feb 18 20:13:43 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7e60a6f app-admin/webapp-config: fix USE flag description typo Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> app-admin/webapp-config/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-admin/webapp-config/metadata.xml b/app-admin/webapp-config/metadata.xml index 67d2bc40c7e..cbf8aeabe11 100644 --- a/app-admin/webapp-config/metadata.xml +++ b/app-admin/webapp-config/metadata.xml @@ -10,7 +10,7 @@ Gentoo Webapps - Propagete python_targets dependencies to sys-apps/portage + Propagate python_targets dependencies to sys-apps/portage webapp-config
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: 13982c5114ff8ffefd4e7430d9c91def9f034abc Author: Craig Andrews gentoo org> AuthorDate: Sat Apr 18 17:45:59 2020 + Commit: Craig Andrews gentoo org> CommitDate: Sat Apr 18 17:55:16 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13982c51 app-admin/webapp-config: Python 3.8 compatibility Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Craig Andrews gentoo.org> app-admin/webapp-config/webapp-config-1.55-r1.ebuild | 2 +- app-admin/webapp-config/webapp-config-.ebuild| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app-admin/webapp-config/webapp-config-1.55-r1.ebuild b/app-admin/webapp-config/webapp-config-1.55-r1.ebuild index 8f6158777d9..f8cb336a9af 100644 --- a/app-admin/webapp-config/webapp-config-1.55-r1.ebuild +++ b/app-admin/webapp-config/webapp-config-1.55-r1.ebuild @@ -3,7 +3,7 @@ EAPI=5 -PYTHON_COMPAT=( python{3_6,3_7} ) +PYTHON_COMPAT=( python{3_6,3_7,3_8} ) inherit distutils-r1 prefix diff --git a/app-admin/webapp-config/webapp-config-.ebuild b/app-admin/webapp-config/webapp-config-.ebuild index 206b5aa84ed..99ed397bbc8 100644 --- a/app-admin/webapp-config/webapp-config-.ebuild +++ b/app-admin/webapp-config/webapp-config-.ebuild @@ -3,7 +3,7 @@ EAPI=5 -PYTHON_COMPAT=( python{3_6,3_7} ) +PYTHON_COMPAT=( python{3_6,3_7,3_8} ) inherit distutils-r1 prefix
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: 2a9124fbb1c2207e174ea37b88e5bd2c4fc3ba1b Author: Michał Górny gentoo org> AuthorDate: Thu Mar 19 08:50:21 2020 + Commit: Michał Górny gentoo org> CommitDate: Thu Mar 19 09:40:58 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a9124fb app-admin/webapp-config: Drop py2 Signed-off-by: Michał Górny gentoo.org> app-admin/webapp-config/webapp-config-1.55-r1.ebuild | 2 +- app-admin/webapp-config/webapp-config-.ebuild| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app-admin/webapp-config/webapp-config-1.55-r1.ebuild b/app-admin/webapp-config/webapp-config-1.55-r1.ebuild index 2966dd2dcd9..5c673ce152b 100644 --- a/app-admin/webapp-config/webapp-config-1.55-r1.ebuild +++ b/app-admin/webapp-config/webapp-config-1.55-r1.ebuild @@ -3,7 +3,7 @@ EAPI=5 -PYTHON_COMPAT=( python{2_7,3_6,3_7} ) +PYTHON_COMPAT=( python{3_6,3_7} ) inherit distutils-r1 prefix diff --git a/app-admin/webapp-config/webapp-config-.ebuild b/app-admin/webapp-config/webapp-config-.ebuild index 9e17168b767..98c743df74f 100644 --- a/app-admin/webapp-config/webapp-config-.ebuild +++ b/app-admin/webapp-config/webapp-config-.ebuild @@ -3,7 +3,7 @@ EAPI=5 -PYTHON_COMPAT=( python{2_7,3_6,3_7} ) +PYTHON_COMPAT=( python{3_6,3_7} ) inherit distutils-r1 prefix
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/, app-admin/webapp-config/files/
commit: f4e685358dbe88b1d97d49e5a7c36734027a9f35 Author: Michał Górny gentoo org> AuthorDate: Thu Mar 19 08:50:16 2020 + Commit: Michał Górny gentoo org> CommitDate: Thu Mar 19 09:40:57 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4e68535 app-admin/webapp-config: Drop old Signed-off-by: Michał Górny gentoo.org> app-admin/webapp-config/Manifest | 3 - .../files/webapp-config-1.52-nulls-doctest.patch | 185 - ...-1.53-sources-function.sh-from-lib-gentoo.patch | 25 --- .../files/webapp-config-1.54-fix-bashism.patch | 12 -- .../files/webapp-config-1.54-pvr-check.patch | 49 -- .../webapp-config/webapp-config-1.52-r1.ebuild | 64 --- .../webapp-config/webapp-config-1.53-r2.ebuild | 67 .../webapp-config/webapp-config-1.54-r2.ebuild | 65 8 files changed, 470 deletions(-) diff --git a/app-admin/webapp-config/Manifest b/app-admin/webapp-config/Manifest index f3a98ce6478..958441a4850 100644 --- a/app-admin/webapp-config/Manifest +++ b/app-admin/webapp-config/Manifest @@ -1,4 +1 @@ -DIST webapp-config-1.52.tar.bz2 62951 BLAKE2B 8abc9f5503c9204fdb2d860f819e06a9f75f285bc0190bf1c479caea08754da92a351a12abe026d8600a51d8e33d57d827b027e8a0f9da5a8af1f09daa0de1e5 SHA512 ec616067588e6ab306af067e70bab9d17961aa675f387ee67a2291235ce81638b49a784d9a6c31891b7c78a712f276c3e62c6681a5e496a52c7e6fe7753922ea -DIST webapp-config-1.53.tar.bz2 63429 BLAKE2B bb13d52a4c19859ff4730df2f7db75452effa23d1864d97aada38137f00ada8eec530f728f1c3ae06ecbed713a2d489b7225db3fc02aeabbf6241d0956761609 SHA512 7d2fc7197d537f2264c26b68b61e69273d2fcd3eec93657db54ba685c8383e7b8245cf05ed2ddd8b72453bf3fbf8f4bc4867e53d608331799df2e6162be14820 -DIST webapp-config-1.54.tar.bz2 58954 BLAKE2B 42a4305c51ccb8bb9db455c6ae2663b5d17c9d477eee3e504569c802e5f0d10183f3e6cd1e747462dcc0559d6ed7ba53a8b5607ed422f34813a33e0e8148bb90 SHA512 fa61e88696eaed130575e5ae9a17ec827aa14aece359e5ba43fa723ad00083def22e44fb02d99fc5ba6000a5949c5ce7aecea9307d2bfae333e202ef111dcd31 DIST webapp-config-1.55.tar.bz2 72583 BLAKE2B be958dc991f0e1f6835d9c29350b7d97e3f23d52971f6013165ce59a8f4b32ac6262c9719956d1bcdbe60797f07d77910b44a749ae545c4dc15f765525144709 SHA512 44294b276fd036908438cd984ebf70433639caa18d8330bab348433b4f39ea2c42c57fa8de4f0a6198f7875429a3ef9ebe61321c288d910f9be8b3414865f438 diff --git a/app-admin/webapp-config/files/webapp-config-1.52-nulls-doctest.patch b/app-admin/webapp-config/files/webapp-config-1.52-nulls-doctest.patch deleted file mode 100644 index 97c64a90df2..000 --- a/app-admin/webapp-config/files/webapp-config-1.52-nulls-doctest.patch +++ /dev/null @@ -1,185 +0,0 @@ -From 5f61d249507c3502c3c76faf3926522e6e63370d Mon Sep 17 00:00:00 2001 -From: Devan Franchini -Date: Fri, 3 Jan 2014 21:03:00 -0500 -Subject: [PATCH] WebappConfig/{ebuild,content}.py: Nulls doctest code. - -Due to the variable nature of the returning values of the two functions -run_vars() and add(), it is unrealistic to depend on doctest to not -fail. It has been decided that disabling these two doctest codes would -be the best decision to prevent failures that are not detrimental. - -X-Gentoo-Bug: 430010 -X-Gentoo-Bug-URL: https://bugs.gentoo.org/430010 - WebappConfig/content.py | 36 ++-- - WebappConfig/ebuild.py | 46 +++--- - 2 files changed, 41 insertions(+), 41 deletions(-) - -diff --git a/WebappConfig/content.py b/WebappConfig/content.py -index 8fe5be9..c635f5a 100644 a/WebappConfig/content.py -+++ b/WebappConfig/content.py -@@ -379,71 +379,71 @@ class Contents: - (and this is important for md5) - relative- 1 for storing a relative filename, 0 otherwise - -->>> OUT.color_off() -->>> import os.path -->>> here = os.path.dirname(os.path.realpath(__file__)) -+OUT.color_off() -+import os.path -+here = os.path.dirname(os.path.realpath(__file__)) - - One for pretending: - -->>> a = Contents(here + '/tests/testfiles/contents/app/', -+a = Contents(here + '/tests/testfiles/contents/app/', - ... package = 'test', version = '1.0', - ... pretend = True) - - And this one is for real: - -->>> b = Contents(here + '/tests/testfiles/contents/app/', -+b = Contents(here + '/tests/testfiles/contents/app/', - ... package = 'test', version = '1.0') - - Pretend to add a file: - -->>> a.add('file', 'config-owned', -+a.add('file', 'config-owned', - ... destination = here + '/tests/testfiles/contents/app/', - ... path = '/test1', relative = True) - * pretending to add: file 1 config-owned "test1" - - Lets not pretend this time: - -->>> b.add('file', 'config-owned', -+b.add('file',
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: 162ff05d4c677877e863fe8ab80a5396f88b6108 Author: matoro users noreply github com> AuthorDate: Fri Mar 1 20:13:42 2019 + Commit: Anthony G. Basile gentoo org> CommitDate: Sat Mar 23 09:10:43 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=162ff05d app-admin/webapp-config: enable python3_7 All tests pass under python 3.7 per this build log: https://gist.github.com/matoro/1808592dcc9cf09f344a907c8a2fb1af Signed-off-by: matoro airmail.cc> Signed-off-by: Anthony G. Basile gentoo.org> app-admin/webapp-config/webapp-config-1.55-r1.ebuild | 4 ++-- app-admin/webapp-config/webapp-config-.ebuild| 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app-admin/webapp-config/webapp-config-1.55-r1.ebuild b/app-admin/webapp-config/webapp-config-1.55-r1.ebuild index be1d9c659f8..c70dc1eac20 100644 --- a/app-admin/webapp-config/webapp-config-1.55-r1.ebuild +++ b/app-admin/webapp-config/webapp-config-1.55-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy ) +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy ) inherit distutils-r1 prefix diff --git a/app-admin/webapp-config/webapp-config-.ebuild b/app-admin/webapp-config/webapp-config-.ebuild index 08cda620478..6ce237b3e82 100644 --- a/app-admin/webapp-config/webapp-config-.ebuild +++ b/app-admin/webapp-config/webapp-config-.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy ) +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy ) inherit distutils-r1 prefix
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/, games-emulation/dolphin/
commit: 8054807a4e67591d2c89b33b0dc6271abcffc526 Author: Michał Górny gentoo org> AuthorDate: Sat Jul 21 22:12:46 2018 + Commit: Michał Górny gentoo org> CommitDate: Sat Jul 21 22:14:34 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8054807a */*: Reassign packages of twitch153 Bug: https://bugs.gentoo.org/467534 app-admin/webapp-config/metadata.xml | 4 games-emulation/dolphin/metadata.xml | 5 + 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/app-admin/webapp-config/metadata.xml b/app-admin/webapp-config/metadata.xml index bf2371089c8..67d2bc40c7e 100644 --- a/app-admin/webapp-config/metadata.xml +++ b/app-admin/webapp-config/metadata.xml @@ -1,10 +1,6 @@ http://www.gentoo.org/dtd/metadata.dtd;> - - twitch...@gentoo.org - Devan Franchini - bluen...@gentoo.org Anthony G. Basile diff --git a/games-emulation/dolphin/metadata.xml b/games-emulation/dolphin/metadata.xml index e5f72fa203b..5d2e84088c1 100644 --- a/games-emulation/dolphin/metadata.xml +++ b/games-emulation/dolphin/metadata.xml @@ -12,10 +12,7 @@ Dolphin is a Gamecube and Wii emulator. Most games run perfectly or with minor bugs. Games are playable at HD quality, with 1080p and more. - - twitch...@gentoo.org - Devan Franchini - + dolphin-emu/dolphin
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: def268efc796d93d7c925731fca5bb94541f5e51 Author: Mikle Kolyada gentoo org> AuthorDate: Tue Jun 12 15:31:31 2018 + Commit: Mikle Kolyada gentoo org> CommitDate: Tue Jun 12 15:31:31 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=def268ef app-admin/webapp-config: mark s390 stable Package-Manager: Portage-2.3.40, Repoman-2.3.9 app-admin/webapp-config/webapp-config-1.55-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-admin/webapp-config/webapp-config-1.55-r1.ebuild b/app-admin/webapp-config/webapp-config-1.55-r1.ebuild index 9f4d3c31c22..be1d9c659f8 100644 --- a/app-admin/webapp-config/webapp-config-1.55-r1.ebuild +++ b/app-admin/webapp-config/webapp-config-1.55-r1.ebuild @@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy ) 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 ~s390 ~sh sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd" DESCRIPTION="Gentoo's installer for web-based applications" HOMEPAGE="https://sourceforge.net/projects/webapp-config/;
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: cbdb73d5b1f88227a37809b36942ffb296dc43e1 Author: Sergei Trofimovich gentoo org> AuthorDate: Mon Mar 26 06:54:42 2018 + Commit: Sergei Trofimovich gentoo org> CommitDate: Mon Mar 26 06:54:48 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbdb73d5 app-admin/webapp-config: stable 1.55-r1 for hppa, bug #622562 Package-Manager: Portage-2.3.24, Repoman-2.3.6 RepoMan-Options: --include-arches="hppa" app-admin/webapp-config/webapp-config-1.55-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-admin/webapp-config/webapp-config-1.55-r1.ebuild b/app-admin/webapp-config/webapp-config-1.55-r1.ebuild index 871ffb75c6a..9f4d3c31c22 100644 --- a/app-admin/webapp-config/webapp-config-1.55-r1.ebuild +++ b/app-admin/webapp-config/webapp-config-1.55-r1.ebuild @@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy ) 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 ~s390 ~sh sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd" DESCRIPTION="Gentoo's installer for web-based applications" HOMEPAGE="https://sourceforge.net/projects/webapp-config/;
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: d422c43b01841293f62a31347ca8f30e065c933d Author: Markus Meier gentoo org> AuthorDate: Tue Jul 11 04:45:05 2017 + Commit: Markus Meier gentoo org> CommitDate: Tue Jul 11 04:45:05 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d422c43b app-admin/webapp-config: arm stable, bug #622562 Package-Manager: Portage-2.3.6, Repoman-2.3.1 RepoMan-Options: --include-arches="arm" app-admin/webapp-config/webapp-config-1.55.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-admin/webapp-config/webapp-config-1.55.ebuild b/app-admin/webapp-config/webapp-config-1.55.ebuild index c91c18e2c5e..b83d9fcd994 100644 --- a/app-admin/webapp-config/webapp-config-1.55.ebuild +++ b/app-admin/webapp-config/webapp-config-1.55.ebuild @@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy ) 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 ~s390 ~sh sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd" DESCRIPTION="Gentoo's installer for web-based applications" HOMEPAGE="https://sourceforge.net/projects/webapp-config/;
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: 98d51f0ea0d04f4a698d387719d076e3759c8203 Author: Sergei Trofimovich gentoo org> AuthorDate: Fri Jun 30 07:14:51 2017 + Commit: Sergei Trofimovich gentoo org> CommitDate: Fri Jun 30 08:12:58 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98d51f0e app-admin/webapp-config: ia64 stable, bug #622562 Package-Manager: Portage-2.3.6, Repoman-2.3.2 app-admin/webapp-config/webapp-config-1.55.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-admin/webapp-config/webapp-config-1.55.ebuild b/app-admin/webapp-config/webapp-config-1.55.ebuild index ca0066af905..a2ec4414539 100644 --- a/app-admin/webapp-config/webapp-config-1.55.ebuild +++ b/app-admin/webapp-config/webapp-config-1.55.ebuild @@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy ) 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 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" DESCRIPTION="Gentoo's installer for web-based applications" HOMEPAGE="https://sourceforge.net/projects/webapp-config/;
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: a934f3fd37075973a963e27168254a896dfe96ad Author: Tobias Klausmann gentoo org> AuthorDate: Mon Jun 26 20:18:10 2017 + Commit: Tobias Klausmann gentoo org> CommitDate: Mon Jun 26 20:18:10 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a934f3fd app-admin/webapp-config-1.55-r0: add alpha keyword Gentoo-Bug: 622562 app-admin/webapp-config/webapp-config-1.55.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-admin/webapp-config/webapp-config-1.55.ebuild b/app-admin/webapp-config/webapp-config-1.55.ebuild index 58745ce5216..ca0066af905 100644 --- a/app-admin/webapp-config/webapp-config-1.55.ebuild +++ b/app-admin/webapp-config/webapp-config-1.55.ebuild @@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy ) 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 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" DESCRIPTION="Gentoo's installer for web-based applications" HOMEPAGE="https://sourceforge.net/projects/webapp-config/;
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: 87a2bd56fed7fa7791236c0cad7183c8325125c5 Author: Agostino Sarubbo gentoo org> AuthorDate: Sun Jun 25 16:31:35 2017 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sun Jun 25 16:31:35 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87a2bd56 app-admin/webapp-config: amd64 stable wrt bug #622562 Package-Manager: Portage-2.3.6, Repoman-2.3.1 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> app-admin/webapp-config/webapp-config-1.55.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-admin/webapp-config/webapp-config-1.55.ebuild b/app-admin/webapp-config/webapp-config-1.55.ebuild index 0082013b860..58745ce5216 100644 --- a/app-admin/webapp-config/webapp-config-1.55.ebuild +++ b/app-admin/webapp-config/webapp-config-1.55.ebuild @@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy ) 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 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" DESCRIPTION="Gentoo's installer for web-based applications" HOMEPAGE="https://sourceforge.net/projects/webapp-config/;
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: 751d08074a9bced1d23e34ebb50b7ebdc70d60c2 Author: Devan Franchini gentoo org> AuthorDate: Sat Jun 24 03:57:31 2017 + Commit: Devan Franchini gentoo org> CommitDate: Sat Jun 24 03:59:08 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=751d0807 app-admin/webapp-config: Removes configparser blocker from 1.55 With the addition of a fix in commit dfacbd61 in webapp-config's repo we no longer need to block on this package from installation X-Gentoo-Bug: 622504 X-Gentoo-Bug-URL: https://bugs.gentoo.org/622504 Package-Manager: Portage-2.3.6, Repoman-2.3.1 app-admin/webapp-config/webapp-config-1.55.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/app-admin/webapp-config/webapp-config-1.55.ebuild b/app-admin/webapp-config/webapp-config-1.55.ebuild index d1f94e21cf1..0082013b860 100644 --- a/app-admin/webapp-config/webapp-config-1.55.ebuild +++ b/app-admin/webapp-config/webapp-config-1.55.ebuild @@ -18,7 +18,6 @@ SLOT="0" IUSE="+portage" DEPEND="app-text/xmlto - !dev-python/configparser sys-apps/gentoo-functions" RDEPEND="portage? ( sys-apps/portage[${PYTHON_USEDEP}] )"
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: 7922d766deb16875368fd03e344d49923e981754 Author: Devan Franchini gentoo org> AuthorDate: Sat Jun 24 03:49:38 2017 + Commit: Devan Franchini gentoo org> CommitDate: Sat Jun 24 03:59:07 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7922d766 app-admin/webapp-config: Removes configparser blocker from This is no longer necessary as the reason for doing so was resolved by commit dfacbd61 in webapp-config's git repo X-Gentoo-Bug: 622504 X-Gentoo-Bug-URL: https://bugs.gentoo.org/622504 Package-Manager: Portage-2.3.6, Repoman-2.3.1 app-admin/webapp-config/webapp-config-.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/app-admin/webapp-config/webapp-config-.ebuild b/app-admin/webapp-config/webapp-config-.ebuild index 92e931ab791..409c9b0d9b1 100644 --- a/app-admin/webapp-config/webapp-config-.ebuild +++ b/app-admin/webapp-config/webapp-config-.ebuild @@ -25,7 +25,6 @@ SLOT="0" IUSE="+portage" DEPEND="app-text/xmlto - !dev-python/configparser sys-apps/gentoo-functions" RDEPEND="portage? ( sys-apps/portage[${PYTHON_USEDEP}] )"
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: bc687464acfaadd0c8dbde354f7d5d1d1f1f7d31 Author: Devan Franchini gentoo org> AuthorDate: Thu Jun 22 23:31:18 2017 + Commit: Devan Franchini gentoo org> CommitDate: Thu Jun 22 23:33:11 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc687464 app-admin/webapp-config: Adds 1.55 ebuild to the tree Package-Manager: Portage-2.3.6, Repoman-2.3.1 app-admin/webapp-config/Manifest | 1 + app-admin/webapp-config/webapp-config-1.55.ebuild | 66 +++ 2 files changed, 67 insertions(+) diff --git a/app-admin/webapp-config/Manifest b/app-admin/webapp-config/Manifest index 4c6c0ac1933..49de5cd1bdf 100644 --- a/app-admin/webapp-config/Manifest +++ b/app-admin/webapp-config/Manifest @@ -1,3 +1,4 @@ DIST webapp-config-1.52.tar.bz2 62951 SHA256 b8295bbc518f68f60913fe2ee9232d77f1a10e21fcddffb8c4370546ba96a2a5 SHA512 ec616067588e6ab306af067e70bab9d17961aa675f387ee67a2291235ce81638b49a784d9a6c31891b7c78a712f276c3e62c6681a5e496a52c7e6fe7753922ea WHIRLPOOL ca6484871e26acff6d14510a4a925672258f58c1c8c05c5207b78350b1cc787e29c6ea68c1af05b5c5aaebed12ce545e023f54acbdc7215678b30a2f14708eee DIST webapp-config-1.53.tar.bz2 63429 SHA256 4d45b1452feb730cc55bfdce686277183acfd64ab6aef5fab82992d1a508263d SHA512 7d2fc7197d537f2264c26b68b61e69273d2fcd3eec93657db54ba685c8383e7b8245cf05ed2ddd8b72453bf3fbf8f4bc4867e53d608331799df2e6162be14820 WHIRLPOOL f12ca0f3fcee31de6e2ead3cd3685fa32c697d258324bf40fc2bfc2f1787c4e7cbd7290bbb5f5523515bff29cb78bece35fcad390e419cf5dd619e5efdafc1dc DIST webapp-config-1.54.tar.bz2 58954 SHA256 7663c4f7ae0d4e7206e349f3bf79fed479c9971365363929f431c92ebd622d17 SHA512 fa61e88696eaed130575e5ae9a17ec827aa14aece359e5ba43fa723ad00083def22e44fb02d99fc5ba6000a5949c5ce7aecea9307d2bfae333e202ef111dcd31 WHIRLPOOL 417944147e0bdc7eb1575b10102230306f6c76652beeb0e2866d0fbe41b12bcdeb31421dd7551961db55f4fe4544ca5600c072cb74083621745c7c74fbfeec2e +DIST webapp-config-1.55.tar.bz2 72583 SHA256 222c41ac71b2991b078352fb8d09a0d458ff30b9c9729a2429165835c38c564b SHA512 44294b276fd036908438cd984ebf70433639caa18d8330bab348433b4f39ea2c42c57fa8de4f0a6198f7875429a3ef9ebe61321c288d910f9be8b3414865f438 WHIRLPOOL 80d577e4398f6872129544221d58003beb5b5ce972c181a241ec96cfe0fe34975e7bef5a96acc40977320ad71cd4370ee58216c0517d78c1765f000a42d8ea56 diff --git a/app-admin/webapp-config/webapp-config-1.55.ebuild b/app-admin/webapp-config/webapp-config-1.55.ebuild new file mode 100644 index 000..d1f94e21cf1 --- /dev/null +++ b/app-admin/webapp-config/webapp-config-1.55.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy ) + +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 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" + +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 + !dev-python/configparser + sys-apps/gentoo-functions" +RDEPEND="portage? ( sys-apps/portage[${PYTHON_USEDEP}] )" + +python_prepare_all() { + distutils-r1_python_prepare_all + eprefixify WebappConfig/eprefix.py config/webapp-config +} + +python_compile_all() { + emake -C doc/ +} + +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 + + insinto /etc/vhosts + doins config/webapp-config + + keepdir /usr/share/webapps + keepdir /var/db/webapps + + dodoc AUTHORS + doman doc/*.[58] + dohtml doc/*.[58].html +} + +python_test() { + PYTHONPATH="." "${PYTHON}" WebappConfig/tests/external.py \ + || 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" + elog "packages that use webapp-config." +}
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: 2ae9900b7310a643423546b3ee3bb847c55ffefe Author: Devan Franchini gentoo org> AuthorDate: Thu Jun 22 23:26:56 2017 + Commit: Devan Franchini gentoo org> CommitDate: Thu Jun 22 23:33:09 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ae9900b app-admin/webapp-config: Deletes 1.54-r1 ebuild .../webapp-config/webapp-config-1.54-r1.ebuild | 64 -- 1 file changed, 64 deletions(-) diff --git a/app-admin/webapp-config/webapp-config-1.54-r1.ebuild b/app-admin/webapp-config/webapp-config-1.54-r1.ebuild deleted file mode 100644 index 2141c27bac3..000 --- a/app-admin/webapp-config/webapp-config-1.54-r1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy ) - -inherit distutils-r1 - -SRC_URI="https://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2; -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd" - -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() { - epatch "${FILESDIR}/${P}-pvr-check.patch" -} -python_compile_all() { - emake -C doc/ -} - -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 - - insinto /etc/vhosts - doins config/webapp-config - - keepdir /usr/share/webapps - keepdir /var/db/webapps - - dodoc AUTHORS - doman doc/*.[58] - dohtml doc/*.[58].html -} - -python_test() { - PYTHONPATH="." "${PYTHON}" WebappConfig/tests/external.py \ - || die "Testing failed with ${EPYTHON}" -} - -pkg_postinst() { - elog "webapp-config now requires that all -I/-U/-C commands be followed" - elog "by the package name and package version of the webapp" - elog "eg.) 'webapp-config -d drupal -I drupal 8.0.0_beta10'" - elog "See 'man 8 webapp-config' for more information" -}
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: 6034f0ad8b1c76bb7b125626440e37bf6e2861b3 Author: Martin Mokrejš gmail com> AuthorDate: Tue Jan 10 14:21:55 2017 + Commit: Michał Górny gentoo org> CommitDate: Tue May 23 06:03:56 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6034f0ad app-admin/webapp-config: respect EPREFIX during src_install Closes: https://github.com/gentoo/gentoo/pull/3415 app-admin/webapp-config/webapp-config-1.52-r1.ebuild | 4 ++-- app-admin/webapp-config/webapp-config-1.53-r2.ebuild | 4 ++-- app-admin/webapp-config/webapp-config-1.54-r1.ebuild | 2 +- app-admin/webapp-config/webapp-config-1.54-r2.ebuild | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app-admin/webapp-config/webapp-config-1.52-r1.ebuild b/app-admin/webapp-config/webapp-config-1.52-r1.ebuild index 2cca142219d..e8c416dd5e3 100644 --- a/app-admin/webapp-config/webapp-config-1.52-r1.ebuild +++ b/app-admin/webapp-config/webapp-config-1.52-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -35,7 +35,7 @@ python_install() { # 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="/usr/sbin" + distutils-r1_python_install --install-scripts="${EPREFIX}/usr/sbin" } python_install_all() { diff --git a/app-admin/webapp-config/webapp-config-1.53-r2.ebuild b/app-admin/webapp-config/webapp-config-1.53-r2.ebuild index 795e702cd8f..e7084845cb4 100644 --- a/app-admin/webapp-config/webapp-config-1.53-r2.ebuild +++ b/app-admin/webapp-config/webapp-config-1.53-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -38,7 +38,7 @@ python_install() { # 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="/usr/sbin" + distutils-r1_python_install --install-scripts="${EPREFIX}/usr/sbin" } python_install_all() { diff --git a/app-admin/webapp-config/webapp-config-1.54-r1.ebuild b/app-admin/webapp-config/webapp-config-1.54-r1.ebuild index f33bfb49fc5..2141c27bac3 100644 --- a/app-admin/webapp-config/webapp-config-1.54-r1.ebuild +++ b/app-admin/webapp-config/webapp-config-1.54-r1.ebuild @@ -34,7 +34,7 @@ python_install() { # 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="/usr/sbin" + distutils-r1_python_install --install-scripts="${EPREFIX}/usr/sbin" } python_install_all() { diff --git a/app-admin/webapp-config/webapp-config-1.54-r2.ebuild b/app-admin/webapp-config/webapp-config-1.54-r2.ebuild index 9936cfe55d7..d364cbb4511 100644 --- a/app-admin/webapp-config/webapp-config-1.54-r2.ebuild +++ b/app-admin/webapp-config/webapp-config-1.54-r2.ebuild @@ -35,7 +35,7 @@ python_install() { # 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="/usr/sbin" + distutils-r1_python_install --install-scripts="${EPREFIX}/usr/sbin" } python_install_all() {
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: 62e8b3b53b1003fd6549bfc7ca852e273404564d Author: Manuel Rüger gentoo org> AuthorDate: Tue May 16 23:03:30 2017 + Commit: Manuel Rüger gentoo org> CommitDate: Tue May 16 23:03:30 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62e8b3b5 app-admin/webapp-config: Add python3_6 to live Package-Manager: Portage-2.3.5, Repoman-2.3.2 app-admin/webapp-config/webapp-config-.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-admin/webapp-config/webapp-config-.ebuild b/app-admin/webapp-config/webapp-config-.ebuild index 2d10cc49628..92e931ab791 100644 --- a/app-admin/webapp-config/webapp-config-.ebuild +++ b/app-admin/webapp-config/webapp-config-.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=5 -PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy ) +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy ) inherit distutils-r1 prefix
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: b612aed9e67c78a4f3e1d1522771e8ae6d7b32c1 Author: Manuel Rüger gentoo org> AuthorDate: Tue May 16 23:02:42 2017 + Commit: Manuel Rüger gentoo org> CommitDate: Tue May 16 23:02:42 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b612aed9 app-admin/webapp-config: Add python3_6 Package-Manager: Portage-2.3.5, Repoman-2.3.2 app-admin/webapp-config/webapp-config-1.54-r2.ebuild | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app-admin/webapp-config/webapp-config-1.54-r2.ebuild b/app-admin/webapp-config/webapp-config-1.54-r2.ebuild index db03dd87705..9936cfe55d7 100644 --- a/app-admin/webapp-config/webapp-config-1.54-r2.ebuild +++ b/app-admin/webapp-config/webapp-config-1.54-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=5 -PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy ) +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy ) inherit distutils-r1 @@ -22,8 +22,8 @@ DEPEND="app-text/xmlto RDEPEND="portage? ( sys-apps/portage[${PYTHON_USEDEP}] )" python_prepare() { - epatch "${FILESDIR}/${P}-pvr-check.patch" - epatch "${FILESDIR}/${P}-fix-bashism.patch" + epatch "${FILESDIR}/${P}-pvr-check.patch"\ + "${FILESDIR}/${P}-fix-bashism.patch" } python_compile_all() { emake -C doc/
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: 1cb9280dbf9aa945a3c28cc6d55bde68014002f4 Author: Devan Franchini gentoo org> AuthorDate: Thu Feb 16 03:28:54 2017 + Commit: Devan Franchini gentoo org> CommitDate: Thu Feb 16 03:28:54 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cb9280d app-admin/webapp-config-.ebuild: Makes use of prefix eclass X-Gentoo-Bug: 608018 X-Gentoo-Bug-URL: https://bugs.gentoo.org/608018 Package-Manager: portage-2.3.3 app-admin/webapp-config/webapp-config-.ebuild | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app-admin/webapp-config/webapp-config-.ebuild b/app-admin/webapp-config/webapp-config-.ebuild index 2d1d3c7ad8..a1b3ec2550 100644 --- a/app-admin/webapp-config/webapp-config-.ebuild +++ b/app-admin/webapp-config/webapp-config-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -6,7 +6,7 @@ EAPI="5" PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy ) -inherit distutils-r1 +inherit distutils-r1 prefix if [[ ${PV} = * ]] then @@ -30,6 +30,11 @@ DEPEND="app-text/xmlto sys-apps/gentoo-functions" RDEPEND="portage? ( sys-apps/portage[${PYTHON_USEDEP}] )" +python_prepare_all() { + distutils-r1_python_prepare_all + eprefixify WebappConfig/eprefix.py config/webapp-config +} + python_compile_all() { emake -C doc/ } @@ -40,7 +45,7 @@ python_install() { # 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="/usr/sbin" + distutils-r1_python_install --install-scripts="${EPREFIX}/usr/sbin" } python_install_all() {
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: 99e2819f2510b81ad745ef1c7f1c1dce985220bb Author: Pacho Ramos gentoo org> AuthorDate: Sun Oct 9 07:36:39 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Oct 9 07:46:31 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99e2819f app-admin/webapp-config: Support python 3.5 Package-Manager: portage-2.3.1 app-admin/webapp-config/webapp-config-1.54-r1.ebuild | 4 ++-- app-admin/webapp-config/webapp-config-1.54-r2.ebuild | 4 ++-- app-admin/webapp-config/webapp-config-.ebuild| 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app-admin/webapp-config/webapp-config-1.54-r1.ebuild b/app-admin/webapp-config/webapp-config-1.54-r1.ebuild index fc8d1ca..1806566 100644 --- a/app-admin/webapp-config/webapp-config-1.54-r1.ebuild +++ b/app-admin/webapp-config/webapp-config-1.54-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI="5" -PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) +PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy ) inherit distutils-r1 diff --git a/app-admin/webapp-config/webapp-config-1.54-r2.ebuild b/app-admin/webapp-config/webapp-config-1.54-r2.ebuild index 90075b1..98f452e 100644 --- a/app-admin/webapp-config/webapp-config-1.54-r2.ebuild +++ b/app-admin/webapp-config/webapp-config-1.54-r2.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI="5" -PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) +PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy ) inherit distutils-r1 diff --git a/app-admin/webapp-config/webapp-config-.ebuild b/app-admin/webapp-config/webapp-config-.ebuild index 74104fa..b033362 100644 --- a/app-admin/webapp-config/webapp-config-.ebuild +++ b/app-admin/webapp-config/webapp-config-.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI="5" -PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) +PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy ) inherit distutils-r1
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/files/
commit: 8fb1450e251cb9e9600c0fa9fd0e19f99868d21f Author: Michael Mair-Keimberger (asterix) gmail com> AuthorDate: Thu Jun 30 18:00:06 2016 + Commit: Patrice Clement gentoo org> CommitDate: Fri Jul 1 07:34:41 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fb1450e app-admin/webapp-config: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/1806 Signed-off-by: Patrice Clement gentoo.org> .../webapp-config-1.50.16-absolute-paths.patch | 42 .../files/webapp-config-1.50.16-apache-move.patch | 13 .../files/webapp-config-1.50.16-baselayout2.patch | 13 .../webapp-config-1.50.16-fix-unicode-tests.patch | 39 --- .../webapp-config-1.50.16-htdocs-symlink.patch | 13 .../webapp-config-1.50.16-update-servers.patch | 80 -- .../files/webapp-config-1.51-fix-indentation.patch | 25 --- 7 files changed, 225 deletions(-) diff --git a/app-admin/webapp-config/files/webapp-config-1.50.16-absolute-paths.patch b/app-admin/webapp-config/files/webapp-config-1.50.16-absolute-paths.patch deleted file mode 100644 index c74fff9..000 --- a/app-admin/webapp-config/files/webapp-config-1.50.16-absolute-paths.patch +++ /dev/null @@ -1,42 +0,0 @@ -Index: webapp-config-1.50.16/WebappConfig/config.py -=== webapp-config-1.50.16.orig/WebappConfig/config.py -+++ webapp-config-1.50.16/WebappConfig/config.py -@@ -204,6 +204,7 @@ class Config: - pass - - self.__d = { -+'allow_absolute' : 'no', - 'config_protect' : wrapper.config_protect, - # Necessary to load the config file - 'my_etcconfig' : '/etc/vhosts/webapp-config', -@@ -870,8 +871,13 @@ class Config: - # - # this makes sure we don't write rubbish into the installs list - --installpath = self.config.get('USER', 'g_htdocsdir') + '/' + \ -- self.config.get('USER', 'g_installdir') -+g_installdir = self.config.get('USER', 'g_installdir') -+ -+if (os.path.isabs(g_installdir) -+and self.config.get('USER', 'allow_absolute') == 'yes'): -+installpath = g_installdir -+else: -+installpath = self.config.get('USER', 'g_htdocsdir') + '/' + g_installdir - - installpath = re.compile('/+').sub('/', self.__root + installpath) - -Index: webapp-config-1.50.16/config/webapp-config -=== webapp-config-1.50.16.orig/config/webapp-config -+++ webapp-config-1.50.16/config/webapp-config -@@ -183,6 +183,9 @@ vhost_perms_virtualowned_file="o-w" - - vhost_perms_installdir="0755" - -+# Allow specifying absolute path names using the -d option? -+allow_absolute="no" -+ - - # - # END OF USER-EDITABLE SETTINGS diff --git a/app-admin/webapp-config/files/webapp-config-1.50.16-apache-move.patch b/app-admin/webapp-config/files/webapp-config-1.50.16-apache-move.patch deleted file mode 100644 index 6f9a30e..000 --- a/app-admin/webapp-config/files/webapp-config-1.50.16-apache-move.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: webapp-config-1.50.16/WebappConfig/server.py -=== webapp-config-1.50.16.orig/WebappConfig/server.py -+++ webapp-config-1.50.16/WebappConfig/server.py -@@ -300,7 +300,7 @@ class Apache(Basic): - - name = 'Apache' - desc = 'supports installation on Apache 1 & 2' --dep= '>=net-www/apache-1.3' -+dep= '>=www-servers/apache-1.3' - - def set_server_user(self): - self.vhost_server_uid = get_user('apache') diff --git a/app-admin/webapp-config/files/webapp-config-1.50.16-baselayout2.patch b/app-admin/webapp-config/files/webapp-config-1.50.16-baselayout2.patch deleted file mode 100644 index 24f0004..000 --- a/app-admin/webapp-config/files/webapp-config-1.50.16-baselayout2.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: webapp-config-1.50.16/sbin/webapp-cleaner -=== webapp-config-1.50.16.orig/sbin/webapp-cleaner -+++ webapp-config-1.50.16/sbin/webapp-cleaner -@@ -11,7 +11,7 @@ CMD="emerge -Cav" - WEBAPP_DIR="/usr/share/webapps" - WEBAPP_CONFIG= - --[[ -z ${RC_GOT_FUNCTIONS} ]] && source /sbin/functions.sh -+[[ -z ${RC_GOT_FUNCTIONS} ]] && source /lib/gentoo/functions.sh - - function help() { - echo "Remove obsolete and unused versions of web applications" diff --git a/app-admin/webapp-config/files/webapp-config-1.50.16-fix-unicode-tests.patch b/app-admin/webapp-config/files/webapp-config-1.50.16-fix-unicode-tests.patch deleted file mode 100644 index cad75a2..000 ---
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/files/, app-admin/webapp-config/
commit: 9d904eac76ee1ac31db62713a71b0c5be3ee10d0 Author: PPed72 iol it> AuthorDate: Tue May 3 09:33:30 2016 + Commit: Anthony G. Basile gentoo org> CommitDate: Thu May 12 12:48:13 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d904eac app-admin/webapp-config: fix bashism in tests, bug #561798 .../files/webapp-config-1.54-fix-bashism.patch | 12 .../webapp-config/webapp-config-1.54-r2.ebuild | 66 ++ 2 files changed, 78 insertions(+) diff --git a/app-admin/webapp-config/files/webapp-config-1.54-fix-bashism.patch b/app-admin/webapp-config/files/webapp-config-1.54-fix-bashism.patch new file mode 100644 index 000..9958c14 --- /dev/null +++ b/app-admin/webapp-config/files/webapp-config-1.54-fix-bashism.patch @@ -0,0 +1,12 @@ +diff -Naur WebappConfig.old/ebuild.py WebappConfig/ebuild.py +--- WebappConfig/ebuild.py WebappConfig/ebuild.py +@@ -101,7 +101,7 @@ + + for i in post_instructions: + i = i.replace('"', '\\"') +-post.append(os.popen('echo -n "' + i + '"\n').read()[:-1]) ++post.append(os.popen('printf "' + i + '"\n').read()[:-1]) + + post = post + [ + '', diff --git a/app-admin/webapp-config/webapp-config-1.54-r2.ebuild b/app-admin/webapp-config/webapp-config-1.54-r2.ebuild new file mode 100644 index 000..3a0e46f --- /dev/null +++ b/app-admin/webapp-config/webapp-config-1.54-r2.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) + +inherit distutils-r1 + +SRC_URI="https://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2; +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" + +DESCRIPTION="Gentoo's installer for web-based applications" +HOMEPAGE="http://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() { + epatch "${FILESDIR}/${P}-pvr-check.patch" + epatch "${FILESDIR}/${P}-fix-bashism.patch" +} +python_compile_all() { + emake -C doc/ +} + +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="/usr/sbin" +} + +python_install_all() { + distutils-r1_python_install_all + + insinto /etc/vhosts + doins config/webapp-config + + keepdir /usr/share/webapps + keepdir /var/db/webapps + + dodoc AUTHORS + doman doc/*.[58] + dohtml doc/*.[58].html +} + +python_test() { + PYTHONPATH="." "${PYTHON}" WebappConfig/tests/external.py \ + || die "Testing failed with ${EPYTHON}" +} + +pkg_postinst() { + elog "webapp-config now requires that all -I/-U/-C commands be followed" + elog "by the package name and package version of the webapp" + elog "eg.) 'webapp-config -d drupal -I drupal 8.0.0_beta10'" + elog "See 'man 8 webapp-config' for more information" +}
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: 61bc92f047fc29e7158f7171320fa4c7769813bc Author: Tobias Klausmann gentoo org> AuthorDate: Sun Nov 1 15:13:43 2015 + Commit: Tobias Klausmann gentoo org> CommitDate: Sun Nov 1 15:13:43 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61bc92f0 app-admin/webapp-config: add alpha keyword Gentoo-Bug: 561658 Package-Manager: portage-2.2.23 app-admin/webapp-config/webapp-config-1.54-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-admin/webapp-config/webapp-config-1.54-r1.ebuild b/app-admin/webapp-config/webapp-config-1.54-r1.ebuild index 54496a2..d64b534 100644 --- a/app-admin/webapp-config/webapp-config-1.54-r1.ebuild +++ b/app-admin/webapp-config/webapp-config-1.54-r1.ebuild @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) inherit distutils-r1 SRC_URI="https://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2; -KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd" DESCRIPTION="Gentoo's installer for web-based applications" HOMEPAGE="http://sourceforge.net/projects/webapp-config/;
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: 39dca2480e038ebd44c94d2bd4034293cd4ca113 Author: Agostino Sarubbo gentoo org> AuthorDate: Fri Oct 30 10:14:43 2015 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri Oct 30 10:15:14 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39dca248 app-admin/webapp-config: ppc stable wrt bug #561658 Package-Manager: portage-2.2.20.1 RepoMan-Options: --include-arches="ppc" app-admin/webapp-config/webapp-config-1.54-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-admin/webapp-config/webapp-config-1.54-r1.ebuild b/app-admin/webapp-config/webapp-config-1.54-r1.ebuild index 3194624..54496a2 100644 --- a/app-admin/webapp-config/webapp-config-1.54-r1.ebuild +++ b/app-admin/webapp-config/webapp-config-1.54-r1.ebuild @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) inherit distutils-r1 SRC_URI="https://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2; -KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd" DESCRIPTION="Gentoo's installer for web-based applications" HOMEPAGE="http://sourceforge.net/projects/webapp-config/;
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: 9994d7f40b6405cb6cd0834f10d097e2baca30b5 Author: Markus Meier gentoo org> AuthorDate: Sat Oct 17 11:09:40 2015 + Commit: Markus Meier gentoo org> CommitDate: Sat Oct 17 11:13:21 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9994d7f4 app-admin/webapp-config: arm stable, bug #561658 Package-Manager: portage-2.2.23 RepoMan-Options: --include-arches="arm" app-admin/webapp-config/webapp-config-1.54-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-admin/webapp-config/webapp-config-1.54-r1.ebuild b/app-admin/webapp-config/webapp-config-1.54-r1.ebuild index b3e5802..3194624 100644 --- a/app-admin/webapp-config/webapp-config-1.54-r1.ebuild +++ b/app-admin/webapp-config/webapp-config-1.54-r1.ebuild @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) inherit distutils-r1 SRC_URI="https://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2; -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd" DESCRIPTION="Gentoo's installer for web-based applications" HOMEPAGE="http://sourceforge.net/projects/webapp-config/;
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: ce9abe6216c7982305a1550ab8ee0678950f8a65 Author: Mikle Kolyada gentoo org> AuthorDate: Sat Oct 10 15:08:08 2015 + Commit: Mikle Kolyada gentoo org> CommitDate: Sat Oct 10 15:08:08 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce9abe62 app-admin/webapp-config: sparc stable wrt bug #561658 Package-Manager: portage-2.2.20.1 app-admin/webapp-config/webapp-config-1.54-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-admin/webapp-config/webapp-config-1.54-r1.ebuild b/app-admin/webapp-config/webapp-config-1.54-r1.ebuild index 67a609a..b3e5802 100644 --- a/app-admin/webapp-config/webapp-config-1.54-r1.ebuild +++ b/app-admin/webapp-config/webapp-config-1.54-r1.ebuild @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) inherit distutils-r1 SRC_URI="https://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2; -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd" DESCRIPTION="Gentoo's installer for web-based applications" HOMEPAGE="http://sourceforge.net/projects/webapp-config/;
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: 8b4f464af7c4cbc1ee08dcf77f2290cd18df5806 Author: Mikle Kolyada gentoo org> AuthorDate: Fri Oct 2 10:59:20 2015 + Commit: Mikle Kolyada gentoo org> CommitDate: Fri Oct 2 10:59:20 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b4f464a app-admin/webapp-config: ia64 stable wrt bug #561522 Package-Manager: portage-2.2.20.1 app-admin/webapp-config/webapp-config-1.54-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-admin/webapp-config/webapp-config-1.54-r1.ebuild b/app-admin/webapp-config/webapp-config-1.54-r1.ebuild index 02f6624..67a609a 100644 --- a/app-admin/webapp-config/webapp-config-1.54-r1.ebuild +++ b/app-admin/webapp-config/webapp-config-1.54-r1.ebuild @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) inherit distutils-r1 SRC_URI="https://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2; -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd" DESCRIPTION="Gentoo's installer for web-based applications" HOMEPAGE="http://sourceforge.net/projects/webapp-config/;
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: 64403d0c52eab1133ed8e24a78adf0c2be434226 Author: Jeroen Roovers gentoo org> AuthorDate: Wed Sep 30 03:49:49 2015 + Commit: Jeroen Roovers gentoo org> CommitDate: Wed Sep 30 03:49:49 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64403d0c app-admin/webapp-config: Stable for HPPA (bug #561658). Package-Manager: portage-2.2.20.1 RepoMan-Options: --ignore-arches app-admin/webapp-config/webapp-config-1.54-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-admin/webapp-config/webapp-config-1.54-r1.ebuild b/app-admin/webapp-config/webapp-config-1.54-r1.ebuild index 403ba90..44412ba 100644 --- a/app-admin/webapp-config/webapp-config-1.54-r1.ebuild +++ b/app-admin/webapp-config/webapp-config-1.54-r1.ebuild @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) inherit distutils-r1 SRC_URI="https://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2; -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd" DESCRIPTION="Gentoo's installer for web-based applications" HOMEPAGE="http://sourceforge.net/projects/webapp-config/;
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: f4be72969b4be4ad32180073d74cfcc9ec5cb5f2 Author: Jeroen Roovers gentoo org> AuthorDate: Wed Sep 30 03:54:11 2015 + Commit: Jeroen Roovers gentoo org> CommitDate: Wed Sep 30 03:54:11 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4be7296 app-admin/webapp-config: Stable for PPC64 (bug #561658). Package-Manager: portage-2.2.20.1 RepoMan-Options: --ignore-arches app-admin/webapp-config/webapp-config-1.54-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-admin/webapp-config/webapp-config-1.54-r1.ebuild b/app-admin/webapp-config/webapp-config-1.54-r1.ebuild index 44412ba..02f6624 100644 --- a/app-admin/webapp-config/webapp-config-1.54-r1.ebuild +++ b/app-admin/webapp-config/webapp-config-1.54-r1.ebuild @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) inherit distutils-r1 SRC_URI="https://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2; -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd" DESCRIPTION="Gentoo's installer for web-based applications" HOMEPAGE="http://sourceforge.net/projects/webapp-config/;
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: 3dfc84a77e020c4ecaf559ac60be58f6b5b2 Author: Agostino Sarubbo gentoo org> AuthorDate: Mon Sep 28 09:30:44 2015 + Commit: Agostino Sarubbo gentoo org> CommitDate: Mon Sep 28 09:30:44 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dfc84a7 app-admin/webapp-config: amd64 stable wrt bug #561658 Package-Manager: portage-2.2.20.1 RepoMan-Options: --include-arches="amd64" app-admin/webapp-config/webapp-config-1.54-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-admin/webapp-config/webapp-config-1.54-r1.ebuild b/app-admin/webapp-config/webapp-config-1.54-r1.ebuild index a6e8464..71f1457 100644 --- a/app-admin/webapp-config/webapp-config-1.54-r1.ebuild +++ b/app-admin/webapp-config/webapp-config-1.54-r1.ebuild @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) inherit distutils-r1 SRC_URI="https://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2; -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" DESCRIPTION="Gentoo's installer for web-based applications" HOMEPAGE="http://sourceforge.net/projects/webapp-config/;
[gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/
commit: 642abca94edaef5303b52ba3f7439b3f5cab1c8e Author: Mikle Kolyada gentoo org> AuthorDate: Mon Sep 28 10:01:35 2015 + Commit: Mikle Kolyada gentoo org> CommitDate: Mon Sep 28 10:01:54 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=642abca9 app-admin/webapp-config: x86 stable wrt bug #561658 Package-Manager: portage-2.2.20.1 app-admin/webapp-config/webapp-config-1.54-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-admin/webapp-config/webapp-config-1.54-r1.ebuild b/app-admin/webapp-config/webapp-config-1.54-r1.ebuild index 71f1457..403ba90 100644 --- a/app-admin/webapp-config/webapp-config-1.54-r1.ebuild +++ b/app-admin/webapp-config/webapp-config-1.54-r1.ebuild @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) inherit distutils-r1 SRC_URI="https://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2; -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd" DESCRIPTION="Gentoo's installer for web-based applications" HOMEPAGE="http://sourceforge.net/projects/webapp-config/;