Version bump

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

4 files changed, 197 insertions, 12 deletions

diff --git a/app-laptop/pommed/ChangeLog b/app-laptop/pommed/ChangeLog
index 5854d99f1d8c..bb7b381ccd86 100644
--- a/app-laptop/pommed/ChangeLog
+++ b/app-laptop/pommed/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-laptop/pommed
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pommed/ChangeLog,v 1.49 2010/01/07 16:07:28 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pommed/ChangeLog,v 1.50 2010/02/28 16:33:11 cedk Exp $
+
+*pommed-1.31 (28 Feb 2010)
+
+  28 Feb 2010; Cédric Krier <cedk@gentoo.org> +pommed-1.31.ebuild,
+  +files/pommed-1.31.patch:
+  Version bump
 
   07 Jan 2010; Joseph Jezak <josejx@gentoo.org> pommed-1.30.ebuild:
   Fix for x86/amd64 kernel check not needed on ppc.
diff --git a/app-laptop/pommed/Manifest b/app-laptop/pommed/Manifest
index fdfd105620dd..a3100bd0c17a 100644
--- a/app-laptop/pommed/Manifest
+++ b/app-laptop/pommed/Manifest
@@ -1,19 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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.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
 EBUILD pommed-1.21-r1.ebuild 2368 RMD160 c818466be64d54fa0f93c384484f676c1a88079a SHA1 af34bcd4b9de22a8a9b6cd7df5ba99d9ee1cca86 SHA256 4758716bcd50b0733c7c464fe88e7ebb9f36995a2edd955f883d9bd1f444bdbb
 EBUILD pommed-1.30.ebuild 2484 RMD160 2fdda4a1c9366176a62aae550fdf3ca8eda55b08 SHA1 dae609cd80c8d3e591d67bada00d15b4c668baa7 SHA256 77ccd3792b1aa163ec6f6f2f82e2a13658c99db6f4958f5f5415b13a4d6629f1
-MISC ChangeLog 6914 RMD160 2ba435061c9c6ca9184a10cd25319e07f3ee0f90 SHA1 c3fe820daf998c1175e29e1885c8bb0fd4e5889b SHA256 24a1185d25830747b0bf8011b6f9adfc61de4ce40ef2853081e0077aa00a63a6
+EBUILD pommed-1.31.ebuild 2485 RMD160 44135b808e5154dc86143b888ccc20f45466a21a SHA1 a4d1fade35e87526c21adbbeed975faeaf9c870f SHA256 c5398bb99650fe293a288e5cc48d737e08c63fedb5c5c090abc4a6fd3366e4f7
+MISC ChangeLog 7052 RMD160 39f788163d1758d7db99e0efe0d360607ee8dd85 SHA1 975e3a06fb6fadf702d56d24e1d63f3b84409154 SHA256 911e83fb8c875228e82e8491958a9eb436da9924bbc11261a4c1c1b31e559a44
 MISC metadata.xml 650 RMD160 f7daee13a933d338a74f6d96ab6cf50ca14c41fe SHA1 55e4fd4f2955d2874a1a6b01897d3ee979a9b886 SHA256 98d730e05d016004e5fe2e7de97c0b2d08ec7f6c5a3521bda0d6ab3d16c0e327
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAktGBlwACgkQcsIHjyDViGQLLACgnY6LtawRr/tK8n6tUJx8L/ko
-wRwAoOHxcjKfj1ZiNgu+fl2lXQ6bBeza
-=PEB/
------END PGP SIGNATURE-----
diff --git a/app-laptop/pommed/files/pommed-1.31.patch b/app-laptop/pommed/files/pommed-1.31.patch
new file mode 100644
index 000000000000..484d7bc2db57
--- /dev/null
+++ b/app-laptop/pommed/files/pommed-1.31.patch
@@ -0,0 +1,75 @@
+diff -ru pommed-1.31~/gpomme/Makefile pommed-1.31/gpomme/Makefile
+--- pommed-1.31~/gpomme/Makefile	2010-02-28 17:24:31.000000000 +0100
++++ pommed-1.31/gpomme/Makefile	2010-02-28 17:25:31.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 -lX11 $(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 -lX11 $(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.31~/pommed/Makefile pommed-1.31/pommed/Makefile
+--- pommed-1.31~/pommed/Makefile	2010-02-28 17:24:31.000000000 +0100
++++ pommed-1.31/pommed/Makefile	2010-02-28 17:26:20.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.31~/wmpomme/Makefile pommed-1.31/wmpomme/Makefile
+--- pommed-1.31~/wmpomme/Makefile	2010-02-28 17:24:31.000000000 +0100
++++ pommed-1.31/wmpomme/Makefile	2010-02-28 17:26:42.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.31.ebuild b/app-laptop/pommed/pommed-1.31.ebuild
new file mode 100644
index 000000000000..bc9ba1c6f863
--- /dev/null
+++ b/app-laptop/pommed/pommed-1.31.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pommed/pommed-1.31.ebuild,v 1.1 2010/02/28 16:33:11 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="3202"
+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() {
+	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
+}