From 5d07e7de1608c6bc9f24e9f9d12b01ee5273417d Mon Sep 17 00:00:00 2001 From: Christian Ruppert Date: Sat, 31 Dec 2011 20:17:51 +0000 Subject: Revbump. Don't use deprecated start-stop-daemon options, bug 380607. Package-Manager: portage-2.1.10.41/cvs/Linux i686 RepoMan-Options: --force --- www-apps/trac/ChangeLog | 8 ++- www-apps/trac/Manifest | 16 +---- www-apps/trac/files/tracd.initd | 4 +- www-apps/trac/trac-0.12.2-r1.ebuild | 116 ++++++++++++++++++++++++++++++++++++ www-apps/trac/trac-0.12.2.ebuild | 116 ------------------------------------ 5 files changed, 128 insertions(+), 132 deletions(-) create mode 100644 www-apps/trac/trac-0.12.2-r1.ebuild delete mode 100644 www-apps/trac/trac-0.12.2.ebuild (limited to 'www-apps') diff --git a/www-apps/trac/ChangeLog b/www-apps/trac/ChangeLog index 52b469d83d97..afafc671564d 100644 --- a/www-apps/trac/ChangeLog +++ b/www-apps/trac/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-apps/trac # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/ChangeLog,v 1.121 2011/12/13 12:35:09 naota Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/ChangeLog,v 1.122 2011/12/31 20:17:50 idl0r Exp $ + +*trac-0.12.2-r1 (31 Dec 2011) + + 31 Dec 2011; Christian Ruppert -trac-0.12.2.ebuild, + +trac-0.12.2-r1.ebuild, files/tracd.initd: + Revbump. Don't use deprecated start-stop-daemon options, bug 380607. 13 Dec 2011; Naohiro Aota trac-0.12.2.ebuild: Add ~x86-fbsd wrt #336211 diff --git a/www-apps/trac/Manifest b/www-apps/trac/Manifest index 6e5b9a516017..c63a2b8e72ba 100644 --- a/www-apps/trac/Manifest +++ b/www-apps/trac/Manifest @@ -1,18 +1,8 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - 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 918 RMD160 34e24f4a523ebf48b4b9e11eab78a1ab9c905dbc SHA1 0c32032faeefbc45c21558ef36959ac39dace3b6 SHA256 342ce62957a170db2e86abe801883076239e422b773a2534beceef0e3a24068e +AUX tracd.initd 927 RMD160 0ecd5b36d4c79a13c885a7081cb94a8f4b38d21a SHA1 a2b95fde5438bd4fa8156be398e8354959c55986 SHA256 987a4c6ce9047501b15db2d2325898274425b8a7ceb67dcb26128ea9817931e6 DIST Trac-0.12.2.tar.gz 2208361 RMD160 317d5792976bc4c048cbac2a831398e976251110 SHA1 95ca75b54abfd5a3d838f300c19ef8dbd125f08d SHA256 c5b41da9a2a1464f9f5a42f8624b3a9cf3cb96f8ffbbdb17bf3cb01b06280ec6 -EBUILD trac-0.12.2.ebuild 2798 RMD160 f71ac5e7ad43ed0f383f58df5e1c99623d80ae7b SHA1 a1882ecc57867d2e9622a692d08e6a3e1ee1fef0 SHA256 1fe30774448d7d2de43de278242563db6a250fddba8b61d3085a4024699fc075 -MISC ChangeLog 18103 RMD160 317793a480f370667bd99601f15eee12ef201056 SHA1 a405d5eefcf967b4e4d4335866761dba320897d7 SHA256 28c9172e0820ad352ec2b3704565b8226d40ab288d1b0a67d5803fdc3d8da5d6 +EBUILD trac-0.12.2-r1.ebuild 2801 RMD160 98455158848634473ae3fce806d2a3d0c38c4ca2 SHA1 ea1a64ac58789fcf9a950cf51956700e3b618055 SHA256 a85d744c8b4e595202330c8c1e8b0118db2ec8ba3c31a1e30277e15d405f87d7 +MISC ChangeLog 18324 RMD160 0538974c69e479ace824408ee1b5677a31e615d3 SHA1 6eea9b3e57fb0a29df90c22632584d43ee0fcc7e SHA256 42421abc862198f4cc3dc97d513d7f406c14253550b1683a95c45c3e98ae9d31 MISC metadata.xml 353 RMD160 f4472ab9ab13edf764e019de289cd8658c8c9f41 SHA1 0d13970ae85fc0d2ebe0960ea78457b0b1da29c3 SHA256 12d6ceeed2212b5daf258a1dc4fee3fb6acd607e866e4062a907c157ac387059 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (FreeBSD) - -iEYEARECAAYFAk7nRpUACgkQGpDnPLSHuMBUaQCfbpqHRsXgx8w1lxHeMMDo93vS -B7IAnjmwIt05Bqz7IOrOnbIGmgPaju51 -=xQCR ------END PGP SIGNATURE----- diff --git a/www-apps/trac/files/tracd.initd b/www-apps/trac/files/tracd.initd index d026b1da55d9..f7e091198438 100755 --- a/www-apps/trac/files/tracd.initd +++ b/www-apps/trac/files/tracd.initd @@ -1,7 +1,7 @@ #!/sbin/runscript # 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.5 2011/02/08 08:02:50 djc Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/files/tracd.initd,v 1.6 2011/12/31 20:17:51 idl0r Exp $ depend() { need net @@ -12,7 +12,7 @@ start() { # 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} \ + start-stop-daemon --start --user ${TRACD_USER:-tracd} --group ${TRACD_GROUP:-tracd} \ --pidfile /var/run/tracd.pid --make-pidfile --background \ --env PYTHON_EGG_CACHE="/var/lib/trac/egg-cache" \ --exec /usr/bin/tracd -- \ diff --git a/www-apps/trac/trac-0.12.2-r1.ebuild b/www-apps/trac/trac-0.12.2-r1.ebuild new file mode 100644 index 000000000000..5969f64a2265 --- /dev/null +++ b/www-apps/trac/trac-0.12.2-r1.ebuild @@ -0,0 +1,116 @@ +# 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.2-r1.ebuild,v 1.1 2011/12/31 20:17:50 idl0r 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 ppc ~ppc64 ~sparc x86 ~x86-fbsd" + +# 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.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 + " +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.2.ebuild b/www-apps/trac/trac-0.12.2.ebuild deleted file mode 100644 index 2764a130bf39..000000000000 --- a/www-apps/trac/trac-0.12.2.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# 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.2.ebuild,v 1.5 2011/12/13 12:35:09 naota 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 ppc ~ppc64 ~sparc x86 ~x86-fbsd" - -# 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.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 - " -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 -} -- cgit v1.2.3-65-gdbad