public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/files/, app-admin/webapp-config/
@ 2016-05-12 12:49 Anthony G. Basile
  0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2016-05-12 12:49 UTC (permalink / raw
  To: gentoo-commits

commit:     9d904eac76ee1ac31db62713a71b0c5be3ee10d0
Author:     PPed72 <paolo.pedroni <AT> iol <DOT> it>
AuthorDate: Tue May  3 09:33:30 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu May 12 12:48:13 2016 +0000
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 0000000..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 0000000..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"
+}


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

* [gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/files/, app-admin/webapp-config/
@ 2024-04-15 17:44 Viorel Munteanu
  0 siblings, 0 replies; 2+ messages in thread
From: Viorel Munteanu @ 2024-04-15 17:44 UTC (permalink / raw
  To: gentoo-commits

commit:     e0dec3d48e60d0f4d1e19a0da482933394639649
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 15 17:28:06 2024 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Mon Apr 15 17:43:32 2024 +0000
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 <ceamac <AT> gentoo.org>

 .../webapp-config-1.55-py3.122-invalid-escape-sequence.patch  | 11 +++++++++++
 ...webapp-config-9999.ebuild => webapp-config-1.55-r4.ebuild} |  8 ++++++--
 app-admin/webapp-config/webapp-config-9999.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 000000000000..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-9999.ebuild b/app-admin/webapp-config/webapp-config-1.55-r4.ebuild
similarity index 93%
copy from app-admin/webapp-config/webapp-config-9999.ebuild
copy to app-admin/webapp-config/webapp-config-1.55-r4.ebuild
index 76caefb23e6d..cc2e8028b578 100644
--- a/app-admin/webapp-config/webapp-config-9999.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} == 9999* ]]; then

diff --git a/app-admin/webapp-config/webapp-config-9999.ebuild b/app-admin/webapp-config/webapp-config-9999.ebuild
index 76caefb23e6d..cc2e8028b578 100644
--- a/app-admin/webapp-config/webapp-config-9999.ebuild
+++ b/app-admin/webapp-config/webapp-config-9999.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} == 9999* ]]; then


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

end of thread, other threads:[~2024-04-15 17:44 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-15 17:44 [gentoo-commits] repo/gentoo:master commit in: app-admin/webapp-config/files/, app-admin/webapp-config/ Viorel Munteanu
  -- strict thread matches above, loose matches on Subject: below --
2016-05-12 12:49 Anthony G. Basile

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