From bc4da85d9fe261032602d986e0ef09a7967a7bde Mon Sep 17 00:00:00 2001 From: Matthew Thode Date: Sat, 25 May 2019 10:08:30 -0500 Subject: net-misc/memcached: 1.5.16 bump with 1.5.15 cleanup Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Matthew Thode --- net-misc/memcached/Manifest | 2 +- net-misc/memcached/memcached-1.5.15.ebuild | 95 ------------------------------ net-misc/memcached/memcached-1.5.16.ebuild | 95 ++++++++++++++++++++++++++++++ 3 files changed, 96 insertions(+), 96 deletions(-) delete mode 100644 net-misc/memcached/memcached-1.5.15.ebuild create mode 100644 net-misc/memcached/memcached-1.5.16.ebuild (limited to 'net-misc') diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest index e03f5ec07818..f2b0fb61ee4d 100644 --- a/net-misc/memcached/Manifest +++ b/net-misc/memcached/Manifest @@ -4,5 +4,5 @@ DIST memcached-1.5.11.tar.gz 457692 BLAKE2B 248e1b1e6aa54db06d18086add51964b8fc6 DIST memcached-1.5.12.tar.gz 457719 BLAKE2B 6ad223cc62b3514f42eb91851cb906aa6c22f1bed65aed8b9bd5f11d8201bd1e946ddf980e26f4a2a8380f1da03ad7a4e9ad68f2c830bbfa948fe117b2689c3c SHA512 95927fcc06e83e46a050dd50c85e50faf41e6d1f6901b757f7a842b7727a596054082a512a3b830729171556e8a995f037d39d991df2198a80a4e61a6efa1fd8 DIST memcached-1.5.13.tar.gz 483697 BLAKE2B fb4f58cbeb518941a92dc213ce2d30dda501bc84c61ae5fa520c1a3a5cfd58ed92128ea098430d57b2a3db69f0d8e8a77dd38ea7edf4440b3f6c484d3b3fb966 SHA512 77ea80135f572ff49d030ea1da01b31aa6513589e75c370ef306a986a79129358062730dfebe6801487eeb20b1367aed4096514e882ef35425c764434493fa7b DIST memcached-1.5.14.tar.gz 485076 BLAKE2B 729b4b708e921184bfedadbb02b0304eb09dcebbbd1420605deb608dcd7dea25a8982ca0f387f237a1a6412b4682372018c593396ef9bff5aa0fa901c0fdafd6 SHA512 d06083d971d0a40195b4dfb252a3bf7c3a0d20b2dcad56726ff9e0b87ba84024309300516dad40181f1b7af4d9c4f35924383977c5e1ff9b5f13d2ef05f684ed -DIST memcached-1.5.15.tar.gz 487808 BLAKE2B cb2bcf9bb0b452b4da4356b2c9f0b9cd2d2e126eac6faefce2929850fec8dc14d58f6782ad3dffecd6869c3229e13b52dbd018543857cf4cc567daaa795b0778 SHA512 945bdb7be0fcc629c72fd7560d08c064e1b560412be1d90e5c4c989db0f77d7ac2d33c6f0ee0830c2dca1825db7394dde8befbe8c87612724c8b524454325a1c +DIST memcached-1.5.16.tar.gz 487868 BLAKE2B b9889866b8adbbbf23785f0da35f6f6b3cd5c842c6167beab3dd5385d6ed53e4607a2ffc18cd815005f2a1d67a3a549c780411b93d34335c541f4999d793b8a0 SHA512 999872c4c68e0210feab76f74c9487fbfb652cf3e6b7fa347f882767aad41ea6d8ba3ee056494409c054d673fc209032d8a890605810b2c6c9048d26d50751a0 DIST memcached-1.5.2.tar.gz 407715 BLAKE2B d9d6bc3fde4ca47954dbcec520af73a823ff33cd21149cf4a8fd234c383382b83a089196fd168f178aaaa7f764ac4b0b72a4bf8f50867bdc377e95a622f399a1 SHA512 439e1dbf3b15fd014446abb5fd130eb914a72b7372f65a00388da83f30486e8658de75b87626b0c512397457aca9b60057fcedb83d84c628b53137d2a2167c0d diff --git a/net-misc/memcached/memcached-1.5.15.ebuild b/net-misc/memcached/memcached-1.5.15.ebuild deleted file mode 100644 index 8d046a22030e..000000000000 --- a/net-misc/memcached/memcached-1.5.15.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# 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 -} diff --git a/net-misc/memcached/memcached-1.5.16.ebuild b/net-misc/memcached/memcached-1.5.16.ebuild new file mode 100644 index 000000000000..8d046a22030e --- /dev/null +++ b/net-misc/memcached/memcached-1.5.16.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2019 Gentoo Authors +# 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 +} -- cgit v1.2.3-65-gdbad