Version bump and webapp-config cleanups.

Package-Manager: portage-2.1

6 files changed, 137 insertions, 26 deletions

diff --git a/www-apps/lxr/ChangeLog b/www-apps/lxr/ChangeLog
index 9cf973d48bcd..130dc8d4091b 100644
--- a/www-apps/lxr/ChangeLog
+++ b/www-apps/lxr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/lxr
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/lxr/ChangeLog,v 1.9 2006/02/13 15:16:11 mcummings Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/lxr/ChangeLog,v 1.10 2006/06/15 03:50:38 vapier Exp $
+
+*lxr-0.9.5 (15 Jun 2006)
+
+  15 Jun 2006; Mike Frysinger <vapier@gentoo.org> files/postinstall-en.txt,
+  files/reconfig, +lxr-0.9.5.ebuild:
+  Version bump and webapp-config cleanups.
 
   13 Feb 2006; Michael Cummings <mcummings@gentoo.org> lxr-0.3.1.ebuild:
   Virtuals for perl-core
diff --git a/www-apps/lxr/Manifest b/www-apps/lxr/Manifest
index 758ca3d400bc..324db81c17de 100644
--- a/www-apps/lxr/Manifest
+++ b/www-apps/lxr/Manifest
@@ -1,19 +1,44 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 7fb007dc71d487e7f4f78d3592644475 ChangeLog 1971
-MD5 8ce5e2b6e0ab9fcc6a3a116347a24204 files/digest-lxr-0.3.1 60
-MD5 079cf235c7e3710d7cfe9c99c049da15 files/digest-lxr-0.9.4-r1 57
+AUX initdb-mysql.patch 472 RMD160 ae940b59261f78701668918a0f260e5835066afb SHA1 2c4099f63bc766ccfba2f377c0f08e102e3391f3 SHA256 c8ebfbc343182631715c65663d05947d89ce21445b5b16f18872a10eb4873025
 MD5 dc4f45f2522e069916336f27c75a9509 files/initdb-mysql.patch 472
-MD5 867862e75df9d3d89b3235d846399411 files/postinstall-en.txt 1353
-MD5 e29006dab30804fb516da79548e917b3 files/reconfig 272
+RMD160 ae940b59261f78701668918a0f260e5835066afb files/initdb-mysql.patch 472
+SHA256 c8ebfbc343182631715c65663d05947d89ce21445b5b16f18872a10eb4873025 files/initdb-mysql.patch 472
+AUX postinstall-en.txt 1351 RMD160 9c9f14512526e8e5fff51bd5c43be0d0940a6097 SHA1 c5550a1b07dee55fa7810d0f3d881935a10fedd7 SHA256 1c5ccbde33bf200f727c53a87f67499328f140b64e8821e50065c872fe8b72f2
+MD5 ec22ba517a82f8fba640d9e0bc425153 files/postinstall-en.txt 1351
+RMD160 9c9f14512526e8e5fff51bd5c43be0d0940a6097 files/postinstall-en.txt 1351
+SHA256 1c5ccbde33bf200f727c53a87f67499328f140b64e8821e50065c872fe8b72f2 files/postinstall-en.txt 1351
+AUX reconfig 357 RMD160 9edb2dc81fc0b02b6146fb712b9bf8e32d489a32 SHA1 92c3160edc80d9cb577a4c044a917603dcbf03f3 SHA256 395a8d5013e87e13e6701c8b1bbc889978cc92186ebe3569e2b1bee9f96b78a7
+MD5 8cfabefe0123e7bb898cd5020936238a files/reconfig 357
+RMD160 9edb2dc81fc0b02b6146fb712b9bf8e32d489a32 files/reconfig 357
+SHA256 395a8d5013e87e13e6701c8b1bbc889978cc92186ebe3569e2b1bee9f96b78a7 files/reconfig 357
+DIST lxr-0.3.1.tar.gz 29396
+DIST lxr-0.9.4.tgz 79867
+DIST lxr-0.9.5.tgz 105230 RMD160 fd6e8ae9c9940083e0550872fb8ac729342aad89 SHA1 89d8292cfa6c006185914588fec1a8b9d77778fd SHA256 5b126b8180a1c56fef5a89b9335a0b5d6e467850bf62b29a9f44b12107a74c8e
+EBUILD lxr-0.3.1.ebuild 1744 RMD160 10592b2db1bd64e294517108cb545ddd06db8b4c SHA1 647c510f8684725062521292386508f936b8dc34 SHA256 23cd6a6b0e3bc7d2daf69e85a1783900f4b7311fb6d4853dc95f66dafe2482e7
 MD5 f6ba9a472aa1ec2550e9bb989bf73da4 lxr-0.3.1.ebuild 1744
