From c4456f9d089d84626a4ecb2a506dc9afaa77680f Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Wed, 19 Aug 2015 07:10:06 +0200 Subject: [PATCH] Old. Package-Manager: portage-2.2.20.1 --- dev-libs/libnl/Manifest | 2 - .../libnl/files/libnl-3.2.23-python.patch | 26 ----- dev-libs/libnl/files/libnl-3.2.23-utils.h | 41 ------- dev-libs/libnl/libnl-3.2.23.ebuild | 82 -------------- dev-libs/libnl/libnl-3.2.24-r1.ebuild | 102 ------------------ dev-libs/libnl/libnl-3.2.24.ebuild | 80 -------------- 6 files changed, 333 deletions(-) delete mode 100644 dev-libs/libnl/files/libnl-3.2.23-python.patch delete mode 100644 dev-libs/libnl/files/libnl-3.2.23-utils.h delete mode 100644 dev-libs/libnl/libnl-3.2.23.ebuild delete mode 100644 dev-libs/libnl/libnl-3.2.24-r1.ebuild delete mode 100644 dev-libs/libnl/libnl-3.2.24.ebuild diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest index fa99e158495c..8825f09d6d93 100644 --- a/dev-libs/libnl/Manifest +++ b/dev-libs/libnl/Manifest @@ -1,5 +1,3 @@ DIST libnl-1.1.4.tar.gz 1174974 SHA256 4f80c21fe5bbcdde6e72b59b4f98306063a41421f909887c34e58d93e746d063 SHA512 25e26ddcc16540346ea34815ab6ac094177e5cee2eb3d843c4f8b30cd9d83390a3e87cb46046dc3bd9ae4d21f77e57bb3827c2cfc588eb18afe049921f2030b4 WHIRLPOOL eab5547dce7b11c86123fbcc9cd8e00100c7e78f48a4a9fef40f80f89407ea705b701f8f0eb7df63997866f17b0cf0924b43c69b29fa1f1b016fe997371b950e -DIST libnl-3.2.23.tar.gz 766271 SHA256 8cc2cda9aa8cbbad384b9bb1ba0f6777ed9bf65e1cc3170d8c2ba5b3ee12f2b3 SHA512 b56dde135bf8e2a48bb7bb885351cf557b6a88c67dbc012c3c3f4008b8c6066f18442de772e7f8a41d6da8c80d4a38664393f131732870deae9da090b53045d8 WHIRLPOOL ef3f35edc77b7de1657e5ddd0f26e2e316d31ffb46353ab6c7345df5ff9b6d757b2d62fbaa5c58f4a7f5ed13859b00759971b22a069e381af519a82ffa8eb7a4 -DIST libnl-3.2.24.tar.gz 802068 SHA256 fb8d6e5dc8af5b85bc6d00a71582a68a01e6a3f7d1664d4a646e289a99dd6816 SHA512 d42c131d0be3bddfd65b9353f7193d355a0b5a7f0c32ee3db67ceeb9da2b04030f2dbc0d51f7f7cddbcc15fcc596b380e0c846dbe1c52212e50d06b7ee12fb10 WHIRLPOOL a90e9dcd08c7a2fb2bc883dd4f8b09e21afd55b10573bada84d1fb6425f5a9adff90bfd0c7572aef437719cfaaa106e5cc4b4aeed081d62e6723ba31c15f0edf DIST libnl-3.2.25.tar.gz 832513 SHA256 8beb7590674957b931de6b7f81c530b85dc7c1ad8fbda015398bc1e8d1ce8ec5 SHA512 3f9649577e9282cf41d2d4894aaecb2d53b4a1c51f9e674a6fb73393e9482f9f45e6f0ffa5815e606f972916e369774bfd85141a96c0e3d9d4ead3adea796286 WHIRLPOOL f151776fa1d1b9d23416408a315c0aa900928fa902322a0f4df3c90631ef54f281cf0cae6f69ec878a76f03a609f5fa2eb52d4c03db502c9972a70d864cdaf97 DIST libnl-3.2.26.tar.gz 896005 SHA256 1323ff6cea47efe9f988893b09840942a8c36131f472a9f3b96eb68d8f8d7555 SHA512 5ab4a3a40244d71e0c8c50fcef30a67f814509d508e9537c85f2d710578a8a61513e7f26b2c0c29a9817484ca6ecd005e53b4f9054cd878274ae3b439abbe516 WHIRLPOOL 84854749fc312c867d9eec1e4d91bbeb5a132f79c004c5db0504a7d60136a2f39263b4efd4b0d1cd2e07f6cd363cc5e68f93089cb9b9dd58a45f416338c41a6f diff --git a/dev-libs/libnl/files/libnl-3.2.23-python.patch b/dev-libs/libnl/files/libnl-3.2.23-python.patch deleted file mode 100644 index 559376b546c6..000000000000 --- a/dev-libs/libnl/files/libnl-3.2.23-python.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/python/setup.py.in -+++ b/python/setup.py.in -@@ -9,6 +9,7 @@ - sources = ['netlink/capi.i'], - include_dirs = include, - swig_opts = opts, -+ library_dirs=['@top_builddir@/lib/.libs'], - libraries = ['nl-3'], - ) - -@@ -16,6 +17,7 @@ - sources = ['netlink/route/capi.i'], - include_dirs = include, - swig_opts = opts, -+ library_dirs=['@top_builddir@/lib/.libs'], - libraries = ['nl-3', 'nl-route-3'], - ) - -@@ -23,6 +25,7 @@ - sources = ['netlink/genl/capi.i'], - include_dirs = include, - swig_opts = opts, -+ library_dirs=['@top_builddir@/lib/.libs'], - libraries = ['nl-3', 'nl-genl-3'], - ) - diff --git a/dev-libs/libnl/files/libnl-3.2.23-utils.h b/dev-libs/libnl/files/libnl-3.2.23-utils.h deleted file mode 100644 index 7836c3076ff4..000000000000 --- a/dev-libs/libnl/files/libnl-3.2.23-utils.h +++ /dev/null @@ -1,41 +0,0 @@ -struct list_head { - struct list_head *next; -}; - -#define LIST_HEAD(name) \ - struct list_head name = { &(name) } - -static inline int list_empty(const struct list_head *head) -{ - return head->next == head; -} - -static inline void list_add(struct list_head *new, struct list_head *head) -{ - new->next = head->next; - head->next = new; -} - -static inline void list_del(struct list_head *entry, struct list_head *prev) -{ - prev->next = entry->next; - entry->next = entry; -} - -#define list_for_each_safe(pos, n, head) \ - for (n = (head), pos = (head)->next; pos != (head); \ - n = pos, pos = n->next) - -#undef offsetof -#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) - -#define container_of(ptr, type, member) ({ \ - const typeof( ((type *)0)->member ) *__mptr = (ptr); \ - (type *)( (char *)__mptr - offsetof(type,member) );}) - -#ifdef DEBUG -#define pynl_dbg(fmt, ...) \ - fprintf(stderr, "%s: " fmt, __func__, __VA_ARGS__) -#else -#define pynl_dbg(fmt, ...) -#endif diff --git a/dev-libs/libnl/libnl-3.2.23.ebuild b/dev-libs/libnl/libnl-3.2.23.ebuild deleted file mode 100644 index 25cfb13442d0..000000000000 --- a/dev-libs/libnl/libnl-3.2.23.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python2_7 python3_3 ) -DISTUTILS_OPTIONAL=1 -inherit distutils-r1 eutils libtool multilib - -NL_P=${P/_/-} - -DESCRIPTION="A collection of libraries providing APIs to netlink protocol based Linux kernel interfaces" -HOMEPAGE="http://www.infradead.org/~tgr/libnl/" -SRC_URI=" - http://www.infradead.org/~tgr/${PN}/files/${NL_P}.tar.gz -" -LICENSE="LGPL-2.1 utils? ( GPL-2 )" -SLOT="3" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux" -IUSE="static-libs python utils" - -RDEPEND="python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND} - python? ( dev-lang/swig ) - sys-devel/flex - sys-devel/bison -" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DOCS=( ChangeLog ) - -S=${WORKDIR}/${NL_P} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.1-vlan-header.patch - epatch "${FILESDIR}"/${PN}-3.2.20-rtnl_tc_get_ops.patch - epatch "${FILESDIR}"/${PN}-3.2.20-cache-api.patch - epatch "${FILESDIR}"/${PN}-3.2.23-python.patch - - elibtoolize - - if use python; then - cp "${FILESDIR}"/${P}-utils.h python/netlink/utils.h || die - cd "${S}"/python || die - distutils-r1_src_prepare - fi -} - -src_configure() { - econf \ - --disable-silent-rules \ - $(use_enable static-libs static) \ - $(use_enable utils cli) - - if use python; then - cd "${S}"/python || die - distutils-r1_src_configure - fi -} - -src_compile() { - default - - if use python; then - cd "${S}"/python || die - distutils-r1_src_compile - fi -} - -src_install() { - default - - if use python; then - # Unset DOCS= since distutils-r1.eclass interferes - DOCS='' - cd "${S}"/python || die - distutils-r1_src_install - fi - - prune_libtool_files $(usex static-libs --modules --all) -} diff --git a/dev-libs/libnl/libnl-3.2.24-r1.ebuild b/dev-libs/libnl/libnl-3.2.24-r1.ebuild deleted file mode 100644 index 4e37f2853087..000000000000 --- a/dev-libs/libnl/libnl-3.2.24-r1.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python2_7 python3_{3,4} ) -DISTUTILS_OPTIONAL=1 -inherit distutils-r1 eutils libtool multilib multilib-minimal - -NL_P=${P/_/-} - -DESCRIPTION="A collection of libraries providing APIs to netlink protocol based Linux kernel interfaces" -HOMEPAGE="http://www.infradead.org/~tgr/libnl/" -SRC_URI=" - http://www.infradead.org/~tgr/${PN}/files/${NL_P}.tar.gz -" -LICENSE="LGPL-2.1 utils? ( GPL-2 )" -SLOT="3" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux" -IUSE="static-libs python utils" - -RDEPEND="python? ( ${PYTHON_DEPS} ) - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20140508-r5 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - )" -DEPEND="${RDEPEND} - python? ( dev-lang/swig ) - sys-devel/flex - sys-devel/bison -" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DOCS=( ChangeLog ) - -S=${WORKDIR}/${NL_P} - -MULTILIB_WRAPPED_HEADERS=( - # we do not install CLI stuff for non-native - /usr/include/libnl3/netlink/cli/addr.h - /usr/include/libnl3/netlink/cli/class.h - /usr/include/libnl3/netlink/cli/cls.h - /usr/include/libnl3/netlink/cli/ct.h - /usr/include/libnl3/netlink/cli/exp.h - /usr/include/libnl3/netlink/cli/link.h - /usr/include/libnl3/netlink/cli/neigh.h - /usr/include/libnl3/netlink/cli/qdisc.h - /usr/include/libnl3/netlink/cli/route.h - /usr/include/libnl3/netlink/cli/rule.h - /usr/include/libnl3/netlink/cli/tc.h - /usr/include/libnl3/netlink/cli/utils.h -) - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.1-vlan-header.patch - epatch "${FILESDIR}"/${PN}-3.2.20-rtnl_tc_get_ops.patch - epatch "${FILESDIR}"/${PN}-3.2.20-cache-api.patch - - elibtoolize - - if use python; then - cd "${S}"/python || die - distutils-r1_src_prepare - fi - - # out-of-source build broken - # https://github.com/thom311/libnl/pull/58 - multilib_copy_sources -} - -multilib_src_configure() { - econf \ - --disable-silent-rules \ - $(use_enable static-libs static) \ - $(multilib_native_use_enable utils cli) -} - -multilib_src_compile() { - default - - if multilib_is_native_abi && use python; then - cd python || die - distutils-r1_src_compile - fi -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - if multilib_is_native_abi && use python; then - # Unset DOCS= since distutils-r1.eclass interferes - local DOCS=() - cd python || die - distutils-r1_src_install - fi -} - -multilib_src_install_all() { - einstalldocs - prune_libtool_files --modules -} diff --git a/dev-libs/libnl/libnl-3.2.24.ebuild b/dev-libs/libnl/libnl-3.2.24.ebuild deleted file mode 100644 index 54069f04127b..000000000000 --- a/dev-libs/libnl/libnl-3.2.24.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python2_7 python3_{3,4} ) -DISTUTILS_OPTIONAL=1 -inherit distutils-r1 eutils libtool multilib - -NL_P=${P/_/-} - -DESCRIPTION="A collection of libraries providing APIs to netlink protocol based Linux kernel interfaces" -HOMEPAGE="http://www.infradead.org/~tgr/libnl/" -SRC_URI=" - http://www.infradead.org/~tgr/${PN}/files/${NL_P}.tar.gz -" -LICENSE="LGPL-2.1 utils? ( GPL-2 )" -SLOT="3" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux" -IUSE="static-libs python utils" - -RDEPEND="python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND} - python? ( dev-lang/swig ) - sys-devel/flex - sys-devel/bison -" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DOCS=( ChangeLog ) - -S=${WORKDIR}/${NL_P} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.1-vlan-header.patch - epatch "${FILESDIR}"/${PN}-3.2.20-rtnl_tc_get_ops.patch - epatch "${FILESDIR}"/${PN}-3.2.20-cache-api.patch - - elibtoolize - - if use python; then - cd "${S}"/python || die - distutils-r1_src_prepare - fi -} - -src_configure() { - econf \ - --disable-silent-rules \ - $(use_enable static-libs static) \ - $(use_enable utils cli) - - if use python; then - cd "${S}"/python || die - distutils-r1_src_configure - fi -} - -src_compile() { - default - - if use python; then - cd "${S}"/python || die - distutils-r1_src_compile - fi -} - -src_install() { - default - - if use python; then - # Unset DOCS= since distutils-r1.eclass interferes - DOCS='' - cd "${S}"/python || die - distutils-r1_src_install - fi - - prune_libtool_files $(usex static-libs --modules --all) -} -- 2.26.2