[Lunar-commits] <moonbase-other> Merge branch 'master' of github.com:lunar-linux/moonbase-other

[Florin Braescu]

commit 913a4b8768abbfc025a09c1ce2dc6df78a7a12ab
Author: Florin Braescu <florin at lunar-linux.org>
Date: Fri, 22 Aug 2014 15:23:31 +0300
URL: https://github.com/lunar-linux/moonbase-other/commit/913a4b8768abbfc025a09c1ce2dc6df78a7a12ab

Merge branch 'master' of github.com:lunar-linux/moonbase-other
---
  net/avahi/BUILD         | +2/-2     
  net/avahi/DEPENDS       | +1/-4     
  net/avahi/DETAILS       | +6/-3     
  net/openslp/DETAILS     | +3/-3     
  sql/libpqxx/DETAILS     | +3/-5     
  utils/elektra/DETAILS   | +3/-3     
  x11-apps/jpilot/DETAILS | +3/-3     
  7 files changed, 21 insertions(+), 23 deletions(-)

--- a/net/avahi/BUILD
+++ b/net/avahi/BUILD
@@ -10,8 +10,8 @@
 # Add this missing group. It is used in /etc/dbus-1/system.d/avahi-dbus.conf
    add_priv_group netdev &&
 
-   OPTS+=" --enable-compat-howl --enable-compat-libdns_sd --disable-gtk3 --disable-qt3 \
-           --disable-stack-protector --with-distro=none --disable-monodoc" &&
+   OPTS+=" --enable-compat-howl --enable-compat-libdns_sd --disable-gtk3 --disable-qt3 --disable-manpages \
+           --disable-stack-protector --with-distro=none --disable-monodoc --disable-xmltoman --disable-python" &&
 
     default_build
 
--- a/net/avahi/DEPENDS
+++ b/net/avahi/DEPENDS
@@ -7,14 +7,11 @@ optional_depends "gdbm"      "--enable-gdbm"     "--disable-gdbm"     "for exten
 optional_depends "qt4"       "--enable-qt4"      "--disable-qt4"      "building of Qt4 mainloop integration"
 optional_depends "libglade"  "--enable-gtk"      "--disable-gtk"      "for the use of GTK+"
 optional_depends "pygtk"     "--enable-pygtk"    "--disable-pygtk"    "for the use of pyGTK"
-optional_depends "xmltoman"  "--enable-xmltoman" "--disable-xmltoman" "to build the manpages"
 optional_depends "gtk-sharp" "--enable-mono"     "--disable-mono"     "to build the Mono/.NET avahi-sharp library"
 
 optional_depends "gobject-introspection" "--enable-introspection=yes" "--enable-introspection=no" "for introspection support"
 
-optional_depends "dbus-python" "--enable-python-dbus --enable-python" \
-                 "--disable-python-dbus --disable-python" \
-                 "Enable use of D-Bus in Python"
+optional_depends "dbus-python" "--enable-python-dbus" "--disable-python-dbus" "Enable use of D-Bus in Python"
 
 
 
--- a/net/avahi/DETAILS
+++ b/net/avahi/DETAILS
@@ -1,11 +1,14 @@
           MODULE=avahi
-         VERSION=0.6.30
+         VERSION=0.6.31
           SOURCE=$MODULE-$VERSION.tar.gz
+         SOURCE2=avahi-0.6.31-install-exec-hook.patch
       SOURCE_URL=http://avahi.org/download
-      SOURCE_VFY=sha1:5b77443537600a00770e4c77e3c443eeb5861d06
+     SOURCE2_URL=http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-dns/avahi/files/
+      SOURCE_VFY=sha1:7e05bd78572c9088b03b1207a0ad5aba38490684
+     SOURCE2_VFY=sha1:5418b1d8e6ad1cf58d4731e578a27507c9342054
         WEB_SITE=http://avahi.org
          ENTERED=20060808
-         UPDATED=20110827
+         UPDATED=20140821
            SHORT="A service discovery on a local network"
 
 cat << EOF
--- a/net/openslp/DETAILS
+++ b/net/openslp/DETAILS
@@ -1,11 +1,11 @@
           MODULE=openslp
-         VERSION=1.2.1
+         VERSION=2.0.0
           SOURCE=$MODULE-$VERSION.tar.gz
       SOURCE_URL=$SFORGE_URL/$MODULE
-      SOURCE_VFY=sha1:47ab19154084d2b467f09525f5351e9ab7193cf9
+      SOURCE_VFY=sha1:e4630bfb986cdffab6bb829b37e9340c9152d838
         WEB_SITE=http://www.openslp.org/
          ENTERED=20071027
-         UPDATED=20071027
+         UPDATED=20140821
            SHORT="Service Location Protocol"
 
 cat << EOF
--- a/sql/libpqxx/DETAILS
+++ b/sql/libpqxx/DETAILS
@@ -1,13 +1,11 @@
-# Do not bump this for now as it is a downgrade for calligra and koffice.
-# Those two modules are the only users of libpqxx. 
           MODULE=libpqxx
-         VERSION=3.1.1
+         VERSION=4.0.1
           SOURCE=$MODULE-$VERSION.tar.gz
       SOURCE_URL=http://pqxx.org/download/software/libpqxx/
-      SOURCE_VFY=sha1:b8942164495310894cab39e5882c42f092570fc5
+      SOURCE_VFY=sha1:4748835bd1a90fb34e6e577788006a416c2acb60
         WEB_SITE=http://pqxx.org/development/libpqxx/
          ENTERED=20050728
-         UPDATED=20130327
+         UPDATED=20140821
            SHORT="C++ client API for PostgreSQL"
 
 cat << EOF
--- a/utils/elektra/DETAILS
+++ b/utils/elektra/DETAILS
@@ -1,11 +1,11 @@
           MODULE=elektra
-         VERSION=0.8.6
+         VERSION=0.8.7
           SOURCE=$MODULE-$VERSION.tar.gz
       SOURCE_URL=ftp://ftp.libelektra.org/elektra/releases/
-      SOURCE_VFY=sha1:2570710b0057470223611ca00d61a0196e54e7b2
+      SOURCE_VFY=sha1:00887cc8edb3dea1bc110f69ea64f6b700c29402
         WEB_SITE=http://freedesktop.org/wiki/Software/Elektra
          ENTERED=20090412
-         UPDATED=20140721
+         UPDATED=20140822
            SHORT="hierarchical configuration store"
 
 cat << EOF
--- a/x11-apps/jpilot/DETAILS
+++ b/x11-apps/jpilot/DETAILS
@@ -1,11 +1,11 @@
           MODULE=jpilot
-         VERSION=1.8.1
+         VERSION=1.8.2
           SOURCE=$MODULE-$VERSION.tar.gz
       SOURCE_URL=http://jpilot.org/
-      SOURCE_VFY=sha1:98a70bbb30bcccb8ba74aecb6a41b819dc8a4a3b
+      SOURCE_VFY=sha1:3348bf3e49928f4b5202bac546ab62852155291c
         WEB_SITE=http://jpilot.org
          ENTERED=20020218
-         UPDATED=20111007
+         UPDATED=20140821
            SHORT="Desktop organizer software for PalmOS devices."
 cat << EOF
 J-Pilot is a desktop organizer application for PalmOS devices that runs under