gentoo resync : 29.10.2017

3 files changed, 2 insertions, 199 deletions

diff --git a/app-backup/backuppc/Manifest b/app-backup/backuppc/Manifest
index 143c55d7f687..9857b8ce8727 100644
--- a/app-backup/backuppc/Manifest
+++ b/app-backup/backuppc/Manifest
@@ -8,8 +8,7 @@ AUX backuppc-3.3.1-perl522.patch 607 SHA256 39e5b941705920f2a8f2ec73523d920861af
 AUX backuppc-3.3.1-perl526.patch 969 SHA256 c3a9ecbd526268b4610025455467ff594f8a9bc3bc94ea602616253760b1d485 SHA512 da626131a3253bbc6fe46a06f74462a2d356a71ae369e8de88acca2d85376be0d6ad16c8c566f7c80b93e794808f8b1c09a75707d5031dc64b93ab0f698faced WHIRLPOOL bbf89cf615cb0e2db781589e41e27256d0cc4827028fca45423fbc61c625f23f8117011b9928f6f324efcf2a40bd8b48c08d08e1453de3824f9763bcbbd36124
 AUX backuppc.service 231 SHA256 64114b3ba85c4f6fe313734523c5c2f53f269bf69aea71b85d8f2a8fad7f80f8 SHA512 9a7cb7ac7da2851cfaf90fafe082800fbac34a5a40a9f6aed1ea817b6f9aeb5be60cb3cfb35c263997c2ac1d22f3384752a23f44158572a9efc8f2c48e99c969 WHIRLPOOL 73d966f11ee9070c73016a77373bc80cf90b746fe67f53a178f439767c72b6d2efcfc16b66d4771e11a5862006e26bcff433da1dc4668635ea3e8f1254b28ef9
 DIST BackupPC-3.3.1.tar.gz 556461 SHA256 c9cc4aec28a7474a68d40f4bc460ff15140e05c96900c7f98ff3ef06c4f6ae4c SHA512 b6bb9de3103c5062098d80755055b7461ae9133a4a46a66b3d0af89d081086571694db1898e7d85880defa15b030bad522812116ae5361c0fbde90b877d139c6 WHIRLPOOL 1d895f530932fc1287cde9db584befc6ca0850b5841cc4e60927442d0db662ec092bda4efa4953650d3bfa13deb6e9fafa25c10f82e19b39c67969bb4e143bac
-EBUILD backuppc-3.3.1-r4.ebuild 5477 SHA256 6a38cb3548b056d35fa06112f1b4a90144db7276dfb48145f3d71f9cc0656396 SHA512 baaa06ec3fad3743f213def8dada6ada60973068f9629d9508e561570567189736190aa7be557c6b3a917f238b331ce4ea79c1160e9e916e6c233ffe455f8e82 WHIRLPOOL 38361bed12d687eb8f7595afd3d33ff5d425146add36998d30c47f825a4076a23b70348b4ade37120b01bce396cacaf5bb7e9c4f47751926c1653529cb221e8a
-EBUILD backuppc-3.3.1-r5.ebuild 5527 SHA256 c11b158eeaf4533f47501332979c77c6deea69f94ba900467970cffe36f9035c SHA512 62674f0cbf192ccabcdf07c638949e97138229d63bf20fd785513a19f2612b3d2fc78a92010125bb509c23ca1f7aee4d68ff776af0c985732bf2db2d8ed34998 WHIRLPOOL 925f19a4572a28fe3f01a0b3ed9259cf79e6f172d06c06021627bd3044dd5eb908bb2860f7a2b4a535d80a3595cc777d348b5c35ac6189424ec550c9f5646746
+EBUILD backuppc-3.3.1-r5.ebuild 5526 SHA256 f8f7751ad652267a766b77327b085703109cf742f6f9507cde2f923c578d0f96 SHA512 c1c16a3cbb91dbd990165719591fd48fc6bdddc54c86e6d977f6e7cc3302b3e5e49ce1992f79b70e5c8edbde0b85919fcf4e8dcb2811af7dd725a5a1ab0d0ff6 WHIRLPOOL 0f8d24ef88f3438a98b73ae52f9a81fefb7e24a9e09e01d22597a049a00fb75327ded706dacdc5a9c5a0df15954efb888af09c2c90ac3946799867ca0aa92980
 MISC ChangeLog 5475 SHA256 3314e604fac7c9aa6f2aaeac3455267155348c8098410ab78036de0c9e1c9481 SHA512 9489dd75dd8d3a4293dfacca4e87cf8950caeb12bc1ffab6799e760595d11baededaa1ee539c5162284a1aeee727fefafb69761a3f6cc23073d877434cf6d0a7 WHIRLPOOL 38b1bd5d921381f44c3c5e5d32dccc4821075b963673efed1953210b0d59b5e72fe476d5a27601777bfe8b76b3569e9f0907ff4e38e6884f34401f08e8694eef
 MISC ChangeLog-2015 4969 SHA256 ff971ce4f576305d8716057a045d3e03ce91c11b911d53b654e818afeda89b28 SHA512 94f00aa13f98e63dc1ab372fd44430afd868d9e5c3353782ece3aa6d88d20677afa560d4cf9d0b741342f97d24253185913107b30773cba1a21e0bf36f24140e WHIRLPOOL 556015ae5a37c510febd7926ec277a1839bf6162e70ce246c1f966b79f82d67d6d797bcea4540650a2b80a19350bafa3aab3f37a36b14edd96ddc00820dbc700
 MISC metadata.xml 245 SHA256 2ed31d145dc2ab60b1831fb2907b6345be8646b5200997e2d2f8e2b3ef8cf6dc SHA512 4129c00f4fd37b4c2e051df35c98105ee97b74bc2a8af78e97f2cbc4c97d14740456fc01ed2ab5c6df3bab10a17ce1728de9e4b83cfee393a8841e8933232877 WHIRLPOOL 757f6848afff294f8f748273dc054a16758d724a506b103b87a5bdf0f0a2a4200637b456eb3d94b3b42e2439633c15387b2035a32d7fe4cef1f2b23cd17d2c87
