make ibam really optional

Package-Manager: portage-2.1.1_rc1

4 files changed, 57 insertions, 20 deletions

diff --git a/app-laptop/pbbuttonsd/ChangeLog b/app-laptop/pbbuttonsd/ChangeLog
index 9e46eba541ca..8eafc8a76014 100644
--- a/app-laptop/pbbuttonsd/ChangeLog
+++ b/app-laptop/pbbuttonsd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-laptop/pbbuttonsd
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/ChangeLog,v 1.52 2006/08/26 07:23:19 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/ChangeLog,v 1.53 2006/08/27 20:17:42 lu_zero Exp $
+
+  27 Aug 2006; Luca Barbato <lu_zero@gentoo.org>
+  +files/pbbuttonsd-ibam-g++.patch, pbbuttonsd-0.7.8.ebuild:
+  fix spurious libstdc++ dep
 
   26 Aug 2006; Stephanie Lockwood-Childs <wormo@gentoo.org>
   +files/pbbuttonsd-laptopmode-noatime.patch, pbbuttonsd-0.6.6.ebuild,
diff --git a/app-laptop/pbbuttonsd/Manifest b/app-laptop/pbbuttonsd/Manifest
index 01e60746726a..848ec54d2d61 100644
--- a/app-laptop/pbbuttonsd/Manifest
+++ b/app-laptop/pbbuttonsd/Manifest
@@ -1,6 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX pbbuttonsd-ibam-g++.patch 1207 RMD160 ac9f7c6f379670c8c82476e245731c7c30385e68 SHA1 9c31634711185ae97f2bdb0cd5f6f76cd2aa3b4b SHA256 5379bcf5de6f4aaed3ad38da17bce2981883c9db9a727a53ff415e9bbcc2d54b
+MD5 d46a0203283bc8447251de3a070bf41f files/pbbuttonsd-ibam-g++.patch 1207
+RMD160 ac9f7c6f379670c8c82476e245731c7c30385e68 files/pbbuttonsd-ibam-g++.patch 1207
+SHA256 5379bcf5de6f4aaed3ad38da17bce2981883c9db9a727a53ff415e9bbcc2d54b files/pbbuttonsd-ibam-g++.patch 1207
 AUX pbbuttonsd-laptopmode-noatime.patch 813 RMD160 ff2fed12457af85186b83d67fd8b6bdbce3000a3 SHA1 32e4b8d2e3ed72b9dc24420128d92c979b80fed6 SHA256 74f681cc742442301a3ab257e8105b45b6efdfd0745cd7134d7ba92741e182d9
 MD5 bc314d534f5015b5fcfc5b3d4135aa41 files/pbbuttonsd-laptopmode-noatime.patch 813
 RMD160 ff2fed12457af85186b83d67fd8b6bdbce3000a3 files/pbbuttonsd-laptopmode-noatime.patch 813
@@ -30,14 +31,14 @@ EBUILD pbbuttonsd-0.7.6.ebuild 2090 RMD160 cb1a5ea706ce618d3b654e9fcf3825ea6d9b6
 MD5 dde4f8f9da7d3c1b495e082222ffcb5b pbbuttonsd-0.7.6.ebuild 2090
 RMD160 cb1a5ea706ce618d3b654e9fcf3825ea6d9b6611 pbbuttonsd-0.7.6.ebuild 2090
 SHA256 c6772b4ebb0ca42193d7ec3b2c60350778c35d5c8dfadae5135212d2c9dbe12f pbbuttonsd-0.7.6.ebuild 2090
-EBUILD pbbuttonsd-0.7.8.ebuild 2090 RMD160 d506ae537edbb076f0b22bfeb3fc87ac7aff1b7e SHA1 13f1ebb260116ef3d0fec9071c01a65558856c73 SHA256 304367b25a4c03942013f9a35d611ffb93518eb90a0f24428a7ae3084e551aea
-MD5 7694811a0299bc04003f2b3c2c7958c9 pbbuttonsd-0.7.8.ebuild 2090
-RMD160 d506ae537edbb076f0b22bfeb3fc87ac7aff1b7e pbbuttonsd-0.7.8.ebuild 2090
-SHA256 304367b25a4c03942013f9a35d611ffb93518eb90a0f24428a7ae3084e551aea pbbuttonsd-0.7.8.ebuild 2090
-MISC ChangeLog 12389 RMD160 f28b439c156fb96fef42b4c8e2bda1749c8f28b2 SHA1 a556a2a9303c6802029d31de4845dbef9364630a SHA256 a07c03a48f24b9adf9b3e76becaec267b4e81f90109be5f18716ddf7d119a1ff
-MD5 253740a729b5092de17290a0a2f9f33a ChangeLog 12389
-RMD160 f28b439c156fb96fef42b4c8e2bda1749c8f28b2 ChangeLog 12389
-SHA256 a07c03a48f24b9adf9b3e76becaec267b4e81f90109be5f18716ddf7d119a1ff ChangeLog 12389
+EBUILD pbbuttonsd-0.7.8.ebuild 2153 RMD160 b2af3a32982539cbc34d7976e0d95917308eec70 SHA1 8675cc2274d9209f369e5d4a48cdd36bc13513ab SHA256 c80c2b86fe9ef6ec45d2f1657f7a0ed8b4b0ce2bc769a162abdeddff80d6dafc
+MD5 ece6b7358a46f8816f6040557091705a pbbuttonsd-0.7.8.ebuild 2153
+RMD160 b2af3a32982539cbc34d7976e0d95917308eec70 pbbuttonsd-0.7.8.ebuild 2153
+SHA256 c80c2b86fe9ef6ec45d2f1657f7a0ed8b4b0ce2bc769a162abdeddff80d6dafc pbbuttonsd-0.7.8.ebuild 2153
+MISC ChangeLog 12531 RMD160 dafb4a7dba44b4962b15b3bfebeca39912de9a52 SHA1 97880dcf6026b8f65d31e304b10ae2b73f7bd0fd SHA256 d541bfb85b659f8394f015a72f92c1d28a32cdf354e9da2569adb50e4c7bb463
+MD5 dd1ec6e2b6a0f8caff9f7f4af5cb2171 ChangeLog 12531
+RMD160 dafb4a7dba44b4962b15b3bfebeca39912de9a52 ChangeLog 12531
+SHA256 d541bfb85b659f8394f015a72f92c1d28a32cdf354e9da2569adb50e4c7bb463 ChangeLog 12531
 MISC metadata.xml 156 RMD160 a57e9e3e71bd04aa138850dc8cce8dbe9e1cd5a2 SHA1 30b3e2b32ee2b52b68ad1d77f04f2c75980bf7d4 SHA256 d57f79be439079b5c78578b17eb3ee7d20883353b1c40a716d3f1ab06af34851
 MD5 52f9d8e98c8931645c57a3de1c36727d metadata.xml 156
 RMD160 a57e9e3e71bd04aa138850dc8cce8dbe9e1cd5a2 metadata.xml 156
