From 957235cf19a691360c720f7913672adda4258ed0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 7 Oct 2018 11:03:14 +0100 Subject: gentoo resync : 07.10.2018 --- www-servers/varnish/Manifest | 8 +-- www-servers/varnish/metadata.xml | 3 + www-servers/varnish/varnish-6.0.0.ebuild | 102 ------------------------------- www-servers/varnish/varnish-6.0.1.ebuild | 4 +- www-servers/varnish/varnish-6.1.0.ebuild | 102 +++++++++++++++++++++++++++++++ 5 files changed, 111 insertions(+), 108 deletions(-) delete mode 100644 www-servers/varnish/varnish-6.0.0.ebuild create mode 100644 www-servers/varnish/varnish-6.1.0.ebuild (limited to 'www-servers/varnish') diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest index d6b685949055..c62e696ba6e8 100644 --- a/www-servers/varnish/Manifest +++ b/www-servers/varnish/Manifest @@ -12,12 +12,12 @@ DIST varnish-4.0.5.tgz 1947888 BLAKE2B d921dc6f2abae7b0bd1816470fd41f8555c02a026 DIST varnish-4.1.8.tgz 2254772 BLAKE2B acadf4079d58bb8f0dc5e24713aba7f2786ca6f06a683465b1564bacd986e209d858f9a3100cfb7586fa5d17f7e5f4d8425ece10c609bb3412d3adafa6ad0d05 SHA512 c642359118d87e8713d2ccf817da317a454a0f9ae6f7a07da1d10b5076aa7e5d7dcc203ef71ae19d56b7592db0c66b4ca96cb43d5fa0e6aa588d1dc8e03e026e DIST varnish-5.1.3.tgz 2643223 BLAKE2B 85bae87785da1284d7d916b8948a0984eea9cf07e96012255435ba04c28e8078e5dad893946bbc12da6cbe9326699458f0e3af6be55cb5e7bba4e622724ddac2 SHA512 a10c317dc38ddff139ca8153f6388955df449c3abeb4d4f069b632ba2b32064a2827ab05fa8515994b251a68507fc3a7bf4e08eacc991fc03283ab234b9efd0a DIST varnish-5.2.1.tgz 2827676 BLAKE2B 6f50a55a9b16d137eaec59aea98a0179b808bb67fc3de26c9b0924b9937a3688b7f9db45d2f0a71be2b7c6f77bfd47cd22e7b898348b5236114572b5bb33ff22 SHA512 2e979983c7f2325e289768752cc474dc3032c3420de65ccfd5871098c076aecf18e962b04308ecb1860f542fd6f6418dc79220fdd6cf4a75f7476a733faa589c -DIST varnish-6.0.0.tgz 3033621 BLAKE2B 8fb3c8bf64527476251500ebf809dcff927c8097811e500172d489dd02828981e92034d8c95b8b6d183381d8f3a0fdba633451e8ab17d40d56f7727376378d68 SHA512 39bae462fe40bda9b7c93114ab8256c838a7d67f1a9f7397c37ad090163a33232676120eb7609d0512684a563d8e02c1c2ff5e1b9da0ddedef2250db51c3cc79 DIST varnish-6.0.1.tgz 3065822 BLAKE2B b99d0d50444872353367007f2ee97c5d5f0e60031ece7b07f8b2c3a7a84b31be88fe2b850304b1f2e47a35f35c2c41f43888bee1d1874721a72ad078acfddfa1 SHA512 057cb69ae6a4d980401effb7561d3a9b537216d8626fdf4e7bcc75971958517f51b6bd7f7af86c11bc92a2e77876831c577736dfcd11447ad0128f222c5ad138 +DIST varnish-6.1.0.tgz 3137149 BLAKE2B 8db1fb3460a25763bd28c92fa8b9181711b497a7d1cadfbbf19794c9df3e64e60aefac87032892a02eed3ff380686f047fb67d8c7f70b602e65c63b69224e674 SHA512 48584fc2d938cc0759fa5d795992a0c6d5d9fb49db5f3063dca8d3d88c6282dac971ed268edc07bec95b4f25e26562089b1b84abdd26099e12be9ea66557716d EBUILD varnish-4.0.5.ebuild 2050 BLAKE2B 22e332f95d1138577e37deebee8e0e77f11bb1ead55f672cd67db4765b3d3e8ae5854b940d59a652ec6619c56a5e3a379f425c39780685c0e8fa7a54869a2141 SHA512 b1520598b99b94f29afd63305470e06fc9a8ef4f6d816cc56390b73fb980cbffcd62488e644e4eaa56991445f153ff39661a04726babbb89e574bca3f891a796 EBUILD varnish-4.1.8.ebuild 2208 BLAKE2B 6a0509906c324ead94dc1706dfcb22156d04c2390615acd541277d90c25fe2e0bf4e96d1210d03f8f886711b67b2deb6fa635d14ef4fe249ab7b71bcf350fdf3 SHA512 166fe6d8e1d89fbf4064f2d6995b00156bbca7920b1131a6fbbde45605d26fdfaf54dadff626ed72546fdfd66ccdec20efb31a526c2ff3336261da2f31d6b84e EBUILD varnish-5.1.3.ebuild 2213 BLAKE2B 33a0b63f322d721c352748ac54b9e78c3df4b1916950bf698960bab57cfabfd39efa1c7a5ca4ea945f77fbebd943cfdf2579eb92e21a98bf24690a8a537b14b6 SHA512 290570d1a668f5ed0a4acda504313d5264c9d0dc7dc2d49a237b4bfa16c5c5b31749c48fa20e79fc06cb54a5ad100231da6fef00cdb75362a926f123ff17320f EBUILD varnish-5.2.1.ebuild 2267 BLAKE2B 6b6886e00415115a3649eee695bbbd4bbc2a7ab8590edf9cd7951a50cdf6f6e32bd3384514bd3330086dfab18dfc5a39c79db36f40cec76a9c66cdbc4e26ce3b SHA512 d3dec4d67b7e22981ecb643cefdb8729e51cb7545178eee996d96e15875e6373cf9b2956e29b3acc888b5ec6db430164096f0ce9e2bb24b295c01435870d27a3 -EBUILD varnish-6.0.0.ebuild 2242 BLAKE2B 985fa674cd406733137c8e32772044818422431639de32162b8fd1baab8cee6449d601d7ee6ff24428762755407e2275e7a95cb9315e3d2f2ffe18b05dcaa472 SHA512 ff7a0fa8e3beb7731df50d0ff910b224291cd2ff1bdea3623a3a1ccc436b2611d3487681c7273a717db1b387f96699a79ad2e8c56bf5de371ad4dc36c973d582 -EBUILD varnish-6.0.1.ebuild 2242 BLAKE2B 985fa674cd406733137c8e32772044818422431639de32162b8fd1baab8cee6449d601d7ee6ff24428762755407e2275e7a95cb9315e3d2f2ffe18b05dcaa472 SHA512 ff7a0fa8e3beb7731df50d0ff910b224291cd2ff1bdea3623a3a1ccc436b2611d3487681c7273a717db1b387f96699a79ad2e8c56bf5de371ad4dc36c973d582 -MISC metadata.xml 1148 BLAKE2B b9f3dcc97112ee180ce62b82d50d3c9ba038b2015f1707061ee80a2771ee98be0855f84d58cb87f7a7483762a0afe21638f9597912021c3793e64e7539932787 SHA512 88f914d30836f5337e6aa56bed18a4ff37463607e7475c0d78b7d14033d5e9ae9de5076186fb5f4d256cf6b41c69c1712dd3c961f38b2f1349e4b2077731493c +EBUILD varnish-6.0.1.ebuild 2241 BLAKE2B ddfcb5a33309872865b766f3259d00a16368f895e786ece160217cfa134643a8f776f5c87733461a8a57d3f6d715b0d618412b6fbbfc3c14c81dc95c853a45d1 SHA512 0b7c5e688d3d0cd2003842b2085c8894b52acdb0f1ecb72d77ef35ecc349ac5e00adc4c34ea488d60c01e648d7eca6582b5dbfd5939c1d99819f11fdd72a41b2 +EBUILD varnish-6.1.0.ebuild 2241 BLAKE2B 8ea2b313770d6518b3ca7076ee474c6b9ce9a3401fae3f3ee5b9582a0c676f8ebdf9a1a2b2219b6b2bbfa580f97277777bcc608b9a97a2f82b46e07dba8cecff SHA512 7c7f57a72cd87495608b8a22ac1e56d8915241d7229ab82e622e808e4f3d0a3fa36a187671618040a1a084402234105a54eb1f8e1f6e5c2fcddf33e8b48db759 +MISC metadata.xml 1238 BLAKE2B cef661c859116827e87bf628c89350a59bf0f3edca8ab9570089198c40867cfcd04d368db42ab5f11c0725813f2c866fd44ca4d988e0c26c6f7e632475156b44 SHA512 472dab09769715fecd8ead6d95ee11b4cd83a6ab5b22901094635ac62fb94fa9cae9beb3c08c4918958ccda1d32239d8b196d03908a78f6791aeaee9a779a865 diff --git a/www-servers/varnish/metadata.xml b/www-servers/varnish/metadata.xml index 271e7eab665a..5046b2337ea0 100644 --- a/www-servers/varnish/metadata.xml +++ b/www-servers/varnish/metadata.xml @@ -22,4 +22,7 @@ managment and good documentation is also a main goal of the project since the lack of either one will render Varnish useless. + + Reflect ABI compatibility for libvarnishapi.so. + diff --git a/www-servers/varnish/varnish-6.0.0.ebuild b/www-servers/varnish/varnish-6.0.0.ebuild deleted file mode 100644 index fd1d1a8b7caf..000000000000 --- a/www-servers/varnish/varnish-6.0.0.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy ) - -inherit user autotools systemd python-r1 - -DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator" -HOMEPAGE="https://varnish-cache.org/" -SRC_URI="http://varnish-cache.org/_downloads/${P}.tgz" - -LICENSE="BSD-2 GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86" -IUSE="jemalloc jit static-libs" - -CDEPEND=" - sys-libs/readline:0= - dev-libs/libpcre[jit?] - jemalloc? ( dev-libs/jemalloc ) - sys-libs/ncurses:0=" - -#varnish compiles stuff at run time -RDEPEND=" - ${PYTHON_DEPS} - ${CDEPEND} - sys-devel/gcc" - -DEPEND=" - ${CDEPEND} - dev-python/docutils - virtual/pkgconfig" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RESTRICT="test" #315725 - -pkg_setup() { - ebegin "Creating varnish user and group" - enewgroup varnish - enewuser varnish -1 -1 /var/lib/varnish varnish - eend $? -} - -src_prepare() { - # Remove -Werror bug #528354 - sed -i -e 's/-Werror\([^=]\)/\1/g' configure.ac - - # Upstream doesn't put varnish.m4 in the m4/ directory - # We link because the Makefiles look for the file in - # the original location - ln -sf ../varnish.m4 m4/varnish.m4 - - eapply_user - - eautoreconf -} - -src_configure() { - econf \ - $(use_enable static-libs static) \ - $(use_enable jit pcre-jit ) \ - $(use_with jemalloc) -} - -src_install() { - emake DESTDIR="${D}" install - - python_replicate_script "${D}/usr/share/varnish/vmodtool.py" - - newinitd "${FILESDIR}"/varnishlog.initd varnishlog - newconfd "${FILESDIR}"/varnishlog.confd varnishlog - - newinitd "${FILESDIR}"/varnishncsa.initd varnishncsa - newconfd "${FILESDIR}"/varnishncsa.confd varnishncsa - - newinitd "${FILESDIR}"/varnishd.initd-r4 varnishd - newconfd "${FILESDIR}"/varnishd.confd-r4 varnishd - - insinto /etc/logrotate.d/ - newins "${FILESDIR}/varnishd.logrotate-r2" varnishd - - diropts -m750 - - keepdir /var/lib/varnish - keepdir /var/log/varnish - - systemd_dounit "${FILESDIR}/${PN}d.service" - - insinto /etc/varnish/ - doins lib/libvmod_std/vmod.vcc - doins etc/example.vcl - - dodoc README.rst - dodoc doc/changes.rst - - fowners root:varnish /etc/varnish/ - fowners varnish:varnish /var/lib/varnish/ - fperms 0750 /var/lib/varnish/ /etc/varnish/ -} diff --git a/www-servers/varnish/varnish-6.0.1.ebuild b/www-servers/varnish/varnish-6.0.1.ebuild index fd1d1a8b7caf..c5595875a13e 100644 --- a/www-servers/varnish/varnish-6.0.1.ebuild +++ b/www-servers/varnish/varnish-6.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -12,7 +12,7 @@ HOMEPAGE="https://varnish-cache.org/" SRC_URI="http://varnish-cache.org/_downloads/${P}.tgz" LICENSE="BSD-2 GPL-2" -SLOT="0" +SLOT="0/1" KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86" IUSE="jemalloc jit static-libs" diff --git a/www-servers/varnish/varnish-6.1.0.ebuild b/www-servers/varnish/varnish-6.1.0.ebuild new file mode 100644 index 000000000000..87fca369e166 --- /dev/null +++ b/www-servers/varnish/varnish-6.1.0.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy ) + +inherit user autotools systemd python-r1 + +DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator" +HOMEPAGE="https://varnish-cache.org/" +SRC_URI="http://varnish-cache.org/_downloads/${P}.tgz" + +LICENSE="BSD-2 GPL-2" +SLOT="0/2" +KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86" +IUSE="jemalloc jit static-libs" + +CDEPEND=" + sys-libs/readline:0= + dev-libs/libpcre[jit?] + jemalloc? ( dev-libs/jemalloc ) + sys-libs/ncurses:0=" + +#varnish compiles stuff at run time +RDEPEND=" + ${PYTHON_DEPS} + ${CDEPEND} + sys-devel/gcc" + +DEPEND=" + ${CDEPEND} + dev-python/docutils + virtual/pkgconfig" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RESTRICT="test" #315725 + +pkg_setup() { + ebegin "Creating varnish user and group" + enewgroup varnish + enewuser varnish -1 -1 /var/lib/varnish varnish + eend $? +} + +src_prepare() { + # Remove -Werror bug #528354 + sed -i -e 's/-Werror\([^=]\)/\1/g' configure.ac + + # Upstream doesn't put varnish.m4 in the m4/ directory + # We link because the Makefiles look for the file in + # the original location + ln -sf ../varnish.m4 m4/varnish.m4 + + eapply_user + + eautoreconf +} + +src_configure() { + econf \ + $(use_enable static-libs static) \ + $(use_enable jit pcre-jit ) \ + $(use_with jemalloc) +} + +src_install() { + emake DESTDIR="${D}" install + + python_replicate_script "${D}/usr/share/varnish/vmodtool.py" + + newinitd "${FILESDIR}"/varnishlog.initd varnishlog + newconfd "${FILESDIR}"/varnishlog.confd varnishlog + + newinitd "${FILESDIR}"/varnishncsa.initd varnishncsa + newconfd "${FILESDIR}"/varnishncsa.confd varnishncsa + + newinitd "${FILESDIR}"/varnishd.initd-r4 varnishd + newconfd "${FILESDIR}"/varnishd.confd-r4 varnishd + + insinto /etc/logrotate.d/ + newins "${FILESDIR}/varnishd.logrotate-r2" varnishd + + diropts -m750 + + keepdir /var/lib/varnish + keepdir /var/log/varnish + + systemd_dounit "${FILESDIR}/${PN}d.service" + + insinto /etc/varnish/ + doins lib/libvmod_std/vmod.vcc + doins etc/example.vcl + + dodoc README.rst + dodoc doc/changes.rst + + fowners root:varnish /etc/varnish/ + fowners varnish:varnish /var/lib/varnish/ + fperms 0750 /var/lib/varnish/ /etc/varnish/ +} -- cgit v1.2.3