# HG changeset patch
# User David Demelier <markand@malikania.fr>
# Date 1562610300 -7200
# Node ID 0194a200012b483644bb37850e5fa55e374e8a28
# Parent  336550fef4944ed69283c7292f207d5d6584cdc4
compression/xz: rename from lib/xz

diff -r 336550fef494 -r 0194a200012b compression/libarchive/libarchive.sh
--- a/compression/libarchive/libarchive.sh	Mon Jul 08 20:25:00 2019 +0200
+++ b/compression/libarchive/libarchive.sh	Mon Jul 08 20:25:00 2019 +0200
@@ -70,7 +70,7 @@
 fi
 
 if [ "$LZMA" = "yes" ]; then
-	PKGDEPENDS="core/xz $PKGDEPENDS"
+	PKGDEPENDS="compression/xz $PKGDEPENDS"
 	with_lzma="--with-lzma"
 else
 	with_lzma="--without-lzma"
diff -r 336550fef494 -r 0194a200012b compression/xz/xz.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/compression/xz/xz.sh	Mon Jul 08 20:25:00 2019 +0200
@@ -0,0 +1,64 @@
+#!/bin/sh
+#
+# Copyright (c) 2019 David Demelier <markand@malikania.fr>
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+
+PKGNAME=xz
+PKGVERSION=5.2.4
+PKGREVISION=1
+PKGLICENSE="LGPLv21 GPLv2 GPLv3"
+PKGSUMMARY="XZ and LZMA compression tools"
+PKGDOWNLOAD="https://tukaani.org/$PKGNAME/$PKGNAME-$PKGVERSION.tar.gz"
+PKGOPTIONS="NLS"
+
+: ${CHOST:=$(uname -m)-linux-musl}
+: ${CBUILD:=$(uname -m)-linux-musl}
+: ${CC:=clang}
+: ${CFLAGS:=-O2}
+: ${LDFLAGS:=}
+: ${LIBS:=}
+: ${NLS:=yes}
+
+if [ "${NLS:-yes}" = "yes" ]; then
+	PKGDEPENDS="core/gettext:build $PKGDEPENDS"
+	with_nls="--enable-nls"
+else
+	with_nls="--disable-nls"
+fi
+
+build()
+{
+	rm -rf $PKGNAME-$PKGVERSION
+	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
+	pushd $PKGNAME-$PKGVERSION
+
+	CC="$CC" \
+	CFLAGS="$CFLAGS" \
+	LDFLAGS="$LDFLAGS" \
+	LIBS="$LIBS" \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix= \
+		--disable-static \
+		--enable-shared \
+		$with_nls
+	make
+	make install DESTDIR=$DESTDIR
+	rm -f $DESTDIR/lib/liblzma.la
+
+	popd
+	rm -rf $PKGNAME-$PKGVERSION
+}
diff -r 336550fef494 -r 0194a200012b core/grub/grub.sh
--- a/core/grub/grub.sh	Mon Jul 08 20:25:00 2019 +0200
+++ b/core/grub/grub.sh	Mon Jul 08 20:25:00 2019 +0200
@@ -37,7 +37,7 @@
 : ${NLS:=yes}
 
 if [ "$LZMA" = "yes" ]; then
-	PKGDEPENDS="core/xz $PKGDEPENDS"
+	PKGDEPENDS="compression/xz $PKGDEPENDS"
 	with_lzma="--enable-liblzma"
 else
 	with_lzma="--disable-liblzma"
diff -r 336550fef494 -r 0194a200012b core/xz/xz.sh
--- a/core/xz/xz.sh	Mon Jul 08 20:25:00 2019 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2019 David Demelier <markand@malikania.fr>
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-
-PKGNAME=xz
-PKGVERSION=5.2.4
-PKGREVISION=1
-PKGLICENSE="LGPLv21 GPLv2 GPLv3"
-PKGSUMMARY="XZ and LZMA compression tools"
-PKGDOWNLOAD="https://tukaani.org/$PKGNAME/$PKGNAME-$PKGVERSION.tar.gz"
-PKGOPTIONS="NLS"
-
-: ${CHOST:=$(uname -m)-linux-musl}
-: ${CBUILD:=$(uname -m)-linux-musl}
-: ${CC:=clang}
-: ${CFLAGS:=-O2}
-: ${LDFLAGS:=}
-: ${LIBS:=}
-: ${NLS:=yes}
-
-if [ "${NLS:-yes}" = "yes" ]; then
-	PKGDEPENDS="core/gettext:build $PKGDEPENDS"
-	with_nls="--enable-nls"
-else
-	with_nls="--disable-nls"
-fi
-
-build()
-{
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
-
-	CC="$CC" \
-	CFLAGS="$CFLAGS" \
-	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		--disable-static \
-		--enable-shared \
-		$with_nls
-	make
-	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/lib/liblzma.la
-
-	popd
-	rm -rf $PKGNAME-$PKGVERSION
-}
diff -r 336550fef494 -r 0194a200012b dev/cmake/cmake.sh
--- a/dev/cmake/cmake.sh	Mon Jul 08 20:25:00 2019 +0200
+++ b/dev/cmake/cmake.sh	Mon Jul 08 20:25:00 2019 +0200
@@ -27,7 +27,7 @@
             lib/libuv
             core/rhash
             compression/bzip2
-            core/xz
+            compression/xz
             compression/libarchive"
 PKGOPTIONS="QT5"
 
diff -r 336550fef494 -r 0194a200012b graphics/libtiff/libtiff.sh
--- a/graphics/libtiff/libtiff.sh	Mon Jul 08 20:25:00 2019 +0200
+++ b/graphics/libtiff/libtiff.sh	Mon Jul 08 20:25:00 2019 +0200
@@ -44,7 +44,7 @@
 fi
 
 if [ "$LZMA" = "yes" ]; then
-	PKGDEPENDS="core/xz $PKGDEPENDS"
+	PKGDEPENDS="compression/xz $PKGDEPENDS"
 	with_lzma="--enable-lzma"
 else
 	with_lzma="--disable-lzma"
diff -r 336550fef494 -r 0194a200012b text/libxml2/libxml2.sh
--- a/text/libxml2/libxml2.sh	Mon Jul 08 20:25:00 2019 +0200
+++ b/text/libxml2/libxml2.sh	Mon Jul 08 20:25:00 2019 +0200
@@ -42,7 +42,7 @@
 fi
 
 if [ "$LZMA" = "yes" ]; then
-	PKGDEPENDS="core/xz $PKGDEPENDS"
+	PKGDEPENDS="compression/xz $PKGDEPENDS"
 	with_lzma="--with-lzma"
 else
 	with_lzma="--without-lzma"