Fri Nov 1 01:13:45 PDT 2013

2 files changed, 71 insertions, 89 deletions

diff --git a/community/nemo-extensions/PKGBUILD b/community/nemo-extensions/PKGBUILD
index ba89a325c..5c312e523 100644
--- a/community/nemo-extensions/PKGBUILD
+++ b/community/nemo-extensions/PKGBUILD
@@ -1,62 +1,62 @@
 # $Id$
 # Maintainer: Alexandre Filgueira <alexfilgueira@antergos.com>
 
-pkgbase="nemo-extensions"
+pkgbase=nemo-extensions
 pkgname=('nemo-fileroller'
-	'nemo-share'
-	'nemo-python'
-	'nemo-seahorse')
-	# 'nemo-media-columns'
+	 'nemo-preview'
+	 'nemo-python'
+	 'nemo-share'
+	 'nemo-seahorse')
+	#'nemo-media-columns'
 	#'nemo-pastebin'
-	#'nemo-preview'
-	# 'nemo-compare'
+	#'nemo-compare'
 	#'nemo-rabbitvcs'
 pkgver=2.0.0
-pkgrel=1
+_gitver=adeeeb12ea
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL2')
 url="https://github.com/linuxmint/nemo-extensions"
-depends=(nemo python2-gobject gconf libgnome-keyring libcryptui file-roller samba pastebinit \
-		 clutter-gtk clutter-gst gst-plugins-good cjs libmusicbrainz5 evince gtksourceview3 webkitgtk \
-     python2-dbus)
-makedepends=(gnome-common gtk-doc intltool python2-distutils-extra gobject-introspection)
+depends=(nemo file-roller cjs clutter-gtk clutter-gst gst-plugins-good libmusicbrainz5
+         evince gtksourceview3 webkitgtk python2-gobject seahorse-nautilus samba)
+makedepends=(gconf gnome-common gtk-doc intltool) # python2-distutils-extra
 options=('!emptydirs')
