Merge branch 'kh' into 'master'

bzip2: removed make.patch

See merge request sulix/packages/main!2

system/extra/bzip2/ympbuild

@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+name=bzip2
+version=1.0.8
+release=1
+url='https://sourceware.org/bzip2'
+description='lzma compression utilities and library'
+email='kurth4cker@tutanota.com'
+maintainer='kurth4cker'
+source=('https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz')
+md5sums=('67e051268d0c475ea773822f7500d0e5')
+group=(system.extra)
+
+cd $name-$version
+
+setup(){
+    mkdir -p $name-shared
+    cp *.c *.h $name-shared
+    cp Makefile-libbz2_so $name-shared/Makefile
+}
+build(){
+    export CFLAGS="-Winline -D_FILE_OFFSET_BITS=64 ${CFLAGS}"
+    make -e -j$(nproc) bzip2recover libbz2.a
+    make -j$(nproc) -C $name-shared CFLAGS="-fpic -fPIC ${CFLAGS}"
+}
+package(){
+    install -dm755 ${DESTDIR}/usr/{bin,lib64,include,share/man/man1}
+
+    install -m755 $name-shared/bzip2-shared "${DESTDIR}"/usr/bin/bzip2
+    install -m755 bzip2recover bzdiff bzgrep bzmore "${DESTDIR}"/usr/bin
+    ln -sf bzip2 "${DESTDIR}"/usr/bin/bunzip2
+    ln -sf bzip2 "${DESTDIR}"/usr/bin/bzcat
+
+    install -m755 libbz2.a "${DESTDIR}"/usr/lib64/
+    install -m755 $name-shared/libbz2.so* "${DESTDIR}"/usr/lib64
+    ln -s libbz2.so.$version "${DESTDIR}"/usr/lib64/libbz2.so
+    ln -s libbz2.so.$version "${DESTDIR}"/usr/lib64/libbz2.so.1
+
+    install -m644 bzlib.h "${DESTDIR}"/usr/include/
+
+    install -m644 bzip2.1 "${DESTDIR}"/usr/share/man/man1/
+    ln -sf bzip2.1 "${DESTDIR}"/usr/share/man/man1/bunzip2.1
+    ln -sf bzip2.1 "${DESTDIR}"/usr/share/man/man1/bzcat.1
+    ln -sf bzip2.1 "${DESTDIR}"/usr/share/man/man1/bzip2recover.1
+}

system/extra/file/ympbuild

@@ -11,6 +11,9 @@ md5sums=(8effd70da368210a6c6eece037f978eb)
 group=(system.extra)
 uses=(bzip2 lzma zlib seccomp)
 zlib_depends=(zlib)
+lzma_depends=(xz-utils)
+bzip2_depends=(bzip2)
+seccomp_depends=(libseccomp)
 
 cd $name-$version
 
@@ -22,27 +25,11 @@ setup(){
 	--enable-elf
 	--enable-elf-core
     )
-    use_bzip2=--disable-bzlib
-    use_lzma=--disable-xzlib
-    use_zlib=--disable-zlib
-    use_seccomp=--disable-libseccomp
-    if use bzip2; then
-        use_bzip2=--enable-bzlib
-    fi
-    if use lzma; then
-        use_lzma=--enable-xzlib
-    fi
-    if use zlib; then
-        use_zlib=--enable-zlib
-    fi
-    if use seccomp; then
-        use_seccomp=--enable-libseccomp
-    fi
     ./configure ${opts[@]} \
-    	$use_bzip2 \
-	$use_lzma \
-	$use_zlib \
-	$use_seccomp
+	$(use_opt zlib --enable-zlib --disable-zlib) \
+	$(use_opt lzma --enable-xzlib --disable-xzlib) \
+	$(use_opt bzip2 --enable-bzlib --disable-bzlib) \
+	$(use_opt seccomp --enable-libseccomp --disable-libseccomp)
 }
 
 build(){