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

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.22-ovz005 i686

7 files changed, 25 insertions, 333 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/Manifest b/www-apps/trac/Manifest
index d11c2c35cdf7..4778a9692811 100644
--- a/www-apps/trac/Manifest
+++ b/www-apps/trac/Manifest
@@ -1,15 +1,10 @@
-AUX 0.9.6-postinst-en.txt 2275 RMD160 5434d1d4174621455f3983daf56b6d60b071bee2 SHA1 4cce4d9e6514d6cb6ea425be23b5bcfa641aea37 SHA256 1b89d5b0d69da1aad5be058096e4237ddef9e0b1fd46909495f9297b6b63f85d
 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 598 RMD160 d2a85d9acb6376bb748c1bca62fbbc9d00769b90 SHA1 c601da4421e17a79eaa4d24ead96395ba6d7963e SHA256 571c1e9b9501f3e271aceef7cd402fbea4be0269cc13691da65077517455955e
-DIST Trac-0.11b2.tar.gz 644080 RMD160 557765be2198042b055079e24dcd9590a76ca5f6 SHA1 abc8053d583290925d7bd4ec7669695ab72445f2 SHA256 40051ddb91596e7188b3ead0adaa97c4347998cd18fee851dc679417c8424840
-DIST trac-0.10.3.1.tar.gz 443713 RMD160 02b34dbb41d858c999627ee2201cdbd43e592576 SHA1 4735f453f9bea15d65b71bcbd0e4817ee21f104a SHA256 35cc090d6338a8aae8a902e4b41782a140284381baa9474051ac27fc89261476
+AUX tracd.initd 881 RMD160 c215a990133d5b655bc94e13ab4de9d1c938a163 SHA1 2c1a9dbae7e4890c2fb71f22091786ba7396c940 SHA256 6e76bfffe7f6928bff24d79b97aa8bbd27dafdfbb16fe8c79b7ad298e202d950
+DIST Trac-0.11.tar.gz 684359 RMD160 c59ee652c69bf916c44113b0a3a6559585716cb8 SHA1 309f40c1cd8ff7a4f2d133f61d1a17a7c53650c2 SHA256 bfdfd4d8385c1ebb1e63ea285953ba36ed68fcb2fd8205b8f3de6d4212b55bea
 DIST trac-0.10.4.tar.gz 449116 RMD160 9eb843eabf5f986b3d08cd2081f02fe9033abd1e SHA1 2b6db96665cb7753d02de4f7f75beef9a1d97afc SHA256 0061cf11d6d259505ff64252c40baf53e845095437eb56f98d3493fad9701100
-DIST trac-0.9.6.tar.gz 339647 RMD160 3bf086f8c5a6b3b7d6584359dbc916f6ee61dfdc SHA1 b64b193ec014113341f493149e0de2876a32fc7d SHA256 67862c30c2dd0852ba4778a23bba79ab2387e9b40a85b40865cb76c4fa878dfc
-EBUILD trac-0.10.3.1.ebuild 4434 RMD160 6849766a0890188d70898617625922183123146e SHA1 28ab8545cb289afa7c15d4b4022f5a1b29db472d SHA256 0683211e374f851888a68f4708dde5974e53d6bdce6af290b5b156b5c2857bb8
 EBUILD trac-0.10.4.ebuild 4412 RMD160 7db2ea97952c39d33abd9e336fb70c0cb5cd5a82 SHA1 2385bd43b4e21d3bbc9041d1182e8a3f0230eaeb SHA256 ba1079c039ae198ccb21b4570ff47ead6f248129d61e19f7b35cf6a4d461713b
-EBUILD trac-0.11_beta2.ebuild 4030 RMD160 d084f199e6f1b381fa2416972e737a9b27cf50ff SHA1 bcc269cdb49ec418468616bff52c59d113ea19e8 SHA256 d704213c63cc03fbab1c1896f026a8993a17ce5444cb52749a07ec910efe237a
-EBUILD trac-0.9.6.ebuild 3158 RMD160 5133838b24c969d64e51b121485152082a850d52 SHA1 fcd2ea1473b96d5bff95b275149b2bf923784612 SHA256 13a05b01957917fe42f14e3efa2984262fcbed94ef88665c0f9040a1d711fe42
-MISC ChangeLog 11277 RMD160 52145a4a8a0dfc9bb0468eaae7c513bd6715513c SHA1 365d7e0c2b41ee325012bdade090b6f8cd9bf08e SHA256 27bce410d0dddb21ca7ba65da9ec4e057bf5eb001fb02421a9fe15a78bf22f46
+EBUILD trac-0.11.ebuild 3824 RMD160 14a1292c5f45998b280c27262dd9965e042f9552 SHA1 6dc8a6fa48fe6015b437c96d5d254359bdbe32de SHA256 434370e8cdb09e790dcf763178d3a10f0448d9f8899559899f1fb4812e7733a6
+MISC ChangeLog 11618 RMD160 bcf62e0728026d23b2d914a8c092237cf1f7a4da SHA1 c229d3874ec32e89bfbfdaace4142cb2f98cd39f SHA256 e8bbb851596ef524af4d9f61216c8b5491b95d574fb93eb96e536ab8d5b37bbb
 MISC metadata.xml 161 RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b SHA1 5b91a6d8d06d3dca2d774425befba30caca51507 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4
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
-}