Marked ppc stable. Added patches to not link in g++ if ibam is not enabled. Also added patch for bug #194595. Fixed some unquoted variables and removed old versions.

(Portage version: 2.1.4_rc4)

8 files changed, 49 insertions, 216 deletions

diff --git a/app-laptop/pbbuttonsd/ChangeLog b/app-laptop/pbbuttonsd/ChangeLog
index c588b6e3c9b2..4a234c4081dd 100644
--- a/app-laptop/pbbuttonsd/ChangeLog
+++ b/app-laptop/pbbuttonsd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-laptop/pbbuttonsd
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/ChangeLog,v 1.70 2007/09/09 01:58:39 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/ChangeLog,v 1.71 2007/11/30 03:38:43 josejx Exp $
+
+  30 Nov 2007; Joseph Jezak <josejx@gentoo.org> +files/g++.patch,
+  +files/lz.patch, -pbbuttonsd-0.8.1.ebuild, -pbbuttonsd-0.8.1-r1.ebuild,
+  pbbuttonsd-0.8.1-r2.ebuild:
+  Marked ppc stable. Added patches to not link in g++ if ibam is not enabled.
+  Also added patch for bug #194595. Fixed some unquoted variables and removed
+  old versions.
 
 *pbbuttonsd-0.8.1-r2 (09 Sep 2007)
 
diff --git a/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.8.1 b/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.8.1
deleted file mode 100644
index 68208022e6dc..000000000000
--- a/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.8.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5addde05fe291bee974443b531a3a3e5 pbbuttonsd-0.8.1.tar.gz 589630
-RMD160 2f1dc0bc8b67cbb310f06df932a5dfcf26d35551 pbbuttonsd-0.8.1.tar.gz 589630
-SHA256 b391fd98ed263f355d7e7addc6566959e986627c87dcfdaa1da15310ad70bffa pbbuttonsd-0.8.1.tar.gz 589630
diff --git a/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.8.1-r1 b/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.8.1-r1
deleted file mode 100644
index 68208022e6dc..000000000000
--- a/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.8.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5addde05fe291bee974443b531a3a3e5 pbbuttonsd-0.8.1.tar.gz 589630
-RMD160 2f1dc0bc8b67cbb310f06df932a5dfcf26d35551 pbbuttonsd-0.8.1.tar.gz 589630
-SHA256 b391fd98ed263f355d7e7addc6566959e986627c87dcfdaa1da15310ad70bffa pbbuttonsd-0.8.1.tar.gz 589630
diff --git a/app-laptop/pbbuttonsd/files/g++.patch b/app-laptop/pbbuttonsd/files/g++.patch
new file mode 100644
index 000000000000..5743bf0aa5df
--- /dev/null
+++ b/app-laptop/pbbuttonsd/files/g++.patch
@@ -0,0 +1,11 @@
+--- src/Makefile.tmp	2007-11-29 20:42:38.000000000 -0500
++++ src/Makefile.in	2007-11-29 20:47:23.000000000 -0500
+@@ -319,7 +319,7 @@
+ 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+ pbbuttonsd$(EXEEXT): $(pbbuttonsd_OBJECTS) $(pbbuttonsd_DEPENDENCIES) 
+ 	@rm -f pbbuttonsd$(EXEEXT)
+-	$(CXXLINK) $(pbbuttonsd_LDFLAGS) $(pbbuttonsd_OBJECTS) $(pbbuttonsd_LDADD) $(LIBS)
++	$(LINK) $(pbbuttonsd_LDFLAGS) $(pbbuttonsd_OBJECTS) $(pbbuttonsd_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
diff --git a/app-laptop/pbbuttonsd/files/lz.patch b/app-laptop/pbbuttonsd/files/lz.patch
new file mode 100644
index 000000000000..c367acba0211
--- /dev/null
+++ b/app-laptop/pbbuttonsd/files/lz.patch
@@ -0,0 +1,15 @@
+--- configure.in.bak	2007-11-29 22:29:42.000000000 -0500
++++ configure.in	2007-11-29 22:30:06.000000000 -0500
+@@ -59,10 +59,9 @@
+ 		AC_CHECK_HEADERS([smbios/SystemInfo.h],
+ 			AC_DEFINE_UNQUOTED(WITH_SMBIOS, 1, [SMBIOS available]),
+ 			AC_MSG_ERROR([SMBios library not available. Please install development files for libsmbios.]), [/* dummy */])
+-		AC_CHECK_HEADERS([pci/pci.h sys/io.h], ac_macbook=yes,
+-			AC_MSG_ERROR([Please install development files for libpci and direct I/O.]), [/* dummy */])
++		PKG_CHECK_MODULES(LIBPCI, libpci)
+ 		PB_OBJECTS+=" driver_backlight_x1600.$OBJEXT driver_backlight_gma950.$OBJEXT module_acpi.$OBJEXT module_imac.$OBJEXT"
+-		PB_LIBS+=" -lpci -lsmbios"
++		PB_LIBS+=" -lsmbios $LIBPCI_LIBS"
+ 		LCD_FADINGSPEED="448"
+ 		LCD_AUTOADJMODE="linear"
+ 		LCD_AUTOADJPARMBAT="0,10,80,30"
diff --git a/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1-r1.ebuild b/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1-r1.ebuild
deleted file mode 100644
index 8ae1dd025e6d..000000000000
--- a/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1-r1.ebuild,v 1.2 2007/09/09 01:58:39 josejx Exp $
-
-inherit autotools flag-o-matic eutils
-
-DESCRIPTION="Handles power management and special keys on laptops."
-HOMEPAGE="http://pbbuttons.berlios.de"
-SRC_URI="mirror://sourceforge/pbbuttons/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ppc ~x86"
-IUSE="acpi alsa debug doc ibam macbook oss"
-
-DEPEND="macbook? ( sys-libs/libsmbios )
-		>=dev-libs/glib-2.6
-		doc? ( app-doc/doxygen )"
-RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0 )
-		 >=dev-libs/glib-2.6"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/pmcs.patch
-	eautoconf
-}
-
-src_compile() {
-	# Fix crash bug on some systems
-	replace-flags -O? -O1
-
-	if use macbook; then
-		laptop=macbook
-	elif use x86 || use amd64; then
-		if use acpi; then
-			laptop=acpi
-		else
-			laptop=i386
-		fi
-	# Default to PowerBook
-	else
-		laptop=powerbook
-	fi
-
-	econf laptop=$laptop \
-		$(use_enable debug) \
-		$(use_with doc doxygen_docs) \
-		$(use_with alsa) \
-		$(use_with oss) \
-		$(use_with ibam) \
-		|| die "Sorry, failed to configure pbbuttonsd"
-
-	# Thanks to Stefan Bruda for this workaround
-	# Using -j1 fixes a parallel build issue with the docs
-	if use doc; then
-		emake -j1 || die "Sorry, failed to compile pbbuttonsd"
-	else
-		emake || die "Sorry, failed to compile pbbuttonsd"
-	fi
-}
-
-src_install() {
-	dodir /etc/power
-	use ibam && dodir /var/lib/ibam
-	make DESTDIR=${D} install || die "failed to install"
-	newinitd ${FILESDIR}/pbbuttonsd.rc6 pbbuttonsd
-	dodoc README
-	use doc && dohtml -r doc/*
-}
-
-pkg_postinst() {
-	if [ -e /etc/pbbuttonsd.conf ]; then
-		ewarn "The pbbuttonsd.cnf file replaces /etc/pbuttonsd.conf with a new"
-		ewarn "file (/etc/pbbuttonsd.conf) and a new format.  Please check the"
-		ewarn "manual page with 'man pbbuttonsd.cnf' for details."
-		ewarn
-	fi
-
-	if use macbook; then
-		ewarn "Macbook and Macbook Pro users should make sure to have applesmc"
-		ewarn "loaded before starting pbbuttonsdm otherwise auto-adjustments"
-		ewarn "will not work and pbbuttonsd may segfault."
-	fi
-
-	ewarn "Ensure that the evdev kernel module is loaded otherwise"
-	ewarn "pbbuttonsd won't work.  SysV IPC is also required."
-	ewarn
-	ewarn "If you need extra security, you can tell pbbuttonsd to only accept"
-	ewarn "input from one user.  You can set the userallowed option in"
-	ewarn "/etc/pbbuttonsd.cnf to limit access."
-	ewarn
-
-	if use ibam; then
-		elog "To properly initialize the IBaM battery database, you will"
-		elog "need to perform a full discharge/charge cycle.  For more"
-		elog "details, please see the pbbuttonsd man page."
-		elog
-	fi
-}
diff --git a/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1-r2.ebuild b/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1-r2.ebuild
index 683910fac605..ec7777ae6e38 100644
--- a/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1-r2.ebuild
+++ b/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1-r2.ebuild,v 1.1 2007/09/09 01:58:39 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1-r2.ebuild,v 1.2 2007/11/30 03:38:43 josejx Exp $
 
 inherit autotools flag-o-matic eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/pbbuttons/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="ppc ~x86"
 IUSE="acpi alsa debug doc ibam macbook oss"
 
 DEPEND="macbook? ( sys-libs/libsmbios )
@@ -20,10 +20,16 @@ RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0 )
 		 >=dev-libs/glib-2.6"
 
 src_unpack() {
-	unpack ${A}
-	cd ${S}
+	unpack "${A}"
+	cd "${S}"
 
-	epatch ${FILESDIR}/pmcs.patch
+	epatch "${FILESDIR}/pmcs.patch"
+	### Don't link with g++ if we don't use ibam
+	if ! use ibam; then
+		epatch "${FILESDIR}/g++.patch"
+	fi
+	### Fix macbook -lz issue
+	epatch "${FILESDIR}/lz.patch"
 	eautoconf
 }
 
@@ -64,8 +70,8 @@ src_compile() {
 src_install() {
 	dodir /etc/power
 	use ibam && dodir /var/lib/ibam
-	make DESTDIR=${D} install || die "failed to install"
-	newinitd ${FILESDIR}/pbbuttonsd.rc6 pbbuttonsd
+	make DESTDIR="${D}" install || die "failed to install"
+	newinitd "${FILESDIR}/pbbuttonsd.rc6" pbbuttonsd
 	dodoc README
 	use doc && dohtml -r doc/*
 
@@ -73,8 +79,8 @@ src_install() {
 	dodir /etc/power/suspend.d
 	dodir /etc/power/scripts.d
 	exeinto "/etc/power/scripts.d"
-	doexe ${FILESDIR}/wireless
-	ln -s ${D}/etc/power/scripts.d/wireless ${D}/etc/power/resume.d/wireless
+	doexe "${FILESDIR}/wireless"
+	ln -s "${D}/etc/power/scripts.d/wireless" "${D}/etc/power/resume.d/wireless"
 }
 
 pkg_postinst() {
diff --git a/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1.ebuild b/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1.ebuild
deleted file mode 100644
index eca29b64dbf0..000000000000
--- a/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1.ebuild,v 1.1 2007/07/07 23:40:18 josejx Exp $
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="Handles power management and special keys on laptops."
-HOMEPAGE="http://pbbuttons.berlios.de"
-SRC_URI="mirror://sourceforge/pbbuttons/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE="acpi alsa debug doc ibam macbook oss"
-
-DEPEND="macbook? ( sys-libs/libsmbios )
-		>=dev-libs/glib-2.6
-		doc? ( app-doc/doxygen )"
-RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0 )
-		 >=dev-libs/glib-2.6"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	eautoconf
-}
-
-src_compile() {
-	# Fix crash bug on some systems
-	replace-flags -O? -O1
-
-	if use macbook; then
-		laptop=macbook
-	elif use x86 || use amd64; then
-		if use acpi; then
-			laptop=acpi
-		else
-			laptop=i386
-		fi
-	# Default to PowerBook
-	else
-		laptop=powerbook
-	fi
-
-	econf laptop=$laptop \
-		$(use_enable debug) \
-		$(use_with doc doxygen_docs) \
-		$(use_with alsa) \
-		$(use_with oss) \
-		$(use_with ibam) \
-		|| die "Sorry, failed to configure pbbuttonsd"
-
-	# Thanks to Stefan Bruda for this workaround
-	# Using -j1 fixes a parallel build issue with the docs
-	if use doc; then
-		emake -j1 || die "Sorry, failed to compile pbbuttonsd"
-	else
-		emake || die "Sorry, failed to compile pbbuttonsd"
-	fi
-}
-
-src_install() {
-	dodir /etc/power
-	use ibam && dodir /var/lib/ibam
-	make DESTDIR=${D} install || die "failed to install"
-	newinitd ${FILESDIR}/pbbuttonsd.rc6 pbbuttonsd
-	dodoc README
-	use doc && dohtml -r doc/*
-}
-
-pkg_postinst() {
-	if [ -e /etc/pbbuttonsd.conf ]; then
-		ewarn "The pbbuttonsd.cnf file replaces /etc/pbuttonsd.conf with a new"
-		ewarn "file (/etc/pbbuttonsd.conf) and a new format.  Please check the"
-		ewarn "manual page with 'man pbbuttonsd.cnf' for details."
-		ewarn
-	fi
-
-	if use macbook; then
-		ewarn "Macbook and Macbook Pro users should make sure to have applesmc"
-		ewarn "loaded before starting pbbuttonsdm otherwise auto-adjustments"
-		ewarn "will not work and pbbuttonsd may segfault."
-	fi
-
-	ewarn "Ensure that the evdev kernel module is loaded otherwise"
-	ewarn "pbbuttonsd won't work.  SysV IPC is also required."
-	ewarn
-	ewarn "If you need extra security, you can tell pbbuttonsd to only accept"
-	ewarn "input from one user.  You can set the userallowed option in"
-	ewarn "/etc/pbbuttonsd.cnf to limit access."
-	ewarn
-
-	if use ibam; then
-		elog "To properly initialize the IBaM battery database, you will"
-		elog "need to perform a full discharge/charge cycle.  For more"
-		elog "details, please see the pbbuttonsd man page."
-		elog
-	fi
-}