old

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

8 files changed, 15 insertions, 199 deletions

diff --git a/app-admin/fam/ChangeLog b/app-admin/fam/ChangeLog
index 9f69f2290e8a..9ca220476100 100644
--- a/app-admin/fam/ChangeLog
+++ b/app-admin/fam/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/fam
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/ChangeLog,v 1.74 2012/02/25 15:11:14 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/ChangeLog,v 1.75 2012/02/25 15:54:05 ssuominen Exp $
+
+  25 Feb 2012; Samuli Suominen <ssuominen@gentoo.org> -fam-2.7.0-r5.ebuild,
+  -files/fam-2.7.0-gcc41.patch, -files/fam-2.7.0-gcc43.patch,
+  -files/fam-2.7.0-gcc44.patch, -files/fam-2.7.0-largefiles.patch,
+  -files/fam-2.7.0-limits.patch:
+  old
 
   25 Feb 2012; Samuli Suominen <ssuominen@gentoo.org> fam-2.7.0-r6.ebuild:
   ppc64 stable wrt #396749
diff --git a/app-admin/fam/Manifest b/app-admin/fam/Manifest
index 314a9d05370c..313377cf7f1c 100644
--- a/app-admin/fam/Manifest
+++ b/app-admin/fam/Manifest
@@ -1,27 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX fam-2.7.0-gcc41.patch 566 RMD160 a5fcf50f06ece45282d61438b3004771cee4178b SHA1 6e594dcb7d012ef4cafd56dec991f5a4dd1945e1 SHA256 e28a16720be736819afc5151853d724bea23bd4a4225e370f3f80b838467ff66
-AUX fam-2.7.0-gcc43.patch 961 RMD160 fea728ec7067056e45dd53aeca51fc12e9ab240b SHA1 5d56ae78ed378cac7d89bf9ca78b506ec9a76613 SHA256 3826e3f8651830356eaf9dacd8d2014de16289914e69ad5b1862d3e1955974e3
-AUX fam-2.7.0-gcc44.patch 216 RMD160 01392214e0fac6618c3e9d2756f3c7ba56ac0f29 SHA1 fe73b2619c25a940560c8262999871c89be1a398 SHA256 3dfc06c4daede3b5d569f7eca4c6bfd90bcfaf50112fbf4c58418b2acba8ed8a
-AUX fam-2.7.0-largefiles.patch 326 RMD160 949475406175c0f221ab7b4f34abbd26f4e56533 SHA1 6394d99517fa8a614f5bcb64bbf175e6cc9fb05b SHA256 cbe4260704d2cdff34ad0ed52b51b49af36200bc7e801e2e19f1857e2177f7af
-AUX fam-2.7.0-limits.patch 243 RMD160 54cc9b6488e70f1ced1a28f6b6ce43889e663c74 SHA1 c5e0d5848ec25c009f025c1d8a262debea00d5c1 SHA256 47ebfb54ca488df401ea0637d42b667a4eb6c90b1320bcf0fd6d929ff94911a8
 AUX famd 490 RMD160 ba0a1761b473c946d645aac2cc6b20d6bfbe8382 SHA1 a705c2b8dda3fb79fad015523ea2fced12569170 SHA256 1ce8019d276ef5f9ddaa38d0fc0eff12f66934eea21931b1f98ad8bcafc22bd9
-DIST fam-2.7.0-dnotify.patch.bz2 7127 RMD160 dfca4dc1fa98c968ba684cb0510e0ad241dc7d4a SHA1 058c8eb3dee154e2f63b1a2ec585911ec76b13fd SHA256 c5b7df410521f919c98ca9814743c9dd753b71c1bbc048d62f967625d8e4afdb
 DIST fam-2.7.0.tar.gz 301974 RMD160 1895b578d6a141c36d5bee4e3fbbc2a298a91430 SHA1 6c2316f02acf89a41c42ffc3d7fd9cf5eada83a8 SHA256 1e0aa136693a3e9f4b43ebd71e7bd934cea31817a4a6cba2edc7aac353b8a93f
 DIST fam_2.7.0-17.diff.gz 28056 RMD160 1d1eccacd5dd2cfffacb4daa2bda2610062dc0b2 SHA1 680b03081b014246425f5b722fdb832ee254393e SHA256 2362384d1fbde5dcbccf70f617aedbcae44d3f826a5b9df1331b070da1e0d5c2
-EBUILD fam-2.7.0-r5.ebuild 2265 RMD160 2f3feaff35184d75a9fb81b29f49da6b6adfd534 SHA1 8c9de55ad392d5accbb1afd5c05cdfcb99264bf6 SHA256 e64348f5ee23a8dda61c3fd74a4baef76d75b4b712affa812e08e41d9de9a605
 EBUILD fam-2.7.0-r6.ebuild 1312 RMD160 a0fec9bbfe4023fd4656728528d95373e669ffa8 SHA1 c4dd32e4210d793afa861482358ab51b31375862 SHA256 04e34aa38251a08c04af45ba5a4b2331107e508dc78074dc82afa23278179cf7
