Version bump for Bug 187576; remove old broken version. Major ebuild rewrite, fix dependencies, add lots of use flags, sanitize ebuild.

svn path=/experimental/; revision=531

7 files changed, 185 insertions, 135 deletions

diff --git a/www-apps/mnogosearch/ChangeLog b/www-apps/mnogosearch/ChangeLog
index 32e66d8..cd2e240 100644
--- a/www-apps/mnogosearch/ChangeLog
+++ b/www-apps/mnogosearch/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Sep 2007; Jakub Moc <jakub@gentoo.org>
+  -files/mnogosearch-3.2.38-configure.in.patch,
+  +files/mnogosearch-3.3.4-indexer.conf.patch,
+  -files/mnogosearch-indexer.conf.patch, -mnogosearch-3.2.40.ebuild,
+  +mnogosearch-3.3.4.ebuild:
+  Version bump for Bug 187576; remove old broken version. Major ebuild
+  rewrite, fix dependencies, add lots of use flags, sanitize ebuild.
+
   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
diff --git a/www-apps/mnogosearch/Manifest b/www-apps/mnogosearch/Manifest
index 366b41d..3e66595 100644
--- a/www-apps/mnogosearch/Manifest
+++ b/www-apps/mnogosearch/Manifest
@@ -1,7 +1,6 @@
-AUX mnogosearch-3.2.38-configure.in.patch 472 RMD160 c185c9ce50ca454cee3a6cadcb9a3b347953cf1a SHA1 33184ad4383948b42638ef1fbe144bb5961db0e9 SHA256 06651d4e255c8cf3088671b83629b1aea56436eb627d40b1c073d3c18954d017
-AUX mnogosearch-indexer.conf.patch 829 RMD160 6d0d91d8170e8ab95d777d953a8adbb5f4ca864a SHA1 573504e1a315ff671e575c5e3de08494446cf4ba SHA256 eac520e3cdb2956fb1dc49a8e28bf2bb236e69e7a396e8e2bde5f7362ba9ae9e
+AUX mnogosearch-3.3.4-indexer.conf.patch 826 RMD160 c00f5fffe5691ee002c1b871942460b2a2d1850b SHA1 6f632b751b2bb45751240cfd51f99e2ecddb2320 SHA256 f30bfb20f704cd9f59ce65c2a0f57db9f4e00c22b3b4394171c61b79f9b62bb4
 AUX postinstall-en.txt 1161 RMD160 45abe76526f52088f7cc841bd12994c105fb293e SHA1 7f9fb7397f1c92c63a0dcbf63f5ad5bd00ec1a09 SHA256 86b5065d8c532e1de15f18df458754821f216566a61906091b265b9e9018ed0b
-DIST mnogosearch-3.2.40.tar.gz 3408680 RMD160 3ff279c1b4b052cb1fa18fa078316e2fd1f9d584 SHA1 1923c2803e233d7fdfcfea01e005933d7fad2cc9 SHA256 c74fdfa601db052023551d10ed9ba7984cd4098e9c98a65d064df053792a4fde
-EBUILD mnogosearch-3.2.40.ebuild 3308 RMD160 a6dc3940dc35d6f034b0446b42ee28f45cbe9326 SHA1 7d0fa21c6dc6e43708969844886ee953e18c29f2 SHA256 326184b6c71e8d7cad28e879bcf1204a40a212ee44ffa85535dd36c6de0cb981
-MISC ChangeLog 697 RMD160 fc5abe9ef0ab47e571d6d6c2ca60e720f94959db SHA1 f7cc0fbba087e861f6c336e1d4323673b1e4d348 SHA256 888726fbde781a37f3ebe07f32a8affdd0440f9c568d595116811a8f32525cca
+DIST mnogosearch-3.3.4.tar.gz 3559399 RMD160 2124ce813c5419757c4cd41e014f376975c6a3cc SHA1 49c92df3639fc87d87e0b27683c304822b6fbad2 SHA256 31d7e4223181fbd3a2a308c1689a4fc465d3bdb28758a5ff876b7619159adc6b
+EBUILD mnogosearch-3.3.4.ebuild 5058 RMD160 08ca74128ae0225404dde13492ce33fc9e6cca52 SHA1 b376cdceec659e6526f2e0b01180236dfda86d4a SHA256 394a44b756c26ed43aa4353c9aff28b3a7c8782dbd095c34ca234be0fde27b86
+MISC ChangeLog 1075 RMD160 25d526a623d80b13d4e92a5042aaa51e54dd9de8 SHA1 6b018657914da2593802767088605e90f82d53dd SHA256 15eef6d0065cca734615bfb6b525150688a77997be95f0cac842211019c538e8
 MISC metadata.xml 715 RMD160 aefe5b5ec31e623a3296839cf5d3314880446e59 SHA1 0294c3e4e16c40b017d855e9f3f62b4135cf2369 SHA256 ad90d833d218f6c89d8d39842b88bbbcc8f863733a62432e5e5f33257aed082b