+RMD160 10592b2db1bd64e294517108cb545ddd06db8b4c lxr-0.3.1.ebuild 1744
+SHA256 23cd6a6b0e3bc7d2daf69e85a1783900f4b7311fb6d4853dc95f66dafe2482e7 lxr-0.3.1.ebuild 1744
+EBUILD lxr-0.9.4-r1.ebuild 1997 RMD160 283938870138120d7363c7603e15d1aa44afaa75 SHA1 ab70d447fca0d7bf58dfacb1e05f502efafb71e0 SHA256 76c0fce2cc9dbe9c57d708eb25fef58cd37d5b81309c08427c6e278c4891fe09
 MD5 310764a001eb1262609fe23ec5cea7cc lxr-0.9.4-r1.ebuild 1997
+RMD160 283938870138120d7363c7603e15d1aa44afaa75 lxr-0.9.4-r1.ebuild 1997
+SHA256 76c0fce2cc9dbe9c57d708eb25fef58cd37d5b81309c08427c6e278c4891fe09 lxr-0.9.4-r1.ebuild 1997
+EBUILD lxr-0.9.5.ebuild 2045 RMD160 8dfcdcd851d9039116724889f653f8b8d4463c58 SHA1 6efda7f480014655cd27e2575780f759867a5018 SHA256 9854e7a7db2bcb1c9136a4bbcffebe6891448fe30dfcc5df80f5f28269e49c9c
+MD5 06f219cfad0ca7f074d41ff634c1b18a lxr-0.9.5.ebuild 2045
+RMD160 8dfcdcd851d9039116724889f653f8b8d4463c58 lxr-0.9.5.ebuild 2045
+SHA256 9854e7a7db2bcb1c9136a4bbcffebe6891448fe30dfcc5df80f5f28269e49c9c lxr-0.9.5.ebuild 2045
+MISC ChangeLog 2152 RMD160 ae118e2f0fef73b407acba89630699c88a22ae9f SHA1 e4500ba466b24a48b0137c8453df3e9f4397cc00 SHA256 a5e0acb16c34e93d353d6436aaae943d12f6bf84636ea2745181f4c11485accb
+MD5 e4a1f8314699322078647102c6516e2e ChangeLog 2152
+RMD160 ae118e2f0fef73b407acba89630699c88a22ae9f ChangeLog 2152
+SHA256 a5e0acb16c34e93d353d6436aaae943d12f6bf84636ea2745181f4c11485accb ChangeLog 2152
+MISC metadata.xml 225 RMD160 7081530104e84534030353cb15c4a541bb8d5e05 SHA1 af63626385169ab58c44695ebe4df705d455f94b SHA256 0986f8971072c8d055fccbc67cc59ac43eecd1f5592cd9c0ae729b23e550cc96
 MD5 4defd726d2b03decc5b7ff21b0aac1a3 metadata.xml 225
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFD8KKxtG5z4I8BtQoRAswZAJ0Ta3VwVW80/zJcHAhzUrAhpWs9NACeNIrC
-G2fBQap06n7oznn5YaFC/tg=
-=WgcE
------END PGP SIGNATURE-----
+RMD160 7081530104e84534030353cb15c4a541bb8d5e05 metadata.xml 225
+SHA256 0986f8971072c8d055fccbc67cc59ac43eecd1f5592cd9c0ae729b23e550cc96 metadata.xml 225
+MD5 8ce5e2b6e0ab9fcc6a3a116347a24204 files/digest-lxr-0.3.1 60
+RMD160 77b7e30d1a5e74d3bd16f4b7b3848a80a9462e8e files/digest-lxr-0.3.1 60
+SHA256 00f0d85f834d58e16c837760693c0e0b25a5808d9dc040e3095affac97f0c12b files/digest-lxr-0.3.1 60
+MD5 079cf235c7e3710d7cfe9c99c049da15 files/digest-lxr-0.9.4-r1 57
+RMD160 8417432a834ad339b9605f41d0ac83e8fd2b26a2 files/digest-lxr-0.9.4-r1 57
+SHA256 e512aa9fd3e015749403bf0a8d482e9fadb67a5afc88dc62261cdd8cddec8fbf files/digest-lxr-0.9.4-r1 57
+MD5 d2bb36a4339a162894a2d9d2736e3442 files/digest-lxr-0.9.5 220
+RMD160 722252b4a8beb689be482f6b7adeebc122023a7f files/digest-lxr-0.9.5 220
+SHA256 e8a3ff8a1552376a0c564d69e732e8df52d5724611d894784beceb4250d3b26b files/digest-lxr-0.9.5 220
diff --git a/www-apps/lxr/files/digest-lxr-0.9.5 b/www-apps/lxr/files/digest-lxr-0.9.5
new file mode 100644
index 000000000000..66e0a8905a4e
--- /dev/null
+++ b/www-apps/lxr/files/digest-lxr-0.9.5
@@ -0,0 +1,3 @@
+MD5 b4eb6428ef27e4fe3923dfe8abf5cb94 lxr-0.9.5.tgz 105230
+RMD160 fd6e8ae9c9940083e0550872fb8ac729342aad89 lxr-0.9.5.tgz 105230
+SHA256 5b126b8180a1c56fef5a89b9335a0b5d6e467850bf62b29a9f44b12107a74c8e lxr-0.9.5.tgz 105230
diff --git a/www-apps/lxr/files/postinstall-en.txt b/www-apps/lxr/files/postinstall-en.txt
index 8da1468851dc..07412c4da554 100644
--- a/www-apps/lxr/files/postinstall-en.txt
+++ b/www-apps/lxr/files/postinstall-en.txt
@@ -1,4 +1,5 @@
 0. Create a db for lxr:
