Sync with portage [Thu Apr 23 09:23:24 MSK 2015].

9 years ago · ba04242c4d
parent ad374586a9
commit ba04242c4d
251 changed files with 2218 additions and 2626 deletions
--- a/app-admin/killproc/killproc-2.13-r1.ebuild
+++ b/app-admin/killproc/killproc-2.13-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/killproc/killproc-2.13-r1.ebuild,v 1.10 2015/03/28 21:29:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/killproc/killproc-2.13-r1.ebuild,v 1.11 2015/04/22 17:59:34 jer Exp $

 EAPI=5
 inherit eutils toolchain-funcs
@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.suse.com/pub/projects/init/${P}.tar.gz"

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

 src_prepare() {
 	epatch "${FILESDIR}/${P}-makefile.patch"
--- a/app-editors/retext/Manifest
+++ b/app-editors/retext/Manifest
@ -1,2 +1,3 @@
 DIST ReText-4.1.3.tar.gz 129283 SHA256 bb4409982d27ac62cab01b0748fe41d9c6660853668b350f3369e76d155edd6c SHA512 d2b3fa901afa9870f6cecc7ab3126b91f1420ca1b14ddd4f609c2ada7121388840b5be679914694664f3bbf876ee8522aa6b0c82a23f837844f788fa10a46323 WHIRLPOOL 3be71e5d7ec612ae4e4fec17ca544f6d0e7cb7421fcdeb517d3c13156ed07f5e5e7c3e352cf604bfb5f2287964fdc173a1bac0eeab41ee1cda8b265ad0f57686
 DIST ReText-5.0.1.tar.gz 140814 SHA256 a62f784f18bfcdad13969b8b15a8e92f57e930f23e93bfce1ab714e5ac77e939 SHA512 fd68f95f93639f6e80b93ed928753d12fea0ac0af11729f93fc4083a8422ad563319c198597b9180bafb3f1c6a03205a06c64f0ba2743872a5ded289b788cfb3 WHIRLPOOL d410a4a8289e19abd6c015981dfb9bcca8ce1821d574f8ecbad10f71b8e7ff5f7f846e6e21874676ae6d091b3918b9a81bb43def59ec2a645aca23fd0922f9cf
+DIST ReText-5.0.2.tar.gz 140853 SHA256 7ef898abc8aed70502fd4d69ed7e8ab43cc978fcbe6864da5771379c1e315bdd SHA512 b28dd24aa5253106880bd6a5a3a16f96670c3145a2cb46da520407d6705f055ee52aaef9c0a8e27c2900b5fdde6a67c599cb8945f7daa6e3ef4456e1fd7c9b0f WHIRLPOOL 0ee1a7497ca3d6fef8356777d93e369d06de542b20974055ddf66cc8e12d33c7716d3b4b5f0360b40037c90d146fddbff4c3b48c96929efafd8f43e278240c0f
--- a/app-editors/retext/retext-5.0.2.ebuild
+++ b/app-editors/retext/retext-5.0.2.ebuild
@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/retext/retext-5.0.2.ebuild,v 1.1 2015/04/22 23:49:07 mrueg Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_{3,4} )
+
+PLOCALES="ca cs cy da de es et eu fr hu it ja pl pt pt_BR ru sk uk vi zh_CN zh_TW"
+
+inherit distutils-r1 l10n
+
+MY_PN="ReText"
+MY_P="${MY_PN}-${PV/_/~}"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-2
+	EGIT_REPO_URI="git://git.code.sf.net/p/retext/git"
+	KEYWORDS=""
+else
+	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A Qt-based text editor for Markdown and reStructuredText"
+HOMEPAGE="http://sourceforge.net/p/retext/home/ReText/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+spell"
+
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/markdown[${PYTHON_USEDEP}]
+	dev-python/markups[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/PyQt5[gui,network,printsupport,webkit,widgets,${PYTHON_USEDEP}]
+	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
+"
+
+S="${WORKDIR}"/${MY_P}
+
+remove_locale() {
+	find "${ED}" -name "retext_${1}.qm" -delete || die "Failed to remove locale ${1}."
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newicon {icons/,}${PN}.png
+	newicon {icons/,}${PN}.svg
+
+	l10n_for_each_disabled_locale_do remove_locale
+
+	make_desktop_entry ${PN} "${MY_PN} Editor" ${PN} "Development;Utility;TextEditor"
+}
--- a/app-misc/boxes/boxes-1.1.2-r1.ebuild
+++ b/app-misc/boxes/boxes-1.1.2-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/boxes/boxes-1.1.2-r1.ebuild,v 1.6 2015/04/21 18:58:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/boxes/boxes-1.1.2-r1.ebuild,v 1.7 2015/04/23 04:49:25 jer Exp $

 EAPI=5

@ -12,7 +12,7 @@ SRC_URI="https://github.com/ascii-boxes/boxes/archive/v${PV}.tar.gz -> ${P}.tar.

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

 DEPEND="
--- a/app-misc/delay/delay-1.6-r2.ebuild
+++ b/app-misc/delay/delay-1.6-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/delay/delay-1.6-r2.ebuild,v 1.5 2015/04/19 09:46:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/delay/delay-1.6-r2.ebuild,v 1.6 2015/04/23 04:47:14 jer Exp $

 EAPI=5

@ -12,7 +12,7 @@ SRC_URI="http://onegeek.org/~tom/software/delay/dl/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~mips ppc ~ppc64 x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~mips ppc ppc64 x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos"

 RDEPEND="sys-libs/ncurses"
 DEPEND="
--- a/app-text/dos2unix/dos2unix-6.0.6.ebuild
+++ b/app-text/dos2unix/dos2unix-6.0.6.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-6.0.6.ebuild,v 1.7 2015/03/02 09:30:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-6.0.6.ebuild,v 1.8 2015/04/23 04:48:48 jer Exp $

 EAPI=5

@ -14,7 +14,7 @@ SRC_URI="

 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="debug nls"

 RDEPEND="
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@ -1,6 +1,5 @@
 DIST phpMyAdmin-4.0.10.9-all-languages.tar.xz 4776232 SHA256 ca8399711dcd613f3e13de706ced326885001a0891b31dc9677dd3a23cc78258 SHA512 fbc973b2719162c2aa8a7c88d395d513c2425259a3b69ecbdfc08f954c6dc25146fae41e4d67c57815782e3cf36580ef50ed870ee245463f59948f9062882b2a WHIRLPOOL 6dc1c230f3ed95ee828909d6b96fadcca25c19ea90fcdc38359d7ddd8ee8acf1724e9f4fd592ef60a6a41498badc1ec3ab983a36ca9f41f4e4e4efbed59952d0
 DIST phpMyAdmin-4.1.14.8-all-languages.tar.xz 4881004 SHA256 e2a2fee1658e3108048907a257b8f291fcfbd5840690e8f4711f9ea28233dce8 SHA512 34d28f04d6a808565ecc3d7187b2719d1e25e55d6248e3ea516e5914bd5a70aab0d9c4df3525cb8e77b37949a78671235af46e22871fe26ba999aa01b01c44d2 WHIRLPOOL a2e236a47154117c1bee3b9a51d4c3da9d1bd5834e3167174cbd80e562b5c14424b7e75de814f85d1ade1f6501b665a2af21cedd1c87be2ea6a9e151c0d8a2cf
-DIST phpMyAdmin-4.2.13.1-all-languages.tar.xz 5205324 SHA256 bc179dd35f6aa6d01b573f1e11b594d357fb2c09405b7fec06de5059adbec7c4 SHA512 121e6f063d7f4c4e8eaf048c9f68aaff713206ae077090fed671328f3fbd6f7d723309719c38e3a800c149630c1e2038b3f002bff7b48337278925cecf178b58 WHIRLPOOL 0bf85889e37f68907e8565a41d2e9ba804d41f8ad223a6d650117a93bd0900de242bed318a3cb467556b17eb2618d46571908090165cab666a2782a6f7465b3c
 DIST phpMyAdmin-4.2.13.2-all-languages.tar.xz 5204448 SHA256 3a8262fe392337d1963e8bc4364e280ced8ecace32c94cae0a4394cbf19256ee SHA512 944a324269b28290e57d15d7ed247594ab62c7117c763069ee4739c4bde2b09dbc59297745459dde4ec083771318ccb1f462eb828bdca31451fa13c5e9e2f6bd WHIRLPOOL bdeced7f9ff774be06c68c2b0dfd461133012530795b1530155f67d36a6ad6b9e9da418ce842ed1b79e900cf19fe0659547b0cd4c2ffd696e9f96b69d9b8eefb
 DIST phpMyAdmin-4.3.12-all-languages.tar.xz 5370996 SHA256 2ef69b32af8dfb51523378b654b0d3ee58a08fc80ab7ef2d1bdc38e0e26956ce SHA512 d7bb599ed3f2d5674e0b03df519a8c7a293f8a2814b7d28dab66161e0e3eb40e8e4943f436d113829df5187d1b802cb53dad7495efbeccc64f79d2190df4d688 WHIRLPOOL a008f10f2901fe774af151ac28230f0eb0294d74213a1a0f95909d5c98dee543b81647dbe9d5f014513743aca5d00847871506d46f5dcaf430e4936c493ff8be
-DIST phpMyAdmin-4.4.0-beta1-all-languages.tar.xz 5665800 SHA256 7d3379b377618850d358e6d2760c71f48616068fd7b454662866fa8f8ce90854 SHA512 8d77b437122da5f2315628d442eae9eacacab0c03f85a15026f991d09d7c5f0a5e8148414f77353a2f4b55a913eb4828e3c1781e84cf7a346791d7d5af21d15c WHIRLPOOL 89f6dc1b7fa64a33fa09b2a7cf0bf9510f5eee65f74e08f6920bdd64ae968d4182704f712a9d193c5ba301480c9b4ef29003d4d5b0a6c1e8c3945c730932b3b5
+DIST phpMyAdmin-4.4.3-all-languages.tar.xz 5639244 SHA256 1319d3fcf45808d17f3c609f7bad01c3f57a906d4855c5ef03694fc62e653d53 SHA512 702eb243e4b3ccb7065227ea7d9eedf1b5f008b9bd0b4516c31496de79c9422c5007e12d4c6e2ff6c61510b156e267e3b9c2f7ca417745cba7642a59c7a77f03 WHIRLPOOL 87ebcce116ca176cfa3917cbad09628b1f1409b293f74900b160be8f19e95e6e3e9b6c8ae0d7cb6b6464bc2a303d35fd506d411dad192a69932cd95ad036aebb
--- a/dev-db/phpmyadmin/phpmyadmin-4.2.13.1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.2.13.1.ebuild
@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.2.13.1.ebuild,v 1.8 2015/02/24 10:56:32 ago Exp $
-
-EAPI="5"
-
-inherit eutils webapp depend.php
-
-MY_PV=${PV/_/-}
-MY_P="phpMyAdmin-${MY_PV}-all-languages"
-
-DESCRIPTION="Web-based administration for MySQL database in PHP"
-HOMEPAGE="http://www.phpmyadmin.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="setup"
-
-RDEPEND="
-	dev-lang/php[crypt,ctype,filter,json,session,unicode]
-	|| (
-		dev-lang/php[mysqli]
-		dev-lang/php[mysql]
-	)
-"
-
-need_httpd_cgi
-need_php_httpd
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc README RELEASE-DATE-${MY_PV} ChangeLog || die
-	rm -f LICENSE README* RELEASE-DATE-${MY_PV}
-
-	if ! use setup; then
-		rm -rf setup || die "Cannot remove setup utility"
-		elog "The phpMyAdmin setup utility has been removed."
-		elog "It is a regular target of various exploits. If you need it, set USE=setup."
-	else
-		elog "You should consider disabling the setup USE flag"
-		elog "to exclude the setup utility if you don't use it."
-		elog "It regularly is the target of various exploits."
-	fi
-
-	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-	webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
-	webapp_src_install
-}
--- a/dev-db/phpmyadmin/phpmyadmin-4.4.0_beta1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.4.0_beta1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.4.0_beta1.ebuild,v 1.1 2015/03/14 15:33:38 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.4.3.ebuild,v 1.1 2015/04/23 02:42:37 jmbsvicetto Exp $

 EAPI="5"

--- a/dev-java/commons-logging/Manifest
+++ b/dev-java/commons-logging/Manifest
@ -1 +1,2 @@
 DIST commons-logging-1.1.1-src.tar.gz 190670 SHA256 b49a79fa78ebfae15dc46ae6f0144fee6b94ab608a25518c54609d3419909eb2 SHA512 ccba6cb8078807219dfe4a771c2e6f5569190b52ca00a605a0445b53697d9162c62237fc34ead2960146603b018769f406fe9e47b2eefe0d0fb6ad993c669974 WHIRLPOOL b28ad3dcad851ccbe7fffe9968426b67fb3b6a372de85aa6adb055db5f3eaf621d63f81b9bf74dd6d4958fd681b29272898fc6907b5681a431af0772f876ec16
+DIST commons-logging-1.2-src.tar.gz 188536 SHA256 49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81 SHA512 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9 WHIRLPOOL fe31832404d9071d73fba940021ab664998ffa9867a88c2078918547cc6a23a06339f33f5d74f8b6ea5aaeeb86cd94c0aef6c6195e454a651b8fc492a1a6b5f8
--- a/dev-java/commons-logging/commons-logging-1.1.1.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.1.1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/commons-logging-1.1.1.ebuild,v 1.13 2014/08/10 20:11:43 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/commons-logging-1.1.1.ebuild,v 1.14 2015/04/22 21:50:06 monsieurp Exp $

 EAPI="1"
 JAVA_PKG_IUSE="doc source test"
--- a/dev-java/commons-logging/commons-logging-1.2.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2.ebuild
@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/commons-logging-1.2.ebuild,v 1.1 2015/04/22 21:50:06 monsieurp Exp $
+
+EAPI="5"
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 java-osgi
+
+DESCRIPTION="The Jakarta-Commons Logging package is an ultra-thin bridge between different logging libraries"
+HOMEPAGE="http://commons.apache.org/logging/"
+SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="avalon-logkit log4j servletapi avalon-framework"
+
+COMMON_DEP="
+	avalon-logkit? ( dev-java/avalon-logkit:1.2 )
+	log4j? ( dev-java/log4j:0 )
+	servletapi? ( java-virtuals/servlet-api:2.3 )
+	avalon-framework? ( dev-java/avalon-framework:4.2 )"
+# ATTENTION: Add this when log4j-1.3 is out
+#	=dev-java/log4j-1.3*
+RDEPEND=">=virtual/jre-1.6
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.6
+	${COMMON_DEP}
+	test? ( dev-java/ant-junit:0 )"
+
+S="${WORKDIR}/${P}-src/"
+
+RESTRICT="!servletapi? ( test )"
+
+java_prepare() {
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	# patch to make the build.xml respect no servletapi
+	# TODO file upstream -nichoj
+	epatch "${FILESDIR}/${P}-servletapi.patch"
+
+	# bug 200918
+	java-ant_ignore-system-classes
+
+	# bug #208098
+	echo "jdk.1.4.present=true" > build.properties
+	use log4j && echo "log4j12.jar=$(java-pkg_getjars log4j)" >> build.properties
+	# ATTENTION: Add this when log4j-1.3 is out (check the SLOT)
+	#echo "log4j13.jar=$(java-pkg_getjars log4j-1.3)" > build.properties
+	use avalon-logkit && echo "logkit.jar=$(java-pkg_getjars avalon-logkit-1.2)" >> build.properties
+	use servletapi && echo "servletapi.jar=$(java-pkg_getjar --virtual servlet-api-2.3 servlet.jar)" >> build.properties
+	use avalon-framework && echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties
+	java-pkg_filter-compiler jikes ecj-3.2
+
+	if use test && ! use servletapi; then
+		eerror "Tests need use servletapi, tests not executed"
+	fi
+}
+
+EANT_BUILD_TARGET="compile"
+
+src_install() {
+	java-osgi_newjar "target/${P}.jar" "org.apache.commons.logging" "Apache Commons Logging" "org.apache.commons.logging;version=\"${PV}\", org.apache.commons.logging.impl;version=\"${PV}\""
+	java-pkg_newjar target/${PN}-api-${PV}.jar ${PN}-api.jar
+	java-pkg_newjar target/${PN}-adapters-${PV}.jar ${PN}-adapters.jar
+
+	dodoc RELEASE-NOTES.txt || die
+	dohtml PROPOSAL.html || die
+	use doc && java-pkg_dojavadoc target/docs/
+	use source && java-pkg_dosrc src/main/java/org
+}
--- a/dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch
+++ b/dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch
@ -0,0 +1,26 @@
+--- a/build.xml	2013-05-16 22:04:22.000000000 +0200
+++ b/build.xml	2013-12-25 23:58:47.447266535 +0100
+@@ -773,4 +773,23 @@
+     </fail>
+   </target>
+ 
+  <target depends="" name="javadoc" description="o Generate javadoc" >
+    <mkdir dir="${build.home}/docs" >
+    </mkdir>
+    <tstamp >
+      <format pattern="2001-yyyy" property="year" >
+      </format>
+    </tstamp>
+    <property name="copyright" value="Copyright &amp;copy;  The Apache Software Foundation. All Rights Reserved." >
+    </property>
+    <property name="title" value="Logging 1.1 API" >
+    </property>
+    <javadoc use="true" author="true" sourcepath="src/main/java" destdir="${build.home}/docs" version="true" private="true" packagenames="org.apache.commons.logging.*" >
+      <classpath >
+        <path refid="javadoc.classpath" >
+        </path>
+      </classpath>
+    </javadoc>
+  </target>
+
+ </project>
--- a/dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch
+++ b/dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch
@ -0,0 +1,42 @@
+--- a/build.xml	2013-12-26 00:00:51.019721667 +0100
+++ b/build.xml	2013-12-26 00:22:27.616511976 +0100
+@@ -279,6 +279,8 @@
+                classpathref="compile.classpath"
+                classname="org.apache.log.Logger"/>
+ 
+    <available classname="javax.servlet.ServletContextEvent" property="servletapi.present" classpathref="compile.classpath" ignoresystemclasses="true" ></available>
+
+     <available property="avalon-framework.present"
+                classpathref="compile.classpath"
+                classname="org.apache.avalon.framework.logger.Logger"/>
+@@ -315,6 +317,13 @@
+     </echo>
+   </target>
+   
+  <target depends="init,discovery" unless="servletapi.present" name="servletapi-warning" >
+    <echo >
+    *** WARNING ***
+    ServletAPI not found: Cannot Build ServletContextCleaner
+	</echo>
+  </target>
+  
+   <target name="avalon-framework-warning" unless='avalon-framework.present' depends='init,discovery'>
+     <echo>
+     *** WARNING ***
+@@ -337,7 +346,7 @@
+   </target>
+     
+   <target name='warning' 
+-    depends='log4j12-warning,log4j13-warning,logkit-warning,jdk1.4-warning,avalon-framework-warning,compile-1.4'/>
+    depends='log4j12-warning,log4j13-warning,logkit-warning,jdk1.4-warning,avalon-framework-warning,servletapi-warning,compile-1.4'/>
+ 
+   <target name="compile-only" 
+     depends="prepare,discovery,warning,show-lib-presence,compile-non-log4j,compile-log4j12,compile-log4j13,build-jar"/>
+@@ -365,6 +374,7 @@
+     
+       <exclude name="org/apache/commons/logging/impl/Log4J*.java"/>
+ 
+	  <exclude unless="servletapi.present" name="org/apache/commons/logging/impl/ServletContextCleaner.java" ></exclude>
+       <exclude name="org/apache/commons/logging/impl/Jdk13LumberjackLogger.java"
+                unless="jdk.1.4.present"/>
+       <exclude name="org/apache/commons/logging/impl/Jdk14Logger.java"
--- a/dev-java/jdbc-postgresql/Manifest
+++ b/dev-java/jdbc-postgresql/Manifest
@ -3,3 +3,4 @@ DIST postgresql-jdbc-8.4-701.src.tar.gz 551752 SHA256 d2748885b99b414fb2a1d68659
 DIST postgresql-jdbc-9.2-1003.src.tar.gz 1843082 SHA256 d61449b8a17ce540b26437382c33a59a49a94c578c943fccf91139ee06478968 SHA512 f91d9617726722998a51275c625f6ea89dfe0ac7ce415cc6fa76302b13762bcf825cd61ec69d25d0199ca21de8a24286eeffb843ad59c06fd3049a289ac2b702 WHIRLPOOL a7994d7ce38bd17e9353339d2838601a22328c8eff03baa122663526ef2c0c2afa8b16d9c93ea9fbff7a756612cddffef41ec00552640766acc5e1fbe4996282
 DIST postgresql-jdbc-9.2-1004.src.tar.gz 1842921 SHA256 eeadff0d830cd19a4f52a9489748a7126b0c1d4863bf9a5d65618158dfc6ae68 SHA512 6e218b7df3d772e4fb9053672f5f77f6012fe6e652a536dfe171408e957465520b05994d4fa13c4d478b595a55b8068da663b9f3dcb544a46fcf91d71ba8fdf5 WHIRLPOOL f1afa3201fbaaf47edb0224d3263642b3202fbf6fc922318354db86e394f0005611b0981da043a4e14cbb67224ac8fa6d96880e0763fcd4d5b502423c7eaa0c7
 DIST postgresql-jdbc-9.3-1100.src.tar.gz 1852465 SHA256 e6be53d4cda04735f5f147d2296acb9a22630b062fa3a4ef894073f23efc6d55 SHA512 43968a62f9443739721016ede186b2f41fa6db2d1ef319cd65059f8715e90eda7c7f568995b293578c39e04d43085cfdfece587500f99ed1a49964c12d8c747a WHIRLPOOL 9bf218936a00df00fb4b4f6ed6c3bbe06cdcfcd14d306a4f7bf3073e83f1c51bc85c0a061c2e04790bcebf9183b8aabd056522fa5d18b0734a4aec34b3ab14a0
