Thanks for the fix MarkWalters.pw!

2 files changed, 16 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 69636d216627..18a13b81dc4d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = apt
-	pkgver = 2.1.7
+	pkgver = 2.2.0
 	pkgrel = 1
 	url = http://packages.debian.org
 	arch = i686
@@ -22,11 +22,12 @@ pkgbase = apt
 	makedepends = perl-unicode-linebreak
 	makedepends = perl-pod-parser
 	makedepends = po4a
+	makedepends = xxhash
 	provides = libapt-inst
 	provides = libapt-pkg
 	provides = libapt-pkg-dev
 	provides = apt-utils
-	source = git+https://salsa.debian.org/apt-team/apt.git#tag=2.1.7
+	source = git+https://salsa.debian.org/apt-team/apt.git#tag=2.2.0
 	source = https://github.com/mquinson/po4a/releases/download/v0.60/po4a-0.60.tar.gz
 	sha256sums = SKIP
 	sha256sums = c8d9c28758fa007e8e2989b5820c55910a6533dab581208d0c8acf4d43027b59
@@ -35,8 +36,11 @@ pkgname = apt
 	pkgdesc = Command-line package manager used on Debian-based systems
 	depends = gnupg
 	depends = curl
-	depends = xz
+	depends = libseccomp
+	depends = perl
+	depends = xxhash
 
 pkgname = apt-docs
 	pkgdesc = Documentation for apt
+	arch = any
 
diff --git a/PKGBUILD b/PKGBUILD
index e312b7f68bbd..59504db35ccf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,20 @@
 # Maintainer: Moses Narrow <moe_narrow@use.startmail.com>
 # Co-Maintainer: Felix Golatofski <contact@xdfr.de>
+# Contributor: MarkWalters.pw <archlinux@markwalters.pw>
 # Contributor: Mark Weiman <mark.weiman@markzz.com>
 # Contributor: Johannes Dewender  arch at JonnyJD dot net
 # Contributor: Tony Lambiris <tony@critialstack.com>
 
 pkgbase=apt
 pkgname=('apt' 'apt-docs')
-pkgver=2.1.7
+pkgver=2.2.0
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://packages.debian.org"
 license=('GPL2')
 makedepends=('cmake' 'dpkg' 'docbook-xsl' 'doxygen' 'git' 'gtest' 'w3m' 'triehash'
              'perl-text-wrapi18n' 'perl-locale-gettext' 'perl-yaml-tiny'
-             'perl-term-readkey' 'perl-sgmls' 'perl-module-build' 'perl-unicode-linebreak' 'perl-pod-parser' 'po4a')
+             'perl-term-readkey' 'perl-sgmls' 'perl-module-build' 'perl-unicode-linebreak' 'perl-pod-parser' 'po4a' 'xxhash')
 provides=('libapt-inst' 'libapt-pkg' 'libapt-pkg-dev' "apt-utils")
 source=("git+https://salsa.debian.org/apt-team/apt.git#tag=${pkgver}"
 	"https://github.com/mquinson/po4a/releases/download/v0.60/po4a-0.60.tar.gz")
@@ -27,7 +28,7 @@ build() {
   cd "$srcdir/po4a-0.60"
   perl Build.PL installdirs=vendor create_packlist=0
   LC_ALL=en_US.UTF-8 perl Build
-  alias po4a="$srcdir/po4a-0.60/po4a"
+  [[ "$PATH" =~ /usr/bin/vendor_perl ]] || export PATH="$PATH:/usr/bin/vendor_perl"
 
   msg2 "Building apt..."
   cd "$srcdir/$pkgname"
@@ -39,7 +40,7 @@ build() {
   	-DCMAKE_INSTALL_PREFIX="/usr" \
   	-DCMAKE_INSTALL_LIBDIR="lib" \
   	-DCMAKE_INSTALL_LIBEXECDIR="lib" \
-	  -DDOCBOOK_XSL="/usr/share/xml/docbook/${DOCBOOK_XSL_VER}"
+	-DDOCBOOK_XSL="/usr/share/xml/docbook/${DOCBOOK_XSL_VER}-nons"
 
   sed -i -e "s|stylesheet/docbook-xsl|$DOCBOOK_XSL_VER=t|" build/doc/*.xsl
   sed -i -e "s|stylesheet/nwalsh|$DOCBOOK_XSL_VER=|" build/doc/*.xsl
@@ -48,14 +49,16 @@ build() {
 }
 
 package_apt() {
-  depends=('gnupg' 'curl' 'xz')
+  depends=('gnupg' 'curl' 'libseccomp' 'perl' 'xxhash')
   pkgdesc="Command-line package manager used on Debian-based systems"
   cd "$srcdir/$pkgbase"
   make -C build DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}/usr/share/docs"
+  rm -rf "${pkgdir}/usr/share/doc"
+  find "$pkgdir/usr/share/man" -type d -empty -delete
 }
 
 package_apt-docs() {
+  arch=('any')
   pkgdesc="Documentation for apt"
   cd "$srcdir/$pkgbase"
   make -C build DESTDIR="${pkgdir}" install