9 files changed, 162 insertions, 151 deletions
diff --git a/pcr/openrc-core/LICENSE b/pcr/netifrc/LICENSE
index a995d5485..a995d5485 100644
--- a/pcr/openrc-core/LICENSE
+++ b/pcr/netifrc/LICENSE
diff --git a/pcr/netifrc/PKGBUILD b/pcr/netifrc/PKGBUILD
new file mode 100644
index 000000000..47269daa5
--- /dev/null
+++ b/pcr/netifrc/PKGBUILD
@@ -0,0 +1,66 @@
+# Maintainer (Manjaro): artoo <artoo@manjaro.org>
+# Contributor (Manjaro): williamh <williamh@gentoo.org>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
+
+_src_uri="https://github.com"
+
+_net_uri="${_src_uri}/gentoo/netifrc/archive"
+_func_uri="${_src_uri}/gentoo/gentoo-functions/archive"
+
+_func_ver=0.10
+
+pkgname=netifrc
+pkgver=0.3.1
+pkgrel=6
+pkgdesc="Gentoo Network Interface Management Scripts"
+arch=('i686' 'x86_64' 'armv7h')
+url="http://www.gentoo.org/proj/en/base/openrc/"
+license=('BSD2')
+groups=('openrc-base')
+depends=('udev-openrc')
+install=${pkgname}.install
+backup=('etc/conf.d/net')
+source=("${pkgname}-${pkgver}.tar.gz::${_net_uri}/${pkgver}.tar.gz"
+	"gentoo-functions-${_func_ver}.tar.gz::${_func_uri}/${_func_ver}.tar.gz"
+	'LICENSE')
+sha256sums=('8ae41223cdc735eee8303e93959b31b6aeae6f1a08661ef5baa6373dd86419c7'
+            '709c8b22f404001a512e47a7a4d3192070b3e150fb9d0f943de09736d665b0db'
+            '28875cc6cb52e93657b96cf1bf0cc3b91891cdcbbc3196007c8cd93c6e22078f')
+
+_net_args=(SYSCONFDIR=/etc)
+_net_args+=(BRANDING="Parabola")
+_id="parabola"
+_net_args+=(PREFIX=/usr)
+_net_args+=(SBINDIR=/usr/bin)
+_net_args+=(LIBEXECDIR=/usr/lib/${pkgname})
+
+_func_args+=(ROOTPREFIX=/usr)
+_func_args+=(ROOTSBINDIR=/usr/bin)
+_func_args+=(ROOTLIBEXECDIR=/usr/lib/$_id)
+
+build(){
+	# make netifrc
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make "${_net_args[@]}"
+	cd ${srcdir}/gentoo-functions-${_func_ver}
+	make "${_func_args[@]}"
+}
+
+package() {
+        cd "${srcdir}/${pkgname}-${pkgver}"
+        make DESTDIR="${pkgdir}" "${_net_args[@]}" install
+        install -Dm 644 "${srcdir}/${pkgname}-${pkgver}/doc/net.example" "${pkgdir}/etc/conf.d/net"
+
+        install -d "${pkgdir}/etc/runlevels//boot"
+        sed -e 's|#!/usr/bin/runscript|#!/usr/bin/openrc-run|' \
+            -i "${pkgdir}/etc/init.d/net.lo"
+        ln -sf "/etc/init.d/net.lo" "${pkgdir}/etc/runlevels/boot/net.lo"
+
+        cd ${srcdir}/gentoo-functions-${_func_ver}
+        make DESTDIR="${pkgdir}" "${_func_args[@]}" install
+
+        sed -e "s|/lib/gentoo/functions.sh|/usr/lib/$_id/functions.sh|g" \
+            -i "${pkgdir}/usr/lib/${pkgname}/sh/functions.sh"
+
+        install -Dm644 ${srcdir}/LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/pcr/openrc-core/netifrc.install b/pcr/netifrc/netifrc.install
index fa8554bc3..fa8554bc3 100644
--- a/pcr/openrc-core/netifrc.install
+++ b/pcr/netifrc/netifrc.install
diff --git a/pcr/openrc-core/PKGBUILD b/pcr/openrc-core/PKGBUILD
deleted file mode 100644
index 589f1260c..000000000
--- a/pcr/openrc-core/PKGBUILD
+++ /dev/null
@@ -1,132 +0,0 @@
-# Maintainer (Manjaro): artoo <artoo@manjaro.org>
-# Contributor (Manjaro): williamh <williamh@gentoo.org>
-# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
-
-_src_uri="https://github.com"
-
-_rc_uri="${_src_uri}/OpenRC/openrc/archive"
-_net_uri="${_src_uri}/gentoo/netifrc/archive"
-_func_uri="${_src_uri}/gentoo/gentoo-functions/archive"
-
-_rc_ver=0.18.3
-_net_ver=0.3.1
-_func_ver=0.10
-
-pkgver=${_rc_ver}
-pkgrel=1
-pkgbase=openrc-core
-pkgname=('openrc' 'netifrc')
-arch=('i686' 'x86_64' 'armv7h')
-url="http://www.gentoo.org/proj/en/base/openrc/"
-license=('BSD2')
-source=("openrc-${_rc_ver}.tar.gz::${_rc_uri}/${_rc_ver}.tar.gz"
-	"netifrc-${_net_ver}.tar.gz::${_net_uri}/${_net_ver}.tar.gz"
-	"gentoo-functions-${_func_ver}.tar.gz::${_func_uri}/${_func_ver}.tar.gz"
-	"openrc.logrotate"
-	'LICENSE')
-sha256sums=('e8e0bbefd8b40284a167af5c5071bd2eff6304988b3fd935bd6834c62cfa2339'
-            '8ae41223cdc735eee8303e93959b31b6aeae6f1a08661ef5baa6373dd86419c7'
-            '709c8b22f404001a512e47a7a4d3192070b3e150fb9d0f943de09736d665b0db'
-            '0b44210db9770588bd491cd6c0ac9412d99124c6be4c9d3f7d31ec8746072f5c'
-            '28875cc6cb52e93657b96cf1bf0cc3b91891cdcbbc3196007c8cd93c6e22078f')
-
-_configure_args() {
-    _base_args=(SYSCONFDIR=/etc)
-    _base_args+=(BRANDING="Parabola")
-    _id="parabola"
-    _base_args+=(PREFIX=/usr)
-    _base_args+=(SBINDIR=/usr/bin)
-
-    _rc_args=( "${_base_args[@]}" )
-    _rc_args+=(LIBEXECDIR=/usr/lib/rc)
-    _rc_args+=(MKSELINUX=no)
-    _rc_args+=(MKPAM=pam)
-    _rc_args+=(MKTERMCAP=ncurses)
-    _rc_args+=(MKNET=no)
-
-    _func_args+=(ROOTPREFIX=/usr)
-    _func_args+=(ROOTSBINDIR=/usr/bin)
-    _func_args+=(ROOTLIBEXECDIR=/usr/lib/$_id)
-
-    _net_args=( "${_base_args[@]}" )
-    _net_args+=(LIBEXECDIR=/usr/lib/netifrc)
-}
-
-_configure_args
-
-prepare(){
-	cd "${srcdir}/openrc-${pkgver}"
-	sed -e "s|/sbin|/usr/bin|g" -i support/sysvinit/inittab
-}
-
-build(){
-	# make openrc
-	cd "${srcdir}/openrc-${pkgver}"
-	make "${_rc_args[@]}"
-	# make netifrc
-	cd "${srcdir}/netifrc-${_net_ver}"
-	make "${_net_args[@]}"
-	cd ${srcdir}/gentoo-functions-${_func_ver}
-	make "${_func_args[@]}"
-}
-
-package_openrc() {
-        pkgver=${_rc_ver}
-        pkgrel=1
-        pkgdesc="Gentoo's universal init system"
-        depends=('inetutils' 'psmisc' 'sysvinit')
-        optdepends=('netifrc: Network Interface Management Scripts'
-                    'networkmanager-openrc: NetworkManager'
-                    'connman-openrc: connman')
-        conflicts=('systemd-sysvcompat' 'openrc-core')
-        replaces=('openrc-core')
-        install=${pkgname}.install
-        backup=('etc/rc.conf'
-                'etc/conf.d/consolefont'
-                'etc/conf.d/keymaps'
-                'etc/conf.d/hostname'
-                'etc/conf.d/modules'
-                'etc/conf.d/hwclock'
-                'etc/inittab')
-
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" "${_rc_args[@]}" install
-
-	install -m644 "${srcdir}/${pkgname}-${pkgver}/support/sysvinit/inittab" "${pkgdir}/etc/inittab"
-	install -Dm644 "${srcdir}/${pkgname}.logrotate" "${pkgdir}/etc/logrotate.d/${pkgname}"
-
-	sed -e 's/#unicode="NO"/unicode="YES"/' \
-	    -e 's/#rc_logger="YES"/rc_logger="YES"/' \
-	    -i "${pkgdir}/etc/rc.conf"
-
-	install -d ${pkgdir}/usr/lib/rc/cache
-
-	install -Dm644 ${srcdir}/LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_netifrc() {
-        pkgver=${_net_ver}
-        pkgrel=3
-        groups=('openrc-base')
-        pkgdesc="Gentoo Network Interface Management Scripts"
-        depends=('udev-openrc')
-        install=${pkgname}.install
-        backup=('etc/conf.d/net')
-
-        cd "${srcdir}/${pkgname}-${pkgver}"
-        make DESTDIR="${pkgdir}" "${_net_args[@]}" install
-        install -Dm 644 "${srcdir}/${pkgname}-${pkgver}/doc/net.example" "${pkgdir}/etc/conf.d/net"
-
-        install -d "${pkgdir}/etc/runlevels//boot"
-        sed -e 's|#!/usr/bin/runscript|#!/usr/bin/openrc-run|' \
-            -i "${pkgdir}/etc/init.d/net.lo"
-        ln -sf "/etc/init.d/net.lo" "${pkgdir}/etc/runlevels/boot/net.lo"
-
-        cd ${srcdir}/gentoo-functions-${_func_ver}
-        make DESTDIR="${pkgdir}" "${_func_args[@]}" install
-
-        sed -e "s|/lib/gentoo/functions.sh|/usr/lib/$_id/functions.sh|g" \
-                -i "${pkgdir}/usr/lib/${pkgname}/sh/functions.sh"
-
-        install -Dm644 ${srcdir}/LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/pcr/openrc-core/kmod-static-nodes b/pcr/openrc-core/kmod-static-nodes
deleted file mode 100644
index 7a3f529dc..000000000
--- a/pcr/openrc-core/kmod-static-nodes
+++ /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/LICENSE b/pcr/openrc/LICENSE
new file mode 100644
index 000000000..a995d5485
--- /dev/null
+++ b/pcr/openrc/LICENSE
@@ -0,0 +1,23 @@
+Copyright (c) <YEAR>, <OWNER>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/pcr/openrc/PKGBUILD b/pcr/openrc/PKGBUILD
new file mode 100644
index 000000000..6550e0557
--- /dev/null
+++ b/pcr/openrc/PKGBUILD
@@ -0,0 +1,73 @@
+# Maintainer (Manjaro): artoo <artoo@manjaro.org>
+# Contributor (Manjaro): williamh <williamh@gentoo.org>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
+
+_rc_uri="https://github.com/OpenRC/openrc/archive"
+
+pkgname=openrc
+pkgver=0.18.3
+pkgrel=1
+pkgdesc="Gentoo's universal init system"
+arch=('i686' 'x86_64' 'armv7h')
+url="http://www.gentoo.org/proj/en/base/openrc/"
+license=('BSD2')
+depends=('inetutils' 'psmisc' 'sysvinit')
+optdepends=('netifrc: Network Interface Management Scripts'
+            'networkmanager-openrc: NetworkManager'
+            'connman-openrc: connman')
+conflicts=('systemd-sysvcompat' 'openrc-core')
+replaces=('openrc-core')
+install=${pkgname}.install
+backup=('etc/rc.conf'
+        'etc/conf.d/consolefont'
+        'etc/conf.d/keymaps'
+        'etc/conf.d/hostname'
+        'etc/conf.d/modules'
+        'etc/conf.d/hwclock'
+        'etc/inittab')
+source=("openrc-${pkgver}.tar.gz::${_rc_uri}/${pkgver}.tar.gz"
+	"openrc.logrotate"
+	'LICENSE')
+sha256sums=('e8e0bbefd8b40284a167af5c5071bd2eff6304988b3fd935bd6834c62cfa2339'
+            '0b44210db9770588bd491cd6c0ac9412d99124c6be4c9d3f7d31ec8746072f5c'
+            '28875cc6cb52e93657b96cf1bf0cc3b91891cdcbbc3196007c8cd93c6e22078f')
+
+_rc_args=(SYSCONFDIR=/etc)
+_rc_args+=(BRANDING="Parabola")
+_id="parabola"
+_rc_args+=(PREFIX=/usr)
+_rc_args+=(SBINDIR=/usr/bin)
+_rc_args+=(LIBEXECDIR=/usr/lib/rc)
+_rc_args+=(MKSELINUX=no)
+_rc_args+=(MKPAM=pam)
+_rc_args+=(MKTERMCAP=ncurses)
+_rc_args+=(MKNET=no)
+
+
+prepare(){
+	cd "${srcdir}/openrc-${pkgver}"
+	sed -e "s|/sbin|/usr/bin|g" -i support/sysvinit/inittab
+}
+
+build(){
+	# make openrc
+	cd "${srcdir}/openrc-${pkgver}"
+	make "${_rc_args[@]}"
+}
+
+package() {
+
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" "${_rc_args[@]}" install
+
+	install -m644 "${srcdir}/${pkgname}-${pkgver}/support/sysvinit/inittab" "${pkgdir}/etc/inittab"
+	install -Dm644 "${srcdir}/${pkgname}.logrotate" "${pkgdir}/etc/logrotate.d/${pkgname}"
+
+	sed -e 's/#unicode="NO"/unicode="YES"/' \
+	    -e 's/#rc_logger="YES"/rc_logger="YES"/' \
+	    -i "${pkgdir}/etc/rc.conf"
+
+	install -d ${pkgdir}/usr/lib/rc/cache
+
+	install -Dm644 ${srcdir}/LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/pcr/openrc-core/openrc.install b/pcr/openrc/openrc.install
index c45dcce43..c45dcce43 100644
--- a/pcr/openrc-core/openrc.install
+++ b/pcr/openrc/openrc.install
diff --git a/pcr/openrc-core/openrc.logrotate b/pcr/openrc/openrc.logrotate
index a168f2361..a168f2361 100644
--- a/pcr/openrc-core/openrc.logrotate
+++ b/pcr/openrc/openrc.logrotate