Sync with portage [Tue May 31 08:58:31 MSK 2016].

8 years ago · df289f2625
parent f3da297470
commit df289f2625
575 changed files with 3292 additions and 5709 deletions
--- a/app-accessibility/espeakup/espeakup-9999.ebuild
+++ b/app-accessibility/espeakup/espeakup-9999.ebuild
@ -15,7 +15,7 @@ fi
 inherit $vcs linux-info

 DESCRIPTION="espeakup is a small lightweight connector for espeak and speakup"
-HOMEPAGE="https://www.github.com/williamh/espeakup"
+HOMEPAGE="https://github.com/williamh/espeakup"

 LICENSE="GPL-3"
 SLOT="0"
--- a/app-admin/github-backup-utils/github-backup-utils-2.5.0.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.5.0.ebuild
@ -10,7 +10,7 @@ inherit python-any-r1

 DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
 HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="http://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
--- a/app-admin/github-backup-utils/github-backup-utils-2.6.0.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.6.0.ebuild
@ -10,7 +10,7 @@ inherit python-any-r1

 DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
 HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="http://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
--- a/app-arch/engrampa/engrampa-1.10.2.ebuild
+++ b/app-arch/engrampa/engrampa-1.10.2.ebuild
@ -17,7 +17,7 @@ HOMEPAGE="http://mate-desktop.org"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"

 IUSE="caja magic"

--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@ -2,3 +2,4 @@ DIST unrarsrc-5.1.6.tar.gz 215185 SHA256 3c38eaabc655527244fd0c3ba3beff567ea24aa
 DIST unrarsrc-5.2.7.tar.gz 218880 SHA256 ef14757e943787b439fedf2c564c1f38d0db315528a928e0de170860717e2fac SHA512 95e06451e2bec46a12e5b9b1423c3ea31ce86859f8086812d9c442aaa69627f72635a6a8c197b30dbc7e99bbf7c7caaa25d703caecbe03c697cc0e5b7644d638 WHIRLPOOL 49f5492a7441192d96616f892012ca2dac8a94063e806ece3c62bf13d29beb9d2d0368a186c0f0bff8814c9e6af542ba6b447a61683295f560f120ff75507379
 DIST unrarsrc-5.3.11.tar.gz 223663 SHA256 77b87af4b2976ef7c6b0c79e071284c2c1b035a9543273ec925f9d92f73b8763 SHA512 14ea833fe4c2d81718df25794d2e795a255f92c68a5533d6a7d2cbfc072db3ce07bba7ba1fd5555aad1a17fbaf4980eb217a7d9f6158461fa917e1a17590569b WHIRLPOOL 60c909d9005cb0e2cfbef606b2dc66d9f7b3fd019fbf8ad83ce8b07f9e11c1890db175836ee3e63a21aa2f309ac0ebfebcf2ed5f60ca321a9b8a1b89409b1331
 DIST unrarsrc-5.4.1.tar.gz 225911 SHA256 93444ce11626683db5900f795c6961137dd8758fd118bf0854cf43fb9cf9743d SHA512 422b09701171888c27b428dc0de6e44671a8305930d2d82cc48bc160b4cb0b6140c2af39ee2a6aa61bc08fa5753ad746db9a9409cd6373123b07aba0902e8d90 WHIRLPOOL a505f37e40d9fd273db5ae912d5b8d6ac08ba7a6d52f6d48594cf63e7eb5ccc238e141e37b161efd21726620e97d810d3e7f4da77284dcb7f8d26226ac38b920
+DIST unrarsrc-5.4.2.tar.gz 225915 SHA256 d91d5fa8abdbac60b3e2b7317cc1451a2b38c550adee977b847f22594c53f1bd SHA512 a6c6b4fde8d0d1bff1d8eabaf348c2397bc7f1433cb8781b7bf4d4d48a62cc23e410ab1b6badf2f16a87664e7ecd0a8e33c4f30fa8af23d65bc4efa7a6c964e3 WHIRLPOOL 5880187982f5497e6195e80e47427fdd6a6cfafc956316d5fc1206c2b8762b02663a9f48826c9cebe5ac664df8bb6f43b24a135b321abf9364e183dc4a80cf7c
--- a/app-arch/unrar/unrar-5.4.2.ebuild
+++ b/app-arch/unrar/unrar-5.4.2.ebuild
@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+MY_PN=${PN}src
+
+DESCRIPTION="Uncompress rar files"
+HOMEPAGE="http://www.rarlab.com/rar_add.htm"
+SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="unRAR"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
+
+S=${WORKDIR}/unrar
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-5.0.2-build.patch
+	epatch "${FILESDIR}"/${PN}-5.2.2-no-auto-clean.patch #528218
+	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
+	else
+		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
+	fi
+	sed -i "${sed_args[@]}" makefile || die
+}
+
+src_configure() {
+	mkdir -p build-{lib,bin}
+	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
+	cp build-{lib,bin}/Makefile || die
+}
+
+src_compile() {
+	unrar_make() {
+		emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
+	}
+
+	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
+
+	unrar_make -C build-bin
+}
+
+src_install() {
+	dobin build-bin/unrar
+	dodoc readme.txt
+
+	dolib.so build-lib/libunrar*
+
+	insinto /usr/include/libunrar${PV%.*.*}
+	doins *.hpp
+	dosym libunrar${PV%.*.*} /usr/include/libunrar
+}
--- a/app-crypt/qca/qca-2.1.1.ebuild
+++ b/app-crypt/qca/qca-2.1.1.ebuild
@ -12,7 +12,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"

 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"

 IUSE="botan debug doc examples gcrypt gpg libressl logger nss +openssl pkcs11 +qt4 qt5 sasl softstore test"
 REQUIRED_USE="|| ( qt4 qt5 )"
--- a/app-crypt/ssh-multiadd/metadata.xml
+++ b/app-crypt/ssh-multiadd/metadata.xml
@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>ashmew2@gmail.com</email>
+		<name>Ashish Gupta</name>
+		<description>Proxied Maintainer, assign bugs to him</description>
+	</maintainer>
+	<maintainer type="person">
+		<email>k_f@gentoo.org</email>
+		<name>Kristian Fiskerstrand</name>
+		<description>Proxy Maintainer, CC on bugs</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Gentoo Proxy Maintainers Project</name>
+	</maintainer>
 </pkgmetadata>
--- a/app-doc/xmltoman/xmltoman-0.4.ebuild
+++ b/app-doc/xmltoman/xmltoman-0.4.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

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

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~hppa ppc ~ppc64 sparc x86"
 IUSE=""

 RDEPEND="dev-lang/perl
--- a/app-editors/pluma/pluma-1.10.2.ebuild
+++ b/app-editors/pluma/pluma-1.10.2.ebuild
@ -19,7 +19,7 @@ HOMEPAGE="http://mate-desktop.org"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"

 IUSE="python spell"

--- a/app-editors/qxmledit/Manifest
+++ b/app-editors/qxmledit/Manifest
@ -1,3 +1,2 @@
 DIST qxmledit-0.8.8-1-src.tgz 8885329 SHA256 d43ccd0029b1094a970d58170a095cbe5fddfe3d93da7c52388783d321386e17 SHA512 5440d33c052507d3b5c840cdd2966c151a77e2027703f7c1d33f80ec786affab915053d2ae17ef72fd856223ca85dbb70d39d8800170449a26ea88632c0069b5 WHIRLPOOL 68f8d73c39ce490f13d88283053ad045125f007132a25d965ffb603ab1de1d42b62944659a76aa9bbb5adc884b37ad90f7eaf4487f314678d8a1923cd16f1078
-DIST qxmledit-0.9.2-src.tgz 16697023 SHA256 14b8b47f00cf8ea031a0066c928cf8888a3b0d885627ed7f45c6d455be8bd531 SHA512 1cef025ded878e8ad4a33af7f22caf4b157a93e30a6fe863d80ef8c32ca6c9f080e3e4212d1db6a18e647ca111afba796b77f13c2dbc65b18d498fb977504c93 WHIRLPOOL 07fc283720a7427f352fac086770f07e921c20f66ead80fd1b0729be5afc6a01d0c437973dc6c85a61c22f3dabdc9eba2c9b9bf1721e859f0a23cc0cd60900a7
 DIST qxmledit-0.9.3-src.tgz 17564710 SHA256 f4f1e305712ca033d8fe9cef8ddce6a94fd4deffd9e723c1734786e18a49fc50 SHA512 b7377c73d2e2aff1670e94c8c86c146e85d70841c638878f6be17ff939167c7d17f28095d4929388212380957cd4e3537450549827d8a8b239f5510f27e01afa WHIRLPOOL 214662e68d42c86745524278ac5809e6beb3d7e36ecffa4e6041447c521b733a97673adb93f00ab8513be870bfdb12a3adb950f8238bab15591993f3677373c2
--- a/app-editors/qxmledit/qxmledit-0.9.2.ebuild
+++ b/app-editors/qxmledit/qxmledit-0.9.2.ebuild
@ -1,70 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit eutils qmake-utils
-
-DESCRIPTION="Qt4 XML Editor"
-HOMEPAGE="http://qxmledit.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tgz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="qt5"
-
-DEPEND="
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtsql:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-		dev-qt/qtxmlpatterns:5
-	)
-	!qt5? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qtsql:4
-		dev-qt/qtsvg:4
-		dev-qt/qtxmlpatterns:4
-	)"
-RDEPEND="${DEPEND}"
-
-DOCS=(AUTHORS NEWS README)
-
-src_prepare() {
-	default
-
-	# bug 568746
-	sed -i -e '/QMAKE_CXXFLAGS/s:-Werror::' \
-		src/{QXmlEdit,QXmlEditWidget,sessions/QXmlEditSessions}.pro || die
-}
-
-src_configure() {
-	export \
-		QXMLEDIT_INST_DIR="/usr/bin" \
-		QXMLEDIT_INST_LIB_DIR="/usr/$(get_libdir)" \
-		QXMLEDIT_INST_INCLUDE_DIR="/usr/include/${PN}" \
-		QXMLEDIT_INST_DATA_DIR="/usr/share/${PN}" \
-		QXMLEDIT_INST_DOC_DIR="/usr/share/doc/${PF}" \
-		QXMLEDIT_INST_TRANSLATIONS_DIR="/usr/share/${PN}/translations"
-
-	if use qt5; then
-		eqmake5
-	else
-		eqmake4
-	fi
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	doicon install_scripts/environment/icon/qxmledit.png
-	domenu install_scripts/environment/desktop/QXmlEdit.desktop
-	einstalldocs
-}
--- a/app-editors/qxmledit/qxmledit-0.9.3.ebuild
+++ b/app-editors/qxmledit/qxmledit-0.9.3.ebuild
@ -6,7 +6,7 @@ EAPI=6

 inherit eutils qmake-utils

-DESCRIPTION="Qt4 XML Editor"
+DESCRIPTION="Simple Qt-based XML editor"
 HOMEPAGE="http://qxmledit.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}-src.tgz"

--- a/app-editors/tea/Manifest
+++ b/app-editors/tea/Manifest
@ -1,2 +1 @@
-DIST tea-41.1.0.tar.bz2 381370 SHA256 65ea128739802b7626a5a59de12b0e885dcef7a83f7bcd06b6d3aea830ed8717 SHA512 a46e0cdfce5c7d453c7783c59ad98b2b029847ddcc8ce0655c6e1ae45825426ac1b271ca7ad90f0219d8f796f507f6bdba0f2c764c563c8c23503b94be817eb7 WHIRLPOOL a3d00f5e42a145be2a7f3bf846832bf2a7e95e957abf4c928118be7607adb57fddfb906fbedaf7fa51665b25629beae0fe5b4db40886f42dfcf5c166e43717b5
 DIST tea-41.1.1.tar.bz2 382592 SHA256 5f17a1f190c7a31f326273f5c987378f9fdbc3fc34a7d0a97529bc926492bef9 SHA512 087325a80f86b27c20174849a8477d1d994176f560fc0bc353cfa6bfcfc1e916bac42607d94640cd1c2e1abd6385db7a836557a6ef2defae6de0901195fc7975 WHIRLPOOL d1e48c2ba40d2978a06c2069927ba664b17f84039e96b349937ae5f159e32998a964fd86e8c89725bb36845aba541ba4eccfb91f939fb352b727e1cf2aa72548
--- a/app-editors/tea/tea-41.1.0.ebuild
+++ b/app-editors/tea/tea-41.1.0.ebuild
@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PLOCALES="de fr ru"
-
-inherit eutils l10n qmake-utils
-
-DESCRIPTION="Small, lightweight Qt text editor"
-HOMEPAGE="http://tea.ourproject.org/ http://semiletov.org/tea/"
-SRC_URI="http://tea.ourproject.org/dloads/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86 ~x86-fbsd"
-IUSE="aspell hunspell"
-
-RDEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	sys-libs/zlib
-	aspell? ( app-text/aspell )
-	hunspell? ( app-text/hunspell )
-"
-DEPEND="${RDEPEND}
-	hunspell? ( virtual/pkgconfig )
-"
-
-DOCS=( AUTHORS ChangeLog NEWS TODO )
-
-src_configure() {
-	eqmake4 src.pro \
-		$(use aspell || echo CONFIG+=noaspell) \
-		$(use hunspell || echo CONFIG+=nohunspell)
-}
-
-src_install() {
-	dobin bin/tea
-
-	newicon icons/tea-icon-v3-01.png ${PN}.png
-	make_desktop_entry ${PN} 'Tea Editor'
-
-	# translations
-	insinto /usr/share/qt4/translations
-	local lang
-	for lang in $(l10n_get_locales); do
-		doins translations/${PN}_${lang}.qm
-	done
-
-	# docs
-	dohtml manuals/en.html
-	if use linguas_ru; then
-		dodoc NEWS-RU
-		dohtml manuals/ru.html
-	fi
-}
--- a/app-emulation/q4wine/Manifest
+++ b/app-emulation/q4wine/Manifest
@ -1,3 +1,3 @@
 DIST q4wine-1.0-r3.tar.bz2 889308 SHA256 9f1319dd0baff3834a3938e0a048c1529cb9ea521158370176b706fce0d4d2ff SHA512 df10a2fbf6874f4c4e02dd9c43031453a46c76f03d83321f2d6e9544d0540dd07da1bc9246767c5c91ce17d67d5d236227294efaed9de09f3d5a18afbd60b224 WHIRLPOOL 51b5b4cfc157da6b99154269ef4ef9f38ff91f861864158b789352505af485d8b523a21c6d4b59544804ed3c15cb1c6c756db3f3203c8e3ba55c8396c3630df3
-DIST q4wine-1.1-r2.tar.bz2 888990 SHA256 01463f9ec3ef9f7ef987d2b77425f2806cf2b60f574deb6644458366782eafc7 SHA512 8aaeec46d239a86a9eb10377842d63d84a35864f920f9dc46a022ae1cf3e010273d3759701595e058a089f6418a297a0bf94ed62b580a71fa1c8c27a80f4ec7e WHIRLPOOL 6ae891e33a2bf3759c45930820e21a273b2bf36f2c386a841a96c3bf14cfdb6741871d3c90383dde3b6b01df1a87f5b1537ae40bac5a494bdd3023248c526244
 DIST q4wine-1.2-r2.tar.bz2 690922 SHA256 44bac78060233504d0db945533e5da4a92bf8b4ca4ef87928032d14451e42160 SHA512 c47fc3adc756ea4bc33dc10f6de03e0a0e72258d1b4b238930136653a7938869d221ce08f6fcafcd5f012583b28227cf827505a59ee5322e9ab90c2c819fd7cb WHIRLPOOL 564eb944097528248f340ac59462f63bec22211d554ad26f125d46382a30ee2a8b7c8d00dd8874fabe92ae939f6bcf13665158957e0e8dad26e077018e495c0d
+DIST q4wine-1.3.tar.bz2 2819219 SHA256 bb6c0f936cbbb9158982596fb82c2e7a228f07d81af430245197f64c0702423a SHA512 e38cd8c389ec9eb2915b4efb786ba799d61e6c95ec042a746165a2f50de2fc545be2798afe98223aa8410b76ed77e267c99f0ff8f9366f010d2b145ccd8ed34a WHIRLPOOL 581d460f6d84e2ec7ce272352d4db3ae22f06befefbf34bfef72e8bb77cd18c8d8056bcf53389e4f7c1c9265d42c13a6f84704b9a1c8b34977f7d47076084594
--- a/app-emulation/q4wine/files/q4wine-qtsingleapp.patch
+++ b/app-emulation/q4wine/files/q4wine-qtsingleapp.patch
@ -1,15 +0,0 @@
-https://github.com/brezerk/q4wine/issues/39
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index adb8db6..7c0d0d2 100644
--- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -275,7 +275,7 @@ SET ( Q4WINE_HEADERS_DIR
- 
- IF (${WITH_SYSTEM_SINGLEAPP} MATCHES ON )
-     MESSAGE(STATUS "Searching for QtSingleApplication package (WITH_SYSTEM_SINGLEAPP=ON) --\n")
-    find_path(QTSINGLEAPPLIB_INCLUDE_DIR QtSingleApplication PATH_SUFFIXES QtSolutions)
-+    find_path(QTSINGLEAPPLIB_INCLUDE_DIR QtSingleApplication PATH_SUFFIXES QtSolutions PATHS /usr/include/qt4)
-     find_library(QTSINGLEAPPLIB QtSolutions_SingleApplication-2.6)
- 
-     IF (QTSINGLEAPPLIB_INCLUDE_DIR AND QTSINGLEAPPLIB )
--- a/app-emulation/q4wine/metadata.xml
+++ b/app-emulation/q4wine/metadata.xml
@ -11,11 +11,14 @@
 	</maintainer>
 	<use>
 		<flag name="gnome">Use the gksu sudo GUI for managing the devices</flag>
-		<flag name="icoutils">Enable icoutils support</flag>
+		<flag name="ico">Enable ico support via <pkg>media-gfx/icoutils</pkg></flag>
+		<flag name="icoutils">Enable <pkg>media-gfx/icoutils</pkg> support</flag>
+		<flag name="iso">Support unprivileged mounting of ISO9660 images via <pkg>sys-fs/fuseiso</pkg></flag>
 		<flag name="kde">Use the kdesu sudo GUI for managing the devices</flag>
-		<flag name="wineappdb">Enable Win AppDB browser subsystem</flag>
+		<flag name="wineappdb">Enable Wine AppDB browser support</flag>
 	</use>
 	<upstream>
+		<remote-id type="github">brezerk/q4wine</remote-id>
 		<remote-id type="sourceforge">q4wine</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/app-emulation/q4wine/q4wine-1.1_p2-r1.ebuild
+++ b/app-emulation/q4wine/q4wine-1.1_p2-r1.ebuild
@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PLOCALES="af_ZA cs_CZ de_DE en_US es_ES fa_IR he_IL it_IT pl_PL pt_BR ru_RU uk_UA"
-PLOCALE_BACKUP="en_US"
-
-inherit cmake-utils l10n
-
-DESCRIPTION="Qt4 GUI configuration tool for Wine"
-HOMEPAGE="http://q4wine.brezblock.org.ua/"
-
-# Upstream names the package PV-rX. We change that to
-# PV_pX so we can use portage revisions.
-MY_PV="${PV/_p/-r}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/${PN}%20${MY_PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+dbus debug +icoutils +wineappdb"
-
-DEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtsingleapplication[qt4(+),X]
-	dev-qt/qtsql:4[sqlite]
-	dbus? ( dev-qt/qtdbus:4 )
-"
-RDEPEND="${DEPEND}
-	app-admin/sudo
-	app-emulation/wine
-	>=sys-apps/which-2.19
-	sys-fs/fuseiso
-	icoutils? ( >=media-gfx/icoutils-0.26.0 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS ChangeLog README )
-
-src_configure() {
-	local enabled_linguas
-	construct_LINGUAS() {
-		local current_locale="$(echo ${1} | tr '[:upper:]' '[:lower:]')"
-		enabled_linguas="${enabled_linguas};${current_locale}"
-	}
-	l10n_for_each_locale_do construct_LINGUAS
-	local mycmakeargs=(
-		-DLINGUAS="${enabled_linguas}"
-		-DQT5=OFF
-		-DWITH_SYSTEM_SINGLEAPP=ON
-		$(cmake-utils_use debug)
-		$(cmake-utils_use_with dbus)
-		$(cmake-utils_use_with icoutils)
-		$(cmake-utils_use_with wineappdb)
-	)
-	cmake-utils_src_configure
-}
--- a/app-emulation/q4wine/q4wine-1.3.ebuild
+++ b/app-emulation/q4wine/q4wine-1.3.ebuild
@ -0,0 +1,67 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils
+
+# Upstream names the package PV-rX. We change that to
+# PV_pX so we can use portage revisions.
+MY_P=${PN}-${PV/_p/-r}
+
+DESCRIPTION="Qt GUI configuration tool for Wine"
+HOMEPAGE="http://q4wine.brezblock.org.ua/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+dbus debug +ico +iso qt5 +wineappdb"
+
+CDEPEND="
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtsingleapplication[qt5,X]
+		dev-qt/qtsql:5[sqlite]
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+		dbus? ( dev-qt/qtdbus:5 )
+	)
+	!qt5? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		dev-qt/qtsingleapplication[qt4,X]
+		dev-qt/qtsql:4[sqlite]
+		dbus? ( dev-qt/qtdbus:4 )
+	)
+"
+DEPEND="${CDEPEND}
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+RDEPEND="${CDEPEND}
+	app-admin/sudo
+	>=sys-apps/which-2.19
+	ico? ( >=media-gfx/icoutils-0.26.0 )
+	iso? ( sys-fs/fuseiso )
+"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( AUTHORS ChangeLog README )
+
+src_configure() {
+	local mycmakeargs=(
+		-DQT5=$(usex qt5 ON OFF)
+		-DDEBUG=$(usex debug ON OFF)
+		-DWITH_ICOUTILS=$(usex ico ON OFF)
+		-DWITH_SYSTEM_SINGLEAPP=ON
+		-DWITH_WINEAPPDB=$(usex wineappdb ON OFF)
+		-DUSE_BZIP2=OFF
+		-DUSE_GZIP=OFF
+		-DWITH_DBUS=$(usex dbus ON OFF)
+	)
+	cmake-utils_src_configure
+}
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@ -1 +1,2 @@
 DIST vice-2.4.22.tar.gz 25180343 SHA256 767e00eb9dbd1a9bcc6db8b4cd1697b8bc744b1d507bbac930975ee130378d9d SHA512 b43e609ae2f43717d10e079d3b8ac284e5c4920ed222c7502e9a7b75dfe32784628031ae6cf8672c8d9d50576fb714cecdd1a9292bf53477f4bbd52c10403975 WHIRLPOOL 580de25d739585c0316c91aba44bb17b2cd4cc19f162e3c5e53b8a7a9e3f694e8c5d8d549b232259d5c9ed077549410b220169a3c026ebad55bc7c537922be81
