Sync with portage [Tue Aug 11 11:07:28 MSK 2015].

app-crypt/zuluCrypt/Manifest

@@ -0,0 +1 @@
+DIST zuluCrypt-4.7.6.tar.bz2 582120 SHA256 b39533de700608a0d1981eb6818f8e103c948c342ba3de36f2f4a0520664294b SHA512 bcf3dd31997ba7db47df4beae2c1e54d031b9c468517475fb7ea6a73e3cf787aaf87a4fdc3cfbb3e54cc0ed8ea218b92014315e940ecb722e0b748248367a2b7 WHIRLPOOL e4d1ca05ebce4c33a8b849e96917b842a1a0330a57700e94fc3f1d1af6a13bcfca9d2039e58f6b4b9353c14296d9feaf898b3de47c3ccd6cc11517be5f07088f

app-crypt/zuluCrypt/metadata.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
+	</maintainer>
+	<use>
+		<flag name='gnome'>Enable support for the freedesktop.org
+			Secret Service API via <pkg>app-crypt/libsecret</pkg>.
+			This does not control the gui!
+		</flag>
+		<flag name='gui'>Whether to build the QT gui. Highly recommended.
+		</flag>
+		<flag name='kde'>Enable support for KDE, e.g. via
+			<pkg>kde-base/kwalletd</pkg>. This does not control the gui,
+			but NEEDS GUI ENABLED!
+		</flag>
+		<flag name='udev'>Whether udev will be consulted when deciding
+			if a volume is system or not.
+		</flag>
+	</use>
+</pkgmetadata>

app-crypt/zuluCrypt/zuluCrypt-4.7.6.ebuild

@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib cmake-utils
+
+DESCRIPTION="Front end to cryptsetup"
+HOMEPAGE="http://mhogomchungu.github.io/zuluCrypt/"
+SRC_URI="https://github.com/mhogomchungu/zuluCrypt/releases/download/${PV}/zuluCrypt-${PV}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome +gui kde udev"
+
+CDEPEND="
+	dev-libs/libgcrypt:0
+	sys-apps/util-linux
+	sys-fs/cryptsetup
+	gnome? ( app-crypt/libsecret )
+	gui? (
+		dev-libs/libpwquality
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		kde? (
+			kde-base/kdelibs:4
+			kde-apps/kwalletd:4
+		)
+	)
+"
+RDEPEND="${CDEPEND}
+	udev? ( virtual/udev )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use udev UDEVSUPPORT)
+		-DLIB_SUFFIX="$(get_libdir)"
+		$(cmake-utils_use !gnome NOGNOME)
+		$(cmake-utils_use !gui NOGUI)
+		# WITH_PWQUALITY has no effect without gui
+		$(cmake-utils_use gui WITH_PWQUALITY)
+		# KDE has no effect without gui
+		$(usex gui "$(cmake-utils_use !kde NOKDE)" "-DNOKDE=TRUE")
+	)
+
+	cmake-utils_src_configure
+}

app-editors/xemacs/xemacs-21.4.24.ebuild

@@ -18,7 +18,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha ~amd64 hppa ppc ppc64 sparc ~x86"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc ~x86"
 IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xim athena neXt Xaw3d gdbm berkdb"
 
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"

app-emacs/ess/ess-15.03.1.ebuild

@@ -13,7 +13,7 @@ SRC_URI="http://ess.r-project.org/downloads/ess/${MY_P}.tgz"
 
 LICENSE="GPL-2+ GPL-3+ Texinfo-manual"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 DEPEND="app-text/texi2html
 	virtual/latex-base"

app-emulation/lxd/lxd-0.13.ebuild

@@ -67,7 +67,7 @@ src_compile() {
 	cd "${S}/src/${EGO_PN}"
 
 	# Build binaries
-	GOPATH="${S}" emake
+	GOPATH="${S}:$(get_golibdir_gopath)" emake
 
 	use nls && emake build-mo
 }

app-emulation/lxd/lxd-0.14.ebuild

@@ -68,7 +68,7 @@ src_compile() {
 	cd "${S}/src/${EGO_PN}"
 
 	# Build binaries
-	GOPATH="${S}" emake
+	GOPATH="${S}:$(get_golibdir_gopath)" emake
 
 	use nls && emake build-mo
 }

app-misc/fdupes/fdupes-9999.ebuild

@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic git-r3 toolchain-funcs
+
+MY_P="${PN}-${PV/_pre/-PR}"
+
+DESCRIPTION="Identify/delete duplicate files residing within specified directories"
+HOMEPAGE="https://github.com/adrianlopezroche/fdupes https://code.google.com/p/fdupes/"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/adrianlopezroche/fdupes.git"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-makefile.patch
+
+	append-lfs-flags
+	tc-export CC
+}
+
+src_install() {
+	dobin fdupes
+	doman fdupes.1
+	dodoc CHANGES CONTRIBUTORS README TODO
+}

app-misc/fdupes/files/fdupes-1.50_pre2-lfs.patch

