From 838a54d517d386452c8f6830814df4b4d02a57e6 Mon Sep 17 00:00:00 2001 From: geos_one Date: Thu, 21 Apr 2011 05:24:30 +0000 Subject: [PATCH] www-apps/trac: bump (Portage version: 2.2.0_alpha30-r1/svn/Linux x86_64) git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@2892 6952d904-891a-0410-993b-d76249ca496b --- www-apps/trac/ChangeLog | 9 +- www-apps/trac/Manifest | 13 +- www-apps/trac/files/tracd.initd | 7 +- www-apps/trac/files/tracd.initd.2 | 27 ---- www-apps/trac/metadata.xml | 13 +- www-apps/trac/trac-0.12.1.ebuild | 119 ------------------ ...trac-0.12-r1.ebuild => trac-0.12.2.ebuild} | 9 +- 7 files changed, 28 insertions(+), 169 deletions(-) delete mode 100755 www-apps/trac/files/tracd.initd.2 delete mode 100644 www-apps/trac/trac-0.12.1.ebuild rename www-apps/trac/{trac-0.12-r1.ebuild => trac-0.12.2.ebuild} (90%) diff --git a/www-apps/trac/ChangeLog b/www-apps/trac/ChangeLog index 130fae7f..66a890e6 100644 --- a/www-apps/trac/ChangeLog +++ b/www-apps/trac/ChangeLog @@ -1,7 +1,14 @@ # ChangeLog for www-apps/trac -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/www-apps/trac/ChangeLog,v 1.84 2008/11/17 04:40:58 wrobel Exp $ +*trac-0.12.2 (21 Apr 2011) + + 21 Apr 2011; Mario Fetka -trac-0.12-r1.ebuild, + -trac-0.12.1.ebuild, +trac-0.12.2.ebuild, -files/tracd.initd.2, + files/tracd.initd, metadata.xml: + bump + 21 Oct 2010; Mario Fetka +trac-0.12.1.ebuild: Bump diff --git a/www-apps/trac/Manifest b/www-apps/trac/Manifest index 8de6758f..180c2f54 100644 --- a/www-apps/trac/Manifest +++ b/www-apps/trac/Manifest @@ -1,11 +1,8 @@ AUX postinst-en.txt 1349 RMD160 019db0eb917956b84e2afe621edcba501e83a105 SHA1 337a6d417aee1cb94d936952584a154a18ae6d74 SHA256 af9ea54a0499737a454852d8f878368fea6540dc50fce3ce486ede2a0a201a39 AUX postupgrade-en.txt 674 RMD160 088b1b590ebd7876347b06e71f9dda549238eda1 SHA1 f45997b23c35eec1188003b21dd971d28961ab98 SHA256 4ce5f023f0f2312ac6b6162b2db510397d204cc168db1d5c09ad3aae678ea6b0 AUX tracd.confd 359 RMD160 7328dd041576abbc76130ce220041d837289dd00 SHA1 91a6077f1baf9301082826697e8828c6039f7648 SHA256 6ae50c887d18f8eeda7d59c4d3fd1b5e07e407711c4e4679fef3583f7be8ed6e -AUX tracd.initd 881 RMD160 c215a990133d5b655bc94e13ab4de9d1c938a163 SHA1 2c1a9dbae7e4890c2fb71f22091786ba7396c940 SHA256 6e76bfffe7f6928bff24d79b97aa8bbd27dafdfbb16fe8c79b7ad298e202d950 -AUX tracd.initd.2 939 RMD160 2991a7a8d2d1a2911a899ed5f356fd88de872b5d SHA1 c8d00dc0e7ca92f17caa4ec1dfa49d3178fbc735 SHA256 9cd796e0fb516a91f5ec69037819144e9b9920af5df4f91839f9fb7fc67823a0 -DIST Trac-0.12.1.tar.gz 2170563 RMD160 3f5e61e27d6217995a9c87401c0c57e4d353d8aa SHA1 062e335a2f5bf6dd5f858711cf38419f73f286b1 SHA256 7ab452a99e61be9cc6b6fd7dbcfa6e4f5d1760480a132dc41c6fe2fce10c73a4 -DIST Trac-0.12.tar.gz 2107428 RMD160 aca8d024a582519cefef07053517d14722f87609 SHA1 f13a5caf2ab353248f696dc5320df7a27c102e06 SHA256 a1c15c0c3a0c717e6d50d4e4f949b8e8c510a308611013c45c6253c675e805cf -EBUILD trac-0.12-r1.ebuild 2749 RMD160 fe1579e8d12c94814300f4f2a6970073426fe974 SHA1 899883db033cb8219bc0d939338f4debcb942a94 SHA256 ff6113ad44decce02e359d88d751b84536d96b8c622f58c7f6fece80e1f40098 -EBUILD trac-0.12.1.ebuild 2749 RMD160 fe1579e8d12c94814300f4f2a6970073426fe974 SHA1 899883db033cb8219bc0d939338f4debcb942a94 SHA256 ff6113ad44decce02e359d88d751b84536d96b8c622f58c7f6fece80e1f40098 -MISC ChangeLog 15062 RMD160 d31f4861626dd53496eee99e9ad48a78d60d9dcc SHA1 8a10287c62fb7b4ce6f487f1a6801cfa69e1f9eb SHA256 75e225f03839811de4bc8514b04b298dc1f7f051e2ef124a95e0d80e7d71d4ea -MISC metadata.xml 294 RMD160 583b0b68a78884cf52e3a16a0aa9195dbb50654d SHA1 f73728c47f88df1bd4b4760b28c4f48c63a30ebb SHA256 a77b23b4cddd5cd048cbe2c0fdd3950d53ef2b48d30cdf1b1f501ee25a690e08 +AUX tracd.initd 918 RMD160 34e24f4a523ebf48b4b9e11eab78a1ab9c905dbc SHA1 0c32032faeefbc45c21558ef36959ac39dace3b6 SHA256 342ce62957a170db2e86abe801883076239e422b773a2534beceef0e3a24068e +DIST Trac-0.12.2.tar.gz 2208361 RMD160 317d5792976bc4c048cbac2a831398e976251110 SHA1 95ca75b54abfd5a3d838f300c19ef8dbd125f08d SHA256 c5b41da9a2a1464f9f5a42f8624b3a9cf3cb96f8ffbbdb17bf3cb01b06280ec6 +EBUILD trac-0.12.2.ebuild 2801 RMD160 97b5370993532c8e9589e89ca890c12bf31973b1 SHA1 49ca843f2ad9d399d69d57606b29514f24b879b8 SHA256 c21a98aafd995c43ea9216a2c9501b2695bb9c4b68c14c18424d91f867ad9a1d +MISC ChangeLog 15272 RMD160 48033145ee1db6a39dcf9d8fefa040a8cf41aac4 SHA1 1150865aaf899aaab6a876e875082830374d126a SHA256 62320b79580cbfa48bc76e6d8f186a33928a2ae3c3ee6227a2981a88229ba55c +MISC metadata.xml 353 RMD160 f4472ab9ab13edf764e019de289cd8658c8c9f41 SHA1 0d13970ae85fc0d2ebe0960ea78457b0b1da29c3 SHA256 12d6ceeed2212b5daf258a1dc4fee3fb6acd607e866e4062a907c157ac387059 diff --git a/www-apps/trac/files/tracd.initd b/www-apps/trac/files/tracd.initd index c63b7942..d026b1da 100755 --- a/www-apps/trac/files/tracd.initd +++ b/www-apps/trac/files/tracd.initd @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/files/tracd.initd,v 1.3 2008/07/16 21:20:07 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/files/tracd.initd,v 1.5 2011/02/08 08:02:50 djc Exp $ depend() { need net @@ -14,7 +14,8 @@ start() { # --background option of s-s-d. start-stop-daemon --start --chuid ${TRACD_USER:-tracd}:${TRACD_GROUP:-tracd} \ --pidfile /var/run/tracd.pid --make-pidfile --background \ - --exec /usr/bin/python -- /usr/bin/tracd \ + --env PYTHON_EGG_CACHE="/var/lib/trac/egg-cache" \ + --exec /usr/bin/tracd -- \ -p ${TRACD_PORT:-8000} ${TRACD_OPTS:---env-parent-dir /var/lib/trac/} eend $? } diff --git a/www-apps/trac/files/tracd.initd.2 b/www-apps/trac/files/tracd.initd.2 deleted file mode 100755 index 75de9090..00000000 --- a/www-apps/trac/files/tracd.initd.2 +++ /dev/null @@ -1,27 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/files/tracd.initd.2,v 1.1 2008/09/10 07:50:30 wrobel Exp $ - -depend() { - need net -} - -start() { - ebegin "Starting tracd" - # tracd fails to create pidfile if started as non-root user, thus we are asking - # s-s-d to do that. To have correct pid we avoid -d option of tracd and use - # --background option of s-s-d. - start-stop-daemon --start --chuid ${TRACD_USER:-tracd}:${TRACD_GROUP:-tracd} \ - --pidfile /var/run/tracd.pid --make-pidfile --background \ - --env PYTHON_EGG_CACHE="/var/lib/trac/egg-cache" \ - --exec /usr/bin/python -- /usr/bin/tracd \ - -p ${TRACD_PORT:-8000} ${TRACD_OPTS:---env-parent-dir /var/lib/trac/} - eend $? -} - -stop() { - ebegin "Stopping tracd" - start-stop-daemon --stop --quiet --pidfile /var/run/tracd.pid - eend $? -} diff --git a/www-apps/trac/metadata.xml b/www-apps/trac/metadata.xml index cf6c599b..9b6a5c4e 100644 --- a/www-apps/trac/metadata.xml +++ b/www-apps/trac/metadata.xml @@ -1,9 +1,12 @@ -web-apps - - Add app-text/silvercity support to - colourize code stored in the repository - + web-apps + + djc@gentoo.org + Dirkjan Ochtman + + + Enable support for i18n with dev-python/Babel + diff --git a/www-apps/trac/trac-0.12.1.ebuild b/www-apps/trac/trac-0.12.1.ebuild deleted file mode 100644 index 84bf1998..00000000 --- a/www-apps/trac/trac-0.12.1.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-0.12-r1.ebuild,v 1.1 2010/08/13 13:23:44 djc Exp $ - -EAPI="2" -PYTHON_DEPEND="2" -SUPPORT_PYTHON_ABIS="1" - -inherit distutils eutils webapp - -MY_PV=${PV/_beta/b} -MY_P=Trac-${MY_PV} -S=${WORKDIR}/${MY_P} - -DESCRIPTION="Trac is a minimalistic web-based project management, wiki and bug/issue tracking system." -HOMEPAGE="http://trac.edgewall.com/" -LICENSE="BSD" -SRC_URI="http://ftp.edgewall.com/pub/trac/${MY_P}.tar.gz" - -IUSE="cgi fastcgi i18n mysql postgres +sqlite subversion" - -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" - -# doing so because tools, python packages... overlap -SLOT="0" -WEBAPP_MANUAL_SLOT="yes" - -RDEPEND=" - dev-python/setuptools - dev-python/docutils - dev-python/genshi - dev-python/pygments - dev-python/pytz - i18n? ( >=dev-python/Babel-0.9.5 ) - cgi? ( virtual/httpd-cgi ) - fastcgi? ( virtual/httpd-fastcgi ) - mysql? ( dev-python/mysql-python ) - postgres? ( >=dev-python/psycopg-2 ) - sqlite? ( - >=dev-db/sqlite-3.3.4 - || ( - >=dev-lang/python-2.5[sqlite] - >=dev-python/pysqlite-2.3.2 - ) - ) - subversion? ( dev-vcs/subversion[python] ) - !www-apps/trac-webadmin - " -DEPEND="${RDEPEND}" -RESTRICT_PYTHON_ABIS="3.*" - -pkg_setup() { - python_pkg_setup - webapp_pkg_setup - - if ! use mysql && ! use postgres && ! use sqlite; then - eerror "You must select at least one database backend, by enabling" - eerror "at least one of the 'mysql', 'postgres' or 'sqlite' USE flags." - die "no database backend selected" - fi - - enewgroup tracd - enewuser tracd -1 -1 -1 tracd -} - -src_test() { - - testing() { - PYTHONPATH=. "$(PYTHON)" trac/test.py - } - python_execute_function testing - - if use i18n; then - make check - fi - -} - -# the default src_compile just calls setup.py build -# currently, this switches i18n catalog compilation based on presence of Babel - -src_install() { - webapp_src_preinst - distutils_src_install - - # project environments might go in here - keepdir /var/lib/trac - - # Use this as the egg-cache for tracd - dodir /var/lib/trac/egg-cache - keepdir /var/lib/trac/egg-cache - fowners tracd:tracd /var/lib/trac/egg-cache - - # documentation - cp -r contrib "${D}"/usr/share/doc/${P}/ - - # tracd init script - newconfd "${FILESDIR}"/tracd.confd tracd - newinitd "${FILESDIR}"/tracd.initd tracd - - if use cgi; then - cp cgi-bin/trac.cgi "${D}"/${MY_CGIBINDIR} || die - fi - if use fastcgi; then - cp cgi-bin/trac.fcgi "${D}"/${MY_CGIBINDIR} || die - fi - - for lang in en; do - webapp_postinst_txt ${lang} "${FILESDIR}"/postinst-${lang}.txt - webapp_postupgrade_txt ${lang} "${FILESDIR}"/postupgrade-${lang}.txt - done - - webapp_src_install -} - -pkg_postinst() { - distutils_pkg_postinst - webapp_pkg_postinst -} diff --git a/www-apps/trac/trac-0.12-r1.ebuild b/www-apps/trac/trac-0.12.2.ebuild similarity index 90% rename from www-apps/trac/trac-0.12-r1.ebuild rename to www-apps/trac/trac-0.12.2.ebuild index 84bf1998..c13dcc95 100644 --- a/www-apps/trac/trac-0.12-r1.ebuild +++ b/www-apps/trac/trac-0.12.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-0.12-r1.ebuild,v 1.1 2010/08/13 13:23:44 djc Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-0.12.2.ebuild,v 1.4 2011/03/15 21:34:31 xarthisius Exp $ EAPI="2" PYTHON_DEPEND="2" @@ -38,10 +38,7 @@ RDEPEND=" postgres? ( >=dev-python/psycopg-2 ) sqlite? ( >=dev-db/sqlite-3.3.4 - || ( - >=dev-lang/python-2.5[sqlite] - >=dev-python/pysqlite-2.3.2 - ) + || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] >=dev-python/pysqlite-2.3.2 ) ) subversion? ( dev-vcs/subversion[python] ) !www-apps/trac-webadmin