Fixes for bug #108924.

(Portage version: 2.1_pre3-r1)

5 files changed, 34 insertions, 18 deletions

diff --git a/www-apps/lxr/ChangeLog b/www-apps/lxr/ChangeLog
index 54050368a368..76e92efebfce 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.7 2006/01/15 18:00:35 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/lxr/ChangeLog,v 1.8 2006/01/26 20:45:45 rl03 Exp $
+
+*lxr-0.9.4-r1 (26 Jan 2006)
+
+  26 Jan 2006; Renat Lumpau <rl03@gentoo.org> +files/initdb-mysql.patch,
+  -lxr-0.9.4.ebuild, +lxr-0.9.4-r1.ebuild:
+  Fixes for bug #108924.
 
   15 Jan 2006; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt:
   Minor fix in postinstall instructions
diff --git a/www-apps/lxr/Manifest b/www-apps/lxr/Manifest
index 5f11c37e975b..90ae46a85320 100644
--- a/www-apps/lxr/Manifest
+++ b/www-apps/lxr/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 e4d6b3c20698f06665a47edea3bf07c7 ChangeLog 1696
 MD5 8ce5e2b6e0ab9fcc6a3a116347a24204 files/digest-lxr-0.3.1 60
-MD5 079cf235c7e3710d7cfe9c99c049da15 files/digest-lxr-0.9.4 57
+MD5 079cf235c7e3710d7cfe9c99c049da15 files/digest-lxr-0.9.4-r1 57
+MD5 dc4f45f2522e069916336f27c75a9509 files/initdb-mysql.patch 472
 MD5 867862e75df9d3d89b3235d846399411 files/postinstall-en.txt 1353
 MD5 e29006dab30804fb516da79548e917b3 files/reconfig 272
 MD5 dd932f0988c68a07db8e35fce86af72a lxr-0.3.1.ebuild 1741
-MD5 bdcdecf40b240ca162c586100e08b444 lxr-0.9.4.ebuild 1954
+MD5 a0ff4702ee57bb079fe6f9218f5b319d lxr-0.9.4-r1.ebuild 1994
 MD5 4defd726d2b03decc5b7ff21b0aac1a3 metadata.xml 225
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDyo3PEzitwsaoONoRAqACAJ47EC7C2a42kBB5SQtdSv+EVD1U9QCgiMaD
-/Ct13tMXeez8Q94VqISy7Uo=
-=g/W9
------END PGP SIGNATURE-----
diff --git a/www-apps/lxr/files/digest-lxr-0.9.4 b/www-apps/lxr/files/digest-lxr-0.9.4-r1
index 9aacef82f7a8..9aacef82f7a8 100644
--- a/www-apps/lxr/files/digest-lxr-0.9.4
+++ b/www-apps/lxr/files/digest-lxr-0.9.4-r1
diff --git a/www-apps/lxr/files/initdb-mysql.patch b/www-apps/lxr/files/initdb-mysql.patch
new file mode 100644
index 000000000000..8c35593017b8
--- /dev/null
+++ b/www-apps/lxr/files/initdb-mysql.patch
@@ -0,0 +1,13 @@
+--- initdb-mysql	2004-07-20 11:31:24.000000000 -0400
++++ initdb-mysql.patched	2006-01-26 15:41:43.000000000 -0500
+@@ -34,8 +34,8 @@ create table lxr_indexes (
+ 
+ create table lxr_releases 
+         (fileid         int not null references lxr_files,
+-        release         char(255) binary not null,
+-        primary key     (fileid,release)
++        `release`         char(255) binary not null,
++        primary key     (fileid,`release`)
+ );
+ 
+ create table lxr_useage
diff --git a/www-apps/lxr/lxr-0.9.4.ebuild b/www-apps/lxr/lxr-0.9.4-r1.ebuild
index ca6aa48c905a..9a3dbadc3754 100644
--- a/www-apps/lxr/lxr-0.9.4.ebuild
+++ b/www-apps/lxr/lxr-0.9.4-r1.ebuild
@@ -1,8 +1,8 @@
 # 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.4.ebuild,v 1.1 2006/01/10 20:38:07 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/lxr/lxr-0.9.4-r1.ebuild,v 1.1 2006/01/26 20:45:45 rl03 Exp $
 
-inherit webapp
+inherit webapp multilib eutils
 
 WEBAPP_MANUAL_SLOT="yes"
 SLOT="0"
@@ -26,6 +26,11 @@ RDEPEND="dev-util/ctags
 		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
+}
 
 src_install() {
 	webapp_src_preinst
@@ -34,9 +39,10 @@ src_install() {
 	PERLVERSION=${version}
 	eval `perl '-V:archname'`
 	ARCHVERSION=${archname}
-	dodir /usr/lib/perl5/vendor_perl/${PERLVERSION}/${ARCHVERSION} /usr/bin
-	mv Local.pm ${D}/usr/lib/perl5/vendor_perl/${PERLVERSION}/${ARCHVERSION}
-	cp -r lib/LXR ${D}/usr/lib/perl5/vendor_perl/${PERLVERSION}/${ARCHVERSION}
+	local PERLDIR="/usr/$(get_libdir)/perl5/vendor_perl/${PERLVERSION}/${ARCHVERSION}"
+	dodir ${PERLDIR} /usr/bin
+	mv Local.pm ${D}${PERLDIR}
+	cp -r lib/LXR ${D}${PERLDIR}
 	sed "s|/usr/local/bin/swish-e|/usr/bin/swish-e|
 		s|/usr/bin/ctags|/usr/bin/exuberant-ctags|
 		s|'glimpse|#'glimpse|g