summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pcr/dbus-openrc/PKGBUILD71
-rw-r--r--pcr/openrc-base/PKGBUILD29
2 files changed, 15 insertions, 85 deletions
diff --git a/pcr/dbus-openrc/PKGBUILD b/pcr/dbus-openrc/PKGBUILD
deleted file mode 100644
index 39376269c..000000000
--- a/pcr/dbus-openrc/PKGBUILD
+++ /dev/null
@@ -1,71 +0,0 @@
-# $Id: PKGBUILD 274760 2016-08-28 01:55:59Z heftig $
-# Maintainer (Manjaro): Jan de Groot <jgc@archlinux.org>
-# Maintainer (Manjaro): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor (Manjaro): Tom Gundersen <teg@jklm.no>
-# Contributor (Manjaro): Link Dupont <link@subpop.net>
-# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
-
-_url="https://raw.githubusercontent.com/gentoo/gentoo/master"
-_pkgname=dbus
-
-pkgname=dbus-openrc
-pkgver=1.10.10
-pkgrel=5
-pkgdesc="Freedesktop.org message bus system"
-url="https://wiki.freedesktop.org/www/Software/dbus/"
-arch=("i686" "x86_64" "armv7h")
-license=("GPL" "custom")
-provides=("libdbus" "dbus")
-depends=("libeudev" "expat")
-makedepends=("eudev" "xmlto" "docbook-xsl" "python" "yelp-tools" "doxygen" 'libx11')
-conflicts=("libdbus" "dbus")
-source=("https://dbus.freedesktop.org/releases/$_pkgname/$_pkgname-$pkgver.tar.gz"
- "dbus.initd::${_url}/sys-apps/dbus/files/dbus.initd-r1")
-sha256sums=('9d8f1d069ab4d1a0255d7b400ea3bcef4430c42e729b1012abb2890e3f739a43'
- '4491c09942d72fd464bc1da286c4f5a237ec8debfbaba83c6fbf4a46d46fe51e')
-
-_inst_initd(){
- install -Dm755 ${srcdir}/$1.initd ${pkgdir}/etc/init.d/$1
-
- sed -e 's|#!/sbin/runscript|#!/usr/bin/openrc-run|' \
- -e 's|#!/sbin/openrc-run|#!/usr/bin/openrc-run|' \
- -e 's|/var/run|/run|g' \
- -e 's|dbus.pid|dbus/pid|g' \
- -i ${pkgdir}/etc/init.d/$1
-}
-
-prepare() {
- cd $_pkgname-$pkgver
-# autoreconf -fvi
-}
-
-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-static \
- --disable-verbose-mode --disable-asserts \
- --disable-systemd --disable-user-session
- make
-}
-
-check() {
- cd $_pkgname-$pkgver
- make check
-}
-
-package() {
- cd $_pkgname-$pkgver
-
- make DESTDIR="$pkgdir" install
- rm -r "$pkgdir/var/run"
- install -Dm644 COPYING "$pkgdir/usr/share/licenses/$_pkgname/COPYING"
-
- # Split docs
- rm -rv "$pkgdir/usr/share/doc"
-
- _inst_initd 'dbus'
-}
diff --git a/pcr/openrc-base/PKGBUILD b/pcr/openrc-base/PKGBUILD
index 977b15d62..967982e8d 100644
--- a/pcr/openrc-base/PKGBUILD
+++ b/pcr/openrc-base/PKGBUILD
@@ -11,10 +11,10 @@ pkgname=('cronie-openrc'
'glibc-openrc'
'inetutils-openrc'
'lvm2-openrc'
- 'mdadm-openrc')
-# 'dbus-openrc')
-pkgver=20160608
-pkgrel=1.1
+ 'mdadm-openrc'
+ 'dbus-openrc')
+pkgver=20160907
+pkgrel=1
pkgdesc="OpenRC init scripts"
arch=('any')
url="https://github.com/manjaro/packages-openrc"
@@ -37,7 +37,7 @@ source=("cronie.initd::${_url}/sys-process/cronie/files/cronie-1.3-initd"
"mdraid.confd::${_url}/sys-fs/mdadm/files/mdraid.confd"
"mdraid.initd::${_url}/sys-fs/mdadm/files/mdraid.rc"
"dhcpcd.initd::${_url}/net-misc/dhcpcd/files/dhcpcd.initd"
-# "dbus.initd::${_url}/sys-apps/dbus/files/dbus.initd-r1"
+ "dbus.initd::${_url}/sys-apps/dbus/files/dbus.initd-r1"
'ftpd.confd'
'ftpd.initd')
sha256sums=('a0dc91cb6aecafc4e5999829ae90a87217e5aa946aa4e3d3a3d3549a71a8ecf1'
@@ -56,6 +56,7 @@ sha256sums=('a0dc91cb6aecafc4e5999829ae90a87217e5aa946aa4e3d3a3d3549a71a8ecf1'
'b489ced10391d4295bb8ca29e128b0d4217c290f1b4e37b05f5a9275048d289d'
'c072e70fd46096e3af31f96219a3abc3b7d8d981f61ac90a8dbf554928a3b7e8'
'6bb9b8b0075e45e63e898ed043f3c5951dc3e95c1fa62d22cc6e0616c792ecd1'
+ '4491c09942d72fd464bc1da286c4f5a237ec8debfbaba83c6fbf4a46d46fe51e'
'59fe1aa68c43f4958afc397a0d6b35da263a20fcdb457005123a0d64cb1f7477'
'7f46e5e9ac9f204fb1564560c506a5bb4cede8823b89e3f1844e4f8be258e9ef')
@@ -91,15 +92,15 @@ package_cronie-openrc() {
sed -e 's|/usr/sbin|/usr/bin|g' -i ${pkgdir}/etc/init.d/cronie
}
-# package_dbus-openrc() {
-# pkgdesc="OpenRC dbus init script"
-# groups=('openrc-base' 'openrc-desktop')
-# depends=('openrc' 'dbus')
-#
-# _inst_initd 'dbus'
-#
-# sed -e 's|dbus.pid|dbus/pid|g' -i "${pkgdir}/etc/init.d/dbus"
-# }
+package_dbus-openrc() {
+ pkgdesc="OpenRC dbus init script"
+ groups=('openrc-base' 'openrc-desktop')
+ depends=('openrc' 'dbus-x11')
+
+ _inst_initd 'dbus'
+
+ sed -e 's|dbus.pid|dbus/pid|g' -i "${pkgdir}/etc/init.d/dbus"
+}
package_dhcpcd-openrc() {
pkgdesc="OpenRC dhcpcd init script"