From d7ae731c1365e53a55d0835f8786c71805aaffa6 Mon Sep 17 00:00:00 2001
From: David Oberhollenzer <goliath@infraroot.at>
Date: Wed, 27 Feb 2019 20:39:06 +0100
Subject: [PATCH] Split up unbound and util-linux into smaller packages

Signed-off-by: David Oberhollenzer <goliath@infraroot.at>
---
 pkg/btrfs-progs/btrfs-progs-dev.desc          |  2 +-
 pkg/btrfs-progs/btrfs-progs.desc              |  2 +-
 pkg/btrfs-progs/btrfs-progs.files             |  2 ++
 pkg/btrfs-progs/build                         |  4 ++--
 pkg/unbound/build                             |  4 ++--
 pkg/unbound/libunbound-dev.desc               |  2 ++
 ...unbound-dev.files => libunbound-dev.files} |  0
 pkg/unbound/libunbound.desc                   |  2 ++
 pkg/unbound/libunbound.files                  |  7 ++++++
 pkg/unbound/unbound-dev.desc                  |  2 --
 pkg/unbound/unbound.desc                      |  2 +-
 pkg/unbound/unbound.files                     |  6 +----
 pkg/util-linux/build                          |  4 ++--
 pkg/util-linux/libblkid-dev.desc              |  2 ++
 pkg/util-linux/libblkid-dev.files             |  7 ++++++
 pkg/util-linux/libblkid.desc                  |  2 ++
 pkg/util-linux/libblkid.files                 |  2 ++
 pkg/util-linux/libfdisk-dev.desc              |  2 ++
 pkg/util-linux/libfdisk-dev.files             |  7 ++++++
 pkg/util-linux/libfdisk.desc                  |  2 ++
 pkg/util-linux/libfdisk.files                 |  2 ++
 pkg/util-linux/libmount-dev.desc              |  2 ++
 pkg/util-linux/libmount-dev.files             |  7 ++++++
 pkg/util-linux/libmount.desc                  |  2 ++
 pkg/util-linux/libmount.files                 |  2 ++
 pkg/util-linux/libsmartcols-dev.desc          |  2 ++
 pkg/util-linux/libsmartcols-dev.files         |  7 ++++++
 pkg/util-linux/libsmartcols.desc              |  2 ++
 pkg/util-linux/libsmartcols.files             |  2 ++
 pkg/util-linux/libuuid-dev.desc               |  2 ++
 pkg/util-linux/libuuid-dev.files              |  7 ++++++
 pkg/util-linux/libuuid.desc                   |  2 ++
 pkg/util-linux/libuuid.files                  |  2 ++
 pkg/util-linux/util-linux-dev.desc            |  2 --
 pkg/util-linux/util-linux-dev.files           | 23 -------------------
 pkg/util-linux/util-linux.desc                |  2 +-
 pkg/util-linux/util-linux.files               | 10 --------
 37 files changed, 89 insertions(+), 52 deletions(-)
 create mode 100644 pkg/unbound/libunbound-dev.desc
 rename pkg/unbound/{unbound-dev.files => libunbound-dev.files} (100%)
 create mode 100644 pkg/unbound/libunbound.desc
 create mode 100644 pkg/unbound/libunbound.files
 delete mode 100644 pkg/unbound/unbound-dev.desc
 create mode 100644 pkg/util-linux/libblkid-dev.desc
 create mode 100644 pkg/util-linux/libblkid-dev.files
 create mode 100644 pkg/util-linux/libblkid.desc
 create mode 100644 pkg/util-linux/libblkid.files
 create mode 100644 pkg/util-linux/libfdisk-dev.desc
 create mode 100644 pkg/util-linux/libfdisk-dev.files
 create mode 100644 pkg/util-linux/libfdisk.desc
 create mode 100644 pkg/util-linux/libfdisk.files
 create mode 100644 pkg/util-linux/libmount-dev.desc
 create mode 100644 pkg/util-linux/libmount-dev.files
 create mode 100644 pkg/util-linux/libmount.desc
 create mode 100644 pkg/util-linux/libmount.files
 create mode 100644 pkg/util-linux/libsmartcols-dev.desc
 create mode 100644 pkg/util-linux/libsmartcols-dev.files
 create mode 100644 pkg/util-linux/libsmartcols.desc
 create mode 100644 pkg/util-linux/libsmartcols.files
 create mode 100644 pkg/util-linux/libuuid-dev.desc
 create mode 100644 pkg/util-linux/libuuid-dev.files
 create mode 100644 pkg/util-linux/libuuid.desc
 create mode 100644 pkg/util-linux/libuuid.files
 delete mode 100644 pkg/util-linux/util-linux-dev.desc
 delete mode 100644 pkg/util-linux/util-linux-dev.files

