tools-uclibc/desktop: update build

tools-uclibc/desktop/portage/env/gnome-doc-utils.conf

@@ -0,0 +1 @@
+MAKEOPTS="-j1"

tools-uclibc/desktop/portage/make.conf.2

@@ -27,7 +27,7 @@ USE_MPLAYER="bidi bl bluray bs2b cddb cdparanoia cpudetection fbcon ftp ggi joys
 USE_BROWSE="curl webkit -libproxy"
 USE_WORD="latex math openxml pdf spell thesaurus wmf wordperfect"
 USE_GAMES="artworkextra"
-USE_XFCE4="session thunar"
+USE_XFCE4="-upower session thunar"
 
 USE_MISC="bash-completion extras lpsol natspec unlock-notify utils uuid vim-syntax watchdog"
 

tools-uclibc/desktop/portage/make.conf.3

@@ -27,7 +27,7 @@ USE_MPLAYER="bidi bl bluray bs2b cddb cdparanoia cpudetection fbcon ftp ggi joys
 USE_BROWSE="curl webkit -libproxy"
 USE_WORD="latex math openxml pdf spell thesaurus wmf wordperfect"
 USE_GAMES="artworkextra"
-USE_XFCE4="session thunar"
+USE_XFCE4="-upower session thunar"
 
 USE_MISC="bash-completion extras lpsol natspec unlock-notify utils uuid vim-syntax watchdog"
 

tools-uclibc/desktop/portage/package.accept_keywords/alsa-plugins

@@ -0,0 +1 @@
+=media-plugins/alsa-plugins-1.0.27-r2 ~amd64

tools-uclibc/desktop/portage/package.accept_keywords/boost

@@ -1,2 +0,0 @@
-=dev-libs/boost-1.52.0-r6 ~amd64
-=dev-util/boost-build-1.52.0-r1 ~amd64

tools-uclibc/desktop/portage/package.accept_keywords/elfix

@@ -1,2 +0,0 @@
-=dev-python/pypax-0.8.3 ~amd64
-=sys-apps/elfix-0.8.3 ~amd64

tools-uclibc/desktop/portage/package.accept_keywords/nettle

@@ -1 +0,0 @@
-=dev-libs/nettle-2.7 ~amd64

tools-uclibc/desktop/portage/package.accept_keywords/uclibc

@@ -0,0 +1 @@
+=sys-libs/uclibc-0.9.33.9999 ~amd64

tools-uclibc/desktop/portage/package.accept_keywords/xorg-cf-files

@@ -1 +0,0 @@
-=x11-misc/xorg-cf-files-1.0.4-r1 ~amd64

tools-uclibc/desktop/portage/package.env

@@ -1,4 +1,5 @@
 app-crypt/pinentry pinentry.conf
+app-text/gnome-doc-utils gnome-doc-utils.conf
 dev-libs/pakchois pakchois.conf
 dev-python/pygobject pygobject.conf
 dev-util/cmake cmake.conf

tools-uclibc/desktop/portage/package.mask/webkit-gtk

@@ -1 +0,0 @@
->net-libs/webkit-gtk-1.8.3-r300

tools-uclibc/desktop/portage/package.unmask/alsa-plugins

@@ -0,0 +1 @@
+=media-plugins/alsa-plugins-1.0.27-r2

tools-uclibc/desktop/portage/patches/sys-libs/uclibc/99-libc-add-isfdtype.patch

@@ -0,0 +1,65 @@
+From f22cca4722fa66e424562e69f4afa2bca0af871d Mon Sep 17 00:00:00 2001
+From: "Anthony G. Basile" <blueness@gentoo.org>
+Date: Sun, 28 Jul 2013 09:08:34 -0400
+Subject: [PATCH] libc: add isfdtype()
+
+isfdtype(int fd, int fdtype) check whether a file descriptor fd is
+of type fdtype, where the types are defined in stat(2).  It is
+supported in glibc and BSD, and used by utilities such as acpid.
+
+Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+ libc/misc/file/isfdtype.c | 40 ++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 40 insertions(+)
+ create mode 100644 libc/misc/file/isfdtype.c
+
+diff --git a/libc/misc/file/isfdtype.c b/libc/misc/file/isfdtype.c
+new file mode 100644
+index 0000000..4d9199b
+--- /dev/null
++++ libc/misc/file/isfdtype.c
+@@ -0,0 +1,40 @@
++/* Determine whether descriptor has given property.
++   Copyright (C) 1996-2013 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#include <errno.h>
++#include <sys/stat.h>
++#include <sys/socket.h>
++#include <sys/types.h>
++#ifdef __UCLIBC_HAS_LFS__
++# include <_lfs_64.h>
++#else
++# define stat64 stat
++# define fstat64 fstat
++#endif
++
++int
++isfdtype (int fildes, int fdtype)
++{
++  struct stat64 st;
++  int save_error = errno;
++  int result = fstat64 (fildes, &st);
++  __set_errno (save_error);
++  if (result)
++	  return result;
++  return (st.st_mode & S_IFMT) == (mode_t) fdtype;
++}
+-- 
+1.8.3.2.733.gf8abaeb
+

tools-uclibc/desktop/resolv.conf

@@ -1,4 +1,4 @@
 # Add your own name server here.
 # This is only for the build. It
 # will be removed in the final image.
-nameserver 67.151.215.230
+nameserver 192.168.100.7

tools-uclibc/desktop/run.sh

@@ -39,10 +39,10 @@ populate_etc() {
 	rm -f "${ROOTFS}"/etc/portage/make.conf.catalyst
 	cp -f portage/make.conf.1 "${ROOTFS}"/etc/portage/make.conf
 
-	for d in env package.accept_keywords package.mask package.use profile repos.conf; do
+	rm -rf "${ROOTFS}"/etc/portage/patches
+	for d in env package.accept_keywords package.env package.mask package.unmask package.use patches profile repos.conf; do
 		[[ -a portage/"${d}" ]] && cp -af portage/${d} "${ROOTFS}"/etc/portage
 	done
-	cp -af portage/package.env "${ROOTFS}"/etc/portage
 }
 
 rebuild_toolchain() {