commit: 494e377e4ad78003afe41c6e991fb874a0784aa6 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> AuthorDate: Tue Dec 20 15:30:44 2016 +0000 Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> CommitDate: Tue Dec 20 15:31:34 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=494e377e
net-misc/memcached: clean up bug 598836 Package-Manager: portage-2.3.0 net-misc/memcached/Manifest | 8 -- .../files/memcached-1.3.3-gcc4-slab-fixup.patch | 25 ------ net-misc/memcached/files/memcached.init | 93 ---------------------- net-misc/memcached/memcached-1.4.24.ebuild | 84 ------------------- net-misc/memcached/memcached-1.4.25.ebuild | 84 ------------------- net-misc/memcached/memcached-1.4.26.ebuild | 84 ------------------- net-misc/memcached/memcached-1.4.27.ebuild | 84 ------------------- net-misc/memcached/memcached-1.4.29.ebuild | 84 ------------------- net-misc/memcached/memcached-1.4.30.ebuild | 84 ------------------- net-misc/memcached/memcached-1.4.31.ebuild | 84 ------------------- net-misc/memcached/memcached-1.4.32.ebuild | 84 ------------------- net-misc/memcached/memcached-1.4.33-r1.ebuild | 2 - 12 files changed, 800 deletions(-) diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest index 6db0179f..21913ea 100644 --- a/net-misc/memcached/Manifest +++ b/net-misc/memcached/Manifest @@ -1,9 +1 @@ -DIST memcached-1.4.24.tar.gz 354917 SHA256 08a426c504ecf64633151eec1058584754d2f54e62e5ed2d6808559401617e55 SHA512 446676ae7b21d8d9246f38d3df06b167ea93a853f88ac70ae3a99b1a85a4de3d452ee266e77fac599660b9bc6e785bc89224f46e16ff6e216476d50e4706b9f6 WHIRLPOOL 269e920a0d5279786a4f4ef516b71fa7e95cacdf8627a2b692d2387a66d5d9a80618f190cf013bf070aff0f73d70d6e75dc4e3402fe8e64b372026be83170e3d -DIST memcached-1.4.25.tar.gz 359709 SHA256 f058437b3c224d321919a9a6bb4e3eedb2312ed718c0caf087ff2f04ab795dda SHA512 e037c3bbb68c4077f814f855663501af418ce3b1f8bc20f8e7eba3249aea378e55b3291457952fa4511779ec3702496fdaab5799edae7d59bc64eb6fd54ee14e WHIRLPOOL 213bb95d9b814e446dce31073701d997ac6b994bca655bf38eb7b8f552c4bd7e87bd36d5f9a802a965649306fe5e1ea3f093b4ce274119b23fe7aaf22a55f2ca -DIST memcached-1.4.26.tar.gz 373384 SHA256 4a67800277eec2e523c51d5f620c416e7d0acfde90beacaa26d8e4f6976b43f6 SHA512 b9346e5fd60407133d2d1eb1a6fadfe455607b6b9ba4434a00ec9c8ce480dffddf19a4965dfed92a6a10d46b98f1a6754851fd4c20d55c4a19200879db5baf9c WHIRLPOOL 9b03018914b11eadb9af2c7f67af9a298e2fc3d4139af615951f94114e0c099b600f859c08d2230c919888d288b3b80a7d2df188a95e4d73ec781ae6965a7910 -DIST memcached-1.4.27.tar.gz 377793 SHA256 96a90e7abec041a3c03258b6ce01ab21be16a9c594b7891a55567428392e8fe7 SHA512 54572e5d18e71d5c03cc3ed9a13c822800eeef7b7779132aa72f685177884c10f783a4c8fa88b6af7aef51dc230df7f351f2fa2b317ddd9b495007be89aefcea WHIRLPOOL ba7ff04d92a1cc42a4873406fe20ae771411294aa312d002af7f2921584589c1e1811dac7cdd57d0525990861e00d8840377e7e319ff1b6fa9892af921d1e7c7 -DIST memcached-1.4.29.tar.gz 383966 SHA256 c61a3a7f9c82e574559797bbf4bb01ad8b79e436ca80b8e46f5b51ae39b03d0b SHA512 fa44a2599f9cfea6002fa6b9b12e8ecf64820f87b164c9e98e0c25800c79473de5db6a9040967c1b8e436d75eede7318308275479d046e33129a6fdc7882e21f WHIRLPOOL 51c9e00a72fa0efe2b198fb70bc9aee4d54901fcc4eb1fce124730e688a5b408af9449a9920a621dab795820dbeab63a8b1a072caf277bd3fb5fe325236c807d -DIST memcached-1.4.30.tar.gz 384231 SHA256 e0bea597c9082557f3357f63db08c3d5121ccc8502f300a48d4cb84d22e8be5f SHA512 cf41832d6a112778d06cdbaa780bbcf8d7d07850c592e3ce1573a4561d9146e7081407f726bd49be8a08130e7ac42a86bed984290d4a19c4a173671698587bb7 WHIRLPOOL b434a342da56933ccbe5e70dd303d13338a01a1359d7225534d65ac78483229a13de9685ff7740ac9116fceec79dfc44bc505618c60118cdb45d80e5b8c87430 -DIST memcached-1.4.31.tar.gz 389502 SHA256 77ce5f820bafe94c33bf7bd86268d9bcdb3b76f68128d795b106db53d528707f SHA512 0e3faf7f574599d06df6764c98e0f01f3ed64c480efdc59ed01975e6149a836a1d47844ed9c1824a596ae1c42c1c5e36fd64692399d1073c120ea97a655c3532 WHIRLPOOL 51b7cbe3dca71895b8702af527644f671e6e5683b2af6b85abf9f73ccea41d5ea2e6a2ecb034f0e932a64cd9eee06225ea584d04ca02c49efbde4322de1f6899 -DIST memcached-1.4.32.tar.gz 389771 SHA256 54bb9acd5fbbb73cd1fbfa67cbc6b301009a2835a26c8a4c3dba634a0c3d875d SHA512 60e1d7f76df34cc1d822fcba680c98e2f4933b8c51c0bf0510b68afbd73f97579ad211806220121b1d9c4fb1417cee7e8db85ef7e222243679a0530974a23e37 WHIRLPOOL 423fccb730a48b2af7473aa244ef036c1d8d9dafd563cfafa23acd56d9abcd75e98a6f9d4c842fdb5358f4060b77e9591e9ea3ff5c6dcbbbf4387dea033bc67f DIST memcached-1.4.33.tar.gz 389813 SHA256 83726c8d68258c56712373072abb25a449c257398075a39ec0867fd8ba69771d SHA512 00af5a2f46702fb8e606b1035cdaad125445d8eb701927a3ccccd7cd6c12e0811efb3ad917e3118043fd993b5c313f1aa0c4b2a471218e971a21fed7c896e136 WHIRLPOOL 05ee1d4ea931a1f1792283b1d947ffa48752cb6ad1417d06221f967b00e638f5fa21448080efc1de1adf7457bd202b6102ae1495ba1e01368fcba04565c95299 diff --git a/net-misc/memcached/files/memcached-1.3.3-gcc4-slab-fixup.patch b/net-misc/memcached/files/memcached-1.3.3-gcc4-slab-fixup.patch deleted file mode 100644 index 5b70350..00000000 --- a/net-misc/memcached/files/memcached-1.3.3-gcc4-slab-fixup.patch +++ /dev/null @@ -1,25 +0,0 @@ -Compile fix for illegal syntax to make GCC4 happy. - -Signed-off-by: Robin H. Johnson <[email protected]> - -diff -Nuar -Nuar memcached-1.3.3.orig/slabs.c memcached-1.3.3/slabs.c ---- memcached-1.3.3.orig/slabs.c 2009-04-02 12:29:32.000000000 -0700 -+++ memcached-1.3.3/slabs.c 2009-06-03 14:11:04.134757232 -0700 -@@ -419,7 +419,7 @@ - slab = p->slab_list[p->killing - 1]; - slab_end = (char*)slab + POWER_BLOCK; - -- for (iter = slab; iter < slab_end; (char*)iter += p->size) { -+ for (iter = slab; iter < slab_end; iter = (char*)iter + p->size) { - item *it = (item *)iter; - if (it->slabs_clsid) { - if (it->refcount) was_busy = true; -@@ -449,7 +449,7 @@ - dp->end_page_free = dp->perslab; - /* this isn't too critical, but other parts of the code do asserts to - make sure this field is always 0. */ -- for (iter = slab; iter < slab_end; (char*)iter += dp->size) { -+ for (iter = slab; iter < slab_end; iter = (char*)iter + dp->size) { - ((item *)iter)->slabs_clsid = 0; - } - return 1; diff --git a/net-misc/memcached/files/memcached.init b/net-misc/memcached/files/memcached.init deleted file mode 100644 index 2321a44..00000000 --- a/net-misc/memcached/files/memcached.init +++ /dev/null @@ -1,93 +0,0 @@ -#!/sbin/openrc-run - -CONF="${SVCNAME#*.}" -CONFBASE="/etc/conf.d/memcached" - -[ -z "${PIDBASE}" ] && PIDBASE="/run/memcached/memcached" -[ "${CONF}" == "memcached" ] && CONF='' - -if [ -n "${CONF}" ]; then - PIDFILE="${PIDBASE}.${CONF}.pid" - CONFSRC="${CONFBASE}.${CONF}" - if [ -f "${CONFSRC}" ]; then - source "${CONFSRC}" - else - eerror "The configuration file $CONFSRC was not found!" - fi -else - PIDFILE="${PIDBASE}.pid" - CONFSRC="${CONFBASE}" -fi - -depend() { - if [ -z "${SOCKET}" ]; then - need net - fi - # per bug #269022, accurate time is important for memcached! - # We include the full list of ways it might be set on boot. - after ntp-client ntpd rdate openrdate adjtimex hwclock -} - -checkconfig() { - if [ -z "${LISTENON}" ] && [ -z "${SOCKET}" ]; then - ewarn "You should edit $CONFSRC and specify an address or socket to listen on." - ewarn "Listening on any address (check your firewall!)" - fi -} - -start() { - if [ -n "${CONF}" ]; then - ebegin "Starting memcached (${CONF})" - else - ebegin "Starting memcached" - fi - checkconfig - local dir="$(dirname ${PIDFILE})" - if [ ! -d "${dir}" ]; then - einfo " Creating ${dir}" - mkdir -p "${dir}" - fi - - chown ${MEMCACHED_RUNAS} "${dir}" - if [ -f "${PIDFILE}" ]; then - einfo " Removing stale pidfile ${PIDFILE}" - rm -f "${PIDFILE}" 1>/dev/null - fi - - - if [ -n "${SOCKET}" ]; then - CONNECTION="-s ${SOCKET}" - - if [ -n "${SOCKET_MASK}" ]; then - CONNECTION="${CONNECTION} -a ${SOCKET_MASK}" - fi - else - CONNECTION="-p ${PORT} -U ${UDPPORT}" - - if [ -n "${LISTENON}" ]; then - CONNECTION="${CONNECTION} -l ${LISTENON}" - fi - fi - - /sbin/start-stop-daemon --start --pidfile "${PIDFILE}" \ - --exec "${MEMCACHED_BINARY}" -- \ - -d ${CONNECTION} -m ${MEMUSAGE} \ - -c ${MAXCONN} -u ${MEMCACHED_RUNAS} -P "${PIDFILE}" \ - ${MISC_OPTS} - - eend $? -} - -stop() { - if [ -n "${CONF}" ]; then - ebegin "Stopping memcached (${CONF})" - else - ebegin "Stopping memcached" - fi - - start-stop-daemon --stop --quiet --pidfile "${PIDFILE}" - - rm -f "${PIDFILE}" - - eend $? -} diff --git a/net-misc/memcached/memcached-1.4.24.ebuild b/net-misc/memcached/memcached-1.4.24.ebuild deleted file mode 100644 index 018f6a0..00000000 --- a/net-misc/memcached/memcached-1.4.24.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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://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 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.25.ebuild b/net-misc/memcached/memcached-1.4.25.ebuild deleted file mode 100644 index 496ede1..00000000 --- a/net-misc/memcached/memcached-1.4.25.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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://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 ~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.26.ebuild b/net-misc/memcached/memcached-1.4.26.ebuild deleted file mode 100644 index f41d7cd..00000000 --- a/net-misc/memcached/memcached-1.4.26.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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://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 ~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.27.ebuild b/net-misc/memcached/memcached-1.4.27.ebuild deleted file mode 100644 index cb90d58..00000000 --- a/net-misc/memcached/memcached-1.4.27.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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://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 ~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.29.ebuild b/net-misc/memcached/memcached-1.4.29.ebuild deleted file mode 100644 index cb90d58..00000000 --- a/net-misc/memcached/memcached-1.4.29.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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://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 ~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.30.ebuild b/net-misc/memcached/memcached-1.4.30.ebuild deleted file mode 100644 index cb90d58..00000000 --- a/net-misc/memcached/memcached-1.4.30.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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://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 ~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.31.ebuild b/net-misc/memcached/memcached-1.4.31.ebuild deleted file mode 100644 index 391882d..00000000 --- a/net-misc/memcached/memcached-1.4.31.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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://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 ~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.32.ebuild b/net-misc/memcached/memcached-1.4.32.ebuild deleted file mode 100644 index cb90d58..00000000 --- a/net-misc/memcached/memcached-1.4.32.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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://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 ~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.33-r1.ebuild b/net-misc/memcached/memcached-1.4.33-r1.ebuild index ee866cf..93c8ab6 100644 --- a/net-misc/memcached/memcached-1.4.33-r1.ebuild +++ b/net-misc/memcached/memcached-1.4.33-r1.ebuild @@ -29,8 +29,6 @@ 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"
