Merge branch 'master' of git@github.com:sjnewbury/multilib-overlay

47 files changed, 1472 insertions, 35 deletions

diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index dd359f168..65de16447 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -3,7 +3,7 @@ AUX libgcrypt-1.4.3-HMAC-SHA-384-512.patch 796 RMD160 4c485c2f19fc05746f984920fd
 DIST libgcrypt-1.4.0-idea.diff.bz2 2944 RMD160 4044cc244ca375a832674561cf030840c239ee86 SHA1 2e96628a66918d868aca1aaebc8bdb58d59be9ba SHA256 56bc3da6e8477f2cc3ce3186c175442124d4c5f5c7078704765b33cc944340d3
 DIST libgcrypt-1.4.0.tar.bz2 964779 RMD160 bccec927cdf0437778d8aa1071b27a871ed5c72d SHA1 cd1b52e8ecfa361737c6f130ed2f1d850e312c16 SHA256 d7f855f766944a5b6e7ffee2d6ffdf828ab709acd4453b0e64aea808ce2760ec
 DIST libgcrypt-1.4.4.tar.bz2 1143139 RMD160 65fd66687bd17bc8a680c59f26a8edf3e21e7dbf SHA1 3987f0efcbb7048c136d5c859e88eee1763a14f6 SHA256 3212b88080cf8fa006164d38fc176fafa5c29591c8384f284ab880db0dbf306f
-EBUILD libgcrypt-1.4.0-r1.ebuild 2677 RMD160 ad37d843a53e874879151ebc1e031b84a211da26 SHA1 1aa929a00f857f7cb70268e3abcfe2c449019827 SHA256 b3bfc7e1f2d94b656e81534b49c91468232ab70bad82ada96a9635436b1c7e71
-EBUILD libgcrypt-1.4.4.ebuild 1326 RMD160 e411df599615a8d52f0e7549edb539eecb76e129 SHA1 d5a2353b345c943864d6e570bec37b732da4ac7d SHA256 ee3eb033eacca006fa2470fb9ac127c69ccf6f2c76ace7fc041499a8ce13dbcd
+EBUILD libgcrypt-1.4.0-r1.ebuild 2534 RMD160 b1687114543a39e47241d19f3360bdfec0945e8f SHA1 7de0d850f05f7f6a84610585e5a5299fda30d737 SHA256 7954b9a130070681527f6a0e00beac328ed689c5f4302325bf5c1b41cd53f242
+EBUILD libgcrypt-1.4.4.ebuild 1183 RMD160 a5e642f98d98232d3067ed306dbaa886d5f23e6f SHA1 be6e02a8a4d392d7be0641278e105a800a4e0b57 SHA256 ef078b4dfcada25a84b1bada7c9ce3d519ddc59ebc98f336f52d101955392e40
 MISC ChangeLog 17089 RMD160 6511988b911e539fbb1b6d36b19cbe33038bba18 SHA1 34d3800881a3491c3ccc92d2a25bf93ad91db3c6 SHA256 0179e517ed0eb52f0bba18f706390c427cd472b2c35abc5004643650bae42f91
 MISC metadata.xml 231 RMD160 f55939ecfa9103e22ed6f3b0ace3f26fa8050417 SHA1 bb40ba62bd4eb3785818e820af5678eac394511b SHA256 3742bb789b2248572a4afcc61839d8d4e833d5c0a38d26c8eadb764dd18acfaf
