openrc-desktop-20170312-1: updating version

1 files changed, 119 insertions, 133 deletions

diff --git a/pcr/openrc-desktop/PKGBUILD b/pcr/openrc-desktop/PKGBUILD
index e8fd18d39..38e55b08f 100644
--- a/pcr/openrc-desktop/PKGBUILD
+++ b/pcr/openrc-desktop/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer: artoo <artoo@manjaro.org>
+# Maintainer (Manajaro): artoo <artoo@manjaro.org>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 _url="https://raw.githubusercontent.com/gentoo/gentoo/master"
 
@@ -6,8 +7,6 @@ pkgbase=openrc-desktop
 pkgname=('acpid-openrc'
 		'alsa-utils-openrc'
 		'avahi-openrc'
-		'cgmanager-openrc'
-		'consolekit-openrc'
 		'displaymanager-openrc'
 		'gpm-openrc'
 		'bluez-openrc'
@@ -15,47 +14,41 @@ pkgname=('acpid-openrc'
 		'wpa_supplicant-openrc'
 		'elogind-openrc')
 
-pkgver=20170311
+pkgver=20170312
 pkgrel=1
 pkgdesc="OpenRC init scripts"
 arch=('any')
 url="https://github.com/manjaro/packages-openrc"
 license=('GPL2')
-groups=('openrc-desktop')
+# groups=('openrc-desktop')
 conflicts=('systemd-sysvcompat')
 source=("acpid.confd::${_url}/sys-power/acpid/files/acpid-2.0.16-conf.d"
-		"acpid.initd::${_url}/sys-power/acpid/files/acpid-2.0.26-init.d"
-		"alsasound.confd::${_url}/media-sound/alsa-utils/files/alsasound.confd-r4"
-		"alsasound.initd::${_url}/media-sound/alsa-utils/files/alsasound.initd-r6"
-		"consolekit.initd::${_url}/sys-auth/consolekit/files/consolekit-1.0.0.initd"
-		"xdm.confd::${_url}/x11-base/xorg-server/files/xdm.confd-4"
-		"xdm.initd::${_url}/x11-base/xorg-server/files/xdm.initd-11"
-		"xdm-setup.initd::${_url}/x11-base/xorg-server/files/xdm-setup.initd-1"
-		"${_url}/x11-apps/xinit/files/startDM.sh"
-		"gpm.confd::${_url}/sys-libs/gpm/files/gpm.conf.d"
-		"gpm.initd::${_url}/sys-libs/gpm/files/gpm.rc6-2"
-# 		"rfcomm.confd::${_url}/net-wireless/bluez/files/rfcomm-conf.d"
-		"rfcomm.initd::${_url}/net-wireless/bluez/files/rfcomm-init.d-r2"
-		"bluetooth.initd::${_url}/net-wireless/bluez/files/bluetooth-init.d-r3"
-		"wpa_supplicant.confd::${_url}/net-wireless/wpa_supplicant/files/wpa_supplicant-conf.d"
-		"wpa_supplicant.initd::${_url}/net-wireless/wpa_supplicant/files/wpa_supplicant-init.d"
-		"${_url}/net-wireless/wpa_supplicant/files/wpa_cli.sh"
-		"cgproxy.initd::${_url}/app-admin/cgmanager/files/cgproxy.initd-r1"
-		"cgmanager.initd::${_url}/app-admin/cgmanager/files/cgmanager.initd-r1"
-		"NetworkManager.confd::${_url}/net-misc/networkmanager/files/conf.d.NetworkManager"
-		"NetworkManager.initd::${_url}/net-misc/networkmanager/files/init.d.NetworkManager-r1"
-		#"10-openrc-status::${_url}/net-misc/networkmanager/files/10-openrc-status-r4"
-		'10-openrc-status'
-		'avahi-daemon.initd'
-		'avahi-dnsconfd.initd'
-		'xdg-user-dirs'
-		"elogind.confd::${_url}/sys-auth/elogind/files/elogind.conf"
-		"elogind.initd::${_url}/sys-auth/elogind/files/elogind.init")
+        "acpid.initd::${_url}/sys-power/acpid/files/acpid-2.0.26-init.d"
+        "alsasound.confd::${_url}/media-sound/alsa-utils/files/alsasound.confd-r4"
+        "alsasound.initd::${_url}/media-sound/alsa-utils/files/alsasound.initd-r6"
+        "xdm.confd::${_url}/x11-base/xorg-server/files/xdm.confd-4"
+        "xdm.initd::${_url}/x11-base/xorg-server/files/xdm.initd-11"
+        "xdm-setup.initd::${_url}/x11-base/xorg-server/files/xdm-setup.initd-1"
+        "${_url}/x11-apps/xinit/files/startDM.sh"
+        "gpm.confd::${_url}/sys-libs/gpm/files/gpm.conf.d"
+        "gpm.initd::${_url}/sys-libs/gpm/files/gpm.rc6-2"
+        "rfcomm.initd::${_url}/net-wireless/bluez/files/rfcomm-init.d-r2"
+        "bluetooth.initd::${_url}/net-wireless/bluez/files/bluetooth-init.d-r3"
+        "wpa_supplicant.confd::${_url}/net-wireless/wpa_supplicant/files/wpa_supplicant-conf.d"
+        "wpa_supplicant.initd::${_url}/net-wireless/wpa_supplicant/files/wpa_supplicant-init.d"
+        "${_url}/net-wireless/wpa_supplicant/files/wpa_cli.sh"
+        "NetworkManager.confd::${_url}/net-misc/networkmanager/files/conf.d.NetworkManager"
+        "NetworkManager.initd::${_url}/net-misc/networkmanager/files/init.d.NetworkManager-r1"
+        "elogind.confd::${_url}/sys-auth/elogind/files/elogind.conf"
+        "elogind.initd::${_url}/sys-auth/elogind/files/elogind.init"
+        '10-openrc-status'
+        'avahi-daemon.initd'
+        'avahi-dnsconfd.initd'
+        'xdg-user-dirs')
 sha256sums=('3755d4eb8bb64a1304e5defedb949305ac550565da36fe4f94d5f31beee821ba'
             '5dcf5721a129b3782c13fc453853c390c34e2ad4ee00706388ce014454b063ee'
             'd1c55400b701a72dcb8bb85e016b5013fa3eb6a2766ffc20dae278d0ee4c1a43'
             'cf67ba1c4bd13cc6fafdebab40b3e84d09f5b6ec768ed2dcf0ec53d9be296ba4'
-            'c5e8db4e9d390bcaebcf203127a99b16d888a576d873920bd42dc56d20fa90c8'
             '9d26b72bb28611a60a6b9f942b8d8cfe47b59f926be89af9709b5912668344d8'
             '2ae57ee506eeb15eaa8f06b6a8f1d29fd007e33558c506bbf7640d16c4a67d50'
             'e37a9353ed848f35ac7b07d1398466a18741fd1de075a6cb971e1c28088d791d'
@@ -67,159 +60,152 @@ sha256sums=('3755d4eb8bb64a1304e5defedb949305ac550565da36fe4f94d5f31beee821ba'
             '61ec59007f66ac5bacc0aa095d1f2ccbc977a687038e161a463d1727223d5a90'
             '98985142371d39ea6294d757e85a3d3fc9fc21718063afbf81869e1d2ca648a7'
             'f3aa34b99a90213c53496f8ea014c487266338791f3526043a7fd97adc651fc6'
-            '97220fa0af6dcaa9d2cb726620ee3de8e216e55bab37cea40e5ed010ed637e35'
-            'f162685428a6593630daf5d636c198caf4992843ced977dc6d7288b7559a062c'
             '4594573f01fe5e04b6dde4525796acf909158591bdcefd662ec23fe0d1c3e1bd'
             '99bd8af8573b8b4ca64e818ef312ce6094f05ed5829712203fd4a12b98f39650'
+            'ad651e0c6cd456cc0209802ac878a7c08e69435f0428ded4ad116d11f728b2dd'
+            '0113e93f3dd2c7e2ee581a39e7625d49d8e64c6089d432721a6be9df85e36531'
             '1535237db113a76261d6f1ce0b24a55e956934b0c1c59e9fd624f621961327b6'
             '876788303553fe773e64917f76f0208f5e8adf7b91d4af24aa9d6a68a147d646'
             'e128576d72981e402ff106bb481108ab6d5ba941ab1b0f5f53e96a7831fc1d15'
-            'f0f27de23d849b2fa4ebf59e448b5a843b577d14dc2c1070e228999091fa7f5e'
-            'ad651e0c6cd456cc0209802ac878a7c08e69435f0428ded4ad116d11f728b2dd'
-            '0113e93f3dd2c7e2ee581a39e7625d49d8e64c6089d432721a6be9df85e36531')
+            'f0f27de23d849b2fa4ebf59e448b5a843b577d14dc2c1070e228999091fa7f5e')
 
 pkgver() {
 	date +%Y%m%d
 }
 
 _inst_initd(){
-	install -Dm755 ${srcdir}/$1.initd ${pkgdir}/etc/init.d/$1
+    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|/usr/sbin|/usr/bin|g' \
-		-i ${pkgdir}/etc/init.d/$1
+    sed -e 's|/var/run|/run|g' \
+        -e 's|/usr/sbin|/usr/bin|g' \
+        -i ${pkgdir}/etc/init.d/$1
 }
 
 _inst_confd(){
-	install -Dm755 ${srcdir}/$1.confd ${pkgdir}/etc/conf.d/$1
+    install -Dm755 ${srcdir}/$1.confd ${pkgdir}/etc/conf.d/$1
 }
 
 package_acpid-openrc() {
-	pkgdesc="OpenRC acpid init script"
-	depends=('openrc' 'acpid')
-	backup=('etc/conf.d/acpid')
+    pkgdesc="OpenRC acpid init script"
+    groups=('openrc-desktop')
+    depends=('openrc' 'acpid')
+    backup=('etc/conf.d/acpid')
 
-	_inst_confd 'acpid'
-	_inst_initd 'acpid'
+    _inst_confd 'acpid'
+    _inst_initd 'acpid'
 }
 
 package_alsa-utils-openrc() {
-	pkgdesc="OpenRC alsa-utils init script"
-	depends=('openrc' 'alsa-utils')
-	backup=('etc/conf.d/alsasound')
+    pkgdesc="OpenRC alsa-utils init script"
+    groups=('openrc-desktop')
+    depends=('openrc' 'alsa-utils')
+    backup=('etc/conf.d/alsasound')
 
-	_inst_confd 'alsasound'
-	_inst_initd 'alsasound'
+    _inst_confd 'alsasound'
+    _inst_initd 'alsasound'
 }
 
 package_avahi-openrc() {
-	pkgdesc="OpenRC avahi init script"
-	depends=('avahi' 'dbus-openrc')
-
-	_inst_initd 'avahi-daemon'
-	_inst_initd 'avahi-dnsconfd'
-}
-
-package_cgmanager-openrc() {
-	pkgdesc="OpenRC cgmanager init script"
-	depends=('openrc' 'cgmanager')
+    pkgdesc="OpenRC avahi init script"
+    groups=('openrc-desktop')
+    depends=('avahi' 'dbus-openrc')
 
-	_inst_initd 'cgproxy'
-	_inst_initd 'cgmanager'
-}
-
-package_consolekit-openrc() {
-	pkgdesc="OpenRC consolekit init script"
-	depends=('consolekit' 'dbus-openrc' 'cgmanager-openrc' 'udev-openrc')
-
-	_inst_initd 'consolekit'
+    _inst_initd 'avahi-daemon'
+    _inst_initd 'avahi-dnsconfd'
 }
 
 package_displaymanager-openrc() {
-	pkgdesc="OpenRC dm init script"
-	depends=('openrc' 'xorg-server' 'xorg-xinit' 'udev-openrc')
-	optdepends=('consolekit-openrc: consolekit initscript'
-                    'dbus-openrc: dbus initscript')
-	backup=('etc/conf.d/xdm')
-	install=displaymanager.install
+    pkgdesc="OpenRC dm init script"
+    groups=('openrc-desktop')
+    depends=('xorg-server' 'xorg-xinit' 'udev-openrc')
+    optdepends=('elogind-openrc: elogind initscript'
+                'dbus-openrc: dbus initscript')
 
-	_inst_confd 'xdm'
-	_inst_initd 'xdm'
-	_inst_initd 'xdm-setup'
+    backup=('etc/conf.d/xdm')
+    install=displaymanager.install
 
-	install -Dm755 "${srcdir}/startDM.sh" "${pkgdir}/etc/X11/startDM.sh"
+    _inst_confd 'xdm'
+    _inst_initd 'xdm'
+    _inst_initd 'xdm-setup'
 
-	sed -e 's|/etc/profile.env|/etc/profile|g' \
-		-e 's|{ROOTPATH}|{PATH}|g' \
-		-e 's|use consolekit dbus xfs|use consolekit dbus xfs elogind|' \
-		-i "${pkgdir}/etc/init.d/xdm"
+    install -Dm755 "${srcdir}/startDM.sh" "${pkgdir}/etc/X11/startDM.sh"
 
-	install -D ${srcdir}/xdg-user-dirs "$pkgdir/etc/X11/xinit/xinitrc.d/xdg-user-dirs"
+    sed -e 's|/etc/profile.env|/etc/profile|g' \
+        -e 's|{ROOTPATH}|{PATH}|g' \
+        -e 's|use consolekit dbus xfs|use consolekit dbus xfs elogind|' \
+        -i "${pkgdir}/etc/init.d/xdm"
+
+    install -D ${srcdir}/xdg-user-dirs "$pkgdir/etc/X11/xinit/xinitrc.d/xdg-user-dirs"
 }
 
 package_elogind-openrc() {
-	pkgdesc="OpenRC elogind init script"
-	depends=('elogind' 'openrc')
-
-	_inst_confd 'elogind'
-	_inst_initd 'elogind'
+    pkgdesc="OpenRC elogind init script"
+    groups=('openrc-desktop')
+    depends=('elogind' 'dbus-openrc' 'udev-openrc')
+    conflicts=('consolekit-openrc')
+# 	replaces=('consolekit-openrc')
+
+    _inst_confd 'elogind'
+    _inst_initd 'elogind'
+
+    sed -e 's|/usr/libexec|/usr/lib|' \
+        -e 's|/var/run|/run|' \
+        -i "${pkgdir}/etc/conf.d/elogind"
 }
 
 package_gpm-openrc() {
-	pkgdesc="OpenRC gpm init script"
-	depends=('openrc' 'gpm')
-	backup=('etc/conf.d/gpm')
+    pkgdesc="OpenRC gpm init script"
+    depends=('openrc' 'gpm')
+    groups=('openrc-desktop')
+    backup=('etc/conf.d/gpm')
 
-	_inst_confd 'gpm'
-	_inst_initd 'gpm'
+    _inst_confd 'gpm'
+    _inst_initd 'gpm'
 }
 
 package_networkmanager-openrc() {
-	pkgdesc="OpenRC networkmanager init script"
-	depends=('openrc' 'networkmanager')
-	groups=('openrc-desktop' 'openrc-mobile')
-	backup=('etc/conf.d/NetworkManager')
+    pkgdesc="OpenRC networkmanager init script"
+    depends=('dbus-openrc' 'networkmanager')
+    groups=('openrc-desktop' 'openrc-mobile')
+    optdepends=('elogind-openrc: elogind initscript')
+    backup=('etc/conf.d/NetworkManager')
 
-	_inst_confd 'NetworkManager'
-	_inst_initd 'NetworkManager'
+    _inst_confd 'NetworkManager'
+    _inst_initd 'NetworkManager'
 
-	install -Dm755 "${srcdir}/10-openrc-status" "${pkgdir}/etc/NetworkManager/dispatcher.d/10-openrc-status"
+    install -Dm755 "${srcdir}/10-openrc-status" "${pkgdir}/etc/NetworkManager/dispatcher.d/10-openrc-status"
 
-	sed -e 's|use consolekit|use consolekit elogind|' \
-		-i "${pkgdir}/etc/init.d/NetworkManager"
+    sed -e 's|use consolekit|use consolekit elogind|' \
+        -i "${pkgdir}/etc/init.d/NetworkManager"
 }
 
 package_bluez-openrc() {
-	pkgdesc="OpenRC bluez init script"
-	groups=('openrc-mobile')
-	depends=('bluez' 'dbus-openrc')
-	#backup=('etc/conf.d/rfcomm')
+    pkgdesc="OpenRC bluez init script"
+    groups=('openrc-mobile')
+    depends=('bluez' 'dbus-openrc')
 
-# 	_inst_confd 'rfcomm'
-	_inst_initd 'rfcomm'
-	_inst_initd 'bluetooth'
+    _inst_initd 'rfcomm'
+    _inst_initd 'bluetooth'
 
-	sed -e 's|/usr/libexec|/usr/lib|g' \
-            -i "${pkgdir}/etc/init.d/bluetooth"
+    sed -e 's|/usr/libexec|/usr/lib|g' \
+        -i "${pkgdir}/etc/init.d/bluetooth"
 }
 
 package_wpa_supplicant-openrc() {
-	pkgdesc="OpenRC wpa_supplicant init script"
-	groups=('openrc-mobile')
-	depends=('openrc' 'wpa_supplicant')
-	backup=('etc/conf.d/wpa_supplicant')
-
-	_inst_confd 'wpa_supplicant'
-	_inst_initd 'wpa_supplicant'
-
-	install -Dm755 "${srcdir}/wpa_cli.sh" "${pkgdir}/etc/wpa_supplicant/wpa_cli.sh"
-
-	if [[ -f /etc/os-release ]];then
-		. /etc/os-release
-		sed -e "s|gentoo-release|${ID}-release|" -i "${pkgdir}/etc/wpa_supplicant/wpa_cli.sh"
-	else
-		sed -e 's|gentoo-release|arch-release|' -i "${pkgdir}/etc/wpa_supplicant/wpa_cli.sh"
-	fi
+    pkgdesc="OpenRC wpa_supplicant init script"
+    groups=('openrc-mobile')
+    depends=('openrc' 'wpa_supplicant')
+    backup=('etc/conf.d/wpa_supplicant')
+
+    _inst_confd 'wpa_supplicant'
+    _inst_initd 'wpa_supplicant'
+
+    install -Dm755 "${srcdir}/wpa_cli.sh" "${pkgdir}/etc/wpa_supplicant/wpa_cli.sh"
+
+    if [[ -f /etc/os-release ]];then
+        . /etc/os-release
+        sed -e "s|gentoo-release|${ID}-release|" -i "${pkgdir}/etc/wpa_supplicant/wpa_cli.sh"
+    else
+        sed -e 's|gentoo-release|arch-release|' -i "${pkgdir}/etc/wpa_supplicant/wpa_cli.sh"
+    fi
 }