From b279bbe94522565b8feb19b8e5f377d3ea76f157 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 24 Mar 2018 10:19:03 +0000
Subject: gentoo resync : 24.03.2018

---
 app-admin/Manifest.gz                             | Bin 34302 -> 34306 bytes
 app-admin/ansible/Manifest                        |   2 +
 app-admin/ansible/ansible-2.5.0.ebuild            |  56 ++++++++++++
 app-admin/apache-tools/Manifest                   |   4 +-
 app-admin/apache-tools/apache-tools-2.4.32.ebuild | 105 ----------------------
 app-admin/apache-tools/apache-tools-2.4.33.ebuild | 105 ++++++++++++++++++++++
 6 files changed, 165 insertions(+), 107 deletions(-)
 create mode 100644 app-admin/ansible/ansible-2.5.0.ebuild
 delete mode 100644 app-admin/apache-tools/apache-tools-2.4.32.ebuild
 create mode 100644 app-admin/apache-tools/apache-tools-2.4.33.ebuild

(limited to 'app-admin')

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index bad1b0f1d9de..278df9b70afd 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index d13bd0694802..b42f43583cf0 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,7 +1,9 @@
 DIST ansible-2.4.2.0.tar.gz 6503595 BLAKE2B df4ec4e24671f1488950f2d9eb7705fbad4e035d6ac67d5017417281455cc44cde1290976a9ed16675c0cc19a9190200b95b29890725c56df5f2699398accd6b SHA512 32a075959dca01e184d9c3988fc9c491e904e7627a38e3527c37a8b26340f331bd294cacfe7353d339d15488857ba5ee1b36d9ae4ebeb8b5827934a73f4b42b0
 DIST ansible-2.4.3.0.tar.gz 6511115 BLAKE2B d43679c651f6aa5fd86c797a204645a8ee98efbcde9abaa25385aeb6f1d7c8b4ad74185434bfd159dbf673fe9339ef8f915f78238f8b8a5caf924b54cb9bdd52 SHA512 a7cda358c67c519c7e5ba248bf47070f21a27203fb29d70d9d75ecf027ba1275d71c0f96493e047281211d172a3be8273d7e08144446284695fb0bc8b94daa82
+DIST ansible-2.5.0.tar.gz 10073927 BLAKE2B 00e5d4245b7ea89a3826a3ab25c880c3acfdb713a045b9583dcc7fe913673954f1bee31d10a5125a8c386eca8d478ca807e44466a4c2729cfb571323836d5353 SHA512 93dee0404c5de0a9c8c5b8987f1fb2dbacceb848e8d5b4c70c5a6692d6fe8e9d4bec67d592071346f458b46b9ed2d800609a080d7d4b16266943f32d56a19220
 EBUILD ansible-2.4.2.0-r1.ebuild 1406 BLAKE2B 9f63cd0a25a4ada0913f0e94c5dc221043936b60a0287d32668f3b9ede027f4b32695d527d5b6402252c5294e3bedc00d2ccdb3f8b0d8f892a9c6c003f81d73e SHA512 492cb42bc894ed7b07275828117689901b90574135397b73bbe9b7447a06df6024a18f9cc61bd48ac8d2f3ead9b0555ad79c708d275894725aa6ed1548a00fb7
 EBUILD ansible-2.4.2.0.ebuild 1445 BLAKE2B f00ce2aaff90cbdff9a6eee800a61bfca78491671a3b8e7c931fe8f24cced9b6b8bb5552f42d34b106d8b101173c373f4ee69f8dba8738936af3866e946164df SHA512 2f731321ff758ca6db6cd90701ae234cd63fb84f8dcfe730c6b2cf824fb8f801ceb174e1bde7b3f3e9d14723574ff5c18d5ca68c82b27192aef3d4b355df5ff0
 EBUILD ansible-2.4.3.0.ebuild 1404 BLAKE2B 520e1d8270be10a88249acf994577545b9b2e41289446b2bd5f164a1a5ea3e9b19a7d522dd57a732abbdfe0b8d2439cd4aaa9d7c46cd79a8bea3fed2fdd856fa SHA512 c72349eb645c40f7399975a12f1fb9daacdabee4dc9d801e8bc7c4ac8bffeae178906481eb6e69fe2dc81505179092ca30f4b7c7e0a92715e14f2d93f3143c7e
