From 88e8169c698a6fa5e3b299b27d6e432fa3e829ce Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Sat, 19 Mar 2016 04:57:33 -0500 Subject: Removing dbus-openrc. Use openrc-base instead --- pcr/dbus-openrc/30-dbus.sh | 6 ---- pcr/dbus-openrc/PKGBUILD | 79 -------------------------------------------- pcr/dbus-openrc/dbus.install | 21 ------------ 3 files changed, 106 deletions(-) delete mode 100644 pcr/dbus-openrc/30-dbus.sh delete mode 100644 pcr/dbus-openrc/PKGBUILD delete mode 100644 pcr/dbus-openrc/dbus.install (limited to 'pcr/dbus-openrc') diff --git a/pcr/dbus-openrc/30-dbus.sh b/pcr/dbus-openrc/30-dbus.sh deleted file mode 100644 index 96a51828a..000000000 --- a/pcr/dbus-openrc/30-dbus.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -# launches a session dbus instance -if [ -z "${DBUS_SESSION_BUS_ADDRESS-}" ] && type dbus-launch >/dev/null; then - eval $(dbus-launch --sh-syntax --exit-with-session) -fi diff --git a/pcr/dbus-openrc/PKGBUILD b/pcr/dbus-openrc/PKGBUILD deleted file mode 100644 index 04bb00567..000000000 --- a/pcr/dbus-openrc/PKGBUILD +++ /dev/null @@ -1,79 +0,0 @@ -# Maintainer (Manjaro): Alexey D. -# Contributor (Manjaro): Jan de Groot -# Contributor (Manjaro): Link Dupont -# Maintainer: Omar Vega Ramos - -_pkgname=dbus -_gentoo_uri="https://raw.githubusercontent.com/gentoo/gentoo/master/sys-apps/dbus/files" - -pkgname=dbus-openrc -pkgver=1.10.6 -pkgrel=2 -pkgdesc="Freedesktop.org message bus system" -url="http://www.freedesktop.org/Software/dbus" -arch=('i686' 'x86_64' 'armv7h') -license=('GPL' 'custom') -groups=('openrc-base' 'openrc-desktop') -depends=('expat' "libdbus=${pkgver}" 'openrc') -makedepends=('libx11' 'xmlto' 'docbook-xsl' 'udev') -optdepends=('libx11: dbus-launch support' - 'dbus-openrc: dbus openrc initscript') -provides=('dbus-core' "dbus=${pkgver}") -conflicts=('dbus-core' 'dbus' - 'systemd-sysvcompat') -#replaces=('dbus-core' 'dbus') -install=dbus.install -source=("http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz" #{,.asc} - "dbus.initd::${_gentoo_uri}/dbus.initd-r1" - '30-dbus.sh') -sha256sums=('b5fefa08a77edd76cd64d872db949eebc02cf6f3f8be82e4bbc641742af5d35f' - '7c1429585cd08f57d420b87bebb89c1fccf963414a0d591021df85c8372f5cab' - 'dc1ce6d38674bad7a48ad1911576f8bbb3819f1019126fb1ef7c3cfad16bb02a') - -build() { - cd $_pkgname-$pkgver - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib/dbus-1.0 \ - --with-dbus-user=dbus \ - --with-system-pid-file=/run/dbus/pid \ - --with-system-socket=/run/dbus/system_bus_socket \ - --with-console-auth-dir=/run/console/ \ - --enable-inotify \ - --disable-verbose-mode \ - --disable-static \ - --disable-tests \ - --disable-asserts \ - --disable-systemd \ - --disable-user-session - - make -} -_inst_initd(){ - install -Dm755 ${srcdir}/$1.initd ${pkgdir}/etc/init.d/$1 - - sed -e 's|#!/sbin/runscript|#!/usr/bin/openrc-run|' \ - -e 's|/var/run|/run|g' \ - -i ${pkgdir}/etc/init.d/$1 -} - -package(){ - cd $_pkgname-$pkgver - - # Disable installation of libdbus - sed -i -e 's/^SUBDIRS = dbus/SUBDIRS =/' Makefile - - make DESTDIR="$pkgdir" install - - rm -rf "${pkgdir}/var/run" - rm -rf "${pkgdir}/usr/lib/pkgconfig" - - install -Dm755 ../30-dbus.sh "$pkgdir/etc/X11/xinit/xinitrc.d/30-dbus" - install -Dm644 COPYING "$pkgdir/usr/share/licenses/dbus/COPYING" - - _inst_initd 'dbus' - - sed -e 's|dbus.pid|dbus/pid|g' -i "${pkgdir}/etc/init.d/dbus" -} diff --git a/pcr/dbus-openrc/dbus.install b/pcr/dbus-openrc/dbus.install deleted file mode 100644 index 4b8f8e634..000000000 --- a/pcr/dbus-openrc/dbus.install +++ /dev/null @@ -1,21 +0,0 @@ -_svc="dbus" -_rlvl="default" - -post_install() { - _cmd="rc-update add ${_svc} ${_rlvl}" - echo " ==> run '${_cmd}'" -} - -post_upgrade() { - post_install "$1" - # Make sure new rc script can shutdown running dbus - if [ -f run/dbus.pid -a -d run/dbus ]; then - mv run/dbus.pid run/dbus/pid - fi -} - -post_remove() { - _cmd="rc-update del ${_svc} ${_rlvl}" - echo " ==> run '${_cmd}'" -} - -- cgit v1.2.3