+DIST postgresql-jdbc-9.4-1201.src.tar.gz 1909810 SHA256 96b079611038c0ffff6bb8d22d51ada0cb82c8eb3bd3a9294055963cc638fda7 SHA512 6fd543e325de931ee6c33fe4b1daf53d7baa91061afc9dc1687c4b202430cbcf2a7e3fb047f9e1d88f4d39b8f4f85a98f2b930205ceba414212dfcbaaf108883 WHIRLPOOL 3245227c875d44d82109a5700e06ed3d5bcc75469cd9333c98a7b396b2db1e2ac1da002db19f632afed262929cd7e9a3d8f93d2b24321e103b815383f8fc0a05
--- a/dev-java/jdbc-postgresql/files/jdbc-postgresql-9.4_p1201-remove-osgi.patch
+++ b/dev-java/jdbc-postgresql/files/jdbc-postgresql-9.4_p1201-remove-osgi.patch
@ -0,0 +1,37 @@
+--- a/build.xml	2015-02-18 17:44:58.000000000 +0100
+++ b/build.xml	2015-03-23 02:19:03.951945663 +0100
+@@ -403,34 +403,6 @@
+         <attribute name="Implementation-Vendor" value="PostgreSQL Global Development Group" />
+       </manifest>
+     </jar>
+-
+-    <!-- add OSGi meta information -->
+-    <property name="osgidir" value="${builddir}/osgi"/>
+-    <mkdir dir="${osgidir}"/>
+-
+-    <!--   create a bnd file named after the JAR file so that bnd wrap tool find it -->
+-    <echo file="${osgidir}/${artifact.version.string}.bnd">
+-Bundle-ManifestVersion: 2
+-
+-Bundle-Name: PostgreSQL JDBC Driver ${jdbc.version.upper}
+-Bundle-SymbolicName: org.postgresql.${jdbc.version}
+-Bundle-Version: ${osgi.version}
+-
+-Bundle-Vendor: PostgreSQL Global Development Group
+-Bundle-Copyright: Copyright (c) 2003-2015, PostgreSQL Global Development Group
+-Bundle-License: http://www.postgresql.org/about/licence/
+-Bundle-DocURL: http://jdbc.postgresql.org/
+-
+-Bundle-Classpath: .
+-Bundle-Activator: org.postgresql.osgi.PGBundleActivator
+-Require-Capability: osgi.ee;filter:="(&amp;(|(osgi.ee=J2SE)(osgi.ee=JavaSE))(version>=${java.specification.version}))"
+-Export-Package: org.postgresql*; version=${fullversion}
+-Import-Package: javax.sql, javax.transaction.xa, javax.naming, *;resolution:=optional
+-    </echo>
+-
+-    <!--   run wrap task from bnd -->
+-    <taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="dependency.build.classpath"/> 
+-    <bndwrap jars="${artifact.jar.build}" output="${artifact.jar}" definitions="${osgidir}"/>
+   </target>
+ 
+   <!-- create a distribution with docs, dependencies, and driver jar -->
--- a/dev-java/jdbc-postgresql/files/jdbc-postgresql-9.4_p1201-remove-sspi.patch
+++ b/dev-java/jdbc-postgresql/files/jdbc-postgresql-9.4_p1201-remove-sspi.patch
@ -0,0 +1,138 @@
+--- a/org/postgresql/core/v3/ConnectionFactoryImpl.java	2015-03-23 07:32:15.000000000 +0100
+++ b/org/postgresql/core/v3/ConnectionFactoryImpl.java	2015-03-23 07:41:53.160058718 +0100
+@@ -19,7 +19,6 @@
+ 
+ import org.postgresql.PGProperty;
+ import org.postgresql.core.*;
+-import org.postgresql.sspi.SSPIClient;
+ import org.postgresql.hostchooser.GlobalHostStatusTracker;
+ import org.postgresql.hostchooser.HostChooser;
+ import org.postgresql.hostchooser.HostChooserFactory;
+@@ -387,11 +386,7 @@
+         // or an authentication request
+ 
+         String password = PGProperty.PASSWORD.get(info);
+-        
+-        /* SSPI negotiation state, if used */
+-        SSPIClient sspiClient = null;
+ 
+-        try {
+ 	        authloop:
+ 	        while (true)
+ 	        {
+@@ -507,88 +502,16 @@
+                     case AUTH_REQ_SSPI:
+                         /* 
+                          * Use GSSAPI if requested on all platforms, via JSSE.
+-                         *
+-                         * For SSPI auth requests, if we're on Windows attempt native SSPI
+-                         * authentication if available, and if not disabled by setting a
+-                         * kerberosServerName. On other platforms, attempt JSSE GSSAPI
+-                         * negotiation with the SSPI server.
+-                         *
+-                         * Note that this is slightly different to libpq, which uses SSPI
+-                         * for GSSAPI where supported. We prefer to use the existing Java
+-                         * JSSE Kerberos support rather than going to native (via JNA) calls
+-                         * where possible, so that JSSE system properties etc continue
+-                         * to work normally.
+-                         *
+-                         * Note that while SSPI is often Kerberos-based there's no guarantee
+-                         * it will be; it may be NTLM or anything else. If the client responds
+-                         * to an SSPI request via GSSAPI and the other end isn't using Kerberos
+-                         * for SSPI then authentication will fail.
+                          */
+-                        final String gsslib = PGProperty.GSS_LIB.get(info);
+-                        final boolean usespnego = PGProperty.USE_SPNEGO.getBoolean(info);
+-                        
+-                        boolean useSSPI = false;
+                        org.postgresql.gss.MakeGSS.authenticate(pgStream, host,
+                                user, password, 
+                                PGProperty.JAAS_APPLICATION_NAME.get(info),
+                                PGProperty.KERBEROS_SERVER_NAME.get(info),
+                                logger,
+                                PGProperty.USE_SPNEGO.getBoolean(info));
+
+                        break;
+ 
+-                        /* 
+-                         * Use SSPI if we're in auto mode on windows and have a
+-                         * request for SSPI auth, or if it's forced. Otherwise
+-                         * use gssapi. If the user has specified a Kerberos server
+-                         * name we'll always use JSSE GSSAPI.
+-                         */
+-                        if (gsslib.equals("gssapi"))
+-                            logger.debug("Using JSSE GSSAPI, param gsslib=gssapi");
+-                        else if (areq == AUTH_REQ_GSS && !gsslib.equals("sspi"))
+-                            logger.debug("Using JSSE GSSAPI, gssapi requested by server and gsslib=sspi not forced");
+-                        else
+-                        {
+-                            /* Determine if SSPI is supported by the client */
+-                            sspiClient = new SSPIClient(pgStream,
+-                                    PGProperty.SSPI_SERVICE_CLASS.get(info),
+-                                    /* Use negotiation for SSPI, or if explicitly requested for GSS */
+-                                    areq == AUTH_REQ_SSPI || (areq == AUTH_REQ_GSS && usespnego),
+-                                    logger);
+-                            
+-                            useSSPI = sspiClient.isSSPISupported();
+-                            logger.debug("SSPI support detected: " + useSSPI);
+-                        
+-                            if (!useSSPI) {
+-                                /* No need to dispose() if no SSPI used */
+-                                sspiClient = null;
+-                                
+-                                if (gsslib.equals("sspi"))
+-                                    throw new PSQLException("SSPI forced with gsslib=sspi, but SSPI not available; set loglevel=2 for details", 
+-                                            PSQLState.CONNECTION_UNABLE_TO_CONNECT);
+-                            }
+-                            
+-                            logger.debug("Using SSPI: " + useSSPI + ", gsslib="+gsslib+" and SSPI support detected");
+-                        }
+-
+-                        if (useSSPI)
+-                        {
+-                            /* SSPI requested and detected as available */
+-    	                	sspiClient.startSSPI();
+-                        }
+-                        else
+-                        {
+-                            /* Use JGSS's GSSAPI for this request */
+-                            org.postgresql.gss.MakeGSS.authenticate(pgStream, host,
+-                                    user, password, 
+-                                    PGProperty.JAAS_APPLICATION_NAME.get(info),
+-                                    PGProperty.KERBEROS_SERVER_NAME.get(info),
+-                                    logger,
+-                                    usespnego);
+-                        }
+-                        
+-	                	break;
+-	                
+-	                case AUTH_REQ_GSS_CONTINUE:
+-	                	 /* 
+-	                	  * Only called for SSPI, as GSS is handled by an inner loop
+-	                	  * in MakeGSS.
+-	                	  */
+-	                	sspiClient.continueSSPI(l_msgLen - 8);
+-	                	break;
+-	                	
+ 	                case AUTH_REQ_OK:
+ 	                    /* Cleanup after successful authentication */
+ 	                    if (logger.logDebug())
+@@ -609,18 +532,6 @@
+ 	                throw new PSQLException(GT.tr("Protocol error.  Session setup failed."), PSQLState.PROTOCOL_VIOLATION);
+ 	            }
+ 	        }
+-        } finally {
+-        	/* Cleanup after successful or failed authentication attempts */
+-        	if (sspiClient != null)
+-        	{
+-        		try {
+-        			sspiClient.dispose();
+-        		} catch (RuntimeException ex) {
+-        			logger.log("Unexpected error during SSPI context disposal", ex);
+-        		}
+-        		
+-        	}
+-        }
+         
+     }
+ 
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-9.3_p1100.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-9.3_p1100.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/jdbc-postgresql-9.3_p1100.ebuild,v 1.3 2014/12/28 15:24:21 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/jdbc-postgresql-9.3_p1100.ebuild,v 1.4 2015/04/22 22:27:05 monsieurp Exp $

 EAPI="5"

