Marked stable on AMD64 based on arch testing by Agostino "ago" Sarubbo & Elijah "Armageddon" El Lazkani in security bug #391259. Removed 2.0.18 with problematic dependencies so the arch teams can commit without --force. Remove now-unused kakasi USE-flag.

(Portage version: 2.1.10.38/cvs/Linux x86_64)

4 files changed, 10 insertions, 99 deletions

diff --git a/app-text/namazu/ChangeLog b/app-text/namazu/ChangeLog
index 5bd7d1622c77..3a852671e9ea 100644
--- a/app-text/namazu/ChangeLog
+++ b/app-text/namazu/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/namazu
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/namazu/ChangeLog,v 1.36 2011/10/30 07:11:31 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/namazu/ChangeLog,v 1.37 2011/11/28 23:12:58 chainsaw Exp $
+
+  28 Nov 2011; Tony Vroon <chainsaw@gentoo.org> -namazu-2.0.18.ebuild,
+  namazu-2.0.21.ebuild, metadata.xml:
+  Marked stable on AMD64 based on arch testing by Agostino "ago" Sarubbo &
+  Elijah "Armageddon" El Lazkani in security bug #391259. Removed 2.0.18 with
+  problematic dependencies so the arch teams can commit without --force. Remove
+  now-unused kakasi USE-flag.
 
 *namazu-2.0.21 (30 Oct 2011)
 
diff --git a/app-text/namazu/metadata.xml b/app-text/namazu/metadata.xml
index 754feb26260c..871ced73ff77 100644
--- a/app-text/namazu/metadata.xml
+++ b/app-text/namazu/metadata.xml
@@ -5,8 +5,4 @@
 <maintainer>
   <email>hattya@gentoo.org</email>
 </maintainer>
-<use>
-  <flag name='kakasi'>Enable kakasi support
-    (<pkg>dev-perl/Text-Kakasi</pkg>)</flag>
-</use>
 </pkgmetadata>
diff --git a/app-text/namazu/namazu-2.0.18.ebuild b/app-text/namazu/namazu-2.0.18.ebuild
deleted file mode 100644
index 47cf6e6f7953..000000000000
--- a/app-text/namazu/namazu-2.0.18.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/namazu/namazu-2.0.18.ebuild,v 1.6 2009/01/19 01:13:03 tcunha Exp $
-
-inherit elisp-common
-
-IUSE="chasen cjk emacs kakasi nls tk"
-
-DESCRIPTION="Namazu is a full-text search engine"
-HOMEPAGE="http://www.namazu.org/"
-SRC_URI="http://www.namazu.org/stable/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ppc64 ~sparc x86"
-SLOT="0"
-
-DEPEND=">=dev-perl/File-MMagic-1.20
-	chasen? ( app-text/chasen )
-	cjk? ( app-i18n/nkf )
-	emacs? ( virtual/emacs )
-	kakasi? ( dev-perl/Text-Kakasi )
-	nls? ( sys-devel/gettext )
-	tk? (
-		dev-lang/tk
-		www-client/lynx
-	)"
-
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-
-	sed -i "s:\(rm -f \$(filterdir).*$\):# \1:" filter/Makefile.in
-
-}
-
-src_compile() {
-
-	local myconf
-
-	use tk && myconf="--with-namazu=/usr/bin/namazu
-					--with-mknmz=/usr/bin/mknmz
-					--with-indexdir=/var/lib/namazu/index"
-
-	econf \
-		$(use_enable nls) \
-		$(use_enable tk tknamazu) \
-		${myconf} \
-		|| die
-	emake || die
-
-	if use emacs; then
-		cd lisp
-		rm -f browse*
-		elisp-compile *.el || die
-	fi
-
-}
-
-src_install () {
-
-	emake DESTDIR="${D}" install || die
-
-	rm -rf "${D}"/usr/share/namazu/{doc,etc}
-
-	dodoc AUTHORS CREDITS ChangeLog* HACKING* NEWS README* THANKS TODO
-	dohtml -r doc/*
-
-	insinto /usr/share/doc/${P}
-	doins etc/*.png
-
-	if use emacs; then
-		elisp-install ${PN} lisp/*.el* || die
-		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el || die
-
-		docinto lisp
-		dodoc lisp/ChangeLog*
-	fi
-
-}
-
-pkg_postinst() {
-
-	use emacs && elisp-site-regen
-
-}
-
-pkg_postrm() {
-
-	use emacs && elisp-site-regen
-
-}
diff --git a/app-text/namazu/namazu-2.0.21.ebuild b/app-text/namazu/namazu-2.0.21.ebuild
index bdb223e50fa9..8c4831192dfc 100644
--- a/app-text/namazu/namazu-2.0.21.ebuild
+++ b/app-text/namazu/namazu-2.0.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/namazu/namazu-2.0.21.ebuild,v 1.1 2011/10/30 07:11:31 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/namazu/namazu-2.0.21.ebuild,v 1.2 2011/11/28 23:12:58 chainsaw Exp $
 
 inherit eutils elisp-common
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.namazu.org/"
 SRC_URI="http://www.namazu.org/stable/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 
 RDEPEND=">=dev-perl/File-MMagic-1.20