Merge branch 'lukeshu/systemd-split'

8 files changed, 75 insertions, 136 deletions

diff --git a/pcr/eudev-openrc/PKGBUILD b/pcr/eudev-openrc/PKGBUILD
deleted file mode 100644
index 6c56bf55a..000000000
--- a/pcr/eudev-openrc/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer (Artix): artoo <artoo@cromnix.org>
-# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
-
-_url="http://dev.gentoo.org/~williamh/dist"
-_pkgname=udev-init-scripts
-
-_sed_args=(-e "s|/bin/udevadm|/usr/bin/udevadm|g" -e "s|/sbin/udevd|/usr/bin/udevd|g")
-_sed_args+=(-e 's|#!/sbin/openrc-run|#!/usr/bin/openrc-run|g')
-
-pkgname=eudev-openrc
-pkgver=32
-pkgrel=4.3
-pkgdesc="OpenRC eudev startup scripts"
-arch=('any')
-url="https://github.com/cromnix/artix"
-license=('GPL2')
-groups=('openrc-base')
-provides=('udev-openrc')
-depends=('kmod-openrc' 'eudev')
-conflicts=('systemd-sysvcompat' 'udev-openrc')
-replaces=('udev-openrc')
-source=("${_url}/${_pkgname}-${pkgver}.tar.gz")
-sha256sums=('d5ae437291ae140194f67fec2c9a6ceeda39708433840e7b4b0361cc5ae53eaa')
-
-package(){
-    cd "${srcdir}/${_pkgname}-${pkgver}"
-    make DESTDIR="${pkgdir}" install
-
-    for f in ${pkgdir}/etc/init.d/*;do
-        sed ${_sed_args[@]} -i "$f"
-    done
-
-    install -d "${pkgdir}/etc/runlevels/sysinit"
-    ln -sf "/etc/init.d/udev" "${pkgdir}/etc/runlevels/sysinit/udev"
-    ln -sf "/etc/init.d/udev-trigger" "${pkgdir}/etc/runlevels/sysinit/udev-trigger"
-}
diff --git a/pcr/eudev/PKGBUILD b/pcr/eudev/PKGBUILD
index 8edba5b35..f3df759a7 100644
--- a/pcr/eudev/PKGBUILD
+++ b/pcr/eudev/PKGBUILD
@@ -6,9 +6,9 @@
 _udev_ver=220
 
 pkgbase=eudev
-pkgname=('eudev' 'libeudev')
+pkgname=('eudev' 'eudev-libudev')
 pkgver=3.2.5
-pkgrel=3
+pkgrel=4
 pkgdesc="The userspace dev tools (udev) forked by Gentoo"
 arch=('i686' 'x86_64' 'armv7h')
 url="http://www.gentoo.org/proj/en/eudev/"
@@ -59,11 +59,12 @@ build() {
 }
 
 package_eudev() {
-    provides=("udev=${_udev_ver}")
-    depends=("libeudev" 'kbd' 'kmod' 'hwids' 'util-linux')
+    depends=("eudev-libudev=$pkgver" 'kbd' 'kmod' 'hwids' 'util-linux')
     optdepends=('eudev-openrc: udev starup scripts for openrc')
     backup=('etc/udev/udev.conf')
 
+    provides=("udev=${_udev_ver}")
+    conflicts=('udev')
 
     cd "${srcdir}/${pkgbase}-${pkgver}"
 
@@ -81,10 +82,15 @@ package_eudev() {
     install -Dm644 -t "$pkgdir"/usr/share/libalpm/hooks ${srcdir}/*.hook
 }
 
-package_libeudev() {
+package_eudev-libudev() {
     pkgdesc="eudev client libraries"
     depends=('glibc' 'libelf')
     provides=("libudev=${_udev_ver}" 'libudev.so')
+    conflicts=('libudev')
+
+    provides+=("libeudev=$pkgver")
+    conflicts+=('libeudev')
+    replaces+=('libeudev')
 
     cd "${srcdir}/${pkgbase}-${pkgver}"
     make -C src/libudev DESTDIR="$pkgdir" install
diff --git a/pcr/kmod-openrc/PKGBUILD b/pcr/kmod-openrc/PKGBUILD
new file mode 100644
index 000000000..a99f9dd7b
--- /dev/null
+++ b/pcr/kmod-openrc/PKGBUILD
@@ -0,0 +1,24 @@
+# Maintainer: Luke Shumaker <lukeshu@parabola.nu>
+
+# Package information
+pkgname=kmod-openrc
+pkgdesc="kmod startup scripts for OpenRC"
+pkgrel=1
+arch=('any')
+groups=('base-openrc')
+depends=('openrc' 'kmod')
+
+# Upstream information
+pkgver=20170228
+_commit=22fd7b2d4764535bd3afc37728df1015b0294467
+url=https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-apps/kmod
+# see here for new pkgver/_commit values: https://gitweb.gentoo.org/repo/gentoo.git/log/sys-apps/kmod/files/kmod-static-nodes-r1
+source=("kmod-static-nodes-r1-$pkgver::https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-apps/kmod/files/kmod-static-nodes-r1?id=${_commit}")
+sha256sums=('328b74618b85fea197b36f8fc602a33d27e204f0d0b38ed0e6dfc920ba219e2f')
+license=('GPL2')
+
+package() {
+    install -Dm755 "$srcdir/kmod-static-nodes-r1-$pkgver" "$pkgdir/etc/init.d/kmod-static-nodes"
+    install -d "${pkgdir}/etc/runlevels/sysinit"
+    ln -sf "/etc/init.d/kmod-static-nodes" "${pkgdir}/etc/runlevels/sysinit/kmod-static-nodes"
+}
diff --git a/pcr/openrc-base/PKGBUILD b/pcr/openrc-base/PKGBUILD
index c0cc2a781..a62f16cef 100644
--- a/pcr/openrc-base/PKGBUILD
+++ b/pcr/openrc-base/PKGBUILD
@@ -1,7 +1,9 @@
 # Maintainer (Artix): artoo <artoo@cromnix.org>
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
-_url="https://raw.githubusercontent.com/gentoo/gentoo/master"
+pkgver=20170927
+_commit=0783bd6eb14f40386abf1ca4c6b6ef30b68ae11b
+_url="https://raw.githubusercontent.com/gentoo/gentoo/${_commit}"
 
 _sed_args=(-e 's|/var/run|/run|g')
 prefix=true
@@ -16,14 +18,12 @@ pkgname=('cronie-openrc'
          'dhcpcd-openrc'
          'glibc-openrc'
          'inetutils-openrc'
-         'kmod-openrc'
          'lvm2-openrc'
          'mdadm-openrc'
          'nfs-utils-openrc'
          'quota-tools-openrc'
          'rpcbind-openrc'
          'syslog-ng-openrc')
-pkgver=20170927
 pkgrel=2
 pkgdesc="OpenRC init scripts"
 arch=('any')
@@ -42,7 +42,6 @@ source=("cronie.initd::${_url}/sys-process/cronie/files/cronie-1.3-initd"
         "nscd.initd::${_url}/sys-libs/glibc/files/nscd"
         'ftpd.confd'
         'ftpd.initd'
-        'kmod-static-nodes.initd'
         "lvm.confd::${_url}/sys-fs/lvm2/files/lvm.confd-2.02.28-r2"
         "lvm.initd::${_url}/sys-fs/lvm2/files/lvm.rc-2.02.172"
         "lvm-monitoring.initd::${_url}/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.105-r2"
@@ -79,7 +78,6 @@ sha256sums=('8646ff964892eeb5f6c5da444a5ef5d898fb1f3a395c5b9fc85d32d8d56fc785'
             '13391343bfc64379c696b4bfc1cfe8d7fbb2886f477265343fddf448d82deabf'
             '59fe1aa68c43f4958afc397a0d6b35da263a20fcdb457005123a0d64cb1f7477'
             '925c1531fd447792a4b2031473057c16bf6cf77486f11aa7f6e50d69f838e2d7'
-            '3ecbe7761b92a123a5a3d395ec3d9e090b0dfba7910a5987b4a2298c20a7e571'
             '28370c089c39c248d7ded0960b8d8a9256bada44d44c22ce3cec87d512ef6844'
             '499fae740d7740895842e2a6db8736272ceacf2d4b6f57f00a8ff91b7993d1da'
             '42847d8e6dabbcf2cc19846c6ad22cbab65e9a033c4add569b152504b16ab477'
@@ -104,9 +102,6 @@ sha256sums=('8646ff964892eeb5f6c5da444a5ef5d898fb1f3a395c5b9fc85d32d8d56fc785'
             'b29325498ee3b1f3d63672efcd1e93f0745eecdb9f4bb05fed82a2f085399484'
             '5c4ad3406fc885555883de0537614034de181d783bcb1e864bff6299ac6c1356')
 
-pkgver() {
-    date +%Y%m%d
-}
 
 _inst_initd(){
     install -Dm755 ${srcdir}/$1.initd ${pkgdir}/etc/init.d/$1
@@ -191,16 +186,6 @@ package_inetutils-openrc() {
     _inst_initd 'ftpd'
 }
 
-package_kmod-openrc() {
-    pkgdesc="OpenRC nscd init script"
-    depends=('openrc' 'kmod')
-
-    _inst_initd 'kmod-static-nodes'
-
-    install -d "${pkgdir}/etc/runlevels/sysinit"
-    ln -sf "/etc/init.d/kmod-static-nodes" "${pkgdir}/etc/runlevels/sysinit/kmod-static-nodes"
-}
-
 package_lvm2-openrc() {
     pkgdesc="OpenRC lvm2 init script"
     depends=('device-mapper-openrc' 'lvm2')
diff --git a/pcr/openrc-base/kmod-static-nodes.initd b/pcr/openrc-base/kmod-static-nodes.initd
deleted file mode 100644
index 7a3f529dc..000000000
--- a/pcr/openrc-base/kmod-static-nodes.initd
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-description="Create list of required static device nodes for the current kernel"
-
-depend() {
-	after dev-mount
-	before tmpfiles.dev dev
-	keyword -lxc -systemd-nspawn
-}
-
-start() {
-	ebegin "Creating list of required static device nodes for the current kernel"
-	checkpath -q -d /run/tmpfiles.d
-	kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf
-	eend $?
-}
diff --git a/pcr/openrc/PKGBUILD b/pcr/openrc/PKGBUILD
index 84214bf33..e38606d99 100644
--- a/pcr/openrc/PKGBUILD
+++ b/pcr/openrc/PKGBUILD
@@ -6,7 +6,7 @@
 pkgbase=openrc
 pkgname=('openrc' 'openrc-init')
 pkgver=0.35.5
-pkgrel=1.parabola1
+pkgrel=1.parabola2
 arch=('i686' 'x86_64' 'armv7h')
 url="https://wiki.gentoo.org/wiki/Project:OpenRC"
 license=('BSD2')
@@ -53,7 +53,7 @@ build(){
 package_openrc() {
     pkgdesc="Gentoo's universal init system"
     install=${pkgbase}.install
-    depends=('psmisc' 'pam' 'opentmpfiles' 'init')
+    depends=('psmisc' 'pam' 'init')
     optdepends=('netifrc: Network Interface Management Scripts'
                 'networkmanager-openrc: NetworkManager')
     backup=('etc/rc.conf'
diff --git a/pcr/systemdcompat/PKGBUILD b/pcr/systemdcompat/PKGBUILD
deleted file mode 100644
index 8efd75290..000000000
--- a/pcr/systemdcompat/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# Maintainer (Artix): artoo <artoo@manjaro.org>
-# Contributor (Artix): Philip Müller <philm|manjaro|org>
-# Contributor (Arch): Dave Reisner <dreisner@archlinux.org>
-# Contributor (Arch): Tom Gundersen <teg@jklm.no>
-# Maintainer: David P. <megver83@parabola.nu>
-
-_spkgrel=1.parabola1
-_repo=https://repo.parabola.nu/libre/os
-
-pkgbase=systemdcompat
-pkgname=('systemd-dummy' 'libsystemd-dummy')
-pkgver=238.76
-pkgrel=1
-pkgrel+=.parabola3
-arch=('x86_64' 'i686' 'armv7h')
-license=('GPL2')
-groups=('base-openrc' 'openrc-base')
-url="http://www.freedesktop.org/wiki/Software/systemd"
-source_x86_64=("$_repo/x86_64/libsystemd-standalone-$pkgver-${_spkgrel}-x86_64.pkg.tar.xz"
-               "$_repo/x86_64/systemd-$pkgver-${_spkgrel}-x86_64.pkg.tar.xz")
-source_i686=("$_repo/i686/libsystemd-standalone-$pkgver-${_spkgrel}-i686.pkg.tar.xz"
-               "$_repo/i686/systemd-$pkgver-${_spkgrel}-i686.pkg.tar.xz")
-source_armv7h=("$_repo/armv7h/libsystemd-standalone-$pkgver-${_spkgrel}-armv7h.pkg.tar.xz"
-               "$_repo/armv7h/systemd-$pkgver-${_spkgrel}-armv7h.pkg.tar.xz")
-sha256sums_x86_64=('3edd5db99841b33f8bd642fd4d0485c2b193632ba4422202b3f2a804a622ed41'
-                   '846192d62ecc76973c8bf1e0d636de229dcc217d2b3c91de1d3ecfae3458b78e')
-sha256sums_i686=('8f55127e661875ba0347901c5ffac1deb3b1b8454e8c4d0a4961000b03981ab4'
-                 'c0f3e01a4bf477c2d01b6239ee3c0d4b51e30d7459b5491693fb5c18755be5d6')
-sha256sums_armv7h=('b0a606b4664047ca1d49462a590fedb4a5d13034ca733860f3f4bbe420f13435'
-                   'd80fdecdf8af82a83356c3ed6f6294b455f8685efdcf01c614f8e01fe772eb75')
-
-package_systemd-dummy() {
-    pkgdesc="systemd shared libraries; systemd compatibility package"
-    provides=("systemd=${pkgver}" "systemd-tools=${pkgver}")
-    depends=('eudev' 'libseccomp')
-    conflicts=('systemd-tools' 'systemd' 'eudev-systemdcompat')
-    replaces=('eudev-systemd')
-
-    install -d "$pkgdir"/usr/lib/systemd
-    for f in usr/lib/systemd/libsystemd-shared*.so*;do
-        mv -v $f $pkgdir/usr/lib/systemd
-    done
-}
-
-package_libsystemd-dummy() {
-    pkgdesc="systemd client libraries without udev; systemd compatibility package"
-    provides=("libsystemd=${pkgver}" 'libsystemd.so')
-    depends=('glibc' 'libcap' 'libgcrypt' 'lz4' 'xz' 'libeudev')
-    conflicts=('libsystemd' 'libsystemd-standalone' 'eudev-systemdcompat')
-    replaces=('libeudev-systemd')
-
-    install -d $pkgdir/usr/lib
-    for f in usr/lib/libsystemd*.so*;do
-        mv -v $f $pkgdir/usr/lib
-    done
-}
diff --git a/pcr/udev-init-scripts/PKGBUILD b/pcr/udev-init-scripts/PKGBUILD
new file mode 100644
index 000000000..7840d12da
--- /dev/null
+++ b/pcr/udev-init-scripts/PKGBUILD
@@ -0,0 +1,35 @@
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
+# Contributor: Luke Shumaker <lukeshu@parabola.nu>
+
+# Upstream information
+pkgname=udev-init-scripts
+pkgver=32
+pkgdesc="udev startup scripts for OpenRC"
+url="https://gitweb.gentoo.org/proj/${pkgname}.git"
+# Gentoo's package script: https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-fs/udev-init-scripts
+source=("http://dev.gentoo.org/~williamh/dist/${pkgname}-${pkgver}.tar.gz")
+sha256sums=('d5ae437291ae140194f67fec2c9a6ceeda39708433840e7b4b0361cc5ae53eaa')
+depends=('openrc' 'udev>=217')
+license=('GPL2')
+
+# Package information
+pkgrel=5
+arch=('any')
+groups=('base-openrc')
+# Depend on any $X-openrc packages that exist for the dependencies of
+# eudev and systemd-udev
+depends+=('kmod-openrc')
+
+# Historical compatibility
+provides+=('udev-openrc' 'eudev-openrc')
+conflicts+=('udev-openrc' 'eudev-openrc')
+replaces+=('udev-openrc' 'eudev-openrc')
+
+package(){
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+
+    install -d "${pkgdir}/etc/runlevels/sysinit"
+    ln -sf "/etc/init.d/udev"         "${pkgdir}/etc/runlevels/sysinit/udev"
+    ln -sf "/etc/init.d/udev-trigger" "${pkgdir}/etc/runlevels/sysinit/udev-trigger"
+}