Revert incorrect libnl change (powertop works with libnl ver 1, 2, or 3), and further clean up the build.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

6 files changed, 123 insertions, 33 deletions

diff --git a/sys-power/powertop/ChangeLog b/sys-power/powertop/ChangeLog
index dbb6bc88ac09..660f5cbe3f80 100644
--- a/sys-power/powertop/ChangeLog
+++ b/sys-power/powertop/ChangeLog
@@ -1,6 +1,12 @@
 # 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.47 2011/10/27 16:21:54 jer Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/ChangeLog,v 1.48 2012/04/19 01:22:34 vapier Exp $
+
+  19 Apr 2012; Mike Frysinger <vapier@gentoo.org> powertop-1.98.ebuild,
+  files/powertop-1.98-build.patch, +files/powertop-1.98-build-libnl-3.patch,
+  powertop-9999.ebuild:
+  Revert incorrect libnl change (powertop works with libnl ver 1, 2, or 3), and
+  further clean up the build.
 
   27 Oct 2011; Jeroen Roovers <jer@gentoo.org> powertop-1.97-r1.ebuild,
   powertop-1.98.ebuild:
diff --git a/sys-power/powertop/Manifest b/sys-power/powertop/Manifest
index 2727cf780193..405e68d1bff4 100644
--- a/sys-power/powertop/Manifest
+++ b/sys-power/powertop/Manifest
@@ -2,7 +2,8 @@
 Hash: SHA1
 
 AUX powertop-1.98-build-cc.patch 704 RMD160 487e240229d57fabf82dc6c1979123fc3055f6b9 SHA1 55a3fe982b5e24e208ce137d143a39929fb36532 SHA256 36ccfeec0c64f0131415238316e14fee2239d4af0a52b48c0162181f49ad9457
-AUX powertop-1.98-build.patch 690 RMD160 2253b0387e3fbb1163eb19e04fbe90b737149f17 SHA1 b1028d11b19c30c48d24454f546ca4c490a8151b SHA256 094ac006dbd6fa09c2b7eee3ff59b362f2d05f45c11ab5ba266564fa21907b32
+AUX powertop-1.98-build-libnl-3.patch 611 RMD160 351d9db264b89a2976d209a2759055b14fa90296 SHA1 ccfa0bf775208e17b9b6577b1f5393f166e5be6b SHA256 0799362cdf6923a1a8a0c9ac61097dbaa6ffa21d5b0dd038bae44f58102e4328
+AUX powertop-1.98-build.patch 2266 RMD160 b8be82c9f2763e0a566768bf0a99cee65209ca55 SHA1 3bc5880bcf2994fac6b37a7c490ee5b50120ee79 SHA256 8b76948494deb0bece80e7300ec8f84c2fab7bf1d79838faa3e52478142ebfeb
 DIST powertop-1.11.tar.gz 73136 RMD160 be05916afbb808ae17f6becbef7d456a753bd652 SHA1 d1d71db9a0854fab51f295a87ec505d89e451de3 SHA256 70e7cc53e5fbade5e447bda9f0ca12f2153bf426e074dbac3a2e97adf46180f2
 DIST powertop-1.13.tar.gz 104675 RMD160 e6cf649e387a9a6f8cf036ddfa0f5def50303f76 SHA1 91a6f1ec9ca768c1a04409e154e6909458028d66 SHA256 2bc866089496877dd26d2d316ad5763ab8ecb5e28aefba44bc5d355dcdc58d98
 DIST powertop-1.97.tar.bz2 84657 RMD160 8e9f0db989a42a9a368a45cbf6e9e1985e3fb82a SHA1 0227d5199ef3092915a62aca63aaa1d3ba1a9c12 SHA256 d3dafe1ce4dabeb4edb724616d7b8533ac40ed71fca43e81b007e9fd7011e516
@@ -10,14 +11,24 @@ DIST powertop-1.98.tar.bz2 88110 RMD160 ebbd0867aba4d2a72584e19e3ab55c50cd82911c
 EBUILD powertop-1.11.ebuild 1103 RMD160 352796f0e4974260fe498de282270cb388e211bc SHA1 137f2c60671829387c573203f9813a6f33f50e2a SHA256 5c961061f2e057b2258f55323c0d618006abf9039816d3811064ca0f6fa84911
 EBUILD powertop-1.13.ebuild 1121 RMD160 6e9e4a84aaf6b643a4cd83f28516b0e51d36d5e9 SHA1 84deca5fe572d0820751741fb8c5bf8c114e33b4 SHA256 ad10c47049432ef0f9047eee7c5c6db033843f699cd2003c5b087169a296a030
 EBUILD powertop-1.97-r1.ebuild 1290 RMD160 6fbe1dab20b7d9986d87fe7baf9b04aafe59a4a9 SHA1 9362d7f11e5f3f581e35e2d4d326ece6c49137c4 SHA256 4004da3a6e306bc45c7058ba918798733b06a321c1472ed56ae1cae58b1a1706
