these can go too

Package-Manager: portage-2.1_pre6-r3

3 files changed, 3 insertions, 151 deletions

diff --git a/app-admin/gamin/Manifest b/app-admin/gamin/Manifest
index 4e5f0b02c27a..0da86d178562 100644
--- a/app-admin/gamin/Manifest
+++ b/app-admin/gamin/Manifest
@@ -7,12 +7,6 @@ SHA256 30d8de2bb83c5ebaecbf4a0a9a04ac1030ed26648096b97df5675bfc5d51b884 ChangeLo
 MD5 f7e47b4a525f2f21b158644c138252a7 files/digest-gamin-0.1.7 63
 RMD160 addcad5664d57deced33bc2d17ad9f37bc5e371b files/digest-gamin-0.1.7 63
 SHA256 a1eb1752d4be3edd2b22787c5d289ba25835f6fbfee4776ea15f62d843baf4b8 files/digest-gamin-0.1.7 63
-MD5 510d70d44de83d7822311077a39621c8 files/gamin-0.1.3-freebsd.patch 3857
-RMD160 0bec77509cc948158394cf13c5beb2f0898f2157 files/gamin-0.1.3-freebsd.patch 3857
-SHA256 ea39938d0017817c0fd2a720468716f4b5f3dd12dc124e06788888142014a667 files/gamin-0.1.3-freebsd.patch 3857
-MD5 44c921abd1a5d8fd8a6bb523dde8e680 files/gamin-0.1.6-doublefree.patch 1012
-RMD160 ae8afcdbd4357f126996014d6ca3a6725c0e04df files/gamin-0.1.6-doublefree.patch 1012
-SHA256 3838c9e7bd95cd11f436a54a426b31361b9aac1d313fec8ffa35eb1a4fe33c82 files/gamin-0.1.6-doublefree.patch 1012
 MD5 8b7b2ad91f56adff638f6cf2606fe66d gamin-0.1.7.ebuild 1309
 RMD160 053f0a1401333bcbef6873bf217a1b283aaa103b gamin-0.1.7.ebuild 1309
 SHA256 e6e8255ab9463607d349e6c8f4e7cbd54d820ea8583ea4cc75939e25a9731505 gamin-0.1.7.ebuild 1309
@@ -22,7 +16,7 @@ SHA256 b82ac6b8096e516fb3cdc312cdca1b72b65c3a890b0c8cf9c425a893c0a1cdae metadata
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEHespTOXg++0VvJQRAiPNAKCNCdLWC5DQyZ5YAdG7bCgGG93HfgCdEqf0
-ge/B4P4IuOoB+DioOPJ8y0o=
-=0+78
+iD8DBQFEHeuqTOXg++0VvJQRAl6zAKC85hJCw1TuKi5CqoUV+30+4vL/lgCcDgsv
+tXuupKRJLkvGHN228JyUywc=
+=6WBN
 -----END PGP SIGNATURE-----
