summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-08-20 09:05:47 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2009-08-20 09:05:47 +0000
commitd780278ad7e4d3bab8a4c70edb89960f3313d960 (patch)
tree0aed3031a1f1618d3d0cc048481d4ac5a347be4b /app-misc
parentDeprecation indicates that it might still work, so be more clear that this no... (diff)
downloadgentoo-2-d780278ad7e4d3bab8a4c70edb89960f3313d960.tar.gz
gentoo-2-d780278ad7e4d3bab8a4c70edb89960f3313d960.tar.bz2
gentoo-2-d780278ad7e4d3bab8a4c70edb89960f3313d960.zip
Version bump. Remove old. Per bug #281636.
(Portage version: 2.2_rc38/cvs/Linux i686)
Diffstat (limited to 'app-misc')
-rw-r--r--app-misc/strigi/ChangeLog8
-rw-r--r--app-misc/strigi/strigi-0.7.0.ebuild (renamed from app-misc/strigi/strigi-0.6.4.ebuild)44
2 files changed, 29 insertions, 23 deletions
diff --git a/app-misc/strigi/ChangeLog b/app-misc/strigi/ChangeLog
index bbe6d03f288f..1d1b70198537 100644
--- a/app-misc/strigi/ChangeLog
+++ b/app-misc/strigi/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-misc/strigi
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/ChangeLog,v 1.37 2009/05/18 12:56:46 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/ChangeLog,v 1.38 2009/08/20 09:05:47 scarabeus Exp $
+
+*strigi-0.7.0 (20 Aug 2009)
+
+ 20 Aug 2009; Tomáš Chvátal <scarabeus@gentoo.org> -strigi-0.6.4.ebuild,
+ +strigi-0.7.0.ebuild:
+ Version bump. Remove old.
18 May 2009; Tomas Chvatal <scarabeus@gentoo.org> strigi-0.6.5.ebuild,
+files/strigi-0.6.5-gcc4.4-missing-headers.patch:
diff --git a/app-misc/strigi/strigi-0.6.4.ebuild b/app-misc/strigi/strigi-0.7.0.ebuild
index 5b133ac3ba32..963f1ba6d1af 100644
--- a/app-misc/strigi/strigi-0.6.4.ebuild
+++ b/app-misc/strigi/strigi-0.7.0.ebuild
@@ -1,14 +1,14 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/strigi-0.6.4.ebuild,v 1.11 2009/04/11 15:46:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/strigi-0.7.0.ebuild,v 1.1 2009/08/20 09:05:47 scarabeus Exp $
EAPI="2"
-inherit cmake-utils eutils
+inherit base cmake-utils
DESCRIPTION="Fast crawling desktop search engine with Qt4 GUI"
HOMEPAGE="http://strigi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+SRC_URI="http://www.vandenoever.info/software/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
@@ -20,21 +20,19 @@ COMMONDEPEND="
virtual/libiconv
>=virtual/poppler-utils-0.8
clucene? ( >=dev-cpp/clucene-0.9.19[-debug] )
- dbus? ( sys-apps/dbus
- || ( ( x11-libs/qt-dbus:4
- x11-libs/qt-gui:4 )
- =x11-libs/qt-4.3*:4[dbus] )
- )
+ dbus? (
+ x11-libs/qt-dbus:4
+ x11-libs/qt-gui:4
+ )
exif? ( >=media-gfx/exiv2-0.17 )
fam? ( virtual/fam )
hyperestraier? ( app-text/hyperestraier )
log? ( >=dev-libs/log4cxx-0.10.0 )
qt4? (
- || ( ( x11-libs/qt-core:4
- x11-libs/qt-gui:4
- x11-libs/qt-dbus:4 )
- =x11-libs/qt-4.3*:4[dbus] )
- )
+ x11-libs/qt-core:4
+ x11-libs/qt-gui:4
+ x11-libs/qt-dbus:4
+ )
!clucene? (
!hyperestraier? (
>=dev-cpp/clucene-0.9.19[-debug]
@@ -45,9 +43,11 @@ DEPEND="${COMMONDEPEND}
test? ( dev-util/cppunit )"
RDEPEND="${COMMONDEPEND}"
-src_prepare() {
- epatch "${FILESDIR}"/${P}-gcc44.patch
-}
+PATCHES=(
+ "${FILESDIR}/${PN}-0.6.4-gcc44.patch"
+ "${FILESDIR}/${PN}-0.6.5-gcc4.4-missing-headers.patch"
+ "${FILESDIR}/${PN}-disable_java.patch"
+)
src_configure() {
# Strigi needs either expat or libxml2.
@@ -59,15 +59,15 @@ src_configure() {
-DENABLE_EXPAT=OFF -DENABLE_POLLING=ON
-DFORCE_DEPS=ON -DENABLE_CPPUNIT=OFF
-DENABLE_REGENERATEXSD=OFF
- $(cmake-utils_use_enable clucene CLUCENE)
- $(cmake-utils_use_enable dbus DBUS)
+ $(cmake-utils_use_enable clucene)
+ $(cmake-utils_use_enable dbus)
$(cmake-utils_use_enable exif EXIV2)
- $(cmake-utils_use_enable fam FAM)
- $(cmake-utils_use_enable hyperestraier HYPERESTRAIER)
- $(cmake-utils_use_enable inotify INOTIFY)
+ $(cmake-utils_use_enable fam)
+ $(cmake-utils_use_enable hyperestraier)
+ $(cmake-utils_use_enable inotify)
$(cmake-utils_use_enable log LOG4CXX)
$(cmake-utils_use_enable qt4 DBUS)
- $(cmake-utils_use_enable qt4 QT4)"
+ $(cmake-utils_use_enable qt4)"
if ! use clucene && ! use hyperestraier; then
mycmakeargs="${mycmakeargs} -DENABLE_CLUCENE=ON"