Version bump, fixed bug #295300, taking over maintenance, dropped old, updated URL/SRC_URI, keyworded for ~sparc.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 31 insertions, 61 deletions

diff --git a/app-backup/ccollect/ChangeLog b/app-backup/ccollect/ChangeLog
index 6e496eb94729..408133aab547 100644
--- a/app-backup/ccollect/ChangeLog
+++ b/app-backup/ccollect/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-backup/ccollect
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/ccollect/ChangeLog,v 1.29 2009/10/12 17:19:30 halcy0n Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/ccollect/ChangeLog,v 1.30 2010/04/13 10:36:28 dev-zero Exp $
+
+*ccollect-0.8 (13 Apr 2010)
+
+  13 Apr 2010; Tiziano Müller <dev-zero@gentoo.org> -ccollect-0.6.ebuild,
+  -ccollect-0.7.0-r1.ebuild, +ccollect-0.8.ebuild, metadata.xml:
+  Version bump, fixed bug #295300, taking over maintenance, dropped old,
+  updated URL/SRC_URI, keyworded for ~sparc.
 
   12 Oct 2009; Mark Loeser <halcy0n@gentoo.org> ccollect-0.5.1.ebuild,
   ccollect-0.6.ebuild:
diff --git a/app-backup/ccollect/ccollect-0.6.ebuild b/app-backup/ccollect/ccollect-0.6.ebuild
deleted file mode 100644
index c0ce6a425f1c..000000000000
--- a/app-backup/ccollect/ccollect-0.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/ccollect/ccollect-0.6.ebuild,v 1.2 2009/10/12 17:19:30 halcy0n Exp $
-
-DESCRIPTION="(pseudo) incremental backup with different exclude lists using
-hardlinks and rsync"
-HOMEPAGE="http://unix.schottelius.org/ccollect/"
-SRC_URI="http://unix.schottelius.org/ccollect/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-IUSE="doc"
-
-DEPEND="doc? ( >=app-text/asciidoc-7.0.2 )"
-RDEPEND="net-misc/rsync"
-
-src_compile() {
-	if use doc; then
-		make documentation
-	else
-		einfo 'Nothing to compile'
-	fi
-}
-
-src_install() {
-	dobin ccollect.sh
-
-	insinto /usr/share/${PN}/tools
-	doins tools/*
-
-	if use doc; then
-		dodoc doc/*
-
-		# dodoc is not recursive. So do a workaround.
-		insinto /usr/share/doc/${PF}/examples/
-		doins -r "${S}"/conf
-	fi
-}
-
-pkg_postinst() {
-	ewarn "If you're upgrading from 0.3.X or less, please run"
-	ewarn "/usr/share/ccollect/tools/config-pre-0.4-to-0.4.sh"
-	ewarn "because the old configuration is no longer compatible."
-}
diff --git a/app-backup/ccollect/ccollect-0.7.0-r1.ebuild b/app-backup/ccollect/ccollect-0.8.ebuild
index 5f8ea85085e1..61315f5f469d 100644
--- a/app-backup/ccollect/ccollect-0.7.0-r1.ebuild
+++ b/app-backup/ccollect/ccollect-0.8.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 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-r1.ebuild,v 1.1 2008/06/03 20:07:55 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/ccollect/ccollect-0.8.ebuild,v 1.1 2010/04/13 10:36:28 dev-zero Exp $
 
-EAPI="1"
+EAPI="2"
 
 DESCRIPTION="(pseudo) incremental backup with different exclude lists using hardlinks and rsync"
-HOMEPAGE="http://unix.schottelius.org/ccollect/"
-SRC_URI="http://unix.schottelius.org/ccollect/${P}.tar.bz2"
+HOMEPAGE="http://www.nico.schottelius.org/software/ccollect/"
+SRC_URI="http://www.nico.schottelius.org/software/${PN}/download/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-IUSE="doc"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="doc examples"
 
 DEPEND="doc? ( >=app-text/asciidoc-8.1.0
 		app-text/docbook-xsl-stylesheets
@@ -19,11 +19,12 @@ DEPEND="doc? ( >=app-text/asciidoc-8.1.0
 		dev-libs/libxslt )"
 RDEPEND="net-misc/rsync"
 
+# tests need ssh-access
+RESTRICT="test"
+
 src_compile() {
 	if use doc; then
-		make XSL=/usr/share/sgml/docbook/xsl-stylesheets/html/docbook.xsl documentation
-	else
-		einfo 'Nothing to compile'
+		emake XSL=/usr/share/sgml/docbook/xsl-stylesheets/html/docbook.xsl documentation || die "building docs failed"
 	fi
 }
 
@@ -31,7 +32,7 @@ src_install() {
 	dobin ccollect.sh
 	dosym ccollect.sh /usr/bin/ccollect
 
-	local tools="add_source analyse_logs delete_source list_intervals logwrapper stats"
+	local tools="add_source analyse_logs archive_config check_config delete_source list_intervals logwrapper stats"
 	for t in ${tools} ; do
 		newbin tools/ccollect_${t}.sh ccollect_${t}
 	done
@@ -39,16 +40,23 @@ src_install() {
 	insinto /usr/share/${PN}/tools
 	doins tools/config-pre* tools/{gnu-du-backup-size-compare,report_success}.sh
 
-	dodoc CREDITS README doc/CHANGES
+	dodoc CREDITS README
+	pushd doc/changes
+	for n in * ; do
+		newdoc ${n} NEWS-${n}
+	done
+	popd
 
 	if use doc; then
 		dohtml doc/*.htm doc/*.html
 		dohtml -r doc/man
 		doman doc/man/*.1
+	fi
 
+	if use examples ; then
 		# dodoc is not recursive. So do a workaround.
 		insinto /usr/share/doc/${PF}/examples/
-		cp -Rdp "${S}/conf" "${D}/usr/share/doc/${PF}/examples/"
+		doins -r conf/*
 	fi
 }
 
diff --git a/app-backup/ccollect/metadata.xml b/app-backup/ccollect/metadata.xml
index 9f3fdee2246b..25a407b48e3e 100644
--- a/app-backup/ccollect/metadata.xml
+++ b/app-backup/ccollect/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<herd>no-herd</herd>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
+		<email>dev-zero@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>