use proper per-arch depends; download icon from web not dropbox

2 files changed, 36 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9c253d8f678d..50595e93ac81 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,30 +7,30 @@ pkgbase = machinarium
 	arch = i686
 	arch = x86_64
 	license = unknown
-	depends = desktop-file-utils
-	depends = hicolor-icon-theme
-	depends = lib32-alsa-lib
-	depends = lib32-bzip2
-	depends = lib32-curl
-	depends = lib32-gtk2
-	depends = lib32-libxdamage
-	depends = lib32-libxt
-	depends = lib32-nss
 	source = hib://Machinarium_full_en.tar.gz
-	source = machinarium.desktop
-	source = http://dl.dropbox.com/u/3395784/aur/machinarium/machinarium.png
 	source = machinarium.sh
+	source = machinarium.desktop
+	source = https://apps.ubuntu.com/site_media/icons/2015/07/machinariumIjgfeQ.png
 	source = http://dl.dropbox.com/u/3395784/aur/machinarium/machinarium-browser.swf
-	sha256sums = bf038f8d47448896f97f6a8a599699a9f53b44e31ae46779b24d3d615e99e86b
-	sha256sums = da021ff4e5e3e6a340a1601856b75ac7be2e3a74bc6feca0487712638dccc34d
-	sha256sums = 0349c7b9e4fcc59e34f155a98694e9c1519fcd8e66117e32ee0aee4344b76204
-	sha256sums = e4798a56df38254e54a1e147e82870ac759743131a3d879462730ab046ee2d69
-	sha256sums = 8d129d89754666de64d67a12660b268c254d5832b4356aafca01830a2e104877
-	sha512sums = 5fbaa215b58ef5a5a9a048e6f5569e22a4816c608407d3e3cf585b03271933b6e33cda50e974b651613eb2454c7c00e2c5060caa46a08e360e927e1e4b7b8aa3
-	sha512sums = a82db5ce8fff73e1d03e90ee59fbfaeb8076955afd3cca98ae9cb23ccd67300fa6f722831f120a5179cb006c319a89db8b513933f11656fdf31162a15567edb6
-	sha512sums = 3c5ea1968a7251960c4801312009d765d01a56fd1ede44e16ae15eda657a1a8d7372d0ba8478d6d51521fad70c4cb659fe5451c467f62ef895365de10908e7c2
-	sha512sums = 5a23583a9d96e184be77a876c4aa4c3540b3e0be3a7e49adfcf700dff06ee6a87f798dd63de6cf00bf0e9c5eaf0303fb53fa5a5c5da6c63c3b1ab8c25d3feab9
-	sha512sums = 92e0ea781266d2c7cc7e1da05f2032b67e3ad85dc3a02b5af381cf2795f88e8e09db429e8c4ae3e12089bb35ae29c1f648575c71657872f229c1cb13ccf93e7b
+	sha1sums = b0cd45fa1d75b29a9cb761f96ef398cec29d8c12
+	sha1sums = e78be4e1e9752586188dce39e24da457711ee5b3
+	sha1sums = 1febb90a558e55cb42531cac96bfb3d07698fef8
+	sha1sums = eeb580db1ecce734ad9b1b7a4d59f4ce43ea750a
+	sha1sums = 8f5a30be012632538d46fd815277f2cee1edb80b
+	depends_i686 = alsa-lib
+	depends_i686 = bzip2
+	depends_i686 = curl
+	depends_i686 = gtk2
+	depends_i686 = libxdamage
+	depends_i686 = libxt
+	depends_i686 = nss
+	depends_x86_64 = lib32-alsa-lib
+	depends_x86_64 = lib32-bzip2
+	depends_x86_64 = lib32-curl
+	depends_x86_64 = lib32-gtk2
+	depends_x86_64 = lib32-libxdamage
+	depends_x86_64 = lib32-libxt
+	depends_x86_64 = lib32-nss
 
 pkgname = machinarium
 
diff --git a/PKGBUILD b/PKGBUILD
index 5c6a777c7a08..ba89dd507a4f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,31 +9,28 @@ pkgdesc="A point-and-click logic adventure game by the creators of Samorost (req
 arch=(i686 x86_64)
 url=http://machinarium.net/
 license=(unknown)
