Workaround again

6 files changed, 106 insertions, 18 deletions

diff --git a/app-laptop/pbbuttonsd/ChangeLog b/app-laptop/pbbuttonsd/ChangeLog
index aeb5131f1a25..f298d074aaac 100644
--- a/app-laptop/pbbuttonsd/ChangeLog
+++ b/app-laptop/pbbuttonsd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-laptop/pbbuttonsd
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/ChangeLog,v 1.3 2004/04/11 14:47:07 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/ChangeLog,v 1.4 2004/04/21 11:52:42 lu_zero Exp $
+
+*pbbuttonsd-0.5.10-r1 (21 Apr 2004)
+
+  21 Apr 2004; Luca Barbato <lu_zero@gentoo.org>
+  +files/pbbuttonsd-0.5.10-compat.patch, +pbbuttonsd-0.5.10-r1.ebuild:
+  Fixed again the backward compatibility
 
 *pbbuttonsd-0.5.10 (11 Apr 2004)
 
diff --git a/app-laptop/pbbuttonsd/Manifest b/app-laptop/pbbuttonsd/Manifest
index a73d074b7a58..2b50b8d1a454 100644
--- a/app-laptop/pbbuttonsd/Manifest
+++ b/app-laptop/pbbuttonsd/Manifest
@@ -1,18 +1,21 @@
-MD5 c6901eb0354ffab93115cf7eb49935c8 files/digest-pbbuttonsd-0.4.10a 70
-MD5 459c829a59fb5afde8ec96244abbcd68 files/digest-pbbuttonsd-0.5.2-r1 68
-MD5 68d74820f8f82d459c92e4d79eb21e65 files/digest-pbbuttonsd-0.5.8 68
-MD5 888adb1c866daaa6c22e23d07c2367b0 files/digest-pbbuttonsd-0.5.9 68
+MD5 736c7b02dd4c3733c8994c04f0da9359 pbbuttonsd-0.4.10a.ebuild 1099
+MD5 99b3b63e4de285ccecf7a201c4d93ed0 ChangeLog 4563
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 31e0374f2a1bead544cd6982a22e9651 pbbuttonsd-0.5.2-r1.ebuild 1420
+MD5 ca5402f6c79d82fc9cb1280c11d20eb3 pbbuttonsd-0.5.10-r1.ebuild 1639
+MD5 d1747f39d2aa92249cef31335b7cbe43 pbbuttonsd-0.5.9.ebuild 1554
+MD5 00f2995dfd50b749e0d585b2b704b7cb pbbuttonsd-0.5.8.ebuild 1553
+MD5 19935fb5d708d4ead4256ca2074c7534 pbbuttonsd-0.5.10.ebuild 1597
+MD5 1808e6f826d3af9b6909e10810706366 pbbuttonsd-0.5.9-r1.ebuild 1646
 MD5 888adb1c866daaa6c22e23d07c2367b0 files/digest-pbbuttonsd-0.5.9-r1 68
+MD5 a25484ee7150c343f693fb3b570f3403 files/digest-pbbuttonsd-0.5.10 69
 MD5 56622898666491660d75995555e987fa files/pbbuttons-0.5.2-replace_pmud.patch 715
+MD5 888adb1c866daaa6c22e23d07c2367b0 files/digest-pbbuttonsd-0.5.9 68
+MD5 b5980a206e08839a9e1303c95353a223 files/pbbuttonsd-0.5.10-compat.patch 1121
+MD5 68d74820f8f82d459c92e4d79eb21e65 files/digest-pbbuttonsd-0.5.8 68
+MD5 6fa4a67917c2f9b0051243b6868f3c42 files/pbbuttonsd.rc6 452
+MD5 459c829a59fb5afde8ec96244abbcd68 files/digest-pbbuttonsd-0.5.2-r1 68
 MD5 831fe80c3eeb273f204b8a41f7ac2810 files/pbbuttonsd-compat.patch 1070
