Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: dev-libs/libnl/
Date: Sat, 11 Nov 2017 20:34:44
Message-Id: 1510432469.3b9ca289b0e5b2a86ece93f4a9211a59edb113f2.blueness@gentoo
1 commit: 3b9ca289b0e5b2a86ece93f4a9211a59edb113f2
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Sat Nov 11 20:34:29 2017 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Sat Nov 11 20:34:29 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=3b9ca289
7
8 dev-libs/libnl: 3.4.0 stable on all musl arches
9
10 Package-Manager: Portage-2.3.8, Repoman-2.3.3
11
12 dev-libs/libnl/Manifest | 4 +-
13 dev-libs/libnl/libnl-3.3.0.ebuild | 108 --------------------------------------
14 dev-libs/libnl/libnl-3.4.0.ebuild | 2 +-
15 3 files changed, 2 insertions(+), 112 deletions(-)
16
17 diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
18 index 23b6961..f3e7fc2 100644
19 --- a/dev-libs/libnl/Manifest
20 +++ b/dev-libs/libnl/Manifest
21 @@ -1,6 +1,4 @@
22 AUX libnl-3.3.0_rc1-musl.patch 3539 SHA256 8e0a4d1da3ddc8cfbe81b5d9440458b6bbebce101aeaaff4085c2ba857d208de SHA512 a31ec4b76d2fc472072f2d770cb3f5819a6477230a97603a476ce175c0c94d25e74eff8dc0ce2e6baa96f0e450b82db508a152f418bdd72919cbd5521d5f82fd WHIRLPOOL 6678b618dea03c1dc51c506e3f81ec770c5ab1ee1fd3931e7b52fa2e217a6cdccdf465f4ee979ecba2c4dee55e132057e55e065eaabd1c576b219d8bc0ef8305
23 -DIST libnl-3.3.0.tar.gz 933390 SHA256 705468b5ae4cd1eb099d2d1c476d6a3abe519bc2810becf12fb1e32de1e074e4 SHA512 3fc5d95b875605ab6378d2d454020c1276a6772205fa11bbd22eba9fd9ef1deb8c75347e5d4602f0ab7bf13bd66b418f5ef73ed05f18134f08638ce06eef622c WHIRLPOOL a6f7c066c9d05af807ed17babe1f39107d24b4b5ef44ca94e487543a39b0a2f1298fbf6448356fa3701c033fbff0df392945666c125f16246398d47a8c828f5b
24 DIST libnl-3.4.0.tar.gz 933443 SHA256 b7287637ae71c6db6f89e1422c995f0407ff2fe50cecd61a312b6a9b0921f5bf SHA512 6336e5c55c79ff2638de9c812cc1842871769236bad7f65c547dec35fafd91988b257fceab144a0cc133c4b29f61172f6552c53aa9fc723bdc783079c2b1851e WHIRLPOOL c10ef68515c4d5870d36dcba671be70b8edaa3369ee2d7d6f1a362ef0cbe0524644db622625e661a076ed4723812fd762f187756f3eb02fbb9a0aa627a817d80
25 -EBUILD libnl-3.3.0.ebuild 2530 SHA256 cf898ee05c9df21ea7efa37b006c1128242f17ee0a82e7693395414f82aad469 SHA512 6189b0dad6e63ceed6ff74b2782de1febddb21640b28c2a9bd42ad7ea2b32630e2f745800509a027f4fe964487fd98d921d03e5822f1fe89bd8eab338c5635de WHIRLPOOL a6fe528055732aa1bf2c2c53d9dadd95ee1166197eea2dccc7f0b758eac3d0ec57d26f34f1dd325e7004d4b8f98b1eb3adb18a390257a916d5417d2e406acfe3
26 -EBUILD libnl-3.4.0.ebuild 2530 SHA256 cf898ee05c9df21ea7efa37b006c1128242f17ee0a82e7693395414f82aad469 SHA512 6189b0dad6e63ceed6ff74b2782de1febddb21640b28c2a9bd42ad7ea2b32630e2f745800509a027f4fe964487fd98d921d03e5822f1fe89bd8eab338c5635de WHIRLPOOL a6fe528055732aa1bf2c2c53d9dadd95ee1166197eea2dccc7f0b758eac3d0ec57d26f34f1dd325e7004d4b8f98b1eb3adb18a390257a916d5417d2e406acfe3
27 +EBUILD libnl-3.4.0.ebuild 2452 SHA256 13bbc4f86200f191a0328ee5328b0376946d40eaa8511837a5d79e5fb40764da SHA512 578afdce796e754ae9e32f01f9aa1c9d6752fb14a018c517ac94e0046927337f75fc3482c3cc5f59d91fb9f9856f46ba3b9ff81ad02f599617eaf8355ef95a73 WHIRLPOOL 9918744cae9c1d5e26f639a843bd8cc444fb6ff13fffc2afcfaee245fd43f0d92c5ac7acf28a3f5bf7deca1495cb47a873ba30da66f56d05ce1f97e07381a085
28 MISC metadata.xml 524 SHA256 26086a846b5963db028e70e48b2ac896dfe360089b6743798527b3c37ec18cec SHA512 c9fbbb399200dd7779394d2586e3e780b156220ddf8183ad5b7cec2dc3798180e4faf63e126d3e92503c2f755c76bf32396f6551441a88e9b96ef2f9ed742806 WHIRLPOOL 0fd684c36bab8883e51fa5b1f30e3998f7f6aca37dad308104a3c34d92d7337fd223e7980299ed24771cdee6e3a81eb90df156c4ca74a390b40ac84843d5d3b6
29
30 diff --git a/dev-libs/libnl/libnl-3.3.0.ebuild b/dev-libs/libnl/libnl-3.3.0.ebuild
31 deleted file mode 100644
32 index 5b83b2e..0000000
33 --- a/dev-libs/libnl/libnl-3.3.0.ebuild
34 +++ /dev/null
35 @@ -1,108 +0,0 @@
36 -# Copyright 1999-2017 Gentoo Foundation
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=6
40 -PYTHON_COMPAT=( python2_7 python3_{4,5} )
41 -DISTUTILS_OPTIONAL=1
42 -inherit distutils-r1 eutils libtool multilib multilib-minimal
43 -
44 -LIBNL_P=${P/_/-}
45 -LIBNL_DIR=${PV/_/}
46 -LIBNL_DIR=${LIBNL_DIR//./_}
47 -
48 -DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces"
49 -HOMEPAGE="http://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl"
50 -SRC_URI="
51 - https://github.com/thom311/${PN}/releases/download/${PN}${LIBNL_DIR}/${P/_rc/-rc}.tar.gz
52 -"
53 -LICENSE="LGPL-2.1 utils? ( GPL-2 )"
54 -SLOT="3"
55 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
56 -IUSE="static-libs python utils"
57 -
58 -RDEPEND="
59 - python? ( ${PYTHON_DEPS} )
60 - abi_x86_32? (
61 - !<=app-emulation/emul-linux-x86-baselibs-20140508-r5
62 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
63 - )
64 -"
65 -DEPEND="
66 - ${RDEPEND}
67 - python? ( dev-lang/swig )
68 - sys-devel/bison
69 - sys-devel/flex
70 -"
71 -REQUIRED_USE="
72 - python? ( ${PYTHON_REQUIRED_USE} )
73 -"
74 -DOCS=(
75 - ChangeLog
76 -)
77 -
78 -PATCHES=( "${FILESDIR}"/${PN}-3.3.0_rc1-musl.patch )
79 -
80 -S=${WORKDIR}/${LIBNL_P}
81 -
82 -MULTILIB_WRAPPED_HEADERS=(
83 - # we do not install CLI stuff for non-native
84 - /usr/include/libnl3/netlink/cli/addr.h
85 - /usr/include/libnl3/netlink/cli/class.h
86 - /usr/include/libnl3/netlink/cli/cls.h
87 - /usr/include/libnl3/netlink/cli/ct.h
88 - /usr/include/libnl3/netlink/cli/exp.h
89 - /usr/include/libnl3/netlink/cli/link.h
90 - /usr/include/libnl3/netlink/cli/neigh.h
91 - /usr/include/libnl3/netlink/cli/qdisc.h
92 - /usr/include/libnl3/netlink/cli/route.h
93 - /usr/include/libnl3/netlink/cli/rule.h
94 - /usr/include/libnl3/netlink/cli/tc.h
95 - /usr/include/libnl3/netlink/cli/utils.h
96 -)
97 -
98 -src_prepare() {
99 - default
100 -
101 - elibtoolize
102 -
103 - if use python; then
104 - cd "${S}"/python || die
105 - distutils-r1_src_prepare
106 - fi
107 -
108 - # out-of-source build broken
109 - # https://github.com/thom311/libnl/pull/58
110 - multilib_copy_sources
111 -}
112 -
113 -multilib_src_configure() {
114 - econf \
115 - --disable-silent-rules \
116 - $(use_enable static-libs static) \
117 - $(multilib_native_use_enable utils cli)
118 -}
119 -
120 -multilib_src_compile() {
121 - default
122 -
123 - if multilib_is_native_abi && use python; then
124 - cd python || die
125 - distutils-r1_src_compile
126 - fi
127 -}
128 -
129 -multilib_src_install() {
130 - emake DESTDIR="${D}" install
131 -
132 - if multilib_is_native_abi && use python; then
133 - # Unset DOCS= since distutils-r1.eclass interferes
134 - local DOCS=()
135 - cd python || die
136 - distutils-r1_src_install
137 - fi
138 -}
139 -
140 -multilib_src_install_all() {
141 - einstalldocs
142 - prune_libtool_files --modules
143 -}
144
145 diff --git a/dev-libs/libnl/libnl-3.4.0.ebuild b/dev-libs/libnl/libnl-3.4.0.ebuild
146 index 5b83b2e..95ea314 100644
147 --- a/dev-libs/libnl/libnl-3.4.0.ebuild
148 +++ b/dev-libs/libnl/libnl-3.4.0.ebuild
149 @@ -17,7 +17,7 @@ SRC_URI="
150 "
151 LICENSE="LGPL-2.1 utils? ( GPL-2 )"
152 SLOT="3"
153 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
154 +KEYWORDS="amd64 arm ~mips ppc x86"
155 IUSE="static-libs python utils"
156
157 RDEPEND="