+
  MySQL: run mysql and read in the initdb file using:
    \. ${MY_SQLSCRIPTSDIR}/mysql/${PVR}_create.sql
 
@@ -6,7 +7,7 @@
    createuser lxr
    createdb -U lxr lxr
    psql -U lxr lxr
-   \i ${MY_SQLSCRIPTSDIR}/postgressql/${PVR}_create.sql
+   \i ${MY_SQLSCRIPTSDIR}/postgresql/${PVR}_create.sql
 
 1. Edit ${MY_INSTALLDIR}/lxr.conf and set:
  - db settings
@@ -38,6 +39,6 @@ you must take special care not to make lxr.conf visible to the world. If you
 are not using mod_perl, use .htaccess_cgi instead.
 
 5. Create the index:
- ${MY_INSTALLDIR}/genxref --url http://${VHOST_HOSTNAME}/${VHOST_APPDIR}
+ ${MY_INSTALLDIR}/genxref --url http://${VHOST_HOSTNAME}${VHOST_APPDIR}
 
-6. Browse to http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/source
+6. Browse to http://${VHOST_HOSTNAME}${VHOST_APPDIR}/source
diff --git a/www-apps/lxr/files/reconfig b/www-apps/lxr/files/reconfig
index bf90b9f92657..e9e2f47b3f69 100644
--- a/www-apps/lxr/files/reconfig
+++ b/www-apps/lxr/files/reconfig
@@ -2,15 +2,20 @@
 
 die() {
 	echo "#####"
-	echo $1
+	echo "$@"
 	echo "#####"
 	exit 1
 }
 