@@ -57,10 +58,3 @@ SHA256 c721ac0bdc9f3d08ff172cb9a44ece2a883519e9a5a70b59fb81606cdb648762 files/di
 MD5 4fd90ebec1a8366a5a712e7c34aaaa83 files/digest-pbbuttonsd-0.7.8 250
 RMD160 a1b332abd36987031b48908fc8d916932a9ce544 files/digest-pbbuttonsd-0.7.8 250
 SHA256 66e8f156c829045820447c601c2d94dd050ffd5972d01afad1c31d66e3a14ecf files/digest-pbbuttonsd-0.7.8 250
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFE7/ZO/NoSW7FuNV8RAtmLAJ4uqtXA3s40tnSz0pc4DxLq3ik07gCeLItS
-rGMnxg9QmT43laVI1UjoqSU=
-=yZxU
------END PGP SIGNATURE-----
diff --git a/app-laptop/pbbuttonsd/files/pbbuttonsd-ibam-g++.patch b/app-laptop/pbbuttonsd/files/pbbuttonsd-ibam-g++.patch
new file mode 100644
index 000000000000..85000783838c
--- /dev/null
+++ b/app-laptop/pbbuttonsd/files/pbbuttonsd-ibam-g++.patch
@@ -0,0 +1,36 @@
+--- pbbuttonsd-0.7.8.orig/configure.in	2006-07-31 10:08:31.000000000 +0200
++++ pbbuttonsd-0.7.8/configure.in	2006-08-27 21:36:25.000000000 +0200
+@@ -81,9 +81,7 @@
+ pbb_with_ibam=yes
+ AC_ARG_WITH(ibam, [  --with-ibam             enable IBAM support in pbbuttonsd (default=yes)],
+ 	pbb_with_ibam=$withval, )
+-if test "$pbb_with_ibam" == "yes"; then
+-	AC_DEFINE_UNQUOTED(WITH_IBAM, 1, [enable IBAM support])
+-fi
++AM_CONDITIONAL(WITH_IBAM, test "$pbb_with_ibam" = yes)
+ 
+ dnl Conditionals
+ AM_CONDITIONAL(DEBUG, test "$enable_debug" = yes)
+--- pbbuttonsd-0.7.8.orig/src/Makefile.am	2006-07-22 19:25:39.000000000 +0200
++++ pbbuttonsd-0.7.8/src/Makefile.am	2006-08-27 21:40:53.000000000 +0200
+@@ -4,6 +4,10 @@
+ 
+ bin_PROGRAMS = pbbuttonsd
+ 
++if WITH_IBAM
++IBAM = ibam_stub.cpp ibam_stub.h ibam.hpp ibam.inl
++endif
++
+ pbbuttonsd_SOURCES = \
+ 	pbbuttonsd.c \
+ 	init.c init.h systems.h \
+@@ -20,8 +24,7 @@
+ 	module_alsamixer.c module_alsamixer.h \
+ 	module_peep.c module_peep.h \
+ 	tcp.c tcp.h gettext_macros.h pbbinput.h \
+-	debug.h \
+-	ibam_stub.cpp ibam_stub.h ibam.hpp ibam.inl
++	debug.h $(IBAM)
+ 
+ pbbuttonsd_LDADD = -lpbb $(INTLLIBS) $(ALSA_LIBS) @PACKAGE_LIBS@
+ pbbuttonsd_LDFLAGS = -L$(top_srcdir)/libpbbipc
diff --git a/app-laptop/pbbuttonsd/pbbuttonsd-0.7.8.ebuild b/app-laptop/pbbuttonsd/pbbuttonsd-0.7.8.ebuild
index 46d779c8000d..fc62ebbcd1bc 100644
--- a/app-laptop/pbbuttonsd/pbbuttonsd-0.7.8.ebuild
+++ b/app-laptop/pbbuttonsd/pbbuttonsd-0.7.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.7.8.ebuild,v 1.2 2006/08/26 07:23:19 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.7.8.ebuild,v 1.3 2006/08/27 20:17:42 lu_zero Exp $
 
 inherit eutils flag-o-matic
 
@@ -22,6 +22,9 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-laptopmode-noatime.patch
+	epatch ${FILESDIR}/${PN}-ibam-g++.patch
+	autoconf
+	automake
 }
 
 src_compile() {