+DIST vice-2.4.27.tar.gz 25561665 SHA256 ce8b8649308b38f5245490c9df13230d075d3e571b538807d4ca8dd1d53e0b47 SHA512 589b9892f3180db6f169e74b863171f08567045862f2f47cac73ef946e81d55dcde5373fc910cfd1659238669f12ee6ad934c7143c87fad736cda77479439bec WHIRLPOOL 44633477e9ec5bf6b950efa6743647304770a44d58c624b623c992d09735446c79185ca410af60768554b62c0db4675e99c9db1a25c49b3b861860d00a298406
--- a/app-emulation/vice/files/vice-2.4.27-autotools.patch
+++ b/app-emulation/vice/files/vice-2.4.27-autotools.patch
@ -0,0 +1,11 @@
+--- vice-2.4.7.orig/configure.ac
+++ vice-2.4.7/configure.ac
+@@ -124,7 +118,7 @@
+ AC_SUBST(VICE_VERSION)
+ 
+ AM_INIT_AUTOMAKE(vice, $VICE_VERSION)
+-AM_CONFIG_HEADER(src/config.h)
+AC_CONFIG_HEADERS(src/config.h)
+ 
+ if test x"$VICE_VERSION_BUILD" = "x" -o x"$VICE_VERSION_BUILD" = "x0" ; then
+   VERSION_RC=$VICE_VERSION_MAJOR","$VICE_VERSION_MINOR",0,0"
--- a/app-emulation/vice/vice-2.4.27.ebuild
+++ b/app-emulation/vice/vice-2.4.27.ebuild
@ -0,0 +1,170 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils toolchain-funcs flag-o-matic games
+
+DESCRIPTION="The Versatile Commodore 8-bit Emulator"
+HOMEPAGE="http://vice-emu.sourceforge.net/"
+SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="Xaw3d alsa ethernet ffmpeg fullscreen +gtk ipv6 lame nls oss png pulseaudio sdl +sdlsound threads vte zlib"
+
+# upstream says gtk3 and sdl2 shouldn't be exposed yet.
+#REQUIRED_USE="?? ( gtk2 gtk3 sdl )"
+REQUIRED_USE="?? ( gtk sdl )"
+
+GTK_COMMON="
+	x11-libs/pango
+	x11-libs/cairo"
+#	gtk3? (
+#		x11-libs/gtk+:3
+#		vte? ( x11-libs/vte:2.90 )
+#		${GTK_COMMON}
+#	)
+RDEPEND="
+	virtual/jpeg:0
+	virtual/opengl
+	media-libs/giflib
+	alsa? ( media-libs/alsa-lib )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdlsound? ( media-libs/libsdl[sound] )
+	ethernet? (
+	    >=net-libs/libpcap-0.9.8
+	    >=net-libs/libnet-1.1.2.1:1.1
+	)
+	ffmpeg? ( virtual/ffmpeg )
+	lame? ( media-sound/lame )
+	nls? ( virtual/libintl )
+	png? ( media-libs/libpng:0 )
+	zlib? ( sys-libs/zlib )
+	sdl? (
+		media-libs/libsdl[joystick,video]
+	)
+	!sdl? (
+		fullscreen? (
+			x11-libs/libXrandr
+			x11-libs/libXxf86vm )
+		x11-libs/libX11
+		x11-libs/libXext
+		sys-libs/readline:0
+	)
+	gtk? (
+		x11-libs/gtk+:2
+		vte? ( x11-libs/vte:0 )
+		x11-libs/gtkglext
+		${GTK_COMMON}
+	)
+	!sdl? ( !gtk? (
+		x11-libs/libXmu
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-libs/libXv
+		Xaw3d? ( x11-libs/libXaw3d )
+		!Xaw3d? ( x11-libs/libXaw )
+	) )
+	"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	!sdl? (
+		fullscreen? ( x11-proto/xf86vidmodeproto )
+		!gtk? (
+			x11-libs/libICE
+			x11-libs/libSM
+		)
+	)
+	x11-apps/bdftopcf
+	x11-apps/mkfontdir
+	x11-proto/xproto
+	x11-proto/xextproto
+	media-libs/fontconfig
+	x11-proto/videoproto
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-autotools.patch
+	sed -i \
+		-e 's/building//' \
+		doc/Makefile.am || die
+	sed -i \
+		-e "/^docdir =/s:=.*:=/usr/share/doc/${PF}:" \
+		doc/Makefile.am \
+		doc/readmes/Makefile.am || die
+	sed -i \
+		-e "/^docdir =/s:=.*:=/usr/share/doc/${PF}/html:" \
+		doc/html/Makefile.am || die
+	sed -i \
+		-e "s:/usr/local/lib/VICE:$(games_get_libdir)/${PN}:" \
+		man/vice.1 \
+		$(grep -rl --exclude="*texi" /usr/local/lib doc) || die
+	sed -i \
+		-e "/VICEDIR=/s:=.*:=\"$(games_get_libdir)/${PN}\";:" \
+		configure.ac || die
+	sed -i \
+		-e "s:\(#define LIBDIR \).*:\1\"$(games_get_libdir)/${PN}\":" \
+		-e "s:\(#define DOCDIR \).*:\1\"/usr/share/doc/${PF}\":" \
+		src/arch/unix/archdep.h \
+		src/arch/sdl/archdep_unix.h || die
+	rm -rf src/lib/{libffmpeg,liblame} || die
+	sed -i \
+		-e '/SUBDIRS/s/libffmpeg//;' \
+		-e '/SUBDIRS/s/liblame//;' \
+		src/lib/Makefile.am || die
+	AT_NO_RECURSIVE=1 eautoreconf
+}
+
+src_configure() {
+	local gui_arg snd_arg
+
+	snd_arg+=" $(use_with alsa)"
+	snd_arg+=" $(use_with oss)"
+	snd_arg+=" $(use_with pulseaudio pulse)"
+	snd_arg+=" $(use_with sdlsound)"
+
+	gui_arg+=" $(use_enable sdl sdlui)"
+	# The gtk UI code has raw calls to XOpenDisplay and
+	# is missing -lX11 if vte doesn't pull it in.
+	#if use gtk2 || use gtk3 ; then
+	if use gtk ; then
+		use vte || append-libs -lX11
+	fi
+	gui_arg+=" $(use_enable gtk gnomeui)"
+	#gui_arg+=" $(use_enable gtk3 gnomeui3)"
+	gui_arg+=" $(use_enable Xaw3d xaw3d)"
+
+	# --with-readline is forced to avoid using the embedded copy
+	# don't try to actually run fc-cache (bug #280976)
+	FCCACHE=/bin/true \
+	PKG_CONFIG=$(tc-getPKG_CONFIG) \
+	egamesconf \
+		--enable-parsid \
+		--with-resid \
+		--with-readline \
+		--without-arts \
+		--without-midas \
+		$(use_enable ethernet) \
+		$(use_enable ffmpeg) \
+		$(use_enable ffmpeg external-ffmpeg) \
+		$(use_enable fullscreen) \
+		$(use_enable ipv6) \
+		$(use_enable lame) \
+		$(use_enable nls) \
+		$(use_enable vte) \
+		$(use_with png) \
+		$(use_with threads uithreads) \
+		$(use_with zlib) \
+		${gui_arg} \
+		${snd_arg} \
+		--disable-option-checking
+		# --disable-option-checking has to be last
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog FEEDBACK README" \
+		default
+	prepgamesdirs
+}
--- a/app-i18n/fcitx/fcitx-4.2.9.1.ebuild
+++ b/app-i18n/fcitx/fcitx-4.2.9.1.ebuild
@ -22,7 +22,7 @@ fi

 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="+X +autostart +cairo +dbus debug +enchant gtk2 gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml"
 REQUIRED_USE="autostart? ( dbus ) cairo? ( X ) gtk2? ( dbus ) gtk3? ( dbus ) introspection? ( dbus ) pango? ( cairo ) qt4? ( X dbus )"

--- a/app-i18n/fcitx/fcitx-9999.ebuild
+++ b/app-i18n/fcitx/fcitx-9999.ebuild
@ -20,7 +20,7 @@ else
 	SRC_URI="https://download.fcitx-im.org/${PN}/${P}_dict.tar.xz"
 fi

-LICENSE="GPL-2+ LGPL-2+"
+LICENSE="GPL-2+ LGPL-2+ MIT"
 SLOT="0"
 KEYWORDS=""
 IUSE="+X +autostart +cairo +dbus debug +enchant gtk2 gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml"
--- a/app-misc/brewtarget/Manifest
+++ b/app-misc/brewtarget/Manifest
@ -1,2 +1 @@
-DIST brewtarget_2.1.0.orig.tar.xz 8576552 SHA256 5d34c6ed169d6589c85dd5383850512a0e36ab2b2233f9ed566f3a0fb4adb9be SHA512 980867c7d5d0d9c6a3c7dc659677c384522fa468c4c86b54d2e77e59b577352abdcaa245d04f01ee4d4d433426925f9df472821c81346e13457b6c58a35fe9c5 WHIRLPOOL df22343055dd133efb918afde589bd86bb0596adde2005a3cda70c8c7817392b762d4ae238feb4d026272108e6053743a1becfe953402d2f646f336a17bcf072
 DIST brewtarget_2.3.1.orig.tar.xz 9449200 SHA256 1541856e9f835d896045ea3f0aeaf9ed254c8225e9fe0e540a0b4e5bd467ceb0 SHA512 2ff29496df6df1b4507594905f5b3cdedd472a3e767c5f5dda00d306d092a7bec6f9d67350a830416f0ab457553339ba2f9dd2ea8476ed1dfa7dd4c49adda086 WHIRLPOOL c9e539cd91ebb9d48cecf3a2f21cc5522fcd5b04f99d07a32c98af117949cad467621b09ad26e0ca16c91dce411f70ec5523fd98d98e9f28d6efe44e2c27886d
--- a/app-misc/brewtarget/brewtarget-2.1.0.ebuild
+++ b/app-misc/brewtarget/brewtarget-2.1.0.ebuild
@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PLOCALES="ca cs da de el en es fr hu it nb nl pl pt ru sv zh"
-
-inherit cmake-utils l10n
-
-DESCRIPTION="Application to create and manage beer recipes"
-HOMEPAGE="http://www.brewtarget.org/"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${PN}_${PV}.orig.tar.xz"
-
-LICENSE="GPL-3 WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="kde phonon"
-
-DEPEND="
-	>=dev-qt/qtcore-4.8:4
-	>=dev-qt/qtgui-4.8:4
-	>=dev-qt/qtsql-4.8:4[sqlite]
-	>=dev-qt/qtsvg-4.8:4
-	>=dev-qt/qtwebkit-4.8:4
-	phonon? (
-		kde? ( media-libs/phonon[qt4] )
-		!kde? ( || ( >=dev-qt/qtphonon-4.8:4 media-libs/phonon[qt4] ) )
-	)
-"
-RDEPEND="${DEPEND}"
-
-remove_locale() {
-	sed -i -e "/bt_$1.ts/d" CMakeLists.txt || die
-}
-
-src_prepare() {
-	# Check for new locales, respect LINGUAS
-	l10n_find_plocales_changes "${S}/translations" bt_ .ts
-	l10n_for_each_disabled_locale_do remove_locale
-
-	# Tests are bogus, don't build them
-	sed -i -e '/=Tests=/,/=Installs=/d' src/CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDO_RELEASE_BUILD=ON
-		-DNO_MESSING_WITH_FLAGS=ON
-		$(cmake-utils_use_no phonon)
-	)
-	cmake-utils_src_configure
-}
--- a/app-misc/brewtarget/metadata.xml
+++ b/app-misc/brewtarget/metadata.xml
@ -5,9 +5,6 @@
 		<email>pesa@gentoo.org</email>
 		<name>Davide Pesavento</name>
 	</maintainer>
-	<use>
-		<flag name="phonon">Enable sound support via <pkg>media-libs/phonon</pkg> or <pkg>dev-qt/qtphonon</pkg></flag>
-	</use>
 	<upstream>
 		<remote-id type="github">Brewtarget/brewtarget</remote-id>
 	</upstream>
--- a/app-misc/mencal/Manifest
+++ b/app-misc/mencal/Manifest
@ -1 +1,2 @@
 DIST mencal-2.3.tar.gz 19169 SHA256 cdab443a349572b811cfde7b194ad9ccb56989942b358d43b1a81047fa1a0f44 SHA512 1c65015aa62ad1572d0d2f49a40e5fd02762a82c729bcd09657087d9e20b0d7ad1a5d6bc9729f522cf35f0752193bf70614e4cf7ed06c5940b0c7dd4f2746ea4 WHIRLPOOL e9c27cb03a848b6e6478cf2b67e40e57084ad4a420a7e462f33df2b1d73bb89c8236f8dff0fa3fc5c85c423260969bccb6bd12cdeeaded3d700c32c25476ae3c
+DIST mencal-3.0.tar.gz 19560 SHA256 9328d0b2f3f57847e8753c5184531f4832be7123d1b6623afdff892074c03080 SHA512 0a99af941b9cea4923a90065813d8434c908d52e4ead1309114a28b565ca8b8e81cf132740be4ab88159b61628c22fba65cd8a74213b58d4db69a2f315d737eb WHIRLPOOL 4a81e9f328a324939c568de707466a1d00ccdbd74d23aa109119f5d15d6256e95d2b6e48e620ec05c22c30a668435695f478c3411043e3e5811107b930ceaf33
--- a/app-misc/mencal/mencal-3.0.ebuild
+++ b/app-misc/mencal/mencal-3.0.ebuild
@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Calendar to track menstruation cycles"
+HOMEPAGE="http://www.kyberdigi.cz/projects/mencal/english.html"
+SRC_URI="http://www.kyberdigi.cz/projects/mencal/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~mips ~alpha ~hppa ~ia64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	dobin "${PN}"
+	dodoc README
+}
--- a/app-text/atril/atril-1.10.3-r2.ebuild
+++ b/app-text/atril/atril-1.10.3-r2.ebuild
@ -18,7 +18,7 @@ HOMEPAGE="http://mate-desktop.org"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"

 IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring +postscript t1lib tiff xps"

--- a/app-text/blogc/Manifest
+++ b/app-text/blogc/Manifest
@ -1 +1 @@
-DIST blogc-0.9.0.tar.xz 265340 SHA256 e5d21deb3793e5863c32c87bd51522cde7749b144a486ab37c5be007d3b3e968 SHA512 3068f8b666b87d168a0cf893d4c913461bb403588fef0cd4d53d006c3c0e880592c71d5e4f6d622c930b05b67b1ad77b53af18cba5c183fc3357d97b8af27f39 WHIRLPOOL 1932625f1330391a5e403bd65183c02106b446743c5fa61a7e552c35c511f18a9dff548c932e401c6c62e6bed2f78ce48efe5cf7a38bb7e679b9fc9ceb68c3cd
+DIST blogc-0.10.0.tar.xz 266800 SHA256 6d76d7b3054bc126e3e80ecc9248d8f7fa30d633544c1ce2d5839b413da13008 SHA512 1f1b9b3c6898e7b5251901ba297b101fc9d65820776f6e48af3bf54cb73faaee5d377f1b3ba0464328d73c1c479abd63ff6f61b17f3357fe7c24c508feaa9158 WHIRLPOOL 5e093c024a755f750dbcc0b15eb665858941d79a7c4e62a9f16d06d15a6475dd83338d0e49fc8cffaabe070ebbd37fab8df16411d74e16d234e493cf01fd79ec
--- a/app-text/blogc/blogc-0.10.0.ebuild
+++ b/app-text/blogc/blogc-0.10.0.ebuild
--- a/app-text/mupdf/mupdf-1.8.ebuild
+++ b/app-text/mupdf/mupdf-1.8.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -26,7 +26,7 @@ LIB_DEPEND="
 	virtual/jpeg[static-libs?]
 	X? ( x11-libs/libX11[static-libs?]
 		x11-libs/libXext[static-libs?] )
-	javascript? ( dev-lang/mujs )
+	javascript? ( <dev-lang/mujs-0_p20160504 )
 	opengl? ( >=media-libs/glfw-3 )"
 RDEPEND="${LIB_DEPEND}"
 DEPEND="${RDEPEND}
--- a/dev-db/sqlcipher/sqlcipher-3.3.0.ebuild
+++ b/dev-db/sqlcipher/sqlcipher-3.3.0.ebuild
@ -15,7 +15,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"

-IUSE="readline static-libs tcl"
+IUSE="readline static-libs tcl test"

 # Tcl is always needed by buildsystem
 RDEPEND="dev-libs/openssl:0[${MULTILIB_USEDEP}]
@ -24,6 +24,9 @@ RDEPEND="dev-libs/openssl:0[${MULTILIB_USEDEP}]
 DEPEND="${RDEPEND}
 	dev-lang/tcl"