diff --git a/dev-libs/libgcrypt/libgcrypt-1.4.0-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.4.0-r1.ebuild
index 434061a2f..9438e83c0 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.4.0-r1.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.4.0-r1.ebuild
@@ -40,19 +40,12 @@ src_unpack() {
 
 multilib-native_src_configure_internal() {
 	# --disable-padlock-support for bug#201917
-	
-	local myconf
-	if use lib32 && ([[ "${ABI}" == "x86" ]] || [[ "${ABI}" == "ppc" ]]); then
-		myconf="--program-suffix=32"
-	fi
-	
 	econf \
 		--disable-padlock-support \
 		--disable-dependency-tracking \
 		--with-pic \
 		--enable-noexecstack \
 		$(use_enable nls) \
-		${myconf} \
 		|| die
 }
 
diff --git a/dev-libs/libgcrypt/libgcrypt-1.4.4.ebuild b/dev-libs/libgcrypt/libgcrypt-1.4.4.ebuild
index 31ef3cab1..0b586d581 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.4.4.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.4.4.ebuild
@@ -25,18 +25,11 @@ pkg_setup() {
 
 multilib-native_src_configure_internal() {
 	# --disable-padlock-support for bug #201917
-	
-	local myconf
-	if use lib32 && ([[ "${ABI}" == "x86" ]] || [[ "${ABI}" == "ppc" ]]); then
-		myconf="--program-suffix=32"
-	fi
-	
 	econf \
 		--disable-padlock-support \
 		--disable-dependency-tracking \
 		--with-pic \
-		--enable-noexecstack \
-		${myconf}
+		--enable-noexecstack
 }
 
 multilib-native_src_install_internal() {
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index b4d9488aa..0a52f09ce 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -2,4 +2,4 @@ AUX libxslt-1.1.23-parallel-install.patch 547 RMD160 b5a4895a4a794e8a07264157998
 AUX libxslt-1.1.24-exslt_crypt.patch 4906 RMD160 fbdbea30ec2180b3093cf71f9119ad0287fa8be4 SHA1 018183759b431aaabe094ecadbdb30df80613dd8 SHA256 d21b61608d4bd05e99270bbfaa46238157ae72e6869cac519bb11653d508f0dd
 AUX libxslt.m4-libxslt-1.1.8.patch 1292 RMD160 0dcd21978aa0102784df670f2c9835da227f42c8 SHA1 ffa3c5ff84b0636ec4238167e324d377305c4d34 SHA256 0da59fb6cb50bf30e8ac79644df90394707ac07e60337aa3c0e53986781e9e0d
 DIST libxslt-1.1.24.tar.gz 3363961 RMD160 41e7721eeed722c45310877d045422b47ab32973 SHA1 b5402e24abff5545ed76f6a55049cbebc664bd58 SHA256 c0c10944841e9a79f29d409c6f8da0d1b1af0403eb3819c82c788dfa6a180b3e
-EBUILD libxslt-1.1.24-r1.ebuild 2311 RMD160 16d21f9e3c88fad1fb55931d127ecbeee0d596bb SHA1 e4966fd4a3577195160b8fbbdbd772ea44f70b78 SHA256 4d847126742de90663e491fc4d9772dcb5609df5cccf8d2b68f259e826c0fbf9
+EBUILD libxslt-1.1.24-r1.ebuild 2113 RMD160 d05ce430822e8fd6727a45df404334d3c695db7f SHA1 bfe51db4e3f5e0c608906ea196daab542e3ebcbc SHA256 a4984b36cfa6710232e5c4b49a545f75d3c3237ada473b40959ea6335d950c28
diff --git a/dev-libs/libxslt/libxslt-1.1.24-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.24-r1.ebuild
index bb98de2fb..506341330 100644
--- a/dev-libs/libxslt/libxslt-1.1.24-r1.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.24-r1.ebuild
@@ -47,13 +47,6 @@ multilib-native_src_prepare_internal() {
 multilib-native_src_configure_internal() {
 	# Always pass --with-debugger. It is required by third parties (see
 	# e.g. bug #98345)
-
-	if use lib32 && ([[ "${ABI}" == "x86" ]] || [[ "${ABI}" == "ppc" ]]); then
-		export LIBGCRYPT_CONFIG="/usr/bin/libgcrypt-config32"
-	else
-		export LIBGCRYPT_CONFIG="/usr/bin/libgcrypt-config"
-	fi
-
 	local myconf="--with-debugger \
 		$(use_with python)       \
 		$(use_with crypt crypto) \
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 805284941..2578faa3e 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -4,5 +4,7 @@ AUX nspr-4.6.1-lang.patch 1718 RMD160 6c3fb440f4b4004289de3f65b996936bcfcbaa45 S
 AUX nspr-4.7.0-prtime.patch 964 RMD160 a963c21fb1ce5e8913d3c41753ca37b24e80798d SHA1 b47ffa12022ea83b738e5d847e61cca026ec7f07 SHA256 3fd4f3c68257dced021c0bfa00245d0da2d6c64205135b1cc89f96a3375dffc7
 DIST nspr-4.7.3.tar.gz 1254585 RMD160 532417c8c4d04a32d6cfc09ea8f2279d5ee69e72 SHA1 351c34c8f26d11a441bc3130655cd9144e724899 SHA256 b1d2419ef1807c38944fc746fff14fda8506589e5462dc31194a9d1b494b9f49
 DIST nspr-4.7.4.tar.gz 1256846 RMD160 7f6478f889dbddd91271d2182ace910f32a2c375 SHA1 7653b922b1953bb21d25fb445d0ead90ac79dd21 SHA256 5532056aff17d6769953727ac7ba8dc62741612e936c5be84496671f8a2d08cd
+DIST nspr-4.8.tar.gz 1170419 RMD160 f63468de3613793a8b564e967f3a963aab977c99 SHA1 ac30ec18bf0d070a9663d1a8c2d258004f3f42ad SHA256 a2de84aa21a7bbabd93c4f172123d58c6432c2358807bb260ac338b2dc61dbfe
 EBUILD nspr-4.7.3.ebuild 2718 RMD160 cafc65b81279ddd7615e3b8be8558d0bf9eaa5bc SHA1 14923895a88459e2be4aa85883d859f1327304df SHA256 44b97cb4d5b3062ef7429842190ba76551dffae27cdd2898e9710cff25d7f90c
 EBUILD nspr-4.7.4.ebuild 2719 RMD160 6988b1108f6d304360b4b17a40d18f86d283ef47 SHA1 3d80082ce33943d50b2eb412a1b5d31a44009dd4 SHA256 24468f20d2c7fe22adf1bddf42b8aefefee25bd8db3bb559ecbd72f8709787fb
+EBUILD nspr-4.8.ebuild 2787 RMD160 ee546b13152be8d49864b05a0d7ba98b034685f4 SHA1 83db63304ee8ea93340414f39177a603b4d7ffc7 SHA256 7c61dfa0fcfc427e8c10e135dc311854946aa9ba7c878e6ded4de4128531cba0
diff --git a/dev-libs/nspr/nspr-4.8.ebuild b/dev-libs/nspr/nspr-4.8.ebuild
new file mode 100644
index 000000000..c123c666c
--- /dev/null
+++ b/dev-libs/nspr/nspr-4.8.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.7.4.ebuild,v 1.7 2009/05/01 14:03:12 maekke Exp $
+
+EAPI="2"
+
+inherit eutils multilib toolchain-funcs multilib-native versionator
+
+MIN_PV="$(get_version_component_range 2)"
+
+DESCRIPTION="Netscape Portable Runtime"
+HOMEPAGE="http://www.mozilla.org/projects/nspr/"
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz"
+
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS=""
+IUSE="ipv6 debug"
+
+DEPEND=">=dev-db/sqlite-3.5[lib32?]"
+RDEPEND="${DEPEND}"
+
+multilib-native_src_prepare_internal() {
+	cd "${S}"
+	mkdir build inst
+	epatch "${FILESDIR}"/${PN}-4.6.1-config.patch
+	epatch "${FILESDIR}"/${PN}-4.6.1-config-1.patch
+	epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch
+	epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
+		mozilla/nsprpub/config/rules.mk
+}
+
+multilib-native_src_configure_internal() {
+	cd "${S}"/build
+
+	echo > "${T}"/test.c
+	$(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o
+	case $(file "${T}"/test.o) in
+		*64-bit*) myconf="${myconf} --enable-64bit";;
+		*32-bit*) ;;
+		*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
+	esac
+
+	if use ipv6; then
+		myconf="${myconf} --enable-ipv6"
+	fi
+
+	myconf="${myconf} --libdir=/usr/$(get_libdir)/nspr \
+		--enable-system-sqlite"
+
+	ECONF_SOURCE="../mozilla/nsprpub" econf \
+		$(use_enable debug) \
+		${myconf} || die "econf failed"
+}
+
+multilib-native_src_compile_internal() {
+	cd ${S}/build
+	make CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die
+}
+
+multilib-native_src_install_internal() {
+	# Their build system is royally fucked, as usual
+	MINOR_VERSION=${MIN_PV} # Used for .so version
+	cd "${S}"/build
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	cd "${D}"/usr/$(get_libdir)/nspr
+	for file in *.so; do
+		mv ${file} ${file}.${MINOR_VERSION}
+		ln -s ${file}.${MINOR_VERSION} ${file}
+	done
+	# cope with libraries being in /usr/lib/nspr
+	dodir /etc/env.d
+	echo "LDPATH=/usr/$(get_libdir)/nspr" > "${D}/etc/env.d/08nspr-${ABI}"
+
+	# install nspr-config
+	dobin "${S}"/build/config/nspr-config
+
+	# create pkg-config file
+	insinto /usr/$(get_libdir)/pkgconfig/
+	doins "${S}"/build/config/nspr.pc
+
+	# Remove stupid files in /usr/bin
+	rm "${D}"/usr/bin/{prerr.properties,nspr.pc}
+
+	prep_ml_binaries /usr/bin/nspr-config 
+}
+
+multilib-native_pkg_postinst_internal() {
+	preserve_old_lib_notify /usr/$(get_libdir)/nspr/lib{nspr,plc,plds}4.so.6
+	elog
+	elog "Please make sure you run revdep-rebuild after upgrade, This is extremely important"
+	elog "to ensure your system nspr works proplery."
+	elog
+}
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 06ab66723..090988432 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,10 +1,18 @@
 AUX 3.12-nss-config.in 2400 RMD160 927a5573d72ad8c9d06a56fd094b7523d8cc0784 SHA1 0227f94c745519b67b1b530e6cc116e8069a6b43 SHA256 6d03d7c1ade80922831b90a4242bf57519d649c4ab47eaac0958ceee90c169b2
 AUX 3.12-nss.pc.in 280 RMD160 e6966434f42fdcdb71977ba80638c74ef4b2ae63 SHA1 2024da0f72759c87375459a4e521caaf97a7922c SHA256 c61ebe55abca04bf6b05024e6c160735f74fe83a1ba48b0314a4110b6828bbc9
+AUX nss-3.11-config-1.patch 1440 RMD160 052cc7d19eafaadec1cca6d9882f23265afdf8a7 SHA1 7a9153ec9bd099d2b1d42ab3de240201ae5d6004 SHA256 9a67bbbd9996535ac0aff115294c6537be5ba2efc99ae48c3bc92eb995e670bc
 AUX nss-3.11-config.patch 3167 RMD160 e4b57c89a518b54070b884f40ca11224ccc60349 SHA1 78acfa3c26bf5ca8f8d741f54c00bcf044d4c82b SHA256 0947675d067f09dee55684e29dc7764834ad640b2adf52d9450fbb1b7f9b728c
+AUX nss-3.11.5-config-1.patch 1508 RMD160 2f71b5c38841c2c24cbea6ca0f206b3debfb4942 SHA1 7df5c48fc0ea49fee61e408f8b8c64a9eb01c995 SHA256 400bfe6e75ba628663819b833a04fd0037c575edc075a1e109665fe939670c74
 AUX nss-3.12-config-1.patch 1508 RMD160 ea2f4e2f05cc865ef41af0c39e573b8eb8801f42 SHA1 4897595a91f331ce34155e9872ece3518acb1ac8 SHA256 22d72c155d7b6aa8f1dd797959d5ec3b0975cf9a1bf4607e6b0ee2207112c2b7
 AUX nss-3.12-config.patch 4192 RMD160 22955dd1a51b285748fff9f854946a461a9b43f2 SHA1 bcd834996c24c86e3af49e2b9c855925f80b055e SHA256 44acd5199ceed4a286b6526cb158db75e704fca34d6d3b2cddaaa99b9af7c926
+AUX nss-3.12.3-executable-stacks.patch 444 RMD160 ec9337fcfa7f666b9d58224a143811338b4afd7b SHA1 57f48fc04cd62789bb8a67d283c52d21eac50e36 SHA256 063958325f02090bd8221fd60b45031720c561cfeab683883ca082c217c9b173
+AUX nss-config.in 2238 RMD160 b9dfeeef5319bae20326454a67dc67316dcd04cd SHA1 535ea4869d0f5fdc4f14b723320ef7284c14190a SHA256 57fb0219482981c80d9a72d8a86dfcbe0e776e4e5609fad8965e651f79296fa7
+AUX nss-fbsd7.patch 638 RMD160 9c60b07a9f9b9a7482221f09042266c358d6cfcf SHA1 27036a161ff076fc8a9d459458d2a4adc38876ad SHA256 f471f04def6d4f1abd2062b582246a60a33b346576ad6e71c782fcfe317c8cc7
 AUX nss-mips64-2.patch 540 RMD160 16c461f453470238922065068dd6530b908bb64f SHA1 27062b98164c946d5116b64a49c7c164b261fdbd SHA256 06ad64812bd49382ff4165bfa452fd697a5ca2c03e8f3ffb9aa1bcfa14499b34
+AUX nss-mips64.patch 508 RMD160 17e750805ec8e3e6f5989810b43522bea344f133 SHA1 dd127c2365ea13f5f5c3ec3f9d6d1991225e3565 SHA256 e50a8fcd0521b7722448b480ff672d49d6ca0dc6134d8df25ac63da1a83ab07b
+AUX nss.pc.in 269 RMD160 8716eb83ecf554c5751b0a135adeaf0a3a4208b0 SHA1 1a33aeb4131333d4cf4ccef7118533d0e89d7267 SHA256 cf659c5e72e560b79a928e7cdf5ed416b286f4eefa8d5b0cab50ee846b320e75
 DIST nss-3.12.2.tar.bz2 3974864 RMD160 eebddb26f26268550d106301464e0f98944a5e04 SHA1 a668ddb8e80c90aaa6d958f85745c6595a493f38 SHA256 84fb75ded8db4a4a38cb12a7aeeeade4fed68ff0f5e9f069ffe021d3b36f94a4
 DIST nss-3.12.3.tar.bz2 4066954 RMD160 b5339eda9dfc87385b2c11e2ca53be249b75ed69 SHA1 eeca14a37629287baa10eb7562a5fb927e9dd171 SHA256 68152f9ad62b49c8860306a6056f5c42f1a66095749e97346a2c3001528075f4
 EBUILD nss-3.12.2.ebuild 4859 RMD160 0019195e3b6a92f7bdf00f12c183b210e15e6eb0 SHA1 d32b04e0b104e3a0dd708f1415e40d4ee76db019 SHA256 d4592365397d7211b74dc09548baab6bd9e0951d3850d321d18682b00b080eb8
+EBUILD nss-3.12.3-r1.ebuild 4992 RMD160 9f08a919041d2e1b9e52e22d7cd3fb23b6b3b129 SHA1 c82b16317d2b903044c0a6508aa7fc93d2dfd96d SHA256 0e1c884fae5f73b57cf73c45c09c1278fa8186a41485b894d473bbe30d9bb34a
 EBUILD nss-3.12.3.ebuild 4938 RMD160 754989d4d6cf08129cb67d3ca72159e23db1390c SHA1 699bbae91524ba326330bafdf0f1b5c29166f0c8 SHA256 717471108dee0e31214c0aa8d46ee1db072cf70a43bef9ddf4390ab2aec0a57a
diff --git a/dev-libs/nss/files/nss-3.11-config-1.patch b/dev-libs/nss/files/nss-3.11-config-1.patch
new file mode 100644
index 000000000..3b2cd8a6b
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.11-config-1.patch
@@ -0,0 +1,36 @@
+--- mozilla/security/coreconf/Linux.mk.orig	2005-09-16 17:09:23.000000000 +0000
++++ mozilla/security/coreconf/Linux.mk	2006-02-09 05:27:36.000000000 +0000
+@@ -37,6 +37,8 @@
+ 
+ include $(CORE_DEPTH)/coreconf/UNIX.mk
+ 
++NSS_VERSION_MINOR=11
++
+ #
+ # The default implementation strategy for Linux is now pthreads
+ #
+--- mozilla/security/coreconf/Linux2.6.mk.orig	2005-09-16 17:09:23.000000000 +0000
++++ mozilla/security/coreconf/Linux2.6.mk	2006-02-09 05:38:16.000000000 +0000
+@@ -38,8 +38,7 @@
+ include $(CORE_DEPTH)/coreconf/Linux.mk
+ 
+ OS_REL_CFLAGS   += -DLINUX2_1
+-MKSHLIB         = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
+-
++MKSHLIB         = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so).$(NSS_VERSION_MINOR)
+ ifdef MAPFILE
+ 	MKSHLIB += -Wl,--version-script,$(MAPFILE)
+ endif
+--- mozilla/security/coreconf/rules.mk.orig	2005-10-10 23:46:12.000000000 +0000
++++ mozilla/security/coreconf/rules.mk	2006-02-09 06:27:46.000000000 +0000
+@@ -113,7 +113,10 @@
+ 	$(INSTALL) -m 664 $(LIBRARY) $(SOURCE_LIB_DIR)
+ endif
+ ifdef SHARED_LIBRARY
++	mv $(SHARED_LIBRARY) $(SHARED_LIBRARY).$(NSS_VERSION_MINOR)
++	ln -s $(shell pwd)/$(SHARED_LIBRARY).$(NSS_VERSION_MINOR) $(shell pwd)/$(SHARED_LIBRARY)
+	$(INSTALL) -m 775 $(SHARED_LIBRARY) $(SOURCE_LIB_DIR)
++	$(INSTALL) -m 775 $(SHARED_LIBRARY).$(NSS_VERSION_MINOR) $(SOURCE_LIB_DIR)	
+ endif
+ ifdef IMPORT_LIBRARY
+ 	$(INSTALL) -m 775 $(IMPORT_LIBRARY) $(SOURCE_LIB_DIR)
diff --git a/dev-libs/nss/files/nss-3.11.5-config-1.patch b/dev-libs/nss/files/nss-3.11.5-config-1.patch
new file mode 100644
index 000000000..a39e30ddd
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.11.5-config-1.patch
@@ -0,0 +1,37 @@
+--- mozilla/security/coreconf/Linux.mk.orig	2005-09-16 17:09:23.000000000 +0000
++++ mozilla/security/coreconf/Linux.mk	2006-02-09 05:27:36.000000000 +0000
+@@ -37,6 +37,8 @@
+ 
+ include $(CORE_DEPTH)/coreconf/UNIX.mk
+ 
++NSS_VERSION_MINOR=11
++
+ #
+ # The default implementation strategy for Linux is now pthreads
+ #
+--- mozilla/security/coreconf/Linux2.6.mk.orig	2005-09-16 17:09:23.000000000 +0000
++++ mozilla/security/coreconf/Linux2.6.mk	2006-02-09 05:38:16.000000000 +0000
+@@ -38,8 +38,7 @@
+ include $(CORE_DEPTH)/coreconf/Linux.mk
+ 
+ OS_REL_CFLAGS   += -DLINUX2_1
+-MKSHLIB         = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
+-
++MKSHLIB         = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so).$(NSS_VERSION_MINOR)
+ ifdef MAPFILE
+ 	MKSHLIB += -Wl,--version-script,$(MAPFILE)
+ endif
+--- mozilla/security/coreconf/rules.mk.orig	2005-10-10 23:46:12.000000000 +0000
++++ mozilla/security/coreconf/rules.mk	2006-02-09 06:27:46.000000000 +0000
+@@ -113,7 +113,10 @@
+	$(INSTALL) -m 664 $(LIBRARY) $(SOURCE_LIB_DIR)
+ endif
+ ifdef SHARED_LIBRARY
++	mv $(SHARED_LIBRARY) $(SHARED_LIBRARY).$(NSS_VERSION_MINOR)
++	ln -s $(shell pwd)/$(SHARED_LIBRARY).$(NSS_VERSION_MINOR) $(shell pwd)/$(SHARED_LIBRARY)
+	$(INSTALL) -m 775 $(SHARED_LIBRARY) $(SOURCE_LIB_DIR)
++	$(INSTALL) -m 775 $(SHARED_LIBRARY).$(NSS_VERSION_MINOR) $(SOURCE_LIB_DIR)
+ ifdef MOZ_DEBUG_SYMBOLS
+ ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET)))
+	$(INSTALL) -m 644 $(SHARED_LIBRARY:$(DLL_SUFFIX)=pdb) $(SOURCE_LIB_DIR)
+
diff --git a/dev-libs/nss/files/nss-3.12.3-executable-stacks.patch b/dev-libs/nss/files/nss-3.12.3-executable-stacks.patch
new file mode 100644
index 000000000..aedbebf7f
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.12.3-executable-stacks.patch
@@ -0,0 +1,15 @@
+--- mozilla/security/nss/lib/freebl/intel-aes.s-old	2009-06-21 14:20:10.491641710 -0500
++++ mozilla/security/nss/lib/freebl/intel-aes.s	2009-06-21 14:21:33.846655888 -0500
+@@ -1633,4 +1633,10 @@
+ 
+ 	xor	%eax, %eax
+ 	ret
+-	.size intel_aes_decrypt_cbc_256, .-intel_aes_decrypt_cbc_256
++	.size intel_aes_decrypt_cbc_256, .-intel_aes_decrypt_cbc_256
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
++
++
+
diff --git a/dev-libs/nss/files/nss-config.in b/dev-libs/nss/files/nss-config.in
new file mode 100644
index 000000000..664fafeed
--- /dev/null
+++ b/dev-libs/nss/files/nss-config.in
@@ -0,0 +1,137 @@
+#!/bin/sh
+
+prefix=@prefix@
+
+major_version=@MOD_MAJOR_VERSION@
+minor_version=@MOD_MINOR_VERSION@
+patch_version=@MOD_PATCH_VERSION@
+
+usage()
+{
+	cat <<EOF
+Usage: nss-config [OPTIONS] [LIBRARIES]
+Options:
+	[--prefix[=DIR]]
+	[--exec-prefix[=DIR]]
+	[--includedir[=DIR]]
+	[--libdir[=DIR]]
+	[--version]
+	[--libs]
+	[--cflags]
+Dynamic Libraries:
+	nss
+	ssl
+	smime
+EOF
+	exit $1
+}
+
+if test $# -eq 0; then
+	usage 1 1>&2
+fi
+
+lib_ssl=yes
+lib_smime=yes
+lib_nss=yes
+
+while test $# -gt 0; do
+  case "$1" in
+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+  *) optarg= ;;
+  esac
+
+  case $1 in
+    --prefix=*)
+      prefix=$optarg
+      ;;
+    --prefix)
+      echo_prefix=yes
+      ;;
+    --exec-prefix=*)
+      exec_prefix=$optarg
+      ;;
+    --exec-prefix)
+      echo_exec_prefix=yes
+      ;;
+    --includedir=*)
+      includedir=$optarg
+      ;;
+    --includedir)
+      echo_includedir=yes
+      ;;
+    --libdir=*)
+      libdir=$optarg
+      ;;
+    --libdir)
+      echo_libdir=yes
+      ;;
+    --version)
+      echo ${major_version}.${minor_version}.${patch_version}
+      ;;
+    --cflags)
+      echo_cflags=yes
+      ;;
+    --libs)
+      echo_libs=yes
+      ;;
+    ssl)
+      lib_ssl=yes
+      ;;
+    smime)
+      lib_smime=yes
+      ;;
+    nss)
+      lib_nss=yes
+      ;;
+    *)
+      usage 1 1>&2
+      ;;
+  esac
+  shift
+done
+
+# Set variables that may be dependent upon other variables
+if test -z "$exec_prefix"; then
+    exec_prefix=@exec_prefix@
+fi
+if test -z "$includedir"; then
+    includedir=@includedir@
+fi
+if test -z "$libdir"; then
+    libdir=@libdir@
+fi
+
+if test "$echo_prefix" = "yes"; then
+    echo $prefix
+fi
+
+if test "$echo_exec_prefix" = "yes"; then
+    echo $exec_prefix
+fi
+
+if test "$echo_includedir" = "yes"; then
+    echo $includedir
+fi
+
+if test "$echo_libdir" = "yes"; then
+    echo $libdir
+fi
+
+if test "$echo_cflags" = "yes"; then
+    echo -I$includedir
+fi
+
+if test "$echo_libs" = "yes"; then
+      libdirs="-Wl,-R$libdir -L$libdir"
+      if test -n "$lib_ssl"; then
+	libdirs="$libdirs -lssl${major_version}"
+      fi
+      if test -n "$lib_smime"; then
+	libdirs="$libdirs -lsmime${major_version}"
+      fi
+      if test -n "$lib_nss"; then
+	libdirs="$libdirs -lnss${major_version}"
+      fi
+      echo $libdirs
+fi      
+
diff --git a/dev-libs/nss/files/nss-fbsd7.patch b/dev-libs/nss/files/nss-fbsd7.patch
new file mode 100644
index 000000000..932f9e0ea
--- /dev/null
+++ b/dev-libs/nss/files/nss-fbsd7.patch
@@ -0,0 +1,16 @@
+https://bugzilla.mozilla.org/show_bug.cgi?id=436806
+
+objformat has been deprecated for a while. elf has been the default format for
+FreeBSD for a while too. objformat is gone from FreeBSD 7, so we default to elf.
+
+--- nss-3.12/mozilla/security/coreconf/FreeBSD.mk.old	2008-09-05 11:38:11 +0200
++++ nss-3.12/mozilla/security/coreconf/FreeBSD.mk	2008-09-05 11:38:28 +0200
+@@ -65,7 +65,7 @@
+ 
+ ARCH			= freebsd
+ 
+-MOZ_OBJFORMAT		:= $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout)
++MOZ_OBJFORMAT		:= $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf)
+ 
+ ifeq ($(MOZ_OBJFORMAT),elf)
+ DLL_SUFFIX		= so
diff --git a/dev-libs/nss/files/nss-mips64.patch b/dev-libs/nss/files/nss-mips64.patch
new file mode 100644
index 000000000..5abb26634
--- /dev/null
+++ b/dev-libs/nss/files/nss-mips64.patch
@@ -0,0 +1,21 @@
+--- mozilla/security/coreconf/Linux.mk.orig	2004-08-21 00:07:08.000000000 -0400
++++ mozilla/security/coreconf/Linux.mk	2004-08-20 23:28:52.000000000 -0400
+@@ -106,6 +106,10 @@
+ 	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
+ 	CPU_ARCH        = mips
+ else
++ifeq ($(OS_TEST),mips64)
++	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
++	CPU_ARCH        = mips64
++else
+ 	OS_REL_CFLAGS	= -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
+ 	CPU_ARCH	= x86
+ endif
+@@ -122,6 +126,7 @@
+ endif
+ endif
+ endif
++endif
+ 
+ 
+ LIBC_TAG		= _glibc
diff --git a/dev-libs/nss/files/nss.pc.in b/dev-libs/nss/files/nss.pc.in
new file mode 100644
index 000000000..1c5ac9626
--- /dev/null
+++ b/dev-libs/nss/files/nss.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: NSS
+Description: Network Security Services
+Version: @NSS_VERSION@
+Requires: nspr >= @NSPR_VERSION@
+Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -Wl,-R${libdir}
+Cflags: -I${includedir}
diff --git a/dev-libs/nss/nss-3.12.3-r1.ebuild b/dev-libs/nss/nss-3.12.3-r1.ebuild
new file mode 100644
index 000000000..41cf1b061
--- /dev/null
+++ b/dev-libs/nss/nss-3.12.3-r1.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.3-r1.ebuild,v 1.1 2009/06/24 15:56:40 nirbheek Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic multilib toolchain-funcs multilib-native
+
+NSPR_VER="4.7.4"
+RTM_NAME="NSS_${PV//./_}_RTM"
+DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
+HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.bz2"
+#SRC_URI="http://dev.gentoo.org/~armin76/dist/${P}.tar.bz2
+#	mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="utils"
+
+DEPEND=">=dev-libs/nspr-${NSPR_VER}[lib32?]
+	>=dev-db/sqlite-3.5[lib32?]"
+RDEPEND="${DEPEND}"
+
+multilib-native_src_prepare_internal() {
+	cd "${S}"/mozilla/security/coreconf
+	# hack nspr paths
+	echo 'INCLUDES += -I/usr/include/nspr -I$(DIST)/include/dbm' \
+		>> headers.mk || die "failed to append include"
+
+	# cope with nspr being in /usr/$(get_libdir)/nspr
+	sed -e 's:$(DIST)/lib:/usr/'"$(get_libdir)"/nspr':' \
+		-i location.mk
+
+	# modify install path
+	sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+		-i source.mk
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+
+	# do not always append -m64/-m32 on 64bit since it breaks multilib build
+	sed -i -e '/ARCHFLAG.*=/s:^:# :' Linux.mk
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-3.12-config.patch
+	epatch "${FILESDIR}"/${PN}-3.12-config-1.patch
+	epatch "${FILESDIR}"/${PN}-mips64-2.patch
+	epatch "${FILESDIR}"/${P}-executable-stacks.patch
+}
+
+multilib-native_src_compile_internal() {
+	strip-flags
+
+	echo > "${T}"/test.c
+	$(tc-getCC) ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o
+	case $(file "${T}"/test.o) in
+	*64-bit*) export USE_64=1;;
+	*32-bit*) ;;
+	*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
+	esac
+
+	export NSDISTMODE=copy
+	export NSS_USE_SYSTEM_SQLITE=1
+	export NSS_ENABLE_ECC=1
+	export NSPR_LIB_DIR="/usr/$(get_libdir)/nspr"
+	cd "${S}"/mozilla/security/coreconf
+	emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "coreconf make failed"
+	cd "${S}"/mozilla/security/dbm
+	emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "dbm make failed"
+	cd "${S}"/mozilla/security/nss
+	emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "nss make failed"
+}
+
+multilib-native_src_install_internal() {
+	MINOR_VERSION=12
+	cd "${S}"/mozilla/security/dist
+
+	# put all *.a files in /usr/lib/nss (because some have conflicting names
+	# with existing libraries)
+	dodir /usr/$(get_libdir)/nss
+	cp -L */lib/*.so "${D}"/usr/$(get_libdir)/nss || die "copying shared libs failed"
+	cp -L */lib/*.chk "${D}"/usr/$(get_libdir)/nss || die "copying chk files failed"
+	cp -L */lib/*.a "${D}"/usr/$(get_libdir)/nss || die "copying libs failed"
+
+	# all the include files
+	insinto /usr/include/nss
+	doins private/nss/*.h
+	doins public/nss/*.h
+	cd "${D}"/usr/$(get_libdir)/nss
+	for file in *.so; do
+		mv ${file} ${file}.${MINOR_VERSION}
+		ln -s ${file}.${MINOR_VERSION} ${file}
+	done
+
+	# coping with nss being in a different path. We move up priority to
+	# ensure that nss/nspr are used specifically before searching elsewhere.
+	dodir /etc/env.d
+	echo "LDPATH=/usr/$(get_libdir)/nss" > "${D}/etc/env.d/08nss-${ABI}"
+
+	dodir /usr/bin
+	dodir /usr/$(get_libdir)/pkgconfig
+	cp "${FILESDIR}"/3.12-nss-config.in "${D}"/usr/bin/nss-config
+	cp "${FILESDIR}"/3.12-nss.pc.in "${D}"/usr/$(get_libdir)/pkgconfig/nss.pc
+	NSS_VMAJOR=`cat ${S}/mozilla/security/nss/lib/nss/nss.h | grep "#define.*NSS_VMAJOR" | awk '{print $3}'`
+	NSS_VMINOR=`cat ${S}/mozilla/security/nss/lib/nss/nss.h | grep "#define.*NSS_VMINOR" | awk '{print $3}'`
+	NSS_VPATCH=`cat ${S}/mozilla/security/nss/lib/nss/nss.h | grep "#define.*NSS_VPATCH" | awk '{print $3}'`
+
+	sed -e "s,@libdir@,/usr/"$(get_libdir)"/nss,g" \
+		-e "s,@prefix@,/usr,g" \
+		-e "s,@exec_prefix@,\$\{prefix},g" \
+		-e "s,@includedir@,\$\{prefix}/include/nss,g" \
+		-e "s,@MOD_MAJOR_VERSION@,$NSS_VMAJOR,g" \
+		-e "s,@MOD_MINOR_VERSION@,$NSS_VMINOR,g" \
+		-e "s,@MOD_PATCH_VERSION@,$NSS_VPATCH,g" \
+		-i "${D}"/usr/bin/nss-config
+	chmod 755 "${D}"/usr/bin/nss-config
+
+	sed -e "s,@libdir@,/usr/"$(get_libdir)"/nss,g" \
+	      -e "s,@prefix@,/usr,g" \
+	      -e "s,@exec_prefix@,\$\{prefix},g" \
+	      -e "s,@includedir@,\$\{prefix}/include/nss," \
+	      -e "s,@NSPR_VERSION@,`nspr-config --version`,g" \
+	      -e "s,@NSS_VERSION@,$NSS_VMAJOR.$NSS_VMINOR.$NSS_VPATCH,g" \
+	      -i "${D}"/usr/$(get_libdir)/pkgconfig/nss.pc
+	chmod 644 "${D}"/usr/$(get_libdir)/pkgconfig/nss.pc
+
+	if use utils; then
+		cd "${S}"/mozilla/security/dist/*/bin/
+		for f in *; do
+			newbin ${f} nss${f}
+		done
+	fi
+
+	prep_ml_binaries /usr/bin/nss-config 
+}
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index 7647d7405..bfad4c0a9 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -6,11 +6,13 @@ DIST pygobject-2.14.2.tar.bz2 366808 RMD160 c9894695d745a9d859f3edfb9e2946ad8b4f
 DIST pygobject-2.15.4.tar.bz2 477302 RMD160 eecbf4a7969a7a81a50cf6e2b52d53d7d72d6b4e SHA1 dfc3f04a27243ac4c386bfd19e4c383dd419d040 SHA256 c746693328bfed7838a1f3bfac41b13d7f39a81ac961559cd0daf700fc677da7
 DIST pygobject-2.16.0.tar.bz2 515503 RMD160 509cddab25ab084706bc69d3c6c90f490251c37e SHA1 bb16032be31b0651160e9a2caf11c1115c69c85a SHA256 db0ab6f998bc5750aba2dfa96c8932f673914d8bf804a2c1c769b4a6e3f192d2
 DIST pygobject-2.16.1.tar.bz2 522347 RMD160 37f4075af9c06aba4fca47e2580c5408dbc28845 SHA1 12ce140438e7ff7e1a26fe4bba9a26b49f80ec0d SHA256 ee229c642759470a242c7f6ce3bd969a7484496f95570a8783859b03d6d79cc5
