gentoo resync : 15.09.2018

7 files changed, 69 insertions, 31 deletions

diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index f652cc16d4e0..54c6398c4d96 100644
--- a/www-misc/Manifest.gz
+++ b/www-misc/Manifest.gz
diff --git a/www-misc/multisort/Manifest b/www-misc/multisort/Manifest
index 24d953204e4b..40383ee06b79 100644
--- a/www-misc/multisort/Manifest
+++ b/www-misc/multisort/Manifest
@@ -1,4 +1,3 @@
 DIST multisort-1.1.tar.gz 3520 BLAKE2B 8fcd797abb9649b21d80bd964a2f82b05f0bbf4b5b0f263b156d8b90ab36f87009199aecbf19b495e7c56415e707cd675cb7b73346a233a6a52b9b66ea223a21 SHA512 346be785a223814086536bfc8aacb11122ca91cf6cb63c8bbe2ae70f323bd36812f25575114c1422c431f658328bbb7fc75b839e74b7f37c12c4a3f179e05e1b
-EBUILD multisort-1.1-r1.ebuild 603 BLAKE2B 768cfd4805c32ddcc00134ac03c5e220d6041c962e8905b0544984cc243a33b5384b45a54a0bbdb7f58160094938f583c2c1380f9bc498f54ab114cadbc5dfc2 SHA512 bfe9d2d2603b5aa909a9209129aed78c6bfec6ce6c90b9329186c7031d8f3de1b11bda1f53259b6855e916cb5a5834b227c2e8431b2692a233a72b949c2f2062
 EBUILD multisort-1.1-r2.ebuild 601 BLAKE2B 3c8f5f2d1aa0ffa717f3d0e4c9d9df0a1c3a601311424afb2c72d0a1ce034220e456b5333bb347a384db9898e2a2c8fc9f17e3b9cd1125e4381def8cd0fc9d3e SHA512 2054e3055d1fe1b69af55b862398a42069908562e803660d73cf28b4658825a50f67e072b054670f5d401d7923a820727e6282606776378cf025560a4aea0b7b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/www-misc/multisort/multisort-1.1-r1.ebuild b/www-misc/multisort/multisort-1.1-r1.ebuild
deleted file mode 100644
index 7a1f5d15fff7..000000000000
--- a/www-misc/multisort/multisort-1.1-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit toolchain-funcs
-
-DESCRIPTION="Merges httpd logfiles in the Common Log Format"
-HOMEPAGE="https://www.xach.com/multisort/"
-SRC_URI="https://www.xach.com/${PN}/${PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-
-src_prepare() {
-	# respect LDFLAGS wrt bug #337359
-	sed -i -e 's/$(CFLAGS)/& \$(LDFLAGS)/' Makefile || die 'sed on Makefile failed'
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dosbin multisort
-}
diff --git a/www-misc/profile-sync-daemon/Manifest b/www-misc/profile-sync-daemon/Manifest
index e48a0832533a..da966514d6bd 100644
--- a/www-misc/profile-sync-daemon/Manifest
+++ b/www-misc/profile-sync-daemon/Manifest
@@ -1,6 +1,10 @@
+AUX bad-substitution-fix.patch 476 BLAKE2B b7ff1d56a41c29a53c3650db1407707b611597a35c7219d74320be278bac01a5a7e0458c10dfc95f728a58d98c520766b4c3bb86a9a726ddd9da95bc7655e719 SHA512 cfb61ab20ee6f19d596366eafd6557bec31a74754ad03b840aa14073af3c66ccd7de187d49107e3c1ad19bd38fabdbf3558703ece43fc6075fbef1c3643d1a21
+AUX openrc-path.patch 554 BLAKE2B 9e43692ed6baabf1001c6423abea72f0265e94326adf4cd10590e27eda0b0a76ca628db88e396e4b6074de27ba71bab033139dd0e4ad13afe654a2f9645b061c SHA512 d64640d443c95bf9a771416f28edabcc63fb0b329b936ac5942734225da80f771b63d1d1b6d03209bbba1b0eece95d84872e182e4d1fb790f3aa965ba44dced9
 DIST profile-sync-daemon-5.45.1.tar.gz 25543 BLAKE2B e033ae0587c3c5b90442e9ed199b10112019459f6e5f32d8ffb836c1d0ab878d4f535709c76d8a8bf7edde7aca8d1b8d868ad5c472166c7ec22d1da9f0f5591d SHA512 8a61ebfe52031bd59c70416adfd477edc313641cec93a4e96c80f316517cdb53f49840cfd7711ea2f6180ecce8e8e5d45f01d7bd85ba787c3fe288a14426b944