-MD5 4eb84bf95682f026d1ad6c72e6b7d7fd files/pbbuttonsd.rc5 512
-MD5 db10b2619b7554160d4fbdd6f990ea1c files/pbbuttonsd.rc6 453
-MD5 a25484ee7150c343f693fb3b570f3403 files/digest-pbbuttonsd-0.5.10 69
-MD5 aa03aa084865553c3cbb19279ddac7f9 ChangeLog 4365
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 a5712840be2929fa8721a5fe92c1e07c pbbuttonsd-0.4.10a.ebuild 1100
-MD5 e48eb761ecbb95285971e6476b3ada28 pbbuttonsd-0.5.2-r1.ebuild 1421
-MD5 d535f3a88cfe51adf06a34979759c149 pbbuttonsd-0.5.8.ebuild 1554
-MD5 5b042dc4cea8e6bd67de01112e7d4521 pbbuttonsd-0.5.9-r1.ebuild 1647
-MD5 2a7c605a245f2ad40fcf13e3e85f78fe pbbuttonsd-0.5.9.ebuild 1555
-MD5 1d47f7f69692ab5aa7508c5cd7ebae51 pbbuttonsd-0.5.10.ebuild 1598
+MD5 a25484ee7150c343f693fb3b570f3403 files/digest-pbbuttonsd-0.5.10-r1 69
+MD5 f96e1a83c3d9764a16f9efaa9c9bcb46 files/pbbuttonsd.rc5 511
+MD5 c6901eb0354ffab93115cf7eb49935c8 files/digest-pbbuttonsd-0.4.10a 70
diff --git a/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.5.10-r1 b/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.5.10-r1
new file mode 100644
index 000000000000..8dfa49f6b791
--- /dev/null
+++ b/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.5.10-r1
@@ -0,0 +1 @@
+MD5 219298e0ab1c95bb6e965521da5ee774 pbbuttonsd-0.5.10.tar.gz 336853
diff --git a/app-laptop/pbbuttonsd/files/pbbuttonsd-0.5.10-compat.patch b/app-laptop/pbbuttonsd/files/pbbuttonsd-0.5.10-compat.patch
new file mode 100644
index 000000000000..1f633540ca66
--- /dev/null
+++ b/app-laptop/pbbuttonsd/files/pbbuttonsd-0.5.10-compat.patch
@@ -0,0 +1,23 @@
+diff -ruN pbbuttonsd-0.5.10.orig/libpbbipc/pbbtags.h pbbuttonsd-0.5.10/libpbbipc/pbbtags.h
+--- pbbuttonsd-0.5.10.orig/libpbbipc/pbbtags.h	2004-04-21 13:11:34.534048368 +0200
++++ pbbuttonsd-0.5.10/libpbbipc/pbbtags.h	2004-04-21 13:17:02.968118800 +0200
+@@ -92,6 +92,19 @@
+ #define TAG_BLANKFRAMEBUFFER	MOD_DISPLAY | 9
+ #define TAG_DIMFULLYDARK	MOD_DISPLAY | 11
+ 
++/* Compatibility tags, needed by kmilo and possibly other programs */
++#define TAG_BRIGHTNESSUPKEY    MOD_DISPLAY | 1
++#define TAG_BRIGHTNESSUPMOD    MOD_DISPLAY | 2
++#define TAG_BRIGHTNESSDOWNKEY  MOD_DISPLAY | 3
++#define TAG_BRIGHTNESSDOWNMOD  MOD_DISPLAY | 4
++#define TAG_BRIGHTNESS         MOD_DISPLAY | 5
++#define TAG_BRIGHTNESSOP       MOD_DISPLAY | FLG_PRIVATE | 6
++#define TAG_BRIGHTNESSMAX      MOD_DISPLAY | 7
++#define TAG_FRAMEBUFFERDEVICE  MOD_DISPLAY | FLG_STRING | 8
++#define TAG_BLANKFRAMEBUFFER   MOD_DISPLAY | 9
++#define TAG_FADINGSPEED                MOD_DISPLAY | 10
++#define TAG_DIMFULLYDARK       MOD_DISPLAY | 11
++
+ #define MOD_MIXER		5 << 16
+ #define TAG_MIXERDEVICE		MOD_MIXER | FLG_STRING | 1
+ #define TAG_VOLUMEUPKEY		MOD_MIXER | 2
diff --git a/app-laptop/pbbuttonsd/pbbuttonsd-0.4.10a.ebuild b/app-laptop/pbbuttonsd/pbbuttonsd-0.4.10a.ebuild
index ecf4b9c7693f..e0e607f1e0b7 100644
--- a/app-laptop/pbbuttonsd/pbbuttonsd-0.4.10a.ebuild
+++ b/app-laptop/pbbuttonsd/pbbuttonsd-0.4.10a.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.4.10a.ebuild,v 1.1 2004/03/16 04:43:28 warpzero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.4.10a.ebuild,v 1.2 2004/04/21 11:52:42 lu_zero Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="PBButtons is a PPC-only program to map special Powerbook/iBook keys in Linux"
diff --git a/app-laptop/pbbuttonsd/pbbuttonsd-0.5.10-r1.ebuild b/app-laptop/pbbuttonsd/pbbuttonsd-0.5.10-r1.ebuild
new file mode 100644
index 000000000000..e874a047d74e
--- /dev/null
+++ b/app-laptop/pbbuttonsd/pbbuttonsd-0.5.10-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.5.10-r1.ebuild,v 1.1 2004/04/21 11:52:42 lu_zero Exp $
+
+inherit eutils
+DESCRIPTION="program to map special Powerbook/iBook keys in Linux"
+HOMEPAGE="http://www.cymes.de/members/joker/projects/pbbuttons/pbbuttons.html"
+SRC_URI="http://www.cymes.de/members/joker/projects/pbbuttons/tar/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~ppc"
+
+DEPEND="virtual/glibc
+	>=sys-apps/baselayout-1.8.6.12-r1"
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+    epatch ${FILESDIR}/${P}-compat.patch
+}
+
+src_compile() {
+	econf || die
+	make || die "compile failed"
+}
+
+src_install() {
+	local mydir=/var/lib
+	dodir /etc/power
+	make \
+		sysconfdir=${D}/etc \
+		localstatedir=${D}/${mydir} \
+		DESTDIR=${D} \
+		install \
+		|| die "failed to install"
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/pbbuttonsd.rc6 pbbuttonsd
+	dodoc README COPYING
+	#fix the symlink
+	rm ${D}/etc/pbbuttonsd.conf
+#	mv ${D}/var/lib/pbbuttons/pbbuttonsd.conf ${D}/etc/pbbuttonsd.conf
+#	dosym /etc/pbbuttonsd.conf /var/lib/pbbuttons/pbbuttonsd.conf
+	dosym ${mydir}/pbbuttons/pbbuttonsd.conf /etc/pbbuttonsd.conf
+	dodir /etc/env.d
+	echo "CONFIG_PROTECT=${mydir}/pbbuttons" > ${D}/etc/env.d/10pbbuttonsd
+}
+
+pkg_postinst(){
+	einfo "This version of pbbuttonsd can replace PMUD functionality."
+	einfo "If you want PMUD installed and running, you should set"
+	einfo "replace_pmud=no in /etc/pbbuttonsd.conf. Otherwise you can"
+	einfo "try setting replace_pmud=yes in /etc/pbbuttonsd.conf and"
+	einfo "disabling PMUD"
+}