www-apps/mnogosearch: Remove old. Use unicode USE flags like the rest of the tree, instead of inventing new ones.

svn path=/experimental/; revision=455

5 files changed, 12 insertions, 151 deletions

diff --git a/www-apps/mnogosearch/ChangeLog b/www-apps/mnogosearch/ChangeLog
index 9da9470..32e66d8 100644
--- a/www-apps/mnogosearch/ChangeLog
+++ b/www-apps/mnogosearch/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for www-apps/mnogosearch
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  08 Sep 2007; Jakub Moc <jakub@gentoo.org> -mnogosearch-3.2.38.ebuild,
+  mnogosearch-3.2.40.ebuild:
+  Remove old. Use unicode USE flags like the rest of the tree, instead of
+  inventing new ones.
+
   03 Dec 2006; Emanuele Gentili <bathym@0x656d67.org>
   +mnogosearch-3.2.40.ebuild:
   Version bump
diff --git a/www-apps/mnogosearch/Manifest b/www-apps/mnogosearch/Manifest
index 4e3f74f..366b41d 100644
--- a/www-apps/mnogosearch/Manifest
+++ b/www-apps/mnogosearch/Manifest
@@ -1,36 +1,7 @@
 AUX mnogosearch-3.2.38-configure.in.patch 472 RMD160 c185c9ce50ca454cee3a6cadcb9a3b347953cf1a SHA1 33184ad4383948b42638ef1fbe144bb5961db0e9 SHA256 06651d4e255c8cf3088671b83629b1aea56436eb627d40b1c073d3c18954d017
-MD5 19261d421aba6168380fd05784bccef0 files/mnogosearch-3.2.38-configure.in.patch 472
-RMD160 c185c9ce50ca454cee3a6cadcb9a3b347953cf1a files/mnogosearch-3.2.38-configure.in.patch 472
-SHA256 06651d4e255c8cf3088671b83629b1aea56436eb627d40b1c073d3c18954d017 files/mnogosearch-3.2.38-configure.in.patch 472
 AUX mnogosearch-indexer.conf.patch 829 RMD160 6d0d91d8170e8ab95d777d953a8adbb5f4ca864a SHA1 573504e1a315ff671e575c5e3de08494446cf4ba SHA256 eac520e3cdb2956fb1dc49a8e28bf2bb236e69e7a396e8e2bde5f7362ba9ae9e
-MD5 196ce5bf9d0952d91ad337ed327c5866 files/mnogosearch-indexer.conf.patch 829
-RMD160 6d0d91d8170e8ab95d777d953a8adbb5f4ca864a files/mnogosearch-indexer.conf.patch 829
-SHA256 eac520e3cdb2956fb1dc49a8e28bf2bb236e69e7a396e8e2bde5f7362ba9ae9e files/mnogosearch-indexer.conf.patch 829
 AUX postinstall-en.txt 1161 RMD160 45abe76526f52088f7cc841bd12994c105fb293e SHA1 7f9fb7397f1c92c63a0dcbf63f5ad5bd00ec1a09 SHA256 86b5065d8c532e1de15f18df458754821f216566a61906091b265b9e9018ed0b
-MD5 5f55fd72767c3e3e4a14465972a3c042 files/postinstall-en.txt 1161
-RMD160 45abe76526f52088f7cc841bd12994c105fb293e files/postinstall-en.txt 1161
-SHA256 86b5065d8c532e1de15f18df458754821f216566a61906091b265b9e9018ed0b files/postinstall-en.txt 1161
-DIST mnogosearch-3.2.38.tar.gz 3422447 RMD160 3545da15ec3463a0fdcc658d2e1cc24961ade423 SHA1 18a910f474be8504b27e4c011aca7f11410818ee SHA256 486c29d5beb988f5e4e9dd18bebb17486954d19562a776967eefe23d62001231
 DIST mnogosearch-3.2.40.tar.gz 3408680 RMD160 3ff279c1b4b052cb1fa18fa078316e2fd1f9d584 SHA1 1923c2803e233d7fdfcfea01e005933d7fad2cc9 SHA256 c74fdfa601db052023551d10ed9ba7984cd4098e9c98a65d064df053792a4fde