-EBUILD powertop-1.98.ebuild 1505 RMD160 ecae9299a81bde16873202b09d68a870f8e4cfd4 SHA1 5233e2bbe2032e1515ceff8992a02a1d8ba9fdbe SHA256 3f551589ddaeb1428258b446c0694003b5b4ddabf43d5ac412822796265be3e9
-EBUILD powertop-9999.ebuild 1504 RMD160 15b97a3637d20db66ec51f6307f997d55b8961cb SHA1 3b450bb34c881f166344e0d64bae1fb65dc8a328 SHA256 c51f32f6d6dd366c515d54791274ba9d3ce8af573680796fcb3cc08f1c80725e
-MISC ChangeLog 6752 RMD160 3af636c94d9c425751c8e82d7651df41a76a4386 SHA1 38527a6edb6b4cd8276288aabce2ac9e5ddbb31b SHA256 f79ef4ff5add820a8a490fed9446c009f02745782d2e47f64b9adc34b610fd43
+EBUILD powertop-1.98.ebuild 1372 RMD160 bf4374af3e878702e75dbc49ff6cb00c51063b5a SHA1 86df5d1f03a58a617cfa82b2e09f2c72c93010a9 SHA256 31ba70fcb3f1f0a31c9db9bd5f5509cce076b3dd7b90dbbaa1d0cd41a5a31090
+EBUILD powertop-9999.ebuild 1372 RMD160 5b273239a5e93274eaa00db6c1b643eff90fe2a6 SHA1 667e7500a42d81434f548d6cb06e596aba25ea13 SHA256 c7d15d6ef79b91febdfbe45aa72c1d79ad4442ba3dc7d7da55b2b9cf5f22ec27
+MISC ChangeLog 7039 RMD160 2f8ca5c6ddd1220e9ef4beb5d1f514783a2bcfc3 SHA1 508db075fe03d36a96bf698122a9a0a2ecf6dba9 SHA256 6734e7621da6284ee84fcf97e01282a0478b7c9ef61e52120c0b7ef1277963e7
 MISC metadata.xml 161 RMD160 a5e1f234c4886ff31d39f229a0cf30d0bfcea869 SHA1 3876fd42cd9e63a7edb04c5025d53d773aa80bc3 SHA256 838bd208a7f948ea9b4e2b8869464622bc64a2f02468de4c3d7f6c2530e28e89
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk6phSgACgkQVWmRsqeSphPD4ACeIXT9MNN78UBGmS7yt4XSFpbC
-4zAAn3CLJF1uG50to9hggIFqZ/R9BP42
-=EhSQ
+iQIcBAEBAgAGBQJPj2kVAAoJELEHsLL7fEFWDUYQAIgKutu46prkaTfVjkPHrLxh
+me3cWjOsMUW+cgrX5TgKuFYt8pocPcZsq8tCdSb2ZqDoE8ONHzrm/rZPE/kT9qyt
+6jdy38pLIMpUW/ILThAsMBwx/XNlsECEeNc25Su930tYDTazQxZNkn8a2ObYjs1Z
+GU6uELw12OYC9oG0jzCp1ANy6UsXbd4BaAD9m7WzqLJVRt/YbyW7TYhBWYID3p2X
+8OHQ7suuIjBhaxHzb6XiNrqhQMr2MJRVbPm9RgVxpMdH/IhC5u1WILZY4HNaMD6z
+XvENHHdRW6+wHQr1Ko4Sv0ma8cCyR91lt80wKFugrl39xdhNUJtrmM6fILwZkJbM
+owZPw+sOoG1h25tpKZMz7+i6PDtK2SzRWcTpKdBmu8Z/2Co/zi+h0LiOxPF1dEX2
+g5FBsld//W130qOiqNW4k1CpwXYHSmd11KaYM15sffvOjCwd2pzvo7uSOMTUNpDM
+47Q4phQw7w/ccMOUR225hEYhHHwWDzQ32Wzu8DLhICCmN+D0uyVEGMrGObUHgKU+
+7S7zX94jiz5nMwiMMt1C4SmM+at/hpYs17h4vraLtzXhbEYEYGOMoVZYrad+UGz0
+ZkMV3xqaXIwhRyTgA13vDPnXO30wfg8OW83WwsGnD/ltn/kbPksNnh2dVJDkgEHD
+9KB7YzQt9MueLEbD2oBq
+=cCPL
 -----END PGP SIGNATURE-----
