Sync with portage [Sat Oct 17 22:12:47 MSK 2015].

app-accessibility/caribou/Manifest

@@ -1,3 +1,2 @@
-DIST caribou-0.4.17.tar.xz 421960 SHA256 31828886b812421dd7217a7aa29043945b8601f3a101507f7e3faa0dc157e516 SHA512 97e773fb44f6bcf827bd8c839cd0669e029ebb377e1c3c777f7acf1cbf262ee58af09ea3e941843bc9519eee3bb59f3c572c04ddea0fb888baac9129c74c8932 WHIRLPOOL b3dee923e7815788655279857c5f6b4a6eac9ad34cffffff0b95f05bcb36ea09882acea5b88e1043b2c806d7a78a52a86772affd2e052588eacec41e76fcbf6b
 DIST caribou-0.4.18.1.tar.xz 410548 SHA256 aefadf125a647fc68696f4134e99ee43dca121da5de8e1edf6eab5664a9f3150 SHA512 226ca64fafb4e7c5e38ba714059e9e6ef7bbfce04160b98884fb299dc465e4f7d278033477f2539ba64fe9c39c62448903a8273dee0315bff81dbbe107d665d5 WHIRLPOOL 1310f79944ee547535a04563dd7910dfff2db400faf6c28685deecc062432759a24f0587f875d88cc87ddcdcd4c249a83abde0222ffcab4a24afe91dc9a55cdb
-DIST caribou-0.4.18.tar.xz 422580 SHA256 8d94977f3364926600b5f711406e765a9a61aa444609f87a1d435b301e147226 SHA512 cb1dbfa33ef7898b98d05af8ec937f4ecd6ee17148d136186e6bd1e00da97c4146d04e283f9b72a2ac88e8379f8aa4051535a247bce91dd87f32558322fa3720 WHIRLPOOL 5e3dcfb5ccf74d33f698678092468b2236b7cb1e78ba53816221c1c159c1a657ad32f56f2f389075d1ab4fb363ddaf019f0f3d27164b061ae8e9bba47015a56c
+DIST caribou-0.4.19.tar.xz 412328 SHA256 2f0bd0c14c5f94cf5ac3a7627018919addf7a054ac84aaa8e62356957c175a44 SHA512 ae8fd278612778eae35810eee199dc9c64b45340de1459cc71eb5806ebc14ddd05e7e0e5464e2976d0160a50c6d76656a7ed0362bfd79eecdc09de1fc78b6de1 WHIRLPOOL db26dbc91e231558712bd33f57f857de660cc17f5c7c6c8c8fd2687807b75d5784df8654e0328c35a4e06902ec5a628609b8c9dd2d568a2afcb59c2f12c081a8

app-accessibility/caribou/caribou-0.4.17.ebuild

@@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit gnome2 python-r1
-
-DESCRIPTION="Input assistive technology intended for switch and pointer users"
-HOMEPAGE="https://wiki.gnome.org/Projects/Caribou"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
-	app-accessibility/at-spi2-core
-	>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
-	>=x11-libs/gtk+-3:3[introspection]
-	x11-libs/gtk+:2
-	>=dev-libs/gobject-introspection-0.10.7
-	dev-libs/libgee:0.8
-	dev-libs/libxml2
-	>=media-libs/clutter-1.5.11:1.0[introspection]
-	x11-libs/libX11
-	x11-libs/libxklavier
-	x11-libs/libXtst
-"
-# gsettings-desktop-schemas is needed for the 'toolkit-accessibility' key
-# pyatspi-2.1.90 needed to run caribou if pygobject:3 is installed
-# librsvg needed to load svg images in css styles
-RDEPEND="${COMMON_DEPEND}
-	>=dev-python/pyatspi-2.1.90[${PYTHON_USEDEP}]
-	>=gnome-base/gsettings-desktop-schemas-3
-	gnome-base/librsvg:2
-	sys-apps/dbus
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	>=dev-util/intltool-0.35.5
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# delete custom PYTHONPATH, useless on Gentoo and potential bug source
-	# + caribou is python2 only so fix the shell scripts
-	sed -e '/export PYTHONPATH=.*python/ d' \
-		-e "s:@PYTHON@:${EPREFIX}/usr/bin/python2:" \
-		-i bin/{antler-keyboard,caribou-preferences}.in ||
-		die "sed failed"
-
-	gnome2_src_prepare
-
-	prepare_caribou() {
-		mkdir -p "${BUILD_DIR}" || die
-	}
-	python_foreach_impl prepare_caribou
-}
-
-src_configure() {
-	ECONF_SOURCE="${S}" python_foreach_impl run_in_build_dir \
-		gnome2_src_configure \
-			--disable-docs \
-			--disable-static \
-			--enable-gtk3-module \
-			--enable-gtk2-module \
-			VALAC=$(type -P true)
-	# vala is not needed for tarball builds, but configure checks for it...
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_test() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	python_foreach_impl run_in_build_dir gnome2_src_install
-	dodoc AUTHORS NEWS README # ChangeLog simply points to git log
-}

app-admin/consul/metadata.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
@@ -10,4 +10,7 @@
   <use>
     <flag name="web">Build the web UI.</flag>
   </use>
+  <upstream>
+    <remote-id type="github">ryanuber/columnize</remote-id>
+  </upstream>
 </pkgmetadata>

app-admin/r10k/metadata.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
@@ -8,9 +8,8 @@
   <herd>sysadmin</herd>
   <longdescription lang="en">
 			r10k provides a general purpose toolset for deploying Puppet environments and modules. It implements the Puppetfile format and provides a native implementation of Puppet dynamic environments.
-        </longdescription>
+  </longdescription>
   <upstream>
-    <remote-id type="rubyforge">r10k</remote-id>
     <remote-id type="github">adrienthebo/r10k</remote-id>
   </upstream>
 </pkgmetadata>

app-admin/salt/metadata.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
@@ -19,7 +19,7 @@ files to define the state a server needs to be in.
 
 Between the remote execution system, and state management Salt addresses the
 backbone of cloud and data center management.
-</longdescription>
+  </longdescription>
   <use>
     <flag name="api">Enable support for salt-api.</flag>
     <flag name="cherrypy">Enable support for using cherrypy.</flag>
@@ -39,5 +39,6 @@ backbone of cloud and data center management.
   </use>
   <upstream>
     <remote-id type="pypi">salt</remote-id>
+    <remote-id type="github">saltstack/salt-vim</remote-id>
   </upstream>
 </pkgmetadata>

app-admin/vault/metadata.xml

@@ -1,7 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
     <email>zmedico@gentoo.org</email>
   </maintainer>
+  <upstream>
+    <remote-id type="github">mitchellh/iochan</remote-id>
+  </upstream>
 </pkgmetadata>

app-admin/webapp-config/webapp-config-1.54-r1.ebuild

@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
 inherit distutils-r1
 
 SRC_URI="https://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 
 DESCRIPTION="Gentoo's installer for web-based applications"
 HOMEPAGE="http://sourceforge.net/projects/webapp-config/"

app-crypt/loop-aes-losetup/metadata.xml

@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>crypto</herd>
+	<upstream>
+		<remote-id type="sourceforge">loop-aes</remote-id>
+	</upstream>
 </pkgmetadata>

app-crypt/simple-tpm-pk11/Manifest

@@ -1 +1,2 @@
 DIST simple-tpm-pk11-0.03.tar.gz 25238 SHA256 0059064cb29900f0db8ce6163ef6aee17b2dcd095613c813dd53ad7f597bf141 SHA512 ed8a1d605bb21ae6abec426f32159882fef74ee7cbc7cdfa5b649a9947f10bad2b95354b2445f3f40dbd9d55803f9fc40fca02605d466e995083c7e9ca29bd8e WHIRLPOOL 1887c7d18a333319a99b28157f7d9b3bce83868154cd3496b8aec911d3d61b13678d0a0ceb143c65cb8addf625e68ccb4008d65af55f87b2bff27d0ac6dddd40
+DIST simple-tpm-pk11-0.04.tar.gz 26377 SHA256 54f67e08cd0847c1716dd86ceb2748982d226f047de059073c2ffa4cad27c56a SHA512 9023fd580237030e4928fa517739801a06ec673571f13ef365e22e7ebe857fa0be5e6d2004663e0b8287ff7a741f163d0f5e1bc28d7c0300b32fc6af0176d275 WHIRLPOOL 0227adcb41ab3f54f9e23fd3f4d6a4cc1ebe92354d2544a92317b2d7f7f690cb7a163402954957ed5cbb10cff75f3b38441033b7395724a3b46c15f5465d51d6

app-crypt/simple-tpm-pk11/simple-tpm-pk11-0.04.ebuild

@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="Simple PKCS11 provider for TPM chips"
+HOMEPAGE="https://github.com/ThomasHabets/simple-tpm-pk11"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/ThomasHabets/${PN}.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/ThomasHabets/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+IUSE=""
+RESTRICT="test" # needs to communicate with the TPM and gtest is all broken
+
+DEPEND="app-crypt/tpm-tools[pkcs11]
+	dev-libs/opencryptoki[tpm]
+	app-crypt/trousers
+	dev-libs/openssl:0="
+RDEPEND="${DEPEND}
+	net-misc/openssh[-X509]"
+
+src_prepare() {
+	epatch_user
+	eautoreconf
+}

app-dicts/freedict-deu-eng/metadata.xml

@@ -1,5 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">freedict</remote-id>
+	</upstream>
 </pkgmetadata>

app-dicts/freedict-eng-fra/metadata.xml

@@ -1,5 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">freedict</remote-id>
+	</upstream>
 </pkgmetadata>

app-dicts/freedict-eng-ita/metadata.xml

@@ -1,5 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">freedict</remote-id>
+	</upstream>
 </pkgmetadata>

app-dicts/freedict-eng-swe/metadata.xml

@@ -1,5 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">freedict</remote-id>
+	</upstream>
 </pkgmetadata>

app-dicts/freedict-fra-eng/metadata.xml

