gentoo resync : 17.12.2017

4 files changed, 2 insertions, 268 deletions

diff --git a/app-misc/recoll/Manifest b/app-misc/recoll/Manifest
index 20deefc2aa86..90cd61f94829 100644
--- a/app-misc/recoll/Manifest
+++ b/app-misc/recoll/Manifest
@@ -1,7 +1,3 @@
-DIST recoll-1.22.4.tar.gz 2511949 BLAKE2B fd1104903f63e8ab5834247d867169954b20907716fc309a5f6e24a9a71503994b0a97cb41a0abc60a9b18317790f46c4d5c1878091e1ceac38a4e40f5225304 SHA512 90d258c854972a41adbb3eef71b08d25c5aea24ed6fc830245d19e273112c016b66b0359e1d83143992d07b5a67226216e8f406ac135c21da6b86c7ffde31225
-DIST recoll-1.23.2.tar.gz 2546793 BLAKE2B 843d8e83f3f785d096e93062b00f7d3494a1bf066ea7334e2150c767f775c96f1b09760a5017763f71a6056036f56bf509883118d37520a61bf668a0bb44656b SHA512 0f3d6bae73da066e92e328f963129979f43a12a622120c26d66debde66e569e19e3e8b61154ee77386ad93e968d88262d3e22a679b618bcb8bf468fa16a46769
 DIST recoll-1.23.3.tar.gz 2590148 BLAKE2B ec058bac500aa61b4e395720bffcc2bfbcaded954c986e8e1fe69720456267c33b5e34eb3e28de47f57d9af207c60b138c521792882b093120b988b682600b2a SHA512 bfad118dd9561c8d18e194b11d8014e2f9ea74f6aaf50f91704087775e6f72d5f3574a3eafe470dab7658cb4a7233817a672af939f21b3e69c719e599bc5cd06
-EBUILD recoll-1.22.4.ebuild 3717 BLAKE2B 8acbaf174f41c67127452cfc12258fce94be6e1fc3c431ccf8d122cfbb073071d19da7c11749d0a9d6dfde89ebb2d64b5e7ffd44e14ed8d1d7240b0037466f4c SHA512 9984c5feec2ab7110d32804ed5dcf7af5fd2b26e5589fd934a86628b46d155ca74b6c75e8ab82823d18ab0c9e3b82d13a187322043aa7ff5d9cc5e09731aadb0
-EBUILD recoll-1.23.2.ebuild 3700 BLAKE2B 547512bb096eba4cc5a088fa08502238485c6eea3b7811ce68702a268601b719ff78703f948c4e82027cabbe8df7a9770b2fbab9599c7bce5e916e3ad7eec325 SHA512 1f2c012f168607cfc18cafc6230b2ed291ff3fa814d458592b0c32360e52577223e73f0e17be329bce7f44743d26100b9ab61217072de24bd9edf077b28a22f4
-EBUILD recoll-1.23.3.ebuild 3531 BLAKE2B 520eff7fcf0bc437d6b07dccd9effacbf63fea36de66e81b5228c8adf183fd8ddbbc5cb63007c64818b4406e98e011f3967b13a49b5556875d49036db9fc931f SHA512 809c442e9b173e55d00a5e81a951fb0bba15ae64000e6cfe5901cc98c9338314dcbf9f3cb137a0d6d4b6da211ea9cf43ed78774c908066a0760ade70e8560d9a
+EBUILD recoll-1.23.3.ebuild 3530 BLAKE2B 2ab1153d20e6868ce8cf8f641a475957e51ca98ed322fe00edbafc9e8766639b5a91054bef716e628ea1e15300a73a629f7fef8251c30e666e5910bc56a1e462 SHA512 a37a458472a8c8b07f3c2d9b61bfed65e22d7f94622b941a0dc1cf1175bf57ffe5e49a063972490670b122adddc6471b01ed046560b237a9de0a2a7e2eef4724
 MISC metadata.xml 1204 BLAKE2B a27afe4b6f800a38fa63956a750e4ddcd8ac2e9a785df910f660fce03357a77b37752e405be6d76fad74ce6f90d8564912499f397eb819535859ddc259cbc7a3 SHA512 581c483f1d64131cb7a83e9a899b5286f03cbacc3f011c5fcdb3236b56e2b22e1a0fa880b34bb107874fe03fde7f82767805bb7e2d0aa46367e8d5dca0037ea5