diff --git a/app-backup/backuppc/backuppc-3.3.1-r4.ebuild b/app-backup/backuppc/backuppc-3.3.1-r4.ebuild
deleted file mode 100644
index 62d816fa2e8a..000000000000
--- a/app-backup/backuppc/backuppc-3.3.1-r4.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit depend.apache eutils user systemd
-
-MY_P="BackupPC-${PV}"
-
-DESCRIPTION="High-performance backups to a server's disk"
-HOMEPAGE="http://backuppc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-
-IUSE="rss samba"
-
-# The CGI modules are handled in $RDEPEND.
-APACHE_MODULES="apache2_modules_alias," # RedirectMatch
-APACHE_MODULES+="apache2_modules_authn_core," # AuthType
-APACHE_MODULES+="apache2_modules_authz_core," # Require
-APACHE_MODULES+="apache2_modules_authz_host," # Require host
-APACHE_MODULES+="apache2_modules_authz_user" # Require valid-user
-
-DEPEND="dev-lang/perl
-	app-admin/apache-tools
-	app-admin/makepasswd"
-
-# Older versions of mod_perl think they're compatibile with apache-2.4,
-# so we require the new one explicitly.
-RDEPEND="${DEPEND}
-	virtual/perl-IO-Compress
-	dev-perl/Archive-Zip
-	dev-perl/CGI
-	dev-perl/libwww-perl
-	app-arch/tar
-	app-arch/par2cmdline
-	app-arch/gzip
-	app-arch/bzip2
-	virtual/mta
-	>=www-apache/mod_perl-2.0.9
-	www-apache/mpm_itk
-	|| ( >=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgi]
-		 >=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgid]
-		 >=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_fcgid] )
-	net-misc/rsync
-	dev-perl/File-RsyncP
-	rss? ( dev-perl/XML-RSS )
-	samba? ( net-fs/samba )"
-
-need_apache2_4
-
-SLOT="0"
-
-S="${WORKDIR}/${MY_P}"
-
-CGIDIR="/usr/lib/backuppc/htdocs"
-CONFDIR="/etc/BackupPC"
-DATADIR="/var/lib/backuppc"
-DOCDIR="/usr/share/doc/${PF}"
-LOGDIR="/var/log/BackupPC"
-
-pkg_setup() {
-	enewgroup backuppc
-	enewuser backuppc -1 /bin/bash /var/lib/backuppc backuppc
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/3.3.0/01-fix-configure.pl.patch"
-	epatch "${FILESDIR}/3.3.0/02-fix-config.pl-formatting.patch"
-	epatch "${FILESDIR}/3.3.0/03-reasonable-config.pl-defaults.patch"
-
-	epatch "${FILESDIR}/3.2.0/04-add-docdir-marker.patch"
-	epatch "${FILESDIR}/3.2.0/05-nicelevel.patch"
-
-	epatch "${FILESDIR}"/${P}-perl522.patch #580254
-
-	# Fix docs location using the marker that we've patched in.
-	sed -i "s+__DOCDIR__+${DOCDIR}+" "lib/BackupPC/CGI/View.pm" \
-		|| die "failed to sed the documentation location"
-}
-
-src_install() {
-	local myconf
-	myconf=""
-	if use samba ; then
-		myconf="--bin-path smbclient=$(type -p smbclient)"
-		myconf="${myconf} --bin-path nmblookup=$(type -p nmblookup)"
-	fi
-
-	/usr/bin/env perl ./configure.pl \
-		--batch \
-		--bin-path perl=$(type -p perl) \
-		--bin-path tar=$(type -p tar) \
-		--bin-path rsync=$(type -p rsync) \
-		--bin-path ping=$(type -p ping) \
-		--bin-path df=$(type -p df) \
-		--bin-path ssh=$(type -p ssh) \
-		--bin-path sendmail=$(type -p sendmail) \
-		--bin-path hostname=$(type -p hostname) \
-		--bin-path gzip=$(type -p gzip) \
-		--bin-path bzip2=$(type -p bzip2) \
-		--config-dir "${CONFDIR}" \
-		--install-dir /usr \
-		--data-dir "${DATADIR}" \
-		--hostname 127.0.0.1 \
-		--uid-ignore \
-		--dest-dir "${D%/}" \
-		--html-dir "${CGIDIR}"/image \
-		--html-dir-url /image \
-		--cgi-dir "${CGIDIR}" \
-		--fhs \
-		${myconf} || die "failed the configure.pl script"
-
-	ebegin "Installing documentation"
-
-	pod2man \
-		-errors=none \
-		--section=8 \
-		--center="BackupPC manual" \
-		"${S}"/doc/BackupPC.pod backuppc.8 \
-		|| die "failed to generate man page"
-
-	doman backuppc.8
-
-	# Place the documentation in the correct location
-	dodoc "${D}/usr/doc/BackupPC.html"
-	dodoc "${D}/usr/doc/BackupPC.pod"
-	rm -rf "${D}/usr/doc" || die
-
-	eend 0
-
-	# Setup directories
-	dodir "${CONFDIR}/pc"
-
-	keepdir "${CONFDIR}"
-	keepdir "${CONFDIR}/pc"
-	keepdir "${DATADIR}"/{trash,pool,pc,cpool}
-	keepdir "${LOGDIR}"
-
-	ebegin "Setting up init.d/conf.d/systemd scripts"
-	newinitd "${S}"/init.d/gentoo-backuppc backuppc
-	newconfd "${S}"/init.d/gentoo-backuppc.conf backuppc
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	insinto "${APACHE_MODULES_CONFDIR}"
-	doins "${FILESDIR}"/99_backuppc.conf
-
-	# Make sure that the ownership is correct
-	chown -R backuppc:backuppc "${D}${CONFDIR}" || die
-	chown -R backuppc:backuppc "${D}${DATADIR}" || die
-	chown -R backuppc:backuppc "${D}${LOGDIR}"  || die
-}
-
-pkg_postinst() {
-	elog "Installation finished, you may now start using BackupPC."
-	elog
-	elog "- Read the documentation in /usr/share/doc/${PF}/BackupPC.html"
-	elog "  Please pay special attention to the security section."
-	elog
-	elog "- You can launch backuppc by running:"
-	elog
-	elog "    # /etc/init.d/backuppc start"
-	elog
-	elog "- To enable the GUI, first edit ${ROOT}etc/conf.d/apache2 and add,"
-	elog
-	elog "    \"-D BACKUPPC -D PERL -D MPM_ITK\""
-	elog
-	elog "  to the APACHE2_OPTS line."
-	elog
-	elog "  Then you must edit ${ROOT}etc/apache2/modules.d/00_mpm_itk.conf"
-	elog "  and adjust the values of LimitUIDRange/LimitGIDRange to include"
-	elog "  the UID and GID of the backuppc user."
-	elog
-	elog "  Finally, start apache:"
-	elog
-	elog "    # /etc/init.d/apache2 start"
-	elog
-	elog "  The web interface should now be running on,"
-	elog
-	elog "    http://127.0.0.1:8080/"
-	elog
-
-	# Generate a new password if there's no auth file
-	if [[ ! -f "${CONFDIR}/users.htpasswd" ]]; then
-		adminuser="backuppc"
-		adminpass=$( makepasswd --chars=12 )
-		htpasswd -bc "${CONFDIR}/users.htpasswd" $adminuser $adminpass
-
-		elog ""
-		elog "- Created admin user $adminuser with password $adminpass"
-		elog "  To add new users, run: "
-		elog ""
-		elog "  # htpasswd ${CONFDIR}/users.htpasswd newUser"
-	fi
-}
diff --git a/app-backup/backuppc/backuppc-3.3.1-r5.ebuild b/app-backup/backuppc/backuppc-3.3.1-r5.ebuild
index 879139e9d5e9..932f8a9640d5 100644
--- a/app-backup/backuppc/backuppc-3.3.1-r5.ebuild
+++ b/app-backup/backuppc/backuppc-3.3.1-r5.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://backuppc.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="rss samba"