+# Testsuite requires compilation with TCL, bug #582584
+REQUIRED_USE="test? ( tcl )"
+
 src_prepare() {
 	append-cflags -DSQLITE_HAS_CODEC

--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@ -2,11 +2,14 @@ DIST sqlite-autoconf-3110100.tar.gz 2359545 SHA256 533ff1d0271c2e666f01591271cef
 DIST sqlite-autoconf-3120000.tar.gz 2374101 SHA256 53ecdbb5287af673eca3710c5f6c2305e73bb2d034f2a28770bea2be92ed269e SHA512 84a9107ca9045ddc724d7e37dfe2b1dc00a106769260c7bd429a95beedc46a906985b65e0b2bf597de23dd56d132b9ef6888a8c4e5f8a731c8a5c026b971d89e WHIRLPOOL 4ec76b383670f2ee9c50870587696a3c86357161344851b487f54a03c668dac8c4272738b44e5a4048dd00bf2b3122904c53b6d2195f9b48aef3ad928f34b85b
 DIST sqlite-autoconf-3120100.tar.gz 2374576 SHA256 1c038519862b3983b0475f3ed3143ce4bbfcd21bfbd0741192f415838c831a7c SHA512 eb0b892bb6a1783df9b712d5f78c9f5fb5aa8ff1b1735fd2806e96b1c04e2a5f87b2e47469185195611a5cf6c446ec32935e9ae0b01734383a8fefc1bcaf5842 WHIRLPOOL 0284241a3fd6dbee16ba5fe4c1a0dc15b1b3134bd39ba8a2219c2da4e426e3572809459bbdc8bbf3fa4ea055406b85c547d8e7f05afcb57baa712653ce0d6f64
 DIST sqlite-autoconf-3120200.tar.gz 2374804 SHA256 fd00770c9afd39db555c78400e52f55e8bd6568c78be23561abb472a22d09abb SHA512 e56b8d5b8fb41d27437659db669259198663c266c0b3faf44ba9b130441550fb79bd040e6488f56280b33230d9cf4e51c7906f968ffdd36206354bfabc4b6eb4 WHIRLPOOL bd1231f0cce91281c9e42338ae698a06446078d2070f4f16b5472ed4004dbf1913339a3f0e5a34d87d0e71390a130c347f3c97353967530b65b23e1492664b7e
+DIST sqlite-autoconf-3130000.tar.gz 2459805 SHA256 e2797026b3310c9d08bd472f6d430058c6dd139ff9d4e30289884ccd9744086b SHA512 c2547ff9a144c46829344058b4f8dcc5b8c9c823cbc667be2944dc7beecb9cc213858cc9ce302a763200278397d9a0fc6bb35c542028a124ef0980fedd574c2f WHIRLPOOL b9bcfb2eecf30719f7a673d569949b4e497c9682de08ca6f0ccc6c67a8f1541a51e88108bebde94a14802516b114c9f8cad83fbdbb130774b3082a8107657255
 DIST sqlite-doc-3110100.zip 5386958 SHA256 3f127c51c7936d13de96255b00a6be3862693ff025f61a1d3d17d3d57ee295d0 SHA512 b8fe71a852ce2fa3d7da27c09e3a1e8d019a9c55eb7e5516425754148f8d8a6cc88571d006768d5fd5b2c72aa513544bfc0ce4208f376099f8f08b7fee480d06 WHIRLPOOL 8cf7b3495ff184622dbf2842931d6b77061dc166c9d66e6bb6e400525c59ccc5b689b22cea45dad0fa7a7117692a1c16fea46aa4789084ce8c4de3655e973812
 DIST sqlite-doc-3120000.zip 5402611 SHA256 346d9d56a0193d9396948192b7eca9e45c2adfeea6bbf71df62502830da510f3 SHA512 7879d006e528d692ea5718f27d03e2dfe2a5e54aa135be983b992836102720df4dc690d84795115a25ed19a663e895a3f3f8a59d0de079c451d215e07081281e WHIRLPOOL 00f5bc4b82af1ba8d43ae4d0761dacd2e608009812a12fee9aedd333baec9b36f74542c60de4acacd19f5ef898d3bd57dfb705f3b21219ba3862ca91c2f76402
 DIST sqlite-doc-3120100.zip 5410493 SHA256 dbe53c076922c711a467dde57432583fbf9a12eac57cb75f6116a310880eb088 SHA512 d0117618d97744255248b9160816203147ba2afdb0bea5fe02d5e464541e09bc9147189317c6f849cc56059d6ae96e3e4b2a30cd8d0bc7b0e1ecacb573cfcdd4 WHIRLPOOL e3f054eda83301b9e4b5170bf9c56895756e4ac78a1c6256467c990fafccaeadec5f7ca54f1bf118bcb950f25db63df6c0972a138d36a10a0a9cfdf688eb207b
 DIST sqlite-doc-3120200.zip 5416790 SHA256 67c640c4b01b961016717db61e3e43c63c33248c78ce0de9f10b88ea7ce97670 SHA512 4ded937565b2d9b63ae55495d4b536bc0056e0d9aa7119ee54ddea127c42ba7de17986db7b85c172043fab1112132cbc126a102b248770fca6cde9a8fda438ae WHIRLPOOL 7eefecb6d0450c85ec3f30cdeb853117f4067e1bace7d3c0524e5c6cb13d2e31772211aec8562f972491da413d9bd79022bc29c16968b086562e7f17bff984eb
+DIST sqlite-doc-3130000.zip 5550186 SHA256 510606a9cdd89814b2d44e7b7f284ebb0a58153e1800de6daadfab445190f79c SHA512 0bf4544a07bd92533bc248dc16ed43c4fcad870ab535591618d3006f38c2741a8c0ed1da082444ea1af2f57936575c678bc12b651252426b908660023b36cd39 WHIRLPOOL 78fd5de701224e39d07fbb03a9193dff45237845b215d83f27a623f289d9da0df7082d53115e90474856b775d350ee3f9d2970ca2c1a4a33b24543de06fd3b9a
 DIST sqlite-src-3110100.zip 9294249 SHA256 ade6aa93fd1d52dec0d8712f9ba4df59ecc6ec442f32ef28631c3b9341aadf97 SHA512 350c3019922a6adc1b7372f5e27c810a08f4bf576ea4e07d46bc59e1939a919d1bda1a29581f4df258f577202d79253292f719ca56ba30d1e7a1a2d801b65a48 WHIRLPOOL 3f7cc7baa7c59930e2e676d859478a68fddd392ccc4747630aa68c3909eb0b633d6031e9a998c1a741054594935dd52b3143ce05b574ff1b14f20f6ededc0a6e
 DIST sqlite-src-3120000.zip 9367749 SHA256 d891e7ffd56cd97d069a6ed99d7e85cbe655b0a97ca6b5398c7806e888642df1 SHA512 9669e33e328b826f4692725ec09e21d85f4f2c386c624a81b0535f41ca7d2f996ebf5018db8ecdfdac18cff39a881a953111801499705dfb599f00e3bb5d10e4 WHIRLPOOL 865aaecbe331ec93b1a8c5b965c3edc43d35994c2db79d336febb27860ee91d68753d3ea274b4639f3e05d3f0a589fb21aedac33bc2120a4de8d094383d7b923
 DIST sqlite-src-3120100.zip 9368459 SHA256 49b9819683f8f7329a78d2008e3f7c4e02126b556b95e5dfe3be102b9e741cff SHA512 6d0d7230343ca460215b5764d4a546631ddc2bcfc0777051379fb4632ccf9c36a53d26eda6811823156be166643c001c994a0f52498c6196ed13b34e931d55e1 WHIRLPOOL e41fd7a1ba870efb5421657975990c1d7e1ecc27023882771474a62e82b2ae305bc3d0b8556e0627de886d35e1b375fec223b3f70582d64fc5345c525b293131
 DIST sqlite-src-3120200.zip 9370396 SHA256 2c16caa653e57f3c71873aa88797c97117981d6b0974254ce24d933dd27f9a86 SHA512 6cc9718c23ca3f65a42cc715eb67c8d174ecf0e397457efb6bfc5bd2efc9a51ea2f84266d31826068bf46efc550eb277b3c8e93cb85c5d23645e8b8ae4e2fc07 WHIRLPOOL ffdbbc384189f0d62a93ee8219051ff936b7c0c2fd39449f6ff72a734ab219f23f049648de7c0ec510a74aad85ba07ef0c8bebea4c3b83e043464744d2c039f4
+DIST sqlite-src-3130000.zip 9506412 SHA256 b46b62dc27abbde52db69d8e2a710469b9af613ba251eb98e412d4f3827f915b SHA512 4cb7531105869ff7db5c08aa8e4d303fa3d80c8c67e21d9a835a09f7dddb4c9dbba837e2030dd4af6bcdb00a305b057cbd6430e11b3f2ae5e470f27b69b6c1e6 WHIRLPOOL 901f6cd343daaa62970f8d768e3c6ccb0b1da75fb5643b27e76f60d224005a08955fde9df5b8bb63250ab27994e2428ce19e21b4a1ccabec47cd4b8df4a13657
--- a/dev-db/sqlite/files/sqlite-3.13.0-full_tarball-build.patch
+++ b/dev-db/sqlite/files/sqlite-3.13.0-full_tarball-build.patch
@ -0,0 +1,137 @@
+Link executables against libsqlite3.so.
+Increase timeout for fuzzcheck.
+Fix building with dlopen() not available.
+
+--- Makefile.in
+++ Makefile.in
+@@ -555,7 +555,7 @@
+ # Extra compiler options for various shell tools
+ #
+ SHELL_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS4
+-SHELL_OPT += -DSQLITE_ENABLE_EXPLAIN_COMMENTS
+SHELL_OPT += -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_DBSTAT_VTAB
+ FUZZERSHELL_OPT = -DSQLITE_ENABLE_JSON1
+ FUZZCHECK_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MEMSYS5
+ 
+@@ -576,18 +576,18 @@
+ 
+ libtclsqlite3.la:	tclsqlite.lo libsqlite3.la
+ 	$(LTLINK) -no-undefined -o $@ tclsqlite.lo \
+-		libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \
+		libsqlite3.la @TCL_STUB_LIB_SPEC@ \
+ 		-rpath "$(TCLLIBDIR)" \
+ 		-version-info "8:6:8" \
+ 		-avoid-version
+ 
+-sqlite3$(TEXE):	$(TOP)/src/shell.c sqlite3.c
+-	$(LTLINK) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \
+-		$(TOP)/src/shell.c sqlite3.c \
+-		$(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
+sqlite3$(TEXE):	$(TOP)/src/shell.c libsqlite3.la
+	$(LTLINK) $(READLINE_FLAGS) -o $@ \
+		$(TOP)/src/shell.c libsqlite3.la \
+		$(LIBREADLINE)
+ 
+-sqldiff$(TEXE):	$(TOP)/tool/sqldiff.c sqlite3.c sqlite3.h
+-	$(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.c $(TLIBS)
+sqldiff$(TEXE):	$(TOP)/tool/sqldiff.c libsqlite3.la
+	$(LTLINK) -o $@ $(TOP)/tool/sqldiff.c libsqlite3.la
+ 
+ srcck1$(BEXE):	$(TOP)/tool/srcck1.c
+ 	$(BCC) -o srcck1$(BEXE) $(TOP)/tool/srcck1.c
+@@ -656,7 +656,7 @@
+ # Rule to build the amalgamation
+ #
+ sqlite3.lo:	sqlite3.c
+-	$(LTCOMPILE) $(TEMP_STORE) -c sqlite3.c
+	$(LTCOMPILE) $(SHELL_OPT) $(TEMP_STORE) -c sqlite3.c
+ 
+ # Rules to build the LEMON compiler generator
+ #
+@@ -1082,13 +1082,13 @@
+ 
+ # Fuzz testing
+ fuzztest:	fuzzcheck$(TEXE) $(FUZZDATA)
+-	./fuzzcheck$(TEXE) $(FUZZDATA)
+	./fuzzcheck$(TEXE) --timeout 3600 $(FUZZDATA)
+ 
+ fastfuzztest:	fuzzcheck$(TEXE) $(FUZZDATA)
+-	./fuzzcheck$(TEXE) --limit-mem 100M $(FUZZDATA)
+	./fuzzcheck$(TEXE) --limit-mem 100M --timeout 3600 $(FUZZDATA)
+ 
+ valgrindfuzz:	fuzzcheck$(TEXT) $(FUZZDATA)
+-	valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 600 $(FUZZDATA)
+	valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 3600 $(FUZZDATA)
+ 
+ # Minimal testing that runs in less than 3 minutes
+ #
+@@ -1114,32 +1114,32 @@
+ smoketest:	$(TESTPROGS) fuzzcheck$(TEXE)
+ 	./testfixture$(TEXE) $(TOP)/test/main.test $(TESTOPTS)
+ 
+-sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl
+sqlite3_analyzer.c:	$(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl
+ 	echo "#define TCLSH 2" > $@
+ 	echo "#define SQLITE_ENABLE_DBSTAT_VTAB 1" >> $@
+-	cat sqlite3.c $(TOP)/src/tclsqlite.c >> $@
+	cat $(TOP)/src/tclsqlite.c >> $@
+ 	echo "static const char *tclsh_main_loop(void){" >> $@
+ 	echo "static const char *zMainloop = " >> $@
+ 	$(TCLSH_CMD) $(TOP)/tool/tostr.tcl $(TOP)/tool/spaceanal.tcl >> $@
+ 	echo "; return zMainloop; }" >> $@
+ 
+-sqlite3_analyzer$(TEXE): sqlite3_analyzer.c
+-	$(LTLINK) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS)
+sqlite3_analyzer$(TEXE):	sqlite3_analyzer.c libsqlite3.la
+	$(LTLINK) sqlite3_analyzer.c -o $@ libsqlite3.la $(LIBTCL)
+ 
+-showdb$(TEXE):	$(TOP)/tool/showdb.c sqlite3.lo
+-	$(LTLINK) -o $@ $(TOP)/tool/showdb.c sqlite3.lo $(TLIBS)
+showdb$(TEXE):	$(TOP)/tool/showdb.c libsqlite3.la
+	$(LTLINK) -o $@ $(TOP)/tool/showdb.c libsqlite3.la
+ 
+-showstat4$(TEXE):	$(TOP)/tool/showstat4.c sqlite3.lo
+-	$(LTLINK) -o $@ $(TOP)/tool/showstat4.c sqlite3.lo $(TLIBS)
+showstat4$(TEXE):	$(TOP)/tool/showstat4.c libsqlite3.la
+	$(LTLINK) -o $@ $(TOP)/tool/showstat4.c libsqlite3.la
+ 
+-showjournal$(TEXE):	$(TOP)/tool/showjournal.c sqlite3.lo
+-	$(LTLINK) -o $@ $(TOP)/tool/showjournal.c sqlite3.lo $(TLIBS)
+showjournal$(TEXE):	$(TOP)/tool/showjournal.c
+	$(LTLINK) -o $@ $(TOP)/tool/showjournal.c
+ 
+-showwal$(TEXE):	$(TOP)/tool/showwal.c sqlite3.lo
+-	$(LTLINK) -o $@ $(TOP)/tool/showwal.c sqlite3.lo $(TLIBS)
+showwal$(TEXE):	$(TOP)/tool/showwal.c
+	$(LTLINK) -o $@ $(TOP)/tool/showwal.c
+ 
+-changeset$(TEXE):	$(TOP)/ext/session/changeset.c sqlite3.lo
+-	$(LTLINK) -o $@ $(TOP)/ext/session/changeset.c sqlite3.lo $(TLIBS)
+changeset$(TEXE):	$(TOP)/ext/session/changeset.c libsqlite3.la
+	$(LTLINK) -o $@ $(TOP)/ext/session/changeset.c libsqlite3.la
+ 
+ rollback-test$(TEXE):	$(TOP)/tool/rollback-test.c sqlite3.lo
+ 	$(LTLINK) -o $@ $(TOP)/tool/rollback-test.c sqlite3.lo $(TLIBS)
+@@ -1153,8 +1153,8 @@
+ speedtest1$(TEXE):	$(TOP)/test/speedtest1.c sqlite3.lo
+ 	$(LTLINK) -o $@ $(TOP)/test/speedtest1.c sqlite3.lo $(TLIBS)
+ 
+-rbu$(EXE): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.lo 
+-	$(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c sqlite3.lo $(TLIBS)
+rbu$(EXE):	$(TOP)/ext/rbu/rbu.c libsqlite3.la
+	$(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c libsqlite3.la
+ 
+ loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
+ 	$(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS)
+--- configure.ac
+++ configure.ac
+@@ -570,6 +570,9 @@
+ if test "${use_loadextension}" = "yes" ; then
+   OPT_FEATURE_FLAGS=""
+   AC_SEARCH_LIBS(dlopen, dl)
+  if test "${ac_cv_search_dlopen}" = "no" ; then
+    OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
+  fi
+ else
+   OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
+ fi
--- a/dev-db/sqlite/sqlite-3.13.0.ebuild
+++ b/dev-db/sqlite/sqlite-3.13.0.ebuild
@ -0,0 +1,243 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator
+
+SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))"
+DOC_PV="${SRC_PV}"
+# DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))"
+
+DESCRIPTION="A SQL Database Engine in a C Library"
+HOMEPAGE="https://sqlite.org/"
+SRC_URI="doc? ( https://sqlite.org/2016/${PN}-doc-${DOC_PV}.zip )
+	tcl? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip )
+	test? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip )
+	tools? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip )
+	!tcl? ( !test? ( !tools? ( https://sqlite.org/2016/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )"
+
+LICENSE="public-domain"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
+
+RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
+	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
+	tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
+	tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	doc? ( app-arch/unzip )
+	tcl? ( app-arch/unzip )
+	test? (
+		app-arch/unzip
+		dev-lang/tcl:0[${MULTILIB_USEDEP}]
+	)
+	tools? ( app-arch/unzip )"
+
+full_tarball() {
+	use tcl || use test || use tools
+}
+
+pkg_setup() {
+	if full_tarball; then
+		S="${WORKDIR}/${PN}-src-${SRC_PV}"
+	else
+		S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
+	fi
+}
+
+src_prepare() {
+	if full_tarball; then
+		epatch "${FILESDIR}/${PN}-3.13.0-full_tarball-build.patch"
+
+		# Fix AC_CHECK_FUNCS.
+		# https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
+		sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac
+	else
+		epatch "${FILESDIR}/${PN}-3.12.0-nonfull_tarball-build.patch"
+
+		# Fix AC_CHECK_FUNCS.
+		# https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
+		sed \
+			-e "s/AC_CHECK_FUNCS(\[fdatasync.*/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" \
+			-e "/AC_CHECK_FUNCS(posix_fallocate)/d" \
+			-i configure.ac
+	fi
+
+	eautoreconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local CPPFLAGS="${CPPFLAGS}" options=()
+
+	options+=(
+		--enable-$(full_tarball && echo load-extension || echo dynamic-extensions)
+		--enable-threadsafe
+	)
+	if ! full_tarball; then
+		options+=(--disable-static-shell)
+	fi
+
+	# Support detection of misuse of SQLite API.
+	# https://sqlite.org/compile.html#enable_api_armor
+	append-cppflags -DSQLITE_ENABLE_API_ARMOR
+
+	# Support column metadata functions.
+	# https://sqlite.org/c3ref/column_database_name.html
+	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
+
+	# Support dbstat virtual table.
+	# https://sqlite.org/dbstat.html
+	append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
+
+	# Support comments in output of EXPLAIN.
+	# https://sqlite.org/compile.html#enable_explain_comments
+	append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS
+
+	# Support Full-Text Search versions 3, 4 and 5.
+	# https://sqlite.org/fts3.html
+	# https://sqlite.org/fts5.html
+	append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
+	options+=(--enable-fts5)
+
+	# Support hidden columns.
+	append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS
+
+	# Support JSON1 extension.
+	# https://sqlite.org/json1.html
+	append-cppflags -DSQLITE_ENABLE_JSON1
+
+	# Support Resumable Bulk Update extension.
+	# https://sqlite.org/rbu.html
+	append-cppflags -DSQLITE_ENABLE_RBU
+
+	# Support R*Trees.
+	# https://sqlite.org/rtree.html
+	append-cppflags -DSQLITE_ENABLE_RTREE
+
+	# Support scan status functions.
+	# https://sqlite.org/c3ref/stmt_scanstatus.html
+	# https://sqlite.org/c3ref/stmt_scanstatus_reset.html
+	append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
+
+	# Support Session extension.
+	# https://sqlite.org/sessionintro.html
+	options+=(--enable-session)
+
+	# Support unlock notification.
+	# https://sqlite.org/unlock_notify.html
+	append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
+
+	# Support soundex() function.
+	# https://sqlite.org/lang_corefunc.html#soundex
+	append-cppflags -DSQLITE_SOUNDEX
+
+	# debug USE flag.
+	if full_tarball; then
+		options+=($(use_enable debug))
+	else
+		if use debug; then
+			append-cppflags -DSQLITE_DEBUG
+		else
+			append-cppflags -DNDEBUG
+		fi
+	fi
+
+	# icu USE flag.
+	if use icu; then
+		# Support ICU extension.
+		# https://sqlite.org/compile.html#enable_icu
+		append-cppflags -DSQLITE_ENABLE_ICU
+		if full_tarball; then
+			sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+		else
+			sed -e "s/^LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+		fi
+	fi
+
+	# readline USE flag.
+	options+=(
+		--disable-editline
+		$(use_enable readline)
+	)
+	if full_tarball && use readline; then
+		options+=(--with-readline-inc="-I${EPREFIX}/usr/include/readline")
+	fi
+
+	# secure-delete USE flag.
+	if use secure-delete; then
+		# Enable secure_delete pragma by default.
+		# https://sqlite.org/pragma.html#pragma_secure_delete
+		append-cppflags -DSQLITE_SECURE_DELETE
+	fi
+
+	# static-libs USE flag.
+	options+=($(use_enable static-libs static))
+
+	# tcl, test, tools USE flags.
+	if full_tarball; then
+		options+=(--enable-tcl)
+	fi
+
+	if [[ "${CHOST}" == *-mint* ]]; then
+		append-cppflags -DSQLITE_OMIT_WAL
+	fi
+
+	econf "${options[@]}"
+}
+
+multilib_src_compile() {
+	emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
+
+	if use tools && multilib_is_native_abi; then
+		emake changeset rbu showdb showjournal showstat4 showwal sqldiff sqlite3_analyzer
+	fi
+}
+
+multilib_src_test() {
+	if [[ "${EUID}" -eq 0 ]]; then
+		ewarn "Skipping tests due to root permissions"
+		return
+	fi
+
+	emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
+
+	if use tools && multilib_is_native_abi; then
+		install_tool() {
+			if [[ -f ".libs/${1}" ]]; then
+				newbin ".libs/${1}" "${2}"
+			else
+				newbin "${1}" "${2}"
+			fi
+		}
+
+		install_tool changeset sqlite3-changeset
+		install_tool rbu sqlite3-rbu
+		install_tool showdb sqlite3-show-db
+		install_tool showjournal sqlite3-show-journal
+		install_tool showstat4 sqlite3-show-stat4
+		install_tool showwal sqlite3-show-wal
+		install_tool sqldiff sqlite3-diff
+		install_tool sqlite3_analyzer sqlite3-analyzer
+
+		unset -f install_tool
+	fi
+}
+
+multilib_src_install_all() {
+	prune_libtool_files
+
+	doman sqlite3.1
+
+	if use doc; then
+		dohtml -A ico,odf,odg,pdf,svg -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"
+	fi
+}
--- a/dev-haskell/esqueleto/Manifest
+++ b/dev-haskell/esqueleto/Manifest
@ -1,3 +1 @@
-DIST esqueleto-1.3.5.tar.gz 28170 SHA256 57f898d2a10795fb50c018de58287d3df51f965eb201de708061f845b23be153 SHA512 1ac07a64c93f6cf48607a38bcf1f7f85a9891fd5e06f6d18b3754f24fab3acb3e6a76abb62d3503d791c3db3384b3ff8818f5f2d8d0f84ddbf6e820a9d4a7bef WHIRLPOOL 37b5464776b25ebbd956e36f802be55e73fd3ce1e43f9d9836ef1468a5e07b61ccf8cccacb6d1158c8d859ed77c37258f0d74ca3057bb42481ad22676d7e1e7c
-DIST esqueleto-1.4.1.2.tar.gz 28540 SHA256 826f9fb473acc36c86e815f68032323970dce54019bf8a09d56d0bdf012bdee2 SHA512 ba5d59872b4785753e4c51168e068f63fb1ed3cb28bbbe2fb40cea3c6f953d5e3d10ecf31ca9e8d75827db5e52c922fe7f4c1f0f6262bb11eeccedda66330317 WHIRLPOOL f48dd6be95ec6df9e9f721671a82f77552ec532d4a85824ea141002f4c902fcaaf4dc01ecda0d774b1d9ff0b72e38259ba40076e3b1771f166f6274556ecc671
 DIST esqueleto-2.1.3.tar.gz 33024 SHA256 2d6da3477660212ed7cddec606d0324537b39ef24abe627ba389a0da500158f3 SHA512 b0508daec0f248458581155c731d307f039d04fae7e76697d2a8bb8498a5072b31499d1d3b041314b34b4034e4357e10323483d04f7ce3218da7489a00683fbc WHIRLPOOL aea8960ebe1ba214afe147db5db0e392b208525f5eeccc7c953a314c6000b684df5ccbd671ec23a698048f20af8bb212f3357db8743ac28f4b3cdb42723258a6
--- a/dev-haskell/esqueleto/esqueleto-1.3.5.ebuild
+++ b/dev-haskell/esqueleto/esqueleto-1.3.5.ebuild
@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-#hackport: flags: -mysql,-postgresql
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Bare bones, type-safe EDSL for SQL queries on persistent backends"
-HOMEPAGE="https://github.com/meteficha/esqueleto"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/conduit:=[profile?]
-	dev-haskell/monad-logger:=[profile?]
-	>=dev-haskell/persistent-1.3:=[profile?] <dev-haskell/persistent-1.4:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	>=dev-haskell/tagged-0.2:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3 <dev-haskell/hspec-1.9
-		dev-haskell/hunit
-		dev-haskell/monad-control
-		>=dev-haskell/persistent-sqlite-1.2 <dev-haskell/persistent-sqlite-1.4
-		>=dev-haskell/persistent-template-1.2 <dev-haskell/persistent-template-1.4
-		dev-haskell/quickcheck )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0.6-haddock.patch
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-mysql \
-		--flag=-postgresql
-}
--- a/dev-haskell/esqueleto/esqueleto-1.4.1.2.ebuild
+++ b/dev-haskell/esqueleto/esqueleto-1.4.1.2.ebuild
@ -1,53 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-#hackport: flags: -mysql,-postgresql
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Type-safe EDSL for SQL queries on persistent backends"
-HOMEPAGE="https://github.com/meteficha/esqueleto"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/conduit-1.1:=[profile?]
-	dev-haskell/monad-logger:=[profile?]
-	>=dev-haskell/persistent-1.3:=[profile?] <dev-haskell/persistent-1.4:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	>=dev-haskell/tagged-0.2:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.8
-		dev-haskell/hunit
-		dev-haskell/monad-control
-		>=dev-haskell/monad-logger-0.3
-		>=dev-haskell/persistent-sqlite-1.2 <dev-haskell/persistent-sqlite-1.4
-		>=dev-haskell/persistent-template-1.2 <dev-haskell/persistent-template-1.4
-		dev-haskell/quickcheck )
-"
-
-RESTRICT=test # hangs
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0.6-haddock.patch
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-mysql \
-		--flag=-postgresql
-}
--- a/dev-haskell/esqueleto/files/esqueleto-1.0.6-haddock.patch
+++ b/dev-haskell/esqueleto/files/esqueleto-1.0.6-haddock.patch
@ -1,13 +0,0 @@
-diff --git a/src/Database/Esqueleto.hs b/src/Database/Esqueleto.hs
-index 5900c5d..340cd7d 100644
--- a/src/Database/Esqueleto.hs
-+++ b/src/Database/Esqueleto.hs
-@@ -289,7 +289,7 @@ import qualified Database.Persist.Store
- --
- -- @
- -- do 'update' $ \\p -> do
---      'set' p [ PersonName '=.' val \"João\" ]
-+--      'set' p [ PersonName '=.' val \"Joao\" ]
- --      where_ (p ^. PersonName ==. val \"Joao\")
- --    'delete' $
- --      from $ \\p -> do
--- a/dev-haskell/mtl/mtl-2.1.3.1.ebuild
+++ b/dev-haskell/mtl/mtl-2.1.3.1.ebuild
@ -10,7 +10,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal

 DESCRIPTION="Monad classes, using functional dependencies"
-HOMEPAGE="http://github.com/ekmett/mtl"
+HOMEPAGE="https://github.com/ekmett/mtl"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"

 LICENSE="BSD"
--- a/dev-haskell/multipart/multipart-0.1.2.ebuild
+++ b/dev-haskell/multipart/multipart-0.1.2.ebuild
@ -10,7 +10,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal

 DESCRIPTION="HTTP multipart split out of the cgi package"
-HOMEPAGE="https://www.github.com/silkapp/multipart"
+HOMEPAGE="https://github.com/silkapp/multipart"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"

 LICENSE="BSD"
--- a/dev-haskell/persistent-sqlite/Manifest
+++ b/dev-haskell/persistent-sqlite/Manifest
@ -1,4 +1 @@
-DIST persistent-sqlite-1.1.5.tar.gz 1285378 SHA256 94993b3b4f09d27846c149b68e3e9ba73a2bd6e361a6e74519dff5ad31b81dcf SHA512 ccbbc392e09082e5c70825ae6c8135b1c7adc05e33a1c6a215a0794f4ebf6fd436ef00705c274752681171958b2aebfbd89bb87b5cb2d5c38bbcc28214848ead WHIRLPOOL a0db2e4a8f52b9580717e5d25e2696d594da0861738bc19194886f479eca0f6a9b6ef755320a3a8318ad7e6929d3ad96ebe3e5034871b4b2ae8f33ccc8641eed
-DIST persistent-sqlite-1.2.1.tar.gz 1285579 SHA256 c097a32e9d73a38143652b109db895180db2c621178ccedfa43df6718d466bd1 SHA512 10b0c2ee09998f12c35d35ac8a8e41ca9208e01033fab15af906d663f191f41ea474ed64a4adc57238d0c3d185381056067207df6ed40157c13898321a128669 WHIRLPOOL c6b2f03029b7bd2764e3291befc05f4c99e7c2b4e122af6d9f67217d221ab4d216bc3bb174ef4747e20b0cfad9c76ff136a7138f14b9671772ab38ae94078243
-DIST persistent-sqlite-1.3.0.5.tar.gz 1353303 SHA256 eb477f7f98d4af69aa5ef88750c0e62915378c554a480652b4b09e4f985f6715 SHA512 5ea6919c73eb7d791bfdd09ed12bc8eba957cbc6854596d08bfe6b5e924929f2fa031fdffe69b755b29a8c99571a2e3ee784ab7abc4b983a279bb69735b0d3d0 WHIRLPOOL 8d427c9e7dd9a26cc25e6c979dcd11aee6b906992197ae26dc6ab593b77d1466e9de6b042b13533fb112ed82308862ba7774478e2e64bd3b113fbdbe8b8415fd
 DIST persistent-sqlite-2.1.4.2.tar.gz 1460596 SHA256 0ac7e708c06ae1b63bb068c248fb3ccba0beb99da52702efa6c0a4bca047123c SHA512 9c959164135120f02464daee6d9012872d12212bcb94128010f05784cd11cd04d2fd2dcca5dafd9036d0bd4154a5262b26816b27d7a335f0404634471e3944c7 WHIRLPOOL 04ca7a978b7469e4332cb7461b65a3b8c9c50b97621de7f1bf420adfae2be79e5973e2bdb5f6cfd7f491657dc84704c02fbb25e2ae53348b82496a5f41392f39
--- a/dev-haskell/persistent-sqlite/files/persistent-sqlite-1.2.1-pthread.patch
+++ b/dev-haskell/persistent-sqlite/files/persistent-sqlite-1.2.1-pthread.patch
@ -1,23 +0,0 @@
-Fixes yesod-persistent test build failure:
-
-[2 of 2] Compiling Main             ( test/Spec.hs, dist/build/test/test-tmp/Main.o )
-Linking dist/build/test/test ...
-/usr/lib/gcc/x86_64-pc-linux-gnu/4.8.1/../../../../x86_64-pc-linux-gnu/bin/ld: /usr/lib64/persistent-sqlite-1.2.1/ghc-7.6.3/libHSpersistent-sqlite-1.2.1.a(sqlite3.o): undefined reference to s
-ymbol 'pthread_mutexattr_settype@@GLIBC_2.2.5'
-/usr/lib/gcc/x86_64-pc-linux-gnu/4.8.1/../../../../x86_64-pc-linux-gnu/bin/ld: note: 'pthread_mutexattr_settype@@GLIBC_2.2.5' is defined in DSO /lib64/libpthread.so.0 so try adding it to the 
-linker command line
-/lib64/libpthread.so.0: could not read symbols: Invalid operation
-collect2: error: ld returned 1 exit status
-
-diff --git a/persistent-sqlite.cabal b/persistent-sqlite.cabal
-index c40a1d9..aaf0b1f 100644
--- a/persistent-sqlite.cabal
-+++ b/persistent-sqlite.cabal
-@@ -34,6 +34,7 @@ library
-         extra-libraries: sqlite3
-     else
-         c-sources:   cbits/sqlite3.c
-+        extra-libraries: pthread
- 
- source-repository head
-   type:     git
--- a/dev-haskell/persistent-sqlite/persistent-sqlite-1.1.5.ebuild
+++ b/dev-haskell/persistent-sqlite/persistent-sqlite-1.1.5.ebuild
@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Backend for the persistent library using sqlite3"
-HOMEPAGE="http://www.yesodweb.com/book/persistent"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="systemlib"
-
-RDEPEND=">=dev-haskell/aeson-0.5:=[profile?]
-		>=dev-haskell/conduit-0.5.3:=[profile?]
-		>=dev-haskell/monad-control-0.2:=[profile?]
-		>=dev-haskell/monad-logger-0.2.4:=[profile?]
-		>=dev-haskell/persistent-1.1.5:=[profile?]
-		<dev-haskell/persistent-1.2:=[profile?]
-		>=dev-haskell/text-0.7:=[profile?]
-		>=dev-haskell/transformers-0.2.1:=[profile?]
-		>=dev-lang/ghc-6.10.4:=
-		systemlib? ( >=dev-db/sqlite-3.0
-		)"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag systemlib systemlib)
-}
--- a/dev-haskell/persistent-sqlite/persistent-sqlite-1.2.1-r1.ebuild
+++ b/dev-haskell/persistent-sqlite/persistent-sqlite-1.2.1-r1.ebuild
@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit base haskell-cabal
-
-DESCRIPTION="Backend for the persistent library using sqlite3"
-HOMEPAGE="http://www.yesodweb.com/book/persistent"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="systemlib"
-
-RDEPEND=">=dev-haskell/aeson-0.5:=[profile?]
-		>=dev-haskell/conduit-0.5.3:=[profile?]
-		>=dev-haskell/monad-control-0.2:=[profile?]
-		>=dev-haskell/monad-logger-0.2.4:=[profile?]
-		=dev-haskell/persistent-1.2*:=[profile?]
-		>=dev-haskell/text-0.7:=[profile?]
-		>=dev-haskell/transformers-0.2.1:=[profile?]
-		>=dev-lang/ghc-6.10.4:=
-		systemlib? ( >=dev-db/sqlite-3.0
-		)"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-PATCHES=("${FILESDIR}"/${P}-pthread.patch)
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag systemlib systemlib)
-}
--- a/dev-haskell/persistent-sqlite/persistent-sqlite-1.3.0.5.ebuild
+++ b/dev-haskell/persistent-sqlite/persistent-sqlite-1.3.0.5.ebuild
@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-#hackport: flags: +systemlib
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Backend for the persistent library using sqlite3"
-HOMEPAGE="http://www.yesodweb.com/book/persistent"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="build-sanity-exe"
-
-RDEPEND=">=dev-db/sqlite-3.0
-	>=dev-haskell/aeson-0.5:=[profile?]
-	>=dev-haskell/conduit-0.5.3:=[profile?]
-	>=dev-haskell/monad-control-0.2:=[profile?]
-	>=dev-haskell/monad-logger-0.2.4:=[profile?]
-	>=dev-haskell/persistent-1.3:=[profile?] <dev-haskell/persistent-1.4:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2.1:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-	virtual/libc
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag build-sanity-exe build-sanity-exe) \
-		--flag=systemlib
-}
--- a/dev-haskell/persistent-template/Manifest
+++ b/dev-haskell/persistent-template/Manifest
@ -1,4 +1 @@
-DIST persistent-template-1.1.3.1.tar.gz 11611 SHA256 f70002bc0d1d02983e38787a67fc783f5ca4f87d75dc49e9bdc9b9b12beae104 SHA512 1497c5026d5842d706732ba023d93c6c1b9df03e1badbbc494f54965c845a920bf0825c1fa4f8858a41ccd9089fe7d70e03a5a112bc1526a8a47ef3b232f87e1 WHIRLPOOL bd6c367b7cad0e21df609aec562dad32e73fda3aeba7a0e474fd82d0ec4468dca695fca515aa2a89ce9b1ccf9f597c5dc63936a286a261a88630d3bcc4adc735
-DIST persistent-template-1.2.0.6.tar.gz 12485 SHA256 7adc6872fa72317236a5fd6ee154899df52556146b2ff722f8692ed584eb79ee SHA512 15724b255654de463fa5778d7391fe1ee5525df752fbbaad913b7f0fe7b8e605eef6b6515a359e5cc36cde5d907e4dcc6d157ef8111c76965379aa10ef5091a5 WHIRLPOOL 7fc57f681a77624d2a335330aafd5d5d8546c8d89bc04a2e311921469db2a6b0126526f73c1098fab06a5159ce722040764b4696e8943829b4c072df6765d523
-DIST persistent-template-1.3.1.4.tar.gz 14384 SHA256 d3313840ef0258775b2ce0d37ba9be0948a11d97ef6f3ed3ce76f0b476d045fb SHA512 5b6c421c555513c44c38e70905fb7388f21261d3f4b674604fd74b3ca3705b964beb8f23f4c84035c7ec51e0efd7c6e3930307d71830e2d451b94d25b6fc1e16 WHIRLPOOL f9cf0d36546fcf7675b48929c1650250c6eb37d44ad652689b4d44485b10e2c6848c13ce706048b0349bbfcab815297a3dd86d421e81274d392c877e29605976
 DIST persistent-template-2.1.3.4.tar.gz 19084 SHA256 4f28c9ef478e3835de5bc0105907582b2e0229cecc84ffa895c67c1a59ae2172 SHA512 8b218dea93a6a2ca80801acb43f101d6809d7118f3b6765a98543d87b12b4b565d5b3ea1f1256863b2493553f996ef5dcc569432507de6477b1f59a02093d95a WHIRLPOOL cff63be1def830d15a099039be64221760b442ebe46466600b736269df2ca872199d20bebadad4477e1eb3964ff5d7e459522010e004389119adba11e43124e0