@@ -1,5 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">freedict</remote-id>
+	</upstream>
 </pkgmetadata>

app-dicts/freedict-ita-eng/metadata.xml

@@ -1,5 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">freedict</remote-id>
+	</upstream>
 </pkgmetadata>

app-dicts/hunspell-kk/metadata.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
@@ -10,4 +10,8 @@
 		<name>Galym Kerimbekov</name>
 		<description>Proxy maintainer, assign bugs to him</description>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">kergalym/hunspell-kk</remote-id>
+		<remote-id type="sourceforge">hunspell</remote-id>
+	</upstream>
 </pkgmetadata>

app-dicts/prime-dict/metadata.xml

@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+	<herd>cjk</herd>
+	<upstream>
+		<remote-id type="sourceforge-jp">prime</remote-id>
+	</upstream>
 </pkgmetadata>

app-doc/gnucash-docs/Manifest

@@ -1,2 +1,2 @@
-DIST gnucash-docs-2.6.6.tar.gz 58940604 SHA256 64c5e5a9a5b0756f4fc7f631ace6d5bea910acf5b4d5249b9e010575f67004f7 SHA512 11ba613d0df2c8d1a4d107313001371b301db9595adeba6e0157ad258d3d2498e2b7a17f1bd6dc44ae3f6026ea0ed7d5597fde732a78bcf1cd03a835181f8f22 WHIRLPOOL 0a771aed2699b9b846c1b627e6b5018cf73bfb78b43ab6c7ff8d97dcf6fed457d69b56fe059971d0ce4eeeddb752ed2e23e895e9f28b92c0170294cb53215fe5
 DIST gnucash-docs-2.6.7.tar.gz 58975368 SHA256 80b8188675f3202aa0385f005a99d720a96aa380d2689c9c15f9aa7ecb08de7e SHA512 a73692e72f7613bf5f30869db8f8b42cc209af337ffb95327198a153a764ee0427fda12ee89a14ab932b15dfb8a3f8be318f50910e63b0419a13fb1b9773b262 WHIRLPOOL f6365eda03da9f005f4c6b19887dece44ce3893b57e37902ca2c55605755a9bd56ab00b405089631756fd65fba41a07361fd359e3edd8e76c08a7b7fa439e5c0
+DIST gnucash-docs-2.6.9.tar.gz 63820580 SHA256 5bd92664321c7447b61183d9eb0b57d7bab736f807b36fa901a2553aee06341b SHA512 f3f44912f400bd53fed20d310224e78053a2458a2afb31bb1a19432691bcf4c343a364b97ab62f5fabba45a3006d279139bdd2e8306989c167551435f81ce4ec WHIRLPOOL ae6bffffe84b03a7a75d9da46b98ec255bfbd4f5ff957473c655c880b4f1f48f209af028e865e3f33479e4cea37680b0f3cf6abaa0957ea768c41bb6262ee63e

app-doc/gnucash-docs/gnucash-docs-2.6.9.ebuild

@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/gnucash/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2 FDL-1.1"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 RDEPEND="!<=app-office/gnucash-2.2.1"

app-doc/root-docs/metadata.xml

@@ -1,19 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+  <maintainer>
-  <email>bircoph@gentoo.org</email>
+    <email>bircoph@gentoo.org</email>
-  <name>Andrew Savchenko</name>
+    <name>Andrew Savchenko</name>
-</maintainer>
+  </maintainer>
-<herd>sci-physics</herd>
+  <herd>sci-physics</herd>
-<longdescription lang="en">
+  <longdescription lang="en">
   This package contains the automatically generated ROOT class
   documentation.
-</longdescription>
+  </longdescription>
-<use>
+  <use>
-  <flag name="api">Generate html API documentation</flag>
+    <flag name="api">Generate html API documentation</flag>
-  <flag name="http">Build HttpServer documentation</flag>
+    <flag name="http">Build HttpServer documentation</flag>
-  <flag name="math">Provide all math related documentation</flag>
+    <flag name="math">Provide all math related documentation</flag>
-  <flag name="metric">Default to A4 paper size and metric measurement. Letter will be used otherwise</flag>
+    <flag name="metric">Default to A4 paper size and metric measurement. Letter will be used otherwise</flag>
-</use>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">tmva</remote-id>
+  </upstream>
 </pkgmetadata>

app-editors/gedit/Manifest

@@ -1,3 +1,2 @@
-DIST gedit-3.14.3.tar.xz 2875192 SHA256 cd6c9f556ec12001e4b250091a1d7405cd807cce7fe767bc89ed2c25aa96a319 SHA512 2237ad697161cff5755336775cf128136d7cefdece0d335246735b3ae1b9d2cadb29ae36be2000cd7fb02d6a4187aac1d2ff7935bec5c64b5b880fe84f330b01 WHIRLPOOL 39ffa7ece00f712f052c78107b3f95cd0e3a744932d22f5e946141b3bc8954643ae091f75508d9761761fb041a18b43e50b23ed1c0ff3d7ac0bdce9464cc71cd
-DIST gedit-3.16.2.tar.xz 2905916 SHA256 db60a9408711b00f3780f5f5b657e9f44722c88c683ba6e9f2b4885631f429aa SHA512 511d70099eeb857a3e25d789c44302756d108ff84634c4c7386e1e1de8dd08834cf57991311c69aa81da23510027523bc7cde313b689feb1a8e08eb01b017648 WHIRLPOOL ce51f82265664839d686ea91388f8dc906c5dcf666032f4073792832aabfa9a04dbd99e4aeef5cfd733a753eaf63daaa5b55dce3c67bb0cdb01d96595d36b4f9
 DIST gedit-3.16.3.tar.xz 2924392 SHA256 c28df44a29ee5707441f89e94b513079d709111afec4bd4b079a1dff0242cdb2 SHA512 479370c25be4b8c6f2fc77628e835b763194fdc9ce1858bb8fe4641964e6911db573b28300d8cc5519a5e4ddef980d28c224a315c3879770265be9328b70e925 WHIRLPOOL 604690b148f2af10358c1d567521e49a406594c390d8b67a22a4879ce1d70398d0de43865cc3874d29b51d9c86103fa765b5cde181008172e5617333b1ab3b9e
+DIST gedit-3.16.4.tar.xz 2925984 SHA256 210937ea9143d8a6c9580a7ab11acf60d478f516d591ace6c8384fb085fb4cc0 SHA512 6320e11f6387b317789f6af4bdbb54350af89bd00c1443b26e68afdacf87c672ca74caf50c9ead80f4395a826d07a8da640e5d5ae89f71bccf75da683f420a81 WHIRLPOOL 057a7ecf22d12fa4899d20e3e365000bfe5c39873edc1331a75c1a061a5ce601b69d5ffaec1685cf0751ab0d7feff68e4d8be024654afdf90a6c08d0193aa2e9

app-editors/gedit/gedit-3.14.3.ebuild

@@ -1,106 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python3_{3,4} )
-VALA_MIN_API_VERSION="0.26"
-VALA_USE_DEPEND="vapigen"
-
-inherit eutils gnome2 multilib python-r1 vala virtualx
-
-DESCRIPTION="A text editor for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-
-IUSE="+introspection +python spell vala"
-# python-single-r1 would request disabling PYTHON_TARGETS on libpeas
-# we need to fix that
-REQUIRED_USE="python? ( ^^ ( $(python_gen_useflags '*') ) )"
-
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
-
-# X libs are not needed for OSX (aqua)
-COMMON_DEPEND="
-	>=dev-libs/libxml2-2.5.0:2
-	>=dev-libs/glib-2.40:2[dbus]
-	>=x11-libs/gtk+-3.14:3[introspection?]
-	>=x11-libs/gtksourceview-3.14.3:3.0[introspection?]
-	>=dev-libs/libpeas-1.7.0[gtk]
-
-	gnome-base/gsettings-desktop-schemas
-	gnome-base/gvfs
-
-	x11-libs/libX11
-
-	net-libs/libsoup:2.4
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-libs/gobject-introspection-0.9.3
-		>=x11-libs/gtk+-3:3[introspection]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}]
-		dev-libs/libpeas[${PYTHON_USEDEP}] )
-	spell? (
-		>=app-text/enchant-1.2:=
-		>=app-text/iso-codes-0.35 )
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/gnome-icon-theme-symbolic
-"
-DEPEND="${COMMON_DEPEND}
-	${vala_depend}
-	app-text/docbook-xml-dtd:4.1.2
-	>=app-text/scrollkeeper-0.3.11
-	dev-libs/libxml2:2
-	>=dev-util/gtk-doc-am-1
-	>=dev-util/intltool-0.50.1
-	>=sys-devel/gettext-0.18
-	virtual/pkgconfig
-"
-# yelp-tools, gnome-common needed to eautoreconf
-
-pkg_setup() {
-	use python && [[ ${MERGE_TYPE} != binary ]] && python_setup
-}
-
-src_prepare() {
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
-
-	gnome2_src_configure \
-		--disable-deprecations \
-		--enable-updater \
-		--enable-gvfs-metadata \
-		$(use_enable introspection) \
-		$(use_enable spell) \
-		$(use_enable python) \
-		$(use_enable vala) \
-		ITSTOOL=$(type -P true)
-}
-
-src_test() {
-	# FIXME: this should be handled at eclass level
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-
-	unset DBUS_SESSION_BUS_ADDRESS
-	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
-}
-
-src_install() {
-	local args=()
-	# manually set pyoverridesdir due to bug #524018 and AM_PATH_PYTHON limitations
-	use python && args+=( pyoverridesdir="$(python_get_sitedir)/gi/overrides" )
-
-	gnome2_src_install "${args[@]}"
-}

app-editors/gedit/gedit-3.16.4.ebuild

