[gentoo-commits] gentoo-x86 commit in dev-cpp/clucene: ChangeLog clucene-0.9.21b-r1.ebuild

[Tomas Chvatal (scarabeus)]

scarabeus    11/01/05 10:22:19

  Modified:             ChangeLog clucene-0.9.21b-r1.ebuild
  Log:
  Fix maintainer mode called automake. Per bug #350100.
  
  (Portage version: 2.2.0_alpha12/cvs/Linux x86_64)

Revision  Changes    Path
1.33                 dev-cpp/clucene/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/clucene/ChangeLog?rev=1.33&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/clucene/ChangeLog?rev=1.33&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/clucene/ChangeLog?r1=1.32&r2=1.33

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-cpp/clucene/ChangeLog,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ChangeLog	3 Dec 2010 10:41:24 -0000	1.32
+++ ChangeLog	5 Jan 2011 10:22:19 -0000	1.33
@@ -1,6 +1,10 @@
 # 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.32 2010/12/03 10:41:24 grozin Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/clucene/ChangeLog,v 1.33 2011/01/05 10:22:19 scarabeus Exp $
+
+  05 Jan 2011; Tomáš Chvátal <scarabeus@g.o>
+  clucene-0.9.21b-r1.ebuild:
+  Fix maintainer mode called automake. Per bug #350100.
 
   03 Dec 2010; Andrey Grozin <grozin@g.o> clucene-0.9.21b-r1.ebuild,
   +files/clucene-0.9.21b-doxygen.patch:



1.5                  dev-cpp/clucene/clucene-0.9.21b-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/clucene/clucene-0.9.21b-r1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/clucene/clucene-0.9.21b-r1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/clucene/clucene-0.9.21b-r1.ebuild?r1=1.4&r2=1.5

Index: clucene-0.9.21b-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-cpp/clucene/clucene-0.9.21b-r1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- clucene-0.9.21b-r1.ebuild	3 Dec 2010 10:41:24 -0000	1.4
+++ clucene-0.9.21b-r1.ebuild	5 Jan 2011 10:22:19 -0000	1.5
@@ -1,11 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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-0.9.21b-r1.ebuild,v 1.4 2010/12/03 10:41:24 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/clucene/clucene-0.9.21b-r1.ebuild,v 1.5 2011/01/05 10:22:19 scarabeus Exp $
 
-EAPI="3"
+EAPI=3
 
 MY_P=${PN}-core-${PV}
-inherit base
+inherit base autotools
 
 DESCRIPTION="High-performance, full-featured text search engine based off of lucene in C++"
 HOMEPAGE="http://clucene.sourceforge.net/"
@@ -26,6 +26,17 @@
 
 S="${WORKDIR}/${MY_P}"
 
+src_prepare() {
+	base_src_prepare
+
+	# fix wrong aclocal_amflags
+	sed -i \
+		-e '/ACLOCAL_AMFLAGS/d' \
+		Makefile.am || die
+
+	AT_M4DIR='-I m4' eautoreconf
+}
+
 src_configure() {
 	econf \
 		$(use_enable debug) \
@@ -45,8 +56,6 @@
 	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"
-	fi
+	find "${D}" -type f -name '*.la' -exec rm -f {} + \
+		|| die "la removal failed"
 }