fpm-git: follow ruby pkg guidelines; fix pkgver, desc

3 files changed, 99 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bb70486f29ef..ce6d31580c05 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,33 +1,28 @@
-# Generated by mksrcinfo v8
-# Fri Mar  3 20:12:29 UTC 2017
 pkgbase = fpm-git
-	pkgdesc = Effing package management! Build packages for multiple platforms with great ease and sanity. (git version)
-	pkgver = 1983.fd7ef05
+	pkgdesc = Build packages for multiple platforms with great ease and sanity
+	pkgver = 1.15.1.r3.b085edc4
 	pkgrel = 1
 	url = https://github.com/jordansissel/fpm
 	arch = any
 	license = MIT
 	makedepends = git
-	depends = ruby
+	makedepends = ruby-rspec
+	makedepends = ruby-insist
+	makedepends = ruby-pry
+	makedepends = ruby-rake
+	depends = python-simplejson
+	depends = python-setuptools
 	depends = ruby-cabin
 	depends = ruby-backports
 	depends = ruby-arr-pm
 	depends = ruby-clamp
-	depends = ruby-childprocess
-	depends = ruby-json-1
-	depends = ruby-ffi
-	depends = ruby-archive-tar-minitar
-	depends = ruby-xz
 	depends = ruby-pleaserun
-	depends = ruby-rspec
-	depends = ruby-insist
-	depends = ruby-pry
 	depends = ruby-stud
-	provides = fpm
+	depends = ruby-rexml
+	provides = fpm=1.15.1
 	conflicts = fpm
 	options = !emptydirs
-	source = fpm::git+https://github.com/jordansissel/fpm.git
-	sha256sums = SKIP
+	source = git+https://github.com/jordansissel/fpm.git
+	b2sums = SKIP
 
 pkgname = fpm-git
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..713f6f80aff8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+/*
+!/.gitignore
+!/.SRCINFO
+!/PKGBUILD
diff --git a/PKGBUILD b/PKGBUILD
index 554ee4a6325b..62da770d023e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,96 @@
-# Maintainer: Mark Weiman <mark dot weiman at markzz dot com>
+# Maintainer: éclairevoyant
+# Contributor: Mark Weiman <mark dot weiman at markzz dot com>
 
-_gemname=fpm
-pkgname=$_gemname-git
-_pkgver=1.8.1
-pkgver=1983.fd7ef05
+_pkgname=fpm
+pkgname="$_pkgname-git"
+pkgver=1.15.1.r3.b085edc4
+_pkgver=${pkgver%%.r*}
 pkgrel=1
-pkgdesc='Effing package management! Build packages for multiple platforms with great ease and sanity. (git version)'
+pkgdesc='Build packages for multiple platforms with great ease and sanity'
 arch=(any)
-url="https://github.com/jordansissel/${_gemname}"
-license=('MIT')
-depends=(ruby ruby-cabin ruby-backports ruby-arr-pm ruby-clamp
-         ruby-childprocess ruby-json-1 ruby-ffi
-         ruby-archive-tar-minitar ruby-xz ruby-pleaserun
-         ruby-rspec ruby-insist ruby-pry ruby-stud)
-makedepends=('git')
-provides=(fpm)
-conflicts=(fpm)
+url="https://github.com/jordansissel/$_pkgname"
+license=(MIT)
+depends=(
+	python-simplejson
+	python-setuptools
+	ruby-cabin
+	ruby-backports
+	ruby-arr-pm
+	ruby-clamp
+	ruby-pleaserun
+	ruby-stud
+	ruby-rexml)
+makedepends=(
+	git
+	ruby-rspec
+	ruby-insist
+	ruby-pry
+	ruby-rake
+)
+provides=("$_pkgname=$_pkgver")
+conflicts=("$_pkgname")
 options=(!emptydirs)
-source=("${_gemname%-*}::git+https://github.com/jordansissel/${_gemname}.git")
-sha256sums=('SKIP')
+source=("git+$url.git")
+b2sums=('SKIP')
 
 pkgver() {
-  cd "$srcdir/${_gemname%-}"
-  printf "%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+	git -C $_pkgname describe --long --tags | sed 's/^v//;s/\([^-]*-\)g/r\1/;s/-/./g'
 }
 
 build() {
-  cd $srcdir/${_gemname%-*}
-  sed -i 's/"clamp", "~> 0.6"/"clamp", ">= 0.6"/' fpm.gemspec
-  gem build fpm.gemspec > /dev/null 2>&1
+	cd $_pkgname
+
+	local _gemdir="$(gem env gemdir)"
+
+  gem build "$_pkgname.gemspec"
+
+  gem install \
+    --local \
+    --verbose \
+    --ignore-dependencies \
+    --no-user-install \
+    --install-dir "tmp_install/$_gemdir" \
+    --bindir "tmp_install/usr/bin" \
+    "$_pkgname-$_pkgver.gem"
+
+  # remove unrepreducible files
+  rm --force --recursive --verbose \
+    "tmp_install/$_gemdir/cache/" \
+    "tmp_install/$_gemdir/gems/$_pkgname-$_pkgver/vendor/" \
+    "tmp_install/$_gemdir/doc/$_pkgname-$_pkgver/ri/ext/"
+
+  find "tmp_install/$_gemdir/gems/" \
+    -type f \
+    \( \
+      -iname "*.o" -o \
+      -iname "*.c" -o \
+      -iname "*.so" -o \
+      -iname "*.time" -o \
+      -iname "gem.build_complete" -o \
+      -iname "Makefile" \
+    \) \
+    -delete
+
+  find "tmp_install/$_gemdir/extensions/" \
+    -type f \
+    \( \
+      -iname "mkmf.log" -o \
+      -iname "gem_make.out" \
+    \) \
+    -delete
+}
+
+check() {
+	cd $_pkgname
+	local _gemdir="$(gem env gemdir)"
+	GEM_HOME="tmp_install/$_gemdir" rspec
 }
 
 package() {
-  local _gemdir="$(ruby -e'puts Gem.default_dir')"
-  gem install --ignore-dependencies --no-user-install --debug --backtrace --verbose -i "$pkgdir/$_gemdir" -n "$pkgdir/usr/bin" $srcdir/$_gemname/$_gemname-$_pkgver.gem > /dev/null 2>&1
-  rm "$pkgdir/$_gemdir/cache/$_gemname-$_pkgver.gem"
-  install -D -m644 "$pkgdir/$_gemdir/gems/$_gemname-$_pkgver/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+	cd $_pkgname
+
+  cp --archive --verbose tmp_install/* "$pkgdir"
+
+  install -vDm0644 LICENSE -t "$pkgdir/usr/share/licenses/$_pkgname/"
+  install -vDm0644 *.md -t "$pkgdir/usr/share/doc/$_pkgname/"
 }