Cleanup.

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

3 files changed, 0 insertions, 59 deletions

diff --git a/net-dns/avahi/files/avahi-0.6.24-cmsg_space.patch b/net-dns/avahi/files/avahi-0.6.24-cmsg_space.patch
deleted file mode 100644
index 220e63fa24f3..000000000000
--- a/net-dns/avahi/files/avahi-0.6.24-cmsg_space.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.orig	2009-02-25 11:51:29 +0100
-+++ configure.ac	2009-02-25 11:55:47 +0100
-@@ -348,7 +348,7 @@
-  # Solaris stuff
-  AC_SEARCH_LIBS([inet_ntop],[nsl])
-  AC_SEARCH_LIBS([recv],[socket])
-- AC_CHECK_DECL([CMSG_SPACE],,CFLAGS="$CFLAGS -D_XOPEN_SOURCE=500 -D__EXTENSIONS__")
-+ AC_CHECK_DECL([CMSG_SPACE],,CFLAGS="$CFLAGS -D_XOPEN_SOURCE=500 -D__EXTENSIONS__", [[#include <sys/socket.h>]])
- 
- # Checks for library functions.
- AC_FUNC_MEMCMP
diff --git a/net-dns/avahi/files/avahi-0.6.24-libintl.patch b/net-dns/avahi/files/avahi-0.6.24-libintl.patch
deleted file mode 100644
index 3ad943ac130c..000000000000
--- a/net-dns/avahi/files/avahi-0.6.24-libintl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- avahi-common/Makefile.am.orig	2008-12-12 21:33:35 +0100
-+++ avahi-common/Makefile.am	2009-02-25 12:21:14 +0100
-@@ -71,7 +71,7 @@
- 	i18n.c i18n.h
- 
- libavahi_common_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -DAVAHI_LOCALEDIR=\"$(avahilocaledir)\"
--libavahi_common_la_LIBADD = $(AM_LDADD) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(LIBINTL)
-+libavahi_common_la_LIBADD = $(AM_LDADD) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(INTLLIBS)
- libavahi_common_la_LDFLAGS = $(AM_LDFLAGS)  -version-info $(LIBAVAHI_COMMON_VERSION_INFO)
- 
- strlst_test_SOURCES = \
diff --git a/net-dns/avahi/files/avahi-0.6.27-no-auto-activated.patch b/net-dns/avahi/files/avahi-0.6.27-no-auto-activated.patch
deleted file mode 100644
index 8a37cd7f3282..000000000000
--- a/net-dns/avahi/files/avahi-0.6.27-no-auto-activated.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git b/avahi-client/client.c a/avahi-client/client.c
-index 2b29480..6435723 100644
---- b/avahi-client/client.c
-+++ a/avahi-client/client.c
-@@ -141,10 +141,9 @@ static DBusHandlerResult filter_func(DBusConnection *bus, DBusMessage *message,
- 
-         if (strcmp(name, AVAHI_DBUS_NAME) == 0) {
- 
--            if (old[0] &&
--                avahi_client_is_connected(client)) {
-+            if (avahi_client_is_connected(client)) {
- 
--                /* Regardless if the server lost its name or
-+                /* Regardless if the server lost or acquired its name or
-                  * if the name was transfered: our services are no longer
-                  * available, so we disconnect ourselves */
-                 avahi_client_set_errno(client, AVAHI_ERR_DISCONNECTED);
-@@ -523,7 +522,7 @@ AvahiClient *avahi_client_new(const AvahiPoll *poll_api, AvahiClientFlags flags,
-         goto fail;
-     }
- 
--    if (!dbus_connection_add_filter(client->bus, filter_func, client, NULL)) {
-+    if (!dbus_connection_add_filter (client->bus, filter_func, client, NULL)) {
-         if (ret_error)
-             *ret_error = AVAHI_ERR_NO_MEMORY;
-         goto fail;
-@@ -560,7 +559,9 @@ AvahiClient *avahi_client_new(const AvahiPoll *poll_api, AvahiClientFlags flags,
-     if (dbus_error_is_set(&error))
-         goto fail;
- 
--    if (!dbus_bus_start_service_by_name(client->bus, AVAHI_DBUS_NAME, 0, NULL, &error)) {
-+
-+    if (!(dbus_bus_name_has_owner(client->bus, AVAHI_DBUS_NAME, &error)) ||
-+        dbus_error_is_set(&error)) {
- 
-         /* We free the error so its not set, that way the fail target
-          * will return the NO_DAEMON error rather than a DBUS error */