gentoo resync : 23.03.2018

5 files changed, 3 insertions, 176 deletions

diff --git a/www-apps/baikal/Manifest b/www-apps/baikal/Manifest
index 4abe6e604f7a..01ae99007ad4 100644
--- a/www-apps/baikal/Manifest
+++ b/www-apps/baikal/Manifest
@@ -1,10 +1,4 @@
 AUX postinstall-en.txt 272 BLAKE2B 2042cf6fbf8d98ef144d19002c3498e4e5f6238b8d135066920ee999facf14a65ba3ed1269228dedbd7f17932a894c399379c19fcf2fccf648d7a7f30b0ffb49 SHA512 4f902e053ac38e313698269decfabe750ca41e255076972eb439f7c753dba50f09879e54df09768daf643da13c81a7bcd1f9bee834da9d29e91a5be88b38c740
-DIST baikal-0.3.5.zip 3282401 BLAKE2B 7b44e4b888e2689bab8d64dbefe85ade742703001b781dc9d65f7c83763c14de7df5c0c47d4a9a003948638338b7c82edd3c3ee3cd5bd4d67580252e0a682558 SHA512 b0e1c9387c92a355c25c39165f608a956778199b23922b10cc9721ac0c5b5c3465e743ab6d890c2400eddaf7249bb2749c2065539892567430f4bef0625d760d
-DIST baikal-0.4.4.zip 3285109 BLAKE2B 2d880cf9432c803f228304cb92922234ce5c6da67bb383595e93b8880bee5ce08c96331bfbccd4332b8e3cc651487ae14606f053b7d05148c0a6505719d99e72 SHA512 3617b5dffddf074a30c6a463b3074c5dc33bbb22d53c3ace4bb705b83a778beed40e3fd5978ebd2019aeed4fdeb836217d18fcbcebb8de309c047dcab92e2d11
 DIST baikal-0.4.6.zip 3288478 BLAKE2B e841c405e59808411999475431e79945a00f2de33228d6a46812acca03b742c1c23349c59d6501b0a1b39587030047682fbc92ead54565766f81a19ee76efdc0 SHA512 8cb4141deb4233858764e6bd0eb44691c5e31677dd6dde09e8249675a331115af8bbcf181c4371338165a0ef40f894dfc4ed0502b46a6bc8387924f6a65725a1
-DIST baikal-regular-0.2.7.tgz 2273699 BLAKE2B 8394939d578cf5b714f20f0fc26d9807e0b23a717dc9b61230606f466e7365132abdcef6ef9fe80de1aa9c192eb94122f317c2b810979df4f2c523e410e05650 SHA512 261e34eda6e85e38f9478e04f68fdea09ea12203a11b47aaf1a446e33333a9d8d1d9663f4a36da1cfd2adf776ba3f4be459b2639cc1a23e64e8584e47632bb8f
-EBUILD baikal-0.2.7.ebuild 1398 BLAKE2B 0a110266ccaadd6c2b3e458a34711184d9465a1650bc2bfa7dadc5b0e3e277dc18b4a6dc759329df22cbb95bb7bf490e3c2dd8cf74b4c4cc8464e749ae289692 SHA512 f2ba442d6b1754fce7e7b95defd5534d13ea486c594eb9ae1a9b406f6a86b7bb447bc7be0f9245b416aa1622bca6e7497c286da8f7b41b313f0ea8a103825e82
-EBUILD baikal-0.3.5.ebuild 1446 BLAKE2B d874e6d5637687b358d3add4c7133ce61c2072143170daac131cd5d12110d5c5b4c78f3d0211204a698fbe5f95a70cc0fee9686ede4a65f2f5016281e450af06 SHA512 a2fc47fbe930b90999192ab30859e4c27ab0bfa8b53f1aae06a30c8ecdc1e13d1e51a9db66835f4f4bf7f0eb8183226c7f65c754b9b0808b499ba4984d6a7bea
-EBUILD baikal-0.4.4.ebuild 1461 BLAKE2B 487c0d7f7b7b8fd566494e649fc0e9b3e059d99428e52ae284ad626e19bb4ddc1360a8afa3ab7254a67a2c9b130825df7662c387e86990e450958fc99b938e92 SHA512 3eba92629db154561a58e6122dfe38fc5345598f70825b98f201bbb6bc4bff85900fc37202bffe045993bde01dd9c41c6c13ccad7dcc03cf66edfd68699f7403
-EBUILD baikal-0.4.6.ebuild 1461 BLAKE2B 487c0d7f7b7b8fd566494e649fc0e9b3e059d99428e52ae284ad626e19bb4ddc1360a8afa3ab7254a67a2c9b130825df7662c387e86990e450958fc99b938e92 SHA512 3eba92629db154561a58e6122dfe38fc5345598f70825b98f201bbb6bc4bff85900fc37202bffe045993bde01dd9c41c6c13ccad7dcc03cf66edfd68699f7403
+EBUILD baikal-0.4.6.ebuild 1468 BLAKE2B ed4eeb28da46a5d1b098f275ea19ad0dfa0bfcd5374a10bbd5af4e5ca6a12d0473f1a589947f92dabd47151c6a308411203c9ca3b5f1aeb9a54797c90e05e7be SHA512 bee1d38b1aa692bd8bd7ede59f7db6478e2bf12f76f4ab6841e15a4039fb6e86b4b559a7c935d5ae5a54d9182b448b8ed6690ccabb4e8fbddab44de111777835
 MISC metadata.xml 325 BLAKE2B 92c24f0b14c94c6666fe915eda815354af8f73d3f829ff414afcd4ff49b775191ee79ec9000718a795799060ccca8f10acf5ca27d861943ee5ac5c5a34d69ce0 SHA512 2b6f9ba13bbc4821f79703ba0fe5829b4ec30817b9571c05698d65cadbd52444bd3dcff42f0807f4fcdfc9269db6edb858bb0301a50546b0741929030bc196c9