-EBUILD mnogosearch-3.2.38.ebuild 3299 RMD160 0fe1f1e9f7e730b0d36aebcc879c90a48b6130f2 SHA1 18308da243370d8bf8af32083ebe1164fe1f863d SHA256 479cf72b8e635d251fd328f8e7ddc8cdc61490c494465168036aab0c2cd004a7
-MD5 ab2766215e259d9af2c533263ca64f1b mnogosearch-3.2.38.ebuild 3299
-RMD160 0fe1f1e9f7e730b0d36aebcc879c90a48b6130f2 mnogosearch-3.2.38.ebuild 3299
-SHA256 479cf72b8e635d251fd328f8e7ddc8cdc61490c494465168036aab0c2cd004a7 mnogosearch-3.2.38.ebuild 3299
-EBUILD mnogosearch-3.2.40.ebuild 3299 RMD160 0fe1f1e9f7e730b0d36aebcc879c90a48b6130f2 SHA1 18308da243370d8bf8af32083ebe1164fe1f863d SHA256 479cf72b8e635d251fd328f8e7ddc8cdc61490c494465168036aab0c2cd004a7
-MD5 ab2766215e259d9af2c533263ca64f1b mnogosearch-3.2.40.ebuild 3299
-RMD160 0fe1f1e9f7e730b0d36aebcc879c90a48b6130f2 mnogosearch-3.2.40.ebuild 3299
-SHA256 479cf72b8e635d251fd328f8e7ddc8cdc61490c494465168036aab0c2cd004a7 mnogosearch-3.2.40.ebuild 3299
-MISC ChangeLog 499 RMD160 077e89b384264e079fd60825aafbdb1501e3f3ab SHA1 9efda477bdeb1be81f9cc80dd5985ea7c26917db SHA256 c42fd08f467df3d1e5d50134b95fde3e6213e3b7a98525e232ebe954b8ce3a0a
-MD5 d42ab9eb45535290079c238226f0615b ChangeLog 499
-RMD160 077e89b384264e079fd60825aafbdb1501e3f3ab ChangeLog 499
-SHA256 c42fd08f467df3d1e5d50134b95fde3e6213e3b7a98525e232ebe954b8ce3a0a ChangeLog 499
+EBUILD mnogosearch-3.2.40.ebuild 3308 RMD160 a6dc3940dc35d6f034b0446b42ee28f45cbe9326 SHA1 7d0fa21c6dc6e43708969844886ee953e18c29f2 SHA256 326184b6c71e8d7cad28e879bcf1204a40a212ee44ffa85535dd36c6de0cb981
+MISC ChangeLog 697 RMD160 fc5abe9ef0ab47e571d6d6c2ca60e720f94959db SHA1 f7cc0fbba087e861f6c336e1d4323673b1e4d348 SHA256 888726fbde781a37f3ebe07f32a8affdd0440f9c568d595116811a8f32525cca
 MISC metadata.xml 715 RMD160 aefe5b5ec31e623a3296839cf5d3314880446e59 SHA1 0294c3e4e16c40b017d855e9f3f62b4135cf2369 SHA256 ad90d833d218f6c89d8d39842b88bbbcc8f863733a62432e5e5f33257aed082b