-MISC ChangeLog 13107 RMD160 90b1c347f6e9d0f41662188bd2ce0bec08b1c0b1 SHA1 75aab08a067aab52db095b2ded7c6e1e09ff00d5 SHA256 c3b9c038491507bfee5b83198919c711507d85f04e18169bda7923e80f5eff67
+MISC ChangeLog 13352 RMD160 824c272970f2aa371315114aa89e47e63fd26e59 SHA1 fa6d886310d15d139b37fe4bf556d4f056d933d3 SHA256 e4ad29b2ce6135fde8d789a9d5017e3827037e4a9b803c52fa9447ceab6d577e
 MISC metadata.xml 230 RMD160 f4eaafe69d80938604be6213ca2529b73ced7a53 SHA1 27d0d9e737236700ad6d266c9a2fc8869f427869 SHA256 529c3320b250d179bb9e9ae651a88ba3f2a1bca78cd1ab07d5aef28d571960ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPSPoBAAoJEEdUh39IaPFNn8gH+gL1lPKCg/9ZWmXEDqx6tuAQ
-6LKMLpOJUXf7yXbG0tXSJaxdVmTJFMDBBLOSm6581e/niRkymu01ke5z3ZxtQa9c
-B7YqvxYkmIeOXE+JPwLfbN/V8W0SQiEPdd5TNfZwT85AzyZoBZGqnsOJf7SBZDL2
-8y41+zgRV7vEs8faMgPBIZkyT/tZST5IZ5Unmst3WQO1Kp9i6I8tu32NdiWYQMQW
-ZynaSZ/dMqG5KkgWlycbWrONjGuiWfPXIEVwCwVZCz7YhsSjgYTBDvywVZWnQa/U
-x/Lr5AGWUTp67pWCmgY1C/WM76IlDY29Ii2fVaRa+fiMd8DIA8Ugn4KJ7QS3iAw=
-=/m1c
+iQEcBAEBAgAGBQJPSQQMAAoJEEdUh39IaPFNwCsH/3+i/7FIBlCJg2FVbivWlHSt
+8EJepF1N6HSroVnlf3uA53w0Z0I2sORpbSAKM5F9HipRYIFKKZQhS7cTBIVQxMUn
+cUGu8f6rhN0CUKTgLGMz4fNy83HEHOvZrla4d++4HsaOWlnoMKDCcWh2ab4LDarQ
+2xVXJ2QAgchTuv0avcinTmCPP53HfUe0ZIn96usFY5Nj5toauFfYLl8B2L3mA/Kz
+skB3syH3kLiCPimo1fC2BeozPBrmdbkPwrDfddV1oFlmbSDXnuui+FtZ4lNms9J1
+rQsMWI0QBQRhWiQTKPn2J86+6iUWO9UB+zBvkkP0qgQwbazhJuBPewWgbcnlf3s=
+=NUle
 -----END PGP SIGNATURE-----