diff --git a/www-apps/baikal/baikal-0.2.7.ebuild b/www-apps/baikal/baikal-0.2.7.ebuild
deleted file mode 100644
index 6d36fb9754d4..000000000000
--- a/www-apps/baikal/baikal-0.2.7.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit webapp
-
-DESCRIPTION="Lightweight CalDAV+CardDAV server"
-HOMEPAGE="http://baikal-server.com/"
-SRC_URI="http://baikal-server.com/get/${PN}-regular-${PV}.tgz"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64"
-IUSE="+mysql sqlite"
-REQUIRED_USE="|| ( mysql sqlite )"
-
-RDEPEND=">=dev-lang/php-5.3[ctype,filter,pdo,session,xml,mysql?,sqlite?]
-	mysql? ( virtual/mysql )
-	sqlite? ( dev-db/sqlite )
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}-regular
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc *.md  || die "dodoc failed"
-
-	einfo "Installing web files"
-	insinto "${MY_HTDOCSDIR}"
-	doins -r html/* html/.htaccess Core vendor || die "doins failed"
-
-	einfo "Setting up container for configuration"
-	insinto /etc/${PN}
-	doins Specific/.htaccess || die "doins failed"
-
-	einfo "Fixing symlinks"
-	local link target
-	find "${D}${MY_HTDOCSDIR}" -type l | while read link ; do
-		target=$(readlink "${link}")
-		target=${target/..\/Core/Core}
-		rm "${link}" && ln -s "${target}" "${link}"
-	done
-	dosym /etc/${PN} "${MY_HTDOCSDIR}"/Specific
-	dosym . "${MY_HTDOCSDIR}"/html
-
-	webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
-	webapp_src_install
-
-	if has_version www-servers/apache ; then
-		fowners -R apache:apache /etc/${PN}
-	else
-		einfo "/etc/${PN} must be owned by the webserver user for baikal"
-	fi
-}
diff --git a/www-apps/baikal/baikal-0.3.5.ebuild b/www-apps/baikal/baikal-0.3.5.ebuild
deleted file mode 100644
index 8e83aa8754e1..000000000000
--- a/www-apps/baikal/baikal-0.3.5.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit webapp
-
-DESCRIPTION="Lightweight CalDAV+CardDAV server"
-HOMEPAGE="http://sabre.io/baikal/"
-SRC_URI="https://github.com/fruux/Baikal/releases/download/${PV}/${P}.zip"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm"
-IUSE="+mysql sqlite"
-REQUIRED_USE="|| ( mysql sqlite )"
-
-RDEPEND=">=dev-lang/php-5.5[ctype,filter,pdo,session,xml,xmlreader,mysql?,sqlite?]
-	mysql? ( virtual/mysql )
-	sqlite? ( dev-db/sqlite )
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc *.md  || die "dodoc failed"
-
-	einfo "Installing web files"
-	insinto "${MY_HTDOCSDIR}"
-	doins -r html/* html/.htaccess Core vendor || die "doins failed"
-
-	einfo "Setting up container for configuration"
-	insinto /etc/${PN}
-
-	einfo "Fixing symlinks"
-	local link target
-	find "${D}${MY_HTDOCSDIR}" -type l | while read link ; do
-		target=$(readlink "${link}")
-		target=${target/..\/Core/Core}
-		rm "${link}" && ln -s "${target}" "${link}"
-	done
-	dosym /etc/${PN} "${MY_HTDOCSDIR}"/Specific
-	dosym . "${MY_HTDOCSDIR}"/html
-
-	webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
-	webapp_src_install
-
-	if has_version www-servers/apache ; then
-		fowners -R apache:apache /etc/${PN}
-	elif has_version www-servers/nginx ; then
-		fowners -R nginx:nginx /etc/${PN}
-	else
-		einfo "/etc/${PN} must be owned by the webserver user for baikal"
-	fi
-}
diff --git a/www-apps/baikal/baikal-0.4.4.ebuild b/www-apps/baikal/baikal-0.4.4.ebuild
deleted file mode 100644
index bf20db84b6cf..000000000000
--- a/www-apps/baikal/baikal-0.4.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit webapp
-
-DESCRIPTION="Lightweight CalDAV+CardDAV server"
-HOMEPAGE="http://sabre.io/baikal/"
-SRC_URI="https://github.com/fruux/Baikal/releases/download/${PV}/${P}.zip"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm"
-IUSE="+mysql sqlite"
-REQUIRED_USE="|| ( mysql sqlite )"
-
-RDEPEND=">=dev-lang/php-5.5[ctype,filter,json,pdo,session,xml,xmlreader,xmlwriter,mysql?,sqlite?]
-	mysql? ( virtual/mysql )
-	sqlite? ( dev-db/sqlite )
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc *.md  || die "dodoc failed"
-
-	einfo "Installing web files"
-	insinto "${MY_HTDOCSDIR}"
-	doins -r html/* html/.htaccess Core vendor || die "doins failed"
-
-	einfo "Setting up container for configuration"
-	insinto /etc/${PN}
-
-	einfo "Fixing symlinks"
-	local link target
-	find "${D}${MY_HTDOCSDIR}" -type l | while read link ; do
-		target=$(readlink "${link}")
-		target=${target/..\/Core/Core}
-		rm "${link}" && ln -s "${target}" "${link}"
-	done
-	dosym /etc/${PN} "${MY_HTDOCSDIR}"/Specific
-	dosym . "${MY_HTDOCSDIR}"/html
-
-	webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
-	webapp_src_install
-
-	if has_version www-servers/apache ; then
-		fowners -R apache:apache /etc/${PN}
-	elif has_version www-servers/nginx ; then
-		fowners -R nginx:nginx /etc/${PN}
-	else
-		einfo "/etc/${PN} must be owned by the webserver user for baikal"
-	fi
-}
diff --git a/www-apps/baikal/baikal-0.4.6.ebuild b/www-apps/baikal/baikal-0.4.6.ebuild
index bf20db84b6cf..70a40f4bbc7e 100644
--- a/www-apps/baikal/baikal-0.4.6.ebuild
+++ b/www-apps/baikal/baikal-0.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -10,7 +10,7 @@ HOMEPAGE="http://sabre.io/baikal/"
 SRC_URI="https://github.com/fruux/Baikal/releases/download/${PV}/${P}.zip"
 
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~ppc64"
 IUSE="+mysql sqlite"
 REQUIRED_USE="|| ( mysql sqlite )"