pcr/openrc: Don't disable MKNET, but split it in to a separate package

Mention this 'openrc-net' package in openrc:optdepends, but don't include
it in groups=(base-openrc).

While we're at it, drop "networkmanager-openrc" from optdepends.  Where's
it end?  wicd-openrc?  dhcpcd-openrc?

1 files changed, 22 insertions, 5 deletions

diff --git a/pcr/openrc/PKGBUILD b/pcr/openrc/PKGBUILD
index eb8356b0b..a9e8cf43f 100644
--- a/pcr/openrc/PKGBUILD
+++ b/pcr/openrc/PKGBUILD
@@ -11,7 +11,7 @@
 # Contributor (AUR): Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 
 pkgbase=openrc
-pkgname=('openrc' 'openrc-init' 'openrc-sysvinit')
+pkgname=('openrc' 'openrc-init' 'openrc-sysvinit' 'openrc-net')
 pkgver=0.38.2
 pkgrel=1
 arch=('i686' 'x86_64' 'armv7h')
@@ -32,7 +32,7 @@ _makeargs=(
     SBINDIR=/usr/bin
     LIBEXECDIR=/usr/lib/rc
 
-    MKNET=no
+    #MKNET=yes
     MKPAM=pam
     MKSELINUX=no
     MKSYSVINIT=yes
@@ -63,14 +63,19 @@ build(){
         install -d -- "$srcdir/dest/openrc-init/${file%/*}"
         mv -T -- "$srcdir"/dest/{openrc,openrc-init}/"$file"
     done
+
+    for file in etc/{init,conf}.d/{network,staticroute}; do
+        install -d -- "$srcdir/dest/openrc-net/${file%/*}"
+        mv -T -- "$srcdir"/dest/{openrc,openrc-net}/"$file"
+    done
 }
 
 package_openrc() {
     pkgdesc="A dependency based init system"
     groups=('base-openrc')
     depends=('psmisc' 'pam' 'openrc-pid1')
-    optdepends=('netifrc: Network Interface Management Scripts'
-                'networkmanager-openrc: NetworkManager')
+    optdepends=('openrc-net: OpenRC ("newnet") network management scripts'
+                'netifrc: Gentoo ("oldnet") network management scripts')
     backup=('etc/conf.d/agetty'
             'etc/conf.d/bootmisc'
             'etc/conf.d/consolefont'
@@ -92,7 +97,7 @@ package_openrc() {
             'etc/pam.d/start-stop-daemon'
             'etc/pam.d/supervise-daemon'
             'etc/rc.conf')
-        
+
     cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir"
 
     # Configuration
@@ -141,3 +146,15 @@ package_openrc-init() {
     # License
     install -Dm644 "$srcdir/$pkgbase/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
+
+package_openrc-net() {
+    pkgdesc="OpenRC new-style networking"
+    depends=('openrc')
+    backup=('etc/conf.d/network'
+            'etc/conf.d/staticroute')
+
+    cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir"
+
+    # License
+    install -Dm644 "$srcdir/$pkgbase/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}