Version bump and fix for bug #284158

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 195 insertions, 2 deletions

diff --git a/app-laptop/pommed/ChangeLog b/app-laptop/pommed/ChangeLog
index 7420924e6900..36f69e1e2fda 100644
--- a/app-laptop/pommed/ChangeLog
+++ b/app-laptop/pommed/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-laptop/pommed
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pommed/ChangeLog,v 1.44 2009/05/28 17:45:18 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pommed/ChangeLog,v 1.45 2009/11/21 18:49:05 cedk Exp $
+
+*pommed-1.30 (21 Nov 2009)
+
+  21 Nov 2009; Cédric Krier <cedk@gentoo.org> +pommed-1.30.ebuild,
+  +files/pommed-1.30.patch:
+  Version bump and fix for bug #284158
 
 *pommed-1.26 (28 May 2009)
 
diff --git a/app-laptop/pommed/Manifest b/app-laptop/pommed/Manifest
index 779bef0f3177..9635614ea13a 100644
--- a/app-laptop/pommed/Manifest
+++ b/app-laptop/pommed/Manifest
@@ -1,12 +1,15 @@
 AUX pommed-1.21-r1.patch 2917 RMD160 03e2562b327b1d578b9ddde1f151fdff46f84f18 SHA1 092ba342ce808e5072049ac9042582efb20832ec SHA256 f72975bd17bbbcbee50beb27cd8968260748388f397e583dab6d77b93e2af414
 AUX pommed-1.25.patch 2927 RMD160 edb2e811cda09c4bf2b39dd15f21f536a111bf6c SHA1 654e30daae77175774d3746196121144e989e98f SHA256 9162dfa841b3d2098970d6f16f911714e1837f735293a622d75e6bb99736770d
 AUX pommed-1.26.patch 3048 RMD160 608fa63c1d9b128fb00c77e9249f0328fcea093d SHA1 3fbd1374e7902685bacf3bfb050337c1b1f2c6a8 SHA256 d663ed4f3117ef7d85dadf208f54e980ca99abcd1b3e932ebcf6ea161a15cae0
+AUX pommed-1.30.patch 2963 RMD160 1bd614f094d06877a4fbcd40e0c63239aff89447 SHA1 550a529ed3b747d2495782bb1b61cd9869fc6ecf SHA256 a5a001b9caf2ec59e912270dc4de322cf6099dd7be0bb583101558d7234af023
 AUX pommed.rc 382 RMD160 9bc2e6c515f72eff59045ab20ac0b743b7c2030a SHA1 6bd5ec4bc79ae09919f5e66a6e13fff76f347e38 SHA256 91911d2f65eb26b1e449ae45e587ccd03d756bdb549142fe169bc1161e9fb6d5
 DIST pommed-1.21.tar.gz 1005380 RMD160 4e5155b9fda18f0bd08265b992e0f66be21575d0 SHA1 ac60bb3797096d777fbde39f6dce97c4e85e7d13 SHA256 56cf4e2d85d832b0231542f52f3c6928de675b8dc75175f9ea214ca9206a30bf
 DIST pommed-1.25.tar.gz 1008230 RMD160 924fff56d39f50af579de3ff5e80b07ed954b666 SHA1 dbbe98c2a2ac3bdaa7133ec80912bca46fe3f8f0 SHA256 4ef7dcc0d097e366b9d2ee75eb913ef73530fb5465399b0fbdbc37a2d0d41801
 DIST pommed-1.26.tar.gz 992860 RMD160 57e8ce77f95341ac8f9e604853b257aa950023ee SHA1 5dd239120d8e904ac89eae8791d2d93142efbab3 SHA256 0168fb1a6258033fc29046384a272428239483b4739ef6e02774803ec68a9a78
