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.

Package-Manager: portage-2.2.0_alpha93/cvs/Linux x86_64

5 files changed, 82 insertions, 49 deletions

diff --git a/dev-cpp/clucene/Manifest b/dev-cpp/clucene/Manifest
index f1d55d3ed607..684622dd64e4 100644
--- a/dev-cpp/clucene/Manifest
+++ b/dev-cpp/clucene/Manifest
@@ -1,23 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX clucene-0.9.21b-doxygen.patch 320 RMD160 396f63bbe283778033b02f80a3e9e84e4d1c52f3 SHA1 1f8f075966652f3e47471d32bba3ea76debfd318 SHA256 b255bad44fb80d0bb2d371751252954b3ef38eddebbb2c56df07202081774914
 AUX clucene-0.9.21b-gcc44.patch 218 RMD160 61cae76cb6051905a1f0c911cf7641df2885a91c SHA1 20d4c94095ddb70f3bd02d3ec8a5135567202d53 SHA256 2ab6c9350ae2ddc56e0c3c956c687f22b0a6f5adc438a0e512bca18efc502d2f
+AUX clucene-2.3.3.4-contrib.patch 1697 RMD160 c38121e5e46040318537e49d9f87523c06799532 SHA1 304e5dfaaf6cf0733b8e6f43a192565c9a9a845a SHA256 3d3f73685f75b4ceacf1941e50b6108941bded3ca558ac1343c35b1b7d0e78dc
+AUX clucene-2.3.3.4-pkgconfig.patch 894 RMD160 81749da50f36a169e99a3f533a07858d5bc83597 SHA1 77e4fc94e89dcd66ffe824e36949edd1172653b1 SHA256 10c808ce483d997d7ff349cc3ec97b8785c365f956d6eef45458e9caf4e5e88d
 DIST clucene-core-0.9.21b.tar.bz2 1539103 RMD160 e04ca10ca755cdd9c7bf5ccdd34a91c0007de1d4 SHA1 8bc505b64f82723c2dc901036cb0607500870973 SHA256 202ee45af747f18642ae0a088d7c4553521714a511a1a9ec99b8144cf9928317
 DIST clucene-core-2.3.3.4.tar.gz 2241498 RMD160 5acfc9c8acd167b3684cfc731a60fd9c5465cc9b SHA1 76d6788e747e78abb5abf8eaad78d3342da5f2a4 SHA256 ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab
 EBUILD clucene-0.9.21b-r1.ebuild 1410 RMD160 27a8396c579b1fca378248c5404b88d7f5e43003 SHA1 6f1097a7ddf8f378417eb0c0dffe93fd64b677af SHA256 058b53958aaef6e9a983474215783091dbf98b906028483f61f873509f304955
-EBUILD clucene-2.3.3.4-r1.ebuild 1258 RMD160 c93b2e5f525fb7f524e0493a32496c24c4eaf71e SHA1 ed65bbbe101976148b001aad6565acfe869a4ace SHA256 a3f00c71723c2297354658d4e561a73e66492d21c6068cbcfe272b5bccacdfcb
-EBUILD clucene-9999.ebuild 969 RMD160 e6c601036fee689228495dfb08be1b9b6b97ff5e SHA1 4ffeaba76a333ff1dfabce16e9a4adb9af58af01 SHA256 be7de822479e8d3f3a7eb1c1c0eb448d40cd74d37770178070ed38312ac74db4
+EBUILD clucene-2.3.3.4-r2.ebuild 1487 RMD160 fb1755276cd0e5766255c80ecdf84b1f80a8481c SHA1 0793c95a5f5b63c11b1885c4a4c1f71aa9ee2790 SHA256 df7a38a6cbcc2b437a68d77101fdaad1a127213662f5c60edc78d49283b0c16f
 MISC ChangeLog 5955 RMD160 33668257f7a9d0c7d5f35821009a82bfc0d49d13 SHA1 3317832c66b37e71b3d3fa60a1c25f2e88d672ef SHA256 aeb4519020bb81261cdddb857d668ba6f590cebd5ec6252b12875309166983c3
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCgAGBQJO4LBqAAoJEO+t9ga+3I3aoaoH+QH4kP8yRMsGX0X/tzexgfp2
-fv5+3RACUVQD9yioz/7MCLRegAxjBwg08Kds6S23gpSlL/U73iIe4pFoul/qi2ci
-z/PmLYTw1iHYbZrOrqzipy0k376FIwyuziJZdeRg5ttTU5Igh9VKxI/221kpHrxv
-Ee8zca/BJLm8QuYFCqOZenr4JrUGwBJBW74L0c3Z9OajvWra0gpQ5l+Tr1EUB++Q
-kuxdqpD5eOaNSIYdwQLbYG0TTySp1oP4V5aMuzFboy+I9o4wqtW+eTHDQit48DXw
-F9282yqvKEpT2gSWlTSIlJBbTUcDqxKGfS6/tcqGS6adfm029IUL380UWzpTBCk=
-=IL5+
+iQIcBAEBAgAGBQJPaat4AAoJEOSiRoyO7jvoQyAP+wZMHJagja1B3E6UIFU5FkdK
+gUks/aSx5OAoEab1v8aqVJyMeLGzhH3a9iUYLtsXXpXthhIjpGSxug7AA/Wy9d4q
+/hO1YwOxxrZ/r2EnwHLjUBteTVXKzFek+gBzfwuqJ1in/GhB1J0QPOfCjTlTsfuH
+w0BV1whpb9Pa+QIv9e72jhq4n12RJIFQ1Ew01Rgr6LEneVR0T8CmMF7H+/rT8Vq4
+YS4CcMS33Lh1CrzAodTRKCWnjSydPJ8/HQY3yawbpEvtFgqtoVXWUNcsOTREYqis
+Q9K3pVg4pLkrOOFqtm6DyqCkE3XvbbojNilivU5ThhhRteQwSmRc+RA8c92NzYRC
+GAnKrtbGA2lBSPOLlINQtYy4nuFsmUEIivWqn5H+CZpp6+CSZhVsZIwcN2KdF1hv
+jKEYDLRbmE/TcTZzzA9HC1Oew+nXVZxOXZy6twzwK5h1+3N0v/6q/RIhVXjEQHT3
+cPpfp+MtKSx91dTPiNM192vrrbZtpHBPgw9hao+hpW4AzLKFQMvh83598cTzPC9+
+ZJZW4MbmwEK4ZiJCtjXf1V29ZjpczDHNnxe+QQkP8MkGz1TOQOfj08E+FZYXG5Qx
+VD9A4JA7DLOZ0tYryoMDxTTaFUKFlfvZVY2emq/6gMmpBnvMSFXiVOlYtYYoTxhk
+GGIhRPn1eLzcd3+YVBhU
+=5xVX
 -----END PGP SIGNATURE-----
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@
+ ~