Version bump, bug #225891, thanks all who participated. Bug #215127 is fixed, thank Damien Gombault for report. Removed old.

(Portage version: 2.2_rc1/cvs/Linux 2.6.22-ovz005 i686)

6 files changed, 21 insertions, 324 deletions

diff --git a/www-apps/trac/ChangeLog b/www-apps/trac/ChangeLog
index 7a656e554ec9..727717d5f709 100644
--- a/www-apps/trac/ChangeLog
+++ b/www-apps/trac/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-apps/trac
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/ChangeLog,v 1.66 2008/04/28 17:40:34 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/ChangeLog,v 1.67 2008/07/16 21:20:06 pva Exp $
+
+*trac-0.11 (16 Jul 2008)
+
+  16 Jul 2008; Peter Volkov <pva@gentoo.org> -files/0.9.6-postinst-en.txt,
+  files/tracd.initd, -trac-0.9.6.ebuild, -trac-0.10.3.1.ebuild,
+  -trac-0.11_beta2.ebuild, +trac-0.11.ebuild:
+  Version bump, bug #225891, thanks all who participated. Bug #215127 is
+  fixed, thank Damien Gombault for report. Removed old.
 
 *trac-0.11_beta2 (28 Apr 2008)
 
diff --git a/www-apps/trac/files/0.9.6-postinst-en.txt b/www-apps/trac/files/0.9.6-postinst-en.txt
deleted file mode 100644
index f052d00c3855..000000000000
--- a/www-apps/trac/files/0.9.6-postinst-en.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-Install Instructions
-====================
-
-To complete the install, create your first Trac environment by running this command:
-
-	trac-admin /var/lib/trac/<project-name> initenv
-
-For security, trac relies on the webserver for authentication. The following command
-creates a password database for Basic Authentication with Apache 2: 
-
-	htpasswd2 -c /etc/apache2/trac.htpasswd <user-name>
-
-Please adjust for the webserver of your choice, and refer to your webserver's
-documentation.
-
-Now, all you need to do is to configure your webserver. The following is a configuration
-example for CGI and Apache:
-
-	<Location "/cgi-bin/trac.cgi">
-		SetEnv TRAC_ENV "/var/lib/trac/<project-name>"
-	</Location>
-	<Location "/cgi-bin/trac.cgi/login">
-		AuthType Basic
-		AuthName "trac"
-		AuthUserFile /etc/apache2/trac.htpasswd
-		Require valid-user
-	</Location>
-
-Again, please adjust for the webserver of your choice.
-
-Fast-CGI users: you have to emerge and configure your Fast-CGI engine separately.
-
-You can also use Trac without having to install a webserver. See
-http://projects.edgewall.com/trac/wiki/TracStandalone to know more.
-
-Don't forget to update the configuration file! It is located at
-/var/lib/trac/<project-name>/conf/trac.ini. See its reference at
-http://projects.edgewall.com/trac/wiki/TracIni.
-
-More information (multiple projects setup, installation with Apache 2's mod_python,
-lighttpd...) can be found on the Trac wiki:
-
-	http://projects.edgewall.com/trac/wiki/
-
-Upgrade Instructions
-====================
-
-If you are upgrading from a previous Trac version, please follow the
-instructions here:
-
-	http://projects.edgewall.com/trac/wiki/TracUpgrade
-
-Trac 0.9.x now uses sqlite-3 instead of sqlite-2. If you were using Trac 0.8.x or below,
-you have to upgrade your database files or else you won't be able to use Trac. You can
-issue the following commands, for each environment you have:
-
-	mv /var/lib/trac/<project-name>/db/trac.db /var/lib/trac/<project-name>/db/trac2.db
-	sqlite /var/lib/trac/<project-name>/db/trac2.db .dump | sqlite3 /var/lib/trac/<project-name>/db/trac.db
-	trac-admin /var/lib/trac/<project-name> upgrade
-	trac-admin /var/lib/trac/<project-name> resync
-	trac-admin /var/lib/trac/<project-name> wiki upgrade
-
-And review the trac.ini configuration file.
diff --git a/www-apps/trac/files/tracd.initd b/www-apps/trac/files/tracd.initd
index f985bbe97239..c63b794298a6 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
 # 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.2 2007/06/19 12:23:25 dju Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/files/tracd.initd,v 1.3 2008/07/16 21:20:07 pva Exp $
 
 depend() {
 	need net
@@ -9,15 +9,18 @@ depend() {
 
 start() {
 	ebegin "Starting tracd"
-	start-stop-daemon --start --quiet \
-		--chuid ${TRACD_USER:-tracd}:${TRACD_GROUP:-tracd} \
-		--exec /usr/bin/tracd -- -d -p ${TRACD_PORT:-8000} \
-		${TRACD_OPTS:---env-parent-dir /var/lib/trac/}
+	# 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 \
+		--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 --name tracd
+	start-stop-daemon --stop --quiet --pidfile /var/run/tracd.pid
 	eend $?
 }
diff --git a/www-apps/trac/trac-0.10.3.1.ebuild b/www-apps/trac/trac-0.10.3.1.ebuild
deleted file mode 100644
index 3d6c904d32d7..000000000000
--- a/www-apps/trac/trac-0.10.3.1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-0.10.3.1.ebuild,v 1.6 2007/08/24 18:31:22 beandog Exp $
-
-inherit distutils webapp
-
-DESCRIPTION="Trac is a minimalistic web-based project management, wiki and bug/issue tracking system."
-HOMEPAGE="http://trac.edgewall.com/"
-SRC_URI="http://ftp.edgewall.com/pub/trac/${P}.tar.gz"
-
-LICENSE="trac"
-KEYWORDS="amd64 ppc ~ppc64 ~sparc x86"
-IUSE="cgi fastcgi mysql postgres sqlite enscript silvercity"
-
-# doing so because utils (such as trac-admin), manpages... overlap
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-
-# we need to depend on virtual/httpd-cgi to pull apache/lighttpd/whatever in when USE cgi
-# we need to depend on virtual/httpd-fcgi to pull mod_fastcgi/lighttpd/whatever in when USE fastcgi
-# we need to depend on virtual/httpd-python to pull mod_python/whatever in when USE python (python
-# is rather confusing here, as dev-lang/python is a required dependency, but httpd-python isn't)
-DEPEND="${DEPEND}
-	>=dev-lang/python-2.3
-	app-text/pytextile
-	>=dev-python/docutils-0.3.9
-	dev-libs/clearsilver
-	>=dev-util/subversion-1.3.2
-	mysql? (
-		>=virtual/mysql-4.1
-		>=dev-python/mysql-python-1.2.1
-	)
-	sqlite? (
-		>=dev-db/sqlite-3.3.4
-		|| ( >=dev-lang/python-2.5 >=dev-python/pysqlite-2.3 )
-	)
-	postgres? ( >=dev-python/psycopg-2 )
-	enscript? ( app-text/enscript )
-	silvercity? ( app-text/silvercity )"
-
-# The following function should be added to eutils.eclass (see bug #143572):
-
-# Generate an standard error message for missing USE flags
-# in existing packages, and die.
-#
-# Usage: built_with_use_error <category/package> <functionality> [<USE flag>]
-#    ex: built_with_use_error dev-util/subversion python
-#    or: built_with_use_error www-servers/apache LDAP ldap
-#
-# Typical usage:
-#	if ! built_with_use dev-util/subversion python ; then
-#        built_with_use_error dev-util/subversion python
-#   fi
-#
-# Note: when <USE flag> is not specified, <functionality> is used for the USE flag name.
-built_with_use_error() {
-	local package=$1
-	local func=$2
-	local use_flag=$3
-
-	[[ -z ${use_flag} ]] && use_flag=${func}
-
-	eerror "Your ${package} package has been built without"
-	eerror "${func} support, please enable the '${use_flag}' USE flag and"
-	eerror "re-emerge ${package}."
-	elog "You can enable this USE flag either globally in /etc/make.conf,"
-	elog "or just for specific packages in /etc/portage/package.use."
-	die "${package} missing ${func} support"
-}
-
-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
-
-	# python has built-in sqlite support starting from 2.5
-	if use sqlite && \
-		has_version ">=dev-lang/python-2.5" && \
-		! has_version ">=dev-python/pysqlite-2.3" && \
-		! built_with_use dev-lang/python sqlite ; then
-		eerror "To use the sqlite database backend, you must either:"
-		eerror "- build dev-lang/python with sqlite support, using the 'sqlite'"
-		eerror "  USE flag, or"
-		eerror "- emerge dev-python/pysqlite"
-		die "missing python sqlite support"
-	fi
-
-	if ! built_with_use dev-util/subversion python ; then
-		built_with_use_error dev-util/subversion python
-	fi
-
-	if ! built_with_use dev-libs/clearsilver python ; then
-		built_with_use_error dev-libs/clearsilver python
-	fi
-
-	ebegin "Creating tracd group and user"
-	enewgroup tracd
-	enewuser tracd -1 -1 -1 tracd
-	eend ${?}
-
-	webapp_pkg_setup
-}
-
-src_install () {
-	# project environments might go in here
-	keepdir /var/lib/trac
-
-	webapp_src_preinst
-	distutils_src_install
-
-	dodoc AUTHORS INSTALL RELEASE THANKS UPGRADE
-	rm ${D}/usr/share/doc/${P}/MANIFEST.in.gz
-	rm ${D}/usr/share/doc/${P}/PKG-INFO.gz
-
-	docinto contrib
-	dodoc contrib/*
-
-	# if needed, install cgi/fcgi scripts for webapp-config
-	local my_dir=${D}/usr/share/trac
-	if use cgi ; then
-		mv ${my_dir}/cgi-bin/trac.cgi ${D}${MY_CGIBINDIR} || die
-	fi
-	if use fastcgi ; then
-		mv ${my_dir}/cgi-bin/trac.fcgi ${D}${MY_CGIBINDIR} || die
-	fi
-	rm -rf ${my_dir}/cgi-bin || die
-
-	for lang in en; do
-		webapp_postinst_txt ${lang} ${FILESDIR}/postinst-${lang}.txt
-	done
-
-	# copy graphics, css & js
-	cp -r htdocs/* ${D}/${MY_HTDOCSDIR}
-
-	webapp_src_install
-
-	newconfd "${FILESDIR}"/tracd.confd tracd
-	newinitd "${FILESDIR}"/tracd.initd tracd
-}
diff --git a/www-apps/trac/trac-0.11_beta2.ebuild b/www-apps/trac/trac-0.11.ebuild
index bc117995b7a0..1aaee559d652 100644
--- a/www-apps/trac/trac-0.11_beta2.ebuild
+++ b/www-apps/trac/trac-0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-0.11_beta2.ebuild,v 1.1 2008/04/28 17:40:34 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-0.11.ebuild,v 1.1 2008/07/16 21:20:06 pva Exp $
 
 inherit distutils webapp
 
@@ -15,7 +15,7 @@ SRC_URI="http://ftp.edgewall.com/pub/trac/${MY_P}.tar.gz"
 
 IUSE="cgi fastcgi mysql postgres sqlite subversion"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~ppc ~ppc64 ~sparc"
 
 # doing so because tools, python packages... overlap
 SLOT="0"
@@ -28,7 +28,7 @@ DEPEND="
 
 RDEPEND="
 	${RDEPEND}
-	dev-python/genshi
+	>=dev-python/genshi-0.5
 	dev-python/pygments
 	>=dev-python/docutils-0.3.9
 	dev-python/pytz
@@ -114,10 +114,8 @@ pkg_setup() {
 		built_with_use_die dev-util/subversion python
 	fi
 
-	ebegin "Creating tracd group and user"
 	enewgroup tracd
 	enewuser tracd -1 -1 -1 tracd
-	eend ${?}
 }
 
 src_install() {
@@ -128,16 +126,12 @@ src_install() {
 	keepdir /var/lib/trac
 
 	# documentation
-	dodoc AUTHORS RELEASE THANKS UPGRADE
 	cp -r contrib "${D}"/usr/share/doc/${P}/
 
 	# tracd init script
 	newconfd "${FILESDIR}"/tracd.confd tracd
 	newinitd "${FILESDIR}"/tracd.initd tracd
 
-	# prepare webapp master copy
-
-	# if needed, install cgi/fcgi scripts
 	if use cgi ; then
 		cp cgi-bin/trac.cgi "${D}"/${MY_CGIBINDIR} || die
 	fi
@@ -145,9 +139,6 @@ src_install() {
 		cp cgi-bin/trac.fcgi "${D}"/${MY_CGIBINDIR} || die
 	fi
 
-	# copy graphics, css & js
-#	cp -r htdocs/* ${D}/${MY_HTDOCSDIR}
-
 	for lang in en; do
 		webapp_postinst_txt ${lang} "${FILESDIR}"/postinst-${lang}.txt
 		webapp_postupgrade_txt ${lang} "${FILESDIR}"/postupgrade-${lang}.txt
diff --git a/www-apps/trac/trac-0.9.6.ebuild b/www-apps/trac/trac-0.9.6.ebuild
deleted file mode 100644
index 18117f2f838a..000000000000
--- a/www-apps/trac/trac-0.9.6.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-0.9.6.ebuild,v 1.5 2007/01/07 19:51:05 dju Exp $
-
-inherit distutils webapp
-
-DESCRIPTION="Trac is a minimalistic web-based project management, wiki and bug/issue tracking system."
-HOMEPAGE="http://trac.edgewall.com/"
-SRC_URI="http://ftp.edgewall.com/pub/trac/${P}.tar.gz"
-
-LICENSE="trac"
-KEYWORDS="~amd64 ppc ~sparc x86"
-IUSE="cgi fastcgi postgres sqlite enscript silvercity"
-
-# doing so because utils (such as trac-admin), manpages... overlap
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-
-# we need to depend on virtual/httpd-cgi to pull apache/lighttpd/whatever in when USE cgi
-# we need to depend on virtual/httpd-fcgi to pull mod_fastcgi/lighttpd/whatever in when USE fastcgi
-# we need to depend on virtual/httpd-python to pull mod_python/whatever in when USE python (python
-# is rather confusing here, as dev-lang/python is a required dependency, but httpd-python isn't)
-DEPEND="${DEPEND}
-	>=dev-lang/python-2.3
-	app-text/pytextile
-	>=dev-python/docutils-0.3.3
-	dev-libs/clearsilver
-	>=dev-util/subversion-1.1
-	sqlite? ( >=dev-python/pysqlite-2 )
-	postgres? ( dev-python/psycopg )
-	enscript? ( app-text/enscript )
-	silvercity? ( app-text/silvercity )"
-
-pkg_setup () {
-	if ! use postgres && ! use sqlite ; then
-		eerror "You must select at least one database backend,"
-		eerror "using sqlite or postgres USE flags."
-		die "no database backend selected"
-	fi
-
-	if ! built_with_use dev-util/subversion python ; then
-		eerror "Your subversion has been built without python bindings,"
-		eerror "please enable the 'python' useflag and recompile"
-		eerror "dev-util/subversion."
-		die "pkg_setup failed"
-	fi
-
-	if ! built_with_use dev-libs/clearsilver python ; then
-		eerror "Your clearsilver has been built without python bindings,"
-		eerror "please enable the 'python' useflag and recompile"
-		eerror "dev-libs/clearsilver."
-		eerror ""
-		eerror "See the Handbook for more information about use flags:"
-		eerror "http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=2&chap=2"
-		die "clearsilver built without python support"
-	fi
-
-	ebegin "Creating tracd group and user"
-	enewgroup tracd
-	enewuser tracd -1 -1 -1 tracd
-	eend ${?}
-
-	webapp_pkg_setup
-}
-
-src_install () {
-	# project environments might go in here
-	keepdir /var/lib/trac
-
-	webapp_src_preinst
-	distutils_src_install
-
-	dodoc AUTHORS INSTALL RELEASE THANKS UPGRADE
-	rm ${D}/usr/share/doc/${P}/MANIFEST.in.gz
-	rm ${D}/usr/share/doc/${P}/PKG-INFO.gz
-
-	docinto contrib
-	dodoc contrib/*
-
-	# if needed, install cgi/fcgi scripts for webapp-config
-	local my_dir=${D}/usr/share/trac
-	if use cgi ; then
-		mv ${my_dir}/cgi-bin/trac.cgi ${D}${MY_CGIBINDIR} || die
-	fi
-	if use fastcgi ; then
-		mv ${my_dir}/cgi-bin/trac.fcgi ${D}${MY_CGIBINDIR} || die
-	fi
-	rm -rf ${my_dir}/cgi-bin || die
-
-	for lang in en; do
-		webapp_postinst_txt ${lang} ${FILESDIR}/${PV}-postinst-${lang}.txt
-	done
-
-	# copy graphics, css & js
-	cp -r htdocs/* ${D}/${MY_HTDOCSDIR}
-
-	webapp_src_install
-
-	newconfd "${FILESDIR}"/tracd.confd tracd
-	newinitd "${FILESDIR}"/tracd.initd tracd
-}