gentoo resync : 15.09.2018

3 files changed, 2 insertions, 99 deletions

diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 3098b364a8d6..390de69a66d5 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -8,9 +8,7 @@ AUX memcached.service 273 BLAKE2B bfe217d2ec7fd9aead468f4f5b100843287a49bef163dd
 DIST memcached-1.4.39.tar.gz 403751 BLAKE2B fc6082eb9b6dc5ee41c42ded9bcde03ebfe87d1c8ed9acbc6e61cb8889604c6c2715e49556473a1b9215974150b0ccb03d5dbb7210108c87d8e67f19eaccbd87 SHA512 055d39d9d681adebb9a6a255bce5d550b61df0a1981f0105f8ffcc936e2053bca60360d755b65d79af836ba1ca71d4c739c67e20a2e0e7110ada183a7b0b63d6
 DIST memcached-1.5.10.tar.gz 465169 BLAKE2B cfdd4cba4baf3c628b6cb655bbc91fc493b7183c2b403516cd68f7d7deff3ce2f9ba6bce2c92d9b1f0863d2da593f7f51def50afd7827996c109641efa71eaf1 SHA512 5b6217ab90492cb4b3f6597c935a4028697f1d071516d647a70f6ba9353db16184ef229935733e669d4120d34d72f6f2415edcfd3ec899e06eab9d3f494f11f1
 DIST memcached-1.5.2.tar.gz 407715 BLAKE2B d9d6bc3fde4ca47954dbcec520af73a823ff33cd21149cf4a8fd234c383382b83a089196fd168f178aaaa7f764ac4b0b72a4bf8f50867bdc377e95a622f399a1 SHA512 439e1dbf3b15fd014446abb5fd130eb914a72b7372f65a00388da83f30486e8658de75b87626b0c512397457aca9b60057fcedb83d84c628b53137d2a2167c0d
-DIST memcached-1.5.9.tar.gz 462605 BLAKE2B e648cd968f64107be11ebb101efd1d61bfb7db677b3cb7ed1325ca1fd810949cb3067ebee07df974f89beff48a38133f4409fcb8cd176b195a5287ea91be3d53 SHA512 06f7f09a0ec1ec02353296f79776ce9229c648f4ca7c6914f82b3e50455c3b5c8d535c62d8a823f5a50375acddb9cb77470bec430c2acb37f107fb660fe29e54
 EBUILD memcached-1.4.39.ebuild 2873 BLAKE2B 1862c2434c8b711d22d97d827a79a484c1e0f682e92f282d61c10d78d6c6bb62af86519a59d3e3f715f9eae6fb8af2ee92b7705f9c987ca01f35f64ec87c08bd SHA512 2980ce757bbeb1cc401cd91473dbb4a76bce44407f0253aba2f05353426e87022cf40fcb2d584eae9d8bbd930f901e65030b86842936cd48b7425ce7163d78d9
-EBUILD memcached-1.5.10.ebuild 2935 BLAKE2B ee062015766a5e68287ff9227a64b3936d2e5919e8893f5681f0b89b05c9d4fc2b4cff1a856ba71653b2830573b4d12ab0f848f12fa876528bc79650c8b5a5ff SHA512 7d3f8fd60a34547a6b0c76966cd1f589edba5be05418e5561e60e1c86d666652037a37381ba2bdb5c166c84b7a8b1608228a10fcde8c80cf15ca7157cc119dd2
+EBUILD memcached-1.5.10.ebuild 2933 BLAKE2B 53ed1e26ad2f3d60088b0f0eb4020d8338fcf27bca4a72224ecf61f3c9b31421ee1d6480f1aba03c7dfe07948fc0b7112f3442655ec27762d4dcc543b7d3c630 SHA512 450b27248f092e78827d95e7fab3276112b2da4b907339519e5afaaf3ce3902f2a5ac082db187d68fbd1c26874450596d5d2b42df4d6e96bcbf442b56e08f0b4
 EBUILD memcached-1.5.2.ebuild 2882 BLAKE2B e92dbd6cde47898797b2225a09a560651dbb3a9fb9cf603d2b5aadecf25472a02ac33771369855deca687e80fd38c53a263f4affeb92ffb60719d5a64f381deb SHA512 187509aef05b0c47ca2f8ef26bcf9ec813d5fd2a859482a2ce95907b1dba05d4c7d0091542c9e85cc4605e679600bfe7a2260cc3a3b150d3a5a608729d75251d
