version bump. Fix bug #331295

(Portage version: 2.2.0_alpha43/cvs/Linux x86_64)

3 files changed, 209 insertions, 1 deletions

diff --git a/app-laptop/pommed/ChangeLog b/app-laptop/pommed/ChangeLog
index 37ae38454971..6cbf41c8afa6 100644
--- a/app-laptop/pommed/ChangeLog
+++ b/app-laptop/pommed/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-laptop/pommed
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pommed/ChangeLog,v 1.53 2011/07/10 03:49:45 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pommed/ChangeLog,v 1.54 2011/07/10 06:00:55 naota Exp $
+
+*pommed-1.39 (10 Jul 2011)
+
+  10 Jul 2011; Naohiro Aota <naota@gentoo.org> +pommed-1.39.ebuild,
+  +files/pommed-1.39.patch:
+  version bump. Fix bug #331295
 
   10 Jul 2011; Naohiro Aota <naota@gentoo.org> metadata.xml:
   Change maintainer to me
diff --git a/app-laptop/pommed/files/pommed-1.39.patch b/app-laptop/pommed/files/pommed-1.39.patch
new file mode 100644
index 000000000000..1215606c35cb
--- /dev/null
+++ b/app-laptop/pommed/files/pommed-1.39.patch
@@ -0,0 +1,89 @@
+diff --git a/gpomme/Makefile b/gpomme/Makefile
+index 0874b48..a3ab64a 100644
+--- a/gpomme/Makefile
++++ b/gpomme/Makefile
+@@ -1,5 +1,3 @@
+-CC = gcc
+-
+ GTK_CFLAGS = $(shell pkg-config --cflags gtk+-2.0)
+ GTK_LIBS = $(shell pkg-config --libs gtk+-2.0)
+ 
+@@ -14,7 +12,7 @@ CONFUSE_LIBS = $(shell pkg-config libconfuse --libs)
+ 
+ INOTIFY_CFLAGS = $(shell test -e /usr/include/sys/inotify.h || echo -DNO_SYS_INOTIFY_H)
+ 
+-CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(CONFUSE_CFLAGS) $(INOTIFY_CFLAGS)
++CFLAGS += -Wall $(DBUS_CFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(CONFUSE_CFLAGS) $(INOTIFY_CFLAGS)
+ LDLIBS = -lpthread -lX11 $(DBUS_LIBS) $(DBUSGLIB_LIBS) $(GTK_LIBS) $(CONFUSE_LIBS)
+ 
+ SOURCES = gpomme.c theme.c conffile.c \
+@@ -30,6 +28,7 @@ all: gpomme mo
+ mo: $(MOFILES)
+ 
+ gpomme: $(OBJS)
++	${CC} -o $@ ${OBJS} ${LDLIBS} ${LDFLAGS}
+ 
+ gpomme.o: gpomme.c gpomme.h theme.h ../client-common/dbus-client.h ../client-common/video-client.h
+ 
+diff --git a/pommed/Makefile b/pommed/Makefile
+index 5f3cbf9..3425a2a 100644
+--- a/pommed/Makefile
++++ b/pommed/Makefile
+@@ -1,7 +1,5 @@
+ ARCH ?= $(shell uname -m)
+ 
+-CC = gcc
+-
+ DBUS_CFLAGS = $(shell pkg-config dbus-1 --cflags) -DDBUS_API_SUBJECT_TO_CHANGE
+ DBUS_LIBS = $(shell pkg-config dbus-1 --libs)
+ 
+@@ -18,7 +16,7 @@ INOTIFY_CFLAGS = $(shell test -e /usr/include/sys/inotify.h || echo -DNO_SYS_INO
+ 
+ TIMERFD_CFLAGS = $(shell test -e /usr/include/sys/timerfd.h || echo -DNO_SYS_TIMERFD_H)
+ 
+-CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS) $(ALSA_CFLAGS) $(AUDIOFILE_CFLAGS) $(CONFUSE_CFLAGS) $(INOTIFY_CFLAGS) $(TIMERFD_CFLAGS)
++CFLAGS += -Wall $(DBUS_CFLAGS) $(ALSA_CFLAGS) $(AUDIOFILE_CFLAGS) $(CONFUSE_CFLAGS) $(INOTIFY_CFLAGS) $(TIMERFD_CFLAGS)
+ 
+ LDLIBS = -pthread -lrt $(DBUS_LIBS) $(ALSA_LIBS) $(AUDIOFILE_LIBS) $(CONFUSE_LIBS)
+ 
+@@ -54,6 +52,7 @@ ifeq ($(LIBPCI_SHARED), true)
+ 
+ 	CFLAGS += $(LIBPCI_CFLAGS)
+ 	LDLIBS += $(LIBPCI_LIBS)
++	LIBS = $(LIBPCI_LIBS)
+ else
+ 	LIB_OBJS += /usr/lib/libpci.a
+ 	LDLIBS += -lz
+@@ -73,6 +72,7 @@ OBJS = $(SOURCES:%.c=%.o)
+ 
+ 
+ pommed: $(OBJS) $(LIB_OBJS)
++	${CC} -o $@ ${OBJS} ${LDLIBS} ${LDFLAGS}
+ 
+ pommed.o: pommed.c pommed.h evloop.h kbd_backlight.h lcd_backlight.h cd_eject.h evdev.h conffile.h audio.h dbus.h beep.h
+ 
+diff --git a/wmpomme/Makefile b/wmpomme/Makefile
+index cc7a438..6c4bee1 100644
+--- a/wmpomme/Makefile
++++ b/wmpomme/Makefile
+@@ -1,11 +1,9 @@
+-CC = gcc
+-
+ DBUS_CFLAGS = $(shell pkg-config dbus-1 --cflags) -DDBUS_API_SUBJECT_TO_CHANGE
+ DBUS_LIBS = $(shell pkg-config dbus-1 --libs)
+ 
+ TIMERFD_CFLAGS = $(shell test -e /usr/include/sys/timerfd.h || echo -DNO_SYS_TIMERFD_H)
+ 
+-CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS) $(TIMERFD_CFLAGS)
++CFLAGS += -Wall $(DBUS_CFLAGS) $(TIMERFD_CFLAGS)
+ LDLIBS = -lrt -lXpm -lXext -lX11 $(DBUS_LIBS)
+ 
+ SOURCES = wmgeneral.c wmpomme.c \
+@@ -15,6 +13,7 @@ SOURCES = wmgeneral.c wmpomme.c \
+ OBJS = $(SOURCES:%.c=%.o)
+ 
+ wmpomme: $(OBJS)
++	${CC} -o $@ ${OBJS} ${LDLIBS} ${LDFLAGS}
+ 
+ wmpomme.o: wmpomme.c wmgeneral.h wmpomme-master.xpm ../client-common/dbus-client.h
+ 
diff --git a/app-laptop/pommed/pommed-1.39.ebuild b/app-laptop/pommed/pommed-1.39.ebuild
new file mode 100644
index 000000000000..98fd0341a46a
--- /dev/null
+++ b/app-laptop/pommed/pommed-1.39.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pommed/pommed-1.39.ebuild,v 1.1 2011/07/10 06:00:55 naota Exp $
+
+EAPI="1"
+
+inherit eutils toolchain-funcs linux-info
+
+DESCRIPTION="Manage special features such as screen and keyboard backlight on Apple MacBook Pro/PowerBook"
+HOMEPAGE="http://technologeek.org/projects/pommed/index.html"
+ALIOTH_NUMBER="3583"
+SRC_URI="http://alioth.debian.org/frs/download.php/${ALIOTH_NUMBER}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gtk X"
+
+COMMON_DEPEND="media-libs/alsa-lib
+	x86? ( sys-apps/pciutils )
+	amd64? (  sys-apps/pciutils )
+	dev-libs/confuse
+	>=sys-apps/dbus-1.1
+	dev-libs/dbus-glib
+	sys-libs/zlib
+	media-libs/audiofile
+	gtk? ( x11-libs/gtk+:2 )
+	X? ( x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	media-sound/alsa-utils
+	virtual/eject"
+
+pkg_setup() {
+	if ! use ppc; then
+		linux-info_pkg_setup
+
+		CONFIG_CHECK="~DMIID"
+		check_extra_config
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}.patch"
+}
+
+src_compile() {
+	cd "${S}"/pommed
+	emake CC="$(tc-getCC)" OFLIB=1 || die "emake pommed failed"
+
+	if use gtk; then
+		cd "${S}"/gpomme
+		local POFILES=""
+		for LANG in ${LINGUAS}; do
+			if [ -f po/${LANG}.po ]; then
+				POFILES="${POFILES} po/${LANG}.po"
+			fi
+		done
+		emake CC="$(tc-getCC)" POFILES="${POFILES}" || die "emake gpomme failed"
+	fi
+	if use X; then
+		cd "${S}"/wmpomme
+		emake CC="$(tc-getCC)" || die "emake wmpomme failed"
+	fi
+}
+
+src_install() {
+	insinto /etc
+	if use x86 || use amd64; then
+		newins pommed.conf.mactel pommed.conf
+	elif use ppc; then
+		newins pommed.conf.pmac pommed.conf
+	fi
+
+	insinto /etc/dbus-1/system.d
+	newins dbus-policy.conf pommed.conf
+
+	insinto /usr/share/pommed
+	doins pommed/data/*.wav
+
+	dobin pommed/pommed
+
+	newinitd "${FILESDIR}"/pommed.rc pommed
+
+	dodoc AUTHORS ChangeLog README TODO
+
+	if use gtk ; then
+		dobin gpomme/gpomme
+		for LANG in ${LINGUAS}; do
+			if [ -f gpomme/po/${LANG}.mo ]; then
+				einfo "Installing lang ${LANG}"
+				insinto /usr/share/locale/${LANG}/LC_MESSAGES/
+				doins gpomme/po/${LANG}.mo
+			fi
+		done
+
+		insinto /usr/share/applications
+		doins gpomme/gpomme.desktop
+		doins gpomme/gpomme-c.desktop
+		insinto /usr/share/gpomme/
+		doins -r gpomme/themes
+		doins gpomme/gpomme.glade
+	fi
+
+	if use X ; then
+		dobin wmpomme/wmpomme
+	fi
+}