3 files changed, 60 insertions, 13 deletions
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 <scarabeus@gentoo.org>
+  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/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
+}