+DIST profile-sync-daemon-5.75.tar.gz 27829 BLAKE2B b333688af27a7373f72e72a09dd18afc210f2196957a76f6fab59d46ecd4e9b905b833a66bf49001c0be307b05b06320d7ee2b754cee1b6559a113346717b82b SHA512 54c2a6c743bf3a3dd746862f6dc0448c8993c96fe0163f4f89885cee3e4c81ecac46414c0ca57d57ec0e9e6c646f9a39462d5d533a7515a952cc56276509bdc0
 DIST profile-sync-daemon-6.31.tar.gz 20490 BLAKE2B 6c65f414230051e71578d1d0d69dd266a6d2b6f741b9c3a0e6b3132945fbe8f98db12544ac145609c82e793e1a8d5e8cef278191e653cb5560c3451d6f158307 SHA512 7e7585e902c2428c28dc980c73ebf77ea7f2b39133a6ad0c82e714c2789811c42785ac5d403f965f1b3de8c685d7cba51810ea99206e2b7351dbd607a2cd0fdb
 EBUILD profile-sync-daemon-5.45.1.ebuild 797 BLAKE2B f95fb21bab962e665fe8d604cc68bcdcb27b81dd46b7afc49a24645975e0575858644ee33704630f7434283b57ae3f996557062d81a9a1d6355f80b34dfc9d0e SHA512 3d67d5cdc991efe7fde32a962966674408d4c7645e65c9a27e152afcce230c92f4c6c6d561773dc2ae282437fdf716d80e7c851cb0cff1329508a87a7c4448e5
+EBUILD profile-sync-daemon-5.75.ebuild 975 BLAKE2B e102f0aa0bf92ec35bb314a56d210088836ac7a49f312171b544b6a5b5e81847eb1630bdbe6abfa2f37e15504dfc209b10b285905cc20858e6bf1db4056f9880 SHA512 2e63a814b95756b0c3509564deed1f9e7e88ef168f0514381a3c88cc7e46cfd2680b04f101baf66eebef827dec2c81de86604f5dc1b9fcf4b976f14b0ffec179
 EBUILD profile-sync-daemon-6.31.ebuild 787 BLAKE2B 9a4c7e2d13f95c0b83c0ca4a4f34dc19c0d46de962a5529a099aeea58f16518d1ccc12411e0486a8052f8d0524f69c02f5f31bd54fc1758c2312bcefd1c197c7 SHA512 584197ff6492dd5cc3e7d2c9682808872a68d5880f1d9c04bef9608f74a01caecd98ec4bba933e2639f7dede29a170a3e45d950230d25612dfc83c376a12bb68
 EBUILD profile-sync-daemon-9999.ebuild 414 BLAKE2B 2d75908e1931749dd2c4681076ae33e01e05454a2817903f25ce5ddf591c1f2d28184271036d0d6073268a8e0c7faea5648416b9e594e10ff0f7c6ddd03b8612 SHA512 320f2c02f049c099bac9f319e8725b98b36e597357729e95ef70be6f42ccfef17fae32a7bb55826cf46bc72056b662af7573055dae67d1c725db0d7c020d233b
 MISC metadata.xml 260 BLAKE2B 220a2f95bc7bde461342a6a7473f3639cc87564372edede01a4505a0aac38878320bbe26c37201c1c241b3f4e99847779d8e9a5d10a97cb789d7b50dd6b00cb5 SHA512 a5a602103d5329cac407769e8b94240601f1905c81ce7cd1de78f19a304eb97e05f17d838acdd983304306405d0ccaaebf574cd1549cfc2e35b2345629b60087
