Fixed dependencies, updated postinst instructions.

Package-Manager: portage-2.0.51.19

5 files changed, 63 insertions, 29 deletions

diff --git a/www-apps/trac/ChangeLog b/www-apps/trac/ChangeLog
index a3d97df5d801..064bd4fc238c 100644
--- a/www-apps/trac/ChangeLog
+++ b/www-apps/trac/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/trac
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/ChangeLog,v 1.16 2005/06/21 22:12:12 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/ChangeLog,v 1.17 2005/07/05 22:35:45 dju Exp $
+
+  05 Jul 2005; Julien Allanos <dju@gentoo.org> +files/0.8.4-postinst-en.txt,
+  metadata.xml, trac-0.8.4.ebuild:
+  Fixed dependencies, updated post-installation instructions.
+  Added myself as the maintainer.
 
   21 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> trac-0.8.4.ebuild:
   Stable on ppc (#96572).
diff --git a/www-apps/trac/Manifest b/www-apps/trac/Manifest
index 1649a5127011..5edb9214084c 100644
--- a/www-apps/trac/Manifest
+++ b/www-apps/trac/Manifest
@@ -1,21 +1,22 @@
-MD5 cda66bcd1eab7300f13b92bca66b429b trac-0.8.4.ebuild 1837
-MD5 b7143f40e1a92c998dab3d48f4bb572c trac-0.7.1.ebuild 1341
 MD5 a5f4f741b18ea9b78ba7c176c5a923ad trac-0.7.ebuild 1300
-MD5 4defd726d2b03decc5b7ff21b0aac1a3 metadata.xml 225
-MD5 dc7f3171220dede396380a7d76b9d5e0 trac-0.8.2.ebuild 1838
-MD5 5400c3c718881db797dd2ce5f2144d76 ChangeLog 3579
-MD5 f3791a2d3e53dd7b56e91032e6fc44f6 trac-0.8.ebuild 1565
 MD5 e574ce3d03988bd963e4282466d0f143 trac-0.8.1.ebuild 1629
 MD5 a3820e64fdb8c4b74bcbc090ce7fc5a9 trac-0.6.1.ebuild 1289
-MD5 d9fb4f2a1d8f5d4653af732dd6504f7f files/0.8.1-postinst-en.txt 1242
-MD5 76a6e6911b2d58e07f08566da7298f3f files/postinst-en.txt 631
+MD5 f3791a2d3e53dd7b56e91032e6fc44f6 trac-0.8.ebuild 1565
+MD5 dc7f3171220dede396380a7d76b9d5e0 trac-0.8.2.ebuild 1838
+MD5 95f0550de31d9a880a3a6206108a7491 ChangeLog 3785
+MD5 fc3b5dec4ccef02547c54bf840024aa6 metadata.xml 220
+MD5 b7143f40e1a92c998dab3d48f4bb572c trac-0.7.1.ebuild 1341
+MD5 f605a49aef73a61cbcc7527da21fd418 trac-0.8.4.ebuild 1511
+MD5 e5e17601cd3677a53e87ea4887302f81 files/0.7-postinst-en.txt 1013
 MD5 043ef6a77428424a22fb762977533416 files/0.7.1-postinst-en.txt 1252
+MD5 51f89a9fb89c4b1433da0db051f04147 files/digest-trac-0.7 60
+MD5 a09870b386d01a3599fd92521d0c5ce0 files/digest-trac-0.8 60
+MD5 d9fb4f2a1d8f5d4653af732dd6504f7f files/0.8-postinst-en.txt 1242
 MD5 e48341b7627ee627a13e0ea41a0ef826 files/digest-trac-0.6.1 62
-MD5 8923e5fb9575c109266bbab2350940ff files/digest-trac-0.8.4 62
 MD5 94e075de9e02819d253096d0527de6d8 files/digest-trac-0.7.1 62
-MD5 d9fb4f2a1d8f5d4653af732dd6504f7f files/0.8-postinst-en.txt 1242
 MD5 ab4ca7142e33b94cdd025ce1c67f0e01 files/digest-trac-0.8.1 62
 MD5 ba2d3ff29f0357234fd123f84c210ec3 files/digest-trac-0.8.2 62
-MD5 e5e17601cd3677a53e87ea4887302f81 files/0.7-postinst-en.txt 1013
-MD5 a09870b386d01a3599fd92521d0c5ce0 files/digest-trac-0.8 60
-MD5 51f89a9fb89c4b1433da0db051f04147 files/digest-trac-0.7 60
+MD5 8923e5fb9575c109266bbab2350940ff files/digest-trac-0.8.4 62
+MD5 469236380f880bdb92903ecee4587ae3 files/0.8.4-postinst-en.txt 1035
+MD5 d9fb4f2a1d8f5d4653af732dd6504f7f files/0.8.1-postinst-en.txt 1242
+MD5 76a6e6911b2d58e07f08566da7298f3f files/postinst-en.txt 631
diff --git a/www-apps/trac/files/0.8.4-postinst-en.txt b/www-apps/trac/files/0.8.4-postinst-en.txt
new file mode 100644
index 000000000000..5ac65f64f07c
--- /dev/null
+++ b/www-apps/trac/files/0.8.4-postinst-en.txt
@@ -0,0 +1,37 @@
+Install Instructions
+====================
+
+To complete the install, run this commands:
+
+	trac-admin ${MY_HOSTROOT}/trac/<project-name> initenv
+
+To add security, create a password database. This command is for Apache 2;
+adjust for the webserver of your choice.
+
+	htpasswd2 -c ${MY_HOSTROOT}/trac.passwd <user>
+
+Now, all you need to do is to configure your webserver.  This would go
+into Apache's .htaccess file; adjust for the webserver of your choice.
+
+	<Location "/cgi-bin/trac.cgi">
+		SetEnv TRAC_ENV ${MY_HOSTROOT}/trac/<project-name>
+	</Location>
+	<Location "/cgi-bin/trac.cgi/login">
+		AuthType Basic
+		AuthName "trac"
+		AuthUserFile ${MY_HOSTROOT}/trac.passwd
+		Require valid-user
+	</Location>
+
+More information (multiple projects setup, installation with mod_python...)
+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
diff --git a/www-apps/trac/metadata.xml b/www-apps/trac/metadata.xml
index bee101f41174..f1850ed53c18 100644
--- a/www-apps/trac/metadata.xml
+++ b/www-apps/trac/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>web-apps</herd>
 <maintainer>
-  <email>web-apps@gentoo.org</email>
+  <email>dju@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/www-apps/trac/trac-0.8.4.ebuild b/www-apps/trac/trac-0.8.4.ebuild
index bf8ab9ae28f0..0c5d07949ac1 100644
--- a/www-apps/trac/trac-0.8.4.ebuild
+++ b/www-apps/trac/trac-0.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-0.8.4.ebuild,v 1.2 2005/06/21 22:12:12 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-0.8.4.ebuild,v 1.3 2005/07/05 22:35:45 dju Exp $
 
 inherit distutils webapp
 
@@ -16,19 +16,12 @@ DEPEND="$DEPEND
 	>=dev-lang/python-2.3
 	>=dev-python/docutils-0.3.3
 	=dev-db/sqlite-2.8*
-	<=dev-python/pysqlite-1.0
-	>=dev-libs/clearsilver-0.9.3
+	<dev-python/pysqlite-1.1
+	dev-libs/clearsilver
 	app-text/silvercity
-	>=dev-util/subversion-1.0.3"
+	>=dev-util/subversion-1.0"
 
-POSTINST_PV="0.8.1"
-
-# need choice between enscript/silvercity/nothing
-# need choice between sqlite-3 + pysqlite-1.1 / sqlite-2.8 + pysqlite-1.0
-# need choice between mod_python/nothing
-#
-# NOTE: could someone please enlight me in why ${who} wrote those notes above?
-# What's been ${who}'s goals? -- trapni (2005-06-02 07:17 UTC)
+POSTINST_PV="0.8.4"
 
 DOCS="AUTHORS COPYING ChangeLog INSTALL MANIFEST.in PKG-INFO README README.tracd RELEASE THANKS UPGRADE"
 
@@ -41,7 +34,6 @@ src_install () {
 	dodoc ${DOCS}
 
 	# now, we have to turn this into something that webapp-config can use
-
 	local my_dir=${D}/usr/share/trac
 	mv ${my_dir}/cgi-bin/trac.cgi ${D}${MY_CGIBINDIR} || die
 	rm -rf ${my_dir}/cgi-bin || die
@@ -54,7 +46,6 @@ src_install () {
 
 	# the trac dir itself needs to be server-owned
 	# this should do the trick
-
 	webapp_serverowned ${MY_HTDOCSDIR}
 
 	# okay, we're done - let webapp.eclass finish off