--- a/dev-haskell/persistent-template/persistent-template-1.1.3.1.ebuild
+++ b/dev-haskell/persistent-template/persistent-template-1.1.3.1.ebuild
@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type-safe, non-relational, multi-backend persistence"
-HOMEPAGE="http://www.yesodweb.com/book/persistent"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-		>=dev-haskell/monad-control-0.2:=[profile?]
-		<dev-haskell/monad-control-0.4:=[profile?]
-		>=dev-haskell/persistent-1.1.2:=[profile?]
-		<dev-haskell/persistent-1.2:=[profile?]
-		>=dev-haskell/text-0.5:=[profile?]
-		<dev-haskell/text-1.0:=[profile?]
-		>=dev-haskell/transformers-0.2:=[profile?]
-		<dev-haskell/transformers-0.4:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( >=dev-haskell/hspec-1.3
-			dev-haskell/quickcheck
-		)"
--- a/dev-haskell/persistent-template/persistent-template-1.2.0.6.ebuild
+++ b/dev-haskell/persistent-template/persistent-template-1.2.0.6.ebuild
@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type-safe, non-relational, multi-backend persistence"
-HOMEPAGE="http://www.yesodweb.com/book/persistent"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	>=dev-haskell/monad-control-0.2:=[profile?] <dev-haskell/monad-control-0.4:=[profile?]
-	dev-haskell/monad-logger:=[profile?]
-	>=dev-haskell/persistent-1.2:=[profile?] <dev-haskell/persistent-1.3:=[profile?]
-	>=dev-haskell/text-0.5:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck )
-"
--- a/dev-haskell/persistent-template/persistent-template-1.3.1.4.ebuild
+++ b/dev-haskell/persistent-template/persistent-template-1.3.1.4.ebuild
@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type-safe, non-relational, multi-backend persistence"
-HOMEPAGE="http://www.yesodweb.com/book/persistent"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	>=dev-haskell/monad-control-0.2:=[profile?] <dev-haskell/monad-control-0.4:=[profile?]
-	dev-haskell/monad-logger:=[profile?]
-	>=dev-haskell/persistent-1.3:=[profile?] <dev-haskell/persistent-1.4:=[profile?]
-	>=dev-haskell/text-0.5:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck )
-"
--- a/dev-haskell/persistent/Manifest
+++ b/dev-haskell/persistent/Manifest
@ -1,4 +1 @@
-DIST persistent-1.1.5.1.tar.gz 31484 SHA256 df3a2eaf2765797382672f26a4b48ea3fdbb75f7b7c6d3a7aac0bcf7ebc040b7 SHA512 1086dd3c8448729789e5036128d70e8087d4b2a43fec5f585937c67dff72e9f32e5dfba1c6a56033585560f14f1bc1124c039f366219b98f9d854244a4a5f316 WHIRLPOOL 2fd92ed24b7e37f526067517e2f27770ff74e7859711fc20914df374e5c6ec9ec843195b3357ee72409143e10c1759bcb58648caaad0ea405162de045c9fad8e
-DIST persistent-1.2.3.0.tar.gz 31470 SHA256 759ce0fc3e0054776cb6882cb4df9c1c8347c4d48479e993af03da2c460a342e SHA512 80993fcfcfd9cd86992d5d7273bea9b8bd40d46d039e8725a035430c6202172e70f2012f6810488213df08b7093ec190bb8eee4ad34addcc3f0f8e325bbc46af WHIRLPOOL 46e7b6439df80bd51656ab528ac2d9e1445207cbf68191137801b0d1bcd88e92288ce72f37713bcd332f123a33ae5ca0ed6150eab6d189cf333a6b4ddd170077
-DIST persistent-1.3.1.1.tar.gz 37042 SHA256 7db789abfdd485f6f8a5f27613115f53f0d9702b87e1d200d91fa27a22ab4159 SHA512 b9c1fbd6578cad478c5af0d43b4378fd992a61fd3a7b3512cbb3207f560b53859788143de611c4add68b4ff1e69b472462bac2cd91c62fca4c1352fad07558c9 WHIRLPOOL d997157ffd17e9219f568942d791c1e80f6d20377dabe7b1cd41db263bdcb089c8bffa7e04fd95da2a07ecd364bee3811196adef41dee8993636c91d654fe52a
 DIST persistent-2.1.6.tar.gz 42889 SHA256 d4d74384c6f4017215fea11b23c2bc6505b86a184c0530db4893d9be7b914c9e SHA512 b1de69547d252a142bce18b837b37be60cc384172473f08dc0d7826dc82f7ce879bb7e0860d31e5c8dadab78992f2c84766bdc804f6ca06b29fa5e7f8391273e WHIRLPOOL 84f66dc65347cb9debfe418256041baa3a0ded11ef9dae3ba720551c75b5d459a6010295826f690e49276a1d2bf2ea721770a6e6ee6379bc7757fd733f7cfb4c
--- a/dev-haskell/persistent/persistent-1.1.5.1.ebuild
+++ b/dev-haskell/persistent/persistent-1.1.5.1.ebuild
@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type-safe, multi-backend data serialization"
-HOMEPAGE="http://www.yesodweb.com/book/persistent"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.5:=[profile?]
-		dev-haskell/attoparsec:=[profile?]
-		dev-haskell/base64-bytestring:=[profile?]
-		>=dev-haskell/blaze-html-0.5:=[profile?]
-		>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-		>=dev-haskell/conduit-0.5.5:=[profile?]
-		>=dev-haskell/lifted-base-0.1:=[profile?]
-		>=dev-haskell/monad-control-0.3:=[profile?]
-		>=dev-haskell/monad-logger-0.2.3:=[profile?]
-		>=dev-haskell/path-pieces-0.1:=[profile?]
-		>=dev-haskell/pool-conduit-0.1.1:=[profile?]
-		>=dev-haskell/resourcet-0.4:=[profile?]
-		dev-haskell/silently:=[profile?]
-		>=dev-haskell/text-0.8:=[profile?]
-		>=dev-haskell/transformers-0.2.1:=[profile?]
-		dev-haskell/transformers-base:=[profile?]
-		dev-haskell/unordered-containers:=[profile?]
-		dev-haskell/vector:=[profile?]
-		>=dev-lang/ghc-6.12.1:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( >=dev-haskell/hspec-1.3
-		)"
--- a/dev-haskell/persistent/persistent-1.2.3.0.ebuild
+++ b/dev-haskell/persistent/persistent-1.2.3.0.ebuild
@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type-safe, multi-backend data serialization"
-HOMEPAGE="http://www.yesodweb.com/book/persistent"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.5:=[profile?]
-		dev-haskell/attoparsec:=[profile?]
-		dev-haskell/base64-bytestring:=[profile?]
-		>=dev-haskell/blaze-html-0.5:=[profile?]
-		>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-		>=dev-haskell/conduit-1.0:=[profile?]
-		>=dev-haskell/lifted-base-0.1:=[profile?]
-		>=dev-haskell/monad-control-0.3:=[profile?]
-		>=dev-haskell/monad-logger-0.3:=[profile?]
-		>=dev-haskell/path-pieces-0.1:=[profile?]
-		>=dev-haskell/pool-conduit-0.1.2:=[profile?]
-		>=dev-haskell/resourcet-0.4:=[profile?]
-		dev-haskell/silently:=[profile?]
-		>=dev-haskell/text-0.8:=[profile?]
-		>=dev-haskell/transformers-0.2.1:=[profile?]
-		dev-haskell/transformers-base:=[profile?]
-		dev-haskell/unordered-containers:=[profile?]
-		dev-haskell/vector:=[profile?]
-		>=dev-lang/ghc-6.12.1:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( >=dev-haskell/hspec-1.3
-		)"
--- a/dev-haskell/persistent/persistent-1.3.1.1.ebuild
+++ b/dev-haskell/persistent/persistent-1.3.1.1.ebuild
@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type-safe, multi-backend data serialization"
-HOMEPAGE="http://www.yesodweb.com/book/persistent"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="nooverlap"
-
-RDEPEND=">=dev-haskell/aeson-0.5:=[profile?]
-	dev-haskell/attoparsec:=[profile?]
-	dev-haskell/base64-bytestring:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	>=dev-haskell/conduit-1.0:=[profile?]
-	dev-haskell/exceptions:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?]
-	>=dev-haskell/monad-logger-0.3:=[profile?]
-	>=dev-haskell/path-pieces-0.1:=[profile?]
-	dev-haskell/resource-pool:=[profile?]
-	>=dev-haskell/resourcet-0.4:=[profile?]
-	dev-haskell/scientific:=[profile?]
-	dev-haskell/silently:=[profile?]
-	>=dev-haskell/text-0.8:=[profile?]
-	>=dev-haskell/transformers-0.2.1:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-	test? ( >=dev-haskell/hspec-1.3 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag nooverlap nooverlap)
-}
--- a/dev-haskell/temporary-rc/temporary-rc-1.2.0.3.ebuild
+++ b/dev-haskell/temporary-rc/temporary-rc-1.2.0.3.ebuild
@ -10,7 +10,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal

 DESCRIPTION="Portable temporary file and directory support for Windows and Unix"
-HOMEPAGE="https://www.github.com/feuerbach/temporary"
+HOMEPAGE="https://github.com/feuerbach/temporary"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"

 LICENSE="BSD"
--- a/dev-haskell/temporary/temporary-1.1.2.4.ebuild
+++ b/dev-haskell/temporary/temporary-1.1.2.4.ebuild
@ -10,7 +10,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal

 DESCRIPTION="Portable temporary file and directory support for Windows and Unix, based on code from Cabal"
-HOMEPAGE="https://www.github.com/batterseapower/temporary"
+HOMEPAGE="https://github.com/batterseapower/temporary"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"

 LICENSE="BSD"
--- a/dev-haskell/temporary/temporary-1.2.0.3.ebuild
+++ b/dev-haskell/temporary/temporary-1.2.0.3.ebuild
@ -10,7 +10,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal

 DESCRIPTION="Portable temporary file and directory support for Windows and Unix, based on code from Cabal"
-HOMEPAGE="https://www.github.com/batterseapower/temporary"
+HOMEPAGE="https://github.com/batterseapower/temporary"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"

 LICENSE="BSD"
--- a/dev-haskell/yesod-auth-hashdb/Manifest
+++ b/dev-haskell/yesod-auth-hashdb/Manifest
@ -1,3 +1 @@
-DIST yesod-auth-hashdb-1.3.0.1.tar.gz 6772 SHA256 984c38923340cd59b87f0862024cb5a9c02a84184093f2d52760999700afe860 SHA512 51bf15517055ff9929f4c633e22e1a17102a0ee06b2111ea1b4541ae013234ea41668599ae816c993ca1237b3aabe9c278d3e161504af5a2ead84c1bf2b9b26b WHIRLPOOL d06e85d1db995aad2c3b7290696819f6ee84eb71e807fed0eea2325c217f81f2d527c6ba64d88bc12224f14713a4f8d15a19edb615820a4f6b3a3da636723ccc
-DIST yesod-auth-hashdb-1.4.2.2.tar.gz 10290 SHA256 d904933fa5172cc330785591eb92fa61a3cb86599c617ff4bdedf348ecad5868 SHA512 f0a87e93dcd36887a1cc214024267c25b8d9721c44c3b9147205b22c27e663dced3482e81f35cd8685bb95c47c44ec8631adf7929f22605571570e8b3a2e862d WHIRLPOOL 96c12ba1c25435335f12f025372d97d721fd78028225111a7c33e47064809cbbda965540040c00d3652e626589824ee63b2e8095b0eab6a85f5b2c3ec0576574
 DIST yesod-auth-hashdb-1.5.1.tar.gz 12987 SHA256 fb69116768ae46b0ba582e91151438fd9f89daf0fbcfb5fc534058798552d2fe SHA512 9fbbd5b3b8bdd56e0e35a7609408fff034ba320e8271655ae29d75b1a75dd7c4ef9cebc4f94ed991137940d8161ec8560af6bf3c397d86de78e447adaf741ccf WHIRLPOOL e8bf1ccd36d55da08abdba4ec14f326345732ef13a30781d66fde584e3f84648e2f8f81e103e366f1b1c1bb8a4fe390cc5272d18a65e3db59eb9fdb768af6b5b
