Version bump.

(Portage version: 14273-svn/cvs/Linux x86_64)

4 files changed, 15 insertions, 88 deletions

diff --git a/dev-libs/xapian/ChangeLog b/dev-libs/xapian/ChangeLog
index 6d0687e87f42..826de14dee3d 100644
--- a/dev-libs/xapian/ChangeLog
+++ b/dev-libs/xapian/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/xapian
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/ChangeLog,v 1.32 2009/05/01 20:33:44 tommy Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/ChangeLog,v 1.33 2009/09/14 23:24:00 arfrever Exp $
+
+*xapian-1.0.16 (14 Sep 2009)
+
+  14 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -xapian-0.9.6.ebuild, -xapian-0.9.9.ebuild, -xapian-1.0.10.ebuild,
+  +xapian-1.0.16.ebuild:
+  Version bump.
 
   01 May 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   -files/xapian-0.9.2-config.patch, -files/xapian-0.9.3-config.patch,
diff --git a/dev-libs/xapian/xapian-0.9.6.ebuild b/dev-libs/xapian/xapian-0.9.6.ebuild
deleted file mode 100644
index 43cdd91eddb6..000000000000
--- a/dev-libs/xapian/xapian-0.9.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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.9.6.ebuild,v 1.4 2007/07/12 02:25:34 mr_bones_ Exp $
-
-DESCRIPTION="Xapian Probabilistic Information Retrieval library"
-HOMEPAGE="http://www.xapian.org/"
-SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-core-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="ppc x86"
-IUSE=""
-
-DEPEND="virtual/libc
-	sys-apps/gawk
-	sys-apps/grep
-	sys-apps/sed
-	sys-devel/libtool
-	sys-devel/gcc"
-
-RDEPEND="virtual/libc"
-
-S=${WORKDIR}/xapian-core-${PV}
-
-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 -j1 DESTDIR="${D}" install || die
-
-	mv "${D}/usr/share/doc/xapian-core" "${D}/usr/share/doc/${PF}"
-
-	dodoc AUTHORS HACKING PLATFORMS README
-}
diff --git a/dev-libs/xapian/xapian-0.9.9.ebuild b/dev-libs/xapian/xapian-0.9.9.ebuild
deleted file mode 100644
index a76f999cc9e2..000000000000
--- a/dev-libs/xapian/xapian-0.9.9.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/xapian-0.9.9.ebuild,v 1.3 2007/07/12 02:25:34 mr_bones_ Exp $
-
-DESCRIPTION="Xapian Probabilistic Information Retrieval library"
-HOMEPAGE="http://www.xapian.org/"
-SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-core-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="virtual/libc
-	sys-apps/gawk
-	sys-apps/grep
-	sys-apps/sed
-	sys-devel/libtool
-	sys-devel/gcc"
-
-RDEPEND="virtual/libc"
-
-S=${WORKDIR}/xapian-core-${PV}
-
-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 -j1 DESTDIR="${D}" install || die
-
-	mv "${D}/usr/share/doc/xapian-core" "${D}/usr/share/doc/${PF}"
-
-	dodoc AUTHORS HACKING PLATFORMS README NEWS
-}
diff --git a/dev-libs/xapian/xapian-1.0.10.ebuild b/dev-libs/xapian/xapian-1.0.16.ebuild
index 340ea8052837..27fc09d0a04b 100644
--- a/dev-libs/xapian/xapian-1.0.10.ebuild
+++ b/dev-libs/xapian/xapian-1.0.16.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/xapian-1.0.10.ebuild,v 1.3 2009/05/01 20:33:44 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/xapian-1.0.16.ebuild,v 1.1 2009/09/14 23:24:00 arfrever Exp $
+
+EAPI="2"
 
 MY_P="${PN}-core-${PV}"
 
@@ -13,15 +15,15 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND="sys-devel/libtool"
+DEPEND=""
 RDEPEND=""
 
 S="${WORKDIR}/${MY_P}"
 
 src_install () {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die "emake install failed"
 
-	mv "${D}/usr/share/doc/xapian-core" "${D}/usr/share/doc/${PF}"
+	mv "${D}usr/share/doc/xapian-core" "${D}usr/share/doc/${PF}"
 
 	dodoc AUTHORS HACKING PLATFORMS README NEWS || die "dodoc failed"
 }