From 1798c4aeca70ac8d0a243684d6a798fbc65735f8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:57:42 +0100 Subject: gentoo resync : 14.07.2018 --- dev-cpp/clucene/Manifest | 6 --- dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild | 63 ---------------------- .../clucene/files/clucene-2.3.3.4-contrib.patch | 42 --------------- dev-cpp/clucene/files/clucene-2.3.3.4-gcc6.patch | 28 ---------- .../clucene/files/clucene-2.3.3.4-pkgconfig.patch | 12 ----- dev-cpp/clucene/metadata.xml | 7 --- 6 files changed, 158 deletions(-) delete mode 100644 dev-cpp/clucene/Manifest delete mode 100644 dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild delete mode 100644 dev-cpp/clucene/files/clucene-2.3.3.4-contrib.patch delete mode 100644 dev-cpp/clucene/files/clucene-2.3.3.4-gcc6.patch delete mode 100644 dev-cpp/clucene/files/clucene-2.3.3.4-pkgconfig.patch delete mode 100644 dev-cpp/clucene/metadata.xml (limited to 'dev-cpp/clucene') diff --git a/dev-cpp/clucene/Manifest b/dev-cpp/clucene/Manifest deleted file mode 100644 index c133599946db..000000000000 --- a/dev-cpp/clucene/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX clucene-2.3.3.4-contrib.patch 1697 BLAKE2B 2aebc143ff0dafb2765cb3bd5d8e5183bdcfa7cb51a6109e957650412394796c7825c38dab9f1f9637c436b10714624dcbcfd3b6ab88dbfef9c5de9582e65ccc SHA512 0aa92635949089196e4e7c579e78761e8751987ef5036320a161a4aaa67da3c63756398c903419c76ea0fbdc8a949e871fcb65be98179a9853a24a5a4cacfde3 -AUX clucene-2.3.3.4-gcc6.patch 1102 BLAKE2B c7a264585532237d38ad5d06d1e1b96559e47145dc9ecbfe73ec6b8a493fd9c0eef73611305de213e432dd94736dc49dbc140b47d0c65081228989aa21a3fe62 SHA512 367e97d9b5d59bca880d8ec70b37078406f581267a896ff6b35cd3ab21f983f4b21152482bb34fb813e426b4cae14a6d319ccdb08e3bf968de8ece3c28a18722 -AUX clucene-2.3.3.4-pkgconfig.patch 871 BLAKE2B a108d0c4427159a09d2575b351bedfd38c6305219e01a7927b66aacfcab3587d3c08315f0a7e58a123e6779d2d8fec17fb06127de32dfd5782408cbc5c916ed5 SHA512 afcdf00537c8eb9c75ed569356520551ea194c8edc636f6e82bd0b1ef60e33396c1e2722b895aced2b58358950b3c5c1df2a914295074e9e99485ca6cee21c18 -DIST clucene-core-2.3.3.4.tar.gz 2241498 BLAKE2B e7c02d3976fd8d722a81ad4c6d43363b9af0073aa68edb8303cada495f8b8514cb8c86a85f398f8c9ffc1f78a49c0718cde5af4145c32869572d21e8af633846 SHA512 1c9da9077edcebd46563bd9e47d330518e0b30061016650a759cfe051e9748fdad8932a472b1cca53a6adafed5f41656527271fc5f55ddfcefb558f0d83286b4 -EBUILD clucene-2.3.3.4-r6.ebuild 1529 BLAKE2B 16ccc927491fb827de63c015e79e072dddce3f334c6813a888be2bd9fd673ba3dff5a32c380bcd03aba9d28c841ae56b7e78df464afb7a36c4f3a8433d322975 SHA512 7ad4ed1947c1932bbbb15490c39f65c248fe82ab7fff3114318cb53d1f280acc7512d69e97df3372c2adc0f9c5df79b322fd8ca0d4c1c91932f42b14d2afc939 -MISC metadata.xml 216 BLAKE2B 52c5c99fc83e614fdcb2cb7f83f8cc5bfe32584104dc1da8f233a7aa636553a52df7eddd120b578d3a029f92080eacfafd19a541c33b4d6050908cb0d0723e2a SHA512 f08965e90195baaacd6b6eb8d904a105df499b9ec48adfc586c6f688591260bf0f12b6992313f6119e201f6362f6abd52d659d23d4b5d84c6ae67a09f8e2b183 diff --git a/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild b/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild deleted file mode 100644 index f636e9b11277..000000000000 --- a/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PN="${PN}"-core -MY_P="${MY_PN}"-"${PV}" - -inherit cmake-utils multilib - -DESCRIPTION="High-performance, full-featured text search engine based off of lucene in C++" -HOMEPAGE="http://clucene.sourceforge.net/" -SRC_URI="mirror://sourceforge/clucene/${MY_P}.tar.gz" - -LICENSE="|| ( Apache-2.0 LGPL-2.1 )" -SLOT="1" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" - -IUSE="debug doc static-libs" - -DEPEND=" - doc? ( >=app-doc/doxygen-1.4.2 ) -" -RDEPEND="" - -RESTRICT="test" - -DOCS=(AUTHORS ChangeLog README README.PACKAGE REQUESTS) - -S="${WORKDIR}/${MY_PN}-${PV}" - -PATCHES=( - "${FILESDIR}/${P}-contrib.patch" - "${FILESDIR}/${P}-pkgconfig.patch" - "${FILESDIR}/${P}-gcc6.patch" -) - -src_prepare() { - cmake-utils_src_prepare - - # patch out installing bundled boost headers, we build against system one - sed -i \ - -e '/ADD_SUBDIRECTORY (src\/ext)/d' \ - CMakeLists.txt || die - rm -rf src/ext || die -} - -src_configure() { - # Disabled threads: see upstream bug - # https://sourceforge.net/tracker/?func=detail&aid=3237301&group_id=80013&atid=558446 - local mycmakeargs=( - -DENABLE_ASCII_MODE=OFF - -DENABLE_PACKAGING=OFF - -DDISABLE_MULTITHREADING=OFF - -DBUILD_CONTRIBS_LIB=ON - "-DLIB_DESTINATION=${EPREFIX}/usr/$(get_libdir)" - -DENABLE_DEBUG=$(usex debug) - -DENABLE_CLDOCS=$(usex doc) - -DBUILD_STATIC_LIBRARIES=$(usex static-libs) - ) - - 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 deleted file mode 100644 index 8fbb3c7164ab..000000000000 --- a/dev-cpp/clucene/files/clucene-2.3.3.4-contrib.patch +++ /dev/null @@ -1,42 +0,0 @@ -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-gcc6.patch b/dev-cpp/clucene/files/clucene-2.3.3.4-gcc6.patch deleted file mode 100644 index b0b9ac1a327b..000000000000 --- a/dev-cpp/clucene/files/clucene-2.3.3.4-gcc6.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b5a1b3488a72abd250cbd5d4dfbeac3e3739c237 Mon Sep 17 00:00:00 2001 -From: Hodorgasm -Date: Thu, 12 May 2016 20:38:12 -0400 -Subject: [PATCH] Support GCC-6 - -Updated 2017-06-18 by mgorny to allow *any* gcc version so that -we do not have to update the patch every second month. - ---- - src/shared/cmake/MacroCheckGccVisibility.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/shared/cmake/MacroCheckGccVisibility.cmake b/src/shared/cmake/MacroCheckGccVisibility.cmake -index 2022aa3..020f913 100644 ---- a/src/shared/cmake/MacroCheckGccVisibility.cmake -+++ b/src/shared/cmake/MacroCheckGccVisibility.cmake -@@ -15,7 +15,7 @@ macro(MACRO_CHECK_GCC_VISIBILITY GccVisibility) - # get the gcc version - exec_program(${CMAKE_C_COMPILER} ARGS --version OUTPUT_VARIABLE _gcc_version_info) - -- string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") -+ string (REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" _gcc_version "${_gcc_version_info}") - if (NOT _gcc_version) - - # clang reports: clang version 1.1 (trunk 95754) --- -2.8.2 - 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 deleted file mode 100644 index 14563628ea41..000000000000 --- a/dev-cpp/clucene/files/clucene-2.3.3.4-pkgconfig.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 - ~ diff --git a/dev-cpp/clucene/metadata.xml b/dev-cpp/clucene/metadata.xml deleted file mode 100644 index 780c9e86ccc8..000000000000 --- a/dev-cpp/clucene/metadata.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - clucene - - -- cgit v1.2.3