update needed dependencies and their version constraints

3 files changed, 57 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b7dfb4e0e81b..c60d5c4051e2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,32 @@
 pkgbase = sup
-	pkgdesc = Sup is a console-based email client for people with a lot of email. Great mutt alternative.
+	pkgdesc = Console-based email client for people with a lot of email. Great mutt alternative.
 	pkgver = 1.0
 	pkgrel = 1
 	url = http://sup-heliotrope.github.io/
 	arch = any
-	license = GPL
-	depends = ruby-chronic-old
+	license = GPL2
+	makedepends = ruby-rake
+	depends = ruby
+	depends = ruby-chronic
 	depends = ruby-highline
-	depends = ruby-locale
+	depends = ruby-locale>=2.0
+	depends = ruby-locale<3
 	depends = ruby-lockfile
-	depends = ruby-mime-types
-	depends = ruby-ncursesw
-	depends = ruby-rmail-sup
-	depends = ruby-trollop
-	depends = ruby-unicode
-	depends = ruby-xapian-ruby
-	optdepends = ruby-gpgme: PGP support
+	depends = ruby-mime-types>2.0
+	depends = ruby-ncursesw>=1.4.0
+	depends = ruby-ncursesw<1.5
+	depends = ruby-optimist
+	depends = ruby-rmail>=1.1
+	depends = ruby-rmail<2
+	depends = ruby-unicode>=0.4.4
+	depends = ruby-unicode<0.5
+	depends = ruby-unicode-display_width
+	depends = ruby-xapian-ruby>=1.2
+	depends = ruby-xapian-ruby<2
+	optdepends = ruby-gpgme>=2.0.2: PGP support
 	conflicts = sup-git
 	noextract = sup-1.0.gem
 	source = https://rubygems.org/downloads/sup-1.0.gem
-	md5sums = 3297c3ef21019e8cfd6e5ca28b1964e8
+	b2sums = 1c1864b4380e39c425fb41fc2904dd182fd2be446d0685671b943096b24a9d5a60bd1d91b49c26e2b2a7233e959d4f41ef3f2843bfff5a370bae00051b31abb0
 
 pkgname = sup
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..05c6d4d4c97b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!.gitignore
+!.SRCINFO
+!PKGBUILD
diff --git a/PKGBUILD b/PKGBUILD
index 16e1d479173a..7cd12ec0e08d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,43 @@
-# Maintainer: Vojtěch Aschenbrenner <v@asch.cz>
+# Contributor: Marcell Meszaros < marcell.meszaros AT runbox.eu >
+# Contributor: Vojtěch Aschenbrenner <v@asch.cz>
 
-_gemname=sup
-pkgname=sup
+_gemname="sup"
+pkgname="${_gemname}"
 pkgver=1.0
 pkgrel=1
-pkgdesc="Sup is a console-based email client for people with a lot of email. Great mutt alternative."
-arch=(any)
-url="http://sup-heliotrope.github.io/"
-license=('GPL')
-depends=('ruby-chronic-old' 'ruby-highline' 'ruby-locale' 'ruby-lockfile' 'ruby-mime-types' 'ruby-ncursesw' 'ruby-rmail-sup' 'ruby-trollop' 'ruby-unicode' 'ruby-xapian-ruby')
-optdepends=('ruby-gpgme: PGP support')
-conflicts=(sup-git)
-source=(https://rubygems.org/downloads/$_gemname-$pkgver.gem)
-noextract=($_gemname-$pkgver.gem)
-md5sums=('3297c3ef21019e8cfd6e5ca28b1964e8')
+pkgdesc='Console-based email client for people with a lot of email. Great mutt alternative.'
+arch=('any')
+url='http://sup-heliotrope.github.io/'
+license=('GPL2')
+depends=(
+  'ruby'
+  'ruby-chronic'
+  'ruby-highline'
+  'ruby-locale>=2.0'            'ruby-locale<3'
+  'ruby-lockfile'
+  'ruby-mime-types>2.0'
+  'ruby-ncursesw>=1.4.0'        'ruby-ncursesw<1.5'
+  'ruby-optimist'
+  'ruby-rmail>=1.1'             'ruby-rmail<2'
+  'ruby-unicode>=0.4.4'         'ruby-unicode<0.5'
+  'ruby-unicode-display_width'
+  'ruby-xapian-ruby>=1.2'       'ruby-xapian-ruby<2'
+)
+makedepends=('ruby-rake')
+optdepends=(
+  'ruby-gpgme>=2.0.2: PGP support'
+)
+conflicts=('sup-git')
+source=("https://rubygems.org/downloads/${_gemname}-${pkgver}.gem")
+noextract=("${_gemname}-${pkgver}.gem")
+b2sums=('1c1864b4380e39c425fb41fc2904dd182fd2be446d0685671b943096b24a9d5a60bd1d91b49c26e2b2a7233e959d4f41ef3f2843bfff5a370bae00051b31abb0')
 
 package() {
   cd "$srcdir"
   # _gemdir is defined inside package() because if ruby[gems] is not installed on
   # the system, makepkg will exit with an error when sourcing the PKGBUILD.
-  local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
+  local _gemdir="$(ruby -r rubygems -e'puts Gem.default_dir')"
 
-  gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" -n "$pkgdir/usr/bin" \
-    "$_gemname-$pkgver.gem"
+  gem install --no-user-install --ignore-dependencies -i "${pkgdir}/$_gemdir" -n "${pkgdir}/usr/bin" \
+    "${_gemname}-${pkgver}.gem"
 }
-
-# vim:set ts=2 sw=2 et: