add upower, polkit and dependencies

29 files changed, 467 insertions, 56 deletions

diff --git a/package/bzip2/Makefile b/package/bzip2/Makefile
index 2f6bb7f8b..a2cb7a709 100644
--- a/package/bzip2/Makefile
+++ b/package/bzip2/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:=		3
 PKG_MD5SUM:=		00b516f4704d4a7cb50a1d97e6e8e15b
 PKG_DESCR:=		bzip2 compression utility
 PKG_SECTION:=		archive
+PKG_BUILDDEP:=		bzip2-host
 PKG_DEPENDS:=		libbz2
 PKG_URL:=		http://www.bzip.org/
 PKG_SITES:=		http://www.bzip.org/${PKG_VERSION}/
@@ -23,17 +24,32 @@ ifeq ($(ADK_STATIC),y)
 PKG_OPTS+=		libmix
 endif
 
+include ${TOPDIR}/mk/host.mk
 include ${TOPDIR}/mk/package.mk
 
+$(eval $(call HOST_template,BZIP2,bzip2,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,BZIP2,bzip2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBBZ2,libbz2,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBZ2},${PKGSC_LIBBZ2},${PKG_OPTS}))
 
+HOST_STYLE:=		manual
 MAKE_FILE:=		Makefile-libbz2_so
 CONFIG_STYLE:=		manual
 TARGET_CFLAGS+=		-fPIC
 XAKE_FLAGS+=		PREFIX=${WRKINST}/usr
 INSTALL_STYLE:=		manual
 
+host-build:
+	(cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
+		PREFIX=${HOST_WRKINST}/usr ${HOST_ALL_TARGET})
+
+bzip2-hostinstall:
+	${INSTALL_DIR} ${STAGING_HOST_DIR}/usr/lib
+	${INSTALL_DIR} $(STAGING_HOST_DIR)/usr/include
+	$(CP) ${WRKBUILD}/libbz2.so* \
+		${STAGING_HOST_DIR}/usr/lib
+	(cd ${STAGING_HOST_DIR}/usr/lib; ln -sf libbz2.so.1.0.6 libbz2.so)
+	$(CP) $(WRKBUILD)/bzlib.h $(STAGING_HOST_DIR)/usr/include
+
 libbz2-install:
 	${INSTALL_DIR} ${IDIR_LIBBZ2}/usr/lib
 	$(CP) ${WRKBUILD}/libbz2.so* \
@@ -49,4 +65,5 @@ bzip2-install:
 	${INSTALL_DIR} ${IDIR_BZIP2}/usr/bin
 	${INSTALL_BIN} ${WRKBUILD}/bzip2-shared ${IDIR_BZIP2}/usr/bin/bzip2
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/dbus-glib/Makefile b/package/dbus-glib/Makefile
index 204c66f50..3ad006afa 100644
--- a/package/dbus-glib/Makefile
+++ b/package/dbus-glib/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		dbus-glib
-PKG_VERSION:=		0.86
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		cd0ab148fb0c786fc88be49d19971f50
+PKG_VERSION:=		0.100.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		ad0920c7e3aad669163bb59171cf138e
 PKG_DESCR:=		DBUS glib bindings
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		dbus glib
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index 229b09dea..054541334 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -15,7 +15,7 @@ PKG_DEPENDS+=		libxdamage libxfixes libidl libsqlite libxcomposite gdk-pixbuf li
 PKG_DEPENDS+=		harfbuzz mesalib libvpx libbz2 ca-certificates libevent
 PKG_BUILDDEP:=		alsa-lib glib gtk+ libIDL libX11 MesaLib libtiff gdk-pixbuf
 PKG_BUILDDEP+=		nspr nss libjpeg-turbo libXt fontconfig sqlite atk libpng hicolor-icon-theme
-PKG_BUILDDEP+=		libvpx pango gettext-tiny bzip2 libevent python2-host yasm-host
+PKG_BUILDDEP+=		libvpx pango gettext-tiny bzip2 libevent bzip2-host python2-host yasm-host
 PKG_BUILDDEP+=		zip-host
 PKG_URL:=		http://www.mozilla.org/
 PKG_SITES:=		http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_VERSION}/source/
diff --git a/package/glib/Makefile b/package/glib/Makefile
index 41edca441..730a44336 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -4,10 +4,10 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		glib
-PKG_VERSION:=		2.36.4
+PKG_VERSION:=		2.38.2
 PKG_RELEASE:=		1
