Update and switch to archlinux32 source archive

2 files changed, 22 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 94f87eaf02c1..06e6db445a0c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,16 @@
-# Generated by makepkg 4.2.1
-# Tue Mar 17 19:07:19 UTC 2015
 pkgbase = lib32-libxp
-	pkgdesc = X11 X Print Library
+	pkgdesc = X11 X Print Library (32-bit)
 	pkgver = 1.0.3
 	pkgrel = 1
-	url = http://xorg.freedesktop.org/
+	url = https://xorg.freedesktop.org/
 	arch = x86_64
 	license = GPL
 	depends = lib32-libxext
-	source = http://mirror.yandex.ru/archlinux/extra/os/i686/libxp-1.0.3-1-i686.pkg.tar.xz
-	md5sums = 6e81313cbb597707c861514d0367c5f6
+	source = http://pool.mirror.archlinux32.org/i686/extra/libxp-1.0.3-2.2-i686.pkg.tar.xz
+	source = http://pool.mirror.archlinux32.org/i686/extra/libxp-1.0.3-2.2-i686.pkg.tar.xz.sig
+	validpgpkeys = 16194A82231E9EF823562181C8E8F5A0AF9BA7E7
+	sha256sums = dd1656f29e0ace91dc1846d51d3f47b83aeeb08ba94335929a14e3e71fdb8b37
+	sha256sums = SKIP
 
 pkgname = lib32-libxp
 
diff --git a/PKGBUILD b/PKGBUILD
index 8056506ccb8f..3cdd8d921a51 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,26 @@
-# Maintainer:  Felix Berkenkamp <felix1012 at gmx dot de>
+# Maintainer: Jonathon Fernyhough <jonathon_at manjaro ddoott org>
+# Contributor: Felix Berkenkamp <felix1012 at gmx dot de>
 # Contributor: Simon Génier <sgenier at gmain dot com>
 # Contributor: Max Pray a.k.a. Synthead <synthead at gmail dot com>
 # Contributor: Ray Kohler <ataraxia937 at gmail dot com>
 # Category: lib
 
 pkgname=lib32-libxp
-pkgname32=${pkgname/lib32-/}
 pkgver=1.0.3
 pkgrel=1
-pkgrel32=1
-pkgdesc="X11 X Print Library"
-arch=('x86_64')
-url="http://xorg.freedesktop.org/"
-license=('GPL')
-depends=('lib32-libxext')
-source=(http://mirror.yandex.ru/archlinux/extra/os/i686/${pkgname32}-${pkgver}-${pkgrel32}-i686.pkg.tar.xz)
-md5sums=('6e81313cbb597707c861514d0367c5f6')
+pkgdesc="X11 X Print Library (32-bit)"
+arch=(x86_64)
+url=https://xorg.freedesktop.org/
+license=(GPL)
+depends=(lib32-libxext)
+
+_pkgrel32=2.2
+source=(http://pool.mirror.archlinux32.org/i686/extra/${pkgname/lib32-/}-$pkgver-$_pkgrel32-i686.pkg.tar.xz{,.sig})
+sha256sums=('dd1656f29e0ace91dc1846d51d3f47b83aeeb08ba94335929a14e3e71fdb8b37'
+            'SKIP')
+validpgpkeys=(16194A82231E9EF823562181C8E8F5A0AF9BA7E7) # 'Andreas Bauman'
 
 package() {
-mkdir -p ${pkgdir}/usr/lib32
-cp -rPf ${srcdir}/usr/lib/* ${pkgdir}/usr/lib32
+	install -d ${pkgdir}/usr/lib32
+	cp -rPf ${srcdir}/usr/lib/* ${pkgdir}/usr/lib32
 }