Use pgk-config for libpci, bug #217610

Package-Manager: portage-2.1.4.4

5 files changed, 37 insertions, 15 deletions

diff --git a/app-laptop/pommed/ChangeLog b/app-laptop/pommed/ChangeLog
index f445caa843f7..45cc781419c7 100644
--- a/app-laptop/pommed/ChangeLog
+++ b/app-laptop/pommed/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-laptop/pommed
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pommed/ChangeLog,v 1.25 2008/04/05 23:23:23 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pommed/ChangeLog,v 1.26 2008/04/27 10:42:46 cedk Exp $
+
+  27 Apr 2008; Cédric Krier <cedk@gentoo.org> -files/pommed-1.11.patch,
+  +files/pommed-1.14.patch, files/pommed-1.16.patch, pommed-1.14.ebuild:
+  Use pgk-config for libpci, bug #217610
 
   05 Apr 2008; Cédric Krier <cedk@gentoo.org> -files/pommed-1.5.patch,
   -pommed-1.5.ebuild, -pommed-1.12.ebuild:
diff --git a/app-laptop/pommed/Manifest b/app-laptop/pommed/Manifest
index 1a82b2c1f61a..d8a08939bddd 100644
--- a/app-laptop/pommed/Manifest
+++ b/app-laptop/pommed/Manifest
@@ -1,9 +1,9 @@
-AUX pommed-1.11.patch 907 RMD160 9d4d0c425034b91cfc14ba92e0693eb3ee0bf489 SHA1 904d26a58c03c4ab224666f23042f935d536ddca SHA256 eca81004e5ba337da7d1c1436baf650a25fffd6e1ee5dea88a3371f3f4630373
-AUX pommed-1.16.patch 801 RMD160 3cd94fde4b3cb8d69b7f1cd8ca4c9b9395d33068 SHA1 d99e0063b8f521c6bc1b28f5a39c30d48c87fbeb SHA256 8375ce782ad37353f98651771b03070461d949ea1c08edbcf0c3591801f2be85
+AUX pommed-1.14.patch 1079 RMD160 e452c44f696ef182a12bf4a6f19867f03278251c SHA1 8694b0913375be02bc943f694254fb052a978f47 SHA256 af57bb5fe204114729b786544e77ab3a47b5d46fa1426de58c8be91e729eca15
+AUX pommed-1.16.patch 1016 RMD160 f102c458f1e884f5db43bcd392bb2e2b8a2f8e77 SHA1 0df128c840fa91279dedc347aa3f33ec113ec136 SHA256 8ae893173d08e7f1eb3bdab85f180d93dacde6d698ea9e4ba3153194ee59e907
 AUX pommed.rc 382 RMD160 9bc2e6c515f72eff59045ab20ac0b743b7c2030a SHA1 6bd5ec4bc79ae09919f5e66a6e13fff76f347e38 SHA256 91911d2f65eb26b1e449ae45e587ccd03d756bdb549142fe169bc1161e9fb6d5
 DIST pommed-1.14.tar.gz 997497 RMD160 6a0dcd074d0412aaecc71f706ce0170663e8c1f4 SHA1 f50587ae94e90af215d2ffc0657617b03b19ffa1 SHA256 408a66b629516a655ce862152552e7a97137a42b42304217f6f46e87a2b559ee
 DIST pommed-1.16.tar.gz 998769 RMD160 16723de0af0d8ab4590ec141fbf3e62bcec84742 SHA1 bd935560d12f70eaf1e5e7d7db5deeee301391f4 SHA256 6f281bb389f81ca16438a7b529f7a8db8eeb90d76cb0d9c2af145c4d73f5697f
-EBUILD pommed-1.14.ebuild 2342 RMD160 603bdca47d2c21aea8d9e22f3c7e751fbac16d25 SHA1 53dcc9b8367dc05187e23fdb23475a932d917afe SHA256 aeb979ec0483521aa91c2326da9626922b08dac8c8d51bac193e6ef880461250
+EBUILD pommed-1.14.ebuild 2336 RMD160 742a4830622d720eef3026ade423c41d38c5ae8a SHA1 d919dc7d4d80d94799f0a6a9b050e0b251da01df SHA256 8d35b8e4d6bf5d77766ec78b443bdc2a4995b637237bde40907878d76a1d0cd2
 EBUILD pommed-1.16.ebuild 2339 RMD160 47fde841f17da57f4e6c89638b4f192cca4607cb SHA1 b5bbea0eebfd8f3f45bbef8f67004e85c7e10736 SHA256 2e021ba043ce5320d9510efb82638634165935767b7e4779ddc2ec179dae5b22
-MISC ChangeLog 3646 RMD160 4b98b84ca8b783d4b616688b5898fbc8c0e65d27 SHA1 4fa11d5594113ddd47eec4435100ee71abe0e7c4 SHA256 1c4c3145daf0d5d54bdf5a47a2c46e84323a8ebde3fce98c00abf591c2618c9e
+MISC ChangeLog 3834 RMD160 7aec593b5b8af8d0360bd9d4c83756ac4411cbfa SHA1 f563e6a4b13325a2dde49f3088e0ee2650038ba0 SHA256 dbb573ce5826565d458e7b97ef132413332d048a8dd87d4658c260c343c34d87
 MISC metadata.xml 650 RMD160 f7daee13a933d338a74f6d96ab6cf50ca14c41fe SHA1 55e4fd4f2955d2874a1a6b01897d3ee979a9b886 SHA256 98d730e05d016004e5fe2e7de97c0b2d08ec7f6c5a3521bda0d6ab3d16c0e327
