Added trac-0.11.1-r1 that should fix #236509.

Package-Manager: portage-2.1.4.4

4 files changed, 193 insertions, 6 deletions

diff --git a/www-apps/trac/ChangeLog b/www-apps/trac/ChangeLog
index d82cc0faec4a..673cca4f18aa 100644
--- a/www-apps/trac/ChangeLog
+++ b/www-apps/trac/ChangeLog
@@ -1,6 +1,12 @@
 # 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.78 2008/08/23 04:57:20 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/ChangeLog,v 1.79 2008/09/10 07:50:30 wrobel Exp $
+
+*trac-0.11.1-r1 (10 Sep 2008)
+
+  10 Sep 2008; wrobel@gentoo.org +files/tracd.initd.2,
+  +trac-0.11.1-r1.ebuild:
+  Added trac-0.11.1-r1 that should fix #236509.
 
   23 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/www-apps/trac/Manifest b/www-apps/trac/Manifest
index 51596f85a440..111123c60c95 100644
--- a/www-apps/trac/Manifest
+++ b/www-apps/trac/Manifest
@@ -5,18 +5,20 @@ AUX postinst-en.txt 1349 RMD160 019db0eb917956b84e2afe621edcba501e83a105 SHA1 33
 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.11.1.tar.gz 687225 RMD160 9d6e595df064e3dfe08299da44ae18c8a51b961f SHA1 92be092d45bb03bc01d39983966d7a89a1b47e29 SHA256 360a02a0e2f6180ba6cc6de7d24556e66123253180036c67e9ba2b709c37c942
 DIST Trac-0.11.tar.gz 684359 RMD160 c59ee652c69bf916c44113b0a3a6559585716cb8 SHA1 309f40c1cd8ff7a4f2d133f61d1a17a7c53650c2 SHA256 bfdfd4d8385c1ebb1e63ea285953ba36ed68fcb2fd8205b8f3de6d4212b55bea
 DIST trac-0.10.5.tar.gz 452253 RMD160 c9632030624471f6c456cdc34f2a23cfe2ccdde9 SHA1 3e1e3ea3edd76be7761359ffc7f080cc3fd5c4dc SHA256 157707cd8244e002a94f6880d948ad046b561c232ff04ab35893ab3f2e1a6ec7
 EBUILD trac-0.10.5.ebuild 4431 RMD160 fb457366720108645aa7f6391a99c7c82bcfe199 SHA1 36305a17aacf380bb956faaa4d93716840817460 SHA256 de5cfa66016e6dd7139756501c9653ffc0a5b90897b742e5aa1c786323f03625
+EBUILD trac-0.11.1-r1.ebuild 3933 RMD160 e923a3b4318e036bd6c26e8db90c8bfcb929c585 SHA1 4c82f40e608cd7745b308fb66aeb8ffd09867d2e SHA256 88cc4c7940c833ac2a3bf78107f6b94e2f25d935a3186059c19ef08cac009965
 EBUILD trac-0.11.1.ebuild 3824 RMD160 426ca7cc0f13d7af83d54c11d0a81feb39d5293f SHA1 36e021009189e90fd58ecb7774d00f568ecacc6c SHA256 977918d64a972c97d571a348b1bbf3d89fba903bb1617e63d9dcfe0b67fc22a2
 EBUILD trac-0.11.ebuild 3824 RMD160 acebdd5177e4977cd3635f9ccd55809f74f6cda4 SHA1 069be2bdcc8523f0e8914111e602634d8afef783 SHA256 67d98c6c6e1f4fea2cfab401e97e02939af7913defd176220e01a804c59f884a
-MISC ChangeLog 12914 RMD160 2bbd57b7c9885643a1d178daa022e3248cda7bc4 SHA1 628434dbf690ea0acea9e437cac564150a97e5d4 SHA256 94712b5949fc8574d1cf89e0529488fdcf55d95e35ad63b2a8995887ad0c59a3
+MISC ChangeLog 13075 RMD160 468e428d2aeb31e15cf5f99b6630cdaf68ec7c83 SHA1 ca104553918f3ebf115f716d03ca616bbbac3073 SHA256 1f4441ef64840cd7e1addc846991bce02414f435da8d31a63c9eac53731388c3
 MISC metadata.xml 294 RMD160 583b0b68a78884cf52e3a16a0aa9195dbb50654d SHA1 f73728c47f88df1bd4b4760b28c4f48c63a30ebb SHA256 a77b23b4cddd5cd048cbe2c0fdd3950d53ef2b48d30cdf1b1f501ee25a690e08
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iEYEARECAAYFAkivmLYACgkQoeSe8B0zEfzSSQCdG8jjlapDyRATVzDj96+MqOhf
-/84AniEa4dGBg0C+zw6yy4zRZ2/SuN7y
-=1so4
+iD8DBQFIx3xWEEcxCpcDQ74RAsbOAJ4g1i8B1oHmF4omOC6X98XxVt4+YQCfUF86
+A0kFfpyjDhUwiVWW2qNd5mQ=
+=f9Q3
 -----END PGP SIGNATURE-----
diff --git a/www-apps/trac/files/tracd.initd.2 b/www-apps/trac/files/tracd.initd.2
new file mode 100755
index 000000000000..75de90902efb
--- /dev/null
+++ b/www-apps/trac/files/tracd.initd.2
@@ -0,0 +1,27 @@
+#!/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/trac-0.11.1-r1.ebuild b/www-apps/trac/trac-0.11.1-r1.ebuild
new file mode 100644
index 000000000000..8d662f64cd97
--- /dev/null
+++ b/www-apps/trac/trac-0.11.1-r1.ebuild
@@ -0,0 +1,152 @@
+# 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.1-r1.ebuild,v 1.1 2008/09/10 07:50:30 wrobel Exp $
+
+inherit distutils 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="trac"
+SRC_URI="http://ftp.edgewall.com/pub/trac/${MY_P}.tar.gz"
+
+IUSE="cgi fastcgi mysql postgres sqlite subversion"
+
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+
+# doing so because tools, python packages... overlap
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+
+DEPEND="
+	${DEPEND}
+	dev-python/setuptools
+	"
+
+RDEPEND="
+	${RDEPEND}
+	>=dev-python/genshi-0.5
+	dev-python/pygments
+	>=dev-python/docutils-0.3.9
+	dev-python/pytz
+	cgi? (
+		virtual/httpd-cgi
+	)
+	fastcgi? (
+		virtual/httpd-fastcgi
+	)
+	mysql? (
+		>=dev-python/mysql-python-1.2.1
+		>=virtual/mysql-4.1
+	)
+	postgres? (
+		>=dev-python/psycopg-2
+	)
+	sqlite? (
+		>=dev-db/sqlite-3.3.4
+		|| (
+			>=dev-lang/python-2.5
+			>=dev-python/pysqlite-2.3.2
+		)
+	)
+	subversion? (
+		>=dev-util/subversion-1.4.2
+	)
+	!www-apps/trac-webadmin
+	"
+
+# 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_die <category/package> <functionality> [<USE flag>]
+#    ex: built_with_use_die dev-util/subversion python
+#    or: built_with_use_die www-servers/apache LDAP ldap
+#
+# Typical usage:
+#	if ! built_with_use dev-util/subversion python ; then
+#        built_with_use_die dev-util/subversion python
+#   fi
+#
+# Note: when <USE flag> is not specified, <functionality> is used for the USE flag name.
+built_with_use_die() {
+	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() {
+	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
+
+	# 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 use subversion && \
+		! built_with_use dev-util/subversion python ; then
+		built_with_use_die dev-util/subversion python
+	fi
+
+	enewgroup tracd
+	enewuser tracd -1 -1 -1 tracd
+}
+
+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
+
+	# documentation
+	cp -r contrib "${D}"/usr/share/doc/${P}/
+
+	# tracd init script
+	newconfd "${FILESDIR}"/tracd.confd tracd
+	newinitd "${FILESDIR}"/tracd.initd.2 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
+}