10 files changed, 19 insertions, 114 deletions
diff --git a/app-laptop/pbbuttonsd/ChangeLog b/app-laptop/pbbuttonsd/ChangeLog
index 169ec76f1283..8f261fb4bed1 100644
--- a/app-laptop/pbbuttonsd/ChangeLog
+++ b/app-laptop/pbbuttonsd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-laptop/pbbuttonsd
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/ChangeLog,v 1.23 2005/05/26 19:28:19 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/ChangeLog,v 1.24 2005/06/27 04:31:37 josejx Exp $
+
+*pbbuttonsd-0.7_pre1 (27 Jun 2005)
+
+  27 Jun 2005; Joseph Jezak <josejx@gentoo.org>
+  -files/alsa-segfault-0.6.7.patch, -pbbuttonsd-0.6.7.ebuild,
+  -pbbuttonsd-0.6.8.ebuild, -pbbuttonsd-0.6.9.ebuild,
+  +pbbuttonsd-0.7_pre1.ebuild:
+  Added 0.7beta1 and removed old ebuilds.
 
 *pbbuttonsd-0.6.10 (26 May 2005)
 
diff --git a/app-laptop/pbbuttonsd/Manifest b/app-laptop/pbbuttonsd/Manifest
index 5b4ec7332970..d682a2f9b1a1 100644
--- a/app-laptop/pbbuttonsd/Manifest
+++ b/app-laptop/pbbuttonsd/Manifest
@@ -1,6 +1,7 @@
-MD5 b992f471fde92e5bf0968ebdc37d2a9d ChangeLog 7716
+MD5 7b7b1d44ab306ac1437758d5ed5d7793 ChangeLog 7845
 MD5 f0cdcf7c27493d60d25d76f479b82e63 pbbuttonsd-0.6.10.ebuild 1117
 MD5 86caedd5742982169284b585959a54be pbbuttonsd-0.6.6.ebuild 1146
+MD5 c307ab5fb24de21abe4e5ab5274d0c07 pbbuttonsd-0.7_pre1.ebuild 1162
 MD5 a1a227ff046587610a675a10f886e17f pbbuttonsd-0.6.9.ebuild 1116
 MD5 52f9d8e98c8931645c57a3de1c36727d metadata.xml 156
 MD5 7e92ba1b0553ffc0f053f7fbcb509940 pbbuttonsd-0.6.8.ebuild 1116
@@ -9,6 +10,7 @@ MD5 e87049121a8371a7173cb9aa7c5b167d files/pbbuttonsd.rc6 444
 MD5 76ce2f280375ad31eca7fcf131e89de9 files/digest-pbbuttonsd-0.6.8 68
 MD5 0f4c273c42485937890959b8248405c5 files/digest-pbbuttonsd-0.6.9 68
 MD5 af23b978a8a629ecc99e95f3505e8a74 files/digest-pbbuttonsd-0.6.10 69
+MD5 921e017fad1253b70863f48dc9dbf670 files/digest-pbbuttonsd-0.7_pre1 73
 MD5 676408374debb17d40c3562e2fa021a6 files/alsa-segfault-0.6.7.patch 487
 MD5 79966ef982c2ecd2ae5fcd57c9a82e97 files/digest-pbbuttonsd-0.6.7 68
 MD5 72caa2adac6c8260c57c0ae15cc259f3 files/digest-pbbuttonsd-0.6.6 68
