Updated upgrade warnings. Installing tools directly to /usr/bin (as recommended by upstream).

(Portage version: 2.1.5.3)

2 files changed, 28 insertions, 6 deletions

diff --git a/app-backup/ccollect/ChangeLog b/app-backup/ccollect/ChangeLog
index e016b70e90b9..d4043e7cff05 100644
--- a/app-backup/ccollect/ChangeLog
+++ b/app-backup/ccollect/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-backup/ccollect
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/ccollect/ChangeLog,v 1.26 2008/06/03 11:46:21 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/ccollect/ChangeLog,v 1.27 2008/06/03 20:07:55 dev-zero Exp $
+
+*ccollect-0.7.0-r1 (03 Jun 2008)
+
+  03 Jun 2008; Tiziano Müller <dev-zero@gentoo.org> -ccollect-0.7.0.ebuild,
+  +ccollect-0.7.0-r1.ebuild:
+  Updated upgrade warnings. Installing tools directly to /usr/bin (as
+  recommended by upstream).
 
   03 Jun 2008; Tiziano Müller <dev-zero@gentoo.org> ccollect-0.7.0.ebuild:
   Fixed dependencies for doc/manpage generation. Fixed doc/manpage
diff --git a/app-backup/ccollect/ccollect-0.7.0.ebuild b/app-backup/ccollect/ccollect-0.7.0-r1.ebuild
index d1f9650d8730..5f8ea85085e1 100644
--- a/app-backup/ccollect/ccollect-0.7.0.ebuild
+++ b/app-backup/ccollect/ccollect-0.7.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/ccollect/ccollect-0.7.0.ebuild,v 1.2 2008/06/03 11:46:21 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/ccollect/ccollect-0.7.0-r1.ebuild,v 1.1 2008/06/03 20:07:55 dev-zero Exp $
 
 EAPI="1"
 
@@ -29,9 +29,15 @@ src_compile() {
 
 src_install() {
 	dobin ccollect.sh
+	dosym ccollect.sh /usr/bin/ccollect
+
+	local tools="add_source analyse_logs delete_source list_intervals logwrapper stats"
+	for t in ${tools} ; do
+		newbin tools/ccollect_${t}.sh ccollect_${t}
+	done
 
 	insinto /usr/share/${PN}/tools
-	doins tools/*
+	doins tools/config-pre* tools/{gnu-du-backup-size-compare,report_success}.sh
 
 	dodoc CREDITS README doc/CHANGES
 
@@ -47,7 +53,16 @@ src_install() {
 }
 
 pkg_postinst() {
-	ewarn "If you're upgrading from 0.6.X or less, please run"
-	ewarn "/usr/share/ccollect/tools/config-pre-0.7-to-0.7.sh"
-	ewarn "because the old configuration is no longer compatible."
+	ewarn "If you're upgrading from 0.6.x or less, you'll have to"
+	ewarn "upgrade your existing configuration as follows:"
+	ewarn "1. Make the scripts in /usr/share/ccollect/scripts executable"
+	ewarn "2. Run all config-pre-\$VER-to-\$VER.sh in /usr/share/ccollect/scripts"
+	ewarn "   ascending order, where \$VER is greater or equal than the version"
+	ewarn "   you upgraded from."
+	ewarn "Example:"
+	ewarn "  You upgraded from 0.5, thus you have to run:"
+	ewarn "  /usr/share/ccollect/tools/config-pre-0.6-to-0.6.sh"
+	ewarn "  /usr/share/ccollect/tools/config-pre-0.7-to-0.7.sh"
+	elog "Please note that many tools are now installed directly to /usr/bin"
+	elog "as recommended by upstream."
 }