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>

Package-Manager: portage-2.2.0_alpha74/cvs/Linux x86_64

4 files changed, 36 insertions, 28 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/Manifest b/app-misc/recoll/Manifest
index 75134502aac9..652bd99f4651 100644
--- a/app-misc/recoll/Manifest
+++ b/app-misc/recoll/Manifest
@@ -2,23 +2,23 @@
 Hash: SHA512
 
 DIST recoll-1.16.0.tar.gz 1358438 RMD160 e6997ba29c64a95a958f6894b4737dbf0791249d SHA1 eede284bfb202fd008adef3c8303edadb3466c88 SHA256 b7dd72404aae4614799b159458d8dfd53df9d28dd3e21d0e8de1ad256102a5bf
-EBUILD recoll-1.16.0.ebuild 4026 RMD160 0c037ff62cbf8782e0480519ee59096f7a68cd69 SHA1 46147fdd772e1e3d44cc26f32363238d65e7af9e SHA256 7b8d726fad29f85c19befe19746009e8f8b5c1b6a411bc9f2ff0dad15fdebc8b
-MISC ChangeLog 439 RMD160 54845607197563fe3cf947512538b8bdf44ef105 SHA1 fae2cf5f8ce826f05221612bcfc020c37a35de9a SHA256 816188bf36afe42f72f76606471451679f1af3bc39ebdc1642dd2fefd79d4907
-MISC metadata.xml 1133 RMD160 e37d583a094715f93fe78665d8be98593ecd8ff8 SHA1 f5649c13f8c9fdaae2ead2ae01521d703502ef6f SHA256 14a30c7b9b06213b2e7fb59ea1595e02ca1ac931f6c963cb02392c44c5148897
+EBUILD recoll-1.16.0.ebuild 4011 RMD160 51fc829a8fe14cf55da9ab598dfd119efb939885 SHA1 907fc7bced5cafa1c4da7c4cda6e1c3ea4057c25 SHA256 4d6f18422e89a96431142b6c6c8e9a9b14d854415127ab2e5f5b863908241919
+MISC ChangeLog 702 RMD160 42d93e5936b219dc6348c6569c2bdccd4e15029a SHA1 d3e6df84c4d27ad1d66d6ecd7f6c25d7399a3499 SHA256 25a230b8ff3ae3d1e203699fb554c9d5da5606f1abb329e7020e4881a6d39b9e
+MISC metadata.xml 1462 RMD160 07ee311b807dc4624b1b06cfa0df1b812182b772 SHA1 7b7cdea0a9adeadbfa3ec8ec4f2ebbc318170ef1 SHA256 7cba7026b9817104f5bf66a3dd11b161802f7886d52d492ff8ec6164d43e7467
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOgNm6AAoJEPqDWhW0r/LChhMQALnNE1tHpkcUGZ+o5oVmtkLk
-eD3k6PD3PWdINkrCIFOOGeArsiOuQRj941OEwfeOL/11FJN3fHdI+WbnYIL4AmEi
-VVfGqz5+pWmFVDX7/pApbdY4AmUmSxT2iIjIJRJHchScrkmpz0gs6Bj5NlzHIt/q
-LkWOsbn5yk5oN2Nn8R/L3tJdtLT1ZPnkeJ6fJbX4L4YU/K+ZAt3s2xZct1MAFNTr
-7ciJbrD53Jyf0TMA0MHpBpa0wovWGWmKZH8HUOG0Zn/MB5i4SUDf89G9oGdeo0ts
-QG/T0XZ1qjjxgkk80vf7qZUAfmbOmfQj6MqeyQbLA7k5YctbEah1O/cJbxa/fyOL
-os6ANr2Aa4kZ93l7reVuU1m57wkNXfaqQKDD2nqWu+kk2G25QzO3CIPjdA5zNHwQ
-UEaSGlIJSXCq+FBZE/Z1FX7KfVPHUE2KGilOlWqeM497LRzpziIhOjyNnhbBKr/b
-+i/zK55vOnuGyUGJrSyWFv+9dMxBtnfnAWQeRg5aXaDSeNrFR3QR+Yec8ok/HSVH
-kpt16ICNTW0GY5gkjtx4UAnd/2rbNeafd5wiiEo8W911PHZHt2zcL44p/VDSA4wZ
-HrjdnSaHCYDAOPoECv+97xyHBsvEU7cuUpzeeoRP1DGRJy0cTs5DvSsONaDdNlW6
-b42NKcjGNnPQ6DxVJn+X
-=MomO
+iQIcBAEBCgAGBQJOwYW6AAoJEPqDWhW0r/LC3fwP/jmuBVlJTfGxYCZAu8wB4YVj
+zg0Wry3GmJ/zHDapQjKOxJz8WTPuY+f9W8lhdr5KE+sSgujX1ittdR09u4i443gm
+EtIL7O0r0i7EowgmyUvtVoKiqovBg62+rEn94opKLoifwFXc+6dPCvEp7Dqlm+3N
+aS0rBM8GNJj7TH87Ut5OCxx0kMB+FjBQmiLCo6xWWIbKAM0ka1NMONkcm/rDACLi
+wao9Y4ofdivdEWHUCH2GwD4e5cQjtZ2yJ12JjE7EviZjVHBXjtdKVCowvcwEdk1u
+ZmbYlxcFAo/yg+ZqcxpRJKU5WcPtHJ1BUjvoKjsVwCF8Qd5xNbNgnU2seG0qkFMd
+ZvLpcDRChy3sO3KIoSQBWhPB04fpfKqBYoyxTbRlbHI0UZvZ80zpsmzFUGsX3Hev
+mU8CRYQtERI+8e/JlKD0HGNVWTwB2LgL5SEpTVeWC/Ui+ek2td0jSHouUNMi9hP4
+Yd8zkLmJROTFCN9tRjtDX6SskgVWi6naA94u6VWx3t9HqUb7RcCf8I73VIgVmniK
+ivWt0gkms819im6AdxMaVe11Mj91SByGRWexmaNS4bnMQLGHDNXc/lmm9PSHndsX
+oaksGq61bOv1vYmFjzzDRLZNM6gGrKYq4IhCB6sTFrNsisOU6RNdBPNyoo4sovTp
+g/xV6iL2mcJViolFz3TC
+=Wycm
 -----END PGP SIGNATURE-----
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}
 }