Sync with portage [Thu Dec 8 10:36:36 MSK 2016].

app-accessibility/simon/metadata.xml

@@ -6,8 +6,8 @@
 		<name>Gentoo Accessibility Project</name>
 	</maintainer>
 	<use>
-		<flag name="kdepim">Use <pkg>kde-apps/kdepimlibs</pkg></flag>
 		<flag name="opencv">Use <pkg>media-libs/opencv</pkg></flag>
+		<flag name="pim">Use <pkg>kde-apps/kdepimlibs</pkg></flag>
 		<flag name="sphinx">Build sphinx backend (pulls <pkg>app-accessibility/julius</pkg> if disabled</flag>
 	</use>
 </pkgmetadata>

app-accessibility/simon/simon-0.4.1.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -19,7 +19,7 @@ SRC_URI="mirror://kde/stable/simon/${PV}/src/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="kdepim libsamplerate nls opencv sphinx"
+IUSE="libsamplerate nls opencv pim sphinx"
 
 RDEPEND="
 	dev-qt/qtcore:4
@@ -32,13 +32,13 @@ RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXtst
 	x11-libs/qwt:6
-	kdepim? ( kde-apps/kdepimlibs:4 )
 	libsamplerate? ( media-libs/libsamplerate )
 	nls? (
 		kde-apps/kde4-l10n
 		virtual/libintl
 	)
 	opencv? ( media-libs/opencv )
+	pim? ( kde-apps/kdepimlibs:4 )
 	sphinx? (
 		>=app-accessibility/pocketsphinx-0.8
 		>=app-accessibility/sphinxbase-0.8
@@ -64,7 +64,7 @@ src_configure() {
 		-DBackendType=$(usex sphinx "both" "jhtk")
 		$(cmake-utils_use_with sphinx Sphinxbase)
 		$(cmake-utils_use_with sphinx Pocketsphinx)
-		$(cmake-utils_use_with kdepim KdepimLibs)
+		$(cmake-utils_use_with pim KdepimLibs)
 		$(cmake-utils_use_with libsamplerate LibSampleRate)
 		$(cmake-utils_use_with opencv OpenCV)
 		$(cmake-utils_use_enable nls NLS)

app-admin/augeas/augeas-1.7.0.ebuild

@@ -12,7 +12,7 @@ SRC_URI="http://download.augeas.net/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="static-libs test"
 
 RDEPEND="

app-admin/gtkdiskfree/Manifest

@@ -1,2 +1,2 @@
 DIST gtkdiskfree-2.0.1.tar.gz 354661 SHA256 eb4369db5ff98df487b43fd59f998f3524a87896686cd2e9c5adccea3bfe7e94 SHA512 ec202cc79dc80fb66fdf028b6a89610344bb76d7cbe09563f5f47ae072bed791e395d9d1389954046c25e882587d3685b14db4e871e26244045beabb8b579de8 WHIRLPOOL bd4aaeaea45703e62478a28a7b4b349fafdf0846d53f106837c332385efefde1ecb9a6637cc045b2949cc0dddf33aa416da7d1635a75972cb4af5aed348aa2d3
-DIST gtkdiskfree-2.0.2.tar.bz2 231786 SHA256 bd8bbe0663ddf1067119098ba97c5ac1beb9fe3b46943a3ba9ea7ce864094ab0 SHA512 117d89d7a54ac2a14e141872800723f4ca946241df9e976b22b4827392979ec61cc91a8320d3c5c9126e9c3478dd856e1accfc3ed18eb08dfd4e0aafdecdbbb6 WHIRLPOOL 75ba532a591f10d99ffced63d05b671d9ecf9097ca31c577d0ec414f08d0023438e722b08a52615774d0edea295040da51b5a440f6141c462d8a5c3bfa60cbac
+DIST gtkdiskfree-2.0.3.tar.bz2 216189 SHA256 d159bd28848c4c1e6b5a76a714c1780f7e4bf2a8183de59b5c912c9f707bd063 SHA512 c6f093ff023cb8c67090b3bd3660a998163e786b08386f346bdc1aa7b29e030a31cfb0ef54c55f109f211bf045f90afd20558b91849a4f82d041c99532f170fe WHIRLPOOL 5a4c860ca1772b4aa45f45456f0903a3b943a075eecf50e65dff84718681238b65a69700dbb6d8f08d9df8e439d678adc1855023184f3350bcb8813208637ba6

app-admin/gtkdiskfree/gtkdiskfree-2.0.3.ebuild

@@ -1,8 +1,8 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gtkdiskfree/gtkdiskfree-2.0.1.ebuild,v 1.6 2012/07/26 20:48:25 xmw Exp $
+# $Id$
 
-EAPI=5
+EAPI=6
 
 inherit vcs-snapshot
 
@@ -13,14 +13,17 @@ SRC_URI="https://gitlab.com/mazes_80/${PN}/repository/archive.tar.bz2?ref=${PV}
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gtk2 nls"
+IUSE="gtk2"
 
-RDEPEND="gtk2? ( x11-libs/gtk+:2 )
-	!gtk2? ( x11-libs/gtk+:3 )"
+RDEPEND="
+	gtk2? ( x11-libs/gtk+:2 )
+	!gtk2? ( x11-libs/gtk+:3 )
+"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	sys-devel/gettext
+	virtual/pkgconfig
+"
 
 src_configure() {
-	econf --enable-nls \
-		$(use_with gtk2)
+	econf $(use_with gtk2)
 }

app-admin/puppet-agent/Manifest

@@ -2,3 +2,5 @@ DIST puppet-agent_1.7.1-1xenial_amd64.deb 13901688 SHA256 f9f0cedcb29f054064bc2b
 DIST puppet-agent_1.7.1-1xenial_i386.deb 15252694 SHA256 0e2c94907bcd0174e5518a72eb91b4e66639ffa2829292044782658b7762fd19 SHA512 b1f85586848cff2b6790c93a320a7c8ee226d78dca14ddcf947e9d01c1b105b379cb0e044280640e95873e7abd31c3873d6e90117c249c314ae948bca36bad17 WHIRLPOOL b2460598fd12fdd565e6cc131a8e14d4eb411b233ce5125e436d09432fa5f9fca9d9065c515b53d0a26811a18d120cc0bcae0e9c848ed19820d89903d27340c3
 DIST puppet-agent_1.8.1-1xenial_amd64.deb 15184048 SHA256 380bada6281c8785aa91ae60434afd3f36f470c723d09746274f8d91a872e23e SHA512 d0457a7b7024d1f00cb11b6287f17d6dea8411bf183e5610e7a0657400914aa9a3c02609b159e00ff8dde1ac433e33f9499a257e4edd7a1bc4f9e74a2f7765ee WHIRLPOOL a7279a33efc8798ece02be5135b7a777d1e339dccbc5fc1cbd9d0ee0fbb05e490d8a6bf17c3454e836729a8deb80250328375a93e22c925bf4eeeba711f7c2d8
 DIST puppet-agent_1.8.1-1xenial_i386.deb 16608626 SHA256 8908e987ba451d34e54210e0cfa6f1269a1e678f695c4f73c284216d5fa4522a SHA512 a6124489752172e9e5e5899ef032a5d2e7ed3de2096f9055f63d77358035ad2672ebddb075f73aed5d13660d2b40add8bc0962c56b9ec1942463dbe3847297aa WHIRLPOOL 034c9c026d0607d02e98267ec422cadd14dfa934866c962904ceecb1f1de4c22e1adb76e763a6b5c46c5c2dcd29e9f8bb89a9450517fa33706b1f48412acc5ba
+DIST puppet-agent_1.8.2-1xenial_amd64.deb 15179348 SHA256 5195af288ca014bcf65705c3fb83a1da8caf02eb1f431396380951480fb7e2dc SHA512 6093012994faaa3e7248c3e705e2dcb9269c85cfd4405c7ac66ab0adf3a547bc37ad3f5d44530514ed30a4edb01c01522eae1bced8d7ebade9ceb737ee600449 WHIRLPOOL 9905c00b16b12b75b331faf60c5ba3ad948a04db1ad4ef9b11aa413442fd464b836cc295cb4e0d85c34ebb3f97f470141cf207491fbeedb7964409ab75420f44
+DIST puppet-agent_1.8.2-1xenial_i386.deb 16609778 SHA256 48d4588ae8c87a3a3e41c5c4e6159cba7bf6484578ce0761b4abd76854f7bdad SHA512 b96e239906e75773a22c37a28c3c794b7293cab1a970ba5067064b120e12e0a6f0b620f06dfb3cc5b83e9140467fa552aa05ea46a33f3fb8b489ac7790cb7734 WHIRLPOOL 6daf05a7ae5e50ecb922ffa260101cc62e64267fd40ca6dd8d684ab1b3760eb45a4f797f9644b7fb351f70a86e88d5c88cd1cc5dd4d68341912846466ba72257

app-admin/puppet-agent/puppet-agent-1.8.2.ebuild

@@ -0,0 +1,103 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils systemd unpacker user
+
+DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
+HOMEPAGE="https://puppetlabs.com/"
+SRC_BASE="http://apt.puppetlabs.com/pool/xenial/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1xenial"
+SRC_URI="
+	amd64? ( ${SRC_BASE}_amd64.deb )
+	x86?   ( ${SRC_BASE}_i386.deb )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="puppetdb selinux"
+RESTRICT="strip"
+
+CDEPEND="!app-admin/augeas
+	!app-admin/mcollective
+	!app-admin/puppet
+	!dev-ruby/hiera
+	!dev-ruby/facter
+	!app-emulation/virt-what"
+
+DEPEND="
+	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	app-portage/eix
+	sys-apps/dmidecode
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )"
+
+S=${WORKDIR}
+
+QA_PREBUILT="
+	/opt/puppetlabs/puppet
+	/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/*
+	/opt/puppetlabs/puppet/lib/engines/*
+	/opt/puppetlabs/puppet/lib/virt-what/*
+	/opt/puppetlabs/puppet/lib/*
+	/opt/puppetlabs/puppet/bin/*"
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/run/puppet puppet
+}
+
+src_install() {
+	# conf.d
+	doconfd etc/default/puppet
+	doconfd etc/default/mcollective
+	doconfd etc/default/pxp-agent
+	# logrotate.d
+	insinto /etc/logrotate.d
+	doins etc/logrotate.d/mcollective
+	doins etc/logrotate.d/pxp-agent
+	# puppet itself
+	insinto /etc/puppetlabs
+	doins -r etc/puppetlabs/*
+	# logdir for systemd
+	dodir var/log/puppetlabs/puppet/
+	fperms 0750 var/log/puppetlabs/puppet/
+	# the rest
+	insinto /opt
+	dodir opt/puppetlabs/puppet/cache
+	doins -r opt/*
+	fperms 0750 /opt/puppetlabs/puppet/cache
+	# init
+	newinitd "${FILESDIR}/puppet.initd" puppet
+	newinitd "${FILESDIR}/mcollective.initd" mcollective
+	systemd_dounit lib/systemd/system/puppet.service
+	systemd_dounit lib/systemd/system/mcollective.service
+	systemd_dounit lib/systemd/system/pxp-agent.service
+	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
+	# symlinks
+	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
+	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
+	dosym /opt/puppetlabs/bin/facter /usr/bin/facter
+	dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera
+	dosym /opt/puppetlabs/bin/mco /usr/bin/mco
+	dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet
+	dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
+	dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
+	dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
+	dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
+	dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera
+}

app-admin/sudo/sudo-1.8.16.ebuild

@@ -23,7 +23,7 @@ SRC_URI="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 # 3-clause BSD license
 LICENSE="ISC BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~sparc-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~sparc-solaris"
 IUSE="ldap nls pam offensive selinux skey +sendmail"
 
 DEPEND="pam? ( virtual/pam )

app-arch/gzip/gzip-1.8.ebuild

@@ -14,7 +14,7 @@ SRC_URI="mirror://gnu/gzip/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pic static"
 
 PATCHES=(

app-arch/rar/Manifest

@@ -1,6 +1,9 @@
 DIST rarlinux-5.2.1.tar.gz 1109839 SHA256 dafe2deb46d0a9cc99b5f4e7204913051d4a2010e08311a0d3565050bd74026f SHA512 bb7ad791f5a34b8d48008a75f9d8008237f36261be6e722d8fdf97a19e70e444c42232544ac63514c354e1d173260dcb635024f72c77afff172f326a137ef21c WHIRLPOOL 6ee7d38bac0c158f0ab6b534544dd7fcd3bf3459219790d2f05ae60df86e7502ca8211580035d62279e99bd427577c4a79bd2eca6e1b99dc2dfde679a07537ec
 DIST rarlinux-5.3.0.tar.gz 1114667 SHA256 7638f20ba68a49e9d9b3b247d9922f3d36c248eaa2e784bd2f0fad0aa1fd7ba8 SHA512 b2eb9831cac88f7f72a169c081a35fc688aa82a5e80cf681440b38f7d5f7691511ca1b85960b3949668faa4c1fe0921fb170d7a1ffb52d77db124fd073f1516b WHIRLPOOL 42ee7ef6f4a186b6284490e04378d24fcdbdea2406724137522ce2c18ebc62f8321e7092673ce4ea3e917b0ea393145b8f496ba06e780bdf2526b3223d5474aa
+DIST rarlinux-5.4.0.tar.gz 1121998 SHA256 18b4aa6b22a5460cae6dd4372fa1a6d69e0726e693c04993cc5e124d7c0a7db6 SHA512 6dd905de5fae268bf65d7fc803d03919db96d0489ea5351c5deac8dd12e4a7da295ea9342b26a9603efaad7cfec780094c64c0e82ea9c72967b5e43286a40ee8 WHIRLPOOL aefb8cc47d37ab2c60ffda82f6311233998f0d3b263628341cbeaa9c21d7249b75906e56e3c6ea92008423d76b1f8d840feb92d77d34f9987a01171f1c010940
 DIST rarlinux-x64-5.2.1.tar.gz 1145110 SHA256 54015e921bf2789ca90afdf913c5a5d57db612bfdbf33eedae7b068aa1016a2d SHA512 fe0f866aa7437608e60d3d760263aa2428d7154f0574140008d19a088b6968b06a02d056bd6e9f1b30f4b06c5fd447bf8383bd823d958c6676cd7d835f14de2c WHIRLPOOL b82f153a9aa1e239e2b1e137c71005ce812ce446911e9f62c43609a810cfb86874aa7137698b7a79326d693d4571da20df19973206412be429f1b593908fa86e
 DIST rarlinux-x64-5.3.0.tar.gz 1149037 SHA256 8075b01d29ba0fc0c927f08e2a1b2149921bdb42c9457b7a7ef0950e387b5131 SHA512 3391db53adcdc355b6c58843a59f17a0adc2abc874ba8828cb985f27d33d27804d6a8c4db642fbef6a09d513858a6b507f6b49f9097a499d800f4cdd953f1f3e WHIRLPOOL b450bf85d36627c0b03be1523cdee980ac771ea5acd9786264fc10efd8473b1cec031dec57d1b1f345ea601fed94f0505d300d106800076c20bc97a437b6fd26
+DIST rarlinux-x64-5.4.0.tar.gz 1156900 SHA256 bf3e718df88cac8da631e34b3b2cc3185ca111e11d945e6bb91c0c038b8aa945 SHA512 6b4a9f9ba454e6f40bd8ec391a11790dc43d1a54733e1c8de0ac2cf969193959df327f5fee22c9b403cc838dfb92906c1b47d001b41522983fb0cf21b73da696 WHIRLPOOL 31427c056662619790e939b9f9a6904422a2bcbead8589279c206cf36c7a8726176061351d91c9dd8fdf9b7357d0fe20b94e7e67376e14324222f0c47a13c938
 DIST winrar-x64-521.exe 1941744 SHA256 e315674d9e2f5f63977fb5fd8e8bcafcdc106594b83e7ba062c5bec24901a5d2 SHA512 b08be6ea9dcbd19ac3849045a18d59a968ade46bcdfe3c6451dbcb5856d294b9dbdb89b1d38dff1749b44c47dc47b4de519ae5561825f06498455ffec48c7822 WHIRLPOOL 4faf6f2379e8b589974bff8fbb4a8a9561d2d60473f7874c0bf163a8915e902d7550847bd808e32ace3f48cfc02246b07b69b50ed848881d84d59d0594fd2322
 DIST winrar-x64-530.exe 1964912 SHA256 951b53d30aa7d40f5fd4720ddd7385d431ede0e18df496fcb9c255ee1520d668 SHA512 ebe7ba3e3bc36941a6cf4f27f00edfd62e2297fda6de64a3718da10f10c9a9510b1dea96e5d128602e3b4069e276c88f79914b535a0acb390158a620510501ca WHIRLPOOL ac463202b33f4130e45da5df85b47a0eaf268686aefb5bcd8b09da729f1348d000d513f8297c67520515321b0d6632a16d6ed23ccc73efbd18c605cb624981d1
+DIST winrar-x64-540.exe 2179856 SHA256 d73cc6a97c3edde637c7d952ee2e0efc5b09937e5300cb0ecaffda70f4efdef0 SHA512 27082f2aa1fde0b82611360bece85b984258a3e81fb20249122a643ae1d6d9878ca248e854899a7ceffa4363aa032fc5360eba80c19e700292b5a261040d75c0 WHIRLPOOL 62bd28cb0ef7c4b5294f44cf15d697f15a69aaaa898865b006d3ff3984378cb688907481dab738e2f25737cec9fe199dc157b48b66f28ae6a66fb1dd27018d7b

app-arch/rar/rar-5.4.0.ebuild

@@ -0,0 +1,82 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+MY_PV="${PV/0_beta/b}"
+DESCRIPTION="RAR compressor/uncompressor"
+HOMEPAGE="http://www.rarsoft.com/"
+URI_x86="http://www.rarsoft.com/rar/rarlinux-${MY_PV}.tar.gz"
+URI_amd64="http://www.rarsoft.com/rar/rarlinux-x64-${MY_PV}.tar.gz"
+URI_w64="http://www.rarsoft.com/rar/winrar-x64-${MY_PV//.}.exe"
+SRC_URI="x86? ( ${URI_x86} )
+	amd64? ( ${URI_amd64} )
+	all_sfx? (
+		${URI_x86}
+		${URI_amd64}
+		${URI_w64}
+	)"
+
+LICENSE="RAR BSD BSD-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="all_sfx static"
+RESTRICT="mirror bindist"
+
+DEPEND="all_sfx? ( app-arch/unrar )"
+RDEPEND="sys-libs/glibc"
+
+S="${WORKDIR}/${PN}"
+
+QA_FLAGS_IGNORED="opt/rar/default.sfx
+	opt/rar/default-elf32.sfx
+	opt/rar/default-elf64.sfx
+	opt/rar/default-win32.sfx
+	opt/rar/default-win64.sfx
+	opt/rar/WinCon.SFX
+	opt/rar/WinCon64.SFX
+	opt/rar/Zip.SFX
+	opt/rar/Zip64.SFX
+	opt/rar/unrar
+	opt/rar/rar"
+QA_PRESTRIPPED=${QA_FLAGS_IGNORED}
+
+src_unpack() {
+	use x86 && unpack ${URI_x86##*/}
+	use amd64 && unpack ${URI_amd64##*/}
+	rm -f "${S}"/license.txt
+	if use all_sfx ; then
+		mkdir sfx
+		cd sfx
+		unpack ${URI_x86##*/}
+		mv rar/default.sfx default-elf32.sfx || die
+		unpack ${URI_amd64##*/}
+		mv rar/default.sfx default-elf64.sfx || die
+		ln -s "${DISTDIR}"/${URI_w64##*/} w64.rar
+		unpack ./w64.rar
+		mv Default.SFX default-win32.sfx || die
+		mv Default64.SFX default-win64.sfx || die
+	fi
+}
+
+src_compile() { :; }
+
+src_install() {
+	exeinto /opt/rar
+	doexe rar unrar || die
+	use static && { newexe rar_static rar || die ; }
+
+	dodir /opt/bin
+	dosym ../rar/rar /opt/bin/rar || die
+	dosym ../rar/unrar /opt/bin/unrar || die
+
+	insinto /opt/rar
+	if use all_sfx ; then
+		doins "${WORKDIR}"/sfx/*.{sfx,SFX} || die
+	else
+		doins default.sfx || die
+	fi
+	doins rarfiles.lst || die
+	dodoc *.txt
+}

app-crypt/pinentry/pinentry-0.9.7-r1.ebuild

@@ -12,7 +12,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="emacs gtk ncurses qt4 qt5 caps gnome-keyring static"
 
 CDEPEND="

app-crypt/tpm-tools/files/tpm-tools-1.3.9-gold.patch

@@ -1,57 +1,5 @@
-From 4cf41d367e3248fecee7620501d12449c374c055 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Tue, 6 Dec 2016 09:38:06 +0200
-Subject: [PATCH] build: -lcrypto is required for tspi
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- configure.ac              | 13 +++++++++----
- lib/Makefile.am           |  2 +-
- src/cmds/Makefile.am      |  2 +-
- src/data_mgmt/Makefile.am |  2 +-
- src/tpm_mgmt/Makefile.am  |  2 +-
- 5 files changed, 13 insertions(+), 8 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 279954a..99f9c4b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -90,14 +90,22 @@ AC_ARG_WITH(openssl,
- 		    AC_MSG_ERROR([$OPENSSL_INCLUDE_DIR or $OPENSSL_LIB_DIR doen't exist!])
- 	    else
- 		    AC_MSG_RESULT([yes])
--		    CFLAGS="$CFLAGS -L$OPENSSL_LIB_DIR -I$OPENSSL_INCLUDE_DIR"
-+		    CFLAGS="$CFLAGS -I$OPENSSL_INCLUDE_DIR"
-+		    LDFLAGS="$LDFLAGS -L$OPENSSL_LIB_DIR"
- 		    AC_SUBST([OPENSSL_LIB_DIR])
- 	    fi],
- 	    [AC_MSG_RESULT([no])
- 	    AC_SUBST([OPENSSL_LIB_DIR], []) ] )
- 
-+AC_CHECK_LIB(crypto, PEM_read_X509, [OPENSSL_LIB="1"], [AC_MSG_ERROR([openssl lib not found: libcrypto.so])])
-+AC_CHECK_HEADER(openssl/evp.h, [OPENSSL_INC="1"], [AC_MSG_ERROR([openssl header not found: openssl/evp.h])])
-+
-+OLD_LIBS="$LIBS"
-+LIBS="$LIBS -lcrypto"
- AC_CHECK_LIB(tspi, Tspi_Context_Create, [TSS_LIB="1"], [AC_MSG_ERROR([tss lib not found: libtspi.so])])
- AC_CHECK_LIB(tspi, Tspi_TPM_SetOperatorAuth, [TSS_12="1"], [TSS_12="0"])
-+AC_SUBST([TSPI_LIBS], ["-ltspi -lcrypto"])
-+LIBS="$OLD_LIBS"
- if test "$TSS_12" = "1"; then
- 	AM_CONDITIONAL(TSS_LIB_IS_12, true)
- 	AC_MSG_NOTICE([Configuring tpm-tools for TSS 1.2])
-@@ -107,9 +115,6 @@ else
- fi
- AC_CHECK_HEADER(trousers/tss.h, [TSS_INC="1"], [AC_MSG_ERROR([tss header not found: trousers/tss.h])])
- 
--AC_CHECK_LIB(crypto, PEM_read_X509, [OPENSSL_LIB="1"], [AC_MSG_ERROR([openssl lib not found: libcrypto.so])])
--AC_CHECK_HEADER(openssl/evp.h, [OPENSSL_INC="1"], [AC_MSG_ERROR([openssl header not found: openssl/evp.h])])
--
- OPENCRYPTOKI="0"
- AC_ARG_ENABLE(pkcs11_support, 
-   AC_HELP_STRING([--disable-pkcs11-support], [don't build data_mgmt commands [[default=no]]]),
 diff --git a/lib/Makefile.am b/lib/Makefile.am
-index c1d7009..af9bc49 100644
+index cef6a2f..d7092a7 100644
 --- a/lib/Makefile.am
 +++ b/lib/Makefile.am
 @@ -80,4 +80,4 @@ endif
@@ -59,46 +7,4 @@ index c1d7009..af9bc49 100644
  libtpm_unseal_la_SOURCES =	tpm_unseal.c
  libtpm_unseal_la_LDFLAGS =	-shared -version-info 1:0:0
 -libtpm_unseal_la_LIBADD  =	-ltspi  libtpm_tspi.la @INTLLIBS@
-+libtpm_unseal_la_LIBADD  =	libtpm_tspi.la -lcrypto @TSPI_LIBS@ @INTLLIBS@
-diff --git a/src/cmds/Makefile.am b/src/cmds/Makefile.am
-index 27fc9ef..d7508bf 100644
---- a/src/cmds/Makefile.am
-+++ b/src/cmds/Makefile.am
-@@ -30,7 +30,7 @@ else
- AM_CPPFLAGS	=	-I$(top_srcdir)/include -D_LINUX
- endif
- 
--LDADD		=	$(top_builddir)/lib/libtpm_tspi.la -ltspi $(top_builddir)/lib/libtpm_unseal.la -ltpm_unseal -lcrypto @INTLLIBS@
-+LDADD		=	$(top_builddir)/lib/libtpm_tspi.la $(top_builddir)/lib/libtpm_unseal.la -ltpm_unseal -lcrypto @TSPI_LIBS@ @INTLLIBS@
- 
- tpm_sealdata_SOURCES = tpm_sealdata.c
- tpm_unsealdata_SOURCES = tpm_unsealdata.c
-diff --git a/src/data_mgmt/Makefile.am b/src/data_mgmt/Makefile.am
-index de505e4..765a2fa 100644
---- a/src/data_mgmt/Makefile.am
-+++ b/src/data_mgmt/Makefile.am
-@@ -38,7 +38,7 @@ noinst_HEADERS =	data_common.h \
- # Common build flags
- AM_CPPFLAGS	=	-I$(top_srcdir)/include -D_LINUX
- 
--LDADD		=	$(top_builddir)/lib/libtpm_pkcs11.la -ltspi -ldl @INTLLIBS@
-+LDADD		=	$(top_builddir)/lib/libtpm_pkcs11.la @TSPI_LIBS@ -ldl @INTLLIBS@
- 
- 
- #
-diff --git a/src/tpm_mgmt/Makefile.am b/src/tpm_mgmt/Makefile.am
-index 7ca47c9..6205b64 100644
---- a/src/tpm_mgmt/Makefile.am
-+++ b/src/tpm_mgmt/Makefile.am
-@@ -55,7 +55,7 @@ else
- AM_CPPFLAGS	=	-I$(top_srcdir)/include -D_LINUX
- endif
- 
--LDADD		=	$(top_builddir)/lib/libtpm_tspi.la -ltspi @INTLLIBS@
-+LDADD		=	$(top_builddir)/lib/libtpm_tspi.la @TSPI_LIBS@ @INTLLIBS@
- 
- tpm_startup_SOURCES =		tpm_startup.c
- tpm_reset_SOURCES =		tpm_reset.c
--- 
-2.7.3
-
++libtpm_unseal_la_LIBADD  =	-ltspi  libtpm_tspi.la -lcrypto @INTLLIBS@

app-crypt/trousers/files/trousers-0.3.14-libressl.patch

@@ -0,0 +1,26 @@
+From b8b1cda430270f03dc556cf9cf7d2fd478101525 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Wed, 7 Dec 2016 09:36:34 +0200
+Subject: [PATCH] tspi: support libressl
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ src/trspi/crypto/openssl/rsa.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/trspi/crypto/openssl/rsa.c b/src/trspi/crypto/openssl/rsa.c
+index 2b1205f..3e56015 100644
+--- a/src/trspi/crypto/openssl/rsa.c
++++ b/src/trspi/crypto/openssl/rsa.c
+@@ -38,7 +38,7 @@
+ #define DEBUG_print_openssl_errors()
+ #endif
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100001L
++#if OPENSSL_VERSION_NUMBER < 0x10100001L || defined(LIBRESSL_VERSION_NUMBER)
+ static int
+ RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
+ {
+-- 
+2.7.3
+

app-crypt/trousers/trousers-0.3.14-r1.ebuild

@@ -29,6 +29,7 @@ RDEPEND="${CDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.3.13-nouseradd.patch"
+	"${FILESDIR}/${P}-libressl.patch"
 )
 
 DOCS="AUTHORS ChangeLog NICETOHAVES README TODO"

app-doc/csound-manual/Manifest

@@ -6,3 +6,7 @@ DIST Csound6.07_manual-fr_html.zip 15495149 SHA256 746c2c0e3a60988198bf3ff36f6a8
 DIST Csound6.07_manual-fr_pdf.zip 6602805 SHA256 a164ac4108f25f3366f81f0b530e07de61060379e11673ba63477939587df41b SHA512 a39bc2d1c89d304471ac9675809842ce12d43b65af1ab2db643b822a1f9aeb7a69ab6dd93986eb3f582bc76200b68a4f87eeb2ef9a5775d575099c662f5d4c0a WHIRLPOOL 56fd21e1216dd2bfee3d3c52522f55995997279a7e978ca4ffe268a3a23533a6544644bf1ef7cc90117d3c5a79d0f20eb057b681c33926cd43bc8b2644a2db5b
 DIST Csound6.07_manual_html.zip 15220371 SHA256 e71f364aedf74f8fa3d9c4ba071326a630bfa8b408910ef7f9ac9f5347bf669c SHA512 dcf288d7c968bbeeb7fed449b6d423331f29eb7fe4d0afb8786d0cdb60449d6d2a416551e567be4ac28baf4432e5326225e533eb6c232fa93ff4ec6dca3d5557 WHIRLPOOL a0b34715f98f74124e38f72f184be827b4c991767a462312e1f571313f2331c9febdcfe35f2bbc1677583d3f7d6df3aa544c8f4b984aea518a71347ffbc8235f
 DIST Csound6.07_manual_pdf.zip 6272890 SHA256 ac244f8ec2073b3a60c77c28d419d460f70ce28ad2fad6e4d50098b7c252a32c SHA512 e1affd039cd246a6eedbff4d8af68fe2e49d89ce60d839774b30a61059a4463bf3c30812e5edb05f3df5cb2cf33ac9c678338ecd110d57334aa3ce240168a466 WHIRLPOOL 5edd9cb35241823658b430455cbd3001a9fd343ca42fef457f423a85405336f096511ce55a286f211b29dfecf7736b8334d27d8873fae0430e7666b7bebecfa4
+DIST Csound6.08_manual-fr_html.zip 15576083 SHA256 ec2860fb2bcf0c974f4c64503833aed182ebe919119d2f9f78aa8aaff029e7f4 SHA512 7e3a5fbf2c52a1f5f0e9a6c5ee2bfe5e155edfdab81c9a64b66756754dba07a4bc6e7279e668c54ab762c1055a66f2a28c4928d5d3cd7af5418d049b8ffacdd3 WHIRLPOOL a4137f342c7188937f67b469eb6d5281d53325798100a4dd5d4b33d559ead02d99dad5d8483cda079d489cbae66c20e8657d9e9371794e7a69b4f51d4504d19c
+DIST Csound6.08_manual-fr_pdf.zip 6660383 SHA256 a8e0365ebe974cc18bb7a31e909cf6a5d268ade0297f7e6a6d0931442feb5cef SHA512 eb61a576bf0eb4620c12c123ae2e23589cc24f53bffc05e646efba633ebb142906f021b41ac9a77b030476c319cc3ffa3466927ffe9f266d67f7e72217f97396 WHIRLPOOL 403650040ee2097cece161273a40828662f7ea71beb28613c9c2e7d4b696163d6723ee912ab1e9d17938e9bd45980a1ab2464543a49ed137cdfc1563d44261aa
+DIST Csound6.08_manual_html.zip 15267494 SHA256 1ac442112bcd3b9e698070e3e8cd30a71b6a9b02b403a1d43b736544ea2243b6 SHA512 7aaf61d94c067907a418df4bdf48a86b1bb2c220a6f2cedcef7b50af3e49040cd2c0f6f389b9d82b22f4fe6b166fdf4608d70be7e83f2caf7889ce61610dd8e6 WHIRLPOOL cc2d104ce2ca26d96b25c7969b8faf39ed41db41c046d9fb86ff47743135213cb6cf4d712e3727d5d8395a1bec0c5b543febe1eafa8d3ac6e860a1ee70edb8ae
+DIST Csound6.08_manual_pdf.zip 6326314 SHA256 60cfc97571fa75783ad1522be0b43c181bb64d0c2295a5232fec34dbfe95d4c4 SHA512 b911af38ea78b8b551abf1599f0078911c1a80ea44580119ad5c32afb95f07d59848643afcde20c6c64b61af868b1242aa04174761b983a0c160cea2bc28f243 WHIRLPOOL 39c7a25026470b1169549c13a03f1b3f4cba0216645c50c8624db61c0c79ca98f9bf03b187abfd00c007b8c11488a5136dd32757e9b583cd7c0a8c9eaaa440e5

app-doc/csound-manual/csound-manual-6.08.ebuild

@@ -0,0 +1,65 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+MY_P=Csound${PV}
+
+DESCRIPTION="The Csound reference manual"
+HOMEPAGE="http://csounds.com/"
+SRC_URI="
+	https://github.com/csound/csound/releases/download/${PV}.0/${MY_P}_manual_pdf.zip
+	l10n_fr? ( https://github.com/csound/csound/releases/download/${PV}.0/${MY_P}_manual-fr_pdf.zip )
+
+	html? (
+		https://github.com/csound/csound/releases/download/${PV}.0/${MY_P}_manual_html.zip
+		l10n_fr? ( https://github.com/csound/csound/releases/download/${PV}.0/${MY_P}_manual-fr_html.zip )
+	)"
+
+LICENSE="FDL-1.2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="html"
+
+LANGS=" fr"
+IUSE+="${LANGS// / l10n_}"
+
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${MY_P}_manual_pdf.zip
+
+	if use html ; then
+		unpack ${MY_P}_manual_html.zip
+		mv html html-en
+	fi
+
+	local lang
+	for lang in ${LANGS} ; do
+		use l10n_${lang} || continue
+		unpack ${MY_P}_manual-${lang}_pdf.zip
+		if use html ; then
+			unpack ${MY_P}_manual-${lang}_html.zip
+			mv html html-${lang}
+		fi
+	done
+}
+
+src_install() {
+	dodoc *.pdf
+
+	if use html ; then
+		docinto html
+		dodoc -r html-en/*
+
+		local lang
+		for lang in ${LANGS} ; do
+			use l10n_${lang} || continue
+			docinto html-${lang}
+			dodoc -r html-${lang}/*
+		done
+	fi
+}

app-emulation/xen-pvgrub/Manifest

@@ -5,4 +5,5 @@ DIST pciutils-2.2.9.tar.bz2 212265 SHA256 f60ae61cfbd5da1d849d0beaa21f593c38dac9
 DIST polarssl-1.1.4-gpl.tgz 611340 SHA256 2d29fd04a0d0ba29dae6bd29fb418944c08d3916665dcca74afb297ef37584b6 SHA512 88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad WHIRLPOOL 39448c00dda142a836a78381b446c7b586272a44d8afc867a7ea702228f105bb2adffe757bd6c23af090cff64ef32e7af0c373dccc5145ff4c11552cf3f28383
 DIST xen-4.6.4.tar.gz 19709274 SHA256 b795d5631a85fb68295361067195ecd00003656dacede4ec57533fce33ab5109 SHA512 e6278061a16829628030579e115a500970ff575eb6796189bfa1e2d7a8cbbf8aec2c2bd04c77cdc87226d6cc5eaee59d6c62cacb4e74b06e1f1379734b872938 WHIRLPOOL a982f7bbf2ba16781ac0f310ef27a32e9115596e91117609d22827bc1999facb12df4f33d1ba0b7015cbfae90a24302243d508e8c38ba45ea998341b76ba0567
 DIST xen-4.7.1.tar.gz 20706864 SHA256 e87f4b0575e78657ee23d31470a15ecf1ce8c3a92a771cda46bbcd4d0d671ffe SHA512 eb03244f5fa7b54402fcc1d38f1e69c0ea4536d5ab2f9859b41b5e94920ad9db20fb146e3c3d3635e9ca1d12e93ce0429e57f24bf53d4a2c4b69babc76ec724e WHIRLPOOL 5d7ba29ea58bdedb6a237f7cb1c0aacf361dc35ebb07ec8e55773e07b1f38c1b151615b526e14daeca7c2db235114bde0b6d124219e8818c6e529873b5151fec
+DIST xen-4.8.0.tar.gz 22499917 SHA256 1e15c713ab7ba3bfda8b4a285ed973529364fd1100e6dd5a61f29583dc667b04 SHA512 70b95553f9813573b12e52999a4df8701dec430f23c36a8dc70d25a46bb4bc9234e5b7feb74a04062af4c8d6b6bcfe947d90b2b172416206812e54bac9797454 WHIRLPOOL 1296c25a05e3ab81730a2587ea1c07c7c022f05cfefc580224185c8d5fc9853531031c1292f69eff944ae2752492c4b95f13e160be3c449a7626aeadf1a21102
 DIST zlib-1.2.3.tar.gz 496597 SHA256 1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e WHIRLPOOL 8fd7010faf6a48a9c7ff4bcfe3ce4fe9061eb541259e0a2d0def214e8c4becf2b22e8d6f96f65ca827abffeaa9d96e95ed2402844f99835f7b079fc9f3e84276

app-emulation/xen-pvgrub/files/xen-pvgrub-4.8-jserver.patch

@@ -0,0 +1,13 @@
+diff --git a/tools/firmware/vgabios/Makefile b/tools/firmware/vgabios/Makefile
+index 3284812..ef242b3 100644
+--- a/tools/firmware/vgabios/Makefile
++++ b/tools/firmware/vgabios/Makefile
+@@ -30,7 +30,7 @@ distclean: clean
+ 
+ .PHONY: release
+ release: 
+-	VGABIOS_VERS=\"-DVGABIOS_VERS=\\\"$(RELVERS)\\\"\" make bios cirrus-bios
++	VGABIOS_VERS=\"-DVGABIOS_VERS=\\\"$(RELVERS)\\\"\" $(MAKE) bios cirrus-bios
+ 	/bin/rm -f  *.o *.s *.ld86 \
+           temp.awk.* vgabios.*.orig _vgabios_.*.c core *.bak .#*
+ 	cp VGABIOS-lgpl-latest.bin ../$(RELEASE).bin

app-emulation/xen-pvgrub/xen-pvgrub-4.8.0.ebuild

@@ -0,0 +1,161 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='xml,threads'
+
+inherit flag-o-matic eutils multilib python-single-r1 toolchain-funcs
+
+XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
+LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
+GRUB_URL=mirror://gnu-alpha/grub
+
+UPSTREAM_VER=
+[[ -n ${UPSTREAM_VER} ]] && \
+	UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+
+SRC_URI="
+		http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
+		$GRUB_URL/grub-0.97.tar.gz
+		$XEN_EXTFILES_URL/zlib-1.2.3.tar.gz
+		$LIBPCI_URL/pciutils-2.2.9.tar.bz2
+		$XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
+		$XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz
+		$XEN_EXTFILES_URL/polarssl-1.1.4-gpl.tgz
+		${UPSTREAM_PATCHSET_URI}"
+
+S="${WORKDIR}/xen-${PV}"
+
+DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
+HOMEPAGE="http://xen.org/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="custom-cflags"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="sys-devel/gettext
+	sys-devel/bin86
+	sys-apps/texinfo
+	x11-libs/pixman"
+
+RDEPEND=">=app-emulation/xen-tools-${PV}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+retar-externals() {
+	# Purely to unclutter src_prepare
+	local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz polarssl-1.1.4-gpl.tgz zlib-1.2.3.tar.gz"
+
+	# epatch can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative
+	sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \
+		-i "${WORKDIR}"/zlib-1.2.3/configure
+	sed -e 's:^AR=ar rc:AR=ar:' \
+		-e s':$(AR) $@:$(AR) rc $@:' \
+		-i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in}
+	einfo "zlib Makefile edited"
+
+	cd "${WORKDIR}"
+	tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz
+	tar czp grub-0.97 -f grub-0.97.tar.gz
+	tar czp lwip -f lwip-1.3.0.tar.gz
+	tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz
+	tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz
+	mv $set "${S}"/stubdom/
+	einfo "tarballs moved to source"
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Xen Upstream patch set"
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \;
+	fi
+
+	# Patch the unmergeable newlib, fix most of the leftover gcc QA issues
+	cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
+
+	# Patch stubdom/Makefile to patch insource newlib & prevent internal downloading
+	epatch "${FILESDIR}"/${PN/-pvgrub/}-4.3-externals.patch
+
+	# fix jobserver in Makefile
+	epatch "${FILESDIR}"/${PN}-4.8-jserver.patch
+
+	#Substitute for internal downloading. pciutils copied only due to the only .bz2
+	cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
+	retar-externals || die "re-tar procedure failed"
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf="--prefix=${PREFIX}/usr \
+		--libdir=${PREFIX}/usr/$(get_libdir) \
+		--libexecdir=${PREFIX}/usr/libexec \
+		--disable-werror \
+		--disable-xen"
+
+	econf ${myconf}
+}
+
+src_compile() {
+	use custom-cflags || unset CFLAGS
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include
+
+	if use x86; then
+		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
+		XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+	elif use amd64; then
+		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
+		XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
+		if has_multilib_profile; then
+			multilib_toolchain_setup x86
+			emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
+			XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+		fi
+	fi
+}
+
+src_install() {
+	if use x86; then
+		emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
+	fi
+	if use amd64; then
+		emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub
+		if has_multilib_profile; then
+			emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
+		fi
+	fi
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "http://wiki.xen.org/wiki/Main_Page"
+}

app-emulation/xen-tools/Manifest

@@ -1,10 +1,13 @@
 DIST ovmf-20151110.tar.bz2 27518370 SHA256 74199f6b5c6f756881323242742c396c52096db5f61700a4eb839343f9ab0604 SHA512 dda185af2fc0b9a8d5fc7e1e96db6aa31807782fe77d38491896164d125c30d2277db3d71a7dce7bbd569723b344b97dfebbc78ddddca0a095721f6b1ae3a1d3 WHIRLPOOL 145fb1c873cce96b81b269b44800987ca1b7350425b682fd5a5799648b0270c6c17bb337ad7e06650e6b66a9ac6eef8d9c9239f1478a687be4af187e60c3f3f5
+DIST seabios-1.10.0.tar.gz 588213 SHA256 8976fc4c1ebcda66ac96689762247dfc99115a5f7acb3a7d4e18d18ff5de12a9 SHA512 f1b83ce37b59070b488e19f98c95ca9f413cf4969663331b631c3ccb884c90b2db793d32a779ef05cead538c2fd123be4b73391ad2fa20c900a1f14237178d8c WHIRLPOOL 77718eac01a59f94c3fa81195925ae09c19e11f80f107b3387e910408d88d3ffc93eaca3b73d6a52b67514538c0e020b0f4078db8277a5ee6361fd0d3ada8598
 DIST seabios-1.8.2.tar.gz 538497 SHA256 f59479307fdae840de398b75aacb2333c8eba24a5964d68c77e32ca6c987ee61 SHA512 798d222d5f5725a805cde9e6000b5ce714d0551fd4a3c2642cc6e77b2bdab1a9e239939a358a23bbe0e00112f5ad70696c87d20b90655463c835541fc04e1a00 WHIRLPOOL 9cda0ad502a59dd718c543b759ac3fcf5acb4adee70c3da9bfea95ab188415acf6425827de77f45421ec3be8fd9e0c37fb486e62828217ba3e83f88d942a3f4a
 DIST xen-4.6.4-upstream-patches-0.tar.xz 15280 SHA256 0f2d55e44e2c98fb7caf76997c05f44fe1efdbf7eaa971a4bf234ea3bc95e244 SHA512 26be1b03af1ac0d6a413b0ab8a30d59c733d6d5c4e29ce3b5b90818a1589cbb5c46a50b9ee42b273ef3b37df8ff403241d68e1e2221ce969054fb7e5f13516ab WHIRLPOOL 52420897c49cd1bcfd8896df45a1f9c8df6337cb68dd7a6ff962361e7ab2eab1e6d6699ae8236b105e6b700b5d5b6c8da302ff477ac6493a60a665e4225cff02
 DIST xen-4.6.4.tar.gz 19709274 SHA256 b795d5631a85fb68295361067195ecd00003656dacede4ec57533fce33ab5109 SHA512 e6278061a16829628030579e115a500970ff575eb6796189bfa1e2d7a8cbbf8aec2c2bd04c77cdc87226d6cc5eaee59d6c62cacb4e74b06e1f1379734b872938 WHIRLPOOL a982f7bbf2ba16781ac0f310ef27a32e9115596e91117609d22827bc1999facb12df4f33d1ba0b7015cbfae90a24302243d508e8c38ba45ea998341b76ba0567
 DIST xen-4.7.1-upstream-patches-0.tar.xz 16420 SHA256 cb4724fedadc408ec390f99e9928a44ec75e793fb55cb97793f09980855b6a32 SHA512 79e117c48c6cc3d5783c818218ac11ec494735ce89755b5e263a64c23fb1f0a425bc65b567a24ce2e348b6e3839b26133c7e2c36411e5cc7acb54b855149dfbe WHIRLPOOL 982165da62cbb28cd72d32662c366ca7dac91a511b356eb58bced4b4af5cbc0d94c7e280a2400e5d9c92938d2afee86abd7c688926c2b9cb191d4554be828844
 DIST xen-4.7.1.tar.gz 20706864 SHA256 e87f4b0575e78657ee23d31470a15ecf1ce8c3a92a771cda46bbcd4d0d671ffe SHA512 eb03244f5fa7b54402fcc1d38f1e69c0ea4536d5ab2f9859b41b5e94920ad9db20fb146e3c3d3635e9ca1d12e93ce0429e57f24bf53d4a2c4b69babc76ec724e WHIRLPOOL 5d7ba29ea58bdedb6a237f7cb1c0aacf361dc35ebb07ec8e55773e07b1f38c1b151615b526e14daeca7c2db235114bde0b6d124219e8818c6e529873b5151fec
+DIST xen-4.8.0.tar.gz 22499917 SHA256 1e15c713ab7ba3bfda8b4a285ed973529364fd1100e6dd5a61f29583dc667b04 SHA512 70b95553f9813573b12e52999a4df8701dec430f23c36a8dc70d25a46bb4bc9234e5b7feb74a04062af4c8d6b6bcfe947d90b2b172416206812e54bac9797454 WHIRLPOOL 1296c25a05e3ab81730a2587ea1c07c7c022f05cfefc580224185c8d5fc9853531031c1292f69eff944ae2752492c4b95f13e160be3c449a7626aeadf1a21102
 DIST xen-gentoo-patches-7.tar.xz 24148 SHA256 859fb6b69125c0a1079b35a74bb004dce1b04827b05f056a746cc42c1b187557 SHA512 faf2b0ecd67d545366e2af7e7ecab5f808d02354d07f23cbffe1c3cb80dbb5f88cc4aa140d928ad269612e55c41740ff5bf2af3f0a1f16e375d404c3ffa712b1 WHIRLPOOL d75c35fa10dd1f1567a82c5d5cd7ddabc72def6d74ef7095b7bca9ce9adad2b6ff9c88b55bad7cdefe88da027e5c742f9b9dcafce457cf15f408ea35652546f6
+DIST xen-gentoo-patches-8.tar.xz 24732 SHA256 6e114f3d3bde31f8595a51bd67fafdbb56cbd60793bafad7061fcaaef67f36fb SHA512 05da32f8fca0a9a43d419c2edd01d0c4abe233c0a8cc02e18caf6490ae9938c4302e8e61f7c67339f5fddab412be69504e1f05de895b73ac8b540914745fefd9 WHIRLPOOL 43d5114f455d2465995e9a1bffe5fff1e722540994348d05a3bac5504a970ad6af447f783ddf271a183207c21e75a0b77b6aed0a8ec8c89446e99ec1b377bcbe
 DIST xen-ovmf-patches-2.tar.xz 4344 SHA256 495d61d718440057f8b0b54fb57061450dd764c6e87fe5f8bda1785bcddba770 SHA512 0bdc83029a01b613f5c1ca029bd45aebe211c332f09db91a0cc7d6b6f85a81dbbfdc20c62f0d20e973ee41b155a6551a4fad518cb792e1d508bf070e23d6a1d3 WHIRLPOOL 8346d68fa5d2a8e8a5c007b55e2b85cf48df045cc8c4818f09c756d28a52dd856671f37b4a53478e9b96ca9d2eca0c67fd15f009a94d1d2dfed8e83e596d9633
 DIST xen-security-patches-17.tar.xz 9908 SHA256 9fc679ddea420e3aeb2f7ba4bacbb4c192b6c15d5e62b40def16cdb9e376a032 SHA512 4a5375caf5b928662b10c31ef5af2f9bd092b512d6fb1a0292b0389d3c7f5b062f7ed1401b6c5dbeb83d20418fd025bbca43e76d42c739c5a2809c6cfb59db16 WHIRLPOOL fdda75869ece47a180fce27b3d060b2dfe06861958443c55fe8de31f7c673382c468eccda0c40c87953abae57e12b2c3979a84515fb66ba190b6f7cffe57eb2d
 DIST xen-security-patches-18.tar.xz 2544 SHA256 99d7e0762d221f064d08ff4ca875b2270330a3924d5537b58505e72f8be0de04 SHA512 d2192a1f31557953118ad14e2ed2158577de529ea2cef9f63438f3bf570d979cea8b2f0244d8517a161878c6d8036173715228049102a85571e8dbc758eef3b9 WHIRLPOOL e67f77756fefa64b05c2621ab2e4bffaa349b8f6f7af2d0d7cade0516961e6789b4f6c30536bf681a86acbe907dcf29a08b0b573843fe07bcd7aa678ee7312b0

app-emulation/xen-tools/files/gentoo-patches.conf

@@ -57,11 +57,13 @@ _gx032=" xen-tools-4.5-anti-seabios-download.patch"
 
 # Bug 477676
 _gx022=" xen-tools-4.3-ar-cc.patch"
+_gx038=" xen-tools-4.8-ar-cc.patch"
 
 # Prevent file collision with qemu package Bug 478064
 _gx023=" qemu-bridge.patch"
 _gx025=" xen-4.4-qemu-bridge.patch"
 _gx031=" xen-4.5-qemu-bridge.patch"
+_gx039=" xen-4.8-qemu-bridge.patch"
 #mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
 
 _gx026=" xen-tools-4.4-api-fix.patch"
@@ -117,3 +119,12 @@ ${_gx027} ${_gx032}
 ${_gx028} ${_gx029} ${_gx036}
 ${_gx037}
 "
+
+# xen-tools-4.8.0 patches set
+_gpv_xen_tools_480_0="
+${_gx008}
+${_gx038} ${_gx017} ${_gx039}
+${_gx027} ${_gx032}
+${_gx028} ${_gx029}
+${_gx037}
+"

app-emulation/xen-tools/xen-tools-4.8.0.ebuild

@@ -0,0 +1,456 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='ncurses,xml,threads'
+
+inherit eutils bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs versionator
+
+MY_PV=${PV/_/-}
+MAJOR_V="$(get_version_component_range 1-2)"
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	KEYWORDS=""
+	REPO="xen.git"
+	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
+	S="${WORKDIR}/${REPO}"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	UPSTREAM_VER=
+	SECURITY_VER=
+	# xen-tools's gentoo patches tarball
+	GENTOO_VER=8
+	# xen-tools's gentoo patches version which apply to this specific ebuild
+	GENTOO_GPV=0
+	# xen-tools ovmf's patches
+	OVMF_VER=2
+
+	SEABIOS_VER=1.10.0
+	# OVMF upstream 52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d
+	OVMF_PV=20151110
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	[[ -n ${OVMF_VER} ]] && \
+		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
+
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz
+	http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
+	https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
+	ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2
+		${OVMF_PATCHSET_URI} )
+	${UPSTREAM_PATCHSET_URI}
+	${SECURITY_PATCHSET_URI}
+	${GENTOO_PATCHSET_URI}"
+
+	S="${WORKDIR}/xen-${MY_PV}"
+fi
+
+DESCRIPTION="Xen tools including QEMU and xl"
+HOMEPAGE="http://xen.org/"
+DOCS=( README docs/README.xen-bugtool )
+
+LICENSE="GPL-2"
+SLOT="0/${MAJOR_V}"
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
+# >=dev-lang/ocaml-4 stable
+# Masked in profiles/eapi-5-files instead
+IUSE="api custom-cflags debug doc flask hvm +qemu ocaml ovmf +qemu-traditional +pam python pygrub screen sdl static-libs system-qemu system-seabios"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	pygrub? ( python )
+	ovmf? ( hvm )
+	^^ ( qemu system-qemu )"
+
+COMMON_DEPEND="
+	dev-libs/lzo:2
+	dev-libs/glib:2
+	dev-libs/yajl
+	dev-libs/libaio
+	dev-libs/libgcrypt:0
+	sys-libs/zlib
+"
+
+DEPEND="${COMMON_DEPEND}
+	dev-python/lxml[${PYTHON_USEDEP}]
+	x86? ( sys-devel/dev86
+		sys-power/iasl )
+	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
+	${PYTHON_DEPS}
+	api? ( dev-libs/libxml2
+		net-misc/curl )
+	ovmf? (
+		!arm? ( dev-lang/nasm )
+		$(python_gen_impl_dep sqlite)
+		)
+	!amd64? ( >=sys-apps/dtc-1.4.0 )
+	amd64? ( sys-devel/bin86
+		system-seabios? ( sys-firmware/seabios )
+		sys-firmware/ipxe
+		sys-devel/dev86
+		sys-power/iasl )
+	dev-lang/perl
+	app-misc/pax-utils
+	doc? (
+		app-doc/doxygen
+		dev-python/markdown[${PYTHON_USEDEP}]
+		dev-tex/latex2html[png,gif]
+		media-gfx/graphviz
+		dev-tex/xcolor
+		media-gfx/transfig
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+		dev-tex/latexmk
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-pictures
+		dev-texlive/texlive-latexrecommended
+	)
+	hvm? ( x11-proto/xproto
+		!net-libs/libiscsi )
+	qemu? (
+		x11-libs/pixman
+		sdl? ( media-libs/libsdl[X] )
+	)
+	system-qemu? ( app-emulation/qemu[xen] )
+	ocaml? ( dev-ml/findlib
+		>=dev-lang/ocaml-4 )"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2[-minimal]
+	net-misc/bridge-utils
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="usr/lib/xen/boot/hvmloader
+	usr/share/qemu-xen/qemu/s390-ccw.img"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python_setup
+	export "CONFIG_LOMOUNT=y"
+
+	#bug 522642, disable compile tools/tests
+	export "CONFIG_TESTS=n"
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Xen Upstream patch set"
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+	einfo "Try to apply Xen Security patch set"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		EPATCH_SUFFIX="patch"
+		EPATCH_FORCE="yes"
+
+		source "${WORKDIR}"/patches-security/${PV}.conf
+
+		for i in ${XEN_SECURITY_MAIN}; do
+			epatch "${WORKDIR}"/patches-security/xen/$i
+		done
+
+		# apply qemu-xen/upstream patches
+		pushd "${S}"/tools/qemu-xen/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUU}; do
+			epatch "${WORKDIR}"/patches-security/qemuu/$i
+		done
+		popd > /dev/null
+
+		# apply qemu-traditional patches
+		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUT}; do
+			epatch "${WORKDIR}"/patches-security/qemut/$i
+		done
+		popd > /dev/null
+	fi
+
+	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
+	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	pushd tools/firmware/ > /dev/null
+	ln -s seabios-dir-remote seabios-dir || die
+	popd > /dev/null
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+		einfo "Try to apply Gentoo specific patch set"
+		source "${FILESDIR}"/gentoo-patches.conf
+		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+		for i in ${!_gpv}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-gentoo/$i
+		done
+	fi
+
+	# Ovmf's patchset
+	if use ovmf; then
+		if [[ -n ${OVMF_VER} ]];then
+			einfo "Try to apply Ovmf patch set"
+			pushd "${WORKDIR}"/ovmf-*/ > /dev/null
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+			EPATCH_OPTS="-p1" \
+				epatch "${WORKDIR}"/patches-ovmf
+			popd > /dev/null
+		fi
+		mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
+	fi
+
+	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+	# Fix texi2html build error with new texi2html, qemu.doc.html
+	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
+
+	use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
+	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
+		 -i tools/firmware/Makefile || die
+
+	# Drop .config, fixes to gcc-4.6
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+
+		# try and remove all the default cflags
+		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
+			-exec sed \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+				-i {} + || die "failed to re-set custom-cflags"
+	else
+		unset CFLAGS
+		unset LDFLAGS
+		unset ASFLAGS
+		unset CPPFLAGS
+	fi
+
+	if ! use pygrub; then
+		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
+	fi
+
+	if ! use python; then
+		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
+	fi
+
+	if ! use hvm; then
+		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	# Bug 351648
+	elif ! use x86 && ! has x86 $(get_all_abis); then
+		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+		export CPATH="${WORKDIR}"/extra-headers
+	fi
+
+	if use qemu; then
+		if use sdl; then
+			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
+				tools/Makefile || die
+		else
+			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
+				tools/qemu-xen-traditional/xen-setup || die
+			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
+				tools/Makefile || die
+		fi
+	else
+		# Don't bother with qemu, only needed for fully virtualised guests
+		sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
+	fi
+
+	# Reset bash completion dir; Bug 472438
+	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
+		-i Config.mk || die
+	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
+
+	# xencommons, Bug #492332, sed lighter weight than patching
+	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+		-i tools/hotplug/Linux/init.d/xencommons.in || die
+
+	# respect multilib, usr/lib/libcacard.so.0.0.0
+	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
+		-i tools/qemu-xen/configure || die
+
+	#bug 518136, don't build 32bit exactuable for nomultilib profile
+	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
+		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
+	fi
+
+	# use /var instead of /var/lib, consistat with previous ebuild
+	sed -i -e   "/XEN_LOCK_DIR=/s/\$localstatedir/\/var/g" \
+		m4/paths.m4 configure tools/configure || die
+	# use /run instead of /var/run
+	sed -i -e   "/XEN_RUN_DIR=/s/\$localstatedir//g" \
+		m4/paths.m4 configure tools/configure || die
+
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=:autoballoon=:' \
+		-e 's:^#lockfile=:lockfile=:' \
+		-e 's:^#vif.default.script=:vif.default.script=:' \
+		-i tools/examples/xl.conf  || die
+
+	# Bug #575868 converted to a sed statement, typo of one char
+	sed -e "s:granter’s:granter's:" -i xen/include/public/grant_table.h || die
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf="--prefix=${PREFIX}/usr \
+		--libdir=${PREFIX}/usr/$(get_libdir) \
+		--libexecdir=${PREFIX}/usr/libexec \
+		--disable-werror \
+		--disable-xen \
+		--enable-tools \
+		--enable-docs \
+		$(use_enable pam) \
+		$(use_enable api xenapi) \
+		$(use_enable ovmf) \
+		$(use_enable ocaml ocamltools) \
+		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
+		"
+
+	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
+	use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64"
+	use amd64 && myconf+=" $(use_enable qemu-traditional)"
+	econf ${myconf}
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}/fonts"
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
+
+	use doc && emake -C docs txt html
+	emake -C docs man-pages
+}
+
+src_install() {
+	# Override auto-detection in the build system, bug #382573
+	export INITD_DIR=/tmp/init.d
+	export CONFIG_LEAF_DIR=../tmp/default
+
+	# Let the build system compile installed Python modules.
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+		XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+	# Fix the remaining Python shebangs.
+	python_fix_shebang "${D}"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}"tmp || die
+
+	if use doc; then
+		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+
+		dohtml -r docs/
+		docinto pdf
+		dodoc ${DOCS[@]}
+		[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
+	fi
+
+	rm -rf "${D}"/usr/share/doc/xen/
+	doman docs/man?/*
+
+	newconfd "${FILESDIR}"/xendomains.confd xendomains
+	newconfd "${FILESDIR}"/xenstored.confd xenstored
+	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+	newinitd "${FILESDIR}"/xenstored.initd xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xencommons.initd xencommons
+	newconfd "${FILESDIR}"/xencommons.confd xencommons
+	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
+	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
+
+	if use screen; then
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
+		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
+		keepdir /var/log/xen-consoles
+	fi
+
+	# For -static-libs wrt Bug 384355
+	if ! use static-libs; then
+		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
+	fi
+
+	# for xendomains
+	keepdir /etc/xen/auto
+
+	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "http://wiki.xen.org/wiki/Main_Page"
+	elog ""
+	elog "Recommended to utilise the xencommons script to config sytem At boot"
+	elog "Add by use of rc-update on completion of the install"
+
+	if ! use hvm; then
+		echo
+		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+		elog "support enable the hvm use flag."
+		elog "An x86 or amd64 system is required to build HVM support."
+	fi
+
+	if use qemu; then
+		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
+		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
+		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
+		elog "the qemu-bridge-helper and the xen-bridge-helper.  File bugs of any issues that arise"
+	fi
+}

app-emulation/xen/Manifest

@@ -2,5 +2,6 @@ DIST xen-4.6.4-upstream-patches-0.tar.xz 15280 SHA256 0f2d55e44e2c98fb7caf76997c
 DIST xen-4.6.4.tar.gz 19709274 SHA256 b795d5631a85fb68295361067195ecd00003656dacede4ec57533fce33ab5109 SHA512 e6278061a16829628030579e115a500970ff575eb6796189bfa1e2d7a8cbbf8aec2c2bd04c77cdc87226d6cc5eaee59d6c62cacb4e74b06e1f1379734b872938 WHIRLPOOL a982f7bbf2ba16781ac0f310ef27a32e9115596e91117609d22827bc1999facb12df4f33d1ba0b7015cbfae90a24302243d508e8c38ba45ea998341b76ba0567
 DIST xen-4.7.1-upstream-patches-0.tar.xz 16420 SHA256 cb4724fedadc408ec390f99e9928a44ec75e793fb55cb97793f09980855b6a32 SHA512 79e117c48c6cc3d5783c818218ac11ec494735ce89755b5e263a64c23fb1f0a425bc65b567a24ce2e348b6e3839b26133c7e2c36411e5cc7acb54b855149dfbe WHIRLPOOL 982165da62cbb28cd72d32662c366ca7dac91a511b356eb58bced4b4af5cbc0d94c7e280a2400e5d9c92938d2afee86abd7c688926c2b9cb191d4554be828844
 DIST xen-4.7.1.tar.gz 20706864 SHA256 e87f4b0575e78657ee23d31470a15ecf1ce8c3a92a771cda46bbcd4d0d671ffe SHA512 eb03244f5fa7b54402fcc1d38f1e69c0ea4536d5ab2f9859b41b5e94920ad9db20fb146e3c3d3635e9ca1d12e93ce0429e57f24bf53d4a2c4b69babc76ec724e WHIRLPOOL 5d7ba29ea58bdedb6a237f7cb1c0aacf361dc35ebb07ec8e55773e07b1f38c1b151615b526e14daeca7c2db235114bde0b6d124219e8818c6e529873b5151fec
+DIST xen-4.8.0.tar.gz 22499917 SHA256 1e15c713ab7ba3bfda8b4a285ed973529364fd1100e6dd5a61f29583dc667b04 SHA512 70b95553f9813573b12e52999a4df8701dec430f23c36a8dc70d25a46bb4bc9234e5b7feb74a04062af4c8d6b6bcfe947d90b2b172416206812e54bac9797454 WHIRLPOOL 1296c25a05e3ab81730a2587ea1c07c7c022f05cfefc580224185c8d5fc9853531031c1292f69eff944ae2752492c4b95f13e160be3c449a7626aeadf1a21102
 DIST xen-security-patches-17.tar.xz 9908 SHA256 9fc679ddea420e3aeb2f7ba4bacbb4c192b6c15d5e62b40def16cdb9e376a032 SHA512 4a5375caf5b928662b10c31ef5af2f9bd092b512d6fb1a0292b0389d3c7f5b062f7ed1401b6c5dbeb83d20418fd025bbca43e76d42c739c5a2809c6cfb59db16 WHIRLPOOL fdda75869ece47a180fce27b3d060b2dfe06861958443c55fe8de31f7c673382c468eccda0c40c87953abae57e12b2c3979a84515fb66ba190b6f7cffe57eb2d
 DIST xen-security-patches-18.tar.xz 2544 SHA256 99d7e0762d221f064d08ff4ca875b2270330a3924d5537b58505e72f8be0de04 SHA512 d2192a1f31557953118ad14e2ed2158577de529ea2cef9f63438f3bf570d979cea8b2f0244d8517a161878c6d8036173715228049102a85571e8dbc758eef3b9 WHIRLPOOL e67f77756fefa64b05c2621ab2e4bffaa349b8f6f7af2d0d7cade0516961e6789b4f6c30536bf681a86acbe907dcf29a08b0b573843fe07bcd7aa678ee7312b0

app-emulation/xen/xen-4.8.0.ebuild

@@ -0,0 +1,193 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils multilib mount-boot flag-o-matic python-any-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${PV/_/-}
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	KEYWORDS=""
+	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm -x86"
+	UPSTREAM_VER=
+	SECURITY_VER=18
+	GENTOO_VER=
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz
+		${UPSTREAM_PATCHSET_URI}
+		${SECURITY_PATCHSET_URI}
+		${GENTOO_PATCHSET_URI}"
+fi
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="http://xen.org/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="custom-cflags debug efi flask"
+
+DEPEND="${PYTHON_DEPS}
+	efi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!efi? ( >=sys-devel/binutils-2.22 )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+# no tests are available for the hypervisor
+# prevent the silliness of /usr/lib/debug/usr/lib/debug files
+# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
+RESTRICT="test splitdebug strip"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="arm? ( debug )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	if use flask ; then
+		export "XSM_ENABLE=y"
+		export "FLASK_ENABLE=y"
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+	einfo "Try to apply Xen Security patch set"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		EPATCH_SUFFIX="patch"
+		EPATCH_FORCE="yes"
+
+		source "${WORKDIR}"/patches-security/${PV}.conf
+
+		for i in ${XEN_SECURITY_MAIN}; do
+			epatch "${WORKDIR}"/patches-security/xen/$i
+		done
+	fi
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+			epatch "${WORKDIR}"/patches-gentoo
+	fi
+
+	epatch "${FILESDIR}"/${PN}-4.6-efi.patch
+
+	# Drop .config
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	if use efi; then
+		export EFI_VENDOR="gentoo"
+		export EFI_MOUNTPOINT="boot"
+	fi
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \; || die "failed to re-set custom-cflags"
+	fi
+
+	# remove -Werror for gcc-4.6's sake
+	find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \
+		xargs sed -i 's/ *-Werror */ /'
+	# not strictly necessary to fix this
+	sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
+
+	# Bug #575868 converted to a sed statement, typo of one char
+	sed -e "s:granter’s:granter's:" -i xen/include/public/grant_table.h || die
+
+	epatch_user
+}
+
+src_configure() {
+	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
+
+	use debug && myopt="${myopt} debug=y"
+
+	if use custom-cflags; then
+		filter-flags -fPIE -fstack-protector
+		replace-flags -O3 -O2
+	else
+		unset CFLAGS
+		unset LDFLAGS
+		unset ASFLAGS
+	fi
+}
+
+src_compile() {
+	# Send raw LDFLAGS so that --as-needed works
+	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	# The 'make install' doesn't 'mkdir -p' the subdirs
+	if use efi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
+
+	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+
+	# make install likes to throw in some extra EFI bits if it built
+	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the unoffical wiki page:"
+	elog " https://wiki.gentoo.org/wiki/Xen"
+	elog " http://en.gentoo-wiki.com/wiki/Xen/"
+
+	use efi && einfo "The efi executable is installed in boot/efi/gentoo"
+
+	elog "You can optionally block the installation of /boot/xen-syms by an entry"
+	elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
+	elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
+}

app-i18n/ibus/ibus-1.5.5.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -170,6 +170,5 @@ pkg_postrm() {
 	use gtk && gnome2_query_immodules_gtk2
 	use gtk3 && gnome2_query_immodules_gtk3
 	use gconf && gnome2_schemas_update
-	gnome2_schemas_savelist
 	gnome2_icon_cache_update
 }

app-i18n/ibus/ibus-1.5.8-r1.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -170,6 +170,5 @@ pkg_postrm() {
 	use gtk && gnome2_query_immodules_gtk2
 	use gtk3 && gnome2_query_immodules_gtk3
 	use gconf && gnome2_schemas_update
-	gnome2_schemas_savelist
 	gnome2_icon_cache_update
 }

app-i18n/ibus/ibus-1.5.9-r1.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -186,6 +186,5 @@ pkg_postrm() {
 	use gtk && gnome2_query_immodules_gtk2
 	use gtk3 && gnome2_query_immodules_gtk3
 	use gconf && gnome2_schemas_update
-	gnome2_schemas_savelist
 	gnome2_icon_cache_update
 }

app-office/calligra/calligra-2.9.11.ebuild

@@ -41,8 +41,8 @@ if [[ ${KDE_BUILD_TYPE} == release ]] ; then
 fi
 
 IUSE="attica color-management +crypt +eigen +exif fftw +fontconfig freetds
-+glew +glib +gsf gsl import-filter +jpeg jpeg2k +kdcraw +kdepim +lcms
-marble mysql +okular openexr +pdf postgres spacenav sybase test tiff +threads
++glew +glib +gsf gsl import-filter +jpeg jpeg2k +kdcraw +lcms marble mysql
++okular openexr +pdf +pim postgres spacenav sybase test tiff +threads
 +truetype vc xbase +xml"
 
 # Don't use Active, it's broken on desktops.
@@ -56,7 +56,7 @@ REQUIRED_USE="
 	calligra_features_author? ( calligra_features_words )
 	calligra_features_gemini? ( opengl )
 	calligra_features_krita? ( eigen exif lcms opengl )
-	calligra_features_plan? ( kdepim )
+	calligra_features_plan? ( pim )
 	calligra_features_sheets? ( eigen )
 	calligra_features_stage? ( webkit )
 	vc? ( calligra_features_krita )
@@ -93,7 +93,6 @@ RDEPEND="
 	jpeg? ( virtual/jpeg:0 )
 	jpeg2k? ( media-libs/openjpeg:0 )
 	kdcraw? ( $(add_kdeapps_dep libkdcraw) )
-	kdepim? ( $(add_kdeapps_dep kdepimlibs) )
 	lcms? (
 		media-libs/lcms:2
 		x11-libs/libX11
@@ -110,6 +109,7 @@ RDEPEND="
 		app-text/poppler:=
 		media-gfx/pstoedit
 	)
+	pim? ( $(add_kdeapps_dep kdepimlibs) )
 	postgres? (
 		dev-db/postgresql:*
 		dev-libs/libpqxx
@@ -206,7 +206,6 @@ src_configure() {
 		$(cmake-utils_use_with jpeg JPEG)
 		$(cmake-utils_use_with jpeg2k OpenJPEG)
 		$(cmake-utils_use_with kdcraw Kdcraw)
-		$(cmake-utils_use_with kdepim KdepimLibs)
 		$(cmake-utils_use_with lcms LCMS2)
 		$(cmake-utils_use_with marble CalligraMarble)
 		$(cmake-utils_use_with mysql MySQL)
@@ -215,6 +214,7 @@ src_configure() {
 		$(cmake-utils_use opengl USEOPENGL)
 		$(cmake-utils_use_with pdf Poppler)
 		$(cmake-utils_use_with pdf Pstoedit)
+		$(cmake-utils_use_with pim KdepimLibs)
 		$(cmake-utils_use_with postgres CalligraPostgreSQL)
 		$(cmake-utils_use_build postgres pqxx)
 		$(cmake-utils_use_with spacenav Spnav)

app-office/calligra/metadata.xml

@@ -18,9 +18,9 @@
 		<flag name="gsf">Enable support for ODT structures extraction via <pkg>gnome-extra/libgsf</pkg></flag>
 		<flag name="import-filter">Enable support for various import filter file formats like WordPerfect, Visio and Apple Keynote</flag>
 		<flag name="kdcraw">Enable support for KDE image manipulating interface via <pkg>kde-apps/libkdcraw</pkg></flag>
-		<flag name="kdepim">Enable support for KDEPIM resources integration</flag>
 		<flag name="marble">Enable displaying of maps using Marble</flag>
 		<flag name="okular">Enable bindings for <pkg>kde-apps/okular</pkg></flag>
+		<flag name="pim">Enable support for KDE PIM resources integration</flag>
 		<flag name="spacenav">Enable support for the 3Dconnexion spacenav input device via <pkg>dev-libs/libspnav</pkg></flag>
 		<flag name="vc">Enable support for <pkg>dev-libs/vc</pkg>, could be a significant speed boost on krita</flag>
 		<flag name="xbase">Enable support for xbase compatible database formats</flag>

app-office/homebank/Manifest

@@ -1,5 +1,3 @@
 DIST homebank-4.6.3.tar.gz 1899045 SHA256 f6e31bb789d626b507c2af9d176a0bac0cbaec770ede73048ba7a6df113a6948 SHA512 aab7374d90ffc52a40188eb334fc9b3461c299014d6134f236488991400fffe9f6dcb69247501857fe4caafbb08f0c5d729211b13551203f1231d136e99e024d WHIRLPOOL e8f6a421c64eb1bf6f2d97910e4687b00cf794fd27c8aff83ce9d39e18393cccca1984e73a44110ff5e87427fd0ed74963dcb997490d97614116800100daca5b
-DIST homebank-5.0.6.tar.gz 2578726 SHA256 4a52ef7a20accd50f8cead0d0564042912573c7d60887ef5e4d462fb28b239e4 SHA512 48cb3c4b306804a5cc6dea3083fc84d64a8936bb9c7dfb357838abb05d3f2ce1080eba73be1bb7c37ffeb3ed10d14f15d0f7121d7e4f34c543f8807f8747f289 WHIRLPOOL 7052e27f7d9d38eae13a5ed3af0d7f284bcbdfbff9cb9282bc773f26a7fb5a0af305b81ba82cc2f21339aa3589bb5a6a4b9323f48c637d8418e4767197b4b314
-DIST homebank-5.0.7.tar.gz 2603648 SHA256 d526dc78e6f6ea01efadfb9fd27b2d10326c315cfe550c83cc29cfd8052564e7 SHA512 ffb3246a6abee6a24f4491e6f3f0857033bdc03ec81647050766e965cc156789f829c819d491f81b3d15f24710f89a432f8906b833d11e8f4d1499cb05050dee WHIRLPOOL 5602c4dec49a4478699db795581a40e3a2a31ffec3eaa5c1aeffd647055dccb59b8c5c1b973971bfe76906ca73ba93a85ff35d90e25791ded69267d96b5ffe4d
-DIST homebank-5.0.8.tar.gz 2603678 SHA256 9bdf10b0d94c92d5216462fb110bba34cd2a1b01d38d2c6b629db81a0513a310 SHA512 df4e66b0af076b20e2a2bca37186020d90ad58aec28fba79b3bb603c81e71cb4d54f45df14c250403d320a4f92489fceb84ac0191e9cfdf0f8a6ae3bd2f7a6bf WHIRLPOOL 1721f880276e148a568f809283aa9a67490a3ef68e9517d94ed84741d823ad0be397ff9dfb5db714f11e945ef95be3032f2034ca091ae4ab4260ab408d7f48bb
 DIST homebank-5.0.9.tar.gz 2734386 SHA256 d0bc763e94da0cba544495b07070e79faecf1d5de0cfb092d126482525e062b7 SHA512 832229de9812621bcce3037f1f70eb63cf96cb33468e0e76202ebe3a489544090d5b54fdc7b42feefaf7722c3f42c6d9bc45ee5fbd1b8638c2e54b65ea03357f WHIRLPOOL 4cc8d4a062e4b2f94324307e2b8a8b63caf26095708a814d8561d8818046d6c9fb1d4608fb254366c97cbe0baa8c1d3986d3f233e1a4c32e7cd53ee1380a6add
+DIST homebank-5.1.1.tar.gz 2675174 SHA256 9cd36ddc6931fd95ef5bcc6a723b3df0651b32e19465570d223c21ac1d5aa4bd SHA512 46dea5ed5d134cb30aafaf6890853156753733a89266e2b83297315e4b2a4b570c73d89ff6aa12799a8bc502cc31a95174c09f273260049375f14fa896ce33c8 WHIRLPOOL 5074618039f5d7d6329f119ab4ab9644998e96c0961f5eecfd86514d574509d3fa967f888e4e3b4f1211049123c4acbe83a5b273f43524e209c800debe88b7f1

app-office/homebank/homebank-5.0.6.ebuild

@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit fdo-mime eutils gnome2-utils
-
-DESCRIPTION="Free, easy, personal accounting for everyone"
-HOMEPAGE="http://homebank.free.fr/index.php"
-SRC_URI="http://homebank.free.fr/public/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+ofx"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND=">=dev-libs/glib-2.28
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	>=x11-libs/gtk+-3.6.4:3
-	x11-libs/pango
-	ofx? ( >=dev-libs/libofx-0.8.3 )"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5.8.1
-	dev-perl/XML-Parser
-	>=dev-util/intltool-0.40.5
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog README )
-
-src_configure() {
-	econf $(use_with ofx)
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}

app-office/homebank/homebank-5.0.7.ebuild

@@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="6"
-
-inherit fdo-mime eutils gnome2-utils
-
-DESCRIPTION="Free, easy, personal accounting for everyone"
-HOMEPAGE="http://homebank.free.fr/index.php"
-SRC_URI="http://homebank.free.fr/public/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+ofx"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND=">=dev-libs/glib-2.28
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	>=x11-libs/gtk+-3.6.4:3
-	x11-libs/pango
-	ofx? ( >=dev-libs/libofx-0.8.3 )"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5.8.1
-	dev-perl/XML-Parser
-	>=dev-util/intltool-0.40.5
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog README )
-
-src_configure() {
-	econf $(use_with ofx)
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}

app-office/homebank/homebank-5.1.1.ebuild

@@ -14,10 +14,11 @@ SLOT="0"
 IUSE="+ofx"
 KEYWORDS="~amd64 ~ppc ~x86"
 
-RDEPEND=">=dev-libs/glib-2.28
+RDEPEND=">=dev-libs/glib-2.39
+	>=net-libs/libsoup-2.26
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf
-	>=x11-libs/gtk+-3.6.4:3
+	>=x11-libs/gtk+-3.12:3
 	x11-libs/pango
 	ofx? ( >=dev-libs/libofx-0.8.3 )"
 DEPEND="${RDEPEND}

app-shells/dash/dash-0.5.9.1-r1.ebuild

@@ -21,7 +21,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="dumb-echo libedit static"
+IUSE="libedit static vanilla"
 
 RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
 DEPEND="${RDEPEND}
@@ -42,7 +42,7 @@ src_prepare() {
 	epatch "${PATCHES[@]}"
 
 	#337329 #527848
-	use dumb-echo && epatch "${FILESDIR}"/${PN}-0.5.9.1-dumb-echo.patch
+	use vanilla ||  epatch "${FILESDIR}"/${PN}-0.5.9.1-dumb-echo.patch
 
 	# Fix the invalid sort
 	sed -i -e 's/LC_COLLATE=C/LC_ALL=C/g' src/mkbuiltins

app-shells/dash/metadata.xml

@@ -9,7 +9,7 @@
 		<remote-id type="cpe">cpe:/a:dash:dash</remote-id>
 	</upstream>
 	<use>
-		<flag name="dumb-echo">Disable echo -n for added fun</flag>
+		<flag name="vanilla">Support echo -n, and enable echo -e all the time (unsupported)</flag>
 	</use>
 	<longdescription lang="en">
 		DASH is a direct descendant of the NetBSD version of ash (the Almquist SHell)

app-vim/vimoutliner/Manifest

@@ -1 +1,2 @@
 DIST vimoutliner-0.3.4.tar.gz 52753 SHA256 9e6e85e67dad1a220eee0031821a93fe27dcd2c3881446049ab8644fc7e100f5 SHA512 6a48e3fa65e83733e4731dd63d9a9c91e9fb37e47ac726d1938bbecc2c37d8be0d72f45c534c4bd231c9bed352cd7db1e3f754529efc4779a50d25cae27982d1 WHIRLPOOL 844f7b13bdd1fcaaf9827ff775c6aae3edf974eb244987e03c89f6f7a13be648419f0d6f3aa7433a605150c661d71de18b081ddd04c592fd6bed2d7cbb16e430
+DIST vimoutliner-0.3.6.zip 249053 SHA256 54db454651152a3bd88da37b210259fb369c6a44e74824d2085a8e8ea8969c1d SHA512 20d348ff1b1b9572956fdc56b75e742b25b7deac2637fa6972a1e451edc1f679d8255847a291b84c80866a9ad8a37421524b8eb33565a1bb32ff2b75d0b68dde WHIRLPOOL 87c86930f02162e4819e8ef2feccbbbdfd31629fda9665a6ae64698b89d26663e989238ee9d1e8c360986a05c813807a2906cbe4fd9eb5f422e7b6e79723686b

app-vim/vimoutliner/vimoutliner-0.3.6.ebuild

@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: easy and fast outlining"
+HOMEPAGE="http://www.vimoutliner.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.zip -> ${P}.zip"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
+IUSE=""
+
+VIM_PLUGIN_HELPFILES="vimoutliner"
+VIM_PLUGIN_MESSAGES="filetype"
+
+src_prepare() {
+	default
+	sed -i -e '/^if exists/,/endif/d' ftdetect/vo_base.vim || die
+	sed -i -e 's/g:vo_modules2load/g:vo_modules_load/' vimoutliner/vimoutlinerrc || die
+	rm -v install.sh || die
+	find "${S}" -type f -exec chmod a+r {} \; || die
+}

dev-lang/yasm/yasm-1.3.0.ebuild

@@ -12,7 +12,7 @@ SRC_URI="http://www.tortall.net/projects/yasm/releases/${P}.tar.gz"
 
 LICENSE="BSD-2 BSD || ( Artistic GPL-2 LGPL-2 )"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="-* amd64 ~arm64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="nls python"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

dev-libs/leatherman/Manifest

@@ -1,5 +1,3 @@
-DIST leatherman-0.10.0.tar.gz 423081 SHA256 0f4e6d08eae4a7a59941496e68a62de848bb8763894bc18a2e10356b650dc742 SHA512 80d90a851d9150b90fb30ffd4ce508c6c41e015ec0b59a7e80592ba97afaee8c1dfe487bb9d6f94387c5b83ea65bbd8023d5cc633266a9bffca7cb5febe5baad WHIRLPOOL 1b2cba7a1de5e2ac1006a5ca4655271b9b83f669a83a04948f299c3d6ca76cc90b6f5fd8e217db142621184a267126f23facc05d7c1f53e8b063195278d18be3
+DIST leatherman-0.10.1.tar.gz 423218 SHA256 79b0eded49a02cb8f6ce6260ae39e3f1bdd2dc2c62c02f661308e04c08edb69e SHA512 bbbb772c855f5ce1e38abe7186400d9a2c9663dcdc72bd0a822bbe171eed3d01e33a6ec2196d4f6f8f0895f309d031b1eb77ec188bd16b37e52b306fafb66d17 WHIRLPOOL 19ff51352c49e9fca7d45683117809cf916e15066015e40cbe2eb10e3eb4ae3e6d27595e8bae8291bd5fac874f845399b9c87a5fcc6b645dd174bf3c9b1a8229
 DIST leatherman-0.9.0.tar.gz 392308 SHA256 8d79a998caa47047bfc52093e6a50618458b5c0aa502a6cf61f9fb7a6451c3bb SHA512 25c5edd58abad4e20d36ec7badb94aacc0f9a9e44200e710dcb3da116685396bba5b12ae806f9865e48d5d50c43a31486d8aa39fd853551ccf2c3eaa28859c8d WHIRLPOOL 492ae8971368a8c7e3527a875c8cb4a46d5a767b80b45d32b33fa2f1c66a7d2ea4825c923a6993b1147ac8e68bb111c682ef5315c13a11a68bd583b3423e6656
-DIST leatherman-0.9.1.tar.gz 417376 SHA256 dc436230edd65f5244a72d290c598a3889787c917c4aa1a10f4559149408de81 SHA512 93fcb374eeac37a1e1009def0b94de8e7017764db7d18967da0409c34397e32249894de13e23509ecb37907388d7019e08e021db1d6909b1e8fe8b7b6e535c28 WHIRLPOOL 4e2c89322d349780624dff0670e353b923c159df9db20cf20272a8d7e80a899b85f949c2bbfc05e7a587ff845a5a342fc690be5dd3457d185b2d6850bf97ac47
-DIST leatherman-0.9.3.tar.gz 417894 SHA256 3ede61039b8f15ca54cfa543e614bd115b6c862d3bf994c16d1783eb72ba0810 SHA512 8888c58875d806a7a20ab4aa2e45a52e585f3fda784b38e0552ef8367c1ea6b71d557534e179a11e897f8fe9249373c7cd5777c5bf6c9900b9581c690b4be4cc WHIRLPOOL b9c738d5365a68d7ea497f0e30929323f6fa6ebd396a1f97ab2d73a13d3eb43e3ac64b501e64b1e82397869dfba4b7aaeace7ad9be4930bd842ff2ebe070be2b
 DIST leatherman-0.9.4.tar.gz 418077 SHA256 a396514fef1ab5d14ebc745a9166ac4fcdf229e5378824302de751ef5ec2bee9 SHA512 c08401856f5afc1b9d48cf31fa3c037ee9f316f4356419785c021696dff4628bfde92318ad0e50faf83aa9b205ebd479bbb46379431811cfec1dcbd5c88021f7 WHIRLPOOL cdae73fc20e08603c81d98127f642e6720fae449f1f1fbb9ca591ffed051bb1efc5ba21ea93a041d9cc8c7c58844ed5fc7467f6e9107d325687609780e8e2a6d

dev-libs/leatherman/leatherman-0.9.1.ebuild

@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby21 ruby22"
-CMAKE_MIN_VERSION="3.2.2"
-
-inherit cmake-utils multilib ruby-ng
-
-DESCRIPTION="A C++ toolkit"
-HOMEPAGE="https://github.com/puppetlabs/leatherman"
-SRC_URI="https://downloads.puppetlabs.com/facter/${P}.tar.gz"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${S}/all/${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="debug test"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-
-CDEPEND="
-	>=sys-devel/gcc-4.8:*
-	>=dev-libs/boost-1.54[nls]
-	net-misc/curl"
-
-RDEPEND+=" ${CDEPEND}"
-DEPEND+=" test? ( ${CDEPEND} )"
-
-src_prepare() {
-	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-	)
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-}

dev-libs/leatherman/leatherman-0.9.3.ebuild

@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby21 ruby22"
-CMAKE_MIN_VERSION="3.2.2"
-
-inherit cmake-utils multilib ruby-ng
-
-DESCRIPTION="A C++ toolkit"
-HOMEPAGE="https://github.com/puppetlabs/leatherman"
-SRC_URI="https://downloads.puppetlabs.com/facter/${P}.tar.gz"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${S}/all/${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="debug test"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-
-CDEPEND="
-	>=sys-devel/gcc-4.8:*
-	>=dev-libs/boost-1.54[nls]
-	net-misc/curl"
-
-RDEPEND+=" ${CDEPEND}"
-DEPEND+=" test? ( ${CDEPEND} )"
-
-src_prepare() {
-	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-	)
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-}

dev-libs/libusb/libusb-1.0.21.ebuild

@@ -29,8 +29,7 @@ multilib_src_configure() {
 }
 
 multilib_src_compile() {
-	# Bug 573802
-	emake -j1
+	emake
 
 	if multilib_is_native_abi; then
 		use doc && emake -C doc docs

dev-libs/ppl/Manifest

@@ -1,2 +1,3 @@
 DIST ppl-0.12.1.tar.bz2 14938132 SHA256 4022e54772f81c8ef66d3dd4c3d8dca48f72f9af614d8a36d05fbf5917f2b198 SHA512 e8a4c92271f608e79c5828c71ff2d36c681dd4bd48b5d31353b2a27bcf827a5cb8f0dcdfee3e13cf9f202f35a7693ddf9880dc4d5b8445ec558cef1319f43925 WHIRLPOOL 6616253d5c02c84294ec63e0601fa7bc65772fc72e6cea68f1300fa2b46f551311589813268d8e869cb59295d8fdc5be17a5b3d0cbb7b62fe0bc06a8bf9e1f39
 DIST ppl-1.1.tar.xz 14734820 SHA256 c48ccd74664ec2cd3cdb5e37f287974ccb062f0384dc658d4053c424b19ad178 SHA512 ae0503fb3eac494fa3edf5d5c9ec61e2419e6e2fa57d30323f7d0360ff080b033686410c7462f5b2ff5514803451cb91e9c0fc14cf953485c5f5fd664448cc27 WHIRLPOOL d1b85fe9b44195f7fdc0573b32291a70183ce9de5e29fbb502a5d181a6e0ae11998dd5cfb52ec7ce3e1aed36433a823484488bfaf93362ac3b45a7556a2e9b6a
+DIST ppl-1.2.tar.xz 14136236 SHA256 691f0d5a4fb0e206f4e132fc9132c71d6e33cdda168470d40ac3cf62340e9a60 SHA512 b509ed85fa6aedd40119bd4c980b17f33072c56c2acd923da3445b6bc80d48051cfa4c04cce96f6974711f5279c24b31cb3869f87b2eb6a2a1b30a058c809350 WHIRLPOOL cf2d5895d7d740c650707840caadd45d785411875b1c55db141928a288a1475f50d4f1e6ac829062ab021a920e9581be7822679e9cf2ea11dc64ac70cfa2e5dd

dev-libs/ppl/ppl-1.2.ebuild

@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+DESCRIPTION="The Parma Polyhedra Library provides numerical abstractions for analysis of complex systems"
+HOMEPAGE="http://bugseng.com/products/ppl"
+SRC_URI="http://bugseng.com/products/ppl/download/ftp/releases/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0/4.14" # SONAMEs
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris"
+IUSE="+cxx doc lpsol pch static-libs test"
+
+RDEPEND=">=dev-libs/gmp-6[cxx]
+	lpsol? ( sci-mathematics/glpk )
+	!dev-libs/cloog-ppl"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	sys-devel/m4"
+
+pkg_setup() {
+	if use test ; then
+		ewarn "The PPL testsuite will be run."
+		ewarn "Note that this can take several hours to complete on a fast machine."
+	fi
+}
+
+src_configure() {
+	local interfaces=( c )
+	use cxx && interfaces+=( cxx )
+	econf \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--disable-debugging \
+		--disable-optimization \
+		$(use_enable doc documentation) \
+		$(use_enable lpsol ppl_lpsol) \
+		$(use_enable pch) \
+		$(use_enable static-libs static) \
+		--enable-interfaces="${interfaces[*]}" \
+		$(use test && echo --enable-check=quick)
+}
+
+src_test() {
+	# default src_test runs with -j1, overriding it here saves about
+	# 30 minutes and is recommended by upstream
+	emake check
+}
+
+src_install() {
+	default
+	use static-libs || find "${ED}"/usr -name 'libppl*.la' -delete
+
+	pushd "${ED}/usr/share/doc/${PF}" >/dev/null || die
+	rm gpl* fdl* || die
+	if ! use doc ; then
+		rm -r *-html/ *.ps.gz *.pdf || die
+	fi
+}

dev-libs/tut/Manifest

@@ -0,0 +1 @@
+DIST tut-2013.12.18.tar.gz 248575 SHA256 750c06fa4f681c9ca3b504f7916925e7620db4237675a4769814f8426c021fc8 SHA512 daf232df8d27a5600209ee44dc72f83b9574b68c14cf9566aa826091767e2fc3c00a9e03e83386f46d7f2030bb6d6af5db6af326424a4c0bc41063e227ab8004 WHIRLPOOL 8487b0c35b9ae5c1b181930f687ec5be822b501e3eacbe120b7b0b08c1ae3bf1e5dd102b86806ea4d3fb4479bd8619aab23b4025777e9adc3c445aae0cbdab97

dev-libs/tut/metadata.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>junghans@gentoo.org</email>
+		<name>Christoph Junghans</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+</pkgmetadata>

dev-libs/tut/tut-2013.12.18.ebuild

@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+NO_WAF_LIBDIR=yes
+
+inherit python-any-r1 waf-utils
+
+DESCRIPTION="C++ Template Unit Test Framework"
+HOMEPAGE="http://mrzechonek.github.io/tut-framework/"
+SRC_URI="https://github.com/mrzechonek/tut-framework/archive/${PV//./-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=${PYTHON_DEPS}
+RDEPEND=""
+
+S="${WORKDIR}/tut-framework-${PV//./-}"

dev-ml/js_of_ocaml/Manifest

@@ -1,2 +1 @@
-DIST js_of_ocaml-2.8.2.tar.gz 1334891 SHA256 93d55c7a4883783acb3eee4c6a126993f548f1467d1f08a8d72fa30385a673c4 SHA512 07550311b53a54ec55b5b1e63acbf8eee4757d643cf9639efb035faa029cde4b47c46d732dd2fa3ec0606edf1ef094d096a375c694b0b7255ada16e0c632c4ed WHIRLPOOL 6eac8dccd5217aaa91dc3f899a6ec949afff725dcd1d60276660b0c2e4ca71faf2d55c0a747a3cab05ca55cf7962aa4dbcd2679ec4f8639c7ccbdf414a105d56
 DIST js_of_ocaml-2.8.3.tar.gz 1335811 SHA256 a77e9d4896431742604cba69fb87f9022587de86f2c6d41a6b58e9c24b103c77 SHA512 89908f3da1846f4fe24e1109ba262507221ed67d58bec1d8b7c53ec82438febbab66bdb3bec697e2880842253777167ef1563687cae414426e8ea1dcc00a323a WHIRLPOOL b299214ed367f7aa2252a76a7d49f68f219aaf3ab9901eafa354e937a7dbe4913657a6c1c6fdc85337d63c04b90a5f835b3cf9c321840528188a496f6bfc3d37

dev-ml/js_of_ocaml/js_of_ocaml-2.8.2-r1.ebuild

@@ -1,66 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit findlib eutils
-
-DESCRIPTION="A compiler from OCaml bytecode to javascript"
-HOMEPAGE="http://ocsigen.org/js_of_ocaml/"
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/ocsigen/js_of_ocaml"
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/ocsigen/js_of_ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-IUSE="+async +ocamlopt doc +deriving +ppx +ppx-deriving +react +xml X"
-
-RDEPEND="
-	>=dev-lang/ocaml-3.12:=[ocamlopt?,X?]
-	>=dev-ml/lwt-2.4.4:=
-	async? ( dev-ml/async_kernel:= )
-	react? ( dev-ml/react:=  dev-ml/reactiveData:= )
-	xml? ( >=dev-ml/tyxml-4:= )
-	ppx? ( dev-ml/ppx_tools:= )
-	ppx-deriving? ( dev-ml/ppx_deriving:= )
-	dev-ml/cmdliner:=
-	dev-ml/menhir:=
-	dev-ml/ocaml-base64:=
-	dev-ml/camlp4:=
-	dev-ml/cppo:=
-	dev-ml/uchar:=
-	dev-ml/ocamlbuild:=
-	deriving? ( >=dev-ml/deriving-0.6:= )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	printf "\n\n" >> Makefile.conf
-	use ocamlopt || echo "BEST := byte" >> Makefile.conf
-	use ocamlopt || echo "NATDYNLINK := NO" >> Makefile.conf
-	use deriving || echo "WITH_DERIVING := NO" >> Makefile.conf
-	use X || echo "WITH_GRAPHICS := NO" >> Makefile.conf
-	use react || echo "WITH_REACT := NO" >> Makefile.conf
-	use ppx || echo "WITH_PPX := NO" >> Makefile.conf
-	use ppx-deriving || echo "WITH_PPX_PPX_DERIVING := NO" >> Makefile.conf
-	use async || echo "WITH_ASYNC := NO" >> Makefile.conf
-}
-
-src_compile() {
-	emake -j1
-	use doc && emake doc
-}
-
-src_install() {
-	findlib_src_preinst
-	emake BINDIR="${ED}/usr/bin/" install
-	dodoc CHANGES README.md
-	use doc && dohtml -r doc/api/html/
-}

dev-ml/js_of_ocaml/js_of_ocaml-2.8.3.ebuild

@@ -25,7 +25,7 @@ IUSE="+async +ocamlopt doc +deriving +ppx +ppx-deriving +react +xml X"
 
 RDEPEND="
 	>=dev-lang/ocaml-3.12:=[ocamlopt?,X?]
-	>=dev-ml/lwt-2.4.4:=
+	>=dev-ml/lwt-2.4.4:=[camlp4(+)]
 	async? ( dev-ml/async_kernel:= )
 	react? ( dev-ml/react:=  dev-ml/reactiveData:= )
 	xml? ( >=dev-ml/tyxml-4:= )

dev-ml/js_of_ocaml/js_of_ocaml-9999.ebuild

@@ -25,7 +25,7 @@ IUSE="+async +ocamlopt doc +deriving +ppx +ppx-deriving +react +xml X"
 
 RDEPEND="
 	>=dev-lang/ocaml-3.12:=[ocamlopt?,X?]
-	>=dev-ml/lwt-2.4.4:=
+	>=dev-ml/lwt-2.4.4:=[camlp4(+)]
 	async? ( dev-ml/async_kernel:= )
 	react? ( dev-ml/react:=  dev-ml/reactiveData:= )
 	xml? ( >=dev-ml/tyxml-4:= )

dev-ml/lwt/Manifest

@@ -1,2 +1,3 @@
 DIST lwt-2.4.3.tar.gz 504000 SHA256 efee23937750290d6dee96eed6c0bbdb19817d5be6eefcba61ac5031fac10107 SHA512 725d50a096a43294d49ae2322fdc985c301ce6a8ff5c956925225d7977e787ccb446e36a9db5fdbb50f284b9f1a3a12a52d1aa44d4400feecb59f6f938ed00ad WHIRLPOOL c5999e950008902600b43bf39f174ed0bc2cb3f6dce983d885416969a3bb98170ec8b74c8f5829459c3c96d160e5b4c8491b7057e7efeac035a46c9846ff7764
 DIST lwt-2.5.2.tar.gz 268168 SHA256 b319514cf51656780a8f609a63ead08d3052a442546b218530ce146d37bf6331 SHA512 83c7a9d9798fe12e0bdd618e7f69ac357065a9b26e2abb644240c420cb1d507a3b558549b2f82ecc9c3fbc9ca5952e8d7cb32b6832713bfb6fffcb58975d5449 WHIRLPOOL f0482836988a248b691c332ef7acbeb5121226582cb8ef1e0b301719d35e25fd5d08e6b7b9e9ab02081b4d734ddc399251a31b66a26859542a4484342e517257
+DIST lwt-2.6.0.tar.gz 288385 SHA256 bf7ff0d1c3aa8230f00f55cac149cd335a1a1183b4661c9b098ba8a2d0037cbd SHA512 a30accd39941b421a8afd908129c799bcd178caeabbf36f8a67e07da1e088b4a163a0916738bb11b301972e42800aaf1c194b7eed4d67eb15ea69d04f7cb8abc WHIRLPOOL 963b45a7affa39ceeef209100d293db189fd8bfc21b8c385f92fbbcdeced9df185fca29119af69e72927e628012cff7dd9632067150f4baeeeca967f2616ad74

dev-ml/lwt/lwt-2.6.0.ebuild

@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+OASIS_BUILD_TESTS=1
+# fails to build
+#OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+DESCRIPTION="Cooperative light-weight thread library for OCaml"
+SRC_URI="https://github.com/ocsigen/lwt/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="http://ocsigen.org/lwt"
+
+IUSE="+camlp4 gtk +ppx +react +ssl"
+
+DEPEND="react? ( >=dev-ml/react-1.2:= )
+	dev-libs/libev
+	ssl? ( >=dev-ml/ocaml-ssl-0.4.0:= )
+	gtk? ( dev-ml/lablgtk:= dev-libs/glib:2 )
+	ppx? ( dev-ml/ppx_tools:= )
+	camlp4? ( dev-ml/camlp4:= )"
+
+RDEPEND="${DEPEND}
+	!<www-servers/ocsigen-1.1"
+
+SLOT="0/${PV}"
+LICENSE="LGPL-2.1-with-linking-exception"
+KEYWORDS="~amd64 ~x86-fbsd"
+
+DOCS=( "CHANGES" "README.md" )
+
+src_configure() {
+	oasis_configure_opts="$(use_enable gtk glib)
+		$(use_enable react)
+		$(use_enable ssl)
+		$(use_enable camlp4)
+		$(use_enable ppx)" \
+		oasis_src_configure
+}

dev-ml/lwt/metadata.xml

@@ -10,6 +10,7 @@
     <name>Gentoo ML Project</name>
   </maintainer>
   <use>
+	<flag name="camlp4">Enable camlp4 syntax extension</flag>
 	<flag name="ppx">Enables the ppx syntax extension</flag>
     <flag name="react">Enables support for <pkg>dev-ml/react</pkg>: Functional reactive programming (signals, events, etc.).</flag>
   </use>

dev-ml/oasis/Manifest

@@ -1,3 +1,4 @@
 DIST oasis-0.4.5.tar.gz 336502 SHA256 6623a603415c4718add6a6ebad80f6688164a2e9b28576c082548b17bf8b2e44 SHA512 97d5401762ffda6bf4d7a239d9c77f8647d58da1728925e6de6e8fdfded6f8e7bb69652a838b86ab7203cd68436b06f76921c76840b97db56a94bb87d74450d7 WHIRLPOOL 46f5c3f900baa3d3b6ada8c0cf90cc90cfddc70523510d5ba5541e5075c96360ebacdd23a1b0f8b28a90bda7fb1700b9a2e9d7989af650e9aa5d50f358795d92
 DIST oasis-0.4.6.tar.gz 337490 SHA256 1324becb9fbc181f7276936339f62db224d166f01e50ea19f8f62037271bbbfb SHA512 c85432c75de1814024b11f9aea89fc740016fc13f2fd16ad1a4819de406d26a698f33a43e64649cbc17fe194c5da336e83ad85af91d6b97d0b3f70db44f33d88 WHIRLPOOL 7a742e67dcab5468b57ae2e5c730508b07ff9380a584e75d4b269d84a09a73e826819511d9ebfbbc5748d57163104fc7ab93756e8bfcd56954a2ad411e9ab04c
 DIST oasis-0.4.7.tar.gz 371869 SHA256 54bc4b80e4a38719124e8fb0125c6f3404bda514b87b8749b51442e023de998d SHA512 f1ed31da03ec4245489d74589f8385af990191be16074b25f482a96fa916f87f99e314944bb0cb798269c6870ca85c59273d33a298a2ad3f239b7ae444c74ec2 WHIRLPOOL 6b744ea4e0953f1a350eb7a75458e4d5b4778143f14a2f88742600db3b1858479aadbb26ace70d7f2c9094a56a05f1c7adedca9f09a8d0588b3dd671cf7609dd
+DIST oasis-0.4.8.tar.gz 389565 SHA256 1e535de19fce623cc0019d2bbc4b158ac47e10b0165620e2ea459b1b0fdbc7d2 SHA512 e0baf0f048647c25eac5472db0d2a22d0fcaf85fe61ebd88ec5a101c20d4916ecfa9d10fae069ba4479abb22b90c44f18312b9252727a8c7c7de4aa2d8d72663 WHIRLPOOL db9deb3ddacf19ad1728e5b7d2f8e5f3785bb3a462bb64d6dbf82784c0335c711d894be7ee47596737263d82abf7bb5a8e3c68aba1d8654ea5243f151db9b73e

dev-ml/oasis/oasis-0.4.8.ebuild

@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+OASIS_BUILD_TESTS=1
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+MY_P=${P/_/\~}
+DESCRIPTION="OASIS is a tool to integrate a configure, build and install system in OCaml project"
+HOMEPAGE="http://oasis.forge.ocamlcore.org/index.php"
+SRC_URI="http://forge.ocamlcore.org/frs/download.php/1669/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=dev-ml/ocaml-data-notation-0.0.11:=
+	dev-ml/ocamlbuild:=[ocamlopt]"
+DEPEND="${RDEPEND}
+	>=dev-ml/findlib-1.3.1
+	dev-ml/ocamlify
+	dev-ml/ocamlmod
+	!<sci-chemistry/oasis-4.0-r3
+	test? (
+		>=dev-ml/ocaml-fileutils-0.4.2
+		>=dev-ml/ounit-2.0.0
+		>=dev-ml/ocaml-expect-0.0.4
+		dev-ml/pcre-ocaml
+		dev-ml/extlib
+	)"
+
+STRIP_MASK="*/bin/*"
+S="${WORKDIR}/${MY_P}"
+DOCS=( "README.md" "TODO.txt" "AUTHORS.md" "CHANGES.txt" )

dev-ml/pgocaml/Manifest

@@ -1,2 +1 @@
-DIST pgocaml-2.2.tgz 88613 SHA256 3027ca823f9f3db24475bd36e5628ee259605d72048d889be3b7e32c3e850d74 SHA512 1358e377d46aeb8fa00f44ba47dcc61097919584accc96264ae751cd2d6b8380dd2135109d5f6bf7963f3b448ee59046210c6335a3750deed4ad0ce5fc0a9d8d WHIRLPOOL 53da87c02670d493ff0dd12c467d69bac630aa9fe5141be074f328722c305611ad951d14fafe941961dd40d4b6af012ef4e3a305bb6df96734c13f01473c4520
 DIST pgocaml-2.3.tgz 90383 SHA256 ef8ec253a752eb31e535d845440185b95c4de31db8c5c955e79638b669af9ea2 SHA512 f42ca8ccf31f9e03cfa9f81a9cd19c2a6010c33f5a578e76924683fd10ab4acf2727b09b71c5a8f200bc39765a5d876a289976fea367b49ae54335c007fd3ff7 WHIRLPOOL 48a8adb944db6bce29f818f287d47b35d0b776f3eb5bb68e0e835a4ac451405d46bbd3fcdc14c1ee9542f9b0afecd5e7b98a2f74d32fdbb7efe61c232414a0f7

dev-ml/pgocaml/pgocaml-2.2.ebuild

@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-OASIS_BUILD_DOCS=1
-
-inherit oasis
-
-DESCRIPTION="PG'OCaml is a set of OCaml bindings for the PostgreSQL database"
-HOMEPAGE="http://pgocaml.forge.ocamlcore.org/"
-SRC_URI="http://forge.ocamlcore.org/frs/download.php/1506/${P}.tgz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-DEPEND="dev-ml/calendar:=
-	dev-ml/csv:=
-	dev-ml/pcre-ocaml:=
-	dev-ml/camlp4:="
-RDEPEND="${DEPEND}"
-
-DOCS=( "README.txt" "CHANGELOG.txt"
-	"doc/BUGS.txt" "doc/CONTRIBUTORS.txt"
-	"doc/HOW_IT_WORKS.txt" "doc/PROFILING.txt"
-	)

dev-ml/pgocaml/pgocaml-2.3.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,7 +15,7 @@ SRC_URI="http://forge.ocamlcore.org/frs/download.php/1597/${P}.tgz"
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
-IUSE="camlp4 doc"
+IUSE="+camlp4 doc"
 
 DEPEND="dev-ml/calendar:=
 	dev-ml/csv:=

dev-ml/tyxml/Manifest

@@ -1,3 +1,4 @@
 DIST tyxml-3.5.0.tar.gz 127891 SHA256 e5f55f30b74470cb1400b92c478f320b4b4778678cf6029582716e0e138f4532 SHA512 189dd18a07f19b36ab616bfc512fc739dd704d0e84d720ecf69c7716a48fff43e851dd5bb09488b835f840ce859c8085437e56c5cce68c5d595d183dd66fb5ec WHIRLPOOL 7967aa2f2047aac7deb8d814f14c2beb29f116c39eec442b2383d487aa442d3b2f4ed75a9045c65bf8bb9b397e26b93ed555a67b7a98ab2dd37dbec91c4aecb4
 DIST tyxml-3.6.0.tar.gz 129924 SHA256 ea591587dd29799fff3b4d1390af062d9f7b0bdac5e6210e18355cd41171e0e7 SHA512 f750f80dce92d42172dd9601ec5201c34e1de6587270d00bc86673b2b220b0baed3d91586d4334d98a453cf388b2fa8d1abb763971365ffbf93992c7fde1d127 WHIRLPOOL f91c3934fc922c601b7d1c059a1c010e70ef947dcbb16dfe82b358c18109bf35b5762958449cdcdf6367d01f05fa038e4e8b1b53c961fe7a772d0e2e997a6210
 DIST tyxml-4.0.0.tar.gz 172367 SHA256 1ec7d175d0ad22290c06d1872e869444415edcc04bfa75b993f8ac2db84eb1de SHA512 3e0267bef7ee339697c86a211b76983683066102f5e1ed194cf4a0dbcc358971b58b820e092a74cb614b9fd5a1d866bff48b3cd7ca66297cd97ba4fa40d03f05 WHIRLPOOL d81ee355951bff5454fb15121cf48c379e8567db5d1e7fde4ce6d0cd83d19b7c7f1783916cbd1d8e85033a6730f74d88ef20c8c3bd7ac86a99210e1b2e053a0d
+DIST tyxml-4.0.1.tar.gz 179609 SHA256 b7dbb6dbb8a02c0ab62f078695af6fbb636d162bd0f341fc9bda7d88ef9a1dfa SHA512 ebc0f148602375d8df16df7815f60ad6edcc7b4830af9479fb0e71a394d5d6dd7cb36e592d026b06677537d29be4359201e52f047ad3e23f34d82401b33b31e3 WHIRLPOOL 0b1f5c790f1d11fa503a23ff265b5e2cdb570fb61879d19c95f1d454f325066945607f5f54ffbf822500a58bd19a88906b92d7e9dc1a142bd051a5845ba1db91

dev-ml/tyxml/tyxml-4.0.1.ebuild

@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+# Cannot find findlib package alcotest
+# OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="A libary to build xml trees typechecked by OCaml"
+HOMEPAGE="http://ocsigen.org/tyxml/"
+SRC_URI="https://github.com/ocsigen/tyxml/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ppx +camlp4"
+
+DEPEND="
+	>=dev-ml/uutf-1.0:=
+	dev-ml/ocaml-re:=
+	ppx? ( >=dev-ml/ppx_tools-5:= dev-ml/markup:= )
+	camlp4? ( dev-ml/camlp4:= )"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGES README.md )
+PATCHES=( "${FILESDIR}/uutf.patch" )
+
+src_configure() {
+	oasis_configure_opts="
+		$(use_enable camlp4 syntax)
+		$(use_enable ppx)
+	" oasis_src_configure
+}

dev-perl/Email-Abstract/Email-Abstract-3.8.0.ebuild

@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=RJBS
+DIST_VERSION=3.008
+inherit perl-module
+
+DESCRIPTION="unified interface to mail representations"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+	>=dev-perl/Email-Simple-1.998
+	dev-perl/MRO-Compat
+	>=dev-perl/Module-Pluggable-1.500.0
+	virtual/perl-Scalar-List-Utils
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=virtual/perl-CPAN-Meta-2.120.900
+		virtual/perl-File-Spec
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"

dev-perl/Email-Abstract/Manifest

@@ -1 +1,2 @@
 DIST Email-Abstract-3.007.tar.gz 24091 SHA256 10915aa3a558f6ba9c51a13ea1c135aed765e185a14cd2cfc9b434599cf5eaa8 SHA512 84fa3500dc5ff69315b93e6a6bc1e8f162b9ea99672aee4c05a30b83ca94407b584b0a9dbec202b1471f8cb3ec12a57b2b86fb43901782b85ad4280b97434e7a WHIRLPOOL 407f550d92d028a619c11c680893c0a07cb1496a6a2a526968e0835edff85e0653e07f6cd924ab5e6ea0c153891ef1a7993dc69da4babf3aafa8a73051757ac4
+DIST Email-Abstract-3.008.tar.gz 26934 SHA256 fc7169acb6c43df7f005e7ef6ad08ee8ca6eb6796b5d1604593c997337cc8240 SHA512 efead64612562fb9d644fa830b2f29e0701af0f3ddeb118992badff7c7a45cb569ad4644a7b226cc625cdabfb3f5db155284eb68042928265bfc5c230f4bf40a WHIRLPOOL 5313e4b9faa5679e8e26f93f8e9a08bffeb5a4b411472d7d2c9011d9fa83baf0628980da6d0438058953c97bbc4d21101239633246d374006a326a29b6a9f7fd

dev-perl/Email-Date-Format/Email-Date-Format-1.5.0.ebuild

@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=RJBS
+DIST_VERSION=1.005
+inherit perl-module
+
+DESCRIPTION="Produce RFC 822 date strings"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	>=virtual/perl-Exporter-5.570.0
+	virtual/perl-Time-Local
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"

dev-perl/Email-Date-Format/Manifest

@@ -1 +1,2 @@
 DIST Email-Date-Format-1.002.tar.gz 10150 SHA256 0c7f3636dffa5ff151f6906baa17582c2efeb29109750f40f820fe5d2dc38e84 SHA512 44e96ce8605185ecc6f11d2e1b9349dc6fd9868de03fc9929d33bfcf5b9dd2d8cfbab8b9768aacf8d99106e118c00620d2fb6250d8fffe53d04124fe9d3976b7 WHIRLPOOL 969d771aa063167a10aef556b8fa4128fd1c6c5e9380a1410e5288a2630715630474c5148cedf324e6a02528c6f59823f4f0d248f4eb4c582a044ddea3e4cd55
+DIST Email-Date-Format-1.005.tar.gz 14324 SHA256 579c617e303b9d874411c7b61b46b59d36f815718625074ae6832e7bb9db5104 SHA512 23daefa45874211f053d05ac3c3f3c7c3a86d9b623fdcec3bd9f6f7b4c8e5ad1ac8038146bdc85cc950b21b43b0ad843f8a52ad2183d868d3a62ea96292e34ca WHIRLPOOL a0489a681ce95116aafadabd5320b6ddd6fdfb8d07a88e66cbbd4c0e8d23f56f00891f4576bd85fa64a04fb48bc15b7caec1b84cb66d3a7e980dd10aee453ca9

dev-perl/Email-Filter/Email-Filter-1.34.0.ebuild

@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=RJBS
+DIST_VERSION=1.034
+inherit perl-module
+
+DESCRIPTION="Simple filtering of RFC2822 message format and headers"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-perl/Class-Trigger
+	dev-perl/Email-LocalDelivery
+	dev-perl/Email-Simple
+	dev-perl/IPC-Run
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
+	test? (
+		virtual/perl-File-Temp
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"

dev-perl/Email-Filter/Manifest

@@ -1 +1,2 @@
 DIST Email-Filter-1.032.tar.gz 15255 SHA256 bc1700f7540ce41b05815c854039eadbd7f428785c928ea8726e4d21d3fe73cd SHA512 bfb15488473c4336d501ae0640599c4c2703fae3fb3f02a8e88f126c8b768c9af133c42f983659faa8fc4809e442ecdfaa6277c787b9ed4152bc85133882a4f3 WHIRLPOOL dd0e2c7c7aad90f8a9fbe5660dcc81b69ff41ed09455b3e1edd6580e372da10c80da656865fdc255a65920797b273d7afaf0f36142bf88ebc5e74ef273b82afd
+DIST Email-Filter-1.034.tar.gz 18133 SHA256 b640f3cdd997b3aa513e542db4af2a1016f5aa3ca379f3779bf3195a2898e2f7 SHA512 8b377c3d7503f18f03c8bd97baed17a5615c41cf737886aa834aa324954531a464b2564be244c4097fb9d5fe1b612885303acbf1d7dc8b2a64a739fb81ef3af6 WHIRLPOOL aebb0cbe502a578d4b408e0ecb11cdf06c7e082f10acb3710ad5ff3193e1114e15a925cadf9c75ee0db0c97568ce96f9e07cc5e060a4a546fa06133b991e62e5

dev-perl/Email-MIME/Email-MIME-1.937.0.ebuild

@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=RJBS
+DIST_VERSION=1.937
+inherit perl-module
+
+DESCRIPTION="Easy MIME message parsing"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~sparc-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+	dev-perl/Email-Address
+	>=dev-perl/Email-MIME-ContentType-1.16.0
+	>=dev-perl/Email-MIME-Encodings-1.314.0
+	dev-perl/Email-MessageID
+	>=dev-perl/Email-Simple-2.206.0
+	>=virtual/perl-Encode-1.980.100
+	virtual/perl-MIME-Base64
+	>=dev-perl/MIME-Types-1.130.0
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-parent
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Spec
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"

dev-perl/Email-MIME/Manifest

@@ -1,2 +1,3 @@
 DIST Email-MIME-1.929.tar.gz 115105 SHA256 b0c9267bd9266e40671c2080782f7303cb17b4e93bd066b8677137f21a6dc7e9 SHA512 13a2591de92720dd3f8f798e442cf65c391d38e2a6d1e72d87c9301e8e3b2aa8fc1c8e3cfbcb829f14844bde59575a03ef7eb535741624e4dc8f3575c4089697 WHIRLPOOL bd89adfe87ea78604c860730ef76f6f69c2e97512075445264f05297d08ae977ff76c48ee6d89c05760d3811126aebe89b985dcd1246e6d2065770f774f4f709
 DIST Email-MIME-1.936.tar.gz 117468 SHA256 4c0934284da84b8e9ed48ff1060c9719273fac18e776f4c8e888a47c863ee661 SHA512 3f7fa49a14cb4351a5967600f0ea6b491558ba0ee71799b58ff1a39579ca27776f2e22092d09cacfa5c1f1281033f216ba961807c2b72272e0c8dea5b0db024a WHIRLPOOL b42bd7f03daaeeb211fe84f2a154ad6186724b1e8b0b4ec92c8ac07f94900d84096b771127022a49e4cbd744930db763edc69146eb7a696c2f5904e3f9dfa2b9
+DIST Email-MIME-1.937.tar.gz 117556 SHA256 366567886bfb8e8930199c61f079f680b0acb23d01d84c6e40b9a5d8ed88a068 SHA512 61f8e262070edcad90e8852f1c2b3439d732273e64590c0013a506fb4330bc4d8dbb8430dca2b6a4498864e436e4286728209c01cfe8f11cd5afabc57461cbcf WHIRLPOOL 090a6c265955c3afd39337654492872e81eea2da43271a1eb627ab0a9a5a4e7f25c09c0ed7a350d140b8605062dd30af3406f7194a38f836326d8526b6b35755

dev-perl/Email-MIME/metadata.xml

@@ -9,6 +9,7 @@
     <remote-id type="cpan">Email-MIME</remote-id>
     <remote-id type="cpan-module">Email::MIME</remote-id>
     <remote-id type="cpan-module">Email::MIME::Creator</remote-id>
+    <remote-id type="cpan-module">Email::MIME::Encode</remote-id>
     <remote-id type="cpan-module">Email::MIME::Header</remote-id>
     <remote-id type="cpan-module">Email::MIME::Modifier</remote-id>
   </upstream>

dev-php/pecl-ssh2/pecl-ssh2-0.13-r1.ebuild

@@ -8,10 +8,12 @@ PHP_EXT_NAME="ssh2"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 
-USE_PHP="php5-5 php5-6"
+USE_PHP="php7-0 php5-6"
 
 inherit php-ext-pecl-r3
 
+USE_PHP="php5-6"
+
 DESCRIPTION="PHP bindings for the libssh2 library"
 LICENSE="PHP-3.01"
 SLOT="0"
@@ -20,3 +22,12 @@ KEYWORDS="~amd64 ~x86"
 DEPEND=">=net-libs/libssh2-1.2"
 RDEPEND="${DEPEND}"
 PHP_EXT_ECONF_ARGS=""
+PDEPEND="php_targets_php7-0? ( dev-php/pecl-ssh2:7 )"
+
+src_prepare(){
+	if use php_targets_php5-6 ; then
+		php-ext-source-r3_src_prepare
+	else
+		default_src_prepare
+	fi
+}

dev-php/pecl-stomp/Manifest

@@ -1 +1,2 @@
-DIST stomp-1.0.8.tgz 21837 SHA256 4e75c7baeff1de84b806a3fc17f486f773a8fd94797390c0678a11f71abf16c1 SHA512 5d74b1ce230305728be91808921a4c9a0408618bcd1a896f8bb4dc35d06fc4577f3aa15ec6252685a48891a302809651a055bf5e40548ef995a256f02a59c9e7 WHIRLPOOL e453ea95274933c136452759a660f045c300876c8a75c71085b4602e76e38ae4efbbfb0857e7da4429065f6a7e6dadf020dc6db239666a796770569b5f2fa04a
+DIST stomp-1.0.9.tgz 23166 SHA256 7a7d748c6327ef8c6853dcadaedd41b4366ff821b401b11fab7b915cb5246575 SHA512 e3ab5bfb03c29edde63de4006b448e0204efbac5817b1443ee5b1a0249c2f96d58443847b878e838108b66e5307f6e803f807aff7430af748af4994bfca5199a WHIRLPOOL 0812a75f7e0ee7b8eeb87cbcc29eb68a33035d05aec56432eceb550c1caec3df1dcba683e2bca386a1aae26c3de1878dcfc401ede59f7b9bedb69447cdf63cdf
+DIST stomp-2.0.0.tgz 23422 SHA256 7a51195b26e2178bcdacd4ae09023cf50c756964fea85bf3837ab0b2ea7fa727 SHA512 f999762f842f19e920bca35175e65e20173c9ef5162eba3b79a7a2a70a52991c5d39f6d9dd6d9dfa081f1c2fb23e0dae5fa42224dcad4626666e5785076f1a12 WHIRLPOOL d7f5422a45982de5b9baded1c6c0105d631a10ceeda8ef1ea7902ffe0efb95b31e82b461aaaafe8c73795cd2c334d51e3e8eac90873f058d1c8e8cd41e118954

dev-php/pecl-stomp/pecl-stomp-1.0.8.ebuild

@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-USE_PHP="php5-4 php5-5 php5-6"
-PHP_EXT_NAME="stomp"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS="CREDITS doc/classes.php doc/functions.php"
-
-inherit php-ext-pecl-r2
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="PHP extension to communicate with Stomp compliant Message Brokers"
-LICENSE="PHP-3"
-SLOT="0"
-IUSE="examples +ssl"
-
-for target in ${USE_PHP}; do
-	slot=${target/php}
-	slot=${slot/-/.}
-	PHPUSEDEPEND="${PHPUSEDEPEND}
-	php_targets_${target}? ( dev-lang/php:${slot}[ssl?] )"
-done
-
-DEPEND="${DEPEND}
-	${PHPUSEDEPEND}
-"
-
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	my_conf="--enable-stomp
-		$(use_with ssl openssl-dir=/usr)"
-	php-ext-pecl-r2_src_compile
-}

dev-php/pecl-stomp/pecl-stomp-1.0.9.ebuild

@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+USE_PHP="php5-6 php7-0"
+PHP_EXT_NAME="stomp"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( CREDITS doc/classes.php doc/functions.php )
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php5-6"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="PHP extension to communicate with Stomp compliant Message Brokers"
+LICENSE="PHP-3"
+SLOT="0"
+IUSE="examples +ssl"
+
+DEPEND="${DEPEND}
+	php_targets_php5-6? ( dev-lang/php:5.6[ssl?] )
+"
+
+RDEPEND="${DEPEND}"
+PDEPEND="php_targets_php7-0? ( dev-php/pecl-stomp:7 )"
+
+src_prepare() {
+	if use php_targets_php5-6 ; then
+		php-ext-source-r3_src_prepare
+	else
+		default_src_prepare
+	fi
+}
+
+src_configure() {
+	local PHP_EXT_ECONF_ARGS=( --enable-stomp
+		$(use_with ssl openssl-dir=/usr) )
+	php-ext-source-r3_src_configure
+}
+
+src_install() {
+	if use php_targets_php5-6 ; then
+		php-ext-pecl-r3_src_install
+	fi
+}

dev-php/pecl-stomp/pecl-stomp-2.0.0.ebuild

@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+USE_PHP="php5-6 php7-0"
+PHP_EXT_NAME="stomp"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( CREDITS doc/classes.php doc/functions.php )
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php7-0"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="PHP extension to communicate with Stomp compliant Message Brokers"
+LICENSE="PHP-3"
+SLOT="7"
+IUSE="examples +ssl"
+
+DEPEND="${DEPEND}
+	php_targets_php7-0? ( dev-lang/php:7.0[ssl?] )
+"
+
+RDEPEND="${DEPEND}
+	php_targets_php5-6? ( dev-php/pecl-stomp:0 )"
+
+src_prepare() {
+	if use php_targets_php7-0 ; then
+		php-ext-source-r3_src_prepare
+	else
+		default_src_prepare
+	fi
+}
+
+src_configure() {
+	local PHP_EXT_ECONF_ARGS=( --enable-stomp
+		$(use_with ssl openssl-dir=/usr) )
+	php-ext-source-r3_src_configure
+}
+
+src_install() {
+	if use php_targets_php7-0 ; then
+		php-ext-pecl-r3_src_install
+	fi
+}

dev-php/pecl-svn/files/1.0.3-c99-fixes.patch

@@ -0,0 +1,68 @@
+--- a/svn.c	2016/05/04 04:14:33	339123
++++ b/svn.c	2016/05/04 07:32:45	339129
+@@ -977,6 +977,7 @@
+ 	apr_pool_t *subpool;
+ 	svn_opt_revision_t peg_revision;
+ 	const char *true_path;
++	apr_hash_index_t *hi;
+ 
+ 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lbb",
+ 			&repos_url, &repos_url_len, &revision.value.number, &recurse, &peg) == FAILURE) {
+@@ -1021,7 +1022,7 @@
+ 
+ 	array_init(return_value);
+ 
+-	for (apr_hash_index_t *hi = apr_hash_first(subpool, dirents); hi; hi = apr_hash_next(hi)) {
++	for (hi = apr_hash_first(subpool, dirents); hi; hi = apr_hash_next(hi)) {
+ 		const char *utf8_entryname;
+ 		svn_dirent_t *dirent;
+ 		apr_time_t now = apr_time_now();
+@@ -1031,9 +1032,10 @@
+ 		char timestr[20];
+ 		const char   *utf8_timestr;
+ 		zval 	*row;
++		const char *key;
+ 
+-		svn_utf_cstring_to_utf8 (&utf8_entryname, apr_hash_this_key(hi), subpool);
+-		dirent = apr_hash_this_val(hi);
++		apr_hash_this(hi, &key, NULL, &dirent);
++		svn_utf_cstring_to_utf8 (&utf8_entryname, key, subpool);
+ 
+ 		/* svn_time_to_human_cstring gives us something *way* too long
+ 		to use for this, so we have to roll our own.  We include
+@@ -1101,6 +1103,7 @@
+ {
+ 	struct php_svn_log_receiver_baton *baton = (struct php_svn_log_receiver_baton*) ibaton;
+ 	zval  *row, *paths;
++	apr_hash_index_t *hi;
+ 	TSRMLS_FETCH();
+ 
+ 	if (rev == 0) {
+@@ -1127,7 +1130,7 @@
+ 		MAKE_STD_ZVAL(paths);
+ 		array_init(paths);
+ 
+-		for (apr_hash_index_t *hi = apr_hash_first(pool, changed_paths); hi; hi = apr_hash_next(hi)) {
++		for (hi = apr_hash_first(pool, changed_paths); hi; hi = apr_hash_next(hi)) {
+ 			svn_log_changed_path_t *log_item;
+ 			zval *zpaths;
+ 			const char *path;
+@@ -1135,8 +1138,7 @@
+ 			MAKE_STD_ZVAL(zpaths);
+ 			array_init(zpaths);
+ 
+-			path = apr_hash_this_key(hi);
+-			log_item = apr_hash_this_val(hi);
++			apr_hash_this(hi, &path, NULL, &log_item);
+ 
+ 			add_assoc_stringl(zpaths, "action", &(log_item->action), 1,1);
+ 			add_assoc_string(zpaths, "path", path, 1);
+@@ -1152,7 +1154,7 @@
+ 			add_assoc_zval(paths, path, zpaths);
+ 		}
+ 
+-		zend_hash_sort(Z_ARRVAL_P(paths), zend_qsort, compare_keys_as_paths, 1);
++		zend_hash_sort(Z_ARRVAL_P(paths), zend_qsort, compare_keys_as_paths, 1 TSRMLS_CC);
+ 		add_assoc_zval(row,"paths",paths);
+ 	}
+ 

dev-php/pecl-svn/pecl-svn-1.0.3-r1.ebuild

@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 PHP_EXT_NAME="svn"
 
-USE_PHP="php5-6 php5-5"
+USE_PHP="php5-6"
 
-inherit php-ext-pecl-r2
+inherit php-ext-pecl-r3
 
 KEYWORDS="~amd64 ~x86"
 
@@ -19,3 +19,5 @@ IUSE=""
 
 DEPEND="dev-vcs/subversion"
 RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/1.0.3-c99-fixes.patch" )

dev-php/pecl-translit/Manifest

@@ -1,2 +1 @@
 DIST pecl-translit-0.6.2.tar.gz 226445 SHA256 863ba3793d09776c309ae1a46af2826f8acf855db10ba8d976716ec6ab2ea3a5 SHA512 1d5229ceb2c06f5e4a9e3f7e1e760fc2974c01b732f8e220b9b1ddd49a82c932f4237fb6a19c82017270614881156f9637cffbe7896132e4a07e7a6547915ebb WHIRLPOOL 86b2f1160c5fc352e0faf7eac9b9435f01ba6bbfbb9265aaa7ea247ce73cba27eaed89e168356ef3a742b972a1ef0503eb853688bd9149d2d456d7d0ff24b7ca
-DIST translit-0.6.1.tgz 101748 SHA256 864faa76ef249e0203b761fd6a0b93ad5f61d1c1f4893dc0637997772bf671e3 SHA512 fd5d6d2f03825c9e966cdda5d671150cebe9ae399d76a22a0e63d812191a979887c4e9bd6db7a981558f00315f8e4be7dab95345e453ce0361a8e72764314f45 WHIRLPOOL 83eedc7eac0719c094e59b5457e54fed026f4de60955b6eb62a09b0679cdc31ce67cb1a5eb29c731424987992777b2c6c526f9443ba1cd6b8c7f0a268e28990b

dev-php/pecl-translit/pecl-translit-0.6.1-r1.ebuild

@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PHP_EXT_NAME="translit"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-USE_PHP="php5-6 php5-5 php5-4"
-
-inherit php-ext-pecl-r2
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Transliterates non-latin character sets to latin"
-LICENSE="PHP-3"
-SLOT="0"
-IUSE=""

dev-php/pecl-translit/pecl-translit-0.6.2-r1.ebuild

@@ -2,19 +2,19 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 PHP_EXT_NAME="translit"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 
-USE_PHP="php7-0 php5-6 php5-5"
+USE_PHP="php7-0 php5-6"
 PHP_EXT_NAME="translit"
 
 MY_PV="${PV//./_}"
 S="${WORKDIR}/${PN}-RELEASE_${MY_PV}"
 
-inherit php-ext-source-r2
+inherit php-ext-source-r3
 
 SRC_URI="https://github.com/derickr/${PN}/archive/RELEASE_${MY_PV}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64 ~x86"
@@ -24,6 +24,7 @@ DESCRIPTION="Transliterates non-latin character sets to latin"
 LICENSE="BSD-2"
 SLOT="0"
 IUSE=""
+PHP_EXT_ECONF_ARGS=()
 
 src_test() {
 	for slot in $(php_get_slots); do

dev-php/pecl-uploadprogress/files/1.0.3.1-php7.patch

@@ -0,0 +1,148 @@
+From 7a4d6b3ac3575caedf9429940f54688411cbf5e9 Mon Sep 17 00:00:00 2001
+From: Jan-E <github@ehrhardt.nl>
+Date: Sun, 19 Apr 2015 18:49:48 +0200
+Subject: [PATCH 1/2] PHP7 compatibility
+
+---
+ uploadprogress.c | 36 +++++++++++++++++++++++++++++++++---
+ 1 file changed, 33 insertions(+), 3 deletions(-)
+
+diff --git a/uploadprogress.c b/uploadprogress.c
+index 30f6758..7a52ba7 100644
+--- a/uploadprogress.c
++++ b/uploadprogress.c
+@@ -71,7 +71,7 @@ PHPAPI extern int (*php_rfc1867_callback)(unsigned int , void *, void ** TSRMLS_
+  */
+ static int uploadprogress_php_rfc1867_file(unsigned int event, void  *event_data, void **data TSRMLS_DC)
+ {
+-    zval handler;
++    //zval handler;
+     char *callable = NULL;
+     uploadprogress_data * progress;
+     int read_bytes;
+@@ -157,7 +157,11 @@ static int uploadprogress_php_rfc1867_file(unsigned int event, void  *event_data
+ 
+             if (get_contents) {
+                 php_stream *stream;
++#if defined(ZEND_ENGINE_3)
++                int options = 0;
++#else
+                 int options = ENFORCE_SAFE_MODE;
++#endif
+ 
+                 stream = php_stream_open_wrapper(progress->data_filename, "ab", options, NULL);
+                 if (stream) {
+@@ -301,7 +305,7 @@ PHP_FUNCTION(uploadprogress_get_info)
+ {
+     char * id;
+     int id_lg;
+-    char method;
++    //char method;
+ 
+     if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &id, &id_lg) == FAILURE) {
+         return;
+@@ -417,7 +421,11 @@ static void uploadprogress_file_php_get_info(char * id, zval * return_value)
+                         v[index] = 0;
+                     }
+                 }
++#if defined(ZEND_ENGINE_3)
++                add_assoc_string( return_value, k, v );
++#else
+                 add_assoc_string( return_value, k, v, 1 );
++#endif
+             }
+             fclose(F);
+         }
+@@ -432,10 +440,22 @@ static void uploadprogress_file_php_get_info(char * id, zval * return_value)
+  */
+ static void uploadprogress_file_php_get_contents(char *id, char *fieldname, long maxlen, zval *return_value)
+ {
++#if defined(ZEND_ENGINE_3)
++    char *filename, *template, *data_identifier;
++    zend_string *contents;
++#else
+     char *filename, *template, *contents, *data_identifier;
++#endif
+     php_stream *stream;
++#if defined(ZEND_ENGINE_3)
++    int options = 0;
++#else
+     int options = ENFORCE_SAFE_MODE;
+-    int len, newlen;
++#endif
++    int len;
++#if PHP_API_VERSION < 20100412
++    int newlen;
++#endif
+     TSRMLS_FETCH();
+ 
+     template = INI_STR("uploadprogress.file.contents_template");
+@@ -455,7 +475,13 @@ static void uploadprogress_file_php_get_contents(char *id, char *fieldname, long
+         }
+ 
+         /* uses mmap if possible */
++#if defined(ZEND_ENGINE_3)
++        contents = php_stream_copy_to_mem(stream, maxlen, 0);
++        len = contents->len;
++        if (contents && len > 0) {
++#else
+         if ((len = php_stream_copy_to_mem(stream, &contents, maxlen, 0)) > 0) {
++#endif
+ 
+ #if PHP_API_VERSION < 20100412
+             if (PG(magic_quotes_runtime)) {
+@@ -463,7 +489,11 @@ static void uploadprogress_file_php_get_contents(char *id, char *fieldname, long
+                 len = newlen;
+             }
+ #endif
++#if defined(ZEND_ENGINE_3)
++            RETVAL_STR(contents);
++#else
+             RETVAL_STRINGL(contents, len, 0);
++#endif
+         } else if (len == 0) {
+             RETVAL_EMPTY_STRING();
+         } else {
+-- 
+2.1.4
+
+
+From 95d8a0fd4554e10c215d3ab301e901bd8f99c5d9 Mon Sep 17 00:00:00 2001
+From: Jan-E <github@ehrhardt.nl>
+Date: Mon, 20 Apr 2015 22:20:40 +0200
+Subject: [PATCH 2/2] int id_lg should be size_t id_lg
+
+---
+ uploadprogress.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/uploadprogress.c b/uploadprogress.c
+index 7a52ba7..3d73d15 100644
+--- a/uploadprogress.c
++++ b/uploadprogress.c
+@@ -304,7 +304,11 @@ PHP_MINFO_FUNCTION(uploadprogress)
+ PHP_FUNCTION(uploadprogress_get_info)
+ {
+     char * id;
++#if defined(ZEND_ENGINE_3)
++    size_t id_lg;
++#else
+     int id_lg;
++#endif
+     //char method;
+ 
+     if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &id, &id_lg) == FAILURE) {
+-- 
+2.1.4
+
+--- a/uploadprogress.c	2011-08-15 09:21:10.000000000 -0400
++++ b/uploadprogress.c	2016-12-07 11:05:47.961377088 -0500
+@@ -213,7 +213,7 @@
+             FILE *F;
+             F = VCWD_FOPEN(progress->identifier_tmp, "wb");
+             if (F) {
+-                fprintf(F, "upload_id=%s\nfieldname=%s\nfilename=%s\ntime_start=%d\ntime_last=%d\nspeed_average=%d\nspeed_last=%d\nbytes_uploaded=%d\nbytes_total=%d\nfiles_uploaded=%d\nest_sec=%d\n",
++                fprintf(F, "upload_id=%s\nfieldname=%s\nfilename=%s\ntime_start=%ld\ntime_last=%ld\nspeed_average=%d\nspeed_last=%d\nbytes_uploaded=%ld\nbytes_total=%ld\nfiles_uploaded=%d\nest_sec=%d\n",
+                 progress->upload_id, progress->fieldname, progress->filename,
+                 progress->time_start, progress->time_last,
+                 progress->speed_average, progress->speed_last,

dev-php/pecl-uploadprogress/pecl-uploadprogress-1.0.3.1-r3.ebuild

@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-USE_PHP="php5-6 php5-5 php5-4"
+USE_PHP="php5-6 php7-0"
 
-inherit php-ext-pecl-r2
+inherit php-ext-pecl-r3
 
 DESCRIPTION="An extension to track progress of a file upload"
 LICENSE="PHP-3.01"
@@ -22,6 +22,8 @@ for target in ${USE_PHP}; do
 done
 
 RDEPEND="${PHPUSEDEPEND}"
+PATCHES=( "${FILESDIR}/1.0.3.1-php7.patch" )
+PHP_EXT_ECONF_ARGS=()
 
 pkg_postinst() {
 	elog "This extension is only known to work on Apache with mod_php."

dev-php/pecl-uuid/Manifest

@@ -1,2 +1 @@
-DIST uuid-1.0.3.tgz 6330 SHA256 6832c6453efec9800d2dc0bb9786cea02888378e88c15851f79210ef78369ef1 SHA512 8872de64d39691f7516c4181949ec66725dede3806b522d32198bb7cb7f651cb2223c0b245c2a13df8d67c63b3c482da8e0c8d9cc0dfa0cd05261f7670c6547f WHIRLPOOL a9056940755ff602b222f41889454540e162b04413a28c377010914e9215de45f7e986539ad862ee3fdf6f7b99297a1519f7cac5dd8ca7508f9290a4dbe80cc9
 DIST uuid-1.0.4.tgz 14900 SHA256 63079b6a62a9d43691ecbcd4eb52e5e5fe17b5a3d0f8e46e3c17ff265c06a11f SHA512 989d993f8158a13026b8e5c02f4aa50489b1a946d12da81dd1fff6091839a45b180562f74c8af368a498c495477374ec9e1d536e7de0178c1f288e3abe360164 WHIRLPOOL 883a35955c8d84574deddbabf29741d21309bc23347db37a867e257ee1cd459a224a449743f7d56d74de2eae3d46e48a600c39156cea137f94eb0fc6afeb8c73

dev-php/pecl-uuid/metadata.xml

@@ -5,4 +5,8 @@
     <email>dev-zero@gentoo.org</email>
     <name>Tiziano Müller</name>
   </maintainer>
+  <maintainer type="project">
+    <email>php-bugs@gentoo.org</email>
+    <name>PHP</name>
+  </maintainer>
 </pkgmetadata>

dev-php/pecl-uuid/pecl-uuid-1.0.4-r1.ebuild

@@ -1,17 +1,17 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI="6"
 
 PHP_EXT_NAME="uuid"
 PHP_EXT_INIT="yes"
 PHP_EXT_ZENDEXT="no"
-DOCS="CREDITS"
+DOCS=( CREDITS )
 
-USE_PHP="php5-6 php5-5 php5-4"
+USE_PHP="php7-0 php5-6"
 
-inherit php-ext-pecl-r2
+inherit php-ext-pecl-r3
 
 DESCRIPTION="A wrapper around libuuid"
 LICENSE="LGPL-2.1"
@@ -21,3 +21,4 @@ IUSE=""
 
 DEPEND="sys-apps/util-linux"
 RDEPEND="${DEPEND}"
+PHP_EXT_ECONF_ARGS=()

dev-php/pecl-uuid/pecl-uuid-1.0.4.ebuild

@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PHP_EXT_NAME="uuid"
-PHP_EXT_INIT="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS="CREDITS"
-
-USE_PHP="php7-0 php5-6 php5-5"
-
-inherit php-ext-pecl-r2
-
-DESCRIPTION="A wrapper around libuuid"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="sys-apps/util-linux"
-RDEPEND="${DEPEND}"

dev-php/pecl-xdiff/Manifest

@@ -1,2 +1,2 @@
 DIST xdiff-1.5.2.tgz 9275 SHA256 ebe72b887fcd2296f1e4032d476a8a463803ccfb0b34b403be8433daf3cfd81d SHA512 738d9624155b6d77b01fdef59eb0d34de6b4a8f757d2c0ccb6dd0140d021b6c88388312d6a43197dc5c24f8e643069c3a265fc0d17246e25e8104b00facf2dd0 WHIRLPOOL ee283ba7debacda6b46c931923469d98daae599b5e7a103eebeaea6044bcea3ee6f0bcd3f060463198724d62543a81ee55e570aa1584714a97a94cbd44dc8d6e
-DIST xdiff-2.0.0.tgz 8955 SHA256 52c1d151df8742b366538ee8b9565cc7bda310206ff37df3f170db8de6a009f0 SHA512 178d82e0338a92d25f296a9e1caa74681d2c294b4de80a8e2e59df829e16239186c189a0141d7dd07a36278c555af0943900999af05f124090442395e0f51b1a WHIRLPOOL ac3c8076a60ed34755acb1fb50dd98f42b4bf26a1483bb06792de2d01381e9f56e5b4c86d6d42633254c4958bb172afcdae17461f3997a09f48afb75e93c6fa1
+DIST xdiff-2.0.1.tgz 10418 SHA256 b4ac96c33ec28a5471b6498d18c84a6ad0fe2e4e890c93df08e34061fba7d207 SHA512 43f2bddac82ac19ac688ae7dad3fef65b0d8887c0e6adefd1fc15236582c31d78a54538903760270dee294ca8b8ba3def48bfa9b1d44160bcc450f5c6516402a WHIRLPOOL bd7c6bc098846212d6692fe5cb78d814386f14499e99011d539d2492ab4d962c04473859b6ce235017a5a47544713639408ff3d2381de0dac3b900d5ae0c5444

dev-php/pecl-xdiff/pecl-xdiff-1.5.2-r4.ebuild

@@ -1,25 +1,22 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 PHP_EXT_NAME="xdiff"
 PHP_EXT_PECL_PKG="xdiff"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
 DOCS="README.API"
 
-USE_PHP="php7-0"
+USE_PHP="php5-6"
 
-inherit php-ext-pecl-r2
+inherit php-ext-pecl-r3
 
 KEYWORDS="~x86 ~amd64"
 
 DESCRIPTION="PHP extension for generating diff files"
 LICENSE="PHP-3.01"
 SLOT="0"
-IUSE=""
 
 DEPEND="dev-libs/libxdiff"
 RDEPEND="${DEPEND}"

dev-php/pecl-xdiff/pecl-xdiff-2.0.1.ebuild

@@ -1,25 +1,22 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 PHP_EXT_NAME="xdiff"
 PHP_EXT_PECL_PKG="xdiff"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
 DOCS="README.API"
 
-USE_PHP="php5-6 php5-4 php5-5"
+USE_PHP="php7-0 php7-1"
 
-inherit php-ext-pecl-r2
+inherit php-ext-pecl-r3
 
 KEYWORDS="~x86 ~amd64"
 
 DESCRIPTION="PHP extension for generating diff files"
 LICENSE="PHP-3.01"
 SLOT="0"
-IUSE=""
 
 DEPEND="dev-libs/libxdiff"
 RDEPEND="${DEPEND}"

dev-php/pecl-xrange/files/1.3.2-fixes.patch

@@ -0,0 +1,133 @@
+--- a/xrange.c	2012/07/28 23:20:09	326859
++++ b/xrange.c	2013/10/06 11:48:38	331707
+@@ -175,21 +175,21 @@
+ 	zend_class_implements(php_xrange_xri_entry TSRMLS_CC, 1, spl_ce_Countable);
+ 
+ 	/* Register Class: OddFilterIterator */
+-	memset(&ce, sizeof(ce), '\0');
++	memset(&ce, 0, sizeof(ce));
+ 	INIT_CLASS_ENTRY(ce, PHP_XRANGE_ODDFILTERITERATOR_NAME, php_xrange_OddFilterIterator_functions);
+     ce.name_length = strlen(PHP_XRANGE_ODDFILTERITERATOR_NAME); 
+ 	php_xrange_OddFilterIterator_entry =
+ 		zend_register_internal_class_ex(&ce, spl_ce_FilterIterator, NULL TSRMLS_CC);
+ 
+ 	/* Register Class: EvenFilterIterator */
+-	memset(&ce, sizeof(ce), '\0');
++	memset(&ce, 0, sizeof(ce));
+ 	INIT_CLASS_ENTRY(ce, PHP_XRANGE_EVENFILTERITERATOR_NAME, php_xrange_EvenFilterIterator_functions);
+     ce.name_length = strlen(PHP_XRANGE_EVENFILTERITERATOR_NAME); 
+ 	php_xrange_EvenFilterIterator_entry =
+ 		zend_register_internal_class_ex(&ce, spl_ce_FilterIterator, NULL TSRMLS_CC);
+ 
+ 	/* Register Class: NumericFilterIterator */
+-	memset(&ce, sizeof(ce), '\0');
++	memset(&ce, 0, sizeof(ce));
+ 	INIT_CLASS_ENTRY(ce, PHP_XRANGE_NUMERICFILTERITERATOR_NAME, php_xrange_NumericFilterIterator_functions);
+     ce.name_length = strlen(PHP_XRANGE_NUMERICFILTERITERATOR_NAME); 
+ 	php_xrange_NumericFilterIterator_entry =
+@@ -225,13 +225,16 @@
+ {
+ 	if (return_value_used) {
+ 		int param_count = ZEND_NUM_ARGS();
++		zval ***params;
++		zval *retval = NULL;
++		zval methodName;
+ 
+ 		/* because I'm passing the arguments as an array, I'll need to manually
+ 		   check arg length. */
+ 		if (param_count != 2 && param_count != 3) WRONG_PARAM_COUNT;
+ 
+ 		/* retrieve the function's argument list */
+-		zval ***params = (zval ***) safe_emalloc(param_count, sizeof(zval*), 0);
++		params = (zval ***) safe_emalloc(param_count, sizeof(zval*), 0);
+ 		if (zend_get_parameters_array_ex(param_count, params) == FAILURE) {
+ 			efree(params);
+ 			WRONG_PARAM_COUNT;
+@@ -244,8 +247,6 @@
+ 		);
+ 
+ 		/* setup call to XRangeIterator's constructor (must do manually) */
+-		zval *retval = NULL;
+-		zval methodName;
+ 		ZVAL_STRING(&methodName, "__construct", 0);
+ 
+ 		/* pass all arguments through to the XRangeIterator constructor */
+@@ -286,6 +287,9 @@
+    Return a configured range iterator / generator */
+ PHP_METHOD(PHP_XRANGE_XRI_NAME, __construct)
+ {
++	xrange_module_storage *internalStorage;
++	double iterations;
++
+ 	if (!getThis()) {
+ 		php_error_docref(
+ 			NULL TSRMLS_CC, E_WARNING, "Don't call the constructor statically"
+@@ -293,7 +297,7 @@
+ 		RETURN_FALSE;
+ 	}
+ 
+-	xrange_module_storage *internalStorage = PHP_XRANGE_ZOS_GET;
++	internalStorage = PHP_XRANGE_ZOS_GET;
+ 
+ 	/* parse argument list */
+ 	internalStorage->step = 1.0; /* default */
+@@ -322,7 +326,7 @@
+ 	) internalStorage->step *= -1;
+ 
+ 	/* calculate the total number of iterations before completion */
+-	double iterations = fabs(
++	iterations = fabs(
+ 		(internalStorage->high - internalStorage->low) / internalStorage->step
+ 	);
+ 
+@@ -453,6 +457,7 @@
+ PHP_METHOD(PHP_XRANGE_ODDFILTERITERATOR_NAME, accept)
+ {
+ 	zval *currentValue;
++	int isOdd;
+ 
+ 	// method A: bypass getInnerIterator() call
+ 	spl_dual_it_object *intern =
+@@ -464,7 +469,7 @@
+ 	// TODO: method B - use getInnerIterator() w/ compilation option
+ 
+ 	if (Z_TYPE_P(currentValue) != IS_LONG) convert_to_long(currentValue);
+-	int isOdd = Z_LVAL_P(currentValue) & 1;
++	isOdd = Z_LVAL_P(currentValue) & 1;
+ 
+ 	zval_ptr_dtor(&currentValue); /* clean-up */
+ 	RETURN_BOOL(isOdd);
+@@ -476,6 +481,7 @@
+ PHP_METHOD(PHP_XRANGE_EVENFILTERITERATOR_NAME, accept)
+ {
+ 	zval *currentValue;
++	int isEven;
+ 
+ 	/* method A: bypass getInnerIterator() call */
+ 	spl_dual_it_object *intern =
+@@ -487,7 +493,7 @@
+ 	/* TODO: method B - use getInnerIterator() w/ compilation option */
+ 
+ 	if (Z_TYPE_P(currentValue) != IS_LONG) convert_to_long(currentValue);
+-	int isEven = !(Z_LVAL_P(currentValue) & 1);
++	isEven = !(Z_LVAL_P(currentValue) & 1);
+ 
+ 	zval_ptr_dtor(&currentValue); /* clean-up */
+ 	RETURN_BOOL(isEven);
+@@ -499,6 +505,7 @@
+ PHP_METHOD(PHP_XRANGE_NUMERICFILTERITERATOR_NAME, accept)
+ {
+ 	zval *currentValue;
++	int isNumeric;
+ 
+ 	/* method A: bypass getInnerIterator() call */
+ 	spl_dual_it_object *intern =
+@@ -509,8 +516,6 @@
+ 	);
+ 	/* TODO: method B - use getInnerIterator() w/ compilation option */
+ 
+-	int isNumeric;
+-
+ 	/* this code comes from is_numeric() the implementation. it's here to
+ 	 * to eliminate the overhead of a PHP function call. */
+ 	switch (Z_TYPE_P(currentValue)) {

dev-php/pecl-xrange/pecl-xrange-1.3.2-r2.ebuild

@@ -1,16 +1,16 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 PHP_EXT_NAME="xrange"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 
-USE_PHP="php5-6 php5-5 php5-4"
+USE_PHP="php5-6"
 
-inherit php-ext-pecl-r2
+inherit php-ext-pecl-r3
 
 KEYWORDS="~amd64 ~x86"
 
@@ -21,3 +21,5 @@ IUSE=""
 
 RDEPEND=""
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/1.3.2-fixes.patch" )
+PHP_EXT_ECONF_ARGS=()

dev-php/pecl-yaml/Manifest

@@ -1,3 +1,2 @@
-DIST yaml-1.2.0.tgz 38606 SHA256 fdf0eec6bf16b0c45e58076a2048f96140a778463724fb82ab49ab5fb4c7e19a SHA512 bd67e98afea42f0ab803cbb88ec59f1979b1bd9338f000d3b452ba620f2751b25873f531bd2309c59eb524c275883f01ff3106e796bb56d42f29b1a756be1b4c WHIRLPOOL da4f1e015bb5e96f057de6347edc382d9c1c4ee980125703b587135d19412dce69fd49ebd3ae85cc2755704192a4c9aa61cc7067d077a263517233088e81e7c1
-DIST yaml-1.3.0b1.tgz 37084 SHA256 e846c10bc1b632cdb59c0f73a926ff3067e96fa646cb0eec1d8c85d372310285 SHA512 37068b759a760b5e61098fad42edc06a3d8a868df94a974887af7531fbddaaab5c6547fbf53d70b87855c0a8ae0ff58e56431bb1bdfaa0c1fff96a3f5cb120d8 WHIRLPOOL cc49e9704912991097a9fe7481335c4b6353c1202c08e9554df4b00abb4441cfd990ade8660094c56e6d7adb1dd8d201d3896f123204cf3e4f9468edf9b56594
-DIST yaml-2.0.0RC8.tgz 38077 SHA256 44cab15d57b2fb8fa916ff9291059a34b0c3fa99298c2b08a5082f334613753a SHA512 68d6a09556b2203d61cc1a5b1280eaafa9005cafec8614eccb06377bbb98cf18c883fed6b856a3683ec5a161bd7f14a21729a0a23172b88610cfaf4436e41484 WHIRLPOOL cfc922ed5677e438c856f389348e675c33d228538c362163bc6496164db0593801a90f6c9cab2ceca920ca8ef19a5f094b551f9d909300e4b6ee55eec0ac537b
+DIST yaml-1.3.0.tgz 37075 SHA256 bf4696386fbd4e8435628d84ccb8c261c9e481888c7e1ce537cccceadcb57500 SHA512 60f54db7cd22ef1dc31cb5b31950a138e0bd2cc436f9e667aaa69ddceb4dcd7aeea9ecca9d424cb6822c2300b382de8f10c07403f80df749192820b27881d96a WHIRLPOOL daab5ed57601a3df4c650eaa571295975cdbaaffc95fe963e97afc57f78d2b41c4391e4e9cbc1c48f2c4891c03b5677dd02bcb8689faa9886c39cf5a66270be4
+DIST yaml-2.0.0.tgz 37960 SHA256 ef13ff56c184290c025a522bf9ae2e1b3ecc8543c3a5161dd02adec90897a221 SHA512 760c9f9f5738594e3ad55c030fa619bc891e1d5a8feb85bec2389e2fd4d6d4933fd13abf68c85eb1bb4cc3b6f4a66079ea75a2046c47fe4095b01a50c8e65eab WHIRLPOOL 0ea36c5b155a3d8f22c6fbb1a1f180dabb71a7843a5fb12fb99a6a9b7f543f30511b55ad4fd390c92103b675db6fb7ce90c38ff504c81487589e407c68318959

dev-php/pecl-yaml/pecl-yaml-1.2.0.ebuild

@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PHP_EXT_NAME="yaml"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS="CREDITS README"
-
-USE_PHP="php5-6 php5-5 php5-4"
-
-inherit php-ext-pecl-r2
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="YAML 1.1 (YAML Ain't Markup Language) serialization for PHP"
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-libs/libyaml-0.1.0"
-RDEPEND="${DEPEND}"

dev-php/pecl-yaml/pecl-yaml-1.3.0.ebuild

@@ -11,10 +11,12 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS=( CREDITS README )
 
-USE_PHP="php5-5 php5-6"
+USE_PHP="php7-0 php5-6"
 
 inherit php-ext-pecl-r3
 
+USE_PHP="php5-6"
+
 S="${WORKDIR}/yaml-${MY_PV}"
 PHP_EXT_S="${S}"
 
@@ -27,4 +29,19 @@ IUSE=""
 
 DEPEND=">=dev-libs/libyaml-0.1.0"
 RDEPEND="${DEPEND}"
+PDEPEND="php_targets_php7-0? ( dev-php/pecl-yaml:7 )"
 PHP_EXT_ECONF_ARGS=""
+
+src_prepare() {
+	if use php_targets_php5-6 ; then
+		php-ext-source-r3_src_prepare
+	else
+		default_src_prepare
+	fi
+}
+
+src_install() {
+	if use php_targets_php5-6 ; then
+		php-ext-pecl-r3_src_install
+	fi
+}

dev-php/pecl-yaml/pecl-yaml-2.0.0.ebuild

@@ -37,3 +37,9 @@ src_prepare() {
 		default_src_prepare
 	fi
 }
+
+src_install() {
+	if use php_targets_php7-0 ; then
+		php-ext-pecl-r3_src_install
+	fi
+}

dev-php/pecl-yaz/Manifest

@@ -1,3 +1,2 @@
 DIST yaz-1.1.6.tgz 16464 SHA256 dd9b919ba3b2a09a9c77c847407f106512fe75979cc0689ebccef08c80719eee SHA512 5bef11616ff6fc44e75b5f6ace1b6b9c104e7a1c588e21d04c9da98262021029f3f8dca9ae53bbf7461f8cd3c2f57bac841dfd777931774f150809b5d60addc1 WHIRLPOOL bfdeb26fa749bd12172e33028b210e3c28259c8a15e31a543835ca4bd68af697379ba9a0befe3a1e69614769c8604a3683ba51b11bbf1644a9bed3edfd708032
-DIST yaz-1.1.9.tgz 18590 SHA256 9dd4da2fd6042b37a1811972134f852c94a6f6b85ca4ec5ed5d766eb27a6c401 SHA512 4d588afe60b3b219e0476fabc93a761210e8f625be167e7c2910a33ff9c1daec089d918a02b002d0c27bb7d8fbae03b8cab551d5d33f5ea971aadbaba2383739 WHIRLPOOL a9958d8db5a0934e727dec0b71283ff3d20d9a5b1e228c69f7f53a76b1638db28527adcd2381ce5a4e76d101702756508f6a135c69c02655e83bf2c63ade51ff
-DIST yaz-1.2.0.tgz 20107 SHA256 1c64a756b39790eac85b890b2180504f7bd13e22df4c8e71857d09cd03c5b04d SHA512 f9d550eedcaf2bff3299629725992430c460a0dda943c2858bb509f9b1b2d263b02054095026266385870bf6b7b9acb90cc892f5fb5e2696eac2d0ecf69feb84 WHIRLPOOL 467fbcb18ac8cc0228aa20139a8d6d6ea47ff3f2fd1b1bdb5a9c6df6590f66a9b8a57d540d37dd4afad2133cd299c23b2473c1926110348941f2abe9c2b8bc6a
+DIST yaz-1.2.1.tgz 20147 SHA256 5d402e1029aa62a801206e9783c7d3b25db7dd144d39eacb65bd72ab4c9d34c1 SHA512 92525e485e5499f8b4ef8b1e9b21a3fa7004206f545a3a5b300ee11e3c5ff10d335645d5c42fe3b7523a55fe58ffb0a671c67dfc627bc4bd36aeab63dfe42bf1 WHIRLPOOL 6f2665c0effdd79d5919c2edea1170eb37bb9c99167f0228a2b56770aeb6d63ccd88203b762a114c8a983d405de7e660d92fbc88302da9339a2dae36d2acd5cd

dev-php/pecl-yaz/pecl-yaz-1.1.9.ebuild

@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PHP_EXT_NAME="yaz"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS="README"
-
-USE_PHP="php5-6 php5-5 php5-4"
-
-inherit php-ext-pecl-r2
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-DESCRIPTION="This extension implements a Z39.50 client for PHP using the YAZ toolkit"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-libs/yaz-3.0.2:0="
-RDEPEND="${DEPEND}"
-
-my_conf="--with-yaz=/usr"

dev-php/pecl-yaz/pecl-yaz-1.2.1.ebuild

@@ -9,7 +9,7 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS=( README )
 
-USE_PHP="php7-0 php5-6 php5-5"
+USE_PHP="php7-0 php5-6"
 
 inherit php-ext-pecl-r3