From 2314f065c09fe024421f27049b8e0e9f195e63b8 Mon Sep 17 00:00:00 2001 From: Andrea Rizzolo Date: Thu, 25 Nov 2010 21:39:40 +0100 Subject: [PATCH] updated lcd-stuff-9999.ebuild: - ebuild now uses cmake eclass - IUSEs changed --- app-misc/lcd-stuff/Manifest | 2 +- app-misc/lcd-stuff/lcd-stuff-9999.ebuild | 45 ++++++++++++++------------------ 2 files changed, 20 insertions(+), 27 deletions(-) diff --git a/app-misc/lcd-stuff/Manifest b/app-misc/lcd-stuff/Manifest index 382900b..2a09507 100644 --- a/app-misc/lcd-stuff/Manifest +++ b/app-misc/lcd-stuff/Manifest @@ -4,4 +4,4 @@ AUX lcd-stuff-0.1.3-socket-h.patch 920 RMD160 9baadb9fd966b076f14982a6cedc75dbad AUX lcd-stuff.confd 285 RMD160 09ad0c69d449e1aaec6048161ad6c27caa50eade SHA1 3980be53d0c40aac0b7f8ce754d2e39e749a00de SHA256 75c34d6b3b605bcbbb7151188366d1cbb67960f76c3ebeff25c732ca593f7a65 DIST lcd-stuff-0.1.7.tar.bz2 129968 RMD160 ff153eb30dd580b15895aea577d856e408581b60 SHA1 376e29ac4fb531042d42417aa0d1a531ae258a5c SHA256 5a4b2fde5cb00855c54f0c1bdf990a3f251264092f05729c61fef1878162d3c2 EBUILD lcd-stuff-0.1.7.ebuild 1390 RMD160 b4a87919f36a00f9a10bf7057a36d0cb2e41c25c SHA1 3d5c9b9920bc7cb8771b681b9dd101fe424806e4 SHA256 2827abdeb0e85fb29cdd8b502a43f63adf0d79202c96837965adecbb40192f35 -EBUILD lcd-stuff-9999.ebuild 1460 RMD160 58d633d44096c18002814fb016d3984873d6ffdd SHA1 02a3a586cd4d059ebe52bb9366946636826b0c81 SHA256 b0afa88ecc0a304d95314158ed8ea9906eaf0f3047317223d37aa1bcd359ccaa +EBUILD lcd-stuff-9999.ebuild 1213 RMD160 8df00037b7a1abb2675d8d904958ddcc48daed0b SHA1 3fdd44d2d1e222e4212a0093d966b869502c40fd SHA256 bd47fe791f8f421b88e12df74e2e1d806d4df95e9acffab7e2d63b6e01222d71 diff --git a/app-misc/lcd-stuff/lcd-stuff-9999.ebuild b/app-misc/lcd-stuff/lcd-stuff-9999.ebuild index 06e9c75..649d08d 100644 --- a/app-misc/lcd-stuff/lcd-stuff-9999.ebuild +++ b/app-misc/lcd-stuff/lcd-stuff-9999.ebuild @@ -2,15 +2,14 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-misc/lcd-stuff/lcd-stuff-0.1.6.ebuild,v 1.2 2009/11/09 13:20:57 maekke Exp $ -EAPI=2 -inherit eutils git +EAPI=3 +inherit git cmake-utils DESCRIPTION="lcd-stuff is a client for lcdproc that displays RSS, Weather, MPD and new mail." HOMEPAGE="http://lcd-stuff.berlios.de/" EGIT_REPO_URI="git://git.berlios.de/lcd-stuff" EGIT_PROJECT="lcd-stuff" - KEYWORDS="amd64 x86" SLOT="0" LICENSE="GPL-2" # and GPL-2 only @@ -18,40 +17,34 @@ LICENSE="GPL-2" # and GPL-2 only RDEPEND="app-misc/lcdproc net-misc/curl dev-libs/glib - imap? ( net-libs/libetpan ) + mail? ( net-libs/libetpan ) mpd? ( >=media-libs/libmpd-0.12.0 ) - mp3? ( media-libs/taglib ) - xml? ( net-libs/libnxml ) + weather? ( net-libs/libnxml ) rss? ( net-libs/libmrss net-libs/libnxml )" DEPEND="${DEPEND} dev-util/pkgconfig" -IUSE="imap mpd mp3 xml rss" +IUSE="mail mpd weather rss" + +src_unpack() { + git_src_unpack +} + src_configure() { - cd "${S}" - ./autogen.sh - local XMLRSSLIB="$(use_enable rss mrss)" - if use rss ; then - # If we want rss, we must also have xml - XMLRSSLIB="${XMLRSSLIB} --enable-nxml" - else - XMLRSSLIB="${XMLRSSLIB} $(use_enable xml nxml)" - fi - - econf \ - $(use_enable imap libetpan) \ - $(use_enable mpd libmpd) \ - $(use_enable mp3 taglib_c) \ - $XMLRSSLIB \ - || die "configure failed" + mycmakeargs=( + $(cmake-utils_use_enable mail MAIL) + $(cmake-utils_use_enable mpd MPD) + $(cmake-utils_use_enable weather WEATHER) + $(cmake-utils_use_enable rss RSS) + ) + cmake-utils_src_configure + } src_install() { - emake DESTDIR="${D}" install || die "make install failed" - insinto /etc - doins lcd-stuff.conf + cmake-utils_src_install newconfd "${FILESDIR}/${PN}.confd" ${PN} newinitd "${FILESDIR}/${PN}-0.1.2-r1.initd" ${PN} -- 2.11.4.GIT