From d608078794fa4482e4d52c74c6fc03bee1ead4a6 Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Tue, 15 Mar 2011 09:42:47 +0000 Subject: Sync live ebuild again. There is no manpage now so drop needless gunzip. (Portage version: 2.2.0_alpha26/cvs/Linux x86_64) --- sys-power/powertop/ChangeLog | 6 +++++- sys-power/powertop/powertop-1.97-r1.ebuild | 3 +-- sys-power/powertop/powertop-9999.ebuild | 33 +++++++++++++++++++++--------- 3 files changed, 29 insertions(+), 13 deletions(-) (limited to 'sys-power') diff --git a/sys-power/powertop/ChangeLog b/sys-power/powertop/ChangeLog index f0b7266fe2ac..882a35fac757 100644 --- a/sys-power/powertop/ChangeLog +++ b/sys-power/powertop/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-power/powertop # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/ChangeLog,v 1.43 2011/03/14 21:53:45 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/ChangeLog,v 1.44 2011/03/15 09:42:47 scarabeus Exp $ + + 15 Mar 2011; Tomáš Chvátal powertop-1.97-r1.ebuild, + powertop-9999.ebuild: + Sync live ebuild again. There is no manpage now so drop needless gunzip. 14 Mar 2011; Jeroen Roovers powertop-1.97-r1.ebuild: Add more build time and run time dependencies (bug #358869). diff --git a/sys-power/powertop/powertop-1.97-r1.ebuild b/sys-power/powertop/powertop-1.97-r1.ebuild index 874c159b3ce8..46d973cd629a 100644 --- a/sys-power/powertop/powertop-1.97-r1.ebuild +++ b/sys-power/powertop/powertop-1.97-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-1.97-r1.ebuild,v 1.2 2011/03/14 21:53:45 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-1.97-r1.ebuild,v 1.3 2011/03/15 09:42:47 scarabeus Exp $ EAPI=4 @@ -45,7 +45,6 @@ src_configure() { src_install() { emake install DESTDIR="${ED}" dodoc TODO README - gunzip "${ED}"/usr/share/man/man1/powertop.1.gz keepdir /var/cache/powertop } diff --git a/sys-power/powertop/powertop-9999.ebuild b/sys-power/powertop/powertop-9999.ebuild index 0bcb6849671b..74374ee8bb9c 100644 --- a/sys-power/powertop/powertop-9999.ebuild +++ b/sys-power/powertop/powertop-9999.ebuild @@ -1,39 +1,52 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-9999.ebuild,v 1.3 2011/03/14 09:45:03 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-9999.ebuild,v 1.4 2011/03/15 09:42:47 scarabeus Exp $ EAPI=4 -inherit eutils +inherit eutils toolchain-funcs git DESCRIPTION="tool that helps you find what software is using the most power" HOMEPAGE="http://www.lesswatts.org/projects/powertop/" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/status/powertop/powertop.git" SRC_URI="" +EGIT_REPO_URI="git://git.kernel.org/pub/scm/status/powertop/powertop.git" LICENSE="GPL-2" SLOT="0" -KEYWORDS="" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="unicode" -DEPEND="sys-libs/ncurses[unicode?] +DEPEND=" dev-libs/libnl - sys-devel/gettext" -RDEPEND="${DEPEND}" + sys-apps/pciutils + sys-devel/gettext + sys-libs/ncurses[unicode?] + sys-libs/zlib +" +RDEPEND=" + ${DEPEND} + net-wireless/bluez + x11-apps/xset +" src_prepare() { use unicode || sed -i 's:-lncursesw:-lncurses:' Makefile # fix ldflags sed -i \ - -e 's:g++ $(OBJS) $(LIBS) -o powertop:$(CXX) $(LDFLAGS) $(OBJS) $(LIBS) -o powertop:' \ - -e 's:gcc:$(CC):' \ + -e '/-o powertop/s:g++:$(CXX) $(CFLAGS) $(LDFLAGS):' \ + -e 's: -O2 -g -fno-omit-frame-pointer -fstack-protector::g' \ + -e 's:gcc:$(CC) $(CFLAGS):' \ Makefile || die } +src_configure() { + tc-export CC CXX +} + src_install() { emake install DESTDIR="${ED}" dodoc TODO README - gunzip "${ED}"/usr/share/man/man1/powertop.1.gz + keepdir /var/cache/powertop } pkg_postinst() { -- cgit v1.2.3-65-gdbad