diff --git a/www-apps/mnogosearch/files/digest-mnogosearch-3.2.40 b/www-apps/mnogosearch/files/digest-mnogosearch-3.2.40
deleted file mode 100644
index 3adb89a..0000000
--- a/www-apps/mnogosearch/files/digest-mnogosearch-3.2.40
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 80515ca73111a1ac66fc496646beb39e mnogosearch-3.2.40.tar.gz 3408680
-RMD160 3ff279c1b4b052cb1fa18fa078316e2fd1f9d584 mnogosearch-3.2.40.tar.gz 3408680
-SHA256 c74fdfa601db052023551d10ed9ba7984cd4098e9c98a65d064df053792a4fde mnogosearch-3.2.40.tar.gz 3408680
diff --git a/www-apps/mnogosearch/files/mnogosearch-3.2.38-configure.in.patch b/www-apps/mnogosearch/files/mnogosearch-3.2.38-configure.in.patch
deleted file mode 100644
index f9a2be0..0000000
--- a/www-apps/mnogosearch/files/mnogosearch-3.2.38-configure.in.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur mnogosearch-3.2.38.orig/configure.in mnogosearch-3.2.38/configure.in
---- mnogosearch-3.2.38.orig/configure.in	2006-03-10 17:08:04.000000000 +0000
-+++ mnogosearch-3.2.38/configure.in	2006-04-30 09:52:33.000000000 +0000
-@@ -1458,7 +1458,7 @@
- 
- AC_MSG_CHECKING(for additional character sets)
- 
--if test "$extra_charsets" = none; then
-+if test "$extra_charsets" = none -o "$extra_charsets" = no ; then
-   CHARSETS=""
- else
-   if test "$extra_charsets" = all; then
diff --git a/www-apps/mnogosearch/files/mnogosearch-indexer.conf.patch b/www-apps/mnogosearch/files/mnogosearch-3.3.4-indexer.conf.patch
index 24eeac0..f04f237 100644
--- a/www-apps/mnogosearch/files/mnogosearch-indexer.conf.patch
+++ b/www-apps/mnogosearch/files/mnogosearch-3.3.4-indexer.conf.patch
@@ -1,6 +1,6 @@
-diff -Naur mnogosearch-3.2.38.orig/etc/indexer.conf-dist mnogosearch-3.2.38/etc/indexer.conf-dist
---- mnogosearch-3.2.38.orig/etc/indexer.conf-dist	2005-10-11 04:23:29.000000000 +0000
-+++ mnogosearch-3.2.38/etc/indexer.conf-dist	2006-04-30 16:08:01.000000000 +0000
+diff -Naur mnogosearch-3.3.4.orig/etc/indexer.conf-dist mnogosearch-3.3.4/etc/indexer.conf-dist
+--- mnogosearch-3.3.4.orig/etc/indexer.conf-dist	2005-10-11 04:23:29.000000000 +0000
++++ mnogosearch-3.3.4/etc/indexer.conf-dist	2006-04-30 16:08:01.000000000 +0000
 @@ -2,9 +2,7 @@
  
  ###########################################################################
