From d4e56c17d9b4cbd8806c82b9f152239d7d327947 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Wed, 19 Nov 2014 09:54:41 +0000 Subject: [PATCH] Fix building against sys-libs/ncurses[tinfo] (bug #529782). Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xA792A613 --- x11-misc/xrestop/ChangeLog | 8 ++++-- x11-misc/xrestop/Manifest | 19 ++++++++++--- .../xrestop/files/xrestop-0.4-tinfo.patch | 10 +++++++ x11-misc/xrestop/xrestop-0.4.ebuild | 28 ++++++++++++------- 4 files changed, 49 insertions(+), 16 deletions(-) create mode 100644 x11-misc/xrestop/files/xrestop-0.4-tinfo.patch diff --git a/x11-misc/xrestop/ChangeLog b/x11-misc/xrestop/ChangeLog index 79d6aa1e8d78..e39f2d3f7be3 100644 --- a/x11-misc/xrestop/ChangeLog +++ b/x11-misc/xrestop/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/xrestop -# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrestop/ChangeLog,v 1.28 2007/05/30 16:58:19 armin76 Exp $ +# Copyright 2000-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrestop/ChangeLog,v 1.29 2014/11/19 09:54:39 jer Exp $ + + 19 Nov 2014; Jeroen Roovers xrestop-0.4.ebuild, + +files/xrestop-0.4-tinfo.patch: + Fix building against sys-libs/ncurses[tinfo] (bug #529782). 30 May 2007; Raúl Porcel xrestop-0.4.ebuild: alpha stable wrt #157780 diff --git a/x11-misc/xrestop/Manifest b/x11-misc/xrestop/Manifest index 882f78a50691..275b8937b384 100644 --- a/x11-misc/xrestop/Manifest +++ b/x11-misc/xrestop/Manifest @@ -1,4 +1,15 @@ -DIST xrestop-0.4.tar.gz 92308 RMD160 13113e1de0d2206106a274917fd9a0decd301837 SHA1 040b0ac561f4de0a04e9db42a2cfab918801c452 SHA256 67c2fc94a7ecedbaae0d1837e82e93d1d98f4a6d759828860e552119af3ce257 -EBUILD xrestop-0.4.ebuild 722 RMD160 7d95bead93ad72cb66334a105056b6ea1b2f4c6c SHA1 8d7584de14bc85292513a24d1c66404acfe9f3f5 SHA256 be3412af307269e57957b90b2ab75901ab06bffdd7c90b3155b86b4aa59a7eef -MISC ChangeLog 3208 RMD160 e567265d05d6276fec86aa4b7fe0f96848fbf666 SHA1 f853c9d163d40d151fff38b963e59d1227024f38 SHA256 a75838e22938d4231be9bea71768b4d115b7e666167e37aa9670bc639fa18bc3 -MISC metadata.xml 173 RMD160 f74c5ca8d8aa0d0897c7c107f6eb4424d4f4343e SHA1 ca2ea648208cc74669b8a084f1b74e5cd4415777 SHA256 2f2c48f12680e78f700e809ba6ff98c67b1ea8b707291659c1bfb6b20d28835f +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX xrestop-0.4-tinfo.patch 291 SHA256 625dc01f2595fb92f7713d0231668c2ea0957298c5bbf642e579aad724d866fc SHA512 21993ada033d4ec744b55faa71afd736a99423f12071a64e1445958de979631ce42a908e14ef194e819de98766c92a2c2470b2c88d172879ec5fc4c20212566f WHIRLPOOL 08b348cbb2d4e5936d309d3e53afa75d852be9fa72f341a998658069ab129230d69e99f1ef66b804393534d088523556db4d5522e7618133abe2c1adec7388f0 +DIST xrestop-0.4.tar.gz 92308 SHA256 67c2fc94a7ecedbaae0d1837e82e93d1d98f4a6d759828860e552119af3ce257 SHA512 eb7bf2f3ab7b73708c96d56fd466cb362d711242dd46992fa3e693af2d26995e9baa91075eb445ef227e1342deec5e0e22b37139e80399e4051c9f5cad8fd9b6 WHIRLPOOL 87f3679b529728d4dc16fb5b93e0ef19908c9304bd540d8bc8b7b813da5d43668878592f056c8f849a21b7b7f6ab0c72503e9b0456fec3a1234894bf302b8c09 +EBUILD xrestop-0.4.ebuild 745 SHA256 ef71b40eae3d1c04d167a25a34161e50d90319161309c53787123c89e209b3d4 SHA512 6e1e4eebd26eee7e728dbab73f47297dbf845078b27bf9af1535222247d074a5a10b300906e7512dcd1fa341b74acad6aa3c79d0a841c5a4c74f7a5ad2b57a65 WHIRLPOOL 857819138953a594e2930e7a47e7edbd765a5777203db2d1e9bc7cfbef4a4fd7ee05980c97f9595c1a56561d7b35b6e5201fcff02d8ba5ed667d777a3c5bbf99 +MISC ChangeLog 3368 SHA256 b6c23541aaa6dc52da44197402a1005e634dc0056d8702c181855468a31ce9dc SHA512 1dab1c9101ab979645bdf873b8821b378e32b953fdc338913a85a934148bfffaaf88a526cb007a8bbc2d9bc406892e1221d39ab6a5a65fedf439b3934e10057a WHIRLPOOL 0041cb6c4d8e6e7bae5ec7418a50a76ac8c9010d2dc9522d985e24c8fd314ca5e73f0f71dcf4d23453642ae6a554a67864149c846f0b9324f08a51d3c71ee460 +MISC metadata.xml 173 SHA256 2f2c48f12680e78f700e809ba6ff98c67b1ea8b707291659c1bfb6b20d28835f SHA512 0f9f902a37286192de62589f1aace6bec3cfe2a8511ac95e98b55324a9da1a5e79b8f14316e1be0b818e90c0be0cec5fe16f75d9055301a774b241e1486f62c2 WHIRLPOOL 0d0c57c7890f2cdb7210d2d1d61d03d412478747414999bc7919d70b8243ddc66d7903df50158671e8cc454913b4d859f752bbe3709404aa15608e1f1234d717 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iEYEAREIAAYFAlRsaOEACgkQVWmRsqeSphOrigCggD5ruTYmxT2ilNo9I3S3ogMX +h9QAn1baxahbo2nluiaSber5UIfMxYva +=Ni0G +-----END PGP SIGNATURE----- diff --git a/x11-misc/xrestop/files/xrestop-0.4-tinfo.patch b/x11-misc/xrestop/files/xrestop-0.4-tinfo.patch new file mode 100644 index 000000000000..ef2de121e839 --- /dev/null +++ b/x11-misc/xrestop/files/xrestop-0.4-tinfo.patch @@ -0,0 +1,10 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -65,6 +65,7 @@ + + # check for ncurses, fall back to curses + AC_CHECK_LIB([ncurses], [initscr],,AC_CHECK_LIB([curses], [initscr])) ++AC_SEARCH_LIBS([stdscr], [tinfo]) + + if test "x$GCC" = "xyes"; then + GCC_WARNINGS="-Wall -fno-strict-aliasing" diff --git a/x11-misc/xrestop/xrestop-0.4.ebuild b/x11-misc/xrestop/xrestop-0.4.ebuild index 0dc5812339e7..bff634f4bb85 100644 --- a/x11-misc/xrestop/xrestop-0.4.ebuild +++ b/x11-misc/xrestop/xrestop-0.4.ebuild @@ -1,6 +1,9 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrestop/xrestop-0.4.ebuild,v 1.10 2007/05/30 16:58:19 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrestop/xrestop-0.4.ebuild,v 1.11 2014/11/19 09:54:39 jer Exp $ + +EAPI=5 +inherit autotools eutils DESCRIPTION="'Top' like statistics of X11 client's server side resource usage" HOMEPAGE="http://www.freedesktop.org/wiki/Software/xrestop" @@ -9,15 +12,20 @@ SRC_URI="http://projects.o-hand.com/sources/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="alpha amd64 hppa ppc sparc x86 ~x86-fbsd" -IUSE="" -RDEPEND="x11-libs/libXres +RDEPEND=" x11-libs/libX11 - x11-libs/libXt" -DEPEND="${RDEPEND} - x11-proto/xproto" + x11-libs/libXres + x11-libs/libXt +" +DEPEND=" + ${RDEPEND} + x11-proto/xproto +" -src_install () { - make DESTDIR="${D}" install || die "make install failed" - dodoc AUTHORS ChangeLog NEWS README +src_prepare() { + epatch "${FILESDIR}"/${P}-tinfo.patch + eautoreconf } + +DOCS=( AUTHORS ChangeLog NEWS README ) -- 2.26.2