* [gentoo-commits] gentoo-x86 commit in app-admin/webapp-config: webapp-config-1.50.16-r1.ebuild ChangeLog webapp-config-1.50.16-r3.ebuild
@ 2010-03-10 3:16 Sebastian Pipping (sping)
0 siblings, 0 replies; 2+ messages in thread
From: Sebastian Pipping (sping) @ 2010-03-10 3:16 UTC (permalink / raw
To: gentoo-commits
sping 10/03/10 03:16:32
Modified: webapp-config-1.50.16-r1.ebuild ChangeLog
webapp-config-1.50.16-r3.ebuild
Log:
app-admin/webapp-config: Fix SRC_URI and HOMEPAGE (bug #267895)
(Portage version: 2.2_rc65/cvs/Linux i686)
Revision Changes Path
1.13 app-admin/webapp-config/webapp-config-1.50.16-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.16-r1.ebuild?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.16-r1.ebuild?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.16-r1.ebuild?r1=1.12&r2=1.13
Index: webapp-config-1.50.16-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.16-r1.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- webapp-config-1.50.16-r1.ebuild 24 Aug 2009 15:51:55 -0000 1.12
+++ webapp-config-1.50.16-r1.ebuild 10 Mar 2010 03:16:31 -0000 1.13
@@ -1,12 +1,12 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.16-r1.ebuild,v 1.12 2009/08/24 15:51:55 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.16-r1.ebuild,v 1.13 2010/03/10 03:16:31 sping Exp $
inherit eutils distutils
DESCRIPTION="Gentoo's installer for web-based applications"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="http://build.pardus.de/downloads/${P}.tar.gz"
+HOMEPAGE="http://sourceforge.net/projects/webapp-config/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
1.64 app-admin/webapp-config/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/webapp-config/ChangeLog?rev=1.64&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/webapp-config/ChangeLog?rev=1.64&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/webapp-config/ChangeLog?r1=1.63&r2=1.64
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/webapp-config/ChangeLog,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- ChangeLog 3 Apr 2008 10:24:04 -0000 1.63
+++ ChangeLog 10 Mar 2010 03:16:31 -0000 1.64
@@ -1,6 +1,10 @@
# ChangeLog for app-admin/webapp-config
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/ChangeLog,v 1.63 2008/04/03 10:24:04 hollow Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/ChangeLog,v 1.64 2010/03/10 03:16:31 sping Exp $
+
+ 10 Mar 2010; Sebastian Pipping <sping@gentoo.org>
+ webapp-config-1.50.16-r1.ebuild, webapp-config-1.50.16-r3.ebuild:
+ Fix SRC_URI and HOMEPAGE (bug #267895)
03 Apr 2008; Benedikt Böhm <hollow@gentoo.org>
webapp-config-1.50.16-r1.ebuild, -webapp-config-1.50.16-r2.ebuild,
1.3 app-admin/webapp-config/webapp-config-1.50.16-r3.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.16-r3.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.16-r3.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.16-r3.ebuild?r1=1.2&r2=1.3
Index: webapp-config-1.50.16-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.16-r3.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- webapp-config-1.50.16-r3.ebuild 3 Apr 2008 10:24:04 -0000 1.2
+++ webapp-config-1.50.16-r3.ebuild 10 Mar 2010 03:16:31 -0000 1.3
@@ -1,12 +1,12 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.16-r3.ebuild,v 1.2 2008/04/03 10:24:04 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.16-r3.ebuild,v 1.3 2010/03/10 03:16:31 sping Exp $
inherit eutils distutils
DESCRIPTION="Gentoo's installer for web-based applications"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="http://build.pardus.de/downloads/${P}.tar.gz"
+HOMEPAGE="http://sourceforge.net/projects/webapp-config/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-admin/webapp-config: webapp-config-1.50.16-r1.ebuild ChangeLog webapp-config-1.50.16-r3.ebuild
@ 2010-05-14 18:56 Arfrever Frehtes Taifersar Arahesis (arfrever)
0 siblings, 0 replies; 2+ messages in thread
From: Arfrever Frehtes Taifersar Arahesis (arfrever) @ 2010-05-14 18:56 UTC (permalink / raw
To: gentoo-commits
arfrever 10/05/14 18:56:00
Modified: webapp-config-1.50.16-r1.ebuild ChangeLog
webapp-config-1.50.16-r3.ebuild
Log:
Set SUPPORT_PYTHON_ABIS (bug #308287).
(Portage version: HEAD/cvs/Linux x86_64)
Revision Changes Path
1.14 app-admin/webapp-config/webapp-config-1.50.16-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.16-r1.ebuild?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.16-r1.ebuild?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.16-r1.ebuild?r1=1.13&r2=1.14
Index: webapp-config-1.50.16-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.16-r1.ebuild,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- webapp-config-1.50.16-r1.ebuild 10 Mar 2010 03:16:31 -0000 1.13
+++ webapp-config-1.50.16-r1.ebuild 14 May 2010 18:56:00 -0000 1.14
@@ -1,8 +1,12 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.16-r1.ebuild,v 1.13 2010/03/10 03:16:31 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.16-r1.ebuild,v 1.14 2010/05/14 18:56:00 arfrever Exp $
-inherit eutils distutils
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit distutils eutils
DESCRIPTION="Gentoo's installer for web-based applications"
HOMEPAGE="http://sourceforge.net/projects/webapp-config/"
@@ -14,15 +18,16 @@
IUSE=""
DEPEND=""
+RDEPEND=""
+RESTRICT_PYTHON_ABIS="3.*"
+
+PYTHON_MODNAME="WebappConfig"
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${P}-apache-move.patch
+src_prepare() {
+ epatch "${FILESDIR}/${P}-apache-move.patch"
}
src_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
@@ -30,33 +35,30 @@
# be ok
distutils_src_install --install-scripts="/usr/sbin"
- dodir /etc/vhosts
- cp config/webapp-config "${D}"/etc/vhosts/
+ python_convert_shebangs 2 "${ED}usr/sbin/webapp-config"
+
+ insinto /etc/vhosts
+ doins config/webapp-config
+
keepdir /usr/share/webapps
keepdir /var/db/webapps
+
dodoc examples/phpmyadmin-2.5.4-r1.ebuild AUTHORS.txt CHANGES.txt examples/postinstall-en.txt
- doman doc/webapp-config.5 doc/webapp-config.8
- dohtml doc/webapp-config.5.html doc/webapp-config.8.html
+ doman doc/*.[58]
+ dohtml doc/*.[58].html
}
src_test() {
- distutils_python_version
- if [[ $PYVER_MAJOR -gt 1 ]] && [[ $PYVER_MINOR -gt 3 ]] ; then
- elog "Running webapp-config doctests..."
- if ! PYTHONPATH="." ${python} WebappConfig/tests/dtest.py; then
- eerror "DocTests failed - please submit a bug report"
- die "DocTesting failed!"
- fi
- else
- elog "Python version below 2.4! Disabling tests."
- fi
+ testing() {
+ PYTHONPATH="." "$(PYTHON)" WebappConfig/tests/dtest.py
+ }
+ python_execute_function testing
}
pkg_postinst() {
- echo
+ distutils_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."
- echo
- epause 5
}
1.65 app-admin/webapp-config/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/webapp-config/ChangeLog?rev=1.65&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/webapp-config/ChangeLog?rev=1.65&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/webapp-config/ChangeLog?r1=1.64&r2=1.65
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/webapp-config/ChangeLog,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- ChangeLog 10 Mar 2010 03:16:31 -0000 1.64
+++ ChangeLog 14 May 2010 18:56:00 -0000 1.65
@@ -1,6 +1,10 @@
# ChangeLog for app-admin/webapp-config
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/ChangeLog,v 1.64 2010/03/10 03:16:31 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/ChangeLog,v 1.65 2010/05/14 18:56:00 arfrever Exp $
+
+ 14 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ webapp-config-1.50.16-r1.ebuild, webapp-config-1.50.16-r3.ebuild:
+ Set SUPPORT_PYTHON_ABIS (bug #308287).
10 Mar 2010; Sebastian Pipping <sping@gentoo.org>
webapp-config-1.50.16-r1.ebuild, webapp-config-1.50.16-r3.ebuild:
1.4 app-admin/webapp-config/webapp-config-1.50.16-r3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.16-r3.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.16-r3.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.16-r3.ebuild?r1=1.3&r2=1.4
Index: webapp-config-1.50.16-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.16-r3.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- webapp-config-1.50.16-r3.ebuild 10 Mar 2010 03:16:31 -0000 1.3
+++ webapp-config-1.50.16-r3.ebuild 14 May 2010 18:56:00 -0000 1.4
@@ -1,8 +1,12 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.16-r3.ebuild,v 1.3 2010/03/10 03:16:31 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.16-r3.ebuild,v 1.4 2010/05/14 18:56:00 arfrever Exp $
-inherit eutils distutils
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit distutils eutils
DESCRIPTION="Gentoo's installer for web-based applications"
HOMEPAGE="http://sourceforge.net/projects/webapp-config/"
@@ -14,14 +18,16 @@
IUSE=""
DEPEND=""
+RDEPEND=""
+RESTRICT_PYTHON_ABIS="3.*"
+
+PYTHON_MODNAME="WebappConfig"
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${P}-apache-move.patch
- epatch "${FILESDIR}"/${P}-baselayout2.patch
- epatch "${FILESDIR}"/${P}-htdocs-symlink.patch
- epatch "${FILESDIR}"/${P}-absolute-paths.patch
+src_prepare() {
+ epatch "${FILESDIR}/${P}-apache-move.patch"
+ epatch "${FILESDIR}/${P}-baselayout2.patch"
+ epatch "${FILESDIR}/${P}-htdocs-symlink.patch"
+ epatch "${FILESDIR}/${P}-absolute-paths.patch"
rm -f doc/webapp.eclass.5{,.html}
}
@@ -33,6 +39,8 @@
# be ok
distutils_src_install --install-scripts="/usr/sbin"
+ python_convert_shebangs 2 "${ED}usr/sbin/webapp-config"
+
insinto /etc/vhosts
doins config/webapp-config
@@ -45,23 +53,16 @@
}
src_test() {
- distutils_python_version
- if [[ $PYVER_MAJOR -gt 1 ]] && [[ $PYVER_MINOR -gt 3 ]] ; then
- elog "Running webapp-config doctests..."
- if ! PYTHONPATH="." ${python} WebappConfig/tests/dtest.py; then
- eerror "DocTests failed - please submit a bug report"
- die "DocTesting failed!"
- fi
- else
- elog "Python version below 2.4! Disabling tests."
- fi
+ testing() {
+ PYTHONPATH="." "$(PYTHON)" WebappConfig/tests/dtest.py
+ }
+ python_execute_function testing
}
pkg_postinst() {
- echo
+ distutils_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."
- echo
- epause 5
}
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-05-14 18:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-10 3:16 [gentoo-commits] gentoo-x86 commit in app-admin/webapp-config: webapp-config-1.50.16-r1.ebuild ChangeLog webapp-config-1.50.16-r3.ebuild Sebastian Pipping (sping)
-- strict thread matches above, loose matches on Subject: below --
2010-05-14 18:56 Arfrever Frehtes Taifersar Arahesis (arfrever)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox