When upgrading from slocate-2.x, delete the slocate db as they are incompatible.

Package-Manager: portage-2.1.4

3 files changed, 28 insertions, 11 deletions

diff --git a/sys-apps/slocate/ChangeLog b/sys-apps/slocate/ChangeLog
index 199c678ff0b7..9ce8d5a78508 100644
--- a/sys-apps/slocate/ChangeLog
+++ b/sys-apps/slocate/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/slocate
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/ChangeLog,v 1.74 2007/12/02 20:03:13 vapier Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/ChangeLog,v 1.75 2008/02/04 17:39:19 vapier Exp $
+
+  04 Feb 2008; Mike Frysinger <vapier@gentoo.org> slocate-3.1-r1.ebuild:
+  When upgrading from slocate-2.x, delete the slocate db as they are
+  incompatible.
 
   02 Dec 2007; Mike Frysinger <vapier@gentoo.org> slocate-2.7-r8.ebuild,
   slocate-3.1-r1.ebuild:
diff --git a/sys-apps/slocate/Manifest b/sys-apps/slocate/Manifest
index 12b89db81b06..74b956e5ab38 100644
--- a/sys-apps/slocate/Manifest
+++ b/sys-apps/slocate/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX slocate-2.7-bounds.patch 305 RMD160 df8f220cdf25d98e2fa9fd0e054b2151b3a4b1ad SHA1 a82e6f131ecc6109ac8e8546ba543913e151f39e SHA256 59ce3339cacaa817d65031fae80c0bd96962f01915511a096e47fafa295d5e8f
 AUX slocate-2.7-really-long-paths.patch 538 RMD160 d592621e92a5fd3c5e15e64fad4c307eddbdfb86 SHA1 b3e9918d171eeb35c4ef569e590bff1586aeee78 SHA256 3d2ab6ec4cbb2b87a358e93018e6f77f6bbad18eaffbd47d8b6acdec20480e83
 AUX slocate-3.1-build.patch 1258 RMD160 1eaac141880c84e33e1673b253d6b0a6bb1f37f3 SHA1 328c1d36e26c7f47ac4ea8f0619efd6a45bbb918 SHA256 aded9d720df1ca41c83acabb29e97e37079df9cf214b524d419e4b8692d13733
@@ -9,6 +12,13 @@ DIST slocate-2.7-uclibc-sl_fts.patch.bz2 7566 RMD160 bc614e9717e6c4a2bc8247d7140
 DIST slocate-2.7.tar.gz 87240 RMD160 0aa08da7b958be5c8fec7c4655e42373d8faf2cc SHA1 b5de4668b61b137f3f5fa9f17b334f56b9424f90 SHA256 ddff733fcc5f240d40361c5acbce0011b2204efc506efb0da63c8d0e38947dcf
 DIST slocate-3.1.tar.gz 37748 RMD160 d3b1e818cc35ce8e87ec1b0764f6b2145a319e13 SHA1 e427552664385b86931b7626c26bd95ae5f9f085 SHA256 6abec68ab50fa743739fb78a5063c295ae2f7d04d2e538f7c3108120e49a3266
 EBUILD slocate-2.7-r8.ebuild 2762 RMD160 bd3d2cc630f474aa122bc2fddac0cc031a4d80b8 SHA1 b617ec505b163e958e23fca3e06467a2bfe4e716 SHA256 26440e0adef082f9c16a52df6e1fc8ae0d3fe1688cd4ad25374f12301be15e4b
-EBUILD slocate-3.1-r1.ebuild 2219 RMD160 c8e716e5075199dfcff39f8cf9b1d1019467b2d8 SHA1 f60f417dd62f29dc82db2714d71e785f425abe0a SHA256 0afb2de0721ae23ab2401059f76b9a17ecaa8c61b70d163a813680448af5daaf
-MISC ChangeLog 9716 RMD160 2f8ec22aa2e1e2fe779117d9838be8fdda8b740c SHA1 1c10178a967625bf24b88e6623cee262943c298c SHA256 909a9887013906ff2274662d769f585a1e349beff0cb551980639f6fce410071
+EBUILD slocate-3.1-r1.ebuild 2214 RMD160 3b5c737d7c565ddb9502faa22e927e7ac5ef24bd SHA1 a1be1234439467695178184eca5ab4f82e07ab46 SHA256 d959099f04311fb21ef04d0eee2dded0e33b3fd5b97bd94f1fda24a339406d9e
+MISC ChangeLog 9875 RMD160 668562ee5d076095ca9bc3802a6010a5482d1880 SHA1 8f58caf9439b794ca859c59b70856628718031c0 SHA256 1064d79397efe53aa2bde01c95d437efa18ed03d6b6095f01b51682e8fff45f3
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHp0y/j9hvisErhMIRAppSAJ9aiZ7qzu95OE5KT6DJOP+Vm7upgQCfVj75
+cBdrPT+XgbD3ffS6cMb9Vbo=
+=dEhG
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/slocate/slocate-3.1-r1.ebuild b/sys-apps/slocate/slocate-3.1-r1.ebuild
index e2c563f0fc3b..7f7f5ff974f2 100644
--- a/sys-apps/slocate/slocate-3.1-r1.ebuild
+++ b/sys-apps/slocate/slocate-3.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/slocate-3.1-r1.ebuild,v 1.3 2007/12/02 20:03:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/slocate-3.1-r1.ebuild,v 1.4 2008/02/04 17:39:19 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -67,6 +67,14 @@ src_install() {
 	fperms 0750 /var/lib/slocate
 }
 
+pkg_preinst() {
+	if has_version '=sys-apps/slocate-2*' ; then
+		rm -f "${ROOT}"/var/lib/slocate/slocate.db
+		ewarn "The slocate database created by slocate-2.x is incompatible"
+		ewarn "with slocate-3.x.  Make sure you run updatedb!"
+	fi
+}
+
 pkg_postinst() {
 	if [[ -f ${ROOT}/etc/cron.daily/slocate.cron ]]; then
 		ewarn "If you merged slocate-2.7.ebuild, please remove"
@@ -74,9 +82,4 @@ pkg_postinst() {
 		ewarn "from the filename"
 		echo
 	fi
-	einfo "Note that the /etc/updatedb.conf file is generic"
-	einfo "Please customize it to your system requirements"
-	echo
-	ewarn "The slocate database created by slocate-2.x is incompatible"
-	ewarn "with slocate-3.x.  Make sure you run updatedb!"
 }