diff --git a/www-misc/profile-sync-daemon/files/bad-substitution-fix.patch b/www-misc/profile-sync-daemon/files/bad-substitution-fix.patch
new file mode 100644
index 000000000000..7551b08157a6
--- /dev/null
+++ b/www-misc/profile-sync-daemon/files/bad-substitution-fix.patch
@@ -0,0 +1,11 @@
+--- a/common/profile-sync-daemon.in	2015-07-29 16:57:24.000000000 -0400
++++ b/common/profile-sync-daemon.in	2017-07-25 21:35:59.209639588 -0400
+@@ -581,7 +581,7 @@
+ 				# check that the LAST DIRECTORY in the full path is unique
+ 				unique_count=$(echo ${DIRArr[@]##*/} |
+ 				sed 's/ /\n/g' | sort -u | wc -l)
+-				if [[ ${#DIRArr[@]##*/} -eq $unique_count ]]; then
++				if [[ ${#DIRArr[@]} -eq $unique_count ]]; then
+ 					# no problems so do nothing
+ 					return
+ 				else
diff --git a/www-misc/profile-sync-daemon/files/openrc-path.patch b/www-misc/profile-sync-daemon/files/openrc-path.patch
new file mode 100644
index 000000000000..fc2d51b872d4
--- /dev/null
+++ b/www-misc/profile-sync-daemon/files/openrc-path.patch
@@ -0,0 +1,13 @@
+--- a/Makefile	2015-07-29 17:57:24.000000000 -0300
++++ b/Makefile	2017-02-02 15:08:06.720017266 -0300
+@@ -64,8 +64,8 @@
+ 
+ install-openrc:
+ 	$(Q)echo -e '\033[1;32mInstalling openrc files...\033[0m'
+-	$(INSTALL_DIR) "$(DESTDIR)$(DOCDIR)"
+-	$(INSTALL_SCRIPT) init/psd.openrc "$(DESTDIR)$(DOCDIR)/psd.openrc"
++	$(INSTALL_DIR) "$(DESTDIR)$(INITDIR_UPSTART)"
++	$(INSTALL_SCRIPT) init/psd.openrc "$(DESTDIR)$(INITDIR_UPSTART)/psd"
+ 	[ -f "$(DESTDIR)$(CONFDIR)/psd.conf" ] || $(INSTALL_DATA) common/psd.conf "$(DESTDIR)$(CONFDIR)/psd.conf"
+ 
+ install-systemd:
diff --git a/www-misc/profile-sync-daemon/profile-sync-daemon-5.75.ebuild b/www-misc/profile-sync-daemon/profile-sync-daemon-5.75.ebuild
new file mode 100644
index 000000000000..70b563708959
--- /dev/null
+++ b/www-misc/profile-sync-daemon/profile-sync-daemon-5.75.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Symlinks and syncs browser profile dirs to RAM"
+HOMEPAGE="https://wiki.archlinux.org/index.php/Profile-sync-daemon"
+SRC_URI="https://github.com/graysky2/profile-sync-daemon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="systemd zsh-completion"
+
+RDEPEND="
+	app-shells/bash
+	net-misc/rsync[xattr]
+	systemd? ( sys-apps/systemd )"
+
+PATCHES=(
+	"${FILESDIR}/openrc-path.patch"
+	"${FILESDIR}/bad-substitution-fix.patch"
+)
+
+src_install() {
+	emake DESTDIR="${ED}" \
+		install-openrc-all \
+		$(usex systemd "install-systemd" "")
+
+	if ! use zsh-completion; then
+		rm -r "${ED}/usr/share/zsh" || die
+	fi
+
+	fperms -x /etc/cron.hourly/psd-update
+}
+
+pkg_postinst() {
+	elog "The cronjob is -x by default."
+	elog "You might want to set it +x if you don't use"
+	elog "the systemd provided \"psd-resync.timer\"."
+}