@@ -42,7 +42,7 @@ COMMON_DEPEND="
 
 	net-libs/libsoup:2.4
 
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
 	python? (
 		${PYTHON_DEPS}
 		dev-python/pycairo[${PYTHON_USEDEP}]
@@ -62,6 +62,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-libs/libxml2:2
 	>=dev-util/gtk-doc-am-1
 	>=dev-util/intltool-0.50.1
+	dev-util/itstool
 	>=sys-devel/gettext-0.18
 	virtual/pkgconfig
 "
@@ -86,8 +87,7 @@ src_configure() {
 		$(use_enable introspection) \
 		$(use_enable spell) \
 		$(use_enable python) \
-		$(use_enable vala) \
+		$(use_enable vala)
-		ITSTOOL=$(type -P true)
 }
 
 src_test() {

app-editors/retext/metadata.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
@@ -12,5 +12,6 @@
   <upstream>
     <remote-id type="sourceforge">retext</remote-id>
     <remote-id type="github">retext-project/retext</remote-id>
+    <remote-id type="pypi">ReText</remote-id>
   </upstream>
 </pkgmetadata>

app-emacs/doctest-mode/metadata.xml

@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>emacs</herd>
+	<herd>emacs</herd>
+	<upstream>
+		<remote-id type="sourceforge">python-mode.svn</remote-id>
+	</upstream>
 </pkgmetadata>

app-emacs/mmm-mode/metadata.xml

@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>emacs</herd>
+  <herd>emacs</herd>
-<upstream>
+  <upstream>
-  <remote-id type="sourceforge">mmm-mode</remote-id>
+    <remote-id type="sourceforge">mmm-mode</remote-id>
-</upstream>
+    <remote-id type="github">purcell/mmm-mode</remote-id>
+  </upstream>
 </pkgmetadata>

app-i18n/imsettings/metadata.xml

@@ -1,10 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+  <herd>cjk</herd>
-<use>
+  <use>
-  <flag name='xfconf'>Enable integration in the Xfce desktop environment with <pkg>xfce-base/xfconf</pkg></flag>
+    <flag name="xfconf">Enable integration in the Xfce desktop environment with <pkg>xfce-base/xfconf</pkg></flag>
-  <flag name='gconf'>Enable GConf support</flag>
+    <flag name="gconf">Enable GConf support</flag>
-  <flag name='gtk3'>Enable support for <pkg>x11-libs/gtk+</pkg>:3</flag>
+    <flag name="gtk3">Enable support for <pkg>x11-libs/gtk+</pkg>:3</flag>
-</use>
+  </use>
+  <upstream>
+    <remote-id type="bitbucket">tagoh/imsettings</remote-id>
+  </upstream>
 </pkgmetadata>

app-i18n/transifex-client/metadata.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">transifex-client</remote-id>
+		<remote-id type="github">transifex/transifex-client</remote-id>
 	</upstream>
 </pkgmetadata>

app-leechcraft/liblaretz/metadata.xml

@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>leechcraft</herd>
+	<upstream>
+		<remote-id type="github">0xd34df00d/laretz</remote-id>
+	</upstream>
 </pkgmetadata>

app-misc/dateutils/metadata.xml

@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
 		<email>radhermit@gentoo.org</email>
 		<name>Tim Harder</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="bitbucket">hroptatyr/dateutils</remote-id>
+	</upstream>
 </pkgmetadata>

app-misc/golly/golly-2.7-r1.ebuild

@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WX_GTK_VER=3.0
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1 gnome2-utils wxwidgets
+
+DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
+HOMEPAGE="http://golly.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-lang/perl
+	sys-libs/zlib
+	x11-libs/wxGTK:${WX_GTK_VER}[X]"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${P}-src
+ECONF_SOURCE=gui-wx/configure
+
+src_configure() {
+	econf --with-perl-shlib="libperl.so"
+}
+
+src_install() {
+	emake docdir= DESTDIR="${D}" install
+	dodoc docs/ReadMe.html
+	newicon --size 32 gui-wx/icons/appicon.xpm ${PN}.xpm
+	make_desktop_entry ${PN} "Golly" ${PN} "Science"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}

app-misc/granule/granule-1.4.0-r1.ebuild

@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="A flashcard program that implements Leitner cardfile methodology"
+HOMEPAGE="http://granule.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-7.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-cpp/gtkmm-2.4.1:2.4
+	>=dev-cpp/libassa-3.5.0
+	x11-libs/gtk+:2
+	dev-cpp/glibmm:2
+	>=dev-libs/libsigc++-2.0
+	x11-libs/pango
+	dev-libs/glib:2
+	dev-libs/libxml2"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/intltool
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${P}-7"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fix-template-with-permissive.patch
+	sed -i -e "s:Application;::" \
+		-i -e "/^Icon/s:\.png::" granule.desktop.in || die
+}

app-misc/sleepyhead/metadata.xml

@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+	<maintainer>
-	<email>rich0@gentoo.org</email>
+		<email>rich0@gentoo.org</email>
-</maintainer>
+	</maintainer>
-<longdescription>QT-based application used to analyze data from various CPAP machines.</longdescription>
+	<longdescription>QT-based application used to analyze data from various CPAP machines.</longdescription>
+	<upstream>
+		<remote-id type="github">rich0/rich0-sleepyhead</remote-id>
+	</upstream>
 </pkgmetadata>

app-misc/subsurface/metadata.xml

@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
     <email>me@bearsh.org</email>
     <name>Martin Gysel</name>
-    <description>Proxy maintainer. Assign bugs to him.</description>    
+    <description>Proxy maintainer. Assign bugs to him.</description>
   </maintainer>
   <maintainer>
     <email>bauman.aaron@gmail.com</email>
@@ -21,4 +21,7 @@
     <flag name="linguas_gsw">Language support for gsw.</flag>
     <flag name="linguas_hr_HR">Language support for hr_HR.</flag>
   </use>
+  <upstream>
+    <remote-id type="bitbucket">bearsh/bearshlay</remote-id>
+  </upstream>
 </pkgmetadata>

app-misc/tdfsb/files/tdfsb-0.0.10-format-security.patch

@@ -0,0 +1,26 @@
+diff --git a/tdfsb.c b/tdfsb.c
+index 5f6b233..a1af5a1 100644
+--- a/tdfsb.c
++++ b/tdfsb.c
+@@ -2436,7 +2436,7 @@ int speckey(int key)
+ 			    if(TDFSB_CSE_FLAG)
+ 				snprintf(TDFSB_CES_TEMP,4096,TDFSB_CUSTOM_EXECUTE_STRING,fullpath);
+ 			    else
+-	    			snprintf(TDFSB_CES_TEMP,4096,TDFSB_CUSTOM_EXECUTE_STRING);
++	    			snprintf(TDFSB_CES_TEMP,4096,"%s", TDFSB_CUSTOM_EXECUTE_STRING);
+ 			}
+ 			system(TDFSB_CES_TEMP);
+ 			printf("EXECUTE COMMAND: %s\n",TDFSB_CES_TEMP);
+@@ -2732,9 +2732,9 @@ int keyboard (unsigned char key)
+ 
+                 else if (key==TDFSB_KC_HELP)
+                         {       TDFSB_SHOW_HELP = 1-TDFSB_SHOW_HELP;
+-                                if (TDFSB_SHOW_HELP)    {       printf("\n=======================================\n");
+-                                                                printf(help_str);
+-                                                                printf("=======================================\n\n");
++                                if (TDFSB_SHOW_HELP)    {       printf("%s", "\n=======================================\n");
++                                                                printf("%s", help_str);
++                                                                printf("%s", "=======================================\n\n");
+                                                         }
+                         }
+ 

app-misc/tdfsb/tdfsb-0.0.10-r1.ebuild

@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="SDL based graphical file browser"
+HOMEPAGE="http://www.determinate.net/webdata/seg/tdfsb.html"
+SRC_URI="http://www.determinate.net/webdata/data/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="media-libs/freeglut
+	media-libs/sdl-image
+	media-libs/smpeg
+	virtual/glu
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXmu"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-asneeded.patch \
+		"${FILESDIR}"/${P}-debugging.patch \
+		"${FILESDIR}"/${P}-format-security.patch
+
+	sed -i -e "s:-O2:${CFLAGS} ${LDFLAGS}:" \
+		-e "s:gcc:$(tc-getCC):" "${S}"/compile.sh || die
+}
+
+src_compile() {
+	./compile.sh || die "compile failed"
+}
+
+src_install() {
+	dobin tdfsb
+	dodoc ChangeLog README
+}

app-misc/tdfsb/tdfsb-0.0.10.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,7 +17,12 @@ IUSE=""
 
 DEPEND="media-libs/smpeg
 	media-libs/sdl-image
