From c1b96746a3cf55f62f3186728e191c443ea1d1e2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 24 Sep 2022 05:35:07 -0400
Subject: [PATCH] rpi-base: re-merge rpi*-base and -kernel packages

---
 srcpkgs/rpi-base/template | 48 +++++++++------------------------------
 1 file changed, 11 insertions(+), 37 deletions(-)

diff --git a/srcpkgs/rpi-base/template b/srcpkgs/rpi-base/template
index 8940033c83a..3b22d684f4b 100644
--- a/srcpkgs/rpi-base/template
+++ b/srcpkgs/rpi-base/template
@@ -1,10 +1,9 @@
 # Template file for 'rpi-base'
 pkgname=rpi-base
 version=3.0
-revision=2
+revision=3
 archs="armv6l* armv7l* aarch64*"
-_base_depends="virtual?ntp-daemon rpi-firmware"
-depends="${_base_depends} rpi-kernel"
+depends="virtual?ntp-daemon rpi-firmware rpi-kernel"
 short_desc="Void Linux Raspberry Pi base files"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
@@ -26,45 +25,20 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-# support legacy systems (before rpi-kernel was split to rpi{,2,3})
-# archs != armv6* are emtpy meta packages to pull the new rpi${n}-base package
-case "$XBPS_TARGET_MACHINE" in
-	armv6*) : ;;
-	*)
-		build_style=meta
-		short_desc+=" (transitional dummy package)"
-
-	 	do_install() { : ; }
-
-		case "$XBPS_TARGET_MACHINE" in
-			armv7*) depends="rpi2-base" ;;
-			aarch64*) depends="rpi3-base" ;;
-		esac
-		;;
-esac
-
 rpi2-base_package() {
-	depends="${_base_depends} rpi2-kernel"
-	short_desc="Void Linux Raspberry Pi 2 base files"
-	pkg_install() {
-		vinstall "${FILESDIR}/71-raspberrypi.rules" 644 usr/lib/udev/rules.d
-	}
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+	depends="rpi-base"
 }
 
-
 rpi3-base_package() {
-	depends="${_base_depends} rpi3-kernel"
-	short_desc="Void Linux Raspberry Pi 3 base files"
-	pkg_install() {
-		vinstall "${FILESDIR}/71-raspberrypi.rules" 644 usr/lib/udev/rules.d
-	}
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+	depends="rpi-base"
 }
 
 rpi4-base_package() {
-	depends="${_base_depends} rpi4-kernel"
-	short_desc="Void Linux Raspberry Pi 4 base files"
-	conflicts="rpi3-base"
-	pkg_install() {
-		vinstall "${FILESDIR}/71-raspberrypi.rules" 644 usr/lib/udev/rules.d
-	}
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+	depends="rpi-base"
 }