upgrade to 3.1.6 and partial fixes for python issues (nfy)

4 files changed, 47 insertions, 60 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3549d504ccb2..df3319807ab7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,18 @@
 pkgbase = imgv
-	pkgdesc = A feature rich image viewer including a GUI
-	pkgver = 3.1.5
-	pkgrel = 2
+	pkgdesc = a feature rich image viewer including a GUI
+	pkgver = 3.1.6
+	pkgrel = 0
 	url = http://imgv.sourceforge.net/
-	install = imgv.install
 	arch = i686
+	arch = x86_64
 	license = GPL
-	makedepends = hd2u
-	depends = bash
-	depends = python-pygame
-	depends = pil
-	source = http://downloads.sourceforge.net/imgv/imgv-3.1.5-src.tar.gz
-	source = imgv.diff
+	makedepends = dos2unix
+	depends = python2-pygame
+	depends = python2-pillow
+	source = http://downloads.sourceforge.net/imgv/imgv-3.1.6-src.tar.gz
 	source = imgv.profile
 	source = imgv.sh
-	md5sums = 42378425b2470daedcc0f3e34c25b6e0
-	md5sums = ef78916636a26b84c1bd55c430146bdc
+	md5sums = 48e19d90000b5d17bb609c93dd74d5b8
 	md5sums = bd0daba52c3165b38ba5a7b61ec0a94d
 	md5sums = 60a287e055f6b17ba864c207cb78d9b2
 
diff --git a/PKGBUILD b/PKGBUILD
index 885e1d317d54..cc7c0295a19c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,47 @@
+# Maintainer: Caleb Maclennan <caleb@alerque.com>
+#
 # Contributor: Eric Belanger <belanger@astro.umontreal.ca>
-# Maintainer: Nathan Owe <ndowens04+AUR @ gmail.com>
+# Contributor: Nathan Owe <ndowens04+AUR @ gmail.com>
+#
+# Any suggestions welcome; please submit paches via Github:
+# https://github.com/alerque/aur/tree/master/imgv
+
 pkgname=imgv
-pkgver=3.1.5
-pkgrel=2
-pkgdesc="A feature rich image viewer including a GUI"
+pkgver=3.1.6
+pkgrel=0
+pkgdesc="a feature rich image viewer including a GUI"
 url="http://imgv.sourceforge.net/"
 license=('GPL')
-arch=('i686')
-depends=('bash' 'python-pygame' 'pil')
-makedepends=('hd2u')
-install=imgv.install
-source=(http://downloads.sourceforge.net/imgv/$pkgname-$pkgver-src.tar.gz imgv.diff imgv.profile imgv.sh)
-md5sums=('42378425b2470daedcc0f3e34c25b6e0' 'ef78916636a26b84c1bd55c430146bdc'\
-         'bd0daba52c3165b38ba5a7b61ec0a94d' '60a287e055f6b17ba864c207cb78d9b2')
+arch=('i686' 'x86_64')
+depends=('python2-pygame' 'python2-pillow')
+makedepends=('dos2unix')
+source=(http://downloads.sourceforge.net/imgv/$pkgname-$pkgver-src.tar.gz imgv.profile imgv.sh)
+md5sums=('48e19d90000b5d17bb609c93dd74d5b8'
+         'bd0daba52c3165b38ba5a7b61ec0a94d'
+         '60a287e055f6b17ba864c207cb78d9b2')
+
+post_install() {
+    echo "==> To configure imgv:
+==> copy /usr/share/imgv/data/imgv.conf to ~/.imgv.conf
+==> and edit ~/.imgv.conf"
+}
+
+post_upgrade() {
+  post_install $1
+}
 
 build() {
-  cd $srcdir/$pkgname-$pkgver-src
-  install -d $pkgdir/usr/share/imgv
+  cd "$srcdir/${pkgname}-${pkgver}"
   dos2unix *.py data/{imgv.conf,playlists}
-  patch -p1 <$srcdir/imgv.diff
-  cp -r * $pkgdir/usr/share/imgv/
-  install -Dm755 $srcdir/imgv.profile $pkgdir/etc/profile.d/imgv.sh
-  install -Dm755 $srcdir/imgv.sh $pkgdir/usr/bin/imgv
-  sed -i 's|COLOR|#COLOR|g' $pkgdir/usr/share/imgv/data/imgv.conf
-  sed -i 's|CACHE_DIRS|#CACHE_DIRS|g' $pkgdir/usr/share/imgv/gl.py
+  sed -i 's/#\s*$//g' *.py
+  sed -i 's|COLOR|#COLOR|g' "data/imgv.conf"
+  sed -i 's|CACHE_DIRS|#CACHE_DIRS|g' "gl.py"
+}
 
+package() {
+  cd "$srcdir/${pkgname}-${pkgver}"
+  install -d "$pkgdir/usr/share/imgv"
+  cp -r * "$pkgdir/usr/share/imgv/"
+  install -Dm755 "$srcdir/imgv.profile" "$pkgdir/etc/profile.d/imgv.sh"
+  install -Dm755 "$srcdir/imgv.sh" "$pkgdir/usr/bin/imgv"
 }
diff --git a/imgv.diff b/imgv.diff
deleted file mode 100644
index 5d0828fec8d2..000000000000
--- a/imgv.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur imgv-3.1.5-src-orig/dir_nav.py imgv-3.1.5-src/dir_nav.py
---- imgv-3.1.5-src-orig/dir_nav.py	2006-12-08 00:37:14.000000000 -0500
-+++ imgv-3.1.5-src/dir_nav.py	2006-12-08 00:44:10.000000000 -0500
-@@ -210,7 +210,8 @@
-         cursor = pygame.mouse.get_pos()
-         (esc_rect, close_font) = close_button(screen)
-         hover_fx(screen, curdir, menu_items, cursor)
--        hover_cursor(cursor, [ren_load_rect, ren_load_subdirs_rect, ren_drive_rect, dirpl_rect, untag_all_rect, view_tagged_rect, filter_rect, esc_rect] + [x[0] for x in menu_items])
-+        if platform == 'win32':
-+            hover_cursor(cursor, [ren_load_rect, ren_load_subdirs_rect, ren_drive_rect, dirpl_rect, untag_all_rect, view_tagged_rect, filter_rect, esc_rect] + [x[0] for x in menu_items])
-         hover_button(ren_load_rect, cursor, screen, " (L)oad ", 0, 18, "topleft")
-         hover_button(ren_load_subdirs_rect, cursor, screen, " Subdirs (T)oo ", 62, 18, "topleft")
-         if platform == 'win32':
diff --git a/imgv.install b/imgv.install
deleted file mode 100644
index 0a2bc45185ec..000000000000
--- a/imgv.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-  cat << EOF
-==> To configure imgv:
-==> copy /usr/share/imgv/data/imgv.conf to ~/.imgv.conf
-==> and edit ~/.imgv.conf
-EOF
-}
-
-
-post_upgrade() {
-  post_install $1
-}
-
-op=$1
-shift
-$op $*