7 files changed, 50 insertions, 49 deletions
diff --git a/dev-libs/xapian/ChangeLog b/dev-libs/xapian/ChangeLog
index 2842789ea959..a02ed8ab3d15 100644
--- a/dev-libs/xapian/ChangeLog
+++ b/dev-libs/xapian/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/xapian
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/ChangeLog,v 1.9 2004/11/14 14:36:57 dragonheart Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/ChangeLog,v 1.10 2005/01/24 11:45:58 dragonheart Exp $
+
+*xapian-0.8.5 (24 Jan 2005)
+
+  24 Jan 2005; Daniel Black <dragonheart@gentoo.org> -xapian-0.5.5.ebuild,
+  xapian-0.8.3.ebuild, +xapian-0.8.5.ebuild:
+  version bump as per bug #78691. Old version removed. PPC and x86 Keywords
+  added to 0.8.3. Thanks to Sig Lange <exonic@signuts.net> for the bug report
 
 *xapian-0.8.3 (15 Nov 2004)
 
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index 4a479ee91909..55c5e2b6d58c 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 a0c2a61c625c502ce0b3b873ffd3241d ChangeLog 1205
 MD5 39b3d75b520e004865538279af77f569 xapian-0.5.5.ebuild 922
 MD5 fe34c0fc51be91b1df02dd01b5147a34 xapian-0.7.5.ebuild 957
 MD5 6d796b061ed1c1337ef157a5f74dab35 metadata.xml 403
-MD5 6f538571f67ac9cdb55365c6911653c7 xapian-0.8.3.ebuild 975
+MD5 cdb43201a461f31177049906630f7b7e xapian-0.8.3.ebuild 973
+MD5 c1af9e63b6108f6d773c20c62f5e2d64 xapian-0.8.5.ebuild 908
 MD5 344df4e801dd25775490cc093095a4e4 files/digest-xapian-0.5.5 70
 MD5 802444d86d5656f568bff8e3c4650ac1 files/digest-xapian-0.7.5 70
 MD5 e34ccc257ed62a9946b05160c1665929 files/digest-xapian-0.8.3 70
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBl22PmdTrptrqvGERAjewAJ0Qo78lmD3zcre3cggDTArVCbtvBwCaA0xP
-ZuAuqazSmBg8J7P123LAavg=
-=TTED
------END PGP SIGNATURE-----
+MD5 359ff8c7c668bd7df20e45e8518254cf files/digest-xapian-0.8.5 70
diff --git a/dev-libs/xapian/files/digest-xapian-0.5.5 b/dev-libs/xapian/files/digest-xapian-0.5.5
deleted file mode 100644
index 9f93287ca9d5..000000000000
--- a/dev-libs/xapian/files/digest-xapian-0.5.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9b5bdfd512d8eb49f86453ac68ae9036 xapian-core-0.5.5.tar.gz 1502017
diff --git a/dev-libs/xapian/files/digest-xapian-0.8.5 b/dev-libs/xapian/files/digest-xapian-0.8.5
new file mode 100644
index 000000000000..bb384aa73af3
--- /dev/null
+++ b/dev-libs/xapian/files/digest-xapian-0.8.5
@@ -0,0 +1 @@
+MD5 65638f8c89cfe825e83e5225f251c475 xapian-core-0.8.5.tar.gz 2048961
diff --git a/dev-libs/xapian/xapian-0.5.5.ebuild b/dev-libs/xapian/xapian-0.5.5.ebuild
deleted file mode 100644
index 2e7c23b1000b..000000000000
--- a/dev-libs/xapian/xapian-0.5.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/xapian-0.5.5.ebuild,v 1.5 2004/07/02 04:57:10 eradicator Exp $
-
-IUSE=""
-
-S=${WORKDIR}/xapian-core-${PV}
-DESCRIPTION="Xapian Probabilistic Information Retrieval library"
-SRC_URI="http://www.tartarus.org/~olly/xapian-0.5.5/xapian-core-${PV}.tar.gz"
-HOMEPAGE="http://www.xapian.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-DEPEND="virtual/libc"
-
-src_compile() {
-	econf || die "./configure failed"
-	emake || die
-}
-
-src_install () {
-	einstall || die
-	dodoc AUTHORS COPYING HACKING INSTALL PLATFORMS README TODO
-	#docs tly et installed under /usr/share/xapian, lets move them under /usr/share/doc..
-	cd ${D}/usr/share/${PN}
-	dodir /usr/share/doc/${PF}/html
-	mv *.html apidoc/ ${D}/usr/share/doc/${PF}/html
-	mv * ${D}/usr/share/doc/${PF}
-	rmdir ${D}/usr/share/${PN}
-}
diff --git a/dev-libs/xapian/xapian-0.8.3.ebuild b/dev-libs/xapian/xapian-0.8.3.ebuild
index 8e45762700d2..f98a612ec1cd 100644
--- a/dev-libs/xapian/xapian-0.8.3.ebuild
+++ b/dev-libs/xapian/xapian-0.8.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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.1 2004/11/14 14:36:57 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/xapian-0.8.3.ebuild,v 1.2 2005/01/24 11:45:58 dragonheart Exp $
 
 IUSE=""
 
@@ -10,7 +10,7 @@ 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="~x86 ~ppc"
+KEYWORDS="x86 ppc"
 
 DEPEND="virtual/libc
 	sys-apps/gawk
diff --git a/dev-libs/xapian/xapian-0.8.5.ebuild b/dev-libs/xapian/xapian-0.8.5.ebuild
new file mode 100644
index 000000000000..e1253189517e
--- /dev/null
+++ b/dev-libs/xapian/xapian-0.8.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/xapian-0.8.5.ebuild,v 1.1 2005/01/24 11:45:58 dragonheart Exp $
+
+IUSE=""
+
+S=${WORKDIR}/xapian-core-${PV}
+DESCRIPTION="Xapian Probabilistic Information Retrieval library"
+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="~x86 ~ppc"
+
+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_install () {
+	emake DESTDIR=${D} install || die
+
+	#docs tly et installed under /usr/share/doc/xapian-core,
+	# lets move them under /usr/share/doc..
+	mv ${D}/usr/share/doc/xapian-core ${D}/usr/share/doc/${PF}
+
+	dodoc AUTHORS COPYING HACKING INSTALL PLATFORMS README Changelog
+}