+DIST pygobject-2.18.0.tar.bz2 639205 RMD160 db454107949b0e797c6c151aa426368ef0f59317 SHA1 f800eda7978fe9813600cfdda973da15c3178bb0 SHA256 b11b840ae31e6e644986806ee3400f4528b803d07b6cee26add45e0f2e5e622b
 EBUILD pygobject-2.14.0.ebuild 2542 RMD160 b3448bf1f03fc57a16e5a1b744e275d47d0a1fd5 SHA1 c2b50af1923df89089942fb142f4b7f440e2c828 SHA256 d6b9bbb20630b4acc7e53494d34878be8abbe2dd640f61c7dc9440116e514307
 EBUILD pygobject-2.14.2.ebuild 2838 RMD160 75771310676cdd3a9f35a82096ef89e6689ce18e SHA1 f4a7982aeebb4f777b1b0064b30af5f9bfaedc6f SHA256 f604095b79b7e3e1fee3bbccc9387283a4d1dbdd8ed7ef625d1e630e3f5c09f5
 EBUILD pygobject-2.15.4.ebuild 2294 RMD160 0ff71711fbbd7d86f863f204cf2580d96157dc65 SHA1 9ee0c8c144d85c0d4241d7633aca0a9a1ff97c30 SHA256 f70913b74987cfac1ab76a872b6645421e89221f453a11a41b91da9131b28970
 EBUILD pygobject-2.16.0.ebuild 2403 RMD160 d59d0e55b1816f41a69577ad669219e080164927 SHA1 309fa4bc716c3d84c7ebd4e59261e70610abbf1b SHA256 2399288c5c884234dc64f13ae5b8e34e3509bdc6a8537f9bfed4582ed97b5c30
 EBUILD pygobject-2.16.1-r1.ebuild 2300 RMD160 e927554dedbf387055e0d116ed2299231cf84aae SHA1 daac45ddd7515a834f271b584eecd300f40a940a SHA256 633622b955607872cabaaf9ac4313da4474bade96fdaf970d640659e1c84a5e2
 EBUILD pygobject-2.16.1.ebuild 2397 RMD160 ef11a73e1f2b08e6bf805ce8575256ae7b0e4864 SHA1 7cae7c1769a5c9aade47011604a529c9631b709c SHA256 0f263205f8adb52e550cb767cd5c7f63a357e5abae7b1b79ef5d7b08b5e3d039