@@ -1,21 +0,0 @@
-diff -urNp fdupes-1.50-PR2.orig/fdupes.c fdupes-1.50-PR2/fdupes.c
---- fdupes-1.50-PR2.orig/fdupes.c	2009-01-31 20:11:49.577968848 +0530
-+++ fdupes-1.50-PR2/fdupes.c	2009-01-31 20:29:17.103220311 +0530
-@@ -643,7 +643,7 @@ void printmatches(file_t *files)
-   while (files != NULL) {
-     if (files->hasdupes) {
-       if (!ISFLAG(flags, F_OMITFIRST)) {
--	if (ISFLAG(flags, F_SHOWSIZE)) printf("%ld byte%seach:\n", files->size,
-+	if (ISFLAG(flags, F_SHOWSIZE)) printf("%lld byte%seach:\n", files->size,
- 	 (files->size != 1) ? "s " : " ");
- 	if (ISFLAG(flags, F_DSAMELINE)) escapefilename("\\ ", &files->d_name);
- 	printf("%s%c", files->d_name, ISFLAG(flags, F_DSAMELINE)?' ':'\n');
-@@ -796,7 +796,7 @@ void deletefiles(file_t *files, int prom
-       do {
- 	printf("Set %d of %d, preserve files [1 - %d, all]", 
-           curgroup, groups, counter);
--	if (ISFLAG(flags, F_SHOWSIZE)) printf(" (%ld byte%seach)", files->size,
-+	if (ISFLAG(flags, F_SHOWSIZE)) printf(" (%lld byte%seach)", files->size,
- 	  (files->size != 1) ? "s " : " ");
- 	printf(": ");
- 	fflush(stdout);

app-misc/fdupes/files/fdupes-1.50_pre2-makefile.patch

@@ -1,23 +0,0 @@
---- fdupes-1.50-PR2/Makefile.orig	2010-11-19 19:05:18.152330536 -0800
-+++ fdupes-1.50-PR2/Makefile	2010-11-19 19:06:00.998659992 -0800
-@@ -72,9 +72,9 @@
- # Make Configuration
- #
- CC = gcc
--COMPILER_OPTIONS = -Wall -O -g
-+COMPILER_OPTIONS = -Wall
- 
--CFLAGS= $(COMPILER_OPTIONS) -I. -DVERSION=\"$(VERSION)\" $(EXTERNAL_MD5) $(EXPERIMENTAL_RBTREE) $(OMIT_GETOPT_LONG)
-+CFLAGS += $(COMPILER_OPTIONS) -I. -DVERSION=\"$(VERSION)\" $(EXTERNAL_MD5) $(EXPERIMENTAL_RBTREE) $(OMIT_GETOPT_LONG)
- 
- INSTALL_PROGRAM = $(INSTALL) -c -m 0755
- INSTALL_DATA    = $(INSTALL) -c -m 0644
-@@ -94,7 +94,7 @@
- all: fdupes
- 
- fdupes: $(OBJECT_FILES)
--	$(CC) $(CFLAGS) -o fdupes $(OBJECT_FILES)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o fdupes $(OBJECT_FILES)
- 
- installdirs:
- 	test -d $(BIN_DIR) || -$(MKDIR) $(BIN_DIR)

app-misc/fdupes/files/fdupes-9999-makefile.patch

@@ -0,0 +1,28 @@
+ Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 921d910..67576f9 100644
+--- a/Makefile
++++ b/Makefile
+@@ -78,9 +78,9 @@ MKDIR   = mkdir -p
+ # Make Configuration
+ #
+ CC ?= gcc
+-COMPILER_OPTIONS = -Wall -O -g
++CFLAGS ?= -Wall -O -g
+ 
+-CFLAGS= $(COMPILER_OPTIONS) -I. -DVERSION=\"$(VERSION)\" $(EXTERNAL_MD5) $(OMIT_GETOPT_LONG) $(FILEOFFSET_64BIT)
++CFLAGS += -I. -DVERSION=\"$(VERSION)\" $(EXTERNAL_MD5) $(OMIT_GETOPT_LONG) $(FILEOFFSET_64BIT)
+ 
+ INSTALL_PROGRAM = $(INSTALL) -c -m 0755
+ INSTALL_DATA    = $(INSTALL) -c -m 0644
+@@ -100,7 +100,7 @@ OBJECT_FILES = fdupes.o md5/md5.o $(ADDITIONAL_OBJECTS)
+ all: fdupes
+ 
+ fdupes: $(OBJECT_FILES)
+-	$(CC) $(CFLAGS) -o fdupes $(OBJECT_FILES)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o fdupes $(OBJECT_FILES)
+ 
+ installdirs:
+ 	test -d $(DESTDIR)$(BIN_DIR) || $(MKDIR) $(DESTDIR)$(BIN_DIR)

app-misc/gtk-sunlight/gtk-sunlight-0.4.2.ebuild

@@ -16,7 +16,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-libs/glib:2
-	x11-libs/gtk+:2"
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3"
 DEPEND="${REPEND}
 	virtual/pkgconfig"
 

app-text/mupdf/files/mupdf-1.5-format-security-error.patch

@@ -0,0 +1,22 @@
+From: =?utf-8?q?=22Kan-Ru_Chen_=28=E9=99=B3=E4=BE=83=E5=A6=82=29=22?=
+ <koster@debian.org>
+Date: Sat, 20 Sep 2014 13:12:16 +0800
+Subject: Fix -Werror=format-security error
+
+---
+ source/pdf/pdf-op-run.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/source/pdf/pdf-op-run.c b/source/pdf/pdf-op-run.c
+index 2bea94b..da881b2 100644
+--- a/source/pdf/pdf-op-run.c
++++ b/source/pdf/pdf-op-run.c
+@@ -1729,7 +1729,7 @@ run_xobject(pdf_csi *csi, void *state, pdf_obj *resources, pdf_xobject *xobj, co
+ 
+ 	/* Rethrow postponed errors */
+ 	if (errmess[0])
+-		fz_throw(ctx, FZ_ERROR_GENERIC, errmess);
++		fz_throw(ctx, FZ_ERROR_GENERIC, "%s", errmess);
+ }
+ 
+ static void pdf_run_BDC(pdf_csi *csi, void *state)

app-text/mupdf/mupdf-1.5-r1.ebuild

@@ -41,7 +41,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-1.3-CFLAGS.patch \
 		"${FILESDIR}"/${PN}-1.5-old-debian-files.patch \
 		"${FILESDIR}"/${PN}-1.3-pkg-config.patch \
-		"${FILESDIR}"/${PN}-1.5-Makerules-openssl-curl.patch
+		"${FILESDIR}"/${PN}-1.5-Makerules-openssl-curl.patch \
+		"${FILESDIR}"/${PN}-1.5-format-security-error.patch
 
 	if has_version ">=media-libs/openjpeg-2.1:2" ; then
 		epatch \

dev-db/sqlitebrowser/Manifest

@@ -1,3 +1,3 @@
-DIST sqlitebrowser-3.3.1.tar.gz 818842 SHA256 5113d3b4c219585fe017047556363d4934b2b3e3f7c3f0968b87e9eac0156d22 SHA512 3cb44631f39b1c1a90b86502761826830054f440509faaece36052958af361185d41335f763499cec5fc005cc90eb7be403c4ac2a5cec655fe63d989434880bc WHIRLPOOL c4ab107ac97800c14ce788e4742beb528f40c74dc787217fdc9fe5dc1f0d8a67b97cd3fc9e6842b54e321d287fff925f050a20d22fbfe5e7491d4c2140c1f6de
 DIST sqlitebrowser-3.5.1.tar.gz 874540 SHA256 d7f3d1e54882ebabab3b2f7764a6bb921d4fe319db84a092147c941ce19feb8d SHA512 815665002932a606c7e1da8738be0d94a0b2bf330042af30d5b4033ce27c548fec1a05b51f2a11a7620d4e123961ba63595b60aec7eac716e5d3747bb90886e2 WHIRLPOOL 1b8984eefe730ef468fc64bff1465de3a5b273e3e1594916f05cbe07bec315126001b42cc05d6a3c153aaaccab39bdafa29d31f83fceba6aa7697df7ff870462
 DIST sqlitebrowser-3.6.0.tar.gz 1453029 SHA256 221a410a3ec8512a766ed8bc4cade1f3b1cde94e41e52743d5a6d2a33acb3a56 SHA512 ae4a0bb9ac8ff01ec965ae264a41fe7749672cd6562f0ce5e5b69007ea403fff5dcc4f90be3ffa4d9b7d1dc293767f2ca7757de55895f56efbe6b7be0e6721df WHIRLPOOL 93e053d8b6cf9e67f0294117995443865e29923c899a0263ce117979f982155e4020a88ba865a4b92d162fc8842f5b95c4b512575d153cb7f9fa9445880e1b5c
+DIST sqlitebrowser-3.7.0.tar.gz 1509766 SHA256 3093a1dcf5b3138c1adf29857d62249ab2b068e70b001869a31151763e28cc3a SHA512 f4c2f517a0b04fb74d8ec656e34f93d467a233040b36fab8f6f172681eb213be5c08131ecdaaa542d833bf24ef564d8e6f800e861b9a20d53de7a585aa104533 WHIRLPOOL 3bbfaa99f179c10f542d344ce6fe55656aa750a52925b2de590e2ba24bcafa95604646e6b218bca4f461390268de2bc2fb29d0de1deaf06438b33cb660e614e8

dev-db/sqlitebrowser/files/sqlitebrowser-3.3.1-unbundle.patch

@@ -1,46 +0,0 @@
- CMakeLists.txt | 12 ++----------
- 1 file changed, 2 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 68f049e..474e613 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -7,13 +7,9 @@ if(NOT CMAKE_BUILD_TYPE)
-     set(CMAKE_BUILD_TYPE "Release")
- endif()
- 
--set(ANTLR_DIR libs/antlr-2.7.7)
- set(QHEXEDIT_DIR libs/qhexedit)
--set(QCUSTOMPLOT_DIR libs/qcustomplot-source)
- 
--add_subdirectory(${ANTLR_DIR})
- add_subdirectory(${QHEXEDIT_DIR})
--add_subdirectory(${QCUSTOMPLOT_DIR})
- 
- if(USE_QT5)
- 	find_package(Qt5Widgets REQUIRED)
-@@ -165,9 +161,7 @@ endif(APPLE)
- 
- include_directories(
- 		"${CMAKE_CURRENT_BINARY_DIR}"
--		${ANTLR_DIR}
- 		${QHEXEDIT_DIR}
--		${QCUSTOMPLOT_DIR}
- 		${ADDITIONAL_INCLUDE_PATHS}
- 		src)
- 
-@@ -183,12 +177,10 @@ if(USE_QT5)
-     qt5_use_modules(${PROJECT_NAME} Gui Widgets Network Test PrintSupport)
-     set(QT_LIBRARIES "")
- endif()
--add_dependencies(${PROJECT_NAME} antlr qhexedit qcustomplot)
-+add_dependencies(${PROJECT_NAME} qhexedit)
- 
- link_directories(
--		"${CMAKE_CURRENT_BINARY_DIR}/${ANTLR_DIR}"
--		"${CMAKE_CURRENT_BINARY_DIR}/${QHEXEDIT_DIR}"
--		"${CMAKE_CURRENT_BINARY_DIR}/${QCUSTOMPLOT_DIR}")
-+		"${CMAKE_CURRENT_BINARY_DIR}/${QHEXEDIT_DIR}")
- 
- target_link_libraries(${PROJECT_NAME}
- 		antlr

dev-db/sqlitebrowser/files/sqlitebrowser-3.6.0-unbundle.patch

@@ -1,75 +0,0 @@
---- sqlitebrowser-3.6.0/CMakeLists.txt
-+++ sqlitebrowser-3.6.0/CMakeLists.txt
-@@ -21,15 +21,9 @@
- 	set(CMAKE_PREFIX_PATH "${QT5_PATH};${SQLITE3_PATH}")
- endif()
- 
--set(ANTLR_DIR libs/antlr-2.7.7)
- set(QHEXEDIT_DIR libs/qhexedit)
--set(QCUSTOMPLOT_DIR libs/qcustomplot-source)
--set(QSCINTILLA_DIR libs/qscintilla/Qt4Qt5)
- 
--add_subdirectory(${ANTLR_DIR})
- add_subdirectory(${QHEXEDIT_DIR})
--add_subdirectory(${QCUSTOMPLOT_DIR})
--add_subdirectory(${QSCINTILLA_DIR})
- 
- if(USE_QT5)
- 	find_package(Qt5Widgets REQUIRED)
-@@ -31,7 +31,7 @@
-     set(CMAKE_AUTOMOC ON)
-     set(CMAKE_INCLUDE_CURRENT_DIR ON)
- else()
--    find_package(Qt4 COMPONENTS QtCore QtGui QtNetwork REQUIRED)
-+    find_package(Qt4 COMPONENTS QtCore QtGui QtNetwork qscintilla2 REQUIRED)
-     include("${QT_USE_FILE}")
-     add_definitions(${QT_DEFINITIONS})
- endif()
-@@ -207,10 +201,7 @@
- 
- include_directories(
- 		"${CMAKE_CURRENT_BINARY_DIR}"
--		${ANTLR_DIR}
- 		${QHEXEDIT_DIR}
--		${QCUSTOMPLOT_DIR}
--		${QSCINTILLA_DIR}
- 		${ADDITIONAL_INCLUDE_PATHS}
- 		src)
- 
-@@ -227,13 +218,10 @@
-     qt5_use_modules(${PROJECT_NAME} Gui Widgets Network Test PrintSupport)
-     set(QT_LIBRARIES "")
- endif()
--add_dependencies(${PROJECT_NAME} antlr qhexedit qcustomplot qscintilla2)
-+add_dependencies(${PROJECT_NAME} qhexedit)
- 
- link_directories(
--		"${CMAKE_CURRENT_BINARY_DIR}/${ANTLR_DIR}"
--		"${CMAKE_CURRENT_BINARY_DIR}/${QHEXEDIT_DIR}"
--		"${CMAKE_CURRENT_BINARY_DIR}/${QCUSTOMPLOT_DIR}"
--		"${CMAKE_CURRENT_BINARY_DIR}/${QSCINTILLA_DIR}")
-+		"${CMAKE_CURRENT_BINARY_DIR}/${QHEXEDIT_DIR}")
- 
- target_link_libraries(${PROJECT_NAME}
- 		antlr
---- sqlitebrowser-3.6.0/tests/CMakeLists.txt
-+++ sqlitebrowser-3.6.0/tests/CMakeLists.txt
-@@ -7,9 +7,6 @@
-     set(CMAKE_BUILD_TYPE "Release")
- endif()
- 
--set(ANTLR_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../libs/antlr-2.7.7")
--add_subdirectory("${ANTLR_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/antlr")
--
- if(USE_QT5)
-     find_package(Qt5Widgets REQUIRED)
-     set(CMAKE_AUTOMOC ON)
-@@ -65,7 +62,7 @@
-     QT4_WRAP_UI(SQLB_FORM_HDR ${SQLB_FORMS})
- endif()
- 
--include_directories("${CMAKE_CURRENT_BINARY_DIR}" "${ANTLR_DIR}" ../src)
-+include_directories("${CMAKE_CURRENT_BINARY_DIR}" ../src)
- 
- add_executable(${PROJECT_NAME} ${SQLB_MOC} ${SQLB_HDR} ${SQLB_SRC} ${SQLB_FORM_HDR})
- 

dev-db/sqlitebrowser/files/sqlitebrowser-3.7.0-unbundle.patch

@@ -0,0 +1,18 @@
+--- sqlitebrowser-3.7.0/CMakeLists.txt
++++ sqlitebrowser-3.7.0/CMakeLists.txt
+@@ -29,15 +29,9 @@
+ find_package(Antlr2)
+ 
+ set(QHEXEDIT_DIR libs/qhexedit)
+-set(QCUSTOMPLOT_DIR libs/qcustomplot-source)
+ set(QSCINTILLA_DIR libs/qscintilla/Qt4Qt5)
+ 
+-if(NOT ANTLR2_FOUND)
+-    set(ANTLR_DIR libs/antlr-2.7.7)
+-    add_subdirectory(${ANTLR_DIR})
+-endif()
+ add_subdirectory(${QHEXEDIT_DIR})
+-add_subdirectory(${QCUSTOMPLOT_DIR})
+ add_subdirectory(${QSCINTILLA_DIR})
+ 
+ if(USE_QT5)

dev-db/sqlitebrowser/sqlitebrowser-3.7.0.ebuild

@@ -4,6 +4,8 @@
 
 EAPI=5
 
+CMAKE_MAKEFILE_GENERATOR=ninja
+
 inherit eutils cmake-utils
 
 DESCRIPTION="SQLite Database Browser"
@@ -13,27 +15,41 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3 MPL-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="qt4 qt5 test"
+
+REQUIRED_USE="^^ ( qt4 qt5 )"
 
 DEPEND="
+	dev-db/sqlite:3
 	dev-java/antlr:0[cxx]
-	dev-libs/qcustomplot[-qt5(-)]
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4"
+	dev-libs/qcustomplot[qt5=]
+	x11-libs/qscintilla
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	qt5? (
+		dev-qt/linguist:5
+		dev-qt/linguist-tools:5
+		dev-qt/qtnetwork:5
+		dev-qt/qttest:5
+		dev-qt/qtwidgets:5
+	)"
 RDEPEND="${DEPEND}"
 
 PATCHES=( "${FILESDIR}"/${P}-unbundle.patch )
 
 src_prepare() {
 	# https://github.com/qingfengxia/qhexedit still bundled
+	# x11-libs/qscintilla[qt4?,qt5?] still bundled
 	find libs/{antlr-2.7.7,qcustomplot-source} -delete || die
 	cmake-utils_src_prepare
 }
 
 src_configure() {
-	# Wait for unmask
 	local mycmakeargs=(
-		-DUSE_QT5=OFF
+		$(cmake-utils_use_use qt5)
+		$(cmake-utils_use_enable test TESTING)
 	)
 	cmake-utils_src_configure
 }
@@ -41,5 +57,4 @@ src_configure() {
 src_install() {
 	cmake-utils_src_install
 	doicon images/sqlitebrowser.svg
-	domenu distri/sqlitebrowser.desktop
 }

dev-go/go-crypto/Manifest

@@ -1 +1 @@
-DIST go-crypto-0_pre20150608.tar.gz 874125 SHA256 2980e16b13dbe52fd2f5128e06c664fe5712a52efa185fa3578d8abc6a124406 SHA512 6ad4e8ecf8c19c5428bd560b90a97bd7db084038e5afaa197a3d76349639e41ac3992e8bafe701b9f32e30ed63a6d0d511fd98cbcc2039f338f4bc174ad03e0e WHIRLPOOL d18fed06e4f2d4bdbde42aeaf02ece2a5c8264f1b222aadfe1c49f16ba814ab15f4d1d9f6050fbdd83825d7dec273e4f14ac95dae2db08ed7472a57fbb55e7bc
+DIST go-crypto-0_pre20150808.tar.gz 876947 SHA256 9ff25a17515c6c7ff0d13fb076ba7a1df868ce30fca105277b3f0356ce801518 SHA512 86826102ff7242259d79a31e543a03192d6b68a06635b46ebac349111bb8451605df1ad9b249c08d75895c38fb4ebbbfc716d40c8c981485395164e87db5a519 WHIRLPOOL 5e1a0372d0a2f493e68c213ce866237cab316c1bf712f2c58a95c16c6864c48ea795e5a6e1346aad7459f666802170aeb0db8f781423fb1d8e252e5bced2e435

dev-go/go-crypto/go-crypto-0_pre20150608.ebuild

@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KEYWORDS="~amd64"
-DESCRIPTION="Go supplementary cryptography libraries"
-MY_PN=${PN##*-}
-GO_PN=golang.org/x/${MY_PN}
-HOMEPAGE="https://godoc.org/${GO_PN}"
-EGIT_COMMIT="1e856cbfdf9bc25eefca75f83f25d55e35ae72e0"
-SRC_URI="https://github.com/golang/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-DEPEND=">=dev-lang/go-1.4"
-RDEPEND=""
-S="${WORKDIR}/src/${GO_PN}"
-EGIT_CHECKOUT_DIR="${S}"
-STRIP_MASK="*.a"
-
-src_unpack() {
-	default
-	mkdir -p src/${GO_PN%/*} || die
-	mv ${MY_PN}-${EGIT_COMMIT} src/${GO_PN} || die
-}
-
-src_prepare() {
-	# disable broken tests
-	sed -e 's:TestAgentForward(:_\0:' -i ssh/test/agent_unix_test.go || die
-	sed -e 's:TestRunCommandSuccess(:_\0:' \
-		-e 's:TestRunCommandStdin(:_\0:' \
-		-e 's:TestRunCommandStdinError(:_\0:' \
-		-e 's:TestRunCommandWeClosed(:_\0:' \
-		-e 's:TestFuncLargeRead(:_\0:' \
-		-e 's:TestKeyChange(:_\0:' \
-		-e 's:TestValidTerminalMode(:_\0:' \
-		-i ssh/test/session_test.go || die
-}
-
-src_compile() {
-	# Create a writable GOROOT in order to avoid sandbox violations.
-	GOROOT="${WORKDIR}/goroot"
-	cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
-	rm -rf "${GOROOT}/src/${GO_PN%/*}" \
-		"${GOROOT}/pkg/linux_${ARCH}/${GO_PN%/*}" || die
-	GOROOT="${GOROOT}" GOPATH=${WORKDIR} go install -v -x -work ${GO_PN}/... || die
-}
-
-src_test() {
-	GOROOT="${GOROOT}" GOPATH=${WORKDIR} \
-		go test -x -v ${GO_PN}/... || die $?
-}
-
-src_install() {
-	insinto /usr/lib/go
-	find "${WORKDIR}"/{pkg,src} -name '.git*' -exec rm -rf {} \; 2>/dev/null
-	insopts -m0644 -p # preserve timestamps for bug 551486
-	doins -r "${WORKDIR}"/{pkg,src}
-}

dev-go/go-crypto/go-crypto-0_pre20150808.ebuild

@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+EGO_PN=golang.org/x/crypto/...
+EGO_SRC=golang.org/x/crypto
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	EGIT_COMMIT="83f1503f771a82af8a31f358eb825e9efb5dae6c"
+	SRC_URI="https://github.com/golang/crypto/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Go supplementary cryptography libraries"
+HOMEPAGE="https://godoc.org/golang.org/x/crypto"
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE=""
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+	# disable broken tests
+	sed -e 's:TestAgentForward(:_\0:' \
+		-i src/${EGO_SRC}/ssh/test/agent_unix_test.go || die
+	sed -e 's:TestRunCommandSuccess(:_\0:' \
+		-e 's:TestRunCommandStdin(:_\0:' \
+		-e 's:TestRunCommandStdinError(:_\0:' \
+		-e 's:TestRunCommandWeClosed(:_\0:' \
+		-e 's:TestFuncLargeRead(:_\0:' \
+		-e 's:TestKeyChange(:_\0:' \
+		-e 's:TestValidTerminalMode(:_\0:' \
+		-i src/${EGO_SRC}/ssh/test/session_test.go || die
+}
+
+src_compile() {
+	# Create a writable GOROOT in order to avoid sandbox violations.
+	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
+	rm -rf "${T}/goroot/src/${EGO_SRC}" || die
+	rm -rf "${T}/goroot/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_SRC}" || die
+	export GOROOT="${T}/goroot"
+	golang-build_src_compile
+}

dev-go/go-net/Manifest

@@ -1,2 +1 @@
-DIST go-net-0_pre20150604.tar.gz 470847 SHA256 407c9a5796baabb40a04cc09fcbc21efc0df72c38e95550054f8191741ad6207 SHA512 5bf62beed4a5d847dd4034fb713412f26f48d392c133ad4ac7409b75af82cb4b72ce46c3dbda7aab58d42879db4bb120432722362f7b8d2cb8131e9f3709c4e5 WHIRLPOOL ab69bca5c7c72a88d64a694b01911645850cea7741798934d3350a49d57704c0be99a9ebaca7582aed5e03be64dd3daf25778e3193b65f9cad522d6b62397c82
 DIST go-net-0_pre20150804.tar.gz 539435 SHA256 77fb87becd3ddb68ff06acd3a1bf1246b390e7489b3e25a9ee9314f7457ccf60 SHA512 02a9734f8335909a15280e925b11ff03b96fbedd6e48fa5c3f869ab1a8b3062971d634f7043f92cee685c618222b147fdee915f1d5d83bd82cdde171970287e3 WHIRLPOOL a63befad593737449f393d7f4490b1680d8cba808f6163b9723b0d1d228480cdcbf9e2fb091ffc96f9121aabde1e24b06f3ddcb7b30e4bffa6e39dece5a8b3e0

dev-go/go-net/go-net-0_pre20150604.ebuild

@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KEYWORDS="~amd64"
-DESCRIPTION="Go supplementary network libraries"
-MY_PN=${PN##*-}
-GO_PN=golang.org/x/${MY_PN}
-HOMEPAGE="https://godoc.org/${GO_PN}"
-EGIT_COMMIT="dfe268fd2bb5c793f4c083803609fce9806c6f80"
-SRC_URI="https://github.com/golang/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-DEPEND=">=dev-lang/go-1.4
-	dev-go/go-text"
-RDEPEND=""
-S="${WORKDIR}/src/${GO_PN}"
-EGIT_CHECKOUT_DIR="${S}"
-STRIP_MASK="*.a"
-
-src_unpack() {
-	default
-	mkdir -p src/${GO_PN%/*} || die
-	mv ${MY_PN}-${EGIT_COMMIT} src/${GO_PN} || die
-}
-
-src_prepare() {
-	# disable broken tests
-	sed -e 's:TestReadProppatch(:_\0:' -i webdav/xml_test.go || die
-	sed -e 's:TestPingGoogle(:_\0:' \
-		-e 's:TestNonPrivilegedPing(:_\0:' \
-		-i icmp/ping_test.go || die
-}
-
-src_compile() {
-	# Create a writable GOROOT in order to avoid sandbox violations.
-	GOROOT="${WORKDIR}/goroot"
-	cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
-	rm -rf "${GOROOT}/src/${GO_PN}" \
-		"${GOROOT}/pkg/linux_${ARCH}/${GO_PN}" || die
-	GOROOT="${GOROOT}" GOPATH=${WORKDIR} go install -v -x -work ${GO_PN}/... || die
-}
-
-src_test() {
-	GOROOT="${GOROOT}" GOPATH=${WORKDIR} \
-		go test -x -v ${GO_PN}/... || die $?
-}
-
-src_install() {
-	insinto /usr/lib/go
-	find "${WORKDIR}"/{pkg,src} -name '.git*' -exec rm -rf {} \; 2>/dev/null
-	insopts -m0644 -p # preserve timestamps for bug 551486
-	doins -r "${WORKDIR}"/{pkg,src}
-}

dev-go/go-oauth2/Manifest

@@ -1,4 +1,2 @@
-DIST gcloud-golang-629ed086d82ad5d0ac3668e309b8785aaf54735b.tar.gz 144387 SHA256 bee11c31bc0f8914b4b72463033eb7432f28cec490673f4a12618b64868ee1f5 SHA512 33bdb3a9b3379bdd2502ade3ee9a41601effbd3f4bae88a7a7b4931866b73b336846b50994b254cac85571693566e12f4a23a0b8a0428d6aef1b301d468ef417 WHIRLPOOL 50426185042fe8b754b2db30b11fce588a189cb61e3e9781409edde6a5deb15a109ed1bf78e5831414762f497d3a6dcd98f2291f9c93b283059aa5b453ac9121
 DIST gcloud-golang-e34a32f9b0ecbc0784865fb2d47f3818c09521d4.tar.gz 168358 SHA256 817456c3b49ff6917604d201041d4f555e7f42328d5df036c68c26bf50c7455c SHA512 135124280cdbf0a9e62f811164b4b97f0ee5142736cc4a06efafd48162a89dd1a6f186264c925da27adc970c964ab0af75423025fd125b772ddb99320b816219 WHIRLPOOL 66a445585c17d0331b0ce24d9bde8c8942ba39d1d404e1b3b73cbaf173327ab0c43af5b7e980accf697100b12e3a544334a07f43f9f17ebac93ee7907b92b7ac
-DIST go-oauth2-0_pre20150527.tar.gz 32027 SHA256 eb1d48e29653b0bc68e41ef35df0d421e586e666ce52d7d504a6f2fb89807ce1 SHA512 9070bfed2e280286dbaeb360e77a9b2decf3e272e945ce4099875f7fd2e378b54082f8a9b4a2b7289d6984be4c66110d34b814cbc8e2850fd44122d484258fd4 WHIRLPOOL 09f19f1111f0a1d40ccff541c5cf4ad968264c91e9f6a3c18d23d441520002896b99f8f9979922dd4245edd9b46f89c46c94144b516c8424de43ccae8d462598
 DIST go-oauth2-0_pre20150701.tar.gz 32040 SHA256 ce9b602dd7f05c819002d6400585c2f09e8e1880a0fe358a4d4f56a6594ccedd SHA512 d809e1d63c7b5a4b388616d930cb22978b1653e2314b208d12679242bdd0e9d72f275f5ade7aa468b1dcf3960aa70ff94183ae1dd04325b24cdd20ef4834880a WHIRLPOOL 984438676de52f635206a3bb19b77e7f05c9c78a2ce6beabbe82cc22fb28fa0c7e3717a596a9b0c967615574ad6e53da0510bc1ecd0a38edd23680622320d6a0

dev-go/go-oauth2/go-oauth2-0_pre20150527.ebuild

@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KEYWORDS="~amd64"
-DESCRIPTION="Go client implementation for OAuth 2.0 spec"
-MY_PN=${PN##*-}
-GO_PN=golang.org/x/${MY_PN}
-HOMEPAGE="https://godoc.org/${GO_PN}"
-EGIT_COMMIT="b5adcc2dcdf009d0391547edc6ecbaff889f5bb9"
-SRC_URI="https://github.com/golang/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-https://github.com/GoogleCloudPlatform/gcloud-golang/archive/629ed086d82ad5d0ac3668e309b8785aaf54735b.tar.gz -> gcloud-golang-629ed086d82ad5d0ac3668e309b8785aaf54735b.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-DEPEND=">=dev-lang/go-1.4
-	dev-go/go-net"
-RDEPEND=""
-S="${WORKDIR}/src/${GO_PN}"
-EGIT_CHECKOUT_DIR="${S}"
-STRIP_MASK="*.a"
-
-src_unpack() {
-	default
-	mkdir -p src/${GO_PN%/*} || die
-	mv ${MY_PN}-${EGIT_COMMIT} src/${GO_PN} || die
-
-	# Create a writable GOROOT in order to avoid sandbox violations.
-	export GOROOT="${WORKDIR}/goroot" GOPATH=${WORKDIR}
-	cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
-	rm -rf "${GOROOT}/src/${GO_PN}" || die
-
-	mkdir -p "${GOROOT}/src/google.golang.org" || die
-	rm -rf "${GOROOT}/src/google.golang.org"/* || die
-	rm -rf "${GOROOT}/pkg/${KERNEL}_${ARCH}/google.golang.org" || die
-	mv gcloud-golang-629ed086d82ad5d0ac3668e309b8785aaf54735b "${GOROOT}/src/google.golang.org/cloud" || die
-}
-
-src_compile() {
-	go install -v -x -work google.golang.org/cloud/compute/metadata || die
-	go install -v -x -work ${GO_PN}/... || die
-}
-
-src_test() {
-	# google/example_test.go imports appengine, introducing a circular dep
-	mv google/example_test.go{,_}
-	go test -x -v ${GO_PN}/... || die $?
-	mv google/example_test.go{_,}
-}
-
-src_install() {
-	insinto /usr/lib/go
-	find "${WORKDIR}"/{pkg,src} -name '.git*' -exec rm -rf {} \; 2>/dev/null
-	insopts -m0644 -p # preserve timestamps for bug 551486
-	doins -r "${WORKDIR}"/{pkg,src}
-}

dev-go/go-protobuf/Manifest

@@ -1 +1 @@
-DIST go-protobuf-0_pre20150727.tar.gz 151982 SHA256 160ad98eb1477492476ba566d218262fe6d326410d5a030c6a00433eaf7f9006 SHA512 04802b8d74ccaa17f9fc030badd0e74b6e47233ca5f1faab7c49f25bef2f06efd97aa4bf3f4783a7815958354744ddb9fee96d183aebbb03864069b0cc569564 WHIRLPOOL f49157a4a1a48c67b72ed38121ba28aec3f9b3405a3388097caba36643715c14b6915f9bcbd04f974fa98e9f2c4c4a4e313480ef307701c0ace734e9c214c010
+DIST go-protobuf-0_pre20150809.tar.gz 151982 SHA256 160ad98eb1477492476ba566d218262fe6d326410d5a030c6a00433eaf7f9006 SHA512 04802b8d74ccaa17f9fc030badd0e74b6e47233ca5f1faab7c49f25bef2f06efd97aa4bf3f4783a7815958354744ddb9fee96d183aebbb03864069b0cc569564 WHIRLPOOL f49157a4a1a48c67b72ed38121ba28aec3f9b3405a3388097caba36643715c14b6915f9bcbd04f974fa98e9f2c4c4a4e313480ef307701c0ace734e9c214c010

dev-go/go-protobuf/go-protobuf-0_pre20150809.ebuild

@@ -13,6 +13,7 @@ else
 	KEYWORDS="~amd64"
 	EGIT_COMMIT="68c687dc49948540b356a6b47931c9be4fcd0245"
 	SRC_URI="https://${EGO_SRC}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
 fi
 inherit golang-build
 
@@ -24,35 +25,6 @@ IUSE=""
 DEPEND=""
 RDEPEND=""
 
-if [[ ${PV} != *9999* ]]; then
-src_unpack() {
-	local f
-
-	for f in ${A}
-	do
-		case "${f}" in
-			*.tar|*.tar.gz|*.tar.bz2|*.tar.xz)
-				local destdir=${WORKDIR}/${P}/src/${EGO_SRC}
-
-				debug-print "${FUNCNAME}: unpacking ${f} to ${destdir}"
-
-				# XXX: check whether the directory structure inside is
-				# fine? i.e. if the tarball has actually a parent dir.
-				mkdir -p "${destdir}" || die
-				tar -C "${destdir}" -x --strip-components 1 \
-					-f "${DISTDIR}/${f}" || die
-				;;
-			*)
-				debug-print "${FUNCNAME}: falling back to unpack for ${f}"
-
-				# fall back to the default method
-				unpack "${f}"
-				;;
-		esac
-	done
-}
-fi
-
 src_install() {
 	rm -rf src/${EGO_SRC}/.git* || die
 	golang-build_src_install

dev-go/go-sys/Manifest

@@ -1 +1 @@
-DIST go-sys-0_pre20150518.tar.gz 528445 SHA256 8b8af041e424a8bd04a955a1104313f4eb3b282f064c555ef4edc53b552ce753 SHA512 90565340fa64b625877444c84589e1ba870403a239cf43e99ba194b071e89e6a4877b4b04bb85ba5966401e9b6361eb1b1ffa88404d727eb9f02938313264a9c WHIRLPOOL 9bf6bf148b8d63bcd863cf64d16c4f999bc68dd8dc382167122afbc14499dbdf8ca0e5397f3106556cd1e3ebe62f0df31a394fed42d1a506a311aa3f9d232c37
+DIST go-sys-0_pre20150729.tar.gz 529002 SHA256 9f9e4a2bca96d9f9708770607e21395c3f4f873f9b6266cae1ba1da526729528 SHA512 f80afa938977f3945ab3f08462eaf5d8db430013240a11b1f8a43911948fd2a8a390192ea9ebf79434b348b2ca520267a0441b922110e70603fff4849e57c487 WHIRLPOOL 0b269666650f285521c9fd3486959957ad9279544baac7ab5caa21158fb10ed4de2b2e7c080ffca9aa352c8e5685f2035612d40a04c8f6c5f7093daf1a020029

dev-go/go-sys/go-sys-0_pre20150518.ebuild

@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KEYWORDS="~amd64"
-DESCRIPTION="Go packages for low-level interaction with the operating system"
-MY_PN=${PN##*-}
-GO_PN=golang.org/x/${MY_PN}
-HOMEPAGE="https://godoc.org/${GO_PN}"
-EGIT_COMMIT="58e109635f5d754f4b3a8a0172db65a52fcab866"
-SRC_URI="https://github.com/golang/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-DEPEND=">=dev-lang/go-1.4"
-RDEPEND=""
-S="${WORKDIR}/src/${GO_PN}"
-EGIT_CHECKOUT_DIR="${S}"
-STRIP_MASK="*.a"
-
-src_unpack() {
-	default
-	mkdir -p src/${GO_PN%/*} || die
-	mv ${MY_PN}-${EGIT_COMMIT} src/${GO_PN} || die
-}
-
-src_compile() {
-	# Create a writable GOROOT in order to avoid sandbox violations.
-	GOROOT="${WORKDIR}/goroot"
-	cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
-	rm -rf "${GOROOT}/src/${GO_PN%%/*}" \
-		"${GOROOT}/pkg/linux_${ARCH}/${GO_PN%%/*}" || die
-	GOROOT="${GOROOT}" GOPATH=${WORKDIR} \
-		go install -x -v -work ${GO_PN}/unix/... || die
-}
-
-src_test() {
-	GOROOT="${GOROOT}" GOPATH=${WORKDIR} \
-		go test -x -v golang.org/x/sys/unix/... || die
-}
-
-src_install() {
-	insinto /usr/lib/go
-	doins -r "${WORKDIR}"/pkg
-	insinto /usr/lib/go/src/${GO_PN}
-	find "${WORKDIR}"/src/${GO_PN} -name '.git*' -exec \
-		rm -rf {} \; 2>/dev/null
-	insopts -m0644 -p # preserve timestamps for bug 551486
-	doins -r "${WORKDIR}"/src/${GO_PN}/unix
-}

dev-go/go-sys/go-sys-0_pre20150729.ebuild

@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+EGO_PN=golang.org/x/sys/...
+EGO_SRC=golang.org/x/sys
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+EGIT_COMMIT="58da1121af381632b48b2843aeb16299f2e1dc50"
+	SRC_URI="https://github.com/golang/sys/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Go packages for low-level interaction with the operating system"
+HOMEPAGE="https://godoc.org/golang.org/x/sys"
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE=""
+DEPEND=""
+RDEPEND=""
+
+src_compile() {
+	# Create a writable GOROOT in order to avoid sandbox violations.
+	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
+	rm -rf "${T}/goroot/src/${EGO_SRC}" || die
+	rm -rf "${T}/goroot/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_SRC}" || die
+	export GOROOT="${T}/goroot"
+	golang-build_src_compile
+}

dev-go/go-text/Manifest

@@ -1,2 +1 @@
-DIST go-text-0_pre20150604.tar.gz 3719061 SHA256 71017417b42ea4e68ac77303782c83b627bfbceed041a1467ddc6319c78923ad SHA512 1bbc5bff271243ee31e346a79abf9dd128907cea82fa1eaba11be62780bd1f6b6b76a2ae9476fbe350224f450e75d12efcffd67521b49d6bec44ce2bb085f0d3 WHIRLPOOL e953d99d661537c8838757ae507f2adda3319ef22ce687a39533351201c5bb7206701db4b54f7c0e4d6df803b378a4f587a2015646825b4c3dfad97696baed2e
 DIST go-text-0_pre20150806.tar.gz 3736536 SHA256 377d3a95ffb01cf301e1b6050b1437f576f6bbfe32b6d97afc343bb0570b141f SHA512 dd0fc8b5abdfa6f005316bb7828c03a081485e0bd33cbf86c0b83f8bf9240973a7b0a2e6f52ef75f48ec00fc922be21a6c65ff9eb4080f28cb3f280bd4c4f5c6 WHIRLPOOL 79b6233c99984b98b5e74915029117e1f920e17789033ce2656d1590fbeafd4c69d145adeff7c57b1c7f8836397466461744959557877d27fc831da97a62b6ff

dev-go/go-text/go-text-0_pre20150604.ebuild

@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KEYWORDS="~amd64"
-DESCRIPTION="Go text processing support"
-MY_PN=${PN##*-}
-GO_PN=golang.org/x/${MY_PN}
-HOMEPAGE="https://godoc.org/${GO_PN}"
-EGIT_COMMIT="df923bbb63f8ea3a26bb743e2a497abd0ab585f7"
-SRC_URI="https://github.com/golang/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-DEPEND=">=dev-lang/go-1.4"
-RDEPEND=""
-S="${WORKDIR}/src/${GO_PN}"
-EGIT_CHECKOUT_DIR="${S}"
-STRIP_MASK="*.a"
-
-src_unpack() {
-	default
-	mkdir -p src/${GO_PN%/*} || die
-	mv ${MY_PN}-${EGIT_COMMIT} src/${GO_PN} || die
-}
-
-src_compile() {
-	# Create a writable GOROOT in order to avoid sandbox violations.
-	GOROOT="${WORKDIR}/goroot"
-	cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
-	rm -rf "${GOROOT}/src/${GO_PN}" \
-		"${GOROOT}/pkg/linux_${ARCH}/${GO_PN}" || die
-	GOROOT="${GOROOT}" GOPATH=${WORKDIR} go install -v -x -work ${GO_PN}/... || die
-}
-
-src_test() {
-	# Create go symlink for TestLinking in display/dict_test.go
-	mkdir -p "${GOROOT}/bin"
-	ln -s /usr/bin/go  "${GOROOT}/bin/go" || die
-
-	GOROOT="${GOROOT}" GOPATH=${WORKDIR} \
-		go test -x -v ${GO_PN}/... || die $?
-}
-
-src_install() {
-	exeinto /usr/lib/go/bin
-	doexe "${WORKDIR}"/bin/*
-	insinto /usr/lib/go
-	find "${WORKDIR}"/{pkg,src} -name '.git*' -exec rm -rf {} \; 2>/dev/null
-	insopts -m0644 -p # preserve timestamps for bug 551486
-	doins -r "${WORKDIR}"/{pkg,src}
-}

dev-go/go-tools/Manifest

@@ -1,3 +1,2 @@
 DIST go-favicon.ico 1150 SHA256 d76ca702a6d81e20ddd31c8c5a4368130e7c68d990600316f6f1c9509bd38ba7 SHA512 194c4b3c360321a10f714b6755d9155de6129682b4070d19b52d0d5706fcbd1d244ea38c33fd77fe1dec85b3e39720dd0a62f5b126803036fbc8337a9d72fea6 WHIRLPOOL f55a84a28812bffd1fa38e098e6ba7d757bdefc0e20c3d8ef767fb1bc7d6e2cfbb8d1ae0593e81cce17c27f60e6aacf094e6c67b1f592c0546090feab9d3830f
-DIST go-tools-0_pre20150606.tar.gz 1625903 SHA256 d121fc152648283413bc0596a55edc229796a7640d2ba6e1fd31c4fc316bb32c SHA512 68904e9799f80c77b1ccda2483eea4dcb19825aaf94355f967d1b0c3547ebf85772c0e92d9b5ba2e492a8af1b4cd07037d121add3c42760d15ca41c05d1161ab WHIRLPOOL 2e5e51112b4ddf2f391c8131e0b84e4c73ddcfcedc46ee934700b45c9cac5c2ee6a4984c02fa80c2207bd39d6b903a68c72cddec0fabcdd14ec2c6a4c7c7f727
 DIST go-tools-0_pre20150805.tar.gz 1633388 SHA256 80db6fc563df50eb924dbf4f96cef287fc6b89cc8b98595c1dac3c80a118f290 SHA512 80813c2da74c7b25fa2cfd15b2505757e7f466469ac701cb22d190dc83a607f091c4dea207a2e371e53d7a1f5459e7b53e5eea53c95565e958a6eb7fcb212359 WHIRLPOOL 3b000f830d81c35e6f76a9883d9430eb7fe0f546a36579a150a7bd8f825146a0623726a98a7b7f764825c9fee30af1f89b3bbc98efeaf05fe8f64bbb127a1f68

dev-go/go-tools/go-tools-0_pre20150606.ebuild

@@ -1,99 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KEYWORDS="~amd64"
-DESCRIPTION="Go Tools"
-MY_PN=${PN##*-}
-GO_PN=golang.org/x/${MY_PN}
-HOMEPAGE="https://godoc.org/${GO_PN}"
-EGIT_COMMIT="ac303766f5f240c1796eeea3dc9bf34f1261aa35"
-SRC_URI="https://github.com/golang/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-	http://golang.org/favicon.ico -> go-favicon.ico"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-DEPEND=">=dev-lang/go-1.4
-	dev-go/go-net"
-RDEPEND=""
-S="${WORKDIR}/src/${GO_PN}"
-EGIT_CHECKOUT_DIR="${S}"
-STRIP_MASK="*.a"
-
-src_unpack() {
-	default
-	mkdir -p src/${GO_PN%/*} || die
-	mv ${MY_PN}-${EGIT_COMMIT} src/${GO_PN} || die
-	cp "${DISTDIR}"/go-favicon.ico "${S}"/godoc/static/favicon.ico || die
-}
-
-src_prepare() {
-	# disable broken tests
-	sed -e 's:TestWeb(:_\0:' -i cmd/godoc/godoc_test.go || die
-	sed -e 's:TestVet(:_\0:' -i cmd/vet/vet_test.go || die
-	sed -e 's:TestImport(:_\0:' -i go/gcimporter/gcimporter_test.go || die
-	sed -e 's:TestImportStdLib(:_\0:' -i go/importer/import_test.go || die
-	sed -e 's:TestStdlib(:_\0:' -i go/loader/stdlib_test.go || die
-	sed -e 's:TestStdlib(:_\0:' -i go/ssa/stdlib_test.go || die
-	sed -e 's:TestGorootTest(:_\0:' \
-		-e 's:TestFoo(:_\0:' \
-		-e 's:TestTestmainPackage(:_\0:' \
-		-i go/ssa/interp/interp_test.go || die
-	sed -e 's:TestBar(:_\0:' \
-		-e 's:TestFoo(:_\0:' -i go/ssa/interp/testdata/a_test.go || die
-	sed -e 's:TestCheck(:_\0:' -i go/types/check_test.go || die
-	sed -e 's:TestStdlib(:_\0:' \
-		-e 's:TestStdFixed(:_\0:' \
-		-e 's:TestStdKen(:_\0:' -i go/types/stdlib_test.go || die
-	sed -e 's:TestRepoRootForImportPath(:_\0:' -i go/vcs/vcs_test.go || die
-	sed -e 's:TestStdlib(:_\0:' -i refactor/lexical/lexical_test.go || die
-
-	# Add favicon to the godoc web interface (bug 551030)
-	sed -e 's:"example.html",:\0\n\t"favicon.ico",:' -i godoc/static/makestatic.go || die
-	sed -e 's:<link type="text/css":<link rel="icon" type="image/png" href="/lib/godoc/favicon.ico">\n\0:' -i \
-		godoc/static/godoc.html || die
-}
-
-src_compile() {
-	# Create a writable GOROOT in order to avoid sandbox violations.
-	GOROOT="${WORKDIR}/goroot"
-	cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
-	rm -rf "${GOROOT}/src/${GO_PN}" \
-		"${GOROOT}/pkg/linux_${ARCH}/${GO_PN}" || die
-
-	# Generate static.go with favicon included
-	pushd godoc/static >/dev/null
-	GOROOT="${GOROOT}" GOPATH=${WORKDIR} go run makestatic.go || die
-	popd >/dev/null
-
-	GOROOT="${GOROOT}" GOPATH=${WORKDIR} go install -v -x -work ${GO_PN}/... || die
-}
-
-src_test() {
-	GOROOT="${GOROOT}" GOPATH=${WORKDIR} \
-		go test -x -v ${GO_PN}/... || die $?
-}
-
-src_install() {
-	local x
-	exeinto /usr/lib/go/bin
-	doexe "${WORKDIR}"/bin/*
-
-	# godoc ends up in ${GOROOT}/bin
-	dodir /usr/bin
-	while read -r -d '' x; do
-		doexe "${x}"
-		ln "${ED}"usr/{lib/go/bin,bin}/${x##*/} || die
-	done < <(find "${GOROOT}/bin" -type f -print0)
-
-	# cover and vet end up in ${GOROOT}/pkg/tool/linux_amd64
-	exeinto /usr/lib/go/pkg/tool/linux_amd64
-	find "${GOROOT}/pkg/tool/linux_amd64" -type f -exec doexe {} \;
-
-	insinto /usr/lib/go
-	find "${WORKDIR}"/{pkg,src} -name '.git*' -exec rm -rf {} \; 2>/dev/null
-	insopts -m0644 -p # preserve timestamps for bug 551486
-	doins -r "${WORKDIR}"/{pkg,src}
-}

dev-java/glassfish-xmlrpc-api/glassfish-xmlrpc-api-1.1.1.ebuild

@@ -16,7 +16,7 @@ SRC_URI="http://dev.gentoo.org/~tomwij/files/dist/${P}.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 x86"
 
 CDEPEND="java-virtuals/servlet-api:3.0"
 

dev-java/istack-commons-tools/Manifest

@@ -1,3 +1 @@
-DIST istack-commons-20070122.tar.bz2 10360 SHA256 dc8c86bb11f7ddd4c1c50ca0925d59ade16b5dc74bcd983fe95a08e104662a8e SHA512 120b9b8db52cebe507e8711dd4fcdc1a12db8d2320ff9054e1fa6688a321cbb18d25f6beb06e11a091c1cbc2870ab07e9df9681784893c5f0d6f36ae4b7e12f6 WHIRLPOOL b4d47b9d73ecd26c2effd287642521d8ecd6741c6df140bd024aa54770ddf1084d504ade53505e27dda66e3204e2625dcb63c40df1d098e4baed76f5371a55ee
-DIST istack-commons-20090620-src.tar.bz2 30194 SHA256 0719fbc462f98bfb66e9606fad11845797a2ba7dd54ad780e07e16c63f3ea899 SHA512 8a037852a19dd8ecf66fd6b6ca1454503e9f3d36ee716d774a1eb70245a60cf21c7e14ae97d811953d68475c4ea9bef7b9470d0ab82363481dc0f71c2865d2d4 WHIRLPOOL 68f8427892ff95390bf418c874dccd84aefe5c04f26e40b42f1f3e6fbe85a81f695365c1ff3b34eab0a4ebf42476301434555ed43d556f39f597bcd4c6861630
 DIST istack-commons-tools-2.22-sources.jar 15106 SHA256 8287f624b188dd70551907728deb9fd73c9e4bf4362458e6c2e84b6ff626a1c3 SHA512 daded38bcc64a8639813e607126867a515cf26c57b709062e32dc1c507e02f1592e496d028dbb36fb40e1aa04a82fb8c1a94d66818fed6680a32790a4a9b802f WHIRLPOOL 881e528c81f636a40de81491a5b5f106af42b7b8dfb709339f23c2626e54a522c0394dc3bca7477e2e437e62592ce9f0f7c70dae1de6d8b7ebec3aa73ae17621

dev-java/istack-commons-tools/istack-commons-tools-2.22.ebuild

@@ -14,7 +14,7 @@ SRC_URI="https://maven.java.net/content/repositories/releases/com/sun/${MY_PN}/$
 
 LICENSE="CDDL"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 CDEPEND="dev-java/ant-core:0"

dev-java/istack-commons-tools/istack-commons-tools-20070122-r1.ebuild

@@ -1,42 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="istack-commons - tools"
-HOMEPAGE="https://istack-commons.dev.java.net/"
-SRC_URI="mirror://gentoo/istack-commons-${PV}.tar.bz2"
-
-LICENSE="CDDL"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}/istack-commons-${PV}"
-
-src_unpack() {
-	unpack ${A}
-
-	java-ant_bsfix_one "${S}/build-common.xml"
-
-	cd "${S}/tools"
-	mkdir -p lib || die
-
-	ln -s $(java-config --tools) lib || die
-}
-
-EANT_BUILD_XML="tools/build.xml"
-
-src_install() {
-
-	java-pkg_dojar tools/build/istack-commons-tools.jar
-
-	use source && java-pkg_dosrc tools/src/*
-
-}

dev-java/istack-commons-tools/istack-commons-tools-20090620.ebuild

@@ -1,60 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="istack-commons - tools"
-HOMEPAGE="https://istack-commons.dev.java.net/"
-PROJ_PN="istack-commons"
-PROJ_P="${PROJ_PN}-${PV}"
-SRC_FILE="${PROJ_P}-src.tar.bz2"
-SRC_URI="mirror://gentoo/${SRC_FILE}"
-
-LICENSE="CDDL"
-SLOT="1.1"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.5
-	dev-java/ant-core"
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}/${PROJ_P}"
-
-# Helper to generate the tarball :-)
-# ( PN=istack-commons-runtime ; PV=20090620 ; P="${PN}-${PV}" ; . ${P}.ebuild  ; src_tarball )
-src_tarball() {
-	CVSROOT=':pserver:guest@cvs.dev.java.net:/cvs'
-	PROJ_PN='istack-commons'
-	cvs -d "${CVSROOT}" \
-		export -D $PV -d "${PROJ_P}" \
-		"${PROJ_PN}/${PROJ_PN}" && \
-	tar cvjf "${SRC_FILE}" \
-		--exclude '*.zip' \
-		--exclude '*.jar' \
-		"${PROJ_P}" \
-		&& \
-	echo "New tarball located at ${SRC_FILE}"
-}
-
-java_prepare() {
-	java-ant_bsfix_one "${S}/build-common.xml"
-	cd "${S}/tools"
-	mkdir -p lib || die
-	ln -s $(java-config --tools) lib || die
-	java-pkg_jar-from --build-only --into "${S}"/tools/lib ant-core ant.jar
-}
-
-EANT_BUILD_XML="tools/build.xml"
-
-src_install() {
-
-	java-pkg_dojar tools/build/istack-commons-tools.jar
-
-	use source && java-pkg_dosrc tools/src/*
-
-}

dev-lang/php/php-5.4.44.ebuild

@@ -6,7 +6,7 @@ EAPI=5
 
 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
 
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-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-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 function php_get_uri ()
 {

dev-lang/php/php-5.5.28.ebuild

@@ -6,7 +6,7 @@ EAPI=5
 
 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
 
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-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 ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 function php_get_uri ()
 {

dev-lang/php/php-5.6.12.ebuild

@@ -6,7 +6,7 @@ EAPI=5
 
 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
 
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-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 ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 function php_get_uri ()
 {

dev-libs/iniparser/iniparser-4.0.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 EAPI=5
 

dev-libs/libntru/Manifest

@@ -1,2 +1,3 @@
 DIST libntru-0.2.tar.gz 49832 SHA256 bc1d10dcd1755f836d4696b734ecc4bc8b047b7ea40d857657c03ecb31ac141f SHA512 4de4cc550fb74d53a26f1b6f94d27d6131756ab7f1b62ce5f1845e6e626581a357004efbd92881d1e180d75f4a92ec97e3c30926dcdf6ea23d87f1da81809f3a WHIRLPOOL 5e96d55f56f608e5ca24506bc8a122d2dff62c61fc0dab847913456d84d36fe13d615c8910b3915c0aa3881a236aaae45725842f9d062183906162df352fd396
 DIST libntru-0.3.tar.gz 53364 SHA256 9ce6b6a20ca304c09d2ff853e3b5762880a8cb85728113b26eb8ca2e915e2a0a SHA512 b99fecf21104f73246a9494dce6caa6742b7a2e5219e9b2a46d639d3181588bb1580c0b03209f150e9294f721d2e1179157be0eab52f25b2664c1451aaae8712 WHIRLPOOL 1545da85003e0466354767388252a67d5ac9cb457e94baf9ed1862b2b2b28bfa6057202509a017765442ca502c888ca50c6724b8c67569b6e6f4fcb8d5b2fd8a
+DIST libntru-0.4.1.tar.gz 97284 SHA256 a540763f12c496b057f75c7684274bafb4e62984e6b713720ceb7ea8f31229e5 SHA512 c49251a194614f02124c90c08b886f89d0dacbed2088eb2e306946666af3b8bc3f9c2dc2c7f5e4c0560af66fca31a640fa853b3142dcfb2ee2b0dfe9a0d41f61 WHIRLPOOL 9313e7659de9dd6cb4c13f76d5fad9bfad7bf0bf97dad24d66a910750c8df185ab356f6934c47b4371fc5295d811df181a9b756d687223869ef348852af9aa6d

dev-libs/libntru/libntru-0.4.1.ebuild

@@ -0,0 +1,63 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs multilib multilib-minimal
+
+DESCRIPTION="C Implementation of NTRUEncrypt"
+HOMEPAGE="https://github.com/tbuktu/libntru"
+SRC_URI="https://github.com/tbuktu/libntru/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples static-libs"
+
+DEPEND="dev-lang/perl"
+
+src_prepare() {
+	multilib_copy_sources
+
+	_copy_test_dir() {
+		cp -pr "${BUILD_DIR}" "${BUILD_DIR}-test" || die
+	}
+	multilib_foreach_abi _copy_test_dir
+}
+
+multilib_src_compile() {
+	CFLAGS="${CFLAGS}" \
+		emake \
+			CC="$(tc-getCC)" \
+			$(usex static-libs "libntru.a libntru.so" "") \
+			MACHINE="$(if [[ ${ABI} == x86 ]] ; then echo i386 ; else echo x86_64 ; fi)"
+}
+
+src_test() {
+	_test() {
+		CFLAGS="${CFLAGS}" \
+			emake CC="$(tc-getCC)" test -j1 -C "${BUILD_DIR}-test" \
+				MACHINE="$(if [[ ${ABI} == x86 ]] ; then echo i386 ; else echo x86_64 ; fi)"
+
+	}
+
+	multilib_foreach_abi _test
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${ED}" \
+		INST_LIBDIR="/usr/$(get_libdir)" \
+		INST_DOCDIR="/usr/share/doc/${PF}" \
+		MACHINE="$(if [[ ${ABI} == x86 ]] ; then echo i386 ; else echo x86_64 ; fi)" \
+		install $(usex static-libs install-static-lib "")
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	if use examples ; then
+		docinto examples
+		dodoc src/hybrid.c
+	fi
+}

dev-perl/Archive-Zip/Archive-Zip-1.490.0.ebuild

@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=PHRED
+MODULE_VERSION=1.49
+inherit perl-module
+
+DESCRIPTION="A wrapper that lets you read Zip archive members as if they were files"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	>=virtual/perl-Compress-Raw-Zlib-2.17.0
+	>=virtual/perl-File-Spec-0.800.0
+	virtual/perl-File-Temp
+	virtual/perl-IO
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( >=virtual/perl-Test-Simple-0.880.0 )
+"
+
+SRC_TEST=do

dev-perl/Archive-Zip/Manifest

@@ -2,3 +2,4 @@ DIST Archive-Zip-1.37.tar.gz 184345 SHA256 ba789436dc82db02a7f3d2e9d120d0221edc8
 DIST Archive-Zip-1.45.tar.gz 186378 SHA256 bc423f96ee07512c968fa788eeccf4b0100f0c4b85f0cacc638b0d658f2f7c7c SHA512 53831db7dd17d3418c593a9961679bfc6cfe067b1f31794664bc60439b332a2e054e8145a156e3eae95f6712dd8cbcc44ed29d7ae8a4fa0f4f1b97ea924e88d4 WHIRLPOOL c71e4c5a05da18ac1f69fccd5b2c35385818bc827d029f1483c7bb07f342def9b1a1a2593fc870c8b30104d4117ff95b2b5316a454f9b0722656bb9e25a7ce6e
 DIST Archive-Zip-1.46.tar.gz 186426 SHA256 6630ebeba753a7025126028eb290040ce44d86e8ced77017e31b75863348e524 SHA512 b1aee295cd6b9f64b5168d978ac5ba756c503c868b952b0ce345914196b9f249a54ed1a063c43d11b41bf247e0bfe51c6dc0219e93c545823b61a7b969e81981 WHIRLPOOL c9a444aa9d494d2621a8615d9dd5ca80708bf3295db916bbba0e52d41d23256975e34468fe009261610fb901ecea69e3e3b6dbd132c9622a3ec209f45f945b8d
 DIST Archive-Zip-1.48.tar.gz 192695 SHA256 01cb4fbc491f9890ceabc33e9888f85261f3d17f884d2b9d8e54564befd9e09f SHA512 b636c870712d51afe1934ef6246e6654e0248052df49dcafdccf9bcde377f4822bd78a48ec39d9971fdaa80b5eb68ee9956553f98004e8edb9f9cc80903d1728 WHIRLPOOL 61c2972db1b953f8a9953ffa7b22a378519c5d817e106214c6d5598ec006bd7d7bb3bcdd383c5d60e244c4c80262224b555b91102794cc98ea263362a529c788
+DIST Archive-Zip-1.49.tar.gz 192903 SHA256 991622ea495daf395abcd69c3b9b8ac92a10435c8d9562d50e30ef395dcc9451 SHA512 78e34f4a122ff5ad516d9efa983de8ba7995b87107148658e5d4100d3d428c361c4ab2674fce1bc87cc4068bdd3277ea810a878175a5c3b4eed691c79a260664 WHIRLPOOL 77d57b0bf8c5b9820dd13302797a278b2db5ad3f5cd8df981115a7eff3ed794ca5b93d3df3403013ae4a124b26911891e6b365bca6e44950375a0086feba4254

dev-perl/DateTime-Format-Mail/DateTime-Format-Mail-0.402.0.ebuild

@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=BOOK
+MODULE_VERSION=0.402
+inherit perl-module
+
+DESCRIPTION="Convert between DateTime and RFC2822/822 formats"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+	>=dev-perl/DateTime-0.180.0
+	dev-perl/Params-Validate
+	dev-perl/Dist-CheckConflicts
+"
+DEPEND="${RDEPEND}
+	virtual/perl-File-Spec
+	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
+	test? ( >=virtual/perl-Test-Simple-0.880.0
+		virtual/perl-File-Spec
+		virtual/perl-Storable )"
+
+SRC_TEST=do

dev-perl/DateTime-Format-Mail/Manifest

@@ -1,2 +1,3 @@
 DIST DateTime-Format-Mail-0.3001.tar.gz 176473 SHA256 b3f36b15442ae3e47bf91f45bcdc23e3311dcd2a3c6bc5c691004ad95986af72 SHA512 7ad356f86bbc8c854d25806e1205834fe4c0f4f9a1ab065b81e72ef75a502f31ab82c166451e6d108faa3ceceae3103a15f4f9ad908c483bba4f068d0aad46ef WHIRLPOOL 5340172c11378c63d0ac0120e41e95eebc59cdf9335b2154e0d4f7f4fbd6b92c52a689c508e82475ccf6ada32866f4360fedaa1ea1cb0f1bd24d7d6b4dfeceb2
 DIST DateTime-Format-Mail-0.401.tar.gz 172403 SHA256 b0668cc6547f0af8f02bb8e1cd09f69ec9f396a153a5fee97e38f651aec953b2 SHA512 d1e882c04c8b695391040da8e01c12423ee1e3aa7fa25ac77c1b84d510bc8093b6a477fdf076d1c704d61b5d329e14f1524a80a2ea342463f5a6136ed7743244 WHIRLPOOL b9fae28a6ce745ec3cf412549574c7189f7774dbc4643374d0df6c4c1730fb519d1ed2c0549ff446c7ebabde678cc2e83df5fc382b514119495981df35f6d343
+DIST DateTime-Format-Mail-0.402.tar.gz 178213 SHA256 d788c883969e1647ed0524cc130d897276de23eaa3261f3616458ddd3a4a88fb SHA512 079a4a4e3dbd8b585726b03809e42436d48a71c94f4a94a662e7955278374ff564ee0fae4a4999f84f2f35d78b0d695b917a737e262a7499940272abd66ac5c6 WHIRLPOOL 31dc42331f7a3f8615d4c1376aa19459772c82f4d59bd2d820e4c6f245b4efa797cd922b841ca00a8e289b477bb1cdc4204a8c998576aa154830c15b19196433

dev-perl/File-Map/File-Map-0.640.0.ebuild

@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=LEONT
+MODULE_VERSION=0.64
+inherit perl-module
+
+DESCRIPTION="Memory mapping made simple and safe"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+	dev-perl/PerlIO-Layers
+	>=dev-perl/Sub-Exporter-Progressive-0.1.5
+	virtual/perl-XSLoader
+"
+DEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.360.100
+	test? (
+		virtual/perl-File-Spec
+		virtual/perl-IO
+		virtual/perl-Scalar-List-Utils
+		dev-perl/Test-Fatal
+		virtual/perl-Test-Simple
+		>=dev-perl/Test-Warnings-0.5.0
+		virtual/perl-Time-HiRes
+	)
+"
+
+SRC_TEST="do parallel"

dev-perl/File-Map/Manifest

@@ -1,3 +1,4 @@
 DIST File-Map-0.56.tar.gz 73947 SHA256 960d614c038e2fb74d4a14543b82e6158d7d7e296a3acbe6a683c3280c73e535 SHA512 e9ab48c525fde25207866e69894c0ffa4e71bd213f5dd39e1b423ace62376c10c83c862693d84860b91e57cea4c275dc0f7f52650f32ad5e3087feb6b6312d68 WHIRLPOOL 9fe0ace81d5f28958984860a70c0497e879cd9c7e5945658041ef1ec10199fc4050f80b26e328480d127471314fe342c9911a6f15b783bae62c935b05d2cdc99
 DIST File-Map-0.61.tar.gz 74315 SHA256 b3bf7d3de1a4bafe1b67928986e00351d3b1b15f8417086d71048e4a7d8815b2 SHA512 ee5da6b777e5e85beeab33e4df4780e0096bac8ab26862b328126935634a4ccff667c1277698a9ed7219c34ac13315f783148062c3553fb57d1b40396bf0771b WHIRLPOOL c46ad0f8a5929ca102e563a186dfe1f3dabd98b0e254dcfdc5492d8be4afdd51a971f81a53c456c4f7c953e21d95723b499902fc42435cf2e5f522386696fb38
 DIST File-Map-0.63.tar.gz 76363 SHA256 1c30716a66a4be27ca8905506a251907bf8f6fa30a902e095eb6b2495482ad50 SHA512 7d84791381a3ad740fd4d1008ee2c18dcb16f75d3e6c2f283278e3157cd00e4288161aa2bd74c08e577964cd250da8b650b573d66527622897754f1fb28e9359 WHIRLPOOL 195978544875ca6ca34ea30dd3fd899920e60e8f0547f4945d92ec5b3944d93d57446d4a93ab1c92ae57ff8536a4623e238c1e02af9263174bb938661863123c
+DIST File-Map-0.64.tar.gz 78083 SHA256 03e42eb2de185b1e257c7a0ed9761a20b7d51f522464c713b20f43d47491a8c9 SHA512 dc1182e79d20e835e19c78f5187dd108b45938209933a7074674d472ac300277fc1fb7604b023ad7d3456ef5837bb8274a94e1cac79f95f2a2235855c59d3809 WHIRLPOOL 1e0d887f51f652d9aa8938c83e5c7d2fe68676de94306f90f6a7a5d5de778532e751351a2fbce40ca38b6f09a6cc9e6593a63e02b087baf646bf12b2aa6af942

dev-python/pbr/files/pbr-1.4.0_no-git.patch

@@ -0,0 +1,43 @@
+From 5c0bb9186fe2d65901744b00af24c8c50b3e1d29 Mon Sep 17 00:00:00 2001
+From: Robert Collins <rbtcollins@hp.com>
+Date: Mon, 10 Aug 2015 16:22:26 +1200
+Subject: Handle git being entirely absent
+
+When we try to find the git directory, if git is not present, treat
+that the same as an error from git itself. Sadly tests for this are
+nearly impossible to meaningfully write, since we always have git
+installed. I can do a mock based test if folk want one.
+
+Change-Id: If6160d1fb3def8133bdd0b66105e60ef93f80f82
+Closes-Bug: #1481468
+
+diff --git a/pbr/git.py b/pbr/git.py
+index b4ae300..60acd3c 100644
+--- a/pbr/git.py
++++ b/pbr/git.py
+@@ -18,6 +18,7 @@ from __future__ import unicode_literals
+ 
+ import distutils.errors
+ from distutils import log
++import errno
+ import io
+ import os
+ import re
+@@ -64,7 +65,13 @@ def _run_git_command(cmd, git_dir, **kwargs):
+ 
+ 
+ def _get_git_directory():
+-    return _run_shell_command(['git', 'rev-parse', '--git-dir'])
++    try:
++        return _run_shell_command(['git', 'rev-parse', '--git-dir'])
++    except OSError as e:
++        if e.errno == errno.ENOENT:
++            # git not installed.
++            return ''
++        raise
+ 
+ 
+ def _git_is_installed():
+-- 
+cgit v0.10.2
+

dev-python/pbr/pbr-1.4.0.ebuild

@@ -14,8 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-#KEYWORDS="~amd64 ~hppa ~amd64-linux ~x86-linux"
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="
@@ -59,6 +58,8 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
+PATCHES=( "${FILESDIR}/${PN}-${PV}_no-git.patch" )
+
 python_test() {
 	# Note; Tests, that have been removed, pass once package is emerged.
 	esetup.py testr

dev-python/pydispatcher/Manifest

@@ -1,2 +1,2 @@
 DIST PyDispatcher-2.0.3.tar.gz 33454 SHA256 735b1f7cba2123fbb60530c178c54b43f774b88cefa2689a8b6dcc476f2ba03f SHA512 2d1ac07ec5ac500f24e41a38b3d41cc54d761c896fb6d580bab02da51d8e881014a8e1b9d5977be2e542f8a4758bc73589319191529a70c573c6bda49342afb1 WHIRLPOOL 71ae88c3a9fff3f359636eec1608458b4d5ee9d198985a16dcb17440ce082277d836053b9210c68b5ee45c88f09f1a1568a88cf692e9975e00f19bba83148cf3
-DIST PyDispatcher-2.0.5.tar.gz 34437 SHA256 5570069e1b1769af1fe481de6dd1d3a388492acddd2cdad7a3bde145615d5caf SHA512 b361463f006a775e1f22cfe07520951649f76c26be35a80ca016620c8ef466129c4abeafe42f0ffdc605e7523287b1e804967f19d951089d24e052fe10d88e6f WHIRLPOOL 482c19525d61c73c4b290491a277ec8ecfd4a8ad247a87a3dab7bf95d9a2923d7b21b9dd06db05cf1b5c0d9efedb13552895a97f9726dc7c666b848b1d7e560f
+DIST pydispatcher-2.0.5.tar.gz 34437 SHA256 5570069e1b1769af1fe481de6dd1d3a388492acddd2cdad7a3bde145615d5caf SHA512 b361463f006a775e1f22cfe07520951649f76c26be35a80ca016620c8ef466129c4abeafe42f0ffdc605e7523287b1e804967f19d951089d24e052fe10d88e6f WHIRLPOOL 482c19525d61c73c4b290491a277ec8ecfd4a8ad247a87a3dab7bf95d9a2923d7b21b9dd06db05cf1b5c0d9efedb13552895a97f9726dc7c666b848b1d7e560f

dev-python/pydispatcher/pydispatcher-2.0.5.ebuild

@@ -3,16 +3,15 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
 
-inherit distutils-r1
+inherit distutils-r1 vcs-snapshot
 
 MY_PN="PyDispatcher"
-MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Multi-producer-multi-consumer signal dispatching mechanism"
 HOMEPAGE="http://pydispatcher.sourceforge.net/ http://pypi.python.org/pypi/PyDispatcher"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -22,8 +21,6 @@ IUSE="doc examples"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND=""
 
-S="${WORKDIR}/${MY_P}"
-
 python_compile_all() {
 	if use doc; then
 		pushd docs/pydoc/ > /dev/null

dev-python/python-novaclient/Manifest

@@ -2,4 +2,5 @@ DIST python-novaclient-2.17.0.tar.gz 230712 SHA256 af6f46890715eb5f4e0d25a714eff
 DIST python-novaclient-2.20.0.tar.gz 267956 SHA256 73fc8169d58e910340aae1ac5370c3b63a9943f748e2a20e4a1dfd7277525c86 SHA512 a1ff87b46d1520346380bf5396383d84e036892f1568d2eb201eb667837919e1cd8db3267a1ea9f6dfc616de0714374c81465de76b8a9bfec32c4742eeee3807 WHIRLPOOL 1fb3052d3fa457524c65b3de087a7cf7377d274b7a9d924529289e2e2b02992c5182cd1ec5aeef443a81c8e1d08fa1202caf6c5e12e3df40b5011f75df0837f8
 DIST python-novaclient-2.23.0.tar.gz 224690 SHA256 0f82e723b1cef48df75d4b47ece7dd6ee980563628d8cfbef10cd35707193e07 SHA512 38f7aa5747c9cea2e8e98ec91e18ada70c1cd61b0236285a6335cff2a90ff465963d648489fec8c4bb96e55e4c8f2c77ddbae58d42e43807e1d0d70f4bdfe9fe WHIRLPOOL 883b5e04ec39e525fea8c22969a72a8fc334c741b2419e3a4cab9f2f6563286dc6968615b7df7a17d2ab4e17de5d182163eb60682fd69bfa84312629d2ea731d
 DIST python-novaclient-2.23.1.tar.gz 225659 SHA256 8a8b0ace401099518ab852b294f89199a9358085b51ffa0e52dfd05c2332e09e SHA512 a3ac753a4cac5e769cef59e6ae8d182f0abfe03b9ff10fa8a34b1d395fd5a83e92e999af644d1248417700654a6e3b3cb3d9818044c4c258d06304d99738a978 WHIRLPOOL 99a38df0e76f8c18c7bea23154c9b4641fe1b9a2086493a0ee2807c151173be21b8f18b27a48231991cca10ffbc32f2fa26bf265d30baa8c310a654c7557c30d
+DIST python-novaclient-2.23.2.tar.gz 224170 SHA256 730cb006395b2df336bbfd75aa2f459375594726a50fe3b9126212ed487fcf98 SHA512 a207afcdb14e811980c6f3962342e3aa4da52f2e9663f94dbbac78b9d5e1e5a555d657b61948acf07cf238eaf04e32b9e440e9495adf80e19e8877e5e6510bcb WHIRLPOOL 8bd7c7f3431ec9dc78ed023e15227c5c5d40becbb9ef06d6fee65d177732af8d98154b27a39da722716ff9fffab7bc0c9790306d5ae184c4335361ac990666a4
 DIST python-novaclient-2.25.0.tar.gz 228156 SHA256 433e314223218031e7ea6e71baa54c1b13485d47fbb128ed3752e2a72ad7cb83 SHA512 b65495e94da9d42aa6eb51090ea7c2af6784e74121ea96c7021d013b8570af1df90d993df332b92274d5f92bc634149ad14616804e68e93fb4529b6b15dbb5c4 WHIRLPOOL 7401147c278a23768e18998b90842c6c17fe2c9dfb28cd320dfe0dc6ce7afd2e0481d6275deb82a4ce5c3ac826b8303390a8d80c011a242c4bed0fff2e446615

dev-python/python-novaclient/python-novaclient-2.23.2.ebuild

@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Nova API"
+HOMEPAGE="https://github.com/openstack/python-novaclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+		test? (
+			>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
+			<dev-python/hacking-0.11[${PYTHON_USEDEP}]
+			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+			>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+			<dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
+			>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
+			!~dev-python/keyring-3.3[${PYTHON_USEDEP}]
+			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+			<dev-python/mock-1.1.0[${PYTHON_USEDEP}]
+			>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
+			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+			!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+			<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+			>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+			<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
+			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+			>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+			>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+			!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+			>=dev-python/tempest-lib-0.4.0[${PYTHON_USEDEP}]
+			<dev-python/tempest-lib-0.5.0[${PYTHON_USEDEP}]
+		)"
+RDEPEND="
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-1.2.0[${PYTHON_USEDEP}]
+	<dev-python/python-keystoneclient-1.4.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# built in...
+	sed -i '/argparse/d' requirements.txt
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	testr init
+	testr run --parallel || die "testsuite failed under python2.7"
+}

dev-ruby/gruff/gruff-0.6.0.ebuild

@@ -30,7 +30,7 @@ RUBY_PATCHES=(
 # gruff to work properly imagemagick needs to be compiled with truetype
 # support and this cannot be expressed in the rmagick dependency. Tests
 # also require imagemagick to have jpeg and png support.
-DEPEND="${DEPEND} test? ( media-gfx/imagemagick[jpeg,png,truetype] )"
+DEPEND="${DEPEND} test? ( media-gfx/imagemagick[jpeg,png,truetype,webp] )"
 RDEPEND="${RDEPEND} media-gfx/imagemagick[truetype]"
 
 ruby_add_rdepend ">=dev-ruby/rmagick-2.13.4"

dev-ruby/haml/Manifest

@@ -1 +1,2 @@
 DIST haml-4.0.6.gem 115712 SHA256 2ede5f8a1f38d98e71daf570d836ec0db18e1c6187c383a50fb7eb2223beff23 SHA512 a58d3de9efb6ac80a504152a4ca71914681a334d802301c9c8954890e97b031d771f4ac5127713d5e1c1e051d6c74fb7c9d55b6b6e7166743e95ed33685be1c4 WHIRLPOOL 0b821983baa267ae03dee990b2432562601af4fe2c84d4f8f9a46133817470c97baef47098ed78f714b9eda5dae75d4cba4a8059398d9f9acf018633a713e4ab
+DIST haml-4.0.7.gem 121856 SHA256 3754d0f7c21cf261a30b207a94524211293b921492fab58c89d1ede7e7933f57 SHA512 5736ded231bb10a0c0932453294604075e24a9020c2658e703c13ebf7a8d148327188157f982a3aea5db6d6938beb372c0167dfbc4ff06325517b2c8bd71a568 WHIRLPOOL 62f1f152dbf8eea15ef3935d8e85b062f5a3f079a3cc4e4ad47056acfe7427b443611f092f591ff957f348d1727ce43b23d9f88083a4678b30d759a2ecd6e659

dev-ruby/haml/haml-4.0.7.ebuild

@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_TEST="test"
+RUBY_FAKEGEM_TASK_DOC="-Ilib doc"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md REFERENCE.md"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A ruby web page templating engine"
+HOMEPAGE="http://haml-lang.com/"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="doc test"
+
+RDEPEND="${RDEPEND} !!<dev-ruby/haml-3.1.8-r2"
+
+ruby_add_rdepend "dev-ruby/tilt:*"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/minitest:5
+		dev-ruby/nokogiri
+		dev-ruby/rails:4.2
+	)
+	doc? (
+		dev-ruby/yard
+		>=dev-ruby/maruku-0.7.2-r1
+	)"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' \
+		-e 's/gem "minitest"/gem "minitest", "~>5.0"/'\
+		-e '1igem "actionpack", "~>4.2"'\
+		-e '1igem "activesupport", "~>4.2"'\
+		-e '1igem "railties", "~>4.2"'\
+		test/test_helper.rb || die
+	# Remove test that fails when RedCloth is available
+	sed -i -e "/should raise error when a Tilt filters dependencies are unavailable for extension/,+9 s/^/#/"\
+		test/filters_test.rb || die
+}

dev-ruby/httparty/httparty-0.13.5.ebuild

@@ -35,6 +35,10 @@ all_ruby_prepare() {
 	# Avoid test dependency on cucumber. We can't run the features since
 	# they depend on mongrel which is no longer packaged.
 	sed -i -e '/cucumber/I s:^:#:' Rakefile || die
+
+	# Avoid test dependency on simplecov
+	sed -i -e '/simplecov/I s:^:#:' \
+		-e '1i require "cgi"' spec/spec_helper.rb || die
 }
 
 each_ruby_test() {

dev-ruby/jeweler/jeweler-2.0.1-r1.ebuild

@@ -26,7 +26,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 IUSE=""
 
 ruby_add_bdepend "doc? ( dev-ruby/yard )
-	test? ( dev-ruby/shoulda dev-ruby/rr dev-ruby/test_construct dev-ruby/test-unit:0 )"
+	test? ( dev-ruby/shoulda dev-ruby/rr dev-ruby/test_construct dev-ruby/test-unit:0 >=dev-ruby/hoe-1.5.1 )"
 
 ruby_add_rdepend "
 	dev-ruby/rake

dev-ruby/memoize/memoize-1.3.1-r1.ebuild

@@ -11,7 +11,7 @@ RUBY_FAKEGEM_EXTRADOC="README"
 
 inherit ruby-fakegem
 DESCRIPTION="A Ruby library that lets you memoize methods"
-HOMEPAGE="http://github.com/djberg96/memoize"
+HOMEPAGE="https://github.com/djberg96/memoize"
 
 LICENSE="Artistic-2"
 SLOT="0"
@@ -19,3 +19,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit:2 ) "
+
+all_ruby_prepare() {
+	sed -i -e 's/Config/RbConfig/' Rakefile || die
+}

dev-util/fatrace/Manifest

@@ -1,3 +1,4 @@
+DIST fatrace-0.10.tar.bz2 19178 SHA256 2afb6ed0f69abe51f290515398216e2cb3201f5362a3f0afe7e6b8a797d80c60 SHA512 9e2e932f965ca95dcd2687d542c7d39701fca9db6279431f3e4a2f14dae4d56cc0012ab5bdaef57b711caa39d4e16ce012fb6a0eda9ba158ab768b0c836bfdb6 WHIRLPOOL b2f91b9c9ab8d951c3933f0f2ac192f9fde7d4e95c1a3cd83343ea29d2f2cb5c6009f4d7c8f4e8b47c71ad2217249572d6244b1bd5908d2309881d57d8db1474
 DIST fatrace-0.4.tar.bz2 18155 SHA256 8abd5d382610e3284f4057dc202f565ff653a5432f3bbc65463be61647e2ef94 SHA512 bd2e31a16f79127294a9599094c41043a612609241653f33fdb8adef17da99a781b5029f6b1af1731b7c939e7ae3c1d2c19f985dde72c9f409e6945d4dc1f7ce WHIRLPOOL c28337e5ca3d14b045704bb23ce386034c5a71559f8ed1a5bb471b4f4202af87088120d7e8e3de76ceae1d860b47179aceead09f277297895753c75ebfc2186e
 DIST fatrace-0.5.tar.bz2 18310 SHA256 de7e04df5650d84da9b1cecd60b0f1dade50adf7cff57835a8617bc94f2becf0 SHA512 e0357e6e74683f4d6ffaa958a704bca996823406a77b92c36537ff2bb4a47b39dd909186b0f0a5cb46672bf48d0ba64c07288d9a1f7fc83bc3928bce5bf91b2d WHIRLPOOL 0bf8ddf1370e9ab95945ed4a5df5f37c3c81e3cff7f22b05f23a86ec48507dc16541e30f58871f426624877df8afafaec3f925ed010745ef0313647bb7134efc
 DIST fatrace-0.9.tar.bz2 18828 SHA256 c028d822ffde68805e5d1f62c4e2d0f4b3d4ae565802cc9468c82b25b92e68cd SHA512 a1dbc17e1e408ddfc145e8f70580b0f5ce500fb53736d6a22547c370c4b221b362973c19a40df3c2dd911c899d74e9dc944a881eea99f9d143f6de7e213146c3 WHIRLPOOL d9b8e05cd32a9fe3904b2f1ba41ddff3e70e44610ae0f05940bb70aa54f40ed5cf6890fd6abd7b5eb4b8015a209c77e49dee6919e7afe3875a32f17f25f4ae53

dev-util/fatrace/fatrace-0.10.ebuild

@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{3_3,3_4} )
+
+inherit linux-info python-r1 toolchain-funcs
+
+DESCRIPTION="report file access events from all running processes"
+HOMEPAGE="https://launchpad.net/fatrace"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="powertop"
+
+RDEPEND="powertop? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+REQUIRED_USE="powertop? ( ${PYTHON_REQUIRED_USE} )"
+
+CONFIG_CHECK="~FANOTIFY"
+
+src_prepare() {
+	tc-export CC
+}
+
+src_install() {
+	dosbin fatrace
+	use powertop && dosbin power-usage-report
+
+	doman fatrace.1
+	dodoc NEWS
+}

games-strategy/openra/openra-20141029-r1.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/OpenRA/OpenRA/tarball/release-${PV} -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="tools"
+IUSE=""
 
 QA_PREBUILT="$(games_get_libdir)/openra/liblua*"
 
@@ -45,7 +45,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake $(usex tools "all" "")
+	emake all
 	emake native-dependencies
 	emake docs
 }
@@ -56,7 +56,7 @@ src_install() {
 		bindir="${GAMES_BINDIR}" \
 		libdir="$(games_get_libdir)" \
 		DESTDIR="${D}" \
-		$(usex tools "install-all" "install") install-linux-scripts
+		install-all install-linux-scripts
 
 	exeinto "$(games_get_libdir)/openra"
 	doexe Eluant.dll.config liblua$(usex amd64 "64" "32")*

kde-misc/systemd-kcm/Manifest

@@ -1,2 +1,2 @@
 DIST systemd-kcm-0.7.0.tar.gz 52063 SHA256 8988e9b782546147e089c9ed86e65600cb9111ac7770dc4aa2fc8f862f4630cf SHA512 67658a97544148bc7a3208d00a0d990eea662f5e88032ff3d1d61f125ade1c3f36e0b1c772ab06fa90d954c9bf2c09436f0a5808d36373cbcf0687a57ff478c5 WHIRLPOOL 95087b293a20c3ddf0f880adecc4a48878199c835e743534fbedc633ddb751b8fa6b4d43f41bf0c730a19dcdc9b539b048f4a9b970607dc4a66b13e90cdfa508
-DIST systemd-kcm-1.2.0.tar.xz 79244 SHA256 d55147811b4a7b7082c5106fc746e8bb4927a0427db4e89cc706a1e92ae90ae7 SHA512 2827378d4ac533c4a774a898ae87c7a5198ecbc9887eb0591a42201e4b582fa113e0f0e887d0e5012f892898866f0c2aff8262f40d53223062baf52bcd64c89a WHIRLPOOL c5a7877f322f8025dd4bc98a56c8ef0e58ea02ad5ebb3be73634806c280fe5f3fdc61d07628308863d59c0cc3aede9dcc84ee764ca4ca1593eb64cee7f458ec9
+DIST systemd-kcm-1.2.1.tar.xz 86268 SHA256 51960f4d3b4a1ceae28737c172c35aec8c1f4e534327fbc6dda76f1c17341389 SHA512 e3dcf6db6513b88b37e724b3a472939fbb155642a605527ca669e71c5a0b8616c4c6add1796037c94170af788bce519415c698f22f010f1133c0e14452245e76 WHIRLPOOL 772dabd48eb5f8ed7ef96398317909c15968fea93db34479f32a3f45a9c750e4bf630291a7b5e19185c9f00e3abd12f5c49444bcf2a21937da02ce59e96dc497

kde-misc/systemd-kcm/systemd-kcm-1.2.1.ebuild

@@ -12,14 +12,16 @@ HOMEPAGE="https://projects.kde.org/projects/playground/sysadmin/systemd-kcm"
 SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 IUSE=""
-LICENSE="GPL-3"
+LICENSE="GPL-2+"
 KEYWORDS="~amd64 ~x86"
 
 DEPEND="
 	$(add_frameworks_dep kauth)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kservice)
 	$(add_frameworks_dep kwidgetsaddons)
 	>=dev-libs/boost-1.45
 	dev-qt/qtdbus:5

mail-client/thunderbird-bin/thunderbird-bin-38.1.0.ebuild

@@ -24,24 +24,14 @@ fi
 
 MOZ_P="${MOZ_PN}-${MOZ_PV}"
 
-# Upstream ftp release URI that's used by mozlinguas.eclass
-# We don't use the http mirror because it deletes old tarballs.
-MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
-MOZ_HTTP_URI="http://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
+MOZ_HTTP_URI="http://archive.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
 
 inherit eutils multilib pax-utils fdo-mime gnome2-utils mozlinguas nsplugins
 
 DESCRIPTION="Thunderbird Mail Client"
 SRC_URI="${SRC_URI}
-	amd64? (
-		${MOZ_FTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2
-		${MOZ_HTTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2
-	)
-	x86? (
-		${MOZ_FTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2
-		${MOZ_HTTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2
-	)
-	${MOZ_FTP_URI/${MOZ_PN}/calendar/lightning}/${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi
+	amd64? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )
 	${MOZ_HTTP_URI/${MOZ_PN}/calendar/lightning}/${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi
 "
 HOMEPAGE="http://www.mozilla.com/thunderbird"

mail-client/thunderbird/thunderbird-38.1.0.ebuild

@@ -29,10 +29,7 @@ EMVER="1.8.2"
 PATCH="thunderbird-38.0-patches-0.1"
 PATCHFF="firefox-38.0-patches-0.3"
 
-# Upstream ftp release URI that's used by mozlinguas.eclass
-# We don't use the http mirror because it deletes old tarballs.
-MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/"
-MOZ_HTTP_URI="http://ftp.mozilla.org/pub/${PN}/releases/"
+MOZ_HTTP_URI="http://ftp.mozilla.org/pub/${PN}/releases"
 
 MOZCONFIG_OPTIONAL_JIT="enabled"
 inherit flag-o-matic toolchain-funcs mozconfig-v6.38 makeedit multilib autotools pax-utils check-reqs nsplugins mozlinguas
@@ -46,16 +43,13 @@ LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 IUSE="bindist crypt hardened ldap lightning +minimal mozdom selinux"
 RESTRICT="!bindist? ( bindist )"
 
-SRC_URIS=(
-	${SRC_URI}
-	{${MOZ_FTP_URI},${MOZ_HTTP_URI}}${MOZ_PV}/source/${MOZ_P}.source.tar.bz2
-	${MOZ_FTP_URI/${PN}/calendar/lightning}"${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi"
-	${MOZ_HTTP_URI/${PN}/calendar/lightning}"${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi"
-	"lightning? ( http://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz )"
-	"crypt? ( http://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz )"
-	http://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/{${PATCH},${PATCHFF}}.tar.xz
-)
-SRC_URI="${SRC_URIS[@]}"
+PATCH_URIS=( http://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/{${PATCH},${PATCHFF}}.tar.xz )
+SRC_URI="${SRC_URI}
+	${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.bz2
+	${MOZ_HTTP_URI/${PN}/calendar/lightning}/${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi
+	lightning? ( http://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz )
+	crypt? ( http://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz )
+	${PATCH_URIS[@]}"
 
 ASM_DEPEND=">=dev-lang/yasm-1.1"
 

media-gfx/freecad/freecad-0.15.4671.ebuild

@@ -22,7 +22,6 @@ COMMON_DEPEND="dev-cpp/eigen:3
 	dev-libs/xerces-c[icu]
 	dev-python/matplotlib
 	dev-python/pyside[X]
-	dev-python/pyside-tools
 	dev-python/shiboken
 	dev-qt/designer:4
 	dev-qt/qtgui:4

media-gfx/freecad/freecad-9999.ebuild

@@ -23,7 +23,6 @@ COMMON_DEPEND="dev-cpp/eigen:3
 	dev-libs/xerces-c[icu]
 	dev-python/matplotlib
 	dev-python/pyside[X]
-	dev-python/pyside-tools
 	dev-python/shiboken
 	dev-qt/designer:4
 	dev-qt/qtgui:4
@@ -78,7 +77,7 @@ src_configure() {
 		-DOCC_LIBRARY="${CASROOT}"/lib/libTKernel.so
 		-DOCC_LIBRARY_DIR="${CASROOT}"/lib
 		-DOCC_LIB_PATH="${CASROOT}"/lib
-		-DCOIN3D_INCLUDE_DIR="${EROOT}"usr/include/coin
+		-DCOIN3D_INCLUDE_DIRS="${EROOT}"usr/include/coin
 		-DCOIN3D_LIBRARY="${EROOT}"usr/$(get_libdir)/libCoin.so
 		-DSOQT_LIBRARY="${EROOT}"usr/$(get_libdir)/libSoQt.so
 		-DSOQT_INCLUDE_PATH="${EROOT}"usr/include/coin
@@ -116,7 +115,7 @@ src_install() {
 	newicon src/Main/icon.ico ${PN}.ico
 	make_desktop_entry FreeCAD
 
-	dodoc README.Linux ChangeLog.txt
+	dodoc README.md ChangeLog.txt
 
 	# disable compression of QT assistant help files
 	>> "${ED}"usr/share/doc/${P}/freecad.qhc.ecompress.skip

media-gfx/zbar/files/zbar-0.10-v4l2-uvcvideo.patch

@@ -0,0 +1,49 @@
+--- zbar-0.10/zbar/video/v4l2.c	2009-10-23 18:16:44.000000000 +0000
++++ zbar-0.10/zbar/video/v4l2.c	2015-03-07 05:46:36.000000000 +0000
+@@ -241,6 +241,21 @@
+     return(0);
+ }
+ 
++static int v4l2_request_buffers (zbar_video_t *vdo)
++{
++    struct v4l2_requestbuffers rb;
++    memset(&rb, 0, sizeof(rb));
++    rb.count = vdo->num_images;
++    rb.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
++    rb.memory = V4L2_MEMORY_USERPTR;
++    if(ioctl(vdo->fd, VIDIOC_REQBUFS, &rb) < 0)
++        return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
++                           "requesting video frame buffers (VIDIOC_REQBUFS)"));
++    if(rb.count) 
++        vdo->num_images = rb.count;
++    return(0);
++}
++
+ static int v4l2_set_format (zbar_video_t *vdo,
+                             uint32_t fmt)
+ {
+@@ -308,6 +323,8 @@
+         return(-1);
+     if(vdo->iomode == VIDEO_MMAP)
+         return(v4l2_mmap_buffers(vdo));
++    if(vdo->iomode == VIDEO_USERPTR)
++        return(v4l2_request_buffers(vdo));
+     return(0);
+ }
+ 
+@@ -337,8 +354,13 @@
+     else {
+         if(!vdo->iomode)
+             vdo->iomode = VIDEO_USERPTR;
+-        if(rb.count)
+-            vdo->num_images = rb.count;
++        /* releasing buffers 
++         * lest the driver may later refuse to change format
++         */
++        rb.count = 0;
++        if (ioctl(vdo->fd, VIDIOC_REQBUFS, &rb) < 0)
++            zprintf(0, "WARNING: releasing video buffers failed: error %d\n",
++                errno);
+     }
+     return(0);
+ }

media-gfx/zbar/zbar-0.10-r5.ebuild

@@ -17,8 +17,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm x86"
 IUSE="gtk imagemagick jpeg python qt4 static-libs +threads v4l X xv"
 
-RDEPEND="sys-devel/gettext
-	gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 )
+RDEPEND="gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 )
 	imagemagick? (
 		|| ( media-gfx/imagemagick
 		media-gfx/graphicsmagick[imagemagick] ) )
@@ -29,6 +28,7 @@ RDEPEND="sys-devel/gettext
 	X? ( x11-libs/libXext
 		xv? ( x11-libs/libXv ) )"
 DEPEND="${RDEPEND}
+	sys-devel/gettext
 	virtual/pkgconfig"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -38,9 +38,10 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-v4l1-check.patch
-	epatch "${FILESDIR}"/${P}-errors.patch
-	epatch "${FILESDIR}"/${P}-python-crash.patch
+	epatch "${FILESDIR}"/${P}-no-v4l1-check.patch \
+		"${FILESDIR}"/${P}-errors.patch \
+		"${FILESDIR}"/${P}-python-crash.patch \
+		"${FILESDIR}"/${P}-v4l2-uvcvideo.patch
 
 	use python && python_fix_shebang examples/upcrpc.py test/*.py
 

media-gfx/zbar/zbar-0.10_p20121015.ebuild

@@ -17,8 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="gtk imagemagick jpeg python qt4 static-libs +threads v4l X xv"
 
-RDEPEND="sys-devel/gettext
-	gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 )
+RDEPEND="gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 )
 	imagemagick? (
 		|| ( media-gfx/imagemagick
 		media-gfx/graphicsmagick[imagemagick] ) )
@@ -29,6 +28,7 @@ RDEPEND="sys-devel/gettext
 	X? ( x11-libs/libXext
 		xv? ( x11-libs/libXv ) )"
 DEPEND="${RDEPEND}
+	sys-devel/gettext
 	virtual/pkgconfig"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -44,9 +44,9 @@ src_unpack() {
 }
 
 src_prepare() {
-	#epatch "${FILESDIR}"/${P}-no-v4l1-check.patch
-	epatch "${FILESDIR}"/${PN}-0.10-errors.patch
-	epatch "${FILESDIR}"/${PN}-0.10-python-crash.patch
+	epatch "${FILESDIR}"/${PN}-0.10-errors.patch \
+		"${FILESDIR}"/${PN}-0.10-python-crash.patch \
+		"${FILESDIR}"/${PN}-0.10-v4l2-uvcvideo.patch
 
 	use python && python_fix_shebang examples/upcrpc.py test/*.py
 

media-sound/pnmixer/Manifest

@@ -1,3 +1,2 @@
 DIST pnmixer-0.6_pre20111213.tar.xz 131328 SHA256 aa42180145aa56639440168935a8b16c576e6e49db0bbe2955b79a890437f013 SHA512 967a685593256f9f2e8ab2ef955a91a03c3710d96956087ac55301d5232e6f01897efbb064bd6dc1804836af1b66c038cb3d04203043462de5246e4f14dd37c4 WHIRLPOOL 1fe36a5ea212447212bbd9b6b4efee22e1f75fbb0f2c0548447c0987664d94524e306e2942f6e96c6f10cf6bf15abc35df6b7953d63ef8ec2241eef3d627c16d
-DIST pnmixer-0.6_pre20140924.tar.gz 263467 SHA256 8db9160fe5a41222e84ef19a38264f3633629013971f7fe549733e5644429558 SHA512 4ed5a5fb8cfa5a0f0757a30c78cb4b90fa8d1fa64234f18306941ef4382af66f49ecce2a833c1784e547b840bab36eab7d0c1f85cb89bde81c117472669ba283 WHIRLPOOL 54bd420e5bdfb76b155440f3f44f3e1e207ed116c3ff664429c0f8ced5945c6545daf0be8ffcede91ead1983882a6e1a18e61d8708f6a24719a0065e250a884a
-DIST pnmixer-0.6_rc1.tar.gz 211924 SHA256 93573056c50fdd6feb881e2c0e1538563996dc26c2fe52ce857bc28fdbc3c589 SHA512 cd617b473067f97b0e830c43d4ee1bc500f6ce953546dd2d062882e11f61c05354aaaa96688b958471f94064b68652715cddfd7fc9dca46b47a6296d0f591cc2 WHIRLPOOL fb3ae98b3274dccfbe0031051ddacddbb8cfd81483f6cd854ad565d506bde92475224a7131138dc44c0d750bc361d19fe914e05c5e6c3ae0e8d894ed2f4429a8
+DIST pnmixer-0.6_rc2.tar.gz 198319 SHA256 df394656c31e94d0ef49a81a8c13d6bcae85a56212b01f2e8da1b6aac63ef049 SHA512 dd54a270e75913c17482e8b7830f19f57a96a07cd0a5a12dd81dc5e09bca185c30d61ff0212d9f5aed542f775de7dab4f8f6b335ae6e0e019d6b6c62ee97bb18 WHIRLPOOL 6af9ab8036b2926a1a4df1276496956d527d523851405bfc86cfc3707f4db944ad74780656d2fff1dec5356b033b2be106c0974ee4b3e7d3dbe440665a327551

media-sound/pnmixer/pnmixer-0.6_pre20140924.ebuild

@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils gnome2-utils
-
-DESCRIPTION="Volume mixer for the system tray"
-HOMEPAGE="https://github.com/nicklan/pnmixer"
-SRC_URI="http://dev.gentoo.org/~hasufell/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug libnotify"
-
-RDEPEND="dev-libs/glib:2
-	media-libs/alsa-lib
-	>=x11-libs/gtk+-3.6:3
-	x11-libs/libX11
-	libnotify? ( x11-libs/libnotify )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		$(use_with libnotify) \
-		$(use_enable debug) \
-		--enable-minimal-flags \
-		--with-gtk3
-}
-
-src_install() {
-	default
-	newicon -s 128 pixmaps/${PN}-about.png ${PN}.png
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}

media-sound/pnmixer/pnmixer-0.6_rc2.ebuild

@@ -9,7 +9,7 @@ inherit autotools eutils gnome2-utils
 
 DESCRIPTION="Volume mixer for the system tray"
 HOMEPAGE="https://github.com/nicklan/pnmixer"
-SRC_URI="https://github.com/nicklan/pnmixer/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/nicklan/pnmixer/archive/v${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -25,6 +25,8 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig"
 
+S=${WORKDIR}/${P/_rc/-rc}
+
 src_prepare() {
 	eautoreconf
 }

media-sound/pnmixer/pnmixer-9999.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -39,11 +39,6 @@ src_configure() {
 		--with-gtk3
 }
 
-src_install() {
-	default
-	newicon -s 128 pixmaps/${PN}-about.png ${PN}.png
-}
-
 pkg_preinst() {
 	gnome2_icon_savelist
 }

metadata/.gitignore

@@ -1,10 +1,10 @@
-# These are added during tree generation only
-cache
-dtd
-glsa
-md5-cache
-news
-herds.xml
-timestamp
-timestamp.chk
-timestamp.x
+# These are added during tree generation only.
+/cache/
+/dtd/
+/glsa/
+/md5-cache/
+/news/
+/herds.xml
+/timestamp
+/timestamp.chk
+/timestamp.x

metadata/dtd/timestamp.chk

@@ -1 +1 @@
-Mon, 10 Aug 2015 20:11:03 +0000
+Tue, 11 Aug 2015 07:11:02 +0000

metadata/glsa/timestamp.chk

@@ -1 +1 @@
-Mon, 10 Aug 2015 20:11:03 +0000
+Tue, 11 Aug 2015 07:11:02 +0000

metadata/md5-cache/app-editors/xemacs-21.4.24

@@ -4,11 +4,11 @@ DESCRIPTION=highly customizable open source text editor and application developm
 EAPI=5
 HOMEPAGE=http://www.xemacs.org/
 IUSE=eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xim athena neXt Xaw3d gdbm berkdb
-KEYWORDS=alpha ~amd64 hppa ppc ppc64 sparc ~x86
+KEYWORDS=alpha amd64 hppa ppc ppc64 sparc ~x86
 LICENSE=GPL-2+
 PDEPEND=app-xemacs/xemacs-base mule? ( app-xemacs/mule-base )
 RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3 ) >=sys-libs/zlib-1.1.4 >=dev-libs/openssl-0.9.6:0 >=media-libs/audiofile-0.2.3 gpm? ( >=sys-libs/gpm-1.19.6 ) postgres? ( dev-db/postgresql:= ) ldap? ( net-nds/openldap ) nas? ( media-libs/nas ) X? ( x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) dnd? ( x11-libs/dnd ) motif? ( >=x11-libs/motif-2.3:0 ) athena? ( x11-libs/libXaw ) Xaw3d? ( x11-libs/libXaw3d ) neXt? ( x11-libs/neXtaw ) xface? ( media-libs/compface ) tiff? ( media-libs/tiff:0 ) png? ( >=media-libs/libpng-1.2:0 ) jpeg? ( virtual/jpeg:0 ) canna? ( app-i18n/canna ) !amd64? ( freewnn? ( app-i18n/freewnn ) ) >=sys-libs/ncurses-5.2 >=app-eselect/eselect-emacs-1.15
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/xemacs-21.4/xemacs-21.4.24.tar.gz http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz
 _eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	eutils	351a78113be5b393c09a2c948701ad36	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=d136a928c2283e7c296a249abf41b2f9
+_md5_=102c01f098400020ed9105318e272e94

metadata/md5-cache/app-emacs/ess-15.03.1

@@ -3,10 +3,10 @@ DEPEND=app-text/texi2html virtual/latex-base >=virtual/emacs-23
 DESCRIPTION=Emacs Speaks Statistics
 EAPI=5
 HOMEPAGE=http://ess.r-project.org/
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2+ GPL-3+ Texinfo-manual
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://ess.r-project.org/downloads/ess/ess-15.03-1.tgz
 _eclasses_=elisp	484004c25306120b472b7dfdb0685c95	elisp-common	73c48c11ad6a6494eda0d0cca848c8fa	eutils	351a78113be5b393c09a2c948701ad36	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	readme.gentoo	13aa6ffcee3f5f1d3a39515b001a39f5	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=dbaf1d8dc1c07a2cc0e24f31c7caa411
+_md5_=112b3613d67358f4cd1c4d83421f8fec

metadata/md5-cache/app-emulation/lxd-0.13

@@ -10,4 +10,4 @@ RDEPEND=app-admin/cgmanager app-arch/xz-utils app-emulation/lxc[cgmanager] net-a
 SLOT=0
 SRC_URI=http://961db08fe45d5f5dd062-b8a7a040508aea6d369676e49b80719d.r29.cf2.rackcdn.com/lxd-0.13.tar.bz2
 _eclasses_=bash-completion-r1	b1fc4d30333bb528c8abb4332bb70ea6	eutils	351a78113be5b393c09a2c948701ad36	golang-base	59e300a2d8836a6e8d508276da0d570f	golang-build	1b49258a68ba3972a575490adf3b7b4c	l10n	714aaf78929eade946da5eaff7d2001a	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	systemd	6b4f0cefa642270eded7e6ca816fd181	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	user	906f3c8eb3a2350a4f1191a89baa3e46	vcs-snapshot	2ecbc36efd3f6b8486f63fcf8530c1bd
-_md5_=e2cc7818536cff2063dde67539e2d393
+_md5_=70402a3364d6d479c5e6b3141d6885f0

metadata/md5-cache/app-misc/gtk-sunlight-0.4.2

@@ -5,8 +5,8 @@ EAPI=4
 HOMEPAGE=http://realtimesunlightwallpaper.weebly.com/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-1
-RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2
+RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3
 SLOT=0
 SRC_URI=http://ppa.launchpad.net/realtime.sunlight.wallpaper/rsw/ubuntu/pool/main/g/gtk-sunlight/gtk-sunlight_0.4.2.orig.tar.gz
 _eclasses_=multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=f920b8c5adcb028de96360918ccf590e
+_md5_=371dabf34e6afecb51d6ce1da276c41e

metadata/md5-cache/app-text/mupdf-1.5-r1

@@ -10,4 +10,4 @@ RDEPEND=dev-libs/openssl[static-libs?] media-libs/freetype:2[static-libs?] media
 SLOT=0/1.5
 SRC_URI=http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=b2f096de23e5341fbbcd7c290f3a144423741906;sf=tgz -> mupdf-1.5.tar.gz
 _eclasses_=eutils	351a78113be5b393c09a2c948701ad36	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	vcs-snapshot	2ecbc36efd3f6b8486f63fcf8530c1bd
-_md5_=50a03453258718e87b311dfb35fcb050
+_md5_=5a418cb8e13af744f5760125e0991cab

metadata/md5-cache/dev-db/sqlitebrowser-3.3.1

@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-java/antlr:0[cxx] dev-libs/qcustomplot[-qt5(-)] dev-qt/qtcore:4 dev-qt/qtgui:4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=SQLite Database Browser
-EAPI=5
-HOMEPAGE=http://sqlitebrowser.org
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3 MPL-2.0
-RDEPEND=dev-java/antlr:0[cxx] dev-libs/qcustomplot[-qt5(-)] dev-qt/qtcore:4 dev-qt/qtgui:4
-SLOT=0
-SRC_URI=https://github.com/sqlitebrowser/sqlitebrowser/archive/v3.3.1.tar.gz -> sqlitebrowser-3.3.1.tar.gz
-_eclasses_=cmake-utils	f474224ef49d530640a43a04ae94928e	eutils	351a78113be5b393c09a2c948701ad36	flag-o-matic	02090c5a622458303e6bf68837ac6b96	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=5be5d1817d0fa9f37a76d9a0d758a380

metadata/md5-cache/dev-go/go-crypto-0_pre20150608

@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.4
-DESCRIPTION=Go supplementary cryptography libraries
-EAPI=5
-HOMEPAGE=https://godoc.org/golang.org/x/crypto
-KEYWORDS=~amd64
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/golang/crypto/archive/1e856cbfdf9bc25eefca75f83f25d55e35ae72e0.tar.gz -> go-crypto-0_pre20150608.tar.gz
-_md5_=608329fd08fd93a618a110e6b2685442

metadata/md5-cache/dev-go/go-net-0_pre20150604

@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.4 dev-go/go-text
-DESCRIPTION=Go supplementary network libraries
-EAPI=5
-HOMEPAGE=https://godoc.org/golang.org/x/net
-KEYWORDS=~amd64
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/golang/net/archive/dfe268fd2bb5c793f4c083803609fce9806c6f80.tar.gz -> go-net-0_pre20150604.tar.gz
-_md5_=26d3e263fb6a0451219ae321738bbbcf

metadata/md5-cache/dev-go/go-oauth2-0_pre20150527

@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.4 dev-go/go-net
-DESCRIPTION=Go client implementation for OAuth 2.0 spec
-EAPI=5
-HOMEPAGE=https://godoc.org/golang.org/x/oauth2
-KEYWORDS=~amd64
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/golang/oauth2/archive/b5adcc2dcdf009d0391547edc6ecbaff889f5bb9.tar.gz -> go-oauth2-0_pre20150527.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/629ed086d82ad5d0ac3668e309b8785aaf54735b.tar.gz -> gcloud-golang-629ed086d82ad5d0ac3668e309b8785aaf54735b.tar.gz
-_md5_=e4a779a26565d902a9a934ca3669051b

metadata/md5-cache/dev-go/go-protobuf-0_pre20150727

@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.4.2:=
-DESCRIPTION=Go support for Google's protocol buffers
-EAPI=5
-HOMEPAGE=https://github.com/golang/protobuf
-KEYWORDS=~amd64
-LICENSE=BSD
-SLOT=0/0_pre20150727
-SRC_URI=https://github.com/golang/protobuf/archive/68c687dc49948540b356a6b47931c9be4fcd0245.tar.gz -> go-protobuf-0_pre20150727.tar.gz
-_eclasses_=golang-base	59e300a2d8836a6e8d508276da0d570f	golang-build	1b49258a68ba3972a575490adf3b7b4c
-_md5_=72cc95de09a8ed824cafc34d99325711

metadata/md5-cache/dev-go/go-sys-0_pre20150518

@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.4
-DESCRIPTION=Go packages for low-level interaction with the operating system
-EAPI=5
-HOMEPAGE=https://godoc.org/golang.org/x/sys
-KEYWORDS=~amd64
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/golang/sys/archive/58e109635f5d754f4b3a8a0172db65a52fcab866.tar.gz -> go-sys-0_pre20150518.tar.gz
-_md5_=d2f6dc68179504b350d9ab0ca0c74783

metadata/md5-cache/dev-go/go-text-0_pre20150604

@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.4
-DESCRIPTION=Go text processing support
-EAPI=5
-HOMEPAGE=https://godoc.org/golang.org/x/text
-KEYWORDS=~amd64
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/golang/text/archive/df923bbb63f8ea3a26bb743e2a497abd0ab585f7.tar.gz -> go-text-0_pre20150604.tar.gz
-_md5_=7eca254d1a5c579b8b688f3016e4932c

metadata/md5-cache/dev-go/go-tools-0_pre20150606

@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.4 dev-go/go-net
-DESCRIPTION=Go Tools
-EAPI=5
-HOMEPAGE=https://godoc.org/golang.org/x/tools
-KEYWORDS=~amd64
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/golang/tools/archive/ac303766f5f240c1796eeea3dc9bf34f1261aa35.tar.gz -> go-tools-0_pre20150606.tar.gz http://golang.org/favicon.ico -> go-favicon.ico
-_md5_=445533a5b9a350bd7a67ed1aa8dbcc37

metadata/md5-cache/dev-java/glassfish-xmlrpc-api-1.1.1

@@ -4,10 +4,10 @@ DESCRIPTION=Project GlassFish XML RPC API
 EAPI=5
 HOMEPAGE=https://glassfish.java.net/
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~x86 ~amd64
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 java-virtuals/servlet-api:3.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~tomwij/files/dist/glassfish-xmlrpc-api-1.1.1.tar.xz
 _eclasses_=eutils	351a78113be5b393c09a2c948701ad36	java-ant-2	a91064e45b54985a9d6a8779e1cde5f4	java-pkg-2	bb9b8157d2a348d9ec42ce34a107fe0d	java-utils-2	7c8af272d218f7b7df22fd16bb0bfb63	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e826ef9fc00755b251ddf89dd8ba307e
+_md5_=48bd470ab981f5ba5b269bf0d1f150a3

metadata/md5-cache/dev-java/istack-commons-tools-2.22

@@ -4,10 +4,10 @@ DESCRIPTION=IStack Commons - Tools jar
 EAPI=5
 HOMEPAGE=https://istack-commons.java.net
 IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.6 dev-java/ant-core:0 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://maven.java.net/content/repositories/releases/com/sun/istack/istack-commons-tools/2.22/istack-commons-tools-2.22-sources.jar
 _eclasses_=eutils	351a78113be5b393c09a2c948701ad36	java-pkg-2	bb9b8157d2a348d9ec42ce34a107fe0d	java-pkg-simple	d87e645de7dff9e1bc0aac42b43ca4f4	java-utils-2	7c8af272d218f7b7df22fd16bb0bfb63	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5ad0cac9f373b893d012374ab6f4c8ea
+_md5_=28a5f0c2bd3af96aad2f834a3052d3d4

metadata/md5-cache/dev-java/istack-commons-tools-20070122-r1

@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install preinst setup unpack
-DEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=istack-commons - tools
-HOMEPAGE=https://istack-commons.dev.java.net/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ppc x86 ~x86-fbsd
-LICENSE=CDDL
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gentoo/istack-commons-20070122.tar.bz2
-_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	java-ant-2	a91064e45b54985a9d6a8779e1cde5f4	java-pkg-2	bb9b8157d2a348d9ec42ce34a107fe0d	java-utils-2	7c8af272d218f7b7df22fd16bb0bfb63	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7f5910608b3e96e656c2f6e893cb0140

metadata/md5-cache/dev-java/istack-commons-tools-20090620

@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 dev-java/ant-core >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=istack-commons - tools
-EAPI=2
-HOMEPAGE=https://istack-commons.dev.java.net/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
-LICENSE=CDDL
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=1.1
-SRC_URI=mirror://gentoo/istack-commons-20090620-src.tar.bz2
-_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	java-ant-2	a91064e45b54985a9d6a8779e1cde5f4	java-pkg-2	bb9b8157d2a348d9ec42ce34a107fe0d	java-utils-2	7c8af272d218f7b7df22fd16bb0bfb63	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b4139a5543ac53be528d7f89254d5335