--- a/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1201.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1201.ebuild
@ -0,0 +1,100 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1201.ebuild,v 1.1 2015/04/22 22:27:05 monsieurp Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="postgresql-jdbc"
+MY_PV="${PV/_p/-}"
+MY_P="${MY_PN}-${MY_PV}.src"
+
+DESCRIPTION="JDBC Driver for PostgreSQL"
+SRC_URI="http://jdbc.postgresql.org/download/${MY_P}.tar.gz"
+HOMEPAGE="http://jdbc.postgresql.org/"
+
+LICENSE="POSTGRESQL"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	doc? (
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+	)
+	test? (
+		dev-java/ant-junit
+		dev-java/junit:4
+		>=dev-db/postgresql-9.3[server]
+	)"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/postgresql-jdbc-${MY_PV}.src"
+
+java_prepare() {
+	find -name "*.class" -type f -exec rm -v {} + || die
+
+	# Strip build.xml of maven deps
+	sed -i -e '/<classpath.*dependency\.compile\.classpath/c\' build.xml || die
+	sed -i -e '/<classpath.*dependency\.runtime\.classpath/c\' build.xml || die
+	sed -i -e '/<classpath.*dependency\.test\.classpath/c\' build.xml || die
+	sed -i -e '/<target name="artifact-version"/,/<[/]target>/{s/depends="maven-dependencies"//}' build.xml || die
+	sed -i -e '/<target name="compile"/ s/,maven-dependencies//' build.xml || die
+
+	# Remove SSPI, it pulls in Waffle-JNA and is only used on Windows
+	sed -i -e '/<include.*sspi/c\' build.xml || die
+	rm -vrf org/postgresql/sspi || die "Error removing sspi"
+	epatch "${FILESDIR}"/${P}-remove-sspi.patch
+
+	# FIXME @someone who cares: enable through osgi flag?
+	sed -i -e '/<include.*osgi/c\' build.xml || die
+	sed -i -e '/<test.*osgi/c\' build.xml || die
+	rm -vrf org/postgresql/osgi || die "Error removing osgi"
+	rm -vrf org/postgresql/test/osgi || die "Error removing osgi tests"
+	epatch "${FILESDIR}"/${P}-remove-osgi.patch
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_DOC_TARGET="publicapi"
+
+src_compile() {
+	EANT_BUILD_TARGET="release-version jar"
+	java-pkg-2_src_compile
+
+	# There is a task that creates this doc but I didn't find a way how to use system catalog
+	# to lookup the stylesheet so the 'doc' target is rewritten here to use system call instead.
+	if use doc; then
+		mkdir -p "${S}/build/doc"
+		xsltproc -o "${S}/build/doc/pgjdbc.html" http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl \
+			"${S}/doc/pgjdbc.xml"
+	fi
+}
+
+src_test() {
+	einfo "In order to run the tests successfully, you have to have:"
+	einfo "1) PostgreSQL server running"
+	einfo "2) database 'test' defined with user 'test' with password 'test'"
+	einfo "   as owner of the database"
+	einfo "3) plpgsql support in the 'test' database"
+	einfo
+	einfo "You can find a general info on how to perform these steps at"
+	einfo "https://wiki.gentoo.org/wiki/PostgreSQL"
+
+	ANT_TASKS="ant-junit" eant test -Dgentoo.classpath=$(java-pkg_getjars --build-only junit-4)
+}
+
+src_install() {
+	java-pkg_newjar build/jars/postgresql*.jar jdbc-postgresql.jar
+
+	if use doc ; then
+		java-pkg_dojavadoc build/publicapi
+		dohtml build/doc/pgjdbc.html
+	fi
+
+	use source && java-pkg_dosrc org
+}
--- a/dev-java/jsch/Manifest
+++ b/dev-java/jsch/Manifest
@ -1,3 +1,4 @@
 DIST jsch-0.1.41.zip 281985 SHA256 4a42313dafc8a72395aeb977613ed22a5d774bcca0fd3c25ba234fa907520fc5 SHA512 ac1387b534cb3680a8bd255afaa08c5ae9da73a0190c9c8c53e06e25b897382477a6e225caf7dc0d317f98afa16bf9006362bd4915967c0b5b6db6b8389e4e6e WHIRLPOOL a688fc11f4449087baa7621e31285a5b856214d6f022e49a8b08595004c2a4840c3d3e11e248bec8fae83520c41e5ee546f7fefaa4e53ce248136f7aa6a78e9d
 DIST jsch-0.1.44.zip 283903 SHA256 a6000c003097cab81ed37dfcf3cad7747ed181111850fddd9090b9cc7dd52ab2 SHA512 8d3e546af1c20231ff9765e9daeeafdc4adf0eb176188459608aeeb0c8155b803e5489154d6db3dcea9cd26bc13203ae088a2c01c9472cd6a3fb03b0fe2e6656 WHIRLPOOL eac2f99c0a5763c9bb68beafd2d45304aa000a6186561002018da219405028d75aa720bb1eaa4635479448c32a20ebaa82c00cf53622ac339442e9407c1b9402
 DIST jsch-0.1.49.zip 312322 SHA256 c017dfd2533b86dd751a8b1caea0ab4f19bfb9199c207c94fbdddcfd2ba9bbfe SHA512 6f21db4b561da65d4d22ecaecdc784aaca26b2dc625646a18a27b5dd7ef0eef5596786553e65b2d7f118b4993c4bb4e9561616052d15edf1a1ee1a3a7fd6b4ed WHIRLPOOL 4d09f8d122d1948400825d286718a2ee5cb42df55fbda059ff6c1260c88a5e6318ae9704d2bd7afc1f655b55d9347b39d158a01eaab1d77c506a6b99f117217e
+DIST jsch-0.1.52.zip 363648 SHA256 ceda29572f9bd670e425e48772b066e62e7a728edc6a6e23ba75f10444832ab5 SHA512 a5a998b6139638eee403e120f5f217112a5c09e81db8e1b1240d53ca311df4540b56aaa5f67f7a5c40cbc8420535d72d456e4fbfc95fe86d46376a00295bec4d WHIRLPOOL b820f35aab95e385bf457fbbd3ea4fc3c30057114c5c7025ac56dc435a4c708c51b450bfbac9b8202e23b90f062cced194def4aa8b479d629f1bef8121c66e5b
--- a/dev-java/jsch/jsch-0.1.52.ebuild
+++ b/dev-java/jsch/jsch-0.1.52.ebuild
@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jsch/jsch-0.1.52.ebuild,v 1.1 2015/04/22 22:01:13 monsieurp Exp $
+
+EAPI="5"
+JAVA_PKG_IUSE="doc source examples"
+
+inherit java-pkg-2 java-ant-2 java-osgi
+
+DESCRIPTION="JSch is a pure Java implementation of SSH2"
+HOMEPAGE="http://www.jcraft.com/jsch/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="zlib"
+
+RDEPEND=">=virtual/jdk-1.6
+	zlib? ( dev-java/jzlib:0 )"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${RDEPEND}"
+
+EANT_BUILD_TARGET="dist"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+src_compile() {
+	if use zlib; then
+		EANT_EXTRA_ARGS="-Djzlib.available=true"
+		EANT_GENTOO_CLASSPATH="jzlib"
+	fi
+
+	java-pkg-2_src_compile
+}
+
+src_install() {
+	java-osgi_newjar dist/lib/jsch*.jar "com.jcraft.jsch" "JSch" \
+		"com.jcraft.jsch, com.jcraft.jsch.jce;x-internal:=true, \
+		com.jcraft.jsch.jcraft;x-internal:=true"
+
+	dodoc README ChangeLog || die
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src/*
+	use examples && java-pkg_doexamples examples
+}
--- a/dev-lang/php/php-5.4.40.ebuild
+++ b/dev-lang/php/php-5.4.40.ebuild
@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.40.ebuild,v 1.3 2015/04/19 08:15:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.40.ebuild,v 1.4 2015/04/23 05:05:44 jer Exp $

 EAPI=5

 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd

-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"

 function php_get_uri ()
 {
--- a/dev-lang/php/php-5.5.24.ebuild
+++ b/dev-lang/php/php-5.5.24.ebuild
@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.24.ebuild,v 1.3 2015/04/19 08:15:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.24.ebuild,v 1.4 2015/04/23 05:05:44 jer Exp $

 EAPI=5

 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd

-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"

 function php_get_uri ()
 {
--- a/dev-lang/ruby/ruby-1.9.3_p551-r1.ebuild
+++ b/dev-lang/ruby/ruby-1.9.3_p551-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.9.3_p551-r1.ebuild,v 1.4 2015/04/15 04:17:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.9.3_p551-r1.ebuild,v 1.5 2015/04/22 17:20:37 jer Exp $

 EAPI=4

@ -34,7 +34,7 @@ SRC_URI="mirror://ruby/1.9/${MY_P}.tar.bz2
 		 http://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"
+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 +yaml" #libedit

 # libedit support is removed everywhere because of this upstream bug:
--- a/dev-lang/ruby/ruby-2.0.0_p645.ebuild
+++ b/dev-lang/ruby/ruby-2.0.0_p645.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-2.0.0_p645.ebuild,v 1.4 2015/04/15 04:17:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-2.0.0_p645.ebuild,v 1.5 2015/04/22 17:20:37 jer Exp $

 EAPI=5

@ -33,7 +33,7 @@ SRC_URI="mirror://ruby/2.0/${MY_P}.tar.xz
 		 http://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"
+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 cpu_flags_x86_sse2"

 RDEPEND="
--- a/dev-libs/dmalloc/dmalloc-5.5.2-r6.ebuild
+++ b/dev-libs/dmalloc/dmalloc-5.5.2-r6.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dmalloc/dmalloc-5.5.2-r6.ebuild,v 1.2 2015/04/22 16:54:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dmalloc/dmalloc-5.5.2-r6.ebuild,v 1.3 2015/04/22 17:02:45 jer Exp $

 EAPI=5
 inherit autotools eutils multilib toolchain-funcs
@ -11,7 +11,7 @@ SRC_URI="http://dmalloc.com/releases/${P}.tgz"

 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="static-libs threads"

 DEPEND="sys-apps/texinfo"
--- a/dev-libs/libnl/libnl-3.2.25.ebuild
+++ b/dev-libs/libnl/libnl-3.2.25.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-3.2.25.ebuild,v 1.10 2015/04/08 17:51:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-3.2.25.ebuild,v 1.11 2015/04/23 04:34:22 jer Exp $

 EAPI=5
 PYTHON_COMPAT=( python2_7 python3_{3,4} )
@ -16,7 +16,7 @@ SRC_URI="
 "
 LICENSE="LGPL-2.1 utils? ( GPL-2 )"
 SLOT="3"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="static-libs python utils"

 RDEPEND="python? ( ${PYTHON_DEPS} )
--- a/dev-perl/Text-Roman/Manifest
+++ b/dev-perl/Text-Roman/Manifest
@ -0,0 +1 @@
+DIST Text-Roman-3.5.tar.gz 18122 SHA256 cb4a08a3b151802ffb2fce3258a416542ab81db0f739ee474a9583ffb73e046a SHA512 597ca054094f58c0983c66ce2b22dbc4d69861b02495663987e6b66dc0044a0d7e18e51ef817ed3c76832d283c01c6f9f51e68af7cb6b186b27553b5a877bc33 WHIRLPOOL eada2cdc1c7438d57574ef1bc88a23cfc2ad346768575c8f7800631a07620251936a2d6af41f4adb4ede1b97201a65edaf5f070e8c26af6286c7afef6e0b749f
--- a/dev-perl/Text-Roman/Text-Roman-3.500.0.ebuild
+++ b/dev-perl/Text-Roman/Text-Roman-3.500.0.ebuild
@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Text-Roman/Text-Roman-3.500.0.ebuild,v 1.1 2015/04/23 00:40:49 mrueg Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=SYP
+MODULE_VERSION=3.5
+inherit perl-module
+
+DESCRIPTION="Allows conversion between Roman and Arabic algarisms"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+SRC_TEST="do"
--- a/dev-perl/Text-Roman/metadata.xml
+++ b/dev-perl/Text-Roman/metadata.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>perl</herd>
+  <maintainer>
+    <email>mrueg@gentoo.org</email>
+    <name>Manuel Rüger</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpan">Text-Roman</remote-id>
+    <remote-id type="cpan-module">Text::Roman</remote-id>
+  </upstream>
+</pkgmetadata>
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@ -1,4 +1,5 @@
 DIST oslo.config-1.10.0.tar.gz 96553 SHA256 1e77a2b3a05700192a11d0091b8c28257821eec8ae34707e08f8cb89aae770a5 SHA512 0e702644801726c0f1c0a70a417b9f17273567314859a985d62e1505eb4dc390a4ba41e2b5888acee9fe3e4ae25e4857acebad1474b347ea66e002a240044489 WHIRLPOOL c9447a4cabc5b8b324ca71d2ec82a95a0adcee7871c4dd604916683a19b4271296dc81e57b7580e588f2e57dcc590239e636357026d09c957d2adb0b032efe46
+DIST oslo.config-1.11.0.tar.gz 95550 SHA256 a5f61075b16e9155cc4e5aceab98f6e47d85bccaeb3739e364e151a9af0bc1ed SHA512 7fa8819e0f2516c94cfe48afbb7e620fc870d02b9e270cfda9726b241cd61271b04c40a97e70d3500590e70e7631d62491c7378db0e5a9b6975e8e42e6aa8d70 WHIRLPOOL 4a2c67297437536b66598dd2fba0f7594c2103a7e82d9839041e587a3421a0e53ab030f0a052a244364b3427c2a59e6aa212891cdd678f3965630828e5566866
 DIST oslo.config-1.3.0.tar.gz 49529 SHA256 1fa44f663f7109ccc3ddd393fbc5a7a077208e116f94e41ada7fbd977f27cbab SHA512 f596cf21e31b78bfe031d74db6720179d5092370dab87ad735605880ac2fd5d8f13b5aac06b4cdc0e1630343fbb90076151282e17916cbf1c020811a71f23583 WHIRLPOOL 5d108815e633d229895b4b8385e8b2d10ebbbeeb5eccd218a532dce93b4c77a651870aae2eae01fada9fd63fcfc09805f9bc5c8ee3794f20b369a4af31d60162
 DIST oslo.config-1.4.0.tar.gz 66544 SHA256 739e76e0a83ec585a3c0415140d9e6ba1b14c7f207e33643e8af7eb4346ffe07 SHA512 cbb9ebe2fd5daa6c78abe0a2169ed3e102f30d6118e53be34257356b218612d5905ecdada28527e8f8820385ef4a404b500ecbe95b01a9f00309271d0f869bc0 WHIRLPOOL fa756561a75c5aec8cc9d7784de2b5d8fc64ef3b86c979dd022d7ffed5f5ef02e261f8450d8818753b69710fb2096b136ef6a8571c2a9259193a27aa8c5343f4
 DIST oslo.config-1.6.0.tar.gz 90139 SHA256 a88cf1af696b4d9cae783a4c8c6898e6fb4abd176f9c9906ba388e7eac5eab17 SHA512 980ad40dd86695f9dd6aa9a491354b61a1b2852c24712493e20946a3b2c664348b07c9860674f7373b52e05b0dfe4c0de9cc1615b04c0a4d35a0ef7252058c3b WHIRLPOOL 78d2a49dda926172a5879095e056736108418445316c84d7f2b9a0e0c1baa871b900e6b9da414221cbcc3a0582d72126ec209e99719d9d2e21d6a2d34832b0ec
--- a/dev-python/oslo-config/oslo-config-1.11.0.ebuild
+++ b/dev-python/oslo-config/oslo-config-1.11.0.ebuild
@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oslo-config/oslo-config-1.11.0.ebuild,v 1.1 2015/04/22 20:22:44 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Oslo Configuration API"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.config/oslo.config-${PV}.tar.gz"
+S="${WORKDIR}/oslo.config-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux ~x86 ~x86-linux"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.8.0[${PYTHON_USEDEP}]
+	<dev-python/pbr-1.0.0[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
+		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	rm -rf .testrepository || die "could not remove '.testrepository' under ${EPTYHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
--- a/dev-python/oslo-context/Manifest
+++ b/dev-python/oslo-context/Manifest
@ -1,2 +1,3 @@
 DIST oslo.context-0.1.0.tar.gz 12320 SHA256 0340e533033607c18ce6a305d92f38a71fd89aaf439bf45074fd4ba9ee086971 SHA512 3e2e2cab4d5efbf8385277ac33d2babad3054b22713b3f343a47644c4420b1034e7711d353990116d2e149383293ba5a1ab1fe9247b42bf119705f5006e1a5b0 WHIRLPOOL 61b8b1be44213a8f1520c29de80adffd1341a3d3278fce0c7fc0bd50165a5b6793aaf6d62ea7685871cf20b59b922d773d3e67fbc26e3d7d13ef01773cbd8e7d
 DIST oslo.context-0.2.0.tar.gz 12726 SHA256 30bee9680a2bf5f947227cfd5996cebb17fd8c8e3013e5a594f7a7accb2947dd SHA512 afc1cf80a97bb90386750719e8314801057bf75c7cab1c2689d774bb337944cff324dc3737931f78b24bbf686ba4b5bbcb1e1ac1aae5347e700fd148556e6881 WHIRLPOOL 99dc8b37c582befbb9b32c26d8d106eb89bd9ef561193bc2cbf22c5ed0c2470f0f60a79bd06f9390866849eab2e65525ced9c8974c330ff5df2df3b5f3261e82
+DIST oslo.context-0.3.0.tar.gz 13108 SHA256 5ac98e1bf0f502de8f31d4ae397ce6b663beab26870e9f9a80d231400353b9cb SHA512 3a6cb17ec85b159d3bc496d3acfcfd7f03e92f32e5483c79be391d45a2af88ceb3c8ec2aae6714ac75f66b6664e3260a1e29c6f14c6802e8fa156f303b943ffa WHIRLPOOL c511b7470c09281402809af78ff7bd57d6ca241ab15736c876a9f705c08da8c7b5ce3dccd1867325e7b2052e83aec4fdd9fd9a32a9bd05f68ad10ccb4a9983cc
--- a/dev-python/oslo-context/oslo-context-0.3.0.ebuild
+++ b/dev-python/oslo-context/oslo-context-0.3.0.ebuild
@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oslo-context/oslo-context-0.3.0.ebuild,v 1.1 2015/04/22 19:52:36 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Helpers to maintain useful information about a request context"
+HOMEPAGE="https://pypi.python.org/pypi/oslo.context"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.context/oslo.context-${PV}.tar.gz"
+S="${WORKDIR}/oslo.context-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/hacking-0.10[${PYTHON_USEDEP}]
+		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+"
+
+# This time half the doc files are missing; Do you want them?
+
+python_test() {
+	nosetests tests/ || die "test failed under ${EPYTHON}"
+}
--- a/dev-python/oslo-db/Manifest
+++ b/dev-python/oslo-db/Manifest
@ -2,3 +2,4 @@ DIST oslo.db-1.0.2.tar.gz 90060 SHA256 7092525eab0352748fc0c58a7facd3d6ae967d913
 DIST oslo.db-1.4.1.tar.gz 127166 SHA256 e1fc76e17db9552c42ddca7b95ef8dce9a2049c68b90c0130ed2e27c7a9d82fb SHA512 138bef9fb82d08be9f2d13061689f6f2af7f16e75968d51e423d58a0c6a5bcc12b13a3849dbb0862789256f737e9c3e72be844125bd2cdcfcce0df91b8694ecc WHIRLPOOL 7a98eae42a620699518415f191af4099b4d2cfc8d68392b2d5ae29e90d2f501670110bf19edfd223a55f52b078cb7c26125f7e99fded99eb52715a45afd578d0
 DIST oslo.db-1.7.1.tar.gz 134351 SHA256 21ceab26d3fe4f69e8ec3a7444cff2f13bc8a6e298cc8ffbfbe965f782931b74 SHA512 02f48ec51c4af4eaa76d2ead7c73f5748b6f8340d7d9d304334f44b718b6aa8f841cc7b48166521f6ca6d93d8ee2a33d06570ec99b8ef1b1b628b6aa6d1eb789 WHIRLPOOL 11f2aa7a5a67bc822216cb3694623d5d6121dd9fc48d78e4837c56af589a73b8b43c2b01b8be2e799993e0af8e57972503d4e404f9242dcca1582ca7b17cbba2
 DIST oslo.db-1.8.0.tar.gz 143208 SHA256 0688ced3c34c975e2a68139e0f91601ef43c79fb73308d75674fdc40d30a2d4c SHA512 c97fd671572dc1fdc2bff642e5680f1b8910c737d295ff8d79bed6e4886de46216361de47c1e7f0ac88315988b7d1cd448d6cffff58d906524d8f9ec86d2e582 WHIRLPOOL 70d72ac5f0baf1c01eea040908a2b35336f793b3c7968f218e83a2c1699fd7381ca84cabef9a612069020a1292c3e195047a5795ca6fd9c62b961c68393b3f38
+DIST oslo.db-1.9.0.tar.gz 143040 SHA256 028ed6a38c1ed6d39d04f3dc2d7b7e2e0aca3cf53e72e145c3c07a5a0fb80eb8 SHA512 2131b2641502007b9b42aecbcb7e83a0cc90527edda2df91d52507dc58f0418b0111c9fb22e9d8bcf40ed53588adc9f02bec1b3df5788d99c775c328c1b3118b WHIRLPOOL f6205bb8e06efaf549d433c236069a5f0432cf49d1c64aadab0617f7badf4b6ea1a7277e42da1f62428c81d33f802adbb8895daf3cbbf9bd0e3e95f475a6bc80
--- a/dev-python/oslo-db/oslo-db-1.9.0.ebuild
+++ b/dev-python/oslo-db/oslo-db-1.9.0.ebuild
@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oslo-db/oslo-db-1.9.0.ebuild,v 1.1 2015/04/22 20:14:35 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Common DB Code"
+HOMEPAGE="http://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.db/oslo.db-${PV}.tar.gz"
+S="${WORKDIR}/oslo.db-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+sqlite mysql postgres"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.8.2[${PYTHON_USEDEP}]
+	<dev-python/pbr-1.0.0[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/alembic-0.7.2[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+	sqlite? (
+		|| (
+			>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
+			<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
+		)
+	)
+	mysql? (
+		dev-python/mysql-python
+		|| (
+			>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+			<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+		)
+	)
+	postgres? (
+		dev-python/psycopg:2
+		|| (
+			>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+			<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+		)
+	)
+	>=dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
+	>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+"
--- a/dev-python/oslo-i18n/Manifest
+++ b/dev-python/oslo-i18n/Manifest
@ -2,3 +2,4 @@ DIST oslo.i18n-1.0.0.tar.gz 31042 SHA256 008f86bc297ee05c63b1e2e4a85985802f086c8
 DIST oslo.i18n-1.3.1.tar.gz 35050 SHA256 8e1b9b3f87cea9e43a2414bb02d8c79b0a688c916afa1f1453f6a0a65ffd85f6 SHA512 987beef5e59b213988001fb53f1b2e41b122b830bd476c64a4481f7650db45d31d66c94d79da26e1fc346035393c00a63febb1254d3ab881ce3d2b00398c5ac8 WHIRLPOOL 7b590d93c478d855edfdfba8a31dac491913426100c8e216cfd4b82ff47b60f98b34a56ff69e2af49d0c16d3e2ac1813731527ab21bb4f9fe2f33dc5847d0835
 DIST oslo.i18n-1.4.0.tar.gz 36140 SHA256 a3d64e8d2b4235a457da2c6269d8c97e867a90ba7d938fe0ed3cfc792c8c87bb SHA512 df1491bb4d98b9295c08f4b7dc18cfff2758834ff5edb9aa3bdc064e587ab475e7e060dc5212c5db1e7e2f34cc4177e5c713a4ac6908a9750f50dc6316105682 WHIRLPOOL 8e77849c0a8f3c5a7e5b314f756673f31a3464f2a65c35e8ad506fd0ce10430b2fea0fae97eaccfef258b74a24db2f86b0843575d25f3d3a84a3b19ae0c5ff12
 DIST oslo.i18n-1.5.0.tar.gz 36068 SHA256 cd09da0780e45737b784bdc026ea705ad006e3c003aa5dfeab83f269b4ea0e70 SHA512 20a640950b7e0eef69371eece396fc6b284c87e195b98a98ec689f207f9ab4f8a41c70cac1c64b0f68621742b6e9da8001d422f67242a3e03e6b4cf09d8add96 WHIRLPOOL ce22737d5285abe18a7e62d01894da59f7d1068a0d16dd055ba62d40888bba7d1408f3d739bfa6a5da7f7149fc84f3794067db4562538f7cee99fca3871924ac
+DIST oslo.i18n-1.6.0.tar.gz 36136 SHA256 29be916f3f4c79cca76d57e604a187b3020354a2ca89d486647b79d8a9adbb9e SHA512 c3a338ce0e5f7fb22f193aa749b4d2402f394af6b010cbb8dddbe2ec259cf39ff8a31d1730da4517ec24208b1bf439af48b97bfdb34acfecd78876bb3f6f4ec1 WHIRLPOOL 50274047e4ee12dc4c823f23e3dd9c7459f381d7882339e8de4b743a67ae433e9a062b1042fc4304c9b9dd9544744a76d3139265f0d1cef8320e91cd7af2fc06
--- a/dev-python/oslo-i18n/oslo-i18n-1.6.0.ebuild
+++ b/dev-python/oslo-i18n/oslo-i18n-1.6.0.ebuild
@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oslo-i18n/oslo-i18n-1.6.0.ebuild,v 1.1 2015/04/22 20:35:11 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="oslo.i18n library"
+HOMEPAGE="http://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/hacking-0.10[${PYTHON_USEDEP}]
+		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
--- a/dev-python/oslo-log/Manifest
+++ b/dev-python/oslo-log/Manifest
@ -1,2 +1,3 @@
 DIST oslo.log-0.3.0.tar.gz 33955 SHA256 c32f85824f2634ffbb34fc7bc1dfebdc706b404ff787d97df98ccc508b311e59 SHA512 d50ead9274e29a9fa3d03f7cfa4de51601b4e2d3c28ccf1ded3a389d7485e5d858c418a5eafbedaec164f4d47ff40e066b0a3f6e11530f270a9d0a4a93d20556 WHIRLPOOL 6d1177899b4771660685a34ce7f91835803c27533bb8d60a047db889e243fac9e49f91ab691244beb0dbdc226bb6b0186e5d3e845e68e96005d4b574aeed01ba
 DIST oslo.log-1.0.0.tar.gz 34366 SHA256 3d66e9a70b82bc1c7c0b70114d093620e86bef679177ee1ec668c6e0a1acf52a SHA512 420a019592778e69cf339617d21b2eabde8220709f9067bbfe61ce11b8defc54f6635b8f120557b032bea15eac936ad4957e23f9f041556390c9e0b641ca0c0f WHIRLPOOL b579fe52acba0ca5957a55b6720862ef7343d0f41157e667f7bd63e57c6779af683cbaf083440c98a1cf0184cc162eb91b64a52a1a19c1e9732a7eb4ce8530c7
+DIST oslo.log-1.1.0.tar.gz 40991 SHA256 a568d567a99443b617338e4a9f120d3c866896b99e5aad2eff1bcfa448ea7e28 SHA512 761324c6a48e6c43411c44a741c7c8e38bdc0ad08e1eeadaf4efd3b264e00c428042b873bc294a0176bc0831d7a612d08e49da838611ad66e2954a7547cc42a0 WHIRLPOOL f680ce7722818bb3d1f2e682bce447ae37fd16a1ba066ac264c5c7ae1b29803c3c12e33138d6b66afcc5e222a401526f1b1eb07f294974551eef0184e83e575d
--- a/dev-python/oslo-log/oslo-log-1.1.0.ebuild
+++ b/dev-python/oslo-log/oslo-log-1.1.0.ebuild
@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oslo-log/oslo-log-1.1.0.ebuild,v 1.1 2015/04/22 19:32:27 prometheanfire Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack logging config library provides standardized configuration for all openstack projects."
+HOMEPAGE="http://pypi.python.org/pypi/oslo.log https://github.com/openstack/oslo.log"
+SRC_URI="mirror://pypi/o/oslo.log/oslo.log-${PV}.tar.gz"
+S="${WORKDIR}/oslo.log-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]"
+DEPEND="
+	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
+		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests oslo_log/tests || die "Tests fail with ${EPYTHON}"
+}
--- a/dev-python/oslo-messaging/Manifest
+++ b/dev-python/oslo-messaging/Manifest
@ -1,3 +1,4 @@
+DIST oslo.messaging-1.10.0.tar.gz 216864 SHA256 d7044bf66bf65848778a10955ac3ee9d7c5174c9b07687c2e36a624417e91d06 SHA512 e2a6e06248a52ddab4cf1fd02510e8d900b39002944df191776289290efac3455a78751caed018b5755158a643b31d9beaa825f0af5147caaf1571e5dbad2a50 WHIRLPOOL 61baa991eaabe168a2b2383913b74be545ac009010d0297dbac2ebb5165b2cae8c00226bf3539071a00c79d5d2db510d64c1accb9b64d03631e8b8b485818294
 DIST oslo.messaging-1.3.0.tar.gz 115501 SHA256 5abcb4c8725319e18a2d7d86f3768dfb3beb2b598cb4761879d45f509c95743c SHA512 bb15dee7f50e87a4aaa0a43437be9d084cbe02a51092a3ce0adac9ad3cb8ee21e6011e6f8d835464ae021be9db0be6defe23e6911b5fea118b00ba50e8a78dc3 WHIRLPOOL 649557bee31530bb2f40f4d6e1c640f5735cdc0c5cd4b7e2761f06a1365214195f0b37aa8ac4da8ac3b10826de94a46077ece955eaee5d81a38d4da0e346d954
 DIST oslo.messaging-1.4.1.tar.gz 144160 SHA256 28243db5fb84287016d6f58fa485a71496c825bcfca3ae806035017700a11945 SHA512 e5099bafa81f0dd86459034cf8a11031fb84b1af3b1fa7820e526f45241f37e8b2eea1a11b7aa420e38b36b3d7fbc2116ceeffe6cf635af9c36cc4ef8bb3b76a WHIRLPOOL 5732bcc2857448e996743914dc1e43b56fe13c6d5715b40967177dfbe0718b6e9d166e5a90fb394ae210150487bca2e3977335971ee9bf2780003ee790cb81d3
 DIST oslo.messaging-1.5.1.tar.gz 146353 SHA256 b1bac4fe771b089e839ae6b071a441f18468a5ac7c506a506d93875dce200250 SHA512 657633df4900321dccf0ede8d1e047d628c9451c9f33d5a4f61cd4bf1e476d1212b7b05351afab8e1020555ef69e567446e26970a2593c97cceaf2153259f640 WHIRLPOOL b869843f1f9e03054466b3324887922b011868b9b520231f7299d0496bc3d7decdea9b12f437c2bc2f8b1883231c7c5af269a86662c5e40740aecc7ce463050c
--- a/dev-python/oslo-messaging/oslo-messaging-1.10.0.ebuild
+++ b/dev-python/oslo-messaging/oslo-messaging-1.10.0.ebuild
@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oslo-messaging/oslo-messaging-1.10.0.ebuild,v 1.1 2015/04/22 20:42:32 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Messaging API for RPC and notifications over a number of different messaging transports"
+HOMEPAGE="https://pypi.python.org/pypi/oslo.messaging"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
+S="${WORKDIR}/oslo.messaging-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/hacking-0.10[${PYTHON_USEDEP}]
+		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
+		dev-python/qpid-python[${PYTHON_USEDEP}]
+		>=dev-python/redis-py-2.10.0[${PYTHON_USEDEP}]
+		>=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-0.2.0
+	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/kombu-2.5.8[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/futures-2.1.6[${PYTHON_USEDEP}]
+	>=dev-python/aioeventlet-0.4[${PYTHON_USEDEP}]
+	>=dev-python/trollius-1.0.0[${PYTHON_USEDEP}]
+"
+
+# This time half the doc files are missing; Do you want them?
+
+python_test() {
+	nosetests tests/ || die "test failed under ${EPYTHON}"
+}
--- a/dev-python/oslo-middleware/Manifest
+++ b/dev-python/oslo-middleware/Manifest
@ -1,3 +1,4 @@
 DIST oslo.middleware-0.4.0.tar.gz 21486 SHA256 d300f8342b5faaf712890d58da111789740aebb4b46874e41b45110b704719cb SHA512 6001ecdf42b0a2cf99c51bd43492e5d8dded2e41669e25a866808407d7762c90cdb8da2a8f5070c64df1ca81b5dedeac8dd012d2576c14fb201d236e73ed2188 WHIRLPOOL d431f55b50a6eccb29c9c4e061c8424d57a818007cec77792eb1ca2ea38c2309186f4ed5949558a60a1e385ac1a7dfb7b03940de129e3fc3f3421722b51f7503
 DIST oslo.middleware-0.5.0.tar.gz 23161 SHA256 c2d2a78debef27181d69e4f2e887cb2e4617f32ad4681a26c0d67210151bddf0 SHA512 a92c1e3bc82fdacf8028170e32600d48e4da0c422a1290ee4dde5fd848b367cc4c8906b7db1f1116d6a3a81a1d4e5d896f3bd3a89c121e58f2a108b532debe4a WHIRLPOOL 3d108f06e30273fbb99450be52512b548a152a7cd75143ff7a015b929506ed7070f4cf6b216b80d5b4c6a07724e9d72cfebaa4ae459f29d3516ebc7bc846c05e
 DIST oslo.middleware-1.0.0.tar.gz 23209 SHA256 5ccf160ae5ce23f3f59b86535352e3b5a9fa35dab0edc4ede8b17438da559995 SHA512 d1658c4608a1ba8f6501d9c576263560e2c77c24d6653081c17115f96011f298b0d203b1511830b4842efc08303b0d7452e6608f3e848145c25e9b960d11613c WHIRLPOOL 0a6c71290c2bbf5d8eca5c7264cd97f981e650139695f08a7fc6e320508cea9bdbb1d4c6d5b01f7cf702d11d5e21712477f73aa2fe2f62e17aa2c731022417d8
+DIST oslo.middleware-1.1.0.tar.gz 29957 SHA256 0647456ebf1611e2a0efc445673af3583780b0ccf694f61a8830d54fb5d6f63c SHA512 ae497098fe4edccf79ce93de1bd42967081616a81f7be8ec255a8732021943e8f377a6b57f6cc23c992506a5bed2641299d2653fcce6f6619d2ca1eff318cf71 WHIRLPOOL 410e422ea3b36e843e2ee91d64c23d84ffd86819bfca7e226fda3f1c2a6d11c9e8a8a4e7d5696764ce276a0b9984becf9361967861c17676b4fd9d77894baf82
--- a/dev-python/oslo-middleware/oslo-middleware-1.1.0.ebuild
+++ b/dev-python/oslo-middleware/oslo-middleware-1.1.0.ebuild
@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oslo-middleware/oslo-middleware-1.1.0.ebuild,v 1.1 2015/04/22 20:47:29 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Library includes components to be injected into wsgi pipelines to intercept request/response flows"
+HOMEPAGE="https://pypi.python.org/pypi/oslo.middleware"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.middleware/oslo.middleware-${PV}.tar.gz"
+S="${WORKDIR}/oslo.middleware-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+		>=dev-python/hacking-0.10[${PYTHON_USEDEP}]
+		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+"
+
+# This time half the doc files are missing; Do you want them?
+
+python_test() {
+	nosetests tests/ || die "test failed under ${EPYTHON}"
+}
--- a/dev-python/oslo-serialization/Manifest
+++ b/dev-python/oslo-serialization/Manifest
@ -1,3 +1,4 @@
 DIST oslo.serialization-1.0.0.tar.gz 16242 SHA256 f9748cfbce1cb2a48942f12cf64a558f607135cddd610dadef8a036aa879063c SHA512 5cde309368b61f7fbf4ea6ece4c7e26bb1c43f4eb96adee8aea89810d81d0b112a1d8443b658f6d25558c0e9071b55ba81ddbea608bc51459afb3704ac9bd78b WHIRLPOOL 2c7dc9223e23d8df3e5ac0c3962ca1d8f66c3bf1f67943274aefc03245f65d312ab33353ea3dc8b63a748a785524b1e5a846361965f2c381fcec90dff51becd4
 DIST oslo.serialization-1.3.0.tar.gz 22586 SHA256 6d5b0f8a0bdb59a7818e62c4c85c4f1ea81f634f2add368b553c93a5c4f28e93 SHA512 47db8850d8f3111e5dd0ef7d506cd629ba36d0996487dfe80256557f505d66accbc83131d6066e323eec85f1b9b22776c4a351372e50ab66e059c89a61f8ad16 WHIRLPOOL b4a9889a66c96da0f43f40cf7647da4ea848ec408192170eefe9f3d8cea435eacd5d5e55e2d4701b961b6819147faed82189f3e90cc3e33b1766b014bdc3aa5b
 DIST oslo.serialization-1.4.0.tar.gz 20631 SHA256 082dca272f0a941e1cdca1dc02849c5ddac65fa7d19604096be54cd41e7b4317 SHA512 d6f1428dbceecdad7e0bff8895a8312f00613f17f93b9a9ed66ff4c00e803331b2b19c547ebe3e13eccdd08dce82babd5753c8ede873705bff1cc70cafc1bfd9 WHIRLPOOL 5fe72f5e5ee85d828482bcef066ee86950cc69b1b7850c3340d60b18d2cc3b5221f63e5ef449a081f57c4f31c0f15864610847f072e529da6d832be67d3439de
+DIST oslo.serialization-1.5.0.tar.gz 24068 SHA256 3ca368c96777cb54a656b6429914717d17f05a7bda13ce6065c0930dce0d4f78 SHA512 5d5f7bce43b5ac3b2c7f12a53fb78340bc0a1eb7454426f43f2e9e45c913425a58e7828cd89bcf7b1b7ba58e1e50fe09097fb9b836872a89eb85676baa40b7a8 WHIRLPOOL 68553208d25e0c8f617258ef9c8eafb3d7b331794b26659963c170474435f7456cf4e7fe33134407965cb0f5b490a48655b08a7154bb76988327dbe344cc2c87
--- a/dev-python/oslo-serialization/oslo-serialization-1.5.0.ebuild
+++ b/dev-python/oslo-serialization/oslo-serialization-1.5.0.ebuild
@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oslo-serialization/oslo-serialization-1.5.0.ebuild,v 1.1 2015/04/22 20:04:44 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="oslo.serialization library"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+# Note: not in tree
+#test? ( <dev-python/hacking-0.8[${PYTHON_USEDEP}] )
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
+		<dev-python/hacking-0.11.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
+		>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	use doc && esetup.py build_sphinx
+}
+
+# Note: Tests fail due to requiring installation.
+#
+# Installation appears to fail due ot the use of namespace packages but root
+# cause was never truly established.
+RESTRICT="test"
+
+python_test() {
+	distutils_install_for_testing
+
+	PYTHONPATH="${TEST_DIR}/lib:${PYTHONPATH}"
+
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@ -3,3 +3,4 @@ DIST oslo.utils-1.1.0.tar.gz 40359 SHA256 f12dfba246ff52e94ec005d5c5862c0300e6cd
 DIST oslo.utils-1.2.1.tar.gz 54946 SHA256 9cd8bcde345554582fd12c6daab81a7327a90c72861aa644e8b7b3fbfed5deba SHA512 f928afe21ef908cb6f20beb42502c4709827fdcc7e44f81fd5adeb4ac8faf07649c813824702e0a1972e8100ec894f441017dfc3a887f1b56afd4bfa24846803 WHIRLPOOL c91b4e2eb283b46df6341d7f52ca61ee20b286c84afd8ca8a287627a7d3be914b343c9fd1ea141e02f2c7179c96921ab38c6d094666ba3979dc639fa5fb2e4f7
 DIST oslo.utils-1.3.0.tar.gz 57677 SHA256 1586065ba1cb4e5dbd731fd612d52945af815b9e3e1404209d8c955b87909b84 SHA512 cd8855ab3fc7123b6410c52142a82fbce0813defe77ca6e7434bd2d4f678c8c477a045aa6abd9fde8915874e45f058094f017a6150f4e07917db44b545788f01 WHIRLPOOL 1cecace92c179f7db2c382d0e6cbf53cb7a2ec8f38d4108f87b78de7ae4204d044af8d3cd5e5a75facda0d71b3933f5339d0bc5f9ff2869696173862cdf309f6
 DIST oslo.utils-1.4.0.tar.gz 61352 SHA256 f90e1d52542225031bc7e3d9bdc1b1270a80388e30285532124586e45e9317f6 SHA512 43cb855a9f05986db34f6aec845d0c4d6eb4c2e5fdb10b7f348786a6e28122eb6f476bb09af76bb406a985e4fae3f0b94eb5f1bbfd5b41fa5853cbb2d94b3a24 WHIRLPOOL f7f282199641a22f23fd3214b73ca1c52a7f241ebd4b67c1f1ba8505b62a42d70c7ed6a665357fb017de8ac1e8d7267f0f367bf88786dc97b23b0a9669328372
+DIST oslo.utils-1.5.0.tar.gz 67945 SHA256 797c048eb266abd7cf2e872b460e466453cc593efa524675e40b5abd3cdcaba6 SHA512 c9a582ef45223eab01ef49a8c248345cfccf57edb9d7d257c71f0f6014fdc95e6d47ecc84905b380dd1a4869636cdcf84f5f5648741a01323a37e16d818f3f14 WHIRLPOOL fb15d70b4b81faddd61d1d32f07e41a8e65052c407f3dfddb1d77a7f44150ba5da99327e28edad3f8eb65a6140f30bd83d6b68646ad2bf10985ba870c1d2442a
--- a/dev-python/oslo-utils/oslo-utils-1.5.0.ebuild
+++ b/dev-python/oslo-utils/oslo-utils-1.5.0.ebuild
@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oslo-utils/oslo-utils-1.5.0.ebuild,v 1.1 2015/04/22 20:30:40 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Oslo Utility library"
+HOMEPAGE="http://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+CDEPEND="
+	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/hacking-0.10[${PYTHON_USEDEP}]
+		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+# Note: Tests fail due to requiring installation
+#
+# Installation appears to fail due to the use of namespace packages but root
+# cause was never truly established.
+#
+# Tests fail with:
+# ImportError: No module named 'oslo.utils
+
+RESTRICT="test"
+
+python_test() {
+	distutils_install_for_testing
+
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
--- a/dev-python/py2neo/Manifest
+++ b/dev-python/py2neo/Manifest
@ -1,2 +1,2 @@
-DIST py2neo-2.0.3.tar.gz 251326 SHA256 e245e2c630d345f55571420ec8b748d3962ea299394e9f84cac942adab50016c SHA512 2a9d03bb3d423950a159d6e80ec597f55d88f73b6dbe5f56bc37dbb29c82c2815474b5f74e3ea11b3e8a076a82ef208139222636e32a4827376b7cacce0883d1 WHIRLPOOL 9a357bfd8106f25d134d6f28aa0eb6b37553fd3421dcd9a071e168845dc40a2077cc73ef9f2ac2bb9b0f6c96bd12c6871a0502cc4be101c17f30a39d4e77666d
 DIST py2neo-2.0.5.tar.gz 251262 SHA256 2c04d4223d2d356c4800c586f30c048757334f9391553c852c29aebf2368d101 SHA512 b1a899a8e6672c167af0a7410569be6f8b0061a2c2477dbbc87852faead0006231665a36e43830146649f6a6e480e5c5453104c976787b71279f1f01f6542cb9 WHIRLPOOL 0be3fba0a53933e10ac821af6242b2be1028797da38350be68ded6556978ca77a237e4e19dfb05ec8ae7cf10b108fd4491310604bd404ad86e4b4d1cd36d1026
+DIST py2neo-2.0.6.tar.gz 251448 SHA256 6bb828d6d3e48b4d095b3f7d79dbb690a47633f0a9812eb62f141b042bab3186 SHA512 93f94ff678ce34e7a9754330939379e9e4211ddf932484d748215c49548a48997a90bcf384a7bd3713ea341db68f0400eeaac40afc686336a144ee20fa09c8cf WHIRLPOOL c7cbba6f9b3f5a8c039817286bb1027c984cc3c1d48c7f17ea6c3770f0fc5d02811885955b854cac174bc2cbf579610642362c7e1955fcb958ffa905c6a2affa
--- a/dev-python/py2neo/py2neo-2.0.6.ebuild
+++ b/dev-python/py2neo/py2neo-2.0.6.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/py2neo/py2neo-2.0.3.ebuild,v 1.1 2015/01/14 04:53:52 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py2neo/py2neo-2.0.6.ebuild,v 1.1 2015/04/23 01:59:01 idella4 Exp $

 EAPI=5

--- a/dev-python/python-glanceclient/Manifest
+++ b/dev-python/python-glanceclient/Manifest
@ -1,3 +1,5 @@
 DIST python-glanceclient-0.13.1.tar.gz 109193 SHA256 46524a25d94fc518676c56320a40c362e32c75c8af13fa2bf9ff348e3aa25205 SHA512 e0c1cc15d7ed9218a076f9140ee75aad76d8d2d01e39f1b66dc1006f155742135231d636a93aa66a7b4ba4c75fa9c7cb0a5227c461615560a209001f22ea2830 WHIRLPOOL b77350d5fcce5cedfae405af7bdf562962bbb55b3fe7aee0370c73d29697033244bd7a145e1332137732ab60befa53f007936ba8596bfbd04b3566633b223a26
 DIST python-glanceclient-0.14.2.tar.gz 121369 SHA256 12f3554077be22d0bdbb6195a8142840f9985ffc0b83affb4ad96f1445a7e784 SHA512 bd07498a65718cc7d0b77b48b8266e81f92c7aec6c678915088e2631c69a93c53887fac423cc591462a6adc9d1a8dca16646e50bb33647a640107a6facc5d87f WHIRLPOOL b16f7c85b419c25181090ee2e4944c5247f448f2836960d044d079e879c108c5d039ac141c3a5efd2072e289bb81c8fc6aee14cca8aa4338d3d22932f66f8528
 DIST python-glanceclient-0.17.0.tar.gz 130715 SHA256 2e83b9100ad56beee9cbe343ee0a5233ac23ab015538feaa3e89400fa2d7fc81 SHA512 c4837985228fde78e051638ea89fc79fad1a054b7db3f669c3c3cd4f4c4e84c89e867758a71739069b347bb9670626b3c81a789670e28ded9ac26e28b7a933d7 WHIRLPOOL 75e1b289fdd38fa1aeb01c58174801ae544e153206a37cf8032030e1a9eeaada52acf4b3ae71094702e26b5b083cc39ffd91658b47df14b9044289f1aa118c7d
+DIST python-glanceclient-0.17.1.tar.gz 131534 SHA256 79e3426aa76d712a9fde4d4dcef4532d9099f8e4bdd2ef9802b428d0d99ffe7e SHA512 a54fcc990fe734c83573ee9cb44bff171440b4cf5a6ce7a9c6aa3fcde12b05037ba2a4bcad1df7b93d05e0774dd3581bab65b8342875b8834e1d0b7794f5d38d WHIRLPOOL f7da0e934f4b45b3e2b560387665ed743f8116f7ad06e3feb65d83427bc447825c5f989de8c3020de5597adcfe5d76a6a31e3af6ac6d09dd73c2dd737cfdd0ac
+DIST python-glanceclient-0.18.0.tar.gz 132194 SHA256 9784de057ffb8fadd98563452a9f30bfdca6d4531ce166ac2d101cd968a6194a SHA512 091f4a954e58abef40520ecb137fb47e02bd299e9903a83dc9eb26e428e4e0a0f58949e2eead5afaa271ef71e2827f319e72074bf93313ccd506f3374e95367d WHIRLPOOL edfe214cd791baed39f05617b2fa35b3eeae66754b57e9e553f019b3937fe04046bf73c9fa1c811f429a22622777b2507221b712e0b040efb7f8d0e2cb986b71
--- a/dev-python/python-glanceclient/python-glanceclient-0.17.1.ebuild
+++ b/dev-python/python-glanceclient/python-glanceclient-0.17.1.ebuild
@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-glanceclient/python-glanceclient-0.17.1.ebuild,v 1.1 2015/04/22 21:19:50 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Glance API"
+HOMEPAGE="https://github.com/openstack/python-glanceclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+REQUIRED_USE="test? ( doc )"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		test? (
+			>=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
+			<dev-python/hacking-0.9[${PYTHON_USEDEP}]
+			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+			>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+			>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+			<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
+			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+			>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+			!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+		)
+		doc? (
+			>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+			<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
+			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+			!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+			<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		)
+	"
+RDEPEND="
+	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-1.0.0[${PYTHON_USEDEP}]
+	<dev-python/python-keystoneclient-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.11[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/warlock-1.0.1[${PYTHON_USEDEP}]
+	<dev-python/warlock-2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -e 's:intersphinx_mapping:_&:' -i doc/source/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	testr init
+	testr run || die "testsuite failed under python2.7"
+	flake8 tests && einfo "run flake8 over tests folder passed" || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
--- a/dev-python/python-glanceclient/python-glanceclient-0.18.0.ebuild
+++ b/dev-python/python-glanceclient/python-glanceclient-0.18.0.ebuild
@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-glanceclient/python-glanceclient-0.18.0.ebuild,v 1.1 2015/04/22 21:19:50 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Glance API"
+HOMEPAGE="https://github.com/openstack/python-glanceclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+REQUIRED_USE="test? ( doc )"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		test? (
+			>=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
+			<dev-python/hacking-0.9[${PYTHON_USEDEP}]
+			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+			>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+			>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+			>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+			!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+			>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+			>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
+		)
+		doc? (
+			>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+			!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+			<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		)
+	"
+RDEPEND="
+	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.11[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/warlock-1.0.1[${PYTHON_USEDEP}]
+	<dev-python/warlock-2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -e 's:intersphinx_mapping:_&:' -i doc/source/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	testr init
+	testr run || die "testsuite failed under python2.7"
+	flake8 tests && einfo "run flake8 over tests folder passed" || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
--- a/dev-python/python-heatclient/Manifest
+++ b/dev-python/python-heatclient/Manifest
@ -2,3 +2,4 @@ DIST python-heatclient-0.2.12.tar.gz 99919 SHA256 e9d5b74206b322ce30184a1b132a78
 DIST python-heatclient-0.2.9.tar.gz 81470 SHA256 8cc6d99f86529633b8b5d99417358fd7c023223572f190ae3e1da09ff435420f SHA512 05fc3a5ff8e738fdc3ac2c5d8221c9be932467aa9109e1138c4a96053f7e68d8ba77b13f50968f05a37e94b60bd5ff2e798faf0c5b145ae80c2a0a6f7f68313a WHIRLPOOL 1c77ac1329c6f5dc1c207670d5864ea44046d6a0686b12c373ad2a26560999fc0bdc011b8efaf431f9c6f5379d19eb9bb65b68fb08a7297f12ec6e0313ce1846
 DIST python-heatclient-0.3.0.tar.gz 95621 SHA256 c3fe26b69610dcd1540f5ab2c8ae59183c3df09d9ede52a5bb704977345f29ad SHA512 f550e785ce21e1a1ad8dedfb1fc94bdaf4e0d9b5902c05a704b73c72e3e49ac6e35f79acbbc8ac511bca329d5032f796447899dfa737da0f7b8b376e5983153a WHIRLPOOL 9a02d508401600a659f552d2c7b46d7a4c94500514ff3763bd47ecfefa2fcc89cf49b20bbfbdb859a04fe4c719bcbdceb29d15cc793f631c89192a03642a2b3f
 DIST python-heatclient-0.4.0.tar.gz 104613 SHA256 1b71e2bb5c380ac6b2e1f07b48b7b3e82e7364cc43255ed696c795ab5f8d5a1d SHA512 f1235e40d6407fc05f53dfa1592d4f1fa72c10c6aa17fcbb78a7a8bf999cf803f4a42f9f7672f403d336006bdb72f3960d849474c398e592085f1d637a28faed WHIRLPOOL 680af36f92f9674667cf1ad97167248e3b30b4fc828065bd9f2dd7ecef4fd7dcd03729c5d257d8f31ce42184764bcea1d4c4aaee37d53ac63e1e44183c694f84
+DIST python-heatclient-0.5.0.tar.gz 104320 SHA256 b64eadecea1ecab5b69c1f51ddd157d53d218dea1360c201843f28a052cb3dbf SHA512 97ac1bb3ef1ca82730650e42dffa5dec2f1f37fac63c38a8c2de87b2ccf772b905749f4e9211831ec92871ebaee57a5094a4a1005e7391823a6dee27b0592dd8 WHIRLPOOL fc90b7a21d70c9044cdb39d626584192dcc347f531f0dc83b5b349d8731b7e3e0278586f5dcec32d9be10d02a6a6cb53175c6088fc43857b9b874a979da77de2
--- a/dev-python/python-heatclient/python-heatclient-0.5.0.ebuild
+++ b/dev-python/python-heatclient/python-heatclient-0.5.0.ebuild
@ -0,0 +1,98 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-heatclient/python-heatclient-0.5.0.ebuild,v 1.1 2015/04/22 21:06:07 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Orchestration API Client Library"
+HOMEPAGE="http://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+CDEPEND="
+	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
+		<dev-python/hacking-0.9[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)
+"
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	# BUG: https://bugs.launchpad.net/python-heatclient/+bug/1313257
+	ebegin 'patching heatclient/tests/test_common_http.py'
+	sed \
+		-e '645,/def/ d' \
+		-i heatclient/tests/test_common_http.py
+	STATUS=${?}
+	eend ${STATUS}
+	[[ ${STATUS} -gt 0 ]] && die
+
+	# BUG: https://bugs.launchpad.net/python-heatclient/+bug/1375035
+	ebegin 'patching heatclient/tests/test_shell.py'
+	sed \
+		-e '2116,/def|@/ d' \
+		-i heatclient/tests/test_shell.py
+	STATUS=${?}
+	eend ${STATUS}
+	[[ ${STATUS} -gt 0 ]] && die
+
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
+
+	testr init
+	testr run || die "testsuite failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
--- a/dev-python/python-heatclient/python-heatclient-9999.ebuild
+++ b/dev-python/python-heatclient/python-heatclient-9999.ebuild
@ -1,81 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-heatclient/python-heatclient-9999.ebuild,v 1.7 2014/09/28 23:16:33 alunduil Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3)
-
-inherit distutils-r1 git-2
-
-DESCRIPTION="OpenStack Orchestration API Client Library"
-HOMEPAGE="http://www.openstack.org/"
-EGIT_REPO_URI="https://github.com/openstack/${PN}.git"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="doc test"
-
-# NOTE: dev-python/discover is not used in tests
-# dev-python/discover[${PYTHON_USEDEP}]
-
-CDEPEND="
-	>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-	!~dev-python/pbr-0.7[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-"
-CRDEPEND="
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-0.10.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.2.1[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		${CRDEPEND}
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.9[${PYTHON_USEDEP}]
-		>=dev-python/httpretty-0.8.0[${PYTHON_USEDEP}]
-		!~dev-python/httpretty-0.8.1[${PYTHON_USEDEP}]
-		!~dev-python/httpretty-0.8.2[${PYTHON_USEDEP}]
-		!~dev-python/httpretty-0.8.3[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	${CRDEPEND}
-"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTYHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
--- a/dev-python/python-keystoneclient/Manifest
+++ b/dev-python/python-keystoneclient/Manifest
@ -1,2 +1,3 @@
 DIST python-keystoneclient-1.0.0.tar.gz 314308 SHA256 6d960d2196efc7a181519a77f757a27ceeeac71f41f624318ae7f1088d2e6db4 SHA512 331d1f634c06f142628c6c641e49a75ca721eb6a37e11827b12db293eeef3e39e9565b38db27d9e39464ef80f5a6d1da2b4e0365dc2eba2b22f63abe0b2992fc WHIRLPOOL abd1173e4caf31ffdef01e7a5f13869dcea4d8c053805ec995b675a46350f2c2a8d5c6d692127a048690b018c3785dc005d6c752df86277dc04873a4daa19525
 DIST python-keystoneclient-1.3.0.tar.gz 338528 SHA256 c009445d9a36fa788a14b093f67501091b246fefccb30fb63925e6e4fbeaac04 SHA512 51fd09419479ed00a9bd1785c0bf08cd7ee5393cb2eabba02558cf9828cbd9070f671377d759ff3dda0b675846f22dc8bb7419443e0b850c26f3263cd3b9b533 WHIRLPOOL 4f134aaefe9353382ab78a74109c139df55f9275cc2d932eae5cd8764e74f3b608fcf5bcfb659ac14504d87e944494b6a0221051dcf82a21bec109ddefeda7bf
+DIST python-keystoneclient-1.4.0.tar.gz 347743 SHA256 f525fc2431dc3eb863490d4d026d4dfb24e3b5a57496557cb6b5e7ebe9a7f9b0 SHA512 0a044235b5c9da2c9854e5e612ce1ae1c859119f661c226d8da53879b52d3e484d481a57e5daa6b1cf3e4f65ac1d47a4c24d720fe450b791f5752a44906d53d5 WHIRLPOOL bdc7c07fbc625c15baf12278d00c75ee40b3d240e62833d818fa9085a960d75d62a681b5e8965d5c968b0d1ed4bb21eddb29c141cf7100f2af86cae9d2e9834e
--- a/dev-python/python-keystoneclient/python-keystoneclient-1.4.0.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-1.4.0.ebuild
@ -0,0 +1,95 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/python-keystoneclient-1.4.0.ebuild,v 1.1 2015/04/22 20:58:58 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Client Library for OpenStack Identity"
+HOMEPAGE="http://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux ~x86 ~x86-linux"
+IUSE="doc examples test"
+
+# Note: blacklist version not in portage:
+#doc? ( !~dev-python/sphinx-1.3_preb1[${PYTHON_USEDEP}] )
+
+TCDEPEND="
+	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+	>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+	>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-mock-0.5.1[${PYTHON_USEDEP}]
+	>=dev-python/tempest-lib-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+	test? (
+		${TCDEPEND}
+		>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
+		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
+		!~dev-python/keyring-3.3[${PYTHON_USEDEP}]
+		>=dev-python/oauthlib-0.6[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
+		>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		${TCDEPEND}
+		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
+"
+PATCHES=(
+"${FILESDIR}/cve-2015-1852-master-keystoneclient.patch"
+)
+
+python_prepare_all() {
+	use doc && esetup.py build_sphinx
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}
--- a/dev-python/stevedore/Manifest
+++ b/dev-python/stevedore/Manifest
@ -2,3 +2,4 @@ DIST stevedore-0.15.tar.gz 348537 SHA256 bec9269cbfa58de4f0849ec79bb7d54eeeed9df
 DIST stevedore-1.0.0.tar.gz 351758 SHA256 4e859756bdba71d7cf4eb1313342cde93cfe36d12fb6b6c35378e9101add229f SHA512 c5969a39d20135e19d8edeeb563e6402ad6d322470a19f8020085fd38eec8f14e3a6a14bb8eff225f6e3b8d228e9aedf23dba6823a1f847069ab3f26db395add WHIRLPOOL 27cfd7c7bf6ccde9dc2f878fd31fd0b36fcfde97811ad958e38b25e8a6da845a82e27abd6f9828057b99f0e3e90558245035cf497b61d6b764d73604fb294934
 DIST stevedore-1.1.0.tar.gz 352294 SHA256 f98381d12a6bfff718328d14d0d26cae6c83e39feb787e7b38acfe1089c3f1d3 SHA512 70f8629fdd455421871753810c14462ba66f81d1478ea45696c400a68f034a77c2a3efaac3c96bebe7293c42f73715681161b7fca8897d545a7ae06d64ad0c44 WHIRLPOOL 1f3e5380792cea8b3ef67fc4a4f8be40fd3cb2f048caa71c0c774990dc45d9981edec599312301b3f7a54955b941a421574e3c23c794fc3f117251e845ea214d
 DIST stevedore-1.3.0.tar.gz 354869 SHA256 beab2b7f91966d259796392c39ed6f260b32851861561dd9f3b9be2fd0c426a5 SHA512 68583c8e7c9c667c4456754a973d344f79ca141d380e6e568d82f8b36fc77e8debc4d77a006eb7b6e580edf017307f748842f1cae8a82ef101114eebdab82c26 WHIRLPOOL 16eb37416b4dccf8606aca2d407eda9060549e014f41db0f54982707f9a9d51cb7bdfcb048b8bac494f707dce042e22a7ff87c210aff8e39d4940717a5f5a6ca
+DIST stevedore-1.4.0.tar.gz 353953 SHA256 4a8d80b0a232746c09e0173bd61d60a18e9864e3dc87e3ebefa3ba3d8a00232f SHA512 a947d13ef15b2a5210da7115de7b49b4297f811a8237f0d205c2e2a676747255a852300ca99dd5279ae0de49f706b380fc8a09921c9a1e9f0bf6ad7ea34023e3 WHIRLPOOL 7c4ab9ce986cec938772ed63094a8f2d6a5072be948845dd324c7c68cae4082781babd36d87d832bae37d30960efa76309350cfafa725555e02ca6354dd7c2aa
--- a/dev-python/stevedore/stevedore-1.4.0.ebuild
+++ b/dev-python/stevedore/stevedore-1.4.0.ebuild
@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/stevedore/stevedore-1.4.0.ebuild,v 1.1 2015/04/22 19:39:46 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Manage dynamic plugins for Python applications"
+HOMEPAGE="https://github.com/openstack/stevedore https://pypi.python.org/pypi/stevedore"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.8.0[${PYTHON_USEDEP}]
+	<dev-python/pbr-1.0.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/pillow-2.4.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND=">=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
+
+python_compile_all() {
+	use doc && ${EPYTHON} setup.py build_sphinx
+}
+
+python_test() {
+	nosetests stevedore || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
--- a/dev-tex/biblatex/Manifest
+++ b/dev-tex/biblatex/Manifest
@ -1 +1,2 @@
 DIST biblatex-2.9a.tds.tgz 17829003 SHA256 d3e6490505728113bcc5332f1a83fca1db6d50950e0ffaade495f4c5052e5175 SHA512 1341e530bc68096498306b9933a014eaf2e4ebc573b344776ae3f3addd93301927f31da84b368b812e364aae45bdab1624da69a63dfcd0589b3a28c7795f6ab8 WHIRLPOOL 51f30f41e323077a24958e0724d1357763f2c5e9b05ebf6dd11b254cde0d5d20f4a93cf66d9f722d550908d1d0c9856f430edc2067aabd4e4d3c11b293e465df
+DIST biblatex-3.0.tds.tgz 18965624 SHA256 8de8554eea84dce59a652d61a11e5fcd52c89f303471eb9ca58304b82155e889 SHA512 a8db58907953010c0376bda823ef03250428a2df0172a6e74f2725b19212a8df95c8e742b27f5301a5ca401ccee394d1aa4485bafc2263c985fbde1ce5de4c93 WHIRLPOOL b444a55a0149a5147e1142c4ba8a4ee2251e1f92cece83a8ee7b6ff79a46d46bbb9a22b4f34cdb06aba55eb9b13efb9465d32de60753f27d5c48931044411719
--- a/dev-tex/biblatex/biblatex-3.0.ebuild
+++ b/dev-tex/biblatex/biblatex-3.0.ebuild
@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/biblatex/biblatex-3.0.ebuild,v 1.1 2015/04/23 00:03:01 mrueg Exp $
+
+EAPI=5
+
+inherit latex-package
+
+DESCRIPTION="Reimplementation of the bibliographic facilities provided by LaTeX"
+HOMEPAGE="http://www.ctan.org/tex-archive/macros/latex/contrib/biblatex"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tds.tgz"
+
+LICENSE="LPPL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+RDEPEND="dev-texlive/texlive-bibtexextra
+	dev-texlive/texlive-latexextra"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}
+TEXMF=/usr/share/texmf-site
+
+src_install() {
+	insinto "${TEXMF}"
+	doins -r bibtex tex
+
+	dodoc doc/latex/biblatex/{README,RELEASE}
+	use doc && { pushd doc/ ; latex-package_src_doinstall doc ; popd ; }
+	if use examples ; then
+		docinto examples
+		dodoc -r doc/latex/biblatex/examples
+	fi
+}
--- a/dev-tex/polytable/Manifest
+++ b/dev-tex/polytable/Manifest
@ -1,2 +1 @@
-DIST polytable-0.7.2.tar.gz 19343 SHA256 cede8a13b28a2ac68eb5b254f02f27708e207313d08318e414292fc333ee98c1 SHA512 f50c797df05e9b84eb8a0d7d0fa6e1a6b8957903f6e2d2f0c8bab567238edefa88d2194f6bee36555621502d35d95e5eff155458529bd7e53e152a7044cc1d2e WHIRLPOOL 25c56d2f7973bed9d5a0b633c46c36058ba223cd6e6e449f657e6b2642e1164ae5613628ee5b387bee407e88f18094bd0246b88077d25354e474815328c726b5
 DIST polytable-0.8.2.tar.gz 23443 SHA256 0bb4adc399ede88816eb50fd0deff278c9ca2246540e06599fc68cfb3d2c9b0f SHA512 5fea2db7467817d13055124f8b2d1b8ee26d7edfae7fcc3a21c1cf44b4d22f6bbfa53fe47f71a02c0e9da3d6bf8ebf486dae88723676a76fbbb7818d6fb17c9e WHIRLPOOL 2351da79101432342250d9edbc8228f72772460a5b79504c627108597fd4fc11d1347891dd326fd665757f7f8ff32d736765b980d617c7eb1bce67f7abd7e08a
--- a/dev-tex/polytable/polytable-0.7.2.ebuild
+++ b/dev-tex/polytable/polytable-0.7.2.ebuild
@ -1,18 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/polytable/polytable-0.7.2.ebuild,v 1.11 2012/03/10 18:00:58 slyfox Exp $
-
-inherit latex-package
-
-DESCRIPTION="tabular-like environments with named columns"
-HOMEPAGE="http://www.ctan.org/tex-archive/macros/latex/contrib/polytable/"
-# originally from:
-#SRC_URI="http://www.ctan.org/tex-archive/macros/latex/contrib/polytable/*"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-LICENSE="LPPL-1.2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 sparc x86"
-IUSE=""
-DEPEND=">=dev-tex/lazylist-1.0a"
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${PN}"
--- a/dev-tex/texamator/Manifest
+++ b/dev-tex/texamator/Manifest
@ -1,2 +1 @@
-DIST TeXamator.v.1.5b.tar.gz 406930 SHA256 54b1e840a700abe0bb661e7e0b5c22f85b730a7787f7c8a7c640be6ed19c1c7b SHA512 995b829785b9339a1cf8fd5e560164af9b999a10a29b25897bad123141721c40cb6d2446359fe8f923bccb0e2d0c4f461397a4f1551e4ea4ad66a435a3256e7e WHIRLPOOL 2f80768ae0468d560317ef231b25357b939ac267a88cb17a500f89c9276808a9c76c4edaff9b9c84ad02d1620c56836a30c6e38ade14698ecf6f17a27279021f
 DIST TeXamator.v.1.7.5.tar.gz 784894 SHA256 b81298658c370e0695dcdce109144037836bc830a7ffcc15f38c30aec0fbb0ad SHA512 a0b05364ac1a65250a2b493616d618b1bd57950681b8f9b60200790572c1bac86dcc86fb922bb0d26bfe49f4d076a5d2f109761a4cdd5630807db03ea7928bb1 WHIRLPOOL 4e299251264cb116c38e3f8abf324a9c24235845384705b78a57766cde5b2197e51f0a17f04513520d18b19e2fd94cf745a94287c919074ee4963d32e722ff6a
--- a/dev-tex/texamator/texamator-1.5b.ebuild
+++ b/dev-tex/texamator/texamator-1.5b.ebuild
@ -1,51 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/texamator/texamator-1.5b.ebuild,v 1.2 2011/04/25 19:27:48 arfrever Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-
-inherit multilib python
-
-MY_PN=TeXamator
-
-DESCRIPTION="A program aimed at helping you making your exercise sheets"
-HOMEPAGE="http://snouffy.free.fr/blog-en/index.php/category/TeXamator"
-SRC_URI="http://snouffy.free.fr/blog-en/public/${MY_PN}/${MY_PN}.v.${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/PyQt4
-	app-text/dvipng
-	virtual/latex-base"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_install() {
-	python_need_rebuild
-
-	dodoc ${MY_PN}/README
-	rm -f ${MY_PN}/README
-
-	insinto /usr/$(get_libdir)
-	doins -r ${MY_PN} || die
-
-	dobin "${FILESDIR}"/${PN} || die
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/$(get_libdir)/${MY_PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/${MY_PN}
-}
--- a/dev-tex/xymtex/Manifest
+++ b/dev-tex/xymtex/Manifest
@ -1,2 +1 @@
-DIST xymtex500.zip 8353092 SHA256 0b5d066fe43a1940a257e76f4fe59f7665dd45b061ec2252165c9fec7e70fecf SHA512 4db1b4ca31bc90812274b3a62e0aa2570d10a90d219dbdaba61a14b6e97299c5081533b237831a3faa8298e32d7b654f108d137c88510c1b203b8c859498d123 WHIRLPOOL 376b934353d4b1b01acf2c0f5644f02ed934f82d03f9c71088bce4d276f81d2ef520c52b48cc87b1e58f1acfa6b4a58121de696a3500f7c9a2c1d4972fc72b22
 DIST xymtex500a.zip 8362958 SHA256 f7f472e3a47988c6ced0f781b280bea54fa5c6337004d23e1fcf56da58564ebd SHA512 5ee0c13443084dce896d2560561c423d94b1d5e2ab10bd120a957e798de7c11efd192872de2b4b8d7df60a1f126a368e5d1dbdb90ce6055b9ab6067a71668fe3 WHIRLPOOL d769a243b3da5483652ebe165fc15e34bc9f78f2fbdbd83c380da7b4a15ab72f467911dc43e9eba1b1512eff7f7981b0d82c49a239824fab333cb2bc9641a052
--- a/dev-tex/xymtex/xymtex-5.00.ebuild
+++ b/dev-tex/xymtex/xymtex-5.00.ebuild
@ -1,43 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/xymtex/xymtex-5.00.ebuild,v 1.3 2010/10/27 14:32:21 hwoarang Exp $
-
-EAPI=3
-
-inherit latex-package versionator
-
-DESCRIPTION="LaTeX package for rendering high-quality chemical structure diagrams"
-HOMEPAGE="http://xymtex.com/"
-MY_PV="$(delete_all_version_separators)"
-SRC_URI="${HOMEPAGE}/fujitas3/${PN}/xym${MY_PV}/xym-up/${PN}${MY_PV}.zip"
-LICENSE="LPPL-1.3"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S="${WORKDIR}/${PN}"
-
-TEXMF=/usr/share/texmf-site
-
-src_compile() {
-	local subdir
-	for subdir in base chemist xymtxpdf xymtxps; do
-		cd "${S}/${subdir}" || die
-		latex-package_src_compile
-	done
-}
-
-src_install() {
-	local subdir
-	for subdir in base chemist xymtxpdf xymtxps; do
-		cd "${S}/${subdir}" || die
-		latex-package_src_install
-	done
-
-	cd "${S}/doc/doc${MY_PV}/" || die
-	latex-package_src_doinstall pdf
-}
--- a/dev-util/argouml/Manifest
+++ b/dev-util/argouml/Manifest
@ -1,10 +1,4 @@
-DIST ArgoUML-0.29.2.tar.gz 14338691 SHA256 d19821f5113a5bfb42291c8745382431ca231c602be0eaeaff5dff332a991784 SHA512 bb53bd79bcc08640b10ce9e795903690e7afca2519b9307653b4e9940212df335e4d7b3ec6a1a4f5cfe425e1cdbc61cfe40bf2cca803b5f99a838e0d5af42552 WHIRLPOOL d37f483d29a8528feeb3b9bd61fdccfd2e2b44f763f497cffe8de5f2a05b6a196c1b4a97de01d15b051a8b179f5990d61fb941a7df4e0f8d95bafb185b4a8a65
-DIST ArgoUML-0.32.2.tar.gz 15819963 SHA256 6140031b06db5b9af045b360e12b829ba373a77d54e9f83a74f2dfc4e1558906 SHA512 81ccc8527b81b5a897bbb97f174a68fcea8bbd481491830e96b61e7f95c8e6532fc623e2bc85dbb0966bce9c98a4a8146e4d5b09d69be117accb9ab91485955f WHIRLPOOL 9d3c4d6e81a7a78ef16cf4202c14868e6e63bc8d2f8056d90d01bd751d669d3f44ea24a4dd4dd00464364188d3883dab222860e950c0ce5256dbfe4eee856f62
 DIST ArgoUML-0.34.tar.gz 16504818 SHA256 818fdbbbaf48f70f3a7386cd4dab5313cdba3293b3d8df49a3045911a5372dc3 SHA512 111d5ff588fe895274b02f5d5a8385455bf3130918a371f3e549c0a7d41c8bd1d109c976b2039ceae26847fac29689aa4339e35916352be633d1fe1a277d79e5 WHIRLPOOL 1b207c330e2d81c5f6e8e4c00a5c10ce78418c6ffc379b68e95c6f6114d394a936a4f1f16e768f776744f677310cb3a3b9a5cbdfebf3970c89dbeaaae3c822fa
 DIST dbuml-module-1.0.4.zip 6231786 SHA256 47b3b26c5eeb884ffcc88d9a56f327a0e746b1851fa53d2ca66845bf5536d0d9 SHA512 a281a8bb8b8422cfceaf704e6b26a0c8b7c8ee393756ebee86ede8a8681b0ba9f8f5b5e568899e6e7b55fba20edba74f9e7a532f647dbf1549f582b3226028b6 WHIRLPOOL a1a4c7027f1f131948b099c374b37c263b80e54e442c8795818a3ed94d3f1d2dcdff29a9ec2e448385ca5ba10bdc1a5594c279a3f400fe794e099430163452c6
-DIST manual-0.29.2.pdf 3406767 SHA256 8d569acd7c4e323347024ccbbdf3a97fad19fffc1dd2364112779837d40fe176 SHA512 ede204ae740f473f62838d3f810d2fa1b6dcc89b612f370e535694447c3feac8b615885da3ea3cce5774f74ed5d54585c4c1b00be44b857d10363325f7fd014b WHIRLPOOL f8593ea7df3f29416319eb21d2ae8c76a72ad473c59f695f8cc899eacef205ddf57ccb426486b75b389346e03c2d5b2a11045530476814a69d7ab3d4dbe19d6d
-DIST manual-0.32.2.pdf 3405772 SHA256 aad5d006772ee6bd62f16078a5d105c0a8eb8136dbaa226664a6d321ea054ec7 SHA512 b48c3c282629da589658c3518aa7e2d9e99f625a6a64dcc7aeb0a63444b0679ad13d409ced98f6a647945c0638774da690a5a54c993f2859cfc95c4f98d56b15 WHIRLPOOL b92196bd781fc7252253441549e6b8abbaa2c865a993d85e7f6d23d79a4b92b962a5b50de8a552d62ebabfdd0938970f6551854b3cbc383fee79e6016fd1ceee
 DIST manual-0.34.pdf 3405949 SHA256 13c91e8b7802fe3a4d4462b9608f06755981549865a710dccc2372021b270c49 SHA512 1dfaf66485beb82d309a58f3868f7c150575d99d652dbef261991429df85073ffce0cf8d73f44f4f9c13299be3cd11f92826da695901846c7b8dc6561b0090d8 WHIRLPOOL edeee1ea860629ceb8b13552672f56113d0293eab8dcfa4c819b42786e2d672f03b97a8553b127a0679ac00a7839b0ed9e043f003d632a71162aa7695f40af09
-DIST quickguide-0.29.2.pdf 58300 SHA256 11e66c912655ef2d7aaf9e18fff1912b6fb83314f2478356d29f1aea9b214f37 SHA512 7bd18354f437a5dc9fd7ba72287f38b039ddd24ccc6e57639e5696a76930cc573a4ebc87f139dc42ce80630278448420568eecb790f75d3b58b2fb07b0b2f041 WHIRLPOOL a3a8ff87c47b46009de1b5ebf4b973b0e53c3d231f225f129605ee4d832f60b8f45f5d7cdf045639fabc9ae3ce8ba59f57e32b08b710e8f920015ef682745ecd
-DIST quickguide-0.32.2.pdf 58284 SHA256 e5be421fdd1ef865c6dd7defe598070c605bcb71ca36bf6cd5c87195c8403799 SHA512 e019433765af968ad58899ee27ff36e0e88c83c2db5925488f3acdd0784c1a99b2301d5965c0c2bcab662b4aaf54d2d8040682c231d29be56b2eac873018fce4 WHIRLPOOL e523326500d1f455db5590b7280d2748b5487d6ae867d7bf54ae570dac5e478c2f234507418acfb0657fa57d4af98c0e0a24800f38f3a270bda3b954f6c3ba97
 DIST quickguide-0.34.pdf 58334 SHA256 6972651140234aad7c1c93948f1d788b1c0a64dc09d8a5342d712904d181e458 SHA512 0bcdeaa643d400e17b12d92c78eddb33a202220ccb26e5a9933528faa0e8d3fccde432a1fba2103b28bec59d3df75e1176ed2918308533f7e490fbdb5d60a82d WHIRLPOOL 73c660703e021f58f0ce3be9cdb8edfd4819337e02465c3d0d9632b1e28ada05a1ac39b9379437729275a20f46a2d14a1c41177688c635e5bd16c7ccc4061035
--- a/dev-util/argouml/argouml-0.29.2.ebuild
+++ b/dev-util/argouml/argouml-0.29.2.ebuild
@ -1,46 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/argouml/argouml-0.29.2.ebuild,v 1.3 2010/02/01 20:07:26 maekke Exp $
-
-inherit java-pkg-2
-
-DESCRIPTION="modelling tool that helps you do your design using UML"
-HOMEPAGE="http://argouml.tigris.org"
-BASE_URI="http://argouml-downloads.tigris.org/nonav/${P}"
-SRC_URI="${BASE_URI}/ArgoUML-${PV}.tar.gz
-	http://argouml-downloads.tigris.org/nonav/argouml-db-1.0/dbuml-module-1.0.4.zip
-	doc? (
-		${BASE_URI}/manual-${PV}.pdf
-		${BASE_URI}/quickguide-${PV}.pdf
-	)"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="doc"
-
-DEPEND="app-arch/unzip"
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}"
-
-src_compile() { :; }
-
-src_install() {
-	java-pkg_jarinto /opt/${PN}/lib
-	java-pkg_dojar ${P}/*.jar
-
-	java-pkg_jarinto /opt/${PN}/lib/ext
-	java-pkg_dojar ${P}/ext/*.jar release/ext/*.jar
-
-	java-pkg_dolauncher ${PN} --main org.argouml.application.Main
-
-	dodoc ${P}/README.txt
-
-	if use doc ; then
-		dohtml -r release/{Readme.htm,www}
-		insinto /usr/share/doc/${P}
-		doins "${DISTDIR}/manual-${PV}.pdf"
-		doins "${DISTDIR}/quickguide-${PV}.pdf"
-	fi
-}
--- a/dev-util/argouml/argouml-0.32.2.ebuild
+++ b/dev-util/argouml/argouml-0.32.2.ebuild
@ -1,59 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/argouml/argouml-0.32.2.ebuild,v 1.2 2012/02/06 15:17:43 sera Exp $
-
-EAPI="3"
-
-inherit eutils fdo-mime java-pkg-2
-
-DESCRIPTION="Modelling tool that helps you do your design using UML"
-HOMEPAGE="http://argouml.tigris.org"
-BASE_URI="http://argouml-downloads.tigris.org/nonav/${P}"
-SRC_URI="${BASE_URI}/ArgoUML-${PV}.tar.gz
-	http://argouml-downloads.tigris.org/nonav/argouml-db-1.0/dbuml-module-1.0.4.zip
-	doc? (
-		${BASE_URI}/manual-${PV}.pdf
-		${BASE_URI}/quickguide-${PV}.pdf
-	)"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc"
-
-DEPEND="app-arch/unzip"
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}"
-
-src_compile() { :; }
-
-src_install() {
-	java-pkg_jarinto /opt/${PN}/lib
-	java-pkg_dojar ${P}/*.jar
-
-	java-pkg_jarinto /opt/${PN}/lib/ext
-	java-pkg_dojar ${P}/ext/*.jar release/ext/*.jar
-
-	java-pkg_dolauncher ${PN} --main org.argouml.application.Main
-
-	dodoc ${P}/README.txt || die
-
-	if use doc ; then
-		dohtml -r release/{Readme.htm,www}
-		insinto /usr/share/doc/${P}
-		doins "${DISTDIR}/manual-${PV}.pdf"
-		doins "${DISTDIR}/quickguide-${PV}.pdf"
-	fi
-
-	newicon ${P}/icon/ArgoIcon128x128.png ${PN}.png || die
-	make_desktop_entry ${PN} "ArgoUML"
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
--- a/dev-util/bsdiff/bsdiff-4.3-r1.ebuild
+++ b/dev-util/bsdiff/bsdiff-4.3-r1.ebuild
@ -1,29 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bsdiff/bsdiff-4.3-r1.ebuild,v 1.13 2010/10/19 05:17:27 leio Exp $
-
-inherit toolchain-funcs flag-o-matic
-
-IUSE=""
-
-DESCRIPTION="bsdiff: Binary Differencer using a suffix alg"
-HOMEPAGE="http://www.daemonology.net/bsdiff/"
-SRC_URI="http://www.daemonology.net/bsdiff/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD-2"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
-
-DEPEND="app-arch/bzip2"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	append-lfs-flags
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o bsdiff bsdiff.c -lbz2 || die "failed compiling bsdiff"
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o bspatch bspatch.c -lbz2 || die "failed compiling bspatch"
-}
-
-src_install() {
-	dobin bs{diff,patch}
-	doman bs{diff,patch}.1
-}
--- a/dev-util/bsdiff/bsdiff-4.3-r2.ebuild
+++ b/dev-util/bsdiff/bsdiff-4.3-r2.ebuild
@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bsdiff/bsdiff-4.3-r2.ebuild,v 1.4 2011/12/18 19:44:59 phajdan.jr Exp $
-
-EAPI=2
-
-inherit toolchain-funcs flag-o-matic
-
-IUSE=""
-
-DESCRIPTION="bsdiff: Binary Differencer using a suffix alg"
-HOMEPAGE="http://www.daemonology.net/bsdiff/"
-SRC_URI="http://www.daemonology.net/bsdiff/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD-2"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
-
-DEPEND="app-arch/bzip2"
-RDEPEND="${DEPEND}"
-
-doecho() {
-	echo "$@"
-	"$@"
-}
-
-src_compile() {
-	append-lfs-flags
-	doecho $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o bsdiff bsdiff.c -lbz2 || die "failed compiling bsdiff"
-	doecho $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o bspatch bspatch.c -lbz2 || die "failed compiling bspatch"
-}
-
-src_install() {
-	dobin bs{diff,patch} || die
-	doman bs{diff,patch}.1 || die
-}
--- a/dev-util/ftjam/ftjam-2.5.3_rc2.ebuild
+++ b/dev-util/ftjam/ftjam-2.5.3_rc2.ebuild
@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ftjam/ftjam-2.5.3_rc2.ebuild,v 1.14 2014/08/10 21:27:09 slyfox Exp $
-
-inherit eutils versionator
-
-MY_PV=$(delete_version_separator _)
-
-DESCRIPTION="Jam is a powerful alternative to make.  FTJam is a 100% compatible enhanced Jam implementation"
-HOMEPAGE="http://freetype.sourceforge.net/jam/index.html"
-SRC_URI="http://david.freetype.org/jam/ftjam-${MY_PV}.tar.bz2"
-
-LICENSE="perforce GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="!dev-util/jam
-	sys-devel/bison"
-RDEPEND="!dev-util/jam"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/ftjam-2.5.3-nostrip.patch
-	epatch "${FILESDIR}"/ftjam-2.5.3-i-hate-yacc.patch
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc README README.ORG CHANGES INSTALL RELNOTES
-	dohtml Jam.html Jambase.html Jamfile.html
-}
--- a/dev-util/pscan/pscan-20000721.ebuild
+++ b/dev-util/pscan/pscan-20000721.ebuild
@ -1,33 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pscan/pscan-20000721.ebuild,v 1.8 2009/09/23 17:46:47 patrick Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="A limited problem scanner for C source files"
-HOMEPAGE="http://www.striker.ottawa.on.ca/~aland/pscan/"
-# I wish upstream would version their files, even if it's only with a date
-SRC_URI="http://www.striker.ottawa.on.ca/~aland/pscan/pscan.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-
-# Does NOT contain a testsuite, but does contain a test.c that confuses src_test
-RESTRICT="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	sys-devel/flex"
-
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	emake CC="$(tc-getCC) ${CFLAGS}" || die
-}
-
-src_install() {
-	dobin pscan || die
-	dodoc README find_formats.sh test.c wu-ftpd.pscan
-}
--- a/dev-util/shtool/Manifest
+++ b/dev-util/shtool/Manifest
@ -1,4 +1 @@
-DIST shtool-2.0.2.tar.gz 91684 SHA256 3479f0e884b7946acb9b2641c7ef40575b7f9ab3cb7ca88911d58617615ea28f SHA512 2f9b2df5fdfec7b9dda06dfc9950e3ca194a6f02f9f89a773bd195655f9e91bdce8491ab66d54547e935544d6cf20aa55342ca6ac02a9c6bdae34fadded89c0c WHIRLPOOL d36852e7c46466c01744b9b425be0ef20618bbc4326a288d677a7b3d654384b48da417ed1cc7580a173d55596fa2ac2d4e0b3a84eef8aa4cda03c6efc6e1c2ce
-DIST shtool-2.0.3.tar.gz 92148 SHA256 92a0fff0a1aa69d9b284b4ebf8d9ed009119575ca2313773c86bf099a4a2edc6 SHA512 787cfba860c8629c605e7aacbf933be5fd116a67636d4435f6067f05cfbd555de473f1cf1aef2d8194e29053f9e3623a2ff7dff2a4bc872af4b54dd248d3db82 WHIRLPOOL 02a40200ef5466ec7d05ef54e3a2ac86703e824d12eed675eca286ed894bd088f3e82ed1453be930659247af74b10914bb8467ecace1c2cd17f3ab9dd7bc888d
-DIST shtool-2.0.4.tar.gz 92616 SHA256 6e67931b482fcfc865ec6d2e4a3338b6ca281e2afcb190c2a91a45d7ae5a615d SHA512 98b5932618fe2b16bf8bdbdcf3a188a5728a8179df5b6db0996f64a844b087e35f04d8ace185951efc5fab25eeef1217c55082efd72b565710d7f750291b3416 WHIRLPOOL 9242760bcf0ade35fd6ad736d957874beefb0187e81ee166f03e5c9f0a6cf70b511df9ea1f593e1f0c75616276067655e3487fa8a97d3c9a3ebdf905d7b18d9f
 DIST shtool-2.0.8.tar.gz 97033 SHA256 1298a549416d12af239e9f4e787e6e6509210afb49d5cf28eb6ec4015046ae19 SHA512 f0c9292e8d980323d587b70e582574ba1cfe3c26296a01d51a2068a7886e5b1f501e8c5dc37b5d4b0f7a34217c7ad7f6f3011969d9c2d65776fe66e8287c1758 WHIRLPOOL d7c161a7b4492df79a0d1c20ee6bc25f920fd3bdf198dea46a0978121c8a128ce758af45c836f8e0b59b16dfa670ce03fc57ee073d2c69402abbc2a969ae38c9
--- a/dev-util/shtool/shtool-2.0.2.ebuild
+++ b/dev-util/shtool/shtool-2.0.2.ebuild
@ -1,20 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/shtool/shtool-2.0.2.ebuild,v 1.6 2012/02/12 14:57:08 armin76 Exp $
-
-DESCRIPTION="A compilation of small but very stable and portable shell scripts into a single shell tool"
-HOMEPAGE="http://www.gnu.org/software/shtool/shtool.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-#SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ia64 ~ppc ~sparc x86"
-IUSE=""
-
-DEPEND=">=dev-lang/perl-5.6"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog README THANKS VERSION NEWS RATIONAL
-}
--- a/dev-util/shtool/shtool-2.0.3.ebuild
+++ b/dev-util/shtool/shtool-2.0.3.ebuild
@ -1,20 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/shtool/shtool-2.0.3.ebuild,v 1.3 2007/01/22 08:16:33 flameeyes Exp $
-
-DESCRIPTION="A compilation of small but very stable and portable shell scripts into a single shell tool"
-HOMEPAGE="http://www.gnu.org/software/shtool/shtool.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-#SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/perl-5.6"
-
-src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog README THANKS VERSION NEWS RATIONAL
-}
--- a/dev-util/shtool/shtool-2.0.4.ebuild
+++ b/dev-util/shtool/shtool-2.0.4.ebuild
@ -1,20 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/shtool/shtool-2.0.4.ebuild,v 1.2 2007/01/22 08:16:33 flameeyes Exp $
-
-DESCRIPTION="A compilation of small but very stable and portable shell scripts into a single shell tool"
-HOMEPAGE="http://www.gnu.org/software/shtool/shtool.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-#SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/perl-5.6"
-
-src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog README THANKS VERSION NEWS RATIONAL
-}
--- a/dev-util/shunit2/Manifest
+++ b/dev-util/shunit2/Manifest
@ -1,3 +1 @@
-DIST shunit2-2.1.4.tgz 49698 SHA256 7f911f871fefa9513972dedd5be1b406e2f2d49d19103c6229098957c4cced57 SHA512 63ebefdae9e628cad3da59e7828978590773c420e5887631f8111b45968409c1907d58fc9c959aa7114acb72db3b13cfca6238406a0217664fbcaeb9be11aa17 WHIRLPOOL 94566a535ecbfb8f23a6cda2253c2476416c2448244f5fe5cbd539094f49cf944e7ae78ec5d0288bb0467e19c10ae8e20d04bbaed669c9fb520823b04fc64081
-DIST shunit2-2.1.5.tgz 65021 SHA256 87b93a205fe451191937f4e54e6a15457023dd091efa27ea7f1c2e56a35bb0ce SHA512 d24b6d0743e44672c2ba79bd421133e1e7135dfbc502b07a88943af6ed871858642a8990527113374d46dbd23634d67bc225d4e4c52b64cd470f323fae939f6d WHIRLPOOL 0a1e261c4daa668f5ec52276aeebfadaafe0beb4fba30eea2cd35e424cfc351287b8af33959480a0572f3ae06ad5aac0aeca5534f4971143a512d881cf13e415
 DIST shunit2-2.1.6.tgz 61558 SHA256 65a313a76fd5cc1c58c9e19fbc80fc0e418a4cbfbd46d54b35ed5b6e0025d4ee SHA512 c78cf349d72a9048e4932108a62b2d1873019b9b1909c3fb1bd7e873e7bb62df58c1941d916508dc60ef6ba0261a2bc6ee9e25d654eefdcce997682f2bc748d7 WHIRLPOOL f20154214fa08db98ad6ffaef39b555079f1dd17cc04b3c15f206a4ae690b55a8dbff582c5440c232920dbb4013c0b292f9fe15aa7dcc64fb1a99e51189ddd92
--- a/dev-util/shunit2/files/test.patch
+++ b/dev-util/shunit2/files/test.patch
@ -1,14 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 080ba0c..629781e 100644
--- a/Makefile
-+++ b/Makefile
-@@ -70,7 +70,8 @@ docs-docbook-prep:
- 	  $(BIN_DIR)/docbookPrep.sh "$(DOCBOOK_SHARE_DIR)"; \
- 	fi
- 
-test: @echo "executing $(PROG) unit tests"
-+test:
-+	@echo "executing $(PROG) unit tests"
- 	( cd $(TEST_SRC_DIR); ./shunit2_test.sh )
- 
- dist: dist-clean build docs
--- a/dev-util/shunit2/shunit2-2.1.4.ebuild
+++ b/dev-util/shunit2/shunit2-2.1.4.ebuild
@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/shunit2/shunit2-2.1.4.ebuild,v 1.4 2014/08/10 21:29:29 slyfox Exp $
-
-EAPI="3"
-
-inherit eutils
-
-DESCRIPTION="Unit-test framework for Bourne-based shell scripts"
-HOMEPAGE="http://code.google.com/p/shunit2/wiki/ProjectInfo"
-SRC_URI="http://shunit2.googlecode.com/files/${P}.tgz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	net-misc/curl"
-
-src_prepare() {
-	epatch "${FILESDIR}"/test.patch
-	sed -i -e '/^__SHUNIT_SHELL_FLAGS/s:u::' src/shell/shunit2 || die
-}
-
-src_compile() {
-	local myconf="build"
-	use doc && myconf="${myconf} docs"
-
-	emake ${myconf} || die
-}
-
-src_install() {
-	if use doc; then
-		for DOC in build/{docbook/*,shunit2.html,shunit2_shelldoc.xml}; do
-			dodoc ${DOC} || die
-			rm ${DOC}
-		done
-	fi
-
-	dodoc doc/*.txt || die
-	dohtml doc/*.html || die
-
-	insinto /usr/share/${PN}
-	doins build/* || die
-}
--- a/dev-util/shunit2/shunit2-2.1.5.ebuild
+++ b/dev-util/shunit2/shunit2-2.1.5.ebuild
@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/shunit2/shunit2-2.1.5.ebuild,v 1.3 2014/08/10 21:29:29 slyfox Exp $
-
-EAPI="3"
-
-inherit eutils
-
-DESCRIPTION="Unit-test framework for Bourne-based shell scripts"
-HOMEPAGE="http://code.google.com/p/shunit2/wiki/ProjectInfo"
-SRC_URI="http://shunit2.googlecode.com/files/${P}.tgz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	net-misc/curl"
-
-src_prepare() {
-	epatch "${FILESDIR}"/test.patch
-	sed -i -e '/^__SHUNIT_SHELL_FLAGS/s:u::' src/shell/shunit2 || die
-}
-
-src_compile() {
-	local myconf="build"
-	use doc && myconf="${myconf} docs"
-
-	emake ${myconf} || die
-}
-
-src_install() {
-	if use doc; then
-		for DOC in build/{docbook/*,shunit2.html,shunit2_shelldoc.xml}; do
-			dodoc ${DOC} || die
-			rm ${DOC}
-		done
-	fi
-
-	dodoc doc/*.txt || die
-	dohtml doc/*.html || die
-
-	insinto /usr/share/${PN}
-	doins build/* || die
-}
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.9 2015/04/01 18:45:04 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.10 2015/04/22 20:23:47 pesa Exp $

 # @ECLASS: qt4-build-multilib.eclass
 # @MAINTAINER:
@ -198,7 +198,7 @@ qt4-build-multilib_src_prepare() {
 		configure || die "sed SYSTEM_VARIABLES failed"

 	# Reset QMAKE_*FLAGS_{RELEASE,DEBUG} variables,
-	# or they will override user's flags (.qmake.cache)
+	# or they will override the user's flags (via .qmake.cache)
 	sed -i -e '/^SYSTEM_VARIABLES=/ i \
 		QMakeVar set QMAKE_CFLAGS_RELEASE\
 		QMakeVar set QMAKE_CFLAGS_DEBUG\
@ -215,8 +215,12 @@ qt4-build-multilib_src_prepare() {
 			'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
 		|| die "sed config.tests failed"

-	# Bug 172219
-	sed -e 's:/X11R6/:/:' -i mkspecs/$(qt4_get_mkspec)/qmake.conf || die
+	# Delete references to the obsolete /usr/X11R6 directory
+	# On prefix, this also prevents looking at non-prefix stuff
+	sed -i -re '/^QMAKE_(LIB|INC)DIR(_X11|_OPENGL|)\s+/ s/=.*/=/' \
+		mkspecs/common/linux.conf \
+		mkspecs/$(qt4_get_mkspec)/qmake.conf \
+		|| die "sed QMAKE_(LIB|INC)DIR failed"

 	if [[ ${CHOST} == *-darwin* ]]; then
 		# Set FLAGS and remove -arch, since our gcc-apple is multilib crippled (by design)
@ -254,23 +258,11 @@ qt4-build-multilib_src_prepare() {
 		fi
 	fi

-	# this is needed for all systems with a separate -liconv, except
-	# Darwin, for which the sources already cater for -liconv
-	if use !elibc_glibc && [[ ${CHOST} != *-darwin* ]]; then
-		sed -e 's|mac:\(LIBS += -liconv\)|\1|g' \
-			-i config.tests/unix/iconv/iconv.pro \
-			|| die "sed iconv.pro failed"
+	if [[ ${CHOST} == *-solaris* ]]; then
+		sed -i -e '/^QMAKE_LFLAGS_THREAD/a QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,' \
+			mkspecs/$(qt4_get_mkspec)/qmake.conf || die
 	fi

-	# we need some patches for Solaris
-	sed -i -e '/^QMAKE_LFLAGS_THREAD/a\QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,' \
-		mkspecs/$(qt4_get_mkspec)/qmake.conf || die
-	# use GCC over SunStudio
-	sed -i -e '/PLATFORM=solaris-cc/s/cc/g++/' configure || die
-	# do not flirt with non-Prefix stuff, we're quite possessive
-	sed -i -e '/^QMAKE_\(LIB\|INC\)DIR\(_X11\|_OPENGL\|\)\t/s/=.*$/=/' \
-		mkspecs/$(qt4_get_mkspec)/qmake.conf || die
-
 	# apply patches
 	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
 	epatch_user
--- a/media-fonts/alee-fonts/Manifest
+++ b/media-fonts/alee-fonts/Manifest
@ -1,2 +1 @@
-DIST ttf-alee_12.tar.gz 776652 SHA256 a0d0e4dab2c0f592c7709dbadebda18232a75ca0dc17b3238d0397fe79e7c841
 DIST ttf-alee_13.tar.gz 702378 SHA256 a36b92e520483195780db7d36da9d86c221a7e7a78621b020cc5023b140ab85a SHA512 2f72067ccb3264c5847639d9b9db4c820ad65bf2b2bfef710fbc42463e4b091dedc004281d05694a92680fde01c56edeb40ca78cd2a659533e22b17bd14b4b2c WHIRLPOOL 36195163c1c9debac81cfb40efb845b443811952c134125abcfc76307c1cf7108d9fc9b6b987ffce278df3bbf2daf8dd35fe1ad096abffcd12b8e72c38fc81c8
--- a/media-fonts/alee-fonts/alee-fonts-12.ebuild
+++ b/media-fonts/alee-fonts/alee-fonts-12.ebuild
@ -1,19 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/alee-fonts/alee-fonts-12.ebuild,v 1.10 2010/01/01 18:18:32 fauli Exp $
-
-inherit font
-
-DESCRIPTION="A Lee's Hangul truetype fonts"
-HOMEPAGE="http://packages.debian.org/unstable/x11/ttf-alee"
-SRC_URI="mirror://debian/pool/main/t/ttf-alee/ttf-alee_${PV}.tar.gz"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-FONT_SUFFIX="ttf"
-FONT_S="${WORKDIR}/ttf-alee-${PV}"
-
-S=${FONT_S}
--- a/media-fonts/arphicfonts/Manifest
+++ b/media-fonts/arphicfonts/Manifest
@ -2,7 +2,5 @@ DIST bkai00mp.ttf.gz 6013768 SHA256 7e56e73900315ac0ad3bdb7244dc20dd575ef634434b
 DIST bsmi00lp.ttf.gz 5653466 SHA256 2201657f06c524111dd1f146e82460f6bdb3467fa3d5648be964a1a43921f730 SHA512 9aa360213b25780def342043f5c0d4d6c1236778488119125a9b702cf26312f9759c9bb7eb1ac93e0169cbbd26e5a8cc38970d8df538903868dec95c3692efeb WHIRLPOOL ef5bb28856665e8d9db0980ab1b801548a07ae9fe42af27feae9ba94d30a73db8c4822c55e15a3f497b7d3ffdf1bf0dfcbd3c078bf035013c563db529549972e
 DIST gbsn00lp.ttf.gz 2345803 SHA256 be0ce76952f1d090a4b65a0a0b03bcf33f1b676916389e35421eb2edbbf4c6d6 SHA512 98bd8a03c901f680edc4073aea21729e5131d15792c5c4a25590a160a4359e29414b3c2457aa85681d475ebced442d9436024a5440a0011881bd7dd07a44623d WHIRLPOOL 90436ccf384d994a7a490bca7fff41118509478aca3ee8d025156e62a556d3166cfb518129026c0fc094d377f813ad22f23646f572b8b4d58260282b67ffe4a2
 DIST gkai00mp.ttf.gz 2698942 SHA256 f7cdb808e6d74878e157c4b0d92aff956dc7dfd9703dfc140dd595e1cdc99d4d SHA512 5797d1a4e49c4ba219381fe4e90225584513f47c29af77f8004bb318c5cddf2097be56ea6cc09ed31573e8ceeec5870129cbacafe81df3d68d8bd556594b2c89 WHIRLPOOL dfdedae4b699a67e3f4971d0f0b483876845f9e922d74b8fa1b2942a21da7dc221b24df7369ba795b777f95ab0d009f48b1e0ac01c7c71596fa4ac9745add4af
-DIST ttf-arphic-ukai_0.1.20060928.orig.tar.gz 12111493 SHA256 3f225fbbb33553ab5bc9bf159025843a845e8cc061541796891db7eafdb67634
 DIST ttf-arphic-ukai_0.2.20080216.1.orig.tar.gz 10336387 SHA256 0ea93b3efdd3bb71026bc545479e34ce14263a9faa20e1ac124bcf7315d19f4a SHA512 8c96d36f5e36eb73ec3e415cba7ee5f02a0b85c334af7362facb2dd9a7650ed3329cfadb21fe0fe7273f52c87f1bd1aeb039c40499ca32925db4cd96ebd03c21 WHIRLPOOL 16be17d339b28b078cc49a0edf3404ddb59504a7529b6e179960729924d335a9b788bef4ee80ee78cfb8847bab9fc3566c179c4b1faeaedc09bdb44d9e3d1df4
-DIST ttf-arphic-uming_0.1.20060928.orig.tar.gz 12671677 SHA256 410085d5f86362d00c47705a36a1557d78043a1db7ed427b4abccc117f45fe6d
 DIST ttf-arphic-uming_0.2.20080216.1.orig.tar.gz 10684442 SHA256 8038a6db9e832456d5da5559aff8d15130243be1091bf24f3243503a6f1bda98 SHA512 ef96969d1c5f1bda14aadfbe112a1ba30ae1bc477a89838753287ceaf07804e59c2f3f306399e9d54074be99d0c963abdb33d789f3933fdd98453a1ef7731407 WHIRLPOOL 862276fb8b661c0de9542179ce5a9f0fc9678f25ffe8b74fc2048e6445f3c41b02f35f2d478b84b05db66b8e0407f35569bd465962110c971d0d557a64c01fca
--- a/media-fonts/arphicfonts/arphicfonts-0.1.20060928.ebuild
+++ b/media-fonts/arphicfonts/arphicfonts-0.1.20060928.ebuild
@ -1,35 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/arphicfonts/arphicfonts-0.1.20060928.ebuild,v 1.12 2007/10/02 01:29:30 dirtyepic Exp $
-
-inherit font
-
-DESCRIPTION="Chinese TrueType Arphic Fonts"
-HOMEPAGE="http://www.arphic.com.tw/ http://www.freedesktop.org/wiki/Software_2fCJKUnifonts"
-SRC_URI="mirror://gnu/non-gnu/chinese-fonts-truetype/gkai00mp.ttf.gz
-	mirror://gnu/non-gnu/chinese-fonts-truetype/bkai00mp.ttf.gz
-	mirror://gnu/non-gnu/chinese-fonts-truetype/bsmi00lp.ttf.gz
-	mirror://gnu/non-gnu/chinese-fonts-truetype/gbsn00lp.ttf.gz
-	mirror://debian/pool/main/t/ttf-arphic-uming/ttf-arphic-uming_${PV}.orig.tar.gz
-	mirror://debian/pool/main/t/ttf-arphic-ukai/ttf-arphic-ukai_${PV}.orig.tar.gz"
-
-LICENSE="Arphic"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="X"
-
-S="${WORKDIR}"
-
-FONT_S="${S}"
-FONT_SUFFIX="ttf"
-
-# Only installs fonts
-RESTRICT="strip binchecks"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}/ttf-arphic-ukai-${PV}"
-	mv ukai.ttf "${S}"
-	cd "${S}/ttf-arphic-uming-${PV}"
-	mv uming.ttf "${S}"
-}
--- a/media-fonts/culmus/culmus-0.120-r1.ebuild
+++ b/media-fonts/culmus/culmus-0.120-r1.ebuild
@ -1,171 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/culmus/culmus-0.120-r1.ebuild,v 1.7 2011/10/11 17:05:19 jer Exp $
-
-EAPI="2"
-
-inherit font
-
-# Maintainer: also check culmus.conf file in ${P}.tar.gz
-
-MY_A_P=AncientSemiticFonts-0.06-1
-# The Type 1 fonts are just a stripped version of TrueType fonts and they are
-# not updated unless there is a meaningful change and we need them for
-# culmus-latex, see bug #350657
-TYPE1_PV=0.105
-
-DESCRIPTION="Hebrew Type1 fonts"
-HOMEPAGE="http://culmus.sourceforge.net/"
-
-FANCY_FONTS="journal hillel anka comix gan ozrad ktav-yad dorian gladia"
-FANCY_YG_FONTS="ShmuelCLM MakabiYG"
-TAAMEY_FONTS="TaameyDavidCLM TaameyFrankCLM KeterAramTsova KeterYG"
-
-SRC_URI="mirror://sourceforge/culmus/${P}.tar.gz
-	mirror://sourceforge/culmus/${PN}-type1-${TYPE1_PV}.tar.gz
-	fontforge? ( mirror://sourceforge/culmus/${PN}-src-${PV}.tar.gz )
-	ancient? ( !fontforge? ( mirror://sourceforge/culmus/${MY_A_P}.TTF.tgz )
-		fontforge? ( mirror://sourceforge/culmus/${MY_A_P}.tgz ) )"
-SRC_URI+=" fancy? ( $(printf "http://culmus.sourceforge.net/fancy/%s.tar.gz " ${FANCY_FONTS}) )"
-SRC_URI+=" fancy? ( $(printf "http://culmus.sourceforge.net/fancy-yg/%s.zip " ${FANCY_YG_FONTS}) )"
-SRC_URI+=" taamey? ( $(printf "http://culmus.sourceforge.net/taamim/%s.zip " ${TAAMEY_FONTS}) )"
-
-# Some fonts are available in otf format too. Do we need them?
-#	http://culmus.sourceforge.net/fancy/anka-otf.zip
-#	http://culmus.sourceforge.net/fancy/hillel-otf.zip
-#	http://culmus.sourceforge.net/fancy/journal-otf.zip
-
-LICENSE="|| ( GPL-2 LICENSE-BITSTREAM ) ancient? ( MIT ) fancy? ( GPL-2 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="ancient fancy fontforge taamey"
-
-FONT_CONF=( "${FILESDIR}/65-culmus.conf" )
-
-RDEPEND="!media-fonts/culmus-ancient"
-DEPEND="${RDEPEND}
-	fontforge? ( media-gfx/fontforge )"
-
-S=${WORKDIR}
-# Put all fonts, generated or not here
-FONT_S=${S}/FONTS
-
-src_unpack() {
-	unpack ${P}.tar.gz # For type1 fonts...
-	unpack ${PN}-type1-${TYPE1_PV}.tar.gz
-	use fontforge && unpack ${PN}-src-${PV}.tar.gz
-
-	use ancient && unpack ${MY_A_P}$(use fontforge || echo .TTF).tgz
-
-	if use fancy; then
-		unpack $(printf "%s.tar.gz " ${FANCY_FONTS})
-		unpack $(printf "%s.zip " ${FANCY_YG_FONTS})
-		mv TTF/* .
-	fi
-
-	if use taamey; then
-		for font in ${TAAMEY_FONTS}; do
-			mkdir ${font}
-			pushd ${font}
-			unpack ${font}.zip
-			popd >/dev/null
-		done
-	fi
-}
-
-src_compile() {
-	mkdir -p "${FONT_S}"
-	if use fontforge; then
-		pushd ${P}
-		mv *.afm *.pfa "${FONT_S}"
-		rm *.ttf
-		popd >/dev/null
-
-		pushd ${PN}-type1-${TYPE1_PV}
-		mv *.afm *.pfa "${FONT_S}"
-		popd >/dev/null
-
-		pushd ${PN}-src-${PV}
-		for f in *.sfd; do
-			"${WORKDIR}"/${PN}-src-${PV}/GenerateTTF.pe ${f} "${FONT_S}" || die
-		done
-		popd >/dev/null
-
-		if use ancient; then
-			pushd ${MY_A_P}/src
-			export FONTFORGE_LANGUAGE=ff
-			make clean
-			make all || die "Failed to build fonts"
-			mv *.ttf "${FONT_S}"
-			popd >/dev/null
-		fi
-
-		if use taamey; then
-			for font in ${TAAMEY_FONTS}; do
-				rm -rf ${font}/TTF
-				pushd ${font}/SFD
-				for f in *.sfd; do
-					"${WORKDIR}"/${PN}-src-${PV}/GenerateTTF.pe ${f} "${FONT_S}" || die
-				done
-				popd >/dev/null
-			done
-		fi
-	else
-		pushd ${P}
-		mv *.afm *.pfa *.ttf "${FONT_S}"
-		popd >/dev/null
-
-		pushd ${PN}-type1-${TYPE1_PV}
-		mv *.afm *.pfa "${FONT_S}"
-		popd >/dev/null
-
-		if use ancient; then
-			pushd ${MY_A_P}$(use fontforge || echo .TTF)/fonts
-			mv *.ttf "${FONT_S}"
-			popd >/dev/null
-		fi
-
-		if use taamey; then
-			for font in ${TAAMEY_FONTS}; do
-				pushd ${font}/TTF
-				mv *.ttf "${FONT_S}"
-				popd >/dev/null
-			done
-		fi
-	fi
-
-	use fancy && mv *.afm *.pfa *.ttf "${FONT_S}"
-}
-
-src_install() {
-	FONT_SUFFIX="pfa $(use fancy && echo afm ttf)" \
-		font_src_install
-
-	rm -rf "${FONT_S}"
-	find "${WORKDIR}" -name '*.ttf' -o -name '*.pfa' -o -name '*.pfm' |
-		while read font; do
-			ewarn "QA: missed font file: ${font}"
-		done
-
-	pushd ${PN}$(use fontforge && echo -src)-${PV}
-	dodoc CHANGES || die
-	popd >/dev/null
-
-	if use ancient; then
-		pushd "${WORKDIR}/${MY_A_P}$(use fontforge || echo .TTF)/"
-		newdoc CHANGES{,.ancient} || die
-		newdoc README{,.ancient} || die
-		popd >/dev/null
-	fi
-
-	if use taamey; then
-		for font in ${TAAMEY_FONTS}; do
-			pushd ${font}
-			[[ -f ChangeLog ]] && { newdoc ChangeLog{,.${font}} || die; }
-			newdoc README{,.${font}} || die
-			insinto /usr/share/doc/${PF}/${font}
-			doins -r Samples
-			popd >/dev/null
-		done
-	fi
-}
--- a/media-fonts/culmus/culmus-0.120-r2.ebuild
+++ b/media-fonts/culmus/culmus-0.120-r2.ebuild
@ -1,171 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/culmus/culmus-0.120-r2.ebuild,v 1.1 2011/09/03 11:37:16 pva Exp $
-
-EAPI="2"
-
-inherit font
-
-# Maintainer: also check culmus.conf file in ${P}.tar.gz
-
-MY_A_P=AncientSemiticFonts-0.06-1
-# The Type 1 fonts are just a stripped version of TrueType fonts and they are
-# not updated unless there is a meaningful change and we need them for
-# culmus-latex, see bug #350657
-TYPE1_PV=0.105
-
-DESCRIPTION="Hebrew Type1 fonts"
-HOMEPAGE="http://culmus.sourceforge.net/"
-
-FANCY_FONTS="journal hillel anka comix gan ozrad ktav-yad dorian gladia"
-FANCY_YG_FONTS="ShmuelCLM MakabiYG"
-TAAMEY_FONTS="TaameyDavidCLM TaameyFrankCLM KeterAramTsova KeterYG"
-
-SRC_URI="mirror://sourceforge/culmus/${P}.tar.gz
-	mirror://sourceforge/culmus/${PN}-type1-${TYPE1_PV}.tar.gz
-	fontforge? ( mirror://sourceforge/culmus/${PN}-src-${PV}.tar.gz )
-	ancient? ( !fontforge? ( mirror://sourceforge/culmus/${MY_A_P}.TTF.tgz )
-		fontforge? ( mirror://sourceforge/culmus/${MY_A_P}.tgz ) )"
-SRC_URI+=" fancy? ( $(printf "http://culmus.sourceforge.net/fancy/%s.tar.gz " ${FANCY_FONTS}) )"
-SRC_URI+=" fancy? ( $(printf "http://culmus.sourceforge.net/fancy-yg/%s.zip " ${FANCY_YG_FONTS}) )"
-SRC_URI+=" taamey? ( $(printf "http://culmus.sourceforge.net/taamim/%s.zip " ${TAAMEY_FONTS}) )"
-
-# Some fonts are available in otf format too. Do we need them?
-#	http://culmus.sourceforge.net/fancy/anka-otf.zip
-#	http://culmus.sourceforge.net/fancy/hillel-otf.zip
-#	http://culmus.sourceforge.net/fancy/journal-otf.zip
-
-LICENSE="|| ( GPL-2 LICENSE-BITSTREAM ) ancient? ( MIT ) fancy? ( GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="ancient fancy fontforge taamey"
-
-FONT_CONF=( "${FILESDIR}/65-culmus.conf" )
-
-RDEPEND="!media-fonts/culmus-ancient"
-DEPEND="${RDEPEND}
-	fontforge? ( media-gfx/fontforge )"
-
-S=${WORKDIR}
-# Put all fonts, generated or not here
-FONT_S=${S}/FONTS
-
-src_unpack() {
-	unpack ${P}.tar.gz # For type1 fonts...
-	unpack ${PN}-type1-${TYPE1_PV}.tar.gz
-	use fontforge && unpack ${PN}-src-${PV}.tar.gz
-
-	use ancient && unpack ${MY_A_P}$(use fontforge || echo .TTF).tgz
-
-	if use fancy; then
-		unpack $(printf "%s.tar.gz " ${FANCY_FONTS})
-		unpack $(printf "%s.zip " ${FANCY_YG_FONTS})
-		mv TTF/* .
-	fi
-
-	if use taamey; then
-		for font in ${TAAMEY_FONTS}; do
-			mkdir ${font}
-			pushd ${font}
-			unpack ${font}.zip
-			popd >/dev/null
-		done
-	fi
-}
-
-src_compile() {
-	mkdir -p "${FONT_S}"
-	if use fontforge; then
-		pushd ${P}
-		mv *.afm *.pfa "${FONT_S}"
-		rm *.ttf
-		popd >/dev/null
-
-		pushd ${PN}-type1-${TYPE1_PV}
-		mv *.afm *.pfa "${FONT_S}"
-		popd >/dev/null
-
-		pushd ${PN}-src-${PV}
-		for f in *.sfd; do
-			"${WORKDIR}"/${PN}-src-${PV}/GenerateTTF.pe ${f} "${FONT_S}" || die
-		done
-		popd >/dev/null
-
-		if use ancient; then
-			pushd ${MY_A_P}/src
-			export FONTFORGE_LANGUAGE=ff
-			make clean
-			make all || die "Failed to build fonts"
-			mv *.ttf "${FONT_S}"
-			popd >/dev/null
-		fi
-
-		if use taamey; then
-			for font in ${TAAMEY_FONTS}; do
-				rm -rf ${font}/TTF
-				pushd ${font}/SFD
-				for f in *.sfd; do
-					"${WORKDIR}"/${PN}-src-${PV}/GenerateTTF.pe ${f} "${FONT_S}" || die
-				done
-				popd >/dev/null
-			done
-		fi
-	else
-		pushd ${P}
-		mv *.afm *.pfa *.ttf "${FONT_S}"
-		popd >/dev/null
-
-		pushd ${PN}-type1-${TYPE1_PV}
-		mv *.afm *.pfa "${FONT_S}"
-		popd >/dev/null
-
-		if use ancient; then
-			pushd ${MY_A_P}$(use fontforge || echo .TTF)/fonts
-			mv *.ttf "${FONT_S}"
-			popd >/dev/null
-		fi
-
-		if use taamey; then
-			for font in ${TAAMEY_FONTS}; do
-				pushd ${font}/TTF
-				mv *.ttf "${FONT_S}"
-				popd >/dev/null
-			done
-		fi
-	fi
-
-	use fancy && mv *.afm *.pfa *.ttf "${FONT_S}"
-}
-
-src_install() {
-	FONT_SUFFIX="pfa $(use fancy && echo afm ttf)" \
-		font_src_install
-
-	rm -rf "${FONT_S}"
-	find "${WORKDIR}" -name '*.ttf' -o -name '*.pfa' -o -name '*.pfm' |
-		while read font; do
-			ewarn "QA: missed font file: ${font}"
-		done
-
-	pushd ${PN}$(use fontforge && echo -src)-${PV}
-	dodoc CHANGES || die
-	popd >/dev/null
-
-	if use ancient; then
-		pushd "${WORKDIR}/${MY_A_P}$(use fontforge || echo .TTF)/"
-		newdoc CHANGES{,.ancient} || die
-		newdoc README{,.ancient} || die
-		popd >/dev/null
-	fi
-
-	if use taamey; then
-		for font in ${TAAMEY_FONTS}; do
-			pushd ${font}
-			[[ -f ChangeLog ]] && { newdoc ChangeLog{,.${font}} || die; }
-			newdoc README{,.${font}} || die
-			insinto /usr/share/doc/${PF}/${font}
-			doins -r Samples
-			popd >/dev/null
-		done
-	fi
-}
--- a/media-fonts/culmus/culmus-0.120-r3.ebuild
+++ b/media-fonts/culmus/culmus-0.120-r3.ebuild
@ -1,173 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/culmus/culmus-0.120-r3.ebuild,v 1.8 2012/03/31 17:20:48 armin76 Exp $
-
-EAPI="2"
-
-inherit font
-
-# Maintainer: also check culmus.conf file in ${P}.tar.gz
-
-MY_A_P=AncientSemiticFonts-0.06-1
-# The Type 1 fonts are just a stripped version of TrueType fonts and they are
-# not updated unless there is a meaningful change and we need them for
-# culmus-latex, see bug #350657
-TYPE1_PV=0.105
-
-DESCRIPTION="Hebrew Type1 fonts"
-HOMEPAGE="http://culmus.sourceforge.net/"
-
-FANCY_FONTS="journal hillel anka comix gan ozrad ktav-yad dorian gladia horev"
-FANCY_YG_FONTS="ShmuelCLM MakabiYG"
-TAAMEY_FONTS="TaameyDavidCLM TaameyFrankCLM KeterAramTsova KeterYG"
-
-SRC_URI="mirror://sourceforge/culmus/${P}.tar.gz
-	mirror://sourceforge/culmus/${PN}-type1-${TYPE1_PV}.tar.gz
-	fontforge? ( mirror://sourceforge/culmus/${PN}-src-${PV}.tar.gz )
-	ancient? ( !fontforge? ( mirror://sourceforge/culmus/${MY_A_P}.TTF.tgz )
-		fontforge? ( mirror://sourceforge/culmus/${MY_A_P}.tgz ) )"
-SRC_URI+=" fancy? ( $(printf "http://culmus.sourceforge.net/fancy/%s.tar.gz " ${FANCY_FONTS}) )"
-SRC_URI+=" fancy? ( $(printf "http://culmus.sourceforge.net/fancy-yg/%s.zip " ${FANCY_YG_FONTS}) )"
-SRC_URI+=" taamey? ( $(printf "http://culmus.sourceforge.net/taamim/%s.zip " ${TAAMEY_FONTS}) )"
-
-# Some fonts are available in otf format too. Do we need them?
-#	http://culmus.sourceforge.net/fancy/anka-otf.zip
-#	http://culmus.sourceforge.net/fancy/hillel-otf.zip
-#	http://culmus.sourceforge.net/fancy/journal-otf.zip
-
-LICENSE="|| ( GPL-2 LICENSE-BITSTREAM ) ancient? ( MIT ) fancy? ( GPL-2 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="ancient fancy fontforge taamey"
-
-FONT_CONF=( "${FILESDIR}/65-culmus.conf" )
-
-RDEPEND="!media-fonts/culmus-ancient"
-# >=x11-apps/mkfontscale-1.0.9-r1 as Heavy weight support is required
-DEPEND="${RDEPEND}
-	>=x11-apps/mkfontscale-1.0.9-r1
-	fontforge? ( media-gfx/fontforge )"
-
-S=${WORKDIR}
-# Put all fonts, generated or not here
-FONT_S=${S}/FONTS
-
-src_unpack() {
-	unpack ${P}.tar.gz # For type1 fonts...
-	unpack ${PN}-type1-${TYPE1_PV}.tar.gz
-	use fontforge && unpack ${PN}-src-${PV}.tar.gz
-
-	use ancient && unpack ${MY_A_P}$(use fontforge || echo .TTF).tgz
-
-	if use fancy; then
-		unpack $(printf "%s.tar.gz " ${FANCY_FONTS})
-		unpack $(printf "%s.zip " ${FANCY_YG_FONTS})
-		mv TTF/* .
-	fi
-
-	if use taamey; then
-		for font in ${TAAMEY_FONTS}; do
-			mkdir ${font}
-			pushd ${font}
-			unpack ${font}.zip
-			popd >/dev/null
-		done
-	fi
-}
-
-src_compile() {
-	mkdir -p "${FONT_S}"
-	if use fontforge; then
-		pushd ${P}
-		mv *.afm *.pfa "${FONT_S}"
-		rm *.ttf
-		popd >/dev/null
-
-		pushd ${PN}-type1-${TYPE1_PV}
-		mv *.afm *.pfa "${FONT_S}"
-		popd >/dev/null
-
-		pushd ${PN}-src-${PV}
-		for f in *.sfd; do
-			"${WORKDIR}"/${PN}-src-${PV}/GenerateTTF.pe ${f} "${FONT_S}" || die
-		done
-		popd >/dev/null
-
-		if use ancient; then
-			pushd ${MY_A_P}/src
-			export FONTFORGE_LANGUAGE=ff
-			make clean
-			make all || die "Failed to build fonts"
-			mv *.ttf "${FONT_S}"
-			popd >/dev/null
-		fi
-
-		if use taamey; then
-			for font in ${TAAMEY_FONTS}; do
-				rm -rf ${font}/TTF
-				pushd ${font}/SFD
-				for f in *.sfd; do
-					"${WORKDIR}"/${PN}-src-${PV}/GenerateTTF.pe ${f} "${FONT_S}" || die
-				done
-				popd >/dev/null
-			done
-		fi
-	else
-		pushd ${P}
-		mv *.afm *.pfa *.ttf "${FONT_S}"
-		popd >/dev/null
-
-		pushd ${PN}-type1-${TYPE1_PV}
-		mv *.afm *.pfa "${FONT_S}"
-		popd >/dev/null
-
-		if use ancient; then
-			pushd ${MY_A_P}$(use fontforge || echo .TTF)/fonts
-			mv *.ttf "${FONT_S}"
-			popd >/dev/null
-		fi
-
-		if use taamey; then
-			for font in ${TAAMEY_FONTS}; do
-				pushd ${font}/TTF
-				mv *.ttf "${FONT_S}"
-				popd >/dev/null
-			done
-		fi
-	fi
-
-	use fancy && mv *.afm *.pfa *.ttf "${FONT_S}"
-}
-
-src_install() {
-	FONT_SUFFIX="pfa $(use fancy && echo afm ttf)" \
-		font_src_install
-
-	rm -rf "${FONT_S}"
-	find "${WORKDIR}" -name '*.ttf' -o -name '*.pfa' -o -name '*.pfm' |
-		while read font; do
-			ewarn "QA: missed font file: ${font}"
-		done
-
-	pushd ${PN}$(use fontforge && echo -src)-${PV}
-	dodoc CHANGES || die
-	popd >/dev/null
-
-	if use ancient; then
-		pushd "${WORKDIR}/${MY_A_P}$(use fontforge || echo .TTF)/"
-		newdoc CHANGES{,.ancient} || die
-		newdoc README{,.ancient} || die
-		popd >/dev/null
-	fi
-
-	if use taamey; then
-		for font in ${TAAMEY_FONTS}; do
-			pushd ${font}
-			[[ -f ChangeLog ]] && { newdoc ChangeLog{,.${font}} || die; }
-			newdoc README{,.${font}} || die
-			insinto /usr/share/doc/${PF}/${font}
-			doins -r Samples
-			popd >/dev/null
-		done
-	fi
-}
--- a/media-fonts/culmus/culmus-0.120.ebuild
+++ b/media-fonts/culmus/culmus-0.120.ebuild
@ -1,156 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/culmus/culmus-0.120.ebuild,v 1.8 2011/04/17 15:26:24 fauli Exp $
-
-EAPI="2"
-
-inherit font
-
-# Maintainer: also check culmus.conf file in ${P}.tar.gz
-
-MY_A_P=AncientSemiticFonts-0.06-1
-
-DESCRIPTION="Hebrew Type1 fonts"
-HOMEPAGE="http://culmus.sourceforge.net/"
-
-FANCY_FONTS="journal hillel anka comix gan ozrad ktav-yad dorian gladia"
-FANCY_YG_FONTS="ShmuelCLM MakabiYG"
-TAAMEY_FONTS="TaameyDavidCLM TaameyFrankCLM KeterAramTsova KeterYG"
-
-SRC_URI="mirror://sourceforge/culmus/${P}.tar.gz
-	fontforge? ( mirror://sourceforge/culmus/${PN}-src-${PV}.tar.gz )
-	ancient? ( !fontforge? ( mirror://sourceforge/culmus/${MY_A_P}.TTF.tgz )
-		fontforge? ( mirror://sourceforge/culmus/${MY_A_P}.tgz ) )"
-SRC_URI+=" fancy? ( $(printf "http://culmus.sourceforge.net/fancy/%s.tar.gz " ${FANCY_FONTS}) )"
-SRC_URI+=" fancy? ( $(printf "http://culmus.sourceforge.net/fancy-yg/%s.zip " ${FANCY_YG_FONTS}) )"
-SRC_URI+=" taamey? ( $(printf "http://culmus.sourceforge.net/taamim/%s.zip " ${TAAMEY_FONTS}) )"
-
-# Some fonts are available in otf format too. Do we need them?
-#	http://culmus.sourceforge.net/fancy/anka-otf.zip
-#	http://culmus.sourceforge.net/fancy/hillel-otf.zip
-#	http://culmus.sourceforge.net/fancy/journal-otf.zip
-
-LICENSE="|| ( GPL-2 LICENSE-BITSTREAM ) ancient? ( MIT ) fancy? ( GPL-2 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="ancient fancy fontforge taamey"
-
-FONT_CONF=( "${FILESDIR}/65-culmus.conf" )
-
-RDEPEND="!media-fonts/culmus-ancient"
-DEPEND="${RDEPEND}
-	fontforge? ( media-gfx/fontforge )"
-
-S=${WORKDIR}
-# Put all fonts, generated or not here
-FONT_S=${S}/FONTS
-
-src_unpack() {
-	unpack ${P}.tar.gz # For type1 fonts...
-	use fontforge && unpack ${PN}-src-${PV}.tar.gz
-
-	use ancient && unpack ${MY_A_P}$(use fontforge || echo .TTF).tgz
-
-	if use fancy; then
-		unpack $(printf "%s.tar.gz " ${FANCY_FONTS})
-		unpack $(printf "%s.zip " ${FANCY_YG_FONTS})
-		mv TTF/* .
-	fi
-
-	if use taamey; then
-		for font in ${TAAMEY_FONTS}; do
-			mkdir ${font}
-			pushd ${font}
-			unpack ${font}.zip
-			popd >/dev/null
-		done
-	fi
-}
-
-src_compile() {
-	mkdir -p "${FONT_S}"
-	if use fontforge; then
-		pushd ${P}
-		mv *.afm *.pfa "${FONT_S}"
-		rm *.ttf
-		popd >/dev/null
-		pushd ${PN}-src-${PV}
-		for f in *.sfd; do
-			"${WORKDIR}"/${PN}-src-${PV}/GenerateTTF.pe ${f} "${FONT_S}" || die
-		done
-		popd >/dev/null
-
-		if use ancient; then
-			pushd ${MY_A_P}/src
-			export FONTFORGE_LANGUAGE=ff
-			make clean
-			make all || die "Failed to build fonts"
-			mv *.ttf "${FONT_S}"
-			popd >/dev/null
-		fi
-
-		if use taamey; then
-			for font in ${TAAMEY_FONTS}; do
-				rm -rf ${font}/TTF
-				pushd ${font}/SFD
-				for f in *.sfd; do
-					"${WORKDIR}"/${PN}-src-${PV}/GenerateTTF.pe ${f} "${FONT_S}" || die
-				done
-				popd >/dev/null
-			done
-		fi
-	else
-		pushd ${P}
-		mv *.afm *.pfa *.ttf "${FONT_S}"
-		popd >/dev/null
-
-		if use ancient; then
-			pushd ${MY_A_P}$(use fontforge || echo .TTF)/fonts
-			mv *.ttf "${FONT_S}"
-			popd >/dev/null
-		fi
-
-		if use taamey; then
-			for font in ${TAAMEY_FONTS}; do
-				pushd ${font}/TTF
-				mv *.ttf "${FONT_S}"
-				popd >/dev/null
-			done
-		fi
-	fi
-
-	use fancy && mv *.afm *.pfa *.ttf "${FONT_S}"
-}
-
-src_install() {
-	FONT_SUFFIX="pfa $(use fancy && echo afm ttf)" \
-		font_src_install
-
-	rm -rf "${FONT_S}"
-	find "${WORKDIR}" -name '*.ttf' -o -name '*.pfa' -o -name '*.pfm' |
-		while read font; do
-			ewarn "QA: missed font file: ${font}"
-		done
-
-	pushd ${PN}$(use fontforge && echo -src)-${PV}
-	dodoc CHANGES || die
-	popd >/dev/null
-
-	if use ancient; then
-		pushd "${WORKDIR}/${MY_A_P}$(use fontforge || echo .TTF)/"
-		newdoc CHANGES{,.ancient} || die
-		newdoc README{,.ancient} || die
-		popd >/dev/null
-	fi
-
-	if use taamey; then
-		for font in ${TAAMEY_FONTS}; do
-			pushd ${font}
-			[[ -f ChangeLog ]] && { newdoc ChangeLog{,.${font}} || die; }
-			newdoc README{,.${font}} || die
-			insinto /usr/share/doc/${PF}/${font}
-			doins -r Samples
-			popd >/dev/null
-		done
-	fi
-}
--- a/media-fonts/essays1743/Manifest
+++ b/media-fonts/essays1743/Manifest
@ -1,3 +1 @@
-DIST Essays1743-1.0-ttf.tar.gz 1249359 SHA256 ea6bc8af8ccacdc2bf1b8e35006c36c70ee6c4ae7d764f1e778529fcba4edd09
-DIST essays1743-1.203-1-ttf.tar.gz 1150274 SHA256 063da229a25a1e59af7caf8dac1377c4bc605ce3e8dc6ab18a5ded0b8c852da0 SHA512 0dcf03e8e495e9560f47631c52bbb44dc6f9e9990fcb8583448a67fe2ef9d2f3c4464ebd25195389e90a62ab99afce221fa9edf6b15f3fc7b75af688d315f7f7 WHIRLPOOL 11723fdfb73e5e1bddc81d956af5345111f3c7921bd516b59f34cd7da7588d9b3d528c5377ed75ac1601ad31d71b5c6e9671cb5b5a4857ee0fd10404d76a81f7
 DIST essays1743-2.000-1-ttf.tar.gz 1384904 SHA256 7b1af37caecc2038a6c329797abbaacced4d806d03ce44edc58228c0337d6a68 SHA512 fa0206c350cbd89b583e5ad5b3b53c51891fabd9ccd3248b92c4ceda195e91d06fa2187ac4823b4535214ff146e1e8d7af2224c347b58a4b1ad413f4a0e4b745 WHIRLPOOL 2a3201b4ae4094597b62659ba317369d5f1295e22f843194f177e76ca590b639cbd27a87a04468106cbb8ef6fdb2071e59a81ffcd639fe2d9db5154fd2e7f5b0
--- a/media-fonts/essays1743/essays1743-1.0.ebuild
+++ b/media-fonts/essays1743/essays1743-1.0.ebuild
@ -1,23 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/essays1743/essays1743-1.0.ebuild,v 1.14 2009/07/06 21:34:49 jer Exp $
-
-inherit font
-
-MY_PN="Essays1743"
-
-DESCRIPTION="John Stracke's Essays 1743 font"
-HOMEPAGE="http://www.thibault.org/fonts/essays/"
-SRC_URI="http://www.thibault.org/fonts/essays/${MY_PN}-${PV}-ttf.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${MY_PN}"
-FONT_S="${S}"
-FONT_SUFFIX="ttf"
--- a/media-fonts/essays1743/essays1743-1.203.1.ebuild
+++ b/media-fonts/essays1743/essays1743-1.203.1.ebuild
@ -1,23 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/essays1743/essays1743-1.203.1.ebuild,v 1.5 2012/02/01 17:38:00 ranger Exp $
-
-inherit versionator font
-
-MY_PV="$(replace_version_separator 2 '-')"
-
-DESCRIPTION="John Stracke's Essays 1743 font"
-HOMEPAGE="http://www.thibault.org/fonts/essays/"
-SRC_URI="http://www.thibault.org/fonts/essays/${PN}-${MY_PV}-ttf.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${PN}"
-FONT_S="${S}"
-FONT_SUFFIX="ttf"
--- a/media-fonts/oldstandard/Manifest
+++ b/media-fonts/oldstandard/Manifest
@ -1,4 +1,2 @@
-DIST oldstandard-2.0.2.otf.zip 342048 RMD160 47a4597b918617bfd19d08878732e57a8707b09d SHA1 2d71a0efd3dc1c1f60bef8975a2d62d030c181a6 SHA256 c1bad2370859a16e466de3eea51cd36054a2633f7e9c257dc79884c24f09d201
-DIST oldstandard-2.0.2.ttf.zip 517344 RMD160 55027b6f9e37fba520f9585864cadab0f8fbde48 SHA1 e3f7a3a852e3c78dd80029d3c610e31984fa454c SHA256 0f311a050f1b7e6419e9daa3ad62107f8bda9335e9b19c8edb40a09684feaa27
-DIST oldstandard-2.2.otf.zip 398951 RMD160 a2aa7298ecdb57a94968274d8448ee678729acb8 SHA1 258e12d1520f108602e0f0f8063bd1f37fedf8a6 SHA256 06866d3d5b491f6749c972e6c893a72a5eaf0d45ac0ada8c6661d704b39e0b76
-DIST oldstandard-2.2.ttf.zip 844435 RMD160 2621ecea9a88f3dfa1b7655d20b267a8f7e15e27 SHA1 82c851cdbdbc54c8e027fd39256a7ce8c0fd720d SHA256 928255f9ca32b9f8f97123aeaa8aa728629fc96074c99f3a28fa1d6f32795ac1
+DIST oldstandard-2.2.otf.zip 398951 SHA256 06866d3d5b491f6749c972e6c893a72a5eaf0d45ac0ada8c6661d704b39e0b76
+DIST oldstandard-2.2.ttf.zip 844435 SHA256 928255f9ca32b9f8f97123aeaa8aa728629fc96074c99f3a28fa1d6f32795ac1
--- a/media-fonts/oldstandard/oldstandard-2.0.2.ebuild
+++ b/media-fonts/oldstandard/oldstandard-2.0.2.ebuild
@ -1,23 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/oldstandard/oldstandard-2.0.2.ebuild,v 1.5 2011/06/19 13:41:12 maekke Exp $
-
-inherit font
-
-DESCRIPTION="Old Standard - font with wide range of Latin, Greek and Cyrillic characters"
-HOMEPAGE="http://www.thessalonica.org.ru/en/fonts.html"
-SRC_URI="http://www.thessalonica.org.ru/downloads/${P}.otf.zip
-		http://www.thessalonica.org.ru/downloads/${P}.ttf.zip"
-
-LICENSE="OFL"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S=${WORKDIR}
-FONT_S=${S}
-FONT_SUFFIX="otf ttf"
-DOCS="OFL.txt OFL-FAQ.txt FONTLOG.txt"
--- a/media-fonts/urw-fonts/Manifest
+++ b/media-fonts/urw-fonts/Manifest
@ -1,2 +1 @@
-DIST urw-fonts-2.4-6.fc10.src.rpm 3197848 SHA256 b833ba1a5c0926709c0dd0db7d16fc7536f21d51045095c4a99524f6a4f1c1c0
 DIST urw-fonts-2.4-9.fc13.src.rpm 3198315 SHA256 47a4ad8b725109d114a4c4151c28dcb787b2c676df5346092e60ea158975970c SHA512 cd8c9eb9e56480e70129c14cc744b944fe51fc616b8b5da46b7251520c84486c6c4354afdd7517569ba7874255c00b755aace076dc2cf1a1d8bdd30e41322d4b WHIRLPOOL 4bec96ebc443c3dd8fb63cb67bdee68232040f73cc057bb301c22d39a9b7f088248412ac9ba2066db74ffdab7d6a8e47bbd0a4931056020460b5ef768b8e6e06
--- a/media-fonts/urw-fonts/urw-fonts-2.4.6.ebuild
+++ b/media-fonts/urw-fonts/urw-fonts-2.4.6.ebuild
@ -1,48 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/urw-fonts/urw-fonts-2.4.6.ebuild,v 1.13 2010/10/01 01:17:16 dirtyepic Exp $
-
-# At some point URW++ released fonts under GPL license. After that they were took
-# and improved by Valek Filippov and this work was somehow related with AFPL...
-# At least it can be found on their svn server:
-# http://svn.ghostscript.com/ghostscript/trunk/urw-fonts/
-
-# Also, some time ago, sources where published on sf.net:
-# http://sourceforge.net/projects/gs-fonts/files/
-# At this point this package was published on a nuber of other sites
-# (gimp.org/cups.org) and media-fonts/gnu-gs-fonts-std was added to the tree.
-# But nobody use that old releases any mover and everybody syncs with
-# svn.ghostscript.com. The most recent tag there is:
-# http://svn.ghostscript.com/ghostscript/tags/urw-fonts-1.0.7pre44/
-
-# But note that version we have is different from upstream tag. This happened
-# because we started to use redhat versions and followed their versioning. It's
-# hard to say why they use such strange version since they also sync with
-# svn.ghostscript.com. Redhat's ChangeLog states:
-# Tue Jan 8 23:00:00 2008 Than Ngo 2.4-2
-#  - update to 1.0.7pre44
-
-inherit eutils rpm font versionator
-
-MY_PV=$(replace_version_separator 2 -)
-
-DESCRIPTION="free good quality fonts gpl'd by URW++"
-HOMEPAGE="http://www.urwpp.de/"
-SRC_URI="mirror://gentoo/${PN}-${MY_PV}.fc10.src.rpm"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x64-solaris ~x86-solaris"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-S=${WORKDIR}
-FONT_S=${S}
-FONT_SUFFIX="afm pfb"
-DOCS="ChangeLog README*"
-
-pkg_postinst() {
-	font_pkg_postinst
-	elog "If you upgraded from ${PN}-2.1-r2 some fonts will look a bit"
-	elog "different. Take a look at bug #208990 if interested."
-}
--- a/media-fonts/vlgothic/Manifest
+++ b/media-fonts/vlgothic/Manifest
@ -1,5 +1,2 @@
-DIST VLGothic-20090811.tar.bz2 4749225 SHA256 60a3f213c91f4fa22ae479e5298cd13c3d1a94a235ad19239928b0f7d71d0f1a
-DIST VLGothic-20101218.tar.bz2 4749740 SHA256 9fa437f9fce23aad0cf97d699e4c88ca7b8342c8d0a1d05f80e03da702d32896
-DIST VLGothic-20110414.tar.bz2 4749147 SHA256 fbcc56c6b1e3340903104a820153afded0279da67c3c53f080b27982e0cbac81
 DIST VLGothic-20110722.tar.bz2 4797664 SHA256 e1ff4a1cc5a1e186c54bd33699e113cca8ac22f52ceb317e95b9988309365113
 DIST VLGothic-20141206.tar.bz2 4952134 SHA256 252b4c3faf6ccf315763e021edace218370154e398d95fb97abce1ca8325556c SHA512 70ef712398b48486c0494ca52c97e145ebbaae0988b535a5447c796ed668944c0700175ab80587e0226d507d1589cedfe733f10f47f9b024873cf9e5d4e7983d WHIRLPOOL aef15d41ec3497b608c0fede4a8857ab9a50295cb5b2667d5bbcd1862bbae511b4f87038dfff939a1cb032a8e86023a139b4ecf734f3a96f25697110d3209e5d
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`DIST Text-Roman-3.5.tar.gz 18122 SHA256 cb4a08a3b151802ffb2fce3258a416542ab81db0f739ee474a9583ffb73e046a SHA512 597ca054094f58c0983c66ce2b22dbc4d69861b02495663987e6b66dc0044a0d7e18e51ef817ed3c76832d283c01c6f9f51e68af7cb6b186b27553b5a877bc33 WHIRLPOOL eada2cdc1c7438d57574ef1bc88a23cfc2ad346768575c8f7800631a07620251936a2d6af41f4adb4ede1b97201a65edaf5f070e8c26af6286c7afef6e0b749f`