gcc41 fix for fam

Package-Manager: portage-2.0.53_rc7

4 files changed, 40 insertions, 8 deletions

diff --git a/app-admin/fam/ChangeLog b/app-admin/fam/ChangeLog
index c6b7a7a29487..df9fbc2af81f 100644
--- a/app-admin/fam/ChangeLog
+++ b/app-admin/fam/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/fam
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/ChangeLog,v 1.34 2005/10/02 11:34:24 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/ChangeLog,v 1.35 2005/11/28 18:35:27 hanno Exp $
+
+  28 Nov 2005; Hanno Boeck <hanno@gentoo.org> +files/fam-2.7.0-gcc41.patch,
+  fam-2.7.0-r4.ebuild:
+  Fix for gcc 4.1.
 
   02 Oct 2005; MATSUU Takuto <matsuu@gentoo.org> fam-2.7.0-r2.ebuild:
   Stable on sh.
diff --git a/app-admin/fam/Manifest b/app-admin/fam/Manifest
index 8de18126bb5f..abe71011b249 100644
--- a/app-admin/fam/Manifest
+++ b/app-admin/fam/Manifest
@@ -1,16 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3a45305c42161ca05365e530617b469d ChangeLog 8095
 MD5 a23feab85a6a00218b5804e3b2827f33 fam-2.7.0-r1.ebuild 2086
-MD5 fdaf497e731cae45f2901c0cd1795b61 fam-2.7.0-r3.ebuild 2187
 MD5 ba6e331eb9a046eb98e025ad6101721b fam-2.7.0-r2.ebuild 2105
-MD5 f097db57f394e0066e33c021c81c0aaa fam-2.7.0-r4.ebuild 2260
-MD5 d654d192ddd5058c8fcf47e516f290da ChangeLog 7977
-MD5 68a04e23ccfb7971cff8ce012aee659c metadata.xml 221
+MD5 fdaf497e731cae45f2901c0cd1795b61 fam-2.7.0-r3.ebuild 2187
+MD5 6693a3c03d5692489c12c27a49fdeaa6 fam-2.7.0-r4.ebuild 2321
 MD5 067a8c7dc9a851716d40256fe989928c fam-2.7.0.ebuild 1924
-MD5 4c750113abbc289ee93c3aa378692f07 files/famd 490
 MD5 a7434bbb78ba9e735212e8b1e5bb0a0f files/digest-fam-2.7.0 61
 MD5 a7434bbb78ba9e735212e8b1e5bb0a0f files/digest-fam-2.7.0-r1 61
 MD5 a7434bbb78ba9e735212e8b1e5bb0a0f files/digest-fam-2.7.0-r2 61
 MD5 a7434bbb78ba9e735212e8b1e5bb0a0f files/digest-fam-2.7.0-r3 61
 MD5 a7434bbb78ba9e735212e8b1e5bb0a0f files/digest-fam-2.7.0-r4 61
-MD5 363f25f0db08bacef13b12e81b32d624 files/fam-2.7.0-limits.patch 316
 MD5 46e90fb6975cfcaa7f5946ab36aa2023 files/fam-2.7.0-dnotify.patch 26419
+MD5 8c541d3766c6671c15c8cad4d6ef671b files/fam-2.7.0-gcc41.patch 724
 MD5 47b41e0b0498793af004696a096d7da1 files/fam-2.7.0-largefiles.patch 326
+MD5 363f25f0db08bacef13b12e81b32d624 files/fam-2.7.0-limits.patch 316
+MD5 4c750113abbc289ee93c3aa378692f07 files/famd 490
+MD5 68a04e23ccfb7971cff8ce012aee659c metadata.xml 221
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDi04Jr2QksT29OyARAtynAKCjvP78emQ8nFydg49sSyoZTRAx2gCfUaJR
+UQZBJED0Qd6gDuS/VVkV7nI=
+=yOIZ
+-----END PGP SIGNATURE-----
diff --git a/app-admin/fam/fam-2.7.0-r4.ebuild b/app-admin/fam/fam-2.7.0-r4.ebuild
index 78eb0b0d4fc8..aaee29154224 100644
--- a/app-admin/fam/fam-2.7.0-r4.ebuild
+++ b/app-admin/fam/fam-2.7.0-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/fam-2.7.0-r4.ebuild,v 1.2 2005/10/02 11:34:24 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/fam-2.7.0-r4.ebuild,v 1.3 2005/11/28 18:35:27 hanno Exp $
 
 inherit libtool eutils gnuconfig
 
@@ -31,6 +31,9 @@ src_unpack() {
 	# Use limits correctly -#89478
 	epatch "${FILESDIR}/${P}-limits.patch"
 
+	# Fix gcc 4.1 problems
+	epatch ${FILESDIR}/${P}-gcc41.patch
+
 	# Fix permission problems with user* in FEATURES (#35307)
 	chmod u+w ${S}/configure
 
diff --git a/app-admin/fam/files/fam-2.7.0-gcc41.patch b/app-admin/fam/files/fam-2.7.0-gcc41.patch
new file mode 100644
index 000000000000..09104e5fcbdd
--- /dev/null
+++ b/app-admin/fam/files/fam-2.7.0-gcc41.patch
@@ -0,0 +1,14 @@
+diff -dpruN fam-2.7.0.orig/src/DNotify.h fam-2.7.0/src/DNotify.h
+--- fam-2.7.0.orig/src/DNotify.h	2005-11-16 08:49:13.000000000 +0100
++++ fam-2.7.0/src/DNotify.h	2005-11-16 08:54:04.972188928 +0100
+@@ -59,8 +59,8 @@ private:
+     static int pipe_write_fd;
+     static int pipe_read_fd;
+     static int change_queue[QUEUESIZE];
+-    static volatile sig_atomic_t DNotify::queue_overflowed;
+-    static volatile sig_atomic_t DNotify::queue_changed;
++    static volatile sig_atomic_t queue_overflowed;
++    static volatile sig_atomic_t queue_changed;
+     static volatile int queue_head; // Only modified by read handler
+     static volatile int queue_tail; // Only modified by signal handler
+     static EventHandler ehandler;