From 0b0ae379af2baaa27f6413eec9d179713f65e7cc Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Wed, 26 May 2010 10:04:49 +0000 Subject: [PATCH] Update clucene-0.9.21b-r1 to be eapi3 and use base eclass. Add live ebuild. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- dev-cpp/clucene/ChangeLog | 9 +++++- dev-cpp/clucene/Manifest | 15 +++++++-- dev-cpp/clucene/clucene-0.9.21b-r1.ebuild | 25 ++++++++------- dev-cpp/clucene/clucene-9999.ebuild | 39 +++++++++++++++++++++++ 4 files changed, 73 insertions(+), 15 deletions(-) create mode 100644 dev-cpp/clucene/clucene-9999.ebuild diff --git a/dev-cpp/clucene/ChangeLog b/dev-cpp/clucene/ChangeLog index 25f1c24930b5..b8e9786a7792 100644 --- a/dev-cpp/clucene/ChangeLog +++ b/dev-cpp/clucene/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-cpp/clucene # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/clucene/ChangeLog,v 1.29 2010/05/25 06:41:03 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/clucene/ChangeLog,v 1.30 2010/05/26 10:04:49 scarabeus Exp $ + +*clucene-9999 (26 May 2010) + + 26 May 2010; Tomáš Chvátal + clucene-0.9.21b-r1.ebuild, +clucene-9999.ebuild: + Update clucene-0.9.21b-r1 to be eapi3 and use base eclass. Add live + ebuild. *clucene-0.9.21b-r1 (25 May 2010) diff --git a/dev-cpp/clucene/Manifest b/dev-cpp/clucene/Manifest index 674822d4202c..8b4a3d95d6ce 100644 --- a/dev-cpp/clucene/Manifest +++ b/dev-cpp/clucene/Manifest @@ -1,6 +1,17 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX clucene-0.9.21b-gcc44.patch 218 RMD160 61cae76cb6051905a1f0c911cf7641df2885a91c SHA1 20d4c94095ddb70f3bd02d3ec8a5135567202d53 SHA256 2ab6c9350ae2ddc56e0c3c956c687f22b0a6f5adc438a0e512bca18efc502d2f DIST clucene-core-0.9.21b.tar.bz2 1539103 RMD160 e04ca10ca755cdd9c7bf5ccdd34a91c0007de1d4 SHA1 8bc505b64f82723c2dc901036cb0607500870973 SHA256 202ee45af747f18642ae0a088d7c4553521714a511a1a9ec99b8144cf9928317 -EBUILD clucene-0.9.21b-r1.ebuild 1315 RMD160 06bd9605d31273c139ff1c1774c62fb255aadb77 SHA1 c28128ba1acd378bbdc6a953d09204a0023bfe1d SHA256 67e17dbead3053463ed0fd99317bd939b253967523ee970dd78aa08270f05de8 +EBUILD clucene-0.9.21b-r1.ebuild 1252 RMD160 98f00b46ba42274db7508392a90f42f34abe711e SHA1 48f16235ffc47c4a3c3c63a116d71d1cd4c6ee4b SHA256 fe0900af59f8461a5469d42e9409624dc910bf855deded9822b69d6775b373ed EBUILD clucene-0.9.21b.ebuild 1153 RMD160 a64ae7d41bd5f096f383a7289ca97b808d0e2fca SHA1 f619874d5f0e2edff930bde12ee90f95df6880be SHA256 76a8f0a4ccce114e0e957db8d54f20e927dffcf88da95e78f7a05aaef7932a46 -MISC ChangeLog 3996 RMD160 274e37e5d8f762e81d292296823f362f242de23c SHA1 e29547987ed1c8fe02ddcabba28a6160c49e681f SHA256 46c83dcf4aace4cebdc70463b831d3bc8268f3d61eddfcf9a22bcd333390d5f2 +EBUILD clucene-9999.ebuild 985 RMD160 efecb719ef05a56b09ef30163a581c8dbd95cb89 SHA1 f5a3bbfcf85eaf44149ab0203652ca2a4cc420b8 SHA256 410f22a1a332185806afbc54e49483fa0a9277b27667a800d07fd8d7892cdf70 +MISC ChangeLog 4213 RMD160 01c70ee0f27201466a210f202851be6f6bbad3d7 SHA1 bec881374146b69afdf295cbfd3db5b5730d7192 SHA256 dee2348f2339ecd1d0baf01bb5eb3995e85fcefc295f6c53c61419a0372223e6 MISC metadata.xml 256 RMD160 838e0f6278a4b0fe932c770396ad4a21b4437b37 SHA1 e845939169cd2438b7a0be04ea629e23d5a2157f SHA256 ed71448e1cf2b00c5a424eab700c847564482392381f9c6079d9642e36143515 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.15 (GNU/Linux) + +iEYEARECAAYFAkv88kwACgkQHB6c3gNBRYf42ACfdhuNf6emNmCZyHiFoGg3Lxlf +E7oAoKfO4H5tdM3xSpgRGGNzK0WKeJou +=92Va +-----END PGP SIGNATURE----- diff --git a/dev-cpp/clucene/clucene-0.9.21b-r1.ebuild b/dev-cpp/clucene/clucene-0.9.21b-r1.ebuild index 29ece13b2526..8d0e3aec997d 100644 --- a/dev-cpp/clucene/clucene-0.9.21b-r1.ebuild +++ b/dev-cpp/clucene/clucene-0.9.21b-r1.ebuild @@ -1,12 +1,11 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/clucene/clucene-0.9.21b-r1.ebuild,v 1.1 2010/05/25 06:41:03 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/clucene/clucene-0.9.21b-r1.ebuild,v 1.2 2010/05/26 10:04:49 scarabeus Exp $ -EAPI="2" - -inherit eutils +EAPI="3" MY_P=${PN}-core-${PV} +inherit base DESCRIPTION="High-performance, full-featured text search engine based off of lucene in C++" HOMEPAGE="http://clucene.sourceforge.net/" @@ -20,29 +19,31 @@ IUSE="debug doc static-libs threads" DEPEND="doc? ( >=app-doc/doxygen-1.4.2 )" RDEPEND="" -S="${WORKDIR}/${MY_P}" +PATCHES=( + "${FILESDIR}/${P}-gcc44.patch" +) -src_prepare() { - epatch "${FILESDIR}"/${P}-gcc44.patch #254254 -} +S="${WORKDIR}/${MY_P}" src_configure() { - econf $(use_enable debug) \ + econf \ + $(use_enable debug) \ $(use_enable debug cnddebug) \ $(use_enable static-libs static) \ $(use_enable threads multithreading) } src_compile() { - emake || die "emake failed" + base_src_compile if use doc ; then emake doxygen || die "making docs failed" fi } src_install() { - emake DESTDIR="${D}" install || die "installation failed" - use doc && dohtml "${S}"/doc/html/* + base_src_install + use doc && { dohtml "${S}"/doc/html/* ; } + if ! use static-libs; then find "${D}" -type f -name '*.la' -exec rm -f {} + \ || die "la removal failed" diff --git a/dev-cpp/clucene/clucene-9999.ebuild b/dev-cpp/clucene/clucene-9999.ebuild new file mode 100644 index 000000000000..e0fdd2a123b7 --- /dev/null +++ b/dev-cpp/clucene/clucene-9999.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2010 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.1 2010/05/26 10:04:49 scarabeus Exp $ + +EAPI="3" + +MY_P=${PN}-core-${PV} +inherit git base cmake-utils + +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="${DEPEND} + doc? ( >=app-doc/doxygen-1.4.2 ) +" + +src_unpack() { + git_src_unpack +} + +src_configure() { + 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 +} -- 2.26.2