Move to flat package hierarchy

Note to self: never try to move submodules again

To migrate your existing submodules (more or less):

	set -x
	set -e

	mkdir .git/modules/pkg
	for old in */*/src ; do
	        new="pkg/${old#*/}"
	        if ! [ -f "$old/.git" ] || [ "${old%%/*}" = pkg ] ; then
			continue
		fi
		git -C ".git/modules/$old" config core.worktree "../../../../../$new"
		rmdir "$new"
		mv "$old" "$new"
	        sed -e "s,$old,$new," "$new/.git" > "$new/.git.tmp"
	        mv "$new/.git.tmp" "$new/.git"
		mkdir ".git/modules/${new%/src}"
	        mv ".git/modules/$old" ".git/modules/$new"

		rm "${old%/src}"/*.ninja
		mv "${old%/src}"/*.tar.{gz,xz,bz2} "${new%/src}/"
		rmdir "${old%/src}" || true
	done
	sed -e 's,^\[submodule "[^/]*/,[submodule "pkg/,' .git/config > .git/config.tmp
	mv .git/config.tmp .git/config

6 files changed, 0 insertions, 51 deletions

diff --git a/core/bzip2/.gitignore b/core/bzip2/.gitignore
deleted file mode 100644
index fc553f38..00000000
--- a/core/bzip2/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/bzip2-1.0.6.tar.gz
-/src
diff --git a/core/bzip2/gen.rc b/core/bzip2/gen.rc
deleted file mode 100644
index 5cd9c64c..00000000
--- a/core/bzip2/gen.rc
+++ /dev/null
@@ -1,12 +0,0 @@
-cflags\
-	-Wall -Winline\
-	-D '_FILE_OFFSET_BITS=64'
-
-lib libbz2.a blocksort.c huffman.c crctable.c randtable.c compress.c decompress.c bzlib.c
-exe bzip2 bzip2.c libbz2.a
-
-file bin/bzip2 '$outdir'/bzip2 755
-file share/man/man1/bzip2.1  '$srcdir'/bzip2.1 644
-sym bin/bzcat bzip2
-
-fetch curl
diff --git a/core/bzip2/patch/0001-Remove-unused-nread-variable.patch b/core/bzip2/patch/0001-Remove-unused-nread-variable.patch
deleted file mode 100644
index 7b322a21..00000000
--- a/core/bzip2/patch/0001-Remove-unused-nread-variable.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 00cc7127e58adeeba4485fab901215b6df6184f6 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sat, 10 Dec 2016 23:37:57 -0800
-Subject: [PATCH] Remove unused nread variable
-
----
- bzip2.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/bzip2.c b/bzip2.c
-index 6de9d1d..1dd5424 100644
---- a/bzip2.c
-+++ b/bzip2.c
-@@ -554,7 +554,7 @@ static
- Bool testStream ( FILE *zStream )
- {
-    BZFILE* bzf = NULL;
--   Int32   bzerr, bzerr_dummy, ret, nread, streamNo, i;
-+   Int32   bzerr, bzerr_dummy, ret, streamNo, i;
-    UChar   obuf[5000];
-    UChar   unused[BZ_MAX_UNUSED];
-    Int32   nUnused;
-@@ -577,7 +577,7 @@ Bool testStream ( FILE *zStream )
-       streamNo++;
- 
-       while (bzerr == BZ_OK) {
--         nread = BZ2_bzRead ( &bzerr, bzf, obuf, 5000 );
-+         BZ2_bzRead ( &bzerr, bzf, obuf, 5000 );
-          if (bzerr == BZ_DATA_ERROR_MAGIC) goto errhandler;
-       }
-       if (bzerr != BZ_STREAM_END) goto errhandler;
--- 
-2.11.0
-
diff --git a/core/bzip2/rev b/core/bzip2/rev
deleted file mode 100644
index 0cfbf088..00000000
--- a/core/bzip2/rev
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/core/bzip2/sha256 b/core/bzip2/sha256
deleted file mode 100644
index 45eb8e18..00000000
--- a/core/bzip2/sha256
+++ /dev/null
@@ -1 +0,0 @@
-a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd  bzip2-1.0.6.tar.gz
diff --git a/core/bzip2/url b/core/bzip2/url
deleted file mode 100644
index 9648ced9..00000000
--- a/core/bzip2/url
+++ /dev/null
@@ -1 +0,0 @@
-url = "http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz"