Revision bump to include pkgcofnig patch and build contrib libraries (needed for libreo). Remove live ebuild that I added back then as PoC for the 2.x series.

(Portage version: 2.2.0_alpha93/cvs/Linux x86_64)

4 files changed, 64 insertions, 38 deletions

diff --git a/dev-cpp/clucene/clucene-2.3.3.4-r1.ebuild b/dev-cpp/clucene/clucene-2.3.3.4-r2.ebuild
index a4a0cd2b7ffa..c9f48ec2b6c1 100644
--- a/dev-cpp/clucene/clucene-2.3.3.4-r1.ebuild
+++ b/dev-cpp/clucene/clucene-2.3.3.4-r2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2011 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-r1.ebuild,v 1.1 2011/12/08 12:41:18 johu Exp $
+# $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 $
 
 EAPI=4
 
 MY_PN="${PN}"-core
 MY_P="${MY_PN}"-"${PV}"
 
-inherit cmake-utils
+inherit cmake-utils multilib
 
 DESCRIPTION="High-performance, full-featured text search engine based off of lucene in C++"
 HOMEPAGE="http://clucene.sourceforge.net/"
@@ -29,6 +29,11 @@ DOCS=(AUTHORS ChangeLog README README.PACKAGE REQUESTS)
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-contrib.patch"
+	"${FILESDIR}/${P}-pkgconfig.patch"
+)
+
 src_configure() {
 	# Disabled threads: see upstream bug
 	# https://sourceforge.net/tracker/?func=detail&aid=3237301&group_id=80013&atid=558446
@@ -36,6 +41,9 @@ src_configure() {
 		-DENABLE_ASCII_MODE=OFF
 		-DENABLE_PACKAGING=OFF
 		-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/clucene-9999.ebuild b/dev-cpp/clucene/clucene-9999.ebuild
deleted file mode 100644
index bda2d6523fb3..000000000000
--- a/dev-cpp/clucene/clucene-9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/clucene/clucene-9999.ebuild,v 1.4 2011/12/08 12:41:18 johu Exp $
-
-EAPI=4
-
-inherit cmake-utils git-2
-
-DESCRIPTION="High-performance, full-featured text search engine based off of lucene in C++"
-HOMEPAGE="http://clucene.sourceforge.net/"
-EGIT_REPO_URI="git://${PN}.git.sourceforge.net/gitroot/${PN}/${PN}"
-
-LICENSE="|| ( Apache-2.0 LGPL-2.1 )"
-SLOT="1"
-KEYWORDS=""
-IUSE="debug doc static-libs threads"
-
-RDEPEND=""
-DEPEND="
-	doc? ( >=app-doc/doxygen-1.4.2 )
-"
-
-DOCS=(AUTHORS ChangeLog README README.PACKAGE REQUESTS)
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_ASCII_MODE=OFF
-		-DENABLE_PACKAGING=OFF
-		$(cmake-utils_use_enable debug)
-		$(cmake-utils_use_enable doc CLDOCS)
-		$(cmake-utils_use_build static-libs STATIC_LIBRARIES)
-		$(cmake-utils_use_disable threads MULTITHREADING)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-cpp/clucene/files/clucene-2.3.3.4-contrib.patch b/dev-cpp/clucene/files/clucene-2.3.3.4-contrib.patch
new file mode 100644
index 000000000000..8fbb3c7164ab
--- /dev/null
+++ b/dev-cpp/clucene/files/clucene-2.3.3.4-contrib.patch
@@ -0,0 +1,42 @@
+diff -NaurpBb clucene-core-2.3.3.4/CMakeLists.txt clucene-core-2.3.3.4-mod/CMakeLists.txt
+--- clucene-core-2.3.3.4/CMakeLists.txt	2011-03-17 03:21:07.000000000 +0300
++++ clucene-core-2.3.3.4-mod/CMakeLists.txt	2011-08-16 16:56:55.968268152 +0400
+@@ -163,7 +163,7 @@ IF ( BUILD_CONTRIBS )
+   SET(BUILD_CONTRIBS_LIB 1)
+ ENDIF ( BUILD_CONTRIBS )
+ IF ( BUILD_CONTRIBS_LIB )
+-  ADD_SUBDIRECTORY (src/contribs-lib EXCLUDE_FROM_ALL)
++  ADD_SUBDIRECTORY (src/contribs-lib)
+ ENDIF ( BUILD_CONTRIBS_LIB )
+ 
+ 
+diff -NaurpBb clucene-core-2.3.3.4/src/contribs-lib/CMakeLists.txt clucene-core-2.3.3.4-mod/src/contribs-lib/CMakeLists.txt
+--- clucene-core-2.3.3.4/src/contribs-lib/CMakeLists.txt	2011-03-17 03:21:07.000000000 +0300
++++ clucene-core-2.3.3.4-mod/src/contribs-lib/CMakeLists.txt	2011-08-16 17:14:13.499275499 +0400
+@@ -106,9 +106,26 @@ add_library(clucene-contribs-lib SHARED
+ )
+ TARGET_LINK_LIBRARIES(clucene-contribs-lib ${clucene_contrib_extra_libs})
+ 
++#install public headers.
++FOREACH(file ${HEADERS})
++	get_filename_component(apath ${file} PATH)
++	get_filename_component(aname ${file} NAME)
++	file(RELATIVE_PATH relpath ${CMAKE_SOURCE_DIR}/src/contribs-lib ${apath})
++	IF ( NOT aname MATCHES "^_.*" )
++		install(FILES ${file} 
++		        DESTINATION include/${relpath}
++		        COMPONENT development)
++	ENDIF ( NOT aname MATCHES "^_.*" )
++ENDFOREACH(file)
++
+ #set properties on the libraries
+ SET_TARGET_PROPERTIES(clucene-contribs-lib PROPERTIES
+     VERSION ${CLUCENE_VERSION}
+     SOVERSION ${CLUCENE_SOVERSION}
+     COMPILE_DEFINITIONS_DEBUG _DEBUG
+ )
++
++#and install library
++install(TARGETS clucene-contribs-lib 
++        DESTINATION ${LIB_DESTINATION}  
++        COMPONENT runtime )
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
new file mode 100644
index 000000000000..aff20d7b4aae
--- /dev/null
+++ b/dev-cpp/clucene/files/clucene-2.3.3.4-pkgconfig.patch
@@ -0,0 +1,12 @@
+diff -up clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake.pkgconfig_sys_includes clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake
+--- clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake.pkgconfig_sys_includes	2011-03-16 19:21:07.000000000 -0500
++++ clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake	2012-03-19 09:01:00.689263954 -0500
+@@ -6,6 +6,6 @@ includedir=${prefix}/include:${prefix}/i
+ Name: libclucene
+ Description: CLucene - a C++ search engine, ported from the popular Apache Lucene
+ Version: @CLUCENE_VERSION_MAJOR@.@CLUCENE_VERSION_MINOR@.@CLUCENE_VERSION_REVISION@.@CLUCENE_VERSION_PATCH@
+-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@
+ ~