summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2011-12-08 12:41:19 +0000
committerJohannes Huber <johu@gentoo.org>2011-12-08 12:41:19 +0000
commit00c119363e55f2719e0d408e9752ac50e0e47073 (patch)
tree7883a75ba971110f8f7f8451d360859898730a4e /dev-cpp
parentVersion bump (diff)
downloadgentoo-2-00c119363e55f2719e0d408e9752ac50e0e47073.tar.gz
gentoo-2-00c119363e55f2719e0d408e9752ac50e0e47073.tar.bz2
gentoo-2-00c119363e55f2719e0d408e9752ac50e0e47073.zip
Removed patch wrt bug #361385
(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)
Diffstat (limited to 'dev-cpp')
-rw-r--r--dev-cpp/clucene/ChangeLog8
-rw-r--r--dev-cpp/clucene/clucene-2.3.3.4-r1.ebuild (renamed from dev-cpp/clucene/clucene-2.3.3.4.ebuild)6
-rw-r--r--dev-cpp/clucene/clucene-9999.ebuild6
-rw-r--r--dev-cpp/clucene/files/clucene-9999-cmake.patch30
4 files changed, 9 insertions, 41 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/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 )
-
-