diff --git a/app-laptop/pommed/files/pommed-1.11.patch b/app-laptop/pommed/files/pommed-1.14.patch
index 0dcb368bb5de..e786b0677c6c 100644
--- a/app-laptop/pommed/files/pommed-1.11.patch
+++ b/app-laptop/pommed/files/pommed-1.14.patch
@@ -1,6 +1,6 @@
-diff -ru pommed-1.11~/pommed/Makefile pommed-1.11/pommed/Makefile
---- pommed-1.11~/pommed/Makefile	2007-11-18 22:41:53.000000000 +0100
-+++ pommed-1.11/pommed/Makefile	2007-11-18 22:44:05.000000000 +0100
+diff -ru pommed-1.14~/pommed/Makefile pommed-1.14/pommed/Makefile
+--- pommed-1.14~/pommed/Makefile	2008-04-27 12:37:24.000000000 +0200
++++ pommed-1.14/pommed/Makefile	2008-04-27 12:38:54.000000000 +0200
 @@ -16,7 +16,7 @@
  
  INOTIFY_CFLAGS = $(shell test -e /usr/include/sys/inotify.h || echo -DNO_SYS_INOTIFY_H)
@@ -10,12 +10,21 @@ diff -ru pommed-1.11~/pommed/Makefile pommed-1.11/pommed/Makefile
  
  ifeq ($(ARCH), ppc)
  OFLIB ?=
-@@ -41,7 +41,7 @@
+@@ -42,7 +42,7 @@
  
  else
  
 -LDFLAGS = -lz -lsmbios $(DBUS_LIBS) $(ALSA_LIBS) $(AUDIOFILE_LIBS) $(CONFUSE_LIBS)
 +LDFLAGS = -lz -lsmbios -lstdc++ $(DBUS_LIBS) $(ALSA_LIBS) $(AUDIOFILE_LIBS) $(CONFUSE_LIBS)
  
- SOURCES = pommed.c cd_eject.c evdev.c conffile.c audio.c dbus.c power.c beep.c \
- 		mactel/x1600_backlight.c mactel/gma950_backlight.c \
+ SOURCES = pommed.c cd_eject.c evdev.c conffile.c audio.c \
+ 		dbus.c power.c beep.c video.c \
+@@ -50,7 +50,7 @@
+ 		mactel/nv8600mgt_backlight.c \
+ 		mactel/kbd_backlight.c mactel/ambient.c mactel/acpi.c
+ 
+-LIBS = /usr/lib/libpci.a
++LIBS = $(shell pkg-config libpci --libs)
+ endif
+ 
+ OBJS = $(SOURCES:%.c=%.o)
diff --git a/app-laptop/pommed/files/pommed-1.16.patch b/app-laptop/pommed/files/pommed-1.16.patch
index 74328ab90630..d9c948dab9df 100644
--- a/app-laptop/pommed/files/pommed-1.16.patch
+++ b/app-laptop/pommed/files/pommed-1.16.patch
@@ -1,6 +1,6 @@
 diff -ru pommed-1.16~/pommed/Makefile pommed-1.16/pommed/Makefile
---- pommed-1.16~/pommed/Makefile	2008-04-05 16:10:17.000000000 +0200
-+++ pommed-1.16/pommed/Makefile	2008-04-05 16:10:55.000000000 +0200
+--- pommed-1.16~/pommed/Makefile	2008-04-27 12:28:57.000000000 +0200
++++ pommed-1.16/pommed/Makefile	2008-04-27 12:31:10.000000000 +0200
 @@ -16,7 +16,7 @@
  
  INOTIFY_CFLAGS = $(shell test -e /usr/include/sys/inotify.h || echo -DNO_SYS_INOTIFY_H)
@@ -19,3 +19,12 @@ diff -ru pommed-1.16~/pommed/Makefile pommed-1.16/pommed/Makefile
  
  SOURCES = pommed.c cd_eject.c evdev.c conffile.c audio.c \
  		dbus.c power.c beep.c video.c \
+@@ -50,7 +50,7 @@
+ 		mactel/nv8600mgt_backlight.c \
+ 		mactel/kbd_backlight.c mactel/ambient.c mactel/acpi.c
+ 
+-LIBS = /usr/lib/libpci.a
++LIBS = $(shell pkg-config libpci --libs)
+ endif
+ 
+ OBJS = $(SOURCES:%.c=%.o)
diff --git a/app-laptop/pommed/pommed-1.14.ebuild b/app-laptop/pommed/pommed-1.14.ebuild
index fd1f60345c74..684a247ec2db 100644
--- a/app-laptop/pommed/pommed-1.14.ebuild
+++ b/app-laptop/pommed/pommed-1.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pommed/pommed-1.14.ebuild,v 1.6 2008/04/05 23:21:31 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pommed/pommed-1.14.ebuild,v 1.7 2008/04/27 10:42:46 cedk Exp $
 
 inherit eutils toolchain-funcs
 
@@ -34,7 +34,7 @@ RDEPEND="${DEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/${PN}-1.11.patch"
+	epatch "${FILESDIR}/${P}.patch"
 }
 
 src_compile() {