diff --git a/sys-power/powertop/files/powertop-1.98-build-libnl-3.patch b/sys-power/powertop/files/powertop-1.98-build-libnl-3.patch
new file mode 100644
index 000000000000..bbe2b1c85737
--- /dev/null
+++ b/sys-power/powertop/files/powertop-1.98-build-libnl-3.patch
@@ -0,0 +1,27 @@
+From 21dcbd03507632c987e8c68b3efcf7b4a5d51147 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Wed, 18 Apr 2012 21:11:22 -0400
+Subject: [PATCH] use right libnl pkg-config name
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ Makefile |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 94ed2be..8a90b85 100644
+--- a/Makefile
++++ b/Makefile
+@@ -39,8 +39,7 @@ endif
+ 
+ ifeq ($(NL3FOUND),Y)
+ CPPFLAGS += -DCONFIG_LIBNL20
+-LIBS += -lnl-genl
+-NLLIBNAME = libnl-3.0
++NLLIBNAME = libnl-genl-3.0
+ endif
+ 
+ ifeq ($(NLLIBNAME),)
+-- 
+1.7.8.5
+
diff --git a/sys-power/powertop/files/powertop-1.98-build.patch b/sys-power/powertop/files/powertop-1.98-build.patch
index cebb09f4ee3d..8f130fdacebc 100644
--- a/sys-power/powertop/files/powertop-1.98-build.patch
+++ b/sys-power/powertop/files/powertop-1.98-build.patch
@@ -1,26 +1,80 @@
-From f60a30a247fd1bfdd58de42934937a861e4b927a Mon Sep 17 00:00:00 2001
+From cafa47147fdc503103cda1e67e736ab95051e44a Mon Sep 17 00:00:00 2001
 From: Mike Frysinger <vapier@gentoo.org>
 Date: Tue, 23 Aug 2011 18:01:36 -0400
-Subject: [PATCH] use CFLAGS/LDFLAGS when linking
+Subject: [PATCH] use right flag names
+
+CFLAGS for the C compiler, CXXFLAGS for the C++ compiler, and
+CPPFLAGS for preprocessor flags.
 
 Signed-off-by: Mike Frysinger <vapier@gentoo.org>
 ---
- Makefile |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ Makefile |   20 ++++++++++++--------
+ 1 files changed, 12 insertions(+), 8 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index b0b6cb7..f637bfe 100644
+index b0b6cb7..bf9b79a 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -70,7 +70,7 @@ clean:
+@@ -2,9 +2,13 @@ all: powertop  po/powertop.pot
+ 
+ VERSION := 1.98
+ 
+-CFLAGS += -Wall -O2 -g -fno-omit-frame-pointer -fstack-protector -Wshadow -Wformat -D_FORTIFY_SOURCE=2
+-CPPFLAGS += -Wall -O2 -g -fno-omit-frame-pointer
+-CXXFLAGS += -Wall -O2 -g -fno-omit-frame-pointer -fstack-protector -Wshadow -Wformat -D_FORTIFY_SOURCE=2
++WFLAGS = -Wall -Wshadow -Wformat
++COMMON_FLAGS = -O2 -g -fno-omit-frame-pointer -fstack-protector
++CFLAGS ?= $(COMMON_FLAGS)
++CFLAGS += $(WFLAGS)
++CXXFLAGS ?= $(COMMON_FLAGS)
++CXXFLAGS += $(WFLAGS)
++CPPFLAGS += -D_FORTIFY_SOURCE=2
+ PKG_CONFIG ?= pkg-config
+ 
+ OBJS := lib.o main.o display.o html.o devlist.o
+@@ -31,13 +35,13 @@ NLLIBNAME = libnl-1
+ endif
+ 
+ ifeq ($(NL2FOUND),Y)
+-CFLAGS += -DCONFIG_LIBNL20
++CPPFLAGS += -DCONFIG_LIBNL20
+ LIBS += -lnl-genl
+ NLLIBNAME = libnl-2.0
+ endif
+ 
+ ifeq ($(NL3FOUND),Y)
+-CFLAGS += -DCONFIG_LIBNL20
++CPPFLAGS += -DCONFIG_LIBNL20
+ LIBS += -lnl-genl
+ NLLIBNAME = libnl-3.0
+ endif
+@@ -47,7 +51,7 @@ $(error Cannot find development files for any supported version of libnl)
+ endif
+ 
+ LIBS += $(shell $(PKG_CONFIG) --libs $(NLLIBNAME))
+-CFLAGS += $(shell $(PKG_CONFIG) --cflags $(NLLIBNAME))
++CPPFLAGS += $(shell $(PKG_CONFIG) --cflags $(NLLIBNAME))
+ 
+ 
+ 
+@@ -70,7 +74,7 @@ clean:
  	rm -f *.o *~ powertop DEADJOE core.* */*.o */*~ csstoh css.h
  	
  powertop: $(OBJS) $(HEADERS)
 -	$(CXX) $(OBJS) $(LIBS) -o powertop
