[gentoo-commits] gentoo-x86 commit in www-apps/lxr: lxr-0.9.5.ebuild ChangeLog

[Benedikt Boehm (hollow)]

hollow      08/02/03 17:04:57

  Modified:             lxr-0.9.5.ebuild ChangeLog
  Log:
  merge from webapps overlay wrt #208584
  (Portage version: 2.1.4)

Revision  Changes    Path
1.5                  www-apps/lxr/lxr-0.9.5.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/lxr/lxr-0.9.5.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/lxr/lxr-0.9.5.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/lxr/lxr-0.9.5.ebuild?r1=1.4&r2=1.5

Index: lxr-0.9.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-apps/lxr/lxr-0.9.5.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lxr-0.9.5.ebuild	29 Jul 2007 17:28:37 -0000	1.4
+++ lxr-0.9.5.ebuild	3 Feb 2008 17:04:57 -0000	1.5
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.4 2007/07/29 17:28:37 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/lxr/lxr-0.9.5.ebuild,v 1.5 2008/02/03 17:04:57 hollow Exp $
 
-inherit perl-module webapp multilib eutils
+inherit perl-module webapp multilib eutils depend.apache
 
 DESCRIPTION="general purpose source code indexer and cross-referener with a web-based frontend"
 HOMEPAGE="http://sourceforge.net/projects/lxr"
@@ -11,17 +11,24 @@
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="cvs freetext mysql postgres"
+WEBAPP_MANUAL_SLOT="yes"
+SLOT="0"
 
 RDEPEND="dev-util/ctags
-	www-servers/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 )
+	postgres? ( dev-perl/DBD-Pg )
 	mysql? ( dev-perl/DBD-mysql )"
 
+need_apache2
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -69,3 +76,11 @@
 	webapp_hook_script "${FILESDIR}"/reconfig
 	webapp_src_install
 }
+
+pkg_postinst() {
+	webapp_pkg_postinst
+}
+
+pkg_prerm() {
+	webapp_pkg_prerm
+}



1.15                 www-apps/lxr/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/lxr/ChangeLog?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/lxr/ChangeLog?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/lxr/ChangeLog?r1=1.14&r2=1.15

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-apps/lxr/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ChangeLog	29 Jul 2007 17:28:37 -0000	1.14
+++ ChangeLog	3 Feb 2008 17:04:57 -0000	1.15
@@ -1,6 +1,16 @@
 # ChangeLog for www-apps/lxr
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/lxr/ChangeLog,v 1.14 2007/07/29 17:28:37 phreak Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/lxr/ChangeLog,v 1.15 2008/02/03 17:04:57 hollow Exp $
+
+  03 Feb 2008; Benedikt Böhm <hollow@g.o> lxr-0.9.5.ebuild:
+  merge from webapps overlay wrt #208584
+
+  02 Feb 2008; Jakub Moc <jakub@g.o> lxr-0.9.5.ebuild:
+  Fix apache dependency wrt Bug 208584. Remove incorrect dependency on
+  dev-db/postgresql. Set WEBAPP_MANUAL_SLOT since otherwise this will
+  obviously collide on the perl modules stuff. Call webapp eclass
+  functions explicitely so that this does not get messed up by
+  perl-module exported functions.
 
   29 Jul 2007; Christian Heim <phreak@g.o> lxr-0.9.5.ebuild:
   Fixing the DEPEND/RDEPEND for the move of net-www/apache to



-- 
gentoo-commits@l.g.o mailing list