Merge pull request #9131 from 4fury-c3440d8/np

up

hardware/disk/exfatprogs/pspec.xml

@@ -13,8 +13,8 @@
 		<PartOf>hardware.disk</PartOf>
 		<Summary>exFAT filesystem userspace utilities.</Summary>
 		<Description>As new exfat filesystem is merged into linux-5.7 kernel, exfatprogs is created as an official userspace utilities that contain all of the standard utilities for creating and fixing and debugging exfat filesystem in linux system.</Description>
-		<Archive sha1sum="901fe8cb296b73806b8596946a4b2ce97271494b" type="tarxz">
+		<Archive sha1sum="e232e6498bade2274e00fe24f5306364a71ca75e" type="tarxz">
-			https://github.com/exfatprogs/exfatprogs/releases/download/1.0.4/exfatprogs-1.0.4.tar.xz
+			https://github.com/exfatprogs/exfatprogs/releases/download/1.1.0/exfatprogs-1.1.0.tar.xz
 		</Archive>
 		<BuildDependencies>
 			<!-- <Dependency></Dependency> -->
@@ -37,6 +37,13 @@
 	</Package>
 
 	<History>
+		<Update release="2">
+			<Date>2021-03-07</Date>
+			<Version>1.1.0</Version>
+			<Comment>Version bump.</Comment>
+			<Name>fury</Name>
+			<Email>uglyside@yandex.ru</Email>
+		</Update>
 		<Update release="1">
 			<Date>2021-01-26</Date>
 			<Version>1.0.4</Version>

multimedia/stream/mpd/pspec.xml

@@ -15,8 +15,8 @@
 		<Description>
 			Music Player Daemon (MPD) is a flexible, powerful, server-side application for playing music. Through plugins and libraries it can play a variety of sound files while being controlled by its network protocol.
 		</Description>
-		<Archive sha1sum="29a69f59c6f2f2e4fc9646355ce181d5534a512c" type="tarxz">
+		<Archive sha1sum="b900af448040d76827ed84dd4ae78e24443513a5" type="tarxz">
-			https://www.musicpd.org/download/mpd/0.22/mpd-0.22.4.tar.xz
+			https://www.musicpd.org/download/mpd/0.22/mpd-0.22.6.tar.xz
 		</Archive>
 		<BuildDependencies>
 			<Dependency>meson</Dependency>
@@ -155,6 +155,13 @@
 	</Package>
 
 	<History>
+		<Update release="3">
+			<Date>2021-03-12</Date>
+			<Version>0.22.6</Version>
+			<Comment>Version bump.</Comment>
+			<Name>fury</Name>
+			<Email>wascheme@tuta.io</Email>
+		</Update>
 		<Update release="2">
 			<Date>2021-01-22</Date>
 			<Version>0.22.4</Version>

util/archive/p7zip/actions.py

@@ -2,37 +2,26 @@
 # -*- coding: utf-8 -*-
 #
 # Licensed under the GNU General Public License, version 3.
-# See the file http://www.gnu.org/licenses/gpl.txt
+# See the file https://www.gnu.org/licenses/gpl-3.0.txt
 
 from pisi.actionsapi import shelltools
 from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
 from pisi.actionsapi import get
 
-WorkDir = "p7zip_%s" % get.srcVERSION()
+WorkDir = "p7zip-%s" % get.srcVERSION()
 
 makefiles = {
-             'i686'     : "makefile.linux_x86_asm_gcc_4.X",
+             'x86_64'   : "makefile.linux_amd64"
-             'x86_64'   : "makefile.linux_amd64_asm"
             }
 
 def setup():
     shelltools.copy(makefiles[get.ARCH()], "makefile.machine")
 
-    for i in shelltools.ls("makefile.*"):
-        pisitools.dosed(i, "^CC=gcc ", "CC=%s " % get.CC())
-        pisitools.dosed(i, "^CXX=g\+\+ ", "CXX=%s " % get.CXX())
-
 def build():
-    autotools.make('OPTFLAGS="%s" all3' % get.CFLAGS())
+    autotools.make('OPTFLAGS="%s %s" 7z 7za 7zr sfx' % (get.CFLAGS(), get.CXXFLAGS()))
 
 def install():
-    pisitools.insinto("/usr/lib/p7zip", "bin/*")
+    autotools.rawInstall("DEST_DIR=%s DEST_HOME=/usr DEST_MAN=/usr/share/man" % get.installDIR())
 
-    # p7zip wrapper
+    pisitools.dodoc("README.md")
-    pisitools.dobin("contrib/gzip-like_CLI_wrapper_for_7z/p7zip")
-    pisitools.doman("contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1")
-    pisitools.doman("man1/*")
-
-    pisitools.dohtml("DOC/MANUAL/*")
-    pisitools.dodoc("ChangeLog", "README", "TODO", "DOC/*.txt")

util/archive/p7zip/files/7z

@@ -1,4 +0,0 @@
-#!/bin/sh
-cd ""
-export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:"
-exec /usr/lib/p7zip/7z "$@"

util/archive/p7zip/files/7za

@@ -1,4 +0,0 @@
-#!/bin/sh
-cd ""
-export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:"
-exec /usr/lib/p7zip/7za "$@"

util/archive/p7zip/files/7zr

@@ -1,4 +0,0 @@
-#!/bin/sh
-cd ""
-export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:"
-exec /usr/lib/p7zip/7zr "$@"

util/archive/p7zip/pspec.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" ?>
-<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
+<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
     <Source>
         <Name>p7zip</Name>
-        <Homepage>http://p7zip.sourceforge.net/</Homepage>
+        <Homepage>https://github.com/jinfeihan57/p7zip</Homepage>
         <Packager>
             <Name>PisiLinux Community</Name>
             <Email>admins@pisilinux.org</Email>
@@ -14,8 +14,8 @@
         <Description>
             p7zip is a port of 7-Zip archiver for Unix. Supports packing-unpacking 7z, ZIP, GZIP, BZIP2 and TAR archives and unpacking RAR, CAB, ISO, ARJ, LZH, CHM, Z, CPIO, RPM, DEB and NSIS arhives.
         </Description>
-        <Archive sha1sum="e8819907132811aa1afe5ef296181d3a15cc8f22" type="tarbz2">
+        <Archive sha1sum="cc4961dbaf7b2abcd589a95e4f8e4b82e8f66268" type="targz">
-            mirrors://sourceforge/p7zip/p7zip/16.02/p7zip_16.02_src_all.tar.bz2
+            https://github.com/jinfeihan57/p7zip/archive/v17.03.tar.gz
         </Archive>
         <BuildDependencies>
             <Dependency>yasm-devel</Dependency>
@@ -34,14 +34,16 @@
             <Path fileType="doc">/usr/share/doc</Path>
             <Path fileType="man">/usr/share/man</Path>
         </Files>
-        <AdditionalFiles>
-            <AdditionalFile owner="root" permission="0755" target="/usr/bin/7z">7z</AdditionalFile>
-            <AdditionalFile owner="root" permission="0755" target="/usr/bin/7za">7za</AdditionalFile>
-            <AdditionalFile owner="root" permission="0755" target="/usr/bin/7zr">7zr</AdditionalFile>
-        </AdditionalFiles>
     </Package>
 
     <History>
+        <Update release="7">
+            <Date>2021-03-13</Date>
+            <Version>17.03</Version>
+            <Comment>Version bump.</Comment>
+            <Name>fury</Name>
+            <Email>uglyside@yandex.ru</Email>
+        </Update>
         <Update release="6">
             <Date>2020-02-19</Date>
             <Version>16.02</Version>