+DIST pommed-1.30.tar.gz 993702 RMD160 e8bd0802890483b4bd66d96474ef90e85b82c894 SHA1 54ce83f18d7543afa9ae3b1f920a3a483b336d20 SHA256 4a09d18fb6e289aaee9cd95070ce5c73c59cea74cdedf81c1b954c3404eab60f
 EBUILD pommed-1.21-r1.ebuild 2368 RMD160 c818466be64d54fa0f93c384484f676c1a88079a SHA1 af34bcd4b9de22a8a9b6cd7df5ba99d9ee1cca86 SHA256 4758716bcd50b0733c7c464fe88e7ebb9f36995a2edd955f883d9bd1f444bdbb
 EBUILD pommed-1.25.ebuild 2365 RMD160 0651d780a19218d127bff6291780a7836d8a1416 SHA1 17c8f50334ce755cc5bf9d0557af03405ba3d896 SHA256 08a2f0d4c979676af738a7bdca04c285ff77d1c688ec759d6386a84ed8f1bc96
 EBUILD pommed-1.26.ebuild 2365 RMD160 3dd626e62ee52d4d8c8656409dd5073adccbe73a SHA1 14575cf2b6b4a3950cb34f0aab7f62765fa8813a SHA256 826a0386849568b6a23eeda2f12e2a05d6f8265817cf1cdfc907fd993714187f
-MISC ChangeLog 6263 RMD160 b7b6829446d415e3fae5bf8aca71e247d1a90e8f SHA1 8bf2d99f728f4e2376d1dc7d77865405ef9ece81 SHA256 7f57f9f2a2db51d929dc7497122a34537749706b74b750f1c28a16ad90527ddd
+EBUILD pommed-1.30.ebuild 2458 RMD160 ce8bc82ed0e1230592f56ab9e6e8cce76bbd5e76 SHA1 7212b5b7081c96864ab424feadb2ef07e6b858e9 SHA256 519b2e5a33dc499a28b168b737e3f5a81898e7b45fb136bd3020912e3a5eec53
+MISC ChangeLog 6427 RMD160 2c0a6a78f958351af172b2d25b4a0a31dcfa723a SHA1 b8a8e90ef39b9d122a4312f746484e7783d1c790 SHA256 33d9916b91d216e766684981577f4a71d3d790c6da5aa7ced53e307039c836a6
 MISC metadata.xml 650 RMD160 f7daee13a933d338a74f6d96ab6cf50ca14c41fe SHA1 55e4fd4f2955d2874a1a6b01897d3ee979a9b886 SHA256 98d730e05d016004e5fe2e7de97c0b2d08ec7f6c5a3521bda0d6ab3d16c0e327
diff --git a/app-laptop/pommed/files/pommed-1.30.patch b/app-laptop/pommed/files/pommed-1.30.patch
new file mode 100644
index 000000000000..48c0fd02bdcf
--- /dev/null
+++ b/app-laptop/pommed/files/pommed-1.30.patch
@@ -0,0 +1,75 @@
+diff -ru pommed-1.30~/gpomme/Makefile pommed-1.30/gpomme/Makefile
+--- pommed-1.30~/gpomme/Makefile	2009-10-22 21:25:30.000000000 +0200
++++ pommed-1.30/gpomme/Makefile	2009-11-21 19:41:08.000000000 +0100
+@@ -17,8 +17,8 @@
+ 
+ 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) $(GLADE_CFLAGS) $(INOTIFY_CFLAGS)
+-LDFLAGS = -lpthread $(DBUS_LIBS) $(DBUSGLIB_LIBS) $(GTK_LIBS) $(CONFUSE_LIBS) $(GLADE_LIBS)
++CFLAGS += -g -Wall $(DBUS_CFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(CONFUSE_CFLAGS) $(GLADE_CFLAGS) $(INOTIFY_CFLAGS)
++LDFLAGS += -lpthread $(DBUS_LIBS) $(DBUSGLIB_LIBS) $(GTK_LIBS) $(CONFUSE_LIBS) $(GLADE_LIBS)
+ 
+ SOURCES = gpomme.c theme.c conffile.c \
+ 		../client-common/dbus-client.c \
+@@ -33,6 +33,7 @@
+ mo: $(MOFILES)
+ 
+ gpomme: $(OBJS) $(LIBS)
++	${CC} -o $@ ${OBJS} ${LIBS} ${LDFLAGS}
+ 
+ gpomme.o: gpomme.c gpomme.h theme.h ../client-common/dbus-client.h ../client-common/video-client.h
+ 
+diff -ru pommed-1.30~/pommed/Makefile pommed-1.30/pommed/Makefile
+--- pommed-1.30~/pommed/Makefile	2009-10-22 21:25:30.000000000 +0200
++++ pommed-1.30/pommed/Makefile	2009-11-21 19:41:08.000000000 +0100
+@@ -18,9 +18,9 @@
+ 
+ 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 += -g -Wall $(DBUS_CFLAGS) $(ALSA_CFLAGS) $(AUDIOFILE_CFLAGS) $(CONFUSE_CFLAGS) $(INOTIFY_CFLAGS) $(TIMERFD_CFLAGS)
+ 
+-LDFLAGS = -pthread -lrt $(DBUS_LIBS) $(ALSA_LIBS) $(AUDIOFILE_LIBS) $(CONFUSE_LIBS)
++LDFLAGS += -pthread -lrt $(DBUS_LIBS) $(ALSA_LIBS) $(AUDIOFILE_LIBS) $(CONFUSE_LIBS)
+ 
+ ifneq (, $(findstring ppc, $(ARCH)))
+ OFLIB ?=
+@@ -52,6 +52,7 @@
+ 
+ 	CFLAGS += $(LIBPCI_CFLAGS)
+ 	LDFLAGS += $(LIBPCI_LIBS)
++	LIBS = $(LIBPCI_LIBS)
+ else
+ 	LIBS = /usr/lib/libpci.a
+ 	LDFLAGS += -lz	
+@@ -69,6 +70,7 @@
+ 
+ 
+ pommed: $(OBJS) $(LIBS)
++	${CC} -o $@ ${OBJS} ${LIBS} ${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 -ru pommed-1.30~/wmpomme/Makefile pommed-1.30/wmpomme/Makefile
+--- pommed-1.30~/wmpomme/Makefile	2009-10-22 21:25:30.000000000 +0200
++++ pommed-1.30/wmpomme/Makefile	2009-11-21 19:41:08.000000000 +0100
+@@ -5,8 +5,8 @@
+ 
+ TIMERFD_CFLAGS = $(shell test -e /usr/include/sys/timerfd.h || echo -DNO_SYS_TIMERFD_H)
+ 
+-CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS) $(TIMERFD_CFLAGS)
+-LDFLAGS = -lrt -lXpm -lXext -lX11 $(DBUS_LIBS)
++CFLAGS += -g -Wall $(DBUS_CFLAGS) $(TIMERFD_CFLAGS)
++LDFLAGS += -lrt -lXpm -lXext -lX11 $(DBUS_LIBS)
+ 
+ SOURCES = wmgeneral.c wmpomme.c \
+ 	../client-common/dbus-client.c \
+@@ -15,6 +15,7 @@
+ OBJS = $(SOURCES:%.c=%.o)
+ 
+ wmpomme: $(OBJS)
++	${CC} -o $@ ${OBJS} ${LDFLAGS}
+ 
+ wmpomme.o: wmpomme.c wmgeneral.h wmpomme-master.xpm ../client-common/dbus-client.h
+ 
diff --git a/app-laptop/pommed/pommed-1.30.ebuild b/app-laptop/pommed/pommed-1.30.ebuild
new file mode 100644
index 000000000000..d87e5e654f9d
--- /dev/null
+++ b/app-laptop/pommed/pommed-1.30.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pommed/pommed-1.30.ebuild,v 1.1 2009/11/21 18:49:05 cedk Exp $
+
+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="3159"
+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
+		>=gnome-base/libglade-2 )
+	X? ( x11-libs/libX11
+		x11-libs/libXpm )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	media-sound/alsa-utils
+	virtual/eject"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	CONFIG_CHECK="DMIID"
+	check_extra_config
+}
+
+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
+}