-+	$(CXX) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o powertop
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o powertop
  	@(cd po/ && $(MAKE))
  	
  install: powertop
+@@ -90,7 +94,7 @@ css.h: csstoh powertop.css
+ %.o: %.cpp lib.h css.h Makefile
+ 	@echo "  CC  $<"
+ 	@[ -x /usr/bin/cppcheck ] && /usr/bin/cppcheck -q $< || :
+-	@$(CC) $(CFLAGS) -c -o $@ $<
++	@$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $<
+ 
+ 
+ uptrans:
 -- 
-1.7.6
+1.7.8.5
 
diff --git a/sys-power/powertop/powertop-1.98.ebuild b/sys-power/powertop/powertop-1.98.ebuild
index 24e44bd833e9..dec17f677bf1 100644
--- a/sys-power/powertop/powertop-1.98.ebuild
+++ b/sys-power/powertop/powertop-1.98.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-1.98.ebuild,v 1.2 2011/10/27 16:21:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-1.98.ebuild,v 1.3 2012/04/19 01:22:34 vapier Exp $
 
 EAPI="4"
 
@@ -22,7 +22,7 @@ SLOT="0"
 IUSE="unicode"
 
 DEPEND="
-	dev-libs/libnl:1.1
+	dev-libs/libnl
 	sys-apps/pciutils
 	sys-devel/gettext
 	sys-libs/ncurses[unicode?]
@@ -40,15 +40,11 @@ src_prepare() {
 	use unicode || sed -i 's:-lncursesw:-lncurses:' Makefile
 	epatch "${FILESDIR}"/${PN}-1.98-build.patch
 	epatch "${FILESDIR}"/${PN}-1.98-build-cc.patch
-	sed -i -r \
-		-e '/FLAGS/s: (-O2|-g|-fno-omit-frame-pointer|-fstack-protector|-D_FORTIFY_SOURCE=2)\>: :g' \
-		-e '/@\$\(CC\)/s:@::' \
-		Makefile || die
+	epatch "${FILESDIR}"/${PN}-1.98-build-libnl-3.patch
 }
 
 src_configure() {
 	tc-export BUILD_CC CC CXX
-	CFLAGS+=" ${CPPFLAGS}" # blah!
 }
 
 src_install() {
diff --git a/sys-power/powertop/powertop-9999.ebuild b/sys-power/powertop/powertop-9999.ebuild
index c70e4ee7bf9a..0216a6645f77 100644
--- a/sys-power/powertop/powertop-9999.ebuild
+++ b/sys-power/powertop/powertop-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.7 2011/08/23 22:14:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-9999.ebuild,v 1.8 2012/04/19 01:22:34 vapier Exp $
 
 EAPI="4"
 
@@ -40,15 +40,11 @@ src_prepare() {
 	use unicode || sed -i 's:-lncursesw:-lncurses:' Makefile
 	epatch "${FILESDIR}"/${PN}-1.98-build.patch
 	epatch "${FILESDIR}"/${PN}-1.98-build-cc.patch
-	sed -i -r \
-		-e '/FLAGS/s: (-O2|-g|-fno-omit-frame-pointer|-fstack-protector|-D_FORTIFY_SOURCE=2)\>: :g' \
-		-e '/@\$\(CC\)/s:@::' \
-		Makefile || die
+	epatch "${FILESDIR}"/${PN}-1.98-build-libnl-3.patch
 }
 
 src_configure() {
 	tc-export BUILD_CC CC CXX
-	CFLAGS+=" ${CPPFLAGS}" # blah!
 }
 
 src_install() {