From e2d84e38284aeb9d522a7e935554340ddf0e4a6f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Nov 2017 17:13:45 +0000 Subject: gentoo resync : 15.11.2017 --- net-misc/memcached/Manifest | 2 +- net-misc/memcached/memcached-1.5.3-r1.ebuild | 95 ++++++++++++++++++++++++++++ net-misc/memcached/memcached-1.5.3.ebuild | 94 --------------------------- 3 files changed, 96 insertions(+), 95 deletions(-) create mode 100644 net-misc/memcached/memcached-1.5.3-r1.ebuild delete mode 100644 net-misc/memcached/memcached-1.5.3.ebuild (limited to 'net-misc/memcached') diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest index 772fd06a2624..791092e8b164 100644 --- a/net-misc/memcached/Manifest +++ b/net-misc/memcached/Manifest @@ -14,7 +14,7 @@ EBUILD memcached-1.4.33.ebuild 2624 SHA256 5e8fa07f214704a05ef63385ae8a2b78920ca EBUILD memcached-1.4.39.ebuild 2887 SHA256 0557ddb98d86c07429a5a5b01af5eba2ea3330b5fe779917ee641157235cdaf2 SHA512 0726d795ffbaa17ed04b3b307146742bd647ab6c2084a1e0f22b333b293ac6e15a7488d69fd166f2480c49c87b236f14e7d7d7642c40fe853097347e9199e706 WHIRLPOOL 2062c9871526025fdb86633dc211f25901aefa72f9d806e58ce667274e13464bf9145cf7c172a4a4f112241363bc824586be16419d946f51411869081c5908c9 EBUILD memcached-1.5.1.ebuild 2903 SHA256 90149ac9457d7b15126a8ddd6295977c0f68ac387094fe06eaec9d0e520d1b91 SHA512 3d20f3405b30234652ea9fd75f6ae4842aac4153f4062703b6090cfb2f4691781e5a2e474cfd9b971a7ea2b2cef12cb1d12b3c9fcf18d2b5e7ba2955112085c6 WHIRLPOOL 2f346ce0fbbc02230fc854eee1d92cfc53cded2d5c3ce3aa14aeaff7c528b96583b7a3c7c69e84f7646a4db68d1c8ef21604738d2f4fa765eb2e7e213593d5d9 EBUILD memcached-1.5.2.ebuild 2898 SHA256 84a6ecdb19a1aa2718a67ea4c9a2ffe99f112e4fec55fb555fe5e30e07879565 SHA512 6f77d52dd72cc12be893c36df6b1953bef5980e97d2fca15288b9fc5c826c1178ed6d780dfc7bca95606733c63320830a819f05b61f6d034131a42bb4ca98595 WHIRLPOOL beada655542fdcc41e7da95050315dfe3cebe4d19b74263ae5fef0ce89862fb4bc7b90915b4b87f283a63344406fb10c5e603604d6e9af50866df74837d7fd38 -EBUILD memcached-1.5.3.ebuild 2903 SHA256 90149ac9457d7b15126a8ddd6295977c0f68ac387094fe06eaec9d0e520d1b91 SHA512 3d20f3405b30234652ea9fd75f6ae4842aac4153f4062703b6090cfb2f4691781e5a2e474cfd9b971a7ea2b2cef12cb1d12b3c9fcf18d2b5e7ba2955112085c6 WHIRLPOOL 2f346ce0fbbc02230fc854eee1d92cfc53cded2d5c3ce3aa14aeaff7c528b96583b7a3c7c69e84f7646a4db68d1c8ef21604738d2f4fa765eb2e7e213593d5d9 +EBUILD memcached-1.5.3-r1.ebuild 2947 SHA256 b15f3f1ccd16070f1b052216cf30d6eb73288eb73a180a5b2f30e60062181dd7 SHA512 c34042999c6efe39d94a11175f4050b0ff83aa0b0a8d67f3cc50f0b21fd0590c0120134d22d87e0b28e858ebf4962d88c9c02c919ac4ba3130db25cda2a6a929 WHIRLPOOL b69d3363b134176fdb2281658efcdcf7552aa1c98aed8e8d5e765de992be0c797a75cca38a51b59f6aae7e269e3fb49048aaea9be3b0642800c2a12cff78e05b MISC ChangeLog 9513 SHA256 2f72df675f6c2041cda3cdb32f7a4f1314fda9417e8873fc24ab60950767e527 SHA512 9962bb124817964f19dceee258da39a00d1f95ab6929efc27d012920f1e2bdc290e5619603cceeb53d080ecf79c22ab9bc3628c923895002220e17cec357e22b WHIRLPOOL 828f0916052f66539e8b37f6c46e14064a2bab23d5066205dfed3049f695ac712d1029d401c85b68954a24f3a971369d05751d17c50564f97c71d7153966f692 MISC ChangeLog-2015 29003 SHA256 a8e02533be3dc8071b69388e8c927edc33d54ce26b596a775f99a30698847eb4 SHA512 55fa88fdce9ff266070e8b5eab890a2418165bc6ab5c093f071acd0c3d218059d47a255281fc789c98869ac67b81aae4ae81111131d2dc5feb0457b54b6301a6 WHIRLPOOL e5fda7152db66bb75db44574d2c68f1272a4323498d25755b5a8f4b01cc684e6fd362c68c143df09b29dcbbdfb3f6fcf4b4291ac252fe28da60ebc705f194e82 MISC metadata.xml 1134 SHA256 e189a8b1f9310663b1921d6279b993ea689153406a9058fbc977927c65e05068 SHA512 c3ce23016f9ea9067f6628f246866e3fcee6624f1a21360e448c7eebc3babd8fa3717966e58eeb0b6fd9885730609fa732a3e10b0a4dfaa57b0f0acc85c20bb4 WHIRLPOOL 9e1b630893ccee95aedb117e40d03de15605fb5085eea1bf687ca445b9972e8fc900dbed7bcf0d45bb351e3801e1849210d6517e8891bae7bf2fd004a207dc53 diff --git a/net-misc/memcached/memcached-1.5.3-r1.ebuild b/net-misc/memcached/memcached-1.5.3-r1.ebuild new file mode 100644 index 000000000000..ec97582ffbf3 --- /dev/null +++ b/net-misc/memcached/memcached-1.5.3-r1.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2017 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 ~sparc-fbsd ~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.3.ebuild b/net-misc/memcached/memcached-1.5.3.ebuild deleted file mode 100644 index 9e386070af56..000000000000 --- a/net-misc/memcached/memcached-1.5.3.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2017 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 ~sparc-fbsd ~x86-fbsd ~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" - 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