diff options
| -rw-r--r-- | dev-libs/xapian/ChangeLog | 12 | ||||
| -rw-r--r-- | dev-libs/xapian/Manifest | 13 | ||||
| -rw-r--r-- | dev-libs/xapian/files/digest-xapian-0.8.3 | 1 | ||||
| -rw-r--r-- | dev-libs/xapian/files/digest-xapian-0.9.2-r1 | 1 | ||||
| -rw-r--r-- | dev-libs/xapian/files/xapian-0.9.2-config.patch | 17 | ||||
| -rw-r--r-- | dev-libs/xapian/xapian-0.9.2-r1.ebuild (renamed from dev-libs/xapian/xapian-0.8.3.ebuild) | 30 |
6 files changed, 57 insertions, 17 deletions
diff --git a/dev-libs/xapian/ChangeLog b/dev-libs/xapian/ChangeLog index 148b35a7885f..4e4b24e83e2d 100644 --- a/dev-libs/xapian/ChangeLog +++ b/dev-libs/xapian/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-libs/xapian -# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/ChangeLog,v 1.14 2005/10/07 10:18:44 dragonheart Exp $ +# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/ChangeLog,v 1.15 2006/01/14 12:31:15 dragonheart Exp $ + +*xapian-0.9.2-r1 (14 Jan 2006) + + 14 Jan 2006; Daniel Black <dragonheart@gentoo.org> + +files/xapian-0.9.2-config.patch, -xapian-0.8.3.ebuild, + +xapian-0.9.2-r1.ebuild: + added patch by author Olly Betts to xapian-config problem -thanks to + Jean-Francois Dockes. Removed old xapian version 07 Oct 2005; Daniel Black <dragonheart@gentoo.org> -xapian-0.7.5.ebuild, xapian-0.8.3.ebuild, -xapian-0.8.5.ebuild, -xapian-0.9.1.ebuild, diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest index 2395a5199827..ca703a8891fb 100644 --- a/dev-libs/xapian/Manifest +++ b/dev-libs/xapian/Manifest @@ -1,16 +1,17 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 eb1e07752a9cd1079c88d28b7fdddcad ChangeLog 2136 -MD5 e34ccc257ed62a9946b05160c1665929 files/digest-xapian-0.8.3 70 +MD5 891b18a65dcada77b8d9b8c49bcec361 ChangeLog 2429 MD5 331c7c366023b054a158e1a234b856f2 files/digest-xapian-0.9.2 70 +MD5 331c7c366023b054a158e1a234b856f2 files/digest-xapian-0.9.2-r1 70 +MD5 58c419978523bfcce71719ad805f3d6f files/xapian-0.9.2-config.patch 853 MD5 6d796b061ed1c1337ef157a5f74dab35 metadata.xml 403 -MD5 d3581907e3585c0ce4f8fe7e6e8e39e9 xapian-0.8.3.ebuild 957 +MD5 f116d3130402c9ddbf147b34aac60bb4 xapian-0.9.2-r1.ebuild 1162 MD5 aad8230cbbfec0062d9f2e3b69de9038 xapian-0.9.2.ebuild 1056 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux) -iD8DBQFDRkuamdTrptrqvGERAtGeAJsFabsN6UGg7mMYJZNFjRIpy7iRMACfbK3d -dlj/xFK/acvQpu2hNf7zrxk= -=N726 +iD8DBQFDyP6cmdTrptrqvGERApstAJ49/JrnF/4Hi5GT1js/4AQTZ1MnCwCfanak +LKw8x5ws0ameSPTMae+uDZU= +=FYAe -----END PGP SIGNATURE----- diff --git a/dev-libs/xapian/files/digest-xapian-0.8.3 b/dev-libs/xapian/files/digest-xapian-0.8.3 deleted file mode 100644 index 84252d872555..000000000000 --- a/dev-libs/xapian/files/digest-xapian-0.8.3 +++ /dev/null @@ -1 +0,0 @@ -MD5 7feef46188912b180d048953e3518fc6 xapian-core-0.8.3.tar.gz 2095952 diff --git a/dev-libs/xapian/files/digest-xapian-0.9.2-r1 b/dev-libs/xapian/files/digest-xapian-0.9.2-r1 new file mode 100644 index 000000000000..ddf3665b9266 --- /dev/null +++ b/dev-libs/xapian/files/digest-xapian-0.9.2-r1 @@ -0,0 +1 @@ +MD5 772115e47e4bbf7cacc74dc0d11a592a xapian-core-0.9.2.tar.gz 2482298 diff --git a/dev-libs/xapian/files/xapian-0.9.2-config.patch b/dev-libs/xapian/files/xapian-0.9.2-config.patch new file mode 100644 index 000000000000..2cb181a34c85 --- /dev/null +++ b/dev-libs/xapian/files/xapian-0.9.2-config.patch @@ -0,0 +1,17 @@ +--- xapian-config.in.orig ++++ xapian-config.in +@@ -132,6 +132,14 @@ + test /usr/lib != "$libdir" && L="-L$libdir " + D= + eval `grep ^dependency_libs= "$libdir/libxapian.la"` ++ # Replace "/path/to/libfoo.la" with "-L/path/to -lfoo" which doesn't ++ # take into account any dependency_libs which libfoo.la may pull in ++ # but the only .la that we're likely to see is libstdc++.la and it'll ++ # hopefully work there as any dependency libs will probably be pulled ++ # in by the compiler for us. Recursively pulling in dependency_libs ++ # is probably too hard to do in sh - we'd need to reimplement ++ # xapian-config in C or C++. ++ dependency_libs=`echo " $dependency_libs "|sed 's![ ][ ]*! !g;s! \(/[^ ]*\)/lib\([^ ]*\).la ! -L\1 -l\2 !g;s! ! !g;s!^ !!;s! $!!'` + test -n "$dependency_libs" && D=" $dependency_libs" + echo "$F$L-lxapian$D" + ;; diff --git a/dev-libs/xapian/xapian-0.8.3.ebuild b/dev-libs/xapian/xapian-0.9.2-r1.ebuild index 8747ccc318e5..e4c13f6bca86 100644 --- a/dev-libs/xapian/xapian-0.8.3.ebuild +++ b/dev-libs/xapian/xapian-0.9.2-r1.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/xapian-0.8.3.ebuild,v 1.3 2005/10/07 10:18:44 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/xapian-0.9.2-r1.ebuild,v 1.1 2006/01/14 12:31:15 dragonheart Exp $ + +inherit eutils IUSE="" @@ -10,23 +12,35 @@ SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-core-${PV}.tar.gz" HOMEPAGE="http://www.xapian.org/" SLOT="0" LICENSE="GPL-2" -KEYWORDS="ppc x86" +KEYWORDS="~ppc ~x86" DEPEND="virtual/libc sys-apps/gawk sys-apps/grep sys-apps/sed sys-devel/libtool - sys-devel/bison sys-devel/gcc" RDEPEND="virtual/libc" -src_compile() { - econf || die "./configure failed" - emake || die + +src_unpack() { + unpack "${A}" + cd "${S}" + epatch "${FILESDIR}/${P}-config.patch" } +src_test() { + if has_version '<=dev-util/valgrind-2.3.0'; + then + #valgrind-2.2 caused errors here. + make check VALGRIND= || die "check failed" + else + make check || die "check failed" + fi +} + + src_install () { emake DESTDIR=${D} install || die @@ -34,5 +48,5 @@ src_install () { # lets move them under /usr/share/doc.. mv ${D}/usr/share/doc/xapian-core ${D}/usr/share/doc/${PF} - dodoc AUTHORS HACKING PLATFORMS README Changelog + dodoc AUTHORS HACKING PLATFORMS README } |