Sync with portage [Tue Jun 18 23:12:44 MSK 2013].

2013-06-18 23:12:52 +04:00 · 2013-06-18 23:12:52 +04:00 · cabe83175f
commit cabe83175f
parent 2960eab30f
307 changed files with 4454 additions and 1329 deletions
--- a/app-accessibility/brltty/brltty-4.2-r1.ebuild
+++ b/app-accessibility/brltty/brltty-4.2-r1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.2-r1.ebuild,v 1.3 2012/12/11 14:46:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.2-r1.ebuild,v 1.4 2013/06/18 16:51:25 vapier Exp $

 EAPI="4"
 FINDLIB_USE="ocaml"
@ -14,7 +14,7 @@ SRC_URI="http://mielke.cc/brltty/releases/${P}.tar.gz"

 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu
 		java +learn-mode +midi nls ocaml +pcm python usb +speech
 		tcl X"
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@ -1,2 +1,3 @@
 DIST logrotate-3.8.3.tar.gz 52210 SHA256 0776bf491171edbcc3ba577751fc912e721e99b834c14251df8109fd3bfa1977 SHA512 34bd24a4740191f8a2e3941fbebcade308becc60cb7aca6ccde93662afe8341dbf7d9177dfe1bd4c124b3aa2829d0ad999fa4bba9101e479f077c55b26fe7119 WHIRLPOOL a9bdec35bf6bc6bedf6ecc0245e6b1780fb2a2910b67ba0704d41f4939c12e2aac948e9f4fb43c5ccbd7d5a54c30f12229fff35b4ca884fc0d3f725b62dbf208
 DIST logrotate-3.8.4.tar.gz 55610 SHA256 d363e9212527ada6e566ad04e18d21eb7d70a3bfd0710671c7b75a2c0dd96e29 SHA512 c3a509d8d9140b4a584c9ca731df10d8df17abfd38fc1263d19b2d25560cd047cf2036c7a5ffa738036599f55616b3c73456af63c40ec087672a263e8895aee0 WHIRLPOOL af914183c0f1358f3e9ce06509b922af43bd5a0e9a942a8b3d546b0966540fb27920cf8d61141d50d99f7157ee35e8f90b42fb4765bc5c4bc3400a9c17b1c156
