Version bump.

Package-Manager: portage-2.2.0_alpha71/cvs/Linux x86_64

4 files changed, 156 insertions, 7 deletions

diff --git a/app-text/namazu/ChangeLog b/app-text/namazu/ChangeLog
index 02a9b2bfd84c..5bd7d1622c77 100644
--- a/app-text/namazu/ChangeLog
+++ b/app-text/namazu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/namazu
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/namazu/ChangeLog,v 1.35 2010/08/12 09:18:37 maekke Exp $
+# 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 $
+
+*namazu-2.0.21 (30 Oct 2011)
+
+  30 Oct 2011; Naohiro Aota <naota@gentoo.org> +namazu-2.0.21.ebuild,
+  +files/namazu-2.0.21-search.patch:
+  Version bump.
 
   12 Aug 2010; Markus Meier <maekke@gentoo.org> namazu-2.0.20.ebuild:
   amd64 stable, bug #306051
diff --git a/app-text/namazu/Manifest b/app-text/namazu/Manifest
index be00747185b8..0604f4f7f809 100644
--- a/app-text/namazu/Manifest
+++ b/app-text/namazu/Manifest
@@ -3,19 +3,22 @@ Hash: SHA1
 
 AUX 50namazu-gentoo.el 108 RMD160 77bd458d1be7b13a580433375404bf45cd98ecf6 SHA1 a980bed7b59a4e64863060492717c402a41b4d57 SHA256 42a3f8c20434d06bb5f9f8b50d94754a12494932f61f07e9fdeeaaeca68e398b
 AUX namazu-2.0.19-gentoo.patch 1258 RMD160 c287dec1df62a4723edab9179e3d47055ca532b8 SHA1 fd84110efba0723cbccb97c80f5af7334739418c SHA256 89218d988e64446cf65d4ff73f53a45543cc45d83dce9065ef4d44a2dc5844dd
+AUX namazu-2.0.21-search.patch 2122 RMD160 33c9ac1edf355321ba95497d36ce75426f996f85 SHA1 06f0127bf086e9194abf4f05d6ac5a26d09514a0 SHA256 5d5c75102e3e0dc3cb35eb91a44d7ceabc699a7ae809812e841cf64b82e13db9
 DIST namazu-2.0.18.tar.gz 1388095 RMD160 3dd598cbe63e515649d1bd798aff90442e2949bc SHA1 a6e9e5522deda04559088e96fd192f203ac7432e SHA256 d288ca0a81403a34495a465e7ab0e0ec09720851b6be83c0e0ba400f06fa258a
 DIST namazu-2.0.19.tar.gz 1392466 RMD160 935ef748a45ea2407f532ca8d1fe1d678914a0d4 SHA1 9d52d873dffa48fa0455e79005e9a43e751157ca SHA256 b0fd725e87f61d99312d631db50f13738cf49afc9ade7c1881ce3f71b32a0d1b
 DIST namazu-2.0.20.tar.gz 1393165 RMD160 ed907f572517ba7549e7dbcefc5e264c80b76643 SHA1 8bc3244c09ac0644696aecfdf5c5c0674343d464 SHA256 cddbbce979484235976115b05535048f41145bd2ed5de9f84108fdca0d1dfcb3
+DIST namazu-2.0.21.tar.gz 1394048 RMD160 b5ac1a114dc4730c56a46c24130899f10d37e9bb SHA1 35aaff34d0cdbe96fff24da87671b6f902bb7d43 SHA256 5c18afb679db07084a05aca8dffcfb5329173d99db8d07ff6d90b57c333c71f7
 EBUILD namazu-2.0.18.ebuild 1659 RMD160 6eccc7ed8ed26a29e77b4ffa7a9b7aa3711d29b6 SHA1 7dbc2c4b7a98f2cd3c006589446bf180a819419b SHA256 fb1302861a90dfbd90de0bf087767b4456c9af76d2ac18690d216d21c5480884
 EBUILD namazu-2.0.19-r1.ebuild 1659 RMD160 1cefd39a013b55cab761fe5a8fd96ce4089c57ca SHA1 0ff195d4ab3d8ab9e28643529e8dd0a312b7e201 SHA256 3ac6130c99a94a22de03c4c771d1adeb2368a088042672a94d1b9aed316d8394
 EBUILD namazu-2.0.19.ebuild 1525 RMD160 0e4a1ad0b0e17b479e73fa63f9d636fe1790703e SHA1 e7da049a5dcb017dff757cc4cd77a0c161922c44 SHA256 54e1a994469ae3ce901b8408fd93e4e4878055d93b579fe32d50b197b7d76972
 EBUILD namazu-2.0.20.ebuild 1663 RMD160 a5e91e70b3de539d6bed8818d0728bdf2ed85572 SHA1 683c1b7a879d57f10c3f01627e32e8cd0139dd5a SHA256 c1d5a14024619a4cefddac4e4e84b3dd673e5c16cb2db3705ab86814e469e1f5
