* [gentoo-commits] gentoo-x86 commit in app-misc/recoll: recoll-1.18.1.ebuild ChangeLog
@ 2013-01-30 19:20 Markos Chandras (hwoarang)
0 siblings, 0 replies; 3+ messages in thread
From: Markos Chandras (hwoarang) @ 2013-01-30 19:20 UTC (permalink / raw
To: gentoo-commits
hwoarang 13/01/30 19:20:11
Modified: ChangeLog
Added: recoll-1.18.1.ebuild
Log:
Version bump #454554. Don't require inotify or fam. Bug #452192
(Portage version: 2.1.11.50/cvs/Linux x86_64, signed Manifest commit with key B4AFF2C2)
Revision Changes Path
1.14 app-misc/recoll/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/recoll/ChangeLog?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/recoll/ChangeLog?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/recoll/ChangeLog?r1=1.13&r2=1.14
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/recoll/ChangeLog,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ChangeLog 20 Nov 2012 20:38:56 -0000 1.13
+++ ChangeLog 30 Jan 2013 19:20:11 -0000 1.14
@@ -1,6 +1,11 @@
# ChangeLog for app-misc/recoll
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/recoll/ChangeLog,v 1.13 2012/11/20 20:38:56 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/recoll/ChangeLog,v 1.14 2013/01/30 19:20:11 hwoarang Exp $
+
+*recoll-1.18.1 (30 Jan 2013)
+
+ 30 Jan 2013; Markos Chandras <hwoarang@gentoo.org> +recoll-1.18.1.ebuild:
+ Version bump #454554. Don't require inotify or fam. Bug #452192
20 Nov 2012; Agostino Sarubbo <ago@gentoo.org> recoll-1.17.3-r1.ebuild:
Stable for x86, wrt bug #432782
1.1 app-misc/recoll/recoll-1.18.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/recoll/recoll-1.18.1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/recoll/recoll-1.18.1.ebuild?rev=1.1&content-type=text/plain
Index: recoll-1.18.1.ebuild
===================================================================
# 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.1.ebuild,v 1.1 2013/01/30 19:20:11 hwoarang Exp $
EAPI="4"
PYTHON_DEPEND="2"
inherit toolchain-funcs qt4-r2 linux-info python
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 fam ${INDEX_HELPERS}"
DEPEND="
virtual/libiconv
>=dev-libs/xapian-1.0.12
sys-libs/zlib
spell? ( app-text/aspell )
!inotify? ( fam? ( virtual/fam ) )
qt4? (
x11-libs/qt-core:4[qt3support]
x11-libs/qt-webkit: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
|| ( sys-apps/gawk sys-apps/mawk )
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() {
# 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
use qt4 && qtconf="QMAKEPATH=/usr/bin/qmake"
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}
cd qtgui && eqmake4 ${PN}.pro && cd ..
}
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
}
pkg_postinst() {
elog
elog "Default configuration files located at"
elog "/usr/share/${PN}/examples. Either edit these files to match"
elog "your needs or copy them to ~/.recoll/ and edit these files"
elog "instead."
elog
if use xattr; then
elog "Use flag \"xattr\" enables support for fetching field values"
elog "from extended file attributes. You will also need to set up a"
elog "map from the attributes names to the Recoll field names"
elog "(see comment at the end of the fields configuration file."
fi
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
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-misc/recoll: recoll-1.18.1.ebuild ChangeLog
@ 2013-02-15 20:50 Markos Chandras (hwoarang)
0 siblings, 0 replies; 3+ messages in thread
From: Markos Chandras (hwoarang) @ 2013-02-15 20:50 UTC (permalink / raw
To: gentoo-commits
hwoarang 13/02/15 20:50:33
Modified: recoll-1.18.1.ebuild ChangeLog
Log:
Add missing webkit useflags. Don't run eqmake4 when qt4 is disabled. Bug #457744
(Portage version: 2.1.11.50/cvs/Linux x86_64, signed Manifest commit with key B4AFF2C2)
Revision Changes Path
1.2 app-misc/recoll/recoll-1.18.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/recoll/recoll-1.18.1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/recoll/recoll-1.18.1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/recoll/recoll-1.18.1.ebuild?r1=1.1&r2=1.2
Index: recoll-1.18.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/recoll/recoll-1.18.1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- recoll-1.18.1.ebuild 30 Jan 2013 19:20:11 -0000 1.1
+++ recoll-1.18.1.ebuild 15 Feb 2013 20:50:33 -0000 1.2
@@ -1,6 +1,6 @@
# 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.1.ebuild,v 1.1 2013/01/30 19:20:11 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/recoll/recoll-1.18.1.ebuild,v 1.2 2013/02/15 20:50:33 hwoarang Exp $
EAPI="4"
@@ -15,7 +15,7 @@
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 fam ${INDEX_HELPERS}"
+IUSE="+spell inotify +qt4 +session camelcase xattr webkit fam ${INDEX_HELPERS}"
DEPEND="
virtual/libiconv
@@ -23,10 +23,8 @@
sys-libs/zlib
spell? ( app-text/aspell )
!inotify? ( fam? ( virtual/fam ) )
- qt4? (
- x11-libs/qt-core:4[qt3support]
- x11-libs/qt-webkit:4
- )
+ qt4? ( x11-libs/qt-core:4[qt3support] )
+ webkit? ( x11-libs/qt-webkit:4 )
session? (
inotify? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE )
!inotify? ( fam? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) )
@@ -103,7 +101,9 @@
src_configure() {
local qtconf
- use qt4 && qtconf="QMAKEPATH=/usr/bin/qmake"
+ if use qt4 || use webkit; then
+ qtconf="QMAKEPATH=/usr/bin/qmake"
+ fi
econf \
$(use_with spell aspell) \
@@ -115,7 +115,9 @@
$(use_with inotify) \
$(use_enable session x11mon) \
${qtconf}
- cd qtgui && eqmake4 ${PN}.pro && cd ..
+ if use qt4; then
+ cd qtgui && eqmake4 ${PN}.pro && cd ..
+ fi
}
src_compile() {
1.15 app-misc/recoll/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/recoll/ChangeLog?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/recoll/ChangeLog?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/recoll/ChangeLog?r1=1.14&r2=1.15
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/recoll/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ChangeLog 30 Jan 2013 19:20:11 -0000 1.14
+++ ChangeLog 15 Feb 2013 20:50:33 -0000 1.15
@@ -1,6 +1,10 @@
# 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.14 2013/01/30 19:20:11 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/recoll/ChangeLog,v 1.15 2013/02/15 20:50:33 hwoarang Exp $
+
+ 15 Feb 2013; Markos Chandras <hwoarang@gentoo.org> recoll-1.18.1.ebuild:
+ Add missing webkit useflags. Don't run eqmake4 when qt4 is disabled. Bug
+ #457744
*recoll-1.18.1 (30 Jan 2013)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-misc/recoll: recoll-1.18.1.ebuild ChangeLog
@ 2013-02-16 12:02 Pacho Ramos (pacho)
0 siblings, 0 replies; 3+ messages in thread
From: Pacho Ramos (pacho) @ 2013-02-16 12:02 UTC (permalink / raw
To: gentoo-commits
pacho 13/02/16 12:02:57
Modified: recoll-1.18.1.ebuild ChangeLog
Log:
Don't show elog messages always (#457596)
(Portage version: 2.1.11.52/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Revision Changes Path
1.4 app-misc/recoll/recoll-1.18.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/recoll/recoll-1.18.1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/recoll/recoll-1.18.1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/recoll/recoll-1.18.1.ebuild?r1=1.3&r2=1.4
Index: recoll-1.18.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/recoll/recoll-1.18.1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- recoll-1.18.1.ebuild 15 Feb 2013 22:10:24 -0000 1.3
+++ recoll-1.18.1.ebuild 16 Feb 2013 12:02:57 -0000 1.4
@@ -1,11 +1,11 @@
# 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.1.ebuild,v 1.3 2013/02/15 22:10:24 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/recoll/recoll-1.18.1.ebuild,v 1.4 2013/02/16 12:02:57 pacho Exp $
EAPI="4"
PYTHON_DEPEND="2"
-inherit toolchain-funcs qt4-r2 linux-info python
+inherit toolchain-funcs qt4-r2 linux-info python readme.gentoo
DESCRIPTION="A personal full text search package"
HOMEPAGE="http://www.lesbonscomptes.com/recoll/"
@@ -87,6 +87,20 @@
}
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
@@ -143,21 +157,13 @@
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() {
- elog
- elog "Default configuration files located at"
- elog "/usr/share/${PN}/examples. Either edit these files to match"
- elog "your needs or copy them to ~/.recoll/ and edit these files"
- elog "instead."
- elog
- if use xattr; then
- elog "Use flag \"xattr\" enables support for fetching field values"
- elog "from extended file attributes. You will also need to set up a"
- elog "map from the attributes names to the Recoll field names"
- elog "(see comment at the end of the fields configuration file."
- fi
+ readme.gentoo_print_elog
+
if [[ -n ${REPLACING_VERSIONS} ]]; then
elog
elog "1.18 introduces significant index formats"
1.17 app-misc/recoll/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/recoll/ChangeLog?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/recoll/ChangeLog?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/recoll/ChangeLog?r1=1.16&r2=1.17
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/recoll/ChangeLog,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ChangeLog 15 Feb 2013 22:10:24 -0000 1.16
+++ ChangeLog 16 Feb 2013 12:02:57 -0000 1.17
@@ -1,6 +1,9 @@
# 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.16 2013/02/15 22:10:24 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/recoll/ChangeLog,v 1.17 2013/02/16 12:02:57 pacho Exp $
+
+ 16 Feb 2013; Pacho Ramos <pacho@gentoo.org> recoll-1.18.1.ebuild:
+ Don't show elog messages always (#457596)
15 Feb 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:
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-02-16 12:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-16 12:02 [gentoo-commits] gentoo-x86 commit in app-misc/recoll: recoll-1.18.1.ebuild ChangeLog Pacho Ramos (pacho)
-- strict thread matches above, loose matches on Subject: below --
2013-02-15 20:50 Markos Chandras (hwoarang)
2013-01-30 19:20 Markos Chandras (hwoarang)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox