Version bump. Bug #469396

Package-Manager: portage-2.1.11.63/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2BA7F3C!

3 files changed, 202 insertions, 12 deletions

diff --git a/app-misc/recoll/ChangeLog b/app-misc/recoll/ChangeLog
index 97b4aabecef8..912ab182a138 100644
--- a/app-misc/recoll/ChangeLog
+++ b/app-misc/recoll/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/recoll
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/recoll/ChangeLog,v 1.18 2013/03/02 19:31:11 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/recoll/ChangeLog,v 1.19 2013/05/18 09:39:27 hwoarang Exp $
+
+*recoll-1.18.2 (18 May 2013)
+
+  18 May 2013; Markos Chandras <hwoarang@gentoo.org> +recoll-1.18.2.ebuild:
+  Version bump. Bug #469396
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> recoll-1.16.2.ebuild,
   recoll-1.17.3-r1.ebuild, recoll-1.17.3.ebuild, recoll-1.18.1.ebuild:
diff --git a/app-misc/recoll/Manifest b/app-misc/recoll/Manifest
index acc57df65703..1496a5c4d299 100644
--- a/app-misc/recoll/Manifest
+++ b/app-misc/recoll/Manifest
@@ -4,23 +4,30 @@ Hash: SHA256
 DIST recoll-1.16.2.tar.gz 1422148 SHA256 f0f29dff2d82ef8541c51963870f31daf28472f3c8822c81c17c346769b77355 SHA512 c71458bd1a42ef118560e516f30787b8c9dbc8b2841e667b77e420b0866c8308f8509e46be9eaa731348438d4194d1954bf369ea68e23eca5a65ac516806c609 WHIRLPOOL 320afbd8598aae44827eff09dfa936090fe1c4bf34e5d10f4115a211267e8f7f09b4e530e8915c75252dee3bda3c4955979a19075e14da4d99f27ee1bf00df92
 DIST recoll-1.17.3.tar.gz 1757278 SHA256 7778f80546e6b10ca45bfb7f8bb0876ccf3987dd4e98c5003ff923bd8b5acb1c SHA512 b41d28255e6bfbfc8e0025d88c3d56ecfbd35814bfa359c41f3e5d3cc25debe6d66dc617aa4c012e1911aa8c373c48a1661f7fff926e2cce423562af82c2fb31 WHIRLPOOL 3ba9d58a0df401832b1a97f34f4caec1b79aa7de027b936b05195d447e374097bff9205714b1a97c287610c74c0ec2e7e726b144c2295859c293a013c3564644
 DIST recoll-1.18.1.tar.gz 2026276 SHA256 8ea01dc64002b594b7ca08cf40c5581963bd98617d8ab5554164a8af4a9fd933 SHA512 cf930c648339843b00b5d8bd2074e111f3b397b3ed8453a8fcb7bfcf295adb95e7d0b7d7dcc78819609e7eb5417e1c259d4b10c6ea80c4b45fd61906ab7a7236 WHIRLPOOL 36de30218ca82bc09506e24104e84cf8ca2bc7dbcd00495dc203c6e5d083f5eac6badb513a4892465ae5d2b9869cf4dec89c2f519b04df649599ea9c168b080f
