From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 63259139695 for ; Thu, 27 Apr 2017 18:15:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 28745E0CB7; Thu, 27 Apr 2017 18:15:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E4D98E0CB7 for ; Thu, 27 Apr 2017 18:15:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 86C333416BC for ; Thu, 27 Apr 2017 18:15:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E66637445 for ; Thu, 27 Apr 2017 18:15:03 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1493316884.6e026c287b096b7690f41a5bfdc855bef7f3b534.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/recoll/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/recoll/Manifest app-misc/recoll/metadata.xml app-misc/recoll/recoll-1.19.5-r1.ebuild X-VCS-Directories: app-misc/recoll/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 6e026c287b096b7690f41a5bfdc855bef7f3b534 X-VCS-Branch: master Date: Thu, 27 Apr 2017 18:15:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: dfeadd79-01bf-435c-bd22-7c5e71c2f5de X-Archives-Hash: 0b2d5b9bb75c49d6a0c4fc5b1ae50108 commit: 6e026c287b096b7690f41a5bfdc855bef7f3b534 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Apr 27 17:56:56 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Apr 27 18:14:44 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e026c28 app-misc/recoll: Drop old Package-Manager: Portage-2.3.3, Repoman-2.3.1 app-misc/recoll/Manifest | 1 - app-misc/recoll/metadata.xml | 14 --- app-misc/recoll/recoll-1.19.5-r1.ebuild | 179 -------------------------------- 3 files changed, 194 deletions(-) diff --git a/app-misc/recoll/Manifest b/app-misc/recoll/Manifest index d2a26b7f4a7..55e40de6010 100644 --- a/app-misc/recoll/Manifest +++ b/app-misc/recoll/Manifest @@ -1,2 +1 @@ -DIST recoll-1.19.5.tar.gz 1997615 SHA256 c4d63a4cd1a598117a521a883a6078082b30fe63eef84a879da9b467fcb56a8d SHA512 45ae5dc6d4f6d6dbb3d7e634bd60a2835b767e5d2d8d188636ab4b1777d65a6918c09d5bc09e80e4849aea6e8b2c9c430b99a9e56b645531065e558f4161a5f3 WHIRLPOOL df099f39a681aa1956076018861d064445bcb9fc050c866133a830ebeddb33efcc9a06596ce18d17d80bcfdb663bb780434719092c6c571f42b6093a4c750be3 DIST recoll-1.22.4.tar.gz 2511949 SHA256 8211e1ccc6e576b0c21e5bfb4f49a0b69990a44bd5a3ce6eae4ff16aaf23412f SHA512 90d258c854972a41adbb3eef71b08d25c5aea24ed6fc830245d19e273112c016b66b0359e1d83143992d07b5a67226216e8f406ac135c21da6b86c7ffde31225 WHIRLPOOL 2dac2936e4c13448b6f8cb0c6d9d0d6d1d7c14b47a6761b6115762d734f91cfd8652186627b8ab55149c14ff5b00260838b0e62962f32ecbd4d2bef1f25e44ba diff --git a/app-misc/recoll/metadata.xml b/app-misc/recoll/metadata.xml index 2b4ebed373d..1e89b50bb67 100644 --- a/app-misc/recoll/metadata.xml +++ b/app-misc/recoll/metadata.xml @@ -18,22 +18,8 @@ Enable indexing for camelCase sentences and words - Index chm files - Index dvi files - Index iCalendar files - Index GNU info files Use the Linux Kernel notification subsystem for monitoring file alterations in realtime - Index Latex lyx files - Index Microsoft Word documents - Index Microsoft PowerPoint documents - Index Microsoft Excel documents - Index PDF documents - Index Microsoft RTF documents Stop monitoring file alterations when X11 session terminates - Index audio files - Index TeX files - Index WordPerfect documents - Index several XML-based formats (Abiword, FictionBook, Kword, Office OpenXML, OpenDocument, SVG) Recoll is a desktop full-text search tool. It can search most document diff --git a/app-misc/recoll/recoll-1.19.5-r1.ebuild b/app-misc/recoll/recoll-1.19.5-r1.ebuild deleted file mode 100644 index 3efef261f44..00000000000 --- a/app-misc/recoll/recoll-1.19.5-r1.ebuild +++ /dev/null @@ -1,179 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -inherit toolchain-funcs qmake-utils qt4-r2 linux-info python-single-r1 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="chm djvu dvi exif postscript ics info lyx msdoc msppt msxls pdf rtf sound 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 ) ) - ) - ${PYTHON_DEPS} -" - -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[${PYTHON_USEDEP}] ) - ics? ( dev-python/icalendar[${PYTHON_USEDEP}] ) - lyx? ( app-office/lyx ) - sound? ( media-libs/mutagen ) - xml? ( dev-libs/libxslt ) - info? ( sys-apps/texinfo ) - " - -REQUIRED_USE="session? ( || ( fam inotify ) ) - ${PYTHON_REQUIRED_USE}" - -pkg_pretend() { - if use inotify; then - CONFIG_CHECK="~INOTIFY_USER" - check_extra_config - fi -} - -pkg_setup() { - python-single-r1_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=$(qt4_get_bindir)/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 - python_optimize - 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 -}