@@ -12,3 +12,4 @@ diff -Naur mnogosearch-3.2.38.orig/etc/indexer.conf-dist mnogosearch-3.2.38/etc/
  # Use '#' to comment out lines.
  # All command names are case insensitive (DBAddr=DBADDR=dbaddr).
  # You may use '\' character to prolong current command to next line
+
diff --git a/www-apps/mnogosearch/mnogosearch-3.2.40.ebuild b/www-apps/mnogosearch/mnogosearch-3.2.40.ebuild
deleted file mode 100644
index fae4fb7..0000000
--- a/www-apps/mnogosearch/mnogosearch-3.2.40.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2007 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 unicode"
-
-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 unicode && { sed -i \
-	-e "s:^#LocalCharset UTF-8:LocalCharset UTF-8:" \
-	${S}/etc/indexer.conf-dist || die "sed of indexer.conf-dist failed" ; }
-
-	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" ; }
-
-	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.3.4.ebuild b/www-apps/mnogosearch/mnogosearch-3.3.4.ebuild
new file mode 100644
index 0000000..3b7b9c4
--- /dev/null
+++ b/www-apps/mnogosearch/mnogosearch-3.3.4.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit webapp eutils autotools confutils
+
+DESCRIPTION="Web search engine software for intranet and internet servers."
+HOMEPAGE="http://www.mnogosearch.org/"
+SRC_URI="http://www.mnogosearch.org/Download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+WEBAPP_MANUAL_SLOT="yes"
+SLOT="0"
+
+CONFUTILS_MISSING_DEPS="db2 interbase oci8 sapdb solid sybase"
+
+DBFLAGS="db2 firebird freetds interbase iodbc mysql oci8 odbc postgres sapdb solid sqlite sqlite3 sybase"
+EXPERIMENTAL_FLAGS="mysqlfulltext"
+IUSE="${DBFLAGS} chasen cjk doc indexer mecab msoffice pdf readline ssl unicode zlib"
+
+COMMON_DEPEND="chasen? ( app-text/chasen )
+	firebird? ( dev-db/firebird )
+	freetds? ( dev-db/freetds )
+	iodbc? ( dev-db/libiodbc dev-db/unixODBC )
+	mecab?  ( app-text/mecab )
+	mysql? ( virtual/mysql )
+	odbc? ( dev-db/unixODBC )
+	postgres? ( dev-db/libpq )
+	readline? ( sys-libs/readline )
+	sqlite? ( =dev-db/sqlite-2* )
+	sqlite3? ( =dev-db/sqlite-3* )
+	ssl? ( dev-libs/openssl )
+	zlib? ( sys-libs/zlib )"
+	# mysqlfulltext ( >=virtual/mysql-5.1 )
+
+DEPEND="${COMMON_DEPEND}
+	doc? ( app-text/openjade app-text/docbook-sgml-utils )"
+
+RDEPEND="${COMMON_DEPEND}
+	msoffice? ( app-text/catdoc )
+	pdf? ( virtual/ghostscript )"
+
+pkg_setup() {
+	confutils_warn_about_missing_deps
+
+	# only die on missing DB support if user actually requires indexing
+	for i in ${DBFLAGS} ; do
+		use ${i} && dbs_enabled="${dbs_enabled} ${i}"
+	done
+
+	if [[ -z ${dbs_enabled} ]] ; then
+		if use indexer ; then
+			confutils_require_any ${DBFLAGS}
+		else
+			ewarn
+			ewarn "No database selected - indexing part will not be compiled!"
+			ewarn "Add one or more of ${DBFLAGS} to your USE if you want this feature."
+			ewarn
+			ebeep
+			epause 3
+		fi
+	fi
+
+	webapp_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-indexer.conf.patch
+
+	# fix the documentation install path
+	sed -i -e "s@/doc/@/share/doc/${PF}/html/@" doc/Makefile.{am,in} \
+			|| die "sed failed on Makefile.{am,in}"
+
+	# modify search.cgi to support vhosts
+	sed -i -e 's@UdmStrdup(UDM_CONF_DIR)@UdmStrdup("../mnogosearch/")@' src/search.c \
+		|| die "sed failed on search.c"
+	
+	# modify conf.c to support vhosts
+	sed -i -e 's@UDM_CONF_DIR@"../mnogosearch/"@' src/conf.c \
+		|| die "sed failed on conf.c"
+
+	# enable external parser for MS Office Word and Excel documents
+	if use msoffice ; then
+		sed -i -e "s@^#Mime application/msword@Mime application/msword@" \
+			-e "s@^#Mime application/vnd.ms-excel@Mime application/vnd.ms-excel@" \
+			etc/indexer.conf-dist || die "sed failed on indexer.conf-dist"
+	fi
+
+	if use unicode ; then
+		# modify indexer.conf for proper utf-8 display and indexing support
+		sed -i -e '/^#Mime text\/x-postscript/s@text/plain@"text/plain; charset=utf-8"@' \
+			-e '/^#Mime application\/pdf/s@text/plain@"text/plain; charset=utf-8"@' \
+			-e "s@^#LocalCharset UTF-8@LocalCharset UTF-8@" \
+			etc/indexer.conf-dist || die "sed failed on indexer.conf-dist"
+
+		# modify search.htm for proper utf-8 display
+		sed -i -e "/^LocalCharset/s@iso-8859-1@UTF-8@" \
+			-e "/^BrowserCharset/s@iso-8859-1@UTF-8@" \
+			etc/search.htm-dist || die "sed failed on search.htm-dist"
+	fi
+
+	# enable external parser for pdf and ps documents
+	if use pdf ; then
+		sed -i -e "s@^#Mime text/x-postscript@Mime text/x-postscript@" \
+			-e "s@^#Mime application/pdf@Mime application/pdf@" \
+			etc/indexer.conf-dist || die "sed failed on indexer.conf-dist"
+	fi
+
+	# rename the config files to provide a working default installation
+	find "${S}/etc" -name 'Makefile.??' -exec sed -i -e "s@-dist@@" {} \; || die "sed -dist failed"
+	for i in etc/*-dist ; do
+		mv ${i} ${i/-dist/} || die "moving ${i} failed"
+	done
+
+	# and finally reconfigure now
+	AT_M4DIR="build/m4" eautoreconf
+}
+
+src_compile() {
+	econf \
+		$(use_with chasen chasen /usr) \
+		$(use_with cjk extra-charsets all) \
+		$(use_with db2) \
+		$(use_with doc docs) \
+		$(use_with firebird ibase /opt) \
+		$(use_with freetds freetds /usr) \
+		$(use_with interbase ibase /opt) \
+		$(use_with iodbc iodbc /usr) \
+		$(use_with mecab) \
+		$(use_with mysql) \
+		$(use_with oci8 oracle8 ${ORACLE_HOME}) \
+		$(use_with odbc unixODBC /usr) \
+		$(use_with postgres pgsql /usr) \
+		$(use_with readline) \
+		$(use_with sapdb) \
+		$(use_with solid) \
+		$(use_with sqlite) \
+		$(use_with sqlite3) \
+		$(use_with sybase sybase /opt) \
+		$(use_with ssl openssl) \
+		$(use_with zlib) \
+		--datadir=/usr/share/${PN} \
+		--sysconfdir=${MY_HOSTROOTDIR}/${PN}
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--includedir=/usr/include/${PN}
+
+		# $(use_with mysqlfulltext mysql-fulltext-plugin ) \
+
+	emake || die "compilation failed"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	emake 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
+}