From 49a086f96e94f518a0401ba4912aae1beb073e69 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 18 Dec 2009 15:58:30 +0000 Subject: Version bump #297161 by Xake. (Portage version: 2.2_rc55/cvs/Linux x86_64) --- sys-process/latencytop/ChangeLog | 12 +++- .../latencytop-0.5-01-mkdir-usr-sbin-as-well.patch | 22 +++++++ .../latencytop-0.5-03-clean-up-build-system.patch | 73 ++++++++++++++++++++++ .../latencytop-0.5-fsync-fix-implicit-decl.patch | 28 +++++++++ sys-process/latencytop/latencytop-0.5.ebuild | 35 +++++++++++ 5 files changed, 168 insertions(+), 2 deletions(-) create mode 100644 sys-process/latencytop/files/latencytop-0.5-01-mkdir-usr-sbin-as-well.patch create mode 100644 sys-process/latencytop/files/latencytop-0.5-03-clean-up-build-system.patch create mode 100644 sys-process/latencytop/files/latencytop-0.5-fsync-fix-implicit-decl.patch create mode 100644 sys-process/latencytop/latencytop-0.5.ebuild diff --git a/sys-process/latencytop/ChangeLog b/sys-process/latencytop/ChangeLog index d668b04af5f2..d139a26bbbaa 100644 --- a/sys-process/latencytop/ChangeLog +++ b/sys-process/latencytop/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sys-process/latencytop -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/latencytop/ChangeLog,v 1.5 2008/05/12 20:09:40 maekke Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-process/latencytop/ChangeLog,v 1.6 2009/12/18 15:58:29 vapier Exp $ + +*latencytop-0.5 (18 Dec 2009) + + 18 Dec 2009; Mike Frysinger +latencytop-0.5.ebuild, + +files/latencytop-0.5-01-mkdir-usr-sbin-as-well.patch, + +files/latencytop-0.5-03-clean-up-build-system.patch, + +files/latencytop-0.5-fsync-fix-implicit-decl.patch: + Version bump #297161 by Xake. 12 May 2008; Markus Meier latencytop-0.4.ebuild: amd64/x86 stable, bug #218167 diff --git a/sys-process/latencytop/files/latencytop-0.5-01-mkdir-usr-sbin-as-well.patch b/sys-process/latencytop/files/latencytop-0.5-01-mkdir-usr-sbin-as-well.patch new file mode 100644 index 000000000000..52d791e7a601 --- /dev/null +++ b/sys-process/latencytop/files/latencytop-0.5-01-mkdir-usr-sbin-as-well.patch @@ -0,0 +1,22 @@ +From d9685bb69c581489ef1c4278df8990fe02b0728d Mon Sep 17 00:00:00 2001 +From: Arjan van de Ven +Date: Tue, 28 Apr 2009 14:44:34 +0100 +Subject: [PATCH] mkdir /usr/sbin as well + +--- + +diff --git a/src/Makefile b/src/Makefile +index fdf1616..de24551 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -30,6 +30,7 @@ + + install: latencytop + mkdir -p $(DESTDIR)/usr/share/latencytop ++ mkdir -p $(DESTDIR)/$(SBINDIR) + install -m 0644 latencytop.trans $(DESTDIR)/usr/share/latencytop/latencytop.trans + install -m 0644 *.png $(DESTDIR)/usr/share/latencytop/ + install -m 0755 latencytop $(DESTDIR)$(SBINDIR)/ +-- +1.6.5.4 + diff --git a/sys-process/latencytop/files/latencytop-0.5-03-clean-up-build-system.patch b/sys-process/latencytop/files/latencytop-0.5-03-clean-up-build-system.patch new file mode 100644 index 000000000000..735ae1c57399 --- /dev/null +++ b/sys-process/latencytop/files/latencytop-0.5-03-clean-up-build-system.patch @@ -0,0 +1,73 @@ +From e024a79b7b16b09bfe88222ed7f43b969b3eb444 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Fri, 18 Dec 2009 10:49:19 -0500 +Subject: [PATCH] clean up build system + +Respect env build settings (compiler flags and tools) and install the man +page for people. + +Signed-off-by: Mike Frysinger +--- + src/Makefile | 32 ++++++++++++++++++-------------- + 1 files changed, 18 insertions(+), 14 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index de24551..9a3cc05 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -3,14 +3,22 @@ HAS_GTK_GUI = 1 + + DESTDIR = + SBINDIR = /usr/sbin +-XCFLAGS = -W -g `pkg-config --cflags glib-2.0` -D_FORTIFY_SOURCE=2 -Wno-sign-compare +-LDF = -Wl,--as-needed `pkg-config --libs glib-2.0` -lncursesw ++DATADIR = /usr/share/latencytop ++MANDIR = /usr/share/man ++MAN8DIR = $(MANDIR)/man8 ++PKG_CONFIG ?= pkg-config ++CFLAGS ?= -g -W ++CPPFLAGS ?= -D_FORTIFY_SOURCE=2 ++override CFLAGS += -Wno-sign-compare ++override CPPFLAGS += `$(PKG_CONFIG) --cflags glib-2.0` ++LDFLAGS ?= -Wl,--as-needed ++LDADD = `$(PKG_CONFIG) --libs glib-2.0` -lncursesw + + OBJS= latencytop.o text_display.o translate.o fsync.o + +-ifdef HAS_GTK_GUI +- XCFLAGS += `pkg-config --cflags gtk+-2.0` -DHAS_GTK_GUI +- LDF += `pkg-config --libs gtk+-2.0` ++ifeq ($(HAS_GTK_GUI),1) ++ override CPPFLAGS += `$(PKG_CONFIG) --cflags gtk+-2.0` -DHAS_GTK_GUI ++ LDADD += `$(PKG_CONFIG) --libs gtk+-2.0` + OBJS += gtk_display.o + endif + +@@ -24,19 +32,15 @@ endif + # libncursesw5-dev package. + # + +-# We write explicity this "implicit rule" +-%.o : %.c +- gcc -c $(CFLAGS) $(XCFLAGS) $< -o $@ +- + latencytop: $(OBJS) latencytop.h Makefile +- gcc $(CFLAGS) $(OBJS) $(LDF) -o latencytop ++ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@ $(LDADD) + + clean: + rm -f *~ latencytop DEADJOE *.o + + install: latencytop +- mkdir -p $(DESTDIR)/usr/share/latencytop +- mkdir -p $(DESTDIR)/$(SBINDIR) +- install -m 0644 latencytop.trans $(DESTDIR)/usr/share/latencytop/latencytop.trans +- install -m 0644 *.png $(DESTDIR)/usr/share/latencytop/ ++ mkdir -p $(DESTDIR)$(DATADIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(MAN8DIR) ++ install -m 0644 latencytop.trans $(DESTDIR)$(DATADIR)/latencytop.trans ++ install -m 0644 *.png $(DESTDIR)$(DATADIR)/ ++ install -m 0644 *.8 $(DESTDIR)$(MAN8DIR)/ + install -m 0755 latencytop $(DESTDIR)$(SBINDIR)/ +-- +1.6.5.4 + diff --git a/sys-process/latencytop/files/latencytop-0.5-fsync-fix-implicit-decl.patch b/sys-process/latencytop/files/latencytop-0.5-fsync-fix-implicit-decl.patch new file mode 100644 index 000000000000..ef57e9e04c00 --- /dev/null +++ b/sys-process/latencytop/files/latencytop-0.5-fsync-fix-implicit-decl.patch @@ -0,0 +1,28 @@ +From 60427a259ba76b8238198e1f17a0c3b06491be3c Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Fri, 18 Dec 2009 10:48:39 -0500 +Subject: [PATCH] fsync: fix implicit decl + +fsync.c: In function 'fsync_display': +fsync.c:330: warning: implicit declaration of function 'gettimeofday' + +Signed-off-by: Mike Frysinger +--- + src/fsync.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/src/fsync.c b/src/fsync.c +index 1706571..3bec719 100644 +--- a/src/fsync.c ++++ b/src/fsync.c +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + #include + #include + +-- +1.6.5.4 + diff --git a/sys-process/latencytop/latencytop-0.5.ebuild b/sys-process/latencytop/latencytop-0.5.ebuild new file mode 100644 index 000000000000..12cfe7b89567 --- /dev/null +++ b/sys-process/latencytop/latencytop-0.5.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-process/latencytop/latencytop-0.5.ebuild,v 1.1 2009/12/18 15:58:29 vapier Exp $ + +inherit eutils toolchain-funcs + +DESCRIPTION="tool for identifying where in the system latency is happening" +HOMEPAGE="http://www.latencytop.org/" +SRC_URI="http://www.latencytop.org/download/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="gtk unicode" + +RDEPEND="=dev-libs/glib-2* + gtk? ( =x11-libs/gtk+-2* ) + sys-libs/ncurses" +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-*.patch +} + +src_compile() { + tc-export CC PKG_CONFIG + emake HAS_GTK_GUI=$(use gtk && echo 1) || die +} + +src_install() { + emake install DESTDIR="${D}" || die +} -- cgit v1.2.3-65-gdbad