-if [ $1 = "install" ]; then
-	sed -e "s|/lxr|/${VHOST_APPDIR}|
-			s|http://192.168.1.3/lxr|${VHOST_HOSTNAME}/${VHOST_APPDIR}|" -i ${MY_INSTALLDIR}/lxr.conf || die
-
-elif [ $1 = "clean" ]; then
+if [[ $1 == "install" ]] ; then
+	cd "${MY_INSTALLDIR}" || die
+	files="lxr.conf $(ls ._cfg*lxr.conf 2>/dev/null)"
+	sed -i \
+		-e "s|/lxr|${VHOST_APPDIR}|" \
+		-e "s|192.168.1.3/lxr|${VHOST_HOSTNAME}${VHOST_APPDIR}|" \
+		${files} || die
+elif [[ $1 = "clean" ]] ; then
 	echo $1
 fi
+
+exit 0
diff --git a/www-apps/lxr/lxr-0.9.5.ebuild b/www-apps/lxr/lxr-0.9.5.ebuild
new file mode 100644
index 000000000000..dd0a79ec44b4
--- /dev/null
+++ b/www-apps/lxr/lxr-0.9.5.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/lxr/lxr-0.9.5.ebuild,v 1.1 2006/06/15 03:50:38 vapier Exp $
+
+inherit perl-module webapp multilib eutils
+
+DESCRIPTION="general purpose source code indexer and cross-referener with a web-based frontend"
+HOMEPAGE="http://sourceforge.net/projects/lxr"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="cvs freetext mysql postgres"
+
+RDEPEND="dev-util/ctags
+	net-www/apache
+	freetext? ( >=www-apps/swish-e-2.1 )
+	dev-lang/perl
+	dev-perl/DBI
+	dev-perl/File-MMagic
+	cvs? ( app-text/rcs )
+	postgres? ( dev-db/postgresql dev-perl/DBD-Pg )
+	mysql? ( >=dev-db/mysql-4 dev-perl/DBD-mysql )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/initdb-mysql.patch
+
+	sed -i \
+		-e 's|/usr/local/bin/swish-e|/usr/bin/swish-e|' \
+		-e 's|/usr/bin/ctags|/usr/bin/exuberant-ctags|' \
+		-e "s|'glimpse|#'glimpse|g" \
+		-e "s:/path/to/lib:${VENDOR_LIB}:" \
+		templates/lxr.conf
+	sed -i \
+		-e 's|Apache::Registry|ModPerl::PerlRun|' \
+		.htaccess
+	sed -i \
+		-e 's|require Local;|require LXR::Local;|' \
+		-e 's|use Local;|use LXR::Local;|' \
+		-e 's|package Local;|package LXR::Local;|' \
+		Local.pm lib/LXR/Common.pm diff find ident search source
+}
+
+# prevent eclasses from overriding this
+src_compile() { :; }
+
+src_install() {
+	perlinfo
+	webapp_src_preinst
+
+	insinto "${VENDOR_LIB}"
+	doins -r lib/LXR || die
+	insinto "${VENDOR_LIB}"/LXR
+	doins Local.pm
+
+	dodoc BUGS CREDITS.txt ChangeLog HACKING INSTALL notes .htaccess* swish-e.conf
+
+	exeinto "${MY_HTDOCSDIR}"
+	doexe diff find genxref ident search source || die
+	insinto "${MY_HTDOCSDIR}"
+	doins .htaccess* templates/* || die
+
+	webapp_configfile "${MY_HTDOCSDIR}"/lxr.conf "${MY_HTDOCSDIR}"/.htaccess
+	webapp_sqlscript mysql initdb-mysql
+	webapp_sqlscript postgresql initdb-postgres
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_hook_script "${FILESDIR}"/reconfig
+	webapp_src_install
+}