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

7 files changed, 0 insertions, 185 deletions

diff --git a/media/alsa-utils/aconfig.h b/media/alsa-utils/aconfig.h
deleted file mode 100644
index 2d82c61e..00000000
--- a/media/alsa-utils/aconfig.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#include <config-posix.h>
-
-#define DATADIR "/share/alsa"
-/* #undef ENABLE_NLS */
-/* #undef ENABLE_NLS_IN_CURSES */
-#define HAVE_ALSA_MIXER_H 1
-#define HAVE_ALSA_PCM_H 1
-#define HAVE_ALSA_RAWMIDI_H 1
-#define HAVE_ALSA_SEQ_H 1
-/* #undef HAVE_ALSA_TOPOLOGY_H */
-#define HAVE_ALSA_USE_CASE_H 1
-/* #undef HAVE_CFLOCALECOPYCURRENT */
-/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */
-/* #undef HAVE_CURSES_ESCDELAY */
-/* #undef HAVE_DCGETTEXT */
-/* #undef HAVE_FORM_H */
-/* #undef HAVE_GETTEXT */
-#define HAVE_LIBASOUND 1
-/* #undef HAVE_LIBFFTW3F */
-#define HAVE_LIBM 1
-#define HAVE_LIBPTHREAD 1
-#define HAVE_LIBRT 1
-/* #undef HAVE_LIBTINYALSA */
-/* #undef HAVE_MEMORY_H */
-/* #undef HAVE_MENU_H */
-/* #undef HAVE_PANEL_H */
-/* #undef HAVE_SAMPLERATE_H */
-/* #undef HAVE_SEQ_CLIENT_INFO_GET_CARD */
-/* #undef HAVE_SEQ_CLIENT_INFO_GET_PID */
-#define PACKAGE "alsa-utils"
-#define PACKAGE_BUGREPORT ""
-#define PACKAGE_NAME "alsa-utils"
-#define PACKAGE_STRING "alsa-utils 1.1.2"
-#define PACKAGE_TARNAME "alsa-utils"
-#define PACKAGE_URL ""
-#define PACKAGE_VERSION "1.1.2"
-#define SOUNDSDIR "/share/sounds/alsa"
-#define TIME_WITH_SYS_TIME 1
-#define VERSION "1.1.2"
-#ifndef _DARWIN_USE_64_BIT_INODE
-# define _DARWIN_USE_64_BIT_INODE 1
-#endif
-/* #undef _FILE_OFFSET_BITS */
-/* #undef _LARGE_FILES */
-/* #undef const */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
diff --git a/media/alsa-utils/gen.rc b/media/alsa-utils/gen.rc
deleted file mode 100644
index 83603735..00000000
--- a/media/alsa-utils/gen.rc
+++ /dev/null
@@ -1,21 +0,0 @@
-cflags\
-	-isystem '$builddir'/media/alsa-lib/include\
-	-I include\
-	-I '$dir' \
-	-I '$srcdir'/include
-
-fn x {
-	name=$1
-	shift
-	exe bin/$name -d media/alsa-lib/headers $*\
-		'$builddir'/media/alsa-lib/libasound.a
-	file bin/$name '$outdir'/bin/$name 755
-	file share/man/man1/$name.1 '$srcdir'/$name/$name.1 644
-}
-
-x amixer amixer/amixer.c alsamixer/volume_mapping.c
-x aplay aplay/aplay.c
-sym bin/arecord aplay
-sym share/man/man1/arecord.1 aplay.1
-
-fetch git
diff --git a/media/alsa-utils/patch/0001-Include-poll.h-instead-of-sys-poll.h.patch b/media/alsa-utils/patch/0001-Include-poll.h-instead-of-sys-poll.h.patch
deleted file mode 100644
index 6423a770..00000000
--- a/media/alsa-utils/patch/0001-Include-poll.h-instead-of-sys-poll.h.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 16fb793861d8833c81b4a7bb0eb8372099699772 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sat, 2 Jul 2016 23:48:43 -0700
-Subject: [PATCH] Include poll.h instead of sys/poll.h
-
----
- amidi/amidi.c               | 2 +-
- amixer/amixer.c             | 2 +-
- aplay/aplay.c               | 2 +-
- seq/aplaymidi/arecordmidi.c | 2 +-
- seq/aseqdump/aseqdump.c     | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/amidi/amidi.c b/amidi/amidi.c
-index cedf18c..46f5767 100644
---- a/amidi/amidi.c
-+++ b/amidi/amidi.c
-@@ -29,7 +29,7 @@
- #include <errno.h>
- #include <signal.h>
- #include <sys/types.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <sys/stat.h>
- #include <unistd.h>
- #include <fcntl.h>
-diff --git a/amixer/amixer.c b/amixer/amixer.c
-index f9b09cb..8241148 100644
---- a/amixer/amixer.c
-+++ b/amixer/amixer.c
-@@ -28,7 +28,7 @@
- #include <errno.h>
- #include <assert.h>
- #include <alsa/asoundlib.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <stdint.h>
- #include "amixer.h"
- #include "../alsamixer/volume_mapping.h"
-diff --git a/aplay/aplay.c b/aplay/aplay.c
-index 2da7dda..172287b 100644
---- a/aplay/aplay.c
-+++ b/aplay/aplay.c
-@@ -43,7 +43,7 @@
- #include <assert.h>
- #include <termios.h>
- #include <signal.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <sys/uio.h>
- #include <sys/time.h>
- #include <sys/stat.h>
-diff --git a/seq/aplaymidi/arecordmidi.c b/seq/aplaymidi/arecordmidi.c
-index 9628086..1c25fa2 100644
---- a/seq/aplaymidi/arecordmidi.c
-+++ b/seq/aplaymidi/arecordmidi.c
-@@ -27,7 +27,7 @@
- #include <string.h>
- #include <signal.h>
- #include <getopt.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <alsa/asoundlib.h>
- #include "aconfig.h"
- #include "version.h"
-diff --git a/seq/aseqdump/aseqdump.c b/seq/aseqdump/aseqdump.c
-index 24c5d21..05892e0 100644
---- a/seq/aseqdump/aseqdump.c
-+++ b/seq/aseqdump/aseqdump.c
-@@ -25,7 +25,7 @@
- #include <string.h>
- #include <signal.h>
- #include <getopt.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <alsa/asoundlib.h>
- #include "aconfig.h"
- #include "version.h"
--- 
-2.9.2
-
diff --git a/media/alsa-utils/patch/0002-amixer.h-Just-include-version.h.patch b/media/alsa-utils/patch/0002-amixer.h-Just-include-version.h.patch
deleted file mode 100644
index 83cf3821..00000000
--- a/media/alsa-utils/patch/0002-amixer.h-Just-include-version.h.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From be89553bd363678ab75c44b8e0630920aba52987 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sun, 3 Jul 2016 00:01:24 -0700
-Subject: [PATCH] amixer.h: Just include "version.h"
-
----
- amixer/amixer.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/amixer/amixer.h b/amixer/amixer.h
-index 3588f04..0daa5b7 100644
---- a/amixer/amixer.h
-+++ b/amixer/amixer.h
-@@ -18,4 +18,4 @@
-  *
-  */
- 
--#include "../include/version.h"
-+#include "version.h"
--- 
-2.9.2
-
diff --git a/media/alsa-utils/rev b/media/alsa-utils/rev
deleted file mode 100644
index 0cfbf088..00000000
--- a/media/alsa-utils/rev
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/media/alsa-utils/src b/media/alsa-utils/src
deleted file mode 160000
-Subproject 675619eb295f8eb35903ef227e6939a86d8c1e7
diff --git a/media/alsa-utils/version.h b/media/alsa-utils/version.h
deleted file mode 100644
index 991790bc..00000000
--- a/media/alsa-utils/version.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- *  version.h
- */
-
-#define SND_UTIL_MAJOR		1
-#define SND_UTIL_MINOR		1
-#define SND_UTIL_SUBMINOR	2
-#define SND_UTIL_VERSION	((SND_UTIL_MAJOR<<16)|\
-				 (SND_UTIL_MINOR<<8)|\
-				  SND_UTIL_SUBMINOR)
-#define SND_UTIL_VERSION_STR	"1.1.2"
-