diff options
author | Samuli Suominen <drac@gentoo.org> | 2008-01-24 19:03:49 +0000 |
---|---|---|
committer | Samuli Suominen <drac@gentoo.org> | 2008-01-24 19:03:49 +0000 |
commit | 154e4cd55f6e8d1ff6508df2876c53d81aad0843 (patch) | |
tree | ee9c0d1f6378e405b6d92b2661954016e8208c7b /app-misc | |
parent | stable x86, security bug 205955 (diff) | |
download | gentoo-2-154e4cd55f6e8d1ff6508df2876c53d81aad0843.tar.gz gentoo-2-154e4cd55f6e8d1ff6508df2876c53d81aad0843.tar.bz2 gentoo-2-154e4cd55f6e8d1ff6508df2876c53d81aad0843.zip |
Use >=sys-libs/slang-2.
(Portage version: 2.1.4)
Diffstat (limited to 'app-misc')
-rw-r--r-- | app-misc/slmon/ChangeLog | 8 | ||||
-rw-r--r-- | app-misc/slmon/files/digest-slmon-0.5.13-r1 | 3 | ||||
-rw-r--r-- | app-misc/slmon/files/slmon-0.5.13-slang-2.patch | 47 | ||||
-rw-r--r-- | app-misc/slmon/slmon-0.5.13-r1.ebuild | 39 |
4 files changed, 96 insertions, 1 deletions
diff --git a/app-misc/slmon/ChangeLog b/app-misc/slmon/ChangeLog index b995a77ffd9b..153d7f3438fc 100644 --- a/app-misc/slmon/ChangeLog +++ b/app-misc/slmon/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-misc/slmon # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/slmon/ChangeLog,v 1.11 2008/01/24 18:41:13 drac Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/slmon/ChangeLog,v 1.12 2008/01/24 19:03:48 drac Exp $ + +*slmon-0.5.13-r1 (24 Jan 2008) + + 24 Jan 2008; Samuli Suominen <drac@gentoo.org> + +files/slmon-0.5.13-slang-2.patch, +slmon-0.5.13-r1.ebuild: + Use >=sys-libs/slang-2. 24 Jan 2008; Samuli Suominen <drac@gentoo.org> slmon-0.5.13.ebuild: Depend on =sys-libs/slang-1* and keyword for ~amd64. diff --git a/app-misc/slmon/files/digest-slmon-0.5.13-r1 b/app-misc/slmon/files/digest-slmon-0.5.13-r1 new file mode 100644 index 000000000000..c848e4de4ad7 --- /dev/null +++ b/app-misc/slmon/files/digest-slmon-0.5.13-r1 @@ -0,0 +1,3 @@ +MD5 9907c53e26b8dfb5d33af6da32ed89e3 slmon-0.5.13.tar.gz 103826 +RMD160 e60d2c645955cc49e3b32d89f1ea199623176c73 slmon-0.5.13.tar.gz 103826 +SHA256 dc38740e4e0cccb86ccf76aaad5734d7d1e42e144615ee09bc8c8c9290110b28 slmon-0.5.13.tar.gz 103826 diff --git a/app-misc/slmon/files/slmon-0.5.13-slang-2.patch b/app-misc/slmon/files/slmon-0.5.13-slang-2.patch new file mode 100644 index 000000000000..bb826579b3a8 --- /dev/null +++ b/app-misc/slmon/files/slmon-0.5.13-slang-2.patch @@ -0,0 +1,47 @@ +diff -ur slmon-0.5.13.orig/configure.in slmon-0.5.13/configure.in +--- slmon-0.5.13.orig/configure.in 2004-08-10 20:47:30.000000000 +0300 ++++ slmon-0.5.13/configure.in 2008-01-24 20:57:35.000000000 +0200 +@@ -73,21 +73,17 @@ + AC_MSG_RESULT("found version 99") + fi + +-AC_CHECK_LIB(slang, SLang_init_tty, slang_found="yes") +-if test x$slang_found = xyes +-then +- AC_CHECK_HEADERS(slang.h, slang_h_found="yes") +-fi ++AC_CHECK_LIB(slang-2, SLang_init_tty, slang_found="yes") + if test x$slang_h_found = xyes + then +- LIBS="$LIBS -lslang" ++ LIBS="$LIBS -lslang-2" + AC_DEFINE(HAVE_SLANG) + else +- AC_CHECK_HEADERS(slang/slang.h, slang_h_found="yes") ++ AC_CHECK_HEADERS(slang-2/slang.h, slang_h_found="yes") + if test x$slang_h_found = xyes + then + AC_DEFINE(HAVE_SLANG) +- LIBS="$LIBS -lslang" ++ LIBS="$LIBS -lslang-2" + else + AC_MSG_WARN("Slang not found") + fi +diff -ur slmon-0.5.13.orig/defines.h slmon-0.5.13/defines.h +--- slmon-0.5.13.orig/defines.h 2004-06-20 18:56:47.000000000 +0300 ++++ slmon-0.5.13/defines.h 2008-01-24 20:59:52.000000000 +0200 +@@ -27,13 +27,7 @@ + #include <utmp.h> + #include <getopt.h> + +-#ifdef HAVE_SLANG_H +-#include <slang.h> +-#endif /* !HAVE_SLANG_H */ +- +-#ifdef HAVE_SLANG_SLANG_H +-#include<slang/slang.h> +-#endif /* !HAVE_SLANG_SLANG_H */ ++#include <slang-2/slang.h> + + #include <signal.h> + #include <sys/utsname.h> diff --git a/app-misc/slmon/slmon-0.5.13-r1.ebuild b/app-misc/slmon/slmon-0.5.13-r1.ebuild new file mode 100644 index 000000000000..f8372de5e196 --- /dev/null +++ b/app-misc/slmon/slmon-0.5.13-r1.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/slmon/slmon-0.5.13-r1.ebuild,v 1.1 2008/01/24 19:03:48 drac Exp $ + +inherit autotools eutils + +DESCRIPTION="Colored text-based system performance monitor" +HOMEPAGE="http://slmon.sourceforge.net" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug" + +RDEPEND=">=dev-libs/glib-2 + >=sys-libs/slang-2 + gnome-base/libgtop" +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-invalid-free.patch # bug 151293 + epatch "${FILESDIR}"/${P}-slang-2.patch + eautoconf +} + +src_compile() { + econf $(use_enable debug) + emake || die "emake failed." +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed." + dodoc AUTHORS ChangeLog README slmonrc TODO + dohtml *.html +} |