-	media-libs/freeglut"
+	media-libs/freeglut
+	virtual/glu
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXmu"
 RDEPEND="${DEPEND}"
 
 src_prepare() {

app-misc/tmux/metadata.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>shell-tools</herd>
@@ -12,4 +12,7 @@
 		tmux is intended to be a simple, modern, BSD-licensed alternative to
 		programs such as <pkg>app-misc/screen</pkg>.
 	</longdescription>
+  <upstream>
+    <remote-id type="github">tmux/tmux</remote-id>
+  </upstream>
 </pkgmetadata>

app-mobilephone/freesmee/metadata.xml

@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
 		<email>ago@gentoo.org</email>
 		<name>Agostino Sarubbo</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">freesmee/freesmee-desktop</remote-id>
+	</upstream>
 </pkgmetadata>

app-office/gnucash/Manifest

@@ -1,2 +1,2 @@
-DIST gnucash-2.6.6.tar.bz2 13303707 SHA256 2337c791511ec35ca1ab207bac5f80dd5764df6029adf46a15154df370c97180 SHA512 bfb6f0e444463bd69f7e31f1dc8ff0ea9ba1c103c5d7d0a7a985c765ca17680c9d821bfe39474e2c9d71b655aeba78c1ec6f97f7a8ce8731cfdc335b683e830f WHIRLPOOL 2d917c0ab2f6756ed5205826b881467366b92d7cd1365b4d2531a8432e71fec46f5323fcb017647317cd7788e044fa4601f5179cfef4d65ed86e247eb126cd35
 DIST gnucash-2.6.7.tar.bz2 13529748 SHA256 6c15b12eeddc095d6926d9ea84d885c20b8f52781602c15aa3f672a1f7e2beef SHA512 a5711d5d6b89e9c44a28b9733dd185ed9afbe8d2c719675ced9d3e56ecdb03b62313faa5fee42cff70869baf4a3c29d4f69abc54967e46c3aa7ad766fc5a489d WHIRLPOOL b6aff7d48557a4619bfe27c2088ede6c3d2e6820947f457d2db42bc763d5dc24011afd28eb94e66f7a6f5405f2e44f03ae8a43e2fe7679502ea38ad2bee0e36a
+DIST gnucash-2.6.9.tar.bz2 13230536 SHA256 cdaa61b393133e03bccce3d2740bb358d6bf590de16dd19c790c983d032d8247 SHA512 cf2846c840055c8415183028101c03a2320ef16665961e6819c4ae3a37b486b5b1e6c62adc9f7173e72c9aa68bc4c29aa35602f83639fd5cc1936a3064bf2806 WHIRLPOOL c3c5669f6214c6c47a4b51b5727bdca6247d606f376f02b9cd7e78459ad7c3fbbb7b11aa05dd3d945a192eb593e8981ad4faa8051f8257256f82cebf7d255e0d

app-office/gnucash/gnucash-2.6.9.ebuild

@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="chipcard debug +doc gnome-keyring hbci mysql ofx postgres python quotes sqlite"
 
 # FIXME: rdepend on dev-libs/qof when upstream fix their mess (see configure.ac)

app-office/gnumeric/Manifest

@@ -1,2 +1,2 @@
-DIST gnumeric-1.12.22.tar.xz 18541384 SHA256 3908cfd6520b599eefefe222aadeaa5126394b54d9a9a7f5e0f938eb674dcf47 SHA512 04accd723db1b88fab80c93234f584f99138ae9c04fe6809cac59d5d4be9f4c105c288f6607ac22f019e3388ad821461e2423405353a42d3936c067219683390 WHIRLPOOL e7a6270ec7e72f4d2c75bcef984b4db7fa3aea8f4fff29d34e8b949dfac354e855af23d02e7a316b5db744b883c72e3056b196c8c1af734a4f03686691cf22ba
 DIST gnumeric-1.12.23.tar.xz 18515672 SHA256 00474cbf1e70f62062974d0beb5f65ebc45d1047bc8fd0a1133e3d9725e19551 SHA512 58f7667196cef453a24689640d21f7de20b052502fcd8f18c9abbe3ca6210d183e0bd53080ba0d6686f145400f404e75f4ed691c90801c5e2cb9f0168420cca0 WHIRLPOOL 7717082ce618adc32f20146aa86b355cbc235e8643fb7729d96c35230035cdebdf8b3aca6ba04fc53e47ce8124efe899129763384bd2172a27087482abedb30a
+DIST gnumeric-1.12.24.tar.xz 18526768 SHA256 c59d5271b27366008bccb4d53ad8333da36d837003a018892f2da325c1449551 SHA512 71bed41a1b50ed57e9ab4993df8d963cb14a9f6f3fbf87d81c30f71359a23c4092daab00079936e587a118041a303c1c563bcd3f38f2aaea78a9ae5593dcdd4b WHIRLPOOL 648930de4d37d25db471fe9b639b91a64a1d1ebf1a50291ef2c79a23d4082b7249e6197467e86ce752e96699b38a7c3d86730cead7d0438c7e6605521b61e7b8

app-office/gnumeric/gnumeric-1.12.24.ebuild

@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gnumeric.org/"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 IUSE="+introspection libgda perl python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

app-office/unoconv/metadata.xml

@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>office</herd>
   <maintainer>
     <email>graaff@gentoo.org</email>
   </maintainer>
+  <upstream>
+    <remote-id type="github">dagwieers/unoconv</remote-id>
+  </upstream>
 </pkgmetadata>

app-portage/esearch/esearch-1.3-r1.ebuild

@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="linguas_fr linguas_it"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 
 DEPEND="sys-apps/portage"
 RDEPEND="${DEPEND}"

app-portage/layman/layman-9999.ebuild

@@ -5,7 +5,7 @@
 EAPI="5"
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-PYTHON_REQ_USE="xml(+)"
+PYTHON_REQ_USE="xml(+),sqlite?"
 
 inherit eutils distutils-r1 git-2 linux-info prefix
 
@@ -17,10 +17,11 @@ EGIT_REPO_URI="git://anongit.gentoo.org/proj/layman.git"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="bazaar cvs darcs +git gpg g-sorcery mercurial squashfs subversion sync-plugin-portage test"
+IUSE="bazaar cvs darcs +git gpg g-sorcery mercurial sqlite squashfs subversion sync-plugin-portage test"
 
 DEPEND="test? ( dev-vcs/subversion )
-	app-text/asciidoc"
+	app-text/asciidoc
+	"
 
 RDEPEND="
 	bazaar? ( dev-vcs/bzr )

app-shells/pdmenu/Manifest

@@ -1,2 +1 @@
-DIST pdmenu_1.3.2.tar.gz 160083 SHA256 7a7b68d50851a4f0f42467d9c5ee74bdb42591e35687f97ad3d2c915f9607d90 SHA512 9359dcf0d058349b502f0c39509d3c51658d80062f2c65c52010255ba97ffd1a3e5bf5cf4d6feffff6865ff1a26440a7523a447e9e4a2a0760cafc6a3109e945 WHIRLPOOL f92187058f4d057149c26c26b2ddb1c215c63690e4412d167b82da0ba77c81df81c9f0cdcc171eec9a4029ba188db38592dcc5ade53fefd9fc084febb7533ed6
 DIST pdmenu_1.3.4.tar.gz 161002 SHA256 302aa81b8868133ff5a0f3e3e897f71d425bc628c0d7439addb623f12c277bea SHA512 2540b3040a799f4682de1014f8da750501000cef7080ea24b066a7e44971e33452a25e3885849bc47a156727641c4acb8d1268d3c16a2aab2cb37d510f50f3ad WHIRLPOOL ab5a0566b470d8db84b1da6308961b696d7a9490d8f30471c731d1537bbe0132a2d9c3a610ead61f55e5c8656c1d0021f5de40a4ae526a69895104dab48e0c86

app-shells/pdmenu/files/pdmenu-impl-dec.patch

@@ -1,16 +0,0 @@
- src/actions.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/src/actions.c b/src/actions.c
-index d42a63a..1f5a0d1 100644
---- a/src/actions.c
-+++ b/src/actions.c
-@@ -30,6 +30,8 @@
- #include <libintl.h>
- #define _(String) gettext (String)
- 
-+#include <ctype.h>
-+
- /* Handle a control c by either exiting pdmenu or doing nothing. */
- void Handle_Ctrl_C() {
-   if (Q_Exits) {

app-shells/pdmenu/pdmenu-1.3.2-r1.ebuild

@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="A simple console menu program"
-HOMEPAGE="http://joeyh.name/code/pdmenu/"
-SRC_URI="mirror://debian/pool/main/p/pdmenu/pdmenu_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips x86"
-IUSE="nls gpm examples"
-
-DEPEND="
-	sys-libs/slang
-	gpm? ( sys-libs/gpm )
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${PN}
-
-RESTRICT="test"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-impl-dec.patch
-	sed \
-		-e 's:\(-o pdmenu\):$(LDFLAGS) \1:g' \
-		-i Makefile || die
-}
-
-src_configure() {
-	econf \
-		$(use_with gpm) \
-		$(use_enable nls)
-}
-
-src_install() {
-	dobin pdmenu
-
-	dodoc doc/ANNOUNCE doc/BUGS doc/TODO
-
-	use examples && dodoc -r examples
-
-	mv doc/pdmenu.man doc/pdmenu.1
-	mv doc/pdmenurc.man doc/pdmenurc.5
-	doman doc/pdmenu.1 doc/pdmenurc.5
-
-}
-
-pkg_postinst() {
-	ewarn "Note this part from man page: Security warning! Any exec command"
-	ewarn "that uses the 'edit' flag will be a security hole. The user need"
-	ewarn "only to enter text with a ';' in it, and they can run an"
-	ewarn "arbitrary command after the semicolon!"
-}

app-shells/pdmenu/pdmenu-1.3.4.ebuild

@@ -8,11 +8,11 @@ inherit eutils
 
 DESCRIPTION="A simple console menu program"
 HOMEPAGE="http://joeyh.name/code/pdmenu/"
-SRC_URI="mirror://debian/pool/main/p/pdmenu/pdmenu_${PV}.tar.gz"
+SRC_URI="mirror://debian/pool/main/p/${PN}/pdmenu_${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
+KEYWORDS="amd64 mips x86"
 IUSE="nls gpm examples"
 
 DEPEND="
@@ -38,15 +38,12 @@ src_configure() {
 }
 
 src_install() {
-	dobin pdmenu
+	dobin "${PN}"
-
 	dodoc doc/ANNOUNCE doc/BUGS doc/TODO
-
 	use examples && dodoc -r examples
-
+	mv "doc/${PN}.man" "doc/${PN}.1" || die
-	mv doc/pdmenu.man doc/pdmenu.1 || die
+	mv "doc/${PN}rc.man" "doc/${PN}rc.5" || die
-	mv doc/pdmenurc.man doc/pdmenurc.5 || die
+	doman "doc/${PN}.1" "doc/${PN}rc.5"
-	doman doc/pdmenu.1 doc/pdmenurc.5
 
 }
 

app-shells/posh/Manifest

@@ -1,3 +1 @@
-DIST posh_0.10.2.tar.gz 469338 SHA256 6ee7e8e2d181953efbcd991cc0e66c98c7d2a0511f1697889e239a93d625f0a1 SHA512 4abde6415eaf199f5a7998e8a8fc6ed0dd07fb2ec95724bc01ba18f01f0d9b1a0af04d6ea59e302407f9a32f7ef7555e24f48005f795390bda3ecd01e55b5878 WHIRLPOOL 208a9e97bdf3846abe2285eb21c40be0f004d4e2a72785cbb22f12830f681268a303ba0d6f3baf54a7a9f6a3933ead2cfda80e7b3fefeb9a6e7f03d39d7ee80f
-DIST posh_0.11.tar.gz 469798 SHA256 0d9b54db168e6fc7f93676d188e460988017868ffac5987b76d4fb18c2008f6f SHA512 2d4319600f4356e0b661403648c62078e87fbac0ac418a4985ebfcf6277bd26a8dd8462f61676194cd547f3c9aa31e1713fc1b562d63466511dbf8845d7a06aa WHIRLPOOL f546f9ff07daba992d9ac897ac77fdbfbca92a393640b1226c01c271cdbbb57a4d0015c5d5a463a6b1505ec2cd168f8ed2bca8a75be9189de1c27e295558500e
 DIST posh_0.12.tar.gz 469680 SHA256 9206b67005cf357404b3f3021c2d7c7bbd50756050512dececb9ed836435b048 SHA512 bb98d2fa009b5ccd666103378dd30da5649baf830d4e3124575f813b98b13275bde46e03bb737c75b37c82f655b3f17e9a5decd29b75d20678e78a4d7e3abf00 WHIRLPOOL ffd03e1537aa8e68545c532fb8c27fc9702ab16157efce7ef5c83b6f70fbe1a807e4759b85525036ae0c26f56b595ccf95d9cffb8a96b4ef8e5a8ec4b50c60e6

app-shells/posh/files/posh-glibc-2.16.patch

@@ -1,19 +0,0 @@
-Description: explicitly include sys/resource.h, for eglibc 2.16
- sys/resource.h is no longer included by sys/wait.h
- http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=d94a4670800de6e8f088b8630ad5142866127980
-Author: Stefano Rivera <stefanor@ubuntu.com>
-Last-Updated: 2012-11-07
-
---- a/ksh_wait.h
-+++ b/ksh_wait.h
-@@ -5,6 +5,10 @@
- # include <sys/wait.h>
- #endif
- 
-+#ifdef HAVE_SYS_RESOURCE_H
-+# include <sys/resource.h>
-+#endif
-+
- #ifndef POSIX_SYS_WAIT
- /* Get rid of system macros (which probably use union wait) */
- # undef WIFCORED

app-shells/posh/posh-0.10.2.ebuild

@@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-inherit autotools-utils
-
-DESCRIPTION="Reimplementation of Bourne shell based on pdksh"
-HOMEPAGE="http://packages.debian.org/posh"
-SRC_URI="mirror://debian/pool/main/p/posh/${P/-/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RESTRICT=test
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-glibc-2.16.patch
-)
-
-src_configure() {
-	myeconfargs=(
-		--exec-prefix=/
-	)
-	autotools-utils_src_configure
-}

app-shells/posh/posh-0.11.ebuild

@@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-inherit autotools-utils
-
-DESCRIPTION="Reimplementation of Bourne shell based on pdksh"
-HOMEPAGE="http://packages.debian.org/posh"
-SRC_URI="mirror://debian/pool/main/p/posh/${P/-/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RESTRICT=test
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-glibc-2.16.patch
-)
-
-src_configure() {
-	myeconfargs=(
-		--exec-prefix=/
-	)
-	autotools-utils_src_configure
-}

app-shells/posh/posh-0.12.ebuild

@@ -11,14 +11,10 @@ SRC_URI="mirror://debian/pool/main/p/posh/${P/-/_}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-RESTRICT=test
+RESTRICT="test"
-
-#PATCHES=(
-#	"${FILESDIR}"/${PN}-glibc-2.16.patch
-#)
 
 src_configure() {
 	myeconfargs=(

app-text/calibre/metadata.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
@@ -10,4 +10,7 @@
   <maintainer>
     <email>yngwin@gentoo.org</email>
   </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">calibre</remote-id>
+  </upstream>
 </pkgmetadata>

app-text/liblangtag/metadata.xml

@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>office</herd>
   <use>
     <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
   </use>
+  <upstream>
+    <remote-id type="bitbucket">tagoh/liblangtag</remote-id>
+  </upstream>
 </pkgmetadata>

app-text/lodgeit/metadata.xml

@@ -1,12 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
     <email>qnikst@gentoo.org</email>
   </maintainer>
   <use>
-    <flag name='vim'>
+    <flag name="vim">
       Install a vim plugin allowing to paste and download from within vim
     </flag>
   </use>
+  <upstream>
+    <remote-id type="bitbucket">skrattaren/lodgeit-script-gentoo</remote-id>
+  </upstream>
 </pkgmetadata>

app-text/pdf2djvu/metadata.xml

@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>printing</herd>
   <use>
-    <flag name='graphicsmagick'>Enable <pkg>media-gfx/graphicsmagick</pkg> support</flag>
+    <flag name="graphicsmagick">Enable <pkg>media-gfx/graphicsmagick</pkg> support</flag>
   </use>
+  <upstream>
+    <remote-id type="bitbucket">jwilk/pdf2djvu</remote-id>
+  </upstream>
 </pkgmetadata>

app-text/poppler/Manifest

@@ -1,5 +1,3 @@
 DIST poppler-0.32.0.tar.xz 1609624 SHA256 4963e31ba5e17530a87b16588e22928bc044e8d28d02303dded981bff6725b98 SHA512 f68355a0242ce467b9d7d7f47cc0c3b08f015c38b147eaeddc392e693239bce2b1b3832bd5e5411f25edddab6d3cea8ca0be151372a86963610a4eae3ea50eee WHIRLPOOL bb56d497f435ccb78dfeb0125ca5d003d08769fe74e11da940f6f5399194698e1908c22d815129e6d1f1a7a9855a68ad7043a3bdd4779045fcf64dd97ade3d22
-DIST poppler-0.33.0.tar.xz 1613060 SHA256 a5fa6d7f7dc5382b48caca82b147c54bdffda02698611af76db5326ba64995a6 SHA512 8d3e05d9663df56d75018dc5c72173ec8b2d3290ce0118dc3a6ea149499dc8c3a0b70963630b1b3ca3067761886539a04310f168de180d3e56a08ac6483721d4 WHIRLPOOL c520831f4677ecebe24e2c1fefd28e723ced82730a73a006c3ba1fb5e598d822f0758c7063586c2b90602b20c39e45bd93c409bc880eddf1d1c75ecac27acb4b
-DIST poppler-0.34.0.tar.xz 1615264 SHA256 1ba4ba9a2f9eb1e62ee6d736f4d82be4fc5f6dd177dc2b03febbe2ef2e515cb0 SHA512 5b027da7a35b07d52b8d06c7756e430346a8954add1ad89d30f383a586c4939d9b899236aa0623d894a96e779af2cb89e55ad89e50f3ed99d7489578a48d5a15 WHIRLPOOL a4f6c582ff03b06d69d25cbcf448b000724d5c35816ebe7b730dca1ae62bfe647b975ddd4a2f352b5ad149eb63d7d9e93670e5bfd359f5f4be150ab57631aec5
-DIST poppler-0.35.0.tar.xz 1618844 SHA256 e86755b1a4df6efe39d84f581c11bcb0e34976166a671a7b700c28ebaa3e2189 SHA512 7d16dc42eab616889401ed281190ad32d403729cb06860e91f70c0e8c9134cf6104c46bcd2b35ebc98ecd72c4d767f8d49f0988ebb869eb120f013ec398b55f0 WHIRLPOOL e5087140afeec3022df0f106cb9085c3b9f889f66a448c31e11ca85c7cdd36edee9a867c40660c3a32774b7fcc3e885d84e16be484448c4694bb30b9d52ecadd
 DIST poppler-0.36.0.tar.xz 1629984 SHA256 93cc067b23c4ef7421380d3e8bd7c940b2027668446750787d7c1cb42720248e SHA512 36f7ea892d05c73d2862b6d5a29753cfe6823f54f8449e010b9960b59d9c698ba4f239625e8dbf41a235ae61203d8b445f775f5622b38c6d24328870e77371c5 WHIRLPOOL 4111ab5146a65ef4485ff010b9056dfd6573c9d72af3d07c5a16bde49c25ded5c05e26285d672e33a06b05845fdfef240170359ebe4547191a7ca695a91e3e90
+DIST poppler-0.37.0.tar.xz 1636496 SHA256 b89f9c5eae3bbb1046b0f767714afd75eca102a0406a3a30856778d42a685bee SHA512 9cdff2da9d13b8db25a24e8703ab411da1caa6545cd25b6153ce019c185cd90eda8dbb59a5c320ea6e8ec1896b0197987acc72ba233d6ece4e212a2132a6b087 WHIRLPOOL 8dda998aac39d86caf215a4c9f3019918282e800d37a29e8f686527e6f2eba6177dbd70968254085008b7a86e34327cbb80b01473a52bf941ad9ad3511fe2341

app-text/poppler/poppler-0.33.0-r1.ebuild

@@ -1,122 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils toolchain-funcs
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
-	SLOT="0/9999"
-else
-	SRC_URI="http://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/52"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
-fi
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="http://poppler.freedesktop.org/"
-
-LICENSE="GPL-2"
-IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms png qt4 qt5 tiff +utils"
-
-# No test data provided
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=media-libs/fontconfig-2.6.0
-	>=media-libs/freetype-2.3.9
-	sys-libs/zlib
-	cairo? (
-		dev-libs/glib:2
-		>=x11-libs/cairo-1.10.0
-		introspection? ( >=dev-libs/gobject-introspection-1.32.1 )
-	)
-	curl? ( net-misc/curl )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lcms? ( media-libs/lcms:2 )
-	png? ( media-libs/libpng:0= )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtxml:5
-	)
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	cjk? ( >=app-text/poppler-data-0.4.4 )
-"
-
-DOCS=(AUTHORS NEWS README README-XPDF TODO)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch"
-	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
-	"${FILESDIR}/${PN}-0.28.1-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Clang doesn't grok this flag, the configure nicely tests that, but
-	# cmake just uses it, so remove it if we use clang
-	if [[ ${CC} == clang ]] ; then
-		sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT4_TESTS=OFF
-		-DBUILD_QT5_TESTS=OFF
-		-DBUILD_CPP_TESTS=OFF
-		-DENABLE_SPLASH=ON
-		-DENABLE_ZLIB=ON
-		-DENABLE_XPDF_HEADERS=ON
-		$(cmake-utils_use_enable curl LIBCURL)
-		$(cmake-utils_use_enable cxx CPP)
-		$(cmake-utils_use_enable utils)
-		$(cmake-utils_use_with cairo)
-		$(cmake-utils_use_with introspection GObjectIntrospection)
-		$(cmake-utils_use_with jpeg)
-		$(cmake-utils_use_with png)
-		$(cmake-utils_use_with qt4)
-		$(cmake-utils_use_find_package qt5 Qt5Core)
-		$(cmake-utils_use_with tiff)
-	)
-	if use jpeg2k; then
-		mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2)
-	else
-		mycmakeargs+=(-DENABLE_LIBOPENJPEG=)
-	fi
-	if use lcms; then
-		mycmakeargs+=(-DENABLE_CMS=lcms2)
-	else
-		mycmakeargs+=(-DENABLE_CMS=)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# live version doesn't provide html documentation
-	if use cairo && use doc && [[ ${PV} != 9999 ]]; then
-		# For now install gtk-doc there
-		insinto /usr/share/gtk-doc/html/poppler
-		doins -r "${S}"/glib/reference/html/*
-	fi
-}

app-text/poppler/poppler-0.35.0.ebuild

@@ -1,122 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils toolchain-funcs
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
-	SLOT="0/9999"
-else
-	SRC_URI="http://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/54"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
-fi
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="http://poppler.freedesktop.org/"
-
-LICENSE="GPL-2"
-IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms png qt4 qt5 tiff +utils"
-
-# No test data provided
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=media-libs/fontconfig-2.6.0
-	>=media-libs/freetype-2.3.9
-	sys-libs/zlib
-	cairo? (
-		dev-libs/glib:2
-		>=x11-libs/cairo-1.10.0
-		introspection? ( >=dev-libs/gobject-introspection-1.32.1 )
-	)
-	curl? ( net-misc/curl )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lcms? ( media-libs/lcms:2 )
-	png? ( media-libs/libpng:0= )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtxml:5
-	)
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	cjk? ( >=app-text/poppler-data-0.4.4 )
-"
-
-DOCS=(AUTHORS NEWS README README-XPDF TODO)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch"
-	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
-	"${FILESDIR}/${PN}-0.28.1-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Clang doesn't grok this flag, the configure nicely tests that, but
-	# cmake just uses it, so remove it if we use clang
-	if [[ ${CC} == clang ]] ; then
-		sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT4_TESTS=OFF
-		-DBUILD_QT5_TESTS=OFF
-		-DBUILD_CPP_TESTS=OFF
-		-DENABLE_SPLASH=ON
-		-DENABLE_ZLIB=ON
-		-DENABLE_XPDF_HEADERS=ON
-		$(cmake-utils_use_enable curl LIBCURL)
-		$(cmake-utils_use_enable cxx CPP)
-		$(cmake-utils_use_enable utils)
-		$(cmake-utils_use_with cairo)
-		$(cmake-utils_use_with introspection GObjectIntrospection)
-		$(cmake-utils_use_with jpeg)
-		$(cmake-utils_use_with png)
-		$(cmake-utils_use_with qt4)
-		$(cmake-utils_use_find_package qt5 Qt5Core)
-		$(cmake-utils_use_with tiff)
-	)
-	if use jpeg2k; then
-		mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2)
-	else
-		mycmakeargs+=(-DENABLE_LIBOPENJPEG=)
-	fi
-	if use lcms; then
-		mycmakeargs+=(-DENABLE_CMS=lcms2)
-	else
-		mycmakeargs+=(-DENABLE_CMS=)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# live version doesn't provide html documentation
-	if use cairo && use doc && [[ ${PV} != 9999 ]]; then
-		# For now install gtk-doc there
-		insinto /usr/share/gtk-doc/html/poppler
-		doins -r "${S}"/glib/reference/html/*
-	fi
-}

app-text/poppler/poppler-0.37.0.ebuild

@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]] ; then
 else
 	SRC_URI="http://poppler.freedesktop.org/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/53"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/56"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"

app-text/xchm/files/xchm-1.23-wx3.0-compat.patch

@@ -0,0 +1,32 @@
+Description: Fix code to compile with wxwidgets 3.0
+ Drops support for wx < 2.7, which is just not relevant now.  And in fact
+ configure.ac checks for at least 2.8.0.
+Author: Olly Betts <olly@survex.com>
+Last-Update: 2014-03-07
+
+--- xchm-1.23.orig/src/chmframe.cpp
++++ xchm-1.23/src/chmframe.cpp
+@@ -265,11 +265,7 @@ void CHMFrame::OnChangeFonts(wxCommandEv
+ 		enu.EnumerateFacenames();
+ 		_normalFonts = new wxArrayString;
+ 
+-#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7
+ 		*_normalFonts = enu.GetFacenames();
+-#else
+-		*_normalFonts = *enu.GetFacenames();
+-#endif
+ 		_normalFonts->Sort();
+ 	}
+ 
+@@ -278,11 +274,7 @@ void CHMFrame::OnChangeFonts(wxCommandEv
+ 		enu.EnumerateFacenames(wxFONTENCODING_SYSTEM, TRUE);
+ 		_fixedFonts = new wxArrayString;
+ 
+-#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7
+ 		*_fixedFonts = enu.GetFacenames();
+-#else
+-		*_fixedFonts = *enu.GetFacenames();
+-#endif
+ 		_fixedFonts->Sort();
+ 	}
+ 

app-text/xchm/xchm-1.23-r1.ebuild

@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+WX_GTK_VER="3.0"
+
+inherit eutils fdo-mime flag-o-matic wxwidgets
+
+DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files"
+HOMEPAGE="http://xchm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xchm/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE=""
+DEPEND=">=dev-libs/chmlib-0.36
+	x11-libs/wxGTK:${WX_GTK_VER}[X]"
+RDEPEND=${DEPEND}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-wx3.0-compat.patch
+
+	append-flags -Wno-unused-local-typedefs
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS README ChangeLog
+
+	cp "${D}"/usr/share/pixmaps/xchm-32.xpm "${D}"/usr/share/pixmaps/xchm.xpm
+	rm -f "${D}"/usr/share/pixmaps/xchm-*.xpm
+	rm -f "${D}"/usr/share/pixmaps/xchmdoc*.xpm
+
+	domenu "${FILESDIR}"/xchm.desktop
+	insinto /usr/share/mime/packages
+	doins "${FILESDIR}"/xchm.xml
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}

app-vim/cctree/metadata.xml

@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>vim</herd>
+	<upstream>
+		<remote-id type="github">vim-scripts/CCTree</remote-id>
+	</upstream>
 </pkgmetadata>

app-vim/colorv/metadata.xml

@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>vim</herd>
+	<upstream>
+		<remote-id type="github">vim-scripts/ColorV</remote-id>
+	</upstream>
 </pkgmetadata>

app-vim/neocomplcache/metadata.xml

@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>vim</herd>
+  <upstream>
+    <remote-id type="github">vim-scripts/neocomplcache</remote-id>
+  </upstream>
 </pkgmetadata>

app-vim/perl-support/metadata.xml

@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>vim</herd>
+	<upstream>
+		<remote-id type="github">vim-scripts/perl-support.vim</remote-id>
+	</upstream>
 </pkgmetadata>

app-vim/slimv/metadata.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>vim</herd>
@@ -19,4 +19,7 @@
 		The script also supports a number of other features provided by SLIME
 		including profiling, paredit mode, and hyperspec lookups.
 	</longdescription>
+	<upstream>
+		<remote-id type="bitbucket">kovisoft/slimv</remote-id>
+	</upstream>
 </pkgmetadata>

app-vim/vimclojure/metadata.xml

@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
 	<maintainer>
 		<email>monsieurp@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">vim-scripts/VimClojure</remote-id>
+	</upstream>
 </pkgmetadata>

app-vim/vimpress/metadata.xml

@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>vim</herd>
+	<upstream>
+		<remote-id type="github">vim-scripts/VimRepress</remote-id>
+	</upstream>
 </pkgmetadata>

dev-cpp/eigen/metadata.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>sci</herd>
@@ -10,4 +10,7 @@
 		OpenGL apps, spreadsheets and other office apps, etc. Eigen is dedicated to
 		providing optimal speed with GCC.
 	</longdescription>
+	<upstream>
+		<remote-id type="bitbucket">eigen/eigen</remote-id>
+	</upstream>
 </pkgmetadata>

dev-db/barman/metadata.xml

@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">downloads</remote-id>
+	</upstream>
 </pkgmetadata>

dev-db/mycli/metadata.xml

@@ -1,10 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<use>
+	<use>
-</use>
+	</use>
 	<maintainer>
 		<email>grknight@gentoo.org</email>
 		<name>Brian Evans</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">dbcli/mycli</remote-id>
+	</upstream>
 </pkgmetadata>

dev-db/mysql-connector-c++/mysql-connector-c++-1.1.6.ebuild

@@ -13,7 +13,7 @@ SRC_URI="mirror://mysql/Downloads/${URI_DIR}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm ~ppc ppc64 sparc x86"
 IUSE="debug examples gcov static-libs"
 
 DEPEND="virtual/libmysqlclient:=

dev-db/mysql-udf-ipv6/metadata.xml

@@ -1,7 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
 		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="bitbucket">watchmouse/mysql-udf-ipv6</remote-id>
+	</upstream>
 </pkgmetadata>

dev-embedded/sunxi-tools/metadata.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>embedded</herd>
@@ -6,4 +6,7 @@
 		<email>chainsaw@gentoo.org</email>
 		<name>Tony Vroon</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">linux-sunxi/sunxi-tools</remote-id>
+	</upstream>
 </pkgmetadata>

dev-games/aseprite/metadata.xml

@@ -11,4 +11,7 @@
     <flag name="memleak">Enable memory-leaks detector (only for developers)</flag>
     <flag name="static">Link against static version of C and C++ runtimes</flag>
   </use>
+  <upstream>
+    <remote-id type="github">aseprite/aseprite</remote-id>
+  </upstream>
 </pkgmetadata>

dev-games/ogre/metadata.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>games</herd>
@@ -72,19 +72,22 @@ Exporters
     * Wings3D (meshes)
     * VRML97 (meshes)
     * Maya (meshes)
-</longdescription>
+  </longdescription>
   <use>
     <flag name="boost">enable boost support</flag>
     <flag name="cg">NVIDIA toolkit plugin</flag>
     <flag name="double-precision">more precise calculations at the expense of speed</flag>
-	<flag name="freeimage">support images via freeimage</flag>
+    <flag name="freeimage">support images via freeimage</flag>
-	<flag name="gl3plus">Build OpenGL 3+ RenderSystem (EXPERIMENTAL)</flag>
+    <flag name="gl3plus">Build OpenGL 3+ RenderSystem (EXPERIMENTAL)</flag>
-	<flag name="gles2">build OpenGL ES 2.x RenderSystem</flag>
+    <flag name="gles2">build OpenGL ES 2.x RenderSystem</flag>
-	<flag name="gles3">Enable OpenGL ES 3.x Features</flag>
+    <flag name="gles3">Enable OpenGL ES 3.x Features</flag>
     <flag name="ois">pull in Object-oriented Input System library for samples</flag>
     <flag name="poco">when USE=threads, use poco for threading</flag>
     <flag name="tbb">when USE=threads, use tbb for threading</flag>
     <flag name="tools">build+install helper tools</flag>
     <flag name="zip">support zip archives</flag>
   </use>
+  <upstream>
+    <remote-id type="bitbucket">sinbad/ogre</remote-id>
+  </upstream>
 </pkgmetadata>

dev-haskell/deepseq/Manifest

@@ -1,3 +0,0 @@
-DIST deepseq-1.3.0.0.tar.gz 3901 SHA256 fee10dbfceda33220fb9869652530c32ab2888694ee628cc86d51ea35a0e537c SHA512 f845b483e7cfd37e63e0a4d8515a54c130a38e219dfe7f3f1a9af2ba0420603097d90985b992f5ff9af3bcbc6ae106f315b821be561c669374115597938cc9fb WHIRLPOOL 16b90220a23d8a1f820d6c41ec9c26c31acedeb331001436c3779a63afdfdbdb61122d38206f937a0be481c27ece452a2c0ea12a6ce51acbd4d095405aa10a0b
-DIST deepseq-1.3.0.1.tar.gz 3900 SHA256 9792d2aff7c65c1e3a9d720ba7fe109eb6aea50a51477ffafd2b5f9e8d9a1f19 SHA512 e04593845d9d1ec427a3448b9e5175e1c0842d55037cd05abd0cb7c3dbc5a5470a824f10c4e8f1fa8b6feae853ba9bdb0fe614e4c419c34298baf86c1f90b8d6 WHIRLPOOL 642336d1ba103a488746ca64871f49dda0602907b1c2b81d1c5dd8c15d01040160cc6fc7e9184a9cffe58065a199333a4d620b711594d981ce03c546e267e562
-DIST deepseq-1.3.0.2.tar.gz 4485 SHA256 779d65aae7d56765089aeb655d9fa26e6b59d626e42fe9e87644a312ca775626 SHA512 c85ba6616747883228813dec1f6d828b03174dbc45049592aa7596a6b4f15fb1aaa6613d2e73b5ff049ef35c66273e102b6dd5895f5e5abd8a1b25b70d9ff71b WHIRLPOOL d57ce527563744d78c2ba4f62de0efb548354abd6eeb7d82d8f496ad85bcb373ccf7e2d58ddac5e2812181164cf90b12be35e5dca017b58a8512a6c25266faeb

dev-haskell/deepseq/deepseq-1.3.0.0.ebuild

@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# ebuild generated by hackport 0.2.13
-
-EAPI="4"
-
-CABAL_FEATURES="lib profile haddock hscolour"
-inherit haskell-cabal versionator
-
-MY_P="${P/_pre*/}"
-
-DESCRIPTION="Deep evaluation of data structures"
-HOMEPAGE="http://hackage.haskell.org/package/deepseq"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.1"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-CABAL_CORE_LIB_GHC_PV="7.4.0.20111219 7.4.0.20120126 7.4.1 7.4.2"

