Update fsport-mediavps to 3.5

3 files changed, 25 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index df0dff4075d7..1f26015c2f09 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,27 @@
 pkgbase = fsport-mediavps
 	pkgdesc = Hi-res FreeSpace 1 resources for FSPort
-	pkgver = 3.4
-	pkgrel = 3
+	pkgver = 3.5
+	pkgrel = 1
 	url = http://fsport.hard-light.net/website/
 	arch = any
 	license = custom:noncommercial
-	makedepends = unzip
 	depends = fsport
 	depends = fs2_open-mediavps
-	noextract = fsport-mediavps.zip
-	noextract = fsport-mediavps_music.zip
+	noextract = fsport-mediavps.7z
+	noextract = fsport-mediavps_2014.7z
+	noextract = fsport-mediavps_music.7z
 	source = fsport-mediavps.sh
 	source = fsport-mediavps.desktop
 	source = LICENSE
-	source = http://fsport.freespacemods.net/releases/fsport-mediavps.zip
-	source = http://fsport.freespacemods.net/releases/fsport-mediavps_music.zip
+	source = http://fsport.freespacemods.net/releases/fsport-mediavps.7z
+	source = http://fsport.freespacemods.net/releases/fsport-mediavps_2014.7z
+	source = http://fsport.freespacemods.net/releases/fsport-mediavps_music.7z
 	sha256sums = ed989975e62cb2e0b116bf9a316305dbec3f1440080e19794eaf95bbf3f686e7
 	sha256sums = 09cb00100f048715b5bab6c9a1bca2a1e2ecae59d9da7a8710c018f37001f38c
 	sha256sums = 79462ffe82b8cf371f37a3444a8e17165d293e797a865b9c4312f86d00ddf4ec
-	sha256sums = 2e925039df10b796377fa3259b7d05d02f7bc2fe19b642e963000004660b882a
-	sha256sums = 977714e2560b320901002284a68f89505defe9c1d1fa07e2096ffc00d8713518
+	sha256sums = f0cc49f13730373c65c4e091a5d84bd284db069650ede460c5c4ee301118d9c9
+	sha256sums = 62aca6bf149d9121b3f91fa983d697829d5e099cb979d03f91f9e01b068b25ff
+	sha256sums = b80ee613c7b0cc3df8990bf1e0eac78a4fd20e615ba29fbcc2b85bfd1f20b443
 
 pkgname = fsport-mediavps
 
diff --git a/.gitignore b/.gitignore
index 376a69d6c613..4907d147d814 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 *.pkg.tar*
 *.src.tar*
-*.zip
+*.7z
 src
 pkg
diff --git a/PKGBUILD b/PKGBUILD
index 206f723f2233..5c15f62ea46e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,24 +1,26 @@
 # Maintainer: Mike Swanson <mikeonthecomputer@gmail.com>
 
 pkgname=fsport-mediavps
-pkgver=3.4
-pkgrel=3
+pkgver=3.5
+pkgrel=1
 pkgdesc="Hi-res FreeSpace 1 resources for FSPort"
 arch=('any')
 url="http://fsport.hard-light.net/website/"
 license=('custom:noncommercial')
 depends=('fsport' 'fs2_open-mediavps')
-makedepends=('unzip')
 source=(fsport-mediavps.sh fsport-mediavps.desktop LICENSE
-        'http://fsport.freespacemods.net/releases/fsport-mediavps.zip'
-        'http://fsport.freespacemods.net/releases/fsport-mediavps_music.zip')
+        'http://fsport.freespacemods.net/releases/fsport-mediavps.7z'
+        'http://fsport.freespacemods.net/releases/fsport-mediavps_2014.7z'
+        'http://fsport.freespacemods.net/releases/fsport-mediavps_music.7z')
 sha256sums=('ed989975e62cb2e0b116bf9a316305dbec3f1440080e19794eaf95bbf3f686e7'
             '09cb00100f048715b5bab6c9a1bca2a1e2ecae59d9da7a8710c018f37001f38c'
             '79462ffe82b8cf371f37a3444a8e17165d293e797a865b9c4312f86d00ddf4ec'
-            '2e925039df10b796377fa3259b7d05d02f7bc2fe19b642e963000004660b882a'
-            '977714e2560b320901002284a68f89505defe9c1d1fa07e2096ffc00d8713518')
-noextract=(fsport-mediavps.zip
-           fsport-mediavps_music.zip)
+            'f0cc49f13730373c65c4e091a5d84bd284db069650ede460c5c4ee301118d9c9'
+            '62aca6bf149d9121b3f91fa983d697829d5e099cb979d03f91f9e01b068b25ff'
+            'b80ee613c7b0cc3df8990bf1e0eac78a4fd20e615ba29fbcc2b85bfd1f20b443')
+noextract=(fsport-mediavps.7z
+           fsport-mediavps_2014.7z
+           fsport-mediavps_music.7z)
 
 # Prevent compression
 PKGEXT=".pkg.tar"
@@ -26,8 +28,8 @@ PKGEXT=".pkg.tar"
 prepare() {
   cd "$srcdir"
   mkdir "$pkgname" && cd "$pkgname" || return 1
-  for zip in ../*.zip; do
-    unzip $zip
+  for sv in ../*.7z; do
+    bsdtar -xf $sv
   done
 }