* [gentoo-commits] gentoo-x86 commit in dev-python/django: django-1.3.1-r1.ebuild django-9999.ebuild ChangeLog
@ 2011-12-14 10:23 Mike Gilbert (floppym)
0 siblings, 0 replies; 3+ messages in thread
From: Mike Gilbert (floppym) @ 2011-12-14 10:23 UTC (permalink / raw
To: gentoo-commits
floppym 11/12/14 10:23:36
Modified: django-9999.ebuild ChangeLog
Added: django-1.3.1-r1.ebuild
Log:
Don't call dodoc on directory; bug 367547. Migrate to bash-completion-r1.
(Portage version: 2.2.0_alpha80/cvs/Linux x86_64)
Revision Changes Path
1.10 dev-python/django/django-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-9999.ebuild?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-9999.ebuild?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-9999.ebuild?r1=1.9&r2=1.10
Index: django-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/django/django-9999.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- django-9999.ebuild 9 Feb 2011 18:16:28 -0000 1.9
+++ django-9999.ebuild 14 Dec 2011 10:23:36 -0000 1.10
@@ -1,13 +1,13 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-9999.ebuild,v 1.9 2011/02/09 18:16:28 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-9999.ebuild,v 1.10 2011/12/14 10:23:36 floppym Exp $
EAPI="3"
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="3.*"
-inherit bash-completion distutils subversion webapp
+inherit bash-completion-r1 distutils subversion webapp
DESCRIPTION="High-level Python web framework"
HOMEPAGE="http://www.djangoproject.com/ http://pypi.python.org/pypi/Django"
@@ -30,7 +30,7 @@
ESVN_REPO_URI="http://code.djangoproject.com/svn/django/trunk/"
-DOCS="docs/* AUTHORS"
+DOCS="docs/README AUTHORS"
WEBAPP_MANUAL_SLOT="yes"
pkg_setup() {
@@ -61,7 +61,7 @@
src_install() {
distutils_src_install
- dobashcompletion extras/django_bash_completion
+ dobashcomp extras/django_bash_completion ${PN}
if use doc; then
rm -fr docs/_build/html/_sources
1.73 dev-python/django/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/ChangeLog?rev=1.73&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/ChangeLog?rev=1.73&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/ChangeLog?r1=1.72&r2=1.73
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- ChangeLog 16 Sep 2011 12:03:23 -0000 1.72
+++ ChangeLog 14 Dec 2011 10:23:36 -0000 1.73
@@ -1,6 +1,12 @@
# ChangeLog for dev-python/django
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.72 2011/09/16 12:03:23 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.73 2011/12/14 10:23:36 floppym Exp $
+
+*django-1.3.1-r1 (14 Dec 2011)
+
+ 14 Dec 2011; Mike Gilbert <floppym@gentoo.org> +django-1.3.1-r1.ebuild,
+ django-9999.ebuild:
+ Don't call dodoc on directory; bug 367547. Migrate to bash-completion-r1.
16 Sep 2011; Tony Vroon <chainsaw@gentoo.org> django-1.3.1.ebuild:
Marked stable on AMD64 based on arch testing by Agostino "ago" Sarubbo & Ian
1.1 dev-python/django/django-1.3.1-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-1.3.1-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-1.3.1-r1.ebuild?rev=1.1&content-type=text/plain
Index: django-1.3.1-r1.ebuild
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.3.1-r1.ebuild,v 1.1 2011/12/14 10:23:36 floppym Exp $
EAPI="3"
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="3.*"
inherit bash-completion-r1 distutils versionator webapp
MY_P="Django-${PV}"
DESCRIPTION="High-level Python web framework"
HOMEPAGE="http://www.djangoproject.com/ http://pypi.python.org/pypi/Django"
SRC_URI="http://media.djangoproject.com/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="doc mysql postgres sqlite test"
RDEPEND="dev-python/imaging
sqlite? ( || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 ) )
postgres? ( dev-python/psycopg )
mysql? ( >=dev-python/mysql-python-1.2.1_p2 )"
DEPEND="${RDEPEND}
doc? ( >=dev-python/sphinx-0.3 )
test? ( || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 ) )"
S="${WORKDIR}/${MY_P}"
DOCS="docs/README AUTHORS"
WEBAPP_MANUAL_SLOT="yes"
pkg_setup() {
python_pkg_setup
webapp_pkg_setup
}
src_compile() {
distutils_src_compile
if use doc; then
einfo "Generation of documentation"
pushd docs > /dev/null
emake html || die "Generation of documentation failed"
popd > /dev/null
fi
}
src_test() {
testing() {
# Tests have non-standard assumptions about PYTHONPATH and
# don't work with usual "build-${PYTHON_ABI}/lib".
PYTHONPATH="." "$(PYTHON)" tests/runtests.py --settings=test_sqlite -v1
}
python_execute_function testing
}
src_install() {
distutils_src_install
newbashcomp extras/django_bash_completion ${PN} || die
if use doc; then
rm -fr docs/_build/html/_sources
dohtml -A txt -r docs/_build/html/* || die "dohtml failed"
fi
insinto "${MY_HTDOCSDIR#${EPREFIX}}"
doins -r django/contrib/admin/media/* || die "doins failed"
webapp_src_install
}
pkg_preinst() {
:
}
pkg_postinst() {
bash-completion_pkg_postinst
distutils_pkg_postinst
einfo "Now, Django has the best of both worlds with Gentoo,"
einfo "ease of deployment for production and development."
echo
elog "A copy of the admin media is available to"
elog "webapp-config for installation in a webroot,"
elog "as well as the traditional location in python's"
elog "site-packages dir for easy development"
echo
ewarn "If you build Django ${PV} without USE=\"vhosts\""
ewarn "webapp-config will automatically install the"
ewarn "admin media into the localhost webroot."
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-python/django: django-1.3.1-r1.ebuild django-9999.ebuild ChangeLog
@ 2011-12-14 23:44 Mike Gilbert (floppym)
0 siblings, 0 replies; 3+ messages in thread
From: Mike Gilbert (floppym) @ 2011-12-14 23:44 UTC (permalink / raw
To: gentoo-commits
floppym 11/12/14 23:44:08
Modified: django-1.3.1-r1.ebuild django-9999.ebuild ChangeLog
Log:
Drop bash-completion_pkg_postinst.
(Portage version: 2.2.0_alpha81/cvs/Linux x86_64)
Revision Changes Path
1.2 dev-python/django/django-1.3.1-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-1.3.1-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-1.3.1-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-1.3.1-r1.ebuild?r1=1.1&r2=1.2
Index: django-1.3.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/django/django-1.3.1-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- django-1.3.1-r1.ebuild 14 Dec 2011 10:23:36 -0000 1.1
+++ django-1.3.1-r1.ebuild 14 Dec 2011 23:44:08 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.3.1-r1.ebuild,v 1.1 2011/12/14 10:23:36 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.3.1-r1.ebuild,v 1.2 2011/12/14 23:44:08 floppym Exp $
EAPI="3"
PYTHON_DEPEND="2"
@@ -79,7 +79,6 @@
}
pkg_postinst() {
- bash-completion_pkg_postinst
distutils_pkg_postinst
einfo "Now, Django has the best of both worlds with Gentoo,"
1.12 dev-python/django/django-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-9999.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-9999.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-9999.ebuild?r1=1.11&r2=1.12
Index: django-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/django/django-9999.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- django-9999.ebuild 14 Dec 2011 22:16:14 -0000 1.11
+++ django-9999.ebuild 14 Dec 2011 23:44:08 -0000 1.12
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-9999.ebuild,v 1.11 2011/12/14 22:16:14 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-9999.ebuild,v 1.12 2011/12/14 23:44:08 floppym Exp $
EAPI="3"
PYTHON_DEPEND="2"
@@ -79,7 +79,6 @@
}
pkg_postinst() {
- bash-completion_pkg_postinst
distutils_pkg_postinst
einfo "Now, Django has the best of both worlds with Gentoo,"
1.76 dev-python/django/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/ChangeLog?rev=1.76&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/ChangeLog?rev=1.76&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/ChangeLog?r1=1.75&r2=1.76
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- ChangeLog 14 Dec 2011 22:16:14 -0000 1.75
+++ ChangeLog 14 Dec 2011 23:44:08 -0000 1.76
@@ -1,6 +1,10 @@
# ChangeLog for dev-python/django
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.75 2011/12/14 22:16:14 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.76 2011/12/14 23:44:08 floppym Exp $
+
+ 14 Dec 2011; Mike Gilbert <floppym@gentoo.org> django-1.3.1-r1.ebuild,
+ django-9999.ebuild:
+ Drop bash-completion_pkg_postinst.
14 Dec 2011; Mike Gilbert <floppym@gentoo.org> django-9999.ebuild:
Call newbashcomp.
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-python/django: django-1.3.1-r1.ebuild django-9999.ebuild ChangeLog
@ 2011-12-21 7:06 Mike Gilbert (floppym)
0 siblings, 0 replies; 3+ messages in thread
From: Mike Gilbert (floppym) @ 2011-12-21 7:06 UTC (permalink / raw
To: gentoo-commits
floppym 11/12/21 07:06:46
Modified: django-1.3.1-r1.ebuild django-9999.ebuild ChangeLog
Log:
Incorporate patch from Progress overlay by Arfrever. Should resolve bug 394777.
(Portage version: 2.2.0_alpha81/cvs/Linux x86_64)
Revision Changes Path
1.3 dev-python/django/django-1.3.1-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-1.3.1-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-1.3.1-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-1.3.1-r1.ebuild?r1=1.2&r2=1.3
Index: django-1.3.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/django/django-1.3.1-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- django-1.3.1-r1.ebuild 14 Dec 2011 23:44:08 -0000 1.2
+++ django-1.3.1-r1.ebuild 21 Dec 2011 07:06:46 -0000 1.3
@@ -1,13 +1,13 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.3.1-r1.ebuild,v 1.2 2011/12/14 23:44:08 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.3.1-r1.ebuild,v 1.3 2011/12/21 07:06:46 floppym Exp $
EAPI="3"
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="3.*"
-inherit bash-completion-r1 distutils versionator webapp
+inherit bash-completion-r1 distutils eutils versionator webapp
MY_P="Django-${PV}"
@@ -38,6 +38,22 @@
webapp_pkg_setup
}
+src_prepare() {
+ distutils_src_prepare
+ epatch "${FILESDIR}/${P}-djangodocs_extension.patch"
+
+ # Disable tests requiring network connection.
+ sed \
+ -e "s/test_correct_url_value_passes/_&/" \
+ -e "s/test_correct_url_with_redirect/_&/" \
+ -i tests/modeltests/validation/tests.py
+ sed \
+ -e "s/test_urlfield_3/_&/" \
+ -e "s/test_urlfield_4/_&/" \
+ -e "s/test_urlfield_10/_&/" \
+ -i tests/regressiontests/forms/tests/fields.py
+}
+
src_compile() {
distutils_src_compile
1.13 dev-python/django/django-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-9999.ebuild?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-9999.ebuild?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-9999.ebuild?r1=1.12&r2=1.13
Index: django-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/django/django-9999.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- django-9999.ebuild 14 Dec 2011 23:44:08 -0000 1.12
+++ django-9999.ebuild 21 Dec 2011 07:06:46 -0000 1.13
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-9999.ebuild,v 1.12 2011/12/14 23:44:08 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-9999.ebuild,v 1.13 2011/12/21 07:06:46 floppym Exp $
EAPI="3"
PYTHON_DEPEND="2"
@@ -38,6 +38,21 @@
webapp_pkg_setup
}
+src_prepare() {
+ distutils_src_prepare
+
+ # Disable tests requiring network connection.
+ sed \
+ -e "s/test_correct_url_value_passes/_&/" \
+ -e "s/test_correct_url_with_redirect/_&/" \
+ -i tests/modeltests/validation/tests.py
+ sed \
+ -e "s/test_urlfield_3/_&/" \
+ -e "s/test_urlfield_4/_&/" \
+ -e "s/test_urlfield_10/_&/" \
+ -i tests/regressiontests/forms/tests/fields.py
+}
+
src_compile() {
distutils_src_compile
1.77 dev-python/django/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/ChangeLog?rev=1.77&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/ChangeLog?rev=1.77&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/ChangeLog?r1=1.76&r2=1.77
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- ChangeLog 14 Dec 2011 23:44:08 -0000 1.76
+++ ChangeLog 21 Dec 2011 07:06:46 -0000 1.77
@@ -1,6 +1,12 @@
# ChangeLog for dev-python/django
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.76 2011/12/14 23:44:08 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.77 2011/12/21 07:06:46 floppym Exp $
+
+ 21 Dec 2011; Mike Gilbert <floppym@gentoo.org>
+ +files/django-1.3.1-djangodocs_extension.patch, django-1.3.1-r1.ebuild,
+ django-9999.ebuild:
+ Incorporate patch from Progress overlay by Arfrever. Should resolve bug
+ 394777.
14 Dec 2011; Mike Gilbert <floppym@gentoo.org> django-1.3.1-r1.ebuild,
django-9999.ebuild:
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-12-21 7:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-14 10:23 [gentoo-commits] gentoo-x86 commit in dev-python/django: django-1.3.1-r1.ebuild django-9999.ebuild ChangeLog Mike Gilbert (floppym)
-- strict thread matches above, loose matches on Subject: below --
2011-12-14 23:44 Mike Gilbert (floppym)
2011-12-21 7:06 Mike Gilbert (floppym)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox