version bump

8 files changed, 39 insertions, 47 deletions

diff --git a/app-portage/esearch/ChangeLog b/app-portage/esearch/ChangeLog
index c4d420859677..bee34fb6dccd 100644
--- a/app-portage/esearch/ChangeLog
+++ b/app-portage/esearch/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-portage/esearch
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/ChangeLog,v 1.12 2004/01/14 03:18:41 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/ChangeLog,v 1.13 2004/02/08 03:08:05 genone Exp $
+
+*esearch-0.6 (08 Feb 2004)
+
+  08 Feb 2004; Marius Mauch <genone@gentoo.org> esearch-0.5.3.ebuild,
+  esearch-0.6.ebuild, files/eupdatedb.cron:
+  version bump, closing bug #39629
 
   13 Jan 2004; Jon Portnoy <avenj@gentoo.org> esearch-0.5.2.ebuild :
   Stable on AMD64.
diff --git a/app-portage/esearch/Manifest b/app-portage/esearch/Manifest
index c6fbe231a4b8..26aaaf21b0bc 100644
--- a/app-portage/esearch/Manifest
+++ b/app-portage/esearch/Manifest
@@ -1,9 +1,7 @@
+MD5 cd7db5b7c7d01b92ed82089b9015a705 esearch-0.5.3.ebuild 861
+MD5 c45f98ceed265faf88844710c84b5899 esearch-0.6.ebuild 863
 MD5 db50967e8d4f51fd71878b75293ffa74 ChangeLog 2215
-MD5 76f3c7752bb72c87a30f1170f0fb0d65 esearch-0.5.1.ebuild 812
-MD5 880095f01f595a7d7a6807183c818211 esearch-0.5.2.ebuild 808
 MD5 fbb6fe345e65c9b7fa51b2ae10f85067 metadata.xml 166
-MD5 fc2440c418ece2f6749b1fbb2fe5d4fd esearch-0.5.3.ebuild 882
-MD5 3e8df576f84456509fd17947fbe13881 files/digest-esearch-0.5.1 64
-MD5 0c184108277fbeacf636a78af2d804f7 files/digest-esearch-0.5.2 64
-MD5 6c1c411e0b2fcf4ee607ca3e8af78af4 files/eupdatedb.cron 358
+MD5 fc6a7836734e3ceceb907fa67a16134f files/digest-esearch-0.6 62
 MD5 52f7276b6ad7d7e1b3e41226d0bcce16 files/digest-esearch-0.5.3 64
+MD5 5cc41b341ae3198b00e2f8fb353c9658 files/eupdatedb.cron 615
diff --git a/app-portage/esearch/esearch-0.5.1.ebuild b/app-portage/esearch/esearch-0.5.1.ebuild
deleted file mode 100644
index 0d39e2b1a732..000000000000
--- a/app-portage/esearch/esearch-0.5.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/esearch-0.5.1.ebuild,v 1.3 2004/01/29 23:55:38 vapier Exp $
-
-DESCRIPTION="Replacement for 'emerge search' with search-index"
-HOMEPAGE="http://david-peter.de/esearch.html"
-SRC_URI="http://david-peter.de/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa ~mips ~arm ~amd64 ~ia64"
-
-DEPEND=">=dev-lang/python-2.2"
-
-src_install() {
-	exeinto /usr/lib/esearch
-	doexe eupdatedb.py esearch.py
-
-	dodir /usr/bin/
-	dodir /usr/sbin/
-
-	dosym /usr/lib/esearch/esearch.py /usr/bin/esearch
-	dosym /usr/lib/esearch/eupdatedb.py /usr/sbin/eupdatedb
-
-	doman esearch.1
-	dodoc ChangeLog ${FILESDIR}/eupdatedb.cron
-}
-
diff --git a/app-portage/esearch/esearch-0.5.3.ebuild b/app-portage/esearch/esearch-0.5.3.ebuild
index b4837a9d4f8b..a7d03a0ff38d 100644
--- a/app-portage/esearch/esearch-0.5.3.ebuild
+++ b/app-portage/esearch/esearch-0.5.3.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/esearch-0.5.3.ebuild,v 1.2 2004/01/29 23:55:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/esearch-0.5.3.ebuild,v 1.3 2004/02/08 03:08:05 genone Exp $
 
 DESCRIPTION="Replacement for 'emerge search' with search-index"
 HOMEPAGE="http://david-peter.de/esearch.html"
 SRC_URI="http://david-peter.de/downloads/${P}.tar.bz2"
 
+IUSE=""
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc alpha ~hppa ~mips ~arm ~amd64 ~ia64"
+KEYWORDS="x86 ~ppc ~sparc alpha ~hppa ~mips ~arm ~amd64 ~ia64"
 
 DEPEND=">=dev-lang/python-2.2"
 
diff --git a/app-portage/esearch/esearch-0.5.2.ebuild b/app-portage/esearch/esearch-0.6.ebuild
index 5905126536b9..0830f0e4829a 100644
--- a/app-portage/esearch/esearch-0.5.2.ebuild
+++ b/app-portage/esearch/esearch-0.6.ebuild
@@ -1,26 +1,28 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/esearch-0.5.2.ebuild,v 1.5 2004/01/29 23:55:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/esearch-0.6.ebuild,v 1.1 2004/02/08 03:08:05 genone Exp $
 
 DESCRIPTION="Replacement for 'emerge search' with search-index"
 HOMEPAGE="http://david-peter.de/esearch.html"
 SRC_URI="http://david-peter.de/downloads/${P}.tar.bz2"
 
+IUSE=""
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc ~sparc alpha ~hppa ~mips ~arm amd64 ~ia64"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~arm ~amd64 ~ia64"
 
 DEPEND=">=dev-lang/python-2.2"
 
 src_install() {
 	exeinto /usr/lib/esearch
-	doexe eupdatedb.py esearch.py
+	doexe eupdatedb.py esearch.py esync.py
 
 	dodir /usr/bin/
 	dodir /usr/sbin/
 
 	dosym /usr/lib/esearch/esearch.py /usr/bin/esearch
 	dosym /usr/lib/esearch/eupdatedb.py /usr/sbin/eupdatedb
+	dosym /usr/lib/esearch/esync.py /usr/sbin/esync
 
 	doman esearch.1
 	dodoc ChangeLog ${FILESDIR}/eupdatedb.cron
diff --git a/app-portage/esearch/files/digest-esearch-0.5.2 b/app-portage/esearch/files/digest-esearch-0.5.2
deleted file mode 100644
index e6342fb5b359..000000000000
--- a/app-portage/esearch/files/digest-esearch-0.5.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f7532c6983d0d054c6ffbe082cf45f01 esearch-0.5.2.tar.bz2 5076
diff --git a/app-portage/esearch/files/digest-esearch-0.6 b/app-portage/esearch/files/digest-esearch-0.6
new file mode 100644
index 000000000000..fae1aca5f818
--- /dev/null
+++ b/app-portage/esearch/files/digest-esearch-0.6
@@ -0,0 +1 @@
+MD5 b33fcd55870533a7e46d2ff4e178c502 esearch-0.6.tar.bz2 6743
diff --git a/app-portage/esearch/files/eupdatedb.cron b/app-portage/esearch/files/eupdatedb.cron
index 86e442c286b4..6595af469a95 100644
--- a/app-portage/esearch/files/eupdatedb.cron
+++ b/app-portage/esearch/files/eupdatedb.cron
@@ -1,18 +1,31 @@
-#! /bin/sh
+#! /bin/bash
+
+# The eupdatedb script _needs_ to be installed with the filename 'eupdatedb'
+# because it does things based on basename $0.
 
 # Run some script
 
 SCRIPT="/usr/sbin/eupdatedb"
-
+SCRIPTOPTS="--quiet"
+PRECOMMAND=""
+POSTCOMMAND=""
 DATE="`date +%Y%m%d`"
-LOG="/var/log/${SCRIPT}"
+LOG="/var/log/`basename ${SCRIPT}`"
+
+${PRECOMMAND}
 
 # Start logging
 echo "--- Starting ${SCRIPT} for ${DATE} ---" >> ${LOG}
 
-${SCRIPT} --quiet && \
-echo "${SCRIPT}: success." >> ${LOG} || \
-echo "ERROR: ${SCRIPT} failed." >> ${LOG}
+if [ "`${SCRIPT} ${SCRIPTOPTS}`" ]
+then
+	 echo "${SCRIPT}: success." >> ${LOG}
+else
+	echo "ERROR: ${SCRIPT} failed." >> ${LOG}
+fi
+
+# Cleanup tasks
+${POSTCOMMAND}
 
 # End logging
 echo "--- Ending ${SCRIPT} for ${DATE} ---" >> ${LOG}