diff options
| author |   Ultrabug <ultrabug@gentoo.org> | 2016-01-27 13:49:22 +0100 |
|---|---|---|
| committer | Ultrabug <ultrabug@gentoo.org> | 2016-01-27 13:49:44 +0100 |
| commit | 4bd40f6bfcb7513b1c58b05c5b764bf0e4b1e5bc (patch) | |
| tree | 4b6bea9b73344ee67d47504e6a70b93eba58bae2 | |
| parent | net-misc/curl: version bump 7.47.0 (diff) | |
| download | gentoo-4bd40f6bfcb7513b1c58b05c5b764bf0e4b1e5bc.tar.gz gentoo-4bd40f6bfcb7513b1c58b05c5b764bf0e4b1e5bc.tar.bz2 gentoo-4bd40f6bfcb7513b1c58b05c5b764bf0e4b1e5bc.zip | |
sys-cluster/ipvsadm: fix libnl3 detection #497890, version bump fix #565464
Package-Manager: portage-2.2.27
| -rw-r--r-- | sys-cluster/ipvsadm/Manifest | 1 | ||||
| -rw-r--r-- | sys-cluster/ipvsadm/ipvsadm-1.27-r1.ebuild | 17 | ||||
| -rw-r--r-- | sys-cluster/ipvsadm/ipvsadm-1.28.ebuild (renamed from sys-cluster/ipvsadm/ipvsadm-1.27.ebuild) | 21 |
3 files changed, 26 insertions, 13 deletions
diff --git a/sys-cluster/ipvsadm/Manifest b/sys-cluster/ipvsadm/Manifest index 33bece925851..b32d2764f69e 100644 --- a/sys-cluster/ipvsadm/Manifest +++ b/sys-cluster/ipvsadm/Manifest @@ -2,3 +2,4 @@ DIST ipvsadm-1.21-11.tar.gz 34030 SHA256 7b85020f84d4648166bce480d747d82ac5c9113 DIST ipvsadm-1.24.tar.gz 32007 SHA256 773cbada48061e3afafaeaa2800d5382b8ff638b2c929293c14a793112a0642a SHA512 f472e55d78901de3b8f07dec0ff6e32b5aa301dc0dc62f34fe168511c8e2af26704fb66936540eb1173d7a0280428a2e6e48f9efadd3e33050dd881e666e1041 WHIRLPOOL 846d06b4977d93562618a9215b470272915458e8712346f37dc02c6afb2e0365ec15f589caedc7654a2a33542610a8f90fc3acc6c52a12a9fdf8098789fe682b DIST ipvsadm-1.26.tar.gz 41700 SHA256 6d6c46fecb1c532a892616b4445c73b71730e8790d5630f60269fd9cbee0eb2d SHA512 873e23a6bdaabc153b00f1ede3853c947e8c8cfb4e18364d55197c74f26cc883ca469e074a90f377fbfd5e73e0cd6c1fe414c9f7a5c28b0d4431af58056eced4 WHIRLPOOL 5f62ad434c7da3359adbfae1cdde230769f19f0c82a190d7ef6fc8ba340d5e761875a778ad9a1dd7162d385b8ebda89c589b7179d53d495c79e82056e46bce9a DIST ipvsadm-1.27.tar.xz 38196 SHA256 d360fb4dcf591e0a8a918831e2c02b1dc03e3c17ee1e60d0d70de9455238b3f8 SHA512 cf982b7981674c91d1b7516de7b55cf378b306ce4a53e13976b8eeb8610015c4fa4aa9d251bc4d329db8e05c1862863160af2d3c63b76263f290087cffdf1b80 WHIRLPOOL fbb69043813ccba929bb044c9d7854b67e8d656ae08209f17e21d3d237ea4690cd8ea7a1e2806ce6b07f847eb9796e93649c7f5231d2356e8519696b5a504b73 +DIST ipvsadm-1.28.tar.xz 38600 SHA256 90e0e49cad5acb9db1c04ed4cdadf7933152a472c2f694039b9d7a291c37f3ab SHA512 a1e10ce30751d9439f832e221e5c41b338f87dcc94a0b21329d908a9164f8882049af9d9d918b764b36c30e353d5b8db49d7088e60c24e4748713c06cccf7035 WHIRLPOOL 76e972792b779526b666469e92a4e181f9b63765bea2a3908b68ea0cac9bd45533c5eeb04f618993d45dae12b8268271c18df3fae82a3eb62d14fa3db4a4f74b diff --git a/sys-cluster/ipvsadm/ipvsadm-1.27-r1.ebuild b/sys-cluster/ipvsadm/ipvsadm-1.27-r1.ebuild index 3ff6de56459a..ac46190fbbaa 100644 --- a/sys-cluster/ipvsadm/ipvsadm-1.27-r1.ebuild +++ b/sys-cluster/ipvsadm/ipvsadm-1.27-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=4 +EAPI=6 inherit eutils linux-info toolchain-funcs @@ -15,8 +15,8 @@ SLOT="0" KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" IUSE="static-libs" -RDEPEND=">=sys-libs/ncurses-5.2 - dev-libs/libnl +RDEPEND=">=sys-libs/ncurses-5.2:* + dev-libs/libnl:= >=dev-libs/popt-1.16" DEPEND="${RDEPEND} virtual/pkgconfig" @@ -29,6 +29,7 @@ pkg_pretend() { } src_prepare() { + default epatch "${FILESDIR}"/${PN}-1.27-buildsystem.patch # Merged upstream in 1.27 #epatch "${FILESDIR}"/${PN}-1.26-stack_smashing.patch # bug 371903 @@ -37,8 +38,14 @@ src_prepare() { } src_compile() { + local libnl_include + if has_version ">=dev-libs/libnl-3.0"; then + libnl_include=$(pkg-config --cflags libnl-3.0) + else + libnl_include="" + fi emake -e \ - INCLUDE="-I.. -I." \ + INCLUDE="-I.. -I. ${libnl_include}" \ CC="$(tc-getCC)" \ HAVE_NL=1 \ STATIC=${STATIC} \ diff --git a/sys-cluster/ipvsadm/ipvsadm-1.27.ebuild b/sys-cluster/ipvsadm/ipvsadm-1.28.ebuild index 5718b3b52f3f..7f7574660287 100644 --- a/sys-cluster/ipvsadm/ipvsadm-1.27.ebuild +++ b/sys-cluster/ipvsadm/ipvsadm-1.28.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=4 +EAPI=6 inherit eutils linux-info toolchain-funcs @@ -15,8 +15,8 @@ SLOT="0" KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" IUSE="static-libs" -RDEPEND=">=sys-libs/ncurses-5.2 - dev-libs/libnl +RDEPEND=">=sys-libs/ncurses-5.2:* + dev-libs/libnl:= >=dev-libs/popt-1.16" DEPEND="${RDEPEND} virtual/pkgconfig" @@ -29,16 +29,21 @@ pkg_pretend() { } src_prepare() { + default epatch "${FILESDIR}"/${PN}-1.27-buildsystem.patch - # Merged upstream in 1.27 - #epatch "${FILESDIR}"/${PN}-1.26-stack_smashing.patch # bug 371903 - + epatch "${FILESDIR}"/${PN}-1.27-fix-daemon-state.patch use static-libs && export STATIC=1 } src_compile() { + local libnl_include + if has_version ">=dev-libs/libnl-3.0"; then + libnl_include=$(pkg-config --cflags libnl-3.0) + else + libnl_include="" + fi emake -e \ - INCLUDE="-I.. -I." \ + INCLUDE="-I.. -I. ${libnl_include}" \ CC="$(tc-getCC)" \ HAVE_NL=1 \ STATIC=${STATIC} \ |