commit: 6bd7a694737ec0f7cfed9650c237ac74da9b4901 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> AuthorDate: Wed Jun 18 12:09:21 2014 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Wed Jun 18 12:09:21 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=6bd7a694
gnome-base/libgtop: fix assumption that we're using glibc Package-Manager: portage-2.2.8-r1 RepoMan-Options: --force Manifest-Sign-Key: 0xF52D4BBA --- gnome-base/libgtop/file/libgtop-musl.patch | 27 +++++++++++++++++++++ gnome-base/libgtop/libgtop-2.28.5-r99.ebuild | 35 ++++++++++++++++++++++++++++ gnome-base/libgtop/libgtop-2.30.0-r99.ebuild | 34 +++++++++++++++++++++++++++ gnome-base/libgtop/metadata.xml | 9 +++++++ 4 files changed, 105 insertions(+) diff --git a/gnome-base/libgtop/file/libgtop-musl.patch b/gnome-base/libgtop/file/libgtop-musl.patch new file mode 100644 index 0000000..c8bb40f --- /dev/null +++ b/gnome-base/libgtop/file/libgtop-musl.patch @@ -0,0 +1,27 @@ +diff -Naur libgtop-2.28.5.orig/sysdeps/linux/netload.c libgtop-2.28.5/sysdeps/linux/netload.c +--- libgtop-2.28.5.orig/sysdeps/linux/netload.c 2013-07-27 12:40:23.000000000 +0000 ++++ libgtop-2.28.5/sysdeps/linux/netload.c 2014-06-18 12:05:40.024216274 +0000 +@@ -34,8 +34,6 @@ + #include <sys/socket.h> + #include <sys/ioctl.h> + +-#if !defined (_LIBC) && defined (__GNU_LIBRARY__) && __GNU_LIBRARY__ > 1 +-/* GNU LibC */ + #include <net/if.h> + #include <netinet/ip_icmp.h> + #include <netinet/in.h> +@@ -43,14 +41,6 @@ + #include <netinet/tcp.h> + #include <netinet/udp.h> + #include <net/if.h> +-#else /* Libc 5 */ +-#include <linux/if.h> +-#include <linux/in.h> +-#include <linux/ip.h> +-#include <linux/icmp.h> +-#include <linux/tcp.h> +-#include <linux/udp.h> +-#endif + + + #ifdef HAVE_IFADDRS_H diff --git a/gnome-base/libgtop/libgtop-2.28.5-r99.ebuild b/gnome-base/libgtop/libgtop-2.28.5-r99.ebuild new file mode 100644 index 0000000..73186ff --- /dev/null +++ b/gnome-base/libgtop/libgtop-2.28.5-r99.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgtop/libgtop-2.28.5.ebuild,v 1.10 2014/05/17 15:31:27 ago Exp $ + +EAPI="5" +GCONF_DEBUG="yes" + +inherit gnome2 eutils + +DESCRIPTION="A library that provides top functionality to applications" +HOMEPAGE="http://developer.gnome.org/libgtop/stable/"; + +LICENSE="GPL-2" +SLOT="2" +KEYWORDS="amd64 arm ~mips x86" +IUSE="debug +introspection" + +RDEPEND=">=dev-libs/glib-2.6:2" +DEPEND="${RDEPEND} + >=dev-util/gtk-doc-am-1.4 + >=dev-util/intltool-0.35 + virtual/pkgconfig + introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) +" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-musl.patch +} + +src_configure() { + DOCS="AUTHORS ChangeLog NEWS README" + gnome2_src_configure \ + --disable-static \ + $(use_enable introspection) +} diff --git a/gnome-base/libgtop/libgtop-2.30.0-r99.ebuild b/gnome-base/libgtop/libgtop-2.30.0-r99.ebuild new file mode 100644 index 0000000..d7a0e71 --- /dev/null +++ b/gnome-base/libgtop/libgtop-2.30.0-r99.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgtop/libgtop-2.30.0.ebuild,v 1.1 2014/05/31 10:19:20 pacho Exp $ + +EAPI="5" +GCONF_DEBUG="yes" + +inherit gnome2 + +DESCRIPTION="A library that provides top functionality to applications" +HOMEPAGE="http://developer.gnome.org/libgtop/stable/"; + +LICENSE="GPL-2" +SLOT="2/10" # libgtop soname version +KEYWORDS="~amd64 ~arm ~mips ~x86" +IUSE="debug +introspection" + +RDEPEND=">=dev-libs/glib-2.6:2" +DEPEND="${RDEPEND} + >=dev-util/gtk-doc-am-1.4 + >=dev-util/intltool-0.35 + virtual/pkgconfig + introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) +" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-musl.patch +} + +src_configure() { + gnome2_src_configure \ + --disable-static \ + $(use_enable introspection) +} diff --git a/gnome-base/libgtop/metadata.xml b/gnome-base/libgtop/metadata.xml new file mode 100644 index 0000000..3147d74 --- /dev/null +++ b/gnome-base/libgtop/metadata.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> +<pkgmetadata> +<herd>gnome</herd> +<use> + <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for + introspection</flag> +</use> +</pkgmetadata>