+EBUILD pygobject-2.18.0.ebuild 2464 RMD160 e71633d601eb281157a86dc370bcf77f0deef181 SHA1 f01e0b3407186459010d6d674f25b7a734011eb0 SHA256 7f7a23810651bdcea3febbfabe5b7897de0d54b01a1911896e9313026f4f9d4d
 MISC ChangeLog 8446 RMD160 de8e65f998ff53ae31fd62ccc97148af035cfaef SHA1 54c4de3ba15924bac5aa10c6edb2d4a29175fdb6 SHA256 5e35a97e3f3f776c2217cdc294706b1a35764e6fb77b1480897aa7407a5e0cf0
 MISC metadata.xml 263 RMD160 aa9b8ada798575f5d2b94042357d5ed59f4b1cbf SHA1 0843ae5e9b5a9a0ea54f4c79539bf781522e9b10 SHA256 993400d5ee19f0bd67c463d999d24e4184e8c077b4e535adf6a00678ced0c46c
diff --git a/dev-python/pygobject/pygobject-2.18.0.ebuild b/dev-python/pygobject/pygobject-2.18.0.ebuild
new file mode 100644
index 000000000..4f69cc95b
--- /dev/null
+++ b/dev-python/pygobject/pygobject-2.18.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.18.0.ebuild,v 1.1 2009/06/24 16:01:51 mrpouet Exp $
+
+EAPI="2"
+
+inherit autotools gnome2 python virtualx versionator multilib-native
+
+DESCRIPTION="GLib's GObject library bindings for Python"
+HOMEPAGE="http://www.pygtk.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc examples libffi test"
+
+RDEPEND=">=dev-lang/python-2.4.4-r5[lib32?]
+	>=dev-libs/glib-2.16[lib32?]
+	!<dev-python/pygtk-2.13[lib32?]
+	libffi? ( virtual/libffi )"
+DEPEND="${RDEPEND}
+	doc? ( dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.70.1 )
+	>=dev-util/pkgconfig-0.12.0"
+
+DOCS="AUTHORS ChangeLog ChangeLog.pre-$(get_version_component_range 1-2)
+	NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+			--disable-dependency-tracking
+			--enable-libtool-lock
+			$(use_enable doc docs)
+			$(use_enable test glibtest)
+			$(use_with libffi ffi)"
+}
+
+multilib-native_src_prepare_internal() {
+	gnome2_src_unpack
+
+	# Fix FHS compliance, see upstream bug #535524
+	epatch "${FILESDIR}/${PN}-2.15.4-fix-codegen-location.patch"
+
+	# needed to build on a libtool-1 system, bug #255542
+	rm m4/lt* m4/libtool.m4 ltmain.sh
+
+	eautoreconf
+
+	# disable pyc compiling
+	mv py-compile py-compile.orig
+	ln -s $(type -P true) py-compile
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check || die "tests failed"
+}
+
+multilib-native_src_install_internal() {
+	gnome2_src_install
+
+	if use examples; then
+		insinto /usr/share/doc/${P}
+		doins -r examples
+	fi
+
+	python_version
+	mv "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.py \
+		"${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.py-2.0
+	mv "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.pth \
+		"${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.pth-2.0
+}
+
+multilib-native_pkg_postinst_internal() {
+	python_version
+	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/gtk-2.0
+	alternatives_auto_makesym /usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.py pygtk.py-[0-9].[0-9]
+	alternatives_auto_makesym /usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.pth pygtk.pth-[0-9].[0-9]
+	python_mod_compile /usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.py
+	python_need_rebuild
+}
+
+pkg_postrm() {
+	python_version
+	python_mod_cleanup
+}
diff --git a/media-libs/libogg/Manifest b/media-libs/libogg/Manifest
index b90110b2c..705d0040c 100644
--- a/media-libs/libogg/Manifest
+++ b/media-libs/libogg/Manifest
@@ -2,12 +2,14 @@ DIST libogg-1.0.tar.gz 222625 RMD160 f4d85234407632e8140c208326f8d4b7526ffec7 SH
 DIST libogg-1.1.1.tar.gz 383607 RMD160 2a057c644d163fe7ce76e7f198542fedf6efa33e SHA1 df8eb2523fcc9aef211b884983cb3a624fe657fb SHA256 269f8f6b11b8ac737cbd8ed8cfa244cc51ca42b6da6683336ba1413d2a00ceb3
 DIST libogg-1.1.2.tar.gz 419959 RMD160 d0f3240ef1a69ae9b8e6ce4e18ade97de16d115d SHA1 518569a6be397f3903d86ca8c83b943ec0e4e713 SHA256 7934f3bf689c6ea0870bc73fcf40b00d5050044b03e558819a1ed333dc3cfadf
 DIST libogg-1.1.3.tar.gz 403467 RMD160 2dc0ab120416441a007cf1017f461372eab03c0d SHA1 a3e495a8baf6939efad7e0bd11cc0e466838c3db SHA256 bae29e79fbc50bbedf1235852094b71c8c910a1ef0cd42fe4163b7b545630b65
+DIST libogg-1.1.4.tar.gz 439365 RMD160 5eafc3defae658b21185036d9a711f3467e6425d SHA1 868ace372004cf303231b954c60a836acbd71065 SHA256 9354c183fd88417c2860778b60b7896c9487d8f6e58b9fec3fdbf971142ce103
 DIST libogg-1.1.tar.gz 282691 RMD160 e4a03223f39d2de7bdedc77c48db992ac8ff4742 SHA1 1021761d10de079ac86c2dc110fbaf83f60f2fca SHA256 01453d561255b5fcb361997904752860e4f8c6b9742f290578a44615fcc94356
 EBUILD libogg-1.0.ebuild 1305 RMD160 ff03a74057f54c68e8898d406bc35146266706fb SHA1 74659eb69148c271d1deda0697a1eae43593e16e SHA256 f0a369176a77b002b7f40c6b3a1815ed479f4ca8eaaa373623dadc769a54567b
 EBUILD libogg-1.1.1.ebuild 818 RMD160 2684c69808ad479ef9454596a17b5aa53fb7efd9 SHA1 4f2bdb7538560cb32eb54d8946d569cf9ae8ebca SHA256 4c10d53d086579b0bcbc5c5375295e4a22827aa02510f42c6e02f87e9d564b3d
 EBUILD libogg-1.1.2.ebuild 680 RMD160 7150f55ac9b3175db15de061488c1b9ce6e358cc SHA1 eeb0382c5190e23ebc1ee046b3ad43c5fd52a431 SHA256 cfa1594a45d548013bbb9e6d34f1ad2338e03ce2a705a72d76fa026a0f60d691
 EBUILD libogg-1.1.3-r1.ebuild 741 RMD160 5395c5bf1ec11f9cdf6ace79576b5c214ff1b302 SHA1 08b81249387094c3d233cdfbd1a66c7574c0fc6c SHA256 89458a3294dc46f69b02071833ffe009ca2eb94e8ed8a81dc02bce582d0db990
 EBUILD libogg-1.1.3.ebuild 688 RMD160 b87d86f16059bf375bcb1f59e7db38b224e00cee SHA1 8412bc2b09d37eda128bdc82485eb21b65654897 SHA256 c36705de23720c99119f5c3a48349847f9921c5fbd86c81d5a4221d407669c48
+EBUILD libogg-1.1.4.ebuild 759 RMD160 48a0d16668a806c06d8e1dae8f3f8ec25483ce0a SHA1 0af44d6ebf2c5bcd6ce43e73c95e02c9b5f3865a SHA256 cf814007ee333c6da9fcb25348f1821a491b82ea38965b89e595b99c7548cb60
 EBUILD libogg-1.1.ebuild 807 RMD160 63462efd63561f09ca7a1765c611944483b79030 SHA1 7c7a1bbcc119e1ac49253a34664a8ad7142ed117 SHA256 057459b6d7a05f8fdc983a0d072b311caea47ba160cef9c7a0ae835c0b076e76
 MISC ChangeLog 6285 RMD160 596edcbf366fedeb885fcf4e03f570e2424cd4a9 SHA1 07a4586bf42acfa383339c9713d532a0d0007bd4 SHA256 a2de632bf8c40e8daa217c88a1f24c7f9db8c5619e126a71da3ba90e1626d53b
 MISC metadata.xml 248 RMD160 05122080e3580393675ec87101f0eb48aba15ea5 SHA1 8f9b5d80a666c1f111e7a6e61c66a298ed67a408 SHA256 790cfd8d63ed9248363a7e773fd9bdad79266c4153368dceb5109a63b2a2aa8f
diff --git a/media-libs/libogg/libogg-1.1.4.ebuild b/media-libs/libogg/libogg-1.1.4.ebuild
new file mode 100644
index 000000000..35753a317
--- /dev/null
+++ b/media-libs/libogg/libogg-1.1.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libogg/libogg-1.1.4.ebuild,v 1.1 2009/06/25 08:56:04 aballier Exp $
+
+EAPI="2"
+
+inherit eutils libtool multilib-native
+
+DESCRIPTION="the Ogg media file format library"
+HOMEPAGE="http://xiph.org/ogg/"
+SRC_URI="http://downloads.xiph.org/releases/ogg/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	elibtoolize
+	epunt_cxx
+}
+
+multilib-native_src_install_internal() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc CHANGES AUTHORS
+
+	find "${D}" -name '*.la' -delete
+}
diff --git a/media-libs/libvorbis/Manifest b/media-libs/libvorbis/Manifest
index ece9eb573..78ba0c5dd 100644
--- a/media-libs/libvorbis/Manifest
+++ b/media-libs/libvorbis/Manifest
@@ -1,6 +1,8 @@
 DIST aotuv-b5.6-1.2.1rc1.diff.bz2 87102 RMD160 7242e12e4dfa4de3f69e5e0817e6baea1fb06a70 SHA1 edc0c39391a573a0f26cd8e76fe1f0139445d71f SHA256 4ad9c62bda2ebff1731fff15bf23e799d87d88723d2ac60a2486b8376c0cc9e4
 DIST libvorbis-1.2.1_rc1-aotuv_beta5.7.patch.bz2 144982 RMD160 67936862bfb8933618f77f3aa80f4dcfe64ef914 SHA1 5fe09c43edcf1fc58908f3dc945c87de7102c295 SHA256 66c26ef0ee5c13a56c2a60ef0eb079fa0d3569dcfbd18b05b9449392d2b78790
 DIST libvorbis-1.2.1rc1.tar.bz2 1175156 RMD160 f99900fdac5dcd91e7b3011eadda1cd499d8450e SHA1 25c8713fec0de238d56603812abd433115a8c091 SHA256 565d8b3565dfab1ca08c374c0ef1ba66d3cb47292537cdc40f86f227c51cf316
+DIST libvorbis-1.2.2.tar.gz 1475590 RMD160 10cefdd540a3f55b6650eed7f1fbe11df463cae4 SHA1 629890c77c6abb56243232f25578c466e27950c7 SHA256 e1c23cc3fdd9d07cdee3441ca44918987d995ea7ea457ddf61b430ac5a6b361d
 EBUILD libvorbis-1.2.1_rc1-r2.ebuild 1685 RMD160 2307623583643b483a84eae58ae4ed68aaae61ed SHA1 c8bd1a0e5d1f90fe4d1521b52f26868862b06c91 SHA256 48cbceb325fdcf52acf7012d3b00ddcdd8f191061261480d609821b361743e43
 EBUILD libvorbis-1.2.1_rc1-r3.ebuild 1779 RMD160 f56e4e6dca57a51e70e198655276bc9ae7f5da11 SHA1 8f20e5794f82e9a18179d5d68d2b07daf9c737c6 SHA256 f29d55a8be450af951351789f221925ca0a9cb235439d47157b6061113386d03
 EBUILD libvorbis-1.2.1_rc1.ebuild 1432 RMD160 f3232b5e837be0fa28eebb36926c9adfd4b8863b SHA1 0b42ed78cb7b0831ac61a1c0fefe0a4653841b23 SHA256 880e4432fa9e067c1bf7c8a63dfe5c42b054495c2a8b57c090fb72db0e406695
