pcr/netifrc: Update 0.6.{0→1}, fix up

 - Update to 0.6.1
 - groups=('base-openrc'), not 'openrc-base'
 - Add pcr/gentoo-functions as a separate package, rather than vendoring it
 - Depend on generic 'udev' stuff, rather than 'eudev'
 - install= is NOT WHERE DOCUMENTATION BELONGS
 - Use git tag signature verification

pcr/gentoo-functions:

 - Is GPLv2, not 2-clause BSD
 - Don't inexplicably install to /usr/lib/parabola instead of /usr/lib/gentoo

2 files changed, 28 insertions, 54 deletions

diff --git a/pcr/netifrc/PKGBUILD b/pcr/netifrc/PKGBUILD
index 032bd7cd2..dedb469eb 100644
--- a/pcr/netifrc/PKGBUILD
+++ b/pcr/netifrc/PKGBUILD
@@ -1,64 +1,47 @@
 # Maintainer (Manjaro): artoo <artoo@manjaro.org>
 # Contributor (Manjaro): williamh <williamh@gentoo.org>
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
+# Contributor: Luke Shumaker <lukeshu@parabola.nu>
 
-_url="https://github.com"
-
-_net_url="${_url}/gentoo/netifrc/archive"
-_func_url="${_url}/gentoo/gentoo-functions/archive"
-
-_func_ver=0.12
-
+# Gentoo's ebuild file:
+# https://gitweb.gentoo.org/repo/gentoo.git/tree/net-misc/netifrc/netifrc-0.6.1.ebuild
 pkgname=netifrc
-pkgver=0.6.0
-pkgrel=1.parabola1
+pkgver=0.6.1
+pkgrel=1
 pkgdesc="Gentoo Network Interface Management Scripts"
-arch=('i686' 'x86_64' 'armv7h')
-url="http://www.gentoo.org/proj/en/base/openrc/"
+arch=('any')
+url="https://wiki.gentoo.org/wiki/Netifrc"
 license=('BSD2')
-groups=('openrc-base')
-depends=('eudev-openrc')
-install=${pkgname}.install
+groups=('base-openrc')
+depends=('gentoo-functions' 'openrc>=0.15' 'udev-init-scripts')
+conflicts=('udev<172' 'udev-init-scripts<27')
+makedepends=('git')
 backup=('etc/conf.d/net')
-source=("${pkgname}-${pkgver}.tar.gz::${_net_url}/${pkgver}.tar.gz"
-        "gentoo-functions-${_func_ver}.tar.gz::${_func_url}/${_func_ver}.tar.gz")
-sha256sums=('b360f4e3b5081ab24db40403a4517c2b7b929fe10dffbd9900bc08d7f3ca650e'
-            '4a6ddb1d8be7b52aae68761fb26546663b6b0e74b155df263cddfbfa72373965')
-
-_id=parabola
+validpgpkeys=('A28BEDE08F1744E16037514806C4536755758000') # Jason A. Donenfeld <zx2c4@gentoo.org>
+source=("git://anongit.gentoo.org/proj/${pkgname}.git?signed#tag=${pkgver}")
+sha256sums=('SKIP')
 
-_net_args=(SYSCONFDIR=/etc)
-_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)
+_makeargs=(
+  SYSCONFDIR=/etc
+  PREFIX=/usr
+  SBINDIR=/usr/bin
+  LIBEXECDIR="/usr/lib/${pkgname}"
+)
 
 build(){
-    # make netifrc
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    make "${_net_args[@]}"
-    cd ${srcdir}/gentoo-functions-${_func_ver}
-    make "${_func_args[@]}"
+    cd "$srcdir/$pkgname"
+    make "${_makeargs[@]}"
 }
 
 package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
+    cd "$srcdir/$pkgname"
 
-    make DESTDIR="${pkgdir}" "${_net_args[@]}" install
+    make DESTDIR="$pkgdir" "${_makeargs[@]}" install
     
-    install -Dm 644 "${srcdir}/${pkgname}-${pkgver}/doc/net.example" "${pkgdir}/etc/conf.d/net"
-
-    install -d "${pkgdir}/etc/runlevels/boot"
-    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
+    install -Dm0644 doc/net.example "$pkgdir/etc/conf.d/net"
 
-    sed -e "s|/lib/gentoo/functions.sh|/usr/lib/$_id/functions.sh|g" \
-        -i "${pkgdir}/usr/lib/${pkgname}/sh/functions.sh"
+    install -d "$pkgdir/etc/runlevels/boot"
+    ln -sT "/etc/init.d/net.lo" "$pkgdir/etc/runlevels/boot/net.lo"
 
-    install -Dm644 ${srcdir}/${pkgname}-${pkgver}/LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
+    install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/pcr/netifrc/netifrc.install b/pcr/netifrc/netifrc.install
deleted file mode 100644
index fa8554bc3..000000000
--- a/pcr/netifrc/netifrc.install
+++ /dev/null
@@ -1,9 +0,0 @@
-post_install() {
-	echo "	==> Set up your network interface before you reboot if using netifrc."
-	local _url="https://wiki.gentoo.org/wiki/Handbook:X86/Full/Networking"
-	echo "	==> Visit ${_url}"
-}
-
-post_upgrade() {
-	post_install "$1"
-}