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

4 files changed, 282 insertions, 0 deletions

diff --git a/pkg/xz/config.h b/pkg/xz/config.h
new file mode 100644
index 00000000..fcd66734
--- /dev/null
+++ b/pkg/xz/config.h
@@ -0,0 +1,141 @@
+#include <config-posix.h>
+
+/* #undef AC_APPLE_UNIVERSAL_BUILD */
+#define ASSUME_RAM 128
+/* #undef ENABLE_NLS */
+#define HAVE_BSWAP_16 1
+#define HAVE_BSWAP_32 1
+#define HAVE_BSWAP_64 1
+#define HAVE_BYTESWAP_H 1
+/* #undef HAVE_CC_SHA256_CTX */
+/* #undef HAVE_CC_SHA256_INIT */
+/* #undef HAVE_CFLOCALECOPYCURRENT */
+/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */
+#define HAVE_CHECK_CRC32 1
+#define HAVE_CHECK_CRC64 1
+#define HAVE_CHECK_SHA256 1
+/* #undef HAVE_COMMONCRYPTO_COMMONDIGEST_H */
+/* #undef HAVE_DCGETTEXT */
+#define HAVE_DECL_CLOCK_MONOTONIC 1
+#define HAVE_DECL_PROGRAM_INVOCATION_NAME 1
+#define HAVE_DECODER_ARM 1
+#define HAVE_DECODER_ARMTHUMB 1
+#define HAVE_DECODER_DELTA 1
+#define HAVE_DECODER_IA64 1
+#define HAVE_DECODER_LZMA1 1
+#define HAVE_DECODER_LZMA2 1
+#define HAVE_DECODER_POWERPC 1
+#define HAVE_DECODER_SPARC 1
+#define HAVE_DECODER_X86 1
+#define HAVE_ENCODER_ARM 1
+#define HAVE_ENCODER_ARMTHUMB 1
+#define HAVE_ENCODER_DELTA 1
+#define HAVE_ENCODER_IA64 1
+#define HAVE_ENCODER_LZMA1 1
+#define HAVE_ENCODER_LZMA2 1
+#define HAVE_ENCODER_POWERPC 1
+#define HAVE_ENCODER_SPARC 1
+#define HAVE_ENCODER_X86 1
+/* #undef HAVE_FUTIMES */
+/* #undef HAVE_FUTIMESAT */
+#define HAVE_GETOPT_H 1
+#define HAVE_GETOPT_LONG 1
+/* #undef HAVE_GETTEXT */
+#define HAVE_IMMINTRIN_H 1
+#define HAVE_MEMORY_H 1
+#define HAVE_MF_BT2 1
+#define HAVE_MF_BT3 1
+#define HAVE_MF_BT4 1
+#define HAVE_MF_HC3 1
+#define HAVE_MF_HC4 1
+/* #undef HAVE_MINIX_SHA2_H */
+#define HAVE_OPTRESET 1
+#define HAVE_PTHREAD_PRIO_INHERIT 1
+/* #undef HAVE_SHA256INIT */
+/* #undef HAVE_SHA256_CTX */
+/* #undef HAVE_SHA256_H */
+/* #undef HAVE_SHA256_INIT */
+/* #undef HAVE_SHA2_CTX */
+/* #undef HAVE_SHA2_H */
+/* #undef HAVE_SMALL */
+/* #undef HAVE_STRUCT_STAT_ST_ATIMENSEC */
+/* #undef HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC */
+/* #undef HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC */
+#define HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC 1
+/* #undef HAVE_STRUCT_STAT_ST_UATIME */
+/* #undef HAVE_SYS_BYTEORDER_H */
+/* #undef HAVE_SYS_ENDIAN_H */
+#define HAVE_SYS_PARAM_H 1
+#define HAVE_VISIBILITY 1
+#define HAVE__BOOL 1
+#define HAVE__MM_MOVEMASK_EPI8 1
+#define LT_OBJDIR ".libs/"
+#define MYTHREAD_POSIX 1
+/* #undef MYTHREAD_VISTA */
+/* #undef MYTHREAD_WIN95 */
+#define NDEBUG 1
+#define PACKAGE "xz"
+#define PACKAGE_BUGREPORT "lasse.collin@tukaani.org"
+#define PACKAGE_NAME "XZ Utils"
+#define PACKAGE_STRING "XZ Utils 5.2.2"
+#define PACKAGE_TARNAME "xz"
+#define PACKAGE_URL "http://tukaani.org/xz/"
+#define PACKAGE_VERSION "5.2.2"
+/* #undef PTHREAD_CREATE_JOINABLE */
+#define SIZEOF_SIZE_T 8
+/* #undef TUKLIB_CPUCORES_CPUSET */
+/* #undef TUKLIB_CPUCORES_PSTAT_GETDYNAMIC */
+#define TUKLIB_CPUCORES_SYSCONF 1
+/* #undef TUKLIB_CPUCORES_SYSCTL */
+#define TUKLIB_FAST_UNALIGNED_ACCESS 1
+/* #undef TUKLIB_PHYSMEM_AIX */
+/* #undef TUKLIB_PHYSMEM_GETINVENT_R */
+/* #undef TUKLIB_PHYSMEM_GETSYSINFO */
+/* #undef TUKLIB_PHYSMEM_PSTAT_GETSTATIC */
+#define TUKLIB_PHYSMEM_SYSCONF 1
+/* #undef TUKLIB_PHYSMEM_SYSCTL */
+/* #undef TUKLIB_PHYSMEM_SYSINFO */
+#ifndef _ALL_SOURCE
+# define _ALL_SOURCE 1
+#endif
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# define _POSIX_PTHREAD_SEMANTICS 1
+#endif
+#ifndef _TANDEM_SOURCE
+# define _TANDEM_SOURCE 1
+#endif
+#ifndef __EXTENSIONS__
+# define __EXTENSIONS__ 1
+#endif
+#define VERSION "5.2.2"
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+/* #  undef WORDS_BIGENDIAN */
+# endif
+#endif
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+/* #undef _FILE_OFFSET_BITS */
+/* #undef _LARGE_FILES */
+/* #undef _MINIX */
+/* #undef _POSIX_1_SOURCE */
+/* #undef _POSIX_SOURCE */
+/* #undef _UINT32_T */
+/* #undef _UINT64_T */
+/* #undef _UINT8_T */
+/* #undef __GETOPT_PREFIX */
+/* #undef int32_t */
+/* #undef int64_t */
+/* #undef uint16_t */
+/* #undef uint32_t */
+/* #undef uint64_t */
+/* #undef uint8_t */
+/* #undef uintptr_t */
diff --git a/pkg/xz/gen.rc b/pkg/xz/gen.rc
new file mode 100644
index 00000000..1bf8f5c5
--- /dev/null
+++ b/pkg/xz/gen.rc
@@ -0,0 +1,140 @@
+cflags\
+	-D HAVE_CONFIG_H\
+	-I '$dir' \
+	-I '$srcdir'/src/common\
+	-I '$srcdir'/src/liblzma/api\
+	-I '$srcdir'/src/liblzma/check\
+	-I '$srcdir'/src/liblzma/common\
+	-I '$srcdir'/src/liblzma/delta\
+	-I '$srcdir'/src/liblzma/lz\
+	-I '$srcdir'/src/liblzma/lzma\
+	-I '$srcdir'/src/liblzma/rangecoder\
+	-I '$srcdir'/src/liblzma/simple\
+	-I include
+
+lib liblzma.a src/^(\
+	common/^(\
+		tuklib_physmem.c\
+		tuklib_cpucores.c\
+	)\
+	liblzma/^(\
+		check/^(\
+			crc32_tablegen.c\
+			crc64_tablegen.c\
+			check.c\
+			crc32_table.c\
+			crc32_fast.c\
+			crc64_table.c\
+			crc64_fast.c\
+			sha256.c\
+		)\
+		common/^(\
+			common.c\
+			block_util.c\
+			easy_preset.c\
+			filter_common.c\
+			hardware_physmem.c\
+			index.c\
+			stream_flags_common.c\
+			vli_size.c\
+			\
+			alone_encoder.c\
+			block_buffer_encoder.c\
+			block_encoder.c\
+			block_header_encoder.c\
+			easy_buffer_encoder.c\
+			easy_encoder.c\
+			easy_encoder_memusage.c\
+			filter_buffer_encoder.c\
+			filter_encoder.c\
+			filter_flags_encoder.c\
+			index_encoder.c\
+			stream_buffer_encoder.c\
+			stream_encoder.c\
+			stream_flags_encoder.c\
+			vli_encoder.c\
+			\
+			hardware_cputhreads.c\
+			outqueue.c\
+			stream_encoder_mt.c\
+			\
+			alone_decoder.c\
+			auto_decoder.c\
+			block_buffer_decoder.c\
+			block_decoder.c\
+			block_header_decoder.c\
+			easy_decoder_memusage.c\
+			filter_buffer_decoder.c\
+			filter_decoder.c\
+			filter_flags_decoder.c\
+			index_decoder.c\
+			index_hash.c\
+			stream_buffer_decoder.c\
+			stream_decoder.c\
+			stream_flags_decoder.c\
+			vli_decoder.c\
+		)\
+		delta/^(\
+			delta_common.c\
+			delta_encoder.c\
+			delta_decoder.c\
+		)\
+		lz/^(\
+			lz_encoder.c\
+			lz_encoder_mf.c\
+			lz_decoder.c\
+		)\
+		lzma/^(\
+			lzma_encoder.c\
+			lzma_encoder_presets.c\
+			lzma_encoder_optimum_fast.c\
+			lzma_encoder_optimum_normal.c\
+			fastpos_table.c\
+			lzma_decoder.c\
+			lzma2_encoder.c\
+			lzma2_decoder.c\
+		)\
+		rangecoder/price_table.c\
+		simple/^(\
+			simple_coder.c\
+			simple_encoder.c\
+			simple_decoder.c\
+			x86.c\
+			powerpc.c\
+			ia64.c\
+			arm.c\
+			armthumb.c\
+			sparc.c\
+		)\
+	)\
+)
+
+exe xz src/^(\
+	xz/^(\
+		args.c\
+		coder.c\
+		file_io.c\
+		hardware.c\
+		list.c\
+		main.c\
+		message.c\
+		mytime.c\
+		options.c\
+		signals.c\
+		suffix.c\
+		util.c\
+	)\
+	common/^(\
+		tuklib_open_stdxxx.c\
+		tuklib_progname.c\
+		tuklib_exit.c\
+		tuklib_mbstr_width.c\
+		tuklib_mbstr_fw.c\
+	)\
+) liblzma.a
+
+file bin/xz '$outdir'/xz 755
+file share/man/man1/xz.1 '$srcdir'/src/xz/xz.1 644
+for(alias in unxz xzcat) sym bin/$alias xz
+
+fetch git
diff --git a/pkg/xz/rev b/pkg/xz/rev
new file mode 100644
index 00000000..d00491fd
--- /dev/null
+++ b/pkg/xz/rev
@@ -0,0 +1 @@
+1
diff --git a/pkg/xz/src b/pkg/xz/src
new file mode 160000
+Subproject 9815cdf6987ef91a85493bfcfd1ce2aaf3b47a0