-source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/linuxmint/nemo-extensions/archive/master.zip")
-md5sums=('ecc7f8c34065d0bdb34778d53cf7b2fa')
+source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/linuxmint/nemo-extensions/archive/${_gitver}.tar.gz")
+md5sums=('de6a36ee77265f2a1528b29526fd6afb')
 
 prepare() {
+  cd ${pkgbase}-${_gitver}*
 
-    cd ${pkgbase}-master
+  # Python2 fix
+  find -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
 
-    # Python2 fix
-    find -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
-    
+  # Fix nemo-preview build
+  sed -i '/AM_GNU_GETTEXT/d' nemo-preview/configure.ac
 }
 
 build() {
-    cd ${pkgbase}-master
-
-    _configure_pkgs="nemo-fileroller nemo-share nemo-seahorse"
-    for dir in ${_configure_pkgs}
-    do
-      cd ${dir}
-      autoreconf -fi
-    	./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+  cd ${pkgbase}-${_gitver}*
+
+  _configure_pkgs="nemo-fileroller nemo-seahorse nemo-share"
+  for dir in ${_configure_pkgs}
+  do
+    pushd ${dir}
+    autoreconf -fi
+    ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/${dir} \
                 --disable-static --disable-schemas-compile
-    	make
-    	cd ..
-    done
-
-    #_autogen_pkgs="nemo-python nemo-preview"
-    _autogen_pkgs="nemo-python"
-    for dir in ${_autogen_pkgs}
-    do
-    	cd ${dir}
-    	./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-                --disable-static
-    	make
-    	cd ..
-    done
+    make
+    popd
+  done
+
+  _autogen_pkgs="nemo-preview nemo-python"
+  for dir in ${_autogen_pkgs}
+  do
+    pushd ${dir}
+    ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/${dir} \
+                 --disable-static --disable-schemas-compile
+    make
+    popd
+  done
 
     # # nemo-pastebin
     # cd nemo-pastebin
@@ -76,46 +76,50 @@ build() {
 }
 
 package_nemo-fileroller(){
-	cd ${pkgbase}-master/nemo-fileroller
+  pkgdesc="File archiver extension for Nemo"
+  depends=(nemo file-roller)
 
-	pkgdesc="Nemo fileroller extension"
-	arch=('i686' 'x86_64')
-	depends=(nemo file-roller)
-	make DESTDIR="${pkgdir}" install
+  cd ${pkgbase}-${_gitver}*/nemo-fileroller
+  make DESTDIR="${pkgdir}" install
 }
 
-package_nemo-share(){
-	cd ${pkgbase}-master/nemo-share
+package_nemo-preview(){
+  pkgdesc=("GtkClutter and Javascript-based quick previewer for Nemo")
+  depends=(nemo cjs clutter-gtk clutter-gst gst-plugins-good libmusicbrainz5 evince gtksourceview3 webkitgtk)
 
-	pkgdesc="Samba extension for Nemo"
-	arch=('i686' 'x86_64')
-	depends=(nemo samba)
-	make DESTDIR="${pkgdir}" install
+  cd ${pkgbase}-${_gitver}*/nemo-preview
+  make DESTDIR="${pkgdir}" install
 }
 
 package_nemo-python() {
- cd ${pkgbase}-master/nemo-python
+  pkgdesc="Python2 binding for Nemo components"
+  depends=(nemo python2-gobject)
+
+  cd ${pkgbase}-${_gitver}*/nemo-python
+  make DESTDIR="${pkgdir}" install
+}
 
- pkgdesc="Python2 binding for Nemo components"
- arch=('i686' 'x86_64')
- depends=(nemo python2-gobject)
+package_nemo-seahorse(){
+  pkgdesc="PGP encryption and signing extension for Nemo"
+  depends=(nemo seahorse-nautilus)
 
- make DESTDIR="${pkgdir}" install
+  cd ${pkgbase}-${_gitver}*/nemo-seahorse
+  make DESTDIR="${pkgdir}" install
 
+  # seahorse-tool is already in seahorse-nautilus package
+  make -C tool DESTDIR="${pkgdir}" uninstall
 }
 
-package_nemo-seahorse(){
-	cd ${pkgbase}-master/nemo-seahorse
+package_nemo-share(){
+  pkgdesc="Samba extension for Nemo"
+  depends=(nemo samba)
 
-	pkgdesc="Seahorse plugins and utilities for encryption"
-  arch=('i686' 'x86_64')
-	depends=(nemo seahorse gconf libgnome-keyring libcryptui)
-  install=nemo-seahorse.install
-	make DESTDIR="${pkgdir}" install
+  cd ${pkgbase}-${_gitver}*/nemo-share
+  make DESTDIR="${pkgdir}" install
 }
 
 # package_nemo-media-columns(){
-# 	cd ${pkgbase}-master/nemo-media-columns
+# 	cd ${pkgbase}-${_gitver}*/nemo-media-columns
 
 # 	pkgdesc=("A Nemo extension to display music/EXIF and PDF metadata info in the Nemo List View")
 # 	arch=(any)
@@ -126,7 +130,7 @@ package_nemo-seahorse(){
 # }
 
 # package_nemo-pastebin(){
-# 	cd ${pkgbase}-master/nemo-pastebin
+# 	cd ${pkgbase}-${_gitver}*/nemo-pastebin
 
 # 	pkgdesc="Nemo extension to send files to a pastebin"
 # 	arch=(any)
@@ -137,18 +141,8 @@ package_nemo-seahorse(){
 # 		--no-compile -O0
 # }
 
-# package_nemo-preview(){
-# 	cd ${pkgbase}-master/nemo-preview
-
-# 	pkgdesc=("Nemo-preview is a GtkClutter and Javascript-based quick previewer for Nemo")
-# 	arch=(any)
-# 	depends=(nemo cjs libmusicbrainz5 evince gtksourceview3 webkitgtk clutter-gtk clutter-gst gst-plugins-good)
-
-# 	make DESTDIR="${pkgdir}" install
-# }
-
 # package_nemo-compare() {
-#   cd ${pkgbase}-master/nemo-compare
+#   cd ${pkgbase}-${_gitver}*/nemo-compare
 
 #   pkgdesc="Context menu comparison extension for Nemo file manager"
 #   depends=(python2 python2-xdg meld nemo-python)
@@ -170,7 +164,7 @@ package_nemo-seahorse(){
 # }
 
 # package_nemo-rabbitvcs(){
-# 	cd ${pkgbase}-master/nemo-rabbitvcs
+# 	cd ${pkgbase}-${_gitver}*/nemo-rabbitvcs
 
 #   depends=(nemo-python python2-dbus)
 
diff --git a/community/nemo-extensions/nemo-seahorse.install b/community/nemo-extensions/nemo-seahorse.install
deleted file mode 100644
index 21f12fbda..000000000
--- a/community/nemo-extensions/nemo-seahorse.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}