diff options
author | Cédric Krier <cedk@gentoo.org> | 2008-04-27 10:42:47 +0000 |
---|---|---|
committer | Cédric Krier <cedk@gentoo.org> | 2008-04-27 10:42:47 +0000 |
commit | 69ebf0e5018de5ab19181246a52b4685d7e6f3c5 (patch) | |
tree | ab02662d2c3b90b01c9c5ba548f43b201e3e686b /app-laptop | |
parent | Fix HOMEPAGE (bug #210210); fix SRC_URI (thanks to nightmorph on IRC); use em... (diff) | |
download | gentoo-2-69ebf0e5018de5ab19181246a52b4685d7e6f3c5.tar.gz gentoo-2-69ebf0e5018de5ab19181246a52b4685d7e6f3c5.tar.bz2 gentoo-2-69ebf0e5018de5ab19181246a52b4685d7e6f3c5.zip |
Use pgk-config for libpci, bug #217610
(Portage version: 2.1.4.4)
Diffstat (limited to 'app-laptop')
-rw-r--r-- | app-laptop/pommed/ChangeLog | 6 | ||||
-rw-r--r-- | app-laptop/pommed/files/pommed-1.14.patch (renamed from app-laptop/pommed/files/pommed-1.11.patch) | 21 | ||||
-rw-r--r-- | app-laptop/pommed/files/pommed-1.16.patch | 13 | ||||
-rw-r--r-- | app-laptop/pommed/pommed-1.14.ebuild | 4 |
4 files changed, 33 insertions, 11 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/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() { |