--- a/dev-haskell/yesod-auth-hashdb/yesod-auth-hashdb-1.3.0.1.ebuild
+++ b/dev-haskell/yesod-auth-hashdb/yesod-auth-hashdb-1.3.0.1.ebuild
@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Authentication plugin for Yesod"
-HOMEPAGE="http://www.yesodweb.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cryptohash-0.8:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?]
-	>=dev-haskell/pwstore-fast-2.2:=[profile?] <dev-haskell/pwstore-fast-2.5:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?] <dev-haskell/text-2.0:=[profile?]
-	>=dev-haskell/yesod-auth-1.3:=[profile?] <dev-haskell/yesod-auth-1.4:=[profile?]
-	>=dev-haskell/yesod-core-1.2:=[profile?] <dev-haskell/yesod-core-1.3:=[profile?]
-	>=dev-haskell/yesod-form-1.3:=[profile?] <dev-haskell/yesod-form-1.4:=[profile?]
-	>=dev-haskell/yesod-persistent-1.2:=[profile?] <dev-haskell/yesod-persistent-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0
-"
--- a/dev-haskell/yesod-auth-hashdb/yesod-auth-hashdb-1.4.2.2.ebuild
+++ b/dev-haskell/yesod-auth-hashdb/yesod-auth-hashdb-1.4.2.2.ebuild
@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Authentication plugin for Yesod"
-HOMEPAGE="https://github.com/paul-rouse/yesod-auth-hashdb"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cryptohash-0.8:=[profile?]
-	>=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-2.3:=[profile?]
-	>=dev-haskell/pwstore-fast-2.2:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/yesod-auth-1.4:=[profile?] <dev-haskell/yesod-auth-1.5:=[profile?]
-	>=dev-haskell/yesod-core-1.4:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
-	>=dev-haskell/yesod-form-1.4:=[profile?] <dev-haskell/yesod-form-1.5:=[profile?]
-	>=dev-haskell/yesod-persistent-1.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0
-	test? ( dev-haskell/hspec )
-"
--- a/dev-haskell/yesod-auth/Manifest
+++ b/dev-haskell/yesod-auth/Manifest
@ -1,4 +1 @@
-DIST yesod-auth-1.2.7.tar.gz 29818 SHA256 93574f918075f7de6aebbe331bb8e78c1ef7c5c45b2c693ba83c9f694ffb3a2b SHA512 e2029095d280d0f7c69e06195c864debe17ab4679e05279d31a37823956880d0fa3abdd6c285c08c44ee658948e7174888d682122687a0a022d229ac376e64b5 WHIRLPOOL b52db4f2325508ac7af358ae3e5836dbeb68af362384f45d8ed0baac3f31799fc0c4a61f0e22a0b4c883514bbe378beb4d05a33aaf000b5cf427180e1c0e6beb
-DIST yesod-auth-1.3.1.1.tar.gz 35665 SHA256 390eb48a0e5ee1efc25e258b126b937f18d74a0f5bec79b67d6943fbd0268057 SHA512 daaf65024334a24da78b53dbfa64e78e855d32b29eed1088f43f99d6794c65e4a49541350fdd3d6590ba28e02556888656f185a8aa92bb6b5439635c972dce6e WHIRLPOOL bcf239527ea22ef9ea910286cecaca5290ab897138efc825a8c91aa565e00a848dc6cce3aaa0dc289b432a07a3e197da82e5dc4135ade3cfa204df85d7733dd8
-DIST yesod-auth-1.4.11.tar.gz 46006 SHA256 2bf08ed837a32e98002d5d16c5cd751a6871950e7bcb2e8b12045f6c60071a77 SHA512 32670e5a0a017d8aee45314babcd49e4dab9c7adfb0e03ab1c622bf2f5df414ae9dd27e275da97cf74147188a81ddf5523edb31701ca84289790fb20113fd4be WHIRLPOOL 35381578c07c2fbdf17e5c3e0b81c6c9b17117b0144120a5b551362a46e3247deb0ff86e959334750d1c2260d2ba26038a019a41d32033022505d6364a9cd99a
 DIST yesod-auth-1.4.13.2.tar.gz 48670 SHA256 65d4cdc979db56e766aef3f64183075f4976ddedb8e62b07efb09be56f2cca20 SHA512 b22207d0ccf86345a50b87a66b4050727003edda7a54d86f81861471a694b2ccfb21d247bea972f21a2e8693cb79988028777f25791059ea3d2a47ddd8a47731 WHIRLPOOL f6ab7b8ebc16c9aa1d4c8ff4d7ca02168bd884d5329c5088f9de318d18b6737478ad544c8e49cd601dd764d85db8ea5b491b89eada938e4061d23d0160383291
--- a/dev-haskell/yesod-auth/yesod-auth-1.2.7.ebuild
+++ b/dev-haskell/yesod-auth/yesod-auth-1.2.7.ebuild
@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Authentication for Yesod"
-HOMEPAGE="http://www.yesodweb.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.5:=[profile?]
-	>=dev-haskell/authenticate-1.3:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/email-validate-1.0:=[profile?]
-	dev-haskell/file-embed:=[profile?]
-	>=dev-haskell/hamlet-1.1:=[profile?] <dev-haskell/hamlet-1.2:=[profile?]
-	>=dev-haskell/http-conduit-1.5:=[profile?]
-	dev-haskell/http-types:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	>=dev-haskell/mime-mail-0.3:=[profile?]
-	dev-haskell/network:=[profile?]
-	>=dev-haskell/persistent-1.2:=[profile?] <dev-haskell/persistent-1.4:=[profile?]
-	>=dev-haskell/persistent-template-1.2:=[profile?] <dev-haskell/persistent-template-1.4:=[profile?]
-	>=dev-haskell/puremd5-2.0:=[profile?]
-	>=dev-haskell/pwstore-fast-2.2:=[profile?]
-	>=dev-haskell/random-1.0.0.2:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	dev-haskell/safe:=[profile?]
-	>=dev-haskell/sha-1.4.1.3:=[profile?]
-	>=dev-haskell/shakespeare-css-1.0:=[profile?] <dev-haskell/shakespeare-css-1.1:=[profile?]
-	>=dev-haskell/shakespeare-js-1.0.2:=[profile?] <dev-haskell/shakespeare-js-1.3:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-haskell/wai-1.4:=[profile?]
-	>=dev-haskell/yesod-core-1.2:=[profile?] <dev-haskell/yesod-core-1.3:=[profile?]
-	>=dev-haskell/yesod-form-1.3:=[profile?] <dev-haskell/yesod-form-1.4:=[profile?]
-	>=dev-haskell/yesod-persistent-1.2:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-"
--- a/dev-haskell/yesod-auth/yesod-auth-1.3.1.1.ebuild
+++ b/dev-haskell/yesod-auth/yesod-auth-1.3.1.1.ebuild
@ -1,63 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Authentication for Yesod"
-HOMEPAGE="http://www.yesodweb.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.5:=[profile?]
-	dev-haskell/attoparsec-conduit:=[profile?]
-	>=dev-haskell/authenticate-1.3:=[profile?]
-	dev-haskell/base16-bytestring:=[profile?]
-	dev-haskell/base64-bytestring:=[profile?]
-	dev-haskell/binary:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	dev-haskell/byteable:=[profile?]
-	dev-haskell/conduit:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	dev-haskell/cryptohash:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/email-validate-1.0:=[profile?]
-	dev-haskell/file-embed:=[profile?]
-	>=dev-haskell/hamlet-1.1:=[profile?]
-	dev-haskell/http-client:=[profile?]
-	>=dev-haskell/http-conduit-1.5:=[profile?]
-	dev-haskell/http-types:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	>=dev-haskell/mime-mail-0.3:=[profile?]
-	dev-haskell/network:=[profile?]
-	>=dev-haskell/persistent-1.2:=[profile?] <dev-haskell/persistent-1.4:=[profile?]
-	>=dev-haskell/persistent-template-1.2:=[profile?] <dev-haskell/persistent-template-1.4:=[profile?]
-	>=dev-haskell/random-1.0.0.2:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/shakespeare:=[profile?]
-	>=dev-haskell/shakespeare-css-1.0:=[profile?]
-	>=dev-haskell/shakespeare-js-1.0.2:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-haskell/wai-1.4:=[profile?]
-	>=dev-haskell/yesod-core-1.2:=[profile?] <dev-haskell/yesod-core-1.3:=[profile?]
-	>=dev-haskell/yesod-form-1.3:=[profile?] <dev-haskell/yesod-form-1.4:=[profile?]
-	>=dev-haskell/yesod-persistent-1.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0
-"
--- a/dev-haskell/yesod-auth/yesod-auth-1.4.11.ebuild
+++ b/dev-haskell/yesod-auth/yesod-auth-1.4.11.ebuild
@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Authentication for Yesod"
-HOMEPAGE="http://www.yesodweb.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?]
-	>=dev-haskell/authenticate-1.3:=[profile?]
-	dev-haskell/base16-bytestring:=[profile?]
-	dev-haskell/base64-bytestring:=[profile?]
-	dev-haskell/binary:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	dev-haskell/byteable:=[profile?]
-	dev-haskell/conduit:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	dev-haskell/cryptohash:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/email-validate-1.0:=[profile?]
-	dev-haskell/file-embed:=[profile?]
-	dev-haskell/http-client:=[profile?]
-	>=dev-haskell/http-conduit-2.1:=[profile?]
-	dev-haskell/http-types:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	>=dev-haskell/mime-mail-0.3:=[profile?]
-	>=dev-haskell/nonce-1.0.2:=[profile?] <dev-haskell/nonce-1.1:=[profile?]
-	>=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-2.3:=[profile?]
-	>=dev-haskell/persistent-template-2.1:=[profile?] <dev-haskell/persistent-template-2.2:=[profile?]
-	>=dev-haskell/random-1.0.0.2:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/shakespeare:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-haskell/wai-1.4:=[profile?]
-	>=dev-haskell/yesod-core-1.4:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
-	>=dev-haskell/yesod-form-1.4:=[profile?] <dev-haskell/yesod-form-1.5:=[profile?]
-	>=dev-haskell/yesod-persistent-1.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
--- a/dev-haskell/yesod-form/Manifest
+++ b/dev-haskell/yesod-form/Manifest
@ -1,3 +1 @@
-DIST yesod-form-1.3.11.tar.gz 23456 SHA256 c016902a7d914ae1ef41f5af0c1b943c94516931a83595e835c5d6f0b7c78495 SHA512 2876b460a7a3eba940cb6f572f0c37aba6caef3d2e109a357f7275c76638b7a82aad980f9d10846c4ce7f80c6ce8a8964fe37d55008acf5a1e81b54620ba6c1d WHIRLPOOL 5549b849c5d5d1fcf2af3aa367bb6827e8ae7b28554c6a05c9eeff43653ab8895ee17e69f1ed0718ff48627afe940e7b058f07af4d4a246a58f85a61af48100d
-DIST yesod-form-1.4.6.tar.gz 29646 SHA256 1a20f58e0f06b92afc5bd31b5ab6b1d5c6645e2f7fd134c4b2e325d818b50e66 SHA512 fe22f6f3b657640e2cbe8a417f98b2a9e1336676c92b54e83cd9e49013195e95bb98ec7aa383c06d3a2196b2b6bdaec69b647851119138ba81a34dfd84928805 WHIRLPOOL 541f9cbef192d094f17392b62bf29b2a68097c88e4186f65a3870439890c4505b41fb6e0b7a628c890f5c5b8c490a6ce983ba11f05f2e027b2193ddcc4d5ad7c
 DIST yesod-form-1.4.7.1.tar.gz 30581 SHA256 66f1672c7aaec0b4c93f5cfc20593a4fb92d779d90d55ee5ebd1f7ae6a6e8dac SHA512 71d5eacfb959320f2120304e36ad067c480002fddc2f6f6b1d9fb0b97864ead335eb66e813ebb554a8d312859a60cbd820edaa7541745f847c18aef8130598d7 WHIRLPOOL f468bdd0a119abe4fb0c10c2af9349d2232aba84cf99a69be304e743e3e8454e6eaf79130931c570d6804ab6b1bc014dc40afb2afd23425f0f1fba5c0145896c
--- a/dev-haskell/yesod-form/yesod-form-1.3.11.ebuild
+++ b/dev-haskell/yesod-form/yesod-form-1.3.11.ebuild
@ -1,47 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Form handling support for Yesod Web Framework"
-HOMEPAGE="http://www.yesodweb.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	>=dev-haskell/attoparsec-0.10:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	dev-haskell/byteable:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/email-validate-1.0:=[profile?]
-	>=dev-haskell/hamlet-1.1.8:=[profile?]
-	>=dev-haskell/network-2.2:=[profile?]
-	>=dev-haskell/persistent-1.2:=[profile?] <dev-haskell/persistent-1.4:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	dev-haskell/shakespeare:=[profile?]
-	>=dev-haskell/shakespeare-css-1.0:=[profile?]
-	>=dev-haskell/shakespeare-js-1.0.2:=[profile?]
-	>=dev-haskell/text-0.9:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/wai-1.3:=[profile?]
-	>=dev-haskell/xss-sanitize-0.3.0.1:=[profile?]
-	>=dev-haskell/yesod-core-1.2:=[profile?] <dev-haskell/yesod-core-1.3:=[profile?]
-	>=dev-haskell/yesod-persistent-1.2:=[profile?] <dev-haskell/yesod-persistent-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hspec )
-"
--- a/dev-haskell/yesod-form/yesod-form-1.4.6.ebuild
+++ b/dev-haskell/yesod-form/yesod-form-1.4.6.ebuild
@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Form handling support for Yesod Web Framework"
-HOMEPAGE="http://www.yesodweb.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	>=dev-haskell/attoparsec-0.10:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	dev-haskell/byteable:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/email-validate-1.0:=[profile?]
-	dev-haskell/persistent:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	>=dev-haskell/shakespeare-2.0:=[profile?]
-	>=dev-haskell/text-0.9:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/wai-1.3:=[profile?]
-	>=dev-haskell/xss-sanitize-0.3.0.1:=[profile?]
-	>=dev-haskell/yesod-core-1.4:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
-	>=dev-haskell/yesod-persistent-1.4:=[profile?] <dev-haskell/yesod-persistent-1.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hspec )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
--- a/dev-haskell/yesod-persistent/Manifest
+++ b/dev-haskell/yesod-persistent/Manifest
@ -1,3 +1 @@
-DIST yesod-persistent-1.2.3.tar.gz 4169 SHA256 fc3627ff021573cb92403b667e20ebb6194b227f30a189019d288be1cdbfbacd SHA512 b7e7f6734ef0a61c61dbbe00d4496ca5ee51a389eaf0f32b2d6092f4662ca810cc051ed47b9976c35b69ca939dec858f1b70f6de8309a3e45486ef914ab329a3 WHIRLPOOL 9c05deefaf7b800463dfeb6551c8a86ad77072b5a29e001ee41680c6697bb9372fe1dab927b2375839f404f75dfdfef0f3b846fade132f149722958ea48ac73a
-DIST yesod-persistent-1.4.0.3.tar.gz 4283 SHA256 6455b79eda028e12caefc9d89808fbc611ece36ef64bab3426f90a26cacf3b5f SHA512 9701fd77fe40862f712a3f2ff7108203c2a1532bea03c1d63396c0133fb24b2adc70d134b22f7e61a1e5c96a8a8859f131eea0e180fe9e731dd2d0ca8d47b0ae WHIRLPOOL ed436bcf4db489f89c1935ce9240b31cc6e4a08d12d24c183db4c3221151502f37ec32e7a5114244a86404192bb22ebb625d85406d716f5d441faeacf234ba16
 DIST yesod-persistent-1.4.0.5.tar.gz 4375 SHA256 e5ad890ca4d4c0499ae08e5e1e294f4c1435e9395ba1ba9bb3acf3982eb8d2c2 SHA512 867e252e7c511da5b4adaaebb22f53fcf657a588c43be456d8415157e49caa8e51b40fb875bf93834cf93c353c5d9f8455eff911636a13245c0725617ad52eb1 WHIRLPOOL aad20e94944de017138c5d172602326152681ea36c9c9e2bba6e681f421d3f836c28e2ec5e15418c65bf009ddd858f40f015a991beef52420426a801d1ed6913
--- a/dev-haskell/yesod-persistent/yesod-persistent-1.2.3.ebuild
+++ b/dev-haskell/yesod-persistent/yesod-persistent-1.2.3.ebuild
@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Some helpers for using Persistent from Yesod"
-HOMEPAGE="http://www.yesodweb.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/blaze-builder:=[profile?]
-	dev-haskell/conduit:=[profile?]
-	>=dev-haskell/persistent-1.2:=[profile?] <dev-haskell/persistent-1.4:=[profile?]
-	>=dev-haskell/persistent-template-1.2:=[profile?] <dev-haskell/persistent-template-1.4:=[profile?]
-	dev-haskell/resource-pool:=[profile?]
-	>=dev-haskell/resourcet-0.4.5:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/yesod-core-1.2.2:=[profile?] <dev-haskell/yesod-core-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hspec
-		dev-haskell/persistent-sqlite
-		dev-haskell/text
-		dev-haskell/wai-extra
-		dev-haskell/wai-test )
-"
--- a/dev-haskell/yesod-persistent/yesod-persistent-1.4.0.3.ebuild
+++ b/dev-haskell/yesod-persistent/yesod-persistent-1.4.0.3.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Some helpers for using Persistent from Yesod"
-HOMEPAGE="http://www.yesodweb.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/blaze-builder:=[profile?]
-	dev-haskell/conduit:=[profile?]
-	>=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-2.3:=[profile?]
-	>=dev-haskell/persistent-template-2.1:=[profile?] <dev-haskell/persistent-template-2.2:=[profile?]
-	dev-haskell/resource-pool:=[profile?]
-	>=dev-haskell/resourcet-0.4.5:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/yesod-core-1.4.0:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hspec
-		dev-haskell/persistent-sqlite
-		dev-haskell/text
-		dev-haskell/wai-extra )
-"
--- a/dev-haskell/yesod/Manifest
+++ b/dev-haskell/yesod/Manifest
@ -1,3 +1 @@
-DIST yesod-1.2.6.tar.gz 7834 SHA256 e03b2d05aac6b18bb7ff47afb501e186663ff09de5beb5b978bf7d66ff378467 SHA512 5bd903c679dbf5ad92d597d690bda5a9213c2bd60e25883c3fbec9201e3884ff26293b60837f157f2eae41777fb1f46bff331febd2a4fa4b748f3c74395ed19f WHIRLPOOL e815c080618ed21935e5c83a342c64369c38524952bb8c15c9a61e60e5b882971ac2cd5cb1dcd24cf5380f9c4ac1a57d5472c48dc016c8acc8a23d33efa7dd0f
-DIST yesod-1.4.2.tar.gz 9801 SHA256 d6d13e608af954de23721261b39ee79569907beb173477db8820acc5e9f45757 SHA512 dae87a0c2c3f6f6b8ef47c2648e73f8e12756798d785d683ad9f9c6bb5535446a398df85fe8123fd0a38069b167b08cc8d98bef31cff1ce6000d7b0af1fb0922 WHIRLPOOL 65893edf0dde30bedb486642a6212fb5a910ea27fedefdaf91a133600895355ff04b94a7940fdd2372bb8518734d26fc4182ddc5eede63f0fc3af9317c00a79d
 DIST yesod-1.4.3.tar.gz 9023 SHA256 13655ed28102b30f32a34fb1b30cf20c1d9bbd9f6f1c89f96643ea6d7bba74a3 SHA512 2964e290307fde99ea0b3ad27af61a5c2d4577fcf24eeb18d7ddd2d7210db8801d4d3a824ae6331e4d79a23155f9943b7b0f705c347bcec4a947fbe7c83b9278 WHIRLPOOL bfbd19eff33cd9f6991a2861b32e2ed3b1e1f48e86eb3c25ad28826b156c1b5c8e4a554c8ec9a037221fc1f9ce0ca06debf22ba683af411495ae4cdaeb6fed4c
--- a/dev-haskell/yesod/yesod-1.2.6.ebuild
+++ b/dev-haskell/yesod/yesod-1.2.6.ebuild
@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Creation of type-safe, RESTful web applications"
-HOMEPAGE="http://www.yesodweb.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	dev-haskell/fast-logger:=[profile?]
-	>=dev-haskell/hamlet-1.1:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-0.4:=[profile?]
-	dev-haskell/monad-logger:=[profile?]
-	dev-haskell/network-conduit:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/shakespeare:=[profile?]
-	>=dev-haskell/shakespeare-css-1.0:=[profile?]
-	>=dev-haskell/shakespeare-js-1.0.2:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-haskell/wai-1.3:=[profile?]
-	>=dev-haskell/wai-extra-1.3:=[profile?]
-	>=dev-haskell/warp-1.3:=[profile?]
-	dev-haskell/yaml:=[profile?]
-	>=dev-haskell/yesod-auth-1.2:=[profile?] <dev-haskell/yesod-auth-1.4:=[profile?]
-	>=dev-haskell/yesod-core-1.2.2:=[profile?] <dev-haskell/yesod-core-1.3:=[profile?]
-	>=dev-haskell/yesod-form-1.3:=[profile?] <dev-haskell/yesod-form-1.4:=[profile?]
-	>=dev-haskell/yesod-persistent-1.2:=[profile?] <dev-haskell/yesod-persistent-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
--- a/dev-haskell/yesod/yesod-1.4.2.ebuild
+++ b/dev-haskell/yesod/yesod-1.4.2.ebuild
@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Creation of type-safe, RESTful web applications"
-HOMEPAGE="http://www.yesodweb.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	dev-haskell/fast-logger:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	dev-haskell/monad-logger:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	dev-haskell/shakespeare:=[profile?]
-	dev-haskell/streaming-commons:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-haskell/wai-1.3:=[profile?]
-	>=dev-haskell/wai-extra-1.3:=[profile?]
-	dev-haskell/wai-logger:=[profile?]
-	>=dev-haskell/warp-1.3:=[profile?]
-	dev-haskell/yaml:=[profile?]
-	>=dev-haskell/yesod-auth-1.4:=[profile?] <dev-haskell/yesod-auth-1.5:=[profile?]
-	>=dev-haskell/yesod-core-1.4:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
-	>=dev-haskell/yesod-form-1.4:=[profile?] <dev-haskell/yesod-form-1.5:=[profile?]
-	>=dev-haskell/yesod-persistent-1.4:=[profile?] <dev-haskell/yesod-persistent-1.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
--- a/dev-lang/ispc/Manifest
+++ b/dev-lang/ispc/Manifest
@ -1,2 +1,3 @@
 DIST ispc-1.8.2-llvm-3.7.patch.gz 15723 SHA256 8fc724b7076b0d288cf1ffeb1d71cfdbba8bf54e5923c1b862572646f6f29931 SHA512 7ad3997e8c0168d83bdc9cd0444e48467c31f9f497105ea6a98c358f8dd1db5c9acba636e5d86e6aed77c16f2a9d776142a3f2f9d2e3780ffddbb116e6679054 WHIRLPOOL 9f92edb0dbec381f43dea9b929683186254a8824cbf8b213d460166b03bf952555b0386f9346732e1ad5bd8ba90dac3c7ef531be94b30dd3288918026ae60064
 DIST ispc-1.8.2.tar.gz 19259133 SHA256 d17ea68b7192d261a2830d6e00df656a73fbccd08a249433fcaf24a886902a9d SHA512 bb1f64afe41af138c386fb12a2a7f477f7bc8df2543191bbe7e5d7624e6b00dfec11ba422f6f396cd91af1c7b4cb5d2b3febf7902740d85c6d068de8ab94765a WHIRLPOOL 45ba7c52b3ada111f518b2a94d71d8c259040114ae84881c693f6e3491bd4b6897563eba4bccb6ae83a7cb90901bf1723bcbfeb9a124267ed235b1b8fdf61d69
+DIST ispc-1.9.0.tar.gz 19271046 SHA256 b151e50f80754d81302f968c66cc7444c65010c20d1f83382b94c22491bb3971 SHA512 d886697fd0390017ee0b8c8682834d8b600b10c08eb069eea53eba7cc68788ec5a8e3f50366636add362c5a0508ef38fc0789f6a349d913b972f325830c78c28 WHIRLPOOL 63020bc499e16655bed565187d97ca7810aea294ca32ec8bef5344e4fb11ecc109cf6af7018d820ed28674b82c2a50148bb2d598d0d3cee848d990072bedb717
--- a/dev-lang/ispc/ispc-1.8.2-r4.ebuild
+++ b/dev-lang/ispc/ispc-1.8.2-r4.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -28,6 +28,8 @@ IUSE="examples"
 RDEPEND="
 	>=sys-devel/clang-3.7
 	>=sys-devel/llvm-3.7
+	<sys-devel/clang-3.8
+	<sys-devel/llvm-3.8
 	"
 DEPEND="
 	${RDEPEND}