diff --git a/pkg/btrfs-progs/btrfs-progs-dev.desc b/pkg/btrfs-progs/btrfs-progs-dev.desc
index 9cf3fde..b037eda 100644
--- a/pkg/btrfs-progs/btrfs-progs-dev.desc
+++ b/pkg/btrfs-progs/btrfs-progs-dev.desc
@@ -1,2 +1,2 @@
 name btrfs-progs-dev
-requires btrfs-progs util-linux-dev zlib-dev lzo-dev crt-dev
+requires btrfs-progs libuuid-dev libblkid-dev zlib-dev lzo-dev crt-dev
diff --git a/pkg/btrfs-progs/btrfs-progs.desc b/pkg/btrfs-progs/btrfs-progs.desc
index 2744783..aa76811 100644
--- a/pkg/btrfs-progs/btrfs-progs.desc
+++ b/pkg/btrfs-progs/btrfs-progs.desc
@@ -1,2 +1,2 @@
 name btrfs-progs
-requires util-linux zlib lzo crt
+requires libuuid libblkid zlib lzo crt
diff --git a/pkg/btrfs-progs/btrfs-progs.files b/pkg/btrfs-progs/btrfs-progs.files
index 20b24cd..db381e3 100644
--- a/pkg/btrfs-progs/btrfs-progs.files
+++ b/pkg/btrfs-progs/btrfs-progs.files
@@ -1,3 +1,5 @@
+dir bin 0755 0 0
+dir lib 0755 0 0
 file bin/btrfs 0755 0 0
 file bin/mkfs.btrfs 0755 0 0
 file bin/btrfs-map-logical 0755 0 0
diff --git a/pkg/btrfs-progs/build b/pkg/btrfs-progs/build
index 06847b7..1234f29 100755
--- a/pkg/btrfs-progs/build
+++ b/pkg/btrfs-progs/build
@@ -3,7 +3,7 @@ SRCDIR="btrfs-progs-v${VERSION}"
 TARBALL="${SRCDIR}.tar.xz"
 URL="https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs"
 SHA256SUM="04d82af5cf479d139299a8f13ec0921f9578ca444e81ec0202f01a20d2bcefb8"
-DEPENDS="util-linux-dev zlib-dev lzo-dev crt-dev"
+DEPENDS="libuuid-dev libblkid-dev zlib-dev lzo-dev crt-dev"
 SUBPKG="btrfs-progs-dev btrfs-progs"
 
 prepare() {
@@ -32,4 +32,4 @@ check_update() {
 	    grep -o ">btrfs-progs-v[0-9.]*tar.xz<" | \
 	    sed 's/>btrfs-progs-v//g' | sed 's/.tar.xz<//g' | \
 	    verson_find_greatest "$VERSION"
-}
\ No newline at end of file
+}
diff --git a/pkg/unbound/build b/pkg/unbound/build
index 5906008..c81d134 100644
--- a/pkg/unbound/build
+++ b/pkg/unbound/build
@@ -4,7 +4,7 @@ TARBALL="${SRCDIR}.tar.gz"
 URL="https://www.unbound.net/downloads"
 SHA256SUM="2b692b8311edfad41e7d0380aac34576060d4176add81dc5db419c79b2a4cecc"
 DEPENDS="openssl-dev expat-dev libbsd-dev crt-dev"
