diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2009-05-18 12:52:43 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-05-18 12:52:43 +0000 |
| commit | 0861b3fb7b15d3a3368c09e4770347041b9b3452 (patch) | |
| tree | a5678457677a8ec2ba9a01f47bb782b6710be434 /app-misc | |
| parent | Version bump. (diff) | |
| download | gentoo-2-0861b3fb7b15d3a3368c09e4770347041b9b3452.tar.gz gentoo-2-0861b3fb7b15d3a3368c09e4770347041b9b3452.tar.bz2 gentoo-2-0861b3fb7b15d3a3368c09e4770347041b9b3452.zip | |
Apply java disabling patch. Per bug #257103. Thx to Igor Ulyanov.
(Portage version: 2.2_rc33/cvs/Linux i686)
Diffstat (limited to 'app-misc')
| -rw-r--r-- | app-misc/strigi/ChangeLog | 6 | ||||
| -rw-r--r-- | app-misc/strigi/files/strigi-disable_java.patch | 19 | ||||
| -rw-r--r-- | app-misc/strigi/strigi-0.6.5.ebuild | 9 |
3 files changed, 29 insertions, 5 deletions
diff --git a/app-misc/strigi/ChangeLog b/app-misc/strigi/ChangeLog index 1bf0131fd21c..e71d5af29e5c 100644 --- a/app-misc/strigi/ChangeLog +++ b/app-misc/strigi/ChangeLog @@ -1,6 +1,10 @@ # 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.35 2009/05/14 20:17:12 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/ChangeLog,v 1.36 2009/05/18 12:52:43 scarabeus Exp $ + + 18 May 2009; Tomas Chvatal <scarabeus@gentoo.org> strigi-0.6.5.ebuild, + +files/strigi-disable_java.patch: + Apply java disabling patch. Per bug #257103. Thx to Igor Ulyanov. 14 May 2009; Tomas Chvatal <scarabeus@gentoo.org> +strigi-0.6.5.ebuild: Clean up deps a bit. diff --git a/app-misc/strigi/files/strigi-disable_java.patch b/app-misc/strigi/files/strigi-disable_java.patch new file mode 100644 index 000000000000..496ef577b187 --- /dev/null +++ b/app-misc/strigi/files/strigi-disable_java.patch @@ -0,0 +1,19 @@ +--- src/xsd/CMakeLists.txt.orig 2009-02-28 23:23:33.000000000 +0300 ++++ src/xsd/CMakeLists.txt 2009-03-01 00:08:08.000000000 +0300 +@@ -22,6 +22,8 @@ endif (LIBXML2_FOUND) + # javac >= 1.5 is required to compile the xsd parser + OPTION(ENABLE_REGENERATEXSD + "regenerate xsd parser from *.xsd files(not normally required)" ON) ++ ++if(${ENABLE_REGENERATEXSD}) + find_package(Java) + if (JAVA_COMPILE) + execute_process(COMMAND ${JAVA_COMPILE} "-version" ERROR_VARIABLE +@@ -31,6 +33,7 @@ if (JAVA_COMPILE) + endif (JAVAC_VERSION MATCHES " 1\\.[56]" AND NOT JAVAC_VERSION MATCHES "g[ci]j") + MESSAGE("Java5 found ${JAVAC5_FOUND}") + endif (JAVA_COMPILE) ++endif(${ENABLE_REGENERATEXSD}) + + # loop over all xsd files + set(XSDFILES "${CMAKE_CURRENT_SOURCE_DIR}/strigidaemonconfiguration.xsd" diff --git a/app-misc/strigi/strigi-0.6.5.ebuild b/app-misc/strigi/strigi-0.6.5.ebuild index eb9d285a5d1b..83b9b442cca8 100644 --- a/app-misc/strigi/strigi-0.6.5.ebuild +++ b/app-misc/strigi/strigi-0.6.5.ebuild @@ -1,6 +1,6 @@ # 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.5.ebuild,v 1.1 2009/05/14 20:17:12 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/strigi-0.6.5.ebuild,v 1.2 2009/05/18 12:52:43 scarabeus Exp $ EAPI="2" @@ -43,9 +43,10 @@ DEPEND="${COMMONDEPEND} test? ( dev-util/cppunit )" RDEPEND="${COMMONDEPEND}" -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.6.4-gcc44.patch -} +PATCHES=( + "${FILESDIR}/${PN}-0.6.4-gcc44.patch" + "${FILESDIR}/${PN}-disable_java.patch" +) src_configure() { # Strigi needs either expat or libxml2. |