Fix slmon to work with slang 2.1.3.

Package-Manager: portage-2.1.4.1

5 files changed, 10 insertions, 93 deletions

diff --git a/app-misc/slmon/ChangeLog b/app-misc/slmon/ChangeLog
index 153d7f3438fc..3504745208d4 100644
--- a/app-misc/slmon/ChangeLog
+++ b/app-misc/slmon/ChangeLog
@@ -1,6 +1,11 @@
 # 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.12 2008/01/24 19:03:48 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/slmon/ChangeLog,v 1.13 2008/02/09 05:46:39 drac Exp $
+
+  09 Feb 2008; Samuli Suominen <drac@gentoo.org>
+  -files/slmon-0.5.13-slang-2.patch, slmon-0.5.13.ebuild,
+  -slmon-0.5.13-r1.ebuild:
+  Fix slmon to work with slang 2.1.3.
 
 *slmon-0.5.13-r1 (24 Jan 2008)
 
diff --git a/app-misc/slmon/Manifest b/app-misc/slmon/Manifest
index e310d7a31fe9..0153878a2c44 100644
--- a/app-misc/slmon/Manifest
+++ b/app-misc/slmon/Manifest
@@ -1,7 +1,5 @@
 AUX slmon-0.5.13-invalid-free.patch 429 RMD160 20486b35f1c2e126bd5c8dd9a83a99c617d94308 SHA1 2bbb56783d1768e567062cc58c89f5140d1dda64 SHA256 7d5a9677d7b856e10dacae147c3c902d494763313c46abed61be98baf2d44c58
-AUX slmon-0.5.13-slang-2.patch 1349 RMD160 14f10aa3cb1c2633125d008e425055fad1937034 SHA1 aa0f3d8e00a4bc39b6b9fb1f98171c6ce8204ceb SHA256 bc36d20825f4ed548ea6bfc2a93ef266daf7b53bd9117d2ebacdcba2d828270f
 DIST slmon-0.5.13.tar.gz 103826 RMD160 e60d2c645955cc49e3b32d89f1ea199623176c73 SHA1 b425b400d8a7d30092ace2ca4d8a9bc1899104eb SHA256 dc38740e4e0cccb86ccf76aaad5734d7d1e42e144615ee09bc8c8c9290110b28
-EBUILD slmon-0.5.13-r1.ebuild 933 RMD160 9d3cd7fbe6b102cb45e389c57ebf68174ca65db0 SHA1 df4a04a4ac6163d8098160072f16e84e0e4f7c2d SHA256 6eba1e37f6c6b12187f350a553421747c4aeec86b5e683ee506d836844f85f37
-EBUILD slmon-0.5.13.ebuild 867 RMD160 f5f665638a3556cbb1d4d0801abc7b8a11f3ebc8 SHA1 a51cbc4ac2ec831520960fc7aa381b574aff752e SHA256 09da90c407f8272ef71a4acaf8ef3c9e8a3cf6f8c129b02ccb11680abf37ff87
-MISC ChangeLog 1535 RMD160 2d64a0175fc87833a20bf7c6486b0f195e8900a8 SHA1 8236e58ca5e9302f97f2276e470d67634aeef930 SHA256 6f3fa1b1e02f9c74587940ba5800f64572959fb9f43873beebfd964f1f748937
+EBUILD slmon-0.5.13.ebuild 863 RMD160 723c16fd1285c0f2a5c76b07d189b3b9781a01ca SHA1 4b826c2aab7aaadd531499225b1245eb29222736 SHA256 b363fbbe1fb2cc7a183aa30faabec83ade400875b5d06ab1d88d56605bda5f49
+MISC ChangeLog 1708 RMD160 0878bb163eb68149caa3c2c151af68ce2b1a774c SHA1 7ac0905619da1e20029583f490e497139ee330fd SHA256 be17a40986ed325dda01765ecfc4a6fd3a263ed4b31680b6c93ae9dace511650
 MISC metadata.xml 237 RMD160 c8e67b9ed38f0b1f4a09268a438fd51981e0a017 SHA1 893e2795205e43c12fbb4b034fb48356f047b449 SHA256 ba5b60fec3f01393f9e5a70f37a0372d8e99b6b15934baefa95566dce16dd3d8
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
deleted file mode 100644
index bb826579b3a8..000000000000
--- a/app-misc/slmon/files/slmon-0.5.13-slang-2.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-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
deleted file mode 100644
index f8372de5e196..000000000000
--- a/app-misc/slmon/slmon-0.5.13-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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
-}
diff --git a/app-misc/slmon/slmon-0.5.13.ebuild b/app-misc/slmon/slmon-0.5.13.ebuild
index 8586f1fcb638..aa1bc097317c 100644
--- a/app-misc/slmon/slmon-0.5.13.ebuild
+++ b/app-misc/slmon/slmon-0.5.13.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.3 2008/01/24 18:41:13 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/slmon/slmon-0.5.13.ebuild,v 1.4 2008/02/09 05:46:39 drac Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 x86"
 IUSE="debug"
 
 RDEPEND=">=dev-libs/glib-2
-	=sys-libs/slang-1*
+	sys-libs/slang
 	gnome-base/libgtop"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"