-SUBPKG="unbound unbound-dev"
+SUBPKG="unbound libunbound libunbound-dev"
 
 prepare() {
 	return
@@ -47,4 +47,4 @@ check_update() {
 	curl --silent -L "$URL" | grep -o ">unbound-[0-9.]*tar.gz<" | \
 	    sed 's/>unbound-//g' | sed 's/.tar.gz<//g' | \
 	    verson_find_greatest "$VERSION"
-}
\ No newline at end of file
+}
diff --git a/pkg/unbound/libunbound-dev.desc b/pkg/unbound/libunbound-dev.desc
new file mode 100644
index 0000000..2c50a9f
--- /dev/null
+++ b/pkg/unbound/libunbound-dev.desc
@@ -0,0 +1,2 @@
+name libunbound-dev
+requires libunbound openssl-dev expat-dev libbsd-dev crt-dev
diff --git a/pkg/unbound/unbound-dev.files b/pkg/unbound/libunbound-dev.files
similarity index 100%
rename from pkg/unbound/unbound-dev.files
rename to pkg/unbound/libunbound-dev.files
diff --git a/pkg/unbound/libunbound.desc b/pkg/unbound/libunbound.desc
new file mode 100644
index 0000000..7dfdd31
--- /dev/null
+++ b/pkg/unbound/libunbound.desc
@@ -0,0 +1,2 @@
+name libunbound
+requires openssl expat libbsd crt
diff --git a/pkg/unbound/libunbound.files b/pkg/unbound/libunbound.files
new file mode 100644
index 0000000..b1390be
--- /dev/null
+++ b/pkg/unbound/libunbound.files
@@ -0,0 +1,7 @@
+dir lib 0755 0 0
+file lib/libunbound.so.8.0.3 0755 0 0
+slink lib/libunbound.so.8 m 777 0 0 libunbound.so.8.0.3
+dir etc 0755 0 0
+dir etc/unbound 0755 52 52
+file etc/unbound/unbound.conf 0644 52 52
+file etc/unbound/root.key 0644 52 52
diff --git a/pkg/unbound/unbound-dev.desc b/pkg/unbound/unbound-dev.desc
deleted file mode 100644
index a851e8a..0000000
--- a/pkg/unbound/unbound-dev.desc
+++ /dev/null
@@ -1,2 +0,0 @@
-name unbound-dev
-requires unbound openssl-dev expat-dev libbsd-dev crt-dev
diff --git a/pkg/unbound/unbound.desc b/pkg/unbound/unbound.desc
index a0a7227..83a107b 100644
--- a/pkg/unbound/unbound.desc
+++ b/pkg/unbound/unbound.desc
@@ -1,2 +1,2 @@
 name unbound
-requires openssl expat libbsd crt
+requires libunbound openssl expat libbsd crt
diff --git a/pkg/unbound/unbound.files b/pkg/unbound/unbound.files
index 2ac9997..1d2295f 100644
--- a/pkg/unbound/unbound.files
+++ b/pkg/unbound/unbound.files
@@ -1,11 +1,7 @@
-file lib/libunbound.so.8.0.3 0755 0 0
-slink lib/libunbound.so.8 m 777 0 0 libunbound.so.8.0.3
+dir bin 0755 0 0
 file bin/unbound 0755 0 0
 file bin/unbound-checkconf 0755 0 0
 file bin/unbound-control 0755 0 0
 file bin/unbound-host 0755 0 0
 file bin/unbound-anchor 0755 0 0
 file bin/unbound-control-setup 0755 0 0
-dir etc/unbound 0755 52 52
-file etc/unbound/unbound.conf 0644 52 52
-file etc/unbound/root.key 0644 52 52
diff --git a/pkg/util-linux/build b/pkg/util-linux/build
index fea3cfb..cfa7371 100755
--- a/pkg/util-linux/build
+++ b/pkg/util-linux/build
@@ -4,7 +4,7 @@ TARBALL="${SRCDIR}.tar.xz"
 URL="https://www.kernel.org/pub/linux/utils/util-linux/v$VERSION/"
 SHA256SUM="f261b9d73c35bfeeea04d26941ac47ee1df937bd3b0583e748217c1ea423658a"
 DEPENDS="bash-dev ncurses-dev zlib-dev crt-dev"
