Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/nginx/PKGBUILD
	community-testing/nginx/nginx.install
	community/chrony/PKGBUILD
	community/lxdm/PKGBUILD
	community/oidentd/PKGBUILD
	community/oss/PKGBUILD
	community/pdnsd/PKGBUILD
	community/ruby-cairo/PKGBUILD
	community/subtle/PKGBUILD
	core/kmod/PKGBUILD
	core/lvm2/PKGBUILD
	core/openldap/PKGBUILD
	core/systemd/PKGBUILD
	extra/smartmontools/PKGBUILD
	multilib/wine/PKGBUILD

1 files changed, 9 insertions, 13 deletions

diff --git a/community/e-modules-extra-svn/PKGBUILD b/community/e-modules-extra-svn/PKGBUILD
index 75e6ce15a..92b791fd4 100755
--- a/community/e-modules-extra-svn/PKGBUILD
+++ b/community/e-modules-extra-svn/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=e-modules-extra-svn
-pkgver=69748
+pkgver=72689
 pkgrel=1
 pkgdesc="Extra gadgets for e17"
 arch=('i686' 'x86_64' 'mips64el')
@@ -36,18 +36,14 @@ build() {
   cp -r $_svnmod $_svnmod-build
   cd $_svnmod-build
 
-  # fix build issue
-#  sed -i 's|efreet/Efreet.h|efreet-0/Efreet.h|' winlist-ng/src/e_mod_main.h || return 1
-
-# winlist-ng fails, add again later
-for i in alarm comp-scale cpu diskio deskshow \
-        empris engage e-tiling everything-aspell everything-mpris \
+  for i in alarm calendar comp-scale cpu diskio deskshow \
+        empris engage everything-aspell everything-mpris \
         everything-pidgin everything-places everything-shotgun \
         everything-tracker everything-wallpaper everything-websearch  \
         execwatch flame iiirk itask mail mem \
         moon mpdule net photo places quickaccess \
-        rain slideshow snow taskbar \
-        winselector xkbswitch; do
+        rain slideshow snow taskbar winlist-ng \
+        winselector; do
 
   cd $i
   ./autogen.sh --prefix=/usr
@@ -59,14 +55,14 @@ done
 package() {
   cd $srcdir/$_svnmod-build
 
-for i in alarm comp-scale cpu diskio deskshow \
-        empris engage e-tiling everything-aspell everything-mpris \
+  for i in alarm calendar comp-scale cpu diskio deskshow \
+        empris engage everything-aspell everything-mpris \
         everything-pidgin everything-places everything-shotgun \
         everything-tracker everything-wallpaper everything-websearch  \
         execwatch flame iiirk itask mail mem \
         moon mpdule net photo places quickaccess \
-        rain slideshow snow taskbar \
-        winselector xkbswitch; do
+        rain slideshow snow taskbar winlist-ng \
+        winselector; do
 
   cd $i
   make DESTDIR=$pkgdir install