Adopted and updated

3 files changed, 54 insertions, 61 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 38002841dadb..ca2acc392697 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,32 +1,27 @@
+# Generated by mksrcinfo v8
+# Wed Sep 13 17:19:20 UTC 2017
 pkgbase = squeeze-git
-	pkgdesc = Squeeze is a modern and advanced archive manager for the Xfce Desktop Environment
-	pkgver = 0.4.90git.r1039.41aea82
+	pkgdesc = Archive manager for the Xfce Desktop Environment (git checkout)
+	pkgver = 0.4.90.r460.gdc87aa3
 	pkgrel = 1
+	epoch = 1
 	url = http://www.xfce.org/
-	install = squeeze.install
 	arch = i686
 	arch = x86_64
-	groups = xfce4-git
 	license = GPL2
 	makedepends = git
 	makedepends = xfce4-dev-tools
-	makedepends = pkgconfig
 	makedepends = gtk-doc
 	makedepends = intltool
-	makedepends = xfconf
+	depends = gtk2
 	depends = libxfce4util
-	depends = hicolor-icon-theme
 	depends = dbus-glib
-	depends = gtk2
-	depends = gtk3
-	depends = desktop-file-utils
-	optdepends = lzop: .tar.lzo handling
-	optdepends = xz: tar.xz handling
-	provides = squeeze
-	provides = squeeze-git
+	optdepends = lzop: Compress/Decompress LZOP archives
+	optdepends = xz: Compress/Decompress XZ archives
+	provides = squeeze=0.4.90
 	conflicts = squeeze
 	options = !libtool
-	source = git+git://git.xfce.org/apps/squeeze#branch=master
+	source = squeeze::git://git.xfce.org/apps/squeeze
 	sha256sums = SKIP
 
 pkgname = squeeze-git
diff --git a/PKGBUILD b/PKGBUILD
index bf66897c6742..a6f59c45f512 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,55 +1,67 @@
-# Maintainer: Frederic Bezies <fredbezies at gmail dot com>
-# Contributor : Stein Krauz <steinkrauz@yahoo.com>
+# Maintainer:  twa022 <twa022 at gmail dot com>
+# Contributor: Frederic Bezies <fredbezies at gmail dot com>
+# Contributor: Stein Krauz <steinkrauz@yahoo.com>
 # Contributor: Jan Jezek <honzin.jezek@gmail.com>
 # Contributor: Skunnyk <skunnyk@archlinux.fr>
-# Contributor : Pablo Lezaeta <prflr88@gmail.com>
+# Contributor: Pablo Lezaeta <prflr88@gmail.com>
 
 _pkgname=squeeze
-_pkgbasever=0.4.90git
-pkgname=squeeze-git
-pkgver=0.4.90git.r1039.41aea82
+pkgname=${_pkgname}-git
+epoch=1
+pkgver=0.4.90.r460.gdc87aa3
 pkgrel=1
-pkgdesc="Squeeze is  a modern and advanced archive manager for the Xfce Desktop Environment"
-arch=(i686 x86_64)
+pkgdesc="Archive manager for the Xfce Desktop Environment (git checkout)"
+arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://www.xfce.org/"
-groups=('xfce4-git')
-makedepends=('git' 'xfce4-dev-tools' 'pkgconfig' 'gtk-doc' 'intltool' 'xfconf')
-depends=('libxfce4util' 'hicolor-icon-theme' 'dbus-glib' 'gtk2' 'gtk3' 'desktop-file-utils')
-optdepends=(
-	'lzop: .tar.lzo handling'
-	'xz: tar.xz handling'
-)
-conflicts=('squeeze')
-provides=("squeeze" "squeeze-git")
+makedepends=('git' 'xfce4-dev-tools' 'gtk-doc' 'intltool')
+depends=('gtk2' 'libxfce4util' 'dbus-glib')
+optdepends=('lzop: Compress/Decompress LZOP archives'
+            'xz: Compress/Decompress XZ archives')
+conflicts=("${_pkgname}")
+provides=("${_pkgname}=${pkgver%.r*}")
 options=('!libtool')
-install=squeeze.install
-#branch=("stephan/new-ui")
-_branch=("master")
-source=(git+git://git.xfce.org/apps/squeeze#branch=$_branch)
+source=("${_pkgname}::git://git.xfce.org/apps/squeeze")
 sha256sums=('SKIP')
 
 pkgver(){
-  cd $srcdir/$_pkgname
-  #echo "$_pkgbasever.$(git rev-parse --short HEAD)"
-   printf "%s.r%s.%s" $_pkgbasever "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  cd "${_pkgname}"
+  _p=$( git describe --long --tags | sed -r "s:^${_pkgname}.::;s/^v//;s/([^-]*-g)/r\1/;s/-/./g" )
+  _maj=$( grep -m 1 squeeze_version_major configure.in.in | sed 's:.*\[\([0-9]*\)\].*:\1:' )
+  _min=$( grep -m 1 squeeze_version_minor configure.in.in | sed 's:.*\[\([0-9]*\)\].*:\1:' )
+  _mic=$( grep -m 1 squeeze_version_micro configure.in.in | sed 's:.*\[\([0-9]*\)\].*:\1:' )
+  echo "${_maj}.${_min}.${_mic}${_p/*\.r/.r}"
 }
 
+prepare() {
+  cd "${_pkgname}"
+  # Doesn't seem like anything really uses xfconf
+  sed -i '/XDT_CHECK_PACKAGE(\[XFCONF\]/d' configure.in.in
+  sed -i '/$(XFCONF_LIBS)/d' src/Makefile.am squeeze-cli/Makefile.am
+  
+  [ ! -d m4 ] && mkdir m4
+}
+  
 
 build(){
-  cd $srcdir/$_pkgname
-
-  mkdir -p m4
+  cd "${_pkgname}"
 
-  ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/$_pkgname \
-  --localstatedir=/var --bindir=/usr/bin --sbindir=/usr/bin \
-  --libdir=/usr/lib --disable-debug
+  mv configure.in.in configure.ac.in
+  ./autogen.sh \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib/xfce4 \
+    --localstatedir=/var \
+    --bindir=/usr/bin \
+    --libdir=/usr/lib \
+    --disable-debug
 
   make
 }
 
 package() {
-	cd $srcdir/$_pkgname
-	make DESTDIR=$pkgdir sbindir=/usr/bin install
+  cd "${_pkgname}"
+
+  make DESTDIR=$pkgdir install
 }
 
diff --git a/squeeze.install b/squeeze.install
deleted file mode 100755
index 7ddc3d6d4698..000000000000
--- a/squeeze.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-  update-desktop-database -q
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}