Fix building with recent glibc wrt #336649 by Jochen Schlick.

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

4 files changed, 33 insertions, 15 deletions

diff --git a/sys-apps/dnotify/ChangeLog b/sys-apps/dnotify/ChangeLog
index 41fba72c34cc..e60f82df268c 100644
--- a/sys-apps/dnotify/ChangeLog
+++ b/sys-apps/dnotify/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/dnotify
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dnotify/ChangeLog,v 1.23 2008/01/10 10:40:22 vapier Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dnotify/ChangeLog,v 1.24 2010/09/10 05:06:06 ssuominen Exp $
+
+  10 Sep 2010; Samuli Suominen <ssuominen@gentoo.org> dnotify-0.18.0.ebuild,
+  +files/dnotify-0.18.0-glibc-212.patch:
+  Fix building with recent glibc wrt #336649 by Jochen Schlick.
 
   10 Jan 2008; Mike Frysinger <vapier@gentoo.org> dnotify-0.18.0.ebuild:
   Update HOMEPAGE #205167 and touchup ebuild.
diff --git a/sys-apps/dnotify/Manifest b/sys-apps/dnotify/Manifest
index cb2c60e124b6..313759a11eaf 100644
--- a/sys-apps/dnotify/Manifest
+++ b/sys-apps/dnotify/Manifest
@@ -1,5 +1,6 @@
+AUX dnotify-0.18.0-glibc-212.patch 213 RMD160 40976692b82160b4848a07f845bc41f4f267e74e SHA1 64de86a3258a3f8f2e0ca5735b38301e8a2382f8 SHA256 c4a86fe0c594e5ce220f4deca46573dac6fe04873569ec13eaa4d19d1008eaf3
 AUX dnotify-0.18.0-nls.patch 248 RMD160 ad3cb573ffd93d7d30c9bc509add621d0058a784 SHA1 3ce2396e815902fbfe59c3858e057bdee2664337 SHA256 aee122aae38a8730a3f76a6caf6f63ec8e9ce033d1edbb6e878ed4c1cbdfe0c2
 DIST dnotify-0.18.0.tar.gz 187909 RMD160 76836ad6025149d1063b20d438bd81100f818acb SHA1 47e36a7f01c65ea68e3e7955c617bd3187f4d24d SHA256 2c1a1aeb3b6471d9c17b769e86235fed4020f2009c6f6841728b94020df67bf1
-EBUILD dnotify-0.18.0.ebuild 804 RMD160 a23789085568903521d39c6b98d329e07aa2e6ca SHA1 2c57cb21f125242e909c3a188c98805845849885 SHA256 fc7f157a725d8eb3cced69fe9c42f6b8697e9b20050c9b813237388355b6a56f
-MISC ChangeLog 2953 RMD160 2a16926bb0ece3f254abf87892ae799b58e275cc SHA1 48f7f401b45a993f9bb4b279f0f4c2e7a75522e9 SHA256 eadccec6d873542df41715d6f44b244f650b8c662f5c09bdceb12ad3f3b642b1
+EBUILD dnotify-0.18.0.ebuild 767 RMD160 9729a8f2896b7e014d43de4a854aac4528a08111 SHA1 ea44ccbac4a686d9d2e9e0fcf4c2c11d09ceb56d SHA256 b019484c29da7b035f51e78dce2b5c270139c54f13e0cf1a1813ef092f6da958
+MISC ChangeLog 3139 RMD160 c8c3976d0e105f9deb8156501cdf695c79cd27e7 SHA1 2d78282c6718627258749f4729dd2146a9257aa8 SHA256 ca2dca470f403c4d8be63e9e2f46906f11ede57b6e85af53cb496baf924ac182
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
diff --git a/sys-apps/dnotify/dnotify-0.18.0.ebuild b/sys-apps/dnotify/dnotify-0.18.0.ebuild
index ac82def8d29a..4d4578ea9bfa 100644
--- a/sys-apps/dnotify/dnotify-0.18.0.ebuild
+++ b/sys-apps/dnotify/dnotify-0.18.0.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dnotify/dnotify-0.18.0.ebuild,v 1.9 2008/01/10 10:40:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dnotify/dnotify-0.18.0.ebuild,v 1.10 2010/09/10 05:06:06 ssuominen Exp $
 
+EAPI=2
 inherit eutils
 
 DESCRIPTION="Execute a command when the contents of a directory change"
@@ -10,23 +11,23 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 mips ppc -sparc x86"
+KEYWORDS="amd64 ~mips ppc -sparc x86"
 IUSE="nls"
 
+RDEPEND=""
 DEPEND="nls? ( sys-devel/gettext )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-nls.patch
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-nls.patch \
+		"${FILESDIR}"/${P}-glibc-212.patch
 }
 
-src_compile() {
-	econf $(use_enable nls) || die "failed to configure"
-	emake || die "failed to make"
+src_configure() {
+	econf \
+		$(use_enable nls)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS TODO NEWS README
 }
diff --git a/sys-apps/dnotify/files/dnotify-0.18.0-glibc-212.patch b/sys-apps/dnotify/files/dnotify-0.18.0-glibc-212.patch
new file mode 100644
index 000000000000..6cc6e6f40092
--- /dev/null
+++ b/sys-apps/dnotify/files/dnotify-0.18.0-glibc-212.patch
@@ -0,0 +1,12 @@
+http://bugs.gentoo.org/336649
+
+--- src/main.c
++++ src/main.c
+@@ -19,6 +19,7 @@
+ 
+ #include <config.h>
+ #include <sys/types.h>
++#include <sys/stat.h>
+ #include <sys/wait.h>
+ #include <stdarg.h>
+ #include <errno.h>