commit: 0af19821a9710ad70f10a474ff5e2a10d912d54b Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Jul 18 15:16:45 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Jul 18 15:30:30 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0af19821
app-misc/recoll: Drop old Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> Package-Manager: Portage-2.3.66, Repoman-2.3.11 app-misc/recoll/Manifest | 2 - app-misc/recoll/files/recoll-1.24.1-qt-5.11.patch | 12 -- app-misc/recoll/files/recoll-python3.patch | 17 --- app-misc/recoll/recoll-1.24.1.ebuild | 125 -------------------- app-misc/recoll/recoll-1.25.15.ebuild | 134 ---------------------- 5 files changed, 290 deletions(-) diff --git a/app-misc/recoll/Manifest b/app-misc/recoll/Manifest index d39b5b89da2..9c13790a98f 100644 --- a/app-misc/recoll/Manifest +++ b/app-misc/recoll/Manifest @@ -1,3 +1 @@ -DIST recoll-1.24.1.tar.gz 2644672 BLAKE2B e5bce2231e075fe9a2bfad7d0d1068906e625106b09247dc5baffaf92957db111dd6be90c658266b8b9940d885b3495769c68ce66247d00568df24c1b5222226 SHA512 60bf57d2718a21dbd578fa1dc73a542fc7ab2152c4c5bb763885b19c14d080340587cb8c01f82f1ca7d1cb63a03edf03b4501f3ef63f06ab6506356c4a0a095c -DIST recoll-1.25.15.tar.gz 2843434 BLAKE2B 7facf6040560ab11b7a3d99b583020bdd4757157236a23430381c9d6932de558917f5dd1faf0f1ca87be3386307b5346ec66bb82637edd42035fd7be61ee9b39 SHA512 acd5349e1a1edd6ca22f819b0cfe76161fedb0bde8b4a86e679e78d68d090481a11a8d1980764d008074846b5033481c766e624da1322ab318b52c9c9c57104c DIST recoll-1.25.19.tar.gz 2845683 BLAKE2B 745eac2dd3208619e173abba78f1e03186cdb5deb363c30728184a9d826c698d8e088cc0420178754131792f0d933f395a4fdb209a4315888b733a1209644580 SHA512 d56aff810e335f8212b908118de8fe12fc8d8f8341ebc281244c00dfe2216e008c655f4d39955b6c71928a28ea0aea073036fed17be5b80e8443fe6dfbe374f6 diff --git a/app-misc/recoll/files/recoll-1.24.1-qt-5.11.patch b/app-misc/recoll/files/recoll-1.24.1-qt-5.11.patch deleted file mode 100644 index 146bc981b60..00000000000 --- a/app-misc/recoll/files/recoll-1.24.1-qt-5.11.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/qtgui/ssearch_w.cpp b/qtgui/ssearch_w.cpp -index 2d0c97c..ca72af1 100644 ---- a/qtgui/ssearch_w.cpp -+++ b/qtgui/ssearch_w.cpp -@@ -32,6 +32,7 @@ - #include <qevent.h> - #include <QTimer> - #include <QCompleter> -+#include <QAbstractItemView> - - #include "log.h" - #include "guiutils.h" \ No newline at end of file diff --git a/app-misc/recoll/files/recoll-python3.patch b/app-misc/recoll/files/recoll-python3.patch deleted file mode 100644 index 6d6fbdf3961..00000000000 --- a/app-misc/recoll/files/recoll-python3.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/filters/recoll-we-move-files.py -+++ b/filters/recoll-we-move-files.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python3 -+#!/usr/bin/env python2 - # Copyright (C) 2017 J.F.Dockes - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -42,6 +42,8 @@ try: - except: - import rclconfig - -+from __future__ import print_function -+ - verbosity = 0 - def logdeb(s): - if verbosity >= 4: diff --git a/app-misc/recoll/recoll-1.24.1.ebuild b/app-misc/recoll/recoll-1.24.1.ebuild deleted file mode 100644 index 3d326d8297b..00000000000 --- a/app-misc/recoll/recoll-1.24.1.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# 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="https://www.lesbonscomptes.com/recoll/"; -SRC_URI="https://www.lesbonscomptes.com/recoll/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -IUSE="camelcase doc +inotify 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 - ) - session? ( - inotify? ( - x11-libs/libSM - x11-libs/libICE - x11-libs/libX11 - ) - ) - spell? ( app-text/aspell ) - ${PYTHON_DEPS} -" - -DEPEND=" - ${CDEPEND} - qt5? ( dev-qt/linguist-tools:5 ) -" - -RDEPEND=" - ${CDEPEND} - app-arch/unzip -" - -PATCHES=( - "${FILESDIR}"/${PN}-python3.patch # python3 patch - "${FILESDIR}"/${P}-qt-5.11.patch # bugs 663028, 660912 -) - -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() { - default - python_fix_shebang filters -} - -src_configure() { - use qt5 && export QMAKE="$(qt5_get_bindir)/qmake" - - econf \ - $(use_enable camelcase) \ - $(use_enable session x11mon) \ - $(use_enable qt5 qtgui) \ - $(use_enable qt5 webkit) \ - $(use_with inotify) \ - $(use_with spell aspell) \ - --without-fam \ - --enable-recollq -} - -src_install() { - emake STRIP="$(type -P true)" DESTDIR="${D}" install - - # html docs should be placed in /usr/share/doc/${PN}/html - use doc && dodoc -r "${ED}"/usr/share/recoll/doc/. - rm -r "${ED}/usr/share/recoll/doc" || die - find "${D}" -name '*.la' -delete || 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.25.15.ebuild b/app-misc/recoll/recoll-1.25.15.ebuild deleted file mode 100644 index 05fa308a893..00000000000 --- a/app-misc/recoll/recoll-1.25.15.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{5,6,7} ) - -inherit eutils linux-info python-single-r1 qmake-utils - -DESCRIPTION="A personal full text search package" -HOMEPAGE="https://www.lesbonscomptes.com/recoll/"; -SRC_URI="https://www.lesbonscomptes.com/recoll/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="camelcase chm doc +inotify qt5 session +spell webengine" -REQUIRED_USE=" - session? ( inotify ) - webengine? ( qt5 ) - ${PYTHON_REQUIRED_USE} -" - -DEPEND=" - dev-libs/xapian:= - sys-libs/zlib:= - virtual/libiconv - chm? ( - dev-libs/chmlib - dev-python/pychm - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtprintsupport:5 - webengine? ( dev-qt/qtwebengine:5[widgets] ) - ) - session? ( - inotify? ( - x11-libs/libSM - x11-libs/libICE - x11-libs/libX11 - ) - ) - spell? ( app-text/aspell ) - ${PYTHON_DEPS} -" - -BDEPEND=" - qt5? ( dev-qt/linguist-tools:5 ) -" - -RDEPEND=" - ${DEPEND} - app-arch/unzip -" - -pkg_pretend() { - if has_version "<app-misc/recoll-1.20"; then - elog "Installing ${PV} over an 1.19 index is possible," - elog "but there have been small changes in the way" - elog "compound words are indexed. So it is best to reset" - elog "the index. The best method to reset the index is to" - elog "quit all recoll programs and delete the index directory" - elog "rm -rf ~/.recoll/xapiandb, then start recoll or recollindex." - fi -} - -pkg_setup() { - if use inotify; then - local CONFIG_CHECK="~INOTIFY_USER" - check_extra_config - fi - python-single-r1_pkg_setup -} - -src_prepare() { - default - python_fix_shebang filters -} - -src_configure() { - use qt5 && export QMAKE="$(qt5_get_bindir)/qmake" - - local myeconfargs=( - $(use_enable camelcase) - $(use_enable chm python-chm) - $(use_enable session x11mon) - $(use_enable qt5 qtgui) - $(use_enable webengine) - $(use_with inotify) - $(use_with spell aspell) - --disable-webkit - --without-fam - --enable-recollq - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - emake STRIP="$(type -P true)" DESTDIR="${D}" install - - # html docs should be placed in /usr/share/doc/${PN}/html - use doc && dodoc -r "${ED}"/usr/share/recoll/doc/. - rm -r "${ED}/usr/share/recoll/doc" || die - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - elog "In order to extract the full functionality of " - elog "recoll, the following packages should be installed " - elog "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 "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 -}
