summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2013-01-20 13:30:13 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2013-01-20 13:30:13 +0000
commit472d16741bf0a153e99f16c3c20d9ed2c16f306c (patch)
treea1bc09fb2e3299dd4c82eef9c107219ae55cfad0 /sys-apps/dbus/files
parentMigrate to EAPI 5. Respect LDFLAGS wrt bug #335512. (diff)
downloadhistorical-472d16741bf0a153e99f16c3c20d9ed2c16f306c.tar.gz
historical-472d16741bf0a153e99f16c3c20d9ed2c16f306c.tar.bz2
historical-472d16741bf0a153e99f16c3c20d9ed2c16f306c.zip
old
Package-Manager: portage-2.2.0_alpha155/cvs/Linux x86_64 RepoMan-Options: --force Manifest-Sign-Key: 0x4868F14D
Diffstat (limited to 'sys-apps/dbus/files')
-rw-r--r--sys-apps/dbus/files/dbus-1.4.0-asneeded.patch94
-rw-r--r--sys-apps/dbus/files/dbus.init-1.051
2 files changed, 0 insertions, 145 deletions
diff --git a/sys-apps/dbus/files/dbus-1.4.0-asneeded.patch b/sys-apps/dbus/files/dbus-1.4.0-asneeded.patch
deleted file mode 100644
index baa71294dc71..000000000000
--- a/sys-apps/dbus/files/dbus-1.4.0-asneeded.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-http://bugs.freedesktop.org/show_bug.cgi?id=23162
-
---- dbus/Makefile.am
-+++ dbus/Makefile.am
-@@ -277,7 +277,7 @@
- dbus_test_SOURCES= \
- dbus-test-main.c
-
--dbus_test_LDADD=libdbus-internal.la $(DBUS_TEST_LIBS)
-+dbus_test_LDADD=$(DBUS_TEST_LIBS) libdbus-internal.la
- dbus_test_LDFLAGS=@R_DYNAMIC_LDFLAG@
-
- ## mop up the gcov files
---- test/Makefile.am
-+++ test/Makefile.am
-@@ -63,17 +63,17 @@
-
- # When any programs are not linked to libdbus-internal, fix this.
- AM_CPPFLAGS=-DDBUS_STATIC_BUILD
--TEST_LIBS=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_TEST_LIBS)
-+TEST_LIBS=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-internal.la
-
--test_service_LDADD=libdbus-testutils.la $(TEST_LIBS)
-+test_service_LDADD=$(TEST_LIBS) libdbus-testutils.la
- test_service_LDFLAGS=@R_DYNAMIC_LDFLAG@
--test_names_LDADD=libdbus-testutils.la $(TEST_LIBS)
-+test_names_LDADD=$(TEST_LIBS) libdbus-testutils.la
- test_names_LDFLAGS=@R_DYNAMIC_LDFLAG@
- ## break_loader_LDADD= $(TEST_LIBS)
- ## break_loader_LDFLAGS=@R_DYNAMIC_LDFLAG@
--test_shell_service_LDADD=libdbus-testutils.la $(TEST_LIBS)
-+test_shell_service_LDADD=$(TEST_LIBS) libdbus-testutils.la
- test_shell_service_LDFLAGS=@R_DYNAMIC_LDFLAG@
--shell_test_LDADD=libdbus-testutils.la $(TEST_LIBS)
-+shell_test_LDADD=$(TEST_LIBS) libdbus-testutils.la
- shell_test_LDFLAGS=@R_DYNAMIC_LDFLAG@
- spawn_test_LDADD=$(TEST_LIBS)
- spawn_test_LDFLAGS=@R_DYNAMIC_LDFLAG@
---- test/name-test/Makefile.am
-+++ test/name-test/Makefile.am
-@@ -22,46 +22,46 @@
- test_pending_call_dispatch_SOURCES = \
- test-pending-call-dispatch.c
-
--test_pending_call_dispatch_LDADD=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_TEST_LIBS)
-+test_pending_call_dispatch_LDADD=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-internal.la
- test_pending_call_dispatch_LDFLAGS=@R_DYNAMIC_LDFLAG@
-
- test_pending_call_timeout_SOURCES = \
- test-pending-call-timeout.c
-
--test_pending_call_timeout_LDADD=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_TEST_LIBS)
-+test_pending_call_timeout_LDADD=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-internal.la
- test_pending_call_timeout_LDFLAGS=@R_DYNAMIC_LDFLAG@
-
- test_threads_init_SOURCES = \
- test-threads-init.c
-
--test_threads_init_LDADD=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_TEST_LIBS)
-+test_threads_init_LDADD=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-internal.la
- test_threads_init_LDFLAGS=@R_DYNAMIC_LDFLAG@
-
- test_ids_SOURCES = \
- test-ids.c
-
--test_ids_LDADD=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_TEST_LIBS)
-+test_ids_LDADD=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-internal.la
- test_ids_LDFLAGS=@R_DYNAMIC_LDFLAG@
-
- test_shutdown_SOURCES = \
- test-shutdown.c
-
- test_shutdown_CFLAGS=
--test_shutdown_LDADD=$(top_builddir)/dbus/libdbus-internal.la ../libdbus-testutils.la $(DBUS_TEST_LIBS)
-+test_shutdown_LDADD=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-internal.la ../libdbus-testutils.la
- test_shutdown_LDFLAGS=@R_DYNAMIC_LDFLAG@
-
- test_privserver_SOURCES = \
- test-privserver.c
-
- test_privserver_CFLAGS=
--test_privserver_LDADD=$(top_builddir)/dbus/libdbus-internal.la ../libdbus-testutils.la $(DBUS_TEST_LIBS)
-+test_privserver_LDADD=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-internal.la ../libdbus-testutils.la
- test_privserver_LDFLAGS=@R_DYNAMIC_LDFLAG@
-
- test_privserver_client_SOURCES = \
- test-privserver-client.c
-
- test_privserver_client_CFLAGS=
--test_privserver_client_LDADD=$(top_builddir)/dbus/libdbus-internal.la ../libdbus-testutils.la $(DBUS_TEST_LIBS)
-+test_privserver_client_LDADD=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-internal.la ../libdbus-testutils.la
- test_privserver_client_LDFLAGS=@R_DYNAMIC_LDFLAG@
-
- endif
diff --git a/sys-apps/dbus/files/dbus.init-1.0 b/sys-apps/dbus/files/dbus.init-1.0
deleted file mode 100644
index 502f40fdc608..000000000000
--- a/sys-apps/dbus/files/dbus.init-1.0
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/files/dbus.init-1.0,v 1.5 2011/09/23 12:45:03 polynomial-c Exp $
-
-extra_started_commands="reload"
-
-depend() {
- need localmount
- after bootmisc
-}
-
-start() {
- ebegin "Starting D-BUS system messagebus"
-
- /usr/bin/dbus-uuidgen --ensure
-
- # We need to test if /var/run/dbus exists, since script will fail if it does not
- [ ! -e /var/run/dbus ] && mkdir /var/run/dbus
-
- start-stop-daemon --start --pidfile /var/run/dbus.pid --exec /usr/bin/dbus-daemon -- --system
- eend $?
-}
-
-stop() {
- local retval
-
- ebegin "Stopping D-BUS system messagebus"
-
- start-stop-daemon --stop --pidfile /var/run/dbus.pid
- retval=$?
-
- eend ${retval}
-
- [ -S /var/run/dbus/system_bus_socket ] && rm -f /var/run/dbus/system_bus_socket
-
- return ${retval}
-}
-
-reload() {
- local retval
-
- ebegin "Reloading D-BUS messagebus config"
-
- /usr/bin/dbus-send --print-reply --system --type=method_call \
- --dest=org.freedesktop.DBus \
- / org.freedesktop.DBus.ReloadConfig > /dev/null
- retval=$?
- eend ${retval}
- return ${retval}
-}