diff --git a/app-laptop/pbbuttonsd/files/alsa-segfault-0.6.7.patch b/app-laptop/pbbuttonsd/files/alsa-segfault-0.6.7.patch
deleted file mode 100644
index c854ec8ab5be..000000000000
--- a/app-laptop/pbbuttonsd/files/alsa-segfault-0.6.7.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/module_alsamixer.c	2005-01-24 19:50:37.000000000 +0100
-+++ src/module_alsamixer.c	2005-01-27 16:24:18.000000000 +0100
-@@ -434,9 +434,15 @@
- alsamixer_exit ()
- {
- 	struct moddata_alsamixer *base = &modbase_alsamixer;
--	free (base->elements);
--	base->elements = NULL;
--	snd_mixer_free (base->mixer);
-+
-+	if (base->elements) {
-+		free (base->elements);
-+		base->elements = NULL;
-+	}
-+
-+	if (base->mixer)
-+		snd_mixer_free (base->mixer);
-+	
- 	base->init_complete = 0;
- 	return 0;
- }
diff --git a/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.6.7 b/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.6.7
deleted file mode 100644
index ca2f4221dbdb..000000000000
--- a/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.6.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9dd3e2e41cae5028020947495a97d3e9 pbbuttonsd-0.6.7.tar.gz 384799
diff --git a/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.6.8 b/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.6.8
deleted file mode 100644
index c50899f532e3..000000000000
--- a/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.6.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 70bf7577f2f0d665be6858c464ac8678 pbbuttonsd-0.6.8.tar.gz 391664
diff --git a/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.6.9 b/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.6.9
deleted file mode 100644
index 88c246b60cff..000000000000
--- a/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.6.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2ab7ca2da8513109a5b91ce0e09268f3 pbbuttonsd-0.6.9.tar.gz 393753
diff --git a/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.7_pre1 b/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.7_pre1
new file mode 100644
index 000000000000..31ef137597db
--- /dev/null
+++ b/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.7_pre1
@@ -0,0 +1 @@
+MD5 4d33513da7f90847f6b8c0675c9c9651 pbbuttonsd-0.7.0beta1.tar.gz 398010
diff --git a/app-laptop/pbbuttonsd/pbbuttonsd-0.6.7.ebuild b/app-laptop/pbbuttonsd/pbbuttonsd-0.6.7.ebuild
deleted file mode 100644
index 191eb29ee13d..000000000000
--- a/app-laptop/pbbuttonsd/pbbuttonsd-0.6.7.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.6.7.ebuild,v 1.2 2005/02/19 05:31:28 josejx Exp $
-
-inherit eutils
-
-DESCRIPTION="program to map special Powerbook/iBook keys"
-HOMEPAGE="http://pbbuttons.sf.net"
-SRC_URI="mirror://sourceforge/pbbuttons/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc"
-IUSE=""
-
-DEPEND="virtual/libc
-	>=sys-apps/baselayout-1.8.6.12-r1"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/alsa-segfault-${PV}.patch
-}
-
-src_compile() {
-	econf || die "sorry, failed to configure pbbuttonsd"
-	emake || die "sorry, failed to compile pbbuttonsd"
-}
-
-src_install() {
-	dodir /etc/power
-	make DESTDIR=${D} install || die "failed to install"
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/pbbuttonsd.rc6 pbbuttonsd
-	dodoc README
-}
-
-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"
-}
diff --git a/app-laptop/pbbuttonsd/pbbuttonsd-0.6.9.ebuild b/app-laptop/pbbuttonsd/pbbuttonsd-0.6.9.ebuild
deleted file mode 100644
index dcb5d3e0a9dd..000000000000
--- a/app-laptop/pbbuttonsd/pbbuttonsd-0.6.9.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.6.9.ebuild,v 1.1 2005/04/08 07:12:46 josejx Exp $
-
-inherit eutils
-
-DESCRIPTION="program to map special Powerbook/iBook keys"
-HOMEPAGE="http://pbbuttons.sf.net"
-SRC_URI="mirror://sourceforge/pbbuttons/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc"
-IUSE=""
-
-DEPEND="virtual/libc
-	>=sys-apps/baselayout-1.8.6.12-r1"
-RDEPEND=""
-
-src_compile() {
-	econf || die "sorry, failed to configure pbbuttonsd"
-	emake || die "sorry, failed to compile pbbuttonsd"
-}
-
-src_install() {
-	dodir /etc/power
-	make DESTDIR=${D} install || die "failed to install"
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/pbbuttonsd.rc6 pbbuttonsd
-	dodoc README
-}
-
-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"
-}
diff --git a/app-laptop/pbbuttonsd/pbbuttonsd-0.6.8.ebuild b/app-laptop/pbbuttonsd/pbbuttonsd-0.7_pre1.ebuild
index 27ba8161f515..80325cf4d38f 100644
--- a/app-laptop/pbbuttonsd/pbbuttonsd-0.6.8.ebuild
+++ b/app-laptop/pbbuttonsd/pbbuttonsd-0.7_pre1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.6.8.ebuild,v 1.1 2005/03/26 10:05:27 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.7_pre1.ebuild,v 1.1 2005/06/27 04:31:37 josejx Exp $
 
 inherit eutils
 
 DESCRIPTION="program to map special Powerbook/iBook keys"
 HOMEPAGE="http://pbbuttons.sf.net"
-SRC_URI="mirror://sourceforge/pbbuttons/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/pbbuttons/${PN}-0.7.0beta1.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,9 +17,11 @@ DEPEND="virtual/libc
 	>=sys-apps/baselayout-1.8.6.12-r1"
 RDEPEND=""
 
+S="${WORKDIR}/${PN}-0.7.0beta1"
+
 src_compile() {
-	econf || die "sorry, failed to configure pbbuttonsd"
-	emake || die "sorry, failed to compile pbbuttonsd"
+	econf || die "Sorry, failed to configure pbbuttonsd"
+	emake || die "Sorry, failed to compile pbbuttonsd"
 }
 
 src_install() {