+EBUILD ansible-2.5.0.ebuild 1406 BLAKE2B 9f63cd0a25a4ada0913f0e94c5dc221043936b60a0287d32668f3b9ede027f4b32695d527d5b6402252c5294e3bedc00d2ccdb3f8b0d8f892a9c6c003f81d73e SHA512 492cb42bc894ed7b07275828117689901b90574135397b73bbe9b7447a06df6024a18f9cc61bd48ac8d2f3ead9b0555ad79c708d275894725aa6ed1548a00fb7
 EBUILD ansible-9999.ebuild 1475 BLAKE2B f2718a27295c6d9ce5ad4415573558ab2e651f52dae85ae9dc79a3e39e5692a29279b5d6a96166c91b7d0b1a389915848e7e9480979c4fa3e0878ae6b2fdc662 SHA512 a1c816593bb2052ce3f89c37fa44322b25af436bf6f3bbbfb8c87e1b1ed33aac880e8e3499fcbc52a0d0bd85db6ad0ac48a858400b1806ae4b61beb66a634244
 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.5.0.ebuild b/app-admin/ansible/ansible-2.5.0.ebuild
new file mode 100644
index 000000000000..346b2f5aea95
--- /dev/null
+++ b/app-admin/ansible/ansible-2.5.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1 eutils versionator
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="http://ansible.com/"
+SRC_URI="http://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman docs/man/man1/*.1
+	dodoc -r examples
+}
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 98bc9d89ae1c..9c292c3336db 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -3,9 +3,9 @@ AUX apache-tools-2.4.7-Makefile.patch 1695 BLAKE2B 8fac145613ac9f587e49bc6932c57
 DIST httpd-2.2.34.tar.bz2 5779739 BLAKE2B 8cdd41fb5d1880da4a1cfef252b4682f613b938594057ea4c9665d3881a50b298fb7339c1ceb3dafc215aa927048f99d500f2d29c125016d5766954be9b632b4 SHA512 e6dac5865a48533c025fe17523ee74d68c3a23f9512c9441b78a140e33cfb6835573eb049b0ad424eb5c5ca78a1915778c54e8a409da95fbdd3890cb99e08240
 DIST httpd-2.4.27.tar.bz2 6527394 BLAKE2B 50a650eb2edd121dac860ff555273290010d7e85bf4d5fbe3683f82e1928dde99ebfabc42186436f5052a66555a73d8b797b114c76c123faa31b9f51575d0bbb SHA512 7e7e8070715b74cb6890096a74e194f4c6a49c14bda685b1ad832e84312f1ac4316ea03a430e679502bfd8e1853aefa544ee002a20d0f7e994b9a590c74bc42c
 DIST httpd-2.4.29.tar.bz2 6567926 BLAKE2B 01a83212941abad548f73fc144f9731ff51e0ed8f975e76cb994247601f7c2f89a3f862e011638afb77988eda0ef2b543634fb6bc45b583e9bdba2c30e565731 SHA512 840982fd3d21463bc5c1747f211dfacf3abdf634d149e49bb49fd2e5deda140de602dbdf31e1bbe5337a48f718ab2261c408e83a8dd39a9291ee7b6b7a85639a