-EBUILD memcached-1.5.9.ebuild 2935 BLAKE2B ee062015766a5e68287ff9227a64b3936d2e5919e8893f5681f0b89b05c9d4fc2b4cff1a856ba71653b2830573b4d12ab0f848f12fa876528bc79650c8b5a5ff SHA512 7d3f8fd60a34547a6b0c76966cd1f589edba5be05418e5561e60e1c86d666652037a37381ba2bdb5c166c84b7a8b1608228a10fcde8c80cf15ca7157cc119dd2
 MISC metadata.xml 1134 BLAKE2B 3313deb6a6fda71074f08e202dcd43b53fcd4ab9af50b78b84aac67309f3c2a4a966f874c9d8f5c4688542e6fe03d4e2f7b3f854842638210ab64fc35bcdab30 SHA512 c3ce23016f9ea9067f6628f246866e3fcee6624f1a21360e448c7eebc3babd8fa3717966e58eeb0b6fd9885730609fa732a3e10b0a4dfaa57b0f0acc85c20bb4
diff --git a/net-misc/memcached/memcached-1.5.10.ebuild b/net-misc/memcached/memcached-1.5.10.ebuild
index 7b92758285f1..3a72e14b2f82 100644
--- a/net-misc/memcached/memcached-1.5.10.ebuild
+++ b/net-misc/memcached/memcached-1.5.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
 
 RDEPEND=">=dev-libs/libevent-1.4:=
diff --git a/net-misc/memcached/memcached-1.5.9.ebuild b/net-misc/memcached/memcached-1.5.9.ebuild
deleted file mode 100644
index 7b92758285f1..000000000000
--- a/net-misc/memcached/memcached-1.5.9.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic systemd user
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="High-performance, distributed memory object caching system"
-HOMEPAGE="http://memcached.org/"
-SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
-		 https://www.memcached.org/files/old/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
-
-RDEPEND=">=dev-libs/libevent-1.4:=
-		 dev-lang/perl
-		 sasl? ( dev-libs/cyrus-sasl )
-		 seccomp? ( sys-libs/libseccomp )
-		 selinux? ( sec-policy/selinux-memcached )"
-DEPEND="${RDEPEND}
-		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
-	epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
-	epatch "${FILESDIR}/${PN}-1.4.4-as-needed.patch"
-	epatch "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
-	sed -i -e 's,-Werror,,g' configure.ac || die
-	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
-	eautoreconf
-	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
-
-	# Tweak upstream systemd unit to use Gentoo variables/envfile.
-	# As noted by bug #587440
-	sed -i -e '/^ExecStart/{
-			s,{USER},{MEMCACHED_RUNAS},g;
-			s,{CACHESIZE},{MEMUSAGE},g;
-			s,OPTIONS,MISC_OPTS,g;
-		};
-		/Environment=/{s,OPTIONS,MISC_OPTS,g;};
-		/EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;};
-		' \
-		"${S}"/scripts/memcached.service
-	default
-}
-
-src_configure() {
-	econf \
-		--disable-docs \
-		$(use_enable sasl)
-	# The xml2rfc tool to build the additional docs requires TCL :-(
-	# `use_enable doc docs`
-}
-
-src_compile() {
-	# There is a heavy degree of per-object compile flags
-	# Users do NOT know better than upstream. Trying to compile the testapp and
-	# the -debug version with -DNDEBUG _WILL_ fail.
-	append-flags -UNDEBUG -pthread
-	emake testapp memcached-debug CFLAGS="${CFLAGS}"
-	filter-flags -UNDEBUG
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dobin scripts/memcached-tool
-	use debug && dobin memcached-debug
-
-	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
-
-	newconfd "${FILESDIR}/memcached.confd" memcached
-	newinitd "${FILESDIR}/memcached.init2" memcached
-	systemd_dounit "${S}/scripts/memcached.service"
-}
-
-pkg_postinst() {
-	enewuser memcached -1 -1 /dev/null daemon
-
-	elog "With this version of Memcached Gentoo now supports multiple instances."
-	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
-	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
-	elog "Please see Gentoo bug #122246 for more info"
-}
-
-src_test() {
-	emake -j1 test
-}