version bump. Fix bug #331295

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

4 files changed, 213 insertions, 2 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/Manifest b/app-laptop/pommed/Manifest
index d9cd9f84de08..0b818afc2806 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.30.patch 2963 RMD160 1bd614f094d06877a4fbcd40e0c63239aff89447 SHA1 550a529ed3b747d2495782bb1b61cd9869fc6ecf SHA256 a5a001b9caf2ec59e912270dc4de322cf6099dd7be0bb583101558d7234af023
 AUX pommed-1.31.patch 2975 RMD160 e87ce67aa7b2624404759920d8f3ee7ec5037ea4 SHA1 cf2a1db51b5778d4e9fbaa3113f3e46eda65d36f SHA256 fc4a7f0969f750bd06377bacb32e43623c74cd99ed5cfa2febe28e6bf370d163
+AUX pommed-1.39.patch 3024 RMD160 6a95e06512cf8824ceb27d7bb5a82627bab92331 SHA1 fc45c11a94fb9933505ac90c69386c4203f19c50 SHA256 04a19e476daa7bdaeddd4527065c10872eb7add2a30e7ba9e966f542c068586a
 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.30.tar.gz 993702 RMD160 e8bd0802890483b4bd66d96474ef90e85b82c894 SHA1 54ce83f18d7543afa9ae3b1f920a3a483b336d20 SHA256 4a09d18fb6e289aaee9cd95070ce5c73c59cea74cdedf81c1b954c3404eab60f
 DIST pommed-1.31.tar.gz 993795 RMD160 208f7823ce6d887d719f9a5a662a43100b910808 SHA1 95532263462c02d284d76dd57d37c50c690d62fe SHA256 58d3c2583f49f79bdb2f3b614964cd1a1543e38c4b8312f2da6768fe60795c8b
+DIST pommed-1.39.tar.gz 995020 RMD160 615d881b4178b8677393307500b783b9846e140e SHA1 631ecf12548d147f05820adb69dbd1d4fc7bef7f SHA256 d715cf1f85525a62bb18a3f9ebd229a2f586906ab8c9306fc9d2aa192bf79da2
 EBUILD pommed-1.21-r1.ebuild 2380 RMD160 fab112dca8310c646c94aa8e5b7888e5a1462d9b SHA1 2c5c6a05bccfeed5247da73b9fbb944c28c7b64a SHA256 1ba25ce56474149f18ec05b64d53c75923f83ea4e21507faf491f569791e8888
 EBUILD pommed-1.30.ebuild 2495 RMD160 09c739ee6f4fbb16c23afdd8475923ea22e8d86c SHA1 4ecdab078d514dfc20639587cda88ab6fb67608e SHA256 95e4c49d3b18938066235e97a04ff80446b52f9420d2a7dee83ab2558397b76f
 EBUILD pommed-1.31.ebuild 2498 RMD160 6108d8a80afc7617a3653f62225b52b2d2f6c632 SHA1 bf9bc42c43d64a139c9a110d87d96a5a3a3b4882 SHA256 d156596a74bd3b7be1fdf5a5801a2896d2a1a824dbff6f5973c65942a8414843
-MISC ChangeLog 7432 RMD160 479f18287a52c57f55ec251eb285f1660b38fd31 SHA1 ed0e597501d7c9e28376fe1f5ee57ded4f40dcdd SHA256 1565bf3bb6a07b01b5289bf8eb66d80466011445bf850730a72dcc343fcb9a2f
+EBUILD pommed-1.39.ebuild 2488 RMD160 d24154991f593edfb87fe24a142f7d179b02fb17 SHA1 8ffb52c0648a872b239456c3f811d275b8f1d45e SHA256 9b99bf1e8b072ca10a7f092c9dcaf8aef8e3eac1765960b5edf8ec8135d867bc
+MISC ChangeLog 7589 RMD160 d3fa12ece29105f72852768f730a68e3b4b0b092 SHA1 2990db8da95625a9bd2eb747942897f3e1269c6d SHA256 131e3cc68a705652e2dcb9427cfec7986e37364cb0f50e20b59a339326559151
 MISC metadata.xml 651 RMD160 473ae31eee7b3ecb588de3343e30aff0b29bcd49 SHA1 6c68495f48d12256316048f5d7a15d83a6c37339 SHA256 c1ab774b3fde8894b4a0779daee66fa7ae4911645e8362a37ef1f3f0d004f0a8
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
+}