+EBUILD libvorbis-1.2.2.ebuild 1522 RMD160 174018ee1d85f81be76345a679d7a4dbb3bf9822 SHA1 9344ded6e742c2fb4bfc388c280665d49c52dba5 SHA256 587fc8ee6f032d5b15c2261ad1dc556db4f5d70d2c070689628971805fc3f9cd
diff --git a/media-libs/libvorbis/libvorbis-1.2.2.ebuild b/media-libs/libvorbis/libvorbis-1.2.2.ebuild
new file mode 100644
index 000000000..1a29044da
--- /dev/null
+++ b/media-libs/libvorbis/libvorbis-1.2.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/libvorbis-1.2.2.ebuild,v 1.1 2009/06/25 09:20:37 aballier Exp $
+
+EAPI=2
+inherit autotools flag-o-matic eutils toolchain-funcs multilib-native
+
+MY_P=${P/_/}
+DESCRIPTION="The Ogg Vorbis sound file format library with aoTuV patch"
+HOMEPAGE="http://xiph.org/vorbis"
+SRC_URI="http://downloads.xiph.org/releases/vorbis/${P}.tar.gz"
+#      aotuv? ( mirror://gentoo/${PN}-1.2.1_rc1-aotuv_beta5.7.patch.bz2
+#              http://dev.gentoo.org/~ssuominen/${PN}-1.2.1_rc1-aotuv_beta5.7.patch.bz2)"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc"
+# +aotuv:  seems it is merged
+
+RDEPEND="media-libs/libogg"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+multilib-native_src_prepare_internal() {
+	#use aotuv && epatch "${WORKDIR}"/${PN}-1.2.1_rc1-aotuv_beta5.7.patch
+
+	sed -e 's:-O20::g' -e 's:-mfused-madd::g' -e 's:-mcpu=750::g' \
+		-i configure.ac || die "sed failed"
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+multilib-native_src_install_internal() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	rm -rf "${D}"/usr/share/doc/${PN}*
+
+	dodoc AUTHORS CHANGES README todo.txt
+	#use aotuv && dodoc aoTuV_README-1st.txt aoTuV_technical.txt
+
+	if use doc; then
+		docinto txt
+		dodoc doc/*.txt
+		docinto html
+		dohtml -r doc/*
+		insinto /usr/share/doc/${PF}/pdf
+		doins doc/*.pdf
+	fi
+}
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 58b9dd641..b2992f137 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -8,6 +8,7 @@ DIST MesaLib-7.3.tar.bz2 3368281 RMD160 ee0b06d375d1ea91dc26ae96c807918e1d3cb7c8
 DIST MesaLib-7.4.1.tar.bz2 3373554 RMD160 6a178359f26f54198e17d22c12f396940abb2b18 SHA1 ee3f8baa48fa31441fc07ccd06734279cb1ca18a SHA256 cba38fc0f6896757cb6e3962d3bb091d3d724a536a213ab9cf6b00a760efc5d2
 DIST MesaLib-7.4.2.tar.bz2 3371577 RMD160 e70b8fd203325e676d90485632bf266e39d46a7e SHA1 fe70945ccf2c08d18ae4e83000018f0400352065 SHA256 71b978812cfc0dbc378315de42ef44a32f171b4166733b18455ec04a7fbc6434
 DIST MesaLib-7.4.3.tar.bz2 3373106 RMD160 10ddaa327e2acadeae4bbe4221964e29e3ecfab6 SHA1 e8f6ea3ca7784ff7d8e413eb8ca402c90579cc81 SHA256 f8dc9efec4c2d98bb969b458f4017425223bab903cec871d255f7a77b8947c88
+DIST MesaLib-7.4.4.tar.bz2 3375615 RMD160 9c9a5e8b7f8d2fd175cc8542e2aecf48edf8c084 SHA1 1cdcef24900489bc0a879013b2138c0d9aedffe3 SHA256 eaf73d7a3a2dc959ddc0753abaa18160c64bec00b35bf4a0c96040b2072918ec
 DIST MesaLib-7.5-rc2.tar.gz 5719904 RMD160 d916d31b762fe2cf2ec35fe390814daa16aa4022 SHA1 6a040f0eccba1e8eb70146deba72ced1e5989e4c SHA256 c239bf494421cc55137f7a2f52b8604fef9dcb06d432d576b9017fab8a428230
 DIST mesa-7.3-gentoo-patches-01.tar.bz2 34342 RMD160 547e3d1e8a72cd7df13bf699c181a5f8d36bff33 SHA1 51310d802ad1ee8b660fc7cf77c37b5478f3794a SHA256 e3d27046f73b6fc3d89e06fdfce9d065fa79705f59950b65350fa55bd539e56a
 DIST mesa-7.4.1-gentoo-patches-02.tar.bz2 8244 RMD160 ce33e22a3fb599f4602cc724be4436633f0e22b2 SHA1 65edf1dad7572b7769fbbb21b6fc6a17ade4adeb SHA256 eee23efd500024fe03970ada70c8678161e60eef285d6d9e334e0ef157bfd96d
@@ -16,5 +17,6 @@ EBUILD mesa-7.3-r1.ebuild 7283 RMD160 c7fa69e0fb4d1258900668e8e676c704826e86b3 S
 EBUILD mesa-7.4.1-r2.ebuild 7954 RMD160 36ea50c17a421d9a0cd1c450c4eeb23889a2e414 SHA1 cb2cce827fdd4f3061933e7bab7a41011704e80d SHA256 fc2cc8ffad870dd99763abff9f18bbedb8bfb7d184ec890e5fce8b193dd0782c
 EBUILD mesa-7.4.2.ebuild 7952 RMD160 13b00a3cccaf92df96a0ba0cb671834eb4950394 SHA1 fbe60c3f37fad9a0c46ff9fc1fa35e8759e8de89 SHA256 5ecd3ab15b16c00c12c102cf5825c6d24ce9b8c03c96b0a84e6abea35be6a159
 EBUILD mesa-7.4.3.ebuild 7957 RMD160 988cbbec2428801b23910aef534fb22f2f02f03a SHA1 c1f1b6d1067e1fe3273d0d00ff57dceb967ff9a6 SHA256 9538ec3a6cd76988529b963e792e2c43cc04467509247b10092b7e2b6d612ee3
+EBUILD mesa-7.4.4.ebuild 7952 RMD160 5d344897780ffac2973d6096f74fada807107b6d SHA1 67c4575f52cb28c5096308e8490653ba0ec26d4d SHA256 28a93ef912ec32788c8cb0cef24ec7250cdc9820ca711c41bee7b4125a25f9a6
 EBUILD mesa-7.5_rc2.ebuild 7796 RMD160 1a06ca81522bd53bc4f24c67f7f2d65175d49ec0 SHA1 5be632da5d688161a6752e68fc8fcb15ce0b9d76 SHA256 c61a31d578bf7f5118ca8769765ce16a43bf94c03c34ceff4a60d2179883d1f3
 EBUILD mesa-9999.ebuild 7870 RMD160 897950ca87d9e86aa6a303f4d3ed484911af0567 SHA1 786c2e9bbd287498073374a923e1f156000ec1a4 SHA256 38a6eeb8bc7cb85a6ea9805e2a5c0736d960bbe15f5f88cccfb6fb57ca2aef16
diff --git a/media-libs/mesa/mesa-7.4.4.ebuild b/media-libs/mesa/mesa-7.4.4.ebuild
new file mode 100644
index 000000000..a3506e1fe
--- /dev/null
+++ b/media-libs/mesa/mesa-7.4.4.ebuild
@@ -0,0 +1,276 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.4.4.ebuild,v 1.1 2009/06/24 17:43:44 remi Exp $
+
+EAPI="2"
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git"
+	EXPERIMENTAL="true"
+	IUSE_VIDEO_CARDS_UNSTABLE="video_cards_nouveau"
+	IUSE_UNSTABLE="gallium"
+	# User can also specify branch by simply adding MESA_LIVE_BRANCH="blesmrt"
+	# to the make.conf, where blesmrt is desired branch.
+	[[ -z ${MESA_LIVE_BRANCH} ]] || EGIT_BRANCH="${MESA_LIVE_BRANCH}"
+fi
+
+inherit autotools multilib flag-o-matic ${GIT_ECLASS} portability multilib-native
+
+OPENGL_DIR="xorg-x11"
+
+MY_PN="${PN/m/M}"
+MY_P="${MY_PN}-${PV/_/-}"
+MY_SRC_P="${MY_PN}Lib-${PV/_/-}"
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="http://mesa3d.sourceforge.net/"
+
+#SRC_PATCHES="mirror://gentoo/${P}-gentoo-patches-01.tar.bz2"
+if [[ $PV = *_rc* ]]; then
+	SRC_URI="http://www.mesa3d.org/beta/${MY_SRC_P}.tar.gz
+		${SRC_PATCHES}"
+elif [[ $PV = 9999* ]]; then
+	SRC_URI="${SRC_PATCHES}"
+else
+	SRC_URI="mirror://sourceforge/mesa3d/${MY_SRC_P}.tar.bz2
+		${SRC_PATCHES}"
+fi
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+
+IUSE_VIDEO_CARDS="${IUSE_VIDEO_CARDS_UNSTABLE}
+	video_cards_intel
+	video_cards_mach64
+	video_cards_mga
+	video_cards_none
+	video_cards_r128
+	video_cards_radeon
+	video_cards_radeonhd
+	video_cards_s3virge
+	video_cards_savage
+	video_cards_sis
+	video_cards_sunffb
+	video_cards_tdfx
+	video_cards_trident
+	video_cards_via"
+IUSE="${IUSE_VIDEO_CARDS} ${IUSE_UNSTABLE}
+	debug doc motif nptl pic xcb kernel_FreeBSD"
+
+# keep correct libdrm and dri2proto dep
+# keep blocks in rdepend for binpkg
+RDEPEND="!<=x11-base/xorg-x11-6.9
+	!<=x11-proto/xf86driproto-2.0.3
+	app-admin/eselect-opengl
+	dev-libs/expat[lib32?]
+	>=x11-libs/libdrm-2.4.6[lib32?]
+	x11-libs/libICE[lib32?]
+	x11-libs/libX11[xcb?,lib32?]
+	x11-libs/libXdamage[lib32?]
+	x11-libs/libXext[lib32?]
+	x11-libs/libXi[lib32?]
+	x11-libs/libXmu[lib32?]
+	x11-libs/libXxf86vm[lib32?]
+	motif? ( x11-libs/openmotif[lib32?] )
+	doc? ( app-doc/opengl-manpages )
+"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	x11-misc/makedepend
+	>=x11-proto/dri2proto-1.99.3
+	>=x11-proto/glproto-1.4.8
+	x11-proto/inputproto
+	x11-proto/xextproto
+	x11-proto/xf86vidmodeproto
+	x11-proto/xf86driproto
+"
+# glew depend on mesa and it is needed in runtime
+PDEPEND=">=media-libs/glew-1.5.1[lib32?]"
+
+S="${WORKDIR}/${MY_P}"
+
+# Think about: ggi, svga, fbcon, no-X configs
+
+pkg_setup() {
+	if use debug; then
+		append-flags -g
+	fi
+
+	# gcc 4.2 has buggy ivopts
+	if [[ $(gcc-version) = "4.2" ]]; then
+		append-flags -fno-ivopts
+	fi
+
+	# recommended by upstream
+	append-flags -ffast-math
+}
+
+src_unpack() {
+	[[ $PV = 9999* ]] && git_src_unpack || unpack ${A}
+}
+
+src_prepare() {
+	# apply patches
+	if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then
+		EPATCH_FORCE="yes" \
+		EPATCH_SOURCE="${WORKDIR}/patches" \
+		EPATCH_SUFFIX="patch" \
+		epatch
+	fi
+	# FreeBSD 6.* doesn't have posix_memalign().
+	[[ ${CHOST} == *-freebsd6.* ]] && \
+		sed -i -e "s/-DHAVE_POSIX_MEMALIGN//" configure.ac
+
+	eautoreconf
+}
+
+multilib-native_src_configure_internal() {
+	local myconf
+
+	# Configurable DRI drivers
+	driver_enable swrast
+	driver_enable video_cards_intel i810 i915 i965
+	driver_enable video_cards_mach64 mach64
+	driver_enable video_cards_mga mga
+	driver_enable video_cards_r128 r128
+	# ATI has two implementations as video_cards
+	driver_enable video_cards_radeon radeon r200 r300
+	driver_enable video_cards_radeonhd r300
+	driver_enable video_cards_s3virge s3v
+	driver_enable video_cards_savage savage
+	driver_enable video_cards_sis sis
+	driver_enable video_cards_sunffb ffb
+	driver_enable video_cards_tdfx tdfx
+	driver_enable video_cards_trident trident
+	driver_enable video_cards_via unichrome
+
+	# all live (experimental) stuff is wrapped around with experimental variable
+	# so the users cant get to this parts even with enabled useflags (downgrade
+	# from live to stable for example)
+	if [[ -n ${EXPERIMENTAL} ]]; then
+		# nouveau works only with gallium and intel, radeon, radeonhd can use
+		# gallium as alternative implementation (NOTE: THIS IS EXPERIMENTAL)
+		if use video_cards_nouveau && ! use gallium ; then
+			elog "Nouveau driver is available only via gallium interface."
+			elog "Enable gallium useflag if you want to use nouveau."
+			echo
+		fi
+		# state trackers, for now enable the one i want
+		# think about this bit more...
+		myconf="${myconf} $(use_enable gallium)"
+		if use gallium; then
+			elog "Warning gallium interface is highly experimental so use"
+			elog "it only if you feel really really brave."
+			elog
+			elog "Intel: works only i915."
+			elog "Nouveau: only available implementation, so no other choice"
+			elog "Radeon: not working, disabled."
+			echo
+			myconf="${myconf}
+				--with-state-trackers=glx,dri,egl
+				$(use_enable video_cards_nouveau gallium-nouveau)
+				$(use_enable video_cards_intel gallium-intel)"
+				#$(use_enable video_cards_radeon gallium-radeon)
+				#$(use_enable video_cards_radeonhd gallium-radeon)"
+		fi
+	fi
+
+	# Deactivate assembly code for pic build
+	# Sparc assembly code is not working
+	myconf="${myconf} $(use_enable !pic asm)"
+	myconf="${myconf} $(use_enable !sparc asm)"
+
+	# --with-driver=dri|xlib|osmesa ; might get changed later to something
+	# else than dri
+	econf \
+		--with-driver=dri \
+		--disable-glut \
+		--without-demos \
+		$(use_enable debug) \
+		$(use_enable motif glw) \
+		$(use_enable motif) \
+		$(use_enable nptl glx-tls) \
+		$(use_enable xcb) \
+		--with-dri-drivers=${DRI_DRIVERS} \
+		${myconf}
+}
+
+multilib-native_src_install_internal() {
+	dodir /usr
+	emake DESTDIR="${D}" install || die "Installation failed"
+
+	# Remove redundant headers
+	# GLUT thing
+	rm -f "${D}"/usr/include/GL/glut*.h || die "Removing glut include failed."
+	# Glew headers
+	rm -f "${D}"/usr/include/GL/{glew,glxew,wglew}.h \
+		|| die "Removing glew includes failed."
+
+	# Move libGL and others from /usr/lib to /usr/lib/opengl/blah/lib
+	# because user can eselect desired GL provider.
+	ebegin "Moving libGL and friends for dynamic switching"
+		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include}
+		local x
+		for x in "${D}"/usr/$(get_libdir)/libGL.{la,a,so*}; do
+			if [ -f ${x} -o -L ${x} ]; then
+				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib \
+					|| die "Failed to move ${x}"
+			fi
+		done
+		for x in "${D}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
+			if [ -f ${x} -o -L ${x} ]; then
+				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include \
+					|| die "Failed to move ${x}"
+			fi
+		done
+	eend $?
+
+	# Install libtool archives
+	insinto /usr/$(get_libdir)
+	# Should this use the -L/usr/lib instead of -L/usr/$(get_libdir)?
+	# Please confirm and update this comment or the file.
+	doins "${FILESDIR}"/lib/libGLU.la || die "doins libGLU.la failed"
+	sed -i -e "s:/lib:/$(get_libdir):g" \
+		"${D}"/usr/$(get_libdir)/libGLU.la
+
+	sed \
+		-e "s:\${libdir}:$(get_libdir):g" \
+		"${FILESDIR}"/lib/libGL.la \
+		> "${D}"/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
+
+	# On *BSD libcs dlopen() and similar functions are present directly in
+	# libc.so and does not require linking to libdl. portability eclass takes
+	# care of finding the needed library (if needed) witht the dlopen_lib
+	# function.
+	sed -i \
+		-e 's:-ldl:'$(dlopen_lib)':g' \
+		"${D}"/usr/$(get_libdir)/{libGLU.la,opengl/xorg-x11/lib/libGL.la} \
+		|| die "sed dlopen failed"
+}
+
+pkg_postinst() {
+	# Switch to the xorg implementation.
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
+}
+
+# $1 - VIDEO_CARDS flag
+# other args - names of DRI drivers to enable
+driver_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			DRI_DRIVERS="${DRI_DRIVERS},$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					DRI_DRIVERS="${DRI_DRIVERS},${i}"
+				done
+			fi
+			;;
+	esac
+}
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 2cbc993e7..ffa75ff82 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -9,7 +9,5 @@ AUX pulseaudio.init.d-2 632 RMD160 5baf66e3f64e406b7e23ffbe13774e32595cff19 SHA1
 AUX pulseaudio.init.d-4 2344 RMD160 172421648cafd1a3b1ff13cc33547c38d08744a1 SHA1 acdb473279e1429d0079794b77f688187773d496 SHA256 677b5606382f61162971efd12120332b6377fef2d96c9cfb92c68c17be096a38
 DIST pulseaudio-0.9.15.tar.gz 1704374 RMD160 7cab0d9ab44180b6440ae7f151a6cbb91928b321 SHA1 56fb71e4e88c901d9941d85bfe142612c30e5c8e SHA256 1e8ad5b7c5cf3485bd0738c296274ff2c99d26d12a25a225dc250eddea25b9f1
 DIST pulseaudio-0.9.9.tar.gz 1063448 RMD160 beb9cb645ce69978ba095e73376ae8ae4b92daf9 SHA1 de8896cf3c6e26e77e4ae19ba300c409b6de8455 SHA256 9caab8f9be8a371aea7cd0241aab7ffd4b1043fbc4a8f62736faea4229f11f7d
-EBUILD pulseaudio-0.9.15-r1.ebuild 4783 RMD160 bb050fb1bbeabc56dd7948b713e81349427a859d SHA1 8f115b9337ec891ed4a3f030051f340a61c5423f SHA256 73d2506240afbbaa1468b6108e73594dedf15c2daa1b5f97d3c99883b52e73f0
-EBUILD pulseaudio-0.9.15-r50.ebuild 6509 RMD160 5a77523e3c0a29352d7eb90a6d8f1621ebc34431 SHA1 d2ce4a5934d9c75f2462bc06185bfb7c00862577 SHA256 3be9e898ba9cf5122d7571ccfd496cc13b76d143b29d4aa0d6d567f0ee01cb5b
 EBUILD pulseaudio-0.9.15.ebuild 6485 RMD160 a654d7899c047e22cbab7c00d2e4431025bdbfb9 SHA1 b82371f258a9d8704b04de33a764c539a9510320 SHA256 1f7d802b53589fdaafecb28a7e729687b0eb84c5f826c3d16bc717ffd77c3a46
 EBUILD pulseaudio-0.9.9.ebuild 6049 RMD160 33f58fc6e1065ebc5db40b1bcd45a403d7aaa408 SHA1 f4724fef7739c667f0ab26828b1041627131d81a SHA256 ea3e354753941d680e9ab1fe16eee72bef0da94a7bbe013dbfefaa06ceadb30d
diff --git a/metadata/cache/dev-libs/nspr-4.8 b/metadata/cache/dev-libs/nspr-4.8
new file mode 100644
index 000000000..92124e2e9
--- /dev/null
+++ b/metadata/cache/dev-libs/nspr-4.8
@@ -0,0 +1,22 @@
+>=dev-db/sqlite-3.5[lib32?] sys-apps/abi-wrapper
+>=dev-db/sqlite-3.5[lib32?] sys-apps/abi-wrapper
+0
+ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.8/src/nspr-4.8.tar.gz
+
+http://www.mozilla.org/projects/nspr/
+|| ( MPL-1.1 GPL-2 LGPL-2.1 )
+Netscape Portable Runtime
+
+base eutils multilib multilib-native portability toolchain-funcs versionator
+ipv6 debug lib32
+
+
+
+2
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-libs/nss-3.12.3-r1 b/metadata/cache/dev-libs/nss-3.12.3-r1
new file mode 100644
index 000000000..74815d6ad
--- /dev/null
+++ b/metadata/cache/dev-libs/nss-3.12.3-r1
@@ -0,0 +1,22 @@
+>=dev-libs/nspr-4.7.4[lib32?] >=dev-db/sqlite-3.5[lib32?] sys-apps/abi-wrapper
+>=dev-libs/nspr-4.7.4[lib32?] >=dev-db/sqlite-3.5[lib32?] sys-apps/abi-wrapper
+0
+ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_3_RTM/src/nss-3.12.3.tar.bz2
+
+http://www.mozilla.org/projects/security/pki/nss/
+|| ( MPL-1.1 GPL-2 LGPL-2.1 )
+Mozilla's Network Security Services library that implements PKI support
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+base eutils flag-o-matic multilib multilib-native portability toolchain-funcs
+utils lib32
+
+
+
+2
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-python/pygobject-2.18.0 b/metadata/cache/dev-python/pygobject-2.18.0
new file mode 100644
index 000000000..c003c3656
--- /dev/null
+++ b/metadata/cache/dev-python/pygobject-2.18.0
@@ -0,0 +1,22 @@
+>=dev-lang/python-2.4.4-r5[lib32?] >=dev-libs/glib-2.16[lib32?] !<dev-python/pygtk-2.13[lib32?] libffi? ( virtual/libffi ) doc? ( dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.70.1 ) >=dev-util/pkgconfig-0.12.0 =sys-devel/automake-1.10* >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-apps/sed-4 X? ( x11-base/xorg-server x11-apps/xhost ) sys-apps/abi-wrapper
+>=dev-lang/python-2.4.4-r5[lib32?] >=dev-libs/glib-2.16[lib32?] !<dev-python/pygtk-2.13[lib32?] libffi? ( virtual/libffi ) sys-apps/abi-wrapper
+2
+mirror://gnome/sources/pygobject/2.18/pygobject-2.18.0.tar.bz2
+
+http://www.pygtk.org/
+LGPL-2.1
+GLib's GObject library bindings for Python
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+alternatives autotools base eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib multilib-native portability python toolchain-funcs versionator virtualx
+doc examples libffi test debug X lib32
+
+
+
+2
+
+compile configure install postinst postrm preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/media-libs/libogg-1.1.4 b/metadata/cache/media-libs/libogg-1.1.4
new file mode 100644
index 000000000..af4c3fa53
--- /dev/null
+++ b/metadata/cache/media-libs/libogg-1.1.4
@@ -0,0 +1,22 @@
+sys-apps/abi-wrapper
+sys-apps/abi-wrapper
+0
+http://downloads.xiph.org/releases/ogg/libogg-1.1.4.tar.gz
+
+http://xiph.org/ogg/
+BSD
+the Ogg media file format library
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+base eutils libtool multilib multilib-native portability toolchain-funcs
+lib32
+
+
+
+2
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/media-libs/libvorbis-1.2.2 b/metadata/cache/media-libs/libvorbis-1.2.2
new file mode 100644
index 000000000..c71c7b148
--- /dev/null
+++ b/metadata/cache/media-libs/libvorbis-1.2.2
@@ -0,0 +1,22 @@
+media-libs/libogg dev-util/pkgconfig =sys-devel/automake-1.10* >=sys-devel/autoconf-2.61 sys-devel/libtool sys-apps/abi-wrapper
+media-libs/libogg sys-apps/abi-wrapper
+0
+http://downloads.xiph.org/releases/vorbis/libvorbis-1.2.2.tar.gz
+
+http://xiph.org/vorbis
+BSD
+The Ogg Vorbis sound file format library with aoTuV patch
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+autotools base eutils flag-o-matic libtool multilib multilib-native portability toolchain-funcs
+doc lib32
+
+
+
+2
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/media-libs/mesa-7.4.4 b/metadata/cache/media-libs/mesa-7.4.4
new file mode 100644
index 000000000..ff3ddcfb3
--- /dev/null
+++ b/metadata/cache/media-libs/mesa-7.4.4
@@ -0,0 +1,22 @@
+!<=x11-base/xorg-x11-6.9 !<=x11-proto/xf86driproto-2.0.3 app-admin/eselect-opengl dev-libs/expat[lib32?] >=x11-libs/libdrm-2.4.6[lib32?] x11-libs/libICE[lib32?] x11-libs/libX11[xcb?,lib32?] x11-libs/libXdamage[lib32?] x11-libs/libXext[lib32?] x11-libs/libXi[lib32?] x11-libs/libXmu[lib32?] x11-libs/libXxf86vm[lib32?] motif? ( x11-libs/openmotif[lib32?] ) doc? ( app-doc/opengl-manpages ) dev-util/pkgconfig x11-misc/makedepend >=x11-proto/dri2proto-1.99.3 >=x11-proto/glproto-1.4.8 x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto x11-proto/xf86driproto =sys-devel/automake-1.10* >=sys-devel/autoconf-2.61 sys-devel/libtool sys-apps/abi-wrapper
+!<=x11-base/xorg-x11-6.9 !<=x11-proto/xf86driproto-2.0.3 app-admin/eselect-opengl dev-libs/expat[lib32?] >=x11-libs/libdrm-2.4.6[lib32?] x11-libs/libICE[lib32?] x11-libs/libX11[xcb?,lib32?] x11-libs/libXdamage[lib32?] x11-libs/libXext[lib32?] x11-libs/libXi[lib32?] x11-libs/libXmu[lib32?] x11-libs/libXxf86vm[lib32?] motif? ( x11-libs/openmotif[lib32?] ) doc? ( app-doc/opengl-manpages ) sys-apps/abi-wrapper
+0
+mirror://sourceforge/mesa3d/MesaLib-7.4.4.tar.bz2
+
+http://mesa3d.sourceforge.net/
+LGPL-2
+OpenGL-like graphic library for Linux
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+autotools base eutils flag-o-matic libtool multilib multilib-native portability toolchain-funcs
+video_cards_intel video_cards_mach64 video_cards_mga video_cards_none video_cards_r128 video_cards_radeon video_cards_radeonhd video_cards_s3virge video_cards_savage video_cards_sis video_cards_sunffb video_cards_tdfx video_cards_trident video_cards_via debug doc motif nptl pic xcb kernel_FreeBSD lib32
+
+>=media-libs/glew-1.5.1[lib32?]
+
+2
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/net-libs/libproxy-0.2.3-r1 b/metadata/cache/net-libs/libproxy-0.2.3-r1
new file mode 100644
index 000000000..0a313d2b7
--- /dev/null
+++ b/metadata/cache/net-libs/libproxy-0.2.3-r1
@@ -0,0 +1,22 @@
+gnome? ( x11-libs/libX11[lib32?] x11-libs/libXmu[lib32?] gnome-base/gconf[lib32?] ) kde? ( x11-libs/libX11[lib32?] x11-libs/libXmu[lib32?] ) networkmanager? ( net-misc/networkmanager[lib32?] ) python? ( >=dev-lang/python-2.5[lib32?] ) webkit? ( net-libs/webkit-gtk[lib32?] ) xulrunner? ( net-libs/xulrunner[lib32?] ) >=dev-util/pkgconfig-0.19 =sys-devel/automake-1.10* >=sys-devel/autoconf-2.61 sys-devel/libtool sys-apps/abi-wrapper
+gnome? ( x11-libs/libX11[lib32?] x11-libs/libXmu[lib32?] gnome-base/gconf[lib32?] ) kde? ( x11-libs/libX11[lib32?] x11-libs/libXmu[lib32?] ) networkmanager? ( net-misc/networkmanager[lib32?] ) python? ( >=dev-lang/python-2.5[lib32?] ) webkit? ( net-libs/webkit-gtk[lib32?] ) xulrunner? ( net-libs/xulrunner[lib32?] ) sys-apps/abi-wrapper
+0
+http://libproxy.googlecode.com/files/libproxy-0.2.3.tar.gz
+
+http://code.google.com/p/libproxy/
+LGPL-2.1
+Library for automatic proxy configuration management
+alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+alternatives autotools base eutils libtool multilib multilib-native portability python toolchain-funcs
+gnome kde networkmanager python webkit xulrunner lib32
+
+
+
+2
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-libs/cracklib-2.8.13 b/metadata/cache/sys-libs/cracklib-2.8.13
index 80079d197..81c4222be 100644
--- a/metadata/cache/sys-libs/cracklib-2.8.13
+++ b/metadata/cache/sys-libs/cracklib-2.8.13
@@ -7,7 +7,7 @@ http://sourceforge.net/projects/cracklib
 CRACKLIB
 Password Checking Library
 alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
-base eutils multilib multilib-native portability toolchain-funcs
+base eutils libtool multilib multilib-native portability toolchain-funcs
 nls python lib32
 
 
diff --git a/metadata/cache/sys-libs/db-4.7.25_p4 b/metadata/cache/sys-libs/db-4.7.25_p4
new file mode 100644
index 000000000..4b930f99b
--- /dev/null
+++ b/metadata/cache/sys-libs/db-4.7.25_p4
@@ -0,0 +1,22 @@
+tcl? ( >=dev-lang/tcl-8.4[lib32?] ) test? ( >=dev-lang/tcl-8.4[lib32?] ) java? ( >=virtual/jdk-1.5 ) >=sys-devel/binutils-2.16.1 test? ( >=dev-lang/tcl-8.4 ) java? ( >=dev-java/java-config-2.1.6 ) =sys-devel/automake-1.10* >=sys-devel/autoconf-2.61 sys-devel/libtool sys-apps/abi-wrapper
+tcl? ( dev-lang/tcl[lib32?] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.6 ) sys-apps/abi-wrapper
+4.7
+http://download.oracle.com/berkeley-db/db-4.7.25.tar.gz http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.1 http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.2 http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.3 http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.4
+
+http://www.oracle.com/technology/software/products/berkeley-db/index.html
+OracleDB
+Oracle Berkeley DB
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd
+autotools base check-reqs db eutils flag-o-matic java-pkg-opt-2 java-utils-2 libtool multilib multilib-native portability toolchain-funcs versionator
+doc java nocxx tcl test doc test elibc_FreeBSD java gcj multislot lib32
+
+
+
+2
+
+compile configure install postinst postrm preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/x11-libs/cairo-1.8.8 b/metadata/cache/x11-libs/cairo-1.8.8
new file mode 100644
index 000000000..8c1def84a
--- /dev/null
+++ b/metadata/cache/x11-libs/cairo-1.8.8
@@ -0,0 +1,22 @@
+media-libs/fontconfig[lib32?] >=media-libs/freetype-2.1.9[lib32?] sys-libs/zlib[lib32?] media-libs/libpng[lib32?] >=x11-libs/pixman-0.12.0[lib32?] directfb? ( >=dev-libs/DirectFB-0.9.24 ) glitz? ( >=media-libs/glitz-0.5.1[lib32?] ) svg? ( dev-libs/libxml2 ) X? ( >=x11-libs/libXrender-0.6[lib32?] x11-libs/libXext[lib32?] x11-libs/libX11[lib32?] x11-libs/libXft[lib32?] ) xcb? ( >=x11-libs/libxcb-0.92[lib32?] x11-libs/xcb-util[lib32?] ) >=dev-util/pkgconfig-0.19 doc? ( >=dev-util/gtk-doc-1.6 ~app-text/docbook-xml-dtd-4.2 ) X? ( x11-proto/renderproto ) xcb? ( x11-proto/xcb-proto ) sys-apps/abi-wrapper
+media-libs/fontconfig[lib32?] >=media-libs/freetype-2.1.9[lib32?] sys-libs/zlib[lib32?] media-libs/libpng[lib32?] >=x11-libs/pixman-0.12.0[lib32?] directfb? ( >=dev-libs/DirectFB-0.9.24 ) glitz? ( >=media-libs/glitz-0.5.1[lib32?] ) svg? ( dev-libs/libxml2 ) X? ( >=x11-libs/libXrender-0.6[lib32?] x11-libs/libXext[lib32?] x11-libs/libX11[lib32?] x11-libs/libXft[lib32?] ) xcb? ( >=x11-libs/libxcb-0.92[lib32?] x11-libs/xcb-util[lib32?] ) sys-apps/abi-wrapper
+0
+http://cairographics.org/releases/cairo-1.8.8.tar.gz
+test
+http://cairographics.org/
+|| ( LGPL-2.1 MPL-1.1 )
+A vector graphics library with cross-device output support
+
+base eutils flag-o-matic libtool multilib multilib-native portability toolchain-funcs
+cleartype debug directfb doc glitz opengl svg X xcb lib32
+
+
+
+2
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/x11-libs/qt-webkit-4.5.1 b/metadata/cache/x11-libs/qt-webkit-4.5.1
index 12d03a06a..cd41896f5 100644
--- a/metadata/cache/x11-libs/qt-webkit-4.5.1
+++ b/metadata/cache/x11-libs/qt-webkit-4.5.1
@@ -1,5 +1,5 @@
-~x11-libs/qt-core-4.5.1[debug=,ssl,lib32?] ~x11-libs/qt-gui-4.5.1[debug=,lib32?] !kde? ( || ( ~x11-libs/qt-phonon-4.5.1:4[debug=,lib32?] media-sound/phonon[lib32?] ) ) kde? ( media-sound/phononb[lib32?] ) sys-apps/abi-wrapper
-~x11-libs/qt-core-4.5.1[debug=,ssl,lib32?] ~x11-libs/qt-gui-4.5.1[debug=,lib32?] !kde? ( || ( ~x11-libs/qt-phonon-4.5.1:4[debug=,lib32?] media-sound/phonon[lib32?] ) ) kde? ( media-sound/phononb[lib32?] ) sys-apps/abi-wrapper
+~x11-libs/qt-core-4.5.1[debug=,ssl,lib32?] ~x11-libs/qt-gui-4.5.1[debug=,lib32?] !kde? ( || ( ~x11-libs/qt-phonon-4.5.1:4[debug=,lib32?] media-sound/phonon[lib32?] ) ) kde? ( media-sound/phonon[lib32?] ) sys-apps/abi-wrapper
+~x11-libs/qt-core-4.5.1[debug=,ssl,lib32?] ~x11-libs/qt-gui-4.5.1[debug=,lib32?] !kde? ( || ( ~x11-libs/qt-phonon-4.5.1:4[debug=,lib32?] media-sound/phonon[lib32?] ) ) kde? ( media-sound/phonon[lib32?] ) sys-apps/abi-wrapper
 4
 http://download.qtsoftware.com/qt/source/qt-x11-opensource-src-4.5.1.tar.bz2
 
diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index 393648330..f37922c85 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -1,6 +1,10 @@
-AUX libproxy-0.2.3-fix-as-needed-problem.patch 570 RMD160 1ebdc1552919bea0ad62108e1ac3fc60a3b70a8c SHA1 c453c230a787ac9f7f9803329962a807fb2a0b14 SHA256 9b00f329db1ad6b398be47cee0eb32e34052bc2b589b7e57b92023c7b33c609e
+AUX libproxy-0.2.3-fbsd.patch 2316 RMD160 961c67621cb34a3f08904d362bd76fbb754a928c SHA1 ca2ae2649f69f5b0988d0b06d1771befce074cc0 SHA256 c07673422ba2592c6092914c92fa932702838ddf0ac5345fb7785b624e66121d
+AUX libproxy-0.2.3-fix-as-needed-problem.patch 574 RMD160 dfd95508caf9a19a73fac5b12cc43fa697c91abd SHA1 63ff8823cedb350d7cd0a3ed26886c1079dddd18 SHA256 9bbc0275b1a78db7ba4966c8169af1269154dc3d9bf716035ba193861bf4869d
 AUX libproxy-0.2.3-fix-dbus-includes.patch 1387 RMD160 ae39dca04f17f58f1a0c36208ceed8190af82d95 SHA1 f43e6d39ecaf7847c3f11255f56d205383e982e6 SHA256 31be2886acd191a80d86a75c9aec090998dd2b21ec23e64d0cda51e73b71d60e
 AUX libproxy-0.2.3-fix-libxul-cflags.patch 960 RMD160 16c5c40040fb81821914ff18e79560d828d57693 SHA1 08c3d1e983d313969905c1c40bf5f3e680020283 SHA256 5b91ca5403f9827d6961b31caf1a730f603e54b209b755514411a4505ef838ec
+AUX libproxy-0.2.3-fix-mozjs-cflags.patch 770 RMD160 f261942d1328dafae7313add34b493d3024bd09d SHA1 9583d25a074b68e43efd97af8bc1282a007e1bb6 SHA256 3495d5abd7da88dca2da22e1d0e409cd2f6f6030a8feeb9462ac47fbd2b55130
 AUX libproxy-0.2.3-fix-python-automagic.patch 858 RMD160 ec182cb70c84ffbf7faa8a1ff8f68b95b2e57155 SHA1 842170203e449b6fcd704fa1183956d1a079bab8 SHA256 0d21b238b2476920c4fcdcff238526ddac4ab3022d359a918aab0e3315f105a4
+AUX libproxy-0.2.3-implicit-declaration.patch 206 RMD160 12d2d0507a2d0c163b7c2d16d7d42ab5d0d7eb8f SHA1 b17dabc232bf9140629a5d987279800b3d2d19d8 SHA256 1ff409011d9a826999dd1478632a5ac18f793bb3d0028e83f89f78463ee88bf5
 DIST libproxy-0.2.3.tar.gz 378773 RMD160 c86c4f8403cb879380e101d074af469c960b5c1c SHA1 2b2b00a179740548035a1145bbae600db9b0a2ce SHA256 59ded160b3547d29e37cc9d06359f7f37d94112214e4532430cd65e704c1339a
+EBUILD libproxy-0.2.3-r1.ebuild 2504 RMD160 95eb8354440a2eeba58fadb6864ed5dbfefa79b2 SHA1 4e4ceb4f7a63bf8b59c05ec9d8f520ed1f18fe1c SHA256 ed74b0ab57d8dc4f4d6f8885067043deda9f8bbe85592ac28b7076ae313064d6
 EBUILD libproxy-0.2.3.ebuild 1960 RMD160 69a9e8efdd37a09f1d28f33b4ec80072d816593e SHA1 675b4a05c79d193ef5a09b068a03bd0c596fa461 SHA256 4a0f8cde1b11b8a076310a49b44fd96a7d8b7b4f89ce08456445cf309c43b7a4
diff --git a/net-libs/libproxy/files/libproxy-0.2.3-fbsd.patch b/net-libs/libproxy/files/libproxy-0.2.3-fbsd.patch
new file mode 100644
index 000000000..8379b3997
--- /dev/null
+++ b/net-libs/libproxy/files/libproxy-0.2.3-fbsd.patch
@@ -0,0 +1,75 @@
+Mix of various upstream commits to build on FreeBSD and be more POSIX compliant.
+Drop at next bump.
+
+
+Index: src/lib/url.c
+===================================================================
+--- src/lib/url.c	(revision 308)
++++ src/lib/url.c	(revision 309)
+@@ -26,6 +26,7 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
++#include <netinet/in.h>
+ 
+ #include "misc.h"
+ #include "url.h"
+Index: src/lib/proxy_factory.c
+===================================================================
+--- src/lib/proxy_factory.c	(revision 308)
++++ src/lib/proxy_factory.c	(revision 309)
+@@ -27,6 +27,7 @@
+ #include <math.h>
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
++#include <netinet/in.h>
+ #include <pthread.h>
+ 
+ 
+Index: src/plugins/pacrunner_webkit.c
+===================================================================
+--- src/plugins/webkit.c	(revision 335)
++++ src/plugins/webkit.c	(working copy)
+@@ -23,6 +23,7 @@
+ #include <sys/socket.h>
+ #include <netdb.h>
+ #include <arpa/inet.h>
++#include <netinet/in.h>
+ #define __USE_BSD
+ #include <unistd.h>
+ 
+Index: src/plugins/pacrunner_mozjs.c
+===================================================================
+--- src/plugins/mozjs.c	(revision 335)
++++ src/plugins/mozjs.c	(working copy)
+@@ -23,6 +23,7 @@
+ #include <sys/socket.h>
+ #include <netdb.h>
+ #include <arpa/inet.h>
++#include <netinet/in.h>
+ #define __USE_BSD
+ #include <unistd.h>
+ 
+Index: configure.ac
+===================================================================
+--- configure.ac	(revision 334)
++++ configure.ac	(revision 335)
+@@ -199,7 +199,7 @@
+ AC_TYPE_SIZE_T
+ PLUGINDIR=$libdir/$PACKAGE_NAME/$PACKAGE_VERSION/plugins
+ AC_SUBST(PLUGINDIR)
+-CFLAGS="-g -std=c99 $CFLAGS -DPLUGINDIR=\\\"$PLUGINDIR\\\" -DSYSCONFDIR=\\\"$sysconfdir\\\" -D_POSIX_C_SOURCE=1"
++CFLAGS="-g -std=c99 $CFLAGS -DPLUGINDIR=\\\"$PLUGINDIR\\\" -DSYSCONFDIR=\\\"$sysconfdir\\\" -D_POSIX_C_SOURCE=200112L"
+ 
+ ### Checks for library functions.
+ AC_FUNC_MALLOC
+Index: src/bin/Makefile.am
+===================================================================
+--- src/bin/Makefile.am	(revision 318)
++++ src/bin/Makefile.am	(revision 319)
+@@ -3,5 +3,4 @@
+ # Command line interface to libproxy
+ proxy_SOURCES = proxy.c
+ proxy_CFLAGS  = -I$(top_srcdir)/src/lib
+-proxy_LDFLAGS = -ldl
+ proxy_LDADD   = ../lib/libproxy.la
diff --git a/net-libs/libproxy/files/libproxy-0.2.3-fix-as-needed-problem.patch b/net-libs/libproxy/files/libproxy-0.2.3-fix-as-needed-problem.patch
index 9dca639de..55fec42b3 100644
--- a/net-libs/libproxy/files/libproxy-0.2.3-fix-as-needed-problem.patch
+++ b/net-libs/libproxy/files/libproxy-0.2.3-fix-as-needed-problem.patch
@@ -6,7 +6,7 @@ diff -Naur libproxy-0.2.3.orig/src/lib/Makefile.am libproxy-0.2.3/src/lib/Makefi
  						misc.h url.h pac.h dhcp.h dns.h slp.h wpad.h proxy_factory.h proxy.h config_file.h
  libproxy_la_CFLAGS  = -Wall
 -libproxy_la_LDFLAGS = -lm
-+libproxy_la_LDFLAGS = -lm -ldl
++libproxy_la_LDFLAGS = -lm $(LIBDL)
  
  include_HEADERS     = proxy.h
  
diff --git a/net-libs/libproxy/files/libproxy-0.2.3-fix-mozjs-cflags.patch b/net-libs/libproxy/files/libproxy-0.2.3-fix-mozjs-cflags.patch
new file mode 100644
index 000000000..33c0b5b45
--- /dev/null
+++ b/net-libs/libproxy/files/libproxy-0.2.3-fix-mozjs-cflags.patch
@@ -0,0 +1,14 @@
+--- configure.ac-old	2008-06-05 15:56:16.000000000 -0500
++++ configure.ac	2009-06-22 23:00:28.582633887 -0500
+@@ -17,8 +17,10 @@
+ PKG_CHECK_MODULES(gconf, gconf-2.0, have_gconf=yes, have_gconf=no)
+ PKG_CHECK_MODULES(webkit, webkit-1.0, have_webkit=yes, have_webkit=no)
+ PKG_CHECK_MODULES(mozjs, xulrunner-js, have_mozjs=yes, 
++		[PKG_CHECK_MODULES(mozjs, libxul-unstable, have_mozjs=yes,
++		[PKG_CHECK_MODULES(mozjs, seamonkey-js , have_mozjs=yes,
+ 		[PKG_CHECK_MODULES(mozjs, firefox-js, have_mozjs=yes,
+-		[PKG_CHECK_MODULES(mozjs, mozilla-js, have_mozjs=yes, have_mozjs=no)])])
++		[PKG_CHECK_MODULES(mozjs, mozilla-js, have_mozjs=yes, have_mozjs=no)])])])])
+ PKG_CHECK_MODULES(NetworkManager, NetworkManager, 
+ 					have_networkmanager=yes, have_networkmanager=no)
+ 
diff --git a/net-libs/libproxy/files/libproxy-0.2.3-implicit-declaration.patch b/net-libs/libproxy/files/libproxy-0.2.3-implicit-declaration.patch
new file mode 100644
index 000000000..9ef13aa9e
--- /dev/null
+++ b/net-libs/libproxy/files/libproxy-0.2.3-implicit-declaration.patch
@@ -0,0 +1,10 @@
+--- src/bin/proxy.c
++++ src/bin/proxy.c
+@@ -21,6 +21,7 @@
+ #include <stdlib.h>
+ #include <assert.h>
+ #include <unistd.h>
++#define __USE_BSD /* For strdup() */
+ #include <string.h>
+ 
+ // Import libproxy API
diff --git a/net-libs/libproxy/libproxy-0.2.3-r1.ebuild b/net-libs/libproxy/libproxy-0.2.3-r1.ebuild
new file mode 100644
index 000000000..8bf6acd26
--- /dev/null
+++ b/net-libs/libproxy/libproxy-0.2.3-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.2.3-r1.ebuild,v 1.2 2009/06/24 15:43:08 nirbheek Exp $
+
+EAPI="2"
+
+inherit autotools eutils python portability multilib-native
+
+DESCRIPTION="Library for automatic proxy configuration management"
+HOMEPAGE="http://code.google.com/p/libproxy/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="gnome kde networkmanager python webkit xulrunner"
+
+RDEPEND="
+	gnome? ( 
+		x11-libs/libX11[lib32?]
+		x11-libs/libXmu[lib32?]
+		gnome-base/gconf[lib32?] )
+	kde? (
+		x11-libs/libX11[lib32?]
+		x11-libs/libXmu[lib32?] )
+	networkmanager? ( net-misc/networkmanager[lib32?] )
+	python? ( >=dev-lang/python-2.5[lib32?] )
+	webkit? ( net-libs/webkit-gtk[lib32?] )
+	xulrunner? ( net-libs/xulrunner[lib32?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.19"
+
+src_prepare() {
+	# http://code.google.com/p/libproxy/issues/detail?id=23
+	epatch "${FILESDIR}/${P}-fix-dbus-includes.patch"
+
+	# http://code.google.com/p/libproxy/issues/detail?id=24
+	epatch "${FILESDIR}/${P}-fix-python-automagic.patch"
+
+	# http://code.google.com/p/libproxy/issues/detail?id=25
+	epatch "${FILESDIR}/${P}-fix-as-needed-problem.patch"
+
+	# http://bugs.gentoo.org/show_bug.cgi?id=275127
+	epatch "${FILESDIR}/${P}-fix-mozjs-cflags.patch"
+	
+	# Fix implicit declaration QA, bug #268546
+	epatch "${FILESDIR}/${P}-implicit-declaration.patch"
+	
+	epatch "${FILESDIR}/${P}-fbsd.patch" # drop at next bump
+	
+	# Fix test to follow POSIX (for x86-fbsd)
+	sed -e 's/\(test.*\)==/\1=/g' -i configure.ac configure || die "sed failed"
+
+	eautoreconf
+}
+
+multilib-native_src_configure_internal() {
+	econf --with-envvar \
+		--with-file \
+		--disable-static \
+		$(use_with gnome) \
+		$(use_with kde) \
+		$(use_with webkit) \
+		$(use_with xulrunner mozjs) \
+		$(use_with networkmanager) \
+		$(use_with python)
+}
+
+multilib-native_src_compile_internal() {
+	emake LIBDL="$(dlopen_lib)" || die
+}
+
+multilib-native_src_install_internal() {
+	emake DESTDIR="${D}" LIBDL="$(dlopen_lib)" install || die "emake install failed!"
+	dodoc AUTHORS NEWS README ChangeLog || die "dodoc failed"
+}
+
+pkg_postinst() {
+	if use python; then
+		python_need_rebuild
+		python_mod_optimize "$(python_get_sitedir)/${PN}.py"
+	fi
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/${PN}.py
+}
diff --git a/profiles/arch/powerpc/ppc64/multilib/make.defaults b/profiles/arch/powerpc/ppc64/multilib/make.defaults
index e87600567..5c8749e70 100644
--- a/profiles/arch/powerpc/ppc64/multilib/make.defaults
+++ b/profiles/arch/powerpc/ppc64/multilib/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/ppc64/64ul/make.defaults,v 1.1 2008/04/30 23:35:00 wolf31o2 Exp $
+# $Header: $
 
 # All extra USE/etc should be specified in sub-profiles.
 # DO NOT POLLUTE USE ON THIS PROFILE.
diff --git a/profiles/arch/powerpc/ppc64/multilib/package.mask b/profiles/arch/powerpc/ppc64/multilib/package.mask
index df110e040..7ecf40a99 100644
--- a/profiles/arch/powerpc/ppc64/multilib/package.mask
+++ b/profiles/arch/powerpc/ppc64/multilib/package.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/ppc64/64ul/package.mask,v 1.4 2009/02/16 21:07:27 ranger Exp $
+# $Header: $
 
 # Brent Baude <ranger@gentoo.org> (16 Feb 2009)
 # Mask qt versions for smooth upgrades
diff --git a/profiles/arch/powerpc/ppc64/multilib/virtuals b/profiles/arch/powerpc/ppc64/multilib/virtuals
index ca038a7cb..679bc49ed 100644
--- a/profiles/arch/powerpc/ppc64/multilib/virtuals
+++ b/profiles/arch/powerpc/ppc64/multilib/virtuals
@@ -1,5 +1,5 @@
 # Copyright 2004-2008 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/ppc64/64ul/virtuals,v 1.1 2008/04/30 23:35:00 wolf31o2 Exp $
+# $Header: $
 
 virtual/bootloader     sys-boot/yaboot-static
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 74fb490c8..10fe22156 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,5 +1,7 @@
 AUX cairo-1.2.4-lcd-cleartype-like.diff 7244 RMD160 e50d5bf17cbead688a8b808a78fe4104c09af52e SHA1 f63131fd75bb496db59e3ce6bc755bbfb70baacb SHA256 4926d20d2b6b5071a5bf9ee9a12a36fef69510ebebd717c1dab151fe650f173a
 AUX cairo-1.8.6-status-return-fix.patch 784 RMD160 cfa21d49438ad4493fd27f619c2ec3286dc4ce97 SHA1 448a1a5c188ac8543c410700dfefa7938c37fcb5 SHA256 9ac4c13454d7ba44a4e3998bf1e25ff3b6dc937885e2f5275de74b9a825bf056
 DIST cairo-1.8.6.tar.gz 6616544 RMD160 2374236afabbe248a642bf1cac6a5996f64bed62 SHA1 d1e5479d4eeb7b1a3589672e3ef8f4899e7c5eba SHA256 93a347af0cecf258be8fb54265b16a0fb16317df4a32896141d2987c30773535
+DIST cairo-1.8.8.tar.gz 6646082 RMD160 78af536ebaaffc608114b626b22fc9a20cff3750 SHA1 e4b8b219427d1ca3dc95f5f44914dce1ae0c3766 SHA256 3c51d3de5dc4596e01a6675acd3c86c2c99c00f02e8fad5493758a29fe451c90
 EBUILD cairo-1.8.6-r1.ebuild 3119 RMD160 9e5a3911c09e5a8183d871a362e5b5c3c2eeeba5 SHA1 388772ad231fd46f3e09c18289be7ee364e9ad27 SHA256 1177f60914afd5c237320a551644cede4ec853fbcb20f15b041d8825fbf2c808
+EBUILD cairo-1.8.8.ebuild 2984 RMD160 75af71831585ec0cfccf64caa77143cb8019cb24 SHA1 6903c9e1413bbac0b3b77fcb8c042617093893cf SHA256 59f47d56c3ce52c9d771bc10f6f4e4b47f2301a3dc05408747d01f0ac04c5e66
 EBUILD cairo-9999.ebuild 2873 RMD160 00228958547eaa117544635e422f1a4ff2e86831 SHA1 16dbe7c8c4b88b7eaad04d7467b4210e4c706c49 SHA256 e7491f89a43e3320037bcb3c224e24e29e25436b97d3af99558cf74740d67f55
diff --git a/x11-libs/cairo/cairo-1.8.8.ebuild b/x11-libs/cairo/cairo-1.8.8.ebuild
new file mode 100644
index 000000000..dfc5981d9
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.8.8.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.8.8.ebuild,v 1.1 2009/06/24 13:45:12 cardoe Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic libtool multilib-native
+
+DESCRIPTION="A vector graphics library with cross-device output support"
+HOMEPAGE="http://cairographics.org/"
+SRC_URI="http://cairographics.org/releases/${P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+KEYWORDS=""
+IUSE="cleartype debug directfb doc glitz opengl svg X xcb"
+
+# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
+RESTRICT="test"
+
+RDEPEND="media-libs/fontconfig[lib32?]
+	>=media-libs/freetype-2.1.9[lib32?]
+	sys-libs/zlib[lib32?]
+	media-libs/libpng[lib32?]
+	>=x11-libs/pixman-0.12.0[lib32?]
+	directfb? ( >=dev-libs/DirectFB-0.9.24 )
+	glitz? ( >=media-libs/glitz-0.5.1[lib32?] )
+	svg? ( dev-libs/libxml2 )
+	X? ( 	>=x11-libs/libXrender-0.6[lib32?]
+		x11-libs/libXext[lib32?]
+		x11-libs/libX11[lib32?]
+		x11-libs/libXft[lib32?] )
+	xcb? (	>=x11-libs/libxcb-0.92[lib32?]
+		x11-libs/xcb-util[lib32?] )"
+#	test? (
+#	pdf test
+#	x11-libs/pango
+#	>=x11-libs/gtk+-2.0
+#	>=app-text/poppler-bindings-0.9.2[gtk]
+#	ps test
+#	virtual/ghostscript
+#	svg test
+#	>=x11-libs/gtk+-2.0
+#	>=gnome-base/librsvg-2.15.0
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.19
+	doc? (	>=dev-util/gtk-doc-1.6
+		~app-text/docbook-xml-dtd-4.2 )
+	X? ( x11-proto/renderproto )
+	xcb? ( x11-proto/xcb-proto )"
+
+multilib-native_src_prepare() {
+	# ClearType-like patches applied by ArchLinux
+	use cleartype && epatch "${FILESDIR}"/cairo-1.2.4-lcd-cleartype-like.diff
+
+	# We need to run elibtoolize to ensure correct so versioning on FreeBSD
+	elibtoolize
+}
+
+multilib-native_src_configure_internal() {
+	#gets rid of fbmmx.c inlining warnings
+	append-flags -finline-limit=1200
+
+	if use glitz && use opengl; then
+		export glitz_LIBS=$(pkg-config --libs glitz-glx)
+	fi
+
+	local myconf
+	if use lib32 && ! is_final_abi; then
+		myconf="--enable-directfb=no"
+	else
+		myconf="$(use_enable directfb)"
+	fi
+
+	econf $(use_enable X xlib) $(use_enable doc gtk-doc) \
+		$(use_enable directfb) $(use_enable xcb) \
+		${myconf} \
+		$(use_enable svg) $(use_enable glitz) $(use_enable X xlib-xrender) \
+		$(use_enable debug test-surfaces) --enable-pdf  --enable-png \
+		--enable-ft --enable-ps \
+		|| die "configure failed"
+}
+
+multilib-native_src_install_internal() {
+	make DESTDIR="${D}" install || die "Installation failed"
+	dodoc AUTHORS ChangeLog NEWS README
+}
+
+pkg_postinst() {
+	if use xcb; then
+		ewarn "You have enabled the Cairo XCB backend which is used only by"
+		ewarn "a select few apps. The Cairo XCB backend is presently"
+		ewarn "un-maintained and needs a lot of work to get it caught up"
+		ewarn "to the Xrender and Xlib backends, which are the backends used"
+		ewarn "by most applications. See:"
+		ewarn "http://lists.freedesktop.org/archives/xcb/2008-December/004139.html"
+	fi
+}