Fix use flag descriptions. Replace gs with ps use flag. Allow neither fam and inotify to be enabled. Bug #389595. Thanks to Israel G. Lugo <israel.lugo@lugosys.com>

(Portage version: 2.2.0_alpha74/cvs/Linux x86_64)

3 files changed, 20 insertions, 12 deletions

diff --git a/app-misc/recoll/ChangeLog b/app-misc/recoll/ChangeLog
index a0b44ee5fe2e..b187397a5e01 100644
--- a/app-misc/recoll/ChangeLog
+++ b/app-misc/recoll/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/recoll
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/recoll/ChangeLog,v 1.1 2011/09/26 20:00:37 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/recoll/ChangeLog,v 1.2 2011/11/14 21:18:47 hwoarang Exp $
+
+  14 Nov 2011; Markos Chandras <hwoarang@gentoo.org> metadata.xml,
+  recoll-1.16.0.ebuild:
+  Fix use flag descriptions. Replace gs with ps use flag. Allow neither fam and
+  inotify to be enabled. Bug #389595. Thanks to Israel G. Lugo
+  <israel.lugo@lugosys.com>
 
 *recoll-1.16.0 (26 Sep 2011)
 
diff --git a/app-misc/recoll/metadata.xml b/app-misc/recoll/metadata.xml
index 42ccc3fa83d9..c9fb67def7cd 100644
--- a/app-misc/recoll/metadata.xml
+++ b/app-misc/recoll/metadata.xml
@@ -6,21 +6,25 @@
 	<name>Markos Chandras</name>
 </maintainer>
 <use>
-	<flag name='inotify'>Use the Linux Kenrel notification subsystem for monitoring file alterations</flag>
+	<flag name='inotify'>Use the Linux Kenrel notification subsystem for monitoring file alterations in realtime</flag>
 	<flag name='camelcase'>Enable indexing for camelCase sentences and words</flag>
 	<flag name='audio'>Index audio files</flag>
 	<flag name='chm'>Index chm files</flag>
 	<flag name='dvi'>Index dvi files</flag>
-	<flag name='gs'>Index PostScript files</flag>
-	<flag name='ics'>Index icalendar files</flag>
+	<flag name='ics'>Index iCalendar files</flag>
 	<flag name='info'>Index GNU info files</flag>
 	<flag name='lyx'>Index Latex lyx files</flag>
 	<flag name='msdoc'>Index Microsoft Word documents</flag>
-	<flag name='msppt'>Index Microsoft Power Point documents</flag>
+	<flag name='msppt'>Index Microsoft PowerPoint documents</flag>
 	<flag name='msxls'>Index Microsoft Excel documents</flag>
+	<flag name='pdf'>Index PDF documents</flag>
+	<flag name='ps'>Index PostScript files</flag>
 	<flag name='rtf'>Index Microsoft RTF documents</flag>
-	<flag name='tex'>Index Tex files</flag>
 	<flag name='wordperfect'>Index wordperfect documents</flag>
+	<flag name='session'>Stop monitoring file alterations when X11 session terminates</flag>
+	<flag name='tex'>Index TeX files</flag>
+	<flag name='wordperfect'>Index WordPerfect documents</flag>
+	<flag name='xml'>Index several XML-based formats (Abiword, FictionBook, Kword, Office OpenXML, OpenDocument, SVG)</flag>
 </use>
 <longdescription lang="en">
 </longdescription>
diff --git a/app-misc/recoll/recoll-1.16.0.ebuild b/app-misc/recoll/recoll-1.16.0.ebuild
index 496fe2031d59..1bf1f2bc8c1b 100644
--- a/app-misc/recoll/recoll-1.16.0.ebuild
+++ b/app-misc/recoll/recoll-1.16.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/recoll/recoll-1.16.0.ebuild,v 1.1 2011/09/26 20:00:37 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/recoll/recoll-1.16.0.ebuild,v 1.2 2011/11/14 21:18:47 hwoarang Exp $
 
 EAPI="4"
 
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-INDEX_HELPERS="audio chm djvu dvi exif gs ics info lyx msdoc msppt msxls pdf rtf tex wordperfect xml"
+INDEX_HELPERS="audio chm djvu dvi exif ps ics info lyx msdoc msppt msxls pdf rtf tex wordperfect xml"
 IUSE="+spell +inotify +qt4 +session camelcase xattr fam ${INDEX_HELPERS}"
 
 DEPEND="
@@ -35,7 +35,7 @@ RDEPEND="
 	sys-apps/sed
 	|| ( sys-apps/gawk sys-apps/mawk )
 	pdf? ( app-text/poppler )
-	gs? ( app-text/pstotext )
+	ps? ( app-text/pstotext )
 	msdoc? ( app-text/antiword )
 	msxls? ( app-text/catdoc )
 	msppt? ( app-text/catdoc )
@@ -53,7 +53,7 @@ RDEPEND="
 	info? ( sys-apps/texinfo )
 	"
 
-REQUIRED_USE="^^ ( fam inotify ) session? ( || ( fam inotify ) )"
+REQUIRED_USE="^^ ( fam inotify ( !fam !inotify ) ) session? ( || ( fam inotify ) )"
 
 pkg_pretend() {
 	if use inotify; then
@@ -105,8 +105,6 @@ src_configure() {
 		$(use_with fam) \
 		$(use_with inotify) \
 		$(use_enable session x11mon) \
-		${x11monconf} \
-		${famconf} \
 		${qtconf}
 }