+DIST recoll-1.18.2.tar.gz 1969421 SHA256 4729785354bd0d465c92e7d2a6fced688d8c08f1342a9bef2f040e7b10b1f510 SHA512 4f049632e94dc12dc8d1ef3f8ed7221f4ef715619f9afbed28177d83a8f189c94ff2d482e20f799edee1d11b9c1841ed25183825f40e921254d370449eddf67c WHIRLPOOL 783ae57339559d4bb5d6b2638ea743898ff60ba53e5ffa8ba67efa910f4537483fdbead57876dacc3e227ec235c84d86921ccee525f05c79ec3a776109b2e8c8
 EBUILD recoll-1.16.2.ebuild 3985 SHA256 bba4534d54805789f646db91eac2b82c09ce86da45aaab3605e138ccdf4b4d7d SHA512 038bf787287601471a083feed806eb1f5e352ed6b49893189944bac296da33100f890a1c8a2d861c09116956892298b1fb77ec481c4f9642c9a427ac7862a377 WHIRLPOOL 4e017b1cdbac03f86ce78acc4e6483f0fcf77cee5f31ae57784f3449cd00451c8ed9edff2f39b6b6e3bc497b79e74ab4ceb6eff75d1664b3b88a284c1742e1e7
 EBUILD recoll-1.17.3-r1.ebuild 4274 SHA256 4d78e8d6f380f275c0ee9cd3d3f05fd3455783b3eaeb539604994e569141cfa2 SHA512 dc8f5bc8da1378b4111bbaff4d52f0c84ac1a7da1bb77946c50f21b1ea88a6e0d8f7d1febd64b232284b880103fd338e55de4ee217d9650d81598f29e112cf15 WHIRLPOOL 93da1326d49e6582729a8db5e97256b83ba58916bb1d7aad6c0f8e93c3863614b21f66e5eece7609019acf6e6ba4226c7403c24f2f9babd4208dc1632a8832ea
 EBUILD recoll-1.17.3.ebuild 4084 SHA256 c1636c3eb263812e9b61eb5dd1bde70ed7422318b8c8d32bf970b22a2f2163fd SHA512 a57412118ec4ce725074eca29872db96c1dca7240f663346ea5febc2846776fc41fc439e77a84510d0698541e74bbc9bf101fe9b73662adfdf21395e2339ade9 WHIRLPOOL c9f84e1f44869e6b0ab5c7b2f6efda57e218bddf01f40b9dbe995fe9232dd85da89400b0eea5e22a1ad4092d25bdc55483338ce8ad69c87e3ae27fe398e91348
 EBUILD recoll-1.18.1.ebuild 5007 SHA256 7737cbf2eed90162c27a92774c7ec551ccbdc807411645e540135cfa5d8aea91 SHA512 4ec1cdec784796cc3aee2d42d3a0c68d1d85afa30860b42871104e4bdda4551600c33c5171b4c7d544daf952a8e31e54bf4ab9e9846ac36da7641d7141ee7592 WHIRLPOOL f5036e6e43f2c32782c107055e5db2b7a0567ed5209a38303327da7dd483d4d6d74bb93037444f8d20045fe7927d65ec8744a20984e3261d93753b7279a20bcd
-MISC ChangeLog 3112 SHA256 f90823bbda40690736acc0e069a75d7c911e3e20570ccb4334291837d5036d7d SHA512 eca0509bea0f84b9784acdeff2da15bd7674b146015d300b29af4eaaca3efbad1eaea693f283da8b5cf068d9c2f38fb47af3764a6fcf4905aaa6179cee328b2b WHIRLPOOL 11b8c94a9af5a74a3a62f0ebe6c71250b8ed6677b8a18df909163c0654ac6e6c78589d222630940c718ea0976fbbf8de61e787177c835314eb2aa1b5608a0037
+EBUILD recoll-1.18.2.ebuild 5007 SHA256 f6b1e7ea64d4cbb877417e03077515f96307a397b35b631281a6a605b86b266b SHA512 f19abaa111d19525a829073f7cd7607dbe588adc8cc7b6f81940efa0e5335160651935d1cdb87f0a4a509ce065c63d2731791db9e2e68e32b9216dbeae42135e WHIRLPOOL 28741238421f8e141c3a66e9c77ae50aaf959828007d06854657feb8157ce582ef9650cc4f0940a4a9bb62d4efcaa29cdf16e88b444acf42878b0041c1882d1b
+MISC ChangeLog 3247 SHA256 b5f5755fe8b409aa018d8e0cb8d8a1de775dc3768d8ea4df6e7e8acb0bdddc77 SHA512 c67ab3a78800413b800412ed91a87317a08cce28731a3c94d9393315a73c870b35593038f0d5691c68a42a4afe233d2a5d37a77d36256c914642f80517e1f1e8 WHIRLPOOL a24e72070136565c0fef0009864a34866cdfb4b8d4aae0a88b67c4d43e9b1bee1998c47ba2271dd35794e7c124c3dcddaf2df774216143b3bf81d11d14a59155
 MISC metadata.xml 1367 SHA256 b2d220265dea39164d361a7d66b7be7efcb282466431dfc6aa9a8d6f26854387 SHA512 dae413d9038fad880f8de5b5acb01f9dd19ec9f213440382bb1929b18d0e3c156a261d626ae6ec71c970ee59f537968612a65365bb6a2e16d3dfbc8d45261288 WHIRLPOOL 6caa75751f7a7a2481b24eb98185dd20786d9320febfd51e5dd9ff5e671bd3a4a75a5cb47b0aa42b7715550684929c8d3b4febe15d1f28ce78713fd0b82dd944
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQGcBAEBCAAGBQJRSqY5AAoJEJQzkH1pP7W4moQL/jADlc2L+Fzfxv5BcZMSDbtM
-ZuUsSUWHFPlIjDjalfFTMyzYM7SI9R5ZXOisT5zPrFYv6RTvTe18duYTsTABRRW0
-fVke3VzUexZja0OAI/yrthd4us1UrPU6iNXrNMcySaSNc4zx4Po7P6S2MA5VjO1g
-HhT6TieyT1nolfkJiVL++QK0IkSG6lzxzWUQGzcjcrZ8FWoZmtqaHAi2JYwwcTh/
-LHoMilK/0oMW/fzXRCIfYtDiB/ySAVaokiXquaikr+EhoOuKAwfLsrvqvkZdZCtq
-Mmky2GtLpGg2OPgnzIK0pYozs7zc3PRUeYgm/lrPRCVgJEaQHQFKUgcg29iw8U6v
-HbTHLcWTyDwhrFRss1Ca1AopQ8brxNwgFmSHwCWJ6mmUGCyd4/YYQ4FTUAXZkIr5
-X9eNWzqn1/q7Hwi2cCSgESwaeETJxc9l9HRKvVc9BbF4F7IZHs3GUEfzDXFl2Cet
-2sUiKOEua4JIq+uXilPKwQKz0eu3mz5tXBAr2guK+g==
-=vAgB
+iQJ8BAEBCABmBQJRl0xQXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88PP0QAMDhVZkAkkXfExpgK3x2OGpC
+iZMwcqCn66LmW82FJ+2BI80vTCRn5zhN7ULYIqpAXGEwJqvGuMsdWBMyf4amVeb/
+u9iF42IYjJeDen9rB4x9f+r6PaZuPXXxz0oLXs97CQuiz3FANopVN+ivGCes7mCg
+yMNBC2npIXVxAZamtYMWvcgpeIPXLwm3M7HzZJ7uLXj1WTP2RyCewrS0aO6MtY9R
+lFXvEpoG8fJQXS3fhMYNlKs5rlJv7LMCaY4Mb7EVI6JunAeBBThzgZ66HSsduqR/
+RPpA9Qm/+Zb2+7TCkvjln6NIjeoE2ZKFPgPRIsmLprB7MtYosdmoGPd0n9tNSGZj
+DXUBwuFnWl9srlnUELE6iN1lJr+9LbOPb26/VWjXefdnR+6cEbyuFLuiz+tHb545
+a3v5e9LzDF4XIQy+Q50i3oWo2YEr3eersdjI8ev7tsThw7uxBWTQ1ldynXH8Seux
+wqZZGKY2dvfSdsZzaVET71CTL5FN5c6rktJyUpC807MR2/L2hlFoGWKqMuvLSb1r
+aYduMRhejIWpTsLtbb2mrgmPtiS4HDI5cMxRVbJcqG+Pt2i5PjZWJrB8jx9A+bzV
+yILZUlM28Nq2yGa0o4jw03Xixp9Sve9hbY0YSfQ5Mre35f5pYWRdYckew+HD2MnR
+DvjOu0uUurLY5KgDoN2I
+=pmie
 -----END PGP SIGNATURE-----
diff --git a/app-misc/recoll/recoll-1.18.2.ebuild b/app-misc/recoll/recoll-1.18.2.ebuild
new file mode 100644
index 000000000000..95a6ab84438a
--- /dev/null
+++ b/app-misc/recoll/recoll-1.18.2.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/recoll/recoll-1.18.2.ebuild,v 1.1 2013/05/18 09:39:27 hwoarang Exp $
+
+EAPI="4"
+
+PYTHON_DEPEND="2"
+inherit toolchain-funcs qt4-r2 linux-info python readme.gentoo
+
+DESCRIPTION="A personal full text search package"
+HOMEPAGE="http://www.lesbonscomptes.com/recoll/"
+SRC_URI="http://www.lesbonscomptes.com/recoll/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+INDEX_HELPERS="audio chm djvu dvi exif postscript ics info lyx msdoc msppt msxls pdf rtf tex wordperfect xml"
+IUSE="+spell inotify +qt4 +session camelcase xattr webkit fam ${INDEX_HELPERS}"
+
+DEPEND="
+	virtual/libiconv
+	>=dev-libs/xapian-1.0.12
+	sys-libs/zlib
+	spell? ( app-text/aspell )
+	!inotify? ( fam? ( virtual/fam ) )
+	qt4? ( dev-qt/qtcore:4[qt3support] )
+	webkit? ( dev-qt/qtwebkit:4 )
+	session? (
+		inotify? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE )
+		!inotify? ( fam? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) )
+	)
+"
+
+RDEPEND="
+	${DEPEND}
+	app-arch/unzip
+	sys-apps/sed
+	virtual/awk
+	pdf? ( app-text/poppler )
+	postscript? ( app-text/pstotext )
+	msdoc? ( app-text/antiword )
+	msxls? ( app-text/catdoc )
+	msppt? ( app-text/catdoc )
+	wordperfect? ( app-text/libwpd:0.9 )
+	rtf? ( app-text/unrtf )
+	tex? ( dev-tex/detex )
+	dvi? ( virtual/tex-base )
+	djvu? ( >=app-text/djvu-3.5.15 )
+	exif? ( media-libs/exiftool )
+	chm? ( dev-python/pychm )
+	ics? ( dev-python/icalendar )
+	lyx? ( app-office/lyx )
+	audio? ( media-libs/mutagen )
+	xml? ( dev-libs/libxslt )
+	info? ( sys-apps/texinfo )
+	"
+
+REQUIRED_USE="session? ( || ( fam inotify ) )"
+
+pkg_pretend() {
+	if use inotify; then
+		CONFIG_CHECK="~INOTIFY_USER"
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+
+	local i at_least_one_helper
+
+	at_least_one_helper=0
+	for i in $INDEX_HELPERS; do
+		if use $i; then
+			at_least_one_helper=1
+			break
+		fi
+	done
+	if [[ $at_least_one_helper -eq 0 ]]; then
+		ewarn
+		ewarn "You did not enable any of the optional file format flags."
+		ewarn "Recoll can read some file formats natively, but many of them"
+		ewarn "are optional since they require external helpers."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	use xattr && has_version "${CATEGORY}/${PN}:${SLOT}[-xattr]" && FORCE_PRINT_ELOG="yes"
+	! use xattr && has_version "${CATEGORY}/${PN}:${SLOT}[xattr]" && FORCE_PRINT_ELOG="yes"
+
+	DOC_CONTENTS="Default configuration files located at
+		/usr/share/${PN}/examples. Either edit these files to match
+		your needs or copy them to ~/.recoll/ and edit these files
+		instead."
+
+	use xattr && DOC_CONTENTS+="
+		Use flag \"xattr\" enables support for fetching field values
+		from extended file attributes. You will also need to set up a
+		map from the attributes names to the Recoll field names
+		(see comment at the end of the fields configuration file."
+
+	# remember configure.ac is b0rked. Fix it before using eautoreconf in the
+	# future
+	# eautoreconf
+
+	# do not strip binaries
+	sed -i -e "/STRIP/d" "${S}"/${PN}install.in \
+		|| die "Failed to fix the installation script"
+	# Drop all the QMAKE lines. We will do it ourselves
+	sed -i -e "/QMAKE/d" Makefile.in || die
+}
+
+src_configure() {
+	local qtconf
+
+	if use qt4 || use webkit; then
+		qtconf="QMAKEPATH=/usr/bin/qmake"
+	fi
+
+	econf \
+		$(use_with spell aspell) \
+		$(use_enable xattr) \
+		$(use_with inotify) \
+		$(use_enable qt4 qtgui) \
+		$(use_enable camelcase) \
+		$(use_with fam) \
+		$(use_with inotify) \
+		$(use_enable session x11mon) \
+		${qtconf}
+	if use qt4; then
+		cd qtgui && eqmake4 ${PN}.pro && cd ..
+	fi
+}
+
+src_compile() {
+	# Do not let upstream people decide on our behalf
+	sed -i "s:ar ru:$(tc-getAR) ru:" lib/Makefile || die
+
+	emake \
+		CC=$(tc-getCC) \
+		CXX=$(tc-getCXX) \
+		CFLAGS="${CFLAGS} ${LDFLAGS}" \
+		CXXFLAGS="${CXXFLAGS} ${LDFLAGS}"
+}
+
+src_install() {
+	# You probably wonder why I did not fix recollinstall in src_prepare.
+	# --prefix requires an absolute path but recollinstall requires prefix
+	# to be actually 'usr' because double // makes portage sad. And no, I am not
+	# gonna ask upstream to fix the build system
+	sed -i -e "/PREFIX/s:/usr:usr:" "${S}"/${PN}install || die
+	sed -i -e "/prefix/s:/usr:usr:" "${S}"/Makefile || die
+
+	emake DESTDIR="${D%/}" install
+	dodoc ChangeLog README
+	mv "${D}/usr/share/${PN}/doc" "${D}/usr/share/doc/${PF}/html"
+	dosym /usr/share/doc/${PF}/html /usr/share/${PN}/doc
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "1.18 introduces significant index formats"
+		elog "changes to support optional character case and diacritics"
+		elog "sensitivity, and it will be advisable to reset the index in"
+		elog "most cases. This will be best done by destroying the index"
+		elog "directory (rm -rf ~/.recoll/xapiandb). If 1.18 is not configured"
+		elog "for case and diacritics sensitivity, it is mostly compatible"
+		elog "with 1.17 indexes."
+		elog
+	fi
+}