Sync with portage [Thu Mar 22 21:45:48 MSK 2012].

12 years ago · 9e3266366b
parent e5caeaadf2
commit 9e3266366b
656 changed files with 4380 additions and 1339 deletions
--- a/app-admin/syslog-ng/files/syslog-ng-3.3.4-memleak.patch
+++ b/app-admin/syslog-ng/files/syslog-ng-3.3.4-memleak.patch
@ -0,0 +1,13 @@
+diff --git a/lib/logwriter.c b/lib/logwriter.c
+index 1c4f1c7..4411826 100644
+--- a/lib/logwriter.c
+++ b/lib/logwriter.c
+@@ -1016,7 +1016,7 @@ struct _LogWriter
+         {
+           /* push back to the queue */
+           log_queue_push_head(self->queue, lm, &path_options);
+-
+          log_msg_unref(lm);
+           msg_set_context(NULL);
+           log_msg_refcache_stop();
+           break;
--- a/app-admin/syslog-ng/syslog-ng-3.3.4.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.3.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.3.4.ebuild,v 1.3 2012/03/21 20:54:04 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.3.4.ebuild,v 1.4 2012/03/22 15:13:04 mr_bones_ Exp $

 EAPI=2
 inherit autotools eutils multilib
@ -42,7 +42,9 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${PN}-${MY_PV}

 src_prepare() {
-	epatch "${FILESDIR}"/${P}-compile.patch
+	epatch \
+		"${FILESDIR}"/${P}-compile.patch \
+		"${FILESDIR}"/${P}-memleak.patch
 	sed -i -e '/libsyslog_ng_crypto_la_LIBADD/s/$/ -lssl -lcrypto/' lib/Makefile.am || die
 	eautoreconf
 }
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@ -1,2 +1 @@
-DIST libarchive-2.8.5.tar.gz 1410485 RMD160 b4b75a5cf5b15312dff8addde44d91161ad1a7a4 SHA1 e48a3b50de84b1d747f5af9ca5ba90eb6d3a4a78 SHA256 13993e0ffbd121ccda46ea226b1f8eac218de0fa8da7d8b1f998093d5c32a72d
 DIST libarchive-3.0.3.tar.gz 3509104 RMD160 8bfde7be3aa15221c327641b0463f0b40a797e19 SHA1 b774e2675e5c1abafbd4d667402e8c3e72313944 SHA256 c5fc7620f74a54b1717e4aed38aee85dc27a988ad1db7640f28eb63a82ea62d7
--- a/app-arch/libarchive/libarchive-2.8.5.ebuild
+++ b/app-arch/libarchive/libarchive-2.8.5.ebuild
@ -1,89 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-2.8.5.ebuild,v 1.10 2012/01/22 15:03:12 armin76 Exp $
-
-EAPI="2"
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="BSD tar command"
-HOMEPAGE="http://code.google.com/p/libarchive/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz
-	http://people.freebsd.org/~kientzle/libarchive/src/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="static static-libs acl xattr kernel_linux +bzip2 +lzma +zlib expat"
-
-COMPRESS_LIBS_DEPEND="lzma? ( app-arch/xz-utils )
-		bzip2? ( app-arch/bzip2 )
-		zlib? ( sys-libs/zlib )"
-
-RDEPEND="!dev-libs/libarchive
-	dev-libs/openssl
-	!expat? ( dev-libs/libxml2 )
-	expat? ( dev-libs/expat )
-	acl? ( virtual/acl )
-	xattr? ( kernel_linux? ( sys-apps/attr ) )
-	!static? ( ${COMPRESS_LIBS_DEPEND} )"
-DEPEND="${RDEPEND}
-	${COMPRESS_LIBS_DEPEND}
-	kernel_linux? ( sys-fs/e2fsprogs
-		virtual/os-headers )"
-
-src_configure() {
-	local myconf
-
-	if ! use static ; then
-		myconf="--enable-bsdtar=shared --enable-bsdcpio=shared"
-	fi
-
-	# force static libs for static binaries
-	if use static && ! use static-libs; then
-		myconf="${myconf} --enable-static"
-	fi
-
-	# Check for need of this in 2.7.1 and later, on 2.7.0, -Werror was
-	# added to the final release, but since it's done in the
-	# Makefile.am we can just work it around this way.
-	append-flags -Wno-error
-
-	# We disable lzmadec because we support the newer liblzma from xz-utils
-	# and not liblzmadec with this version.
-	econf --bindir=/bin \
-		--enable-bsdtar --enable-bsdcpio \
-		$(use_enable acl) $(use_enable xattr) \
-		$(use_with zlib) \
-		$(use_with bzip2 bz2lib) $(use_with lzma) \
-		$(use_enable static-libs static) \
-		$(use_with expat) \
-		$(use_with !expat xml2) \
-		--without-lzmadec \
-		${myconf} \
-		--disable-dependency-tracking
-}
-
-src_test() {
-	# Replace the default src_test so that it builds tests in parallel
-	emake check || die "tests failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-
-	# remove useless .a and .la files (only for non static compilation)
-	use static-libs || find "${D}" \( -name '*.a' -or -name '*.la' \) -delete
-
-	# Create tar symlink for FreeBSD
-	if [[ ${CHOST} == *-freebsd* ]]; then
-		dosym bsdtar /bin/tar
-		dosym bsdtar.1 /usr/share/man/man1/tar.1
-		# We may wish to switch to symlink bsdcpio to cpio too one day
-	fi
-
-	dodoc NEWS README
-	dodir /$(get_libdir)
-	mv "${D}"/usr/$(get_libdir)/*.so* "${D}"/$(get_libdir)
-	gen_usr_ldscript libarchive.so
-}
--- a/app-arch/libarchive/metadata.xml
+++ b/app-arch/libarchive/metadata.xml
@ -4,34 +4,34 @@
  <herd>bsd</herd>
  <maintainer>
    <email>ferringb@gentoo.org</email>
+    <name>Brian Harring</name>
  </maintainer>
-  <longdescription lang="en">
+  <maintainer>
+    <email>ssuominen@gentoo.org</email>
+    <name>Samuli Suominen</name>
+  </maintainer>
+  <longdescription lang='en'>
    The bsdtar program creates and manipulates streaming archive files.
    It has a number of advantages over previous tar implementations.
  </longdescription>
  <use>
-    <flag name="static">
-      Build bsdtar and bsdcpio as static archives, removing
-      dependencies over the enabled compression libraries (lzma,
-      libbz2, zlib).
-    </flag>
-    <flag name="zlib">
+    <flag name='zlib'>
      Allow accessing gzip-compressed archives through
      <pkg>sys-libs/zlib</pkg>. This only affects libarchive's native
      support: bsdtar will keep using gunzip as a filter if that's not
      built-in. It's also needed for supporting extraction of ZIP
      files.
    </flag>
-    <flag name="bzip2">
+    <flag name='bzip2'>
      Allow accessing bzip2-compressed archives through libbz2 (which
      comes with <pkg>app-arch/bzip2</pkg>). This only affects
      libarchive's native support: bsdtar will keep using bunzip2 as a
      filter if that's not built-in.
    </flag>
-    <flag name="nettle">
+    <flag name='nettle'>
      Use <pkg>dev-libs/nettle</pkg> as crypto backend
    </flag>
-    <flag name="e2fsprogs">
+    <flag name='e2fsprogs'>
      Use file flags from <pkg>sys-fs/e2fsprogs</pkg> headers instead of <pkg>virtual/os-headers</pkg> headers
    </flag>
  </use>
--- a/app-backup/deja-dup/Manifest
+++ b/app-backup/deja-dup/Manifest
@ -1,2 +1,3 @@
 DIST deja-dup-18.1.1.tar.bz2 1183341 RMD160 5ca57d46e434342fa4f125719d4d1ba83114e626 SHA1 d04a13606f406a6489156d89c5dff848fcb8189d SHA256 0b0f2201ca8f10fe528872510c7d0d2f614330db841aeac241fac1107eaf4582
 DIST deja-dup-21.2.tar.xz 914396 RMD160 d3e011b5ed836ab603e1d4ae1ec4770b9e314a30 SHA1 a04234e7ffcbb6251b296d1cc92bf5f789bb105f SHA256 1385f45bd2680ab7380a7fd2a8a05000049baba00b8e85500b723ad17063c00b
+DIST deja-dup-22.0.tar.xz 772832 RMD160 4913e9e3b40708fdb2a0ccbe82cf1a436ea39e4e SHA1 f11adb6054ff91e7fc9981fbb46a46f355db5ff0 SHA256 28eb77a6006d21df56d9ee1f73e422d0974f9c75da201b6a5b9ef38e37836420
--- a/app-backup/deja-dup/deja-dup-22.0.ebuild
+++ b/app-backup/deja-dup/deja-dup-22.0.ebuild
@ -0,0 +1,62 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/deja-dup/deja-dup-22.0.ebuild,v 1.1 2012/03/22 16:45:20 jlec Exp $
+
+EAPI=4
+
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Simple backup tool using duplicity back-end"
+HOMEPAGE="https://launchpad.net/deja-dup/"
+SRC_URI="http://launchpad.net/${PN}/22/${PV}/+download/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nautilus"
+
+COMMON_DEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:3
+	x11-libs/libnotify
+
+	app-backup/duplicity
+	dev-libs/dbus-glib
+	dev-libs/libunique:1
+	gnome-base/gnome-keyring
+
+	nautilus? ( gnome-base/nautilus )"
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gvfs[fuse]"
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	dev-lang/vala:0.14
+	dev-perl/Locale-gettext
+	dev-util/pkgconfig
+	dev-util/intltool
+	sys-devel/gettext"
+
+pkg_setup() {
+	DOCS="NEWS AUTHORS"
+	G2CONF="${G2CONF}
+		$(use_with nautilus)
+		--without-ccpanel
+		--without-unity
+		--disable-schemas-compile
+		--disable-static"
+	export VALAC=$(type -p valac-0.14)
+}
+
+#src_prepare() {
+#	epatch \
+#		"${FILESDIR}"/${PN}-21.2-linguas.patch
+#	eautoreconf
+#	gnome2_src_prepare
+#}
+
+src_install() {
+	gnome2_src_install
+	domenu data/deja-dup.desktop
+}
--- a/app-benchmarks/phoronix-test-suite/Manifest
+++ b/app-benchmarks/phoronix-test-suite/Manifest
@ -1,2 +1,3 @@
 DIST phoronix-test-suite-2.8.1.tar.gz 465548 RMD160 f014ae92ff19bd36a8ac38c6a427dd0e89a6135f SHA1 06a28f4ed2d56aca8b3566208a4462878e22db68 SHA256 395a21147c735b8e8b44294d9d541cf04ddeacaccb711b863f6410c8705e2ab9
 DIST phoronix-test-suite-3.2.1.tar.gz 399167 RMD160 f6d5130390f1efc2d8036b7c91de5f7edab30504 SHA1 14b6ad90dd9aae7e8f443e263dd9800b98bd4889 SHA256 b5c8d35ece50450e5b50e67d3f6bd67cb41821d5e181551a514344afa9b25962
+DIST phoronix-test-suite-3.8.0.tar.gz 471257 RMD160 36db910990c92f1991481f2d597447b323008133 SHA1 15fd8e5b24e3c990843f989f8580d93ec9a87404 SHA256 951ed041dcf06178b4eb92535b4a6d5c97d62415c85af0feb04a0db3cbb342fb
--- a/app-benchmarks/phoronix-test-suite/phoronix-test-suite-3.2.1.ebuild
+++ b/app-benchmarks/phoronix-test-suite/phoronix-test-suite-3.2.1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/phoronix-test-suite/phoronix-test-suite-3.2.1.ebuild,v 1.2 2011/12/14 22:55:55 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/phoronix-test-suite/phoronix-test-suite-3.2.1.ebuild,v 1.3 2012/03/22 06:17:30 patrick Exp $

 EAPI=4

@ -18,7 +18,7 @@ IUSE=""
 DEPEND=""

 # php 5.3 doesn't have pcre and reflection useflags anymore
-RDEPEND="dev-lang/php:5.3[cli,curl,gd,posix,pcntl,truetype,zip]
+RDEPEND="dev-lang/php:5.3[cli,curl,gd,json,posix,pcntl,truetype,zip]
 	dev-php/pecl-ps"

 S="${WORKDIR}/${PN}"
--- a/app-benchmarks/phoronix-test-suite/phoronix-test-suite-3.8.0.ebuild
+++ b/app-benchmarks/phoronix-test-suite/phoronix-test-suite-3.8.0.ebuild
@ -0,0 +1,110 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/phoronix-test-suite/phoronix-test-suite-3.8.0.ebuild,v 1.1 2012/03/22 06:31:23 patrick Exp $
+
+EAPI=4
+
+inherit eutils bash-completion
+
+DESCRIPTION="Phoronix's comprehensive, cross-platform testing and benchmark suite"
+HOMEPAGE="http://www.phoronix-test-suite.com"
+SRC_URI="http://www.phoronix-test-suite.com/download.php?file=${P} -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+
+# php 5.3 doesn't have pcre and reflection useflags anymore
+RDEPEND="dev-lang/php:5.3[cli,curl,gd,json,posix,pcntl,truetype,zip]
+	dev-php/pecl-ps"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	sed -i -e "s,export PTS_DIR=\`pwd\`,export PTS_DIR=\"/usr/share/${PN}\"," \
+		phoronix-test-suite
+}
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	dodir /usr/share/${PN}
+	insinto /usr/share/${PN}
+
+	doman documentation/man-pages/phoronix-test-suite.1
+	dodoc AUTHORS CHANGE-LOG
+	dohtml -r documentation/
+	doicon pts-core/static/images/phoronix-test-suite.png
+	doicon pts-core/static/images/openbenchmarking.png
+	domenu pts-core/static/phoronix-test-suite.desktop
+	rm -f pts-core/static/phoronix-test-suite.desktop
+
+	doins -r pts-core
+	exeinto /usr/bin
+	doexe phoronix-test-suite
+
+	fperms a+x /usr/share/${PN}/pts-core/static/scripts/root-access.sh
+	fperms a+x /usr/share/${PN}/pts-core/external-test-dependencies/scripts/install-gentoo-packages.sh
+
+	dobashcompletion pts-core/static/bash_completion ${PN}
+
+	# Need to fix the cli-php config for downloading to work. Very naughty!
+	local slots
+	local slot
+	if [[ "x${PHP_TARGETS}" == "x" ]] ; then
+		ewarn
+		ewarn "PHP_TARGETS seems empty, php.ini file can't be configure."
+		ewarn "Make sure that PHP_TARGETS in /etc/make.conf is set."
+		ewarn "phoronix-test-suite needs the 'allow_url_fopen' option set to \"On\""
+		ewarn "for downloading to work properly."
+		ewarn
+	else
+		for slot in ${PHP_TARGETS}; do
+			slots+=" ${slot/-/.}"
+		done
+	fi
+
+	for slot in ${slots}; do
+		local PHP_INI_FILE="/etc/php/cli-${slot}/php.ini"
+		if [[ -f ${PHP_INI_FILE} ]] ; then
+			dodir $(dirname ${PHP_INI_FILE})
+			cp ${PHP_INI_FILE} "${D}${PHP_INI_FILE}"
+			sed -e 's|^allow_url_fopen .*|allow_url_fopen = On|g' -i "${D}${PHP_INI_FILE}"
+		else
+			if [[ "x$(eselect php show cli)" == "x${slot}" ]] ; then
+				ewarn
+				ewarn "${slot} hasn't a php.ini file."
+				ewarn "phoronix-test-suite needs the 'allow_url_fopen' option set to \"On\""
+				ewarn "for downloading to work properly."
+				ewarn "Check that your PHP_INI_VERSION is set during ${slot} merge"
+				ewarn
+			else
+				elog
+				elog "${slot} hasn't a php.ini file."
+				elog "phoronix-test-suite may need the 'allow_url_fopen' option set to \"On\""
+				elog "for downloading to work properly if you switch to ${slot}"
+				elog "Check that your PHP_INI_VERSION is set during ${slot} merge"
+				elog
+			fi
+		fi
+	done
+
+	ewarn
+	ewarn "If you upgrade from phoronix-test-suite-2*, you should reinstall all"
+	ewarn "your tests because"
+	ewarn "   \$HOME/.phoronix-test-suite/installed-tests/\$TEST_NAME/"
+	ewarn "moves to"
+	ewarn "   \$HOME/.phoronix-test-suite/installed-tests/pts/\$TEST_NAME-\$TEST_VERSION/"
+	ewarn "in phoronix-test-suite-3* version. The \$TEST_VERSION can be find in"
+	ewarn "pts-install.xml file."
+	ewarn
+}
--- a/app-emulation/vagrant/Manifest
+++ b/app-emulation/vagrant/Manifest
@ -1,2 +1 @@
-DIST vagrant-1.0.0.gem 1000960 RMD160 aadb5910a86bb5750ba5b877e58733bf09e5cc66 SHA1 696f9a5d5b706e3761c2d3a5677dd7170c070712 SHA256 ffee3f8b4b02dbf1ec7965342c17d555927e92658dd42eae82e527ab34f196aa
 DIST vagrant-1.0.1.gem 1001984 RMD160 2571eb08f80a098eb6df2724432fa99a0575c66d SHA1 69ee0ccd7d9ba0247405e119a583de5cb0dd7bbc SHA256 0fa25bd0c2b0910fc73629d0627df204f8d1acff5c5542373b3eb257ca8d94c0
--- a/app-emulation/vagrant/vagrant-1.0.0.ebuild
+++ b/app-emulation/vagrant/vagrant-1.0.0.ebuild
@ -1,54 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vagrant/vagrant-1.0.0.ebuild,v 1.1 2012/03/21 07:08:08 radhermit Exp $
-
-EAPI="4"
-USE_RUBY="ruby18 ruby19"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec"
-RUBY_FAKEGEM_EXTRAINSTALL="config keys templates"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A tool for building and distributing virtual machines using VirtualBox"
-HOMEPAGE="http://vagrantup.com/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-# Missing ebuild for contest
-RESTRICT="test"
-
-RDEPEND="${RDEPEND}
-	|| ( app-emulation/virtualbox app-emulation/virtualbox-bin )"
-
-ruby_add_rdepend "
-	~dev-ruby/archive-tar-minitar-0.5.2
-	>=dev-ruby/childprocess-0.3.1
-	>=dev-ruby/erubis-2.7.0
-	>=dev-ruby/i18n-0.6.0
-	>=dev-ruby/json-1.5.1
-	>=dev-ruby/log4r-1.1.9
-	>=dev-ruby/net-scp-1.0.4
-	>=dev-ruby/net-ssh-2.2.2
-"
-
-ruby_add_bdepend "
-	dev-ruby/rake
-	test? ( dev-ruby/mocha virtual/ruby-minitest )
-"
-
-all_ruby_prepare() {
-	# Remove bundler support
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	rm Gemfile || die
-
-	# Loosen unslotted dependencies
-	sed -i -e '/json\|net-ssh/s/~>/>=/' ${PN}.gemspec || die
-
-	# Remove a runtime dependency that we can't satisfy
-	sed -i -e '/git ls-files/d' ${PN}.gemspec || die
-}
--- a/app-emulation/vagrant/vagrant-1.0.1.ebuild
+++ b/app-emulation/vagrant/vagrant-1.0.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vagrant/vagrant-1.0.1.ebuild,v 1.1 2012/03/21 10:05:10 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vagrant/vagrant-1.0.1.ebuild,v 1.2 2012/03/22 10:46:20 radhermit Exp $

 EAPI="4"
 USE_RUBY="ruby18 ruby19"
@ -16,14 +16,14 @@ HOMEPAGE="http://vagrantup.com/"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
 IUSE="test"

 # Missing ebuild for contest
 RESTRICT="test"

 RDEPEND="${RDEPEND}
-	|| ( app-emulation/virtualbox app-emulation/virtualbox-bin )"
+	!x64-macos? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) )"

 ruby_add_rdepend "
 	~dev-ruby/archive-tar-minitar-0.5.2
@ -42,13 +42,23 @@ ruby_add_bdepend "
 "

 all_ruby_prepare() {
-	# Remove bundler support
+	# remove bundler support
 	sed -i -e '/[Bb]undler/d' Rakefile || die
 	rm Gemfile || die

-	# Loosen unslotted dependencies
+	# loosen unslotted dependencies
 	sed -i -e '/json\|net-ssh/s/~>/>=/' ${PN}.gemspec || die

-	# Remove a runtime dependency that we can't satisfy
+	# avoid calling git
 	sed -i -e '/git ls-files/d' ${PN}.gemspec || die
 }
+
+pkg_postinst() {
+	if use x64-macos ; then
+		ewarn
+		ewarn "For Mac OS X prefixes, you must install the virtualbox"
+		ewarn "package specifically for OS X which can be found at:"
+		ewarn "https://www.virtualbox.org/wiki/Downloads"
+		ewarn
+	fi
+}
--- a/app-misc/mc/files/mc-4.8.2-mcedit-without-file-param-fix.patch
+++ b/app-misc/mc/files/mc-4.8.2-mcedit-without-file-param-fix.patch
@ -0,0 +1,48 @@
+fixes mcedit not running without a file parameter
+
+https://bugs.gentoo.org/show_bug.cgi?id=409107
+https://www.midnight-commander.org/ticket/2754
+https://www.midnight-commander.org/changeset/529a7ba24c9da9fdb1df939ff0fe35c6d27e65df
+
+--- src/filemanager/ext.c
+++ src/filemanager/ext.c
+@@ -637,4 +637,7 @@
+     int have_type = 0;          /* Flag used by regex_check_type() */
+ 
+    if (filename_vpath == NULL)
+        return 0;
+
+     /* Check for the special View:%d parameter */
+     if (strncmp (action, "View:", 5) == 0)
+--- src/filemanager/midnight.c
+++ src/filemanager/midnight.c
+@@ -952,9 +952,11 @@
+     case MC_RUN_EDITOR:
+         {
+-            vfs_path_t *param_vpath;
+-
+-            param_vpath = vfs_path_from_str (mc_run_param0);
+-            ret = edit_file (param_vpath, mc_args__edit_start_line);
+-            vfs_path_free (param_vpath);
+            vfs_path_t *vpath = NULL;
+
+            if (mc_run_param0 != NULL && *mc_run_param0 != '\0')
+                vpath = vfs_path_from_str (mc_run_param0);
+
+            ret = edit_file (vpath, mc_args__edit_start_line);
+            vfs_path_free (vpath);
+         }
+         break;
+@@ -962,7 +964,9 @@
+     case MC_RUN_VIEWER:
+         {
+-            vfs_path_t *vpath;
+-
+-            vpath = prepend_cwd_on_local (mc_run_param0);
+            vfs_path_t *vpath = NULL;
+
+            if (mc_run_param0 != NULL && *mc_run_param0 != '\0')
+                vpath = prepend_cwd_on_local (mc_run_param0);
+
+             view_file (vpath, 0, 1);
+             vfs_path_free (vpath);
--- a/app-misc/mc/mc-4.8.2-r1.ebuild
+++ b/app-misc/mc/mc-4.8.2-r1.ebuild
@ -0,0 +1,87 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.2-r1.ebuild,v 1.2 2012/03/22 14:37:17 wired Exp $
+
+EAPI=4
+
+inherit flag-o-matic
+
+MY_P=${P/_/-}
+
+DESCRIPTION="GNU Midnight Commander is a text based file manager"
+HOMEPAGE="http://www.midnight-commander.org"
+SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="+edit gpm mclib nls samba +slang test X +xdg"
+
+RDEPEND=">=dev-libs/glib-2.8:2
+	gpm? ( sys-libs/gpm )
+	kernel_linux? ( sys-fs/e2fsprogs )
+	samba? ( net-fs/samba )
+	slang? ( >=sys-libs/slang-2 )
+	!slang? ( sys-libs/ncurses )
+	X? ( x11-libs/libX11
+		x11-libs/libICE
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libSM )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( dev-libs/check )
+	"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	cp "${FILESDIR}"/${P}-missing-do_panel_cd_stub_env.c \
+		tests/src/filemanager/do_panel_cd_stub_env.c || die
+
+	# bug 409107
+	epatch "${FILESDIR}"/"${P}"-mcedit-without-file-param-fix.patch
+}
+
+src_configure() {
+	local myscreen=ncurses
+	use slang && myscreen=slang
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
+
+	local homedir=".mc"
+	use xdg && homedir="XDG"
+
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable nls) \
+		--enable-vfs \
+		$(use_enable kernel_linux vfs-undelfs) \
+		--enable-charset \
+		$(use_with X x) \
+		$(use_enable samba vfs-smb) \
+		$(use_with gpm gpm-mouse) \
+		--with-screen=${myscreen} \
+		$(use_with edit) \
+		$(use_enable mclib) \
+		$(use_enable test tests) \
+		--with-homedir=${homedir}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS README NEWS
+
+	# fix bug #334383
+	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
+		fowners root:tty /usr/libexec/mc/cons.saver
+		fperms g+s /usr/libexec/mc/cons.saver
+	fi
+}
+
+pkg_postinst() {
+	elog "To enable exiting to latest working directory,"
+	elog "put this into your ~/.bashrc:"
+	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
+}
--- a/app-misc/sleepyhead/files/zlib-of.patch
+++ b/app-misc/sleepyhead/files/zlib-of.patch
@ -0,0 +1,34 @@
+diff --git a/quazip/ioapi.h b/quazip/ioapi.h
+index 716dd4b..a114915 100644
+--- a/quazip/ioapi.h
+++ b/quazip/ioapi.h
+@@ -37,13 +37,13 @@
+ extern "C" {
+ #endif
+ 
+-typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, voidpf file, int mode));
+-typedef uLong  (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size));
+-typedef uLong  (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
+-typedef uLong   (ZCALLBACK *tell_file_func) OF((voidpf opaque, voidpf stream));
+-typedef int   (ZCALLBACK *seek_file_func) OF((voidpf opaque, voidpf stream, uLong offset, int origin));
+-typedef int    (ZCALLBACK *close_file_func) OF((voidpf opaque, voidpf stream));
+-typedef int    (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream));
+typedef voidpf (ZCALLBACK *open_file_func) _Z_OF((voidpf opaque, voidpf file, int mode));
+typedef uLong  (ZCALLBACK *read_file_func) _Z_OF((voidpf opaque, voidpf stream, void* buf, uLong size));
+typedef uLong  (ZCALLBACK *write_file_func) _Z_OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
+typedef uLong   (ZCALLBACK *tell_file_func) _Z_OF((voidpf opaque, voidpf stream));
+typedef int   (ZCALLBACK *seek_file_func) _Z_OF((voidpf opaque, voidpf stream, uLong offset, int origin));
+typedef int    (ZCALLBACK *close_file_func) _Z_OF((voidpf opaque, voidpf stream));
+typedef int    (ZCALLBACK *testerror_file_func) _Z_OF((voidpf opaque, voidpf stream));
+ 
+ typedef struct zlib_filefunc_def_s
+ {
+@@ -59,7 +59,7 @@ typedef struct zlib_filefunc_def_s
+ 
+ 
+ 
+-void fill_qiodevice_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
+void fill_qiodevice_filefunc _Z_OF((zlib_filefunc_def* pzlib_filefunc_def));
+ 
+ #define ZREAD(filefunc,filestream,buf,size) ((*((filefunc).zread_file))((filefunc).opaque,filestream,buf,size))
+ #define ZWRITE(filefunc,filestream,buf,size) ((*((filefunc).zwrite_file))((filefunc).opaque,filestream,buf,size))
--- a/app-misc/sleepyhead/sleepyhead-0.9.2.2.ebuild
+++ b/app-misc/sleepyhead/sleepyhead-0.9.2.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/sleepyhead/sleepyhead-0.9.2.2.ebuild,v 1.1 2012/03/19 22:39:03 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sleepyhead/sleepyhead-0.9.2.2.ebuild,v 1.2 2012/03/22 13:27:26 rich0 Exp $

 EAPI=4
 inherit eutils qt4-r2
@ -37,6 +37,7 @@ src_prepare() {
 	cd "{$S}"
 	epatch "${FILESDIR}/gitfix.patch"
 	epatch "${FILESDIR}/prs1-64fix.patch"
+	epatch "${FILESDIR}/zlib-of.patch"
 	eqmake4 SleepyHeadQT.pro
 }

--- a/app-misc/spacenavd/files/spacenavd-0.5-no-x11.patch
+++ b/app-misc/spacenavd/files/spacenavd-0.5-no-x11.patch
@ -0,0 +1,13 @@
+diff -Npur spacenavd-0.5.old/src/event.c spacenavd-0.5/src/event.c
+--- src/event.c	2012-03-21 22:15:37.093401293 +0100
+++ src/event.c	2012-03-21 22:14:10.734401301 +0100
+@@ -20,7 +20,9 @@ along with this program.  If not, see <h
+ #include <stdlib.h>
+ #include "event.h"
+ #include "client.h"
+#ifdef USE_X11
+ #include "proto_x11.h"
+#endif
+ #include "proto_unix.h"
+ #include "spnavd.h"
+ 
--- a/app-misc/spacenavd/spacenavd-0.5-r2.ebuild
+++ b/app-misc/spacenavd/spacenavd-0.5-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/spacenavd/spacenavd-0.5-r2.ebuild,v 1.2 2012/02/11 23:31:46 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/spacenavd/spacenavd-0.5-r2.ebuild,v 1.3 2012/03/22 14:04:19 sping Exp $

 EAPI="4"

@ -27,6 +27,7 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-destdir.patch
 	epatch "${FILESDIR}"/${P}-custom-flags.patch
+	epatch "${FILESDIR}"/${P}-no-x11.patch
 }

 src_configure() {
--- a/app-office/calligra-l10n/Manifest
+++ b/app-office/calligra-l10n/Manifest
@ -1,46 +1,46 @@
-DIST calligra-l10n-ca-2.3.85.tar.bz2 491596 RMD160 2e62962f2fca4b43965da82b6e5b4a93cc53a832 SHA1 20c9766f0d87651bb6fef6ac0d53497b8d658be7 SHA256 ff67632ee1be60c9dca2e116922749fd48de7897913bb3a506ec364cd76256b6
 DIST calligra-l10n-ca-2.3.86.tar.bz2 486728 RMD160 a3344a6a5b35699bd2c05716d69085c8c9b0037d SHA1 cea97054ed3c711b1f81ffe54fc3ab3581fd89ed SHA256 2c49ac38573f928345cd8720cc9accecd5a87e95273c7abe2b27479f44e18026
-DIST calligra-l10n-ca@valencia-2.3.85.tar.bz2 374813 RMD160 b4beec26c5450d116b206142cf815a8c5bc4f8d7 SHA1 5d736646c356a4c21c44714979c2232881e24ea8 SHA256 d6f86839ba42fb575cca17ca3922ffab9ab9f3456698451c234061abd08600bf
+DIST calligra-l10n-ca-2.3.92.tar.bz2 567109 RMD160 0bc66eafbbc31ddaf89b7a8827a38a90e5dd16a2 SHA1 257a2ef3f207e90d6df88300c2655d5f3eb0ead4 SHA256 2f952674f851ca6e4f419359e2e0156bc0041989aa87b641139e3ae0e2ea974b
 DIST calligra-l10n-ca@valencia-2.3.86.tar.bz2 374966 RMD160 a641e2acaf76d670cc9c15f56afe8c6bf1bcb175 SHA1 7f6d99ed133eef021490de11e95fed1033a160ca SHA256 762b0eb4582348f877a7e59f9d5e9ea1965f77f31db47d757bff7c07d2a538c7
-DIST calligra-l10n-cs-2.3.85.tar.bz2 344866 RMD160 f9c916b8c07bab084fbc39b9cc31fb786f40e4e3 SHA1 0ac229f73e66385269a73ee9563a19786cb6584b SHA256 879ac73673bbdbfd8cd5d15dbbbfc2557bec954eccc19c084fe8b81b9b2ab87e
+DIST calligra-l10n-ca@valencia-2.3.92.tar.bz2 373574 RMD160 e03ce276f4058e260ffbf1fa655665847ab1a021 SHA1 89d5bcb42cf6cf1b9f352d33e25e9f6ccb5245d4 SHA256 97f830a47a6e58184033e066b49724204ac559026d01697417c72ea976c9ee57
 DIST calligra-l10n-cs-2.3.86.tar.bz2 344825 RMD160 b5f682f6da7603241fd51a53f066915c5b0583af SHA1 5e142a3ac4cc222307ff5405e833a2ccbcc85dd2 SHA256 3dc8f2f159cdc154e53b8295b6274d049b9246628daf00082d426e86e2f8b1e1
-DIST calligra-l10n-da-2.3.85.tar.bz2 485117 RMD160 d7d4e33b55ce814cf0bcef1e1aaa4452b1e4214e SHA1 6a355162008646ac0218873ce365d440c852258f SHA256 b4656c4f0e806340e2b96dd60394b342e90ea573bf0c5eeac5ccf3f3a8094447
+DIST calligra-l10n-cs-2.3.92.tar.bz2 348586 RMD160 3338f8b94fa468b2a92fc7e95cb184e5a6d5b259 SHA1 0339902d94876d857ecedcc0c2b190b1bda33af2 SHA256 0baeb9d21e25fa0fab9c40387978b460861d491e0e34a9f32973b6de75f7ddd7
 DIST calligra-l10n-da-2.3.86.tar.bz2 485121 RMD160 d6000c2fc44a7492cee3ff661c8823323c3bcc68 SHA1 79e6b53ef8c8655b49f4dd8663b4475792eae94d SHA256 796be3c8947a5b70d21d2381eb16a5caf361633b002ccfdb07442446036109df
-DIST calligra-l10n-de-2.3.85.tar.bz2 552548 RMD160 db646e5542411969a7b43c40636dfd5cb793c3e7 SHA1 11e1d6b9370702694bfc49d714828a7c0a0ba540 SHA256 54c831099ee19ff90c5d4a8da2ce106eb7bc5f7fb7efaebb76af59984dd19711
+DIST calligra-l10n-da-2.3.92.tar.bz2 545424 RMD160 25339953012d36253d5ac946d9c55390b17ec999 SHA1 c705ff36ded75bba8daf9919bb293984e4f87ac7 SHA256 e6f958d3bc1790a79299bc51de2b368b6675cdd5c44de8a8305ffc67d1e97d7d
 DIST calligra-l10n-de-2.3.86.tar.bz2 438769 RMD160 6f92c7dfacce2f86e21e773ff4c5cc02d496732f SHA1 d1199badc7d88d82c7ade931aa57f83134492b71 SHA256 8a59a923437365c2814072e1fa375682195e7a8c9c0d8ff5506ec09be0333ce4
-DIST calligra-l10n-el-2.3.85.tar.bz2 410278 RMD160 c9287c68141411f86ba8838f92c360880406cedd SHA1 5d05a7d7d6fd0ea51dbe4ed4462da51fb0504737 SHA256 5e49103efe1aaa9274344535e1e9c63ee1e0147ee019d43bf5f0f62be165d85a
+DIST calligra-l10n-de-2.3.92.tar.bz2 700457 RMD160 72c3b81444a825a443de17aa823733359f1c4394 SHA1 914b91ec679510677a15179f0fd79650aafd32d5 SHA256 1777ef19ff488bb78128d662fb713be36dc9c9d537f77d094d6c6c2006f5c77b
 DIST calligra-l10n-el-2.3.86.tar.bz2 409323 RMD160 dca1b48491bdc285a0d8b91b472c29354b0ed0cb SHA1 d540c3cbf8bbb244da5463e0a20b046d18ca2529 SHA256 57b86de85983430442e23b98f0e9b1c7cab52a612dcbbe1bd8a3deb7f31c7b54
-DIST calligra-l10n-en_GB-2.3.85.tar.bz2 384651 RMD160 e3aea25e649d87c95173df748ea436024b79bfff SHA1 4d115af9b17dfd1178633f320dfcc77687555b11 SHA256 b5221680d2a31f6be2047e705750dfea4de27f464ff3b7f1ac3e8bb8e1aee245
+DIST calligra-l10n-el-2.3.92.tar.bz2 417001 RMD160 6977b58f3c6f3a853d2ba57cf0330265559e348f SHA1 c5ef8b63d5eae9422731ece3a5f1eabac6a05e88 SHA256 f4e3266572ed454783b040abce75785e37a4db1a9fe0a506294b3eb08d53c63f
 DIST calligra-l10n-en_GB-2.3.86.tar.bz2 384671 RMD160 0929f1f053d7e8be3627b44f5827dfa2a7689faa SHA1 4245ea002d345496dd35b373354640aaa4d18bd6 SHA256 d70528020c69b35dd4215d1bad9f467d47e1dcabfd41d38d39d79c7741fc470e
-DIST calligra-l10n-es-2.3.85.tar.bz2 4510451 RMD160 30a46d9e55c0d605b3a5260c9ab8f2cd29a823bd SHA1 9d14e9df34ae688fc49658cc59756b888e48af72 SHA256 f9091393d8908d30eb724c34e833069514886e7b4b9e9b5912b3a28ab6bf731f
+DIST calligra-l10n-en_GB-2.3.92.tar.bz2 391742 RMD160 112c4fd160447384c36876c5305983e6ccd17b74 SHA1 925325e37942941ff61b7325b49cc82c96c35c02 SHA256 45a3136d7609fdedbde063c02326aa906c9dd35ab6fea22efc81f8408deb8ebe
 DIST calligra-l10n-es-2.3.86.tar.bz2 4511356 RMD160 d4fb53f6110317ac606c16ec01e0e4487286877e SHA1 af31f15fedbf5dd26e896e4e03cc6f9be2a9cd4b SHA256 55ff2d4e0c0be5d6ba256feb78a98c561e9c76a78d7094a2445bfe41a5f066b6
-DIST calligra-l10n-et-2.3.85.tar.bz2 599490 RMD160 bd0dcacfaa4c4c6c19a3c4fc94b060ffd1664754 SHA1 e08aa51fed706cf2f5b9e3009d60be6d932dab4b SHA256 46e9a5076cdc9b4c3cf3e487e6f90bcc30861d5962f0179b17c8a736af0e6a8f
+DIST calligra-l10n-es-2.3.92.tar.bz2 4383361 RMD160 1d186b8cd5ca47f7036855207376426342a0e39f SHA1 3ca2828ad0b897af655773947ca046cd621889c0 SHA256 d6cf9979f1f8132419bcc91fbaf1e5955adf9e05ef552c9e2230ad5f3a1c3b98
 DIST calligra-l10n-et-2.3.86.tar.bz2 599342 RMD160 757829cc0ec2613132681212044bf6c0618785ed SHA1 690eaf87782d31c279212e36fb82a9a5a409a12e SHA256 8b420b8e5c845f4edf2651c13475ca11c1fc002d88991fe0f9efa7290b3e6fb2
-DIST calligra-l10n-fr-2.3.85.tar.bz2 5532154 RMD160 90f6abe26b5a025267ce2b3dd153d30136ea55df SHA1 451e06acb98c84a87f2d1417049494f13a8694d2 SHA256 9ac36a0797202e7e8adb16ac887696b129d846186d4242c274be9aa8a8333bff
+DIST calligra-l10n-et-2.3.92.tar.bz2 683273 RMD160 febb59f8d399640dffddf55e544be2b66261202f SHA1 a5ca218740524231240ade7afe079a040d74f242 SHA256 c5baeda71bf9b35f3f730f97e36a2a49112b959b64c585c216cde56bfd390f76
 DIST calligra-l10n-fr-2.3.86.tar.bz2 5532701 RMD160 aa85978d847712b8d4de1a1095b17ee25f423982 SHA1 ee48f4fe54937e91aac05477ee8c87a312135f64 SHA256 cb7c6649e774fceebe26793401b27f96e9f8a2df9cf2dc7ea61baf640b2e1fce
-DIST calligra-l10n-it-2.3.85.tar.bz2 543735 RMD160 b98478768957dd1552ba7b2074975d3d313725b0 SHA1 40dac49dabd90391c6aababc2ce2df2bdcd21928 SHA256 ced6ff1e0648128e58ee5e2e151bde1e7b415cf04a86333a07abed56e600e92f
+DIST calligra-l10n-fr-2.3.92.tar.bz2 5608805 RMD160 235fb7758ae001412588e2d486ab7cd84d6137c9 SHA1 55c25df105fe9788b172bc6302512c8b5f6f3ef8 SHA256 944ded0209083237bb8a9981e8c32bba12147b3c370a4ec614a7ef4730008777
 DIST calligra-l10n-it-2.3.86.tar.bz2 544625 RMD160 160f3d6c65dc95daecd9d111eaeb1fd75fdb5e2c SHA1 a29fbcbd682603ec1636b5293d59060cb1073b3f SHA256 bfac502e0f94f67922428fc8f96782729a427b9d5aac399e6e9576ab0e2873f2
-DIST calligra-l10n-kk-2.3.85.tar.bz2 387284 RMD160 60d66cbb583d8de25bac870649414c24709b48f3 SHA1 0d3b4da6cf7925bf001e12737795032f6af5d950 SHA256 9921eb2ac9bdb5c05ba14c6e41dd1e52e8bc9efd27cd4733410725b6d8f81a78
+DIST calligra-l10n-it-2.3.92.tar.bz2 548597 RMD160 ed1c1164c4c27a1a1c9848fab5b938bc52476b9d SHA1 88668a2d4de03f7def382eba6c07987ad4e0c43a SHA256 706aa2f4f435e42e6e5623b96cc6b94acc19fc2848e4eb39bb61f1b151b749b8
 DIST calligra-l10n-kk-2.3.86.tar.bz2 391114 RMD160 2c6e39158ee34a806e146d645ec79498f62d9da7 SHA1 aecd212cd93d4f72fa1dc0ee29177d632223a469 SHA256 b18f9629bac0454bcb8a2d9f819d5dfc22155fdc701f8ff468a50f0a74f83a0e
-DIST calligra-l10n-nb-2.3.85.tar.bz2 367044 RMD160 414f8b0dac79f1213b5d0f24c928e5649df6dc5e SHA1 88189077b20d1a76ad36fb7ef58521924648827a SHA256 61a7fa056d79fdb0cf2b13fdfc83d0752b7a7ad372e64497369c52eb3d319919
+DIST calligra-l10n-kk-2.3.92.tar.bz2 405599 RMD160 3dcaba9735cad204ce3175983cabc8ae36809af6 SHA1 d3748cd802567c620a2c36002725cdb79a351130 SHA256 d2a93a16135a01942d1ba8ecb1984863d2be0af2dad539e04c8741d4874e05e3
 DIST calligra-l10n-nb-2.3.86.tar.bz2 366905 RMD160 093476f1c71fc5901ee07e96ef329d21ae1e677e SHA1 d27197f85f3e47734c2976bd6ed53fbd74a04f1f SHA256 d510ffb005efba873ad298101c6596a12541d11bab5ca5d90355135f9aed9d6d
-DIST calligra-l10n-nds-2.3.85.tar.bz2 408492 RMD160 a1f3813db475594ec2bda4f172e2213ad4275e17 SHA1 c24a80581c77c4cc2d668038d939ea8a3bb5035c SHA256 7edad3556740a6f13a85af9c83f40764f96cc23c6b6e792bbbd1d9c32c48d74c
+DIST calligra-l10n-nb-2.3.92.tar.bz2 368199 RMD160 9e7457582bab7561bc7cb205b899c15eb57acc99 SHA1 196b00d2196dce9a88298c3c9b72f838b08a746c SHA256 aefd7610de51b49466e7cb577044c03d71e49a5b92dc57a8519f3c9d9097bf56
 DIST calligra-l10n-nds-2.3.86.tar.bz2 408731 RMD160 e7c00db07e2c34c1b145cfa39a092a564d621e95 SHA1 8c075509019f5915e4e205e9e3d619ad7863592d SHA256 a1d372a5b9bcb102135ce3f6f4f718f0fdc3b111fb88231d77b5b71051fb5d14
-DIST calligra-l10n-nl-2.3.85.tar.bz2 2388082 RMD160 355d2f93d8d57dbb45fb4e0ab2d56e3b995e9172 SHA1 e6a56a93c72b0ccf3c2718243623f0a3d6e818db SHA256 d5c1096356e4848cd541ad75ee0cf82cdfbed03812112df0eed2dc4f44b1a345
+DIST calligra-l10n-nds-2.3.92.tar.bz2 413573 RMD160 b68c4ff471c200789295a7bb5f68b9c33f886a68 SHA1 267954e5792e2bbff635d6bf0282c6bd1f5fae3f SHA256 486c67e8ce96eac83f3000f565afc93120b58175d7b769fb0cd07f8307688ce8
 DIST calligra-l10n-nl-2.3.86.tar.bz2 2388419 RMD160 6995002a5e9247627aff7af5af19b8a024695839 SHA1 1aee59696ad69e50b95d1a70ee61eb3b902926a8 SHA256 65d8b71ca9a25bae91fd924d176e4491c2decf83d7a5d90011c13e826eaa08b5
-DIST calligra-l10n-pl-2.3.85.tar.bz2 426284 RMD160 d6c9288939052bc8de530aeb8b83443079b02ccd SHA1 b6e0640bb32ad809a2e371f3ab9e19804c27d12c SHA256 1725bc8a4a319aaf3f44ffd853cf3e7e25f3f80d4441a33a6a0c608fa5977509
+DIST calligra-l10n-nl-2.3.92.tar.bz2 3080793 RMD160 fb7f33cdb9273226ed00e72a62e18fdf716b88a0 SHA1 6c3040a16584f2ef718cac45e0f1e69af69a2b26 SHA256 9d4862bf11a7a860435cb5742027a714848230970e32d3c58a7117c075579e68
 DIST calligra-l10n-pl-2.3.86.tar.bz2 427540 RMD160 7cad3b5f4b442ad7812109ee2c42988749150df8 SHA1 75f3e0cab788166875eaf5fe818c927602b28483 SHA256 acd5c9c858494b0c3d2b00d0c3462f1a0be57ee9637084b12ae9906104c032b6
-DIST calligra-l10n-pt-2.3.85.tar.bz2 453507 RMD160 56448966d609cb42383d181a28efb9d7a7c9042b SHA1 720554360e4d1c14984f5d2f1e80fc6289698d05 SHA256 d1c593f5b556fa03967bf6c23f90a5991cced5bf345406f00dd3c9d21b092d70
+DIST calligra-l10n-pl-2.3.92.tar.bz2 431630 RMD160 f591f5c5e8d6b0ad34211f15ac74c73360456372 SHA1 ea1dcb134fea6cd757d1171c6f4cbaa2c6b43434 SHA256 dc39a6080c181eb8bed79671ff0525f552e322f2e641497cc56c467edb0c5738
 DIST calligra-l10n-pt-2.3.86.tar.bz2 453262 RMD160 636201b769a5320b4beb66a1007db7e4d2d84b66 SHA1 fd8f38cf4185fab281f129d649bc6b7c65f20dd5 SHA256 9a28834436c2ee5bd3104f52ca43c2a84eb4d8a8c64c295999047509396e9594
-DIST calligra-l10n-pt_BR-2.3.85.tar.bz2 534339 RMD160 a6da2c93306eca0ad6e26497e56155766678ef41 SHA1 6a262bbd3a9d0225622192bff8a965ba7b57d277 SHA256 f45001d0cc27b6031e3f21e0666e3a4cf6c5cdbcf8bd8b563ff03a016bc9f410
+DIST calligra-l10n-pt-2.3.92.tar.bz2 653858 RMD160 fc3e58dcbbcda8079029f9ce51f0e48d6d167ed4 SHA1 2d9b5a2c85a724ffe0457cc112a5e30f5d1f0238 SHA256 fd8e5479ac31303da4d46ced97563cdd09ea70f4e63784a4ad90786f07d2f838
 DIST calligra-l10n-pt_BR-2.3.86.tar.bz2 531256 RMD160 1e71481c33d70727d3080ad38b629c0512d7f427 SHA1 94fed438f1bbadf0ccbd555f2a9db1da47dfabf1 SHA256 969034756f2931240a6691f639aae97bceca56b4b20690d94c6a6b7ae932831a
-DIST calligra-l10n-ru-2.3.85.tar.bz2 519640 RMD160 8289d92f53e2c38a819ec68b70d4f57e998b588a SHA1 2443fbbf3a10b704901f4a1f52310ae8d14a1db0 SHA256 1b5e27d4508dc7b4bb4bc4730d3097911dd04c349710b7be856a1050c56965c6
+DIST calligra-l10n-pt_BR-2.3.92.tar.bz2 653828 RMD160 9d6d0df57659d6b7639893bd547b8b2aa480740b SHA1 387839b139ec09e931402a02f6c088726f1c12ab SHA256 d5ee254b534aef25aee0d00692cab9b5b5c26a3b815569444c7003cc0c5f03cb
 DIST calligra-l10n-ru-2.3.86.tar.bz2 519775 RMD160 145f99859a73cc515a9c438d74f8deb64e5ed48c SHA1 2ec2780f6e83237070d40094b8c8ee4c6d73826c SHA256 d2614044c80ef9462dcaccde12083e3b3dd0de59ec041534fc8d0218ab7f55e7
-DIST calligra-l10n-sv-2.3.85.tar.bz2 1841873 RMD160 f17c15406b5a64f4adff315fe51e70db6f97aa32 SHA1 a6a0d04404b8b7d659b6fa91f716d6134122239b SHA256 7abab98288996bf890651f44ae195b78a13121d485d43f61c83827697b79a7ca
+DIST calligra-l10n-ru-2.3.92.tar.bz2 578211 RMD160 5408a4fb5a001fe14a24ca7c382a35bd9b58460f SHA1 746cb22bf2867cb7efadacfbde25b6f3fbcb099d SHA256 a57248b6665f51fd7ab67017752595cdfd4926216f630d366df54d3d85925411
 DIST calligra-l10n-sv-2.3.86.tar.bz2 1841167 RMD160 86da0b692dde9e077bf210b72086e65ce8081b3a SHA1 1fd5c369f00d15efb477fe58245136042820c4fe SHA256 3768beb5018789c3356f86339fbfeb222baeb070e81555824d1baf67bde9da72
-DIST calligra-l10n-uk-2.3.85.tar.bz2 489755 RMD160 101b1a5d9ad10812c508ef9e2b7c52ac22fd189c SHA1 a83441d1560570bd84fb78e04d123f82119a9aca SHA256 7c525e4a2ea5530babf090df6247bb63357eec49b2ea74f5cf56db0be3819895
+DIST calligra-l10n-sv-2.3.92.tar.bz2 2031629 RMD160 60080c5550ddaef4d07a01ea4939134f73fa7a4a SHA1 4d1aefa644c3451900dad209e8115eace904173f SHA256 455acfe9321641d34dba7abd30fe74003c582fccf923684c361cc064b59fbc04
 DIST calligra-l10n-uk-2.3.86.tar.bz2 490356 RMD160 c2f78076a4acc5a606699c72c9486db0bf7a9787 SHA1 a4c78d224c57bdd319ee735c2e11671ff99b0099 SHA256 5eed85fa7ed4035fd26eae47ae8c89bdf54347cdd734fa7cd0205d79087380d6
-DIST calligra-l10n-zh_CN-2.3.85.tar.bz2 343091 RMD160 67f402b2d037b78c58614bf1a324abae5697651f SHA1 51ae5227ef623e3a31aebe0a6483bfe43ef73816 SHA256 f614843dff214741987d173d3d1be269a53ebc8c7764807bbe19331af51a5151
+DIST calligra-l10n-uk-2.3.92.tar.bz2 2111898 RMD160 6eadd2353106ed5e7d76dc6f0ba748663facbf3c SHA1 6c1ad467e2654e76dc4b51f73b09b709b07f8bab SHA256 c95cf52a3c9bb54664b4b55a4bde96bb83e7db483240350039c9523a61de0879
 DIST calligra-l10n-zh_CN-2.3.86.tar.bz2 343158 RMD160 9849605717f3b67ca5ad6cd3c0e1e891232340eb SHA1 050a3f20fb1aa5b75ce4a226e02e838760aa09e0 SHA256 f1dcaf31ebad67fd68c11dbbb0bbe0fd065197de195a2ca0ce0fefbb3b052229
-DIST calligra-l10n-zh_TW-2.3.85.tar.bz2 383102 RMD160 574e9411cd24581b9421cff8bbdbf16d56fb2229 SHA1 8b2747aa8822d10b1e4c24032a2dd93dc18d8716 SHA256 afd3c09841a10e1bdaa307f3bbf60760826a948c057432d6b840820e4ff630a4
+DIST calligra-l10n-zh_CN-2.3.92.tar.bz2 346337 RMD160 de5e104a055ff248dc8c8e03491164a0d0a3dda7 SHA1 ba9196fcf5477e430f7bcc1e7a3fc9e7a6d364c1 SHA256 21be114f123e9f9ac2cd773d61d36b250e4bde51deebca3c4624ece2f08d8556
 DIST calligra-l10n-zh_TW-2.3.86.tar.bz2 383125 RMD160 9975550dcaa0e418d1e66dd11e257eb7537a58e8 SHA1 3109d41575b89fb8e205610d670c346ca29bb28f SHA256 03212c44c8f94a978691cbb87ab42d9d25ca8bdadd67e0889804d7f1c2c30de1
+DIST calligra-l10n-zh_TW-2.3.92.tar.bz2 387267 RMD160 ea38ab970060929bd7bf35bf13d4546f0335ef8e SHA1 d638af08639dd84db74888da7da13af65fbf48e3 SHA256 ee7621b2b4e79f06bd37db07f3685b125f271911a37ac8af39bb6a26660ae396
--- a/app-office/calligra-l10n/calligra-l10n-2.3.92.ebuild
+++ b/app-office/calligra-l10n/calligra-l10n-2.3.92.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra-l10n/calligra-l10n-2.3.85.ebuild,v 1.1 2011/12/22 22:29:11 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra-l10n/calligra-l10n-2.3.92.ebuild,v 1.1 2012/03/22 07:27:28 scarabeus Exp $

 EAPI=4

--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@ -1 +1,2 @@
 DIST calligra-2.3.87.tar.bz2 123191120 RMD160 b10cbd7c553e34c014ad14f5e4272061ec3ad93d SHA1 d398e78c553c4d512c57236a92732765aa82abc5 SHA256 3bdda4c35eb467f7599eef3d4fd4712be157846dc16a873cd9d3afc1b99839ab
+DIST calligra-2.3.92.tar.bz2 123533771 RMD160 c55140a0d4e719140e8aff0cb7f5fb68dc376cf0 SHA1 460d01bbb454140e851f7ea251d3ac8e143215e5 SHA256 8faefc34428deb2ce07856e2f1a58a4d7f842faf04dda46147644f07dbdfa7a9
--- a/app-office/calligra/calligra-2.3.92.ebuild
+++ b/app-office/calligra/calligra-2.3.92.ebuild
@ -0,0 +1,199 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.3.92.ebuild,v 1.1 2012/03/22 07:27:59 scarabeus Exp $
+
+# note: files that need to be checked for dependencies etc:
+# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
+# krita/CMakeLists.txt
+
+EAPI=4
+
+KDE_SCM=git
+KDE_MINIMAL=4.6.4
+OPENGL_REQUIRED=optional
+
+KDE_HANDBOOK=optional
+
+KDE_LINGUAS_LIVE_OVERRIDE=true
+inherit kde4-base
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="http://www.calligra-suite.org/"
+[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/unstable/${P}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="4"
+[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86"
+IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
+gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr
+pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype
+wmf word-perfect xbase +xml +xslt"
+
+# please do not sort here, order is same as in CMakeLists.txt
+CAL_FTS="kexi words flow plan stage tables krita karbon braindump"
+for cal_ft in ${CAL_FTS}; do
+	IUSE+=" calligra_features_${cal_ft}"
+done
+unset cal_ft
+
+REQUIRED_USE="
+	calligra_features_kexi? ( calligra_features_tables )
+	calligra_features_words? ( calligra_features_tables )
+	calligra_features_krita? ( eigen exif lcms )
+	calligra_features_plan? ( kdepim semantic-desktop )
+	calligra_features_tables? ( eigen )
+	test? ( calligra_features_karbon )
+"
+
+RDEPEND="
+	!app-office/karbon
+	!app-office/kexi
+	!app-office/koffice-data
+	!app-office/koffice-l10n
+	!app-office/koffice-libs
+	!app-office/koffice-meta
+	!app-office/kplato
+	!app-office/kpresenter
+	!app-office/krita
+	!app-office/kspread
+	!app-office/kword
+	dev-lang/perl
+	dev-libs/boost
+	dev-libs/libxml2
+	$(add_kdebase_dep knewstuff)
+	media-libs/libpng
+	sys-libs/zlib
+	attica? ( dev-libs/libattica )
+	crypt? ( app-crypt/qca:2 )
+	eigen? ( dev-cpp/eigen:2 )
+	exif? ( media-gfx/exiv2 )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	freetds? ( dev-db/freetds )
+	gif? ( media-libs/giflib )
+	glew? ( media-libs/glew )
+	glib? ( dev-libs/glib:2 )
+	gsf? ( gnome-extra/libgsf )
+	gsl? ( sci-libs/gsl )
+	iconv? ( virtual/libiconv )
+	jpeg? ( virtual/jpeg )
+	jpeg2k? ( media-libs/openjpeg )
+	kdcraw? ( $(add_kdebase_dep libkdcraw) )
+	kdepim? ( $(add_kdebase_dep kdepimlibs) )
+	lcms? ( media-libs/lcms:2 )
+	marble? ( $(add_kdebase_dep marble) )
+	mysql? ( virtual/mysql )
+	okular? ( $(add_kdebase_dep okular) )
+	openctl? ( >=media-libs/opengtl-0.9.15 )
+	openexr? ( media-libs/openexr )
+	pdf? (
+		app-text/poppler
+		media-gfx/pstoedit
+	)
+	postgres? (
+		dev-db/postgresql-base
+		=dev-libs/libpqxx-3*
+	)
+	semantic-desktop? ( dev-libs/soprano $(add_kdebase_dep kdelibs semantic-desktop) )
+	ssl? ( dev-libs/openssl )
+	sybase? ( dev-db/freetds )
+	tiff? ( media-libs/tiff )
+	truetype? ( media-libs/freetype:2 )
+	word-perfect? (
+		app-text/libwpd
+		app-text/libwps
+		app-text/libwpg
+	)
+	xbase? ( dev-db/xbase )
+	xslt? ( dev-libs/libxslt )
+	calligra_features_kexi? (
+		>=dev-db/sqlite-3.7.9:3[extensions]
+		dev-libs/icu
+	)
+"
+DEPEND="${RDEPEND}"
+
+RESTRICT=test
+# bug 394273
+
+src_configure() {
+	local cal_ft
+
+	# first write out things we want to hard-enable
+	local mycmakeargs=(
+		"-DWITH_Boost=ON"
+		"-DWITH_LibXml2=ON"
+		"-DWITH_PNG=ON"
+		"-DWITH_ZLIB=ON"
+		"-DGHNS=ON"
+		"-DWITH_X11=ON"
+		"-DWITH_Qt4=ON"
+		"-DQT3SUPPORT=ON" # kde4-base.eclass pulls this in anyway
+	)
+
+	# default disablers
+	mycmakeargs+=(
+		"-DBUILD_mobile=OFF" # we dont suppor mobile gui, maybe arm could
+		"-DWITH_LCMS=OFF" # we use lcms:2
+		"-DCREATIVEONLY=OFF"
+		"-DWITH_TINY=OFF"
+		"-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
+		"-DWITH_DCMTK=OFF"           # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
+		"-DWITH_Spnav=OFF"           # NOT PACKAGED: http://spacenav.sourceforge.net/
+	)
+
+	# regular options
+	mycmakeargs+=(
+		$(cmake-utils_use_with attica LibAttica)
+		$(cmake-utils_use_with crypt QCA2)
+		$(cmake-utils_use_with eigen Eigen2)
+		$(cmake-utils_use_with exif Exiv2)
+		$(cmake-utils_use_with fftw FFTW3)
+		$(cmake-utils_use_with fontconfig Fontconfig)
+		$(cmake-utils_use_with freetds FreeTDS)
+		$(cmake-utils_use_with gif GIF2)
+		$(cmake-utils_use_with glew GLEW)
+		$(cmake-utils_use_with glib GLIB2)
+		$(cmake-utils_use_with glib GObject)
+		$(cmake-utils_use_with gsf LIBGSF)
+		$(cmake-utils_use_with gsl GSL)
+		$(cmake-utils_use_with iconv Iconv)
+		$(cmake-utils_use_with jpeg JPEG)
+		$(cmake-utils_use_with jpeg2k OpenJPEG)
+		$(cmake-utils_use_with kdcraw Kdcraw)
+		$(cmake-utils_use_with kdepim KdepimLibs)
+		$(cmake-utils_use_with lcms LCMS2)
+		$(cmake-utils_use_with marble Marble)
+		$(cmake-utils_use_with mysql MySQL)
+		$(cmake-utils_use_with okular Okular)
+		$(cmake-utils_use_with openctl OpenCTL)
+		$(cmake-utils_use_with openexr OpenEXR)
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with pdf Poppler)
+		$(cmake-utils_use_with pdf Pstoedit)
+		$(cmake-utils_use_with postgres PostgreSQL)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use semantic-desktop NEPOMUK)
+		$(cmake-utils_use_with ssl OpenSSL)
+		$(cmake-utils_use_with sybase FreeTDS)
+		$(cmake-utils_use_with tiff TIFF)
+		$(cmake-utils_use_with threads Threads)
+		$(cmake-utils_use_with truetype Freetype)
+		$(cmake-utils_use_with word-perfect WPD)
+		$(cmake-utils_use_with word-perfect WPG)
+		$(cmake-utils_use_with xbase XBase)
+		$(cmake-utils_use_with xslt LibXslt)
+		$(cmake-utils_use_build wmf libkowmf)
+		$(cmake-utils_use_build mso libmsooxml)
+	)
+
+	# applications
+	for cal_ft in ${CAL_FTS}; do
+		mycmakeargs+=( $(cmake-utils_use_build calligra_features_${cal_ft} ${cal_ft}) )
+	done
+	mycmakeargs+=( $(cmake-utils_use_build test cstester) )
+
+	# filters
+
+	kde4-base_src_configure
+}
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@ -46,7 +46,7 @@ DIST libreoffice-base-3.4.5.2.tar.bz2 2070005 RMD160 432cb53d1becd8e3ebf371f3224
 DIST libreoffice-binfilter-3.5.1.2.tar.xz 5972128 RMD160 452ec26eb02b898ddb53fadc3e6cea2000796cd5 SHA1 ce725f0e3200fe60fa732add0a513e50ae90fd08 SHA256 6f7abba458197c4149ee8c36fa0b7413d8e1aa7cd3baf85ef846d43b79bde4a9
 DIST libreoffice-bootstrap-3.4.3.2.tar.bz2 2711992 RMD160 5ded24c90e34306a0ae0d5d97578638098879351 SHA1 527db77912dd3c5f41916ad0db8405325f37c621 SHA256 18f253da00974958059dc91ddb17d5ce5c6c41ec48b98f43451609fb2b1faa45
 DIST libreoffice-bootstrap-3.4.5.2.tar.bz2 2715464 RMD160 d2b2fadac07507878a6bbed9801384dc25f4e874 SHA1 cc5c1ceb6ae9525a8ee89c0b08da958a420e85c0 SHA256 a9a3f223046d57002f0b76b0c04c07398a77bbc85acb445faea6e6d6a637bf17
-DIST libreoffice-branding-gentoo-0.3.tar.xz 130776 RMD160 acb76ddfd77d9c3093f5da229b9d6703831a97b5 SHA1 12afad81a77bccbaadf5a6a11d6a58d70003432e SHA256 34882717b5cc7e1fbc672e6924b92bb6d5def850209b957003f1e517f08d5598
+DIST libreoffice-branding-gentoo-0.4.tar.xz 130792 RMD160 39c693e84e13d7199f9505b5616cffd5b7072d3b SHA1 e12d41b67b75f3507b86d12b3c182195269d6210 SHA256 9a870560cd470234039ab136c1bb023a0da3fa8d0ffa4f6770b830fec707fc9a
 DIST libreoffice-calc-3.4.3.2.tar.bz2 9521313 RMD160 3233a1d112fdb581121ac5f41f3493906eae7863 SHA1 03028d84c98c35a068f0edd3f65556cc5be80f53 SHA256 05f543b5a47511f789cd30fc74ba31cdd0074a4fe7a9bc91e9dd5ab969583335
 DIST libreoffice-calc-3.4.5.2.tar.bz2 9519567 RMD160 25114e5c9d2206879c4a89360a1fa74d84f71444 SHA1 400e1b7c34e91b9a87391464b1968007d3acc378 SHA256 31f94e9cfca6edc17e62d822349ed5bda8fed93af83c5c651835e92031f000d0
 DIST libreoffice-components-3.4.3.2.tar.bz2 5094591 RMD160 ab3a2cd16340931a124e3d0e783c938a5357f5f9 SHA1 492a0b25128a34c4d75df5ef7b3b5e997c24cf31 SHA256 572fdbff98c1083e5066b15cbc34453cedf7f6ac5a740c07639ef2e65fd61aa7
--- a/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild,v 1.22 2012/02/29 15:21:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild,v 1.23 2012/03/22 15:07:05 scarabeus Exp $

 EAPI=3

@ -22,7 +22,7 @@ DEV_URI="
 EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
 ADDONS_URI="http://dev-www.libreoffice.org/src/"

-BRANDING="${PN}-branding-gentoo-0.3.tar.xz"
+BRANDING="${PN}-branding-gentoo-0.4.tar.xz"

 [[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
 inherit base autotools bash-completion check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins versionator ${SCM_ECLASS}
--- a/app-office/libreoffice/libreoffice-3.4.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.5.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.5.2.ebuild,v 1.10 2012/03/08 14:53:56 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.5.2.ebuild,v 1.11 2012/03/22 15:07:05 scarabeus Exp $

 EAPI=4

@ -22,7 +22,7 @@ DEV_URI="
 EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
 ADDONS_URI="http://dev-www.libreoffice.org/src/"

-BRANDING="${PN}-branding-gentoo-0.3.tar.xz"
+BRANDING="${PN}-branding-gentoo-0.4.tar.xz"
 # PATCHSET="${P}-patchset-01.tar.xz"

 [[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
--- a/app-office/libreoffice/libreoffice-3.5.1.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.5.1.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.1.2.ebuild,v 1.6 2012/03/18 12:12:14 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.1.2.ebuild,v 1.7 2012/03/22 15:07:05 scarabeus Exp $

 EAPI=4

@ -23,7 +23,7 @@ DEV_URI="
 EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
 ADDONS_URI="http://dev-www.libreoffice.org/src/"

-BRANDING="${PN}-branding-gentoo-0.3.tar.xz"
+BRANDING="${PN}-branding-gentoo-0.4.tar.xz"
 # PATCHSET="${P}-patchset-01.tar.xz"

 [[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
--- a/app-office/libreoffice/libreoffice-3.5.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-3.5.9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.27 2012/03/19 12:54:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.28 2012/03/22 15:07:05 scarabeus Exp $

 EAPI=4

@ -23,7 +23,7 @@ DEV_URI="
 EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
 ADDONS_URI="http://dev-www.libreoffice.org/src/"

-BRANDING="${PN}-branding-gentoo-0.3.tar.xz"
+BRANDING="${PN}-branding-gentoo-0.4.tar.xz"
 # PATCHSET="${P}-patchset-01.tar.xz"

 [[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.38 2012/03/21 10:35:29 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.39 2012/03/22 15:07:05 scarabeus Exp $

 EAPI=4

@ -23,7 +23,7 @@ DEV_URI="
 EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
 ADDONS_URI="http://dev-www.libreoffice.org/src/"

-BRANDING="${PN}-branding-gentoo-0.3.tar.xz"
+BRANDING="${PN}-branding-gentoo-0.4.tar.xz"
 # PATCHSET="${P}-patchset-01.tar.xz"

 [[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
--- a/app-text/html2text/Manifest
+++ b/app-text/html2text/Manifest
@ -1 +1,3 @@
 DIST html2text-1.3.2.tar.gz 131336 RMD160 10a5c4cf324302d6571abd28a8f0eebf26708750 SHA1 4ef3e6b30a2ac323693975da3ca8ce96013daa58 SHA256 15e458961ee168771d4e9fa4fd50e9b128ab40e7b530db5ce210178fa17dac44
+DIST html2text-1.3.2a.tar.gz 130088 RMD160 2771c52ea3ff6c97a13d6171839e61bb19226311 SHA1 91d46e3218d05b0783bebee96a14f0df0eb9773e SHA256 000b39d5d910b867ff7e087177b470a1e26e2819920dcffd5991c33f6d480392
+DIST patch-utf8-html2text-1.3.2a.diff 29499 RMD160 3bdf2a8cc143f290f06e57b205f2530e19024628 SHA1 3e928c75495aa6d8f071bcf61d2ceba0eb748811 SHA256 be4e90094d2854059924cb2c59ca31a5e9e0e22d2245fa5dc0c03f604798c5d1
--- a/app-text/html2text/files/html2text-1.3.2a-compiler.patch
+++ b/app-text/html2text/files/html2text-1.3.2a-compiler.patch
@ -0,0 +1,13 @@
+--- a/configure
+++ b/configure
+@@ -38,8 +38,8 @@
+   return 0;
+ }
+ EOF
+-CXX=unknown;
+-for i in "CC" "g++" "cc" "$CC"; do
+CXX=${CXX-unknown}
+for i in "$CXX" "CC" "g++" "cc"; do
+   if $i -c $tmp_file.C 2>/dev/null; then
+     CXX="$i";
+     break;
--- a/app-text/html2text/files/html2text-1.3.2a-urlistream-get.patch
+++ b/app-text/html2text/files/html2text-1.3.2a-urlistream-get.patch
@ -0,0 +1,11 @@
+--- a/urlistream.C
+++ b/urlistream.C
+@@ -362,7 +362,7 @@
+ int
+ urlistream::get()
+ {
+-  char ch;
+  unsigned char ch;
+   int ret = ::read(fd_, &ch, 1);
+   return (ret > 0 ? ch : -1);
+ }
--- a/app-text/html2text/html2text-1.3.2a.ebuild
+++ b/app-text/html2text/html2text-1.3.2a.ebuild
@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/html2text/html2text-1.3.2a.ebuild,v 1.2 2012/03/22 16:57:35 floppym Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A HTML to text converter"
+HOMEPAGE="http://www.mbayer.de/html2text/"
+SRC_URI="http://www.mbayer.de/html2text/downloads/${P}.tar.gz
+	http://www.mbayer.de/html2text/downloads/patch-utf8-${P}.diff"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_unpack() {
+	unpack ${P}.tar.gz
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-compiler.patch
+	epatch "${FILESDIR}"/${P}-urlistream-get.patch
+	epatch "${DISTDIR}"/patch-utf8-${P}.diff
+}
+
+src_configure() {
+	tc-export CXX
+	default
+}
+
+src_compile() {
+	emake LDFLAGS="${LDFLAGS}" DEBUG="${CXXFLAGS}"
+}
+
+src_install() {
+	dobin html2text
+	doman html2text.1.gz html2textrc.5.gz
+	dodoc CHANGES CREDITS KNOWN_BUGS README TODO
+}
--- a/dev-cpp/clucene/clucene-2.3.3.4-r3.ebuild
+++ b/dev-cpp/clucene/clucene-2.3.3.4-r3.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/clucene/clucene-2.3.3.4-r2.ebuild,v 1.1 2012/03/21 10:20:32 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/clucene/clucene-2.3.3.4-r3.ebuild,v 1.1 2012/03/22 11:35:53 scarabeus Exp $

 EAPI=4

@ -43,7 +43,6 @@ src_configure() {
 		-DDISABLE_MULTITHREADING=OFF
 		-DBUILD_CONTRIBS_LIB=ON
 		"-DLIB_DESTINATION=${EPREFIX}/usr/$(get_libdir)"
-		"-DLUCENE_SYS_INCLUDES=${EPREFIX}/usr/$(get_libdir)"
 		$(cmake-utils_use_enable debug)
 		$(cmake-utils_use_enable doc CLDOCS)
 		$(cmake-utils_use_build static-libs STATIC_LIBRARIES)
--- a/dev-cpp/clucene/files/clucene-2.3.3.4-pkgconfig.patch
+++ b/dev-cpp/clucene/files/clucene-2.3.3.4-pkgconfig.patch
@ -8,5 +8,5 @@ diff -up clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake.pkgconfig_sys_in
 -Libs: -L${prefix}/@LIB_DESTINATION@/ -lclucene-core
 -Cflags: -I${prefix}/include -I${prefix}/include/CLucene/ext
 +Libs: -L${prefix}/@LIB_DESTINATION@/ -lclucene-core -lclucene-shared
-+Cflags: -I${prefix}/include -I${prefix}/include/CLucene/ext -I@LUCENE_SYS_INCLUDES@
+Cflags: -I${prefix}/include -I${prefix}/include/CLucene/ext 
 ~
--- a/dev-db/sqlite/sqlite-3.7.10.ebuild
+++ b/dev-db/sqlite/sqlite-3.7.10.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.7.10.ebuild,v 1.4 2012/03/20 08:28:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.7.10.ebuild,v 1.5 2012/03/22 12:03:34 jer Exp $

 EAPI="4"

@ -21,7 +21,7 @@ SRC_URI="doc? ( http://sqlite.org/${PN}-doc-${DOC_PV}.zip )

 LICENSE="as-is"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc +extensions +fts3 icu +readline secure-delete soundex tcl test +threadsafe unlock-notify"

 RDEPEND="icu? ( dev-libs/icu )
--- a/dev-java/jna/jna-3.0.3-r1.ebuild
+++ b/dev-java/jna/jna-3.0.3-r1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jna/jna-3.0.3-r1.ebuild,v 1.2 2009/10/25 21:37:05 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jna/jna-3.0.3-r1.ebuild,v 1.3 2012/03/22 13:27:46 sera Exp $

 EAPI=2

@ -23,6 +23,7 @@ RDEPEND="virtual/libffi
 	>=virtual/jre-1.4"

 DEPEND="virtual/libffi
+	dev-util/pkgconfig
 	!test? ( >=virtual/jdk-1.4 )
 	test? (
 		dev-java/ant-junit
--- a/dev-java/jna/jna-3.2.4.ebuild
+++ b/dev-java/jna/jna-3.2.4.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jna/jna-3.2.4.ebuild,v 1.4 2011/07/18 07:37:11 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jna/jna-3.2.4.ebuild,v 1.5 2012/03/22 13:27:46 sera Exp $

 EAPI=2

@ -23,6 +23,7 @@ RDEPEND="virtual/libffi
 	>=virtual/jre-1.4"

 DEPEND="virtual/libffi
+	dev-util/pkgconfig
 	!test? ( >=virtual/jdk-1.4 )
 	test? (
 		dev-java/junit:0
--- a/dev-java/jna/jna-3.2.7.ebuild
+++ b/dev-java/jna/jna-3.2.7.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jna/jna-3.2.7.ebuild,v 1.1 2011/01/25 17:47:14 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jna/jna-3.2.7.ebuild,v 1.2 2012/03/22 13:27:46 sera Exp $

 EAPI="4"

@ -26,6 +26,7 @@ RDEPEND="virtual/libffi

 DEPEND="virtual/libffi
 	>=virtual/jdk-1.6
+	dev-util/pkgconfig
 	test? (
 		dev-java/junit:0
 		dev-java/ant-junit:0
--- a/dev-java/jna/jna-3.3.0.ebuild
+++ b/dev-java/jna/jna-3.3.0.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jna/jna-3.3.0.ebuild,v 1.1 2011/12/13 17:05:49 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jna/jna-3.3.0.ebuild,v 1.2 2012/03/22 13:27:46 sera Exp $

 EAPI="4"

@ -26,6 +26,7 @@ RDEPEND="virtual/libffi

 DEPEND="virtual/libffi
 	>=virtual/jdk-1.6
+	dev-util/pkgconfig
 	test? (
 		dev-java/junit:0
 		dev-java/ant-junit:0
--- a/dev-java/jna/jna-3.4.0.ebuild
+++ b/dev-java/jna/jna-3.4.0.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jna/jna-3.4.0.ebuild,v 1.1 2011/12/25 14:23:57 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jna/jna-3.4.0.ebuild,v 1.2 2012/03/22 13:27:46 sera Exp $

 EAPI="4"

@ -18,11 +18,13 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="+awt +nio-buffers"
 S="${WORKDIR}/twall-jna-3e5b84f"

-RDEPEND="virtual/libffi
+COMMON_DEP="
+	virtual/libffi"
+RDEPEND="${COMMON_DEP}
 	>=virtual/jre-1.6"
-
-DEPEND="virtual/libffi
+DEPEND="${COMMON_DEP}
 	>=virtual/jdk-1.6
+	dev-util/pkgconfig
 	test? (
 		dev-java/junit:0
 		dev-java/ant-junit:0
--- a/dev-java/netbeans-java/netbeans-java-7.0.1-r1.ebuild
+++ b/dev-java/netbeans-java/netbeans-java-7.0.1-r1.ebuild
@ -0,0 +1,305 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-java/netbeans-java-7.0.1-r1.ebuild,v 1.1 2012/03/22 15:41:49 fordfrog Exp $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Java Cluster"
+HOMEPAGE="http://netbeans.org/projects/java"
+SLOT="7.0"
+SOURCE_URL="http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.patch.bz2
+	http://hg.netbeans.org/binaries/FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip
+	http://hg.netbeans.org/binaries/A511890049A6A9B8D675F4417721337580CBD2F9-apache-maven-3.0.3-bin.zip
+	http://hg.netbeans.org/binaries/B456600D274B835E1E7DDB16FD843DDAB2ED3EF1-appframework-1.0.3-doc.zip
+	http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
+	http://hg.netbeans.org/binaries/8C9BFFBCB34DB6E9C9C03413623F05375D44CE49-eclipselink-2.2.0.jar
+	http://hg.netbeans.org/binaries/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-eclipselink-javax.persistence-2.0.jar
+	http://hg.netbeans.org/binaries/263D76EEB2FA35AE240DE31CFDE83C04096AE19E-eclipselink-jpa-modelgen-2.2.0.jar
+	http://hg.netbeans.org/binaries/59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar
+	http://hg.netbeans.org/binaries/907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.jar
+	http://hg.netbeans.org/binaries/C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip
+	http://hg.netbeans.org/binaries/AF599F03E590A5992EE56F363DBD8F0F32B8787E-indexer-artifact-4.1.0.jar
+	http://hg.netbeans.org/binaries/CAF99EFBB25E9183609D6FBA4F63D85E7606903F-indexer-core-4.1.0.jar
+	http://hg.netbeans.org/binaries/ADD5DE96BF7F30DAA4EC41D70610CF72A16F58FD-javac-api-nb-7.0-b07.jar
+	http://hg.netbeans.org/binaries/AA6FD013C506BAC98BCE1174EACAD00383650342-javac-impl-nb-7.0-b07.jar
+	http://hg.netbeans.org/binaries/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar
+	http://hg.netbeans.org/binaries/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip
+	http://hg.netbeans.org/binaries/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-api.zip
+	http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip
+	http://hg.netbeans.org/binaries/2D0D28E05BD6B6452DAAFE2B5CCB69A84EA63E5D-spring-2.5.6.SEC01.jar
+	http://hg.netbeans.org/binaries/D88A41174C5F85D1B791D6A8E0F8B8A1C459D6C0-spring-framework-3.0.2.RELEASE.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/appframework:0
+	dev-java/beansbinding:0
+	dev-java/cglib:2.2
+	dev-java/jdom:1.0
+	dev-java/swing-worker:0"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}
+	dev-java/absolutelayout:0
+	dev-java/antlr:0[java]
+	dev-java/asm:2.2
+	dev-java/cglib:2.1
+	dev-java/commons-collections:0
+	dev-java/dom4j:1
+	dev-java/ehcache:1.2
+	dev-java/fastinfoset:0
+	dev-java/javassist:3
+	dev-java/jsr67:0
+	dev-java/jsr181:0
+	dev-java/jsr250:0
+	dev-java/glassfish-transaction-api:0
+	dev-java/jtidy:0
+	>=dev-java/maven-bin-3.0.3:3.0
+	dev-java/saaj:0
+	dev-java/stax-ex:0
+	dev-java/xmlstreambuffer:0"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.java -Dext.binaries.downloaded=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-7.0-build.xml-r1.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip o.apache.tools.ant.module/external/ant-libs-1.8.2.zip || die
+	ln -s "${DISTDIR}"/A511890049A6A9B8D675F4417721337580CBD2F9-apache-maven-3.0.3-bin.zip maven.embedder/external/apache-maven-3.0.3-bin.zip || die
+	ln -s "${DISTDIR}"/B456600D274B835E1E7DDB16FD843DDAB2ED3EF1-appframework-1.0.3-doc.zip swingapp/external/appframework-1.0.3-doc.zip || die
+	ln -s "${DISTDIR}"/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip o.jdesktop.beansbinding/external/beansbinding-1.2.1-doc.zip || die
+	ln -s "${DISTDIR}"/8C9BFFBCB34DB6E9C9C03413623F05375D44CE49-eclipselink-2.2.0.jar j2ee.eclipselink/external/eclipselink-2.2.0.jar || die
+	ln -s "${DISTDIR}"/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-eclipselink-javax.persistence-2.0.jar j2ee.eclipselink/external/eclipselink-javax.persistence-2.0.jar || die
+	ln -s "${DISTDIR}"/263D76EEB2FA35AE240DE31CFDE83C04096AE19E-eclipselink-jpa-modelgen-2.2.0.jar j2ee.eclipselinkmodelgen/external/eclipselink-jpa-modelgen-2.2.0.jar || die
+	ln -s "${DISTDIR}"/59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar j2ee.toplinklib/external/glassfish-persistence-v2-build-58g.jar || die
+	ln -s "${DISTDIR}"/907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.jar j2ee.toplinklib/external/glassfish-persistence-v2ur1-build-09d.jar || die
+	ln -s "${DISTDIR}"/C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip hibernatelib/external/hibernate-3.2.5-lib.zip || die
+	ln -s "${DISTDIR}"/AF599F03E590A5992EE56F363DBD8F0F32B8787E-indexer-artifact-4.1.0.jar maven.indexer/external/indexer-artifact-4.1.0.jar || die
+	ln -s "${DISTDIR}"/CAF99EFBB25E9183609D6FBA4F63D85E7606903F-indexer-core-4.1.0.jar maven.indexer/external/indexer-core-4.1.0.jar || die
+	ln -s "${DISTDIR}"/ADD5DE96BF7F30DAA4EC41D70610CF72A16F58FD-javac-api-nb-7.0-b07.jar libs.javacapi/external/javac-api-nb-7.0-b07.jar || die
+	ln -s "${DISTDIR}"/AA6FD013C506BAC98BCE1174EACAD00383650342-javac-impl-nb-7.0-b07.jar libs.javacimpl/external/javac-impl-nb-7.0-b07.jar || die
+	ln -s "${DISTDIR}"/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar maven.embedder/external/maven-dependency-tree-1.2.jar || die
+	ln -s "${DISTDIR}"/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip websvc.jaxws21/external/jaxws-2.2.zip || die
+	ln -s "${DISTDIR}"/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-api.zip websvc.jaxws21api/external/jaxws-2.2-api.zip || die
+	ln -s "${DISTDIR}"/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip websvc.jaxws21/external/jaxws-api-doc.zip || die
+	ln -s "${DISTDIR}"/2D0D28E05BD6B6452DAAFE2B5CCB69A84EA63E5D-spring-2.5.6.SEC01.jar libs.springframework/external/spring-2.5.6.SEC01.jar || die
+	ln -s "${DISTDIR}"/D88A41174C5F85D1B791D6A8E0F8B8A1C459D6C0-spring-framework-3.0.2.RELEASE.zip libs.springframework/external/spring-framework-3.0.2.RELEASE.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-7.0-build.xml-r1.patch
+	sed -i "s%../o.jdesktop.layout/external%\${netbeans.dest.dir}/\${nb.cluster.platform.dir}/modules/ext%" java.examples/build.xml
+
+	# Support for custom patches
+	if [ -n "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS70_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.cglib/external cglib-2.2 cglib.jar cglib-2.2.jar
+	java-pkg_jar-from --into maven.embedder/external jdom-1.0 jdom.jar jdom-1.0.jar
+	java-pkg_jar-from --into o.jdesktop.beansbinding/external beansbinding beansbinding.jar beansbinding-1.2.1.jar
+	java-pkg_jar-from --into swingapp/external appframework appframework.jar appframework-1.0.3.jar
+	java-pkg_jar-from --into swingapp/external swing-worker swing-worker.jar swing-worker-1.1.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/java >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+	grep -E "/java$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	rm -fr "${D}"/${INSTALL_DIR}/ant/* || die
+	rm -fr "${D}"/${INSTALL_DIR}/maven || die
+	dosym /usr/share/maven-bin-3.0 ${INSTALL_DIR}/maven
+
+	insinto ${INSTALL_DIR}/ant
+	dosym /usr/share/ant/bin ${INSTALL_DIR}/ant/bin
+	dosym /usr/share/ant/etc ${INSTALL_DIR}/ant/etc
+	doins -r ant/extra
+	dosym /usr/share/ant/lib ${INSTALL_DIR}/ant/lib
+	doins -r ant/nblib
+	dosym /usr/share/ant/tasks ${INSTALL_DIR}/ant/tasks
+	local vertasks=$(ls -d /usr/share/ant/tasks-*)
+	dosym ${vertasks} ${INSTALL_DIR}/ant/$(basename ${vertasks}) # it would be better if ant would have tasks-current dir
+
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm AbsoluteLayout.jar  && dosym /usr/share/absolutelayout/lib/absolutelayout.jar ${instdir}/AbsoluteLayout.jar || die
+	rm appframework-1.0.3.jar && dosym /usr/share/appframework/lib/appframework.jar ${instdir}/appframework-1.0.3.jar || die
+	rm beansbinding-1.2.1.jar && dosym /usr/share/beansbinding/lib/beansbinding.jar ${instdir}/beansbinding-1.2.1.jar || die
+	rm cglib-2.2.jar && dosym /usr/share/cglib-2.2/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
+	# javac-api-nb-7.0-b07.jar
+	# javac-impl-nb-7.0-b07.jar
+	# org-netbeans-modules-java-j2seplatform-probe.jar
+	rm swing-worker-1.1.jar && dosym /usr/share/swing-worker/lib/swing-worker.jar ${instdir}/swing-worker-1.1.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/eclipselink
+	pushd "${D}"/${instdir} >/dev/null || die
+	# dir: eclipselink
+	# eclipselink-javax.persistence-2.0.jar
+	# eclipselink-jpa-modelgen-2.2.0.jar
+	# eclipselink-2.2.0.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/hibernate
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm antlr-2.7.6.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.6.jar || die
+	rm asm-attrs.jar && dosym /usr/share/asm-2.2/lib/asm-attrs.jar ${instdir}/asm-attrs.jar || die
+	rm asm.jar && dosym /usr/share/asm-2.2/lib/asm.jar ${instdir}/asm.jar || die
+	rm cglib-2.1.3.jar && dosym /usr/share/cglib-2.1/lib/cglib.jar ${instdir}/cglib-2.1.3.jar || die
+	rm commons-collections-2.1.1.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections-2.1.1.jar || die
+	rm dom4j-1.6.1.jar && dosym /usr/share/dom4j-1/lib/dom4j.jar ${instdir}/dom4j-1.6.1.jar || die
+	rm ehcache-1.2.3.jar && dosym /usr/share/ehcache-1.2/lib/ehcache.jar ${instdir}/ehcache-1.2.3.jar || die
+	# ejb3-persistence.jar
+	# hibernate-annotations.jar
+	# hibernate-commons-annotations.jar
+	# hibernate-entitymanager.jar
+	# hibernate-tools.jar
+	# hibernate3.jar
+	rm javassist.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist.jar || die
+	# jdbc2_0-stdext.jar
+	rm jta.jar && dosym /usr/share/jta/lib/jta.jar ${instdir}/jta.jar || die
+	rm jtidy-r8-20060801.jar && dosym /usr/share/jtidy/lib/Tidy.jar ${instdir}/jtidy-r8-20060801.jar || die
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext/jaxws22
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm FastInfoset.jar && dosym /usr/share/fastinfoset/lib/fastinfoset.jar ${instdir}/FastInfoset.jar || die
+	# gmbal-api-only.jar
+	# http.jar
+	# jaxws-rt.jar
+	# jaxws-tools.jar
+	# management-api.jar
+	# mimepull.jar
+	# policy.jar
+	rm saaj-impl.jar && dosym /usr/share/saaj/lib/saaj.jar ${instdir}/saaj-impl.jar || die
+	rm stax-ex.jar && dosym /usr/share/stax-ex/lib/stax-ex.jar ${instdir}/stax-ex.jar || die
+	rm streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/streambuffer.jar ${instdir}/streambuffer.jar || die
+	# woodstox.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxws22/api
+	pushd "${D}"/${instdir} >/dev/null || die
+	# jaxws-api.jar
+	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
+	rm jsr250-api.jar && dosym /usr/share/jsr250/lib/jsr250.jar ${instdir}/jsr250-api.jar || die
+	rm saaj-api.jar && dosym /usr/share/jsr67/lib/jsr67.jar ${instdir}/saaj-api.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/maven
+	pushd "${D}"/${instdir} >/dev/null || die
+	# indexer-artifact-3.1.0.jar
+	# indexer-core-3.1.0.jar
+	rm jdom-1.0.jar && dosym /usr/share/jdom-1.0/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
+	# maven-dependency-tree-1.2.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/spring
+	pushd "${D}"/${instdir} >/dev/null || die
+	# spring-2.5.6.SEC01.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/spring-3.0
+	pushd "${D}"/${instdir} >/dev/null || die
+	# spring-aop-3.0.2.RELEASE.jar
+	# spring-asm-3.0.2.RELEASE.jar
+	# spring-aspects-3.0.2.RELEASE.jar
+	# spring-beans-3.0.2.RELEASE.jar
+	# spring-context-support-3.0.2.RELEASE.jar
+	# spring-context-3.0.2.RELEASE.jar
+	# spring-core-3.0.2.RELEASE.jar
+	# spring-expression-3.0.2.RELEASE.jar
+	# spring-instrument-tomcat-3.0.2.RELEASE.jar
+	# spring-instrument-3.0.2.RELEASE.jar
+	# spring-jdbc-3.0.2.RELEASE.jar
+	# spring-jms-3.0.2.RELEASE.jar
+	# spring-orm-3.0.2.RELEASE.jar
+	# spring-oxm-3.0.2.RELEASE.jar
+	# spring-struts-3.0.2.RELEASE.jar
+	# spring-test-3.0.2.RELEASE.jar
+	# spring-tx-3.0.2.RELEASE.jar
+	# spring-webmvc-portlet-3.0.2.RELEASE.jar
+	# spring-webmvc-3.0.2.RELEASE.jar
+	# spring-web-3.0.2.RELEASE.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/toplink
+	pushd "${D}"/${instdir} >/dev/null || die
+	# toplink-essentials-agent.jar
+	# toplink-essentials.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
+}
+
+pkg_postinst() {
+	elog "Note that if you change your version of ant, you have to re-emerge"
+	elog "this package to get updated the link to ant tasks of that specific"
+	elog "version."
+}
--- a/dev-java/netbeans-java/netbeans-java-7.1.1-r1.ebuild
+++ b/dev-java/netbeans-java/netbeans-java-7.1.1-r1.ebuild
@ -0,0 +1,318 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-java/netbeans-java-7.1.1-r1.ebuild,v 1.1 2012/03/22 15:41:49 fordfrog Exp $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Java Cluster"
+HOMEPAGE="http://netbeans.org/projects/java"
+SLOT="7.1"
+SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip
+	http://hg.netbeans.org/binaries/29CFD351206016B67DD0D556098513D2B259C69B-apache-maven-3.0.4-bin.zip
+	http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
+	http://hg.netbeans.org/binaries/BC0919190ADD3A7FB764C8412D10A2B026CD9563-eclipselink-2.3.0.jar
+	http://hg.netbeans.org/binaries/7C60F22D32F56478AC25A732038E9DD7DFECF5DD-eclipselink-jpa-modelgen-2.3.0.jar
+	http://hg.netbeans.org/binaries/59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar
+	http://hg.netbeans.org/binaries/907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.jar
+	http://hg.netbeans.org/binaries/C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip
+	http://hg.netbeans.org/binaries/204680C59C7D8A4A1A26B9A2ED46D0DAA6DC10B3-indexer-artifact-4.1.2.jar
+	http://hg.netbeans.org/binaries/EA1F2B2504FC5ABCB06146D858F74A97B85A2998-indexer-core-4.1.2.jar
+	http://hg.netbeans.org/binaries/E90F4B2F8972AA5EF58139F16B78D5F6ACFC6EF9-javac-api-nb-7.0-b07.jar
+	http://hg.netbeans.org/binaries/8BA05B53DB763AA62EFD389B2F1C8CFA889079EF-javac-impl-nb-7.0-b07.jar
+	http://hg.netbeans.org/binaries/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-javax.persistence-2.0.jar
+	http://hg.netbeans.org/binaries/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip
+	http://hg.netbeans.org/binaries/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-api.zip
+	http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip
+	http://hg.netbeans.org/binaries/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar
+	http://hg.netbeans.org/binaries/3D4C3416889FDC5C149D97382020F4AC6C736377-org.eclipse.persistence.jpa.jpql_1.0.0.jar
+	http://hg.netbeans.org/binaries/2D0D28E05BD6B6452DAAFE2B5CCB69A84EA63E5D-spring-2.5.6.SEC01.jar
+	http://hg.netbeans.org/binaries/7622CB23DAEDD9DE0ACBD16C820D3A02F94572AF-spring-framework-3.0.6.RELEASE.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/beansbinding:0
+	dev-java/cglib:2.2
+	dev-java/jdom:1.0"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/junit:4"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}
+	dev-java/absolutelayout:0
+	dev-java/antlr:0[java]
+	dev-java/asm:2.2
+	dev-java/cglib:2.1
+	dev-java/commons-collections:0
+	dev-java/dom4j:1
+	dev-java/ehcache:1.2
+	dev-java/fastinfoset:0
+	dev-java/javassist:3
+	dev-java/jsr67:0
+	dev-java/jsr181:0
+	dev-java/jsr250:0
+	dev-java/glassfish-transaction-api:0
+	dev-java/jtidy:0
+	dev-java/saaj:0
+	dev-java/stax-ex:0
+	dev-java/xmlstreambuffer:0"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.java -Dext.binaries.downloaded=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+pkg_pretend() {
+	local die_now=""
+
+	if [ -n "$(find /usr/share/netbeans-java-${SLOT}/ant -type l)" ]; then
+		eerror "Please remove following symlinks and run emerge again:"
+		find /usr/share/netbeans-java-${SLOT}/ant -type l
+		die_now="1"
+	fi
+
+	if [ -L /usr/share/netbeans-java-${SLOT}/maven ]; then
+		if [ -z "${die_now}" ]; then
+			eerror "Please remove following symlinks and run emerge again:"
+		fi
+
+		echo "/usr/share/netbeans-java-${SLOT}/maven"
+		die_now="1"
+	fi
+
+	if [ -n "${die_now}" ]; then
+		die "Symlinks exist"
+	fi
+}
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip o.apache.tools.ant.module/external/ant-libs-1.8.2.zip || die
+	ln -s "${DISTDIR}"/29CFD351206016B67DD0D556098513D2B259C69B-apache-maven-3.0.4-bin.zip maven.embedder/external/apache-maven-3.0.4-bin.zip || die
+	ln -s "${DISTDIR}"/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip o.jdesktop.beansbinding/external/beansbinding-1.2.1-doc.zip || die
+	ln -s "${DISTDIR}"/BC0919190ADD3A7FB764C8412D10A2B026CD9563-eclipselink-2.3.0.jar j2ee.eclipselink/external/eclipselink-2.3.0.jar || die
+	ln -s "${DISTDIR}"/7C60F22D32F56478AC25A732038E9DD7DFECF5DD-eclipselink-jpa-modelgen-2.3.0.jar j2ee.eclipselinkmodelgen/external/eclipselink-jpa-modelgen-2.3.0.jar || die
+	ln -s "${DISTDIR}"/59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar j2ee.toplinklib/external/glassfish-persistence-v2-build-58g.jar || die
+	ln -s "${DISTDIR}"/907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.jar j2ee.toplinklib/external/glassfish-persistence-v2ur1-build-09d.jar || die
+	ln -s "${DISTDIR}"/C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip hibernatelib/external/hibernate-3.2.5-lib.zip || die
+	ln -s "${DISTDIR}"/204680C59C7D8A4A1A26B9A2ED46D0DAA6DC10B3-indexer-artifact-4.1.2.jar maven.indexer/external/indexer-artifact-4.1.2.jar || die
+	ln -s "${DISTDIR}"/EA1F2B2504FC5ABCB06146D858F74A97B85A2998-indexer-core-4.1.2.jar maven.indexer/external/indexer-core-4.1.2.jar || die
+	ln -s "${DISTDIR}"/E90F4B2F8972AA5EF58139F16B78D5F6ACFC6EF9-javac-api-nb-7.0-b07.jar libs.javacapi/external/javac-api-nb-7.0-b07.jar || die
+	ln -s "${DISTDIR}"/8BA05B53DB763AA62EFD389B2F1C8CFA889079EF-javac-impl-nb-7.0-b07.jar libs.javacimpl/external/javac-impl-nb-7.0-b07.jar || die
+	ln -s "${DISTDIR}"/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-javax.persistence-2.0.jar j2ee.eclipselink/external/javax.persistence-2.0.jar || die
+	ln -s "${DISTDIR}"/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip websvc.jaxws21/external/jaxws-2.2.zip || die
+	ln -s "${DISTDIR}"/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-api.zip websvc.jaxws21api/external/jaxws-2.2-api.zip || die
+	ln -s "${DISTDIR}"/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip websvc.jaxws21/external/jaxws-api-doc.zip || die
+	ln -s "${DISTDIR}"/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar maven.embedder/external/maven-dependency-tree-1.2.jar || die
+	ln -s "${DISTDIR}"/3D4C3416889FDC5C149D97382020F4AC6C736377-org.eclipse.persistence.jpa.jpql_1.0.0.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_1.0.0.jar || die
+	ln -s "${DISTDIR}"/2D0D28E05BD6B6452DAAFE2B5CCB69A84EA63E5D-spring-2.5.6.SEC01.jar libs.springframework/external/spring-2.5.6.SEC01.jar || die
+	ln -s "${DISTDIR}"/7622CB23DAEDD9DE0ACBD16C820D3A02F94572AF-spring-framework-3.0.6.RELEASE.zip libs.springframework/external/spring-framework-3.0.6.RELEASE.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.cglib/external cglib-2.2 cglib.jar cglib-2.2.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.10.jar
+	java-pkg_jar-from --into maven.embedder/external jdom-1.0 jdom.jar jdom-1.0.jar
+	java-pkg_jar-from --into o.jdesktop.beansbinding/external beansbinding beansbinding.jar beansbinding-1.2.1.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/java >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+	grep -E "/java$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	#rm -fr "${D}"/${INSTALL_DIR}/ant/* || die
+	#rm -fr "${D}"/${INSTALL_DIR}/maven || die
+	#dosym /usr/share/maven-bin-3.0 ${INSTALL_DIR}/maven
+	chmod 755 "${D}"/${INSTALL_DIR}/maven/bin/mvn* || die
+	rm -fr "${D}"/${INSTALL_DIR}/maven/bin/*.bat || die
+
+	#insinto ${INSTALL_DIR}/ant
+	#dosym /usr/share/ant/bin ${INSTALL_DIR}/ant/bin
+	#dosym /usr/share/ant/etc ${INSTALL_DIR}/ant/etc
+	#doins -r ant/extra
+	#dosym /usr/share/ant/lib ${INSTALL_DIR}/ant/lib
+	#doins -r ant/nblib
+	#dosym /usr/share/ant/tasks ${INSTALL_DIR}/ant/tasks
+	#local vertasks=$(ls -d /usr/share/ant/tasks-*)
+	#dosym ${vertasks} ${INSTALL_DIR}/ant/$(basename ${vertasks}) # it would be better if ant would have tasks-current dir
+
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm AbsoluteLayout.jar  && dosym /usr/share/absolutelayout/lib/absolutelayout.jar ${instdir}/AbsoluteLayout.jar || die
+	rm beansbinding-1.2.1.jar && dosym /usr/share/beansbinding/lib/beansbinding.jar ${instdir}/beansbinding-1.2.1.jar || die
+	rm cglib-2.2.jar && dosym /usr/share/cglib-2.2/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
+	# javac-api-nb-7.0-b07.jar
+	# javac-impl-nb-7.0-b07.jar
+	# org-netbeans-modules-java-j2seplatform-probe.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/eclipselink
+	pushd "${D}"/${instdir} >/dev/null || die
+	# dir: eclipselink
+	# eclipselink-javax.persistence-2.0.jar
+	# eclipselink-jpa-modelgen-2.2.0.jar
+	# eclipselink-2.2.0.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/hibernate
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm antlr-2.7.6.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.6.jar || die
+	rm asm-attrs.jar && dosym /usr/share/asm-2.2/lib/asm-attrs.jar ${instdir}/asm-attrs.jar || die
+	rm asm.jar && dosym /usr/share/asm-2.2/lib/asm.jar ${instdir}/asm.jar || die
+	rm cglib-2.1.3.jar && dosym /usr/share/cglib-2.1/lib/cglib.jar ${instdir}/cglib-2.1.3.jar || die
+	rm commons-collections-2.1.1.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections-2.1.1.jar || die
+	rm dom4j-1.6.1.jar && dosym /usr/share/dom4j-1/lib/dom4j.jar ${instdir}/dom4j-1.6.1.jar || die
+	rm ehcache-1.2.3.jar && dosym /usr/share/ehcache-1.2/lib/ehcache.jar ${instdir}/ehcache-1.2.3.jar || die
+	# ejb3-persistence.jar
+	# hibernate-annotations.jar
+	# hibernate-commons-annotations.jar
+	# hibernate-entitymanager.jar
+	# hibernate-tools.jar
+	# hibernate3.jar
+	rm javassist.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist.jar || die
+	# jdbc2_0-stdext.jar
+	rm jta.jar && dosym /usr/share/jta/lib/jta.jar ${instdir}/jta.jar || die
+	rm jtidy-r8-20060801.jar && dosym /usr/share/jtidy/lib/Tidy.jar ${instdir}/jtidy-r8-20060801.jar || die
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext/jaxws22
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm FastInfoset.jar && dosym /usr/share/fastinfoset/lib/fastinfoset.jar ${instdir}/FastInfoset.jar || die
+	# gmbal-api-only.jar
+	# http.jar
+	# jaxws-rt.jar
+	# jaxws-tools.jar
+	# management-api.jar
+	# mimepull.jar
+	# policy.jar
+	rm saaj-impl.jar && dosym /usr/share/saaj/lib/saaj.jar ${instdir}/saaj-impl.jar || die
+	rm stax-ex.jar && dosym /usr/share/stax-ex/lib/stax-ex.jar ${instdir}/stax-ex.jar || die
+	rm streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/streambuffer.jar ${instdir}/streambuffer.jar || die
+	# woodstox.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxws22/api
+	pushd "${D}"/${instdir} >/dev/null || die
+	# jaxws-api.jar
+	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
+	rm jsr250-api.jar && dosym /usr/share/jsr250/lib/jsr250.jar ${instdir}/jsr250-api.jar || die
+	rm saaj-api.jar && dosym /usr/share/jsr67/lib/jsr67.jar ${instdir}/saaj-api.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/maven
+	pushd "${D}"/${instdir} >/dev/null || die
+	# indexer-artifact-4.1.1.jar
+	# indexer-core-4.1.1.jar
+	rm jdom-1.0.jar && dosym /usr/share/jdom-1.0/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
+	# maven-dependency-tree-1.2.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/spring
+	pushd "${D}"/${instdir} >/dev/null || die
+	# spring-2.5.6.SEC01.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/spring-3.0
+	pushd "${D}"/${instdir} >/dev/null || die
+	# spring-aop-3.0.2.RELEASE.jar
+	# spring-asm-3.0.2.RELEASE.jar
+	# spring-aspects-3.0.2.RELEASE.jar
+	# spring-beans-3.0.2.RELEASE.jar
+	# spring-context-support-3.0.2.RELEASE.jar
+	# spring-context-3.0.2.RELEASE.jar
+	# spring-core-3.0.2.RELEASE.jar
+	# spring-expression-3.0.2.RELEASE.jar
+	# spring-instrument-tomcat-3.0.2.RELEASE.jar
+	# spring-instrument-3.0.2.RELEASE.jar
+	# spring-jdbc-3.0.2.RELEASE.jar
+	# spring-jms-3.0.2.RELEASE.jar
+	# spring-orm-3.0.2.RELEASE.jar
+	# spring-oxm-3.0.2.RELEASE.jar
+	# spring-struts-3.0.2.RELEASE.jar
+	# spring-test-3.0.2.RELEASE.jar
+	# spring-tx-3.0.2.RELEASE.jar
+	# spring-webmvc-portlet-3.0.2.RELEASE.jar
+	# spring-webmvc-3.0.2.RELEASE.jar
+	# spring-web-3.0.2.RELEASE.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/toplink
+	pushd "${D}"/${instdir} >/dev/null || die
+	# toplink-essentials-agent.jar
+	# toplink-essentials.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
+}
--- a/dev-libs/grantlee/files/grantlee-0.1.9-qt-test-optional.patch
+++ b/dev-libs/grantlee/files/grantlee-0.1.9-qt-test-optional.patch
@ -0,0 +1,46 @@
+From ab40a1ce4bff38fe6c19931bcdb46cdf754e29ed Mon Sep 17 00:00:00 2001
+From: Johannes Huber <johu@gentoo.org>
+Date: Thu, 22 Mar 2012 11:37:57 +0100
+Subject: [PATCH] Search only for qt-test if test build option is enabled.
+
+Build fails on systems were no qt-test is installed and the build option
+for tests is disabled. See downstream bug report
+https://bugs.gentoo.org/show_bug.cgi?id=409131.
+---
+ templates/CMakeLists.txt    |    6 +++++-
+ textdocument/CMakeLists.txt |    6 +++++-
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/templates/CMakeLists.txt b/templates/CMakeLists.txt
+index 0594cc3..eec0f12 100644
+--- a/templates/CMakeLists.txt
+++ b/templates/CMakeLists.txt
+@@ -1,5 +1,9 @@
+ 
+-find_package(Qt4 4.5.0 REQUIRED QtCore QtScript QtTest)
+if (BUILD_TESTS)
+	find_package(Qt4 4.5.0 REQUIRED QtCore QtScript QtTest)
+else (BUILD_TESTS)
+	find_package(Qt4 4.5.0 REQUIRED QtCore QtScript)
+endif (BUILD_TESTS)
+ 
+ include(${Grantlee_USE_FILE})
+ 
+diff --git a/textdocument/CMakeLists.txt b/textdocument/CMakeLists.txt
+index d456663..8fa2892 100644
+--- a/textdocument/CMakeLists.txt
+++ b/textdocument/CMakeLists.txt
+@@ -1,5 +1,9 @@
+ 
+-find_package(Qt4 4.5.0 REQUIRED QtCore QtGui QtTest)
+if (BUILD_TESTS)
+	find_package(Qt4 4.5.0 REQUIRED QtCore QtScript QtTest)
+else (BUILD_TESTS)
+        find_package(Qt4 4.5.0 REQUIRED QtCore QtScript)
+endif (BUILD_TESTS)
+ 
+ include(${QT_USE_FILE})
+ 
+-- 
+1.7.9.4
+
--- a/dev-libs/grantlee/grantlee-0.1.9.ebuild
+++ b/dev-libs/grantlee/grantlee-0.1.9.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/grantlee/grantlee-0.1.9.ebuild,v 1.2 2012/02/23 16:38:31 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/grantlee/grantlee-0.1.9.ebuild,v 1.3 2012/03/22 11:30:06 johu Exp $

 EAPI=4

@ -22,6 +22,7 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	doc? ( || ( <app-doc/doxygen-1.7.6.1[-nodot] >=app-doc/doxygen-1.7.6.1[dot] ) )
+	test? ( >=x11-libs/qt-test-4.5.0:4 )
 "
 RDEPEND="${COMMON_DEPEND}"

@ -30,6 +31,8 @@ DOCS=(AUTHORS CHANGELOG GOALS README)
 # Some tests fail
 RESTRICT="test"

+PATCHES=( "${FILESDIR}/${P}-qt-test-optional.patch" )
+
 src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_build test TESTS)
--- a/dev-libs/libowfat/files/libowfat-0.28-GNUmakefile.patch
+++ b/dev-libs/libowfat/files/libowfat-0.28-GNUmakefile.patch
@ -0,0 +1,10 @@
+--- GNUmakefile.bak	2011-10-22 22:08:53.443669478 -0700
+++ GNUmakefile	2011-10-22 22:09:27.535002311 -0700
+@@ -277,6 +277,7 @@
+ socket_accept4.o socket_accept6.o socket_connected.o socket_local4.o \
+ socket_local6.o socket_recv4.o socket_recv6.o socket_remote4.o \
+ socket_remote6.o: havesl.h
+socket_remote4.o: havescope.h
+ 
+ dns_nd6.o fmt_xlong.o scan_xlong.o fmt_ip6_flat.o $(TEXTCODE_OBJS): haveinline.h
+ 
--- a/dev-libs/libowfat/libowfat-0.28-r1.ebuild
+++ b/dev-libs/libowfat/libowfat-0.28-r1.ebuild
@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libowfat/libowfat-0.28-r1.ebuild,v 1.7 2012/01/31 22:10:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libowfat/libowfat-0.28-r1.ebuild,v 1.8 2012/03/22 05:52:13 patrick Exp $

 EAPI=2
-inherit flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs eutils

 DESCRIPTION="reimplement libdjb - excellent libraries from Dan Bernstein."
 SRC_URI="http://dl.fefe.de/${P}.tar.bz2"
@ -29,16 +29,17 @@ src_prepare() {
 		-e "s:^prefix.*:prefix=/usr:" \
 		-e "s:^INCLUDEDIR.*:INCLUDEDIR=\${prefix}/include/libowfat:" \
 		-i GNUmakefile || die "sed failed"
+	epatch "${FILESDIR}/libowfat-0.28-GNUmakefile.patch"
 }

 src_compile() {
-	emake \
+	emake -j1 \
 		CC=$(tc-getCC) \
 		$( use diet || echo 'DIET=' )
 }

 src_install () {
-	emake \
+	emake -j1 \
 		LIBDIR="${D}/usr/lib" \
 		MAN3DIR="${D}/usr/share/man/man3" \
 		INCLUDEDIR="${D}/usr/include/libowfat" \
--- a/dev-libs/libtasn1/libtasn1-2.12.ebuild
+++ b/dev-libs/libtasn1/libtasn1-2.12.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtasn1/libtasn1-2.12.ebuild,v 1.1 2012/03/19 21:16:27 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtasn1/libtasn1-2.12.ebuild,v 1.2 2012/03/22 12:04:58 jer Exp $

 EAPI=4

@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"

 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="doc static-libs"

 DEPEND=">=dev-lang/perl-5.6
--- a/dev-libs/nspr/nspr-4.9.ebuild
+++ b/dev-libs/nspr/nspr-4.9.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.9.ebuild,v 1.1 2012/02/26 15:56:17 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.9.ebuild,v 1.2 2012/03/22 13:40:20 ago Exp $

 EAPI=3
 WANT_AUTOCONF="2.1"
@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar

 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug"

 src_prepare() {
--- a/dev-libs/nss/nss-3.13.3.ebuild
+++ b/dev-libs/nss/nss-3.13.3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.13.3.ebuild,v 1.1 2012/03/11 23:53:05 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.13.3.ebuild,v 1.2 2012/03/22 13:39:21 ago Exp $

 EAPI=3
 inherit eutils flag-o-matic multilib toolchain-funcs
@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}

 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="utils"

 DEPEND="dev-util/pkgconfig"
--- a/dev-python/carbon/Manifest
+++ b/dev-python/carbon/Manifest
@ -0,0 +1 @@
+DIST carbon-0.9.9.tar.gz 39813 RMD160 ee4d7cb01bba30ec28155b77808f47d7bbeaa258 SHA1 84f053a6db50056e714db925b800a79cbae0be3a SHA256 b3d42e3b93c09a82646168d7439e25cfc52143d77eba8a1f8ed45e415bb3b5cb
--- a/dev-python/carbon/carbon-0.9.9-r2.ebuild
+++ b/dev-python/carbon/carbon-0.9.9-r2.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/carbon/carbon-0.9.9-r2.ebuild,v 1.1 2012/03/22 07:59:30 patrick Exp $
+
+EAPI="3"
+
+PYTHON_DEPEND="2"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit python distutils
+
+DESCRIPTION="Backend data caching and persistence daemon for Graphite"
+HOMEPAGE="http://graphite.wikidot.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-python/twisted
+	dev-python/txAMQP"
+
+src_prepare() {
+	sed -i -e "s:/opt/graphite:$(python_get_sitedir):" setup.cfg || die "Failed to fix install location"
+
+}
--- a/dev-python/carbon/metadata.xml
+++ b/dev-python/carbon/metadata.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>python</herd>
+</pkgmetadata>
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@ -1,2 +1,3 @@
 DIST SQLAlchemy-0.7.4.tar.gz 2514647 RMD160 93995f5a51ae2ec68e0e81541f824d83d4bc2240 SHA1 28a7d02b5f083d83a6ad4f424e87bd0953ccb6de SHA256 86157a5579dd67cb61600dcab9eb3edebe4cf344fa42e46e8f3edf1890cdfa87
 DIST SQLAlchemy-0.7.5.tar.gz 2562719 RMD160 ee0a566c1774186be516355d82431b79dca148dd SHA1 24006f9e9eabb23782ff15cb9314e5ad00754c45 SHA256 7e31190a15753694dcb6f4399ce7d02091b0bccf825272d6254e56144debfd18
+DIST SQLAlchemy-0.7.6.tar.gz 2597214 RMD160 95355bf8f46b43f658d390692ee17cf18b0a2a99 SHA1 fb8721fdf39e88e138efcca52946a1becd3a4194 SHA256 606a48a2d53ad959043347dec1d9f9cc561d9b66d79f463a7a8fe302058119e5
--- a/dev-python/sqlalchemy/sqlalchemy-0.7.6.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-0.7.6.ebuild
@ -0,0 +1,74 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.7.6.ebuild,v 1.1 2012/03/22 14:29:13 patrick Exp $
+
+EAPI="4"
+SUPPORT_PYTHON_ABIS="1"
+PYTHON_TESTS_RESTRICTED_ABIS="3.* *-jython 2.7-pypy-*"
+
+inherit distutils
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="http://www.sqlalchemy.org/ http://pypi.python.org/pypi/SQLAlchemy"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples firebird mssql mysql postgres +sqlite test"
+
+RDEPEND="dev-python/setuptools
+	firebird? ( dev-python/kinterbasdb )
+	mssql? ( dev-python/pymssql )
+	mysql? ( dev-python/mysql-python )
+	postgres? ( >=dev-python/psycopg-2 )
+	sqlite? (
+		>=dev-db/sqlite-3.3.13
+		|| ( >=dev-lang/python-2.5[sqlite] dev-python/pysqlite )
+	)"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-db/sqlite-3.3.13
+		>=dev-python/nose-0.10.4
+		|| ( >=dev-lang/python-2.5[sqlite] dev-python/pysqlite )
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
+
+DISTUTILS_GLOBAL_OPTIONS=("2.*-cpython --with-cextensions")
+PYTHON_MODNAME="sqlalchemy"
+
+src_prepare() {
+	distutils_src_prepare
+
+	# Disable tests hardcoding function call counts specific to Python versions.
+	rm -fr test/aaa_profiling
+}
+
+src_test() {
+	testing() {
+		PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib*)" "$(PYTHON)" sqla_nose.py
+	}
+	python_execute_function testing
+}
+
+src_install() {
+	distutils_src_install
+
+	if use doc; then
+		pushd doc > /dev/null
+		rm -fr build
+		dohtml -r [a-z]* _images _static
+		popd > /dev/null
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
--- a/dev-python/twisted-conch/Manifest
+++ b/dev-python/twisted-conch/Manifest
@ -1,3 +1,4 @@
 DIST TwistedConch-10.2.0.tar.bz2 205594 RMD160 dba031df442b0ad77ba858796e72b13cffc9966a SHA1 ac558b8c6cc06ca05075f7a108492f560f0e7496 SHA256 521f801336bdab75c6b6ad067da7fa15f2ce24b29a5327c16944a23a300004eb
 DIST TwistedConch-11.0.0.tar.bz2 209673 RMD160 4072da66247d6e2bfbe2852804f97f6f0763f93d SHA1 5a824c9396b37eda0ebc02099b9c5b6a297de8b1 SHA256 a3bd009928b8388928b24fbbb29e1dae6ea092f3a378001f426c6f6302f25504
 DIST TwistedConch-11.1.0.tar.bz2 211556 RMD160 7fcf7833bb9eaf042a5b59999bda0bd689457f9b SHA1 4513bf01d112e740ba091c44c7cd3989da1dc845 SHA256 fa01447d425c7ad97859f5824775a841f279e4b2b1faf6daa6d5b6f0e35da1b5
+DIST TwistedConch-12.0.0.tar.bz2 214365 RMD160 676e27fad36554db7444261449efb2fb161cddc8 SHA1 83c599f440b936458f4488c72df24f5201a6230a SHA256 b66249b32186eb3bc82ef3d2be4165809a625e57aabc4797c4f5cd134d883595
--- a/dev-python/twisted-conch/twisted-conch-12.0.0.ebuild
+++ b/dev-python/twisted-conch/twisted-conch-12.0.0.ebuild
@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-conch/twisted-conch-12.0.0.ebuild,v 1.1 2012/03/22 07:04:01 patrick Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
+MY_PACKAGE="Conch"
+
+inherit twisted versionator
+
+DESCRIPTION="Twisted SSHv2 implementation"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+	dev-python/pyasn1
+	dev-python/pycrypto"
+RDEPEND="${DEPEND}"
+
+PYTHON_MODNAME="twisted/conch twisted/plugins"
+
+src_prepare() {
+	distutils_src_prepare
+
+	if [[ "${EUID}" -eq 0 ]]; then
+		# Disable tests failing with root permissions.
+		sed -e "s/test_checkKeyAsRoot/_&/" -i twisted/conch/test/test_checkers.py
+		sed -e "s/test_getPrivateKeysAsRoot/_&/" -i twisted/conch/test/test_openssh_compat.py
+	fi
+}
--- a/dev-python/twisted-lore/Manifest
+++ b/dev-python/twisted-lore/Manifest
@ -1,3 +1,4 @@
 DIST TwistedLore-10.2.0.tar.bz2 87278 RMD160 3e8312bc37bb74078f5131aa16459c70dad807ee SHA1 ebf28eaf8da0351366e080dce8ea5d23513086f5 SHA256 0775119fb08a2a1161729facd5968e785a04f9520ff31d431b949371aaa061e2
 DIST TwistedLore-11.0.0.tar.bz2 87252 RMD160 2f21c779cdc57816f52f49e32e6533c22e7b62eb SHA1 d549518a072a8bbe7d08895d90bf8459e1ae97c9 SHA256 d9b16d5fe4e20cb2b4259386ed9871824d94dcb9f0b6abe4c2887a366b74c36e
 DIST TwistedLore-11.1.0.tar.bz2 87032 RMD160 1483716d41d584bae7ca0643ba0a67e839c3195d SHA1 1a7c5f45ccbbe2c6d9cd65f8ddea16b730c8c85a SHA256 e602e5e6b6d5131c62dc7a5cbfc79fc69ae7387ee21c02eddb9defcfb960173e
+DIST TwistedLore-12.0.0.tar.bz2 87051 RMD160 9467d7c2781cf00c2c749deb24353eae7d2f8d2b SHA1 c5e011d1fd25836f0ed890cbfb67c8246201192e SHA256 f50442f218ca6103b899732287c8671ebdd63a7564c6d3a443c579f91b3ea0f5
--- a/dev-python/twisted-lore/twisted-lore-12.0.0.ebuild
+++ b/dev-python/twisted-lore/twisted-lore-12.0.0.ebuild
@ -0,0 +1,22 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-lore/twisted-lore-12.0.0.ebuild,v 1.1 2012/03/22 07:04:45 patrick Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+MY_PACKAGE="Lore"
+
+inherit twisted versionator
+
+DESCRIPTION="Twisted documentation system"
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+	=dev-python/twisted-web-$(get_version_component_range 1-2)*"
+RDEPEND="${DEPEND}"
+
+PYTHON_MODNAME="twisted/lore twisted/plugins"
--- a/dev-python/twisted-mail/Manifest
+++ b/dev-python/twisted-mail/Manifest
@ -1,3 +1,4 @@
 DIST TwistedMail-10.2.0.tar.bz2 143601 RMD160 697e86e2055d8fbbd40fbb932e14235553f3bdeb SHA1 41683d0d8c86cbcfeaaaf13d22cb3d31b3321362 SHA256 c9b86d691819bb48d6e580356d52128c824a0926865403569e47cd1687a2af79
 DIST TwistedMail-11.0.0.tar.bz2 145928 RMD160 61f984b2bf94f5334274b66be0323a46b034bff3 SHA1 491466b58c957d492bf2632bf7d2332f465c5c08 SHA256 0f876dd80602294635cf8092260dcdc61f7dec177d75946ed21c557f534c7a8a
 DIST TwistedMail-11.1.0.tar.bz2 146808 RMD160 da72fb43e3300fd82bcc7b5e4a38e69599200cd0 SHA1 85954b9f9b6eeb36fc7be02416e81dc38b99d237 SHA256 843750e356ccb3a6c8ca6fdcc2fced15477adc330a737da33b7dde89467fb64a
+DIST TwistedMail-12.0.0.tar.bz2 146270 RMD160 a48c860155ebf459fc03132227497687f95b623b SHA1 658ec6c0c7c1b2e54e6d468a7af6042d3118233a SHA256 680ec9964c6a75c89c7470dba4d6423d142549b1fcace0ff19fcb58e1fd88c3c
--- a/dev-python/twisted-mail/twisted-mail-12.0.0.ebuild
+++ b/dev-python/twisted-mail/twisted-mail-12.0.0.ebuild
@ -0,0 +1,22 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-mail/twisted-mail-12.0.0.ebuild,v 1.1 2012/03/22 07:05:29 patrick Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+MY_PACKAGE="Mail"
+
+inherit twisted versionator
+
+DESCRIPTION="A Twisted Mail library, server and client"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+	=dev-python/twisted-names-$(get_version_component_range 1-2)*"
+RDEPEND="${DEPEND}"
+
+PYTHON_MODNAME="twisted/mail twisted/plugins"
--- a/dev-python/twisted-names/Manifest
+++ b/dev-python/twisted-names/Manifest
@ -1,3 +1,4 @@
 DIST TwistedNames-10.2.0.tar.bz2 52250 RMD160 3651bcdc21355726aa2ef9a1c863d59eb12ae8c1 SHA1 536cb68e6b1e7b88dcb7bbffc9aca0f3e4ca292a SHA256 309a45de9a6fb7f500ca61fa74ba955cb52f9acc5d94ead9c1f57fd0a7796798
 DIST TwistedNames-11.0.0.tar.bz2 52156 RMD160 255f0a5ddc6f10b2f139ccc039cc45005ad0e0ce SHA1 def35afef9590564c5d9c34977627baf8ce48151 SHA256 738f3e4fa56d2ebeddf0f3774419fbe3de9067424eb928ce234bc178a146d496
 DIST TwistedNames-11.1.0.tar.bz2 54824 RMD160 f0b91cf91f9f3f9ab57596341ffa0d4e3f490861 SHA1 76580e7e7600799e3f76b4a4a1355693d455b18f SHA256 0a4dad2e4190b4e6635fc0dabe8dd40a27a4ccf7d927f5d6d240f5bedaeb3ff3
+DIST TwistedNames-12.0.0.tar.bz2 55023 RMD160 ea44a430a698274bb6d42d9d6051dc2f5954d378 SHA1 ebcbe9fb595cb66c685bcaf036e38f8ea63ea900 SHA256 41b8995d10d210f26433c4311a679356522de47ca48f9caaca47670de8642ad7
--- a/dev-python/twisted-names/twisted-names-12.0.0.ebuild
+++ b/dev-python/twisted-names/twisted-names-12.0.0.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-names/twisted-names-12.0.0.ebuild,v 1.1 2012/03/22 07:06:12 patrick Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+MY_PACKAGE="Names"
+
+inherit twisted versionator
+
+DESCRIPTION="A Twisted DNS implementation"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*"
+RDEPEND="${DEPEND}"
+
+PYTHON_MODNAME="twisted/names twisted/plugins"
--- a/dev-python/twisted-news/Manifest
+++ b/dev-python/twisted-news/Manifest
@ -1,3 +1,4 @@
 DIST TwistedNews-10.2.0.tar.bz2 19276 RMD160 6ac872ff2470f4ef0fed18fc8425c8501c3d269a SHA1 1c4e90957a4c16f643f510a355fbcbad7aedbd24 SHA256 d32e75c44b9c043b94093eefe51a2e6d96ee477036a9edd54c253940f73d3cd6
 DIST TwistedNews-11.0.0.tar.bz2 19289 RMD160 b3e9ea331caf6503274a9dfcae1ce96803d8c520 SHA1 514d1a53e2b1c11ce644991f8ecc5be34172e34f SHA256 8a39fd6c38f89029b6028c15ebc7e29091b62a565b2e52e3ddb4e36d89773cc4
 DIST TwistedNews-11.1.0.tar.bz2 19309 RMD160 cfca1508c471bdd260bc17faf4e022557660b472 SHA1 0e46a044bf433d655f79b15fab5316547e3c14c1 SHA256 ad2a9cfab55702382da6f6cbd69cfca614f958665df771cd963d2c6e47c71677
+DIST TwistedNews-12.0.0.tar.bz2 19333 RMD160 3466958d6f00a07ab3820c3a9c4dac3199bfcaee SHA1 1f9e631bdf47125294c537f8ff2cf739c9d8f5a9 SHA256 0555591e1578175282ce62165a14dee3b9e5c62193f0343e6e05075913dbe7df
--- a/dev-python/twisted-news/twisted-news-12.0.0.ebuild
+++ b/dev-python/twisted-news/twisted-news-12.0.0.ebuild
@ -0,0 +1,22 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-news/twisted-news-12.0.0.ebuild,v 1.1 2012/03/22 07:06:57 patrick Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+MY_PACKAGE="News"
+
+inherit twisted versionator
+
+DESCRIPTION="Twisted News is an NNTP server and programming library."
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+	=dev-python/twisted-mail-$(get_version_component_range 1-2)*"
+RDEPEND="${DEPEND}"
+
+PYTHON_MODNAME="twisted/news twisted/plugins"
--- a/dev-python/twisted-pair/Manifest
+++ b/dev-python/twisted-pair/Manifest
@ -1 +1,2 @@
 DIST TwistedPair-11.1.0.tar.bz2 9141 RMD160 0b2bf17c9d8f56424217585b268f373cace9677b SHA1 2ed7ba27de254f617362d235269081710d82f383 SHA256 a220a0f44ae2a5d9bf29181c931026948cca3a1088a3b0edf4adf1b5aa2b28cf
+DIST TwistedPair-12.0.0.tar.bz2 9154 RMD160 8724f671fd63207a3c23619a9f5d64419051080b SHA1 1b9fb15867b0e927a959650b6178e3055cfcb7bd SHA256 3d3b7e8b764618b0ede57adb72a5affe7de27d858dfb00d81cdd0f49f73106aa
--- a/dev-python/twisted-pair/twisted-pair-12.0.0.ebuild
+++ b/dev-python/twisted-pair/twisted-pair-12.0.0.ebuild
@ -0,0 +1,22 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-pair/twisted-pair-12.0.0.ebuild,v 1.1 2012/03/22 07:07:38 patrick Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+MY_PACKAGE="Pair"
+
+inherit twisted versionator
+
+DESCRIPTION="Twisted low-level networking"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+	dev-python/eunuchs"
+RDEPEND="${DEPEND}"
+
+PYTHON_MODNAME="twisted/pair"
--- a/dev-python/twisted-runner/Manifest
+++ b/dev-python/twisted-runner/Manifest
@ -1,3 +1,4 @@
 DIST TwistedRunner-10.2.0.tar.bz2 13242 RMD160 db6dc15f9156c0c42559b32949e31673e2882b01 SHA1 ed2377aaa419c4778b84b5378ded7339315ecc68 SHA256 4fee1eac86ed8269e180bc759b4e965608690d2717168dbef83d2ea795eea799
 DIST TwistedRunner-11.0.0.tar.bz2 13267 RMD160 9df314da5b532aaa735ef45f73a5ec636ba0fa5d SHA1 673451322c404a88a6afd7d4da9382cd9579b5b0 SHA256 c0f62b4960b9122e898d568cad6afde6ec9c049373e5b1b764f24533582fe3f5
 DIST TwistedRunner-11.1.0.tar.bz2 13210 RMD160 7b8403606456e97b90b263dbb46233e3b95d9f6f SHA1 3f64fa0c0c821d79b45283b73c9663c24c7541ea SHA256 9ca61e1c8f18cd1120db958742602ccb10ae8d257e6ebc9a082f270358a953ac
+DIST TwistedRunner-12.0.0.tar.bz2 13197 RMD160 47296cadbf83b046bde640f2720623dbb2c19b2b SHA1 cc98185e30f20db9b7f6165e5715885f73034531 SHA256 2d6beb51970ba74f24c23971bc82c70dc8c93b9552a6c59c9cb3b3cd45c06ff5
--- a/dev-python/twisted-runner/twisted-runner-12.0.0.ebuild
+++ b/dev-python/twisted-runner/twisted-runner-12.0.0.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-runner/twisted-runner-12.0.0.ebuild,v 1.1 2012/03/22 07:08:35 patrick Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+MY_PACKAGE="Runner"
+
+inherit twisted versionator
+
+DESCRIPTION="Twisted Runner is a process management library and inetd replacement."
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*"
+RDEPEND="${DEPEND}"
+
+PYTHON_MODNAME="twisted/runner"
+
+src_install() {
+	twisted_src_install
+	python_clean_installation_image
+}
--- a/dev-python/twisted-web/Manifest
+++ b/dev-python/twisted-web/Manifest
@ -1,3 +1,4 @@
 DIST TwistedWeb-10.2.0.tar.bz2 334605 RMD160 0f50e064dfba2ad23da0694540c27aaca4a9001a SHA1 9dd268502df217d779e4dafc4fedba9c3a789440 SHA256 d09c459590f23b824043093450916b22a2eea29d1838d69725413a5abb8350ba
 DIST TwistedWeb-11.0.0.tar.bz2 358074 RMD160 429a86bdee1d6a3af8e53d40d33a819ccd33b583 SHA1 2ce185c6ad5d67b0d3e8009e30e18c651bca155c SHA256 864a08aa283ba690f35cfbc18ba939a8b336bc6ad452a2a855bdf1b388aaac53
 DIST TwistedWeb-11.1.0.tar.bz2 373315 RMD160 6a26bf69961dcd1b70cc956a2e8894583234ed5a SHA1 340633e4662cf9d4ea101b0738723b41be6e4373 SHA256 4858e1112b6520c15ca0276569537a1e5ec9da96baca9b9107df77b9e4f5df4d
+DIST TwistedWeb-12.0.0.tar.bz2 374609 RMD160 26d6238168dc2fba298a89f15fee49d3fc0ca57f SHA1 982923ad276c78c2b93f7e26da5340472d3bfea9 SHA256 ff6d0dad12f1928deca23c8d05a0cb9a340abbb6e2cd8bc503e4092a0a873859
--- a/dev-python/twisted-web/twisted-web-12.0.0.ebuild
+++ b/dev-python/twisted-web/twisted-web-12.0.0.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-web/twisted-web-12.0.0.ebuild,v 1.1 2012/03/22 07:09:20 patrick Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+MY_PACKAGE="Web"
+
+inherit twisted versionator
+
+DESCRIPTION="Twisted web server, programmable in Python"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="soap"
+
+DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+	soap? ( dev-python/soappy )"
+RDEPEND="${DEPEND}"
+
+PYTHON_MODNAME="twisted/plugins twisted/web"
+
+src_prepare() {
+	distutils_src_prepare
+
+	if [[ "${EUID}" -eq 0 ]]; then
+		# Disable tests failing with root permissions.
+		sed -e "s/test_forbiddenResource/_&/" -i twisted/web/test/test_static.py
+		sed -e "s/testDownloadPageError3/_&/" -i twisted/web/test/test_webclient.py
+	fi
+}
--- a/dev-python/twisted-words/Manifest
+++ b/dev-python/twisted-words/Manifest
@ -1,3 +1,4 @@
 DIST TwistedWords-10.2.0.tar.bz2 180104 RMD160 480482e35a9e6d53af1ecbe7f3316a0f0098088a SHA1 514673c7f6ed3cd633523dc2a12d96d113d95c48 SHA256 aebd368c3d638208e28873c5b4262afc988e98fbb76076fb55c9d05388951ab5
 DIST TwistedWords-11.0.0.tar.bz2 164453 RMD160 83150aa88b8b5b2e193675a27533d36553db7a47 SHA1 53efd150a46ab2c8d9b33d6748094a9c8b011910 SHA256 574ffbf706be8cc4281f2d64e006d5efa35fdaa611895494453ec9fb80cea8dd
 DIST TwistedWords-11.1.0.tar.bz2 165255 RMD160 22a267e23156fac4874290fdd69efe69704ce8d4 SHA1 53d0fde8504449a1fa5b28cb45b90565b27c329b SHA256 7bd9aecbc888a6a515b1672f31b8555ccdc8eb77490d5da41c8a4c8a00ebfdf8
+DIST TwistedWords-12.0.0.tar.bz2 166475 RMD160 3e2f358171f4a6a50e1a46e455761c0182dc60e9 SHA1 fabe39dde78ac00574cb325a3b2a8280a4b542e9 SHA256 e2027dd8b8cb6e11424d1c9ad6042bb6384dcf710238208de59f3c662d5b00dd
--- a/dev-python/twisted-words/twisted-words-12.0.0.ebuild
+++ b/dev-python/twisted-words/twisted-words-12.0.0.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-words/twisted-words-12.0.0.ebuild,v 1.1 2012/03/22 07:10:05 patrick Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+MY_PACKAGE="Words"
+
+inherit twisted versionator
+
+DESCRIPTION="Twisted Words contains Instant Messaging implementations."
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+	=dev-python/twisted-web-$(get_version_component_range 1-2)*"
+RDEPEND="${DEPEND}"
+
+PYTHON_MODNAME="twisted/plugins twisted/words"
+
+src_prepare() {
+	distutils_src_prepare
+
+	# Delete documentation for no longer available "im" script.
+	rm -fr doc/man
+}
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@ -1,3 +1,4 @@
 DIST TwistedCore-10.2.0.tar.bz2 1359631 RMD160 87b9ec3ca3e06e0a4421c603c9f56437aa2c2400 SHA1 d0dfd2ec562496e32fb3a64cde31647294683af3 SHA256 38e4fa66713a3cb3eae052c5183e492aa4b363e00ffad2af91bf99c0cad538f6
 DIST TwistedCore-11.0.0.tar.bz2 1396224 RMD160 a6c4fcd70472266cfda1d89478c02aafaec38ec4 SHA1 14c15e4eac787744907c2c3192af710d4ffe8a4e SHA256 46ea3d9390ec94a3234589544fc154c48fb5714121362a582db62cd873133f2f
 DIST TwistedCore-11.1.0.tar.bz2 1455613 RMD160 08e056f86a7b9225c43612fcc82e320c444e7ffc SHA1 db62e3df1f8708127de4d7ba5f2c8168b24a2388 SHA256 0041b5c38cd7c40043f64c4aaeb5fcc4631c229776c896cfa188fd2b567fd76d
+DIST TwistedCore-12.0.0.tar.bz2 1394195 RMD160 3b65b1b804ee791827913385209012b317614180 SHA1 1871f93da04b3ead27c30a53ee3baad710f061e9 SHA256 b5414a0da8e18ff97cfcb246fa61fc417dca0d05e5a70eaa6f93f1d095f6cd3f
--- a/dev-python/twisted/twisted-12.0.0.ebuild
+++ b/dev-python/twisted/twisted-12.0.0.ebuild
@ -0,0 +1,102 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-12.0.0.ebuild,v 1.1 2012/03/22 07:03:15 patrick Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+MY_PACKAGE="Core"
+
+inherit eutils twisted versionator
+
+DESCRIPTION="An asynchronous networking framework written in Python"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="crypt gtk serial"
+
+DEPEND="net-zope/zope-interface
+	crypt? ( >=dev-python/pyopenssl-0.10 )
+	gtk? ( dev-python/pygtk:2 )
+	serial? ( dev-python/pyserial )"
+RDEPEND="${DEPEND}"
+
+DOCS="CREDITS NEWS README"
+
+src_prepare(){
+	distutils_src_prepare
+
+	# Give a load-sensitive test a better chance of succeeding.
+	epatch "${FILESDIR}/${PN}-2.1.0-echo-less.patch"
+
+	# Respect TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE variable.
+	epatch "${FILESDIR}/${PN}-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch"
+
+	if [[ "${EUID}" -eq 0 ]]; then
+		# Disable tests failing with root permissions.
+		sed \
+			-e "s/test_newPluginsOnReadOnlyPath/_&/" \
+			-e "s/test_deployedMode/_&/" \
+			-i twisted/test/test_plugin.py
+	fi
+}
+
+src_test() {
+	testing() {
+		local exit_status="0"
+		"$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" install --root="${T}/tests" --no-compile || die "Installation of tests failed with $(python_get_implementation_and_version)"
+
+		pushd "${T}/tests${EPREFIX}$(python_get_sitedir)" > /dev/null || die
+
+		# Skip broken tests.
+		sed -e "s/test_buildAllTarballs/_&/" -i twisted/python/test/test_release.py || die "sed failed"
+
+		# http://twistedmatrix.com/trac/ticket/5375
+		sed -e "/class ZshIntegrationTestCase/,/^$/d" -i twisted/scripts/test/test_scripts.py || die "sed failed"
+
+		# Prevent it from pulling in plugins from already installed twisted packages.
+		rm -f twisted/plugins/__init__.py
+
+		# An empty file doesn't work because the tests check for doc strings in all packages.
+		echo "'''plugins stub'''" > twisted/plugins/__init__.py || die
+
+		if ! PYTHONPATH="." "${T}/tests${EPREFIX}/usr/bin/trial" twisted; then
+			if [[ -n "${TWISTED_DEBUG_TESTS}" ]]; then
+				die "Tests failed with $(python_get_implementation_and_version)"
+			else
+				exit_status="1"
+			fi
+		fi
+
+		popd > /dev/null || die
+		rm -fr "${T}/tests"
+		return "${exit_status}"
+	}
+	python_execute_function testing
+}
+
+src_install() {
+	distutils_src_install
+	python_clean_installation_image
+
+	python_generate_wrapper_scripts -E -f -q "${ED}usr/bin/trial"
+
+	postinstallational_preparation() {
+		touch "${ED}$(python_get_sitedir)/Twisted-${PV}-py$(python_get_version).egg-info"
+
+		# Delete dropin.cache to avoid collisions.
+		# dropin.cache is regenerated in pkg_postinst().
+		rm -f "${ED}$(python_get_sitedir)/twisted/plugins/dropin.cache"
+	}
+	python_execute_function -q postinstallational_preparation
+
+	# Don't install index.xhtml page.
+	doman doc/man/*.?
+	insinto /usr/share/doc/${PF}
+	doins -r $(find doc -mindepth 1 -maxdepth 1 -not -name man)
+
+	newconfd "${FILESDIR}/twistd.conf" twistd
+	newinitd "${FILESDIR}/twistd.init" twistd
+}
--- a/dev-python/txAMQP/Manifest
+++ b/dev-python/txAMQP/Manifest
@ -0,0 +1 @@
+DIST txAMQP-0.4.tar.gz 16444 RMD160 b0afb678890c29762e1ef9e23d1ae631fe667a8b SHA1 40205ce91b75367f5d57afb9fc3f365fd6800a0d SHA256 56353290d19ae246825e66cfe27625afc5cc3ed8ff7693314fef90e338470637
--- a/dev-python/txAMQP/metadata.xml
+++ b/dev-python/txAMQP/metadata.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>python</herd>
+</pkgmetadata>
--- a/dev-python/txAMQP/txAMQP-0.4.ebuild
+++ b/dev-python/txAMQP/txAMQP-0.4.ebuild
@ -0,0 +1,20 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/txAMQP/txAMQP-0.4.ebuild,v 1.1 2012/03/22 07:23:08 patrick Exp $
+
+EAPI="3"
+
+inherit distutils
+
+DESCRIPTION="Python library for communicating with AMQP peers using Twisted"
+HOMEPAGE="https://launchpad.net/txamqp"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+DEPEND="${DEPEND}"
+RDEPEND="${RDEPEND}
+	dev-python/twisted"
--- a/dev-python/whisper/metadata.xml
+++ b/dev-python/whisper/metadata.xml
@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<herd>python</herd>
 	<maintainer>
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
--- a/dev-ruby/mime-types/Manifest
+++ b/dev-ruby/mime-types/Manifest
@ -1 +1,2 @@
 DIST mime-types-1.16.gem 47104 RMD160 051bba2db6c6f1690a928f7c7c7364c6e8160912 SHA1 dc9c8d0eca668c18c21302b439645c20327da3ab SHA256 c393a1cb8d6901e89b2eabc6c1ca2cfd46f3067c78848daf62cfa7ddc53b97ea
+DIST mime-types-1.18.gem 52736 RMD160 47f112efb73b75d473b5212eb024eeae9355eb45 SHA1 a5fee1d398b6ae0563113fa1493315136aeaa8c5 SHA256 f880433aa2aae29df84a6ccb6e58cbf0bc65876571ea5a86906d96f654de4702
--- a/dev-ruby/mime-types/files/mime-types-1.18-linux-tests.patch
+++ b/dev-ruby/mime-types/files/mime-types-1.18-linux-tests.patch
@ -0,0 +1,161 @@
+commit 134cab8ffdbd337bf0b8bb67b5097222f6f15769
+Author: Austin Ziegler <austin@surfeasy.com>
+Date:   Wed Mar 21 20:30:31 2012 -0400
+
+    Fixing issue #8.
+    
+    Apparently some people run the tests on Linux. Imagine that. :)
+
+diff --git a/History.rdoc b/History.rdoc
+index 82daed8..d1ad126 100644
+--- a/History.rdoc
+++ b/History.rdoc
+@@ -1,4 +1,8 @@
+-== MIME::Types 1.18 / 2012-03-20
+== 1.?? / ????-??-??
+* Resolve issue #8 (https://github.com/halostatue/mime-types/issues/8).
+  Apparently some people run the tests on Linux. Imagine that. :)
+
+== 1.18 / 2012-03-20
+ * New MIME Types:
+   * Types reported in Issue #6 (https://github.com/halostatue/mime-types/issues/6):
+     * CoffeeScript (text/x-coffeescript; .coffee; 8bit).
+@@ -13,11 +17,11 @@
+   * It was pointed out that Licence.txt was incorrectly named. Fixed by renaming to Licence.rdoc (from Issue/Pull Request #8, https://github.com/halostatue/mime-types/issues/8).
+   * It was pointed out that a plan to have the test output generated automatically never went through. Issue #10 (https://github.com/halostatue/mime-types/issues/10)
+ 
+-== MIME::Types 1.17.2 / 2011-10-25
+== 1.17.2 / 2011-10-25
+ * Bug Fixes:
+   * Fixed an issue with Ruby 1.9 and file encoding.
+ 
+-== MIME::Types 1.17.1 / 2011-10-23
+== 1.17.1 / 2011-10-23
+ * Minor Enhancements:
+   * Implemented modern 'hoe' semantics.
+   * Switched to minitest instead of test/unit.
+@@ -34,7 +38,7 @@
+   * Made it much easier to update MIME types from this point forward.
+   * Updated MIME types from IANA.
+ 
+-== MIME::Types 1.16
+== 1.16
+ * Made compatible with Ruby 1.8.6, 1.8.7, and 1.9.1.
+ * Switched to the 'hoe' gem system and added a lot of build-time tools.
+ * Updated the MIME types to the list based on the values in the Perl library
+@@ -44,7 +48,7 @@
+   starting soon on MIME::Types 2.x with richer data querying mechanisms
+   and support for external data sources.
+ 
+-== MIME::Types 1.15
+== 1.15
+ * Removed lib/mime/type.rb to form a single MIME::Types database source. It
+   is unlikely that one will ever need MIME::Type without MIME::Types.
+ * Re-synchronized the MIME type list with the sources, focusing primarily on
+@@ -58,7 +62,7 @@
+   priority as of this release. The data format and information has changed.
+ * Removed MIME::Types.by_suffix and MIME::Types.by_mediatype.
+ 
+-== MIME::Types 1.13.1
+== 1.13.1
+ * Fixed a problem with the installer running tests. This now works.
+ * Improved the implementation of MIME::Type.signature?
+ * Moved code around to use the class << self idiom instead of always
+@@ -72,7 +76,7 @@
+   version number to be updated separately from the Perl version while keeping
+   the MIME Type list version in sync.
+ 
+-== MIME::Types 1.13
+== 1.13
+   ! WARNING: This version changes the API of MIME::Types !
+   ! WARNING: This version is compatible with Ruby 1.8 and higher ONLY !
+ * Removed dependency on InstallPackage; offering 1.13 as either .tar.gz or
+@@ -111,22 +115,22 @@
+   exchange between the two projects.
+ * Added additional unit tests from Mark Overmeer's 1.12 version.
+ 
+-== MIME::Types 1.07
+== 1.07
+ * Changed version numbering to match Perl MIME::Types 1.07.
+ * Re-synchronized with Mark Overmeer's list in Perl PMIME::Types 1.07.
+ * [NN Poster] updated the attributes for the PGP types.
+ 
+-== MIME::Types 1.005
+== 1.005
+ * Changed to Phil Thomson's InstallPackage.
+ * Added several types from Perl MIME::Types 1.005.
+ * Cleaned up data format; some data formats will show up with proper data now.
+ 
+-== MIME::Types 1.004
+== 1.004
+ * Updated to match Perl MIME::Types 1.004, links credited to Dan Puro. Adds
+   new reference list to http://www.indiana.edu/cgi-bin-local/mimetypes
+ * Removed InvalidType and replaced with TypeError.
+ * Changed instances of #type to #class.
+ * Cleaned up how simplified versions are created.
+ 
+-== MIME::Types 1.003
+== 1.003
+ * Initial release based on Perl MIME::Types 1.003.
+diff --git a/test/test_mime_type.rb b/test/test_mime_type.rb
+index 4dfa3a4..8e84cc4 100644
+--- a/test/test_mime_type.rb
+++ b/test/test_mime_type.rb
+@@ -2,11 +2,10 @@ $LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../lib") if __FILE__ == $0
+ 
+ require 'mime/types'
+ require 'minitest/autorun'
+-#require 'test/unit' unless defined? $ZENTEST and $ZENTEST
+ 
+ class TestMIME_Type < MiniTest::Unit::TestCase
+   def yaml_mime_type_from_array
+-    MIME::Type.from_array('text/x-yaml', %w(yaml yml), '8bit', 'linux')
+    MIME::Type.from_array('text/x-yaml', %w(yaml yml), '8bit', 'd9d172f608')
+   end
+ 
+   def setup
+@@ -22,7 +21,7 @@ class TestMIME_Type < MiniTest::Unit::TestCase
+   def test_class_from_hash
+     yaml = MIME::Type.from_hash('Content-Type' => 'text/x-yaml',
+                                 'Content-Transfer-Encoding' => '8bit',
+-                                'System' => 'linux',
+                                'System' => 'd9d172f608',
+                                 'Extensions' => %w(yaml yml))
+     assert_instance_of(MIME::Type, yaml)
+     assert_equal('text/yaml', yaml.simplified)
+@@ -247,7 +246,7 @@ class TestMIME_Type < MiniTest::Unit::TestCase
+ 
+   def test_system_equals
+     yaml = yaml_mime_type_from_array
+-    assert_equal(yaml.system, %r{linux})
+    assert_equal(yaml.system, %r{d9d172f608})
+     yaml.system = /win32/
+     assert_equal(yaml.system, %r{win32})
+     yaml.system = nil
+@@ -264,7 +263,7 @@ class TestMIME_Type < MiniTest::Unit::TestCase
+   def test_to_a
+     yaml = yaml_mime_type_from_array
+     assert_equal(yaml.to_a, ['text/x-yaml', %w(yaml yml), '8bit',
+-                 /linux/, nil, nil, nil, false])
+                 /d9d172f608/, nil, nil, nil, false])
+   end
+ 
+   def test_to_hash
+@@ -273,7 +272,7 @@ class TestMIME_Type < MiniTest::Unit::TestCase
+                  { 'Content-Type' => 'text/x-yaml',
+                     'Content-Transfer-Encoding' => '8bit',
+                     'Extensions' => %w(yaml yml),
+-                    'System' => /linux/,
+                    'System' => /d9d172f608/,
+                     'Registered' => false,
+                     'URL' => nil,
+                     'Obsolete' => nil,
+@@ -289,7 +288,7 @@ class TestMIME_Type < MiniTest::Unit::TestCase
+     yaml = MIME::Type.new('text/x-yaml') do |y|
+       y.extensions = %w(yaml yml)
+       y.encoding = '8bit'
+-      y.system = 'linux'
+      y.system = 'd9d172f608'
+     end
+     assert_instance_of(MIME::Type, yaml)
+     assert_raises(MIME::InvalidContentType) { MIME::Type.new('apps') }
--- a/dev-ruby/mime-types/mime-types-1.18.ebuild
+++ b/dev-ruby/mime-types/mime-types-1.18.ebuild
@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mime-types/mime-types-1.18.ebuild,v 1.1 2012/03/22 07:05:04 graaff Exp $
+
+EAPI=2
+
+USE_RUBY="ruby18 ruby19 jruby ree18"
+
+RUBY_FAKEGEM_TASK_DOC="docs"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides a mailcap-like MIME Content-Type lookup for Ruby."
+HOMEPAGE="http://rubyforge.org/projects/mime-types"
+
+LICENSE="Ruby Artistic GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "doc? ( dev-ruby/hoe )
+	test? ( dev-ruby/hoe virtual/ruby-test-unit )"
+
+all_ruby_prepare() {
+	# when rcov is installed, and a new enough Hoe is installed as
+	# well, the Rakefile will fail because Hoe::test_files is no
+	# longer defined. Since we don't use rcov for testing, we just
+	# disable the whole section unconditionally.
+	sed -i -e '/rcovtask/,/end/ s:^:#:' Rakefile || die "Rakefile fix failed"
+
+	epatch "${FILESDIR}/${P}-linux-tests.patch"
+}
--- a/dev-util/monodevelop/monodevelop-2.6.ebuild
+++ b/dev-util/monodevelop/monodevelop-2.6.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/monodevelop/monodevelop-2.6.ebuild,v 1.4 2011/11/05 12:26:49 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/monodevelop/monodevelop-2.6.ebuild,v 1.5 2012/03/22 11:03:18 ssuominen Exp $

 EAPI="4"

@ -25,7 +25,6 @@ RDEPEND="sys-apps/dbus[X]
 	>=dev-dotnet/gnomevfs-sharp-2.24.0
 	>=dev-dotnet/gconf-sharp-2.24.0
 	||	(
-		net-libs/xulrunner
 		www-client/firefox
 		www-client/firefox-bin
 		www-client/seamonkey
--- a/dev-util/monodevelop/monodevelop-2.8.2.ebuild
+++ b/dev-util/monodevelop/monodevelop-2.8.2.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/monodevelop/monodevelop-2.8.2.ebuild,v 1.1 2011/11/23 19:03:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/monodevelop/monodevelop-2.8.2.ebuild,v 1.2 2012/03/22 11:03:18 ssuominen Exp $

 EAPI="4"

@ -25,7 +25,6 @@ RDEPEND="sys-apps/dbus[X]
 	>=dev-dotnet/gnomevfs-sharp-2.24.0
 	>=dev-dotnet/gconf-sharp-2.24.0
 	||	(
-		net-libs/xulrunner
 		www-client/firefox
 		www-client/firefox-bin
 		www-client/seamonkey
--- a/dev-util/monodevelop/monodevelop-2.8.5.1.ebuild
+++ b/dev-util/monodevelop/monodevelop-2.8.5.1.ebuild
@ -1,10 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/monodevelop/monodevelop-2.8.5.1.ebuild,v 1.1 2012/01/22 11:46:27 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/monodevelop/monodevelop-2.8.5.1.ebuild,v 1.2 2012/03/22 11:03:18 ssuominen Exp $

-EAPI="4"
-
-inherit fdo-mime mono multilib gnome2-utils versionator
+EAPI=4
+inherit fdo-mime gnome2-utils mono versionator

 DESCRIPTION="Integrated Development Environment for .NET"
 HOMEPAGE="http://www.monodevelop.com/"
@ -15,48 +14,51 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+subversion +git"

-RDEPEND="sys-apps/dbus[X]
-	>=dev-lang/mono-2.6.1
-	>=virtual/monodoc-2.0
-	>=dev-dotnet/mono-addins-0.6[gtk]
-	>=dev-dotnet/gtk-sharp-2.12.9
+RDEPEND=">=dev-lang/mono-2.6.1
+	>=dev-dotnet/gconf-sharp-2.24.0
 	>=dev-dotnet/glade-sharp-2.12.9
 	>=dev-dotnet/gnome-sharp-2.24.0
 	>=dev-dotnet/gnomevfs-sharp-2.24.0
-	>=dev-dotnet/gconf-sharp-2.24.0
-	||	(
-		net-libs/xulrunner
+	>=dev-dotnet/gtk-sharp-2.12.9
+	>=dev-dotnet/mono-addins-0.6[gtk]
+	>=dev-dotnet/xsp-2
+	dev-util/ctags
+	sys-apps/dbus[X]
+	>=virtual/monodoc-2.0
+	|| (
 		www-client/firefox
 		www-client/firefox-bin
 		www-client/seamonkey
-	)
-	>=dev-dotnet/xsp-2
+		)
 	subversion? ( dev-vcs/subversion )
-	dev-util/ctags
 	!<dev-util/monodevelop-boo-$(get_version_component_range 1-2)
 	!<dev-util/monodevelop-java-$(get_version_component_range 1-2)
 	!<dev-util/monodevelop-database-$(get_version_component_range 1-2)
 	!<dev-util/monodevelop-debugger-gdb-$(get_version_component_range 1-2)
 	!<dev-util/monodevelop-debugger-mdb-$(get_version_component_range 1-2)
 	!<dev-util/monodevelop-vala-$(get_version_component_range 1-2)"
-
 DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-util/pkgconfig
 	sys-devel/gettext
-	x11-misc/shared-mime-info
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.19"
+	x11-misc/shared-mime-info"

 MAKEOPTS="${MAKEOPTS} -j1"

 src_configure() {
-	econf	--disable-update-mimedb				\
-		--disable-update-desktopdb			\
-		--enable-monoextensions				\
-		--enable-gnomeplatform				\
-		$(use_enable subversion)			\
+	econf \
+		--disable-update-mimedb \
+		--disable-update-desktopdb \
+		--enable-monoextensions \
+		--enable-gnomeplatform \
+		$(use_enable subversion) \
 		$(use_enable git)
 }

+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
 pkg_postinst() {
 	gnome2_icon_cache_update
 	fdo-mime_mime_database_update
@ -71,3 +73,9 @@ pkg_postinst() {
 	elog "Read more here:"
 	elog "http://monodevelop.com/"
 }
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+}
--- a/eclass/autotools.eclass
+++ b/eclass/autotools.eclass
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.128 2012/03/21 21:51:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.129 2012/03/22 15:14:53 vapier Exp $

 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@ -294,7 +294,9 @@ eautomake() {
 	done

 	if [[ -z ${makefile_name} ]] ; then
-		if ! grep -qs AM_INIT_AUTOMAKE configure.?? ; then
+		# Really we should just use autotools_check_macro ...
+		local am_init_automake=$(sed -n '/AM_INIT_AUTOMAKE/{s:#.*::;s:\<dnl\>.*::;p}' configure.??)
+		if [[ ${am_init_automake} != *"AM_INIT_AUTOMAKE"* ]] ; then
 			return 0
 		fi

--- a/eclass/texlive-module.eclass
+++ b/eclass/texlive-module.eclass
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/texlive-module.eclass,v 1.60 2011/08/29 01:28:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/texlive-module.eclass,v 1.61 2012/03/22 12:03:54 aballier Exp $

 # @ECLASS: texlive-module.eclass
 # @MAINTAINER:
@ -27,21 +27,17 @@
 # @DESCRIPTION:
 # The list of packages that will be installed. This variable will be expanded to
 # SRC_URI:
-#
-# For TeX Live 2008: foo -> texlive-module-foo-${PV}.tar.lzma
-# For TeX Live 2009: foo -> texlive-module-foo-${PV}.tar.xz
+# foo -> texlive-module-foo-${PV}.tar.xz

 # @ECLASS-VARIABLE: TEXLIVE_MODULE_DOC_CONTENTS
 # @DESCRIPTION:
 # The list of packages that will be installed if the doc useflag is enabled.
-# Expansion to SRC_URI is the same as for TEXLIVE_MODULE_CONTENTS. This is only
-# valid for TeX Live 2008 and later.
+# Expansion to SRC_URI is the same as for TEXLIVE_MODULE_CONTENTS.

 # @ECLASS-VARIABLE: TEXLIVE_MODULE_SRC_CONTENTS
 # @DESCRIPTION:
 # The list of packages that will be installed if the source useflag is enabled.
-# Expansion to SRC_URI is the same as for TEXLIVE_MODULE_CONTENTS. This is only
-# valid for TeX Live 2008 and later.
+# Expansion to SRC_URI is the same as for TEXLIVE_MODULE_CONTENTS.

 # @ECLASS-VARIABLE: TEXLIVE_MODULE_BINSCRIPTS
 # @DESCRIPTION:
@ -68,17 +64,10 @@ COMMON_DEPEND=">=app-text/texlive-core-${TL_PV:-${PV}}"

 IUSE="source"

-# TeX Live 2008 was providing .tar.lzma files of CTAN packages.
-# For 2009 and 2010 they are now .tar.xz
-if [ "${PV#2008}" != "${PV}" ]; then
-	PKGEXT=tar.lzma
-	DEPEND="${COMMON_DEPEND}
-		|| ( app-arch/xz-utils app-arch/lzma-utils )"
-else
-	PKGEXT=tar.xz
-	DEPEND="${COMMON_DEPEND}
-		app-arch/xz-utils"
-fi
+# Starting from TeX Live 2009, upstream provides .tar.xz modules.
+PKGEXT=tar.xz
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils"

 for i in ${TEXLIVE_MODULE_CONTENTS}; do
 	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.${PKGEXT}"
@ -106,8 +95,6 @@ RDEPEND="${COMMON_DEPEND}"

 S="${WORKDIR}"

-if [ "${PV#2008}" = "${PV}" ]; then
-
 # @FUNCTION: texlive-module_src_unpack
 # @DESCRIPTION:
 # Only for TeX Live 2009 and later.
@ -144,8 +131,6 @@ texlive-module_src_unpack() {
 	done
 }

-fi
-
 # @FUNCTION: texlive-module_add_format
 # @DESCRIPTION:
 # Creates/appends to a format.${PN}.cnf file for fmtutil.
@ -278,7 +263,7 @@ texlive-module_src_compile() {
 			AddHyphen)
 				texlive-module_make_language_def_lines "$parameter"
 				texlive-module_make_language_dat_lines "$parameter"
-				[ "${PV#2008}" = "${PV}" -a "${PV#2009}" = "${PV}" ] && texlive-module_make_language_lua_lines "$parameter"
+				texlive-module_make_language_lua_lines "$parameter"
 				;;
 			AddFormat)
 				texlive-module_add_format "$parameter";;
@ -379,8 +364,4 @@ texlive-module_pkg_postrm() {
 	etexmf-update
 }

-if [ "${PV#2008}" != "${PV}" ]; then
-EXPORT_FUNCTIONS src_compile src_install pkg_postinst pkg_postrm
-else
 EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_postinst pkg_postrm
-fi
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.531 2012/03/15 20:18:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.532 2012/03/22 06:07:08 dirtyepic Exp $
 #
 # Maintainer: Toolchain Ninjas <toolchain@gentoo.org>

@ -11,17 +11,15 @@ RESTRICT="strip" # cross-compilers need controlled stripping

 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib fixheadtails pax-utils

-if [[ ${PV} == *9999* ]] ; then
+if [[ ${PV} == *_pre9999* ]] ; then
 	EGIT_REPO_URI="git://gcc.gnu.org/git/gcc.git"
 	# naming style:
-	# gcc-9999 -> master
 	# gcc-4.7.1_pre9999 -> gcc-4_7-branch
-	#  Note that we need the micro version in order for tc_version_is_at_least
-	#  to work.  gcc/BASE-VER also requires it.
-	if [[ ${PV} == *_pre9999* ]] ; then
-		EGIT_BRANCH="${PN}-${PV%.?_pre9999}-branch"
-		EGIT_BRANCH=${EGIT_BRANCH//./_}
-	fi
+	#  Note that the micro version is required or lots of stuff will break.
+	#  To checkout master set gcc_LIVE_BRANCH="master" in the ebuild before
+	#  inheriting this eclass.
+	EGIT_BRANCH="${PN}-${PV%.?_pre9999}-branch"
+	EGIT_BRANCH=${EGIT_BRANCH//./_}
 	inherit git-2
 fi

@ -771,6 +769,8 @@ toolchain_src_unpack() {
 			# BASE-VER must be a three-digit version number
 			# followed by an optional -pre string
 			#   eg. 4.5.1, 4.6.2-pre20120213, 4.7.0-pre9999
+			# If BASE-VER differs from ${PV/_/-} then libraries get installed in
+			# the wrong directory.
 			echo ${PV/_/-} > "${S}"/gcc/BASE-VER
 		fi
 	fi
--- a/eclass/xorg-2.eclass
+++ b/eclass/xorg-2.eclass
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.51 2011/11/01 13:51:05 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.52 2012/03/22 06:57:46 mgorny Exp $

 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@ -37,8 +37,9 @@ if [[ ${PN} == font* \
 	FONT_ECLASS="font"
 fi

-inherit autotools-utils eutils libtool multilib toolchain-funcs flag-o-matic autotools \
-	${FONT_ECLASS} ${GIT_ECLASS}
+# we need to inherit autotools first to get the deps
+inherit autotools autotools-utils eutils libtool multilib toolchain-funcs \
+	flag-o-matic ${FONT_ECLASS} ${GIT_ECLASS}

 EXPORTED_FUNCTIONS="src_unpack src_compile src_install pkg_postinst pkg_postrm"
 case "${EAPI:-0}" in
@ -313,7 +314,6 @@ xorg-2_patch_source() {
 	EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch}

 	[[ -d "${EPATCH_SOURCE}" ]] && epatch
-	autotools-utils_src_prepare "$@"
 }

 # @FUNCTION: xorg-2_reconf_source
@ -325,11 +325,13 @@ xorg-2_reconf_source() {
 	case ${CHOST} in
 		*-interix* | *-aix* | *-winnt*)
 			# some hosts need full eautoreconf
-			[[ -e "./configure.ac" || -e "./configure.in" ]] && eautoreconf || ewarn "Unable to autoreconf the configure script. Things may fail."
+			[[ -e "./configure.ac" || -e "./configure.in" ]] \
+				&& AUTOTOOLS_AUTORECONF=1
 			;;
 		*)
 			# elibtoolize required for BSD
-			[[ ${XORG_EAUTORECONF} != no && ( -e "./configure.ac" || -e "./configure.in" ) ]] && eautoreconf || elibtoolize
+			[[ ${XORG_EAUTORECONF} != no && ( -e "./configure.ac" || -e "./configure.in" ) ]] \
+				&& AUTOTOOLS_AUTORECONF=1
 			;;
 	esac
 }
@ -342,6 +344,7 @@ xorg-2_src_prepare() {

 	xorg-2_patch_source
 	xorg-2_reconf_source
+	autotools-utils_src_prepare "$@"
 }

 # @FUNCTION: xorg-2_font_configure
--- a/games-sports/torcs/files/torcs-1.3.1-libpng15.patch
+++ b/games-sports/torcs/files/torcs-1.3.1-libpng15.patch
@ -1,20 +1,20 @@
 --- a/src/libs/tgfclient/img.cpp
 +++ b/src/libs/tgfclient/img.cpp
@@ -98,7 +98,7 @@
-		return (unsigned char *)NULL;
-	}
-	
+ 		return (unsigned char *)NULL;
+ 	}
+ 	
 -	if (setjmp(png_ptr->jmpbuf))
 +	if (setjmp(png_jmpbuf(png_ptr)))
-	{
-		/* Free all of the memory associated with the png_ptr and info_ptr */
-		png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+ 	{
+ 		/* Free all of the memory associated with the png_ptr and info_ptr */
+ 		png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
@@ -229,7 +229,7 @@
-		return -1;
-	}
-	
+ 		return -1;
+ 	}
+ 	
 -	if (setjmp(png_ptr->jmpbuf)) {    
 +	if (setjmp(png_jmpbuf(png_ptr))) {
-		png_destroy_write_struct(&png_ptr, &info_ptr);
-		fclose(fp);
-		return -1;
+ 		png_destroy_write_struct(&png_ptr, &info_ptr);
+ 		fclose(fp);
+ 		return -1;
--- a/games-sports/torcs/files/torcs-1.3.1-no-automake.patch
+++ b/games-sports/torcs/files/torcs-1.3.1-no-automake.patch
@ -0,0 +1,21 @@
+torcs doesn't use automake, so it shouldn't be calling the macro
+
+http://bugs.gentoo.org/408473
+
+--- a/configure.in
+++ b/configure.in
+@@ -14,9 +14,12 @@
+ #
+ ##############################################################################
+ 
+-AC_INIT(Make-config.in)
+AC_INIT(torcs, 1.3.1)
+ AC_CONFIG_HEADERS(config.h)
+-AM_INIT_AUTOMAKE(torcs, 1.3.1)
+dnl Workaround code using old VERSION instead of new PACKAGE_VERSION
+VERSION=$PACKAGE_VERSION
+AC_DEFINE_UNQUOTED([VERSION], "$VERSION", [old VERSION workaround])
+AC_SUBST(VERSION)
+ 
+ dnl Checks for programs.
+ AC_PROG_CC
--- a/games-sports/torcs/torcs-1.3.1.ebuild
+++ b/games-sports/torcs/torcs-1.3.1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/torcs/torcs-1.3.1.ebuild,v 1.9 2011/05/30 01:57:46 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/torcs/torcs-1.3.1.ebuild,v 1.10 2012/03/22 15:05:44 vapier Exp $

 EAPI=2
 inherit autotools eutils multilib games
@ -29,7 +29,8 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-as-needed.patch \
-		"${FILESDIR}"/${P}-libpng15.patch
+		"${FILESDIR}"/${P}-libpng15.patch \
+		"${FILESDIR}"/${P}-no-automake.patch
 	eautoreconf
 	ecvs_clean
 }
--- a/games-strategy/asc/asc-2.4.0.0.ebuild
+++ b/games-strategy/asc/asc-2.4.0.0.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/asc/asc-2.4.0.0.ebuild,v 1.5 2011/02/28 18:10:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/asc/asc-2.4.0.0.ebuild,v 1.6 2012/03/22 08:12:15 tupone Exp $

 EAPI=2
 WX_GTK_VER=2.8
@ -36,7 +36,8 @@ RDEPEND="app-arch/bzip2
 	dev-libs/libsigc++:1.2"
 DEPEND="${RDEPEND}
 	dev-lang/perl
-	dev-util/pkgconfig"
+	dev-util/pkgconfig
+	app-arch/zip"

 src_unpack() {
 	local f
--- a/mail-client/thunderbird-bin/thunderbird-bin-10.0.3.ebuild
+++ b/mail-client/thunderbird-bin/thunderbird-bin-10.0.3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-10.0.3.ebuild,v 1.1 2012/03/21 18:26:29 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-10.0.3.ebuild,v 1.2 2012/03/22 13:36:33 ago Exp $

 EAPI="4"
 MOZ_ESR="1"
@ -35,7 +35,7 @@ SRC_URI="${SRC_URI}
 HOMEPAGE="http://www.mozilla.com/thunderbird"
 RESTRICT="strip mirror binchecks"

-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
 SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 IUSE="+crashreporter"
--- a/mail-client/thunderbird/thunderbird-10.0.3.ebuild
+++ b/mail-client/thunderbird/thunderbird-10.0.3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-10.0.3.ebuild,v 1.1 2012/03/21 05:24:43 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-10.0.3.ebuild,v 1.2 2012/03/22 13:35:37 ago Exp $

 EAPI="3"
 WANT_AUTOCONF="2.1"
@ -30,7 +30,7 @@ inherit flag-o-matic toolchain-funcs mozconfig-3 makeedit multilib autotools pax
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"

-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 IUSE="bindist gconf +crashreporter +crypt +ipc +lightning +minimal mozdom +webm"
--- a/mail-filter/maildrop/maildrop-2.5.5-r1.ebuild
+++ b/mail-filter/maildrop/maildrop-2.5.5-r1.ebuild
@ -0,0 +1,141 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-2.5.5-r1.ebuild,v 1.1 2012/03/22 07:16:04 eras Exp $
+
+EAPI=4
+
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="Mail delivery agent/filter"
+[[ -z ${PV/?.?/}   ]] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+[[ -z ${PV/?.?.?/} ]] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+[[ -z ${SRC_URI}   ]] && SRC_URI="http://www.courier-mta.org/beta/${PN}/${P%%_pre}.tar.bz2"
+HOMEPAGE="http://www.courier-mta.org/maildrop/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="berkdb debug fam gdbm ldap mysql postgres static-libs authlib +tools trashquota"
+
+CDEPEND="!mail-mta/courier
+	net-mail/mailbase
+	dev-libs/libpcre
+	net-dns/libidn
+	gdbm?     ( >=sys-libs/gdbm-1.8.0 )
+	mysql?    ( net-libs/courier-authlib )
+	postgres? ( net-libs/courier-authlib )
+	ldap?     ( net-libs/courier-authlib )
+	authlib?  ( net-libs/courier-authlib )
+	fam?      ( virtual/fam )
+	!gdbm? (
+		berkdb? ( >=sys-libs/db-3 )
+	)
+	tools? (
+		!mail-mta/netqmail
+		!net-mail/courier-imap
+		!mail-mta/mini-qmail
+	)"
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig"
+RDEPEND="${CDEPEND}
+	dev-lang/perl"
+REQUIRED_USE="mysql? ( authlib )
+			postgres? ( authlib )
+			ldap? ( authlib )"
+
+S=${WORKDIR}/${P%%_pre}
+
+src_prepare() {
+	# Prefer gdbm over berkdb
+	if use gdbm ; then
+		use berkdb && elog "Both gdbm and berkdb selected. Using gdbm."
+	elif use berkdb ; then
+		epatch "${FILESDIR}"/${PN}-2.5.1-db.patch
+	fi
+
+	if ! use fam ; then
+		epatch "${FILESDIR}"/${PN}-1.8.1-disable-fam.patch
+	fi
+
+	# no need to error out if no default - it will be given to econf anyway
+	sed -i -e \
+		's~AC_MSG_ERROR(Cannot determine default mailbox)~SPOOLDIR="./.maildir"~' \
+		"${S}"/maildrop/configure.in || die "sed failed"
+	epatch "${FILESDIR}"/${PN}-testsuite.patch
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	local mytrustedusers="apache dspam root mail fetchmail"
+	mytrustedusers+=" daemon postmaster qmaild mmdf vmail alias"
+
+	# These flags make maildrop cry
+	replace-flags -Os -O2
+	filter-flags -fomit-frame-pointer
+
+	if use gdbm ; then
+		myconf="${myconf} --with-db=gdbm"
+	elif use berkdb ; then
+		myconf="${myconf} --with-db=db"
+	else
+		myconf="${myconf} --without-db"
+	fi
+
+	if ! use mysql && ! use postgres && ! use ldap && ! use authlib ; then
+		myconf="${myconf} --disable-authlib"
+	fi
+
+	# Default mailbox is $HOME/.maildir for Gentoo
+	maildrop_cv_SYS_INSTALL_MBOXDIR="./.maildir" econf \
+		$(use_enable fam) \
+		--disable-dependency-tracker \
+		--with-devel \
+		--disable-tempdir \
+		--enable-syslog=1 \
+		--enable-use-flock=1 \
+		--enable-use-dotlock=1 \
+		--enable-restrict-trusted=1 \
+		--enable-trusted-users="${mytrustedusers}" \
+		--enable-maildrop-uid=root \
+		--enable-maildrop-gid=mail \
+		--enable-sendmail=/usr/sbin/sendmail \
+		--cache-file="${S}"/configuring.cache \
+		$(use_enable static-libs static) \
+		$(use_with trashquota) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	fperms 4755 /usr/bin/maildrop
+
+	dodoc AUTHORS ChangeLog INSTALL NEWS README \
+		README.postfix UPGRADE maildroptips.txt
+	docinto unicode
+	dodoc unicode/README
+	docinto maildir
+	dodoc maildir/AUTHORS maildir/INSTALL maildir/README*.txt
+
+	# bugs #61116 #374009
+	if ! use tools ; then
+		for tool in "maildirmake" "deliverquota"; do
+			rm "${D}/usr/bin/${tool}"
+			rm "${D}/usr/share/man/man"[0-9]"/${tool}."[0-9]
+			rm "${D}/usr/share/maildrop/html/${tool}.html"
+		done
+		rm "${D}/usr/share/man/man5/maildir.5"
+	fi
+
+	dodir "/usr/share/doc/${PF}"
+	mv "${D}/usr/share/maildrop/html" "${D}/usr/share/doc/${PF}/" || die
+	rm -rf "${D}"/usr/share/maildrop
+
+	dohtml *.html maildir/*.html
+
+	insinto /etc
+	doins "${FILESDIR}"/maildroprc
+
+	use static-libs || find "${D}"/usr/lib* -name '*.la' -delete
+}
--- a/mail-filter/maildrop/metadata.xml
+++ b/mail-filter/maildrop/metadata.xml
@ -5,5 +5,6 @@
  <use>
    <flag name="authlib">Add courier-authlib support</flag>
    <flag name="tools">Install maildirmake and deliverquota tools</flag>
+    <flag name="trashquota">Count deleted messages as part of the maildir quota</flag>
  </use>
 </pkgmetadata>
--- a/media-libs/allegro/allegro-4.4.2-r1.ebuild
+++ b/media-libs/allegro/allegro-4.4.2-r1.ebuild
@ -0,0 +1,114 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-4.4.2-r1.ebuild,v 1.1 2012/03/22 12:52:05 ssuominen Exp $
+
+EAPI=2
+CMAKE_IN_SOURCE_BUILD=1
+inherit cmake-utils eutils
+
+DESCRIPTION="cross-platform multimedia library"
+HOMEPAGE="http://alleg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/alleg/${P}.tar.gz"
+
+LICENSE="Allegro as-is GPL-2 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="alsa fbcon jack jpeg opengl oss png svga test vga vorbis X"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )
+	jpeg? ( virtual/jpeg )
+	png? ( media-libs/libpng:0 )
+	svga? ( media-libs/svgalib )
+	vorbis? ( media-libs/libvorbis )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-libs/libXxf86dga
+		x11-libs/libXxf86vm
+		opengl? (
+			virtual/glu
+			virtual/opengl
+		)
+	)"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	X? (
+		x11-proto/xextproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86vidmodeproto
+		x11-proto/xproto
+	)"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-shared.patch \
+		"${FILESDIR}"/${P}-underlink.patch \
+		"${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-rpath.patch
+
+	sed -i \
+		-e "s:allegro-\${ALLEGRO_VERSION}:${PF}:" \
+		docs/CMakeLists.txt || die
+}
+
+src_configure() {
+	# WANT_LINUX_CONSOLE is by default OFF
+	# WANT_EXAMPLES doesn't install anything
+
+	mycmakeargs=(
+		"-DDOCDIR=share/doc"
+		"-DINFODIR=share/info"
+		"-DMANDIR=share/man"
+		$(cmake-utils_use_want alsa)
+		"-DWANT_EXAMPLES=OFF"
+		$(cmake-utils_use_want jack)
+		$(cmake-utils_use_want jpeg JPGALLEG)
+		"-DWANT_LINUX_CONSOLE=OFF"
+		$(cmake-utils_use_want fbcon LINUX_FBCON)
+		$(cmake-utils_use_want svga LINUX_SVGALIB)
+		$(cmake-utils_use_want vga LINUX_VGA)
+		$(cmake-utils_use_want png LOADPNG)
+		$(cmake-utils_use_want vorbis LOGG)
+		$(cmake-utils_use_want oss)
+		$(cmake-utils_use_want test TESTS)
+		$(cmake-utils_use_want X TOOLS)
+		$(cmake-utils_use_want X X11)
+		)
+
+	if use X; then
+		mycmakeargs+=(
+			$(cmake-utils_use_want opengl ALLEGROGL)
+			)
+	else
+		mycmakeargs+=(
+			"-DWANT_ALLEGROGL=OFF"
+			)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	dohtml docs/html/*.html || die
+
+	#176020 (init_dialog.3), #409305 (key.3)
+	pushd docs/man >/dev/null
+	local manpage
+	for manpage in $(ls -d *.3); do
+		newman ${manpage} ${PN}-${manpage} || die
+	done
+	popd >/dev/null
+
+	if use X; then
+		newbin setup/setup ${PN}-setup || die
+		insinto /usr/share/${PN}
+		doins {keyboard,language,setup/setup}.dat || die
+		newicon misc/icon.png ${PN}.png
+		make_desktop_entry ${PN}-setup "Allegro Setup" ${PN} "Settings"
+	fi
+}
--- a/media-libs/id3lib/files/id3lib-3.8.3-security.patch
+++ b/media-libs/id3lib/files/id3lib-3.8.3-security.patch
@ -1,6 +1,7 @@
-diff -ur id3lib-3.8.3.orig/src/tag_file.cpp id3lib-3.8.3/src/tag_file.cpp
--- id3lib-3.8.3.orig/src/tag_file.cpp	2003-03-02 02:23:00.000000000 +0200
-+++ id3lib-3.8.3/src/tag_file.cpp	2007-08-20 19:40:16.000000000 +0300
+http://bugs.gentoo.org/189610
+
+--- src/tag_file.cpp
+++ src/tag_file.cpp
@@ -242,8 +242,8 @@
     strcpy(sTempFile, filename.c_str());
     strcat(sTempFile, sTmpSuffix.c_str());
--- a/media-libs/id3lib/id3lib-3.8.3-r8.ebuild
+++ b/media-libs/id3lib/id3lib-3.8.3-r8.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/id3lib/id3lib-3.8.3-r8.ebuild,v 1.8 2012/02/25 15:06:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/id3lib/id3lib-3.8.3-r8.ebuild,v 1.9 2012/03/22 12:33:36 ssuominen Exp $

 EAPI=4
 inherit autotools eutils
@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="doc"
+IUSE="doc static-libs"

 RDEPEND="sys-libs/zlib"
 DEPEND="${RDEPEND}
@ -20,6 +20,8 @@ DEPEND="${RDEPEND}

 RESTRICT="test"

+DOCS="AUTHORS ChangeLog HISTORY README THANKS TODO"
+
 S=${WORKDIR}/${P/_}

 src_prepare() {
@ -30,24 +32,27 @@ src_prepare() {
 		"${FILESDIR}"/${P}-doxyinput.patch \
 		"${FILESDIR}"/${P}-unicode16.patch \
 		"${FILESDIR}"/${P}-gcc-4.3.patch \
-		"${FILESDIR}"/${P}-missing_nullpointer_check.patch
-
-	# Security fix for bug 189610.
-	epatch "${FILESDIR}"/${P}-security.patch
+		"${FILESDIR}"/${P}-missing_nullpointer_check.patch \
+		"${FILESDIR}"/${P}-security.patch

 	AT_M4DIR="${S}/m4" eautoreconf
 }

+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
 src_compile() {
-	emake
+	default
 	if use doc; then
-		cd doc
+		pushd doc >/dev/null
 		doxygen Doxyfile || die
+		popd >/dev/null
 	fi
 }

 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog HISTORY README THANKS TODO
+	default
+	use static-libs || rm -f "${ED}"/usr/lib*/lib*.la
 	use doc && dohtml -r doc
 }
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`DIST carbon-0.9.9.tar.gz 39813 RMD160 ee4d7cb01bba30ec28155b77808f47d7bbeaa258 SHA1 84f053a6db50056e714db925b800a79cbae0be3a SHA256 b3d42e3b93c09a82646168d7439e25cfc52143d77eba8a1f8ed45e415bb3b5cb`
				`@ -0,0 +1 @@`
				`DIST txAMQP-0.4.tar.gz 16444 RMD160 b0afb678890c29762e1ef9e23d1ae631fe667a8b SHA1 40205ce91b75367f5d57afb9fc3f365fd6800a0d SHA256 56353290d19ae246825e66cfe27625afc5cc3ed8ff7693314fef90e338470637`