-PKG_EXTRAVER:=		2.36
-PKG_MD5SUM:=		2f4b15f7ef43d8702d067ab987bf7aba
+PKG_EXTRAVER:=		2.38
+PKG_MD5SUM:=		26d1d08e478fc48c181ca8be44f5b69f
 PKG_DESCR:=		low-level core library that forms the basis of GTK+
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libpthread
diff --git a/package/glib/patches/patch-Makefile_in b/package/glib/patches/patch-Makefile_in
deleted file mode 100644
index 92e1eb072..000000000
--- a/package/glib/patches/patch-Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- glib-2.36.4.orig/Makefile.in	2013-08-07 16:43:05.000000000 +0200
-+++ glib-2.36.4/Makefile.in	2013-11-19 11:35:29.000000000 +0100
-@@ -686,7 +686,7 @@ EXTRA_DIST = ChangeLog.pre-2-20 ChangeLo
- 	gio-unix-2.0.pc.in gio-windows-2.0.pc.in check-abis.sh
- TEST_PROGS = 
- ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
--SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs \
-+SUBDIRS = . m4macros glib gmodule gthread gobject gio po \
- 	$(am__append_1)
- DIST_SUBDIRS = $(SUBDIRS) build $(am__append_2)
- bin_SCRIPTS = glib-gettextize
diff --git a/package/glib/patches/patch-gio_gdbus-2_0_codegen_config_py b/package/glib/patches/patch-gio_gdbus-2_0_codegen_config_py
deleted file mode 100644
index e7df26bee..000000000
--- a/package/glib/patches/patch-gio_gdbus-2_0_codegen_config_py
+++ /dev/null
@@ -1,9 +0,0 @@
---- glib-2.36.4.orig/gio/gdbus-2.0/codegen/config.py	2013-08-07 16:43:20.000000000 +0200
-+++ glib-2.36.4/gio/gdbus-2.0/codegen/config.py	2013-11-29 16:50:05.000000000 +0100
-@@ -23,5 +23,5 @@
- 
- DATADIR = "${prefix}/share"
- DATADIR = DATADIR.replace(
--    "${prefix}", "/usr/local")
-+    "${prefix}", "/usr")
- VERSION = "2.36.4"
diff --git a/package/glib/patches/patch-gio_gnetworkmonitor_c b/package/glib/patches/patch-gio_gnetworkmonitor_c
deleted file mode 100644
index 8147a2247..000000000
--- a/package/glib/patches/patch-gio_gnetworkmonitor_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- glib-2.36.4.orig/gio/gnetworkmonitor.c	2013-05-07 20:26:07.000000000 +0200
-+++ glib-2.36.4/gio/gnetworkmonitor.c	2013-11-29 16:58:28.000000000 +0100
-@@ -18,6 +18,8 @@
-  * Boston, MA 02111-1307, USA.
-  */
- 
-+#include <string.h>
-+
- #include "config.h"
- #include "glib.h"
- #include "glibintl.h"
diff --git a/package/glib/patches/patch-gio_gnetworkmonitornetlink_c b/package/glib/patches/patch-gio_gnetworkmonitornetlink_c
deleted file mode 100644
index a3cac9834..000000000
--- a/package/glib/patches/patch-gio_gnetworkmonitornetlink_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- glib-2.36.4.orig/gio/gnetworkmonitornetlink.c	2013-08-07 16:36:32.000000000 +0200
-+++ glib-2.36.4/gio/gnetworkmonitornetlink.c	2013-11-29 17:14:56.000000000 +0100
-@@ -22,6 +22,7 @@
- 
- #include <errno.h>
- #include <unistd.h>
-+#include <string.h>
- 
- #include "gnetworkmonitornetlink.h"
- #include "gcredentials.h"
diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile
index bcebc4ac8..3bed165ab 100644
--- a/package/gpsd/Makefile
+++ b/package/gpsd/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:=		53a88f24a0973d23427e82e9a8914f19
 PKG_DESCR:=		An interface daemon for GPS receivers
 PKG_SECTION:=		misc
 PKG_DEPENDS:=		libpthread
-PKG_BUILDDEP:=		ncurses scons-host python2-host
+PKG_BUILDDEP:=		ncurses scons-host bzip2-host python2-host
 PKG_URL:=		http://catb.org/gpsd/
 PKG_SITES:=		http://download-mirror.savannah.gnu.org/releases/gpsd/
 
diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile
index 2d0ecadea..76df60864 100644
--- a/package/libxml2/Makefile
+++ b/package/libxml2/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:=		9c0cfef285d5c4a5c80d00904ddab380
 PKG_DESCR:=		XML C parser and toolkit
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		zlib
-PKG_BUILDDEP:=		autotool gettext-tiny python2-host libxml2-host zlib
+PKG_BUILDDEP:=		autotool gettext-tiny bzip2-host python2-host libxml2-host zlib
 PKG_URL:=		http://www.xmlsoft.org/
 PKG_SITES:=		http://xmlsoft.org/sources/
 PKG_OPTS:=		dev
