Remove stupid USE=unicode requirement and make sure LDFLAGS are respected.

Package-Manager: portage-2.1.2.8

3 files changed, 31 insertions, 18 deletions

diff --git a/sys-power/powertop/ChangeLog b/sys-power/powertop/ChangeLog
index 7b725f95c926..ab6a62793ab7 100644
--- a/sys-power/powertop/ChangeLog
+++ b/sys-power/powertop/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-power/powertop
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/ChangeLog,v 1.8 2007/05/30 00:06:43 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/ChangeLog,v 1.9 2007/05/31 08:09:07 vapier Exp $
+
+  31 May 2007; Mike Frysinger <vapier@gentoo.org> powertop-1.5.ebuild:
+  Remove stupid USE=unicode requirement and make sure LDFLAGS are respected.
 
   29 May 2007; Stefan Schweizer <genstef@gentoo.org> powertop-1.5.ebuild:
   work around portage trying to compress twice thanks Andre
diff --git a/sys-power/powertop/Manifest b/sys-power/powertop/Manifest
index ae3ee09d3216..9ec1b1453c35 100644
--- a/sys-power/powertop/Manifest
+++ b/sys-power/powertop/Manifest
@@ -1,12 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST powertop-1.5.tar.gz 35660 RMD160 772ea98e225ec5de239005597fefafbeda1fd370 SHA1 429328cc27c78704e2416eae64ec3a2c3ff19f9d SHA256 8c5743b70453db4082dc6bca1cc23b5e48540ae3b5084b9b013b1a7c08061c4d
-EBUILD powertop-1.5.ebuild 1053 RMD160 acb0e1b322c755afb33b8be2a03753b6d39d643e SHA1 d529c9a28a10be216a74b08f0d0a4cafa0a36e11 SHA256 60d11dc6d7f65919a6e55115df1b728f078b604a83b5cc31f06d1ece6635257e
-MD5 12387e3c3152d61abcf860657f66b588 powertop-1.5.ebuild 1053
-RMD160 acb0e1b322c755afb33b8be2a03753b6d39d643e powertop-1.5.ebuild 1053
-SHA256 60d11dc6d7f65919a6e55115df1b728f078b604a83b5cc31f06d1ece6635257e powertop-1.5.ebuild 1053
-MISC ChangeLog 1631 RMD160 7a0f24149ec59f604e2d427f8baf2f7aa854807a SHA1 db2d0ef8c514376bc1552a119af04af8030d05f6 SHA256 1e83f9dbe1c9d514875620e3a80da4b6542ac03d21d7454b0251a7cc3fd7b32a
-MD5 c25010fc19dd05925e5d5fdad2bef6c1 ChangeLog 1631
-RMD160 7a0f24149ec59f604e2d427f8baf2f7aa854807a ChangeLog 1631
-SHA256 1e83f9dbe1c9d514875620e3a80da4b6542ac03d21d7454b0251a7cc3fd7b32a ChangeLog 1631
+EBUILD powertop-1.5.ebuild 1013 RMD160 d04f318cebc79b744c42c22b32f40d1a323938d3 SHA1 6edf6927559d819b4038e220b35a71604ab134a4 SHA256 ed33b37e3d3b7c065e1edbf2245de55ebed3d89992360421ab5c252a3c6380ef
+MD5 d3bedb8561f92562805bfe6d7fba83c5 powertop-1.5.ebuild 1013
+RMD160 d04f318cebc79b744c42c22b32f40d1a323938d3 powertop-1.5.ebuild 1013
+SHA256 ed33b37e3d3b7c065e1edbf2245de55ebed3d89992360421ab5c252a3c6380ef powertop-1.5.ebuild 1013
+MISC ChangeLog 1779 RMD160 08e71665eff91ed3b5e027e75ad2eb7b10975471 SHA1 8668956dffd7868a77572ea393ff295ab372cd8d SHA256 e43fc25a6f8305a730b1e06b3009aa39633d244b8a8ec4822e9f8921f2199ff9
+MD5 a7a155514b932238db9f8c216bd11de8 ChangeLog 1779
+RMD160 08e71665eff91ed3b5e027e75ad2eb7b10975471 ChangeLog 1779
+SHA256 e43fc25a6f8305a730b1e06b3009aa39633d244b8a8ec4822e9f8921f2199ff9 ChangeLog 1779
 MISC metadata.xml 161 RMD160 a5e1f234c4886ff31d39f229a0cf30d0bfcea869 SHA1 3876fd42cd9e63a7edb04c5025d53d773aa80bc3 SHA256 838bd208a7f948ea9b4e2b8869464622bc64a2f02468de4c3d7f6c2530e28e89
 MD5 87b4fef99cfd40eeaad036b7e44efde5 metadata.xml 161
 RMD160 a5e1f234c4886ff31d39f229a0cf30d0bfcea869 metadata.xml 161
@@ -14,3 +17,10 @@ SHA256 838bd208a7f948ea9b4e2b8869464622bc64a2f02468de4c3d7f6c2530e28e89 metadata
 MD5 445d0462203452d5a84c043a6f68d080 files/digest-powertop-1.5 235
 RMD160 ac9be26548036e9d7c234e883bf423b18e1c1e56 files/digest-powertop-1.5 235
 SHA256 09df533801c0214fd33bfd87dac536e181f63f9cab42d43dd963b22a261227c8 files/digest-powertop-1.5 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGXoL68bi6rjpTunYRAvIZAKC7/vXePb+sx2peMxCOPdCcqgKZVgCffdXm
+JiWIwtemg4k541g7t5l8rLo=
+=jEhz
+-----END PGP SIGNATURE-----
diff --git a/sys-power/powertop/powertop-1.5.ebuild b/sys-power/powertop/powertop-1.5.ebuild
index 6811a67a6f5f..3f5ded6d2042 100644
--- a/sys-power/powertop/powertop-1.5.ebuild
+++ b/sys-power/powertop/powertop-1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-1.5.ebuild,v 1.2 2007/05/30 00:06:43 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-1.5.ebuild,v 1.3 2007/05/31 08:09:07 vapier Exp $
 
 inherit toolchain-funcs eutils
 
@@ -11,15 +11,15 @@ SRC_URI="http://www.linuxpowertop.org/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="unicode"
+
 DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}"
 
-pkg_setup() {
-	if ! built_with_use sys-libs/ncurses unicode; then
-		eerror "You need USE=unicode for sys-libs/ncurses"
-		die "You need USE=unicode for sys-libs/ncurses"
-	fi
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i '/${CFLAGS}/s:$: ${LDFLAGS}:' Makefile
+	use unicode || sed -i 's:-lncursesw:-lncurses:' Makefile
 }
 
 src_compile() {
@@ -30,7 +30,7 @@ src_compile() {
 src_install() {
 	emake install DESTDIR="${D}" || die
 	dodoc Changelog README
-	gunzip ${D}/usr/share/man/man1/powertop.1.gz
+	gunzip "${D}"/usr/share/man/man1/powertop.1.gz
 }
 
 pkg_postinst() {