Do not put includes into libdir. Fixes the bug#409205. Altho it is caused because the dovecot does not use the .pc file.

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

4 files changed, 28 insertions, 22 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/Manifest b/dev-cpp/clucene/Manifest
index 684622dd64e4..028644829c8b 100644
--- a/dev-cpp/clucene/Manifest
+++ b/dev-cpp/clucene/Manifest
@@ -4,27 +4,27 @@ 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
+AUX clucene-2.3.3.4-pkgconfig.patch 871 RMD160 0e03c330242dd4b8438a0cbbd75daa0f82eaa7c5 SHA1 7a6c187dc32cab5e13626fe6e5a12dc2bfb6e85f SHA256 ae92955cecb57ec732233dc33d057f9a0677fc9e17d2461911b300037cbb65f7
 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-r2.ebuild 1487 RMD160 fb1755276cd0e5766255c80ecdf84b1f80a8481c SHA1 0793c95a5f5b63c11b1885c4a4c1f71aa9ee2790 SHA256 df7a38a6cbcc2b437a68d77101fdaad1a127213662f5c60edc78d49283b0c16f
-MISC ChangeLog 5955 RMD160 33668257f7a9d0c7d5f35821009a82bfc0d49d13 SHA1 3317832c66b37e71b3d3fa60a1c25f2e88d672ef SHA256 aeb4519020bb81261cdddb857d668ba6f590cebd5ec6252b12875309166983c3
+EBUILD clucene-2.3.3.4-r3.ebuild 1432 RMD160 2df7b83b8946aca90cb01497e00c62b7986e4ea4 SHA1 16364d2a10b60c4c58428d684adc30149bb8e993 SHA256 c063c96933d17a640d0c3daa9301f422d26f16edccfd92df3109d552b413bac1
+MISC ChangeLog 6273 RMD160 fd2139c8acd79e6edc508eee6f875b8ac05c2789 SHA1 9abb12d5c9ccda1881dd02161ce85a287e030bca SHA256 05638cb3002cd827138284fe189231d48e6af0acd6bb72b0f80a6f24d9c1a0f5
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-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
+iQIcBAEBAgAGBQJPaw6fAAoJEOSiRoyO7jvoCMQP/i2jO3aD7nx4QI4EEp948661
+5l1MJJkMUlE1tguVWGdsWgVxGoGd+gyChuiW1MQyXhVB/Y+uz4qjdxi57P9g9MQj
+nGUsyq3g8Jxj0wB8U6fWX9Ofg6fgrdkR6La1aFem55ZwsYc8vThlLzmGpQsYy4Ub
+JcbUikBhqUD/es+mfHwdkn7iV/fr2xyXmZ6JHHK0RgG4/fGRUUmQNnFhUX13VNOR
+vCQGnz1oH6Gt8PhtR0Z4uyAL+7GkcpNT3vlVcanajwPMhk9p+LOpkPBq4r/SkVRv
+d0UfzI8LjzdaC109jRw+Axcem06L6kPmqFZLNjR+jHCYL6UhPkw7bDTViSbjcxGN
+4LHI2i374WGuUjmNdsrAfJDxg7XMV0eYp7kfHk8rRrJc96KfUJtOUp4NGF6IcXG6
+KDRT5txD8kzaG9oWyUzidPxIiX8bp0hyCdlt555+c61Fr+/7O5qbca2Qj44k1xLB
++0Jl3FauOyXc/0Hc5xLr3bxe3Qk2PYc+hUFSpe+kysh4x9BVWvaPPxMVCaZVvPDh
+dUxzMMeXXlRLYE94d6AgczlVg4ghgBFkjm4pHnVvlZHPg/dxMheH1BdESDEXsTnw
+917SNK69EQeVbQJ3PZAFXaMY2UghB9AvmfmIIvFcEHSP4vrBwT5iq3LhP1GoKa1V
+qNrmcMqMfUFJaxXhIAD0
+=xMyg
 -----END PGP SIGNATURE-----
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 
  ~