Sat Jan 18 03:25:57 UTC 2014

author: Nicolás Reynolds <fauno@endefensadelsl.org> 2014-01-18 03:29:33 +0000
committer: Nicolás Reynolds <fauno@endefensadelsl.org> 2014-01-18 03:29:33 +0000
commit: f4cbb127d45017c14988b232dbae02bc2858c6df (patch)
tree: 71d864fa346c59efa48d7c029334b366c6597317 /extra
parent: 953eead14ccfe47904e73cee9cea6e1255f57356 (diff)
33 files changed, 286 insertions, 1147 deletions
diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD
index 08a3e19f1..5bbee3ddd 100644
--- a/extra/cups/PKGBUILD
+++ b/extra/cups/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 199750 2013-11-15 15:38:18Z andyrtr $
+# $Id: PKGBUILD 204308 2014-01-17 05:30:06Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase="cups"
 pkgname=('libcups' 'cups')
-pkgver=1.7.0
-pkgrel=2
+pkgver=1.7.1
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.cups.org/"
-makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'cups-filters' 'bc'
-             'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus-core' 'avahi'  'hicolor-icon-theme' 'systemd')
+makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'pam' 'xdg-utils' 'krb5' 'openssl' 'cups-filters' 'bc'
+             'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus' 'avahi'  'hicolor-icon-theme' 'systemd' 'inetutils')
 source=(#http://mirror.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
         http://www.cups.org/software/${pkgver}/cups-${pkgver}-source.tar.bz2
         cups.logrotate cups.pam
@@ -19,7 +19,6 @@ source=(#http://mirror.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.b
         cups-no-gzip-man.patch
         # FC
         cups-systemd-socket.patch
-        cups-dbus-utf8.patch
         cups-res_init.patch
         cups-avahi-address.patch
         cups-enum-all.patch
@@ -31,14 +30,13 @@ source=(#http://mirror.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.b
         cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch
         get-ppd-file-for-statically-configured-ipp-shared-queues.patch
         ppd-poll-with-client-conf.patch)
-md5sums=('5ab496a2ce27017fcdb3d7ec4818a75a'
+md5sums=('55277c40fd4b7183dc3671d39c5c42b7'
          'f861b18f4446c43918c8643dcbbd7f6d'
          '96f82c38f3f540b53f3e5144900acf17'
          '3ba9e3410df1dc3015463d615ef91b3b'
          'cc4101beccb5ed6deb1c92707a575925'
          '90c30380d4c8cd48a908cfdadae1ea24'
          '555a1c71151ce990e176315b46e3de2f'
-         'a2a88b3a3257c3b5fd3edcc169e6aca4'
          '8fe27d4248cacbc02824e7937cab4088'
          'df0c367c0022e3c7d8e01827e8a6c5e7'
          'f30c2a161caaf27854581507cde8cac6'
@@ -69,9 +67,6 @@ prepare() {
 
   # various bugfixes (upstream reports/SVN or Fedora/Debian
 
-  # Ensure attributes are valid UTF-8 in dbus notifier
-  patch -Np1 -i ${srcdir}/cups-dbus-utf8.patch
-
   # Fixed crash which sometimes happens on shutdown of the CUPS daemon, caused by a wrong shutdown sequence for shutting down the Avahi threaded poll.
 #  patch -Np1 -i ${srcdir}/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch
   # Applications could not get the PPD file for statically-configured IPP-shared print queues
@@ -112,7 +107,7 @@ build() {
      --enable-pam=yes \
      --enable-raw-printing \
      --enable-dbus --with-dbusdir=/etc/dbus-1 \
-     --enable-ssl=yes --enable-gnutls \
+     --enable-ssl=yes --enable-openssl \
      --enable-threads \
      --enable-avahi\
      --with-php=/usr/bin/php-cgi \
@@ -122,15 +117,14 @@ build() {
 
 check() {
   cd ${pkgbase}-${pkgver}
-  #httpAddrGetList(workstation64): FAIL
-  #1 TESTS FAILED!
-  #make[1]: *** [testhttp] Error 1
+#./run-stp-tests.sh: line 782:  6307 Aborted                 (core dumped) $VALGRIND ../scheduler/cupsd -c /tmp/cups-$user/cupsd.conf -f > /tmp/cups-$user/log/debug_log 2>&1
+#FAIL: 87 error messages, expected 33.
   make -k check || /bin/true
 }
 
 package_libcups() {
 pkgdesc="The CUPS Printing System - client libraries and headers"
-depends=('gnutls>=2.8.3' 'libtiff>=4.0.0' 'libpng>=1.5.7' 'krb5' 'avahi')
+depends=('openssl' 'libtiff>=4.0.0' 'libpng>=1.5.7' 'krb5' 'avahi')
 backup=(etc/cups/client.conf)
 
   cd ${pkgbase}-${pkgver}
@@ -162,7 +156,7 @@ backup=(etc/cups/cupsd.conf
         etc/logrotate.d/cups
         etc/pam.d/cups
         etc/xinetd.d/cups-lpd)
-depends=('acl' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc' 'colord' 'libusb' 'dbus-core' 'libsystemd' 'hicolor-icon-theme')
+depends=('acl' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc' 'colord' 'libusb' 'dbus' 'systemd' 'hicolor-icon-theme')
 optdepends=('xdg-utils: xdg .desktop file support')
 
   cd ${pkgbase}-${pkgver}
diff --git a/extra/cups/cups-dbus-utf8.patch b/extra/cups/cups-dbus-utf8.patch
deleted file mode 100644
index 0bcd4a163..000000000
--- a/extra/cups/cups-dbus-utf8.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-diff -up cups-1.6.1/notifier/dbus.c.dbus-utf8 cups-1.6.1/notifier/dbus.c
---- cups-1.6.1/notifier/dbus.c.dbus-utf8	2012-01-20 19:00:32.000000000 +0000
-+++ cups-1.6.1/notifier/dbus.c	2012-10-31 11:04:47.686973616 +0000
-@@ -31,6 +31,9 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
-+#include <assert.h>
-+#include <locale.h>
-+#include <wchar.h>
- 
- #ifdef HAVE_DBUS
- #  include <dbus/dbus.h>
-@@ -157,10 +160,82 @@ enum
-  * Local functions...
-  */
- 
--static int	acquire_lock(int *fd, char *lockfile, size_t locksize);
-+static int		acquire_lock(int *fd, char *lockfile, size_t locksize);
-+static const char	*validate_utf8(const char *str);
- 
- 
- /*
-+ * 'validate_utf8()' - Convert to valid UTF-8
-+ */
-+
-+static const char *
-+validate_utf8 (const char *str)
-+{
-+  static char *buffer = NULL;
-+  static size_t buflen = 0;
-+  char *p;
-+  size_t str_len;
-+  unsigned int i;
-+  mbstate_t instate, outstate;
-+
-+  if (str == NULL)
-+  {
-+    free (buffer);
-+    return (NULL);
-+  }
-+
-+  /* Is it already valid? */
-+  if (mbstowcs (NULL, str, 0) != (size_t) -1)
-+    return str;
-+
-+  /* Make sure our buffer is at least as large as the input string */
-+  str_len = strlen (str);
-+  if (str_len > buflen)
-+  {
-+    if (buffer == NULL)
-+      /* Set encoding type to UTF-8 the first time we need to */
-+      setlocale (LC_CTYPE, "en_US.UTF-8");
-+
-+    buflen = str_len + 1;
-+    buffer = realloc (buffer, buflen);
-+  }
-+
-+  memset (&instate, '\0', sizeof (mbstate_t));
-+  memset (&outstate, '\0', sizeof (mbstate_t));
-+  p = buffer;
-+  i = 0;
-+  while (i < str_len)
-+  {
-+    wchar_t wc;
-+    size_t used, written;
-+    mbstate_t orig_instate = instate;
-+    used = mbrtowc (&wc, str + i, str_len - i, &instate);
-+    switch (used)
-+    {
-+    case (size_t) -2:
-+    case (size_t) -1:
-+      wc = L'?'; /* so replacement is never longer than original char */
-+      instate = orig_instate;
-+      /* fallthru */
-+    case 0:
-+      used = 1;
-+    }
-+
-+    written = wcrtomb (p, wc, &outstate);
-+    if (written != -1)
-+    {
-+      p += written;
-+      assert (p - buffer < buflen);
-+    }
-+
-+    i += used;
-+  }
-+
-+  *p = '\0';
-+  return buffer;
-+}
-+
-+/*
-  * 'main()' - Read events and send DBUS notifications.
-  */
- 
-@@ -366,7 +441,7 @@ main(int  argc,				/* I - Number of comm
-     attr = ippFindAttribute(msg, "notify-text", IPP_TAG_TEXT);
-     if (attr)
-     {
--      const char *val = ippGetString(attr, 0, NULL);
-+      const char *val = validate_utf8 (ippGetString(attr, 0, NULL));
-       if (!dbus_message_iter_append_string(&iter, &val))
-         goto bail;
-     }
diff --git a/extra/e_dbus/PKGBUILD b/extra/e_dbus/PKGBUILD
index b4af542af..ff1c158b1 100644
--- a/extra/e_dbus/PKGBUILD
+++ b/extra/e_dbus/PKGBUILD
@@ -1,25 +1,23 @@
-# $Id: PKGBUILD 199736 2013-11-15 12:16:22Z ronald $
+# $Id: PKGBUILD 204350 2014-01-17 13:56:52Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
 pkgname=e_dbus
 pkgver=1.7.9
-pkgrel=1
+pkgrel=2
 pkgdesc="D-Bus integration with Ecore"
 arch=('i686' 'x86_64')
 url="http://www.enlightenment.org"
 license=('BSD')
-depends=('ecore' 'dbus-core')
+depends=('efl' 'dbus-core')
 options=('!emptydirs')
 source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
 sha1sums=('d1c30cf95cf6eea07c5be54bd8cfbf7eba9fb20b')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
-  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
-  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
+  export CFLAGS="${CFLAGS} -fvisibility=hidden"
 
   ./configure \
     --prefix=/usr \
@@ -42,12 +40,12 @@ build() {
 }
 
 package(){
-  cd $srcdir/$pkgname-$pkgver
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-  make DESTDIR=$pkgdir install
+  make DESTDIR="${pkgdir}" install
 
   # install license files
-  install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
-        $pkgdir/usr/share/licenses/$pkgname/COPYING
+  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/COPYING" \
+        "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }
 
diff --git a/extra/ecore/PKGBUILD b/extra/ecore/PKGBUILD
deleted file mode 100644
index 6bb17a6e8..000000000
--- a/extra/ecore/PKGBUILD
+++ /dev/null
@@ -1,97 +0,0 @@
-# $Id: PKGBUILD 199728 2013-11-15 12:13:56Z ronald $
-# Maintainer: Ronald van Haren <ronald@archlinux.org>
-# Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
-
-pkgname=ecore
-pkgver=1.7.9
-pkgrel=1
-pkgdesc="OS abstraction layer for e17"
-arch=('i686' 'x86_64')
-url="http://www.enlightenment.org"
-license=('BSD')
-depends=('eina' 'evas' 'glib2' 'libxp' 'curl' 'libxss' 'libxtst'
-  'libxcomposite' 'libxrandr' 'libxinerama' 'libxcursor')
-makedepends=('subversion')
-options=('!emptydirs')
-source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('c4343110508dc9dd1580f3349dbc1d4de2088f3d')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  
-  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
-  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
-  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
-
-  ./configure \
-    --prefix=/usr \
-    --libexecdir=/usr/lib/ecore \
-    --with-internal-maximum-log-level=3 \
-    --disable-static \
-    --disable-ecore-timer-dump \
-    --enable-glib \
-    --enable-ecore-x-composite \
-    --enable-ecore-x-damage \
-    --enable-ecore-x-dpms \
-    --enable-ecore-x-randr \
-    --enable-ecore-x-render \
-    --enable-ecore-x-screensaver \
-    --enable-ecore-x-shape \
-    --enable-ecore-x-gesture \
-    --enable-ecore-x-sync \
-    --enable-ecore-x-xfixes \
-    --enable-ecore-x-xinerama \
-    --enable-ecore-x-xprint \
-    --enable-ecore-x-xtest \
-    --enable-ecore-x-cursor \
-    --enable-ecore-x-input \
-    --enable-ecore-x-dri \
-    --enable-epoll \
-    --enable-posix-threads \
-    --disable-debug-threads \
-    --enable-atfile-source \
-    --enable-ecore-con \
-    --enable-curl \
-    --disable-gnutls \
-    --enable-openssl \
-    --enable-ecore-ipc \
-    --enable-ecore-file \
-    --enable-poll \
-    --enable-inotify \
-    --enable-ecore-imf \
-    --enable-ecore-imf-evas \
-    --enable-ecore-input \
-    --enable-ecore-input-evas \
-    --enable-ecore-imf-xim \
-    --disable-ecore-imf-scim \
-    --disable-ecore-imf-ibus \
-    --enable-ecore-x \
-    --disable-ecore-sdl \
-    --enable-ecore-fb \
-    --disable-ecore-directfb \
-    --enable-ecore-evas \
-    --enable-ecore-evas-software-buffer \
-    --enable-ecore-evas-software-x11 \
-    --enable-ecore-evas-opengl-x11 \
-    --enable-ecore-evas-fb \
-    --disable-ecore-evas-ews \
-    --disable-ecore-wayland \
-    --disable-tests \
-    --disable-coverage \
-    --disable-install-examples \
-    --disable-doc
-
-#    --enable-thread-safety # e17 starts with a non-functioning black window if enabled
-
-  make
-}
-
-package(){
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-
-# install license files
-  install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
-        $pkgdir/usr/share/licenses/$pkgname/COPYING
-}
-
diff --git a/extra/edje/PKGBUILD b/extra/edje/PKGBUILD
deleted file mode 100644
index e8f391192..000000000
--- a/extra/edje/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 199732 2013-11-15 12:15:08Z ronald $
-# Maintainer: Ronald van Haren <ronald@archlinux.org>
-# Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
-
-pkgname=edje
-pkgver=1.7.9
-pkgrel=1
-pkgdesc="A graphical design and layout library based on Evas"
-arch=('i686' 'x86_64')
-url="http://www.enlightenment.org"
-license=('BSD')
-depends=('eina' 'ecore' 'evas' 'eio' 'lua' 'shared-mime-info' 'embryo')
-optdepends=('python2: inkscape2edc')
-install=edje.install
-options=('!emptydirs')
-source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('fe5fa239d75e96c7e02c58abb75776a54817654d')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
-  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
-  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
-
-  # python2 fix
-  sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' utils/inkscape2edc
-
-  ./configure \
-    --prefix=/usr \
-    --disable-static \
-    --disable-sndfile \
-    --disable-remix \
-    --disable-vorbisenc \
-    --disable-alsa \
-    --disable-flac \
-    --disable-tests \
-    --disable-coverage \
-    --enable-amalgamation \
-    --disable-doc
-  make
-}
-
-package(){
-  cd $srcdir/$pkgname-$pkgver
-
-  make DESTDIR=$pkgdir install
-
-  # install license files
-  install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
-        $pkgdir/usr/share/licenses/$pkgname/COPYING
-}
-
diff --git a/extra/edje/changeset_76449.diff b/extra/edje/changeset_76449.diff
deleted file mode 100644
index 1a1406b4e..000000000
--- a/extra/edje/changeset_76449.diff
+++ /dev/null
@@ -1,46 +0,0 @@
-Index: /trunk/edje/src/bin/edje_cc_out.c
-===================================================================
---- /trunk/edje/src/bin/edje_cc_out.c	(revision 76448)
-+++ /trunk/edje/src/bin/edje_cc_out.c	(revision 76449)
-@@ -1882,25 +1882,30 @@
-              for (i = 0 ; i < pc->programs.fnmatch_count ; i++)
-                {
--                  if (!strcmp(pl->u.ep->name, pc->programs.fnmatch[i]->name))
-+                  if (pl->u.ep->name && pc->programs.fnmatch[i]->name &&
-+                      !strcmp(pl->u.ep->name, pc->programs.fnmatch[i]->name))
-                     data_queue_anonymous_lookup(pc, pc->programs.fnmatch[i], dest);
-                }
-              for (i = 0 ; i < pc->programs.strcmp_count ; i++)
-                {
--                  if (!strcmp(pl->u.ep->name, pc->programs.strcmp[i]->name))
-+                  if (pl->u.ep->name && pc->programs.strcmp[i]->name &&
-+                      !strcmp(pl->u.ep->name, pc->programs.strcmp[i]->name))
-                     data_queue_anonymous_lookup(pc, pc->programs.strcmp[i], dest);
-                }
-              for (i = 0 ; i < pc->programs.strncmp_count ; i++)
-                {
--                  if (!strcmp(pl->u.ep->name, pc->programs.strncmp[i]->name))
-+                  if (pl->u.ep->name && pc->programs.strncmp[i]->name &&
-+                      !strcmp(pl->u.ep->name, pc->programs.strncmp[i]->name))
-                     data_queue_anonymous_lookup(pc, pc->programs.strncmp[i], dest);
-                }
-              for (i = 0 ; i < pc->programs.strrncmp_count ; i++)
-                {
--                  if (!strcmp(pl->u.ep->name, pc->programs.strrncmp[i]->name))
-+                  if (pl->u.ep->name && pc->programs.strrncmp[i]->name &&
-+                      !strcmp(pl->u.ep->name, pc->programs.strrncmp[i]->name))
-                     data_queue_anonymous_lookup(pc, pc->programs.strrncmp[i], dest);
-                }
-              for (i = 0 ; i < pc->programs.nocmp_count ; i++)
-                {
--                  if (!strcmp(pl->u.ep->name, pc->programs.nocmp[i]->name))
-+                  if (pl->u.ep->name && pc->programs.nocmp[i]->name &&
-+                      !strcmp(pl->u.ep->name, pc->programs.nocmp[i]->name))
-                     data_queue_anonymous_lookup(pc, pc->programs.nocmp[i], dest);
-                }
-@@ -2450,4 +2455,5 @@
- {
-    Code_Lookup *cl;
-+
-    cl = mem_alloc(SZ(Code_Lookup));
-    cl->ptr = ptr;
diff --git a/extra/eet/PKGBUILD b/extra/eet/PKGBUILD
deleted file mode 100644
index e9c9adfd2..000000000
--- a/extra/eet/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 199725 2013-11-15 12:12:55Z ronald $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Ronald van Haren <ronald.archlinux.org>
-
-pkgname=eet
-pkgver=1.7.9
-pkgrel=1
-pkgdesc="A data storage and compression library"
-arch=('i686' 'x86_64')
-url="http://www.enlightenment.org"
-license=('BSD')
-depends=('libjpeg>=7' 'openssl' 'eina')
-source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('843eb9733f6c01442b9c1379e9a48b69bfd5081f')
-
-build() {
-   cd $srcdir/$pkgname-$pkgver
-
-  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
-  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
-  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
-
-  ./configure --prefix=/usr --enable-openssl --disable-gnutls \
-	--disable-build-examples \
-	--disable-doc --disable-install-examples \
-	--disable-old-eet-file-format --disable-tests \
-	--disable-static
-  make
-}
-
-package(){
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install 
-
-  # install license files
-  install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
-        $pkgdir/usr/share/licenses/$pkgname/COPYING
-}
-
-
diff --git a/extra/eeze/PKGBUILD b/extra/eeze/PKGBUILD
deleted file mode 100644
index 6b3bc880a..000000000
--- a/extra/eeze/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 199730 2013-11-15 12:14:34Z ronald $
-# Maintainer: Ronald van Haren <ronald@archlinux.org>
-# Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
-
-pkgname=eeze
-pkgver=1.7.9
-pkgrel=1
-pkgdesc="Manipulate devices using udev and sysfs"
-arch=('i686' 'x86_64')
-url="http://www.enlightenment.org"
-license=('BSD')
-depends=('ecore' 'eina' 'udev')
-options=('!emptydirs')
-source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('6651d9b7723dda9dc00be093097a12a52764d431')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
-  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
-  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
-
-  ./configure \
-    --prefix=/usr \
-    --disable-static \
-    --disable-tests \
-    --disable-doc
-  make
-}
-
-package(){
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-
-  # install license files
-  install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
-        $pkgdir/usr/share/licenses/$pkgname/COPYING
-}
-
diff --git a/extra/efl/PKGBUILD b/extra/efl/PKGBUILD
new file mode 100644
index 000000000..0e2a1ec89
--- /dev/null
+++ b/extra/efl/PKGBUILD
@@ -0,0 +1,63 @@
+# $Id: PKGBUILD 204339 2014-01-17 09:41:33Z ronald $
+# Maintainer: Ronald van Haren <ronald@archlinux.org>
+# Contributor: Enlightenment Developers <enlightenment-devel@enlightenment.org>
+
+pkgbase=efl
+pkgname=('efl' 'efl-docs')
+pkgver=1.8.4
+pkgrel=1
+pkgdesc="Enlightenment Foundation Libraries"
+arch=('i686' 'x86_64')
+url="http://www.enlightenment.org"
+license=('BSD' 'LGPL2.1' 'GPL2' 'custom')
+depends=('bullet' 'libjpeg-turbo' 'gstreamer0.10-base-plugins'
+         'lua' 'curl' 'fribidi' 'libpulse' 'libxcomposite'
+         'libxinerama' 'libxrandr' 'libxss' 'python2'
+         'libxcursor' 'libxp' 'libwebp' 'shared-mime-info')
+makedepends=('doxygen')
+replaces=('ecore' 'edje' 'eet' 'eeze' 'efreet' 'eina' 'eio' 'embryo' 
+	'emotion' 'ethumb' 'evas')
+options=('!emptydirs')
+source=(http://download.enlightenment.org/rel/libs/${pkgname}/$pkgname-$pkgver.tar.gz)
+install=efl.install
+sha1sums=('48f8c82931153eef23ad9e694be4ed8f7ba857a1')
+
+prepare() {
+  sed -i 's/env python$/&2/' "${srcdir}/${pkgname}-${pkgver}/src/scripts/eina/eina-bench-cmp"
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  export CFLAGS="$CFLAGS -fvisibility=hidden"
+
+  ./configure --prefix=/usr \
+  --disable-static --disable-tslib --enable-fb \
+  --enable-xinput22 --enable-multisense --enable-systemd \
+  --enable-image-loader-webp --enable-harfbuzz 
+
+  make
+  make -j1 doc
+}
+
+package_efl(){
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR=${pkgdir} install
+
+  # install non-standard license files
+  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/licenses/COPYING.BSD" \
+	"${pkgdir}/usr/share/licenses/${pkgname}/COPYING.BSD"
+  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/licenses/COPYING.SMALL" \
+	"${pkgdir}/usr/share/licenses/${pkgname}/COPYING.SMALL"
+}
+
+package_efl-docs() {
+  pkgdesc="Documentation for the Enlightenment Foundation Libraries"
+  depends=()
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  install -d "${pkgdir}/usr/share/doc/${pkgbase}"
+  cp -a doc/html "${pkgdir}/usr/share/doc/${pkgbase}/html"
+  cp -a doc/latex "${pkgdir}/usr/share/doc/${pkgbase}/latex"
+}
+
diff --git a/extra/edje/edje.install b/extra/efl/efl.install
index 8407f4576..8407f4576 100644
--- a/extra/edje/edje.install
+++ b/extra/efl/efl.install
diff --git a/extra/efreet/PKGBUILD b/extra/efreet/PKGBUILD
deleted file mode 100644
index 43c9ee017..000000000
--- a/extra/efreet/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 199735 2013-11-15 12:16:06Z ronald $
-# Maintainer: Ronald van Haren <ronald@archlinux.org>
-# Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
-
-pkgname=efreet
-pkgver=1.7.9
-pkgrel=1
-pkgdesc="FreeDesktop.Org specifications for e17"
-arch=('i686' 'x86_64')
-url="http://www.enlightenment.org"
-license=('BSD')
-depends=('eina' 'ecore' 'e_dbus')
-options=('!emptydirs')
-source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('7f12f4c943b572b5470ce11aad2d5f4054b22dc7')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
-  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
-  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
-
-  ./configure \
-    --prefix=/usr \
-    --disable-static \
-    --disable-tests \
-    --disable-coverage \
-    --disable-doc
-
-  make
-}
-
-package(){
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-
-  # install license files
-  install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
-        $pkgdir/usr/share/licenses/$pkgname/COPYING
-}
-
-
-
diff --git a/extra/eina/PKGBUILD b/extra/eina/PKGBUILD
deleted file mode 100644
index 625deba4e..000000000
--- a/extra/eina/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 199724 2013-11-15 12:12:34Z ronald $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Ronald van Haren <ronald.archlinux.org>
-
-pkgname=eina
-pkgver=1.7.9
-pkgrel=1
-pkgdesc="A core data structure and common utility library"
-arch=('i686' 'x86_64')
-url="http://www.enlightenment.org"
-license=('LGPL2.1')
-depends=('glibc')
-options=('!emptydirs')
-source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('26f385e888b29876c8fb06f35f0433ab7e3251d5')
-
-build() {
-   cd $srcdir/$pkgname-$pkgver
-
-  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
-  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
-  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
-
-  ./configure --prefix=/usr --enable-amalgamation \
-	--with-internal-maximum-log-level=3 \
-	--disable-static \
-	--disable-benchmark \
-	--disable-install-examples \
-	--disable-build-examples \
-	--disable-doc \
-	--disable-tests \
-	--enable-default-mempool \
-	--enable-mempool-chained-pool \
-	--enable-mempool-pass-through \
-	--disable-mempool-buddy \
-	--disable-mempool-ememoa-fixed \
-	--disable-mempool-ememoa-unknown \
-	--disable-mempool-fixed-bitmap \
-	--disable-assert \
-	--disable-ememoa 
-
-#	--disable-mempool-one-big ## this option causes a segfault in 1.7.2
-
-  make
-}
-
-package(){
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-}
-
diff --git a/extra/eio/PKGBUILD b/extra/eio/PKGBUILD
deleted file mode 100644
index 0c270b1f5..000000000
--- a/extra/eio/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 199729 2013-11-15 12:14:20Z ronald $
-# Maintainer: Ronald van Haren <ronald@archlinux.org>
-# Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
-
-pkgname=eio
-pkgver=1.7.9
-pkgrel=1
-pkgdesc="Async IO library using Ecore"
-arch=('i686' 'x86_64')
-url="http://www.enlightenment.org"
-license=('BSD')
-depends=('ecore')
-options=('!emptydirs')
-source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('6a849c5da4b1213d018ca46dcea1130a135e99e6')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
-  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
-  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
-
-  ./configure \
-    --prefix=/usr \
-    --disable-static \
-    --enable-posix-threads \
-    --disable-debug-threads \
-    --enable-inotify \
-    --disable-install-examples \
-    --disable-doc
-  make
-}
-
-package(){
-  cd $pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-
-  # install license files
-  install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
-  	$pkgdir/usr/share/licenses/$pkgname/COPYING
-}
-
diff --git a/extra/elementary/PKGBUILD b/extra/elementary/PKGBUILD
index 3ab2df129..09751d894 100644
--- a/extra/elementary/PKGBUILD
+++ b/extra/elementary/PKGBUILD
@@ -1,54 +1,50 @@
-# $Id: PKGBUILD 199737 2013-11-15 12:16:38Z ronald $
+# $Id: PKGBUILD 204342 2014-01-17 09:42:37Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
-pkgname=elementary
-pkgver=1.7.9
+pkgbase=elementary
+pkgname=('elementary' 'elementary-docs')
+pkgver=1.8.3
 pkgrel=1
 pkgdesc="Enlightenment's widget set"
 arch=('i686' 'x86_64')
 url="http://www.enlightenment.org"
 license=('BSD')
-depends=('edje' 'e_dbus' 'efreet' 'ethumb' 'eio')
+depends=('efl' 'evas_generic_loaders')
+makedepends=('doxygen' 'imagemagick')
 options=('!emptydirs')
-source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('4d68e4f77d6b3471a45a4e33ae3af18d0ca42ab1')
+source=(http://download.enlightenment.org/rel/libs/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+sha1sums=('818b01fb029fa45af41680da5f1aec938ffcc26e')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
-  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
-  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
+  export CFLAGS="$CFLAGS -fvisibility=hidden"
+	
   ./configure \
     --prefix=/usr \
-    --libexecdir=/usr/lib/elementary \
-    --with-internal-maximum-log-level=3 \
-    --disable-static \
-    --enable-quick-launch \
-    --enable-emotion \
-    --enable-ecore-x \
-    --enable-ecore-fb \
-    --disable-ecore-sdl \
-    --disable-ecore-wayland \
-    --enable-edbus \
-    --enable-efreet \
-    --disable-eweather \
-    --disable-emap \
-    --enable-ethumb \
-    --disable-debug \
-    --disable-install-examples \
-    --disable-doc
+    --disable-static
   make
+  make -j1 doc
 }
 
-package(){
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
+package_elementary(){
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR=${pkgdir} install
 
   # install license files
-  install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
-        $pkgdir/usr/share/licenses/$pkgname/COPYING
+  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/COPYING" \
+        "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }
 
+package_elementary-docs() {
+  pkgdesc="Documentation for Elementary GUI toolkit"
+  depends=()
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  install -d "${pkgdir}/usr/share/doc/${pkgbase}"
+  cp -a doc/html "${pkgdir}/usr/share/doc/${pkgbase}/html"
+  cp -a doc/latex "${pkgdir}/usr/share/doc/${pkgbase}/latex"
+}
+
+
diff --git a/extra/embryo/PKGBUILD b/extra/embryo/PKGBUILD
deleted file mode 100644
index 4c1096faf..000000000
--- a/extra/embryo/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 199731 2013-11-15 12:14:50Z ronald $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Ronald van Haren <ronald.archlinux.org>
-
-pkgname=embryo
-pkgver=1.7.9
-pkgrel=1
-pkgdesc="implementation of a C like scripting language for e17"
-arch=('i686' 'x86_64')
-url="http://www.enlightenment.org"
-license=('BSD')
-depends=('glibc' 'eina')
-source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('1644da0be669213ce9ed29f1b58e9c6f3ab7c05c')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
-  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
-  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
-
-  ./configure --prefix=/usr \
-	--disable-static \
-	--disable-doc
-  make
-}
-
-package(){
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-
-  # install license files
-  install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
-        $pkgdir/usr/share/licenses/$pkgname/COPYING
-}
-
diff --git a/extra/emotion/PKGBUILD b/extra/emotion/PKGBUILD
deleted file mode 100644
index 2de034f68..000000000
--- a/extra/emotion/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 199733 2013-11-15 12:15:33Z ronald $
-# Maintainer: Ronald van Haren <ronald@archlinux.org>
-# Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
-
-pkgname=emotion
-pkgver=1.7.9
-pkgrel=1
-pkgdesc="Library to easily integrate media playback into EFL applications"
-arch=('i686' 'x86_64')
-url="http://www.enlightenment.org"
-license=('BSD')
-depends=('gstreamer0.10' 'edje' 'eeze')
-options=('!emptydirs')
-source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('c7817d6252ed90d06f9e4ef491f9399fb6213990')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  
-  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
-  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
-  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
-
-  ./configure \
-    --prefix=/usr \
-    --disable-static \
-    --enable-generic \
-    --enable-gstreamer \
-    --disable-generic-vlc \
-    --disable-xine \
-    --disable-install-examples \
-    --disable-doc
-  make
-}
-
-package(){
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-
-  # install license files
-  install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
-        $pkgdir/usr/share/licenses/$pkgname/COPYING
-}
-
diff --git a/extra/emotion_generic_players/PKGBUILD b/extra/emotion_generic_players/PKGBUILD
new file mode 100644
index 000000000..f29311a09
--- /dev/null
+++ b/extra/emotion_generic_players/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 204341 2014-01-17 09:42:17Z ronald $
+# Maintainer: Ronald van Haren <ronald@archlinux.org>
+# Contributor: Enlightenment Developers <enlightenment-devel@enlightenment.org>
+
+pkgname=emotion_generic_players
+pkgver=1.8.0
+pkgrel=2
+pkgdesc="Enlightenment Foundation Libraries"
+arch=('i686' 'x86_64')
+url="http://www.enlightenment.org"
+license=('BSD')
+depends=('efl' 'vlc')
+options=('!emptydirs')
+source=(http://download.enlightenment.org/rel/libs/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+sha1sums=('945c003150ceb912eabbd22323ada5363f0e40d1')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  export CFLAGS="$CFLAGS -fvisibility=hidden"
+
+  ./configure \
+    --prefix=/usr
+  make
+}
+
+package(){
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR=${pkgdir} install
+
+  # install license files
+  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/COPYING" \
+  	"${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+}
+
diff --git a/extra/enlightenment/PKGBUILD b/extra/enlightenment/PKGBUILD
new file mode 100644
index 000000000..06481e29f
--- /dev/null
+++ b/extra/enlightenment/PKGBUILD
@@ -0,0 +1,40 @@
+# Maintainer: Ronald van Haren <ronald@archlinux.org>
+# Contributor: Enlightenment Developers <enlightenment-devel@enlightenment.org>>
+
+pkgname=enlightenment
+pkgver=0.18.2
+pkgrel=1
+pkgdesc="Enlightenment window manager"
+arch=('i686' 'x86_64' 'arm')
+url="http://www.enlightenment.org"
+license=('BSD')
+depends=('elementary' 'xcb-util-keysyms' 'hicolor-icon-theme' 'pixman' 'mesa'
+         'desktop-file-utils' 'udisks2' 'ttf-font' 'bluez-libs')
+optdepends=('connman: network module'
+            'acpid: power events on laptop lid close')
+provides=("enlightenment17=$pkgver" 'notification-daemon')
+conflicts=("enlightenment17")
+replaces=("enlightenment17")
+backup=('etc/enlightenment/sysactions.conf'
+        'etc/xdg/menus/enlightenment.menu')
+source=(http://download.enlightenment.org/rel/apps/${pkgname}/$pkgname-$pkgver.tar.gz)
+install=enlightenment.install
+sha1sums=('e293108b8c5d6c7643ea868550763c9e8e0d6d08')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  export CFLAGS="$CFLAGS -fvisibility=hidden"
+
+  ./configure --prefix=/usr --sysconfdir=/etc \
+	--enable-wayland-clients --enable-wayland-egl
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make -j1 DESTDIR="$pkgdir" install
+
+  # install LICENSE
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
diff --git a/extra/enlightenment17/enlightenment17.install b/extra/enlightenment/enlightenment.install
index 0e3216ffe..1182e768f 100644
--- a/extra/enlightenment17/enlightenment17.install
+++ b/extra/enlightenment/enlightenment.install
@@ -1,11 +1,6 @@
 post_install() {
   update-mime-database usr/share/mime > /dev/null
   update-desktop-database -q
-
-cat << EOF
-Enlightenment is configured to use systemd by default for shutdown/sleep purposes. 
-This can be changed in /etc/enlightenment/sysactions.conf.
-EOF
 }
 
 post_upgrade() {
diff --git a/extra/enlightenment17/PKGBUILD b/extra/enlightenment17/PKGBUILD
deleted file mode 100644
index feb4007bf..000000000
--- a/extra/enlightenment17/PKGBUILD
+++ /dev/null
@@ -1,87 +0,0 @@
-# $Id: PKGBUILD 199739 2013-11-15 12:19:48Z ronald $
-# Maintainer: Ronald van Haren <ronald@archlinux.org>
-# Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
-
-pkgname=enlightenment17
-_pkgname=enlightenment
-pkgver=0.17.5
-pkgrel=1
-pkgdesc="Enlightenment window manager DR17 (aka e17)"
-arch=('i686' 'x86_64')
-url="http://www.enlightenment.org"
-license=('BSD')
-depends=('alsa-lib' 'pam' 'shared-mime-info' 'hicolor-icon-theme'
-  'desktop-file-utils' 'e_dbus' 'edje' 'eeze' 'efreet'
-  'eio' 'elementary' 'xcb-util-keysyms' 'udisks' 'systemd' 'ttf-font')
-optdepends=('connman: network module')
-provides=('notification-daemon' 'e')
-backup=('etc/enlightenment/sysactions.conf')
-options=('!emptydirs')
-install=enlightenment17.install
-source=(http://download.enlightenment.org/releases/$_pkgname-$pkgver.tar.gz
-  'e-applications.menu' 'quickstart.patch' 'sysactions_systemd.patch')
-sha1sums=('8fd40ad2df2eb96a3d6583bcd19d150d594a6e86'
-          'e08cc63cb8a188a06705b42d03e032b9fcfa7ee5'
-          '3f53931ae86de8fe99e386aeb097521aac0decd8'
-          '86f1c5e36dc274c3101362532378be034e89c593')
-	
-prepare() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  patch -p0 < $srcdir/quickstart.patch
-
-  # default to systemd for sysactions
-  patch -Np0 < $srcdir/sysactions_systemd.patch
-
-}
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
-  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
-  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib/enlightenment  \
-    --enable-strict \
-    --disable-static \
-    --enable-pam \
-    --disable-device-hal \
-    --enable-device-udev \
-    --disable-mount-hal \
-    --enable-mount-udisks \
-    --enable-mount-eeze \
-    --enable-elementary \
-    --enable-emotion \
-    --enable-enotify \
-    --disable-ephysics \
-    --disable-wayland-clients \
-    --disable-conf-wallpaper2 \
-    --disable-illume2 \
-    --disable-physics \
-    --disable-doc
-  make
-}
-
-package() {
-  cd $srcdir/$_pkgname-$pkgver
-
-  make DESTDIR=$pkgdir install
-
-# install license files
-  if [ -e $srcdir/$_pkgname-$pkgver/COPYING ]; then
-    install -Dm644 $srcdir/$_pkgname-$pkgver/COPYING \
-        $pkgdir/usr/share/licenses/$pkgname/COPYING
-  fi
-
-  if [ -e $srcdir/$_pkgname-$pkgver/COPYING-PLAIN ]; then
-    install -Dm644 $srcdir/$_pkgname-$pkgver/COPYING-PLAIN \
-        $pkgdir/usr/share/licenses/$pkgname/COPYING-PLAIN
-  fi
-
-  # install a default applications.menu file (mostly copy from gnome-menus)
-  install -Dm644 $srcdir/e-applications.menu \
-	$pkgdir/etc/xdg/menus/e-applications.menu
-}
-
diff --git a/extra/enlightenment17/blackscreenfix.patch b/extra/enlightenment17/blackscreenfix.patch
deleted file mode 100644
index 817d6c105..000000000
--- a/extra/enlightenment17/blackscreenfix.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From b17a9b9cc9438b6dfac4402ac4107f08e23a4373 Mon Sep 17 00:00:00 2001
-From: Chris Michael <cp.michael@samsung.com>
-Date: Wed, 29 May 2013 11:50:17 +0000
-Subject: Backport: 45b4d9f :: Move xinerama init until After randr has setup the screens.
-
-NB: Old Man, THIS should fix your black screen problem ;)
-
-Signed-off-by: Chris Michael <cp.michael@samsung.com>
-Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
----
-diff --git a/src/bin/e_main.c b/src/bin/e_main.c
-index ee8fd8a..ed58cfd 100644
---- a/src/bin/e_main.c
-+++ b/src/bin/e_main.c
-@@ -462,15 +462,6 @@ main(int argc, char **argv)
-    TS("E_Alert Init Done");
-    _e_main_shutdown_push(e_alert_shutdown);
- 
--   TS("E_Xinerama Init");
--   if (!e_xinerama_init())
--     {
--        e_error_message_show(_("Enlightenment cannot initialize E_Xinerama!\n"));
--        _e_main_shutdown(-1);
--     }
--   TS("E_Xinerama Init Done");
--   _e_main_shutdown_push(e_xinerama_shutdown);
--
-    TS("E_Hints Init");
-    e_hints_init();
-    TS("E_Hints Init Done");
-@@ -521,6 +512,15 @@ main(int argc, char **argv)
-      _e_main_shutdown_push(e_randr_shutdown);
-    TS("E_Randr Init Done");
- 
-+   TS("E_Xinerama Init");
-+   if (!e_xinerama_init())
-+     {
-+        e_error_message_show(_("Enlightenment cannot initialize E_Xinerama!\n"));
-+        _e_main_shutdown(-1);
-+     }
-+   TS("E_Xinerama Init Done");
-+   _e_main_shutdown_push(e_xinerama_shutdown);
-+
-    TS("E_Env Init");
-    if (!e_env_init())
-      {
---
-cgit v0.9.2
diff --git a/extra/enlightenment17/e-applications.menu b/extra/enlightenment17/e-applications.menu
deleted file mode 100644
index 69456c1d5..000000000
--- a/extra/enlightenment17/e-applications.menu
+++ /dev/null
@@ -1,154 +0,0 @@
-<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
- "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
-
-<Menu>
-
-  <Name>Applications</Name>
-  <Directory>X-E-Menu-Applications.directory</Directory>
-
-  <!-- Scan legacy dirs first, as later items take priority -->
-  <KDELegacyDirs/>
-  <LegacyDir>/etc/X11/applnk</LegacyDir>
-  <LegacyDir>/usr/share/gnome/apps</LegacyDir>
-
-  <!-- Read standard .directory and .desktop file locations -->
-  <DefaultAppDirs/>
-  <DefaultDirectoryDirs/>
-
-  <!-- Read in overrides and child menus from applications-merged/ -->
-  <DefaultMergeDirs/>
-
-  <!-- Accessories submenu -->
-  <Menu>
-    <Name>Accessories</Name>
-    <Directory>Utility.directory</Directory>
-    <Include>
-      <And>
-        <Category>Utility</Category>
-	<!-- Accessibility spec must have either the Utility or Settings
-	     category, and we display an accessibility submenu already for
-	     the ones that do not have Settings, so don't display accessibility
-	     applications here -->
-        <Not><Category>Accessibility</Category></Not>
-        <Not><Category>System</Category></Not>
-      </And>
-    </Include>
-  </Menu> <!-- End Accessories -->
-
-  <!-- Accessibility submenu -->
-  <Menu>
-    <Name>Universal Access</Name>
-    <Directory>Utility-Accessibility.directory</Directory>
-    <Include>
-      <And>
-        <Category>Accessibility</Category>
-        <Not><Category>Settings</Category></Not>
-      </And>
-    </Include>
-  </Menu> <!-- End Accessibility -->
-
-  <!-- Development Tools -->
-  <Menu>
-    <Name>Development</Name>
-    <Directory>Development.directory</Directory>
-    <Include>
-      <And>
-        <Category>Development</Category>
-      </And>
-      <Filename>emacs.desktop</Filename>
-    </Include>
-  </Menu> <!-- End Development Tools -->
-
-  <!-- Education -->
-  <Menu>
-    <Name>Education</Name>
-    <Directory>Education.directory</Directory>
-    <Include>
-      <And>
-        <Category>Education</Category>
-      </And>
-    </Include>
-  </Menu> <!-- End Education -->
-
-  <!-- Games -->
-  <Menu>
-    <Name>Games</Name>
-    <Directory>Game.directory</Directory>
-    <Include>
-      <And>
-        <Category>Game</Category>
-      </And>
-    </Include>
-  </Menu> <!-- End Games -->
-
-  <!-- Graphics -->
-  <Menu>
-    <Name>Graphics</Name>
-    <Directory>Graphics.directory</Directory>
-    <Include>
-      <And>
-        <Category>Graphics</Category>
-      </And>
-    </Include>
-  </Menu> <!-- End Graphics -->
-
-  <!-- Internet -->
-  <Menu>
-    <Name>Internet</Name>
-    <Directory>Network.directory</Directory>
-    <Include>
-      <And>
-        <Category>Network</Category>
-      </And>
-    </Include>
-  </Menu>   <!-- End Internet -->
-
-  <!-- Multimedia -->
-  <Menu>
-    <Name>Multimedia</Name>
-    <Directory>AudioVideo.directory</Directory>
-    <Include>
-      <And>
-        <Category>AudioVideo</Category>
-      </And>
-    </Include>
-  </Menu>   <!-- End Multimedia -->
-
-  <!-- Office -->
-  <Menu>
-    <Name>Office</Name>
-    <Directory>Office.directory</Directory>
-    <Include>
-      <And>
-        <Category>Office</Category>
-      </And>
-    </Include>
-  </Menu> <!-- End Office -->
-
-  <!-- System Tools-->
-  <Menu>
-    <Name>System</Name>
-    <Directory>System-Tools.directory</Directory>
-    <Include>
-      <And>
-        <Category>System</Category>
-        <Not><Category>Settings</Category></Not>
-      </And>
-    </Include>
-  </Menu>   <!-- End System Tools -->
-
-  <!-- Other -->
-  <Menu>
-    <Name>Other</Name>
-    <Directory>X-GNOME-Other.directory</Directory>
-    <OnlyUnallocated/>
-    <Include>
-      <And>
-        <Not><Category>Core</Category></Not>
-        <Not><Category>Settings</Category></Not>
-        <Not><Category>Screensaver</Category></Not>
-      </And>
-    </Include>
-  </Menu> <!-- End Other -->
-
-</Menu> <!-- End Applications -->
diff --git a/extra/enlightenment17/quickstart.patch b/extra/enlightenment17/quickstart.patch
deleted file mode 100644
index 6b7f372dc..000000000
--- a/extra/enlightenment17/quickstart.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/bin/e_main.c
-===================================================================
---- src/bin/e_main.c	(revision 78707)
-+++ src/bin/e_main.c	(working copy)
-@@ -101,7 +101,7 @@
- static Eina_Bool _e_main_cb_startup_fake_end(void *data __UNUSED__);
- 
- /* local variables */
--static Eina_Bool really_know = EINA_FALSE;
-+static Eina_Bool really_know = EINA_TRUE;
- static Eina_Bool locked = EINA_FALSE;
- static Eina_Bool inloop = EINA_FALSE;
- static jmp_buf x_fatal_buff;
diff --git a/extra/enlightenment17/sysactions_systemd.patch b/extra/enlightenment17/sysactions_systemd.patch
deleted file mode 100644
index 5d535dd60..000000000
--- a/extra/enlightenment17/sysactions_systemd.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- data/etc/sysactions.conf.in	2012-10-31 17:28:49.000000000 +0100
-+++ data/etc/sysactions.conf.in.bak	2012-11-27 19:27:15.955334382 +0100
-@@ -43,10 +43,10 @@
- # user and group name can use glob matches (* == all for example) like the
- # shell. as can action names allowed or denied. 
- 
--action:   halt      /sbin/shutdown -h now
--action:   reboot    /sbin/shutdown -r now
--action:   suspend   @SUSPEND@
--action:   hibernate @HIBERNATE@
-+action:   halt      /usr/bin/systemctl poweroff
-+action:   reboot    /usr/bin/systemctl reboot
-+action:   suspend   /usr/bin/systemctl suspend
-+action:   hibernate /usr/bin/systemctl hibernate
- action:   /bin/mount /bin/mount
- action:   /bin/umount /bin/umount
- action:   /usr/bin/eject /usr/bin/eject
diff --git a/extra/ethumb/PKGBUILD b/extra/ethumb/PKGBUILD
deleted file mode 100644
index ed0efc222..000000000
--- a/extra/ethumb/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 199734 2013-11-15 12:15:50Z ronald $
-# Maintainer: Ronald van Haren <ronald@archlinux.org>
-# Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
-
-pkgname=ethumb
-pkgver=1.7.9
-pkgrel=1
-pkgdesc="Thumbnailing library and D-Bus service using EFL"
-arch=('i686' 'x86_64')
-url="http://www.enlightenment.org"
-license=('BSD')
-depends=('libexif' 'e_dbus'  'emotion')
-options=('!emptydirs')
-source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('7f9a7e536de7a598e921709c3ba0d23850f4494f')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
-  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
-  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
-
-  ./configure \
-    --prefix=/usr \
-    --libexecdir=/usr/lib/ethumb \
-    --with-internal-maximum-log-level=3 \
-    --disable-static \
-    --enable-emotion \
-    --disable-epdf \
-    --enable-libexif \
-    --disable-install-examples \
-    --disable-doc
-  make
-}
-
-package(){
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-
-  # install license files
-  install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
-        $pkgdir/usr/share/licenses/$pkgname/COPYING
-}
-
diff --git a/extra/evas/PKGBUILD b/extra/evas/PKGBUILD
deleted file mode 100644
index afacfe056..000000000
--- a/extra/evas/PKGBUILD
+++ /dev/null
@@ -1,67 +0,0 @@
-# $Id: PKGBUILD 199727 2013-11-15 12:13:26Z ronald $
-# Maintainer: Ronald van Haren <ronald@archlinux.org>
-# Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
-
-pkgname=evas
-pkgver=1.7.9
-pkgrel=1
-pkgdesc="A hardware-accelerated canvas API for X-Windows"
-arch=('i686' 'x86_64')
-url="http://www.enlightenment.org"
-license=('BSD')
-depends=('eet' 'giflib' 'libpng' 'libjpeg' 'libxrender' 'mesa'
-  'fribidi' 'fontconfig' 'freetype2' 'harfbuzz' 'evas_generic_loaders')
-options=('!emptydirs')
-source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('5804cf35451f4e05185b6ae9103b0390c0dfed5d')
-
-build() {
-  cd $pkgname-$pkgver
-
-  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
-  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
-  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
-
-  ./configure \
-    --prefix=/usr \
-    --libexecdir=/usr/lib/evas \
-    --enable-strict \
-    --disable-static \
-    --enable-fontconfig \
-    --enable-fribidi \
-    --enable-harfbuzz \
-    --disable-pixman \
-    --enable-buffer=static \
-    --disable-gl-sdl \
-    --enable-fb \
-    --disable-directfb \
-    --disable-wayland-shm \
-    --disable-wayland-egl \
-    --disable-sdl-primitive \
-    --disable-software-xcb \
-    --enable-software-xlib=static \
-    --disable-gl-xcb \
-    --enable-gl-xlib \
-    --disable-image-loader-edb \
-    --enable-image-loader-gif=static \
-    --enable-image-loader-tiff=static \
-    --enable-image-loader-svg=static \
-    --enable-image-loader-eet=static \
-    --enable-image-loader-generic=static \
-    --disable-install-examples \
-    --disable-tests \
-    --disable-coverage \
-    --disable-doc
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  # install license files
-  install -Dm644 "$srcdir/$pkgname-$pkgver/COPYING" \
-        "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
-
-
diff --git a/extra/evas_generic_loaders/PKGBUILD b/extra/evas_generic_loaders/PKGBUILD
index 562759fb7..d2a790e3f 100644
--- a/extra/evas_generic_loaders/PKGBUILD
+++ b/extra/evas_generic_loaders/PKGBUILD
@@ -1,25 +1,23 @@
-# $Id: PKGBUILD 200655 2013-12-01 09:50:20Z andyrtr $
+# $Id: PKGBUILD 204343 2014-01-17 09:42:39Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
 pkgname=evas_generic_loaders
-pkgver=1.7.9
+pkgver=1.8.1
 pkgrel=2
 pkgdesc="Additional generic loaders for Evas"
 arch=('i686' 'x86_64')
 url="http://www.enlightenment.org"
-license=('BSD')
-depends=('librsvg' 'gstreamer0.10-base' 'poppler' 'libraw' 'libspectre' 'eina')
+license=('GPL2')
+depends=('librsvg' 'gstreamer0.10-base' 'poppler' 'libraw' 'libspectre' 'efl')
 options=('!emptydirs')
-source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('598241d2276608fc41a79216e94b4176a4404277')
+source=(http://download.enlightenment.org/rel/libs/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+sha1sums=('e196829b26f74a1a0a4d9292ebdf8c98b08a32f1')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-  export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}"
-  export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}"
-  export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed  ${LDFLAGS}"
+  export CFLAGS="$CFLAGS -fvisibility=hidden"
 
   ./configure \
     --prefix=/usr \
@@ -34,11 +32,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  # install license files
-  install -Dm644 "$srcdir/$pkgname-$pkgver/COPYING" \
-        "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
 
diff --git a/extra/ibus/PKGBUILD b/extra/ibus/PKGBUILD
index a59e2833e..bdb9624d6 100644
--- a/extra/ibus/PKGBUILD
+++ b/extra/ibus/PKGBUILD
@@ -1,19 +1,18 @@
-# $Id: PKGBUILD 203532 2014-01-13 02:05:53Z fyan $
+# $Id: PKGBUILD 204310 2014-01-17 07:31:32Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 
 pkgbase=ibus
 pkgname=(ibus libibus)
-pkgver=1.5.4
-pkgrel=4
+pkgver=1.5.5
+pkgrel=1
 pkgdesc="Next Generation Input Bus for Linux"
 arch=('i686' 'x86_64')
 url="http://ibus.googlecode.com"
 license=('LGPL')
-depends=('dconf' 'gtk2' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'pygtk' 'python2-dbus')
-makedepends=('gobject-introspection' 'vala' 'gconf' 'iso-codes' 'intltool' 'python2-gobject')
+depends=('dconf' 'gtk2' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'pygtk' 'python2-dbus' 'python2-gobject' 'iso-codes')
+makedepends=('gobject-introspection' 'vala' 'gconf' 'intltool')
 options=('!emptydirs')
 source=(http://ibus.googlecode.com/files/${pkgbase}-${pkgver}.tar.gz)
-sha1sums=('2ce4b4d728a4685fd77360d0097b0e568f920c7b')
 
 build() {
   cd ${pkgbase}-${pkgver}
@@ -31,7 +30,7 @@ build() {
 }
 
 package_ibus() {
-  depends+=("libibus=$pkgver" 'python2-gobject' 'iso-codes')
+  depends+=("libibus=$pkgver")
   install=ibus.install
 
   cd ${pkgbase}-${pkgver}
@@ -50,3 +49,5 @@ package_libibus() {
   make -C bindings DESTDIR="${pkgdir}" install
   make DESTDIR="${pkgdir}" install-pkgconfigDATA
 }
+
+sha512sums=('8249d6ee4918b0e0fe030af736eed2260e1376b2fdaf0d819f289e0bd880a5e3874f1fb3d097fc74b9f359822ce16f4dae52a263aa28c2e2ce7bdf671cb2fea9')
diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
index d241703a7..640058bf7 100644
--- a/extra/java7-openjdk/PKGBUILD
+++ b/extra/java7-openjdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 197107 2013-10-21 20:21:18Z guillaume $
+# $Id: PKGBUILD 204309 2014-01-17 05:30:07Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
@@ -6,18 +6,18 @@
 pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src' 'openjdk7-doc')
 pkgbase=java7-openjdk
 _java_ver=7
-_icedtea_ver=2.4.3
+_icedtea_ver=2.4.4
 
 # check "${srcdir}/icedtea-${_icedtea_ver}"/Makefile.am
-_JDK_UPDATE_VERSION=45
-_CORBA_CHANGESET=8ed5df839fbc
-_JAXP_CHANGESET=8f220f7b51c7
-_JAXWS_CHANGESET=652eb396f959
-_JDK_CHANGESET=7958751eb9ef
-_LANGTOOLS_CHANGESET=3c8eb52a32ea
-_OPENJDK_CHANGESET=e2f5917da3c1
+_JDK_UPDATE_VERSION=51
+_CORBA_CHANGESET=e540fd592221
+_JAXP_CHANGESET=2e2bf2d8be16
+_JAXWS_CHANGESET=5aceb5a787b1
+_JDK_CHANGESET=1fe539ed00bc
+_LANGTOOLS_CHANGESET=3f5408abf14b
+_OPENJDK_CHANGESET=796d1bf47b24
 
-_HOTSPOT_CHANGESET=b59e02d9e72b # see "${srcdir}/icedtea-${_icedtea_ver}"/hotspot.map
+_HOTSPOT_CHANGESET=a8a33cc2dd4b # see "${srcdir}/icedtea-${_icedtea_ver}"/hotspot.map
 
 _bootstrap=0 # 0/1 for quick build or full bootstrap
 
@@ -47,14 +47,14 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar
         jdk7-openjdk.profile.csh
         jre7-openjdk.profile
         jre7-openjdk.profile.csh)
-sha256sums=('15b1acc1fb43b83ca08d531491261c5eeaea4cad3598300074692acea93bdd3d'
-            '75a18abd117e3295c6de4d3450f0094a9abc08f2168e2911bce25d1e153107b9'
-            '7fab9af64ffcdf635a6fed5abf78cffd1f64be1f3827a1aaf3a0e5e1fdbc599c'
-            'cec41aebd42f4c8caba9c24c306ba78e8cf5da3d23da1604b98753340a2719ca'
-            'fb9c22e92c2a056917b7b5dce6905a01ab2e904cbc3c1c6badcc470d22136518'
-            '4df06346d197180bbb9d182e3ebc9ab6386562199d9898d057d0df75566349fe'
-            '462ad61fd34708c90362f9e3d3c432b9246833ea8ff0d8a14955ae386bce4a91'
-            'b7d7e01d7ab9e49b68aa29b55355a019d71f9ae5cabb4ea7378b55855a07df57'
+sha256sums=('ddce5dadaca4a24e8ecd632d5299fefd76f3bdcd7040bfbded3de3b1dffd56b3'
+            'abe048022f46f4d04130b2cf6a1b1d897bdca981518349d34fe5b415310f7782'
+            '77c3285f6abdefe7f19fc4c698ef1f4fe533f38941314e7e7077c34fa5eb4456'
+            '48bb8ece00ef62c6c0161dd90e5789419594dfb5d08163781dac9ffc00c0a3f8'
+            'ee2a7165b78693c3bb61a90128b60934704e9a5c6c7514abfbb61e41531b9919'
+            '16373b85dc5123cfe1816ec04f7d14e9a048c6eee7eb7c22b5b816fa1fd5e9bc'
+            '4375ccfacc49793dd0f13cb73ce3c684218bce71008fc237f3b6da754f4dfea6'
+            'cb5f109ae32c07301bc3a017c334ca3a7723124ff217d46127a16ade516d2902'
             '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
             '56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b'
             'bd55299e08e6f8e61ba5baad0990170891801a29a1e8137e502b5e8a10fc37ea'
diff --git a/extra/terminology/PKGBUILD b/extra/terminology/PKGBUILD
new file mode 100644
index 000000000..b6b67bec5
--- /dev/null
+++ b/extra/terminology/PKGBUILD
@@ -0,0 +1,36 @@
+# Maintainer: Ronald van Haren <ronald@archlinux.org>
+# Contributor: Doug Newgard <scimmia22 at outlook dot com>
+# Contributor: Paul Ezvan <paul@ezvan.fr>
+
+pkgname=terminology
+pkgver=0.4.0
+pkgrel=2
+pkgdesc="EFL based terminal emulator"
+arch=('i686' 'x86_64')
+url="http://www.enlightenment.org/p.php?p=about/terminology"
+license=('BSD')
+depends=('elementary')
+source=("http://download.enlightenment.org/rel/apps/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+install=terminology.install
+sha1sums=('6003519484ba2f50487bc1f6b977564f60bcc1fc')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  export CFLAGS="${CFLAGS} -fvisibility=hidden"
+  
+  ./configure \
+    --prefix=/usr
+
+  make
+}
+
+package(){
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+
+  # install license files
+  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/COPYING" \
+        "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+}
diff --git a/extra/terminology/terminology.install b/extra/terminology/terminology.install
new file mode 100644
index 000000000..88ac37896
--- /dev/null
+++ b/extra/terminology/terminology.install
@@ -0,0 +1,11 @@
+post_install() {
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/x2goserver/PKGBUILD b/extra/x2goserver/PKGBUILD
index 81cd35dc2..981db5bed 100644
--- a/extra/x2goserver/PKGBUILD
+++ b/extra/x2goserver/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 203654 2014-01-13 17:17:44Z andyrtr $
+# $Id: PKGBUILD 204356 2014-01-17 19:43:50Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 # Contributor: Gerhard Brauer <gerbra@archlinux.de>
@@ -8,14 +8,13 @@
 
 pkgname=x2goserver
 pkgver=4.0.1.12
-pkgrel=2
+pkgrel=5
 pkgdesc="Open source terminal server"
 arch=('i686' 'x86_64')
 url="http://www.x2go.org/"
 license=('GPL2')
 # see x2goserver.spec
-depends=(# 'perl-file-basedir'
-         #'python' 'xorg-xauth' 
+depends=(#'python' 'xorg-xauth' 
 
          # For x2goruncommand - for now
          'bc'
@@ -47,7 +46,10 @@ depends=(# 'perl-file-basedir'
          
          'perl-capture-tiny'
          'perl-config-simple'
-
+         'perl-file-basedir' # FS#38551
+         
+         'xorg-xwininfo' # FS#38558
+         
          #x2goserver-extensions
          #x2goserver-xsession
          #x2goserver-fmbindings
diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD
index d715c218e..44e41a8f2 100644
--- a/extra/xf86-video-intel/PKGBUILD
+++ b/extra/xf86-video-intel/PKGBUILD
@@ -1,17 +1,23 @@
-# $Id: PKGBUILD 203622 2014-01-13 17:13:00Z andyrtr $
+# $Id: PKGBUILD 204358 2014-01-17 21:31:02Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-intel
 pkgver=2.99.907
-pkgrel=1
+pkgrel=2
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 install=$pkgname.install
 pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
 depends=('intel-dri' 'libxvmc' 'pixman' 'xcb-util>=0.3.9' 'glamor-egl')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15' 'libx11' 'libxrender')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15' 'libx11' 'libxrender'
+             # additional deps for intel-virtual-output
+            'libxrandr' 'libxinerama' 'libxcursor' 'libxtst')
+optdepends=('libxrandr: for intel-virtual-output'
+            'libxinerama: for intel-virtual-output'
+            'libxcursor: for intel-virtual-output'
+            'libxtst: for intel-virtual-output')
 replaces=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
 provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
 conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16'
author	Nicolás Reynolds <fauno@endefensadelsl.org>	2014-01-18 03:29:33 +0000
committer	Nicolás Reynolds <fauno@endefensadelsl.org>	2014-01-18 03:29:33 +0000
commit	f4cbb127d45017c14988b232dbae02bc2858c6df (patch)
tree	71d864fa346c59efa48d7c029334b366c6597317 /extra
parent	953eead14ccfe47904e73cee9cea6e1255f57356 (diff)