-depends=(desktop-file-utils hicolor-icon-theme lib32-alsa-lib lib32-bzip2 lib32-curl lib32-gtk2 lib32-libxdamage lib32-libxt lib32-nss)
-[[ $CARCH == "i686" ]] && depends=(${depends[@]/lib32-/})
+depends_i686=(desktop-file-utils hicolor-icon-theme)
+depends_i686=(alsa-lib bzip2 curl gtk2 libxdamage libxt nss)
+depends_x86_64=(lib32-alsa-lib lib32-bzip2 lib32-curl lib32-gtk2 lib32-libxdamage lib32-libxt lib32-nss)
 install=$pkgname.install
-source=(hib://Machinarium_full_en.tar.gz
-    $pkgname.desktop
-    http://dl.dropbox.com/u/3395784/aur/$pkgname/$pkgname.png
-    $pkgname.sh
-    http://dl.dropbox.com/u/3395784/aur/$pkgname/$pkgname-browser.swf)
-sha256sums=('bf038f8d47448896f97f6a8a599699a9f53b44e31ae46779b24d3d615e99e86b'
-    'da021ff4e5e3e6a340a1601856b75ac7be2e3a74bc6feca0487712638dccc34d'
-    '0349c7b9e4fcc59e34f155a98694e9c1519fcd8e66117e32ee0aee4344b76204'
-    'e4798a56df38254e54a1e147e82870ac759743131a3d879462730ab046ee2d69'
-    '8d129d89754666de64d67a12660b268c254d5832b4356aafca01830a2e104877')
-sha512sums=('5fbaa215b58ef5a5a9a048e6f5569e22a4816c608407d3e3cf585b03271933b6e33cda50e974b651613eb2454c7c00e2c5060caa46a08e360e927e1e4b7b8aa3'
-    'a82db5ce8fff73e1d03e90ee59fbfaeb8076955afd3cca98ae9cb23ccd67300fa6f722831f120a5179cb006c319a89db8b513933f11656fdf31162a15567edb6'
-    '3c5ea1968a7251960c4801312009d765d01a56fd1ede44e16ae15eda657a1a8d7372d0ba8478d6d51521fad70c4cb659fe5451c467f62ef895365de10908e7c2'
-    '5a23583a9d96e184be77a876c4aa4c3540b3e0be3a7e49adfcf700dff06ee6a87f798dd63de6cf00bf0e9c5eaf0303fb53fa5a5c5da6c63c3b1ab8c25d3feab9'
-    '92e0ea781266d2c7cc7e1da05f2032b67e3ad85dc3a02b5af381cf2795f88e8e09db429e8c4ae3e12089bb35ae29c1f648575c71657872f229c1cb13ccf93e7b')
 DLAGENTS+=('hib::/usr/bin/echo "Could not find %u. Manually download it to \"$(pwd)\", or set up a hib:// DLAGENT in /etc/makepkg.conf."; exit 1')
 PKGEXT='.pkg.tar'
 
+source=(hib://Machinarium_full_en.tar.gz
+        $pkgname.sh
+        $pkgname.desktop
+        https://apps.ubuntu.com/site_media/icons/2015/07/machinariumIjgfeQ.png
+        http://dl.dropbox.com/u/3395784/aur/machinarium/machinarium-browser.swf)
+sha1sums=('b0cd45fa1d75b29a9cb761f96ef398cec29d8c12'
+          'e78be4e1e9752586188dce39e24da457711ee5b3'
+          '1febb90a558e55cb42531cac96bfb3d07698fef8'
+          'eeb580db1ecce734ad9b1b7a4d59f4ce43ea750a'
+          '8f5a30be012632538d46fd815277f2cee1edb80b')
+
 package() {
     install -Dm644 $pkgname-browser.swf "$pkgdir"/usr/share/games/$pkgname/$pkgname-browser.swf
     install -Dm755 $pkgname.sh "$pkgdir"/usr/bin/$pkgname
-    install -Dm644 $pkgname.png "$pkgdir"/usr/share/icons/$pkgname.png
+    install -Dm644 machinariumIjgfeQ.png "$pkgdir"/usr/share/icons/$pkgname.png
     desktop-file-install $pkgname.desktop --dir "$pkgdir"/usr/share/applications/
 
     cp -r Machinarium/* "$pkgdir"/usr/share/games/$pkgname/