diff --git a/package/libxslt/Makefile b/package/libxslt/Makefile
index 8901c8a75..22e732b93 100644
--- a/package/libxslt/Makefile
+++ b/package/libxslt/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:=		9667bf6f9310b957254fdcf6596600b7
 PKG_DESCR:=		XSLT Library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libxml2
-PKG_BUILDDEP:=		autotool python2-host libxml2-host libxslt-host libxml2
+PKG_BUILDDEP:=		autotool bzip2-host python2-host libxml2-host libxslt-host libxml2
 PKG_URL:=		http://xmlsoft.org/XSLT
 PKG_SITES:=		http://xmlsoft.org/sources/
 PKG_NEED_CXX:=		1
diff --git a/package/mozjs/Makefile b/package/mozjs/Makefile
new file mode 100644
index 000000000..c5e41f489
--- /dev/null
+++ b/package/mozjs/Makefile
@@ -0,0 +1,33 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		mozjs
+PKG_VERSION:=		17.0.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		20b6f8f1140ef6e47daa3b16965c9202
+PKG_DESCR:=		javascript library
+PKG_SECTION:=		libs
+PKG_BUILDDEP:=		bzip2-host python2-host nspr
+PKG_SITES:=		http://ftp.mozilla.org/pub/mozilla.org/js/
+PKG_OPTS:=		dev
+
+DISTFILES:=             ${PKG_NAME}${PKG_VERSION}.tar.gz
+WRKDIST=		${WRKDIR}/${PKG_NAME}${PKG_VERSION}
+WRKSRC=                 ${WRKDIST}/js/src
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,MOZJS,mozjs,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+CONFIGURE_ENV+=		HOST_CC="${CC_FOR_BUILD}" HOST_CFLAGS="${CFLAGS_FOR_BUILD}" HOST_CXX="${CXX_FOR_BUILD}"
+CONFIGURE_ARGS+=	--disable-optimize \
+			--with-system-nspr
+
+mozjs-install:
+	$(INSTALL_DIR) $(IDIR_MOZJS)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libmozjs*.so* \
+		$(IDIR_MOZJS)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/mozjs/patches/patch-js_src_configure b/package/mozjs/patches/patch-js_src_configure
new file mode 100644
index 000000000..f2b4f62c4
--- /dev/null
+++ b/package/mozjs/patches/patch-js_src_configure
@@ -0,0 +1,42 @@
+--- mozjs17.0.0.orig/js/src/configure	2013-03-25 21:34:20.000000000 +0100
++++ mozjs17.0.0/js/src/configure	2014-01-09 18:00:47.000000000 +0100
+@@ -6037,39 +6037,6 @@ EOF
+       HAVE_ARM_SIMD=1
+   fi
+ 
+-  echo $ac_n "checking for ARM NEON support in compiler""... $ac_c" 1>&6
+-echo "configure:6042: checking for ARM NEON support in compiler" >&5
+-  # We try to link so that this also fails when
+-  # building with LTO.
+-  cat > conftest.$ac_ext <<EOF
+-#line 6046 "configure"
+-#include "confdefs.h"
+-
+-int main() {
+-asm(".fpu neon\n vadd.i8 d0, d0, d0");
+-; return 0; }
+-EOF
+-if { (eval echo configure:6053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
+-  result="yes"
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  result="no"
+-fi
+-rm -f conftest*
+-  echo "$ac_t"""$result"" 1>&6
+-  if test "$result" = "yes"; then
+-      cat >> confdefs.pytmp <<\EOF
+-        (''' HAVE_ARM_NEON ''', ' 1 ')
+-EOF
+-cat >> confdefs.h <<\EOF
+-#define HAVE_ARM_NEON 1
+-EOF
+-
+-      HAVE_ARM_NEON=1
+-  fi
+ fi # CPU_ARCH = arm
+ 
+ 
diff --git a/package/mozjs/patches/patch-js_src_js_pc_in b/package/mozjs/patches/patch-js_src_js_pc_in
new file mode 100644
index 000000000..456678abe
--- /dev/null
+++ b/package/mozjs/patches/patch-js_src_js_pc_in
@@ -0,0 +1,12 @@
+--- mozjs17.0.0.orig/js/src/js.pc.in	2013-03-25 21:34:20.000000000 +0100
++++ mozjs17.0.0/js/src/js.pc.in	2014-01-10 10:18:19.000000000 +0100
+@@ -1,7 +1,7 @@
+ #filter substitution
+ prefix=@prefix@
+-libdir=@libdir@
+-includedir=@includedir@
++libdir=${prefix}/lib
++includedir=${prefix}/include
+ 
+ Name: SpiderMonkey @MOZILLA_VERSION@
+ Description: The Mozilla library for JavaScript
diff --git a/package/mozjs/patches/patch-js_src_methodjit_MethodJIT_cpp b/package/mozjs/patches/patch-js_src_methodjit_MethodJIT_cpp
new file mode 100644
index 000000000..a347a7077
--- /dev/null
+++ b/package/mozjs/patches/patch-js_src_methodjit_MethodJIT_cpp
@@ -0,0 +1,22 @@
+--- mozjs17.0.0.orig/js/src/methodjit/MethodJIT.cpp	2013-02-11 23:33:23.000000000 +0100
++++ mozjs17.0.0/js/src/methodjit/MethodJIT.cpp	2014-01-09 18:10:13.000000000 +0100
+@@ -702,7 +702,8 @@ asm (
+ FUNCTION_HEADER_EXTRA
+ ".globl " SYMBOL_STRING(JaegerTrampolineReturn)   "\n"
+ SYMBOL_STRING(JaegerTrampolineReturn) ":"         "\n"
+-"   strd    r4, r5, [r10, #24]"             "\n" /* fp->rval type,data */
++"   str     r4, [r10, #24]"             "\n" /* fp->rval type,data */
++"   str     r5, [r10, #28]"             "\n" /* fp->rval type,data */
+ 
+     /* Tidy up. */
+ "   mov     r0, sp"                         "\n"
+@@ -762,7 +763,8 @@ SYMBOL_STRING(JaegerInterpoline) ":"
+ "   blx  " SYMBOL_STRING_RELOC(js_InternalInterpret) "\n"
+ "   cmp     r0, #0"                         "\n"
+ "   ldr     r10, [sp, #(4*7)]"              "\n"    /* Load (StackFrame*)f->regs->fp_ */
+-"   ldrd    r4, r5, [r10, #(4*6)]"          "\n"    /* Load rval payload and type. */
++"   ldr     r4, [r10, #(4*6)]"              "\n"    /* Load rval payload and type. */
++"   ldr     r5, [r10, #((4*6)+4)]"          "\n"    /* Load rval payload and type. */
+ "   ldr     r1, [sp, #(4*3)]"               "\n"    /* Load scratch. */
+ "   it      ne"                             "\n"
+ "   bxne    r0"                             "\n"
diff --git a/package/polkit/Makefile b/package/polkit/Makefile
new file mode 100644
index 000000000..d4a1934c0
--- /dev/null
+++ b/package/polkit/Makefile
@@ -0,0 +1,38 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		polkit
+PKG_VERSION:=		0.112
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		758d825e25283b201026f1bb3a476144
+PKG_DESCR:=		application-level toolkit
+PKG_SECTION:=		libs
+PKG_BUILDDEP:=		autotool mozjs
+PKG_DEPENDS:=		mozjs
+PKG_URL:=		http://www.freedesktop.org/wiki/Software/polkit/
+PKG_SITES:=		http://cgit.freedesktop.org/polkit/snapshot/
+PKG_OPTS:=		dev
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,POLKIT,polkit,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+AUTOTOOL_STYLE:=	autogen
+CONFIGURE_ARGS+=	--disable-man-pages \
+			--disable-examples \
+			--with-authfw=shadow \
+			--with-os-type=unknown
+
+polkit-install:
+	$(INSTALL_DIR) $(IDIR_POLKIT)/etc $(IDIR_POLKIT)/usr/bin
+	$(CP) $(WRKINST)/etc/* $(IDIR_POLKIT)/etc
+	$(INSTALL_DIR) $(IDIR_POLKIT)/usr/lib/polkit-1
+	$(CP) $(WRKINST)/usr/lib/libpolkit*.so* \
+		$(IDIR_POLKIT)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/polkit-1/* \
+		$(IDIR_POLKIT)/usr/lib/polkit-1
+	$(CP) $(WRKINST)/usr/bin/* $(IDIR_POLKIT)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/polkit/patches/patch-Makefile_am b/package/polkit/patches/patch-Makefile_am
new file mode 100644
index 000000000..878409f17
--- /dev/null
+++ b/package/polkit/patches/patch-Makefile_am
@@ -0,0 +1,10 @@
+--- polkit-0.112.orig/Makefile.am	2013-09-18 18:55:09.000000000 +0200
++++ polkit-0.112/Makefile.am	2014-01-09 21:28:39.000000000 +0100
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-SUBDIRS = actions data src docs po test
++SUBDIRS = data src
+ 
+ NULL =
+ 
diff --git a/package/polkit/patches/patch-actions_Makefile_am b/package/polkit/patches/patch-actions_Makefile_am
new file mode 100644
index 000000000..ea3d2131a
--- /dev/null
+++ b/package/polkit/patches/patch-actions_Makefile_am
@@ -0,0 +1,11 @@
+--- polkit-0.112.orig/actions/Makefile.am	2013-09-18 18:55:09.000000000 +0200
++++ polkit-0.112/actions/Makefile.am	2014-01-09 21:14:31.000000000 +0100
+@@ -3,8 +3,6 @@ polkit_actiondir = $(datadir)/polkit-1/a
+ 
+ dist_polkit_action_DATA = org.freedesktop.policykit.policy
+ 
+-@INTLTOOL_POLICY_RULE@
+-
+ #check:
+ #	$(top_builddir)/tools/polkit-policy-file-validate-1 $(top_srcdir)/policy/$(dist_polkit_action_DATA)
+ 
diff --git a/package/polkit/patches/patch-autogen_sh b/package/polkit/patches/patch-autogen_sh
new file mode 100644
index 000000000..6c2cf15a2
--- /dev/null
+++ b/package/polkit/patches/patch-autogen_sh
@@ -0,0 +1,63 @@
+--- polkit-0.112.orig/autogen.sh	2013-09-18 18:55:09.000000000 +0200
++++ polkit-0.112/autogen.sh	2014-01-09 21:12:29.000000000 +0100
+@@ -34,14 +34,6 @@ touch ChangeLog
+   }
+ }
+ 
+-(gtkdocize --flavour no-tmpl) < /dev/null > /dev/null 2>&1 || {
+-	echo
+-	echo "You must have gtk-doc installed to compile $PROJECT."
+-	echo "Install the appropriate package for your distribution,"
+-	echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/"
+-	DIE=1
+-}
+-
+ (automake --version) < /dev/null > /dev/null 2>&1 || {
+   echo
+   echo "**Error**: You must have automake installed."
+@@ -74,13 +66,6 @@ if test "$DIE" -eq 1; then
+   exit 1
+ fi
+ 
+-if test -z "$*"; then
+-  echo "**Warning**: I am going to run configure with no arguments."
+-  echo "If you wish to pass any to it, please specify them on the"
+-  echo $0 " command line."
+-  echo
+-fi
+-
+ case $CC in
+ xlc )
+   am_opt=--include-deps;;
+@@ -88,13 +73,10 @@ esac
+ 
+       aclocalinclude="$ACLOCAL_FLAGS"
+ 
+-      echo "Running autoreconf on test/mocklibc ..."
+-      (cd "test/mocklibc"; autoreconf --install)
+-
+       if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
+ 	if test -z "$NO_LIBTOOLIZE" ; then 
+ 	  echo "Running libtoolize..."
+-	  libtoolize --force --copy
++	  libtoolize -q --force --copy
+ 	fi
+       fi
+       echo "Running aclocal $aclocalinclude ..."
+@@ -108,16 +90,4 @@ esac
+       echo "Running autoconf ..."
+       autoconf
+ 
+-intltoolize --copy --force --automake                  || exit 1
+-
+ cd "$olddir"
+-
+-conf_flags="--enable-maintainer-mode --enable-gtk-doc"
+-
+-if test x$NOCONFIGURE = x; then
+-  echo "Running $srcdir/configure $conf_flags $@ ..."
+-  $srcdir/configure $conf_flags "$@" \
+-  && echo "Now type make to compile." || exit 1
+-else
+-  echo "Skipping configure process."
+-fi
diff --git a/package/polkit/patches/patch-configure_ac b/package/polkit/patches/patch-configure_ac
new file mode 100644
index 000000000..3b258e7f4
--- /dev/null
+++ b/package/polkit/patches/patch-configure_ac
@@ -0,0 +1,54 @@
+--- polkit-0.112.orig/configure.ac	2013-09-18 18:55:09.000000000 +0200
++++ polkit-0.112/configure.ac	2014-01-09 21:28:57.000000000 +0100
+@@ -8,9 +8,6 @@ AM_MAINTAINER_MODE
+ 
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ 
+-# Include external mocklibc tool for unit testing
+-AC_CONFIG_SUBDIRS([test/mocklibc])
+-
+ # libtool versioning - this applies to all libraries in this package
+ #
+ # See http://sources.redhat.com/autobook/autobook/autobook_91.html#SEC91 for details
+@@ -46,8 +43,6 @@ AC_PATH_PROG([XSLTPROC], [xsltproc])
+ fi
+ AM_CONDITIONAL(MAN_PAGES_ENABLED, test x$enable_man_pages = xyes)
+ 
+-GTK_DOC_CHECK([1.3])
+-
+ #### gcc warning flags
+ 
+ if test "x$GCC" = "xyes"; then
+@@ -476,8 +471,6 @@ case "$host_os" in
+ 	;;
+ esac
+ 
+-GOBJECT_INTROSPECTION_CHECK([0.6.2])
+-
+ AC_ARG_ENABLE([examples],
+               AS_HELP_STRING([--enable-examples], [Build the example programs]),,
+               [enable_examples=yes])
+@@ -488,7 +481,6 @@ AM_CONDITIONAL(BUILD_EXAMPLES, test "x$e
+ # Internationalization
+ # ********************
+ 
+-IT_PROG_INTLTOOL([0.40.0])
+ GETTEXT_PACKAGE=polkit-1
+ AC_SUBST([GETTEXT_PACKAGE])
+ AM_GLIB_GNU_GETTEXT
+@@ -512,15 +504,6 @@ src/polkitbackend/Makefile
+ src/polkitagent/Makefile
+ src/programs/Makefile
+ src/examples/Makefile
+-docs/version.xml
+-docs/extensiondir.xml
+-docs/Makefile
+-docs/polkit/Makefile
+-docs/man/Makefile
+-po/Makefile.in
+-test/Makefile
+-test/polkit/Makefile
+-test/polkitbackend/Makefile
+ ])
+ 
+ dnl ==========================================================================
diff --git a/package/polkit/patches/patch-src_polkit_Makefile_am b/package/polkit/patches/patch-src_polkit_Makefile_am
new file mode 100644
index 000000000..4aa7ad8a7
--- /dev/null
+++ b/package/polkit/patches/patch-src_polkit_Makefile_am
@@ -0,0 +1,35 @@
+--- polkit-0.112.orig/src/polkit/Makefile.am	2013-09-18 18:55:09.000000000 +0200
++++ polkit-0.112/src/polkit/Makefile.am	2014-01-09 21:13:06.000000000 +0100
+@@ -102,32 +102,6 @@ libpolkit_gobject_1_la_LIBADD =
+ 
+ libpolkit_gobject_1_la_LDFLAGS = -export-symbols-regex '(^polkit_.*)'
+ 
+-if HAVE_INTROSPECTION
+-
+-INTROSPECTION_GIRS = Polkit-1.0.gir
+-
+-Polkit-1.0.gir: libpolkit-gobject-1.la
+-
+-girdir = $(INTROSPECTION_GIRDIR)
+-gir_DATA = Polkit-1.0.gir
+-
+-typelibsdir = $(INTROSPECTION_TYPELIBDIR)
+-typelibs_DATA = Polkit-1.0.typelib
+-
+-Polkit_1_0_gir_INCLUDES = Gio-2.0
+-Polkit_1_0_gir_SCANNERFLAGS = --c-include='polkit/polkit.h'
+-Polkit_1_0_gir_CFLAGS = \
+-	$(libpolkit_gobject_1_la_CFLAGS)	\
+-	-D_POLKIT_COMPILATION			\
+-	-I.. -I$(top_srcdir)/src
+-Polkit_1_0_gir_LIBS = libpolkit-gobject-1.la
+-Polkit_1_0_gir_FILES = $(libpolkit_gobject_1_la_SOURCES)
+-Polkit_1_0_gir_EXPORT_PACKAGES = polkit-gobject-1
+-
+-include $(INTROSPECTION_MAKEFILE)
+-
+-endif # HAVE_INTROSPECTION
+-
+ EXTRA_DIST = polkitenumtypes.h.template polkitenumtypes.c.template
+ CLEANFILES = $(gir_DATA) $(typelibs_DATA)
+ 
diff --git a/package/polkit/patches/patch-src_polkitagent_Makefile_am b/package/polkit/patches/patch-src_polkitagent_Makefile_am
new file mode 100644
index 000000000..7a5aaeea1
--- /dev/null
+++ b/package/polkit/patches/patch-src_polkitagent_Makefile_am
@@ -0,0 +1,37 @@
+--- polkit-0.112.orig/src/polkitagent/Makefile.am	2013-09-18 18:55:09.000000000 +0200
++++ polkit-0.112/src/polkitagent/Makefile.am	2014-01-09 21:13:36.000000000 +0100
+@@ -109,34 +109,6 @@ polkit_agent_helper_1_LDFLAGS = 					\
+ 	$(AM_LDFLAGS)							\
+ 	$(NULL)
+ 
+-if HAVE_INTROSPECTION
+-
+-girdir = $(INTROSPECTION_GIRDIR)
+-gir_DATA = PolkitAgent-1.0.gir
+-
+-PolkitAgent-1.0.gir: libpolkit-agent-1.la
+-
+-typelibsdir = $(INTROSPECTION_TYPELIBDIR)
+-typelibs_DATA = PolkitAgent-1.0.typelib
+-
+-INTROSPECTION_COMPILER_ARGS = --includedir=../../src/polkit
+-INTROSPECTION_GIRS = PolkitAgent-1.0.gir
+-PolkitAgent_1_0_gir_INCLUDES = Gio-2.0
+-PolkitAgent_1_0_gir_SCANNERFLAGS = \
+-	--include-uninstalled=../../src/polkit/Polkit-1.0.gir	\
+-	--c-include='polkitagent/polkitagent.h'
+-PolkitAgent_1_0_gir_CFLAGS = \
+-        $(libpolkit_agent_1_la_CFLAGS)		\
+-        -D_POLKIT_COMPILATION			\
+-        -D_POLKIT_AGENT_COMPILATION		\
+-        -I.. -I$(top_srcdir)/src
+-PolkitAgent_1_0_gir_LIBS = libpolkit-agent-1.la
+-PolkitAgent_1_0_gir_FILES = $(libpolkit_agent_1_la_SOURCES)
+-PolkitAgent_1_0_gir_EXPORT_PACKAGES = polkit-agent-1
+-
+-include $(INTROSPECTION_MAKEFILE)
+-
+-endif # HAVE_INTROSPECTION
+ 
+ # polkit-agent-helper-1 need to be setuid root because it's used to
+ # authenticate not only the invoking user, but possibly also root
diff --git a/package/python2/Makefile b/package/python2/Makefile
index 933947523..25378bd52 100644
--- a/package/python2/Makefile
+++ b/package/python2/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		10
 PKG_MD5SUM:=		b4f01a1d0ba0b46b05c73b2ac909b1df
 PKG_DESCR:=		Python scripting language (Version 2)
 PKG_SECTION:=		lang
-PKG_BUILDDEP:=		autotool libffi python2-host
+PKG_BUILDDEP:=		autotool libffi bzip2-host python2-host 
 PKG_DEPENDS:=		libpthread libffi libgcc
 PKG_URL:=		http://www.python.org/
 PKG_SITES:=		http://www.python.org/ftp/python/${PKG_VERSION}/
diff --git a/package/scons/Makefile b/package/scons/Makefile
index 97b15fc7f..3f8958d40 100644
--- a/package/scons/Makefile
+++ b/package/scons/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		083ce5624d6adcbdaf2526623f456ca9
 PKG_DESCR:=		a software construction tool
 PKG_SECTION:=		lang
-PKG_BUILDDEP:=		python2-host
+PKG_BUILDDEP:=		bzip2-host python2-host
 PKG_URL:=		http://www.scons.org
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=scons/}
 
diff --git a/package/systemd/Makefile b/package/systemd/Makefile
index 7094d3a4b..11ae586ae 100644
--- a/package/systemd/Makefile
+++ b/package/systemd/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		systemd
 PKG_VERSION:=		208
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		df64550d92afbffb4f67a434193ee165
 PKG_DESCR:=		System and Service Manager
 PKG_SECTION:=		utils
@@ -18,7 +18,9 @@ PKG_LIBNAME:=		libudev
 PKG_OPTS:=		dev
 
 PKG_LIBC_DEPENDS:=	eglibc glibc
-PKG_SUBPKGS:=		UDEV LIBUDEV
+PKG_SUBPKGS:=		UDEV LIBUDEV LIBGUDEV
+PKGSC_LIBGUDEV:=	libs
+PKGSD_LIBGUDEV:=	GUDEV library
 PKGSC_LIBUDEV:=		libs
 PKGSD_LIBUDEV:=		UDEV library
 PKGSD_UDEV:=		Dynamic device management subsystem
@@ -33,11 +35,13 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,UDEV,udev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBUDEV,libudev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBGUDEV,libgudev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 AUTOTOOL_STYLE:=	autoreconf
 TARGET_LDFLAGS+=	-lrt
 CONFIGURE_ARGS+=	--disable-static \
 			--without-python \
+			--enable-gudev \
 			--disable-manpages \
 			--disable-polkit
 
@@ -52,4 +56,8 @@ libudev-install:
 	${INSTALL_DIR} ${IDIR_LIBUDEV}/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libudev.so* $(IDIR_LIBUDEV)/usr/lib
 
+libgudev-install:
+	${INSTALL_DIR} ${IDIR_LIBGUDEV}/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libgudev*.so* $(IDIR_LIBGUDEV)/usr/lib
+
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/systemd/patches/patch-src_gudev_gudev-1_0_pc_in b/package/systemd/patches/patch-src_gudev_gudev-1_0_pc_in
new file mode 100644
index 000000000..1758a8957
--- /dev/null
+++ b/package/systemd/patches/patch-src_gudev_gudev-1_0_pc_in
@@ -0,0 +1,13 @@
+--- systemd-208.orig/src/gudev/gudev-1.0.pc.in	2013-08-13 22:02:46.000000000 +0200
++++ systemd-208/src/gudev/gudev-1.0.pc.in	2014-01-10 16:50:37.000000000 +0100
+@@ -1,7 +1,7 @@
+ prefix=@prefix@
+-exec_prefix=@exec_prefix@
+-libdir=@libdir@
+-includedir=@includedir@
++exec_prefix=@prefix@
++libdir=${prefix}/lib
++includedir=${prefix}/include
+ 
+ Name: gudev-1.0
+ Description: GObject bindings for libudev
diff --git a/package/upower/Makefile b/package/upower/Makefile
new file mode 100644
index 000000000..ea448a693
--- /dev/null
+++ b/package/upower/Makefile
@@ -0,0 +1,37 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		upower
+PKG_VERSION:=		0.99.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		14f43bc13353e23e7280863f33ac50d2
+PKG_DESCR:=		powermanagement
+PKG_SECTION:=		misc
+PKG_BUILDDEP:=		glib dbus-glib polkit systemd
+PKG_DEPENDS:=		glib dbus-glib polkit libgudev
+PKG_URL:=		http://upower.freedesktop.org/
+PKG_SITES:=		http://upower.freedesktop.org/releases/
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.xz
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,UPOWER,upower,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+upower-install:
+	$(INSTALL_DIR) $(IDIR_UPOWER)/etc
+	$(CP) $(WRKINST)/etc/* \
+		$(IDIR_UPOWER)/etc
+	$(INSTALL_DIR) $(IDIR_UPOWER)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libupower*.so* \
+		$(IDIR_UPOWER)/usr/lib
+	$(INSTALL_DIR) $(IDIR_UPOWER)/usr/sbin
+	$(INSTALL_BIN) $(WRKINST)/usr/libexec/upowerd \
+		$(IDIR_UPOWER)/usr/sbin
+	$(INSTALL_DIR) $(IDIR_UPOWER)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/upower \
+		$(IDIR_UPOWER)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/upower/patches/patch-Makefile_in b/package/upower/patches/patch-Makefile_in
new file mode 100644
index 000000000..7709ee096
--- /dev/null
+++ b/package/upower/patches/patch-Makefile_in
@@ -0,0 +1,20 @@
+--- upower-0.99.0.orig/Makefile.in	2013-10-29 11:39:06.000000000 +0100
++++ upower-0.99.0/Makefile.in	2014-01-10 17:09:06.000000000 +0100
+@@ -199,7 +199,7 @@ am__define_uniq_tagged_files = \
+ ETAGS = etags
+ CTAGS = ctags
+ CSCOPE = cscope
+-DIST_SUBDIRS = etc libupower-glib src doc tools po rules
++DIST_SUBDIRS = etc libupower-glib src tools po rules
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ distdir = $(PACKAGE)-$(VERSION)
+ top_distdir = $(distdir)
+@@ -439,7 +439,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ udevrulesdir = @udevrulesdir@
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+-SUBDIRS = etc libupower-glib src doc tools po $(am__append_1)
++SUBDIRS = etc libupower-glib src tools po $(am__append_1)
+ EXTRA_DIST = \
+ 	HACKING 			\
+ 	ChangeLog
diff --git a/package/xcb-proto/Makefile b/package/xcb-proto/Makefile
index 2db4b605e..26561b546 100644
--- a/package/xcb-proto/Makefile
+++ b/package/xcb-proto/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_DESCR:=		XML-XCB protocol descriptions
 PKG_SECTION:=		devel
 PKG_MD5SUM:=		8d2cdb770129cef563088a90c5bec768
-PKG_BUILDDEP:=		autotool python2-host
+PKG_BUILDDEP:=		autotool bzip2-host python2-host
 PKG_SITES:=		http://xcb.freedesktop.org/dist/
 PKG_OPTS:=		dev devonly