Merge stable keyword; Drop old.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC42EB5D6

4 files changed, 14 insertions, 97 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/Manifest b/www-apps/lxr/Manifest
index 89cee896d816..56308a1899cf 100644
--- a/www-apps/lxr/Manifest
+++ b/www-apps/lxr/Manifest
@@ -5,16 +5,15 @@ AUX lxr-0.9.8-initdb-mysql.patch 484 SHA256 2ebeaaa9c10f2953b159fe99206a7eabf618
 AUX postinstall-en.txt 1351 SHA256 1c5ccbde33bf200f727c53a87f67499328f140b64e8821e50065c872fe8b72f2 SHA512 4730fcc56b8a775d5922883906f9db8ead7a0f3beb8a46ceeb451f8ba273e823fbe328b227da72f39a9dfa926cd93b77c5d27c0d1ba2730afec0c570b1da0006 WHIRLPOOL 10b571d9605cd9b927ecfcc0383ae080b9604f6b1e59ce89deaa5331568a4b58380fb67d7b8391d967acc82e457701bf5e43706186d3e94fa8b2211895eb3e0a
 AUX reconfig 357 SHA256 395a8d5013e87e13e6701c8b1bbc889978cc92186ebe3569e2b1bee9f96b78a7 SHA512 b218ddf830fc1412ab95bd53377f07b76209b2dd7640654618e937355efd716f2374a0a18f97e8f92c06619f8aed6bbc311eb93541ebf088437e40250288f8cd WHIRLPOOL 0365b1faa0c266d8c3369eaaf2808ffd6ee55ef9dcc303a425a5a661b3eba239e2f807bbeecdf33a4ab35c26d87eea536e87f7c31ebc72f2f5ac15b68c228b2d
 DIST lxr-0.9.8.tgz 104246 SHA256 2caff9447cc2ef1f82d96ce5a2fc4a0358f2d12de52d73a91f29ae5119db4bf5 SHA512 2ee9965448edc63a35a3c9d51b2e22c142e5e0aed8e487a590ad3e8a9f840f94fbe38736fe139fb02941ab4e5c891821460b0f32b56a52bf295988c6ef432318 WHIRLPOOL e25bc692b08666402e8ef09b9f464811b7d49bbe7ca2597d35e3d9f3dbe2b4bb285ae52e748b86b11327f92a491863ede9030ba914f6f8e3a2251ea3f1b8859c
-EBUILD lxr-0.9.8-r1.ebuild 2223 SHA256 1430253e309c5323bac9d3f29e500e533fb021f5944c38fc688520d9b8a1887e SHA512 b0c7ff08ecafdc6bd5ccb8a713d35ea14def244032c4b3698ba8b109e3d6040629704c3a13513861efe6d27d2a5dc87791998c152d417c90357edebe3c3b7ddc WHIRLPOOL 09710b923bfab1c456938050a194125dfafd2b3260f7d025c2e92a8ca26a7402490d3e96ab396606746396efa73a0be53d148ea4e401ee6967e99f53088bedd3
-EBUILD lxr-0.9.8.ebuild 2195 SHA256 57bbd3520e6a3a7509ec91f05977475df9af26739e16a06114bd4bf5bbee534a SHA512 b47cbbcca4a6f7152be42658ed3b63708ca45fd8efc86194fad6e392de02e1bc91e67d3ced69541e449b06bb1296aae35319b2179e52ec133759d92b19cc6556 WHIRLPOOL f191e52d3b5653838c7198d51850fb91c2adf8603370fbdb98a9622488e85fb99ecb1f0b4fdace52060181a04db84996e9bf206289630c9492728cd85c9f556b
-MISC ChangeLog 4022 SHA256 e5937004dd93e3740dcc2602ad5405774b4e3366c95298de00045c6718b9e0fe SHA512 f1a02a20bd9ec588a3d9ed6ead261d5c9a535625c6d1d415be2009daf1daddad77bdccf6efcb7230b624bc128fe149c975f4e35212b4ca337608e5f3e5f17771 WHIRLPOOL 7f528d3078205c7cced97f43949705fd493e8cc92df08230c7c947a3393a5773b02ab7c2966069cd0c2fc6c83be77ce02fd4e5acbc0d39a55d10ed71968d9409
+EBUILD lxr-0.9.8-r1.ebuild 2222 SHA256 2e15db748623a23cbf97dacbe8af74ec042817cf8e9f1c1a3768908fc76c6bb0 SHA512 a704526bf66dc214c4ef90efa30df8f0646934c0f9c226cd2fff18f420b88c6066bf5c122f543bdfd43bde96df35fc5a58a45c11f80158b5622b43898076ad8f WHIRLPOOL abff0932f5010b183faf2cbc55f107c210f10aee3d2dc339f175fa0d3c799de94653c94f0ffb0df467aa1f7f1e597e2cb1d0a909d00a8832f5d43a4c6c570f39
+MISC ChangeLog 4149 SHA256 ea31f70312ebd4281ee2f966d07924573bed76362b27187cb9fe6adf7f7145a2 SHA512 843e9e9dd10c191f72a440709ff39cfe8accaf44b86f8ca9c08693cca61da07c6b647c585e65b9ac79c9c61e0629a37fdb887709727efd8e4e8cb9db585584a5 WHIRLPOOL 4e351c9be62c1d6369df1dd393adb5226aaa27be76bc88706c4d0ba0b40ca496a003c11ba9c0bfe955c982bbca5cf4cd1fd9e143abcf4db0db9a3b10dbbce4fe
 MISC metadata.xml 251 SHA256 f856867639306390e0f4b50557363f4820b5cfaeb5bbae97f44096d97fd0cb9b SHA512 9c079ad0a787d165d63206e0f717d9bd13b8a956be51d425df11e3d12e394bed49a4f25f61df3b0ed8e1f1b3d539ef551937386b75ceceeeaa156f4fa008b104 WHIRLPOOL 72506b63d3d4f3354cddc9df066e328c44058fd04bbc5bb0130002161a11ea74b7f06472629e91cb49be44ddea123583a024c803d06fcb953463d418b42f7dac
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iJwEAQEIAAYFAlPT71wACgkQG9wOWsQutdYOlAQArqmdrC5VIwopG51WFKskluBl
-jxg9OUZMaDPCJvzXMoR/VVzMd/9FXjid3ZApk5h9xjLlb4QMZpQRhRyiIz8IIrMS
-FTuIzFT4H6XU2j0QHJC9xjQZP8cmCFcHVy2X/iC/dRjTDEB/S7vzr+efBadDaLqN
-liVo2UurpjGH6xw9REo=
-=v6Yq
+iJwEAQEIAAYFAlPT75sACgkQG9wOWsQutdbn+gQA1MnRcYf76h53NQiMSqFZU3R4
+vkGzyBBI3Jje8t9Uk/PyvGKBlHGCj5w++pM30Wmq17yIZVQXTGMcxh2b1PubD7oo
+jZ94Z5g+6i5qAb7wyetIrfgxHXvxPhwuBNR/4lWyjnHMP1Om1Cvqye9L5ZYg35+v
+wiLdImD1Nrabw4+SQVo=
+=woqX
 -----END PGP SIGNATURE-----
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
-}