From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9E735138AE9 for ; Thu, 28 Dec 2017 15:07:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 69C9DE0ECC; Thu, 28 Dec 2017 15:07:45 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3B16EE0ECC for ; Thu, 28 Dec 2017 15:07:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 086C5341236 for ; Thu, 28 Dec 2017 15:07:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 165A6AFC7 for ; Thu, 28 Dec 2017 15:07:41 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1514473631.11e941968974caa61d31f9680c448b61063d8beb.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-backup/ccollect/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-backup/ccollect/ccollect-0.8.ebuild X-VCS-Directories: app-backup/ccollect/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 11e941968974caa61d31f9680c448b61063d8beb X-VCS-Branch: master Date: Thu, 28 Dec 2017 15:07:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9f41f73b-e5fb-48f7-9c43-038c306dcb5d X-Archives-Hash: 92c4c29b4afd71ab52d8c52190adcde4 commit: 11e941968974caa61d31f9680c448b61063d8beb Author: David Seifert gentoo org> AuthorDate: Thu Dec 28 14:43:42 2017 +0000 Commit: David Seifert gentoo org> CommitDate: Thu Dec 28 15:07:11 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11e94196 app-backup/ccollect: Port to EAPI 6 Package-Manager: Portage-2.3.19, Repoman-2.3.6 app-backup/ccollect/ccollect-0.8.ebuild | 53 +++++++++++++++++---------------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/app-backup/ccollect/ccollect-0.8.ebuild b/app-backup/ccollect/ccollect-0.8.ebuild index 8cd9780edb4..b5a9a055b4a 100644 --- a/app-backup/ccollect/ccollect-0.8.ebuild +++ b/app-backup/ccollect/ccollect-0.8.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="2" +EAPI=6 DESCRIPTION="Pseudo incremental backup with different exclude lists using hardlinks and rsync" HOMEPAGE="http://www.nico.schottelius.org/software/ccollect/" @@ -12,64 +12,67 @@ SLOT="0" KEYWORDS="amd64 hppa ppc ~sparc x86" IUSE="doc examples" -DEPEND="doc? ( >=app-text/asciidoc-8.1.0 +DEPEND=" + doc? ( + >=app-text/asciidoc-8.1.0 app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.2 - dev-libs/libxslt )" + dev-libs/libxslt + )" RDEPEND="net-misc/rsync" # tests need ssh-access RESTRICT="test" src_compile() { - if use doc; then - emake XSL=/usr/share/sgml/docbook/xsl-stylesheets/html/docbook.xsl documentation || die "building docs failed" - fi + use doc && emake XSL=/usr/share/sgml/docbook/xsl-stylesheets/html/docbook.xsl documentation } src_install() { dobin ccollect.sh dosym ccollect.sh /usr/bin/ccollect - 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} + local i + for i in add_source analyse_logs archive_config check_config \ + delete_source list_intervals logwrapper stats; do + newbin tools/ccollect_${i}.sh ccollect_${i} done insinto /usr/share/${PN}/tools doins tools/config-pre* tools/{gnu-du-backup-size-compare,report_success}.sh - dodoc CREDITS README - pushd doc/changes - for n in * ; do - newdoc ${n} NEWS-${n} - done - popd + pushd doc/changes >/dev/null || die + for i in * ; do + newdoc ${i} NEWS-${i} + done + popd >/dev/null || die if use doc; then - dohtml doc/*.htm doc/*.html - dohtml -r doc/man doman doc/man/*.1 + + find doc/ \( -iname '*.1' -o -iname '*.text' \) -delete || die + HTML_DOCS=( doc/{*.htm{,l},man} ) fi + einstalldocs if use examples ; then - # dodoc is not recursive. So do a workaround. - insinto /usr/share/doc/${PF}/examples/ - doins -r conf/* + docinto examples + dodoc -r conf/. fi } pkg_postinst() { 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 "1. Make the scripts in ${EROOT%/}/usr/share/ccollect/scripts executable" + ewarn "2. Run all config-pre-\$VER-to-\$VER.sh in ${EROOT%/}/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" + ewarn " ${EROOT%/}/usr/share/ccollect/tools/config-pre-0.6-to-0.6.sh" + ewarn " ${EROOT%/}/usr/share/ccollect/tools/config-pre-0.7-to-0.7.sh" + + elog "Please note that many tools are now installed directly to ${EROOT%/}/usr/bin" elog "as recommended by upstream." }