1 |
commit: a6db5bcc4752e557863532b314c1807d1a9e761b |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Sep 1 16:35:51 2013 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 1 16:37:22 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=a6db5bcc |
7 |
|
8 |
[app-misc/strigi] Update to match upstream changes. |
9 |
|
10 |
Boost is no longer required, and the hyperestraier backend no longer exists. |
11 |
|
12 |
Package-Manager: portage-2.2.1 |
13 |
|
14 |
--- |
15 |
app-misc/strigi/metadata.xml | 13 ++++++------- |
16 |
app-misc/strigi/strigi-9999.ebuild | 38 +++++++++++++++----------------------- |
17 |
2 files changed, 21 insertions(+), 30 deletions(-) |
18 |
|
19 |
diff --git a/app-misc/strigi/metadata.xml b/app-misc/strigi/metadata.xml |
20 |
index 8e6ee8e..573236b 100644 |
21 |
--- a/app-misc/strigi/metadata.xml |
22 |
+++ b/app-misc/strigi/metadata.xml |
23 |
@@ -1,11 +1,10 @@ |
24 |
<?xml version="1.0" encoding="UTF-8"?> |
25 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
26 |
<pkgmetadata> |
27 |
-<use> |
28 |
- <flag name="clucene">Enable <pkg>dev-cpp/clucene</pkg> backend support.</flag> |
29 |
- <flag name="hyperestraier">Enable <pkg>app-text/hyperestraier</pkg> backend support.</flag> |
30 |
- <flag name="log">Enables advanced logging through <pkg>dev-libs/log4cxx</pkg>.</flag> |
31 |
- <flag name="inotify">Enable support for inotify.</flag> |
32 |
-</use> |
33 |
-<herd>kde</herd> |
34 |
+ <herd>kde</herd> |
35 |
+ <use> |
36 |
+ <flag name="clucene">Enable <pkg>dev-cpp/clucene</pkg> backend support.</flag> |
37 |
+ <flag name="log">Enables advanced logging through <pkg>dev-libs/log4cxx</pkg>.</flag> |
38 |
+ <flag name="inotify">Enable support for inotify.</flag> |
39 |
+ </use> |
40 |
</pkgmetadata> |
41 |
|
42 |
diff --git a/app-misc/strigi/strigi-9999.ebuild b/app-misc/strigi/strigi-9999.ebuild |
43 |
index 5621935..15df729 100644 |
44 |
--- a/app-misc/strigi/strigi-9999.ebuild |
45 |
+++ b/app-misc/strigi/strigi-9999.ebuild |
46 |
@@ -5,8 +5,8 @@ |
47 |
EAPI=5 |
48 |
|
49 |
if [[ "${PV}" != "9999" ]]; then |
50 |
- SRC_URI="http://dev.gentoo.org/~johu/distfiles/${P}.tar.xz" |
51 |
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" |
52 |
+ SRC_URI="http://www.vandenoever.info/software/strigi/${P}.tar.bz2" |
53 |
+ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" |
54 |
else |
55 |
EGIT_REPO_URI="git://anongit.kde.org/strigi" |
56 |
GIT_ECLASS="git-2" |
57 |
@@ -21,13 +21,12 @@ HOMEPAGE="https://projects.kde.org/projects/kdesupport/strigi/strigi" |
58 |
|
59 |
LICENSE="GPL-2" |
60 |
SLOT="0" |
61 |
-IUSE="clucene +dbus debug exif fam ffmpeg hyperestraier inotify log +qt4 test" |
62 |
+IUSE="clucene +dbus debug exif fam ffmpeg inotify log +qt4 test" |
63 |
|
64 |
-COMMONDEPEND=" |
65 |
- app-arch/bzip2:0 |
66 |
- dev-libs/boost:= |
67 |
+RDEPEND=" |
68 |
+ app-arch/bzip2 |
69 |
dev-libs/libxml2:2 |
70 |
- sys-libs/zlib:0 |
71 |
+ sys-libs/zlib |
72 |
virtual/libiconv |
73 |
clucene? ( >=dev-cpp/clucene-0.9.21[-debug] ) |
74 |
dbus? ( |
75 |
@@ -37,16 +36,15 @@ COMMONDEPEND=" |
76 |
exif? ( >=media-gfx/exiv2-0.17 ) |
77 |
fam? ( virtual/fam ) |
78 |
ffmpeg? ( virtual/ffmpeg ) |
79 |
- hyperestraier? ( app-text/hyperestraier ) |
80 |
log? ( >=dev-libs/log4cxx-0.10.0 ) |
81 |
qt4? ( |
82 |
dev-qt/qtcore:4 |
83 |
dev-qt/qtgui:4 |
84 |
) |
85 |
" |
86 |
-DEPEND="${COMMONDEPEND} |
87 |
- test? ( dev-util/cppunit )" |
88 |
-RDEPEND="${COMMONDEPEND}" |
89 |
+DEPEND="${RDEPEND} |
90 |
+ test? ( dev-util/cppunit ) |
91 |
+" |
92 |
|
93 |
if [[ ${PV} == 9999 ]] ; then |
94 |
src_unpack() { |
95 |
@@ -61,10 +59,9 @@ fi |
96 |
src_configure() { |
97 |
# Enabled: POLLING (only reliable way to check for files changed.) |
98 |
# Disabled: xine - recommended upstream to keep it this way |
99 |
- mycmakeargs=( |
100 |
+ local mycmakeargs=( |
101 |
-DENABLE_POLLING=ON |
102 |
-DFORCE_DEPS=ON |
103 |
- -DENABLE_CPPUNIT=OFF |
104 |
-DENABLE_REGENERATEXSD=OFF |
105 |
-DENABLE_XINE=OFF |
106 |
$(cmake-utils_use_enable clucene CLUCENE) |
107 |
@@ -73,28 +70,23 @@ src_configure() { |
108 |
$(cmake-utils_use_enable exif EXIV2) |
109 |
$(cmake-utils_use_enable fam) |
110 |
$(cmake-utils_use_enable ffmpeg) |
111 |
- $(cmake-utils_use_enable hyperestraier) |
112 |
$(cmake-utils_use_enable inotify) |
113 |
$(cmake-utils_use_enable log LOG4CXX) |
114 |
$(cmake-utils_use_enable qt4) |
115 |
- $(cmake-utils_use_enable test CPPUNIT) |
116 |
+ $(cmake-utils_use_find_package test CPPUNIT) |
117 |
) |
118 |
|
119 |
if use qt4; then |
120 |
- mycmakeargs+=(-DENABLE_DBUS=ON) |
121 |
+ mycmakeargs+=( -DENABLE_DBUS=ON ) |
122 |
fi |
123 |
|
124 |
cmake-utils_src_configure |
125 |
} |
126 |
|
127 |
pkg_postinst() { |
128 |
- if ! use clucene && ! use hyperestraier; then |
129 |
- echo |
130 |
- elog "Because you didn't enable either of the available backends:" |
131 |
- elog "clucene or hyperestraier, strigi may not be functional." |
132 |
+ if ! use clucene ; then |
133 |
+ elog "Because you didn't enable the clucene backend, strigi may not be functional." |
134 |
elog "If you intend to use standalone strigi indexer (not needed for KDE)," |
135 |
- elog "be sure to reinstall app-misc/strigi with either clucene (recommended)" |
136 |
- elog "or hyperestraier (unreliable) USE flag enabled." |
137 |
- echo |
138 |
+ elog "be sure to reinstall app-misc/strigi with the clucene USE flag enabled." |
139 |
fi |
140 |
} |