-SUBPKG="util-linux util-linux-dev"
+SUBPKG="libblkid libblkid-dev libfdisk libfdisk-dev libmount libmount-dev libsmartcols libsmartcols-dev libuuid libuuid-dev util-linux"
 
 prepare() {
 	apply_patches
@@ -42,4 +42,4 @@ check_update() {
 	curl --silent -L "https://www.kernel.org/pub/linux/utils/util-linux" | \
 	    grep -o "v[0-9.]*/" | grep -o "[0-9.]*" | \
 	    verson_find_greatest "$VERSION"
-}
\ No newline at end of file
+}
diff --git a/pkg/util-linux/libblkid-dev.desc b/pkg/util-linux/libblkid-dev.desc
new file mode 100644
index 0000000..d5844d8
--- /dev/null
+++ b/pkg/util-linux/libblkid-dev.desc
@@ -0,0 +1,2 @@
+name libblkid-dev
+requires libblkid libuuid-dev crt-dev
diff --git a/pkg/util-linux/libblkid-dev.files b/pkg/util-linux/libblkid-dev.files
new file mode 100644
index 0000000..6517d9b
--- /dev/null
+++ b/pkg/util-linux/libblkid-dev.files
@@ -0,0 +1,7 @@
+dir include 0775 0 0
+dir include/blkid 0775 0 0
+dir lib 0775 0 0
+dir lib/pkgconfig 0775 0 0
+file include/blkid/blkid.h 0644 0 0
+file lib/pkgconfig/blkid.pc 0644 0 0
+slink lib/libblkid.so 0777 0 0 libblkid.so.1.1.0
diff --git a/pkg/util-linux/libblkid.desc b/pkg/util-linux/libblkid.desc
new file mode 100644
index 0000000..a199ed7
--- /dev/null
+++ b/pkg/util-linux/libblkid.desc
@@ -0,0 +1,2 @@
+name libblkid
+requires libuuid crt
diff --git a/pkg/util-linux/libblkid.files b/pkg/util-linux/libblkid.files
new file mode 100644
index 0000000..8300ec7
--- /dev/null
+++ b/pkg/util-linux/libblkid.files
@@ -0,0 +1,2 @@
+file lib/libblkid.so.1.1.0 0755 0 0
+slink lib/libblkid.so.1 0777 0 0 libblkid.so.1.1.0
diff --git a/pkg/util-linux/libfdisk-dev.desc b/pkg/util-linux/libfdisk-dev.desc
new file mode 100644
index 0000000..77a2d72
--- /dev/null
+++ b/pkg/util-linux/libfdisk-dev.desc
@@ -0,0 +1,2 @@
+name libfdisk-dev
+requires libfdisk crt-dev libuuid-dev libblkid-dev
diff --git a/pkg/util-linux/libfdisk-dev.files b/pkg/util-linux/libfdisk-dev.files
new file mode 100644
index 0000000..fdab067
--- /dev/null
+++ b/pkg/util-linux/libfdisk-dev.files
@@ -0,0 +1,7 @@
+dir include 0775 0 0
+dir include/libfdisk 0775 0 0
+dir lib 0775 0 0
+dir lib/pkgconfig 0775 0 0
+file include/libfdisk/libfdisk.h 0644 0 0
+file lib/pkgconfig/fdisk.pc 0644 0 0
+slink lib/libfdisk.so 0777 0 0 libfdisk.so.1.1.0
diff --git a/pkg/util-linux/libfdisk.desc b/pkg/util-linux/libfdisk.desc
new file mode 100644
index 0000000..338e3fe
--- /dev/null
+++ b/pkg/util-linux/libfdisk.desc
@@ -0,0 +1,2 @@
+name libfdisk
+requires crt libuuid libblkid
diff --git a/pkg/util-linux/libfdisk.files b/pkg/util-linux/libfdisk.files
new file mode 100644
index 0000000..671a5ed
--- /dev/null
+++ b/pkg/util-linux/libfdisk.files
@@ -0,0 +1,2 @@
+file lib/libfdisk.so.1.1.0 0755 0 0
+slink lib/libfdisk.so.1 0777 0 0 libfdisk.so.1.1.0
diff --git a/pkg/util-linux/libmount-dev.desc b/pkg/util-linux/libmount-dev.desc
new file mode 100644
index 0000000..c72af91
--- /dev/null
+++ b/pkg/util-linux/libmount-dev.desc
@@ -0,0 +1,2 @@
+name libmount-dev
+requires libmount libblkid-dev libuuid-dev crt-dev
diff --git a/pkg/util-linux/libmount-dev.files b/pkg/util-linux/libmount-dev.files
new file mode 100644
index 0000000..10b85fa
--- /dev/null
+++ b/pkg/util-linux/libmount-dev.files
@@ -0,0 +1,7 @@
+dir include 0775 0 0
+dir include/libmount 0775 0 0
+dir lib 0775 0 0
+dir lib/pkgconfig 0775 0 0
+file include/libmount/libmount.h 0644 0 0
+file lib/pkgconfig/mount.pc 0644 0 0
+slink lib/libmount.so 0777 0 0 libmount.so.1.1.0
diff --git a/pkg/util-linux/libmount.desc b/pkg/util-linux/libmount.desc
new file mode 100644
index 0000000..008f296
--- /dev/null
+++ b/pkg/util-linux/libmount.desc
@@ -0,0 +1,2 @@
+name libmount
+requires libblkid libuuid crt
diff --git a/pkg/util-linux/libmount.files b/pkg/util-linux/libmount.files
new file mode 100644
index 0000000..4ac6b01
--- /dev/null
+++ b/pkg/util-linux/libmount.files
@@ -0,0 +1,2 @@
+file lib/libmount.so.1.1.0 0755 0 0
+slink lib/libmount.so.1 0777 0 0 libmount.so.1.1.0
diff --git a/pkg/util-linux/libsmartcols-dev.desc b/pkg/util-linux/libsmartcols-dev.desc
new file mode 100644
index 0000000..163799e
--- /dev/null
+++ b/pkg/util-linux/libsmartcols-dev.desc
@@ -0,0 +1,2 @@
+name libsmartcols-dev
+requires libsmartcols crt-dev
diff --git a/pkg/util-linux/libsmartcols-dev.files b/pkg/util-linux/libsmartcols-dev.files
new file mode 100644
index 0000000..bc69e30
--- /dev/null
+++ b/pkg/util-linux/libsmartcols-dev.files
@@ -0,0 +1,7 @@
+dir include 0775 0 0
+dir include/libsmartcols 0775 0 0
+dir lib 0775 0 0
+dir lib/pkgconfig 0775 0 0
+file include/libsmartcols/libsmartcols.h 0644 0 0
+file lib/pkgconfig/smartcols.pc 0644 0 0
+slink lib/libsmartcols.so 0777 0 0 libsmartcols.so.1.1.0
diff --git a/pkg/util-linux/libsmartcols.desc b/pkg/util-linux/libsmartcols.desc
new file mode 100644
index 0000000..26164af
--- /dev/null
+++ b/pkg/util-linux/libsmartcols.desc
@@ -0,0 +1,2 @@
+name libsmartcols
+requires crt
diff --git a/pkg/util-linux/libsmartcols.files b/pkg/util-linux/libsmartcols.files
new file mode 100644
index 0000000..f6f4cb9
--- /dev/null
+++ b/pkg/util-linux/libsmartcols.files
@@ -0,0 +1,2 @@
+file lib/libsmartcols.so.1.1.0 0755 0 0
+slink lib/libsmartcols.so.1 0777 0 0 libsmartcols.so.1.1.0
diff --git a/pkg/util-linux/libuuid-dev.desc b/pkg/util-linux/libuuid-dev.desc
new file mode 100644
index 0000000..cef7e6a
--- /dev/null
+++ b/pkg/util-linux/libuuid-dev.desc
@@ -0,0 +1,2 @@
+name libuuid-dev
+requires libuuid crt-dev
diff --git a/pkg/util-linux/libuuid-dev.files b/pkg/util-linux/libuuid-dev.files
new file mode 100644
index 0000000..d62e94d
--- /dev/null
+++ b/pkg/util-linux/libuuid-dev.files
@@ -0,0 +1,7 @@
+dir include 0775 0 0
+dir include/uuid 0775 0 0
+dir lib 0775 0 0
+dir lib/pkgconfig 0775 0 0
+file include/uuid/uuid.h 0644 0 0
+file lib/pkgconfig/uuid.pc 0644 0 0
+slink lib/libuuid.so 0777 0 0 libuuid.so.1.3.0
diff --git a/pkg/util-linux/libuuid.desc b/pkg/util-linux/libuuid.desc
new file mode 100644
index 0000000..5155c6f
--- /dev/null
+++ b/pkg/util-linux/libuuid.desc
@@ -0,0 +1,2 @@
+name libuuid
+requires crt
diff --git a/pkg/util-linux/libuuid.files b/pkg/util-linux/libuuid.files
new file mode 100644
index 0000000..73dc027
--- /dev/null
+++ b/pkg/util-linux/libuuid.files
@@ -0,0 +1,2 @@
+file lib/libuuid.so.1.3.0 0755 0 0
+slink lib/libuuid.so.1 0777 0 0 libuuid.so.1.3.0
diff --git a/pkg/util-linux/util-linux-dev.desc b/pkg/util-linux/util-linux-dev.desc
deleted file mode 100644
index 33f0e25..0000000
--- a/pkg/util-linux/util-linux-dev.desc
+++ /dev/null
@@ -1,2 +0,0 @@
-name util-linux-dev
-requires util-linux bash-dev ncurses-dev zlib-dev crt-dev
diff --git a/pkg/util-linux/util-linux-dev.files b/pkg/util-linux/util-linux-dev.files
deleted file mode 100644
index 93c05f0..0000000
--- a/pkg/util-linux/util-linux-dev.files
+++ /dev/null
@@ -1,23 +0,0 @@
-dir include 0775 0 0
-dir include/libmount 0775 0 0
-dir include/blkid 0775 0 0
-dir include/libsmartcols 0775 0 0
-dir include/uuid 0775 0 0
-dir include/libfdisk 0775 0 0
-dir lib 0775 0 0
-dir lib/pkgconfig 0775 0 0
-file include/libmount/libmount.h 0644 0 0
-file include/blkid/blkid.h 0644 0 0
-file include/libsmartcols/libsmartcols.h 0644 0 0
-file include/uuid/uuid.h 0644 0 0
-file include/libfdisk/libfdisk.h 0644 0 0
-file lib/pkgconfig/blkid.pc 0644 0 0
-file lib/pkgconfig/fdisk.pc 0644 0 0
-file lib/pkgconfig/mount.pc 0644 0 0
-file lib/pkgconfig/smartcols.pc 0644 0 0
-file lib/pkgconfig/uuid.pc 0644 0 0
-slink lib/libfdisk.so 0777 0 0 libfdisk.so.1.1.0
-slink lib/libsmartcols.so 0777 0 0 libsmartcols.so.1.1.0
-slink lib/libmount.so 0777 0 0 libmount.so.1.1.0
-slink lib/libblkid.so 0777 0 0 libblkid.so.1.1.0
-slink lib/libuuid.so 0777 0 0 libuuid.so.1.3.0
diff --git a/pkg/util-linux/util-linux.desc b/pkg/util-linux/util-linux.desc
index 7726a21..7404901 100644
--- a/pkg/util-linux/util-linux.desc
+++ b/pkg/util-linux/util-linux.desc
@@ -1,2 +1,2 @@
 name util-linux