-MISC ChangeLog 4295 RMD160 462e6de3a3fb559b67f9418b6c8eb7c42a1f2aa2 SHA1 e797b09f1ea8b653e14428b6f95553f2879e1cbc SHA256 94adec7d93272e468329d786e9def5fa01475ccf7f03b18f9edcb194a515f53a
+EBUILD namazu-2.0.21.ebuild 1711 RMD160 fee7fc340cb9d6d8f1b95feef0fdd56d413cbc3d SHA1 cc8968534ff98928d7952f564e594d55de1b3e8d SHA256 4136d5dea6f4cb660947c0f61dd4a3424d7cf3531d569af4c7642cd0671f22d4
+MISC ChangeLog 4448 RMD160 a49ec8a340345e8c2e55d955cd46841bba1333cc SHA1 039756317e7a3751ba29a7b19e4f393c1ad22d5b SHA256 1663013ff1eff1b41a9d9cd6cd66db7d8ff8ad2fd32caf29c0e2ea06a0ff3ed0
 MISC metadata.xml 320 RMD160 4c1d9b46f7ccfafb1f5ae1f96efdcc1058c17ba1 SHA1 bfc8177258093359d489af23d8da595745e1c5e4 SHA256 59c2662378f80cec959efb0f3c5853e0508eb2e5edb469abbc57d0d8d86d8fb8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAkxjvA4ACgkQkKaRLQcq0GJstwCgh8FvCsfjEy+efp9qJJWoETiT
-VxsAnR94CD+MYzZJma2a/zkJnMcTJ7Hn
-=eeED
+iEYEARECAAYFAk6s+LIACgkQGpDnPLSHuMBauwCeL8U2aI+lGPyFnJwk0j4jakrW
+a5QAoOooU0RiEUSBu48LSZVVGeCCe0P1
+=wgqj
 -----END PGP SIGNATURE-----
diff --git a/app-text/namazu/files/namazu-2.0.21-search.patch b/app-text/namazu/files/namazu-2.0.21-search.patch
new file mode 100644
index 000000000000..6a8e10e8e1a0
--- /dev/null
+++ b/app-text/namazu/files/namazu-2.0.21-search.patch
@@ -0,0 +1,56 @@
+--- a/nmz/search.c	2011-08-05 09:26:47.000000000 +0900
++++ b/nmz/search.c	2011-08-05 09:32:25.000000000 +0900
+@@ -572,7 +572,7 @@
+ {
+     if (*expr == '*' && expr[strlen(expr) - 1] != '*') {
+         /* If suffix match such as '*bar', enforce it into regex */
+-        strcpy(expr, expr + 1);
++        memmove(expr, expr + 1, strlen(expr));
+         escape_meta_characters(expr, BUFSIZE * 2);
+         strncat(expr, "$", BUFSIZE * 2 - strlen(expr) - 1);
+         expr[BUFSIZE * 2 - 1] = '\0';
+@@ -584,7 +584,7 @@
+         expr[BUFSIZE * 2 - 1] = '\0';
+     } else if (*expr == '*' && expr[strlen(expr) - 1] == '*') {
+         /* If internal match such as '*foo*', enforce it into regex */
+-        strcpy(expr, expr + 1);
++        memmove(expr, expr + 1, strlen(expr));
+         expr[strlen(expr) - 1] = '\0';
+         escape_meta_characters(expr, BUFSIZE * 2);
+     } else if (*expr == '/' && expr[strlen(expr) - 1] == '/') {
+@@ -592,7 +592,7 @@
+             nmz_debug_printf("do REGEX search\n");
+             /* Genuine regex */
+             /* Remove the both of '/' chars at begging and end of string */
+-            strcpy(expr, expr + 1);
++            memmove(expr, expr + 1, strlen(expr));
+             expr[strlen(expr) - 1]= '\0';
+         } else {
+             nmz_debug_printf("disabled REGEX search\n");
+@@ -605,7 +605,7 @@
+             || (*expr == '{' && expr[strlen(expr) - 1] == '}')) 
+         {
+             /* Delimiters of field search */
+-            strcpy(expr, expr + 1); 
++            memmove(expr, expr + 1, strlen(expr)); 
+             expr[strlen(expr) - 1] = '\0';
+         }
+         escape_meta_characters(expr, BUFSIZE * 2);
+@@ -695,7 +695,7 @@
+ delete_beginning_backslash(char *str)
+ {
+     if (*str == '\\') {
+-        strcpy(str, str + 1);
++        memmove(str, str + 1, strlen(str));
+     }
+ }
+ 
+@@ -935,7 +935,7 @@
+     if ((strlen(str) >= 3 && (*str == '"' && str[strlen(str) - 1] == '"'))
+         || (*str == '{' && str[strlen(str) - 1] == '}')) 
+     {
+-        strcpy(str, str + 1); 
++        memmove(str , str + 1, strlen(str)); 
+         str[strlen(str) - 1]= '\0';
+     } 
+ }
diff --git a/app-text/namazu/namazu-2.0.21.ebuild b/app-text/namazu/namazu-2.0.21.ebuild
new file mode 100644
index 000000000000..bdb223e50fa9
--- /dev/null
+++ b/app-text/namazu/namazu-2.0.21.ebuild
@@ -0,0 +1,84 @@
+# 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 $
+
+inherit eutils elisp-common
+
+IUSE="emacs nls tk linguas_ja"
+
+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"
+
+RDEPEND=">=dev-perl/File-MMagic-1.20
+	emacs? ( virtual/emacs )
+	linguas_ja? (
+		app-i18n/nkf
+		|| (
+			dev-perl/Text-Kakasi
+			app-i18n/kakasi
+			app-text/chasen
+			app-text/mecab
+		)
+	)
+	nls? ( virtual/libintl )
+	tk? (
+		dev-lang/tk
+		www-client/lynx
+	)"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-2.0.19-gentoo.patch"
+	epatch "${FILESDIR}/${PN}-2.0.21-search.patch"
+}
+
+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
+		elisp-compile gnus-nmz-1.el namazu.el || die
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die
+
+	dodoc AUTHORS CREDITS ChangeLog* HACKING* NEWS README* THANKS TODO etc/*.png
+	dohtml -r doc/*
+
+	if use emacs; then
+		elisp-install ${PN} lisp/gnus-nmz-1.el* lisp/namazu.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
+}