Merge stable keyword; Drop old.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xC42EB5D6)

3 files changed, 7 insertions, 89 deletions

diff --git a/www-apps/lxr/ChangeLog b/www-apps/lxr/ChangeLog
index 463a149cb8f1..5b132bb9f7fa 100644
--- a/www-apps/lxr/ChangeLog
+++ b/www-apps/lxr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/lxr
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/lxr/ChangeLog,v 1.22 2014/07/26 18:06:26 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/lxr/ChangeLog,v 1.23 2014/07/26 18:07:29 zlogene Exp $
+
+  26 Jul 2014; Mikle Kolyada <zlogene@gentoo.org> -lxr-0.9.8.ebuild,
+  lxr-0.9.8-r1.ebuild:
+  Merge stable keyword; Drop old.
 
 *lxr-0.9.8-r1 (26 Jul 2014)
 
diff --git a/www-apps/lxr/lxr-0.9.8-r1.ebuild b/www-apps/lxr/lxr-0.9.8-r1.ebuild
index f97c665f15ba..5409c33a7d28 100644
--- a/www-apps/lxr/lxr-0.9.8-r1.ebuild
+++ b/www-apps/lxr/lxr-0.9.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/lxr/lxr-0.9.8-r1.ebuild,v 1.1 2014/07/26 18:06:26 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/lxr/lxr-0.9.8-r1.ebuild,v 1.2 2014/07/26 18:07:29 zlogene Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://sourceforge.net/projects/lxr"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc ~x86"
 IUSE="cvs freetext mysql postgres"
 WEBAPP_MANUAL_SLOT="yes"
 SLOT="0"
diff --git a/www-apps/lxr/lxr-0.9.8.ebuild b/www-apps/lxr/lxr-0.9.8.ebuild
deleted file mode 100644
index aaff4f9d2a73..000000000000
--- a/www-apps/lxr/lxr-0.9.8.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/lxr/lxr-0.9.8.ebuild,v 1.1 2013/09/12 21:44:22 creffett Exp $
-
-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"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ppc ~x86"
-IUSE="cvs freetext mysql postgres"
-WEBAPP_MANUAL_SLOT="yes"
-SLOT="0"
-
-RDEPEND="dev-util/ctags
-	freetext? ( >=www-apps/swish-e-2.1 )
-	dev-lang/perl
-	dev-perl/DBI
-	dev-perl/File-MMagic
-	cvs? ( dev-vcs/rcs )
-	postgres? ( dev-perl/DBD-Pg )
-	mysql? ( dev-perl/DBD-mysql )"
-
-need_apache2
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-0.9.8-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-apache1
-	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-apache1
-	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
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-}
-
-pkg_prerm() {
-	webapp_pkg_prerm
-}