-requires bash ncurses zlib crt
+requires bash ncurses zlib crt libblkid libfdisk libmount libsmartcols libuuid
diff --git a/pkg/util-linux/util-linux.files b/pkg/util-linux/util-linux.files
index 193562a..3f1556d 100644
--- a/pkg/util-linux/util-linux.files
+++ b/pkg/util-linux/util-linux.files
@@ -51,16 +51,6 @@ file bin/partx 0755 0 0
 file bin/resizepart 0755 0 0
 file bin/rfkill 0755 0 0
 file bin/rtcwake 0755 0 0
-file lib/libuuid.so.1.3.0 0755 0 0
-slink lib/libuuid.so.1 0777 0 0 libuuid.so.1.3.0
-file lib/libblkid.so.1.1.0 0755 0 0
-slink lib/libblkid.so.1 0777 0 0 libblkid.so.1.1.0
-file lib/libmount.so.1.1.0 0755 0 0
-slink lib/libmount.so.1 0777 0 0 libmount.so.1.1.0
-file lib/libsmartcols.so.1.1.0 0755 0 0
-slink lib/libsmartcols.so.1 0777 0 0 libsmartcols.so.1.1.0
-file lib/libfdisk.so.1.1.0 0755 0 0
-slink lib/libfdisk.so.1 0777 0 0 libfdisk.so.1.1.0
 dir share/bash-completion 0755 0 0
 dir share/bash-completion/completions 0755 0 0
 file share/bash-completion/completions/blkid 0644 0 0