| 1 |
mgorny 14/05/25 11:29:04 |
| 2 |
|
| 3 |
Modified: libnl-3.2.9999.ebuild ChangeLog |
| 4 |
Added: libnl-3.2.24-r1.ebuild |
| 5 |
Log: |
| 6 |
Enable multilib support. |
| 7 |
|
| 8 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.6 dev-libs/libnl/libnl-3.2.9999.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libnl/libnl-3.2.9999.ebuild?rev=1.6&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libnl/libnl-3.2.9999.ebuild?rev=1.6&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libnl/libnl-3.2.9999.ebuild?r1=1.5&r2=1.6 |
| 16 |
|
| 17 |
Index: libnl-3.2.9999.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-3.2.9999.ebuild,v |
| 20 |
retrieving revision 1.5 |
| 21 |
retrieving revision 1.6 |
| 22 |
diff -u -r1.5 -r1.6 |
| 23 |
--- libnl-3.2.9999.ebuild 3 May 2014 21:00:23 -0000 1.5 |
| 24 |
+++ libnl-3.2.9999.ebuild 25 May 2014 11:29:04 -0000 1.6 |
| 25 |
@@ -1,11 +1,11 @@ |
| 26 |
# Copyright 1999-2014 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-3.2.9999.ebuild,v 1.5 2014/05/03 21:00:23 floppym Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-3.2.9999.ebuild,v 1.6 2014/05/25 11:29:04 mgorny Exp $ |
| 30 |
|
| 31 |
EAPI=5 |
| 32 |
PYTHON_COMPAT=( python2_{6,7} python3_{2,3,4} ) |
| 33 |
DISTUTILS_OPTIONAL=1 |
| 34 |
-inherit autotools distutils-r1 eutils git-r3 libtool multilib |
| 35 |
+inherit autotools distutils-r1 eutils git-r3 libtool multilib multilib-minimal |
| 36 |
|
| 37 |
DESCRIPTION="A collection of libraries providing APIs to netlink protocol based Linux kernel interfaces" |
| 38 |
HOMEPAGE="http://www.infradead.org/~tgr/libnl/" |
| 39 |
@@ -17,7 +17,11 @@ |
| 40 |
KEYWORDS="" |
| 41 |
IUSE="static-libs python utils" |
| 42 |
|
| 43 |
-RDEPEND="python? ( ${PYTHON_DEPS} )" |
| 44 |
+RDEPEND="python? ( ${PYTHON_DEPS} ) |
| 45 |
+ abi_x86_32? ( |
| 46 |
+ !<=app-emulation/emul-linux-x86-baselibs-20140508-r5 |
| 47 |
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
| 48 |
+ )" |
| 49 |
DEPEND="${RDEPEND} |
| 50 |
python? ( dev-lang/swig ) |
| 51 |
sys-devel/flex |
| 52 |
@@ -28,39 +32,67 @@ |
| 53 |
|
| 54 |
DOCS=( ChangeLog ) |
| 55 |
|
| 56 |
+MULTILIB_WRAPPED_HEADERS=( |
| 57 |
+ # we do not install CLI stuff for non-native |
| 58 |
+ /usr/include/libnl3/netlink/cli/addr.h |
| 59 |
+ /usr/include/libnl3/netlink/cli/class.h |
| 60 |
+ /usr/include/libnl3/netlink/cli/cls.h |
| 61 |
+ /usr/include/libnl3/netlink/cli/ct.h |
| 62 |
+ /usr/include/libnl3/netlink/cli/exp.h |
| 63 |
+ /usr/include/libnl3/netlink/cli/link.h |
| 64 |
+ /usr/include/libnl3/netlink/cli/neigh.h |
| 65 |
+ /usr/include/libnl3/netlink/cli/qdisc.h |
| 66 |
+ /usr/include/libnl3/netlink/cli/route.h |
| 67 |
+ /usr/include/libnl3/netlink/cli/rule.h |
| 68 |
+ /usr/include/libnl3/netlink/cli/tc.h |
| 69 |
+ /usr/include/libnl3/netlink/cli/utils.h |
| 70 |
+) |
| 71 |
+ |
| 72 |
src_prepare() { |
| 73 |
epatch "${FILESDIR}"/${PN}-1.1-vlan-header.patch |
| 74 |
epatch "${FILESDIR}"/${PN}-3.2.20-rtnl_tc_get_ops.patch |
| 75 |
epatch "${FILESDIR}"/${PN}-3.2.20-cache-api.patch |
| 76 |
|
| 77 |
eautoreconf |
| 78 |
+ |
| 79 |
+ if use python; then |
| 80 |
+ cd "${S}"/python || die |
| 81 |
+ distutils-r1_src_prepare |
| 82 |
+ fi |
| 83 |
+ |
| 84 |
+ # out-of-source build broken |
| 85 |
+ # https://github.com/thom311/libnl/pull/58 |
| 86 |
+ multilib_copy_sources |
| 87 |
} |
| 88 |
|
| 89 |
-src_configure() { |
| 90 |
+multilib_src_configure() { |
| 91 |
econf \ |
| 92 |
--disable-silent-rules \ |
| 93 |
$(use_enable static-libs static) \ |
| 94 |
- $(use_enable utils cli) |
| 95 |
+ $(multilib_native_use_enable utils cli) |
| 96 |
} |
| 97 |
|
| 98 |
-src_compile() { |
| 99 |
+multilib_src_compile() { |
| 100 |
default |
| 101 |
|
| 102 |
- if use python; then |
| 103 |
- cd "${S}"/python || die |
| 104 |
+ if multilib_is_native_abi && use python; then |
| 105 |
+ cd python || die |
| 106 |
distutils-r1_src_compile |
| 107 |
fi |
| 108 |
} |
| 109 |
|
| 110 |
-src_install() { |
| 111 |
- default |
| 112 |
+multilib_src_install() { |
| 113 |
+ emake DESTDIR="${D}" install |
| 114 |
|
| 115 |
- if use python; then |
| 116 |
+ if multilib_is_native_abi && use python; then |
| 117 |
# Unset DOCS= since distutils-r1.eclass interferes |
| 118 |
- DOCS='' |
| 119 |
- cd "${S}"/python || die |
| 120 |
+ local DOCS=() |
| 121 |
+ cd python || die |
| 122 |
distutils-r1_src_install |
| 123 |
fi |
| 124 |
+} |
| 125 |
|
| 126 |
- prune_libtool_files $(usex static-libs --modules --all) |
| 127 |
+multilib_src_install_all() { |
| 128 |
+ einstalldocs |
| 129 |
+ prune_libtool_files --modules |
| 130 |
} |
| 131 |
|
| 132 |
|
| 133 |
|
| 134 |
1.209 dev-libs/libnl/ChangeLog |
| 135 |
|
| 136 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libnl/ChangeLog?rev=1.209&view=markup |
| 137 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libnl/ChangeLog?rev=1.209&content-type=text/plain |
| 138 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libnl/ChangeLog?r1=1.208&r2=1.209 |
| 139 |
|
| 140 |
Index: ChangeLog |
| 141 |
=================================================================== |
| 142 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libnl/ChangeLog,v |
| 143 |
retrieving revision 1.208 |
| 144 |
retrieving revision 1.209 |
| 145 |
diff -u -r1.208 -r1.209 |
| 146 |
--- ChangeLog 3 May 2014 21:00:23 -0000 1.208 |
| 147 |
+++ ChangeLog 25 May 2014 11:29:04 -0000 1.209 |
| 148 |
@@ -1,6 +1,12 @@ |
| 149 |
# ChangeLog for dev-libs/libnl |
| 150 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 151 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/ChangeLog,v 1.208 2014/05/03 21:00:23 floppym Exp $ |
| 152 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/ChangeLog,v 1.209 2014/05/25 11:29:04 mgorny Exp $ |
| 153 |
+ |
| 154 |
+*libnl-3.2.24-r1 (25 May 2014) |
| 155 |
+ |
| 156 |
+ 25 May 2014; Michał Górny <mgorny@g.o> +libnl-3.2.24-r1.ebuild, |
| 157 |
+ libnl-3.2.9999.ebuild: |
| 158 |
+ Enable multilib support. |
| 159 |
|
| 160 |
03 May 2014; Mike Gilbert <floppym@g.o> libnl-3.2.24.ebuild, |
| 161 |
libnl-3.2.9999.ebuild: |
| 162 |
|
| 163 |
|
| 164 |
|
| 165 |
1.1 dev-libs/libnl/libnl-3.2.24-r1.ebuild |
| 166 |
|
| 167 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libnl/libnl-3.2.24-r1.ebuild?rev=1.1&view=markup |
| 168 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libnl/libnl-3.2.24-r1.ebuild?rev=1.1&content-type=text/plain |
| 169 |
|
| 170 |
Index: libnl-3.2.24-r1.ebuild |
| 171 |
=================================================================== |
| 172 |
# Copyright 1999-2014 Gentoo Foundation |
| 173 |
# Distributed under the terms of the GNU General Public License v2 |
| 174 |
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-3.2.24-r1.ebuild,v 1.1 2014/05/25 11:29:04 mgorny Exp $ |
| 175 |
|
| 176 |
EAPI=5 |
| 177 |
PYTHON_COMPAT=( python2_{6,7} python3_{2,3,4} ) |
| 178 |
DISTUTILS_OPTIONAL=1 |
| 179 |
inherit distutils-r1 eutils libtool multilib multilib-minimal |
| 180 |
|
| 181 |
NL_P=${P/_/-} |
| 182 |
|
| 183 |
DESCRIPTION="A collection of libraries providing APIs to netlink protocol based Linux kernel interfaces" |
| 184 |
HOMEPAGE="http://www.infradead.org/~tgr/libnl/" |
| 185 |
SRC_URI=" |
| 186 |
http://www.infradead.org/~tgr/${PN}/files/${NL_P}.tar.gz |
| 187 |
" |
| 188 |
LICENSE="LGPL-2.1 utils? ( GPL-2 )" |
| 189 |
SLOT="3" |
| 190 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux" |
| 191 |
IUSE="static-libs python utils" |
| 192 |
|
| 193 |
RDEPEND="python? ( ${PYTHON_DEPS} ) |
| 194 |
abi_x86_32? ( |
| 195 |
!<=app-emulation/emul-linux-x86-baselibs-20140508-r5 |
| 196 |
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
| 197 |
)" |
| 198 |
DEPEND="${RDEPEND} |
| 199 |
python? ( dev-lang/swig ) |
| 200 |
sys-devel/flex |
| 201 |
sys-devel/bison |
| 202 |
" |
| 203 |
|
| 204 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 205 |
|
| 206 |
DOCS=( ChangeLog ) |
| 207 |
|
| 208 |
S=${WORKDIR}/${NL_P} |
| 209 |
|
| 210 |
MULTILIB_WRAPPED_HEADERS=( |
| 211 |
# we do not install CLI stuff for non-native |
| 212 |
/usr/include/libnl3/netlink/cli/addr.h |
| 213 |
/usr/include/libnl3/netlink/cli/class.h |
| 214 |
/usr/include/libnl3/netlink/cli/cls.h |
| 215 |
/usr/include/libnl3/netlink/cli/ct.h |
| 216 |
/usr/include/libnl3/netlink/cli/exp.h |
| 217 |
/usr/include/libnl3/netlink/cli/link.h |
| 218 |
/usr/include/libnl3/netlink/cli/neigh.h |
| 219 |
/usr/include/libnl3/netlink/cli/qdisc.h |
| 220 |
/usr/include/libnl3/netlink/cli/route.h |
| 221 |
/usr/include/libnl3/netlink/cli/rule.h |
| 222 |
/usr/include/libnl3/netlink/cli/tc.h |
| 223 |
/usr/include/libnl3/netlink/cli/utils.h |
| 224 |
) |
| 225 |
|
| 226 |
src_prepare() { |
| 227 |
epatch "${FILESDIR}"/${PN}-1.1-vlan-header.patch |
| 228 |
epatch "${FILESDIR}"/${PN}-3.2.20-rtnl_tc_get_ops.patch |
| 229 |
epatch "${FILESDIR}"/${PN}-3.2.20-cache-api.patch |
| 230 |
|
| 231 |
elibtoolize |
| 232 |
|
| 233 |
if use python; then |
| 234 |
cd "${S}"/python || die |
| 235 |
distutils-r1_src_prepare |
| 236 |
fi |
| 237 |
|
| 238 |
# out-of-source build broken |
| 239 |
# https://github.com/thom311/libnl/pull/58 |
| 240 |
multilib_copy_sources |
| 241 |
} |
| 242 |
|
| 243 |
multilib_src_configure() { |
| 244 |
econf \ |
| 245 |
--disable-silent-rules \ |
| 246 |
$(use_enable static-libs static) \ |
| 247 |
$(multilib_native_use_enable utils cli) |
| 248 |
} |
| 249 |
|
| 250 |
multilib_src_compile() { |
| 251 |
default |
| 252 |
|
| 253 |
if multilib_is_native_abi && use python; then |
| 254 |
cd python || die |
| 255 |
distutils-r1_src_compile |
| 256 |
fi |
| 257 |
} |
| 258 |
|
| 259 |
multilib_src_install() { |
| 260 |
emake DESTDIR="${D}" install |
| 261 |
|
| 262 |
if multilib_is_native_abi && use python; then |
| 263 |
# Unset DOCS= since distutils-r1.eclass interferes |
| 264 |
local DOCS=() |
| 265 |
cd python || die |
| 266 |
distutils-r1_src_install |
| 267 |
fi |
| 268 |
} |
| 269 |
|
| 270 |
multilib_src_install_all() { |
| 271 |
einstalldocs |
| 272 |
prune_libtool_files --modules |
| 273 |
} |
Archives