-MD5 e2326d30a74898ed80d6b1cc3d34bad7 metadata.xml 715
-RMD160 aefe5b5ec31e623a3296839cf5d3314880446e59 metadata.xml 715
-SHA256 ad90d833d218f6c89d8d39842b88bbbcc8f863733a62432e5e5f33257aed082b metadata.xml 715
-MD5 75703f0c0c058c696a6cdf792a23cd1c files/digest-mnogosearch-3.2.38 259
-RMD160 bffa8dc6a3e0506d18c124cef9ffbdca151d3dff files/digest-mnogosearch-3.2.38 259
-SHA256 100a49c79aa6a9e9deed14cd65545a08b34991e699e68a7eba9aa50f032dc572 files/digest-mnogosearch-3.2.38 259
-MD5 cb78e157d476e691dd9a816205a123b7 files/digest-mnogosearch-3.2.40 259
-RMD160 e0f71694322252329c8b00673ef1b04ed0cad792 files/digest-mnogosearch-3.2.40 259
-SHA256 025b056043d069d9b02bfa9e92abd80028267bbeeb6c754f47f0ab73ff19d9f5 files/digest-mnogosearch-3.2.40 259
diff --git a/www-apps/mnogosearch/files/digest-mnogosearch-3.2.38 b/www-apps/mnogosearch/files/digest-mnogosearch-3.2.38
deleted file mode 100644
index 987935a..0000000
--- a/www-apps/mnogosearch/files/digest-mnogosearch-3.2.38
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2aa9a123857a3a6ee77daac762979310 mnogosearch-3.2.38.tar.gz 3422447
-RMD160 3545da15ec3463a0fdcc658d2e1cc24961ade423 mnogosearch-3.2.38.tar.gz 3422447
-SHA256 486c29d5beb988f5e4e9dd18bebb17486954d19562a776967eefe23d62001231 mnogosearch-3.2.38.tar.gz 3422447
diff --git a/www-apps/mnogosearch/mnogosearch-3.2.38.ebuild b/www-apps/mnogosearch/mnogosearch-3.2.38.ebuild
deleted file mode 100644
index babe4e0..0000000
--- a/www-apps/mnogosearch/mnogosearch-3.2.38.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit webapp eutils autotools
-
-DESCRIPTION="Web search engine software for intranet and internet servers."
-HOMEPAGE="http://search.mnogo.ru/"
-SRC_URI="http://search.mnogo.ru/Download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
-# TODO:
-# Create use.local.dest with:
-# www-apps/mnogosearch:zlib - enable HTTP Content encoding, this also enable cache support
-# www-apps/mnogosearch:utf8 - Use UTF8 encoding instead of LATIN1.
-
-IUSE="doc zlib ssl mysql postgres sqlite cjk utf8"
-
-RDEPEND="zlib? ( sys-libs/zlib )
-		ssl? ( dev-libs/openssl )
-		sqlite? ( =dev-db/sqlite-2.8* )"
-DEPEND="${RDEPEND}
-		doc? ( app-text/openjade
-				app-text/docbook-dsssl-stylesheets )
-		mysql? ( dev-db/mysql )
-		postgres? ( dev-db/postgresql )"
-
-pkg_setup() {
-	webapp_pkg_setup
-	use mysql || use postgres || use sqlite || {
-		ewarn "No database selected! indexing part will not be compiled!" ;
-		ewarn "If it's incorrect, add mysql, postgres or sqlite in USE flags." ;
-		ebeep ; }
-}
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-configure.in.patch
-	epatch ${FILESDIR}/${PN}-indexer.conf.patch
-
-	einfo Sedding files...
-
-	find ${S} -name Makefile.am -exec \
-	sed -i \
-	-e "s:\$[(]DESTDIR[)]\$[(]prefix[)]/doc:$\(DESTDIR\)/usr/share/doc/${PF}:" \
-	-e "s:datadir:pkgdatadir:" \{\} \; || die "sed of find Makefile.am failed"
-
-	use utf8 && { sed -i \
-	-e "s:^#LocalCharset UTF-8:LocalCharset UTF-8:" \
-	${S}/etc/indexer.conf-dist || die "sed of indexer.conf-dist failed" ; }
-
-	use utf8 && { sed -i \
-	-e "s:^LocalCharset   iso-8859-1:LocalCharset   UTF-8:" \
-	-e "s:^BrowserCharset iso-8859-1:BrowserCharset UTF-8:" \
-	${S}/etc/search.htm-dist || die "sed of search.htm-dist failed" ; }
-
-	sed -i \
-	-e "s%e.g. http://www.mnogosearch.org,%e.g. http://www.gentoo.org,%" \
-	-e 's:<td align="left">:<td align="center">:' \
-	-e "s:bar@localhost/udm/:bar@localhost/mnogosearch/:" \
-	${S}/etc/search.htm-dist || die "sed of search.htm-dist failed"
-
-	sed -i \
-	-e 's:UdmStrdup(UDM_CONF_DIR):UdmStrdup("../mnogosearch/"):' \
-	${S}/src/search.c || die "sed of search.c failed"
-
-	sed -i -e "s:-dist::" ${S}/etc/Makefile.am || die "sed -dist failed"
-	cd ${S}/etc/
-	rename -dist '' *-dist || \
-	ewarn "rename failed... You'll have to rename -dist files by yourself."
-
-	cd ${S}
-	AT_M4DIR="build/m4"
-	eautoreconf
-}
-
-src_compile() {
-	econf $(use_with doc docs) \
-	$(use_with ssl openssl) \
-	$(use_with cjk extra-charsets all) \
-	$(use_with zlib) \
-	$(use_with mysql) \
-	$(use_with postgres pgsql) \
-	$(use_with sqlite sqlite /usr) \
-	--sysconfdir=${MY_HOSTROOTDIR}/mnogosearch || die "./configure failed"
-
-	emake || die "compilation failed"
-}
-
-src_install() {
-	webapp_src_preinst
-	make DESTDIR="${D}" install
-	mv ${D}/usr/bin/search.cgi ${D}/${MY_CGIBINDIR}
-
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-
-	for CFG in $(find ${D}${MY_HOSTROOTDIR}/mnogosearch/*) ; do
-		local configfile=${CFG/${D}/}
-		webapp_configfile ${configfile}
-	done
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	use mysql || use postgres || use sqlite || {
-		ewarn "No database selected! indexing part is not compiled!" ;
-		ewarn "If it's incorrect, add mysql, postgres or sqlite in USE flags." ; }
-	echo
-	webapp_pkg_postinst
-}
diff --git a/www-apps/mnogosearch/mnogosearch-3.2.40.ebuild b/www-apps/mnogosearch/mnogosearch-3.2.40.ebuild
index babe4e0..fae4fb7 100644
--- a/www-apps/mnogosearch/mnogosearch-3.2.40.ebuild
+++ b/www-apps/mnogosearch/mnogosearch-3.2.40.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -15,7 +15,7 @@ KEYWORDS="~x86 ~amd64"
 # www-apps/mnogosearch:zlib - enable HTTP Content encoding, this also enable cache support
 # www-apps/mnogosearch:utf8 - Use UTF8 encoding instead of LATIN1.
 
-IUSE="doc zlib ssl mysql postgres sqlite cjk utf8"
+IUSE="doc zlib ssl mysql postgres sqlite cjk unicode"
 
 RDEPEND="zlib? ( sys-libs/zlib )
 		ssl? ( dev-libs/openssl )
@@ -46,11 +46,11 @@ src_unpack() {
 	-e "s:\$[(]DESTDIR[)]\$[(]prefix[)]/doc:$\(DESTDIR\)/usr/share/doc/${PF}:" \
 	-e "s:datadir:pkgdatadir:" \{\} \; || die "sed of find Makefile.am failed"
 
-	use utf8 && { sed -i \
+	use unicode && { sed -i \
 	-e "s:^#LocalCharset UTF-8:LocalCharset UTF-8:" \
 	${S}/etc/indexer.conf-dist || die "sed of indexer.conf-dist failed" ; }
 
-	use utf8 && { sed -i \
+	use unicode && { sed -i \
 	-e "s:^LocalCharset   iso-8859-1:LocalCharset   UTF-8:" \
 	-e "s:^BrowserCharset iso-8859-1:BrowserCharset UTF-8:" \
 	${S}/etc/search.htm-dist || die "sed of search.htm-dist failed" ; }