Merge all changes from trunk

dev-libs/libxml2/libxml2-2.7.3.bep

@@ -11,7 +11,7 @@ BUILD {
 	aclocal
 	autoconf
 	automake
-	./configure --prefix=/boot/common --enable-ipv6=no LDFLAGS=-lnetwork
+	./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-ipv6=no LDFLAGS=-lnetwork
 	make
 }
 

dev-libs/libxml2/libxml2-2.7.6.bep

@@ -11,7 +11,7 @@ BUILD {
 	aclocal
 	autoconf
 	automake
-	./configure --prefix=/boot/common --enable-ipv6=no LDFLAGS="-lnetwork -L/boot/common/lib"
+	./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-ipv6=no LDFLAGS="-lnetwork -L/boot/common/lib"
 	make
 }
 

dev-libs/libxml2/libxml2-2.7.7.bep

@@ -11,7 +11,7 @@ BUILD {
 	aclocal
 	autoconf
 	automake
-	./configure --prefix=/boot/common --enable-ipv6=no LDFLAGS="-lnetwork -L/boot/common/lib"
+	./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-ipv6=no LDFLAGS="-lnetwork -L/boot/common/lib"
 	make
 }
 

dev-libs/libxml2/libxml2-2.8.0.bep

@@ -0,0 +1,35 @@
+DESCRIPTION="libxml2 - Version 2 of the library to manipulate XML files" 
+HOMEPAGE="http://www.xmlsoft.org/" 
+SRC_URI="ftp://xmlsoft.org/libxml2/libxml2-2.8.0.tar.gz"
+CHECKSUM_MD5="c62106f02ee00b6437f0fb9d370c1093"
+REVISION="1"
+STATUS_HAIKU="stable"
+DEPEND=""
+BUILD {
+	cd libxml2-2.8.0
+	libtoolize --force --copy --install
+	aclocal
+	autoconf
+	sed -i 's/$(datadir)\/aclocal/`finddir B_COMMON_DATA_DIRECTORY`\/aclocal/g' M*
+	automake
+	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
+	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
+		--datarootdir=$COMMON_DOCS \
+		--docdir=$COMMON_DOCS/doc \
+		--mandir=$COMMON_DOCS/man
+		LDFLAGS="-lnetwork"
+	make
+}
+
+INSTALL {
+	cd libxml2-2.8.0
+	make install
+}
+
+TEST {
+	cd libxml2-2.8.0
+	make tests
+}
+
+LICENSE="MIT"
+COPYRIGHT="1998-2003 Daniel Veillard.  All Rights Reserved."

dev-libs/libxml2/libxml2-2.9.0.bep

@@ -0,0 +1,36 @@
+DESCRIPTION="libxml2 - Version 2 of the library to manipulate XML files" 
+HOMEPAGE="http://www.xmlsoft.org/" 
+SRC_URI="ftp://xmlsoft.org/libxml2/libxml2-2.9.0.tar.gz"
+CHECKSUM_MD5="5b9bebf4f5d2200ae2c4efe8fa6103f7"
+REVISION="1"
+STATUS_HAIKU="stable"
+DEPEND=""
+BUILD {
+	cd libxml2-2.9.0
+	libtoolize --force --copy --install
+	aclocal
+	autoconf
+	sed -i 's/$(datadir)\/aclocal/`finddir B_COMMON_DATA_DIRECTORY`\/aclocal/g' M*
+	automake
+	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
+	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
+		--datarootdir=$COMMON_DOCS \
+		--docdir=$COMMON_DOCS/doc \
+		--mandir=$COMMON_DOCS/man \
+		--with-threads=yes
+		LDFLAGS="-lnetwork"
+	make
+}
+
+INSTALL {
+	cd libxml2-2.9.0
+	make install
+}
+
+TEST {
+	cd libxml2-2.9.0
+	make tests
+}
+
+LICENSE="MIT"
+COPYRIGHT="1998-2003 Daniel Veillard.  All Rights Reserved."

dev-libs/libxml2/patches/libxml2-2.9.0.patch

@@ -0,0 +1,33 @@
+--- libxml2-2.9.0-orig/threads.c	2012-09-11 03:52:46.000000000 +0000
++++ libxml2-2.9.0/threads.c	2013-02-12 20:44:23.000000000 +0000
+@@ -146,6 +146,7 @@
+ static pthread_key_t globalkey;
+ static pthread_t mainthread;
+ static pthread_once_t once_control = PTHREAD_ONCE_INIT;
++static pthread_once_t once_control_init = PTHREAD_ONCE_INIT;
+ static pthread_mutex_t global_init_lock = PTHREAD_MUTEX_INITIALIZER;
+ #elif defined HAVE_WIN32_THREADS
+ #if defined(HAVE_COMPILER_TLS)
+@@ -915,7 +916,7 @@
+ #ifdef HAVE_PTHREAD_H
+     if ((libxml_is_threaded)  && (pthread_key_delete != NULL))
+         pthread_key_delete(globalkey);
+-    once_control = PTHREAD_ONCE_INIT;
++    once_control = once_control_init;
+ #elif defined(HAVE_WIN32_THREADS) && !defined(HAVE_COMPILER_TLS) && (!defined(LIBXML_STATIC) || defined(LIBXML_STATIC_FOR_DLL))
+     if (globalkey != TLS_OUT_OF_INDEXES) {
+         xmlGlobalStateCleanupHelperParams *p;
+--- libxml2-2.9.0-orig/configure.in	2012-09-11 03:52:46.053739520 +0000
++++ libxml2-2.9.0/configure.in	2013-02-12 20:37:19.000000000 +0000
+@@ -988,6 +988,11 @@
+        *beos*) WITH_THREADS="1"
+ 	   THREAD_CFLAGS="$THREAD_CFLAGS -DHAVE_BEOS_THREADS"
+        ;;
++       *haiku*) WITH_THREADS="1"
++       THREAD_LIB=""
++       AC_DEFINE([HAVE_PTHREAD_H], [], [Define if <pthread.h> is there])
++       ;;
++   
+        *linux*)
+            if test "${GCC}" = "yes" ; then
+ 	       GCC_VERSION=`${CC} --version | head -1 | awk '{print $3}'`