Apply patch from upstream which fixes compilation with -dbus. Bug #334533

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 33 insertions, 8 deletions

diff --git a/games-misc/xcowsay/ChangeLog b/games-misc/xcowsay/ChangeLog
index e086265212c4..b295264b6c0b 100644
--- a/games-misc/xcowsay/ChangeLog
+++ b/games-misc/xcowsay/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-misc/xcowsay
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/xcowsay/ChangeLog,v 1.1 2010/08/25 10:27:06 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/xcowsay/ChangeLog,v 1.2 2010/08/26 21:30:02 hwoarang Exp $
+
+  26 Aug 2010; Markos Chandras <hwoarang@gentoo.org> xcowsay-1.2.ebuild,
+  +files/xcowsay-1.2-no-dbus.patch:
+  Apply patch from upstream which fixes compilation with -dbus. Bug #334533
 
 *xcowsay-1.2 (25 Aug 2010)
 
diff --git a/games-misc/xcowsay/Manifest b/games-misc/xcowsay/Manifest
index 1ce943455070..5a86f3b70e3b 100644
--- a/games-misc/xcowsay/Manifest
+++ b/games-misc/xcowsay/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX xcowsay-1.2-no-dbus.patch 454 RMD160 04fa98b845839ad682bf3a24d74394921a5fe914 SHA1 aec605d0465b27cc3f8d67425682769dd6d51540 SHA256 152380dd8798db06236d145373dcc5e7da774c57268649c478dd32670bf428c4
 DIST xcowsay-1.2.tar.gz 264592 RMD160 e7951d345357db64a96617079baba02ff92ccf92 SHA1 b42859a189af71535605e2e0ce53468d5b8e2582 SHA256 27d576b541fbc0aa00be3b3013b5161596eff594ff18abf557ad81cd6b5de324
-EBUILD xcowsay-1.2.ebuild 674 RMD160 373e943624a74a2910ac99dcb3cd184c9890dd2c SHA1 b56af0b31a41ca7d4490115617405eb7fb428316 SHA256 ff6e48f340cafb66811b9fb21ccf771b89ae7ca8347246d0e0d17ba1410a9775
-MISC ChangeLog 359 RMD160 fa63678a386e289090393e805c03a7f480c181c9 SHA1 a00ae38a77bbd008472d1599f1eb9894e30e1ade SHA256 425b4549acc1847df5ba3a6f1443364908b7e2cfc8027b75c30512605db55d2d
+EBUILD xcowsay-1.2.ebuild 777 RMD160 42eb6324dcd21f845b2b561cdd2ce65dede5c4c9 SHA1 3172c2760c8e7bcbe26ddcc7eb2887be28e892ae SHA256 96d99e6645561dbeef4132feda0f1eca2517cc812ac1f3c601813a85b211505d
+MISC ChangeLog 545 RMD160 7b0bd534e0bc0916cf9f76b1b88da43f3b195db3 SHA1 69b734753d09c4dda59444f026f4b63c0096c086 SHA256 4e96ceccb01e5671898fb561b1973fbd604a50c32efcd1541a74fd955832f76c
 MISC metadata.xml 299 RMD160 2e104f9e93f7c11fa27c83226511c841e1a3dbd4 SHA1 25472cd164d586761a84c06a7b1506c6a33c03b7 SHA256 90f87a1654ecc810fd74a96670dee08373b74500e39e378ceb0d64a9c45c6dc5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkx07/4ACgkQ9/cejkQaxBCQkQCdFvTnc64hXXqfFVahuWb7rD3Z
-SK0An1d4sAsaE2vwM4NQmJ3K4mCowwJj
-=AAP6
+iEYEARECAAYFAkx23OkACgkQ9/cejkQaxBAIEgCeLX9H5sjzaCTMPEyoTy7I7njD
+wVMAnA5URhYU868OWKWN+D4NuX2QkIcL
+=m+/3
 -----END PGP SIGNATURE-----
diff --git a/games-misc/xcowsay/files/xcowsay-1.2-no-dbus.patch b/games-misc/xcowsay/files/xcowsay-1.2-no-dbus.patch
new file mode 100644
index 000000000000..a35f34984732
--- /dev/null
+++ b/games-misc/xcowsay/files/xcowsay-1.2-no-dbus.patch
@@ -0,0 +1,14 @@
+diff --git a/configure.ac b/configure.ac
+index 3554e67..b8b66c1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -35,8 +35,8 @@ AC_ARG_ENABLE(dbus,
+         [AS_HELP_STRING([--enable-dbus], [Build the DBus daemon.])],
+         [if test "$enableval" = "yes" ; then
+            modules="$xcowsayd_modules"
++           CFLAGS="$CFLAGS -DWITH_DBUS"
+          fi
+-         CFLAGS="$CFLAGS -DWITH_DBUS"
+ 	 AC_FUNC_FORK])
+ 
+ PKG_CHECK_MODULES(XCOWSAY, $modules)
diff --git a/games-misc/xcowsay/xcowsay-1.2.ebuild b/games-misc/xcowsay/xcowsay-1.2.ebuild
index 66306e9de968..84e12873b717 100644
--- a/games-misc/xcowsay/xcowsay-1.2.ebuild
+++ b/games-misc/xcowsay/xcowsay-1.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/xcowsay/xcowsay-1.2.ebuild,v 1.1 2010/08/25 10:27:06 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/xcowsay/xcowsay-1.2.ebuild,v 1.2 2010/08/26 21:30:02 hwoarang Exp $
 
 EAPI="2"
 
-inherit base
+inherit base autotools
 
 DESCRIPTION="configurable talking graphical cow (inspired by cowsay)"
 HOMEPAGE="http://www.doof.me.uk/xcowsay/"
@@ -16,6 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="dbus"
 
 RDEPEND="dbus? ( sys-apps/dbus )
+	dev-libs/dbus-glib
 	games-misc/fortune-mod
 	media-libs/freetype:2
 	media-libs/libpng
@@ -23,6 +24,11 @@ RDEPEND="dbus? ( sys-apps/dbus )
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-no-dbus.patch
+	eautoreconf
+}
+
 src_configure() {
 	econf $(use_enable dbus)
 }