+DIST logrotate-3.8.5.tar.gz 57818 SHA256 6b695bffeb54ed6f6c9a560780231a55c3548a24b96cb06f33b84f8cea600079 SHA512 7548a8a1841eccb28272ca13d7305315c921563486d3a31bda6e53699d450fdaeb819e181c003200042de869f3526b5fdf162dd4a2fe435264027c197d3f5f1c WHIRLPOOL 4491ebde1710c9f37045c6eed7a3191d86e315fb9bc9c43da68c3b1b0049da54d3270f0e38de4b4c08165b383a6909bd93e1a9f199814f7a3154b94e6f466251
--- a/app-admin/logrotate/files/logrotate-3.8.5-atomic-create.patch
+++ b/app-admin/logrotate/files/logrotate-3.8.5-atomic-create.patch
@ -0,0 +1,45 @@
+diff -Nur a/logrotate.c b/logrotate.c
+--- a/logrotate.c	2013-06-10 14:02:36.000000000 +0200
+++ b/logrotate.c	2013-06-18 18:42:28.759999695 +0200
+@@ -300,15 +300,21 @@
+ int createOutputFile(char *fileName, int flags, struct stat *sb, acl_type acl, int force_mode)
+ {
+     int fd;
+-	struct stat sb_create;
+-	int acl_set = 0;
+    int acl_set = 0;
+ 
+-	fd = open(fileName, (flags | O_EXCL | O_NOFOLLOW),
+-		(S_IRUSR | S_IWUSR) & sb->st_mode);
+    struct stat sb_create;
+    char template[PATH_MAX + 1];
+    char *fname;
+    mode_t umask_value;
+    snprintf(template, PATH_MAX, "%s/logrotate_temp.XXXXXX", ourDirName(fileName));
+    umask_value = umask(0000);
+    fname = mktemp(template);
+    fd = open(fname, (flags | O_EXCL | O_NOFOLLOW), (S_IRUSR | S_IWUSR) & sb->st_mode);
+    umask(umask_value);
+ 
+     if (fd < 0) {
+-	message(MESS_ERROR, "error creating output file %s: %s\n",
+-		fileName, strerror(errno));
+        message(MESS_ERROR, "error creating unique temp file: %s\n",
+               strerror(errno));
+ 	return -1;
+     }
+     if (fchmod(fd, (S_IRUSR | S_IWUSR) & sb->st_mode)) {
+@@ -359,6 +365,13 @@
+ 		}
+ 	}
+ 
+    if (rename(template, fileName)) {
+        message(MESS_ERROR, "error renaming temp file to %s: %s\n",
+        fileName, strerror(errno));
+        close(fd);
+        return -1;
+    }
+
+     return fd;
+ }
+ 
--- a/app-admin/logrotate/files/logrotate-3.8.5-datehack.patch
+++ b/app-admin/logrotate/files/logrotate-3.8.5-datehack.patch
@ -0,0 +1,12 @@
+diff -Nur a/logrotate.c b/logrotate.c
+--- a/logrotate.c	2013-06-10 14:02:36.000000000 +0200
+++ b/logrotate.c	2013-06-18 18:34:09.329999708 +0200
+@@ -2035,7 +2035,7 @@
+ 	}
+ 
+ 	/* Hack to hide earlier bug */
+-	if ((year != 1900) && (year < 1996 || year > 2100)) {
+	if ((year != 1900) && (year < 1970 || year > 2100)) {
+ 	    message(MESS_ERROR,
+ 		    "bad year %d for file %s in state file %s\n", year,
+ 		    argv[0], stateFilename);
--- a/app-admin/logrotate/files/logrotate-3.8.5-fbsd.patch
+++ b/app-admin/logrotate/files/logrotate-3.8.5-fbsd.patch
@ -0,0 +1,57 @@
+diff -Nur a/Makefile b/Makefile
+--- a/Makefile	2013-06-10 14:02:36.000000000 +0200
+++ b/Makefile	2013-06-18 18:36:30.899999705 +0200
+@@ -22,7 +22,9 @@
+ 
+ ifeq ($(WITH_ACL),yes)
+ CFLAGS += -DWITH_ACL
+ifneq ($(OS_NAME),FreeBSD)
+ LOADLIBES += -lacl
+endif
+ # See pretest
+ TEST_ACL=1
+ else
+diff -Nur a/config.c b/config.c
+--- a/config.c	2013-06-10 14:02:36.000000000 +0200
+++ b/config.c	2013-06-18 18:37:05.729999704 +0200
+@@ -1,6 +1,6 @@
+ #include <sys/queue.h>
+ /* Alloca is defined in stdlib.h in NetBSD */
+-#ifndef __NetBSD__
+#if !defined(__NetBSD__) && !defined(__FreeBSD__)
+ #include <alloca.h>
+ #endif
+ #include <limits.h>
+@@ -24,6 +24,10 @@
+ #include <fnmatch.h>
+ #include <sys/mman.h>
+ 
+#if !defined(PATH_MAX) && defined(__FreeBSD__)
+#include <sys/param.h>
+#endif
+
+ #include "basenames.h"
+ #include "log.h"
+ #include "logrotate.h"
+diff -Nur a/logrotate.c b/logrotate.c
+--- a/logrotate.c	2013-06-10 14:02:36.000000000 +0200
+++ b/logrotate.c	2013-06-18 18:37:40.499999703 +0200
+@@ -1,6 +1,6 @@
+ #include <sys/queue.h>
+ /* alloca() is defined in stdlib.h in NetBSD */
+-#ifndef __NetBSD__
+#if !defined(__NetBSD__) && !defined(__FreeBSD__)
+ #include <alloca.h>
+ #endif
+ #include <limits.h>
+@@ -43,6 +43,10 @@
+ 
+ static acl_type prev_acl = NULL;
+ 
+#if !defined(PATH_MAX) && defined(__FreeBSD__)
+#include <sys/param.h>
+#endif
+
+ #include "basenames.h"
+ #include "log.h"
+ #include "logrotate.h"
--- a/app-admin/logrotate/files/logrotate-3.8.5-ignore-hidden.patch
+++ b/app-admin/logrotate/files/logrotate-3.8.5-ignore-hidden.patch
@ -0,0 +1,14 @@
+diff -Nur a/config.c b/config.c
+--- a/config.c	2013-06-10 14:02:36.000000000 +0200
+++ b/config.c	2013-06-18 18:35:33.009999706 +0200
+@@ -255,7 +255,9 @@
+ 	char *pattern;
+ 
+ 	/* Check if fname is '.' or '..'; if so, return false */
+-	if (fname[0] == '.' && (!fname[1] || (fname[1] == '.' && !fname[2])))
+	/* Don't include 'hidden' files either; this breaks Gentoo 
+	   portage config file management http://bugs.gentoo.org/87683 */
+	if (fname[0] == '.')
+ 		return 0;
+ 
+ 	/* Check if fname is ending in a taboo-extension; if so, return false */
--- a/app-admin/logrotate/files/logrotate-3.8.5-noasprintf.patch
+++ b/app-admin/logrotate/files/logrotate-3.8.5-noasprintf.patch
@ -0,0 +1,55 @@
+diff -Nur a/config.c b/config.c
+--- a/config.c	2013-06-10 14:02:36.000000000 +0200
+++ b/config.c	2013-06-18 18:39:26.799999700 +0200
+@@ -45,39 +45,6 @@
+ #include "asprintf.c"
+ #endif
+ 
+-#if !defined(asprintf) && !defined(_FORTIFY_SOURCE)
+-#include <stdarg.h>
+-
+-int asprintf(char **string_ptr, const char *format, ...)
+-{
+-	va_list arg;
+-	char *str;
+-	int size;
+-	int rv;
+-
+-	va_start(arg, format);
+-	size = vsnprintf(NULL, 0, format, arg);
+-	size++;
+-	va_start(arg, format);
+-	str = malloc(size);
+-	if (str == NULL) {
+-		va_end(arg);
+-		/*
+-		 * Strictly speaking, GNU asprintf doesn't do this,
+-		 * but the caller isn't checking the return value.
+-		 */
+-		fprintf(stderr, "failed to allocate memory\\n");
+-		exit(1);
+-	}
+-	rv = vsnprintf(str, size, format, arg);
+-	va_end(arg);
+-
+-	*string_ptr = str;
+-	return (rv);
+-}
+-
+-#endif
+-
+ #if !defined(strndup)
+ char *strndup(const char *s, size_t n)
+ {
+diff -Nur a/logrotate.h b/logrotate.h
+--- a/logrotate.h	2013-06-10 14:02:36.000000000 +0200
+++ b/logrotate.h	2013-06-18 18:39:38.149999700 +0200
+@@ -67,8 +67,5 @@
+ extern int debug;
+ 
+ int readAllConfigPaths(const char **paths);
+-#if !defined(asprintf) && !defined(_FORTIFY_SOURCE)
+-int asprintf(char **string_ptr, const char *format, ...);
+-#endif
+ 
+ #endif
--- a/app-admin/logrotate/logrotate-3.8.3.ebuild
+++ b/app-admin/logrotate/logrotate-3.8.3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.8.3.ebuild,v 1.11 2013/01/01 19:29:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.8.3.ebuild,v 1.12 2013/06/18 17:25:26 nimiux Exp $

 EAPI=4

@ -12,7 +12,7 @@ SRC_URI="https://fedorahosted.org/releases/l/o/logrotate/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="acl selinux"

 RDEPEND="
--- a/app-admin/logrotate/logrotate-3.8.4.ebuild
+++ b/app-admin/logrotate/logrotate-3.8.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.8.4.ebuild,v 1.3 2013/06/18 05:11:43 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.8.4.ebuild,v 1.4 2013/06/18 17:25:26 nimiux Exp $

 EAPI=5

@ -12,7 +12,7 @@ SRC_URI="https://fedorahosted.org/releases/l/o/logrotate/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="acl selinux"

 RDEPEND="
--- a/app-admin/logrotate/logrotate-3.8.5.ebuild
+++ b/app-admin/logrotate/logrotate-3.8.5.ebuild
@ -0,0 +1,70 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.8.5.ebuild,v 1.2 2013/06/18 17:25:26 nimiux Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="Rotates, compresses, and mails system logs"
+HOMEPAGE="https://fedorahosted.org/logrotate/"
+SRC_URI="https://fedorahosted.org/releases/l/o/logrotate/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="acl selinux"
+
+RDEPEND="
+	>=dev-libs/popt-1.5
+	selinux? (
+		sys-libs/libselinux
+		sec-policy/selinux-logrotate
+	)
+	acl? ( virtual/acl )"
+
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-datehack.patch \
+		"${FILESDIR}"/${P}-ignore-hidden.patch \
+		"${FILESDIR}"/${P}-fbsd.patch \
+		"${FILESDIR}"/${P}-noasprintf.patch \
+		"${FILESDIR}"/${P}-atomic-create.patch
+}
+
+src_compile() {
+	local myconf
+	myconf="CC=$(tc-getCC)"
+	use selinux && myconf="${myconf} WITH_SELINUX=yes"
+	use acl && myconf="${myconf} WITH_ACL=yes"
+	emake ${myconf} RPM_OPT_FLAGS="${CFLAGS}"
+}
+
+src_install() {
+	insinto /usr
+	dosbin logrotate
+	doman logrotate.8
+	dodoc CHANGES examples/logrotate*
+
+	exeinto /etc/cron.daily
+	newexe "${S}"/examples/logrotate.cron "${PN}"
+
+	insinto /etc
+	doins "${FILESDIR}"/logrotate.conf
+
+	keepdir /etc/logrotate.d
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "If you wish to have logrotate e-mail you updates, please"
+		elog "emerge virtual/mailx and configure logrotate in"
+		elog "/etc/logrotate.conf appropriately"
+		elog
+		elog "Additionally, /etc/logrotate.conf may need to be modified"
+		elog "for your particular needs.  See man logrotate for details."
+	fi
+}
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@ -1,2 +1,7 @@
+DIST puppet-2.7.21-CVE-2013-3567.patch 185961 SHA256 33fe47facdd5b8c32e8fc870c70733a76fd6b1df7e9f320d1ba7de3b78aa835b SHA512 53f71e7dbd313d06a90af357f9b1cf4f9ef0f0b4f7b3da0fde2d4ba38394dbd1dbff9efc1a71bc999689efb0b1bc1489d9650e79ce3088039624eea6d222737a WHIRLPOOL 5daab2075a39556b7b34ed477ad6bd6e369eb7f7d5ddaa75e10f8fbb067e2b5aa0464fa64129bf97c94182b142d5874fa2ee5ccfa7a5f61ee9add1542f05c09a
 DIST puppet-2.7.21.gem 2031616 SHA256 a5eecdbe68cde5ebfd576a9af5ddb0c8c17dae224a7d0b3ec240ef54e6bd88a1 SHA512 638c188b945791fe86c1657343f9d7ec3ef7e86342c35e03dacfae4e99e63d8c09160dd1faf840f244b275e6a0aea3b969668debe9dc1b60cef68cb2513068b5 WHIRLPOOL a4bcb4181e57bda6aaf79fdd484903114e94dcf5196105203538d6d8a1bfefcd6db44f74cbef1c209b086d7b2bfab53d62069da1be034e6c35fe686fd00898bc
+DIST puppet-2.7.21.tar.gz 1998848 SHA256 c18b426457d023e87745f0a98b7dd257f8e94722b5b0d3cafb6048ef2499273f SHA512 ec5db3b829e146741ebbbde0e5f8128dd0f372dee1216bef8df36f5ac371332e1d0a37e0d6ff45a8e82ca762945060ce33cb9b65e835e243705e8c56ca0f3fc5 WHIRLPOOL 6576248721bdea18871004884c4191288b354bc56fa159ce51c3014a5bb798e00c90f390df73373f12dd227430394f47be1d4daceed27f8dc7356e037a725729
+DIST puppet-2.7.22.tar.gz 2023230 SHA256 bfd79c0aecdeea4e1a8573e9325fbcb48778603d908180e88897458f01fe06de SHA512 534f40d57e57d6b16fbac6e097cccc888e12cda648f9fa8fb74e4add9be49c1733d488d13375a712e9f160d8ccfb314d4f48ee7e604388cfd5456750a2627c94 WHIRLPOOL e5a7a773a5af2dd222c5726c3dbe3a622ed60c148dc0fc88fc7568ad3f1d422a08f49a6d5f5592b218418163526fc7effe48168309024232137919e11ac40a11
+DIST puppet-3.1.1-CVE-2013-3567.patch 177845 SHA256 48b8998182a6d84fcf10847183feefb4b198b8421bd46d82fb8c45577bc0c5f7 SHA512 fe3e8ad8fecf374b9ebe67f38bc49980891121134fee560d7c2e5c43d8ccda772b4ec5b26f69c0928eb35804eb47fdb29654b065b997cc8f5c190fc3e2cca7f8 WHIRLPOOL bc93d1958b2c31d76a0f5b3fb0a33224e6304b72a0875e1ca3de0516212dccf44b760899ffbc29ed179be741560ff7b16516f5b7b65cd6f6a45414edd4eedda8
 DIST puppet-3.1.1.tar.gz 1587190 SHA256 4401f6388bb96b1301a107f247af6fa558127d78467bb5cef1a1e0ff66b4463d SHA512 48759776b68f83a125a0c703ecc9ad3efe34f10e6cfd9ddcd9e596ff082c9f40bdb7e0489bf7eb0bb0ce8bdb4ad0ae87049d2ad3133e839d0a5a6caa8419074e WHIRLPOOL d7152ba5397edadba9784f3c1800c8cf31ddd547691b35567ad52a42e82e741256326d2ee0bccec0642e82f533ffb74babcaddf3a0ee54361626b875cc618b2f
+DIST puppet-3.2.2.tar.gz 1784340 SHA256 c47745aa73912b2cb1a20b07e8741b8af37a920b9bc8dc8afb14b23d8df7d13d SHA512 e794aa7632a03ff4e6c9b96d577c0c17b096d95ecd840473c43ddba1ea403ecf76652cb99ca2976d3d932be3305d9413cb7c9ac3435ac9ecb118f2eaa2c2974a WHIRLPOOL 8873ff2e32b778e171d7910c6b84b12a23b9f952a565455fc2949c2359e8b65005b57987345a7719409fbb5e5a3393162d01b94ba337ce0538d656d76e9ee5bb
--- a/app-admin/puppet/puppet-2.7.21-r1.ebuild
+++ b/app-admin/puppet/puppet-2.7.21-r1.ebuild
@ -0,0 +1,182 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.7.21-r1.ebuild,v 1.1 2013/06/18 17:32:57 prometheanfire Exp $
+
+EAPI="4"
+USE_RUBY="ruby18 ruby19"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST="test"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG* README*"
+
+inherit elisp-common xemacs-elisp-common eutils ruby-fakegem user
+
+DESCRIPTION="A system automation and configuration management software"
+HOMEPAGE="http://puppetlabs.com/"
+SRC_URI="http://www.puppetlabs.com/downloads/puppet/${P}.tar.gz
+		https://dev.gentoo.org/~prometheanfire/dist/patches/CVEs/puppet-2.7.21-CVE-2013-3567.patch"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite3 vim-syntax xemacs"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+
+ruby_add_rdepend "
+	>=dev-ruby/facter-1.5.6
+	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	sqlite3? ( dev-ruby/sqlite3 )
+	virtual/ruby-ssl"
+#	couchdb? ( dev-ruby/couchrest )
+#	mongrel? ( www-servers/mongrel )
+#	rack? ( >=dev-ruby/rack-1 )
+#	rails? (
+#		dev-ruby/rails
+#		>=dev-ruby/activerecord-2.1
+#	)
+#	stomp? ( dev-ruby/stomp )
+
+DEPEND="${DEPEND}
+	ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
+	emacs? ( virtual/emacs )
+	xemacs? ( app-editors/xemacs )
+	selinux? ( sec-policy/selinux-puppet )"
+RDEPEND="${RDEPEND}
+	ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
+	emacs? ( virtual/emacs )
+	xemacs? ( app-editors/xemacs )
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	>=app-portage/eix-0.18.0"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+RUBY_PATCHES=( "${DISTDIR}/puppet-2.7.21-CVE-2013-3567.patch" )
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use emacs ; then
+		elisp-compile ext/emacs/puppet-mode.el
+	fi
+
+	if use xemacs ; then
+		# Create a separate version for xemacs to be able to install
+		# emacs and xemacs in parallel.
+		mkdir ext/xemacs
+		cp ext/emacs/* ext/xemacs/
+		xemacs-elisp-compile ext/xemacs/puppet-mode.el
+	fi
+}
+
+each_fakegem_install() {
+	${RUBY} install.rb --destdir="${D}" install
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	newinitd "${FILESDIR}"/puppet.init-r1 puppet
+	doconfd conf/gentoo/conf.d/puppet
+
+	# Initial configuration files
+	insinto /etc/puppet
+	# Bug #338439
+	#doins conf/gentoo/puppet/*
+	doins conf/redhat/puppet.conf
+
+	# Location of log and data files
+	keepdir /var/{run,log}/puppet
+	fowners -R puppet:puppet /var/{run,log}/puppet
+
+	if use minimal ; then
+		rm "${ED}/usr/bin/puppetmasterd"
+		rm "${ED}/etc/puppet/auth.conf"
+	else
+		newinitd "${FILESDIR}"/puppetmaster.init puppetmaster
+		newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+
+		insinto /etc/puppet
+		doins conf/redhat/fileserver.conf
+
+		keepdir /etc/puppet/manifests
+		keepdir /etc/puppet/modules
+
+		keepdir /var/lib/puppet/ssl
+		keepdir /var/lib/puppet/facts
+		keepdir /var/lib/puppet/files
+		fowners -R puppet:puppet /var/{run,log,lib}/puppet
+	fi
+
+	if use emacs ; then
+		elisp-install ${PN} ext/emacs/puppet-mode.el*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use xemacs ; then
+		xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
+		xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use ldap ; then
+		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/ftdetect; doins ext/vim/ftdetect/puppet.vim
+		insinto /usr/share/vim/vimfiles/syntax; doins ext/vim/syntax/puppet.vim
+	fi
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"; dodoc "${f}"
+	done
+	docinto conf; dodoc conf/namespaceauth.conf
+}
+
+pkg_postinst() {
+	elog
+	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+	elog "cause puppet to hang while installing packages."
+	elog
+	elog "Puppet uses eix to get information about currently installed packages,"
+	elog "so please keep the eix metadata cache updated so puppet is able to properly"
+	elog "handle package installations."
+	elog
+	elog "Currently puppet only supports adding and removing services to the default"
+	elog "runlevel, if you want to add/remove a service from another runlevel you may"
+	elog "do so using symlinking."
+	elog
+
+	if [ \
+		-f "${EPREFIX}/etc/puppet/puppetd.conf" -o \
+		-f "${EPREFIX}/etc/puppet/puppetmaster.conf" -o \
+		-f "${EPREFIX}/etc/puppet/puppetca.conf" \
+	] ; then
+		elog
+		elog "Please remove deprecated config files."
+		elog "	/etc/puppet/puppetca.conf"
+		elog "	/etc/puppet/puppetd.conf"
+		elog "	/etc/puppet/puppetmasterd.conf"
+		elog
+	fi
+
+	use emacs && elisp-site-regen
+	use xemacs && xemacs-elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use xemacs && xemacs-elisp-site-regen
+}
--- a/app-admin/puppet/puppet-2.7.22.ebuild
+++ b/app-admin/puppet/puppet-2.7.22.ebuild
@ -0,0 +1,181 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.7.22.ebuild,v 1.1 2013/06/18 17:32:57 prometheanfire Exp $
+
+EAPI="4"
+USE_RUBY="ruby18 ruby19"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST="test"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG* README*"
+
+inherit elisp-common xemacs-elisp-common eutils ruby-fakegem user
+
+DESCRIPTION="A system automation and configuration management software"
+HOMEPAGE="http://puppetlabs.com/"
+SRC_URI="http://www.puppetlabs.com/downloads/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite3 vim-syntax xemacs"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+
+ruby_add_rdepend "
+	>=dev-ruby/facter-1.5.6
+	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	sqlite3? ( dev-ruby/sqlite3 )
+	virtual/ruby-ssl"
+#	couchdb? ( dev-ruby/couchrest )
+#	mongrel? ( www-servers/mongrel )
+#	rack? ( >=dev-ruby/rack-1 )
+#	rails? (
+#		dev-ruby/rails
+#		>=dev-ruby/activerecord-2.1
+#	)
+#	stomp? ( dev-ruby/stomp )
+
+DEPEND="${DEPEND}
+	ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
+	emacs? ( virtual/emacs )
+	xemacs? ( app-editors/xemacs )
+	selinux? ( sec-policy/selinux-puppet )"
+RDEPEND="${RDEPEND}
+	ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
+	emacs? ( virtual/emacs )
+	xemacs? ( app-editors/xemacs )
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	>=app-portage/eix-0.18.0"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+RUBY_PATCHES=(  )
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use emacs ; then
+		elisp-compile ext/emacs/puppet-mode.el
+	fi
+
+	if use xemacs ; then
+		# Create a separate version for xemacs to be able to install
+		# emacs and xemacs in parallel.
+		mkdir ext/xemacs
+		cp ext/emacs/* ext/xemacs/
+		xemacs-elisp-compile ext/xemacs/puppet-mode.el
+	fi
+}
+
+each_fakegem_install() {
+	${RUBY} install.rb --destdir="${D}" install
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	newinitd "${FILESDIR}"/puppet.init-r1 puppet
+	doconfd conf/gentoo/conf.d/puppet
+
+	# Initial configuration files
+	insinto /etc/puppet
+	# Bug #338439
+	#doins conf/gentoo/puppet/*
+	doins conf/redhat/puppet.conf
+
+	# Location of log and data files
+	keepdir /var/{run,log}/puppet
+	fowners -R puppet:puppet /var/{run,log}/puppet
+
+	if use minimal ; then
+		rm "${ED}/usr/bin/puppetmasterd"
+		rm "${ED}/etc/puppet/auth.conf"
+	else
+		newinitd "${FILESDIR}"/puppetmaster.init puppetmaster
+		newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+
+		insinto /etc/puppet
+		doins conf/redhat/fileserver.conf
+
+		keepdir /etc/puppet/manifests
+		keepdir /etc/puppet/modules
+
+		keepdir /var/lib/puppet/ssl
+		keepdir /var/lib/puppet/facts
+		keepdir /var/lib/puppet/files
+		fowners -R puppet:puppet /var/{run,log,lib}/puppet
+	fi
+
+	if use emacs ; then
+		elisp-install ${PN} ext/emacs/puppet-mode.el*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use xemacs ; then
+		xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
+		xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use ldap ; then
+		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/ftdetect; doins ext/vim/ftdetect/puppet.vim
+		insinto /usr/share/vim/vimfiles/syntax; doins ext/vim/syntax/puppet.vim
+	fi
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"; dodoc "${f}"
+	done
+	docinto conf; dodoc conf/namespaceauth.conf
+}
+
+pkg_postinst() {
+	elog
+	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+	elog "cause puppet to hang while installing packages."
+	elog
+	elog "Puppet uses eix to get information about currently installed packages,"
+	elog "so please keep the eix metadata cache updated so puppet is able to properly"
+	elog "handle package installations."
+	elog
+	elog "Currently puppet only supports adding and removing services to the default"
+	elog "runlevel, if you want to add/remove a service from another runlevel you may"
+	elog "do so using symlinking."
+	elog
+
+	if [ \
+		-f "${EPREFIX}/etc/puppet/puppetd.conf" -o \
+		-f "${EPREFIX}/etc/puppet/puppetmaster.conf" -o \
+		-f "${EPREFIX}/etc/puppet/puppetca.conf" \
+	] ; then
+		elog
+		elog "Please remove deprecated config files."
+		elog "	/etc/puppet/puppetca.conf"
+		elog "	/etc/puppet/puppetd.conf"
+		elog "	/etc/puppet/puppetmasterd.conf"
+		elog
+	fi
+
+	use emacs && elisp-site-regen
+	use xemacs && xemacs-elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use xemacs && xemacs-elisp-site-regen
+}
--- a/app-admin/puppet/puppet-3.1.1-r3.ebuild
+++ b/app-admin/puppet/puppet-3.1.1-r3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-3.1.1.ebuild,v 1.1 2013/03/13 17:38:32 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-3.1.1-r3.ebuild,v 1.1 2013/06/18 17:32:57 prometheanfire Exp $

 EAPI="4"

@ -10,7 +10,8 @@ inherit elisp-common xemacs-elisp-common eutils user ruby-ng versionator

 DESCRIPTION="A system automation and configuration management software"
 HOMEPAGE="http://puppetlabs.com/"
-SRC_URI="http://www.puppetlabs.com/downloads/puppet/${P}.tar.gz"
+SRC_URI="http://www.puppetlabs.com/downloads/puppet/${P}.tar.gz
+		https://dev.gentoo.org/~prometheanfire/dist/patches/CVEs/puppet-3.1.1-CVE-2013-3567.patch"

 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
@ -44,6 +45,9 @@ RDEPEND="${RDEPEND}

 SITEFILE="50${PN}-mode-gentoo.el"

+RUBY_PATCHES=( "${DISTDIR}/puppet-3.1.1-CVE-2013-3567.patch"
+				"${FILESDIR}/puppet-openrc-status-fix.patch" )
+
 pkg_setup() {
 	enewgroup puppet
 	enewuser puppet -1 -1 /var/lib/puppet puppet
@ -80,7 +84,7 @@ all_ruby_install() {
 	if use minimal ; then
 		rm "${ED}/etc/puppet/auth.conf"
 	else
-		newinitd "${FILESDIR}"/puppetmaster.init puppetmaster
+		newinitd "${FILESDIR}"/puppetmaster.init-r1 puppetmaster
 		newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster

 		insinto /etc/puppet
--- a/app-admin/puppet/puppet-3.1.1-r2.ebuild
+++ b/app-admin/puppet/puppet-3.1.1-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-3.1.1-r2.ebuild,v 1.1 2013/06/07 21:07:41 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-3.2.2.ebuild,v 1.1 2013/06/18 17:32:57 prometheanfire Exp $

 EAPI="4"

--- a/app-editors/nano/nano-2.3.2.ebuild
+++ b/app-editors/nano/nano-2.3.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-2.3.2.ebuild,v 1.2 2013/05/01 22:08:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-2.3.2.ebuild,v 1.3 2013/06/18 12:36:32 jer Exp $

 EAPI="3"

@ -18,7 +18,7 @@ HOMEPAGE="http://www.nano-editor.org/ http://www.gentoo.org/doc/en/nano-basics-g

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug justify +magic minimal ncurses nls slang spell unicode"

 RDEPEND=">=sys-libs/ncurses-5.9-r1[unicode?]
--- a/app-emulation/virtualbox-additions/virtualbox-additions-4.1.24.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-4.1.24.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.1.24.ebuild,v 1.3 2013/02/14 13:27:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.1.24.ebuild,v 1.4 2013/06/18 12:09:58 polynomial-c Exp $

 EAPI=2

@ -13,7 +13,7 @@ DESCRIPTION="CD image containing guest additions for VirtualBox"
 HOMEPAGE="http://www.virtualbox.org/"
 SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.iso"

-LICENSE="PUEL"
+LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
--- a/app-emulation/virtualbox-additions/virtualbox-additions-4.1.26.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-4.1.26.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.1.26.ebuild,v 1.3 2013/05/23 17:56:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.1.26.ebuild,v 1.4 2013/06/18 12:09:58 polynomial-c Exp $

 EAPI=2

@ -13,7 +13,7 @@ DESCRIPTION="CD image containing guest additions for VirtualBox"
 HOMEPAGE="http://www.virtualbox.org/"
 SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.iso"

-LICENSE="PUEL"
+LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
--- a/app-emulation/virtualbox-additions/virtualbox-additions-4.2.10.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-4.2.10.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.2.10.ebuild,v 1.1 2013/03/15 15:39:38 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.2.10.ebuild,v 1.2 2013/06/18 12:09:58 polynomial-c Exp $

 EAPI=2

@ -15,7 +15,7 @@ DESCRIPTION="CD image containing guest additions for VirtualBox"
 HOMEPAGE="http://www.virtualbox.org/"
 SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"

-LICENSE="PUEL"
+LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
--- a/app-emulation/virtualbox-additions/virtualbox-additions-4.2.12.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-4.2.12.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.2.12.ebuild,v 1.1 2013/04/13 20:31:58 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.2.12.ebuild,v 1.2 2013/06/18 12:09:58 polynomial-c Exp $

 EAPI=2

@ -15,7 +15,7 @@ DESCRIPTION="CD image containing guest additions for VirtualBox"
 HOMEPAGE="http://www.virtualbox.org/"
 SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"

-LICENSE="PUEL"
+LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.24.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.24.ebuild
@ -1,13 +1,13 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.24.ebuild,v 1.3 2013/02/14 13:27:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.24.ebuild,v 1.4 2013/06/18 12:19:35 polynomial-c Exp $

 EAPI=2

 inherit eutils linux-mod user

 MY_P=VirtualBox-${PV}
-DESCRIPTION="VirtualBox kernel modules and user-space tools for Linux guests"
+DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
 HOMEPAGE="http://www.virtualbox.org/"
 SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"

--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.26.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.26.ebuild
@ -1,13 +1,13 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.26.ebuild,v 1.3 2013/05/23 17:56:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.26.ebuild,v 1.4 2013/06/18 12:19:35 polynomial-c Exp $

 EAPI=2

 inherit eutils linux-mod user

 MY_P=VirtualBox-${PV}
-DESCRIPTION="VirtualBox kernel modules and user-space tools for Linux guests"
+DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
 HOMEPAGE="http://www.virtualbox.org/"
 SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"

--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.10.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.10.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.10.ebuild,v 1.1 2013/03/15 15:42:31 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.10.ebuild,v 1.2 2013/06/18 12:19:35 polynomial-c Exp $

 EAPI=2

@ -9,7 +9,7 @@ inherit eutils linux-mod user
 MY_PV="${PV/beta/BETA}"
 MY_PV="${PV/rc/RC}"
 MY_P=VirtualBox-${MY_PV}
-DESCRIPTION="VirtualBox kernel modules and user-space tools for Linux guests"
+DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
 HOMEPAGE="http://www.virtualbox.org/"
 SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"

--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.12.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.12.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.12.ebuild,v 1.2 2013/04/27 09:15:09 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.12.ebuild,v 1.3 2013/06/18 12:19:35 polynomial-c Exp $

 EAPI=2

@ -9,7 +9,7 @@ inherit eutils linux-mod systemd user
 MY_PV="${PV/beta/BETA}"
 MY_PV="${PV/rc/RC}"
 MY_P=VirtualBox-${MY_PV}
-DESCRIPTION="VirtualBox kernel modules and user-space tools for Linux guests"
+DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
 HOMEPAGE="http://www.virtualbox.org/"
 SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"

--- a/app-forensics/openscap/Manifest
+++ b/app-forensics/openscap/Manifest
@ -1,3 +1,2 @@
-DIST openscap-0.9.1.tar.gz 10744598 SHA256 4601ffd6c1b5d0e9025e49db194f2e7f7d7fef1826981bb212ef543c28e94fe6 SHA512 0ead581b8801b3cd1a0af20d746a766d8c56f58013be49c390df152001bb721a81445d5e683fac50c19071340ab78ff068161bff7d76d67e15e62dfdc50d88aa WHIRLPOOL 966c6604591dfb3d10eaad793c2348b5a4ae0a813fdcdfdf8ebf22f9cb471181bfcd3e0455acda16fe6d358c704067e92584a054fe88b1a8fd2743614af8428a
-DIST openscap-0.9.3.tar.gz 11928497 SHA256 0aa482fa4a22493ec3d5987fd8c86d5124a94675f5cbdd6aac1cb86f14402acd SHA512 75f5d958d04c290a3a8458a4a21956da6f5d337c85ab6da1b246bb13cfbcf376e811f55f16b70c7a3d3c73ae27cb7ab01242bc472556218a116c562c162464fd WHIRLPOOL f46c317c95d5d33f995f4498707d315cf7f38f3be7960efcc9e460b94979290cb783907c6f8b26c436a6152b7d3ca58059b0e2e4382d2be75352dc17232665b2
 DIST openscap-0.9.4.1.tar.gz 12012752 SHA256 9f80ba69482eb9a5ec0f08491fde3d5963c84441576fa5ede4fcc707d6166059 SHA512 8a91e5249c52a7174e03faa8bf347b6e39cb7330ec9aec5c6413d22b654a964c2f6861bc781e1e358bd62eafbd56562bbe980b18bf472b9645003f17fdc39c99 WHIRLPOOL b4b6beae40d60e8852b9a68ab2421a837d3139c6ea598c7e5b6355690178f1f85d88bece9cfd81d2a09fe177361ddd529d83ba1aced67bc87ad4e19d08cbae98
+DIST openscap-0.9.8.tar.gz 12688640 SHA256 977fd8a0196c3dce727b9b166777385565a7c5001ca4ef20bb024d12dcb53af2 SHA512 35a221cde33d3295a0dfb59422aa276a6d307621d45920fa70d6ad056ab84ad94953f060b22c6e0dc0738e2e0694ec66f514c36b8cb178ffd5ca3639ffd8ab94 WHIRLPOOL ec952d10dab5cada7f01cf82224be7858c730a66545c05ad7148c20e2e62f6ac8d5aaaeac67d67038df8a6ab3a0290e1e9c76ee53748e485de0bbd41b5c281fc
--- a/app-forensics/openscap/files/openscap-0.7.1-sql-fix.patch
+++ b/app-forensics/openscap/files/openscap-0.7.1-sql-fix.patch
@ -1,26 +0,0 @@
-X-Git-Url: http://git.fedorahosted.org/git/?p=openscap.git;a=blobdiff_plain;f=src%2FOVAL%2Fprobes%2Findependent%2Fsql.c;h=ad7988c60ec344fa721e28b8aca59b9690cabbac;hp=0eb18a9a7cd0c03d3923c2b724eea23791e4ff25;hb=9eeceaecde0718cf28ffc8a672923f4f16b63c6a;hpb=dfad8e4db009182a3a2c3c2ba79563feefb09ada
-
-diff --git a/src/OVAL/probes/independent/sql.c b/src/OVAL/probes/independent/sql.c
-index 0eb18a9..ad7988c 100644
--- a/src/OVAL/probes/independent/sql.c
-+++ b/src/OVAL/probes/independent/sql.c
-@@ -242,8 +242,8 @@ __fail:
- 	return (-1);
- }
- 
-static SEXP_t *dbSQL_eval(const char *engine, const char *version,
-			  const char *conn, const char *sql, SEXP_t *probe_out)
-+static int dbSQL_eval(const char *engine, const char *version,
-+                      const char *conn, const char *sql, SEXP_t *probe_out)
- {
- 	int err = -1;
- 	dbURIInfo_t uriInfo = { .host = NULL,
-@@ -350,7 +350,7 @@ __exit:
- 	return (err);
- }
- 
-int probe_main(SEXP_t *probe_in, SEXP_t *probe_out, void *arg)
-+int probe_main(SEXP_t *probe_in, SEXP_t *probe_out, void *arg, SEXP_t *filters)
- {
- 	char       *engine, *version, *conn, *sqlexp;
- 	int err;
--- a/app-forensics/openscap/files/openscap-0.9.3-policy.patch
+++ b/app-forensics/openscap/files/openscap-0.9.3-policy.patch
@ -1,23 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=450328
--- src/XCCDF_POLICY/xccdf_policy.c.orig	2012-12-14 18:13:18.000000000 +0800
-+++ src/XCCDF_POLICY/xccdf_policy.c	2013-01-07 22:31:10.417704932 +0800
-@@ -389,8 +389,8 @@
-         __attribute__nonnull__(policy);
-         __attribute__nonnull__(item);
- 
-	static bool TRUE = true;
-	static bool FALSE = false;
-+	static bool TRUE2 = true;
-+	static bool FALSE2 = false;
- 	bool result;
- 
- 	oscap_htable_detach(policy->selected_final, xccdf_item_get_id(item));
-@@ -408,7 +408,7 @@
- 		xccdf_item_iterator_free(child_it);
- 	}
- 
-	assume_ex(oscap_htable_add(policy->selected_final, xccdf_item_get_id(item), result ? &TRUE : &FALSE), NULL);
-+	assume_ex(oscap_htable_add(policy->selected_final, xccdf_item_get_id(item), result ? &TRUE2 : &FALSE2), NULL);
- }
- 
- /**
--- a/app-forensics/openscap/files/test_probes_interface.patch
+++ b/app-forensics/openscap/files/test_probes_interface.patch
@ -1,11 +0,0 @@
--- tests/probes/interface/test_probes_interface.sh.orig	2012-04-05 14:41:53.846540789 +0200
-+++ tests/probes/interface/test_probes_interface.sh	2012-04-05 14:42:41.141285232 +0200
-@@ -22,6 +22,8 @@
-     local DF="test_probes_interface.xml"
-     local RF="results.xml"
- 
-+    require "ipcalc" || return 255
-+
-     [ -f $RF ] && rm -f $RF
- 
-     if [ ! -x test_probes_interface ]; then		
--- a/app-forensics/openscap/files/test_probes_process.patch
+++ b/app-forensics/openscap/files/test_probes_process.patch
@ -1,10 +0,0 @@
--- tests/probes/process/test_probes_process.xml.sh.orig	2012-04-05 15:49:38.746901398 +0200
-+++ tests/probes/process/test_probes_process.xml.sh	2012-04-05 15:50:02.330775903 +0200
-@@ -1,6 +1,6 @@
- #!/usr/bin/env bash
- 
-TMP_P=(`LD_PRELOAD= ps -A -o pid -o ppid -o comm | awk '$1 != 2 && $2 != 2 {print $3}' | \
-+TMP_P=(`LD_PRELOAD= ps -A -o pid -o ppid -o comm | grep -iE '^[a-z0-9A-Z \-]*$' |grep -vE 'cron|grep' | awk '$1 != 2 && $2 != 2 {print $3}' | \
-         sed -n '2,30p'`)
- 
- COUNTER=1
--- a/app-forensics/openscap/openscap-0.9.1.ebuild
+++ b/app-forensics/openscap/openscap-0.9.1.ebuild
@ -1,114 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-0.9.1.ebuild,v 1.1 2012/10/25 17:16:04 hwoarang Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-
-inherit eutils multilib python bash-completion-r1
-
-DESCRIPTION="Framework which enables integration with the Security Content Automation Protocol (SCAP)"
-HOMEPAGE="http://www.open-scap.org/"
-SRC_URI="https://fedorahosted.org/releases/o/p/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion doc nss perl python rpm selinux sql test"
-#RESTRICT="test"
-
-RDEPEND="!nss? ( dev-libs/libgcrypt )
-	nss? ( dev-libs/nss )
-	rpm? ( >=app-arch/rpm-4.9 )
-	sql? ( dev-db/opendbx )
-	dev-libs/libpcre
-	dev-libs/libxml2
-	dev-libs/libxslt
-	net-misc/curl"
-DEPEND="${RDEPEND}
-	perl? ( dev-lang/swig )
-	python? ( dev-lang/swig )
-	test? (
-		app-arch/unzip
-		dev-perl/XML-XPath
-		net-misc/ipcalc
-		sys-apps/grep )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	sed -i 's/uname -p/uname -m/' tests/probes/uname/test_probes_uname.xml.sh || die
-
-	#probe runlevel for non-centos/redhat/fedora is not implemted
-	sed -i 's,.*runlevel_test,#&,' tests/mitre/test_mitre.sh || die
-	sed -i 's,probecheck "runlevel,probecheck "runlevellllll,' tests/probes/runlevel/test_probes_runlevel.sh || die
-
-	#According to comment of theses tests, we must modify it. For the moment disable it
-	sed -i 's,.*linux-def_inetlisteningservers_test,#&,' tests/mitre/test_mitre.sh || die
-	sed -i 's,.*ind-def_environmentvariable_test,#&,' tests/mitre/test_mitre.sh || die
-
-	#This test fail when testing process with [] in names https://fedorahosted.org/openscap/ticket/47
-	epatch "${FILESDIR}"/test_probes_process.patch || die
-
-	# theses tests are hardcoded for checking hald process...,
-	# but no good solution for the moment, disabling them with a fake echo
-	# because encased in a if then
-#	sed -i 's,ha.d,/sbin/udevd --daemon,g' tests/mitre/unix-def_process_test.xml || die
-#	sed -i 's,ha.d,/sbin/udevd --daemon,g' tests/mitre/unix-def_process58_test.xml || die
-	sed -i 's,.*process_test.*,echo "",' tests/mitre/test_mitre.sh || die
-	sed -i 's,.*process58_test.*,echo "",' tests/mitre/test_mitre.sh || die
-
-	if ! use rpm ; then
-		sed -i 's,probe_rpminfo_req_deps_ok=yes,probe_rpminfo_req_deps_ok=no,' configure || die
-		sed -i 's,probe_rpminfo_opt_deps_ok=yes,probe_rpminfo_opt_deps_ok=no,' configure || die
-		sed -i 's,probe_rpmverify_req_deps_ok=yes,probe_rpmverify_req_deps_ok=no,' configure || die
-		sed -i 's,probe_rpmverify_opt_deps_ok=yes,probe_rpmverify_opt_deps_ok=no,' configure || die
-		sed -i 's,^probe_rpm.*_deps_missing=,&disabled by USE flag,' configure || die
-		sed -i 's,.*rpm.*,#&,' tests/mitre/test_mitre.sh || die
-	fi
-	if ! use selinux ; then
-		sed -i 's,.*selinux.*,#&,' tests/mitre/test_mitre.sh || die
-		#process58 need selinux
-		sed -i 's,.*process58,#&,' tests/mitre/test_mitre.sh || die
-	fi
-}
-
-src_configure() {
-	local myconf
-	if use python || use perl ; then
-		myconf+=" --enable-bindings"
-	else
-		myconf+=" --disable-bindings"
-	fi
-	if use nss ; then
-		myconf+=" --with-crypto=nss3"
-	else
-		myconf+=" --with-crypto=gcrypt"
-	fi
-	econf ${myconf}
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	find "${D}" -name '*.la' -delete || die
-	sed -i 's/^Description/&:/' "${D}"/usr/$(get_libdir)/pkgconfig/libopenscap.pc || die
-	#--enable-bindings enable all bindings, clean unwanted bindings
-	if use python && ! use perl ; then
-		rm -rf "${D}"/usr/$(get_libdir)/perl5 || die
-	fi
-	if ! use python && use perl ; then
-		rm -rf "${D}"/$(python_get_sitedir) || die
-	fi
-	if use doc ; then
-		dohtml -r docs/html/* || die
-		dodoc docs/examples/* || die
-	fi
-	if use bash-completion ; then
-		dobashcomp "${D}"/etc/bash_completion.d/oscap
-	fi
-	rm -rf "${D}"/etc/bash_completion.d || die
-}
--- a/app-forensics/openscap/openscap-0.9.3-r1.ebuild
+++ b/app-forensics/openscap/openscap-0.9.3-r1.ebuild
@ -1,111 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-0.9.3-r1.ebuild,v 1.1 2013/01/30 18:43:25 hwoarang Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-
-inherit eutils multilib python bash-completion-r1
-
-DESCRIPTION="Framework which enables integration with the Security Content Automation Protocol (SCAP)"
-HOMEPAGE="http://www.open-scap.org/"
-SRC_URI="https://fedorahosted.org/releases/o/p/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion doc nss perl python rpm selinux sql test"
-#RESTRICT="test"
-
-RDEPEND="!nss? ( dev-libs/libgcrypt )
-	nss? ( dev-libs/nss )
-	rpm? ( >=app-arch/rpm-4.9 )
-	sql? ( dev-db/opendbx )
-	dev-libs/libpcre
-	dev-libs/libxml2
-	dev-libs/libxslt
-	net-misc/curl"
-DEPEND="${RDEPEND}
-	perl? ( dev-lang/swig )
-	python? ( dev-lang/swig )
-	test? (
-		app-arch/unzip
-		dev-perl/XML-XPath
-		net-misc/ipcalc
-		sys-apps/grep )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	sed -i 's/uname -p/uname -m/' tests/probes/uname/test_probes_uname.xml.sh || die
-
-	#probe runlevel for non-centos/redhat/fedora is not implemented
-	sed -i 's,.*runlevel_test.*,echo "runlevel test bypassed",' tests/mitre/test_mitre.sh || die
-	sed -i 's,probecheck "runlevel,probecheck "runlevellllll,' tests/probes/runlevel/test_probes_runlevel.sh || die
-
-	#According to comment of theses tests, we must modify it. For the moment disable it
-	sed -i 's,.*linux-def_inetlisteningservers_test,#&,' tests/mitre/test_mitre.sh || die
-	sed -i 's,.*ind-def_environmentvariable_test,#&,' tests/mitre/test_mitre.sh || die
-
-	# theses tests are hardcoded for checking hald process...,
-	# but no good solution for the moment, disabling them with a fake echo
-	# because encased in a if then
-#	sed -i 's,ha.d,/sbin/udevd --daemon,g' tests/mitre/unix-def_process_test.xml || die
-#	sed -i 's,ha.d,/sbin/udevd --daemon,g' tests/mitre/unix-def_process58_test.xml || die
-	sed -i 's,.*process_test.*,echo "process test bypassed",' tests/mitre/test_mitre.sh || die
-	sed -i 's,.*process58_test.*,echo "process58 test bypassed",' tests/mitre/test_mitre.sh || die
-
-	#This test fail
-	sed -i 's,.*generate report: xccdf,#&,' tests/API/XCCDF/unittests/all.sh ||	die
-
-	if ! use rpm ; then
-		sed -i 's,probe_rpminfo_req_deps_ok=yes,probe_rpminfo_req_deps_ok=no,' configure || die
-		sed -i 's,probe_rpminfo_opt_deps_ok=yes,probe_rpminfo_opt_deps_ok=no,' configure || die
-		sed -i 's,probe_rpmverify_req_deps_ok=yes,probe_rpmverify_req_deps_ok=no,' configure || die
-		sed -i 's,probe_rpmverify_opt_deps_ok=yes,probe_rpmverify_opt_deps_ok=no,' configure || die
-		sed -i 's,^probe_rpm.*_deps_missing=,&disabled by USE flag,' configure || die
-		sed -i 's,.*rpm.*,#&,' tests/mitre/test_mitre.sh || die
-	fi
-	if ! use selinux ; then
-		sed -i 's,.*selinux.*,	echo "SELinux test bypassed",' tests/mitre/test_mitre.sh || die
-		#process58 need selinux
-		sed -i 's,.*process58,#&,' tests/mitre/test_mitre.sh || die
-	fi
-	#450328
-	epatch "${FILESDIR}"/${P}-policy.patch
-}
-
-src_configure() {
-	local myconf
-	if use python ; then
-		myconf+=" --enable-python"
-	else
-		myconf+=" --enable-python=no"
-	fi
-	if use perl ; then
-		myconf+=" --enable-perl"
-	fi
-	if use nss ; then
-		myconf+=" --with-crypto=nss3"
-	else
-		myconf+=" --with-crypto=gcrypt"
-	fi
-	econf ${myconf}
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	find "${D}" -name '*.la' -delete || die
-	if use doc ; then
-		dohtml -r docs/html/* || die
-		dodoc docs/examples/* || die
-	fi
-	if use bash-completion ; then
-		dobashcomp "${D}"/etc/bash_completion.d/oscap
-	fi
-	rm -rf "${D}"/etc/bash_completion.d || die
-}
--- a/app-forensics/openscap/openscap-0.9.8.ebuild
+++ b/app-forensics/openscap/openscap-0.9.8.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-0.9.3.ebuild,v 1.1 2013/01/04 22:48:07 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-0.9.8.ebuild,v 1.1 2013/06/18 10:38:18 xmw Exp $

 EAPI=3

@ -15,11 +15,12 @@ SRC_URI="https://fedorahosted.org/releases/o/p/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion doc nss perl python rpm selinux sql test"
+IUSE="bash-completion doc ldap nss perl python rpm selinux sql test"
 #RESTRICT="test"

 RDEPEND="!nss? ( dev-libs/libgcrypt )
 	nss? ( dev-libs/nss )
+	ldap? ( net-nds/openldap )
 	rpm? ( >=app-arch/rpm-4.9 )
 	sql? ( dev-db/opendbx )
 	dev-libs/libpcre
@ -41,6 +42,8 @@ pkg_setup() {
 }

 src_prepare() {
+	sed -i 's,^    bash,    LC_ALL=C bash,' tests/probes/process/test_probes_process.sh || die
+
 	sed -i 's/uname -p/uname -m/' tests/probes/uname/test_probes_uname.xml.sh || die

 	#probe runlevel for non-centos/redhat/fedora is not implemented
@ -67,14 +70,21 @@ src_prepare() {
 		sed -i 's,probe_rpminfo_opt_deps_ok=yes,probe_rpminfo_opt_deps_ok=no,' configure || die
 		sed -i 's,probe_rpmverify_req_deps_ok=yes,probe_rpmverify_req_deps_ok=no,' configure || die
 		sed -i 's,probe_rpmverify_opt_deps_ok=yes,probe_rpmverify_opt_deps_ok=no,' configure || die
-		sed -i 's,^probe_rpm.*_deps_missing=,&disabled by USE flag,' configure || die
+		sed -i 's,^probe_rpm.*_deps_missing=,&disabled_by_USE_flag,' configure || die
 		sed -i 's,.*rpm.*,#&,' tests/mitre/test_mitre.sh || die
 	fi
 	if ! use selinux ; then
+		einfo "Disabling SELinux probes"
 		sed -i 's,.*selinux.*,	echo "SELinux test bypassed",' tests/mitre/test_mitre.sh || die
 		#process58 need selinux
 		sed -i 's,.*process58,#&,' tests/mitre/test_mitre.sh || die
 	fi
+	if ! use ldap; then
+		einfo "Disabling LDAP probes"
+		sed -i 's,ldap.h,ldapp.h,g' configure || die
+	fi
+
+	epatch_user
 }

 src_configure() {
--- a/dev-lang/mercury-extras/mercury-extras-13.05.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-13.05.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-13.05.ebuild,v 1.1 2013/06/03 07:45:21 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-13.05.ebuild,v 1.2 2013/06/18 09:36:05 keri Exp $

 EAPI=2

@ -104,8 +104,8 @@ src_compile() {
 	mmake \
 		-j1 depend || die "mmake depend failed"

-	mmake \
-		MMAKEFLAGS="${MAKEOPTS}" \
+	# Compiling Mercury submodules is not thread-safe
+	mmake -j1 \
 		EXTRA_MLFLAGS=--no-strip \
 		EXTRA_LDFLAGS="${LDFLAGS}" \
 		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
@ -113,8 +113,8 @@ src_compile() {
 }

 src_install() {
-	mmake \
-		MMAKEFLAGS="${MAKEOPTS}" \
+	# Compiling Mercury submodules is not thread-safe
+	mmake -j1 \
 		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
 		INSTALL_PREFIX="${D}"/usr \
 		install || die "mmake install failed"
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@ -3,6 +3,6 @@ DIST pl-6.2.6.tar.gz 14407455 SHA256 9412f0753a61c30dbcf1afac01fe7c9168002854709
 DIST pl-6.3.15.tar.gz 14587314 SHA256 a52c108dfb3731778a9a55cc85a725857385b23ca2c4cf3f0bf7610b6112b7f6 SHA512 45110c4bbc4d30822c3b54870d644ac253af8fc6aac3e2e841ce26f825597417c22bbebd3feaed38baa1101a5a179ff7c4edefe0d22193dc07ac191ea6e2ab9c WHIRLPOOL fbabd29d494c1ef752e52864d8b526403502d7b20954d5c1f483ea2c279d6be040b8b631df2444126f476a3edf5b2be195b564fa464f5f565d1824db08f71173
 DIST pl-6.3.16.tar.gz 14671853 SHA256 7a4912aa0697f9de20ec0347cbd9f4ff3f16b22f0d4a8281668a5828443d9624 SHA512 8d40e10d70b14fa08317bad26e5077f72a0aa4c095ad00e6092fc8a228606fe2dd7cef1795a4d6e35be19d65352af54433bc1d1fd5fdf5dedefab8e281bd1ff3 WHIRLPOOL 7ceb05ffcf420ee3ba43f94cdae4beadf4e202ae6007b109fd32a80dc14ea25c57858b0d7bc4f6ec84e0b72a3acfe17242f8cc5f9916c84e8c25daf1fa677f51
 DIST swi-prolog-6.2.5-gentoo-patchset-1.tar.gz 2692 SHA256 c4e59e4240effb3383465997020e4056e5967aa4f9bcf0b010a564d1f49bbd71 SHA512 2f31fae8df581931bee3b38bee1687f9fb12567a9f267a01eba5dd011377cea05b3249df942c4b719bb0c2f7cfb86c5665794948083c3090a6854b04fb25ac4e WHIRLPOOL 49685d66ee2ec6ad4a654356bb6d290d8bd81e79c42241786c235d610493b78583cfb2c44be4b20ba49f49891d9da69b90bf5b5c0f9fc59f272c20ff6475c204
-DIST swi-prolog-6.2.6-gentoo-patchset-0.tar.gz 2701 SHA256 9ab62cb8b19816af66adb4b52344ca59449210a6413c08c9edaf4e3fa5cdf3ad SHA512 a0c5961fd3ceb1e8ee59be6a03bd801fa95ecede3eba41d9b66682e39095e532207e87029c13aaa0e8cb90c03e96e6e41889e433b3627df9b864adad9f45851b WHIRLPOOL eafe59ebc256ccef608b635cf8559866e38f0c52667dac96f984ce1fe195de636176fa8f9653d882a87b6619dd56e0019c01efbd413bfbcb48d457dcfb46fac6
+DIST swi-prolog-6.2.6-gentoo-patchset-1.tar.gz 2978 SHA256 eeadd8b3a518aa1378cadc8bb58ff906a84a07b286f460cb0863ac57606d5a36 SHA512 5dbcc2969bbb6def055ae3dceb4bf1a78a862963dc40d34c2028a88021bb4b3eb1426cd042ff723414eee9d1ebe1083b381176720e6948ed49c107b5da7b3d01 WHIRLPOOL 6ec46782ffa2973a8fb3660dfdad7dd98d7e1bdd033a34132cb503dd6e3c9d0d09b551d03e42db09b0d83714fe988582bb18f674366863c7c85999df90aef63c
 DIST swi-prolog-6.3.15-gentoo-patchset-0.tar.gz 1917 SHA256 6d0af71debe017cbbec545b884e57d9326f7e32d9d1e98954bf45c32b841260d SHA512 73a955e975ec19ab3f93a98e0fbee9c61203934f07bbd3aaa9e877e82b2ba6b60930b6d6f6786b3a2247b8ae7c0368cdddf7f83d16809f240aa34aa37baf9a57 WHIRLPOOL cce4e5c3170aa94a737c64bb82d0303a37dd7eb8cf0c34d0e69f9b07deeee89668270da8576b37987cd31545f7bbefde1fe4fca6449a36eddb113015c526b445
 DIST swi-prolog-6.3.16-gentoo-patchset-0.tar.gz 1914 SHA256 0a66ead5d85e2b3520fe2c30175ae554edfb9a6a8850ba0a45396b786141faad SHA512 481d44c1621c60675d5b7667f4303d6207eb63f5d61f0664a1dedf52b03eb3cbd1082e26a0ce182441f04405d4591ba5a27528d897e19c62f27ea0e4e6b8b4f3 WHIRLPOOL 4ac8f192bb60bf56f43f0d3177a91da203bc205a61b912a0be2cceeae7519254a454359a50bfd3b65119f3114a6a519e44e7d770d0dafc8ba96bc0e1c8fc9cb2
--- a/dev-lang/swi-prolog/swi-prolog-6.2.6.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-6.2.6.ebuild
@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-6.2.6.ebuild,v 1.1 2013/01/14 09:47:59 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-6.2.6.ebuild,v 1.2 2013/06/18 11:29:36 keri Exp $

 EAPI=4

 inherit eutils flag-o-matic java-pkg-opt-2 multilib

-PATCHSET_VER="0"
+PATCHSET_VER="1"

 DESCRIPTION="free, small, and standard compliant Prolog compiler"
 HOMEPAGE="http://www.swi-prolog.org/"
--- a/dev-libs/libedit/Manifest
+++ b/dev-libs/libedit/Manifest
@ -2,3 +2,4 @@ DIST libedit-20090923-3.0.tar.gz 466724 SHA256 6aca4e63d27148514a40be5bd59305914
 DIST libedit-20100424-3.0.tar.gz 442438 SHA256 602b385906b6057f52922afc42cafbceadd8bae4be43c9189ea7fa870a561d86 SHA512 0f7215ba7d6ae3c136622cccb9f3b0f691930f6d17f165c5167b24c74b28f76b7b98d52c747dffd89c0564784bbb628c6d6f6ddc344b3d3bbdca60ae8a35e85f WHIRLPOOL 65973b997a2bf532cf3a1715906317a75c88177870d11af83b0df9a2cb9da233d270b1e603af65ea18f5fa199556d76f039f20446787113bcbd5a0920495fdb4
 DIST libedit-20110709-3.0.tar.gz 445609 SHA256 6ab965dbb0020644e40f2f09c79711c46184a355734c70986ba21294deabe1e9 SHA512 3fb08b61288a80d24ec7b2456a2fd0616f1fbc7ddd54d7ae395c694e2dc29065af2c5d317a28c05a3071284210071c033a6929bf10b8a7726ef7eafea7c5e50e WHIRLPOOL b1c5dba9e67a0406b6172dec6d0dbb6feccb6d50f2b9f9e1db27465d2ea9600b7ef11528ca561ff5e413e497e70dad8d7dff3584759973d3ee0191da42db2999
 DIST libedit-20120311-3.0.tar.gz 469830 SHA256 c64a9ee6cac6e7bd3b9a8a24c0586316333f381b1fa6125b027294f29303cf6f SHA512 e246c51704a8dbe476016b26c120324cdbe00a7499ac358cbf45a0fc1306bc6efcbdb0581b1e85d09092c6792f8f39d378f79fe64af28e84920ed7f99a0f388d WHIRLPOOL cc06e3dce095c4393786940a14c0475fab7d4d4c6873cf0f5931616d108fcaeee216f8a7b5e7c3afba2b0d42ba171194ab534d0a560eafa6d844cf2a4ce8766d
+DIST libedit-20130611-3.1.tar.gz 478553 SHA256 ea35592f9a54016fc29dc568d2b4d542822fa4a4660225a3702abfb5b49ab50c SHA512 85f0e901fa4b0dbc7403d18d53d45e196682b78f7fee0f824d73faf2ac1578c84b9cb05249185d8cb3e631ce0926ec08caf9ae9f873c7f820750b11ad721cbb5 WHIRLPOOL c73fefa3f2497755939ab839003706b836d69884aa270fcb1ea354aa0c6519f36b15ac3a057b9a9eac6704c0ae77945a07e7ba03acadf655b51b817641ad9c63
--- a/dev-libs/libedit/libedit-20130611.3.1.ebuild
+++ b/dev-libs/libedit/libedit-20130611.3.1.ebuild
@ -0,0 +1,48 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libedit/libedit-20130611.3.1.ebuild,v 1.1 2013/06/18 12:02:14 naota Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs versionator base
+
+MY_PV=$(get_major_version)-$(get_after_major_version)
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="BSD replacement for libreadline."
+HOMEPAGE="http://www.thrysoee.dk/editline/"
+SRC_URI="http://www.thrysoee.dk/editline/${MY_P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="static-libs"
+
+DEPEND=">=sys-libs/ncurses-5.7-r5[static-libs?]
+	!<=sys-freebsd/freebsd-lib-6.2_rc1"
+
+RDEPEND=${DEPEND}
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-ncursesprivate.patch"
+	"${FILESDIR}/${PN}-20100424.3.0-bsd.patch"
+	"${FILESDIR}/${PN}-20110709.3.0-weak-reference.patch"
+	"${FILESDIR}/${PN}-20120311-3.0-el_fn_sh_complete.patch"
+	)
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--enable-widec \
+		--disable-dependency-tracking \
+		--enable-fast-install
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	find "${D}" -name '*.la' -delete
+
+	gen_usr_ldscript -a edit
+}
--- a/dev-libs/link-grammar/Manifest
+++ b/dev-libs/link-grammar/Manifest
@ -1,2 +1,3 @@
 DIST link-grammar-4.7.12.tar.gz 2815323 SHA256 77d34651df340be1f9e35c92d1a2b46e7ec60aaccca5f28b8a8e2a45ee106818 SHA512 b925e02b5e77e4b4b52543f7252e4e4c53e3e8d97033c8a7dd133f3960e8ac07a5ca3c6f38d7b56399a094c87c2566c4366eabea65c386949cdbcee842296223 WHIRLPOOL a1d995de86189dfe588041b255ebaba59fa85f44857e866ae8e40f9fdc30a7ba8a0fb1ebe8eebb9c031bc56c56f04c232e37dfcf3275d0ada5d95b4d715fac70
+DIST link-grammar-4.7.13.tar.gz 2816589 SHA256 1ed8dbcd2b8dd35aef0d5b04fd56ad238b1106404b1987222c1b78dc5d603b4e SHA512 2a46becfca891cec7ff8ee18e1992bd594e06506982a5ffda1f76f42302e778a7d95fe0647ae18171ee109df468e9fd5aa193e46efd531daa5c564775f1d6546 WHIRLPOOL 5fd4ee6a9f9bd2d3207fe438f2672fb132c28f551b220e2f4bed3add84856798ba2c58b59238e8b6651d47455c484186108266debb2f781acdb7e47c2d40454f
 DIST link-grammar-4.7.8.tar.gz 1288971 SHA256 3a2758e3d8e99d10188e36694084e7e14e756250e85019c73a54d8d90fb872a4 SHA512 fc9887f68ddc01d206191fb6b9caf92ae7f6f074308127e40c661547cdab3ea447e47f90c0114ce003c47de9e935ff6db51a591755d6763cf0fcf0fb53adb174 WHIRLPOOL 9976dae4ccb657af213257b50ea924a1f483a24225799816504a46377241d43cab7c53a60661a54d3203054d7d7d2cc049657e57f39db1e0f9e1f1e15d24e7fd
--- a/dev-libs/link-grammar/link-grammar-4.7.13.ebuild
+++ b/dev-libs/link-grammar/link-grammar-4.7.13.ebuild
@ -0,0 +1,52 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/link-grammar/link-grammar-4.7.13.ebuild,v 1.1 2013/06/18 17:48:09 pacho Exp $
+
+EAPI=5
+inherit java-pkg-opt-2 eutils
+
+DESCRIPTION="A Syntactic English parser"
+HOMEPAGE="http://www.abisource.com/projects/link-grammar/ http://www.link.cs.cmu.edu/link/"
+SRC_URI="http://www.abisource.com/downloads/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# Set the same default as used in app-text/enchant
+IUSE="aspell +hunspell java static-libs threads"
+
+DEPEND="aspell? ( app-text/aspell )
+	hunspell? ( app-text/hunspell )
+	java? ( >=virtual/jdk-1.5
+		dev-java/ant-core )
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	if use aspell && use hunspell; then
+		ewarn "You have enabled 'aspell' and 'hunspell' support, but both cannot coexist,"
+		ewarn "only aspell will be build. Press Ctrl+C and set only 'hunspell' USE flag if"
+		ewarn "you want hunspell support."
+	fi
+}
+
+src_configure() {
+	local myconf
+
+	use hunspell && myconf="${myconf} --with-hunspell-dictdir=/usr/share/myspell"
+	econf \
+		--enable-shared \
+		$(use_enable aspell) \
+		$(use_enable hunspell) \
+		$(use_enable java java-bindings) \
+		$(use_enable static-libs static) \
+		$(use_enable threads pthreads) \
+		${myconf}
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
--- a/dev-libs/nsgenbind/Manifest
+++ b/dev-libs/nsgenbind/Manifest
@ -0,0 +1,2 @@
+DIST netsurf-buildsystem-1.0.tar.gz 37026 SHA256 4495e8e12faf0ace668ab80401064ce7f65a195efe63c924c066a109649ff146 SHA512 763e10766ab16be375c40a226e36a95df5740ac62b5bbc4eb6d52693b83284d2e71d9a3d797f55c28853a5d2565182759ffa9bfb3d736daf21b347f418661c47 WHIRLPOOL a65d53424a34a796a1f85ed5d4a9ca9bf58eaba7246e5ea20bc7da09e0e8ab60e156ce47da521660d5567c6358fda0da744e56ccf52cda6e0db92b19a6055d38
+DIST nsgenbind-0.0.1-src.tar.gz 50210 SHA256 05eb57a0b6de8ae094826e39620cee9ef9b672e79f755e7810ca98c0a3989552 SHA512 108f9ac066f780dac16123d5c043d4e29a1a9666b38e4180000a3bb3db60d5038176e40cea7e5fcc357f3e30b6d34d90fd06b2d4945d755b404a966fcc12c38c WHIRLPOOL c1a6789dfcd4d0cce04b59abff0663b6390d9f8d7eeec1045ec9c9f27bb7c45a2388128050237fd91460175d49718f6b64b3b573b35890a0d97afed796e969b8
--- a/dev-libs/nsgenbind/files/nsgenbind-0.0.1-bison-2.6.patch
+++ b/dev-libs/nsgenbind/files/nsgenbind-0.0.1-bison-2.6.patch
@ -0,0 +1,51 @@
+http://git.netsurf-browser.org/nsgenbind.git/patch/?id=51bd18034c510a6d4711823e08b69af2f7aa063e
+
+From 51bd18034c510a6d4711823e08b69af2f7aa063e Mon Sep 17 00:00:00 2001
+From: Vincent Sanders <vincent.sanders@collabora.co.uk>
+Date: Fri, 03 May 2013 10:39:49 +0000
+Subject: fix building teh lexers with bison versions at and after 2.6
+
+---
+diff --git a/src/nsgenbind-lexer.l b/src/nsgenbind-lexer.l
+index b257c83..8189a72 100644
+--- a/src/nsgenbind-lexer.l
+++ b/src/nsgenbind-lexer.l
+@@ -19,6 +19,16 @@
+     yylloc->first_column = yylloc->last_column + 1; \
+     yylloc->last_column += yyleng;
+ 
+
+/* Ensure compatability with bison 2.6 and later */
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED && defined NSGENBIND_STYPE_IS_DECLARED
+#define YYSTYPE NSGENBIND_STYPE
+#endif
+
+#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED && defined NSGENBIND_LTYPE_IS_DECLARED
+#define YYLTYPE NSGENBIND_LTYPE
+#endif
+
+ %}
+ 
+ /* lexer options */
+diff --git a/src/webidl-lexer.l b/src/webidl-lexer.l
+index 5369d99..74b9bb8 100644
+--- a/src/webidl-lexer.l
+++ b/src/webidl-lexer.l
+@@ -27,6 +27,15 @@
+     yylloc->first_column = yylloc->last_column + 1; \
+     yylloc->last_column += yyleng;
+ 
+/* Ensure compatability with bison 2.6 and later */
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED && defined WEBIDL_STYPE_IS_DECLARED
+#define YYSTYPE WEBIDL_STYPE
+#endif
+
+#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED && defined WEBIDL_LTYPE_IS_DECLARED
+#define YYLTYPE WEBIDL_LTYPE
+#endif
+
+ %}
+ 
+ 
+--
+cgit v0.9.0.3-65-g4555
--- a/dev-libs/nsgenbind/metadata.xml
+++ b/dev-libs/nsgenbind/metadata.xml
@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+</pkgmetadata>
+
--- a/dev-libs/nsgenbind/nsgenbind-0.0.1.ebuild
+++ b/dev-libs/nsgenbind/nsgenbind-0.0.1.ebuild
@ -0,0 +1,150 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nsgenbind/nsgenbind-0.0.1.ebuild,v 1.1 2013/06/18 09:42:58 xmw Exp $
+
+EAPI=5
+
+inherit base toolchain-funcs multilib-minimal
+
+DESCRIPTION="generate javascript to dom bindings from w3c webidl files"
+HOMEPAGE="http://www.netsurf-browser.org/"
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+IUSE=""
+
+RDEPEND=""
+DEPEND="virtual/yacc"
+
+PATCHES=( "${FILESDIR}"/${P}-bison-2.6.patch )
+NETSURF_COMPONENT_TYPE=binary
+
+### future context of netsurf.eclass
+
+NETSURF_BUILDSYSTEM=${NETSURF_BUILDSYSTEM:-buildsystem-1.0}
+NETSURF_COMPONENT_TYPE=${NETSURF_COMPONENT_TYPE:-lib-shared lib-static}
+SRC_URI=${SRC_URI:-http://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz}
+SRC_URI+="
+	http://download.netsurf-browser.org/libs/releases/${NETSURF_BUILDSYSTEM}.tar.gz -> netsurf-${NETSURF_BUILDSYSTEM}.tar.gz"
+IUSE+=" debug"
+if has lib-static ${NETSURF_COMPONENT_TYPE} ; then
+	IUSE+=" static-libs"
+fi
+if has doc ${IUSE} ; then
+	DEPEND+="
+	doc? ( app-doc/doxygen )"
+fi
+DEPEND+="
+	virtual/pkgconfig"
+pkg_setup(){
+	netsurf_src_prepare() {
+		base_src_prepare
+
+		multilib_copy_sources
+	}
+
+	netsurf_src_configure() {
+		netsurf_makeconf=(
+			NSSHARED=${WORKDIR}/${NETSURF_BUILDSYSTEM}
+			Q=
+			HOST_CC="\$(CC)"
+			CCOPT=
+			CCNOOPT=
+			CCDBG=
+			LDDBG=
+			AR="$(tc-getAR)"
+			BUILD=$(usex debug debug release)
+			PREFIX="${EROOT}"usr
+		)
+
+		multilib-minimal_src_configure
+	}
+
+	netsurf_src_compile() {
+		multilib-minimal_src_compile "$@"
+
+		if has doc ${USE} ; then
+			netsurf_make "$@" docs
+		fi
+	}
+
+	netsurf_src_test() {
+		multilib-minimal_src_test "$@"
+	}
+
+	netsurf_src_install() {
+		multilib-minimal_src_install "$@"
+	}
+
+	multilib_src_configure() {
+		sed -e "/^INSTALL_ITEMS/s: /lib: /$(get_libdir):g" \
+			-i Makefile || die
+		if [ -f ${PN}.pc.in ] ; then
+			sed -e "/^libdir/s:/lib:/$(get_libdir):g" \
+				-i ${PN}.pc.in || die
+		fi
+	}
+
+	netsurf_make() {
+		for COMPONENT_TYPE in ${NETSURF_COMPONENT_TYPE} ; do
+			if [ "${COMPONENT_TYPE}" == "lib-static" ] ; then
+				if ! use static-libs ; then
+					continue
+				fi
+			fi
+			emake CC="$(tc-getCC)" LD="$(tc-getLD)" "${netsurf_makeconf[@]}" \
+				COMPONENT_TYPE=${COMPONENT_TYPE} "$@"
+		done
+	}
+
+	multilib_src_compile() {
+		netsurf_make "$@"
+	}
+
+	multilib_src_test() {
+		netsurf_make test "$@"
+	}
+
+	multilib_src_install() {
+		#DEFAULT_ABI may not be the last.
+		#install to clean dir, rename binaries, move everything back
+		if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
+			netsurf_make DESTDIR="${D}"${ABI} install "$@"
+			if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
+				find "${D}"${ABI}/usr/bin -type f -exec mv {} {}.${ABI} \;
+			fi
+			mv "${D}"${ABI}/* "${D}" || die
+			rmdir "${D}"${ABI} || die
+		else
+			netsurf_make DESTDIR="${D}" install "$@"
+		fi
+	}
+
+	multilib_src_install_all() {
+		if has doc ${USE} ; then
+			dohtml -r build/docs/html/*
+		fi
+	}
+}
+
+src_prepare() {
+	sed -e '/CFLAGS := -/s|:=|+=|' \
+		-i Makefile || die
+	sed -e '/CFLAGS/s: -g : :' \
+		-i src/Makefile || die
+
+	netsurf_src_prepare
+}
+
+src_configure() {
+	netsurf_src_configure
+}
+
+src_compile() {
+	netsurf_src_compile
+}
+
+src_install() {
+	netsurf_src_install
+}
--- a/dev-ml/findlib/findlib-1.4.ebuild
+++ b/dev-ml/findlib/findlib-1.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/findlib-1.4.ebuild,v 1.1 2013/06/11 22:20:01 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/findlib-1.4.ebuild,v 1.2 2013/06/18 16:50:43 vapier Exp $

 EAPI=5

@ -14,7 +14,7 @@ IUSE="doc +ocamlopt tk"
 LICENSE="MIT"

 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"

 DEPEND=">=dev-lang/ocaml-3.10:=[ocamlopt?,tk?]"
 RDEPEND="${DEPEND}"
--- a/dev-perl/Config-IniFiles/Config-IniFiles-2.780.0.ebuild
+++ b/dev-perl/Config-IniFiles/Config-IniFiles-2.780.0.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Config-IniFiles/Config-IniFiles-2.780.0.ebuild,v 1.1 2012/11/04 16:13:55 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Config-IniFiles/Config-IniFiles-2.780.0.ebuild,v 1.2 2013/06/18 16:46:50 zlogene Exp $

 EAPI=4

@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A module for reading .ini-style configuration files"

 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="test"

 RDEPEND="
--- a/dev-python/amara/amara-2.0.0_alpha6-r1.ebuild
+++ b/dev-python/amara/amara-2.0.0_alpha6-r1.ebuild
@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/amara/amara-2.0.0_alpha6-r1.ebuild,v 1.2 2013/01/19 13:11:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/amara/amara-2.0.0_alpha6-r1.ebuild,v 1.3 2013/06/18 07:07:23 radhermit Exp $

 EAPI=5

-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE='wide-unicode(+)'

 inherit distutils-r1
--- a/dev-python/aplpy/Manifest
+++ b/dev-python/aplpy/Manifest
@ -1,2 +1 @@
-DIST APLpy-0.9.8.tar.gz 204013 SHA256 c8841815adf8e4a747a207db47452fc071bd1b010a53a0f490029c42a9e48264 SHA512 0a71109f27d7744d5257b5454701b4adc0b129059d28c199fd30f5b94e77348485a1a449de357a00298ff1fcf85ab631ad285904513ba831703a00e3519b472b WHIRLPOOL 093cad9598f4e1382b0be15199e1e2c5ecfe30084ecd210b14c79a78a58b8df4556297c649eaba36975f57c369eb42a5ccb76216c8f7e9c3d542999e9f17ef18
 DIST APLpy-0.9.9.tar.gz 689446 SHA256 dc2fa0ec4d0626172df4ba9ca3b0563e11b50230e81c8a52b4d03975eb3241a7 SHA512 5480093e89c0b66ea20a1d042334fcafdedd7a03ff376a96615700c1977339bbcc8c8e68a957adb49bae373140b1ba9bb2087379a8466f676ae2771af58c6b41 WHIRLPOOL 4c6378c7578b14043f67e5d4153a0928032fb7bcea9f78df91601c2bcbb6ed21a6f913c67b752123ad65c203450b4fd0d8321762d59437587af3b22928022e04
--- a/dev-python/aplpy/aplpy-0.9.8-r1.ebuild
+++ b/dev-python/aplpy/aplpy-0.9.8-r1.ebuild
@ -1,38 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/aplpy/aplpy-0.9.8-r1.ebuild,v 1.3 2013/04/24 21:22:08 bicatali Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit distutils-r1
-
-MYP=APLpy-${PV}
-
-DESCRIPTION="Astronomical Plotting Library in Python"
-HOMEPAGE="http://aplpy.github.com/"
-SRC_URI="mirror://github/${PN}/${PN}/${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	virtual/pyfits[${PYTHON_USEDEP}]
-	virtual/pywcs[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)"
-
-S="${WORKDIR}/${MYP}"
-
-python_test() {
-	PYTHONPATH="${BUILD_DIR}"/lib "${EPYTHON}" runtests.py || die
-}
--- a/dev-python/aplpy/aplpy-0.9.9.ebuild
+++ b/dev-python/aplpy/aplpy-0.9.9.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/aplpy/aplpy-0.9.9.ebuild,v 1.1 2013/04/25 17:51:14 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/aplpy/aplpy-0.9.9.ebuild,v 1.2 2013/06/18 16:13:56 bicatali Exp $

 EAPI=5

@ -23,7 +23,9 @@ IUSE=""
 RDEPEND="
 	>=dev-python/astropy-0.2[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]"
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/pyavm[${PYTHON_USEDEP}]
+	virtual/python-imaging[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"

 S="${WORKDIR}/${MYP}"
--- a/dev-python/hglib/Manifest
+++ b/dev-python/hglib/Manifest
@ -1,3 +1,2 @@
-DIST python-hglib-0.1.tar.gz 24412 SHA256 f9e031e50d19ee59d2f40e51794b1ecb69db41b3faa52bda8e3abb8d53babf9e SHA512 fb12c3552d93c9be7b269048bbabc0433ad38b624c5532a3ea52ea1d1566f94dc471601aaeb9ab622aef6153e5a83cd3d7abd73343d8d4e52d460c5e624a934c WHIRLPOOL 4986dcc0848a236e540f30545c0e8c583df83fccb6336c4e80b6e417bd386fcf932d89834808099db81b049cf16577539179bf9b786e624de6b7bf7d15d3afad
-DIST python-hglib-0.2.tar.gz 27427 SHA256 34cc341a12354a6239d4cd1d4a692aefe534428b4e556f64966129678e243fac SHA512 73de2c99406a38f85273931597525cec4ebef55b93712adca3b0bfea8ca3fc99446e5d6495817e9ad55cf4d48feb7fb49734675c4cc8938db8d4a5225d30eca7 WHIRLPOOL 9eb51851745403247851cdc369d1edc0b16105547af90f89d57abd0a640c4db9353d1f7d2598ba47bfcaba55618b8a6ec3941285be7bf5f2c522726ad4f4c47c
 DIST python-hglib-0.3.tar.gz 27469 SHA256 16d821354c1d068a68b2029e3863d687d8753eaeb001fd4bcf65ceb07c0d3e6e SHA512 d67de9567256e6f1649e4f3f7dfee63371d5f00fd3fd4f92426198f862e97c57f70e827d19f4e5e1929ad85ef2ce7aa5a0596b101cafdac71672e97dc115b397 WHIRLPOOL bfce04929ab92c8f0bc6086e83147182f038e5dd0370fc0efcf28a6cdd0604f28788a9a4e227057af289adaab635f765f41fb375aabe7b06e709f9ed47aa47bf
+DIST python-hglib-0.9.tar.gz 27794 SHA256 277bfcaea4437c8a4eb8fbb215a97973bc770cea038005965fb03ba3e1531b08 SHA512 432552d9d3e5aeb3ab62a23535e4cfa4f833f92e8d0be23e688d415ef86ee9e997b401f244b9f2a5b5e860c95e746c5aad1d750ca18928707b86e5d2c3ed6e3f WHIRLPOOL 2f8a8d47b5487bf77e537e186b23c9deb494cb57c42f28b04bd3223150376cedefac1033ce338dbcd32d008bc2f0f1240b77291401d00afd7caa7dbf1aa4e422
--- a/dev-python/hglib/hglib-0.1.ebuild
+++ b/dev-python/hglib/hglib-0.1.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/hglib/hglib-0.1.ebuild,v 1.2 2012/02/22 05:40:42 patrick Exp $
-
-EAPI=3
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="threads"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.5 2.6 3.* *-jython 2.7-pypy-*"
-MY_P="python-${P}"
-MY_PN="python-${PN}"
-
-inherit distutils
-
-DESCRIPTION="Library for using the Mercurial Command Server from Python"
-HOMEPAGE="http://mercurial.selenic.com/"
-SRC_URI="http://mercurial.selenic.com/release/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND=">=dev-vcs/mercurial-1.9"
-DEPEND="test? ( dev-python/nose )"
-
-S=${WORKDIR}/${MY_P}
-
-src_test() {
-	rm tests/test-summary.py # currently fails
-	testing() {
-#		local testdir="${T}/tests-${PYTHON_ABI}"
-#		rm -rf "${testdir}"
-		"$(PYTHON)" test.py
-	}
-	python_execute_function testing
-}
--- a/dev-python/hglib/hglib-0.2.ebuild
+++ b/dev-python/hglib/hglib-0.2.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/hglib/hglib-0.2.ebuild,v 1.1 2012/03/16 07:25:07 patrick Exp $
-
-EAPI=3
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="threads"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.5 2.6 3.* *-jython 2.7-pypy-*"
-MY_P="python-${P}"
-MY_PN="python-${PN}"
-
-inherit distutils
-
-DESCRIPTION="Library for using the Mercurial Command Server from Python"
-HOMEPAGE="http://mercurial.selenic.com/"
-SRC_URI="mirror://pypi/p/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND=">=dev-vcs/mercurial-1.9"
-DEPEND="test? ( dev-python/nose )"
-
-S=${WORKDIR}/${MY_P}
-
-src_test() {
-	rm tests/test-summary.py # currently fails
-	testing() {
-#		local testdir="${T}/tests-${PYTHON_ABI}"
-#		rm -rf "${testdir}"
-		"$(PYTHON)" test.py
-	}
-	python_execute_function testing
-}
--- a/dev-python/hglib/hglib-0.3.ebuild
+++ b/dev-python/hglib/hglib-0.3.ebuild
@ -1,15 +1,15 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/hglib/hglib-0.3.ebuild,v 1.2 2013/01/23 16:20:50 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/hglib/hglib-0.3.ebuild,v 1.3 2013/06/18 14:02:06 idella4 Exp $

 EAPI=5
 PYTHON_COMPAT=( python2_7 pypy{1_9,2_0} )
-PYTHON_USE_WITH="threads"
+PYTHON_USE_WITH="python_targets_python2_7? ( threads )"

 MY_P="python-${P}"
 MY_PN="python-${PN}"

-inherit distutils-r1 eutils
+inherit distutils-r1

 DESCRIPTION="Library for using the Mercurial Command Server from Python"
 HOMEPAGE="http://mercurial.selenic.com/"
@ -21,15 +21,16 @@ KEYWORDS="~amd64 ~x86"
 IUSE="test"

 RDEPEND=">=dev-vcs/mercurial-1.9"
-DEPEND="test? ( dev-python/nose )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"

 S=${WORKDIR}/${MY_P}

-src_prepare() {
-	distutils-r1_src_prepare
-	epatch "${FILESDIR}"/${P}-tests.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-tests.patch )

 python_test() {
-	${PYTHON} test.py
+	if ! ${PYTHON} test.py; then
+		die "Tests failed under ${EPYTHON}"
+	fi
+	${PYTHON} test.py || die
 }
--- a/dev-python/hglib/hglib-0.9.ebuild
+++ b/dev-python/hglib/hglib-0.9.ebuild
@ -0,0 +1,41 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/hglib/hglib-0.9.ebuild,v 1.1 2013/06/18 14:02:06 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy{1_9,2_0} )
+PYTHON_USE_WITH="python_targets_python2_7? ( threads )"
+
+MY_P="python-${P}"
+MY_PN="python-${PN}"
+
+inherit distutils-r1
+
+DESCRIPTION="Library for using the Mercurial Command Server from Python"
+HOMEPAGE="http://mercurial.selenic.com/"
+SRC_URI="mirror://pypi/p/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+
+RDEPEND=">=dev-vcs/mercurial-1.9"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${PN}-0.3-tests.patch )
+
+python_test() {
+	#  http://bz.selenic.com/show_bug.cgi?id=3965
+	if ! ${PYTHON} test.py; then
+		die "Tests failed under ${EPYTHON}"
+	fi
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/stats.py )
+	distutils-r1_python_install_all
+}
--- a/dev-python/html5lib/Manifest
+++ b/dev-python/html5lib/Manifest
@ -1,2 +1,3 @@
 DIST html5lib-0.90.zip 99322 SHA256 765e04a2c8a08db9209a46887e5244200bed0068f74fdd87fdc219a0c3a1401f SHA512 eb882a55d116d26760956f03214e79c533efa887db5d098cae09a3a40fa870414a6cd2e5a14a6d1bacb9fbc1dc0668e1f9ca99e54ab4ce539f89a68b38883437 WHIRLPOOL e658ba01e67506f6252a365b1cfdabae034cb77c1eb6952c1256d4aedab0ab9ac590e5eee98f6c988af0cd9dbb9c9b5556832f6622fc181fab5baa94c8de83a1
 DIST html5lib-0.95.tar.gz 222614 SHA256 a6e707d9cb17c8bf1e553713ad14b31274a81d5c0ce0fce21b02936d0efd7dbb SHA512 95c8221fb265b0a931636658170fc0c8a95b16c48576d5aa85ea3c6b088e6039f3f8d66cec67e0e497a63394bbf178b0251c0b9897ea9d1c2d5ae90ca35da464 WHIRLPOOL 355aedaea043231b7c473b2b6fb0455c57a8bedb315a83aeadede9298a484ca4a34584901d5bef4ff2320bef894d562559965350fdec5c5fdad75b63e6abc8a6
+DIST html5lib-1.0b1.tar.gz 882197 SHA256 45b76286eda37652c83e246cd04ac64cd20137fced437a7ce5162f7f1393b922 SHA512 77143c9f8e926f526eda0fdccdc127101514512a48c28be9a8b28d2226f35ea01d390841a6e7bfea4a9930b3dbaccb04d11a455f9e79d746efe8affa760ff5c6 WHIRLPOOL 31bd58ffeedf9d5a3cc0c05d4339ae1c4ddf61c43e035f70f3809b585db1f52ef3f646da741ea252cc74918aab31c113b5a7ebadbce6b64ec2adc7dedb8bfd13
--- a/dev-python/html5lib/html5lib-1.0_beta1.ebuild
+++ b/dev-python/html5lib/html5lib-1.0_beta1.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/html5lib/html5lib-1.0_beta1.ebuild,v 1.1 2013/06/18 07:04:53 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+MY_P=${PN}-${PV/_beta/b}
+DESCRIPTION="HTML parser based on the HTML5 specification"
+HOMEPAGE="https://github.com/html5lib/html5lib-python/ http://pypi.python.org/pypi/html5lib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86 ~x86-fbsd"
+IUSE="test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
--- a/dev-python/logilab-common/logilab-common-0.59.1.ebuild
+++ b/dev-python/logilab-common/logilab-common-0.59.1.ebuild
@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/logilab-common-0.59.1.ebuild,v 1.1 2013/04/22 07:18:10 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/logilab-common-0.59.1.ebuild,v 1.2 2013/06/18 14:55:23 idella4 Exp $

 EAPI=5
 # broken with python3.3, bug #449276
-PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy{1_9,2_0} )

 inherit distutils-r1 eutils

--- a/dev-python/nose/nose-1.3.0.ebuild
+++ b/dev-python/nose/nose-1.3.0.ebuild
@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-1.3.0.ebuild,v 1.2 2013/04/24 19:04:57 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-1.3.0.ebuild,v 1.4 2013/06/18 13:15:22 jer Exp $

 EAPI=5

-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_8,1_9,2_0} )
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
 inherit distutils-r1 eutils

 DESCRIPTION="A unittest extension offering automatic test suite discovery and easy test authoring"
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples test"

 RDEPEND="dev-python/coverage[${PYTHON_USEDEP}]
--- a/dev-python/nosexcover/Manifest
+++ b/dev-python/nosexcover/Manifest
@ -1 +1,2 @@
 DIST nosexcover-1.0.7.tar.gz 2389 SHA256 2284c504e7ca9c5e36e5777f354b9224dff1f68d52f63aba62a0d50a241a824b SHA512 5f9934b3ab636e16edceec9f6b1a1558aca56934053474f3e0ef1bb557a5489756b3e764452840189a8c971fbab7e0a2f3d298c0b999d67ce280885486ea779d WHIRLPOOL 49124645a4232c8fc157460065e8ed4fc26dadb0e7de67cb3534c3c0e3cb6935ce467ec68b2215c787174bb70f9925e8590c05b21b44a815b0624a765b09e3f9
+DIST nosexcover-1.0.8.tar.gz 2463 SHA256 060d93ec8d5c302d6873866e3102af76ae2520b2e3b141fa6d610ff02b458ad4 SHA512 27b821bf56ab436276a2010972027510377fcfbc394b7cf759d0ba23039f0dcbf01e16e77a0d0cd1911ce2b86cce882a0e4334317286763986e38e8e786c29d2 WHIRLPOOL 76702f330fb0cc49ffbab650fb71bacfbfcb939afc382186c0bfdfc9312e087e4f4624be94ed9c8b105c7bda1acab9ad46c23c7b9a6cdc9c97d8360ef3e67ca3
--- a/dev-python/nosexcover/nosexcover-1.0.7-r1.ebuild
+++ b/dev-python/nosexcover/nosexcover-1.0.7-r1.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nosexcover/nosexcover-1.0.7-r1.ebuild,v 1.1 2013/06/18 06:50:46 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+
+inherit distutils-r1
+
+DESCRIPTION="Extends nose.plugins.cover to add Cobertura-style XML reports"
+HOMEPAGE="https://github.com/cmheisel/nose-xcover/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
--- a/dev-python/nosexcover/nosexcover-1.0.8.ebuild
+++ b/dev-python/nosexcover/nosexcover-1.0.8.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nosexcover/nosexcover-1.0.8.ebuild,v 1.1 2013/06/18 06:50:45 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+
+inherit distutils-r1
+
+DESCRIPTION="Extends nose.plugins.cover to add Cobertura-style XML reports"
+HOMEPAGE="https://github.com/cmheisel/nose-xcover/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
--- a/dev-python/pyPdf/pyPdf-1.13-r1.ebuild
+++ b/dev-python/pyPdf/pyPdf-1.13-r1.ebuild
@ -0,0 +1,16 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyPdf/pyPdf-1.13-r1.ebuild,v 1.1 2013/06/18 07:18:46 radhermit Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library to work with pdf files"
+HOMEPAGE="http://pybrary.net/pyPdf/ http://pypi.python.org/pypi/pyPdf/"
+SRC_URI="http://pybrary.net/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
--- a/dev-python/pycountry/Manifest
+++ b/dev-python/pycountry/Manifest
@ -1 +1,2 @@
 DIST pycountry-0.14.7.zip 7738052 SHA256 72c989c73881a09967e6b460b046c3d07134600ec4d689ae51fa39d0e1dcb93d SHA512 48cae01b87735a1276c9b98c7a65029924d428cdc1e0f6d041a9c3fe436fd272e0395af9ed7147f7baa40128c8986bcfff66b59cfabc4f93a2ca397c77ba9140 WHIRLPOOL fad4326d1d3774f36560c567df8bdc9980d02c6761f105789a05b37d87c487bd674413b4f681df5ed14e72f7533311a8ef9405d63b535df957ec22fb9191303e
+DIST pycountry-0.14.8.zip 7781480 SHA256 5252b5378ba6f1971aa718248d797fb1e2a33d0bdb975400e4b801549102e2fa SHA512 99d8ded3addd3dbd03e15d6ed31bd53d3c369c4b516c03f3e7bfa7ed42feda769153f6df0a43fd9129f8123b8ebc22341722dc5883c885b0f4a42ba591b475cd WHIRLPOOL 9378ea338d75295a0ced55018834e954f38ce71e77c0800ced0b2fe53318c96c70813b218c57fbc328f7c56f28730e4c5eacba9da58ae9c619fb738eb0ecf48c
--- a/dev-python/pycountry/pycountry-0.14.8.ebuild
+++ b/dev-python/pycountry/pycountry-0.14.8.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycountry/pycountry-0.14.8.ebuild,v 1.1 2013/06/18 08:00:05 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy2_0 )
+
+inherit distutils-r1
+
+DESCRIPTION="ISO country, subdivision, language, currency and script definitions and their translations"
+HOMEPAGE="http://pypi.python.org/pypi/pycountry"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+DOCS=( HISTORY.txt TODO.txt )
+
+python_test() {
+	# nosetests give coverage output of each run
+	pushd "${BUILD_DIR}"/lib > /dev/null
+	nosetests ${PN}/tests.py || die
+}
--- a/dev-python/pypy/pypy-2.0.2.ebuild
+++ b/dev-python/pypy/pypy-2.0.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.0.2.ebuild,v 1.1 2013/05/26 01:48:49 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.0.2.ebuild,v 1.3 2013/06/18 10:41:29 idella4 Exp $

 EAPI=5

@ -84,6 +84,8 @@ src_compile() {
 	set -- "${PYTHON}" rpython/bin/rpython --batch "${args[@]}"
 	echo -e "\033[1m${@}\033[0m"
 	"${@}" || die "compile error"
+
+	use doc && emake -C ${PN}/doc/ html
 }

 src_test() {
@ -96,6 +98,7 @@ src_install() {
 	fperms a+x ${INSDESTTREE}/pypy-c
 	use jit && pax-mark m "${ED%/}${INSDESTTREE}/pypy-c"
 	dosym ../$(get_libdir)/pypy${SLOT}/pypy-c /usr/bin/pypy-c${SLOT}
+	dosym ../$(get_libdir)/pypy${SLOT}/include /usr/include/pypy${SLOT}
 	dodoc README.rst

 	if ! use sqlite; then
@ -128,6 +131,9 @@ src_install() {
 	# compile the installed modules
 	python_optimize "${ED%/}${INSDESTTREE}"

+	# Install docs
+	use doc && dohtml -r ${PN}/doc/_build/html/
+
 	echo "EPYTHON='${EPYTHON}'" > epython.py
 	python_domodule epython.py
 }
--- a/dev-python/pyregion/pyregion-1.1.1.ebuild
+++ b/dev-python/pyregion/pyregion-1.1.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyregion/pyregion-1.1.1.ebuild,v 1.1 2013/05/13 19:18:28 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyregion/pyregion-1.1.1.ebuild,v 1.2 2013/06/18 16:07:36 bicatali Exp $

 EAPI=5

@ -18,7 +18,7 @@ LICENSE="MIT"
 IUSE="examples"
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]"
+	virtual/pyparsing[${PYTHON_USEDEP}]"
 DEPEND="${DEPEND}
 	|| ( dev-python/cython[${PYTHON_USEDEP}]
 		 dev-python/pyrex[${PYTHON_USEDEP}] )"
--- a/dev-python/xhtml2pdf/xhtml2pdf-0.0.5-r1.ebuild
+++ b/dev-python/xhtml2pdf/xhtml2pdf-0.0.5-r1.ebuild
@ -1,24 +1,22 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/xhtml2pdf/xhtml2pdf-0.0.5.ebuild,v 1.2 2013/06/09 17:40:50 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/xhtml2pdf/xhtml2pdf-0.0.5-r1.ebuild,v 1.1 2013/06/18 07:21:35 radhermit Exp $

-EAPI="4"
+EAPI=5
+PYTHON_COMPAT=( python2_{6,7} )

-PYTHON_COMPAT="python2_5 python2_6 python2_7"
-
-inherit python-distutils-ng
+inherit distutils-r1

 DESCRIPTION="PDF generator using HTML and CSS"
-HOMEPAGE="http://www.xhtml2pdf.com/ http://pypi.python.org/pypi/xhtml2pdf"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+HOMEPAGE="http://www.xhtml2pdf.com/ http://pypi.python.org/pypi/xhtml2pdf/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""

-DEPEND="dev-python/html5lib
-	virtual/python-imaging
-	dev-python/pyPdf
-	dev-python/reportlab"
+DEPEND="dev-python/html5lib[${PYTHON_USEDEP}]
+	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pyPdf[${PYTHON_USEDEP}]
+	dev-python/reportlab[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
--- a/eclass/freebsd.eclass
+++ b/eclass/freebsd.eclass
@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.26 2013/06/17 20:00:37 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.28 2013/06/18 17:30:56 aballier Exp $
 #
 # Diego Pettenò <flameeyes@gentoo.org>

@ -105,9 +105,6 @@ freebsd_src_compile() {

 	mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NO_FSCHG="

-	# Many things breaks when using ricer flags here
-	[[ -z "${NOFLAGSTRIP}" ]] && strip-flags
-
 	# Make sure to use FreeBSD definitions while crosscompiling
 	[[ -z "${BMAKE}" ]] && BMAKE="$(freebsd_get_bmake)"

@ -147,6 +144,8 @@ freebsd_multilib_multibuild_wrapper() {
 	mymakeopts="${mymakeopts} TARGET=${target} MACHINE=${target} MACHINE_ARCH=${target} SHLIBDIR=/usr/$(get_libdir) LIBDIR=/usr/$(get_libdir)"
 	if use multilib && [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
 		mymakeopts="${mymakeopts} COMPAT_32BIT="
+		# Teach gcc where to find crt* files.
+		export LDFLAGS="${LDFLAGS} -L/usr/$(get_libdir) -B/usr/$(get_libdir)"
 	fi

 	einfo "Building for ABI=${ABI} and TARGET=${target}"
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@ -1,2 +1 @@
-DIST freeciv-2.3.3.tar.bz2 31381312 SHA256 fc88a8330fa1f30676e775bbdc31c57e07792a45b9b7c31f3a27728351b90258 SHA512 1705f3ef16ba10ee6913d2950e063d50f025d35848ac476ed37fb1663f487877bd7437e3986b02002758ce7f259221fec34e7f77eb1ac442ca01fffce7c7f6e4 WHIRLPOOL 968b17a82050bcea600a5ca30480c7b6c4a9c44b60ec253a4c8195a1cfbecb8d153df293090a5a03ce8c2b67d25d0191b3e4c3e9d1fc261767d9ce8b6eaff5a9
 DIST freeciv-2.3.4.tar.bz2 31395893 SHA256 084c10c50c06166177c9864b5610eaf36dca3808e3d3a7da8ef7ae927d56c41c SHA512 51d89321cf7b5b08d2338f8d76051ebde745c85e4ebad21b9ff2109696edfdc79ad43d7f8d2bf989400ce5e71f28127835dc4b4e60635fb71ebb3a2fb149269a WHIRLPOOL afcb5543049059d87503451c7d82abe6be765406fe3aba13fa01dec430062c4ed51c39b42827fb863a37c0b9737962f9557c6069f9d7be1efbd851c18268b6ce
--- a/games-strategy/freeciv/freeciv-2.3.3.ebuild
+++ b/games-strategy/freeciv/freeciv-2.3.3.ebuild
@ -1,127 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.3.3.ebuild,v 1.4 2013/03/10 08:20:21 mr_bones_ Exp $
-
-EAPI=5
-inherit eutils gnome2-utils games-ggz games
-
-DESCRIPTION="multiplayer strategy game (Civilization Clone)"
-HOMEPAGE="http://www.freeciv.org/"
-SRC_URI="mirror://sourceforge/freeciv/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="auth dedicated ggz +gtk ipv6 nls readline sdl +sound"
-REQUIRED_USE="!dedicated? ( || ( gtk sdl ) )"
-
-RDEPEND="readline? ( sys-libs/readline )
-	sys-libs/zlib
-	app-arch/bzip2
-	auth? ( virtual/mysql )
-	!dedicated? (
-		nls? ( virtual/libintl )
-		gtk? ( x11-libs/gtk+:2 )
-		sdl? (
-			media-libs/libsdl[video]
-			media-libs/sdl-image[png]
-			media-libs/freetype:2
-		)
-		sound? (
-			media-libs/libsdl[audio]
-			media-libs/sdl-mixer[vorbis]
-		)
-		ggz? ( games-board/ggz-gtk-client )
-		media-libs/libpng:0
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	!dedicated? (
-		nls? ( sys-devel/gettext )
-		x11-proto/xextproto
-	)"
-
-src_prepare() {
-	# install the .desktop in /usr/share/applications
-	# install the icons in /usr/share/pixmaps
-	sed -i \
-		-e 's:^.*\(desktopfiledir = \).*:\1/usr/share/applications:' \
-		-e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \
-		-e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \
-		client/Makefile.in \
-		server/Makefile.in \
-		modinst/Makefile.in \
-		data/Makefile.in \
-		data/icons/Makefile.in \
-		|| die
-}
-
-src_configure() {
-	local myclient myopts
-
-	if use dedicated ; then
-		myclient="no"
-	else
-		use sdl && myclient="${myclient} sdl"
-		use gtk && myclient="${myclient} gtk"
-		myopts=$(use_with ggz ggz-client)
-	fi
-
-	egamesconf \
-		--disable-dependency-tracking \
-		--localedir=/usr/share/locale \
-		--with-ggzconfig=/usr/bin \
-		--enable-noregistry="${GGZ_MODDIR}" \
-		$(use_enable auth) \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(use_with readline) \
-		$(use_enable sound sdl-mixer) \
-		${myopts} \
-		--enable-client="${myclient}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if use dedicated ; then
-		rm -rf "${D}/usr/share/pixmaps"
-		rm -f "${D}"/usr/share/man/man6/freeciv-{client,gtk2,sdl,xaw}*
-	else
-		# Create and install the html manual. It can't be done for dedicated
-		# servers, because the 'freeciv-manual' tool is then not built. Also
-		# delete freeciv-manual from the GAMES_BINDIR, because it's useless.
-		# Note: to have it localized, it should be ran from _postinst, or
-		# something like that, but then it's a PITA to avoid orphan files...
-		./manual/freeciv-manual || die
-		dohtml manual*.html
-		if use sdl ; then
-			make_desktop_entry freeciv-sdl "Freeciv (SDL)" freeciv-client
-		else
-			rm -f "${D}"/usr/share/man/man6/freeciv-sdl*
-		fi
-		rm -f "${D}"/usr/share/man/man6/freeciv-xaw*
-	fi
-	find "${D}" -name "freeciv-manual*" -delete
-
-	dodoc ChangeLog NEWS doc/{BUGS,CodingStyle,HACKING,HOWTOPLAY,README*,TODO}
-	rm -rf "${D}$(games_get_libdir)"
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	games-ggz_update_modules
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	games-ggz_update_modules
-	gnome2_icon_cache_update
-}
--- a/kde-misc/katelatexplugin/katelatexplugin-0.5.ebuild
+++ b/kde-misc/katelatexplugin/katelatexplugin-0.5.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/katelatexplugin/katelatexplugin-0.5.ebuild,v 1.1 2013/06/17 23:43:12 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/katelatexplugin/katelatexplugin-0.5.ebuild,v 1.2 2013/06/18 16:25:48 johu Exp $

 EAPI=5

@ -19,5 +19,3 @@ IUSE="debug"
 RDEPEND="
 	$(add_kdebase_dep kate)
 "
-
-S="${WORKDIR}/${PN}"
--- a/media-fonts/cantarell/Manifest
+++ b/media-fonts/cantarell/Manifest
@ -1,2 +1,2 @@
 DIST cantarell-fonts-0.0.12.tar.xz 291964 SHA256 3d509e1117dd92a6b80ef8b2586c89e178dc21a03c7c61f5c50772def5c4934b SHA512 2c3dbdac7875ce588297f7dac6d6ae6c15efc1341d245bf8f766d232073f84fb9b1b485b5e935c8ede858bee76200b1e2c6a59a2ac861fe1b5611deca8c5b336 WHIRLPOOL b1ccd1f2994e1c800cf37018b326b4ab69dad77804dc13ac177cf01c652842d8724def1f13b3481753b8f31dfdaa726d162245d86b611b701d62e5cb51af8bf5
-DIST cantarell-fonts-0.0.9.tar.xz 313280 SHA256 793f4e2f28e5d03b266f4f714570c9569cb7f8b993a56219539788d45e0fa3fe SHA512 731488fb052b742a3d630f9b8d7c8665d0fcf4b06663721c9629dd7e04e7f4442f70b6d584f4fdb0346f59506df6e7a056854bef7f843a5fb600afce9e02cffb WHIRLPOOL 142dde8c10c98a9e7d9dcd5920a7dd89d7aeec1f701c5d3134fd4556088cfc6fccedefe502edadc1c37c37debd99befba864fbba6923eba93974d6037e6649fe
+DIST cantarell-fonts-0.0.13.tar.xz 287832 SHA256 afc53ffa27418932301a3bc030cf811684a1261faa761744fe2d3ce696b6492c SHA512 7d7280efa6cebc17193b9919c5be6f8af6459f868b6d17fa6807aa3c1a12f91073db90ec312a2b6bc37680c8e1438de402f70d1af45c20249705a42291ab93c0 WHIRLPOOL 15cefd8ccb76feae4cd73596d171333cbc9d4a0e7614ab3db2748b1bcc370d5af0ee1a47e2cc52a7962b29e5aeadf1ee370f9260c4107034ab51a520ed451b36
--- a/media-fonts/cantarell/cantarell-0.0.13.ebuild
+++ b/media-fonts/cantarell/cantarell-0.0.13.ebuild
@ -1,18 +1,18 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/cantarell/cantarell-0.0.9.ebuild,v 1.8 2012/10/28 15:56:58 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/cantarell/cantarell-0.0.13.ebuild,v 1.1 2013/06/18 17:54:03 pacho Exp $

-EAPI="4"
+EAPI="5"
 GNOME_ORG_MODULE="${PN}-fonts"

 inherit font gnome.org

-DESCRIPTION="Cantarell fonts, default fontset for GNOME Shell"
-HOMEPAGE="http://live.gnome.org/CantarellFonts"
+DESCRIPTION="Default fontset for GNOME Shell"
+HOMEPAGE="https://live.gnome.org/CantarellFonts"

 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE=""

 RDEPEND="media-libs/fontconfig"
--- a/media-gfx/cropgui/cropgui-0.1.1-r1.ebuild
+++ b/media-gfx/cropgui/cropgui-0.1.1-r1.ebuild
@ -1,52 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/cropgui/cropgui-0.1.1-r1.ebuild,v 1.2 2013/06/09 18:13:14 floppym Exp $
-
-EAPI="4"
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit eutils python
-
-DESCRIPTION="GUI for lossless cropping of jpeg images"
-HOMEPAGE="http://emergent.unpythonic.net/01248401946"
-SRC_URI="http://media.unpythonic.net/emergent-files/01248401946/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	virtual/python-imaging
-	dev-python/pygobject:2
-	dev-python/pygtk:2
-"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-PIL.patch
-	sed -i  -e '/Encoding/d' \
-		-e '/Version/d' \
-		-e '/MimeType/s/$/&;/' \
-		-e '/Categories/s/Application;//' \
-		cropgui.desktop || die 'sed on cropgui.desktop failed'
-}
-
-src_install() {
-	install_cropgui_wrapper() {
-		insinto "$(python_get_sitedir)/${PN}"
-		python_convert_shebangs -q ${PYTHON_ABI} *.py
-		doins cropgtk.py cropgui_common.py filechooser.py cropgui.glade
-		make_wrapper cropgui-${PYTHON_ABI} "$(PYTHON -a) $(python_get_sitedir)/${PN}/cropgtk.py"
-	}
-	python_execute_function -q install_cropgui_wrapper
-	python_generate_wrapper_scripts "${ED}/usr/bin/cropgui"
-
-	domenu cropgui.desktop
-	doicon cropgui.png
-}
--- a/media-gfx/cropgui/cropgui-0.1.1-r2.ebuild
+++ b/media-gfx/cropgui/cropgui-0.1.1-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/cropgui/cropgui-0.1.1-r2.ebuild,v 1.2 2013/06/09 18:13:14 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/cropgui/cropgui-0.1.1-r2.ebuild,v 1.3 2013/06/18 13:23:05 zlogene Exp $

 EAPI="5"

@ -13,7 +13,7 @@ SRC_URI="http://media.unpythonic.net/emergent-files/01248401946/${PN}_${PV}.tar.

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

 DEPEND="${PYTHON_DEPS}"
--- a/media-gfx/cropgui/cropgui-0.1.1.ebuild
+++ b/media-gfx/cropgui/cropgui-0.1.1.ebuild
@ -1,51 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/cropgui/cropgui-0.1.1.ebuild,v 1.3 2012/12/28 16:41:41 ago Exp $
-
-EAPI="4"
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit eutils python
-
-DESCRIPTION="GUI for lossless cropping of jpeg images"
-HOMEPAGE="http://emergent.unpythonic.net/01248401946"
-SRC_URI="http://media.unpythonic.net/emergent-files/01248401946/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	dev-python/imaging
-	dev-python/pygobject:2
-	dev-python/pygtk:2
-"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	sed -i  -e '/Encoding/d' \
-		-e '/Version/d' \
-		-e '/MimeType/s/$/&;/' \
-		-e '/Categories/s/Application;//' \
-		cropgui.desktop || die 'sed on cropgui.desktop failed'
-}
-
-src_install() {
-	install_cropgui_wrapper() {
-		insinto "$(python_get_sitedir)/${PN}"
-		python_convert_shebangs -q ${PYTHON_ABI} *.py
-		doins cropgtk.py cropgui_common.py filechooser.py cropgui.glade
-		make_wrapper cropgui-${PYTHON_ABI} "$(PYTHON -a) $(python_get_sitedir)/${PN}/cropgtk.py"
-	}
-	python_execute_function -q install_cropgui_wrapper
-	python_generate_wrapper_scripts "${ED}/usr/bin/cropgui"
-
-	domenu cropgui.desktop
-	doicon cropgui.png
-}
--- a/media-gfx/iscan-plugin-gt-f720/metadata.xml
+++ b/media-gfx/iscan-plugin-gt-f720/metadata.xml
@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
+		<email>flameeyes@gentoo.org</email>
 	</maintainer>
 	<longdescription lang="en">
 		Proprietary plugin for several EPSON scanner models with the epkowa SANE backend (provided by media-gfx/iscan).
--- a/media-sound/mangler/Manifest
+++ b/media-sound/mangler/Manifest
@ -1,4 +1,2 @@
-DIST mangler-1.2.1.tar.bz2 2878585 SHA256 cb1ca271a48f976595a3f62abbf05fe2e566d3548c14290dc2dedaf4ce7bcb71
-DIST mangler-1.2.2.tar.bz2 5187886 SHA256 17671760c006536fa05138e98422dceb59cbaa7295816b414d4626289e603f20 SHA512 3ea60ea692e49218d1a131bf70039ccff273f563093e05a2046cc5ea0d71a196fd03e80bb9f4f498a0ccad1a42b60872bc279957f521750c5b434fe1c9d5103f WHIRLPOOL 1ffe39a84ba0ec426d5df9c1c44b66699c9c5e08494c5c4f6fa6af80241bcdf01e56c5ffd7e934098d341b2ae54b10e9d94d81f0809fe27e4ecfdf0101e82e6b
 DIST mangler-1.2.4.tar.bz2 5477595 SHA256 176462ce8808af493ea6a1b3e5bc66477e5e74a2227a625b2829148245c82a9b SHA512 d6c2805a3b106538eb89b586ca7f1f7a39c493efbb504fdc2dfc5ae5cb7f5b13a5fe6751a9a49f6c25c37de8db4c70cfa64c38c68c579c8778a41d63aeda7704 WHIRLPOOL 5e2bb1e838fd4ee8d50689266503b091833f9c89f62b0c8fdff6029835c72f267f832daecc54709e0a15983fd3e7d8de0f4f84a971e29bf849dba5526e8e97dc
 DIST mangler-1.2.5.tar.bz2 5390985 SHA256 baae921ac7d0708bf1f435977fa834e41e66007532a39009154835bc4677a55f SHA512 e72eb2f408ba925d10563c6821e08406007bd0b7586f9ee054a1de421a6195351140a2df9656a45389f5f568ebf44f53fb719fbf6fb113695f230dd4bad21e38 WHIRLPOOL 29364187c730dedefeb9017b01e0a426572ce47b6e98efafd2735a96aba1ea722c23b50a92bc9f675960361f703899bbac295c6359a63f54cb208e1bae8bdc52
--- a/media-sound/mangler/mangler-1.2.2.ebuild
+++ b/media-sound/mangler/mangler-1.2.2.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/media-sound/mangler/mangler-1.2.2.ebuild,v 1.4 2012/05/05 08:33:47 mgorny Exp $
-
-EAPI=2
-
-DESCRIPTION="Open source VOIP client capable of connecting to Ventrilo 3.x servers"
-HOMEPAGE="http://www.mangler.org/"
-SRC_URI="http://www.mangler.org/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-3 LGPL-2.1 ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+alsa celt espeak g15 +gsm oss pulseaudio static-libs +speex +xosd"
-
-RDEPEND="dev-cpp/gtkmm:2.4
-	gnome-base/librsvg
-	>=dev-libs/dbus-glib-0.80
-	>=dev-libs/glib-2.20.1:2
-	>=x11-libs/gtk+-2.16:2
-	x11-libs/libX11
-	x11-libs/libXi
-	alsa? ( media-libs/alsa-lib )
-	celt? ( >=media-libs/celt-0.7.1 )
-	espeak? ( app-accessibility/espeak )
-	g15? ( app-misc/g15daemon )
-	gsm? ( media-sound/gsm )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.14 )
-	speex? ( >=media-libs/speex-1.2_rc1 )
-	xosd? ( x11-libs/xosd )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable static-libs static) \
-		$(use_enable gsm) \
-		$(use_enable speex) \
-		$(use_enable celt) \
-		$(use_enable xosd) \
-		$(use_enable g15) \
-		$(use_enable espeak) \
-		$(use_with pulseaudio) \
-		$(use_with alsa) \
-		$(use_with oss)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog
-
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-}
--- a/media-sound/mangler/mangler-1.2.5-r1.ebuild
+++ b/media-sound/mangler/mangler-1.2.5-r1.ebuild
@ -1,8 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mangler/mangler-1.2.1.ebuild,v 1.2 2012/05/05 08:33:47 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mangler/mangler-1.2.5-r1.ebuild,v 1.1 2013/06/18 12:54:47 prometheanfire Exp $

-EAPI=2
+EAPI=5
+
+inherit toolchain-funcs

 DESCRIPTION="Open source VOIP client capable of connecting to Ventrilo 3.x servers"
 HOMEPAGE="http://www.mangler.org/"
@ -11,7 +13,7 @@ SRC_URI="http://www.mangler.org/downloads/${P}.tar.bz2"
 LICENSE="GPL-3 LGPL-2.1 ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+alsa celt espeak g15 +gsm oss pulseaudio static-libs +speex +xosd"
+IUSE="+alsa opus espeak g15 +gsm oss pulseaudio static-libs +speex +xosd"

 RDEPEND="dev-cpp/gtkmm:2.4
 	gnome-base/librsvg
@ -21,7 +23,7 @@ RDEPEND="dev-cpp/gtkmm:2.4
 	x11-libs/libX11
 	x11-libs/libXi
 	alsa? ( media-libs/alsa-lib )
-	celt? ( >=media-libs/celt-0.7.1 )
+	opus? ( media-libs/opus )
 	espeak? ( app-accessibility/espeak )
 	g15? ( app-misc/g15daemon )
 	gsm? ( media-sound/gsm )
@ -32,12 +34,13 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"

 src_configure() {
+	tc-export CC
 	econf \
 		--disable-dependency-tracking \
 		$(use_enable static-libs static) \
 		$(use_enable gsm) \
 		$(use_enable speex) \
-		$(use_enable celt) \
+		$(use_enable opus) \
 		$(use_enable xosd) \
 		$(use_enable g15) \
 		$(use_enable espeak) \
@ -47,7 +50,7 @@ src_configure() {
 }

 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 	dodoc AUTHORS ChangeLog

 	find "${D}" -name '*.la' -exec rm -f '{}' +
--- a/media-sound/mangler/metadata.xml
+++ b/media-sound/mangler/metadata.xml
@ -3,7 +3,6 @@
 <pkgmetadata>
  <herd>sound</herd>
  <use>
-    <flag name="celt">High quality, low delay audio codec</flag>
    <flag name="espeak">Text to speech engine</flag>
    <flag name="g15">Logitech g15 lcd support</flag>
    <flag name="opus">Codec specialized for speech over the internet</flag>
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Tue, 18 Jun 2013 05:36:56 +0000
+Tue, 18 Jun 2013 18:06:57 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Tue, 18 Jun 2013 05:36:56 +0000
+Tue, 18 Jun 2013 18:06:57 +0000
--- a/metadata/md5-cache/app-accessibility/brltty-4.2-r1
+++ b/metadata/md5-cache/app-accessibility/brltty-4.2-r1
@ -4,11 +4,11 @@ DESCRIPTION=Daemon that provides access to the Linux/Unix console for a blind pe
 EAPI=4
 HOMEPAGE=http://mielke.cc/brltty/
 IUSE=+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu java +learn-mode +midi nls ocaml +pcm python usb +speech tcl X elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=java? ( >=virtual/jre-1.4 ) bluetooth? ( net-wireless/bluez ) gpm? ( >=sys-libs/gpm-1.20 ) iconv? ( virtual/libiconv ) icu? ( dev-libs/icu ) nls? ( virtual/libintl ) python? ( >=dev-python/pyrex-0.9.4.1 ) tcl? ( >=dev-lang/tcl-8.4.15 ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libXaw ) java? ( >=dev-java/java-config-2.1.9-r1 )
 REQUIRED_USE=doc? ( api ) java? ( api ) ocaml? ( api ) python? ( api ) tcl? ( api )
 SLOT=0
 SRC_URI=http://mielke.cc/brltty/releases/brltty-4.2.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	f31a0ec0d081047cbf9c0bbb4822d831	findlib	9cf6020ee5481f39f1aa566a323f9868	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=046eca07f4e913bacbd40967064a17c6
+_md5_=865fc36a4916c4c3dd66e846774502b2
--- a/metadata/md5-cache/app-admin/logrotate-3.8.3
+++ b/metadata/md5-cache/app-admin/logrotate-3.8.3
@ -4,10 +4,10 @@ DESCRIPTION=Rotates, compresses, and mails system logs
 EAPI=4
 HOMEPAGE=https://fedorahosted.org/logrotate/
 IUSE=acl selinux
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux sec-policy/selinux-logrotate ) acl? ( virtual/acl )
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/l/o/logrotate/logrotate-3.8.3.tar.gz
 _eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2fbda06e67097f3b669184ad661d8405
+_md5_=a3077f0ee26c1ddb69055715a7dd22ec
--- a/metadata/md5-cache/app-admin/logrotate-3.8.4
+++ b/metadata/md5-cache/app-admin/logrotate-3.8.4
@ -4,10 +4,10 @@ DESCRIPTION=Rotates, compresses, and mails system logs
 EAPI=5
 HOMEPAGE=https://fedorahosted.org/logrotate/
 IUSE=acl selinux
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux sec-policy/selinux-logrotate ) acl? ( virtual/acl )
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/l/o/logrotate/logrotate-3.8.4.tar.gz
 _eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2755934c33669ee9e98cb61e39a7c83a
+_md5_=60cf0a3244bc482a2d31cf0d9b8288ef
--- a/metadata/md5-cache/app-admin/logrotate-3.8.5
+++ b/metadata/md5-cache/app-admin/logrotate-3.8.5
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux sec-policy/selinux-logrotate ) acl? ( virtual/acl ) >=sys-apps/sed-4
+DESCRIPTION=Rotates, compresses, and mails system logs
+EAPI=5
+HOMEPAGE=https://fedorahosted.org/logrotate/
+IUSE=acl selinux
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux sec-policy/selinux-logrotate ) acl? ( virtual/acl )
+SLOT=0
+SRC_URI=https://fedorahosted.org/releases/l/o/logrotate/logrotate-3.8.5.tar.gz
+_eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=16fd7b2b256348d6d856cf15e4fa0b89
--- a/metadata/md5-cache/app-admin/puppet-2.7.21-r1
+++ b/metadata/md5-cache/app-admin/puppet-2.7.21-r1
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby18? ( >=dev-ruby/facter-1.5.6[ruby_targets_ruby18] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby18] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby18] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby18] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby18] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby18] ) sqlite3? ( dev-ruby/sqlite3[ruby_targets_ruby18] ) virtual/ruby-ssl[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/facter-1.5.6[ruby_targets_ruby19] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby19] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby19] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby19] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby19] ) sqlite3? ( dev-ruby/sqlite3[ruby_targets_ruby19] ) virtual/ruby-ssl[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] ) emacs? ( virtual/emacs ) xemacs? ( app-editors/xemacs ) selinux? ( sec-policy/selinux-puppet ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DESCRIPTION=A system automation and configuration management software
+EAPI=4
+HOMEPAGE=http://puppetlabs.com/
+IUSE=augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite3 vim-syntax xemacs test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 test test
+KEYWORDS=~amd64 ~hppa ~ppc ~sparc ~x86
+LICENSE=Apache-2.0 GPL-2
+RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/facter-1.5.6[ruby_targets_ruby18] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby18] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby18] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby18] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby18] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby18] ) sqlite3? ( dev-ruby/sqlite3[ruby_targets_ruby18] ) virtual/ruby-ssl[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/facter-1.5.6[ruby_targets_ruby19] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby19] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby19] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby19] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby19] ) sqlite3? ( dev-ruby/sqlite3[ruby_targets_ruby19] ) virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] ) emacs? ( virtual/emacs ) xemacs? ( app-editors/xemacs ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) >=app-portage/eix-0.18.0 ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+SLOT=0
+SRC_URI=http://www.puppetlabs.com/downloads/puppet/puppet-2.7.21.tar.gz https://dev.gentoo.org/~prometheanfire/dist/patches/CVEs/puppet-2.7.21-CVE-2013-3567.patch
+_eclasses_=elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	f31a0ec0d081047cbf9c0bbb4822d831	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xemacs-elisp-common	81f5b5356f3397c277e83736c42256b5
+_md5_=49a333177503a7a3c3ffd14895722253
--- a/metadata/md5-cache/app-admin/puppet-2.7.22
+++ b/metadata/md5-cache/app-admin/puppet-2.7.22
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby18? ( >=dev-ruby/facter-1.5.6[ruby_targets_ruby18] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby18] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby18] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby18] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby18] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby18] ) sqlite3? ( dev-ruby/sqlite3[ruby_targets_ruby18] ) virtual/ruby-ssl[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/facter-1.5.6[ruby_targets_ruby19] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby19] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby19] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby19] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby19] ) sqlite3? ( dev-ruby/sqlite3[ruby_targets_ruby19] ) virtual/ruby-ssl[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] ) emacs? ( virtual/emacs ) xemacs? ( app-editors/xemacs ) selinux? ( sec-policy/selinux-puppet ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DESCRIPTION=A system automation and configuration management software
+EAPI=4
+HOMEPAGE=http://puppetlabs.com/
+IUSE=augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite3 vim-syntax xemacs test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 test test
+KEYWORDS=~amd64 ~hppa ~ppc ~sparc ~x86
+LICENSE=Apache-2.0 GPL-2
+RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/facter-1.5.6[ruby_targets_ruby18] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby18] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby18] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby18] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby18] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby18] ) sqlite3? ( dev-ruby/sqlite3[ruby_targets_ruby18] ) virtual/ruby-ssl[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/facter-1.5.6[ruby_targets_ruby19] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby19] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby19] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby19] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby19] ) sqlite3? ( dev-ruby/sqlite3[ruby_targets_ruby19] ) virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] ) emacs? ( virtual/emacs ) xemacs? ( app-editors/xemacs ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) >=app-portage/eix-0.18.0 ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+SLOT=0
+SRC_URI=http://www.puppetlabs.com/downloads/puppet/puppet-2.7.22.tar.gz
+_eclasses_=elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	f31a0ec0d081047cbf9c0bbb4822d831	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xemacs-elisp-common	81f5b5356f3397c277e83736c42256b5
+_md5_=c235344bc9ad9ceb94c438d254c89dfa
--- a/metadata/md5-cache/app-admin/puppet-3.1.1-r3
+++ b/metadata/md5-cache/app-admin/puppet-3.1.1-r3
@ -9,6 +9,6 @@ LICENSE=Apache-2.0 GPL-2
 RDEPEND=ruby_targets_ruby18? ( dev-ruby/hiera[ruby_targets_ruby18] >=dev-ruby/facter-1.6.2[ruby_targets_ruby18] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby18] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby18] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby18] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby18] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby18] ) sqlite3? ( dev-ruby/sqlite3[ruby_targets_ruby18] ) virtual/ruby-ssl[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/hiera[ruby_targets_ruby19] >=dev-ruby/facter-1.6.2[ruby_targets_ruby19] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby19] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby19] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby19] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby19] ) sqlite3? ( dev-ruby/sqlite3[ruby_targets_ruby19] ) virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
 SLOT=0
-SRC_URI=http://www.puppetlabs.com/downloads/puppet/puppet-3.1.1.tar.gz
+SRC_URI=http://www.puppetlabs.com/downloads/puppet/puppet-3.1.1.tar.gz https://dev.gentoo.org/~prometheanfire/dist/patches/CVEs/puppet-3.1.1-CVE-2013-3567.patch
 _eclasses_=elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	f31a0ec0d081047cbf9c0bbb4822d831	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	multilib	892e597faee02a5b94eb02ab512e7622	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xemacs-elisp-common	81f5b5356f3397c277e83736c42256b5
-_md5_=217a7d1b09e2271e80cd5ff91801a62d
+_md5_=f3b7d8257c2237241bfcea0688efd68f
--- a/metadata/md5-cache/app-admin/puppet-3.2.2
+++ b/metadata/md5-cache/app-admin/puppet-3.2.2
@ -9,6 +9,6 @@ LICENSE=Apache-2.0 GPL-2
 RDEPEND=ruby_targets_ruby18? ( dev-ruby/hiera[ruby_targets_ruby18] >=dev-ruby/facter-1.6.2[ruby_targets_ruby18] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby18] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby18] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby18] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby18] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby18] ) sqlite3? ( dev-ruby/sqlite3[ruby_targets_ruby18] ) virtual/ruby-ssl[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/hiera[ruby_targets_ruby19] >=dev-ruby/facter-1.6.2[ruby_targets_ruby19] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby19] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby19] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby19] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby19] ) sqlite3? ( dev-ruby/sqlite3[ruby_targets_ruby19] ) virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
 SLOT=0
-SRC_URI=http://www.puppetlabs.com/downloads/puppet/puppet-3.1.1.tar.gz
+SRC_URI=http://www.puppetlabs.com/downloads/puppet/puppet-3.2.2.tar.gz
 _eclasses_=elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	f31a0ec0d081047cbf9c0bbb4822d831	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	multilib	892e597faee02a5b94eb02ab512e7622	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xemacs-elisp-common	81f5b5356f3397c277e83736c42256b5
-_md5_=4f5c49d7885e38ec1a75bd439fde89d2
+_md5_=8ed2860801dd22e6acabd48805df25aa
--- a/metadata/md5-cache/app-editors/nano-2.3.2
+++ b/metadata/md5-cache/app-editors/nano-2.3.2
@ -4,10 +4,10 @@ DESCRIPTION=GNU GPL'd Pico clone with more functionality
 EAPI=3
 HOMEPAGE=http://www.nano-editor.org/ http://www.gentoo.org/doc/en/nano-basics-guide.xml
 IUSE=debug justify +magic minimal ncurses nls slang spell unicode
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.9-r1[unicode?] magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) )
 SLOT=0
 SRC_URI=http://www.nano-editor.org/dist/v2.3/nano-2.3.2.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	f31a0ec0d081047cbf9c0bbb4822d831	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0f4456f5e21ddacaa140b2955e6e67f1
+_md5_=b52447dcb91a13ce528be3b05695659f
--- a/metadata/md5-cache/app-emulation/virtualbox-additions-4.1.24
+++ b/metadata/md5-cache/app-emulation/virtualbox-additions-4.1.24
@ -3,10 +3,10 @@ DESCRIPTION=CD image containing guest additions for VirtualBox
 EAPI=2
 HOMEPAGE=http://www.virtualbox.org/
 KEYWORDS=amd64 x86
-LICENSE=PUEL
+LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
 RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://download.virtualbox.org/virtualbox/4.1.24/VBoxGuestAdditions_4.1.24.iso
 _eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=70adbcc2f57fb003b5397df9511c7793
+_md5_=6c12a11117a8cf711ec2cf57f4cbba26
--- a/metadata/md5-cache/app-emulation/virtualbox-additions-4.1.26
+++ b/metadata/md5-cache/app-emulation/virtualbox-additions-4.1.26
@ -3,10 +3,10 @@ DESCRIPTION=CD image containing guest additions for VirtualBox
 EAPI=2
 HOMEPAGE=http://www.virtualbox.org/
 KEYWORDS=amd64 x86
-LICENSE=PUEL
+LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
 RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://download.virtualbox.org/virtualbox/4.1.26/VBoxGuestAdditions_4.1.26.iso
 _eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ae50eecc81937d87a96f08ce6bbd2b71
+_md5_=ec4f4a65793ea1002835080c16246537
--- a/metadata/md5-cache/app-emulation/virtualbox-additions-4.2.10
+++ b/metadata/md5-cache/app-emulation/virtualbox-additions-4.2.10
@ -3,10 +3,10 @@ DESCRIPTION=CD image containing guest additions for VirtualBox
 EAPI=2
 HOMEPAGE=http://www.virtualbox.org/
 KEYWORDS=~amd64 ~x86
-LICENSE=PUEL
+LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
 RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://download.virtualbox.org/virtualbox/4.2.10/VBoxGuestAdditions_4.2.10.iso
 _eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7bda13f6027f6029dfa4daeb1e124653
+_md5_=39bff97583c161a2af7b50094d6f8903
--- a/metadata/md5-cache/app-emulation/virtualbox-additions-4.2.12
+++ b/metadata/md5-cache/app-emulation/virtualbox-additions-4.2.12
@ -3,10 +3,10 @@ DESCRIPTION=CD image containing guest additions for VirtualBox
 EAPI=2
 HOMEPAGE=http://www.virtualbox.org/
 KEYWORDS=~amd64 ~x86
-LICENSE=PUEL
+LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
 RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://download.virtualbox.org/virtualbox/4.2.12/VBoxGuestAdditions_4.2.12.iso
 _eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b03ce337c3e0ad3b7447b570f403f9c8
+_md5_=5cddf43c9e202584f5b497d0fb90fde2
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.1.24
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.1.24
@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
 DEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-4.1.24 x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) !!x11-drivers/xf86-input-virtualbox >=dev-util/kbuild-0.1.999 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-devel/dev86 sys-libs/pam sys-power/iasl X? ( x11-proto/renderproto ) !X? ( x11-proto/xproto ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=VirtualBox kernel modules and user-space tools for Linux guests
+DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
 EAPI=2
 HOMEPAGE=http://www.virtualbox.org/
 IUSE=X kernel_linux
@ -10,4 +10,4 @@ RDEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-4.1.24 x11-apps/xrandr x11-apps/
 SLOT=0
 SRC_URI=http://download.virtualbox.org/virtualbox/4.1.24/VirtualBox-4.1.24.tar.bz2
 _eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=bf41e46f196e65a160afb57809d9ec8f
+_md5_=1c2e5f3bc0e9026c9662cacc1f516e73
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.1.26
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.1.26
@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
 DEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-4.1.26 x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) !!x11-drivers/xf86-input-virtualbox >=dev-util/kbuild-0.1.999 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-devel/dev86 sys-libs/pam sys-power/iasl X? ( x11-proto/renderproto ) !X? ( x11-proto/xproto ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=VirtualBox kernel modules and user-space tools for Linux guests
+DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
 EAPI=2
 HOMEPAGE=http://www.virtualbox.org/
 IUSE=X kernel_linux
@ -10,4 +10,4 @@ RDEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-4.1.26 x11-apps/xrandr x11-apps/
 SLOT=0
 SRC_URI=http://download.virtualbox.org/virtualbox/4.1.26/VirtualBox-4.1.26.tar.bz2
 _eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=773aba2a6f69774741d203f01d2a5bc3
+_md5_=22d272dfde9017a1cc04e9d4ec40609e
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.2.10
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.2.10
@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
 DEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-4.2.10 x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox >=dev-util/kbuild-0.1.9998_pre20120806 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl X? ( x11-proto/renderproto ) !X? ( x11-proto/xproto ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=VirtualBox kernel modules and user-space tools for Linux guests
+DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
 EAPI=2
 HOMEPAGE=http://www.virtualbox.org/
 IUSE=X kernel_linux
@ -10,4 +10,4 @@ RDEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-4.2.10 x11-apps/xrandr x11-apps/
 SLOT=0
 SRC_URI=http://download.virtualbox.org/virtualbox/4.2.10/VirtualBox-4.2.10.tar.bz2
 _eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=30207545f6c9358787d75c8d33786c37
+_md5_=0d54c8f5d67d9c65ac855386b2786c0e
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.2.12
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.2.12
@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
 DEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-4.2.12 x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox >=dev-util/kbuild-0.1.9998_pre20120806 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl X? ( x11-proto/renderproto ) !X? ( x11-proto/xproto ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) virtual/pkgconfig
-DESCRIPTION=VirtualBox kernel modules and user-space tools for Linux guests
+DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
 EAPI=2
 HOMEPAGE=http://www.virtualbox.org/
 IUSE=X kernel_linux
@ -10,4 +10,4 @@ RDEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-4.2.12 x11-apps/xrandr x11-apps/
 SLOT=0
 SRC_URI=http://download.virtualbox.org/virtualbox/4.2.12/VirtualBox-4.2.12.tar.bz2
 _eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=e92e6292381159ac40401032cdb2cde1
+_md5_=1837b2d1e8043b72433cd01b2789c2f7
--- a/Show more
+++ b/Show more