Removed patch wrt bug #361385

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

5 files changed, 26 insertions, 45 deletions

diff --git a/dev-cpp/clucene/ChangeLog b/dev-cpp/clucene/ChangeLog
index 4e1c1a503fab..453cbdd33288 100644
--- a/dev-cpp/clucene/ChangeLog
+++ b/dev-cpp/clucene/ChangeLog
@@ -1,6 +1,12 @@
 # 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.42 2011/11/12 19:07:49 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/clucene/ChangeLog,v 1.43 2011/12/08 12:41:18 johu Exp $
+
+*clucene-2.3.3.4-r1 (08 Dec 2011)
+
+  08 Dec 2011; Johannes Huber <johu@gentoo.org> +clucene-2.3.3.4-r1.ebuild,
+  -clucene-2.3.3.4.ebuild, -files/clucene-9999-cmake.patch, clucene-9999.ebuild:
+  Removed patch wrt bug #361385
 
 *clucene-2.3.3.4 (12 Nov 2011)
 
diff --git a/dev-cpp/clucene/Manifest b/dev-cpp/clucene/Manifest
index 95647f6fad8f..f1d55d3ed607 100644
--- a/dev-cpp/clucene/Manifest
+++ b/dev-cpp/clucene/Manifest
@@ -1,10 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 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-9999-cmake.patch 1244 RMD160 00a4404ed2b6557baa50a7518697b68370f40e62 SHA1 38113f8c6285e10051894aa67dbb516545c3e6b6 SHA256 ee53fdb5d934464d120bee0c1f2f6f26545226a856bf0f25a3834f717da4fd44
 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.ebuild 1311 RMD160 6684550ca3b9fbc12a54b0e63c40aeb16b7058ec SHA1 e4f8a119bbbd6931a53a9f85dd1ac5e4b76a30c0 SHA256 e490368e3155bf43935366aa56e2dad4c2c8de841d0eabba50b08255f42d03e7
-EBUILD clucene-9999.ebuild 1019 RMD160 7c1961592dc213ece302f03b2f178e54038dc978 SHA1 a8d9580817419c789a7f218a31c7dc9c0b54cc88 SHA256 083a67a8e25933da3010b034acd9de11fd1922a36db10dc557283d22490e5954
-MISC ChangeLog 5735 RMD160 38fc5c057a0957c9527c963c44f0e845de59a0b5 SHA1 db5144d1fb5c5f2b5e3d8dfd116720de97434d21 SHA256 eab5f1dcd6803074f81eba83156031e178d6f782474bdeab81017bf9367df221
+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
+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)
+
+iQEcBAEBCgAGBQJO4LBqAAoJEO+t9ga+3I3aoaoH+QH4kP8yRMsGX0X/tzexgfp2
+fv5+3RACUVQD9yioz/7MCLRegAxjBwg08Kds6S23gpSlL/U73iIe4pFoul/qi2ci
+z/PmLYTw1iHYbZrOrqzipy0k376FIwyuziJZdeRg5ttTU5Igh9VKxI/221kpHrxv
+Ee8zca/BJLm8QuYFCqOZenr4JrUGwBJBW74L0c3Z9OajvWra0gpQ5l+Tr1EUB++Q
+kuxdqpD5eOaNSIYdwQLbYG0TTySp1oP4V5aMuzFboy+I9o4wqtW+eTHDQit48DXw
+F9282yqvKEpT2gSWlTSIlJBbTUcDqxKGfS6/tcqGS6adfm029IUL380UWzpTBCk=
+=IL5+
+-----END PGP SIGNATURE-----
diff --git a/dev-cpp/clucene/clucene-2.3.3.4.ebuild b/dev-cpp/clucene/clucene-2.3.3.4-r1.ebuild
index 4f358b2df78f..a4a0cd2b7ffa 100644
--- a/dev-cpp/clucene/clucene-2.3.3.4.ebuild
+++ b/dev-cpp/clucene/clucene-2.3.3.4-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.2 2011/11/13 21:12:13 mr_bones_ Exp $
+# $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 $
 
 EAPI=4
 
@@ -27,10 +27,6 @@ RDEPEND="!<app-misc/strigi-0.7.5-r3"
 
 DOCS=(AUTHORS ChangeLog README README.PACKAGE REQUESTS)
 
-PATCHES=(
-	"${FILESDIR}/${PN}-9999-cmake.patch"
-)
-
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 src_configure() {
diff --git a/dev-cpp/clucene/clucene-9999.ebuild b/dev-cpp/clucene/clucene-9999.ebuild
index 2c020362dd7c..bda2d6523fb3 100644
--- a/dev-cpp/clucene/clucene-9999.ebuild
+++ b/dev-cpp/clucene/clucene-9999.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2011/04/26 16:03:50 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/clucene/clucene-9999.ebuild,v 1.4 2011/12/08 12:41:18 johu Exp $
 
 EAPI=4
 
@@ -20,10 +20,6 @@ DEPEND="
 	doc? ( >=app-doc/doxygen-1.4.2 )
 "
 
-PATCHES=(
-	"${FILESDIR}/${P}-cmake.patch"
-)
-
 DOCS=(AUTHORS ChangeLog README README.PACKAGE REQUESTS)
 
 src_configure() {
diff --git a/dev-cpp/clucene/files/clucene-9999-cmake.patch b/dev-cpp/clucene/files/clucene-9999-cmake.patch
deleted file mode 100644
index 81a3c531d1c0..000000000000
--- a/dev-cpp/clucene/files/clucene-9999-cmake.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
-index 6084f2f..7529b41 100644
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -222,8 +222,6 @@ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/CLuceneConfig.cmake" "
-     set(CLUCENE_VERSION ${CLUCENE_VERSION})
-     set(CLUCENE_SOVERSION ${CLUCENE_SOVERSION})
- ")
--install(FILES "${CMAKE_CURRENT_BINARY_DIR}/CLuceneConfig.cmake"
--        DESTINATION ${LIB_DESTINATION}/CLuceneConfig.cmake)
- 
- # install pkg-config file
- IF(NOT WIN32)
-@@ -238,16 +236,10 @@ IF ( LUCENE_SYS_INCLUDES )
-     install(FILES ${clucene-shared_BINARY_DIR}/CLucene/clucene-config.h 
-             DESTINATION ${LUCENE_SYS_INCLUDES}/CLucene  
-             COMPONENT development)
--    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/CLuceneConfig.cmake 
--            DESTINATION ${LUCENE_SYS_INCLUDES}/CLucene  
--            COMPONENT development)
- ELSE ( LUCENE_SYS_INCLUDES )
-     install(FILES ${clucene-shared_BINARY_DIR}/CLucene/clucene-config.h 
-             DESTINATION include/CLucene
-             COMPONENT development)
--    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/CLuceneConfig.cmake 
--            DESTINATION include/CLucene
--            COMPONENT development)
- ENDIF ( LUCENE_SYS_INCLUDES )
- 
-