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, 110 deletions

diff --git a/extra/fribidi/.gitignore b/extra/fribidi/.gitignore
deleted file mode 100644
index 012dc66e..00000000
--- a/extra/fribidi/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/tools.ninja
diff --git a/extra/fribidi/config.h b/extra/fribidi/config.h
deleted file mode 100644
index 60024eab..00000000
--- a/extra/fribidi/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#include <config-posix.h>
-
-/* #undef DEBUG */
-/* #undef HAVE_ASM_PAGE_H */
-#define HAVE_MEMORY_H 1
-#define HAVE_STRINGIZE 1
-#define LT_OBJDIR ".libs/"
-#define PACKAGE_BUGREPORT "http://bugs.freedesktop.org/enter_bug.cgi?product=fribidi"
-#define PACKAGE_NAME "GNU FriBidi"
-#define PACKAGE_STRING "GNU FriBidi 0.19.7"
-#define PACKAGE_TARNAME "fribidi"
-#define PACKAGE_URL "http://fribidi.org/"
-#define PACKAGE_VERSION "0.19.7"
-#define SIZEOF_INT 4
-#define SIZEOF_SHORT 2
-#define SIZEOF_VOID_P 8
-#define SIZEOF_WCHAR_T 4
-#define USE_SIMPLE_MALLOC 1
-/* #undef const */
diff --git a/extra/fribidi/fribidi-config.h b/extra/fribidi/fribidi-config.h
deleted file mode 100644
index d7791240..00000000
--- a/extra/fribidi/fribidi-config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* lib/fribidi-config.h.  Generated from fribidi-config.h.in by configure. */
-/* Not copyrighted, in public domain. */
-#ifndef FRIBIDI_CONFIG_H
-#define FRIBIDI_CONFIG_H
-
-#define FRIBIDI "fribidi"
-#define FRIBIDI_NAME "GNU FriBidi"
-#define FRIBIDI_BUGREPORT "http://bugs.freedesktop.org/enter_bug.cgi?product=fribidi"
-
-#define FRIBIDI_VERSION "0.19.7"
-#define FRIBIDI_MAJOR_VERSION 0
-#define FRIBIDI_MINOR_VERSION 19
-#define FRIBIDI_MICRO_VERSION 7
-#define FRIBIDI_INTERFACE_VERSION 3
-#define FRIBIDI_INTERFACE_VERSION_STRING "3"
-
-/* Define to 1 if you want charset conversion codes in the library */
-#define FRIBIDI_CHARSETS 0
-
-/* Define to 1 if you want to use glib */
-#define FRIBIDI_USE_GLIB 0
-
-/* The size of a `int', as computed by sizeof. */
-#define FRIBIDI_SIZEOF_INT 4
-
-#endif /* FRIBIDI_CONFIG_H */
diff --git a/extra/fribidi/gen.rc b/extra/fribidi/gen.rc
deleted file mode 100644
index 18d55075..00000000
--- a/extra/fribidi/gen.rc
+++ /dev/null
@@ -1,63 +0,0 @@
-cflags\
-	-D HAVE_CONFIG_H\
-	-I include\
-	-I '$dir' \
-	-I '$outdir' \
-	-I '$outdir'/include\
-	-I '$srcdir'/lib
-
-{
-	cc gen.tab/packtab.c
-	exe gen-unicode-version gen.tab/gen-unicode-version.c
-	for(t in bidi-type joining-type arabic-shaping mirroring)
-		exe gen-$t-tab -d '$dir'/headers gen.tab/^(gen-$t-tab.c packtab.c.o)
-} >tools.ninja ; subninja tools.ninja
-
-set compression 2
-
-rule gentool '$outdir/$tool $args $in >$out.tmp && mv $out.tmp $out'
-fn gentool {
-	tool=$1
-	out=$2
-	shift 2
-	build '$outdir'/$out gentool '$srcdir'/gen.tab/unidata/$* '|' '$outdir'/gen-$tool
-	with tool gen-$tool
-}
-
-gentool unicode-version include/fribidi-unicode-version.h BidiMirroring.txt
-gentool bidi-type-tab bidi-type.tab.i UnicodeData.txt ; with args '$compression'
-gentool joining-type-tab joining-type.tab.i UnicodeData.txt ArabicShaping.txt ; with args '$compression'
-gentool arabic-shaping-tab arabic-shaping.tab.i UnicodeData.txt ; with args '$compression'
-gentool mirroring-tab mirroring.tab.i BidiMirroring.txt ; with args '$compression'
-
-hdrs=(\
-	fribidi.h fribidi-arabic.h fribidi-begindecls.h\
-	fribidi-bidi.h fribidi-bidi-types.h fribidi-bidi-types-list.h\
-	fribidi-common.h fribidi-deprecated.h fribidi-enddecls.h fribidi-flags.h\
-	fribidi-joining.h fribidi-joining-types.h fribidi-joining-types-list.h\
-	fribidi-mirroring.h fribidi-shape.h fribidi-types.h fribidi-unicode.h\
-)
-for(hdr in $hdrs)
-	build '$outdir'/include/$hdr copy '$srcdir'/lib/$hdr
-build '$outdir'/include/fribidi-config.h copy '$dir'/fribidi-config.h
-phony headers '$outdir'/include/^($hdrs fribidi-config.h fribidi-unicode-version.h)
-
-phony deps\
-	'$outdir'/^(bidi-type joining-type arabic-shaping mirroring)^.tab.i\
-	'$dir'/headers
-
-lib libfribidi.a -d '$dir'/deps lib/^(\
-	fribidi.c\
-	fribidi-arabic.c\
-	fribidi-bidi.c\
-	fribidi-bidi-types.c\
-	fribidi-deprecated.c\
-	fribidi-joining.c\
-	fribidi-joining-types.c\
-	fribidi-mem.c\
-	fribidi-mirroring.c\
-	fribidi-run.c\
-	fribidi-shape.c\
-)
-
-fetch git
diff --git a/extra/fribidi/rev b/extra/fribidi/rev
deleted file mode 100644
index d00491fd..00000000
--- a/extra/fribidi/rev
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/extra/fribidi/src b/extra/fribidi/src
deleted file mode 160000
-Subproject 1a6935cd8cd7d907fb3c5f3bcae174bee727c83