--- a/dev-lang/ispc/ispc-1.9.0.ebuild
+++ b/dev-lang/ispc/ispc-1.9.0.ebuild
@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit toolchain-funcs python-any-r1
+
+DESCRIPTION="Intel SPMD Program Compiler"
+HOMEPAGE="https://ispc.github.com/"
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/ispc/ispc.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD BSD-2 UoI-NCSA"
+SLOT="0"
+IUSE="examples"
+
+RDEPEND="
+	>=sys-devel/clang-3.0
+	>=sys-devel/llvm-3.0
+	"
+DEPEND="
+	${RDEPEND}
+	${PYTHON_DEPS}
+	sys-devel/bison
+	sys-devel/flex
+	"
+
+src_compile() {
+	sed -i '/^\t@/s/@//' Makefile || die #make all slient commands ("@") verbose
+	emake LDFLAGS="${LDFLAGS}" OPT="${CXXFLAGS}" CXX="$(tc-getCXX)" CPP="$(tc-getCPP)"
+}
+
+src_install() {
+	dobin ispc
+	dodoc README.rst
+
+	if use examples; then
+		insinto "/usr/share/doc/${PF}/examples"
+		docompress -x "/usr/share/doc/${PF}/examples"
+		doins -r examples/*
+	fi
+}
--- a/dev-lang/mujs/Manifest
+++ b/dev-lang/mujs/Manifest
@ -1 +1,2 @@
 DIST mujs-0_p20150202.tar.gz 96743 SHA256 c757bfec7ad9864d85d710cd0b413a4909e9dfc418e036e7b0692bb6acd25305 SHA512 28a1b95fcf09098e0882fe0bc989696961c39ae9d4fb2d00f61b84778431b1c9973f1dcc3c9dee277ba4827b2bf1fd323502d9c6469cb5179c6fb1a04bbbd0e1 WHIRLPOOL 17166bad1594bcee38569531ded73abf24f99b98d7434f535775287d1baa16f2106a53a05359d40c504fbf64981e9bd92ccdbab14a41afa03d9a0d34dd553a94
+DIST mujs-0_p20160504.tar.gz 104982 SHA256 8c3bf2bc7a1b0dadf4ef5078aa4234692a98a979890d7866672127b375d3948f SHA512 13ba2bb9c2d6f15787fc2ed79534af511d100b1dadcac92b729a27815e4f8d8eb10e507f010d1be32f927b54e4a41d395de97cbc645ab34db012267410bc6d47 WHIRLPOOL 2f328c7fe7744ded0d13c00dbd5e6813bf05d7f3ef977c4901c02f00764c82d6c06ceb3b8c16a046c93889eb1ac27cb5f5b1f0472de000defdbc54176a1863bd
--- a/dev-lang/mujs/mujs-0_p20160504.ebuild
+++ b/dev-lang/mujs/mujs-0_p20160504.ebuild
@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic toolchain-funcs vcs-snapshot
+
+DESCRIPTION="lightweight Javascript interpreter"
+HOMEPAGE="http://mujs.com/"
+SRC_URI="http://git.ghostscript.com/?p=mujs.git;a=snapshot;h=1930f35933654d02234249b8c9b8c0d1c8c9fb6b;sf=tgz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0_p20150202-Makefile.patch
+	# workaround for linkage of app-text/mupdf-1.7a
+	# TODO: generate a shared library and IUSE=static-libs
+	append-cflags -fPIC
+	tc-export CC
+}
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@ -2,26 +2,15 @@ DIST ruby-2.0.0-p647.tar.xz 8301008 SHA256 9f793880df1209ea4e5c10ee9d8ef79caa0e7
 DIST ruby-2.0.0-p648.tar.xz 8303584 SHA256 22fe97739110ba9171b13fc4dcd1a92e767f16769de3593ee41ef1283d218402 SHA512 95df515d37f04193eaceaded4a4f568f83041683349cd44767803f77361a66533226d83eac6586ac894ae61d79bd36ce047f951aed43f9a8356dbb3244280774 WHIRLPOOL ef78b838d061b1707219453a70c8b4a503d46e9f95797007555943a837de21f22c0c93039c75172d7df4fe9b5eca38472ee7177f98785cb5993c7e80140a1d27
 DIST ruby-2.1.10.tar.xz 9362868 SHA256 5be9f8d5d29d252cd7f969ab7550e31bbb001feb4a83532301c0dd3b5006e148 SHA512 72406ac133af7f057d4633d2a300e49e133881f6b36ff4cdf6c72b4ff4325de332fc5a45c96ea407140a8bf09cdc307e13107c539196902e5b67b7d24cd72dc9 WHIRLPOOL c069461eca483db74ffd72efb3279eea3949975e504d1b38ef76d4226f6e85cc3d337a358453fb4910f3b1306fc903ce38f156c7af65d207d2a4732571ef9ac1
 DIST ruby-2.1.7.tar.xz 9371208 SHA256 225c067d9820fe52fcffbfb91d5b5243708a0b666b9929bea466e9379eb40ad7 SHA512 a4f2a3a684517678442b4ad3bda50433634317c910e8c13c844dffe470532bae5fd8d72b3f83c9a36865f303fe0464703e30854b3e55a558a758252b5e594406 WHIRLPOOL 54fae59b754aebbf1736720e042574ed4a0b4f7c1518742f8215bb396bb7416ee7b50df7d27167337e10eef518f1d488a48d064bfcbfac0065aa8313296fe263
-DIST ruby-2.1.8.tar.xz 9382672 SHA256 94eeae3b3e3ac93cfd205e1aaef4c5325227b7656cbb2fc1ee217618145dd19d SHA512 c712ee69cb1d41ad8420177b9564e451ab795e4903f1edc20c14aa189b8e38c54c5119d913204d13a5f8fa424f2ec43bfad04c77b313ea4533e23a9b1d161392 WHIRLPOOL 542e61ec35a5dacf0ee49daeaf70c2cc3efb605685013eea48208709a4eea6eb83413ff32839dab1d316a60d6d5ebc75811f8085c39b08205c36d815460e7549
 DIST ruby-2.1.9.tar.xz 9395648 SHA256 39f203f7498aed2456fb500147fada5adcbf102d89d4f6aca773ebcadd8ea82a SHA512 1f331a8910fd7a9ab9c41bf56aef12041dd413ad49c696f6df2c9a7ec3a3d5cdf383f2a3d30949ea37b8ecb39f50355e526412b36ed4e07b60733d9db4d2bd14 WHIRLPOOL bb2fa158d837f9c278cab93ecb1a8f6a00ddff12c40d1fa5ffb6b55741dc71268fef40fc9f30508dc89b27a05fe9f3b4fbf739ba69ab4e62f669f82a15d26dfa
-DIST ruby-2.2.2.tar.xz 10463044 SHA256 f033b5d08ab57083e48c1d81bcd7399967578c370b664da90e12a32891424462 SHA512 bd72d0a4c017e2527659f64ef2781bbe8bd540a2302eaa60234a12282fd53c359e04205c56385402c67e81bb9dab3b88de53de82e12bb13e3386c26301043b64 WHIRLPOOL ee9c3a664ac1d67bd9ff4ed8fcc7d4c8e9b6e2f5774c938f876223b22022b498932afc41990890a03b560c65ffe29a039761d18bbeeab46fe13cbfff515bc115
-DIST ruby-2.2.3.tar.xz 10453204 SHA256 c6ec90e9ed018e6d9a578fc93755d8565839908d5796809e1aecd1798c7ea8a7 SHA512 e3ce3333e8d59f4f3bfc84cf9bbbc6f74272470e12913d299fd1d41fc166dee21921eed1789591f50c3f3b6e5fd38fd1b99855c16aff28bdc4ae8fcc680c71bd WHIRLPOOL 3fae4fc3112f24004f0f043d29b2e624e559fa3d53e6b0479af03df910d210aaeb8274c294dfe1ef0602f63790b4cdc31147d5fd92707e38ea29f01fd07e8839
-DIST ruby-2.2.4.tar.xz 10464500 SHA256 d28bff4641e382681c58072ddc244d025ac47ff71dd9426a92fcfc3830d1773c SHA512 755257eea0cb79f28f1d2dc6e2a5ee4b1954280f51153e5fe90605a875b1d52077660b87e4e04d11552591a1f60a1241e4c70056f073a217b3bad896f64780da WHIRLPOOL 9d3d549dce991d2d594df624bf2f55f4ff9269c35193b190e3fd774b8883facb568f010a3b79927e083cc5bad277281e4c8a9fc3979f609fca50f86775563484
 DIST ruby-2.2.5.tar.xz 10457620 SHA256 f86feaa0a578e8da0924ced3ec68b25b50d69fc9a72cc8d919bc3c73f85f87d7 SHA512 6da4bdb0a43d56c7a8e4dddbcacf237e998ebb54706c8f835b53713dbdf924e40d5f89f63017515e1d66904ca01f28058cf296567104e06540c57f036dcdd0fe WHIRLPOOL 16d7a03c359bf31aeecc67afd72d8290f8f7e2a26b15c069ad623716866b76cea467f550946a27916087343ab3225149681e1555ea9c21459a94f7a038758270
 DIST ruby-2.3.0.tar.xz 11294412 SHA256 70125af0cfd7048e813a5eecab3676249582bfb65cfd57b868c3595f966e4097 SHA512 d893c5e6db5a0533e0da48d899c619964388852ef90e7d1b92a4363d5f189cd2dba32a009581f62b9f42a8e6027975fc3c18b64faf356f5e3ac43a8d69ec5327 WHIRLPOOL 1d39136dad87580339f87057649d136e1b76cb58118b275d6847b791be8f6882820de892d9fb7144991a7acf30c355311fd289d1a7931fd018b3b95398945c07
 DIST ruby-2.3.1.tar.xz 11407048 SHA256 6725b5534d5a3a21ec4f14d6d7b9921a0d00d08acb88fd04cd50b47b70496338 SHA512 e9d89aeefb1b1e72cee9d3d414b27c793cf09ff3ed5e0ea5277a2b6ae1cae9fdbf6b404a84b42c0c6835754eb04674fc4f1470fbfedabeee3f57e518f13db633 WHIRLPOOL ddfad0f36d61e75209bdc69da0ec549a3443ecb3ed8e1347bb3d0b54ec34073eb05fc8bb78843d59b8b65ec92b8df47f001f5f28f00f685bd2ab60b1ce557558
 DIST ruby-patches-2.0.0_p647-r1.tar.bz2 3341 SHA256 7d82403fed6216baed59ac1fbba888e2b9a4a9cb742ffd01531753bae07ab6b8 SHA512 40d07275a391df3e0a7a0c2705913c8120a548e223032dc39993f8f873c8d0639646cf728dc95f1400352a13766623ac6d69a1b1ff03183df6fabf32946dd7a6 WHIRLPOOL ed7ea6b1c1fd3570ea85b885f7455d8273cff2a9db2540c9e89faca867bd5eed2b4de52c7d21a96bb33ae0beedce113c68bb6c8cee4688650ff5169bd9c265fd
 DIST ruby-patches-2.0.0_p648.tar.bz2 3341 SHA256 7d82403fed6216baed59ac1fbba888e2b9a4a9cb742ffd01531753bae07ab6b8 SHA512 40d07275a391df3e0a7a0c2705913c8120a548e223032dc39993f8f873c8d0639646cf728dc95f1400352a13766623ac6d69a1b1ff03183df6fabf32946dd7a6 WHIRLPOOL ed7ea6b1c1fd3570ea85b885f7455d8273cff2a9db2540c9e89faca867bd5eed2b4de52c7d21a96bb33ae0beedce113c68bb6c8cee4688650ff5169bd9c265fd
 DIST ruby-patches-2.1.10.tar.bz2 1931 SHA256 7e02c1b6a6352693bfd5828c9d1a7633a52baa57d8770df182ed0d8b450a3341 SHA512 85928207db4f76e58925e50d39d73db2d521674385ce3232828377e7d7bb4252aafb9f93d6045d4c159bf094b472af61ef9307203db313bf28918fe35e0f3a21 WHIRLPOOL 17a698b0a09be15f444ea34b33e9aa1d029fbd572c565072a92480bf7b6b21f1b6b88b0da3183a486bae30e7e65f3172cd72b7336be1dc5974b62bd8e2b9ef7a
-DIST ruby-patches-2.1.7-r1.tar.bz2 1931 SHA256 7e02c1b6a6352693bfd5828c9d1a7633a52baa57d8770df182ed0d8b450a3341 SHA512 85928207db4f76e58925e50d39d73db2d521674385ce3232828377e7d7bb4252aafb9f93d6045d4c159bf094b472af61ef9307203db313bf28918fe35e0f3a21 WHIRLPOOL 17a698b0a09be15f444ea34b33e9aa1d029fbd572c565072a92480bf7b6b21f1b6b88b0da3183a486bae30e7e65f3172cd72b7336be1dc5974b62bd8e2b9ef7a
 DIST ruby-patches-2.1.7.tar.bz2 1931 SHA256 7e02c1b6a6352693bfd5828c9d1a7633a52baa57d8770df182ed0d8b450a3341 SHA512 85928207db4f76e58925e50d39d73db2d521674385ce3232828377e7d7bb4252aafb9f93d6045d4c159bf094b472af61ef9307203db313bf28918fe35e0f3a21 WHIRLPOOL 17a698b0a09be15f444ea34b33e9aa1d029fbd572c565072a92480bf7b6b21f1b6b88b0da3183a486bae30e7e65f3172cd72b7336be1dc5974b62bd8e2b9ef7a
-DIST ruby-patches-2.1.8.tar.bz2 1931 SHA256 7e02c1b6a6352693bfd5828c9d1a7633a52baa57d8770df182ed0d8b450a3341 SHA512 85928207db4f76e58925e50d39d73db2d521674385ce3232828377e7d7bb4252aafb9f93d6045d4c159bf094b472af61ef9307203db313bf28918fe35e0f3a21 WHIRLPOOL 17a698b0a09be15f444ea34b33e9aa1d029fbd572c565072a92480bf7b6b21f1b6b88b0da3183a486bae30e7e65f3172cd72b7336be1dc5974b62bd8e2b9ef7a
 DIST ruby-patches-2.1.9.tar.bz2 1931 SHA256 7e02c1b6a6352693bfd5828c9d1a7633a52baa57d8770df182ed0d8b450a3341 SHA512 85928207db4f76e58925e50d39d73db2d521674385ce3232828377e7d7bb4252aafb9f93d6045d4c159bf094b472af61ef9307203db313bf28918fe35e0f3a21 WHIRLPOOL 17a698b0a09be15f444ea34b33e9aa1d029fbd572c565072a92480bf7b6b21f1b6b88b0da3183a486bae30e7e65f3172cd72b7336be1dc5974b62bd8e2b9ef7a
-DIST ruby-patches-2.2.2-r1.tar.bz2 3066 SHA256 65342c7cd5146f0d5025932d31e2ed40e1247355d68356e17a06b0ff728fbef1 SHA512 1c578b868db179bca6dd7800528ac23076b1f44519d93b92fafd724d8e5a158512b05cb3d5f7a4f5ada156692978f98cab7dd5b4282701e57c33d50bcda977de WHIRLPOOL 241622b25acdc8b2a7cb912bac2f6e29a4331798ba67507821b3fb295791d7bea8b7933540f2cd47cc7e8477df14be478286d018b7afe9ae121cd8c49c58dc83
-DIST ruby-patches-2.2.3-r1.tar.bz2 3143 SHA256 45ce438c31c62313f193546a883afe19ccb6dda3276d1378eb5dfd33bd7b8bbe SHA512 e5799b8008276d98f3cd1bd57b1b76a39d052a7c920d84ef245961c2db55e96e7b7081b71aa04843844786cdeee759eb415b46d8e44611d5ff8f658ad12be7bb WHIRLPOOL d9d6dd5562574c2597cbb81b9dbb15c345cad9096e24cc82515fd021882a4e7fa375f37e660b1ce2075ef66bc7582bae4d0c3e819713549dbe7c5c3d4c658ded
-DIST ruby-patches-2.2.3-r2.tar.bz2 3143 SHA256 45ce438c31c62313f193546a883afe19ccb6dda3276d1378eb5dfd33bd7b8bbe SHA512 e5799b8008276d98f3cd1bd57b1b76a39d052a7c920d84ef245961c2db55e96e7b7081b71aa04843844786cdeee759eb415b46d8e44611d5ff8f658ad12be7bb WHIRLPOOL d9d6dd5562574c2597cbb81b9dbb15c345cad9096e24cc82515fd021882a4e7fa375f37e660b1ce2075ef66bc7582bae4d0c3e819713549dbe7c5c3d4c658ded
-DIST ruby-patches-2.2.3.tar.bz2 2263 SHA256 a08bfaf193adf8e92e7937c9e8db3ec4a880e80dd9c99a5621a00a9233d4d2cd SHA512 dafbb40254d9703a7ed66314f6d9d0dd4c88485a5cef28ff1e3c7020c28cfaac1561ecfb72a465811b59213dbaf9aece6b52240ae895e47f5be63d7f88bc5543 WHIRLPOOL 54b91871b991d38cd4c573884389aaa4ee81afc14fd918e968f0b82df95264930d71199741be820c816998ca9134c496a028e13d00b93cae3c870981f28c2160
-DIST ruby-patches-2.2.4.tar.bz2 3143 SHA256 45ce438c31c62313f193546a883afe19ccb6dda3276d1378eb5dfd33bd7b8bbe SHA512 e5799b8008276d98f3cd1bd57b1b76a39d052a7c920d84ef245961c2db55e96e7b7081b71aa04843844786cdeee759eb415b46d8e44611d5ff8f658ad12be7bb WHIRLPOOL d9d6dd5562574c2597cbb81b9dbb15c345cad9096e24cc82515fd021882a4e7fa375f37e660b1ce2075ef66bc7582bae4d0c3e819713549dbe7c5c3d4c658ded
 DIST ruby-patches-2.2.5.tar.bz2 2272 SHA256 f54373704ce8df732490e8d1e7e35188503faacc5278fe0ab0d8c07bdc762fed SHA512 ed8bff8f730ccb114e62784d29541f276b2821d9eb121a9772dc4aabc139b688f2b14f5f27710098a8cd751c62d31b46170b427ad54dc4f6490c003450ae1583 WHIRLPOOL 8598c9284252c1e7cc9f9019c5f468ce5ab8b4ae013e71c631cd00cc8bfde068b041f1bc6851bb2962982a1e46cbde0ddc51c186ea41638a7881c587c658e603
 DIST ruby-patches-2.3.0.tar.bz2 2223 SHA256 f0a803173564368e5cf31162e1dba901c46640f9e861255f6cbe14256d18f3eb SHA512 bb47000e516017c1fedf7c5313b0628fa734030e69bd0fed1c06a38dd115b8c50837e3dd917f272e24abf5609c4c12793ae4570bfd7d6210290785bf2f8287bd WHIRLPOOL 0b0d4dcf7df4ff3ff11610bfe7a7b29ed621b45b412cb7618a6572f98a568ac67419bd852b193cfc3aa0968382cf9400a578511e9e8fb8b2125bc876e733bd64
 DIST ruby-patches-2.3.1.tar.bz2 2223 SHA256 f0a803173564368e5cf31162e1dba901c46640f9e861255f6cbe14256d18f3eb SHA512 bb47000e516017c1fedf7c5313b0628fa734030e69bd0fed1c06a38dd115b8c50837e3dd917f272e24abf5609c4c12793ae4570bfd7d6210290785bf2f8287bd WHIRLPOOL 0b0d4dcf7df4ff3ff11610bfe7a7b29ed621b45b412cb7618a6572f98a568ac67419bd852b193cfc3aa0968382cf9400a578511e9e8fb8b2125bc876e733bd64
--- a/dev-lang/ruby/ruby-2.1.7-r1.ebuild
+++ b/dev-lang/ruby/ruby-2.1.7-r1.ebuild
@ -1,230 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-#PATCHSET=1
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-RUBYPL=$(get_version_component_range 4)
-
-MY_P="${PN}-$(get_version_component_range 1-3)"
-#MY_P="${PN}-$(get_version_component_range 1-3)-${RUBYPL:-0}"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
-RUBYVERSION=2.1.0
-
-if [[ -n ${PATCHSET} ]]; then
-	if [[ ${PVR} == ${PV} ]]; then
-		PATCHSET="${PV}-r0.${PATCHSET}"
-	else
-		PATCHSET="${PVR}.${PATCHSET}"
-	fi
-else
-	PATCHSET="${PVR}"
-fi
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/2.1/${MY_P}.tar.xz
-		 https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl xemacs ncurses +readline"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( sys-libs/gdbm )
-	ssl? ( dev-libs/openssl:0 )
-	socks5? ( >=net-proxy/dante-1.1.13 )
-	ncurses? ( sys-libs/ncurses:0= )
-	readline?  ( sys-libs/readline:0 )
-	dev-libs/libyaml
-	virtual/libffi
-	sys-libs/zlib
-	>=app-eselect/eselect-ruby-20131227
-	!<dev-ruby/rdoc-3.9.4
-	!<dev-ruby/rubygems-1.8.10-r1"
-
-DEPEND="${RDEPEND}"
-PDEPEND="
-	virtual/rubygems[ruby_targets_ruby21]
-	>=dev-ruby/json-1.8.1[ruby_targets_ruby21]
-	>=dev-ruby/rake-0.9.6[ruby_targets_ruby21]
-	rdoc? ( >=dev-ruby/rdoc-4.0.1[ruby_targets_ruby21] )
-	xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
-		epatch "${WORKDIR}/patches"
-
-	# We can no longer unbundle all of rake because rubygems now depends
-	# on this. We leave the actual rake code around to bootstrap
-	# rubygems, but remove the bits that would cause a file collision.
-	einfo "Unbundling gems..."
-	cd "$S"
-	rm -r \
-		{bin,lib}/rake lib/rake.rb man/rake.1 \
-		bin/gem || die "removal failed"
-
-	# Fix a hardcoded lib path in configure script
-	sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
-		configure.in || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=
-
-	# The Tk module can no longer be built because the module code is no
-	# longer compatible with newer stable versions.
-	# https://bugs.gentoo.org/show_bug.cgi?id=500894
-	local modules="tk"
-
-	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
-	filter-flags -fomit-frame-pointer
-	# In many places aliasing rules are broken; play it safe
-	# as it's risky with newer compilers to leave it as it is.
-	append-flags -fno-strict-aliasing
-	# SuperH needs this
-	use sh && append-flags -mieee
-
-	# Socks support via dante
-	if use socks5 ; then
-		# Socks support can't be disabled as long as SOCKS_SERVER is
-		# set and socks library is present, so need to unset
-		# SOCKS_SERVER in that case.
-		unset SOCKS_SERVER
-	fi
-
-	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
-	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
-		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
-	fi
-
-	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
-	# Determine which modules *not* to build depending in the USE flags.
-	if ! use readline ; then
-		modules="${modules},readline"
-	fi
-	if ! use berkdb ; then
-		modules="${modules},dbm"
-	fi
-	if ! use gdbm ; then
-		modules="${modules},gdbm"
-	fi
-	if ! use ssl ; then
-		modules="${modules},openssl"
-	fi
-	if ! use ncurses ; then
-		modules="${modules},curses"
-	fi
-
-	# Provide an empty LIBPATHENV because we disable rpath but we do not
-	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
-	# #564272
-	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
-		--program-suffix=${MY_SUFFIX} \
-		--with-soname=ruby${MY_SUFFIX} \
-		--docdir=${EPREFIX}/usr/share/doc/${P} \
-		--enable-shared \
-		--enable-pthread \
-		--disable-rpath \
-		--with-out-ext="${modules}" \
-		$(use_enable socks5 socks) \
-		$(use_enable doc install-doc) \
-		--enable-ipv6 \
-		$(use_enable debug) \
-		${myconf} \
-		--enable-option-checking=no \
-		|| die "econf failed"
-}
-
-src_compile() {
-	emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
-	emake -j1 V=1 test || die "make test failed"
-
-	elog "Ruby's make test has been run. Ruby also ships with a make check"
-	elog "that cannot be run until after ruby has been installed."
-	elog
-	if use rubytests; then
-		elog "You have enabled rubytests, so they will be installed to"
-		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
-		elog "than root, and you must place them into a writeable directory."
-		elog "Then call: "
-		elog
-		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
-	else
-		elog "Enable the rubytests USE flag to install the make check tests"
-	fi
-}
-
-src_install() {
-	# Remove the remaining bundled gems. We do this late in the process
-	# since they are used during the build to e.g. create the
-	# documentation.
-	rm -rf ext/json || die
-
-	# Ruby is involved in the install process, we don't want interference here.
-	unset RUBYOPT
-
-	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
-	LD_LIBRARY_PATH="${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
-	for d in $(find "${S}/ext" -type d) ; do
-		RUBYLIB="${RUBYLIB}:$d"
-	done
-	export LD_LIBRARY_PATH RUBYLIB
-
-	emake V=1 DESTDIR="${D}" install || die "make install failed"
-
-	# Remove installed rubygems copy
-	rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
-	rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
-	rm -r "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
-
-	if use doc; then
-		make DESTDIR="${D}" install-doc || die "make install-doc failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r sample
-	fi
-
-	dodoc ChangeLog NEWS doc/NEWS* README* || die
-
-	if use rubytests; then
-		pushd test
-		insinto /usr/share/${PN}-${SLOT}/test
-		doins -r .
-		popd
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
-		eselect ruby set ruby${MY_SUFFIX}
-	fi
-
-	elog
-	elog "To switch between available Ruby profiles, execute as root:"
-	elog "\teselect ruby set ruby(19|20|...)"
-	elog
-}
-
-pkg_postrm() {
-	eselect ruby cleanup
-}
--- a/dev-lang/ruby/ruby-2.1.8.ebuild
+++ b/dev-lang/ruby/ruby-2.1.8.ebuild
@ -1,230 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-#PATCHSET=1
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-RUBYPL=$(get_version_component_range 4)
-
-MY_P="${PN}-$(get_version_component_range 1-3)"
-#MY_P="${PN}-$(get_version_component_range 1-3)-${RUBYPL:-0}"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
-RUBYVERSION=2.1.0
-
-if [[ -n ${PATCHSET} ]]; then
-	if [[ ${PVR} == ${PV} ]]; then
-		PATCHSET="${PV}-r0.${PATCHSET}"
-	else
-		PATCHSET="${PVR}.${PATCHSET}"
-	fi
-else
-	PATCHSET="${PVR}"
-fi
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/2.1/${MY_P}.tar.xz
-		 https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl xemacs ncurses +readline"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( sys-libs/gdbm )
-	ssl? ( dev-libs/openssl:0 )
-	socks5? ( >=net-proxy/dante-1.1.13 )
-	ncurses? ( sys-libs/ncurses:0= )
-	readline?  ( sys-libs/readline:0 )
-	dev-libs/libyaml
-	virtual/libffi
-	sys-libs/zlib
-	>=app-eselect/eselect-ruby-20131227
-	!<dev-ruby/rdoc-3.9.4
-	!<dev-ruby/rubygems-1.8.10-r1"
-
-DEPEND="${RDEPEND}"
-PDEPEND="
-	virtual/rubygems[ruby_targets_ruby21]
-	>=dev-ruby/json-1.8.1[ruby_targets_ruby21]
-	>=dev-ruby/rake-0.9.6[ruby_targets_ruby21]
-	rdoc? ( >=dev-ruby/rdoc-4.0.1[ruby_targets_ruby21] )
-	xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
-		epatch "${WORKDIR}/patches"
-
-	# We can no longer unbundle all of rake because rubygems now depends
-	# on this. We leave the actual rake code around to bootstrap
-	# rubygems, but remove the bits that would cause a file collision.
-	einfo "Unbundling gems..."
-	cd "$S"
-	rm -r \
-		{bin,lib}/rake lib/rake.rb man/rake.1 \
-		bin/gem || die "removal failed"
-
-	# Fix a hardcoded lib path in configure script
-	sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
-		configure.in || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=
-
-	# The Tk module can no longer be built because the module code is no
-	# longer compatible with newer stable versions.
-	# https://bugs.gentoo.org/show_bug.cgi?id=500894
-	local modules="tk"
-
-	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
-	filter-flags -fomit-frame-pointer
-	# In many places aliasing rules are broken; play it safe
-	# as it's risky with newer compilers to leave it as it is.
-	append-flags -fno-strict-aliasing
-	# SuperH needs this
-	use sh && append-flags -mieee
-
-	# Socks support via dante
-	if use socks5 ; then
-		# Socks support can't be disabled as long as SOCKS_SERVER is
-		# set and socks library is present, so need to unset
-		# SOCKS_SERVER in that case.
-		unset SOCKS_SERVER
-	fi
-
-	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
-	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
-		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
-	fi
-
-	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
-	# Determine which modules *not* to build depending in the USE flags.
-	if ! use readline ; then
-		modules="${modules},readline"
-	fi
-	if ! use berkdb ; then
-		modules="${modules},dbm"
-	fi
-	if ! use gdbm ; then
-		modules="${modules},gdbm"
-	fi
-	if ! use ssl ; then
-		modules="${modules},openssl"
-	fi
-	if ! use ncurses ; then
-		modules="${modules},curses"
-	fi
-
-	# Provide an empty LIBPATHENV because we disable rpath but we do not
-	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
-	# #564272
-	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
-		--program-suffix=${MY_SUFFIX} \
-		--with-soname=ruby${MY_SUFFIX} \
-		--docdir=${EPREFIX}/usr/share/doc/${P} \
-		--enable-shared \
-		--enable-pthread \
-		--disable-rpath \
-		--with-out-ext="${modules}" \
-		$(use_enable socks5 socks) \
-		$(use_enable doc install-doc) \
-		--enable-ipv6 \
-		$(use_enable debug) \
-		${myconf} \
-		--enable-option-checking=no \
-		|| die "econf failed"
-}
-
-src_compile() {
-	emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
-	emake -j1 V=1 test || die "make test failed"
-
-	elog "Ruby's make test has been run. Ruby also ships with a make check"
-	elog "that cannot be run until after ruby has been installed."
-	elog
-	if use rubytests; then
-		elog "You have enabled rubytests, so they will be installed to"
-		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
-		elog "than root, and you must place them into a writeable directory."
-		elog "Then call: "
-		elog
-		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
-	else
-		elog "Enable the rubytests USE flag to install the make check tests"
-	fi
-}
-
-src_install() {
-	# Remove the remaining bundled gems. We do this late in the process
-	# since they are used during the build to e.g. create the
-	# documentation.
-	rm -rf ext/json || die
-
-	# Ruby is involved in the install process, we don't want interference here.
-	unset RUBYOPT
-
-	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
-	LD_LIBRARY_PATH="${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
-	for d in $(find "${S}/ext" -type d) ; do
-		RUBYLIB="${RUBYLIB}:$d"
-	done
-	export LD_LIBRARY_PATH RUBYLIB
-
-	emake V=1 DESTDIR="${D}" install || die "make install failed"
-
-	# Remove installed rubygems copy
-	rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
-	rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
-	rm -r "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
-
-	if use doc; then
-		make DESTDIR="${D}" install-doc || die "make install-doc failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r sample
-	fi
-
-	dodoc ChangeLog NEWS doc/NEWS* README* || die
-
-	if use rubytests; then
-		pushd test
-		insinto /usr/share/${PN}-${SLOT}/test
-		doins -r .
-		popd
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
-		eselect ruby set ruby${MY_SUFFIX}
-	fi
-
-	elog
-	elog "To switch between available Ruby profiles, execute as root:"
-	elog "\teselect ruby set ruby(19|20|...)"
-	elog
-}
-
-pkg_postrm() {
-	eselect ruby cleanup
-}
--- a/dev-lang/ruby/ruby-2.2.2-r1.ebuild
+++ b/dev-lang/ruby/ruby-2.2.2-r1.ebuild
@ -1,238 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-#PATCHSET=1
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-MY_P="${PN}-$(get_version_component_range 1-3)"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
-RUBYVERSION=2.2.0
-
-if [[ -n ${PATCHSET} ]]; then
-	if [[ ${PVR} == ${PV} ]]; then
-		PATCHSET="${PV}-r0.${PATCHSET}"
-	else
-		PATCHSET="${PVR}.${PATCHSET}"
-	fi
-else
-	PATCHSET="${PVR}"
-fi
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/2.2/${MY_P}.tar.xz
-		 https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc +rdoc rubytests socks5 ssl xemacs ncurses +readline"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( sys-libs/gdbm )
-	jemalloc? ( dev-libs/jemalloc )
-	ssl? ( dev-libs/openssl:0 )
-	socks5? ( >=net-proxy/dante-1.1.13 )
-	ncurses? ( sys-libs/ncurses:0= )
-	readline?  ( sys-libs/readline:0 )
-	dev-libs/libyaml
-	virtual/libffi
-	sys-libs/zlib
-	>=app-eselect/eselect-ruby-20141227
-	!<dev-ruby/rdoc-3.9.4
-	!<dev-ruby/rubygems-1.8.10-r1"
-
-DEPEND="${RDEPEND}"
-
-BUNDLED_GEMS="
-	>=dev-ruby/minitest-5.4.3[ruby_targets_ruby22]
-	>=dev-ruby/power_assert-0.2.2[ruby_targets_ruby22]
-	>=dev-ruby/test-unit-3.0.8[ruby_targets_ruby22]
-"
-
-PDEPEND="
-	${BUNDLED_GEMS}
-	virtual/rubygems[ruby_targets_ruby22]
-	>=dev-ruby/json-1.8.1[ruby_targets_ruby22]
-	>=dev-ruby/rake-0.9.6[ruby_targets_ruby22]
-	rdoc? ( >=dev-ruby/rdoc-4.0.1[ruby_targets_ruby22] )
-	xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
-		epatch "${WORKDIR}/patches"
-
-	# We can no longer unbundle all of rake because rubygems now depends
-	# on this. We leave the actual rake code around to bootstrap
-	# rubygems, but remove the bits that would cause a file collision.
-	einfo "Unbundling gems..."
-	cd "$S"
-	rm -r \
-		{bin,lib}/rake lib/rake.rb man/rake.1 \
-		bin/gem || die "removal failed"
-	# Remove bundled gems that we will install via PDEPEND, bug
-	# 539700. Use explicit version numbers to ensure rm fails when they
-	# change so we can update dependencies accordingly.
-	rm gems/{minitest-5.4.3,power_assert-0.2.2,test-unit-3.0.8}.gem || die
-
-	# Fix a hardcoded lib path in configure script
-	sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
-		configure.in || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=
-
-	# The Tk module can no longer be built because the module code is no
-	# longer compatible with newer stable versions.
-	# https://bugs.gentoo.org/show_bug.cgi?id=500894
-	local modules="tk"
-
-	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
-	filter-flags -fomit-frame-pointer
-	# In many places aliasing rules are broken; play it safe
-	# as it's risky with newer compilers to leave it as it is.
-	append-flags -fno-strict-aliasing
-	# SuperH needs this
-	use sh && append-flags -mieee
-
-	# Socks support via dante
-	if use socks5 ; then
-		# Socks support can't be disabled as long as SOCKS_SERVER is
-		# set and socks library is present, so need to unset
-		# SOCKS_SERVER in that case.
-		unset SOCKS_SERVER
-	fi
-
-	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
-	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
-		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
-	fi
-
-	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
-	# Determine which modules *not* to build depending in the USE flags.
-	if ! use readline ; then
-		modules="${modules},readline"
-	fi
-	if ! use berkdb ; then
-		modules="${modules},dbm"
-	fi
-	if ! use gdbm ; then
-		modules="${modules},gdbm"
-	fi
-	if ! use ssl ; then
-		modules="${modules},openssl"
-	fi
-	if ! use ncurses ; then
-		modules="${modules},curses"
-	fi
-
-	INSTALL="${EPREFIX}/usr/bin/install -c" econf \
-		--program-suffix=${MY_SUFFIX} \
-		--with-soname=ruby${MY_SUFFIX} \
-		--docdir=${EPREFIX}/usr/share/doc/${P} \
-		--enable-shared \
-		--enable-pthread \
-		--disable-rpath \
-		--with-out-ext="${modules}" \
-		$(use_enable jemalloc jemalloc) \
-		$(use_enable socks5 socks) \
-		$(use_enable doc install-doc) \
-		--enable-ipv6 \
-		$(use_enable debug) \
-		${myconf} \
-		--enable-option-checking=no \
-		|| die "econf failed"
-}
-
-src_compile() {
-	emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
-	emake -j1 V=1 test || die "make test failed"
-
-	elog "Ruby's make test has been run. Ruby also ships with a make check"
-	elog "that cannot be run until after ruby has been installed."
-	elog
-	if use rubytests; then
-		elog "You have enabled rubytests, so they will be installed to"
-		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
-		elog "than root, and you must place them into a writeable directory."
-		elog "Then call: "
-		elog
-		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
-	else
-		elog "Enable the rubytests USE flag to install the make check tests"
-	fi
-}
-
-src_install() {
-	# Remove the remaining bundled gems. We do this late in the process
-	# since they are used during the build to e.g. create the
-	# documentation.
-	rm -rf ext/json || die
-
-	# Ruby is involved in the install process, we don't want interference here.
-	unset RUBYOPT
-
-	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
-	LD_LIBRARY_PATH="${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
-	for d in $(find "${S}/ext" -type d) ; do
-		RUBYLIB="${RUBYLIB}:$d"
-	done
-	export LD_LIBRARY_PATH RUBYLIB
-
-	emake V=1 DESTDIR="${D}" install || die "make install failed"
-
-	# Remove installed rubygems copy
-	rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
-	rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
-	rm -r "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
-
-	if use doc; then
-		make DESTDIR="${D}" install-doc || die "make install-doc failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r sample
-	fi
-
-	dodoc ChangeLog NEWS doc/NEWS* README* || die
-
-	if use rubytests; then
-		pushd test
-		insinto /usr/share/${PN}-${SLOT}/test
-		doins -r .
-		popd
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
-		eselect ruby set ruby${MY_SUFFIX}
-	fi
-
-	elog
-	elog "To switch between available Ruby profiles, execute as root:"
-	elog "\teselect ruby set ruby(19|20|...)"
-	elog
-}
-
-pkg_postrm() {
-	eselect ruby cleanup
-}
--- a/dev-lang/ruby/ruby-2.2.3-r1.ebuild
+++ b/dev-lang/ruby/ruby-2.2.3-r1.ebuild
@ -1,241 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-#PATCHSET=1
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-MY_P="${PN}-$(get_version_component_range 1-3)"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
-RUBYVERSION=2.2.0
-
-if [[ -n ${PATCHSET} ]]; then
-	if [[ ${PVR} == ${PV} ]]; then
-		PATCHSET="${PV}-r0.${PATCHSET}"
-	else
-		PATCHSET="${PVR}.${PATCHSET}"
-	fi
-else
-	PATCHSET="${PVR}"
-fi
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/2.2/${MY_P}.tar.xz
-		 https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl xemacs ncurses +readline"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( sys-libs/gdbm )
-	jemalloc? ( dev-libs/jemalloc )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	socks5? ( >=net-proxy/dante-1.1.13 )
-	ncurses? ( sys-libs/ncurses:0= )
-	readline?  ( sys-libs/readline:0 )
-	dev-libs/libyaml
-	virtual/libffi
-	sys-libs/zlib
-	>=app-eselect/eselect-ruby-20141227
-	!<dev-ruby/rdoc-3.9.4
-	!<dev-ruby/rubygems-1.8.10-r1"
-
-DEPEND="${RDEPEND}"
-
-BUNDLED_GEMS="
-	>=dev-ruby/minitest-5.4.3[ruby_targets_ruby22]
-	>=dev-ruby/power_assert-0.2.2[ruby_targets_ruby22]
-	>=dev-ruby/test-unit-3.0.8[ruby_targets_ruby22]
-"
-
-PDEPEND="
-	${BUNDLED_GEMS}
-	virtual/rubygems[ruby_targets_ruby22]
-	>=dev-ruby/json-1.8.1[ruby_targets_ruby22]
-	>=dev-ruby/rake-0.9.6[ruby_targets_ruby22]
-	rdoc? ( >=dev-ruby/rdoc-4.0.1[ruby_targets_ruby22] )
-	xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
-		epatch "${WORKDIR}/patches"
-
-	# We can no longer unbundle all of rake because rubygems now depends
-	# on this. We leave the actual rake code around to bootstrap
-	# rubygems, but remove the bits that would cause a file collision.
-	einfo "Unbundling gems..."
-	cd "$S"
-	rm -r \
-		{bin,lib}/rake lib/rake.rb man/rake.1 \
-		bin/gem || die "removal failed"
-	# Remove bundled gems that we will install via PDEPEND, bug
-	# 539700. Use explicit version numbers to ensure rm fails when they
-	# change so we can update dependencies accordingly.
-	rm gems/{minitest-5.4.3,power_assert-0.2.2,test-unit-3.0.8}.gem || die
-
-	# Fix a hardcoded lib path in configure script
-	sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
-		configure.in || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=
-
-	# The Tk module can no longer be built because the module code is no
-	# longer compatible with newer stable versions.
-	# https://bugs.gentoo.org/show_bug.cgi?id=500894
-	local modules="tk"
-
-	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
-	filter-flags -fomit-frame-pointer
-	# In many places aliasing rules are broken; play it safe
-	# as it's risky with newer compilers to leave it as it is.
-	append-flags -fno-strict-aliasing
-	# SuperH needs this
-	use sh && append-flags -mieee
-
-	# Socks support via dante
-	if use socks5 ; then
-		# Socks support can't be disabled as long as SOCKS_SERVER is
-		# set and socks library is present, so need to unset
-		# SOCKS_SERVER in that case.
-		unset SOCKS_SERVER
-	fi
-
-	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
-	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
-		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
-	fi
-
-	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
-	# Determine which modules *not* to build depending in the USE flags.
-	if ! use readline ; then
-		modules="${modules},readline"
-	fi
-	if ! use berkdb ; then
-		modules="${modules},dbm"
-	fi
-	if ! use gdbm ; then
-		modules="${modules},gdbm"
-	fi
-	if ! use ssl ; then
-		modules="${modules},openssl"
-	fi
-	if ! use ncurses ; then
-		modules="${modules},curses"
-	fi
-
-	INSTALL="${EPREFIX}/usr/bin/install -c" econf \
-		--program-suffix=${MY_SUFFIX} \
-		--with-soname=ruby${MY_SUFFIX} \
-		--docdir=${EPREFIX}/usr/share/doc/${P} \
-		--enable-shared \
-		--enable-pthread \
-		--disable-rpath \
-		--with-out-ext="${modules}" \
-		$(use_enable jemalloc jemalloc) \
-		$(use_enable socks5 socks) \
-		$(use_enable doc install-doc) \
-		--enable-ipv6 \
-		$(use_enable debug) \
-		${myconf} \
-		--enable-option-checking=no \
-		|| die "econf failed"
-}
-
-src_compile() {
-	emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
-	emake -j1 V=1 test || die "make test failed"
-
-	elog "Ruby's make test has been run. Ruby also ships with a make check"
-	elog "that cannot be run until after ruby has been installed."
-	elog
-	if use rubytests; then
-		elog "You have enabled rubytests, so they will be installed to"
-		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
-		elog "than root, and you must place them into a writeable directory."
-		elog "Then call: "
-		elog
-		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
-	else
-		elog "Enable the rubytests USE flag to install the make check tests"
-	fi
-}
-
-src_install() {
-	# Remove the remaining bundled gems. We do this late in the process
-	# since they are used during the build to e.g. create the
-	# documentation.
-	rm -rf ext/json || die
-
-	# Ruby is involved in the install process, we don't want interference here.
-	unset RUBYOPT
-
-	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
-	LD_LIBRARY_PATH="${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
-	for d in $(find "${S}/ext" -type d) ; do
-		RUBYLIB="${RUBYLIB}:$d"
-	done
-	export LD_LIBRARY_PATH RUBYLIB
-
-	emake V=1 DESTDIR="${D}" install || die "make install failed"
-
-	# Remove installed rubygems copy
-	rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
-	rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
-	rm -r "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
-
-	if use doc; then
-		make DESTDIR="${D}" install-doc || die "make install-doc failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r sample
-	fi
-
-	dodoc ChangeLog NEWS doc/NEWS* README* || die
-
-	if use rubytests; then
-		pushd test
-		insinto /usr/share/${PN}-${SLOT}/test
-		doins -r .
-		popd
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
-		eselect ruby set ruby${MY_SUFFIX}
-	fi
-
-	elog
-	elog "To switch between available Ruby profiles, execute as root:"
-	elog "\teselect ruby set ruby(19|20|...)"
-	elog
-}
-
-pkg_postrm() {
-	eselect ruby cleanup
-}
--- a/dev-lang/ruby/ruby-2.2.3-r2.ebuild
+++ b/dev-lang/ruby/ruby-2.2.3-r2.ebuild
@ -1,244 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-#PATCHSET=1
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-MY_P="${PN}-$(get_version_component_range 1-3)"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
-RUBYVERSION=2.2.0
-
-if [[ -n ${PATCHSET} ]]; then
-	if [[ ${PVR} == ${PV} ]]; then
-		PATCHSET="${PV}-r0.${PATCHSET}"
-	else
-		PATCHSET="${PVR}.${PATCHSET}"
-	fi
-else
-	PATCHSET="${PVR}"
-fi
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/2.2/${MY_P}.tar.xz
-		 https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl xemacs ncurses +readline"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( sys-libs/gdbm )
-	jemalloc? ( dev-libs/jemalloc )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	socks5? ( >=net-proxy/dante-1.1.13 )
-	ncurses? ( sys-libs/ncurses:0= )
-	readline?  ( sys-libs/readline:0 )
-	dev-libs/libyaml
-	virtual/libffi
-	sys-libs/zlib
-	>=app-eselect/eselect-ruby-20141227
-	!<dev-ruby/rdoc-3.9.4
-	!<dev-ruby/rubygems-1.8.10-r1"
-
-DEPEND="${RDEPEND}"
-
-BUNDLED_GEMS="
-	>=dev-ruby/minitest-5.4.3[ruby_targets_ruby22]
-	>=dev-ruby/power_assert-0.2.2[ruby_targets_ruby22]
-	>=dev-ruby/test-unit-3.0.8[ruby_targets_ruby22]
-"
-
-PDEPEND="
-	${BUNDLED_GEMS}
-	virtual/rubygems[ruby_targets_ruby22]
-	>=dev-ruby/json-1.8.1[ruby_targets_ruby22]
-	>=dev-ruby/rake-0.9.6[ruby_targets_ruby22]
-	rdoc? ( >=dev-ruby/rdoc-4.0.1[ruby_targets_ruby22] )
-	xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
-		epatch "${WORKDIR}/patches"
-
-	# We can no longer unbundle all of rake because rubygems now depends
-	# on this. We leave the actual rake code around to bootstrap
-	# rubygems, but remove the bits that would cause a file collision.
-	einfo "Unbundling gems..."
-	cd "$S"
-	rm -r \
-		{bin,lib}/rake lib/rake.rb man/rake.1 \
-		bin/gem || die "removal failed"
-	# Remove bundled gems that we will install via PDEPEND, bug
-	# 539700. Use explicit version numbers to ensure rm fails when they
-	# change so we can update dependencies accordingly.
-	rm gems/{minitest-5.4.3,power_assert-0.2.2,test-unit-3.0.8}.gem || die
-
-	# Fix a hardcoded lib path in configure script
-	sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
-		configure.in || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=
-
-	# The Tk module can no longer be built because the module code is no
-	# longer compatible with newer stable versions.
-	# https://bugs.gentoo.org/show_bug.cgi?id=500894
-	local modules="tk"
-
-	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
-	filter-flags -fomit-frame-pointer
-	# In many places aliasing rules are broken; play it safe
-	# as it's risky with newer compilers to leave it as it is.
-	append-flags -fno-strict-aliasing
-	# SuperH needs this
-	use sh && append-flags -mieee
-
-	# Socks support via dante
-	if use socks5 ; then
-		# Socks support can't be disabled as long as SOCKS_SERVER is
-		# set and socks library is present, so need to unset
-		# SOCKS_SERVER in that case.
-		unset SOCKS_SERVER
-	fi
-
-	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
-	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
-		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
-	fi
-
-	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
-	# Determine which modules *not* to build depending in the USE flags.
-	if ! use readline ; then
-		modules="${modules},readline"
-	fi
-	if ! use berkdb ; then
-		modules="${modules},dbm"
-	fi
-	if ! use gdbm ; then
-		modules="${modules},gdbm"
-	fi
-	if ! use ssl ; then
-		modules="${modules},openssl"
-	fi
-	if ! use ncurses ; then
-		modules="${modules},curses"
-	fi
-
-	# Provide an empty LIBPATHENV because we disable rpath but we do not
-	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
-	# #564272
-	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
-		--program-suffix=${MY_SUFFIX} \
-		--with-soname=ruby${MY_SUFFIX} \
-		--docdir=${EPREFIX}/usr/share/doc/${P} \
-		--enable-shared \
-		--enable-pthread \
-		--disable-rpath \
-		--with-out-ext="${modules}" \
-		$(use_enable jemalloc jemalloc) \
-		$(use_enable socks5 socks) \
-		$(use_enable doc install-doc) \
-		--enable-ipv6 \
-		$(use_enable debug) \
-		${myconf} \
-		--enable-option-checking=no \
-		|| die "econf failed"
-}
-
-src_compile() {
-	emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
-	emake -j1 V=1 test || die "make test failed"
-
-	elog "Ruby's make test has been run. Ruby also ships with a make check"
-	elog "that cannot be run until after ruby has been installed."
-	elog
-	if use rubytests; then
-		elog "You have enabled rubytests, so they will be installed to"
-		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
-		elog "than root, and you must place them into a writeable directory."
-		elog "Then call: "
-		elog
-		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
-	else
-		elog "Enable the rubytests USE flag to install the make check tests"
-	fi
-}
-
-src_install() {
-	# Remove the remaining bundled gems. We do this late in the process
-	# since they are used during the build to e.g. create the
-	# documentation.
-	rm -rf ext/json || die
-
-	# Ruby is involved in the install process, we don't want interference here.
-	unset RUBYOPT
-
-	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
-	LD_LIBRARY_PATH="${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
-	for d in $(find "${S}/ext" -type d) ; do
-		RUBYLIB="${RUBYLIB}:$d"
-	done
-	export LD_LIBRARY_PATH RUBYLIB
-
-	emake V=1 DESTDIR="${D}" install || die "make install failed"
-
-	# Remove installed rubygems copy
-	rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
-	rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
-	rm -r "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
-
-	if use doc; then
-		make DESTDIR="${D}" install-doc || die "make install-doc failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r sample
-	fi
-
-	dodoc ChangeLog NEWS doc/NEWS* README* || die
-
-	if use rubytests; then
-		pushd test
-		insinto /usr/share/${PN}-${SLOT}/test
-		doins -r .
-		popd
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
-		eselect ruby set ruby${MY_SUFFIX}
-	fi
-
-	elog
-	elog "To switch between available Ruby profiles, execute as root:"
-	elog "\teselect ruby set ruby(19|20|...)"
-	elog
-}
-
-pkg_postrm() {
-	eselect ruby cleanup
-}
--- a/dev-lang/ruby/ruby-2.2.3.ebuild
+++ b/dev-lang/ruby/ruby-2.2.3.ebuild
@ -1,238 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-#PATCHSET=1
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-MY_P="${PN}-$(get_version_component_range 1-3)"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
-RUBYVERSION=2.2.0
-
-if [[ -n ${PATCHSET} ]]; then
-	if [[ ${PVR} == ${PV} ]]; then
-		PATCHSET="${PV}-r0.${PATCHSET}"
-	else
-		PATCHSET="${PVR}.${PATCHSET}"
-	fi
-else
-	PATCHSET="${PVR}"
-fi
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/2.2/${MY_P}.tar.xz
-		 https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc +rdoc rubytests socks5 ssl xemacs ncurses +readline"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( sys-libs/gdbm )
-	jemalloc? ( dev-libs/jemalloc )
-	ssl? ( dev-libs/openssl:0 )
-	socks5? ( >=net-proxy/dante-1.1.13 )
-	ncurses? ( sys-libs/ncurses:0= )
-	readline?  ( sys-libs/readline:0 )
-	dev-libs/libyaml
-	virtual/libffi
-	sys-libs/zlib
-	>=app-eselect/eselect-ruby-20141227
-	!<dev-ruby/rdoc-3.9.4
-	!<dev-ruby/rubygems-1.8.10-r1"
-
-DEPEND="${RDEPEND}"
-
-BUNDLED_GEMS="
-	>=dev-ruby/minitest-5.4.3[ruby_targets_ruby22]
-	>=dev-ruby/power_assert-0.2.2[ruby_targets_ruby22]
-	>=dev-ruby/test-unit-3.0.8[ruby_targets_ruby22]
-"
-
-PDEPEND="
-	${BUNDLED_GEMS}
-	virtual/rubygems[ruby_targets_ruby22]
-	>=dev-ruby/json-1.8.1[ruby_targets_ruby22]
-	>=dev-ruby/rake-0.9.6[ruby_targets_ruby22]
-	rdoc? ( >=dev-ruby/rdoc-4.0.1[ruby_targets_ruby22] )
-	xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
-		epatch "${WORKDIR}/patches"
-
-	# We can no longer unbundle all of rake because rubygems now depends
-	# on this. We leave the actual rake code around to bootstrap
-	# rubygems, but remove the bits that would cause a file collision.
-	einfo "Unbundling gems..."
-	cd "$S"
-	rm -r \
-		{bin,lib}/rake lib/rake.rb man/rake.1 \
-		bin/gem || die "removal failed"
-	# Remove bundled gems that we will install via PDEPEND, bug
-	# 539700. Use explicit version numbers to ensure rm fails when they
-	# change so we can update dependencies accordingly.
-	rm gems/{minitest-5.4.3,power_assert-0.2.2,test-unit-3.0.8}.gem || die
-
-	# Fix a hardcoded lib path in configure script
-	sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
-		configure.in || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=
-
-	# The Tk module can no longer be built because the module code is no
-	# longer compatible with newer stable versions.
-	# https://bugs.gentoo.org/show_bug.cgi?id=500894
-	local modules="tk"
-
-	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
-	filter-flags -fomit-frame-pointer
-	# In many places aliasing rules are broken; play it safe
-	# as it's risky with newer compilers to leave it as it is.
-	append-flags -fno-strict-aliasing
-	# SuperH needs this
-	use sh && append-flags -mieee
-
-	# Socks support via dante
-	if use socks5 ; then
-		# Socks support can't be disabled as long as SOCKS_SERVER is
-		# set and socks library is present, so need to unset
-		# SOCKS_SERVER in that case.
-		unset SOCKS_SERVER
-	fi
-
-	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
-	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
-		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
-	fi
-
-	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
-	# Determine which modules *not* to build depending in the USE flags.
-	if ! use readline ; then
-		modules="${modules},readline"
-	fi
-	if ! use berkdb ; then
-		modules="${modules},dbm"
-	fi
-	if ! use gdbm ; then
-		modules="${modules},gdbm"
-	fi
-	if ! use ssl ; then
-		modules="${modules},openssl"
-	fi
-	if ! use ncurses ; then
-		modules="${modules},curses"
-	fi
-
-	INSTALL="${EPREFIX}/usr/bin/install -c" econf \
-		--program-suffix=${MY_SUFFIX} \
-		--with-soname=ruby${MY_SUFFIX} \
-		--docdir=${EPREFIX}/usr/share/doc/${P} \
-		--enable-shared \
-		--enable-pthread \
-		--disable-rpath \
-		--with-out-ext="${modules}" \
-		$(use_enable jemalloc jemalloc) \
-		$(use_enable socks5 socks) \
-		$(use_enable doc install-doc) \
-		--enable-ipv6 \
-		$(use_enable debug) \
-		${myconf} \
-		--enable-option-checking=no \
-		|| die "econf failed"
-}
-
-src_compile() {
-	emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
-	emake -j1 V=1 test || die "make test failed"
-
-	elog "Ruby's make test has been run. Ruby also ships with a make check"
-	elog "that cannot be run until after ruby has been installed."
-	elog
-	if use rubytests; then
-		elog "You have enabled rubytests, so they will be installed to"
-		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
-		elog "than root, and you must place them into a writeable directory."
-		elog "Then call: "
-		elog
-		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
-	else
-		elog "Enable the rubytests USE flag to install the make check tests"
-	fi
-}
-
-src_install() {
-	# Remove the remaining bundled gems. We do this late in the process
-	# since they are used during the build to e.g. create the
-	# documentation.
-	rm -rf ext/json || die
-
-	# Ruby is involved in the install process, we don't want interference here.
-	unset RUBYOPT
-
-	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
-	LD_LIBRARY_PATH="${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
-	for d in $(find "${S}/ext" -type d) ; do
-		RUBYLIB="${RUBYLIB}:$d"
-	done
-	export LD_LIBRARY_PATH RUBYLIB
-
-	emake V=1 DESTDIR="${D}" install || die "make install failed"
-
-	# Remove installed rubygems copy
-	rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
-	rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
-	rm -r "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
-
-	if use doc; then
-		make DESTDIR="${D}" install-doc || die "make install-doc failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r sample
-	fi
-
-	dodoc ChangeLog NEWS doc/NEWS* README* || die
-
-	if use rubytests; then
-		pushd test
-		insinto /usr/share/${PN}-${SLOT}/test
-		doins -r .
-		popd
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
-		eselect ruby set ruby${MY_SUFFIX}
-	fi
-
-	elog
-	elog "To switch between available Ruby profiles, execute as root:"
-	elog "\teselect ruby set ruby(19|20|...)"
-	elog
-}
-
-pkg_postrm() {
-	eselect ruby cleanup
-}
--- a/dev-lang/ruby/ruby-2.2.4.ebuild
+++ b/dev-lang/ruby/ruby-2.2.4.ebuild
@ -1,244 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-#PATCHSET=1
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-MY_P="${PN}-$(get_version_component_range 1-3)"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
-RUBYVERSION=2.2.0
-
-if [[ -n ${PATCHSET} ]]; then
-	if [[ ${PVR} == ${PV} ]]; then
-		PATCHSET="${PV}-r0.${PATCHSET}"
-	else
-		PATCHSET="${PVR}.${PATCHSET}"
-	fi
-else
-	PATCHSET="${PVR}"
-fi
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/2.2/${MY_P}.tar.xz
-		 https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl xemacs ncurses +readline"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( sys-libs/gdbm )
-	jemalloc? ( dev-libs/jemalloc )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	socks5? ( >=net-proxy/dante-1.1.13 )
-	ncurses? ( sys-libs/ncurses:0= )
-	readline?  ( sys-libs/readline:0 )
-	dev-libs/libyaml
-	virtual/libffi
-	sys-libs/zlib
-	>=app-eselect/eselect-ruby-20141227
-	!<dev-ruby/rdoc-3.9.4
-	!<dev-ruby/rubygems-1.8.10-r1"
-
-DEPEND="${RDEPEND}"
-
-BUNDLED_GEMS="
-	>=dev-ruby/minitest-5.4.3[ruby_targets_ruby22]
-	>=dev-ruby/power_assert-0.2.2[ruby_targets_ruby22]
-	>=dev-ruby/test-unit-3.0.8[ruby_targets_ruby22]
-"
-
-PDEPEND="
-	${BUNDLED_GEMS}
-	virtual/rubygems[ruby_targets_ruby22]
-	>=dev-ruby/json-1.8.1[ruby_targets_ruby22]
-	>=dev-ruby/rake-0.9.6[ruby_targets_ruby22]
-	rdoc? ( >=dev-ruby/rdoc-4.0.1[ruby_targets_ruby22] )
-	xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
-		epatch "${WORKDIR}/patches"
-
-	# We can no longer unbundle all of rake because rubygems now depends
-	# on this. We leave the actual rake code around to bootstrap
-	# rubygems, but remove the bits that would cause a file collision.
-	einfo "Unbundling gems..."
-	cd "$S"
-	rm -r \
-		{bin,lib}/rake lib/rake.rb man/rake.1 \
-		bin/gem || die "removal failed"
-	# Remove bundled gems that we will install via PDEPEND, bug
-	# 539700. Use explicit version numbers to ensure rm fails when they
-	# change so we can update dependencies accordingly.
-	rm gems/{minitest-5.4.3,power_assert-0.2.2,test-unit-3.0.8}.gem || die
-
-	# Fix a hardcoded lib path in configure script
-	sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
-		configure.in || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=
-
-	# The Tk module can no longer be built because the module code is no
-	# longer compatible with newer stable versions.
-	# https://bugs.gentoo.org/show_bug.cgi?id=500894
-	local modules="tk"
-
-	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
-	filter-flags -fomit-frame-pointer
-	# In many places aliasing rules are broken; play it safe
-	# as it's risky with newer compilers to leave it as it is.
-	append-flags -fno-strict-aliasing
-	# SuperH needs this
-	use sh && append-flags -mieee
-
-	# Socks support via dante
-	if use socks5 ; then
-		# Socks support can't be disabled as long as SOCKS_SERVER is
-		# set and socks library is present, so need to unset
-		# SOCKS_SERVER in that case.
-		unset SOCKS_SERVER
-	fi
-
-	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
-	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
-		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
-	fi
-
-	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
-	# Determine which modules *not* to build depending in the USE flags.
-	if ! use readline ; then
-		modules="${modules},readline"
-	fi
-	if ! use berkdb ; then
-		modules="${modules},dbm"
-	fi
-	if ! use gdbm ; then
-		modules="${modules},gdbm"
-	fi
-	if ! use ssl ; then
-		modules="${modules},openssl"
-	fi
-	if ! use ncurses ; then
-		modules="${modules},curses"
-	fi
-
-	# Provide an empty LIBPATHENV because we disable rpath but we do not
-	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
-	# #564272
-	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
-		--program-suffix=${MY_SUFFIX} \
-		--with-soname=ruby${MY_SUFFIX} \
-		--docdir=${EPREFIX}/usr/share/doc/${P} \
-		--enable-shared \
-		--enable-pthread \
-		--disable-rpath \
-		--with-out-ext="${modules}" \
-		$(use_enable jemalloc jemalloc) \
-		$(use_enable socks5 socks) \
-		$(use_enable doc install-doc) \
-		--enable-ipv6 \
-		$(use_enable debug) \
-		${myconf} \
-		--enable-option-checking=no \
-		|| die "econf failed"
-}
-
-src_compile() {
-	emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
-	emake -j1 V=1 test || die "make test failed"
-
-	elog "Ruby's make test has been run. Ruby also ships with a make check"
-	elog "that cannot be run until after ruby has been installed."
-	elog
-	if use rubytests; then
-		elog "You have enabled rubytests, so they will be installed to"
-		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
-		elog "than root, and you must place them into a writeable directory."
-		elog "Then call: "
-		elog
-		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
-	else
-		elog "Enable the rubytests USE flag to install the make check tests"
-	fi
-}
-
-src_install() {
-	# Remove the remaining bundled gems. We do this late in the process
-	# since they are used during the build to e.g. create the
-	# documentation.
-	rm -rf ext/json || die
-
-	# Ruby is involved in the install process, we don't want interference here.
-	unset RUBYOPT
-
-	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
-	LD_LIBRARY_PATH="${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
-	for d in $(find "${S}/ext" -type d) ; do
-		RUBYLIB="${RUBYLIB}:$d"
-	done
-	export LD_LIBRARY_PATH RUBYLIB
-
-	emake V=1 DESTDIR="${D}" install || die "make install failed"
-
-	# Remove installed rubygems copy
-	rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
-	rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
-	rm -r "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
-
-	if use doc; then
-		make DESTDIR="${D}" install-doc || die "make install-doc failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r sample
-	fi
-
-	dodoc ChangeLog NEWS doc/NEWS* README* || die
-
-	if use rubytests; then
-		pushd test
-		insinto /usr/share/${PN}-${SLOT}/test
-		doins -r .
-		popd
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
-		eselect ruby set ruby${MY_SUFFIX}
-	fi
-
-	elog
-	elog "To switch between available Ruby profiles, execute as root:"
-	elog "\teselect ruby set ruby(19|20|...)"
-	elog
-}
-
-pkg_postrm() {
-	eselect ruby cleanup
-}
--- a/dev-libs/dotconf/dotconf-1.3.ebuild
+++ b/dev-libs/dotconf/dotconf-1.3.ebuild
@ -7,7 +7,7 @@ EAPI="3"
 inherit eutils

 DESCRIPTION="dot.conf configuration file parser"
-HOMEPAGE="https://www.github.com/williamh/dotconf"
+HOMEPAGE="https://github.com/williamh/dotconf"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 LICENSE="LGPL-2.1"

--- a/dev-libs/expat/expat-2.1.1-r1.ebuild
+++ b/dev-libs/expat/expat-2.1.1-r1.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/expat/${P}.tar.bz2"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="elibc_FreeBSD examples static-libs unicode"
 RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r6
 		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
--- a/dev-libs/libmateweather/libmateweather-1.10.0.ebuild
+++ b/dev-libs/libmateweather/libmateweather-1.10.0.ebuild
@ -18,7 +18,7 @@ HOMEPAGE="http://mate-desktop.org"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"

 IUSE="python"

--- a/dev-libs/libxslt/libxslt-1.1.28-r5.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.28-r5.ebuild
@ -15,7 +15,7 @@ SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="crypt debug examples python static-libs"

 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
--- a/dev-perl/Net-DBus/Net-DBus-1.1.0.ebuild
+++ b/dev-perl/Net-DBus/Net-DBus-1.1.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for the DBus message system"

 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86"
 IUSE="test"

 RDEPEND="
--- a/dev-perl/Net-Patricia/Net-Patricia-1.220.0.ebuild
+++ b/dev-perl/Net-Patricia/Net-Patricia-1.220.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -12,7 +12,7 @@ DESCRIPTION="Patricia Trie perl module for fast IP address lookups"

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

 RDEPEND="dev-perl/Net-CIDR-Lite
--- a/dev-python/aadict/aadict-0.2.2.ebuild
+++ b/dev-python/aadict/aadict-0.2.2.ebuild
@ -9,7 +9,7 @@ PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 inherit distutils-r1

 DESCRIPTION="An auto-attribute dict (and a couple of other useful dict functions)"
-HOMEPAGE="http://github.com/metagriffin/aadict http://pypi.python.org/pypi/aadict"
+HOMEPAGE="https://github.com/metagriffin/aadict http://pypi.python.org/pypi/aadict"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"

 LICENSE="GPL-3+"
--- a/dev-python/bokeh/bokeh-0.10.0.ebuild
+++ b/dev-python/bokeh/bokeh-0.10.0.ebuild
@ -9,7 +9,7 @@ PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 inherit distutils-r1

 DESCRIPTION="Statistical and novel interactive HTML plots for Python"
-HOMEPAGE="http://bokeh.pydata.org/ http://github.com/bokeh/bokeh http://pypi.python.org/pypi/bokeh"
+HOMEPAGE="http://bokeh.pydata.org/ https://github.com/bokeh/bokeh http://pypi.python.org/pypi/bokeh"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"

 LICENSE="BSD"
--- a/dev-python/bokeh/bokeh-0.11.0.ebuild
+++ b/dev-python/bokeh/bokeh-0.11.0.ebuild
@ -9,7 +9,7 @@ PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 inherit distutils-r1

 DESCRIPTION="Statistical and novel interactive HTML plots for Python"
-HOMEPAGE="http://bokeh.pydata.org/ http://github.com/bokeh/bokeh http://pypi.python.org/pypi/bokeh"
+HOMEPAGE="http://bokeh.pydata.org/ https://github.com/bokeh/bokeh http://pypi.python.org/pypi/bokeh"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"

 LICENSE="BSD"
--- a/dev-python/bokeh/bokeh-0.11.1.ebuild
+++ b/dev-python/bokeh/bokeh-0.11.1.ebuild
@ -9,7 +9,7 @@ PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 inherit distutils-r1

 DESCRIPTION="Statistical and novel interactive HTML plots for Python"
-HOMEPAGE="http://bokeh.pydata.org/ http://github.com/bokeh/bokeh http://pypi.python.org/pypi/bokeh"
+HOMEPAGE="http://bokeh.pydata.org/ https://github.com/bokeh/bokeh http://pypi.python.org/pypi/bokeh"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"

 LICENSE="BSD"
--- a/dev-python/catkin_pkg/catkin_pkg-0.2.10.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-0.2.10.ebuild
@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SCM="git-r3"
-	EGIT_REPO_URI="http://github.com/ros-infrastructure/catkin_pkg"
+	EGIT_REPO_URI="https://github.com/ros-infrastructure/catkin_pkg"
 fi

 inherit ${SCM} distutils-r1
@ -21,7 +21,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	SRC_URI="
 		http://download.ros.org/downloads/${PN}/${P}.tar.gz
-		http://github.com/ros-infrastructure/catkin_pkg/archive/${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/ros-infrastructure/catkin_pkg/archive/${PV}.tar.gz -> ${P}.tar.gz
 		"
 	KEYWORDS="~amd64 ~arm"
 fi
--- a/Show More
+++ b/Show More