diff --git a/app-misc/recoll/recoll-1.22.4.ebuild b/app-misc/recoll/recoll-1.22.4.ebuild
deleted file mode 100644
index 5e0fe2627c57..000000000000
--- a/app-misc/recoll/recoll-1.22.4.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils linux-info python-single-r1 qmake-utils
-
-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"
-
-IUSE="camelcase doc +inotify qt4 qt5 session +spell"
-REQUIRED_USE="session? ( inotify ) ${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
-	dev-libs/xapian:=
-	sys-libs/zlib
-	virtual/libiconv
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwebkit:5
-	)
-	!qt5? ( qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	) )
-	session? (
-		inotify? ( x11-libs/libSM x11-libs/libICE )
-	)
-	spell? ( app-text/aspell )
-	${PYTHON_DEPS}
-"
-DEPEND="${COMMON_DEPEND}
-	qt5? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	app-arch/unzip
-	sys-apps/sed
-	virtual/awk
-"
-
-pkg_setup() {
-	if has_version "<app-misc/recoll-1.20"; then
-		einfo "Installing ${PV} over an 1.19 index is possible,"
-		einfo "but there have been small changes in the way"
-		einfo "compound words are indexed. So it is best to reset"
-		einfo "the index. The best method to reset the index is to"
-		einfo "quit all recoll programs and delete the index directory"
-		einfo "rm -rf ~/.recoll/xapiandb, then start recoll or recollindex."
-	fi
-	if use inotify; then
-		CONFIG_CHECK="~INOTIFY_USER"
-		check_extra_config
-	fi
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	python_fix_shebang filters
-	default
-}
-
-src_configure() {
-	local qtconf
-	if use qt4 || use qt5; then
-		qtconf="--enable-qtgui"
-		if use qt5; then
-			export QT_SELECT=qt5
-			qtconf+=" --enable-webkit"
-		elif use qt4; then
-			export QT_SELECT=qt4
-			qtconf+=" --disable-webkit"
-		fi
-	else
-		qtconf="--disable-qtgui --disable-webkit"
-	fi
-
-	econf \
-		$(use_enable camelcase) \
-		$(use_enable session x11mon) \
-		$(use_with inotify) \
-		$(use_with spell aspell) \
-		${qtconf} \
-		--without-fam \
-		--enable-recollq
-}
-
-src_install() {
-	emake STRIP="$(type -P true)" DESTDIR="${D}" install
-	prune_libtool_files
-
-	# html docs should be placed in /usr/share/doc/${PN}/html
-	use doc && dodoc "${ED}"/usr/share/recoll/doc/*
-	rm -r "${ED}/usr/share/recoll/doc" || die
-}
-
-pkg_postinst() {
-	einfo "In order to extract the full functionality of "
-	einfo "recoll, the following packages should be installed "
-	einfo "to get the corresponding document support."
-
-	optfeature "XML based documents support"    "dev-libs/libxslt[python] dev-libs/libxml2[python]"
-	optfeature "PDF files support"              app-text/poppler
-	optfeature "PDF files with OCR support"     app-text/tesseract
-	optfeature "MS Word files support"          app-text/antiword
-	optfeature "Wordperfect files support"      "app-text/libwpd[tools]"
-	optfeature "Lyx files support"              app-office/lyx
-	optfeature "CHM files support"              dev-python/pychm
-	optfeature "GNU Info files support"         sys-apps/texinfo
-	optfeature "RAR archives support"           dev-python/rarfile
-	optfeature "7zip archives support"          dev-python/pylzma
-	optfeature "iCalendar files support"        dev-python/icalendar
-	optfeature "Postscript files support"       app-text/pstotext
-	optfeature "RTF files support"              app-text/unrtf
-	optfeature "TeX files support"              dev-text/detex
-	optfeature "DVI files support"              virtual/tex-base
-	optfeature "DJVU files support"             app-text/djvu
-	optfeature "tags in audio files support"    media-libs/mutagen
-	optfeature "tags in image files support"    media-libs/exiftool
-	optfeature "Midi karaoke files support"     dev-python/chardet
-}
diff --git a/app-misc/recoll/recoll-1.23.2.ebuild b/app-misc/recoll/recoll-1.23.2.ebuild
deleted file mode 100644
index c17511e06209..000000000000
--- a/app-misc/recoll/recoll-1.23.2.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit linux-info python-single-r1 qmake-utils
-
-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"
-
-IUSE="camelcase doc +inotify qt4 qt5 session +spell"
-REQUIRED_USE="session? ( inotify ) ${PYTHON_REQUIRED_USE}"
-
-CDEPEND="
-	dev-libs/xapian:=
-	sys-libs/zlib
-	virtual/libiconv
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwebkit:5
-	)
-	!qt5? ( qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	) )
-	session? (
-		inotify? ( x11-libs/libSM x11-libs/libICE )
-	)
-	spell? ( app-text/aspell )
-	${PYTHON_DEPS}
-"
-
-DEPEND="
-	${CDEPEND}
-	qt5? ( dev-qt/linguist-tools:5 )
-"
-
-RDEPEND="
-	${CDEPEND}
-	app-arch/unzip
-	sys-apps/sed
-	virtual/awk
-"
-
-pkg_setup() {
-	if has_version "<app-misc/recoll-1.20"; then
-		einfo "Installing ${PV} over an 1.19 index is possible,"
-		einfo "but there have been small changes in the way"
-		einfo "compound words are indexed. So it is best to reset"
-		einfo "the index. The best method to reset the index is to"
-		einfo "quit all recoll programs and delete the index directory"
-		einfo "rm -rf ~/.recoll/xapiandb, then start recoll or recollindex."
-	fi
-	if use inotify; then
-		CONFIG_CHECK="~INOTIFY_USER"
-		check_extra_config
-	fi
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	python_fix_shebang filters
-	default
-}
-
-src_configure() {
-	local qtconf
-	if use qt4 || use qt5; then
-		qtconf="--enable-qtgui"
-		if use qt5; then
-			export QT_SELECT=qt5
-			qtconf+=" --enable-webkit"
-		elif use qt4; then
-			export QT_SELECT=qt4
-			qtconf+=" --disable-webkit"
-		fi
-	else
-		qtconf="--disable-qtgui --disable-webkit"
-	fi
-
-	econf \
-		$(use_enable camelcase) \
-		$(use_enable session x11mon) \
-		$(use_with inotify) \
-		$(use_with spell aspell) \
-		${qtconf} \
-		--without-fam \
-		--enable-recollq
-}
-
-src_install() {
-	emake STRIP="$(type -P true)" DESTDIR="${D}" install
-	prune_libtool_files
-
-	# html docs should be placed in /usr/share/doc/${PN}/html
-	use doc && dodoc "${ED}"/usr/share/recoll/doc/*
-	rm -r "${ED}/usr/share/recoll/doc" || die
-}
-
-pkg_postinst() {
-	einfo "In order to extract the full functionality of "
-	einfo "recoll, the following packages should be installed "
-	einfo "to get the corresponding document support."
-
-	optfeature "XML based documents support"    "dev-libs/libxslt[python] dev-libs/libxml2[python]"
-	optfeature "PDF files support"              app-text/poppler
-	optfeature "PDF files with OCR support"     app-text/tesseract
-	optfeature "MS Word files support"          app-text/antiword
-	optfeature "Wordperfect files support"      "app-text/libwpd[tools]"
-	optfeature "Lyx files support"              app-office/lyx
-	optfeature "CHM files support"              dev-python/pychm
-	optfeature "GNU Info files support"         sys-apps/texinfo
-	optfeature "RAR archives support"           dev-python/rarfile
-	optfeature "7zip archives support"          dev-python/pylzma
-	optfeature "iCalendar files support"        dev-python/icalendar
-	optfeature "Postscript files support"       app-text/pstotext
-	optfeature "RTF files support"              app-text/unrtf
-	optfeature "TeX files support"              dev-text/detex
-	optfeature "DVI files support"              virtual/tex-base
-	optfeature "DJVU files support"             app-text/djvu
-	optfeature "tags in audio files support"    media-libs/mutagen
-	optfeature "tags in image files support"    media-libs/exiftool
-	optfeature "Midi karaoke files support"     dev-python/chardet
-}
diff --git a/app-misc/recoll/recoll-1.23.3.ebuild b/app-misc/recoll/recoll-1.23.3.ebuild
index 2405a51ae16f..753184453c32 100644
--- a/app-misc/recoll/recoll-1.23.3.ebuild
+++ b/app-misc/recoll/recoll-1.23.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.lesbonscomptes.com/recoll/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 IUSE="camelcase doc +inotify qt5 session +spell"
 REQUIRED_USE="session? ( inotify ) ${PYTHON_REQUIRED_USE}"