summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2021-12-08 17:02:15 +0100
committerDavid Seifert <soap@gentoo.org>2021-12-08 17:02:15 +0100
commit6e3560b3cc7e133438fa01c9858c0726f2bdc519 (patch)
tree2f79c102692b59411ccb53ca1c9eac80949f0b71
parentapp-office/libreoffice-l10n: 7.2.4.1 version bump (diff)
downloadgentoo-6e3560b3cc7e133438fa01c9858c0726f2bdc519.tar.gz
gentoo-6e3560b3cc7e133438fa01c9858c0726f2bdc519.tar.bz2
gentoo-6e3560b3cc7e133438fa01c9858c0726f2bdc519.zip
dev-libs/libnl: drop 1.1.4-r1, 1.1.9999
Closes: https://bugs.gentoo.org/828572 Signed-off-by: David Seifert <soap@gentoo.org>
-rw-r--r--dev-libs/libnl/Manifest1
-rw-r--r--dev-libs/libnl/files/libnl-1.1-flags.patch11
-rw-r--r--dev-libs/libnl/files/libnl-1.1-vlan-header.patch80
-rw-r--r--dev-libs/libnl/files/libnl-1.1.3-offsetof.patch12
-rw-r--r--dev-libs/libnl/libnl-1.1.4-r1.ebuild61
-rw-r--r--dev-libs/libnl/libnl-1.1.9999.ebuild60
-rw-r--r--dev-libs/libnl/metadata.xml1
7 files changed, 0 insertions, 226 deletions
diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index 610575bfa24..a9a95c9c88d 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -1,2 +1 @@
-DIST libnl-1.1.4.tar.gz 1174974 BLAKE2B e6466e15db17fe4725674d77c6cdcefac73e51346f6f4378bc3ea8409c1534519cc28f1123c8201e78f6b95254701a2f9591f907b3cc597ac1210fd3f8b832ea SHA512 25e26ddcc16540346ea34815ab6ac094177e5cee2eb3d843c4f8b30cd9d83390a3e87cb46046dc3bd9ae4d21f77e57bb3827c2cfc588eb18afe049921f2030b4
DIST libnl-3.5.0.tar.gz 967835 BLAKE2B cf21c1ffa89799b91bf4bddb8833d5af5c62eb1c53a078ee55a2888bd8439e1ae6db8886c9c4f937297962faac6873b4cf5211ee3d1e5354d96b5dc545a6fc2d SHA512 9c94c09bac34297493b3ea482713d7c0865d2839b5042e5c7d1ed008e2402ab63df35a18e272f40b2cce27d0c31dc733fe7e4b2d376e7ca847a2b0d5e90de50c
diff --git a/dev-libs/libnl/files/libnl-1.1-flags.patch b/dev-libs/libnl/files/libnl-1.1-flags.patch
deleted file mode 100644
index dc512c587b9..00000000000
--- a/dev-libs/libnl/files/libnl-1.1-flags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -48,7 +48,7 @@
-
- $(OUT_SLIB): ../Makefile.opts $(OBJ)
- @echo " LD $(OUT_SLIB)"; \
-- $(CC) -shared -Wl,-soname,libnl.so.1 -o $(OUT_SLIB) $(OBJ) $(LIBNL_LIB) -lc
-+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname,libnl.so.1 -o $(OUT_SLIB) $(OBJ) $(LIBNL_LIB) -lc
- @echo " LN $(OUT_SLIB) $(LN1_SLIB)"; \
- rm -f $(LN1_SLIB) ; $(LN) -s $(OUT_SLIB) $(LN1_SLIB)
- @echo " LN $(LN1_SLIB) $(LN_SLIB)"; \
diff --git a/dev-libs/libnl/files/libnl-1.1-vlan-header.patch b/dev-libs/libnl/files/libnl-1.1-vlan-header.patch
deleted file mode 100644
index c4c2fc6382d..00000000000
--- a/dev-libs/libnl/files/libnl-1.1-vlan-header.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From: Patrick McHardy <kaber@trash.net>
-Date: Fri, 18 Jan 2008 16:55:48 +0000 (+0100)
-Subject: [LIBNL]: Add if_vlan.h
-X-Git-Url: http://git.kernel.org/?p=libs%2Fnetlink%2Flibnl.git;a=commitdiff_plain;h=e91bb2ffb090955d443e643a25b250bf3d33534a;hp=7f6b7a8eea0334b34d58dec72c66121a76f08958
-
-[LIBNL]: Add if_vlan.h
-
-vlan support needs VLAN_FLAG_REORDER_HDR, which is not available in
-older if_vlan.h versions. Add the current version from the kernel.
-
-Signed-off-by: Patrick McHardy <kaber@trash.net>
----
-
-diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
-new file mode 100644
-index 0000000..068cd7b
---- /dev/null
-+++ include/linux/if_vlan.h
-@@ -0,0 +1,61 @@
-+/*
-+ * VLAN An implementation of 802.1Q VLAN tagging.
-+ *
-+ * Authors: Ben Greear <greearb@candelatech.com>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ *
-+ */
-+
-+#ifndef _LINUX_IF_VLAN_H_
-+#define _LINUX_IF_VLAN_H_
-+
-+
-+/* VLAN IOCTLs are found in sockios.h */
-+
-+/* Passed in vlan_ioctl_args structure to determine behaviour. */
-+enum vlan_ioctl_cmds {
-+ ADD_VLAN_CMD,
-+ DEL_VLAN_CMD,
-+ SET_VLAN_INGRESS_PRIORITY_CMD,
-+ SET_VLAN_EGRESS_PRIORITY_CMD,
-+ GET_VLAN_INGRESS_PRIORITY_CMD,
-+ GET_VLAN_EGRESS_PRIORITY_CMD,
-+ SET_VLAN_NAME_TYPE_CMD,
-+ SET_VLAN_FLAG_CMD,
-+ GET_VLAN_REALDEV_NAME_CMD, /* If this works, you know it's a VLAN device, btw */
-+ GET_VLAN_VID_CMD /* Get the VID of this VLAN (specified by name) */
-+};
-+
-+enum vlan_flags {
-+ VLAN_FLAG_REORDER_HDR = 0x1,
-+};
-+
-+enum vlan_name_types {
-+ VLAN_NAME_TYPE_PLUS_VID, /* Name will look like: vlan0005 */
-+ VLAN_NAME_TYPE_RAW_PLUS_VID, /* name will look like: eth1.0005 */
-+ VLAN_NAME_TYPE_PLUS_VID_NO_PAD, /* Name will look like: vlan5 */
-+ VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD, /* Name will look like: eth0.5 */
-+ VLAN_NAME_TYPE_HIGHEST
-+};
-+
-+struct vlan_ioctl_args {
-+ int cmd; /* Should be one of the vlan_ioctl_cmds enum above. */
-+ char device1[24];
-+
-+ union {
-+ char device2[24];
-+ int VID;
-+ unsigned int skb_priority;
-+ unsigned int name_type;
-+ unsigned int bind_type;
-+ unsigned int flag; /* Matches vlan_dev_info flags */
-+ } u;
-+
-+ short vlan_qos;
-+};
-+
-+#endif /* !(_LINUX_IF_VLAN_H_) */
diff --git a/dev-libs/libnl/files/libnl-1.1.3-offsetof.patch b/dev-libs/libnl/files/libnl-1.1.3-offsetof.patch
deleted file mode 100644
index e370a5e62fc..00000000000
--- a/dev-libs/libnl/files/libnl-1.1.3-offsetof.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/include/netlink-local.h
-+++ b/include/netlink-local.h
-@@ -343,7 +343,9 @@
- }
-
- #define ARRAY_SIZE(X) (sizeof(X) / sizeof((X)[0]))
-+#ifndef offsetof
- #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
-+#endif
-
- #define __init __attribute__ ((constructor))
- #define __exit __attribute__ ((destructor))
diff --git a/dev-libs/libnl/libnl-1.1.4-r1.ebuild b/dev-libs/libnl/libnl-1.1.4-r1.ebuild
deleted file mode 100644
index 8f3ad2437d6..00000000000
--- a/dev-libs/libnl/libnl-1.1.4-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces"
-HOMEPAGE="https://www.infradead.org/~tgr/libnl/"
-SRC_URI="http://www.infradead.org/~tgr/libnl/files/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="1.1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
-
-DEPEND="doc? ( app-doc/doxygen )"
-DOCS=( ChangeLog )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.1-vlan-header.patch
- "${FILESDIR}"/${PN}-1.1-flags.patch
- "${FILESDIR}"/${PN}-1.1.3-offsetof.patch
-)
-
-src_prepare() {
- default
-
- sed -i \
- -e '/@echo/d' \
- Makefile.rules {lib,src,tests}/Makefile || die
- sed -i \
- -e 's|-g ||g' \
- Makefile.opts.in || die
-
- if ! use static-libs; then
- sed -i lib/Makefile -e '/OUT_AR/d' || die
- fi
-
- rm -f lib/libnl.a || die
-}
-
-src_compile() {
- emake AR="$(tc-getAR)"
-
- if use doc ; then
- cd "${S}/doc" || die
- emake gendoc
- fi
-}
-
-src_install() {
- default
-
- if use doc ; then
- cd "${S}/doc" || die
-
- docinto html
- dodoc -r html/*
- fi
-}
diff --git a/dev-libs/libnl/libnl-1.1.9999.ebuild b/dev-libs/libnl/libnl-1.1.9999.ebuild
deleted file mode 100644
index 14a4835802c..00000000000
--- a/dev-libs/libnl/libnl-1.1.9999.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit git-r3 toolchain-funcs
-
-DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces"
-HOMEPAGE="https://www.infradead.org/~tgr/libnl/"
-EGIT_REPO_URI="https://github.com/tgraf/libnl-1.1-stable"
-
-LICENSE="LGPL-2.1"
-SLOT="1.1"
-IUSE="doc static-libs"
-
-BDEPEND="doc? ( app-doc/doxygen )"
-
-DOCS=( ChangeLog )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.1-vlan-header.patch
- "${FILESDIR}"/${PN}-1.1-flags.patch
- "${FILESDIR}"/${PN}-1.1.3-offsetof.patch
-)
-
-src_prepare() {
- default
-
- sed -i \
- -e '/@echo/d' \
- Makefile.rules {lib,src,tests}/Makefile || die
- sed -i \
- -e 's|-g ||g' \
- Makefile.opts.in || die
-
- if ! use static-libs ; then
- sed -i lib/Makefile -e '/OUT_AR/d' || die
- fi
-
- rm -f lib/libnl.a || die
-}
-
-src_compile() {
- emake AR="$(tc-getAR)"
-
- if use doc ; then
- cd "${S}/doc" || die
- emake gendoc
- fi
-}
-
-src_install() {
- default
-
- if use doc ; then
- cd "${S}/doc" || die
- docinto html
- dodoc -r html/*
- fi
-}
diff --git a/dev-libs/libnl/metadata.xml b/dev-libs/libnl/metadata.xml
index 9a023d2e9d8..ff40a5ef75a 100644
--- a/dev-libs/libnl/metadata.xml
+++ b/dev-libs/libnl/metadata.xml
@@ -6,7 +6,6 @@
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
<use>
- <flag name="doc">Install development documentation</flag>
<flag name="python">Install experimental <pkg>dev-lang/python</pkg> bindings</flag>
<flag name="utils">Install command line interface utils</flag>
</use>