summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-01-05 10:22:19 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2011-01-05 10:22:19 +0000
commit53899f2ccefe1cf54d0f20bc47039392d65e9aef (patch)
treee20507be77d2e222c3433eade95c23d29fc670e0 /dev-cpp
parentTemporary fix - amule segfaults on startup with certain crypto++ versions bug... (diff)
downloadhistorical-53899f2ccefe1cf54d0f20bc47039392d65e9aef.tar.gz
historical-53899f2ccefe1cf54d0f20bc47039392d65e9aef.tar.bz2
historical-53899f2ccefe1cf54d0f20bc47039392d65e9aef.zip
Fix maintainer mode called automake. Per bug #350100.
Package-Manager: portage-2.2.0_alpha12/cvs/Linux x86_64
Diffstat (limited to 'dev-cpp')
-rw-r--r--dev-cpp/clucene/ChangeLog8
-rw-r--r--dev-cpp/clucene/Manifest4
-rw-r--r--dev-cpp/clucene/clucene-0.9.21b-r1.ebuild25
3 files changed, 25 insertions, 12 deletions
diff --git a/dev-cpp/clucene/ChangeLog b/dev-cpp/clucene/ChangeLog
index cf03fe4b3af0..f19bbe54939c 100644
--- a/dev-cpp/clucene/ChangeLog
+++ b/dev-cpp/clucene/ChangeLog
@@ -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@gentoo.org>
+ clucene-0.9.21b-r1.ebuild:
+ Fix maintainer mode called automake. Per bug #350100.
03 Dec 2010; Andrey Grozin <grozin@gentoo.org> clucene-0.9.21b-r1.ebuild,
+files/clucene-0.9.21b-doxygen.patch:
diff --git a/dev-cpp/clucene/Manifest b/dev-cpp/clucene/Manifest
index f2f47bfd2313..992800e7a993 100644
--- a/dev-cpp/clucene/Manifest
+++ b/dev-cpp/clucene/Manifest
@@ -2,8 +2,8 @@ AUX clucene-0.9.21b-doxygen.patch 320 RMD160 396f63bbe283778033b02f80a3e9e84e4d1
AUX clucene-0.9.21b-gcc44.patch 218 RMD160 61cae76cb6051905a1f0c911cf7641df2885a91c SHA1 20d4c94095ddb70f3bd02d3ec8a5135567202d53 SHA256 2ab6c9350ae2ddc56e0c3c956c687f22b0a6f5adc438a0e512bca18efc502d2f
AUX clucene-9999-cmake.patch 1244 RMD160 00a4404ed2b6557baa50a7518697b68370f40e62 SHA1 38113f8c6285e10051894aa67dbb516545c3e6b6 SHA256 ee53fdb5d934464d120bee0c1f2f6f26545226a856bf0f25a3834f717da4fd44
DIST clucene-core-0.9.21b.tar.bz2 1539103 RMD160 e04ca10ca755cdd9c7bf5ccdd34a91c0007de1d4 SHA1 8bc505b64f82723c2dc901036cb0607500870973 SHA256 202ee45af747f18642ae0a088d7c4553521714a511a1a9ec99b8144cf9928317
-EBUILD clucene-0.9.21b-r1.ebuild 1282 RMD160 48180e9348cf6d41d0a0fee70e81815f44947f3d SHA1 67497a6a6122bc568fd4d740ec924f72a7d739bf SHA256 fd3a168196809e8b1879e35dd9f8085e48415ecc177483da245918788d11575b
+EBUILD clucene-0.9.21b-r1.ebuild 1416 RMD160 be12e4dad84244427e7495cd808946666ff19763 SHA1 c18ac40ff35c2078a76219c70fd6bda42173debf SHA256 fd57b55ea2f5b2a231d676906f5e467b4f88a4bcf14d21d3f1a67595d0a33ae8
EBUILD clucene-0.9.21b.ebuild 1153 RMD160 a64ae7d41bd5f096f383a7289ca97b808d0e2fca SHA1 f619874d5f0e2edff930bde12ee90f95df6880be SHA256 76a8f0a4ccce114e0e957db8d54f20e927dffcf88da95e78f7a05aaef7932a46
EBUILD clucene-9999.ebuild 1046 RMD160 75a11d3172419f342508a6f8a98f893da4be6435 SHA1 2861e6195b5287de2f57eca142878de92e03c2c0 SHA256 7fab3cd1a9bee90e9f5d79d7beee9af8c92e30b6bc9911de26c9ad3f31f59652
-MISC ChangeLog 4581 RMD160 09350397cb14ea308955e5be6fcb531a9e52b662 SHA1 97f62b72aa8b39a3f27ef392c95a80226412788a SHA256 0eab4b325bcded4f3435a229660c0452eb7940bb2f7740fbf0121dec0c506e40
+MISC ChangeLog 4725 RMD160 7d6696b1f51afdc8efb3d9bf98796bbea107089b SHA1 954da49a09545aece5b1213237a37f7be11ba813 SHA256 cecf98052e076a9a7a2f0b883e37b32d7d968956da48b0a3d6f7954ed99514a5
MISC metadata.xml 256 RMD160 838e0f6278a4b0fe932c770396ad4a21b4437b37 SHA1 e845939169cd2438b7a0be04ea629e23d5a2157f SHA256 ed71448e1cf2b00c5a424eab700c847564482392381f9c6079d9642e36143515
diff --git a/dev-cpp/clucene/clucene-0.9.21b-r1.ebuild b/dev-cpp/clucene/clucene-0.9.21b-r1.ebuild
index fd267ff9e57e..4488fba3f0dd 100644
--- a/dev-cpp/clucene/clucene-0.9.21b-r1.ebuild
+++ b/dev-cpp/clucene/clucene-0.9.21b-r1.ebuild
@@ -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 @@ PATCHES=(
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 @@ src_install() {
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"
}