-DIST httpd-2.4.32.tar.bz2 6932708 BLAKE2B 89c1aa1dec3ddb6194552aa927c5eb7f3c8d7108b5cf90c8c62fa61652212d7f77bd98c44003f2f3b1a33423dafd186b8d8f633d44651d4ab23c61e79be79562 SHA512 36718a7bcc5cd8186874fe2a83c2feb429f703147b2191b0acfe8b18bc432c40b4bf31136e743fc7fab4c35ad87c6fbd3699252f2bc58a713791460adef9cdd0
+DIST httpd-2.4.33.tar.bz2 6934765 BLAKE2B 4ff266b85358e3100c8064c84c89db0235e6f46bb4b308e6b3bf642a9c0815eb6a731ee12e3d8ea2bf31a5d5e6621152452f1e8a9625755689f552f2473b1955 SHA512 e74b2b3346d67be45a8bc8a7cbb8eabf5c403a5cfe5797a976f94a539529843fbcdf03b9ca0548816b2cf37f4ce0eb301f8d5af25b1270fdf8dd9f5bf0585269
 EBUILD apache-tools-2.2.34.ebuild 1977 BLAKE2B 792d6ea010621c815a13fa89db289cdb7d2f02cd4aecca6d032e21c2bd64af7c35a66ebe3b8102eb441d12a4b6b2ca6197e16f8479d72c82606b088b97dfc24a SHA512 4a71266da0e171579c5d9da9ed681ed5600d2d94ffb15761bbd7f28b60332158959156a65b27ac295869f647f624fe598bdf2e74aa3c7f8b16fef7cbb2dc9a52
 EBUILD apache-tools-2.4.27.ebuild 2653 BLAKE2B 00b1b5e96e7eab66981fc339faf6db5e40d05af2d819c92a5faff3ad2f60c566d0235cbf60ded1d5daa79cec7815534b96b53b8e8f00333d1a814058752dd011 SHA512 e23b494555f6685f482fcecc59b5e81147780bf399de740b91bc19de9197a3d6f9d32a701472ba6551a3039214adc2e0bfd4436e0b82edb388f26d4dc88bd110
 EBUILD apache-tools-2.4.29.ebuild 2658 BLAKE2B 830ea9f04a16a045c49ca1394e4623136aaf2f98841ca23b385d6913005e73058485e32cc6ddf25a2f702eb91b524483e33a06b1c59b15fdd5e9581f10450935 SHA512 0fa016c595f7d19a60c4017ad254ce21e40a00e05743851d07af1b5e05f44f63b5de4a9d63a8fd7a6928fc988b779f19de8137c8ad328307a5ee98f1388d4492
-EBUILD apache-tools-2.4.32.ebuild 2584 BLAKE2B 753da88acf51594057d803cdf7d30c47cea49bc9dde0bc95101b7188f13b59db91b3b7db84422f828efb8871fd95926c58ef9902823fb8d63ee18df12bf37bbc SHA512 d3c4a5bf85c81901e18bd7649d9ee368a478a2bd4b55ad2ce4820db68a576a26ea0aedcfd98dad0d2c6c3a63bb5f177d2a40a68ca5e1cef6bac7c830b41ed258
+EBUILD apache-tools-2.4.33.ebuild 2584 BLAKE2B 753da88acf51594057d803cdf7d30c47cea49bc9dde0bc95101b7188f13b59db91b3b7db84422f828efb8871fd95926c58ef9902823fb8d63ee18df12bf37bbc SHA512 d3c4a5bf85c81901e18bd7649d9ee368a478a2bd4b55ad2ce4820db68a576a26ea0aedcfd98dad0d2c6c3a63bb5f177d2a40a68ca5e1cef6bac7c830b41ed258
 MISC metadata.xml 466 BLAKE2B 06dbc2df528810dc0aa7335271c987c6310ceb7d8b0db3dc74c6727c27d280e499ddd9ee75580dba63e0f33e24ce63ecfa40059a46ebdec80005769608cae82c SHA512 2820a1f104fbdc752196f600def1e0c56eed6025fa3e66b297077be7a6eb735a2009f1a57cc320e2cf0c2d6cebf9db8c338cf2c6cc9c746766ab99a0b49c63fe
