bup for bug 549192

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x33ED3FD25AFC78BA)

6 files changed, 10 insertions, 272 deletions

diff --git a/net-misc/memcached/ChangeLog b/net-misc/memcached/ChangeLog
index c2ea425e7f5b..1c7b26abaa42 100644
--- a/net-misc/memcached/ChangeLog
+++ b/net-misc/memcached/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/memcached
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/ChangeLog,v 1.154 2015/01/12 04:02:53 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/ChangeLog,v 1.155 2015/05/15 18:03:51 prometheanfire Exp $
+
+*memcached-1.4.24 (15 May 2015)
+
+  15 May 2015; Matthew Thode <prometheanfire@gentoo.org>
+  +memcached-1.4.24.ebuild, -memcached-1.1.13-r2.ebuild,
+  -memcached-1.1.13-r3.ebuild, -memcached-1.4.20-r1.ebuild,
+  -memcached-1.4.21.ebuild, -memcached-1.4.22.ebuild:
+  bup for bug 549192
 
 *memcached-1.4.22 (12 Jan 2015)
 
diff --git a/net-misc/memcached/memcached-1.1.13-r2.ebuild b/net-misc/memcached/memcached-1.1.13-r2.ebuild
deleted file mode 100644
index 67b91ff8755f..000000000000
--- a/net-misc/memcached/memcached-1.1.13-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.1.13-r2.ebuild,v 1.3 2014/01/08 06:19:22 vapier Exp $
-
-inherit eutils user
-
-DESCRIPTION="High-performance, distributed memory object caching system"
-
-HOMEPAGE="http://www.danga.com/memcached/"
-
-MY_PV="${PV/_pre/-pre}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="http://www.danga.com/memcached/dist/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="static perl doc"
-
-DEPEND=">=dev-libs/libevent-0.6
-		perl? ( dev-perl/Cache-Memcached )"
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	local myconf=""
-	use static || myconf="--disable-static ${myconf}"
-	econf ${myconf} || die "econf failed"
-	emake || die
-}
-
-src_install() {
-	dobin "${S}"/memcached
-	dodoc "${S}"/{AUTHORS,COPYING,ChangeLog,INSTALL,NEWS,README}
-
-	newconfd "${FILESDIR}/1.1.12/conf" memcached
-
-	newinitd "${FILESDIR}/1.1.12/init" memcached
-
-	doman "${S}"/doc/memcached.1
-
-	if use doc; then
-	  dodoc "${S}"/doc/{memory_management.txt,protocol.txt}
-	fi
-}
-
-pkg_postinst() {
-	enewuser memcached -1 -1 /dev/null daemon
-	einfo "With this version of Memcached Gentoo now supporst multiple instances."
-	einfo "To enable this you must create a symlink in /etc/init.d/ for each instance"
-	einfo "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
-	einfo "Please see Gentoo bug #122246 for more info"
-}
diff --git a/net-misc/memcached/memcached-1.1.13-r3.ebuild b/net-misc/memcached/memcached-1.1.13-r3.ebuild
deleted file mode 100644
index ef7993b5a529..000000000000
--- a/net-misc/memcached/memcached-1.1.13-r3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.1.13-r3.ebuild,v 1.3 2014/01/08 06:19:21 vapier Exp $
-
-inherit eutils user
-
-DESCRIPTION="High-performance, distributed memory object caching system"
-
-HOMEPAGE="http://www.danga.com/memcached/"
-
-MY_PV="${PV/_pre/-pre}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="http://www.danga.com/memcached/dist/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="static perl doc"
-
-DEPEND=">=dev-libs/libevent-0.6
-		perl? ( dev-perl/Cache-Memcached )"
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	local myconf=""
-	use static || myconf="--disable-static ${myconf}"
-	econf ${myconf} || die "econf failed"
-	emake || die
-}
-
-src_install() {
-	dobin "${S}"/memcached
-	dodoc "${S}"/{AUTHORS,COPYING,ChangeLog,INSTALL,NEWS,README}
-
-	newconfd "${FILESDIR}/1.1.13/conf" memcached
-	newinitd "${FILESDIR}/1.1.13/init" memcached
-
-	doman "${S}"/doc/memcached.1
-
-	if use doc; then
-	  dodoc "${S}"/doc/{memory_management.txt,protocol.txt}
-	fi
-}
-
-pkg_postinst() {
-	enewuser memcached -1 -1 /dev/null daemon
-	einfo "With this version of Memcached Gentoo now supporst multiple instances."
-	einfo "To enable this you must create a symlink in /etc/init.d/ for each instance"
-	einfo "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
-	einfo "Please see Gentoo bug #122246 for more info"
-}
diff --git a/net-misc/memcached/memcached-1.4.20-r1.ebuild b/net-misc/memcached/memcached-1.4.20-r1.ebuild
deleted file mode 100644
index 698e324bdf1c..000000000000
--- a/net-misc/memcached/memcached-1.4.20-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.4.20-r1.ebuild,v 1.1 2014/10/17 02:29:40 prometheanfire Exp $
-
-EAPI=5
-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://code.google.com/p/memcached/"
-SRC_URI="http://www.memcached.org/files/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test slabs-reassign debug sasl" # hugetlbfs later
-
-RDEPEND=">=dev-libs/libevent-1.4
-		 dev-lang/perl
-		 sasl? ( dev-libs/cyrus-sasl )"
-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"
-	# Handled different upstream
-	#epatch "${FILESDIR}/${PN}-1.3.3-gcc4-slab-fixup.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
-}
-
-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 "${FILESDIR}/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
-}
diff --git a/net-misc/memcached/memcached-1.4.21.ebuild b/net-misc/memcached/memcached-1.4.21.ebuild
deleted file mode 100644
index eaaac485368b..000000000000
--- a/net-misc/memcached/memcached-1.4.21.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.4.21.ebuild,v 1.1 2014/12/09 02:16:51 prometheanfire Exp $
-
-EAPI=5
-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://code.google.com/p/memcached/"
-SRC_URI="http://www.memcached.org/files/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test slabs-reassign debug sasl selinux" # hugetlbfs later
-
-RDEPEND=">=dev-libs/libevent-1.4
-		 dev-lang/perl
-		 sasl? ( dev-libs/cyrus-sasl )
-		 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"
-	# Handled different upstream
-	#epatch "${FILESDIR}/${PN}-1.3.3-gcc4-slab-fixup.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
-}
-
-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 "${FILESDIR}/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
-}
diff --git a/net-misc/memcached/memcached-1.4.22.ebuild b/net-misc/memcached/memcached-1.4.24.ebuild
index 7f1806835a71..2dd8e1204661 100644
--- a/net-misc/memcached/memcached-1.4.22.ebuild
+++ b/net-misc/memcached/memcached-1.4.24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.4.22.ebuild,v 1.1 2015/01/12 04:02:53 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.4.24.ebuild,v 1.1 2015/05/15 18:03:51 prometheanfire Exp $
 
 EAPI=5
 inherit autotools eutils flag-o-matic systemd user