diff --git a/app-admin/fam/fam-2.7.0-r5.ebuild b/app-admin/fam/fam-2.7.0-r5.ebuild
deleted file mode 100644
index 8f27e9bbe827..000000000000
--- a/app-admin/fam/fam-2.7.0-r5.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2011 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-r5.ebuild,v 1.7 2011/01/06 11:03:49 ssuominen Exp $
-
-inherit libtool eutils autotools
-
-DESCRIPTION="FAM, the File Alteration Monitor"
-HOMEPAGE="http://oss.sgi.com/projects/fam/"
-SRC_URI="ftp://oss.sgi.com/projects/fam/download/stable/${P}.tar.gz
-	mirror://gentoo/fam-2.7.0-dnotify.patch.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-DEPEND="|| ( net-nds/rpcbind >=net-nds/portmap-5b-r6 )
-	!app-admin/gamin"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-
-	# large file patch #76679
-	epatch "${FILESDIR}/${P}-largefiles.patch"
-
-	# dnotify patch #43027
-	echo $WORKDIR
-	epatch "${WORKDIR}/${P}-dnotify.patch"
-
-	# use limits correctly -#89478
-	epatch "${FILESDIR}/${P}-limits.patch"
-
-	# fix gcc 4.1 problems
-	epatch "${FILESDIR}/${P}-gcc41.patch"
-
-	# fix gcc 4.3 problems
-	epatch "${FILESDIR}/${P}-gcc43.patch"
-
-	# fix gcc 4.4 problems
-	epatch "${FILESDIR}/${P}-gcc44.patch"
-
-	eautoreconf
-}
-
-src_install() {
-
-	make install DESTDIR="${D}" || die
-
-	dosed "s:local_only = false:local_only = true:g" /etc/fam.conf
-
-	doinitd "${FILESDIR}/famd"
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS TODO README
-
-}
-
-pkg_postinst() {
-
-	elog "To enable fam on	 boot you will have to add it to the"
-	elog "default profile, issue the following command as root to do so."
-	elog
-	elog "rc-update add famd default"
-
-	# temporary warning for people upgrading
-	# 6-12-03 foser <foser@gentoo.org>
-	if [ -e /etc/init.d/fam ]
-	then
-		echo
-		elog "IMPORTANT INFO FOR USERS UPGRADING FROM OLDER (<2.7.0) FAM VERSIONS :"
-		elog
-		elog "With the 2.7.0 version the fam daemon moved to sbin and was"
-		elog "renamed from 'fam' to 'famd'. These changes are for consistency"
-		elog "reasons also applied to the Gentoo init script. This means you"
-		elog "will have to remove fam from the default runlevel and add famd."
-		elog "This can be done by issueing the following commands :"
-		elog
-		elog "rc-update del fam"
-		elog "rc-update add famd default"
-		elog "rm /etc/init.d/fam"
-		elog
-		elog "The last command removes the old init script."
-		echo
-	fi
-
-}
diff --git a/app-admin/fam/files/fam-2.7.0-gcc41.patch b/app-admin/fam/files/fam-2.7.0-gcc41.patch
deleted file mode 100644
index 9f060ce06b1f..000000000000
--- a/app-admin/fam/files/fam-2.7.0-gcc41.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/DNotify.h
-+++ b/src/DNotify.h
-@@ -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;
diff --git a/app-admin/fam/files/fam-2.7.0-gcc43.patch b/app-admin/fam/files/fam-2.7.0-gcc43.patch
deleted file mode 100644
index 8592a0bccded..000000000000
--- a/app-admin/fam/files/fam-2.7.0-gcc43.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- a/include/BTree.h
-+++ b/include/BTree.h
-@@ -24,6 +24,7 @@
- #define BTree_included
- 
- #include "Boolean.h"
-+#include <cstdlib>
- 
- //  This is an in-core B-Tree implementation.
- //
---- a/lib/Client.c++
-+++ b/lib/Client.c++
-@@ -34,7 +34,7 @@
- #include <syslog.h>
- #include <errno.h>
- 
--#include <iostream.h>
-+#include <iostream>
- 
- #include "fam.h"
- #include "Client.h"
---- a/src/DNotify.c++
-+++ b/src/DNotify.c++
-@@ -31,6 +31,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <libgen.h>
-+#include <cstdlib>
- 
- #include "DNotify.h"
- 
---- a/src/IMon.c++
-+++ b/src/IMon.c++
-@@ -40,7 +40,7 @@
- #include "Interest.h"
- #include "Log.h"
- #include "Scheduler.h"
--#include "alloc.h"
-+#include <memory>
- 
- int		   IMon::imonfd = -2;
- IMon::EventHandler IMon::ehandler = NULL;
---- a/src/Interest.h
-+++ b/src/Interest.h
-@@ -29,6 +29,7 @@
- #include <netinet/in.h>  //  for in_addr
- 
- #include "Boolean.h"
-+#include <cstdlib>
- 
- class Event;
- class FileSystem;
diff --git a/app-admin/fam/files/fam-2.7.0-gcc44.patch b/app-admin/fam/files/fam-2.7.0-gcc44.patch
deleted file mode 100644
index 8e892000dae6..000000000000
--- a/app-admin/fam/files/fam-2.7.0-gcc44.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/NFSFileSystem.c++
-+++ b/src/NFSFileSystem.c++
-@@ -97,7 +97,7 @@
- 
-     attr_cache_timeout = ACREGMAX;
- 
--    char * p;
-+    const char * p;
-         
-     if (strstr(opt, "noac")) {
-         f_noac = true;
diff --git a/app-admin/fam/files/fam-2.7.0-largefiles.patch b/app-admin/fam/files/fam-2.7.0-largefiles.patch
deleted file mode 100644
index 60de9a49465b..000000000000
--- a/app-admin/fam/files/fam-2.7.0-largefiles.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- fam-2.7.0/common.am	2003-01-19 06:09:08.000000000 -0600
-+++ fam-2.7.0.largefile/common.am	2005-01-12 19:08:06.462113110 -0600
-@@ -1,2 +1,5 @@
--INCLUDES = @FAM_INC@ -DFAM_CONF=\"@FAM_CONF@\"
-+INCLUDES = @FAM_INC@ -DFAM_CONF=\"@FAM_CONF@\" \
-+       -D_FILE_OFFSET_BITS=64                  \
-+       -D_LARGEFILE64_SOURCE
-+
diff --git a/app-admin/fam/files/fam-2.7.0-limits.patch b/app-admin/fam/files/fam-2.7.0-limits.patch
deleted file mode 100644
index 23358edd77fb..000000000000
--- a/app-admin/fam/files/fam-2.7.0-limits.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/include/fam.h
-+++ b/include/fam.h
-@@ -41,7 +41,7 @@
- *****************************************************************************/
- 
- /* For NAME_MAX - maximum # of chars in a filename */
--#include "limits.h"
-+#include <limits.h>
- 
- 
-