diff --git a/app-admin/apache-tools/apache-tools-2.4.32.ebuild b/app-admin/apache-tools/apache-tools-2.4.32.ebuild
deleted file mode 100644
index 83ac607083ab..000000000000
--- a/app-admin/apache-tools/apache-tools-2.4.32.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic eutils multilib toolchain-funcs
-
-DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
-HOMEPAGE="https://httpd.apache.org/"
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
-IUSE="libressl ssl"
-RESTRICT="test"
-
-RDEPEND=">=dev-libs/apr-1.5.0:1=
-	dev-libs/apr-util:1=
-	dev-libs/expat
-	dev-libs/libpcre
-	kernel_linux? ( sys-apps/util-linux )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
-
-S="${WORKDIR}/httpd-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
-)
-
-src_prepare() {
-	default
-
-	# This package really should upgrade to using pcre's .pc file.
-	cat <<-\EOF >"${T}"/pcre-config
-	#!/bin/bash
-	flags=()
-	for flag; do
-		if [[ ${flag} == "--version" ]]; then
-			flags+=( --modversion )
-		else
-			flags+=( "${flag}" )
-		fi
-	done
-	exec ${PKG_CONFIG} libpcre "${flags[@]}"
-	EOF
-	chmod a+x "${T}"/pcre-config
-}
-
-src_configure() {
-	# Brain dead check.
-	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
-	tc-export PKG_CONFIG
-
-	local myeconfargs=(
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
-		--sbindir="${EPREFIX}"/usr/sbin
-		--with-perl="${EPREFIX}"/usr/bin/perl
-		--with-expat="${EPREFIX}"/usr
-		--with-z="${EPREFIX}"/usr
-		--with-apr="${SYSROOT}${EPREFIX}"/usr
-		--with-apr-util="${SYSROOT}${EPREFIX}"/usr
-		--with-pcre="${T}"/pcre-config
-		$(use_enable ssl)
-		$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
-	)
-	# econf overwrites the stuff from config.layout.
-	ac_cv_path_PKGCONFIG=${PKG_CONFIG} \
-	econf "${myeconfargs[@]}"
-	sed -i \
-		-e '/^LTFLAGS/s:--silent::' \
-		build/rules.mk build/config_vars.mk || die
-}
-
-src_compile() {
-	emake -C support
-}
-
-src_install() {
-	emake -C support DESTDIR="${D}" install
-	dodoc CHANGES
-	doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
-		docs/man/{htcacheclean,rotatelogs}.8
-
-	# Providing compatiblity symlinks for #177697 (which we'll stop to install
-	# at some point).
-	pushd "${ED%/}"/usr/sbin >/dev/null || die
-	local i
-	for i in *; do
-		dosym ${i} /usr/sbin/${i}2
-	done
-	popd >/dev/null || die
-
-	# Provide a symlink for ab-ssl
-	if use ssl ; then
-		dosym ab /usr/bin/ab-ssl
-		dosym ab /usr/bin/ab2-ssl
-	fi
-}
diff --git a/app-admin/apache-tools/apache-tools-2.4.33.ebuild b/app-admin/apache-tools/apache-tools-2.4.33.ebuild
new file mode 100644
index 000000000000..83ac607083ab
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.4.33.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic eutils multilib toolchain-funcs
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="https://httpd.apache.org/"
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+IUSE="libressl ssl"
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/apr-1.5.0:1=
+	dev-libs/apr-util:1=
+	dev-libs/expat
+	dev-libs/libpcre
+	kernel_linux? ( sys-apps/util-linux )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+
+S="${WORKDIR}/httpd-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
+)
+
+src_prepare() {
+	default
+
+	# This package really should upgrade to using pcre's .pc file.
+	cat <<-\EOF >"${T}"/pcre-config
+	#!/bin/bash
+	flags=()
+	for flag; do
+		if [[ ${flag} == "--version" ]]; then
+			flags+=( --modversion )
+		else
+			flags+=( "${flag}" )
+		fi
+	done
+	exec ${PKG_CONFIG} libpcre "${flags[@]}"
+	EOF
+	chmod a+x "${T}"/pcre-config
+}
+
+src_configure() {
+	# Brain dead check.
+	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+	tc-export PKG_CONFIG
+
+	local myeconfargs=(
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
+		--sbindir="${EPREFIX}"/usr/sbin
+		--with-perl="${EPREFIX}"/usr/bin/perl
+		--with-expat="${EPREFIX}"/usr
+		--with-z="${EPREFIX}"/usr
+		--with-apr="${SYSROOT}${EPREFIX}"/usr
+		--with-apr-util="${SYSROOT}${EPREFIX}"/usr
+		--with-pcre="${T}"/pcre-config
+		$(use_enable ssl)
+		$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
+	)
+	# econf overwrites the stuff from config.layout.
+	ac_cv_path_PKGCONFIG=${PKG_CONFIG} \
+	econf "${myeconfargs[@]}"
+	sed -i \
+		-e '/^LTFLAGS/s:--silent::' \
+		build/rules.mk build/config_vars.mk || die
+}
+
+src_compile() {
+	emake -C support
+}
+
+src_install() {
+	emake -C support DESTDIR="${D}" install
+	dodoc CHANGES
+	doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
+		docs/man/{htcacheclean,rotatelogs}.8
+
+	# Providing compatiblity symlinks for #177697 (which we'll stop to install
+	# at some point).
+	pushd "${ED%/}"/usr/sbin >/dev/null || die
+	local i
+	for i in *; do
+		dosym ${i} /usr/sbin/${i}2
+	done
+	popd >/dev/null || die
+
+	# Provide a symlink for ab-ssl
+	if use ssl ; then
+		dosym ab /usr/bin/ab-ssl
+		dosym ab /usr/bin/ab2-ssl
+	fi
+}
-- 
cgit v1.2.3