summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2012-03-22 11:35:53 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2012-03-22 11:35:53 +0000
commitda697a040db372f923e25183b9fc9ce0283e2d08 (patch)
tree7f631a330d133aedcace2856b18519a055eeb6e5 /dev-cpp/clucene
parentMake the extra tools useflags become USE_EXPAND per -dev discussion. (diff)
downloadgentoo-2-da697a040db372f923e25183b9fc9ce0283e2d08.tar.gz
gentoo-2-da697a040db372f923e25183b9fc9ce0283e2d08.tar.bz2
gentoo-2-da697a040db372f923e25183b9fc9ce0283e2d08.zip
Do not put includes into libdir. Fixes the bug#409205. Altho it is caused because the dovecot does not use the .pc file.
(Portage version: 2.2.0_alpha93/cvs/Linux x86_64)
Diffstat (limited to 'dev-cpp/clucene')
-rw-r--r--dev-cpp/clucene/ChangeLog11
-rw-r--r--dev-cpp/clucene/clucene-2.3.3.4-r3.ebuild (renamed from dev-cpp/clucene/clucene-2.3.3.4-r2.ebuild)5
-rw-r--r--dev-cpp/clucene/files/clucene-2.3.3.4-pkgconfig.patch2
3 files changed, 12 insertions, 6 deletions
diff --git a/dev-cpp/clucene/ChangeLog b/dev-cpp/clucene/ChangeLog
index 453cbdd33288..f870df2ffc4a 100644
--- a/dev-cpp/clucene/ChangeLog
+++ b/dev-cpp/clucene/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-cpp/clucene
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/clucene/ChangeLog,v 1.43 2011/12/08 12:41:18 johu Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/clucene/ChangeLog,v 1.44 2012/03/22 11:35:53 scarabeus Exp $
+
+*clucene-2.3.3.4-r3 (22 Mar 2012)
+
+ 22 Mar 2012; Tomáš Chvátal <scarabeus@gentoo.org> +clucene-2.3.3.4-r3.ebuild,
+ -clucene-2.3.3.4-r2.ebuild, files/clucene-2.3.3.4-pkgconfig.patch:
+ Do not put includes into libdir. Fixes the bug#409205. Altho it is caused
+ because the dovecot does not use the .pc file.
*clucene-2.3.3.4-r1 (08 Dec 2011)
diff --git a/dev-cpp/clucene/clucene-2.3.3.4-r2.ebuild b/dev-cpp/clucene/clucene-2.3.3.4-r3.ebuild
index c9f48ec2b6c1..ca8add5fb485 100644
--- a/dev-cpp/clucene/clucene-2.3.3.4-r2.ebuild
+++ b/dev-cpp/clucene/clucene-2.3.3.4-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/clucene/clucene-2.3.3.4-r2.ebuild,v 1.1 2012/03/21 10:20:32 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/clucene/clucene-2.3.3.4-r3.ebuild,v 1.1 2012/03/22 11:35:53 scarabeus Exp $
EAPI=4
@@ -43,7 +43,6 @@ src_configure() {
-DDISABLE_MULTITHREADING=OFF
-DBUILD_CONTRIBS_LIB=ON
"-DLIB_DESTINATION=${EPREFIX}/usr/$(get_libdir)"
- "-DLUCENE_SYS_INCLUDES=${EPREFIX}/usr/$(get_libdir)"
$(cmake-utils_use_enable debug)
$(cmake-utils_use_enable doc CLDOCS)
$(cmake-utils_use_build static-libs STATIC_LIBRARIES)
diff --git a/dev-cpp/clucene/files/clucene-2.3.3.4-pkgconfig.patch b/dev-cpp/clucene/files/clucene-2.3.3.4-pkgconfig.patch
index aff20d7b4aae..14563628ea41 100644
--- a/dev-cpp/clucene/files/clucene-2.3.3.4-pkgconfig.patch
+++ b/dev-cpp/clucene/files/clucene-2.3.3.4-pkgconfig.patch
@@ -8,5 +8,5 @@ diff -up clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake.pkgconfig_sys_in
-Libs: -L${prefix}/@LIB_DESTINATION@/ -lclucene-core
-Cflags: -I${prefix}/include -I${prefix}/include/CLucene/ext
+Libs: -L${prefix}/@LIB_DESTINATION@/ -lclucene-core -lclucene-shared
-+Cflags: -I${prefix}/include -I${prefix}/include/CLucene/ext -I@LUCENE_SYS_INCLUDES@
++Cflags: -I${prefix}/include -I${prefix}/include/CLucene/ext
~