diff --git a/app-admin/gamin/files/gamin-0.1.3-freebsd.patch b/app-admin/gamin/files/gamin-0.1.3-freebsd.patch
deleted file mode 100644
index a0f122726827..000000000000
--- a/app-admin/gamin/files/gamin-0.1.3-freebsd.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-diff -ur gamin-0.1.3/libgamin/gam_api.c gamin-0.1.3-fbsd/libgamin/gam_api.c
---- gamin-0.1.3/libgamin/gam_api.c	2005-06-15 12:53:25.000000000 +0200
-+++ gamin-0.1.3-fbsd/libgamin/gam_api.c	2005-08-02 23:09:22.416835112 +0200
-@@ -421,7 +421,7 @@
- {
-     char data[2] = { 0, 0 };
-     int written;
--#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS)
-+#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__))
-     struct {
- 	    struct cmsghdr hdr;
- 	    struct cmsgcred cred;
-@@ -445,7 +445,7 @@
- #endif
- 
- retry:
--#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS)
-+#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__))
-     written = sendmsg(fd, &msg, 0);
- #else
-     written = write(fd, &data[0], 1);
-@@ -655,7 +655,7 @@
- 
-     s_uid = getuid();
- 
--#if defined(LOCAL_CREDS) && defined(HAVE_CMSGCRED)
-+#if defined(LOCAL_CREDS) && defined(HAVE_CMSGCRED) && !defined(__FreeBSD__)
-     /* Set the socket to receive credentials on the next message */
-     {
-         int on = 1;
-diff -ur gamin-0.1.3/libgamin/gam_data.c gamin-0.1.3-fbsd/libgamin/gam_data.c
---- gamin-0.1.3/libgamin/gam_data.c	2005-05-18 16:45:04.000000000 +0200
-+++ gamin-0.1.3-fbsd/libgamin/gam_data.c	2005-08-02 23:09:22.416835112 +0200
-@@ -17,6 +17,10 @@
- #ifdef HAVE_PTHREAD_H
- #include <pthread.h>
- 
-+# ifdef __GLIBC__
-+#  define PTHREAD_MUTEX_RECURSIVE PTHREAD_MUTEX_RECURSIVE_NP
-+# endif
-+
- static int is_threaded = -1;
- #endif
- 
-@@ -471,7 +475,7 @@
-     }
-     if (is_threaded > 0) {
- 	pthread_mutexattr_init(&attr);
--	pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
-+	pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
- 	pthread_mutex_init(&ret->lock, &attr);
- 	pthread_mutexattr_destroy(&attr);
-     }
-diff -ur gamin-0.1.3/server/gam_channel.c gamin-0.1.3-fbsd/server/gam_channel.c
---- gamin-0.1.3/server/gam_channel.c	2005-08-01 23:04:50.000000000 +0200
-+++ gamin-0.1.3-fbsd/server/gam_channel.c	2005-08-02 23:09:22.417834960 +0200
-@@ -30,7 +30,7 @@
- {
-     char data[2] = { 0, 0 };
-     int written;
--#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS)
-+#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__))
-     struct {
- 	    struct cmsghdr hdr;
- 	    struct cmsgcred cred;
-@@ -54,7 +54,7 @@
- #endif
- 
- retry:
--#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS)
-+#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__))
-     written = sendmsg(fd, &msg, 0);
- #else
-     written = write(fd, &data[0], 1);
-@@ -103,7 +103,7 @@
- 
-     s_uid = getuid();
- 
--#if defined(LOCAL_CREDS) && defined(HAVE_CMSGCRED)
-+#if defined(LOCAL_CREDS) && defined(HAVE_CMSGCRED) && !defined(__FreeBSD__)
-     /* Set the socket to receive credentials on the next message */
-     {
-         int on = 1;
-Only in gamin-0.1.3-fbsd/server: gam_channel.c.orig
-diff -ur gamin-0.1.3/server/gam_pidname.c gamin-0.1.3-fbsd/server/gam_pidname.c
---- gamin-0.1.3/server/gam_pidname.c	2005-08-01 17:27:19.000000000 +0200
-+++ gamin-0.1.3-fbsd/server/gam_pidname.c	2005-08-02 23:05:34.795438824 +0200
-@@ -7,9 +7,9 @@
- 
- char *gam_get_pidname (int pid)
- {
-+    gchar *pidname = NULL;
- #ifdef HAVE_LINUX
-     gchar *procname;
--    gchar *pidname = NULL;
-     FILE *fp;
- #endif
- 
-diff -ur gamin-0.1.3/tests/testing.c gamin-0.1.3-fbsd/tests/testing.c
---- gamin-0.1.3/tests/testing.c	2005-06-13 10:59:29.000000000 +0200
-+++ gamin-0.1.3-fbsd/tests/testing.c	2005-08-02 23:09:22.417834960 +0200
-@@ -436,9 +436,9 @@
-             return (-1);
-         }
-         /*
--         * wait at most 3 secs before declaring failure
-+         * wait at most 7 secs before declaring failure
-          */
--        while ((delay < 30) && (testState.nb_events < nb_events + count)) {
-+        while ((delay < 70) && (testState.nb_events < nb_events + count)) {
-             debugLoop(100);
- 
- /*	    printf("+"); fflush(stdout); */
diff --git a/app-admin/gamin/files/gamin-0.1.6-doublefree.patch b/app-admin/gamin/files/gamin-0.1.6-doublefree.patch
deleted file mode 100644
index edef11c9a17f..000000000000
--- a/app-admin/gamin/files/gamin-0.1.6-doublefree.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -u -ruN gamin-0.1.6.orig/server/gam_connection.c gamin-0.1.6/server/gam_connection.c
---- gamin-0.1.6.orig/server/gam_connection.c	2005-09-08 06:18:13.000000000 -0400
-+++ gamin-0.1.6/server/gam_connection.c	2005-10-25 12:46:18.000000000 -0400
-@@ -387,8 +387,13 @@
- 	    gam_listener_remove_subscription(conn->listener, sub);
- 	    gam_remove_subscription(sub);
- #ifdef ENABLE_INOTIFY
--	    if (gam_inotify_is_running())
--		gam_subscription_free(sub);
-+	    if ((gam_inotify_is_running()) && (!gam_exclude_check(path))) {
-+		gam_fs_mon_type type;
-+
-+                type = gam_fs_get_mon_type (path);
-+		if (type != GFS_MT_POLL)
-+		    gam_subscription_free(sub);
-+	    }
- #endif
- 
- 	    if (gam_send_ack(conn, req->seq, path, pathlen) < 0) {
-@@ -396,7 +401,8 @@
- 			  gam_connection_get_pid(conn));
- 	    }
- 	    g_free(path);
--        }   break;
-+	    break;
-+        }   
-         case GAM_REQ_DEBUG:
- #ifdef GAMIN_DEBUG_API
- 	    gam_debug_add(conn, req->path, options);