dev-haskell/deepseq/deepseq-1.3.0.1.ebuild

@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_P="${P/_pre*/}"
-
-DESCRIPTION="Deep evaluation of data structures"
-HOMEPAGE="http://hackage.haskell.org/package/deepseq"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-CABAL_CORE_LIB_GHC_PV="7.6.* 7.7.20121101 7.7.20121213"
-
-src_prepare() {
-	cabal_chdeps \
-		'array      >= 0.1 && < 0.5' 'array      >= 0.1'
-}

dev-haskell/deepseq/deepseq-1.3.0.2.ebuild

@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Deep evaluation of data structures"
-HOMEPAGE="http://hackage.haskell.org/package/deepseq"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10.0.0
-"
-CABAL_CORE_LIB_GHC_PV="7.8.1 7.8.2 7.8.3 7.8.3.20141119 7.8.4 7.9.2014*"
-
-src_prepare() {
-	cabal_chdeps \
-		'base       >= 4.3 && < 4.8' 'base       >= 4.3'
-}

dev-haskell/deepseq/metadata.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>haskell</herd>
-	<longdescription>
-		This package provides methods for fully evaluating data structures
-		("deep evaluation"). Deep evaluation is often used for adding
-		strictness to a program, e.g. in order to force pending exceptions,
-		remove space leaks, or force lazy I/O to happen. It is also useful
-		in parallel programs, to ensure pending work does not migrate to the
-		wrong thread.
-	</longdescription>
-</pkgmetadata>

dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild

@@ -0,0 +1,105 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source test"
+
+# Register this as a split-ant task.
+WANT_SPLIT_ANT="true"
+
+# Don't rewrite examples, that's bad.
+JAVA_PKG_BSFIX_ALL="no"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+MY_PN="apache-ivy"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Ivy is a free java based dependency manager"
+HOMEPAGE="http://ant.apache.org/ivy"
+SRC_URI="mirror://apache/ant/ivy/${PV}/${MY_P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+
+# We cannot build tests yet as there is no org.apache.tools.ant.BuildFileTest packaged anywhere yet.
+RESTRICT="test"
+
+# SLOT to use for all bc dependencies.
+BC_SLOT="1.50"
+
+# There may be additional optional dependencies (commons-logging, commons-lang...)
+CDEPEND="dev-java/jsch:0
+	dev-java/bcpg:${BC_SLOT}
+	dev-java/ant-core:0
+	dev-java/bcpkix:${BC_SLOT}
+	dev-java/bcprov:${BC_SLOT}
+	dev-java/commons-vfs:0
+	dev-java/jakarta-oro:2.0
+	dev-java/commons-httpclient:3"
+
+DEPEND=">=virtual/jdk-1.6
+	test? (
+		dev-java/ant-junit:0
+	)
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+	# This stuff needs removing.
+	local CLEANUP=(
+		doc/reports
+		test/triggers
+		doc/configuration
+		test/repositories
+		test/java/org/apache/ivy/core/settings/custom-resolver.jar
+		src/example/chained-resolvers/settings/repository/test-1.0.jar
+	)
+
+	rm -rf "${CLEANUP[@]}" || die
+
+	java-ant_rewrite-classpath
+	mkdir lib || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_GENTOO_CLASSPATH="
+	jsch
+	bcpkix-${BC_SLOT}
+	ant-core
+	bcpg-${BC_SLOT}
+	commons-vfs
+	bcprov-${BC_SLOT}
+	jakarta-oro-2.0
+	commons-httpclient-3
+"
+
+EANT_BUILD_TARGET="/offline jar"
+
+EANT_EXTRA_ARGS="-Dbuild.version=${PV} -Dbundle.version=${PV}"
+
+src_test() {
+	java-pkg_jar-from --into lib junit
+	ANT_TASKS="ant-junit" eant "/offline test"
+}
+
+src_install() {
+	java-pkg_dojar build/artifact/jars/ivy.jar
+	java-pkg_register-ant-task
+
+	if use doc; then
+		java-pkg_dojavadoc build/doc/reports/api
+		java-pkg_dohtml -r doc
+	fi
+
+	use examples && java-pkg_doexamples src/example
+	use source && java-pkg_dosrc src/java/*
+}

dev-java/bcmail/bcmail-1.38-r5.ebuild

@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-jdk14-${PV/./}"
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1.38"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+CDEPEND="
+	dev-java/bcprov:${SLOT}
+	dev-java/junit:0
+	java-virtuals/jaf:0
+	dev-java/oracle-javamail:0
+"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_GENTOO_CLASSPATH="
+	jaf
+	junit
+	bcprov-${SLOT}
+	oracle-javamail
+"
+
+src_unpack() {
+	default
+	cd "${S}"
+	unpack ./src.zip
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use source && java-pkg_dosrc org
+}

dev-java/bcmail/bcmail-1.45-r4.ebuild

@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-jdk15-${PV/./}"
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1.45"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+CDEPEND="
+	dev-java/bcprov:${SLOT}
+	dev-java/junit:0
+	java-virtuals/jaf:0
+	dev-java/oracle-javamail:0
+"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_GENTOO_CLASSPATH="
+	jaf
+	junit
+	bcprov-${SLOT}
+	oracle-javamail
+"
+
+src_unpack() {
+	default
+	cd "${S}"
+	unpack ./src.zip
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use source && java-pkg_dosrc org
+}

dev-java/bcmail/bcmail-1.50-r2.ebuild

@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-jdk15on-${PV/./}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1.50"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+
+CDEPEND="dev-java/bcprov:${SLOT}
+	dev-java/bcpkix:${SLOT}
+	java-virtuals/jaf:0
+	dev-java/junit:0
+	dev-java/oracle-javamail:0"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_GENTOO_CLASSPATH="
+	jaf
+	junit
+	bcprov-${SLOT}
+	bcpkix-${SLOT}
+	oracle-javamail
+"
+
+# Package can't be built with test as bcprov and bcpkix can't be built with test.
+RESTRICT="test"
+
+src_unpack() {
+	default
+	cd "${S}"
+	unpack ./src.zip
+}
+
+java_prepare() {
+	JAVA_RM_FILES=(
+		org/bouncycastle/mail/smime/test/*
+		org/bouncycastle/mail/smime/examples/CreateSignedMail.java
+	)
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use source && java-pkg_dosrc org
+}

dev-java/bcmail/bcmail-1.52-r2.ebuild

@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-jdk15on-${PV/./}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1.52"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+
+CDEPEND="dev-java/bcprov:${SLOT}
+		dev-java/bcpkix:${SLOT}
+		dev-java/junit:0
+		java-virtuals/jaf:0
+		dev-java/oracle-javamail:0"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_GENTOO_CLASSPATH="
+	jaf
+	junit
+	bcprov-${SLOT}
+	bcpkix-${SLOT}
+	oracle-javamail
+"
+
+# Package can't be built with test as bcprov and bcpkix can't be built with test.
+RESTRICT="test"
+
+src_unpack() {
+	default
+	cd "${S}"
+	unpack ./src.zip
+}
+
+java_prepare() {
+	JAVA_RM_FILES=(
+		org/bouncycastle/mail/smime/test/*
+		org/bouncycastle/mail/smime/examples/CreateSignedMail.java
+	)
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use source && java-pkg_dosrc org
+}

dev-java/bcpkix/bcpkix-1.50-r2.ebuild

@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="${PN}-jdk15on"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://central.maven.org/maven2/org/bouncycastle/${MY_PN}/${PV}/${MY_P}-sources.jar"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+
+LICENSE="BSD"
+SLOT="1.50"
+
+CDEPEND="dev-java/bcprov:${SLOT}"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+JAVA_GENTOO_CLASSPATH="bcprov-${SLOT}"
+JAVA_ENCODING="ISO-8859-1"
+JAVA_SRC_DIR="org"

dev-java/bcprov/bcprov-1.50-r4.ebuild

@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-jdk15on-${PV/./}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1.50"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip"
+
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ENCODING="ISO-8859-1"
+
+# Package can't be built with test as bcprov and bcpkix can't be built with test.
+RESTRICT="test"
+
+src_unpack() {
+	default
+	cd "${S}"
+	unpack ./src.zip
+}
+
+java_prepare() {
+	if ! use test; then
+		# There are too many files to delete so we won't be using JAVA_RM_FILES
+		# (it produces a lot of output).
+		local RM_TEST_FILES=()
+		while read -d $'\0' -r file; do
+			RM_TEST_FILES+=("${file}")
+		done < <(find . -name "*Test*.java" -type f -print0)
+		while read -d $'\0' -r file; do
+			RM_TEST_FILES+=("${file}")
+		done < <(find . -name "*Mock*.java" -type f -print0)
+
+		rm -v "${RM_TEST_FILES[@]}" || die
+	fi
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use source && java-pkg_dosrc org
+}

dev-java/bcprov/bcprov-1.52-r3.ebuild

@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-jdk15on-${PV/./}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1.52"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip"
+
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ENCODING="ISO-8859-1"
+
+# Package can't be build with test as bcprov and bcpkix can't be built with test.
+RESTRICT="test"
+
+src_unpack() {
+	default
+	cd "${S}"
+	unpack ./src.zip
+}
+
+java_prepare() {
+	if ! use test; then
+		# There are too many files to delete so we won't be using JAVA_RM_FILES
+		# (it produces a lot of output).
+		local RM_TEST_FILES=()
+		while read -d $'\0' -r file; do
+			RM_TEST_FILES+=("${file}")
+		done < <(find . -name "*Test*.java" -type f -print0)
+		while read -d $'\0' -r file; do
+			RM_TEST_FILES+=("${file}")
+		done < <(find . -name "*Mock*.java" -type f -print0)
+
+		rm -v "${RM_TEST_FILES[@]}" || die
+	fi
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use source && java-pkg_dosrc org
+}

dev-java/invokebinder/Manifest

@@ -1,2 +1 @@
-DIST invokebinder-1.2.tar.gz 28581 SHA256 378ab47e625729974b25c81a60abd425abf155a27f60c7c2728ad3a78fd9a1d4 SHA512 aaf56fa008307d56805c6de7d47285d358f4c5018f1704a8f3b44c5bda5045dc20f588e70ce6fbb3486a48f80d30a7669d568e373717401780b13dd4737a8b16 WHIRLPOOL 1c46acfcb2d6c2c53bb24e94aca5afdc578fb6a72c7b3f83e80c22e69cb98e44257c10ba92bfa86c4ec766fea6216cb0604d9be5b2bb755efcae0fa5b0bc8859
 DIST invokebinder-1.6.tar.gz 36027 SHA256 db59600de448c9253976c0a288ad6575edbdc83ed6a6d58332b902ab9d337c4d SHA512 cacdd6dd5fe74bbba940be1b3d53b183adc247b74e89cc0784805b2ad2c63d12ca1abe20bacf0a90ea50db7574e43d4ac52b5a46e61912e5153e2ac2f6bc559a WHIRLPOOL 967f8bb39b588d381e3495756e79b7e738f631935aadddf5c6396d7367fcd19584f4d4ae3cb9734aafac17ca62906da8fc0459a9194f9f55671d5503b19265de

dev-java/invokebinder/invokebinder-1.2.ebuild

@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Provide a friendly DSL for binding method handles"
-SRC_URI="https://github.com/headius/invokebinder/archive/invokebinder-1.2.tar.gz"
-HOMEPAGE="https://github.com/headius/invokebinder"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LICENSE="Apache-2.0"
-
-S="${WORKDIR}/${PN}-${P}"
-
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7"
-
-# Tests fail, three similar errors where a string is inconvertible to int.
-# Bug #472306.
-RESTRICT="test"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar ${PN}.jar
-
-	use source && java-pkg_dosrc src/main/java/com
-
-	if use doc ; then
-		java-pkg_dojavadoc target/site/apidocs
-
-		dodoc README.markdown
-	fi
-}

dev-java/invokebinder/invokebinder-1.6.ebuild

@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/headius/invokebinder"
 SRC_URI="https://github.com/headius/${PN}/archive/${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="Apache-2.0"
 
 S="${WORKDIR}/${PN}-${P}"

dev-java/itext/itext-5.5.4-r2.ebuild

@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java library that generate documents in the Portable Document Format (PDF) and/or HTML."
+HOMEPAGE="http://itextpdf.com"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+
+LICENSE="AGPL-3"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+
+BC_SLOT="1.52"
+
+CDEPEND="dev-java/bcmail:${BC_SLOT}
+	dev-java/bcpkix:${BC_SLOT}
+	dev-java/bcprov:${BC_SLOT}
+	dev-java/xml-security:0"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6
+	app-arch/unzip"
+
+JAVA_GENTOO_CLASSPATH="
+	bcmail-${BC_SLOT}
+	bcpkix-${BC_SLOT}
+	bcprov-${BC_SLOT}
+	xml-security"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-OcspClientBouncyCastle.java.patch
+)
+
+java_prepare() {
+	mkdir source || die
+
+	for x in *-sources.jar; do
+		unzip -n ${x} -d source || die
+	done
+
+	rm -v *.jar || die
+
+	mkdir target/classes/com/itextpdf/text/pdf/fonts -p || die
+	cp source/com/itextpdf/text/pdf/fonts/*{afm,html,txt} target/classes/com/itextpdf/text/pdf/fonts/ || die
+	mkdir target/classes/com/itextpdf/text/l10n/ -p || die
+	cp -r source/com/itextpdf/text/l10n/* target/classes/com/itextpdf/text/l10n/ || die
+
+	epatch "${PATCHES[@]}"
+}

dev-java/jansi/Manifest

@@ -1,2 +1,3 @@
 DIST jansi-1.1-sources.jar 18401 SHA256 c347970cb7e74832ddc7a37966ec9e1697965200eaaadcf4f1f3f407ad965ce4 SHA512 6f731c3e87b3662ce03a951bea837aa02822cb21ad477e458f8a6ce11b6943fba88d5b6c3786bf47fb9e48d4d30debb4527812fa6c58fe973244ace459b6031d WHIRLPOOL 532adaac74483967079676569c446cfe903a7b22dabffddd4be69dac0c7c4c45ea9bad21fcd5658f5768be68650fe971773a549bcbb6973768a0cd912ba00329
 DIST jansi-1.11.tar.gz 252095 SHA256 e5c7bd4d9ccba7a2f191380111960c7bd699a7ffee370891b2ef7f905047cccf SHA512 4a19d52055da3ce08b6d797fb8e8241af86f1b9b30e12f4de24655edbd72d256b310d58fc6e106cae1384f9b0ab99cd7f2128d53296875fba5422bfc0e8410f1 WHIRLPOOL 30bc2f3bcf1f74ed5b939e9cfb2c16e54f41e679a97c9983643207b264ddd8fdaf9a898c188f12ea2e84742c45942946f59dda97de1b76f39da050329ef91c24
+DIST jansi-1.5.zip 211616 SHA256 e904c8197f100d91c84207e0ec97aa7d197ea8c916d3aa668526b2d4d0279773 SHA512 784c01b7ab48307cf881439d5c3531949a6459e8a90667f1ee7a73f9cbce72710fcf4af8b4cae610d15085641567c0d51cab487488daa0c1b0a4605864de2775 WHIRLPOOL ddc5fcdcb04115b7c24ada6ebf8be9c374fbfd09bf368a9388110b9f8e509c2ae20ec78874767a52ffeed9ecf3ff3ee3c4bf59efcee304d274aa8154ad28cf72