diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
new file mode 100644
index 000000000000..4f3c7bc63df7
--- /dev/null
+++ b/app-admin/calamares/Manifest
@@ -0,0 +1 @@
+DIST calamares-1.1.2.tar.gz 3642991 SHA256 6adf5777f51998a88b19f37c3dd4bb8256be4464106ffbd5d1393ef67109d49c SHA512 567bfae24691576fb814297d7db66f61b39a639b71b2191defb43fd0d2e56b9ccf70dfd666e1fd1faaa1b954c349aea96ad2b5d1b5d59bdc5a351cde6bbdcea6 WHIRLPOOL e6b88ec952d31088c138a6467b98bd66f739ee48daf7689b5e8356274565beddd602ae02df559d6aa9f6483f797da3b7e284d04071eb3e54cf7b8679abe3730a
diff --git a/app-admin/calamares/calamares-1.1.2.ebuild b/app-admin/calamares/calamares-1.1.2.ebuild
new file mode 100644
index 000000000000..7d1176da1319
--- /dev/null
+++ b/app-admin/calamares/calamares-1.1.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/calamares/calamares-1.1.2.ebuild,v 1.1 2015/07/23 19:32:04 johu Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{3_3,3_4} )
+inherit kde5 python-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="http://calamares.io"
+if [[ ${KDE_BUILD_TYPE} == live ]] ; then
+ EGIT_REPO_URI="git://github.com/${PN}/${PN}"
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+IUSE="+networkmanager +upower"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+ >=dev-cpp/yaml-cpp-0.5.1
+ >=dev-libs/boost-1.55[${PYTHON_USEDEP}]
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep solid)
+ dev-qt/linguist-tools:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtquick1:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ sys-apps/dbus
+ sys-apps/dmidecode
+ sys-auth/polkit-qt[qt5]
+"
+
+RDEPEND="${DEPEND}
+ app-admin/sudo
+ dev-libs/libatasmart
+ net-misc/rsync
+ sys-apps/gptfdisk
+ >=sys-block/parted-3.0
+ || ( sys-boot/grub:2 sys-boot/gummiboot )
+ sys-boot/os-prober
+ sys-fs/squashfs-tools
+ sys-fs/udisks:2[systemd]
+ virtual/udev[systemd]
+ networkmanager? ( net-misc/networkmanager )
+ upower? ( sys-power/upower )
+"
+
+src_prepare() {
+ python_setup
+ export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+ PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+ PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+ PYTHON_LIBS="$(python_get_LIBS)"
+ export QT_SELECT=qt5
+}
+
+src_configure() {
+ local mycmakeargs=( "-DWITH_PARTITIONMANAGER=1" )
+ kde5_src_configure
+ sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' "${S}"/calamares.desktop
+ sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' "${S}"/calamares.desktop
+}
+
+src_install() {
+ kde5_src_install
+ dobin "${FILESDIR}"/calamares-pkexec
+}
diff --git a/app-admin/calamares/files/calamares-pkexec b/app-admin/calamares/files/calamares-pkexec
new file mode 100644
index 000000000000..3300d3b70c61
--- /dev/null
+++ b/app-admin/calamares/files/calamares-pkexec
@@ -0,0 +1,2 @@
+#!/bin/sh
+pkexec "/usr/bin/calamares" "$@"
diff --git a/app-admin/calamares/metadata.xml b/app-admin/calamares/metadata.xml
new file mode 100644
index 000000000000..b719686ba39d
--- /dev/null
+++ b/app-admin/calamares/metadata.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ johu@gentoo.org
+ Johannes Huber
+
+
+ Calamares is a distribution-independent system installer, with an
+ advanced partitioning feature for both manual and automated
+ partitioning operations. It is the first installer with an automated
+ “Replace Partition” option, which makes it easy to reuse a partition
+ over and over for distribution testing. Calamares is designed to be
+ customizable by distribution maintainers without need for cumbersome
+ patching, thanks to third party branding and external modules support.
+
+
+ calamares/calamares
+
+
+
diff --git a/app-admin/mcollective/Manifest b/app-admin/mcollective/Manifest
index 101ebb526ed4..604338e52c4c 100644
--- a/app-admin/mcollective/Manifest
+++ b/app-admin/mcollective/Manifest
@@ -1,2 +1 @@
-DIST mcollective-2.5.3.tar.gz 903498 SHA256 6ba69d9d58ca59628e997b6bb602c5884cabd0ea201e859e0863c303f1d64fda SHA512 f5bdccf86699caadb3757778aa33a1635cf18a7bc9e2752431f98b7bd6db8281b49887aeac185b5ae21d3fc37dbcfc49aaf160622cb50562a4a8ba68d6e38732 WHIRLPOOL fd0b82a85656f37c6502f7216c570aad9b18280783bd23449beede471a0f6fe1880f79a61d8ca4b11558963053b434c156b6c4c59157743205c959fcf3c6a4c5
DIST mcollective-2.8.0.tar.gz 718292 SHA256 47084f9285707f2e457850adcf90811f3d39d4f4baa950d822b20b45633db259 SHA512 edc3da334dbd3afd18fcedc675c6498edce1c799d9b472f70ebfe1b972e013cba5217ec492ea4128b15d886edaf283246ba70915180f9a10a67f7c0957fd1c8e WHIRLPOOL 0c6461a43c4533334dee420e7a0debfa8aa2e0079b83407c1313a28689b5ecbd891c94740553947bdce4023786eb0e95e497da73108e283619f358d67dac7c0c
diff --git a/app-admin/mcollective/mcollective-2.5.3.ebuild b/app-admin/mcollective/mcollective-2.5.3.ebuild
deleted file mode 100644
index f59bfb9265d6..000000000000
--- a/app-admin/mcollective/mcollective-2.5.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/mcollective/mcollective-2.5.3.ebuild,v 1.3 2014/08/09 16:42:14 ago Exp $
-
-EAPI="4"
-
-#upstream is adding ruby20 support soonish, keep an eye out
-USE_RUBY="ruby19"
-
-inherit ruby-ng
-
-DESCRIPTION="Framework to build server orchestration or parallel job execution
-systems"
-HOMEPAGE="http://marionette-collective.org/"
-SRC_URI="http://puppetlabs.com/downloads/mcollective/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc +client"
-
-DEPEND=""
-RDEPEND="dev-ruby/stomp"
-
-src_compile() {
- einfo "nothing to compile"
-}
-
-each_ruby_install() {
- doruby -r lib/*
- insinto /usr/share/mcollective
- doins -r plugins
- use client && dosbin bin/mco
- dosbin bin/mcollectived
- if use doc ; then
- dohtml -r doc/*
- insinto /usr/share/doc/${P}/ext
- doins -r ext/*
- fi
- newinitd "${FILESDIR}"/mcollectived.initd mcollectived
- insinto /etc/mcollective
- cd etc
- for cfg in *.dist ; do
- newins "${cfg}" "${cfg%%.dist}"
- sed -i -e "s:^libdir.*:libdir = /usr/share/mcollective/plugins:" \
- "${D}"/etc/mcollective/${cfg%%.dist} || die "sed failed"
- done
- insinto /etc/mcollective/plugin.d
-}
-
-pkg_postinst() {
- einfo "Mcollective requires a stomp server installed and functioning before"
- einfo "you can use it. The recommended server to use is ActiveMQ [1] but"
- einfo "any other stomp compatible server should work."
- einfo
- einfo "It is recommended you read the \'getting started\' guide [2] if this"
- einfo "is a new installation"
- einfo
- einfo "[1] http://activemq.apache.org/"
- einfo "[2] http://code.google.com/p/mcollective/wiki/GettingStarted"
-}
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index e958c64a7892..770ade4f850a 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -1,2 +1,4 @@
DIST puppet-agent_1.2.1-1wheezy_amd64.deb 14844872 SHA256 32cbaa58766dc6d7dd35cfa952c161fd44414110b9cd787080375fd18850bf5f SHA512 22e39fb4110d4b3c7ea2df5a7ed76f0eb5879e9dd57f8c8f0cae360640e6b4058405fd07a5ba0ac25535cedf8e8435d14f719e79e225d4500b0384685bb78425 WHIRLPOOL ab4e1c746c9c2eb3648a27ced7a765f71d4b39afeef9a46a5e8bbb17646e91f278bcac2baa9fc8ccda22b7b74685ebee0f5710b64046701dbf809849e12f29f3
DIST puppet-agent_1.2.1-1wheezy_i386.deb 14792652 SHA256 9fd6ce453c6b5183cad74941f763d7b8fca2754d733e2b52e3b7b5e7be4c7a3d SHA512 c773b18b424fb98a6213529787a1c52216bbd5070da86a96ae03293c3b2e079b2d77511ac05501056e1ec01f2ffce3ec357c25b6150c76375d407f6b1024d26d WHIRLPOOL 9bdfcc5ac2649a6d477097abe59cec80eb30eda0ebf15af6de0e328dee51bb7f7604092006b3e274ec50419bc27b2f6c2f1f0480eed3fe7492dc65d479de9190
+DIST puppet-agent_1.2.2-1wheezy_amd64.deb 14860604 SHA256 5910ff850e8814092b50dc70a68d8c5497d5fe3d960bfef9cd13f8dc689dc665 SHA512 ad11b0ba820186f4b315ac156e8bf78348acd69d11e4c03cb12314fc73e4e3fbfef0814664e7fd04f692e8db42f9e137194e267354b2fc4ec8dda424af9f5d98 WHIRLPOOL 25c42e9f7871ccf61eb55b83327813e6090ee359c42e1e473ef09155db69adebfe412fd61a5752b4b634e5ad8aa7bd45d4a86f7e5ba29c1bdb74033b91f45c3f
+DIST puppet-agent_1.2.2-1wheezy_i386.deb 14816930 SHA256 092b8bfe1e1156322d0ab68d411487c80146bd778916409b1c907791f41a49c8 SHA512 50879ce4eebcd451dafb33cb7a12c36ee9bcaedfc29ffa0d60552efa5aa4cd66d0007061d28a80d31615c67442f8526863185e6753418772d8275e58454d6886 WHIRLPOOL 7abb0b6f52f5dd07a5ccb56b1c795c05f8c4efd18665d2ca209400e51419e4ae335e630a845c031a47df09d96ce20fbc92d7cafa082deb3872306daf74838612
diff --git a/app-admin/puppet-agent/puppet-agent-1.2.2.ebuild b/app-admin/puppet-agent/puppet-agent-1.2.2.ebuild
new file mode 100644
index 000000000000..4afefc7beaa8
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-1.2.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet-agent/puppet-agent-1.2.2.ebuild,v 1.1 2015/07/23 22:53:12 prometheanfire Exp $
+
+EAPI=5
+inherit eutils systemd unpacker
+
+DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
+HOMEPAGE="https://puppetlabs.com/"
+SRC_BASE="http://apt.puppetlabs.com/pool/wheezy/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1wheezy"
+SRC_URI="
+ amd64? ( ${SRC_BASE}_amd64.deb )
+ x86? ( ${SRC_BASE}_i386.deb )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="puppetdb"
+RESTRICT="strip"
+
+DEPEND="
+ ${DEPEND}
+ !app-admin/puppet
+ !app-admin/mcollective
+ !dev-ruby/hiera
+ !dev-ruby/facter"
+RDEPEND="puppetdb? ( >=dev-ruby/puppetdb-termini-3.0.1-r2 )"
+
+S=${WORKDIR}
+
+src_install() {
+ # conf.d
+ doconfd etc/default/puppet
+ doconfd etc/default/mcollective
+ # logrotate.d
+ insinto /etc/logrotate.d
+ doins etc/logrotate.d/mcollective
+ # 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
+ doins -r opt/*
+ fperms 0750 /opt/puppetlabs/puppet/cache
+ # init
+ newinitd "${FILESDIR}/puppet.initd" puppet
+ newinitd "${FILESDIR}/mcollective.initd" mcollective
+ systemd_dounit "${FILESDIR}/puppet.service"
+ systemd_dounit "${FILESDIR}/mcollective.service"
+ systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
+ # symlinks
+ chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
+ 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
+}
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 12d2fd8e0c1c..8b0f3170943b 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -3,4 +3,4 @@ DIST puppet-3.7.4.tar.gz 2600191 SHA256 957c09ab253f76e624809766999da6d872f79b3a
DIST puppet-3.8.1.tar.gz 2633982 SHA256 033d99125276c7062fa5928e3de38c5e487b406530b3c50e84027b3abfd945a8 SHA512 a188c9f5baad3260c7cc2ea26d79d6655b504809deefe90a9e9ed81d3a66c1e10cc0b72b63c9ef34e5dd9266d3588cb7dc0d55e7a762f5fa5bbdc1ebe347979d WHIRLPOOL fd476519032d7b346a8813e4c73826daafc69fc4f7a8924efb35dfc6d691a7734322a7746008484df3f62f32865b23c6203f38662f354057aff5e75c20bf1965
DIST puppet-4.0.0.tar.gz 2498445 SHA256 c02a5cceb68d6c26228c242a312d68cf054233842e914e9d3aec32b38034e013 SHA512 c8ec0771105e83498f7558e1dfa8679d94cb2d526589041319f35cce214a4c8602ebf8541a15fa64ce542168d101042153815887fb8350bce0c4371c490f396f WHIRLPOOL af53d8b14b7110e6648873e9822de37a8bb17b7f635800d9a9fb1fff7df22000cd13604b45913ddddbae58b7af198c80e84c001cc8b6d1643db9ead4ece42bb7
DIST puppet-4.1.0.tar.gz 2532579 SHA256 a168ac45a7b25932dfc78bd5da3efe41363e239c7361dd5c4f91615dc17bb275 SHA512 85ba32fb3a7e9f3413f201263943411fbb6b57a4aa13461954b32c1095b06d04f26288a216c5624290cf89d09183bc86bb5f57769fe2ccadc44bf57cd601f5d3 WHIRLPOOL 5288b3204a5c5b96da4eabdee19c1156e71b3a76662d8d28fc8e43988e76ca52618d423c207c1a25d5d92638c559db76ee3c8ce336286d3a5e875c1dc538f8b8
-DIST puppet-4.2.0.tar.gz 2544711 SHA256 4364162875e470b0da3642ae801440c85b7422ae31fbfa0e9938923c4826b526 SHA512 e5706076259e4c170b331ede48ef78da90a68433381412555c0267ee36cd11fc710fb5a21d190c44dbf92f85b47eb9187be67af314a50049cd8d149c69c7b591 WHIRLPOOL d102da4ffa0866c506b30bfcdce94c4ddb1c0068189624d04825ee6936a965c027146ba4f4cd66076a496869ed7e31dd05b8cc90de23d214e4f5381c7cc2f34e
+DIST puppet-4.2.1.tar.gz 2546267 SHA256 519842dfa03ff78c94e77fb28867aef12933691b9e2ce41788f80c5c2865fe7e SHA512 d4ce3f6cd0fbca4270a9121671c27985c9aaa5360a1a317afcc8f79cd81d285e1661cc77d50dda47abd8e50309762d5931545ea4d675b9fb6c32b612e570fd3d WHIRLPOOL 492294158f7f5eb78b93098c759c97ca53a09fc7b24a8350dfd76220a1d578f78375ba3bd9d618b97299931001af83cc5475c4f6ad9bbb1c3d9744fa07585bfd
diff --git a/app-admin/puppet/files/puppet-fix-tests-4.x.patch b/app-admin/puppet/files/puppet-fix-tests-4.x.patch
new file mode 100644
index 000000000000..77d9cfbda60a
--- /dev/null
+++ b/app-admin/puppet/files/puppet-fix-tests-4.x.patch
@@ -0,0 +1,18 @@
+--- ./spec/unit/network/http/api/indirected_routes_spec.rb 2015-07-21 12:09:09.000000000 -0500
++++ ./spec/unit/network/http/api/indirected_routes_spec.rb.new 2015-07-23 18:33:22.839914116 -0500
+@@ -144,15 +144,6 @@
+ :env))))
+ handler.uri2indirection("GET", "#{master_url_prefix}/node/bar", params)
+ end
+-
+- it "should not pass through an environment to check_authorization and fail if the environment is unknown" do
+- handler.expects(:check_authorization).with(anything,
+- anything,
+- Not(has_entry(:environment)))
+- expect(lambda { handler.uri2indirection("GET",
+- "#{master_url_prefix}/node/bar",
+- {:environment => 'bogus'}) }).to raise_error(ArgumentError)
+- end
+ end
+
+ describe "when converting a request into a URI" do
diff --git a/app-admin/puppet/puppet-4.2.0-r1.ebuild b/app-admin/puppet/puppet-4.2.1.ebuild
similarity index 89%
rename from app-admin/puppet/puppet-4.2.0-r1.ebuild
rename to app-admin/puppet/puppet-4.2.1.ebuild
index 2d0b58ba8991..7860c0adcb2a 100644
--- a/app-admin/puppet/puppet-4.2.0-r1.ebuild
+++ b/app-admin/puppet/puppet-4.2.1.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-4.2.0-r1.ebuild,v 1.2 2015/07/19 08:49:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-4.2.1.ebuild,v 1.2 2015/07/24 00:24:19 prometheanfire Exp $
EAPI="5"
USE_RUBY="ruby20 ruby21"
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
inherit elisp-common xemacs-elisp-common eutils user ruby-fakegem versionator
@@ -18,11 +18,13 @@ LICENSE="Apache-2.0 GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~ppc ~x86"
IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax xemacs"
+RESTRICT="test"
ruby_add_rdepend "
dev-ruby/hiera
>=dev-ruby/rgen-0.6.5 =dev-ruby/rgen-0.6*
dev-ruby/json
+ >=dev-ruby/facter-3.0.0
augeas? ( dev-ruby/ruby-augeas )
diff? ( dev-ruby/diff-lcs )
doc? ( dev-ruby/rdoc )
@@ -31,12 +33,19 @@ ruby_add_rdepend "
sqlite? ( dev-ruby/sqlite3 )
virtual/ruby-ssl"
-DEPEND="${DEPEND}
- dev-lang/ruby
- >=dev-ruby/facter-3.0.0
+ruby_add_bdepend "
+ test? (
+ dev-ruby/mocha
+ dev-ruby/rack
+ dev-ruby/rspec-its
+ )"
+# this should go in the above lists, but isn't because of test deps not being keyworded
+# dev-ruby/rspec-collection_matchers
+
+DEPEND+=" ${DEPEND}
emacs? ( virtual/emacs )
xemacs? ( app-editors/xemacs )"
-RDEPEND="${RDEPEND}
+RDEPEND+=" ${RDEPEND}
rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
selinux? (
sys-libs/libselinux[ruby]
@@ -56,6 +65,9 @@ all_ruby_prepare() {
# Avoid spec that require unpackaged json-schema.
rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+ # can't be run within portage.
+ epatch "${FILESDIR}/puppet-fix-tests-4.x.patch"
+
# Avoid specs that can only run in the puppet.git repository. This
# should be narrowed down to the specific specs.
rm spec/integration/parser/compiler_spec.rb || die
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 8ba78ded8e19..414c944f76b3 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,3 +1,3 @@
DIST sudo-1.8.12.tar.gz 2493373 SHA256 163b51841de8ad19276581a6782d61f5948f1f72a0a843371a1c167d3dc4f3b0 SHA512 1815343eceb7cfa6e37c961ce1c68cf96fc290356b92078d6d24a2c85d8b7a7236df78d3ff7f5e30eba492dc8407346d884e01c0b989eef4414156cfec80b67b WHIRLPOOL 0d9e618937a08b9bf74aaebf12f5b9f96afd827728f90fa95b6a2a4f932cc84240d56674aa903062247068ec5aa3369b14bad64130caeb313330286510c2d3f6
DIST sudo-1.8.13.tar.gz 2515307 SHA256 e374e5edf2c11c00d6916a9f51cb0ad15e51c7b028370fa15169b07e61e05a25 SHA512 d5498ce8136e903a5ee9e6b1e9b69149b2268798f0678bf7fa82d56947c60d0dec1d7ee25df382e2ee05ecb660720af6b6bc24ad1b6493834e158ee3b186d03c WHIRLPOOL b06256020e5c21159f1b7ff7a9849053f89e95c58fce850653e60d625ad71f8cf9caf9421765398ed73d2ca4756483dcd9535dc856e681dc3b8d7c1206ae5553
-DIST sudo-1.8.14p1.tar.gz 2570430 SHA256 b12ccdf1c0b6a2a494afb6616d16d90310206f4d8e68023cf27345396d9f06a0 SHA512 bb2129052fe25162c8aafd8b51c7be3ade03e176975c995c1c33fef9b32768d3a091fcbf76ce8fd58606c61fdcbc498a2c709aa672bcf887181467b21f35fb51 WHIRLPOOL faab6bc3797304c737e9928eb1b95a2dd6a643e355db892c716ba08578d13ac597081faed8e3b9b3d92f68a936220fcc72c2816ecdc248f2b97f52ed1d978f09
+DIST sudo-1.8.14p3.tar.gz 2570892 SHA256 a8a697cbb113859058944850d098464618254804cf97961dee926429f00a1237 SHA512 022e75a4171c0d9b87569adc5b08afc1b8f2adb7dbc6c80dfb737029dbca560a08e317ce37f117b614f36b54666ed01559a72d0c92523a5a2ee3531f520d7a2b WHIRLPOOL 143ff1c464b539e79172cd0340a089739207d2b99fc01d183a27b24b5172c834d6ed0f7258116542ffa559a3a4c3540924261170655dd7bedb449f8d93496bbd
diff --git a/app-admin/sudo/sudo-1.8.14_p1.ebuild b/app-admin/sudo/sudo-1.8.14_p3.ebuild
similarity index 97%
rename from app-admin/sudo/sudo-1.8.14_p1.ebuild
rename to app-admin/sudo/sudo-1.8.14_p3.ebuild
index e85f37c7dcb0..ca66c85398fc 100644
--- a/app-admin/sudo/sudo-1.8.14_p1.ebuild
+++ b/app-admin/sudo/sudo-1.8.14_p3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.14_p1.ebuild,v 1.1 2015/07/20 10:57:20 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.14_p3.ebuild,v 1.1 2015/07/23 20:01:21 polynomial-c Exp $
EAPI=5
diff --git a/app-admin/ulogd/ulogd-2.0.4-r1.ebuild b/app-admin/ulogd/ulogd-2.0.4-r1.ebuild
index 829323f53716..b0b61857ed29 100644
--- a/app-admin/ulogd/ulogd-2.0.4-r1.ebuild
+++ b/app-admin/ulogd/ulogd-2.0.4-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-2.0.4-r1.ebuild,v 1.3 2015/06/26 08:57:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-2.0.4-r1.ebuild,v 1.4 2015/07/23 20:00:11 pacho Exp $
EAPI="5"
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.netfilter.org/pub/${PN}/${P}.tar.bz2
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc x86"
+KEYWORDS="amd64 ~ia64 ppc x86"
IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres sqlite"
RDEPEND="net-firewall/iptables
diff --git a/app-arch/par2cmdline/par2cmdline-0.6.12.ebuild b/app-arch/par2cmdline/par2cmdline-0.6.12.ebuild
index 5cb938314436..2de5bbf35bae 100644
--- a/app-arch/par2cmdline/par2cmdline-0.6.12.ebuild
+++ b/app-arch/par2cmdline/par2cmdline-0.6.12.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/par2cmdline/par2cmdline-0.6.12.ebuild,v 1.3 2015/06/26 08:39:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/par2cmdline/par2cmdline-0.6.12.ebuild,v 1.4 2015/07/23 19:39:21 pacho Exp $
EAPI=5
inherit autotools
@@ -11,7 +11,7 @@ SRC_URI="http://github.com/BlackIkeEagle/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~hppa ppc ~ppc64 x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE=""
DOCS="AUTHORS ChangeLog README" # NEWS is empty, PORTING and ROADMAP are for building
diff --git a/app-arch/xarchiver/xarchiver-0.5.4.ebuild b/app-arch/xarchiver/xarchiver-0.5.4.ebuild
index 8420f745b440..3b50ccfd9859 100644
--- a/app-arch/xarchiver/xarchiver-0.5.4.ebuild
+++ b/app-arch/xarchiver/xarchiver-0.5.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/xarchiver/xarchiver-0.5.4.ebuild,v 1.5 2015/07/15 18:52:11 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xarchiver/xarchiver-0.5.4.ebuild,v 1.6 2015/07/23 20:34:31 pacho Exp $
EAPI=5
inherit xfconf
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha ~amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
IUSE="debug"
RDEPEND=">=dev-libs/glib-2
diff --git a/app-backup/rdiff-backup/rdiff-backup-1.3.3-r1.ebuild b/app-backup/rdiff-backup/rdiff-backup-1.3.3-r1.ebuild
index 7a492e8ff7f7..1e67f023d108 100644
--- a/app-backup/rdiff-backup/rdiff-backup-1.3.3-r1.ebuild
+++ b/app-backup/rdiff-backup/rdiff-backup-1.3.3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/rdiff-backup/rdiff-backup-1.3.3-r1.ebuild,v 1.5 2015/07/03 10:22:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/rdiff-backup/rdiff-backup-1.3.3-r1.ebuild,v 1.6 2015/07/23 20:10:52 pacho Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
@@ -13,7 +13,7 @@ SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~mips ~ppc ppc64 ~sh ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="alpha ~amd64 arm ~mips ppc ppc64 ~sh ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="examples"
DEPEND="
diff --git a/app-crypt/easy-rsa/easy-rsa-2.2.2.ebuild b/app-crypt/easy-rsa/easy-rsa-2.2.2.ebuild
index f6a0a7066918..4de3763eab47 100644
--- a/app-crypt/easy-rsa/easy-rsa-2.2.2.ebuild
+++ b/app-crypt/easy-rsa/easy-rsa-2.2.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/easy-rsa/easy-rsa-2.2.2.ebuild,v 1.5 2015/07/18 11:40:43 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/easy-rsa/easy-rsa-2.2.2.ebuild,v 1.7 2015/07/24 06:04:58 jer Exp $
EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/OpenVPN/easy-rsa/releases/download/${PV}/${MY_P}.tgz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86"
IUSE=""
DEPEND=">=dev-libs/openssl-0.9.6:0"
diff --git a/app-crypt/gpgme/gpgme-1.5.5.ebuild b/app-crypt/gpgme/gpgme-1.5.5.ebuild
index dd5c22a9f87e..5777fb318388 100644
--- a/app-crypt/gpgme/gpgme-1.5.5.ebuild
+++ b/app-crypt/gpgme/gpgme-1.5.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-1.5.5.ebuild,v 1.7 2015/07/19 18:26:30 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-1.5.5.ebuild,v 1.8 2015/07/23 20:00:49 pacho Exp $
EAPI="5"
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2.1"
SLOT="1/11" # subslot = soname major version
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="common-lisp static-libs"
DEPEND="app-crypt/gnupg
diff --git a/app-crypt/qca/qca-2.1.0.3.ebuild b/app-crypt/qca/qca-2.1.0.3.ebuild
index 0238907e58a5..226bfe6b0b38 100644
--- a/app-crypt/qca/qca-2.1.0.3.ebuild
+++ b/app-crypt/qca/qca-2.1.0.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/qca-2.1.0.3.ebuild,v 1.16 2015/07/18 12:07:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/qca-2.1.0.3.ebuild,v 1.17 2015/07/23 20:21:47 pacho Exp $
EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://kde/stable/${MY_PN}/${PV}/src/${MY_PN}-${PV}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="2"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
IUSE="botan debug doc examples gcrypt gpg logger nss +openssl pkcs11 +qt4 qt5 sasl softstore test"
REQUIRED_USE="|| ( qt4 qt5 )"
diff --git a/app-doc/doxygen/doxygen-1.8.9.1.ebuild b/app-doc/doxygen/doxygen-1.8.9.1.ebuild
index 4a6ebd43fdef..89cb64d5cab4 100644
--- a/app-doc/doxygen/doxygen-1.8.9.1.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.9.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.8.9.1.ebuild,v 1.6 2015/07/16 13:37:34 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.8.9.1.ebuild,v 1.7 2015/07/23 20:41:44 pacho Exp $
EAPI=4
PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -14,7 +14,7 @@ SRC_URI="http://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="clang debug doc dot doxysearch qt4 latex sqlite"
#missing SerbianCyrilic, JapaneseEn, KoreanEn, Chinesetraditional
diff --git a/app-editors/leo/leo-5.1.ebuild b/app-editors/leo/leo-5.1.ebuild
index 5c78ca15d0fb..842db99c7e82 100644
--- a/app-editors/leo/leo-5.1.ebuild
+++ b/app-editors/leo/leo-5.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/leo/leo-5.1.ebuild,v 1.1 2015/04/24 02:33:25 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/leo/leo-5.1.ebuild,v 1.2 2015/07/23 20:59:04 pacho Exp $
EAPI=5
@@ -19,7 +19,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc ~x86"
IUSE="doc"
RDEPEND="app-text/silvercity[${PYTHON_USEDEP}]
diff --git a/app-editors/xemacs/xemacs-21.4.24.ebuild b/app-editors/xemacs/xemacs-21.4.24.ebuild
index 3a6e84db82e0..9eab812ca7d3 100644
--- a/app-editors/xemacs/xemacs-21.4.24.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.24.ebuild,v 1.4 2015/07/18 11:57:46 matsl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.24.ebuild,v 1.5 2015/07/23 21:00:51 pacho Exp $
# Note: xemacs currently does not work with a hardened profile. If you
# want to use xemacs on a hardened profile then compile with the
@@ -18,7 +18,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 hppa ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 hppa ppc ppc64 ~sparc ~x86"
IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xim athena neXt Xaw3d gdbm berkdb"
X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
diff --git a/app-emulation/libspectrum/libspectrum-1.1.1.ebuild b/app-emulation/libspectrum/libspectrum-1.1.1.ebuild
index 092914357c57..4f7784c2f03e 100644
--- a/app-emulation/libspectrum/libspectrum-1.1.1.ebuild
+++ b/app-emulation/libspectrum/libspectrum-1.1.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libspectrum/libspectrum-1.1.1.ebuild,v 1.3 2015/06/26 08:40:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libspectrum/libspectrum-1.1.1.ebuild,v 1.4 2015/07/23 19:52:34 pacho Exp $
EAPI="5"
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/fuse-emulator/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
IUSE="audiofile bzip2 gcrypt zlib"
RDEPEND="zlib? ( sys-libs/zlib )
diff --git a/app-emulation/runc/runc-0.0.2.ebuild b/app-emulation/runc/runc-0.0.2.ebuild
index 175b08438cdf..7e78997e17bb 100644
--- a/app-emulation/runc/runc-0.0.2.ebuild
+++ b/app-emulation/runc/runc-0.0.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/runc/runc-0.0.2.ebuild,v 1.1 2015/07/20 02:37:38 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/runc/runc-0.0.2.ebuild,v 1.2 2015/07/23 20:29:32 cardoe Exp $
EAPI=5
@@ -10,9 +10,8 @@ HOMEPAGE="http://runc.io"
GITHUB_URI="github.com/opencontainers/runc"
if [[ ${PV} == *9999* ]]; then
- SRC_URI=""
EGIT_REPO_URI="git://${GITHUB_URI}.git"
- inherit git-2
+ inherit git-r3
else
SRC_URI="https://${GITHUB_URI}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
@@ -46,5 +45,5 @@ src_compile() {
}
src_install() {
- newbin runc runc
+ dobin runc
}
diff --git a/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20140423.ebuild b/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20140423.ebuild
index de58c2c02ce2..4a989fddaa60 100644
--- a/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20140423.ebuild
+++ b/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20140423.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20140423.ebuild,v 1.7 2015/07/16 17:12:52 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20140423.ebuild,v 1.8 2015/07/23 20:59:33 pacho Exp $
EAPI="5"
@@ -14,7 +14,7 @@ SRC_URI="http://dev.gentoo.org/~ottxor/dist/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE=""
RDEPEND="app-admin/eselect"
diff --git a/app-i18n/ibus/ibus-1.5.10.ebuild b/app-i18n/ibus/ibus-1.5.10.ebuild
index faa92308f251..3b1d01c19c41 100644
--- a/app-i18n/ibus/ibus-1.5.10.ebuild
+++ b/app-i18n/ibus/ibus-1.5.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.5.10.ebuild,v 1.4 2015/07/15 16:35:44 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.5.10.ebuild,v 1.5 2015/07/23 20:22:03 pacho Exp $
EAPI=5
@@ -18,7 +18,7 @@ HOMEPAGE="http://code.google.com/p/ibus/"
LICENSE="LGPL-2.1"
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="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
REQUIRED_USE="
|| ( gtk gtk3 X )
diff --git a/app-misc/carbon-c-relay/Manifest b/app-misc/carbon-c-relay/Manifest
index 2c00dadd3b0f..da5db218d685 100644
--- a/app-misc/carbon-c-relay/Manifest
+++ b/app-misc/carbon-c-relay/Manifest
@@ -1,2 +1,3 @@
DIST carbon-c-relay-0.39.tar.gz 55308 SHA256 694cfb291981fda58930af09bd1563a20ca8e40839d8bdbda5b8403774cf391d SHA512 b7797f969bf3431f883a5e8288b748494a9c9d8448c7bcde6642b538e20c6fe99acc296ba7bc940739c53619ee672a46ff787c66d75900f45a057f2660da0e5f WHIRLPOOL 8e1b8646b720f2db3f1a556f57975c9556e4a0d3b36479b6ad58607abe0d9f2629ef7275def4ef6a9dc4b73268376fa07c78b8dac3bd5b8bd90ff70dd706f4cf
DIST carbon-c-relay-0.40.tar.gz 57697 SHA256 38e3b93f4a46e72f11c30f84bd0a0a77862d8d3cd1904447678eabfce89a0468 SHA512 6d77d521eba6dfa576810f3e850f091431a76282f5c7c85a72af300cff18b0dec8738dd00d9555933fbf486ce9656ea4f06332644bfccc634078c90937705aaa WHIRLPOOL ddaf8d02168a10f1e0e2dd8701cd430aefe7346164016a41e25850b2871d541f9002c93063d0836d40caf6db2ff380183d8a4e145df89324be33ef22386bec39
+DIST carbon-c-relay-0.42.tar.gz 63007 SHA256 9ff9daaaa67abf77c0c32933cc83b069a3d7ffab1fbdaccc309bb1df814a29bc SHA512 8970dc4a9bc4bdab4da6075aad277abb824178604d8b83db0d0980865bcb249b23d29f86d98bd7b8c52c2edae5dd745830b92b44fa21688832b050666f85dc0c WHIRLPOOL 2bfe007717b5769e45163450b82fc60e3805ba01cecd8c3e1d12e182a60f169fbaeaf7ddeb60dfffe941670b2cf11353f04caf7cd29dfd23f97df8b3c21d8e9a
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-0.42.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-0.42.ebuild
new file mode 100644
index 000000000000..c6a1875dae03
--- /dev/null
+++ b/app-misc/carbon-c-relay/carbon-c-relay-0.42.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/carbon-c-relay/carbon-c-relay-0.42.ebuild,v 1.1 2015/07/23 20:11:57 grobian Exp $
+
+EAPI=5
+
+inherit toolchain-funcs user
+
+DESCRIPTION="Enhanced C version of Carbon relay, aggregator and rewriter"
+HOMEPAGE="https://github.com/grobian/carbon-c-relay"
+SRC_URI="https://github.com/grobian/carbon-c-relay/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+pkg_preinst() {
+ enewgroup carbon
+ enewuser carbon -1 -1 -1 carbon
+}
+
+src_prepare() {
+ tc-export CC
+ tc-has-openmp || export OPENMP_FLAGS=
+}
+
+src_install() {
+ newbin relay ${PN}
+ dodoc README.md
+
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/app-misc/cdargs/cdargs-1.35-r2.ebuild b/app-misc/cdargs/cdargs-1.35-r2.ebuild
index 657acf9212d9..cacc5b852f0f 100644
--- a/app-misc/cdargs/cdargs-1.35-r2.ebuild
+++ b/app-misc/cdargs/cdargs-1.35-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/cdargs/cdargs-1.35-r2.ebuild,v 1.3 2015/06/23 09:01:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/cdargs/cdargs-1.35-r2.ebuild,v 1.4 2015/07/23 19:42:40 pacho Exp $
EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="http://www.skamphausen.de/software/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ppc ~sparc x86"
IUSE="emacs"
DEPEND="
diff --git a/app-misc/detox/detox-1.2.0-r3.ebuild b/app-misc/detox/detox-1.2.0-r3.ebuild
index 03c5d70ee930..cb0015a40e2f 100644
--- a/app-misc/detox/detox-1.2.0-r3.ebuild
+++ b/app-misc/detox/detox-1.2.0-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/detox/detox-1.2.0-r3.ebuild,v 1.3 2015/06/26 09:03:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/detox/detox-1.2.0-r3.ebuild,v 1.4 2015/07/23 20:34:02 pacho Exp $
EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~hppa ~mips ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ~mips ppc x86 ~amd64-linux ~x86-linux"
IUSE=""
S="${WORKDIR}"/${MY_P}
diff --git a/app-misc/gnuit/gnuit-4.9.5-r2.ebuild b/app-misc/gnuit/gnuit-4.9.5-r2.ebuild
index b876dd2b02e5..25dd04e5466d 100644
--- a/app-misc/gnuit/gnuit-4.9.5-r2.ebuild
+++ b/app-misc/gnuit/gnuit-4.9.5-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gnuit/gnuit-4.9.5-r2.ebuild,v 1.3 2015/06/27 14:17:00 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gnuit/gnuit-4.9.5-r2.ebuild,v 1.4 2015/07/23 21:03:06 pacho Exp $
EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3 FDL-1.3"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ppc ~sparc x86"
IUSE=""
src_prepare() {
diff --git a/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild b/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild
index 291873229918..e6e48a8e225c 100644
--- a/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild,v 1.1 2015/06/26 22:30:31 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild,v 1.2 2015/07/23 19:35:17 pacho Exp $
EAPI=5
@@ -8,10 +8,10 @@ if [[ $PV = *9999* ]]; then
scm_eclass=git-r3
EGIT_REPO_URI=( "git://anongit.kde.org/akonadi" )
SRC_URI=""
- KEYWORDS=""
+ KEYWORDS="ppc"
else
SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+ KEYWORDS="~amd64 ~arm ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
S="${WORKDIR}/${P/-server/}"
fi
diff --git a/app-office/homebank/homebank-4.6.3.ebuild b/app-office/homebank/homebank-4.6.3.ebuild
index a4c104f5eeb6..a4b8e9b0f812 100644
--- a/app-office/homebank/homebank-4.6.3.ebuild
+++ b/app-office/homebank/homebank-4.6.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/homebank/homebank-4.6.3.ebuild,v 1.3 2015/06/26 08:33:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/homebank/homebank-4.6.3.ebuild,v 1.4 2015/07/23 21:01:43 pacho Exp $
EAPI="5"
@@ -12,7 +12,7 @@ SRC_URI="http://homebank.free.fr/public/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
IUSE="+ofx"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
RDEPEND=">=x11-libs/gtk+-2.20:2
>=dev-libs/glib-2.17
diff --git a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.2-r1.ebuild b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.2-r1.ebuild
index 862e4266ee64..8670323469ba 100644
--- a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.2-r1.ebuild
+++ b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.2-r1.ebuild,v 1.4 2015/07/19 18:44:10 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.2-r1.ebuild,v 1.6 2015/07/24 10:36:36 zlogene Exp $
EAPI=5
DESCRIPTION="emerge-webrsync using patches to minimize bandwidth"
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
SRC_URI="https://raw.githubusercontent.com/gentoo/portage/779a9e686d89e31af43e33b1163b01aeff65d7ea/misc/emerge-delta-webrsync -> ${P}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~ia64 ~mips ~ppc ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ~sparc x86 ~x86-fbsd"
IUSE=""
DEPEND=""
diff --git a/app-shells/bash-completion/bash-completion-2.1_p20141224.ebuild b/app-shells/bash-completion/bash-completion-2.1_p20141224.ebuild
index 59143092099e..16c95922c13c 100644
--- a/app-shells/bash-completion/bash-completion-2.1_p20141224.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.1_p20141224.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-2.1_p20141224.ebuild,v 1.8 2015/07/20 05:31:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-2.1_p20141224.ebuild,v 1.9 2015/07/23 19:44:13 pacho Exp $
EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="http://dev.gentoo.org/~mgorny/dist/${P}.tar.xz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
IUSE=""
RDEPEND=">=app-shells/bash-4.3_p30-r1
diff --git a/app-shells/dash/dash-0.5.8.2.ebuild b/app-shells/dash/dash-0.5.8.2.ebuild
index 33297b149dc2..9ecc8f232013 100644
--- a/app-shells/dash/dash-0.5.8.2.ebuild
+++ b/app-shells/dash/dash-0.5.8.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/dash-0.5.8.2.ebuild,v 1.8 2015/07/17 19:59:17 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/dash-0.5.8.2.ebuild,v 1.9 2015/07/23 20:44:50 pacho Exp $
EAPI="4"
@@ -18,7 +18,7 @@ SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${PN}-${DEB_PV}.tar.gz
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"
+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="libedit static"
RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
diff --git a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20140911.ebuild b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20140911.ebuild
index 74f801ebf58c..96a77f9358cb 100644
--- a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20140911.ebuild
+++ b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20140911.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/gentoo-bashcomp/gentoo-bashcomp-20140911.ebuild,v 1.6 2015/07/20 05:31:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/gentoo-bashcomp/gentoo-bashcomp-20140911.ebuild,v 1.7 2015/07/23 19:44:22 pacho Exp $
EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="http://dev.gentoo.org/~mgorny/dist/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
IUSE=""
src_install() {
diff --git a/app-shells/sash/sash-3.8.ebuild b/app-shells/sash/sash-3.8.ebuild
index 05a88f56d396..47a60b8e52bb 100644
--- a/app-shells/sash/sash-3.8.ebuild
+++ b/app-shells/sash/sash-3.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/sash/sash-3.8.ebuild,v 1.7 2015/07/03 10:17:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/sash/sash-3.8.ebuild,v 1.8 2015/07/23 20:03:17 pacho Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="http://www.canb.auug.org.au/~dbell/programs/${P}.tar.gz"
LICENSE="freedist"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
IUSE="static"
DEPEND="
diff --git a/app-text/dvisvgm/dvisvgm-1.8.1.ebuild b/app-text/dvisvgm/dvisvgm-1.8.1.ebuild
index 69591570ab7e..edfa073a2806 100644
--- a/app-text/dvisvgm/dvisvgm-1.8.1.ebuild
+++ b/app-text/dvisvgm/dvisvgm-1.8.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dvisvgm/dvisvgm-1.8.1.ebuild,v 1.6 2015/07/20 05:38:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dvisvgm/dvisvgm-1.8.1.ebuild,v 1.7 2015/07/23 20:44:37 pacho Exp $
EAPI=4
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="test"
# Tests don't work from $WORKDIR: kpathsea tries to search in relative
# directories from where the binary is executed.
diff --git a/app-text/glark/Manifest b/app-text/glark/Manifest
index f96e8b72c03e..bf5e958835b0 100644
--- a/app-text/glark/Manifest
+++ b/app-text/glark/Manifest
@@ -1,2 +1 @@
-DIST glark-git-1.10.4.tgz 196244 SHA256 1442ef4239fdd88ea4f9bdd38a9c8384fd56cb4570be80857498f8a9c51d9900 SHA512 1239e06ce868a0959cca0f93671585f00cbbc39f5817eabcf5076ad77bb1c095c03bba64f06630def27f8e067d31d3ce4db1353c66c3b0d4797baafdf8e5923a WHIRLPOOL 7cb54b7dd83542127321e643ca8eb9e4e26b2a8db07c665a1f93ac5e66d58aa3a6f847cc8a667bd85b1fb975dc32be3e2683d513287371ff8c4e72f3bdce618a
DIST glark-git-1.10.5.tgz 196283 SHA256 b6d12ca82d1f88b14476f40e98ae9c34801107a49fb21871c8189a01bc824647 SHA512 6dcad5567a10f1608925b690e86cb8c0f4be56cc4bce70410d3dd3568a191be2c3fbeaa00bea296de6d658b65b8bd081b1d5555e3e43c3f03a22d5e3d19d6c2c WHIRLPOOL d8853c288b96600acd0802688ffe864fbe4841ce1bbc7845dce67f23bf16a2f728d0ccf7758f70a321a58e0a093ced6cf54606542c766d4b8ed090d87fd8f223
diff --git a/app-text/glark/glark-1.10.4.ebuild b/app-text/glark/glark-1.10.4.ebuild
deleted file mode 100644
index d1a63976f673..000000000000
--- a/app-text/glark/glark-1.10.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/glark/glark-1.10.4.ebuild,v 1.12 2015/01/16 08:52:32 armin76 Exp $
-
-EAPI=5
-USE_RUBY="ruby19"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="Features.txt History.txt README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="File searcher similar to grep but with fancy output"
-HOMEPAGE="https://github.com/jpace/glark"
-
-SRC_URI="https://github.com/jpace/glark/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc sparc x86"
-IUSE="zip"
-
-ruby_add_rdepend "
- >=dev-ruby/logue-1.0.0
- >=dev-ruby/ragol-1.0.0
- >=dev-ruby/rainbow-1.1.4:0
- >=dev-ruby/riel-1.2.0
- zip? ( dev-ruby/rubyzip:0 )"
-
-ruby_add_bdepend "test? ( dev-ruby/rubyzip:0 )"
-
-all_ruby_prepare() {
- rm -rf doc/ || die
-
- # Fix broken links to test data.
- sed -i -e 's:/proj/org/incava/glark/::g' $(find test -type f) || die
-}
diff --git a/app-text/llpp/llpp-20_p20140818.ebuild b/app-text/llpp/llpp-20_p20140818.ebuild
index 635ff58753d1..20935b1e1f77 100644
--- a/app-text/llpp/llpp-20_p20140818.ebuild
+++ b/app-text/llpp/llpp-20_p20140818.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-20_p20140818.ebuild,v 1.2 2015/04/02 18:26:20 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-20_p20140818.ebuild,v 1.3 2015/07/23 19:41:12 pacho Exp $
EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="http://repo.or.cz/w/llpp.git/snapshot/4fc967506989680faf64fb6c1dd0e0d13
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc ~x86"
IUSE="+ocamlopt static"
#IUSE="egl +ocamlopt static"
diff --git a/app-text/mupdf/mupdf-1.5-r1.ebuild b/app-text/mupdf/mupdf-1.5-r1.ebuild
index 2bb8ae2ca403..b8c4a4e25e0f 100644
--- a/app-text/mupdf/mupdf-1.5-r1.ebuild
+++ b/app-text/mupdf/mupdf-1.5-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.5-r1.ebuild,v 1.6 2015/07/17 06:32:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.5-r1.ebuild,v 1.7 2015/07/23 19:40:59 pacho Exp $
EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=b2f096de23e5341fbb
LICENSE="AGPL-3"
MY_SOVER=1.5
SLOT="0/${MY_SOVER}"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="X vanilla +curl +openssl static static-libs"
LIB_DEPEND="dev-libs/openssl[static-libs?]
diff --git a/app-text/silvercity/silvercity-0.9.7-r1.ebuild b/app-text/silvercity/silvercity-0.9.7-r1.ebuild
index c12a86054682..00695b7fb22f 100644
--- a/app-text/silvercity/silvercity-0.9.7-r1.ebuild
+++ b/app-text/silvercity/silvercity-0.9.7-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/silvercity/silvercity-0.9.7-r1.ebuild,v 1.1 2014/12/25 11:11:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/silvercity/silvercity-0.9.7-r1.ebuild,v 1.2 2015/07/23 19:58:57 pacho Exp $
EAPI=5
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/silvercity/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~ia64 ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE=""
DEPEND=""
diff --git a/app-text/writerperfect/writerperfect-0.8.1.ebuild b/app-text/writerperfect/writerperfect-0.8.1.ebuild
index bcb3d9d543e6..765ee6b93672 100644
--- a/app-text/writerperfect/writerperfect-0.8.1.ebuild
+++ b/app-text/writerperfect/writerperfect-0.8.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/writerperfect/writerperfect-0.8.1.ebuild,v 1.2 2015/03/13 21:11:52 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/writerperfect/writerperfect-0.8.1.ebuild,v 1.3 2015/07/23 20:39:02 pacho Exp $
EAPI=4
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/libwpd/writerperfect-${PV}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~ppc x86 ~x86-linux ~ppc-macos ~x86-solaris"
IUSE="debug gsf +visio +wpg +wps"
RDEPEND="
diff --git a/dev-cpp/tbb/tbb-4.3.20141023.ebuild b/dev-cpp/tbb/tbb-4.3.20141023.ebuild
index 365b380a15bd..920537554947 100644
--- a/dev-cpp/tbb/tbb-4.3.20141023.ebuild
+++ b/dev-cpp/tbb/tbb-4.3.20141023.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.3.20141023.ebuild,v 1.3 2015/06/26 14:29:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.3.20141023.ebuild,v 1.4 2015/07/23 19:38:40 pacho Exp $
EAPI=5
inherit eutils flag-o-matic multilib versionator toolchain-funcs
@@ -16,7 +16,7 @@ SRC_URI="http://threadingbuildingblocks.org/sites/default/files/software_release
LICENSE="GPL-2-with-exceptions"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
IUSE="debug doc examples"
DEPEND=""
diff --git a/dev-db/mysql++/mysql++-3.2.1.ebuild b/dev-db/mysql++/mysql++-3.2.1.ebuild
index 8b0663b231e5..d7fc0018a669 100644
--- a/dev-db/mysql++/mysql++-3.2.1.ebuild
+++ b/dev-db/mysql++/mysql++-3.2.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/mysql++-3.2.1.ebuild,v 1.5 2015/07/20 06:04:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/mysql++-3.2.1.ebuild,v 1.6 2015/07/23 20:32:42 pacho Exp $
EAPI="5"
@@ -12,7 +12,7 @@ SRC_URI="http://www.tangentsoft.net/mysql++/releases/${P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0/3"
-KEYWORDS="alpha amd64 hppa ~mips ~ppc ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 hppa ~mips ppc ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE=""
RDEPEND=">=virtual/mysql-4.0"
diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 19ef439a3df2..28b7d1c7b140 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,4 +1,3 @@
DIST antlr-3.4-complete.jar 2388361 SHA256 9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7 SHA512 04be4dfba3a21f3ab9d9e439a64958bd8e844a9f151b798383bd9e0dd6ebc416783ae7cb1d1dbb27fb7288ab9756b13b8338cdb8ceb41a10949c852ad45ab1f2 WHIRLPOOL 488b7b9af1d1d06cca163d43e7be190730e2f0421796c21a26ace11196ee37a16b1bdeea78a1e2e64f8ca0e87f67a2aecd066af21505f3dd92dd76de40a94fa0
-DIST mysql-workbench-community-6.2.5-src.tar.gz 13037465 SHA256 40a5dbf72b55441ea3e9466dce2de47611777c88da2b65b748f10b06dfa0794e SHA512 6cc9ba91a9fd4d19bdec157084fd5b510cc274e2851b54855441ad97dd042009064a00aa330a5689c18ed70a0996bf23411be475339ee96ba2ff5252c49d7839 WHIRLPOOL 74de61140edd91ee85c222338c02d3672869a0231bb25eb5f37c43a9cad2e280db521261a4ec6557e237c3f48cab84e92838a100949835fe85db924b5a382cba
DIST mysql-workbench-community-6.3.3-src.tar.gz 14892631 SHA256 4511d63145b2a979310d84c9f0ca61b7460af2c87b81787b2f2404fd5095f419 SHA512 9736ed4f896b2819d5cde76a000a56b6ce36606262a83b5a0ba8dfc8760476eb43bcda08f258d856297924f3ddca2d89aadf0139fb156beb345f2a6fe5b0bc45 WHIRLPOOL 9e1054b8c18e854918133da62f67cc109f212812cd2509edfc775d4ebbc91b402a7b88b530e540eb67dadba6f6fd3d901b3f7a30b7a03a5a33537c677bbd0024
DIST mysql-workbench-community-6.3.4-src.tar.gz 14954524 SHA256 be47f30c48c04f951a1be9b6496e4d94d5b975d6c693933ba2fa6e96718179d3 SHA512 8d7eacd46fd3cac912dac2fdbc0669759f9411796507cca76b0ad47228381b15b7f88e60a7a5a8763e704b456884828783cb0c7ed218025edb35aa5033d7d02f WHIRLPOOL 9e00ce475e573ee8b875d9f25d73d488cf68ff96b2eb006dba1dc7e424c70a0650cac42dcc3ed34648c5879354cab5311eaf6729e9b307718935d543c4f43bf5
diff --git a/dev-db/mysql-workbench/mysql-workbench-6.2.5.ebuild b/dev-db/mysql-workbench/mysql-workbench-6.2.5.ebuild
deleted file mode 100644
index ec08b39377b7..000000000000
--- a/dev-db/mysql-workbench/mysql-workbench-6.2.5.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/mysql-workbench-6.2.5.ebuild,v 1.6 2015/04/26 17:21:13 pacho Exp $
-
-EAPI=5
-GCONF_DEBUG="no"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-CMAKE_MIN_VERSION="2.8.11.1"
-
-inherit gnome2 eutils flag-o-matic python-single-r1 cmake-utils
-
-MY_P="${PN}-community-${PV}-src"
-
-DESCRIPTION="MySQL Workbench"
-HOMEPAGE="http://dev.mysql.com/workbench/"
-SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz https://github.com/antlr/website-antlr3/blob/gh-pages/download/antlr-3.4-complete.jar?raw=true -> antlr-3.4-complete.jar"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc gnome-keyring"
-
-# glibc: deprecated mutex functions, removed in 2.36.0
-CDEPEND="${PYTHON_DEPS}
- dev-libs/glib:2
- dev-cpp/atkmm
- dev-cpp/pangomm
- >=dev-cpp/glibmm-2.14:2
- >=dev-cpp/gtkmm-2.14:2.4
- dev-libs/atk
- x11-libs/pango
- >=x11-libs/gtk+-2.20:2
- gnome-base/libglade:2.0
- >=x11-libs/cairo-1.5.12[glib,svg]
- dev-libs/libsigc++:2
- dev-libs/boost
- >=dev-cpp/ctemplate-0.95
- >=dev-libs/libxml2-2.6.2:2
- dev-libs/libzip
- >=virtual/mysql-5.1
- dev-libs/libpcre
- >=sci-libs/gdal-1.11.1-r1[-mdb]
- virtual/opengl
- >=dev-lang/lua-5.1[deprecated]
- || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
- dev-libs/tinyxml[stl]
- dev-db/mysql-connector-c++
- dev-db/vsqlite++
- || ( dev-db/libiodbc dev-db/unixODBC )
- gnome-keyring? ( gnome-base/libgnome-keyring )
- dev-python/pexpect
- >=dev-python/paramiko-1.7.4
- "
-
-# lua perhaps no longer needed? Was used via libgrt only
-
-RDEPEND="${CDEPEND}
- app-admin/sudo
- >=sys-apps/net-tools-1.60_p20120127084908"
-
-DEPEND="${CDEPEND}
- dev-lang/swig
- virtual/jre
- virtual/pkgconfig"
-
-S="${WORKDIR}"/"${MY_P}"
-
-src_unpack() {
- unpack ${PN}-community-${PV}-src.tar.gz
-}
-
-src_prepare() {
- ## Patch CMakeLists.txt
- epatch "${FILESDIR}/${PN}-6.2.3-CMakeLists.patch" \
- "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch" \
- "${FILESDIR}/${PN}-6.1.7-mysql_options4.patch"
-
- ## remove hardcoded CXXFLAGS
- sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
-
- ## package is very fragile...
- strip-flags
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_use gnome-keyring GNOME_KEYRING)
- -DLIB_INSTALL_DIR="/usr/$(get_libdir)"
- -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
- -DPYTHON_LIBRARY="$(python_get_library_path)"
- )
- ANTLR_JAR_PATH="${DISTDIR}/antlr-3.4-complete.jar" cmake-utils_src_configure
-}
-
-src_compile() {
- # Work around parallel build issues, bug 507838
- cmake-utils_src_compile -j1
-}
diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.3.ebuild b/dev-db/mysql-workbench/mysql-workbench-6.3.3.ebuild
index 2ab2d4cda7ec..a7f00e2379a3 100644
--- a/dev-db/mysql-workbench/mysql-workbench-6.3.3.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-6.3.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/mysql-workbench-6.3.3.ebuild,v 1.3 2015/07/11 19:19:37 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/mysql-workbench-6.3.3.ebuild,v 1.4 2015/07/23 21:01:27 pacho Exp $
EAPI=5
GCONF_DEBUG="no"
@@ -20,7 +20,7 @@ SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz https://github.co
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
IUSE="debug doc gnome-keyring"
# glibc: deprecated mutex functions, removed in 2.36.0
diff --git a/dev-db/pgadmin3/pgadmin3-1.20.0-r1.ebuild b/dev-db/pgadmin3/pgadmin3-1.20.0-r1.ebuild
index 52bda3de9def..adaa3f969380 100644
--- a/dev-db/pgadmin3/pgadmin3-1.20.0-r1.ebuild
+++ b/dev-db/pgadmin3/pgadmin3-1.20.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/pgadmin3-1.20.0-r1.ebuild,v 1.3 2015/07/11 19:13:27 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/pgadmin3-1.20.0-r1.ebuild,v 1.4 2015/07/23 20:22:48 pacho Exp $
EAPI="5"
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.pgadmin.org/"
SRC_URI="mirror://postgresql/${PN}/release/v${PV}/src/${P}.tar.gz"
LICENSE="POSTGRESQL"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
SLOT="0"
IUSE="debug +databasedesigner"
diff --git a/dev-db/postgresql/postgresql-9.0.22.ebuild b/dev-db/postgresql/postgresql-9.0.22.ebuild
index f3151e2df7e5..5db301654447 100644
--- a/dev-db/postgresql/postgresql-9.0.22.ebuild
+++ b/dev-db/postgresql/postgresql-9.0.22.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.0.22.ebuild,v 1.4 2015/07/22 05:07:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.0.22.ebuild,v 1.6 2015/07/24 10:11:29 zlogene Exp $
EAPI="5"
@@ -13,7 +13,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4}} )
inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
systemd user versionator
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
SLOT="$(get_version_component_range 1-2)"
diff --git a/dev-db/postgresql/postgresql-9.1.18.ebuild b/dev-db/postgresql/postgresql-9.1.18.ebuild
index 45b357f09b83..725e8bf48227 100644
--- a/dev-db/postgresql/postgresql-9.1.18.ebuild
+++ b/dev-db/postgresql/postgresql-9.1.18.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.1.18.ebuild,v 1.4 2015/07/22 05:07:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.1.18.ebuild,v 1.6 2015/07/24 10:11:29 zlogene Exp $
EAPI="5"
@@ -13,7 +13,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4}} )
inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
systemd user versionator
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
SLOT="$(get_version_component_range 1-2)"
diff --git a/dev-db/postgresql/postgresql-9.2.13.ebuild b/dev-db/postgresql/postgresql-9.2.13.ebuild
index 94d891fbb7d5..01a277fc9085 100644
--- a/dev-db/postgresql/postgresql-9.2.13.ebuild
+++ b/dev-db/postgresql/postgresql-9.2.13.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.2.13.ebuild,v 1.4 2015/07/22 05:07:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.2.13.ebuild,v 1.6 2015/07/24 10:11:29 zlogene Exp $
EAPI="5"
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4}} )
inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
systemd user versionator
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
SLOT="$(get_version_component_range 1-2)"
diff --git a/dev-db/postgresql/postgresql-9.3.9.ebuild b/dev-db/postgresql/postgresql-9.3.9.ebuild
index 914536d425f1..e9434e3105a5 100644
--- a/dev-db/postgresql/postgresql-9.3.9.ebuild
+++ b/dev-db/postgresql/postgresql-9.3.9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.3.9.ebuild,v 1.3 2015/07/22 05:07:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.3.9.ebuild,v 1.5 2015/07/24 10:11:29 zlogene Exp $
EAPI="5"
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4}} )
inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
systemd user versionator
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
SLOT="$(get_version_component_range 1-2)"
diff --git a/dev-db/postgresql/postgresql-9.4.4.ebuild b/dev-db/postgresql/postgresql-9.4.4.ebuild
index d1bf62e7e53d..5ee390f51830 100644
--- a/dev-db/postgresql/postgresql-9.4.4.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.4.4.ebuild,v 1.3 2015/07/22 05:07:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.4.4.ebuild,v 1.5 2015/07/24 10:11:29 zlogene Exp $
EAPI="5"
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4}} )
inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
systemd user versionator
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
SLOT="$(get_version_component_range 1-2)"
diff --git a/dev-db/sqlite/sqlite-3.8.10.2.ebuild b/dev-db/sqlite/sqlite-3.8.10.2.ebuild
index 091061c2f1fb..3e363750d421 100644
--- a/dev-db/sqlite/sqlite-3.8.10.2.ebuild
+++ b/dev-db/sqlite/sqlite-3.8.10.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.8.10.2.ebuild,v 1.8 2015/07/20 06:43:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.8.10.2.ebuild,v 1.9 2015/07/23 19:36:05 pacho Exp $
EAPI="5"
@@ -20,7 +20,7 @@ SRC_URI="doc? ( http://sqlite.org/2015/${PN}-doc-${DOC_PV}.zip )
LICENSE="public-domain"
SLOT="3"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
diff --git a/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.7.1.ebuild b/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.7.1.ebuild
index 256e1875a788..e9ed23115a09 100644
--- a/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.7.1.ebuild
+++ b/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.7.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.7.1.ebuild,v 1.5 2015/07/03 10:18:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.7.1.ebuild,v 1.6 2015/07/23 20:33:46 pacho Exp $
EAPI=5
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
IUSE="example"
RDEPEND=">=dev-haskell/ansi-terminal-0.4.0:=[profile?] =virtual/jdk-1.6
+ test? (
+ dev-java/junit:0
+ )
+ app-arch/unzip"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}-src"
+
+java_prepare() {
+ if use test; then
+ # make test not depend on make
+ epatch "${FILESDIR}/${PN}-3.0-test.patch"
+ else
+ # don't compile test classes
+ epatch "${FILESDIR}/${PN}-3.0-notest.patch"
+ fi
+
+ cd "${S}/external" || die
+ rm -v *.jar || die
+
+ use test && java-pkg_jar-from --build-only junit
+}
+
+EANT_BUILD_TARGET="javacompile archive"
+EANT_TEST_TARGET="test"
+
+src_install() {
+ java-pkg_dojar ${PN}.jar
+ dohtml README.html || die
+
+ use doc && java-pkg_dojavadoc doc/api
+ use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/batik/batik-1.8-r1.ebuild b/dev-java/batik/batik-1.8-r1.ebuild
index dbe602bc9c04..fc9967f63ae4 100644
--- a/dev-java/batik/batik-1.8-r1.ebuild
+++ b/dev-java/batik/batik-1.8-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.8-r1.ebuild,v 1.4 2015/06/28 14:58:49 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.8-r1.ebuild,v 1.5 2015/07/24 09:46:03 monsieurp Exp $
EAPI=5
JAVA_PKG_IUSE="doc"
@@ -74,7 +74,7 @@ src_compile() {
cd "${S}"/"${P}/lib" || die
- # batik-all-1.8.jar is a all-in-one jar that contains all other jars.
+ # batik-all-1.8.jar is a all-in-one jar that contains all other jars.
# We don't want to package it.
rm -v ${PN}-all-${PV}.jar
}
diff --git a/dev-java/gnu-crypto/gnu-crypto-2.0.1-r3.ebuild b/dev-java/gnu-crypto/gnu-crypto-2.0.1-r3.ebuild
index a09b42709a33..c972654b0a01 100644
--- a/dev-java/gnu-crypto/gnu-crypto-2.0.1-r3.ebuild
+++ b/dev-java/gnu-crypto/gnu-crypto-2.0.1-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-crypto/gnu-crypto-2.0.1-r3.ebuild,v 1.4 2015/07/07 15:55:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-crypto/gnu-crypto-2.0.1-r3.ebuild,v 1.5 2015/07/23 20:15:04 pacho Exp $
EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.gnupg.org/GnuPG/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE=""
DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-lang/erlang/erlang-17.5.ebuild b/dev-lang/erlang/erlang-17.5.ebuild
index 7c824886d172..bf3b24abb897 100644
--- a/dev-lang/erlang/erlang-17.5.ebuild
+++ b/dev-lang/erlang/erlang-17.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-17.5.ebuild,v 1.2 2015/07/16 17:32:28 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-17.5.ebuild,v 1.3 2015/07/23 20:59:47 pacho Exp $
EAPI=4
WX_GTK_VER="2.8"
@@ -18,7 +18,7 @@ SRC_URI="http://www.erlang.org/download/otp_src_${PV}.tar.gz
LICENSE="ErlPL-1.1"
SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~ia64 ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE="compat-ethread doc emacs halfword hipe java kpoll odbc smp sctp ssl systemd tk wxwidgets"
RDEPEND=">=dev-lang/perl-5.6.1
diff --git a/dev-lang/ruby/ruby-2.1.6-r1.ebuild b/dev-lang/ruby/ruby-2.1.6-r1.ebuild
index e54c4de8bf1d..04adf1c87fb8 100644
--- a/dev-lang/ruby/ruby-2.1.6-r1.ebuild
+++ b/dev-lang/ruby/ruby-2.1.6-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-2.1.6-r1.ebuild,v 1.3 2015/05/24 18:25:00 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-2.1.6-r1.ebuild,v 1.4 2015/07/23 20:53:47 pacho Exp $
EAPI=5
@@ -34,7 +34,7 @@ SRC_URI="mirror://ruby/2.1/${MY_P}.tar.xz
http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl xemacs ncurses +readline"
RDEPEND="
diff --git a/dev-lang/spidermonkey/spidermonkey-1.7.0-r3.ebuild b/dev-lang/spidermonkey/spidermonkey-1.7.0-r3.ebuild
index 79b847fa3455..4cd3bdf556b9 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.7.0-r3.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.7.0-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.7.0-r3.ebuild,v 1.2 2015/07/16 15:33:24 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.7.0-r3.ebuild,v 1.3 2015/07/23 20:40:07 pacho Exp $
EAPI="5"
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/js/${MY_P}.tar.gz"
LICENSE="NPL-1.1"
SLOT="0/js"
-KEYWORDS="alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha ~amd64 ~arm ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="threadsafe unicode"
S="${WORKDIR}/js/src"
diff --git a/dev-libs/boost/boost-1.56.0-r1.ebuild b/dev-libs/boost/boost-1.56.0-r1.ebuild
index 596f590e4c69..d8c86a00e4f5 100644
--- a/dev-libs/boost/boost-1.56.0-r1.ebuild
+++ b/dev-libs/boost/boost-1.56.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.56.0-r1.ebuild,v 1.11 2015/07/17 16:04:48 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.56.0-r1.ebuild,v 1.12 2015/07/23 19:37:01 pacho Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/boost/${MY_P}.tar.bz2"
LICENSE="Boost-1.0"
SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
IUSE="context debug doc icu +nls mpi python static-libs +threads tools"
diff --git a/dev-libs/jsoncpp/jsoncpp-0.10.2-r1.ebuild b/dev-libs/jsoncpp/jsoncpp-0.10.2-r1.ebuild
index b48ac4bfb0fa..61b69b4f37ec 100644
--- a/dev-libs/jsoncpp/jsoncpp-0.10.2-r1.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-0.10.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/jsoncpp/jsoncpp-0.10.2-r1.ebuild,v 1.6 2015/07/15 17:54:08 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/jsoncpp/jsoncpp-0.10.2-r1.ebuild,v 1.7 2015/07/23 20:04:50 pacho Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz -> ${
LICENSE="|| ( public-domain MIT )"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~mips ppc64 x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~mips ppc ppc64 x86"
IUSE="doc test"
DEPEND="
diff --git a/dev-libs/libical/libical-1.0.1.ebuild b/dev-libs/libical/libical-1.0.1.ebuild
index 28b0439d1e69..d40830f44a30 100644
--- a/dev-libs/libical/libical-1.0.1.ebuild
+++ b/dev-libs/libical/libical-1.0.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libical/libical-1.0.1.ebuild,v 1.9 2015/07/16 18:02:39 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libical/libical-1.0.1.ebuild,v 1.10 2015/07/23 20:41:08 pacho Exp $
EAPI=5
inherit cmake-utils
@@ -12,7 +12,7 @@ SRC_URI="http://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
# FIGURE OUT: Why ebuild for 1.0 was marked || ( MPL-1.1 LGPL-2 ) against what COPYING file says?
LICENSE="|| ( MPL-1.0 LGPL-2.1 )"
SLOT="0/1"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="doc examples introspection static-libs"
RDEPEND="introspection? ( dev-libs/gobject-introspection )"
diff --git a/dev-libs/libp11/libp11-0.2.8-r3.ebuild b/dev-libs/libp11/libp11-0.2.8-r3.ebuild
index ef4bc37a5817..ec043371ae75 100644
--- a/dev-libs/libp11/libp11-0.2.8-r3.ebuild
+++ b/dev-libs/libp11/libp11-0.2.8-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libp11/libp11-0.2.8-r3.ebuild,v 1.8 2015/07/17 13:22:06 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libp11/libp11-0.2.8-r3.ebuild,v 1.9 2015/07/23 19:58:00 pacho Exp $
EAPI="5"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/opensc/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86"
IUSE="doc"
RDEPEND="dev-libs/openssl:0"
diff --git a/dev-libs/libuv/libuv-1.4.2.ebuild b/dev-libs/libuv/libuv-1.4.2.ebuild
index 8c5ebbc2bad1..55c2f923d954 100644
--- a/dev-libs/libuv/libuv-1.4.2.ebuild
+++ b/dev-libs/libuv/libuv-1.4.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libuv/libuv-1.4.2.ebuild,v 1.1 2015/03/05 02:18:42 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libuv/libuv-1.4.2.ebuild,v 1.2 2015/07/23 19:42:24 pacho Exp $
EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD BSD-2 ISC MIT"
SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="static-libs"
DEPEND="
diff --git a/dev-lua/lgi/lgi-0.9.0.ebuild b/dev-lua/lgi/lgi-0.9.0.ebuild
index 21e560caab91..63cef7182715 100644
--- a/dev-lua/lgi/lgi-0.9.0.ebuild
+++ b/dev-lua/lgi/lgi-0.9.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lua/lgi/lgi-0.9.0.ebuild,v 1.5 2015/07/07 14:05:53 zlogene Exp ${PV}.ebuild,v 1.7 2015/04/02 18:22:41 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lua/lgi/lgi-0.9.0.ebuild,v 1.6 2015/07/23 20:01:03 pacho Exp ${PV}.ebuild,v 1.7 2015/04/02 18:22:41 mr_bones_ Exp $
EAPI=4
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pavouk/lgi/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 arm ~ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd"
IUSE="examples test"
RDEPEND=">=dev-lang/lua-5.1
diff --git a/dev-perl/Config-General/Config-General-2.580.0.ebuild b/dev-perl/Config-General/Config-General-2.580.0.ebuild
new file mode 100644
index 000000000000..61f444ddcd55
--- /dev/null
+++ b/dev-perl/Config-General/Config-General-2.580.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Config-General/Config-General-2.580.0.ebuild,v 1.1 2015/07/23 23:40:01 dilfridge Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=TLINDEN
+MODULE_VERSION=2.58
+inherit perl-module
+
+DESCRIPTION="Config file parser module"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+ virtual/perl-File-Spec
+ virtual/perl-IO
+"
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/Config-General/Manifest b/dev-perl/Config-General/Manifest
index eb0481c81586..d91c4f84ea49 100644
--- a/dev-perl/Config-General/Manifest
+++ b/dev-perl/Config-General/Manifest
@@ -1,2 +1,3 @@
DIST Config-General-2.52.tar.gz 60471 SHA256 9937d72e0ca23cb1257092aa863eff14f8c0c993f719ef13f3920601db52351f SHA512 9a4d6fd823c58c5aba78528997b17b7db8f303dd58d1763f797cf917ebd5f3257b17afc85dcec6f5607b7fdb874dfa60b540e98366a6bb3cf6000175fb32a7c5 WHIRLPOOL f3bd43b8dbed04f5a515a54bc15e78a53e1b02cebcb0e171c538e7d2dae78785aeb08bc38462cb3677ee6588cadb687a3a6acc949f64e068f56656b686884506
DIST Config-General-2.56.tar.gz 61135 SHA256 0996c834ea2ad39ebddda9e59e62d7190ee6f2da3c5d2932c8379c0fa3eafd6b SHA512 0439d690e58fb30cafd18e3c51fb1c6226cb20017fcd260959ad0210006d0e98a32a939d314b384e5c62871c0a59400a678099e3d703d9e2ed859de20292de9a WHIRLPOOL d993894028a03f84a2e804f87df7b3d4a18f449307f7c7f619b7e306c04b79835793f0cfdcfb05a83b683abade99c43fae55c827c9f616890c9b7100a2fb358b
+DIST Config-General-2.58.tar.gz 61322 SHA256 d63cf3f4c600a87de336db806a7def0385ba5e3a9be427e0c65e407558b82eef SHA512 7a2720ca4ceb7b1cbb4556e08b1cdd16a5a721609afa7ec474803355d29aa292ad09af1ba097a57e6560413486236ac94c615268d22c0fe2923c92e7e0ddf4b7 WHIRLPOOL 546f37f2072afaba07e9bd588fa0b958164a40de0aed31e3b02659c25b2af3da39458bcad2716e461ed492785ec1c59bf972ae1f1543c7b2d8e20ef8fbebe64f
diff --git a/dev-perl/Config-IniFiles/Config-IniFiles-2.860.0.ebuild b/dev-perl/Config-IniFiles/Config-IniFiles-2.880.0.ebuild
similarity index 77%
rename from dev-perl/Config-IniFiles/Config-IniFiles-2.860.0.ebuild
rename to dev-perl/Config-IniFiles/Config-IniFiles-2.880.0.ebuild
index f9da8908c516..a38a41950180 100644
--- a/dev-perl/Config-IniFiles/Config-IniFiles-2.860.0.ebuild
+++ b/dev-perl/Config-IniFiles/Config-IniFiles-2.880.0.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Config-IniFiles/Config-IniFiles-2.860.0.ebuild,v 1.2 2015/06/13 21:41:21 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Config-IniFiles/Config-IniFiles-2.880.0.ebuild,v 1.1 2015/07/23 23:43:22 dilfridge Exp $
EAPI=5
MODULE_AUTHOR=SHLOMIF
-MODULE_VERSION=2.86
+MODULE_VERSION=2.88
inherit perl-module
DESCRIPTION="A module for reading .ini-style configuration files"
@@ -14,14 +14,15 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE="test"
+# needs List::Util and Scalar::Util
RDEPEND="
virtual/perl-Carp
virtual/perl-File-Temp
- >=dev-perl/List-MoreUtils-0.330.0
+ virtual/perl-Scalar-List-Utils
"
DEPEND="${RDEPEND}
>=dev-perl/Module-Build-0.360.0
- virtual/perl-Scalar-List-Utils
+ virtual/perl-File-Spec
test? (
virtual/perl-Test-Simple
dev-perl/Test-Pod
@@ -29,4 +30,4 @@ DEPEND="${RDEPEND}
)
"
-SRC_TEST="do"
+SRC_TEST="do parallel"
diff --git a/dev-perl/Config-IniFiles/Manifest b/dev-perl/Config-IniFiles/Manifest
index 965c246fa85b..d8a0ea8e4c37 100644
--- a/dev-perl/Config-IniFiles/Manifest
+++ b/dev-perl/Config-IniFiles/Manifest
@@ -1,3 +1,3 @@
DIST Config-IniFiles-2.83.tar.gz 72950 SHA256 11578b7ddb1b86148ef5e5091155b7c420f157837d5b9fb486c659829186827d SHA512 9494400423512613da4b35c9f263cac2dae54ab145074fd5788279e9bc4fbcf6cdc7aa40de0ace7743d5db0ea96fb04e6f637f5c97948bcb32624720498f3e3b WHIRLPOOL 0df6eaf38cd71563eee746153e84a5ec67bf43a8789bb703ebd154ec81e21c19805b9755e59aa65a13178c8f9cc14a8a5852ba3af2ee2a435034c6af5e60cd1a
-DIST Config-IniFiles-2.86.tar.gz 79705 SHA256 a290839a6370535e3795cae304ac97d7bd9409df194a30e92933b418d3c85069 SHA512 2a1c3d19b53f6fdafd0d02409281914b0c1efcaf07dee8488724229e73e3878a903c077c9cac5770f5af57209a14120f518a0b03d1d6ece4bb791347464ef075 WHIRLPOOL 544f2f0e9baebc7b564d9020d57dfda6c6c136c08b1f72c491055581f433a6965a939f13f07df54f4a5a70d9b2a8758c2a20898e4164d53f2922c5995bb45e8e
DIST Config-IniFiles-2.87.tar.gz 79919 SHA256 5e69962177b34d8b4bd2f46281d5d8b5fff2ae6d9f5dd2b874830e08bcddce43 SHA512 2ab8e8ca35fbf5eedbee35f0689d7255c077894d3f6b1127bf5d89371e9aa0f7f24f0ba0555ce34aa061cae60057d67122a37d3320408ff6bf260d6a6fdab459 WHIRLPOOL 4a185aebcbccb2e6aaba88aebb1740844372859f5920aef6bf2a729b1c8fc4b3079cf8fef759cb7604377d411fad84978abe6a297b67e6c7e0cea229182838c7
+DIST Config-IniFiles-2.88.tar.gz 80137 SHA256 8223d6d21efd752ef4f9cc1c17a9084976b66369b979ce9c895b7ca3997fa8dc SHA512 f6cd704ee60760860e3404a5f964cee367b55ab0900781c09b3d5eebb9fac6f458cf0c865a8edb1d3ec647c6923aa33e60b8a6e966fc9a6fb2f33bd9b3d73d04 WHIRLPOOL 3bedd6cd9831454958c1fdc11167254b7bde8db81cb939deb4e2621de39ce22dacd415abd35f661c3971b7ba3016ddc759270f49d857b491bcd36a42b6ca67c5
diff --git a/dev-perl/MIME-Types/MIME-Types-2.020.0.ebuild b/dev-perl/MIME-Types/MIME-Types-2.020.0.ebuild
deleted file mode 100644
index 40ac519b9293..000000000000
--- a/dev-perl/MIME-Types/MIME-Types-2.020.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/MIME-Types/MIME-Types-2.020.0.ebuild,v 1.9 2014/02/23 16:56:59 zlogene Exp $
-
-EAPI=5
-
-MODULE_AUTHOR=MARKOV
-MODULE_VERSION=2.02
-inherit perl-module
-
-DESCRIPTION="Definition of MIME types"
-
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/MIME-Types/MIME-Types-2.110.0.ebuild b/dev-perl/MIME-Types/MIME-Types-2.110.0.ebuild
new file mode 100644
index 000000000000..7f0d2ee05395
--- /dev/null
+++ b/dev-perl/MIME-Types/MIME-Types-2.110.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/MIME-Types/MIME-Types-2.110.0.ebuild,v 1.1 2015/07/23 23:47:11 dilfridge Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=MARKOV
+MODULE_VERSION=2.11
+inherit perl-module
+
+DESCRIPTION="Definition of MIME types"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE="test"
+
+# uses List::Util
+RDEPEND="
+ virtual/perl-File-Spec
+ virtual/perl-Scalar-List-Utils
+"
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? ( >=virtual/perl-Test-Simple-0.470.0 )
+"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/MIME-Types/Manifest b/dev-perl/MIME-Types/Manifest
index 14804dc678b0..ce54ea49405c 100644
--- a/dev-perl/MIME-Types/Manifest
+++ b/dev-perl/MIME-Types/Manifest
@@ -1,3 +1,3 @@
-DIST MIME-Types-2.02.tar.gz 44970 SHA256 0ae01fa3871e45ecdf889d51d3732fe24c6b3b9069fb19a5b7c34f76191124cf SHA512 6d16a151c0cd7efe34bbfff6ed9873797b79d9c4235a0696688cfbb5c97ab0ec117a0b44b72e60f24c4d0b389a5d86036c08fe874df1bb4406edfe349dd7a062 WHIRLPOOL 8bbb983d6c57518e1d5693306d211af48a3dd7af6a3045c8accc5c35c39238cf28686996a5237ee95b77f3b7bd7da684f90a93bdff72ddf3d9304428403a238f
DIST MIME-Types-2.04.tar.gz 45320 SHA256 22b6069d372d587b1f2ecc6d0aaf50fb5c64920caed8c214b9884e64538acc8f SHA512 a62f5141f18430f744ecc8f9ed946eef7414e90b749f72f87ee8002270cade376137700579c4f6d155dccac7e616b47445539f02bc9bf16de35edc48079969be WHIRLPOOL b00ae2809d224951538bcd4076ef121908e718c22d1fab74fa17638735d2d91fdabc87531263a4bea752ef17acde5a1f58ef1bbe1631f03e346760abaa98e7a6
DIST MIME-Types-2.09.tar.gz 56101 SHA256 2cccaf8fa5e3963f45106188923c98666402948a00cd9c0a15cc06d6d317fa68 SHA512 6993ebd32d0870f6a4d19a6079857ce4574b9b67fa035fa4ca787db37e6a3d2450b2ce1ac4dfa7259bcd7d397bdf2f9ff067c3fad1a7cf19ffcdaf33c6b95952 WHIRLPOOL 16d31f40bc5fabc07c3f6677116d80ef787582b9e58f495cf4d4957add3aadb5ddab7bf6cf4575e8047a0ab4092084787eab626467877b8105b20e9ec6d456d2
+DIST MIME-Types-2.11.tar.gz 56456 SHA256 8c51fd21d5c5c5b3469672faeb76caa02c77f537a3139e018ffed0e521956dec SHA512 e5f867d32f57620848054dd9871dc540aa726e74da6bf5983d159879b4efcc97b9e96eff70b65a355dffc3d4bad63532ceb75b8165a440383e1a2b2044b31db1 WHIRLPOOL ac77290e9894024e12a9cad740e237703239fe8d93276e1f8db29eecc603668011522de3653f30db6d6d20adec6039c671c09808ca4b0cf054bb941e63bb7aa7
diff --git a/dev-perl/Module-Install/Manifest b/dev-perl/Module-Install/Manifest
index 0e0818dc4d19..9dd1165273fe 100644
--- a/dev-perl/Module-Install/Manifest
+++ b/dev-perl/Module-Install/Manifest
@@ -1,3 +1,3 @@
DIST Module-Install-1.06.tar.gz 135467 SHA256 de9ec8395b3b497d6d9629859b54086643c3911dff80cc7e0e22b380cb194519 SHA512 0bc90ee5e53923af7d1bf0359587762c4a79cc35608ff38e9c4a3bb0e3fb122a596a29c3cc6e91c75e7c7670d65683ce9cb2510ca39d889676fb88c038e444fa WHIRLPOOL 022e7668c8a3190f23720d7b9f0bbe8c4a6e4f79a498d7edefe3e55f796c819f2ca3695ede05bfa61b7c2986cb8dbcc710c80e67048f6616cd7102ddba2ac1c6
-DIST Module-Install-1.12.tar.gz 128175 SHA256 3ba58f4ab7dea442501550372dfa1a72f6a6652af6fbea8a04b31adb181d5503 SHA512 b988e6cf66a592319e441210574ecdd616849b44ce02dacf03f9186122905e1e9eace6dbc35c04539beab233bc9f7783d73121711893dcc1113617c4723ec351 WHIRLPOOL 61bf310b284c6c58a8b7bd836dbbcfd4c132857018f6be559c23b6ff700a38149d624500a7d09da9d1d9f4fd24adc87817e6eaeffdbe6b72e7ec8d5fa50fc26a
DIST Module-Install-1.14.tar.gz 128795 SHA256 3f02f0a33603aff2f5cf06d15f74d1a9be65e844ada99e1a9c2102330ffa0d49 SHA512 2a2c8686b8a5b8aba6314d8434a75dca75e692d1e251bad9287fd9555bf62c5bdab52e88a64d6723f4b9bfe6b57958496869d5fbb35ca45adba4c75fd9d5cf9f WHIRLPOOL 99fb42ab9cf4211c6d41931015402f49a71d7c9d0117c5247fd4cdc7955c5e003ec64b4c37d2208f4179bc65600476a7e4a78572c2a48d50665ca69198958844
+DIST Module-Install-1.16.tar.gz 113004 SHA256 afac1264255f4d822d44f84df1aa9affad207f9ae805e803d93c845fa120025e SHA512 479a3b1a3e489c100bcb25c9f90445abcc90d194238804849b7d3ca1fa171a625b99f8390ce8967e96b10e854d843d117c70e566f12309b3ccdf32113f006422 WHIRLPOOL 909765d0acbb095ec085f8aee346cbaa515d96d08f2fdff66989d41ec59c1e38164df2b51639437b3bf71601270cbdf96e010cb2d5f52471bf5d416054402ddf
diff --git a/dev-perl/Module-Install/Module-Install-1.120.0.ebuild b/dev-perl/Module-Install/Module-Install-1.120.0.ebuild
deleted file mode 100644
index 3c82fefac417..000000000000
--- a/dev-perl/Module-Install/Module-Install-1.120.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Module-Install/Module-Install-1.120.0.ebuild,v 1.3 2015/06/13 22:18:05 dilfridge Exp $
-
-EAPI=5
-
-MODULE_AUTHOR=BINGOS
-MODULE_VERSION=1.12
-inherit perl-module
-
-DESCRIPTION="Standalone, extensible Perl module installer"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-
-RDEPEND=">=virtual/perl-File-Spec-3.28
- >=virtual/perl-Archive-Tar-1.44
- >=virtual/perl-ExtUtils-MakeMaker-6.590.0
- >=virtual/perl-ExtUtils-ParseXS-2.19
- >=dev-perl/Module-Build-0.33
- >=virtual/perl-Module-CoreList-2.17
- >=virtual/perl-Parse-CPAN-Meta-1.39
- >=dev-perl/libwww-perl-5.812
- >=dev-perl/File-Remove-1.42
- >=dev-perl/JSON-2.14
- >=dev-perl/Module-ScanDeps-0.89
- >=dev-perl/PAR-Dist-0.29
- >=dev-perl/YAML-Tiny-1.38"
-DEPEND="${RDEPEND}
- test? ( >=virtual/perl-Test-Harness-3.13
- >=virtual/perl-Test-Simple-0.86 )"
-
-SRC_TEST=do
diff --git a/dev-perl/Module-Install/Module-Install-1.160.0.ebuild b/dev-perl/Module-Install/Module-Install-1.160.0.ebuild
new file mode 100644
index 000000000000..0cc5f77f7063
--- /dev/null
+++ b/dev-perl/Module-Install/Module-Install-1.160.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Module-Install/Module-Install-1.160.0.ebuild,v 1.1 2015/07/23 23:55:14 dilfridge Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=ETHER
+MODULE_VERSION=1.16
+inherit perl-module
+
+DESCRIPTION="Standalone, extensible Perl module installer"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND="
+ >=virtual/perl-Devel-PPPort-3.160.0
+ >=virtual/perl-ExtUtils-Install-1.520.0
+ >=virtual/perl-ExtUtils-MakeMaker-6.590.0
+ >=virtual/perl-ExtUtils-ParseXS-2.190.0
+ >=dev-perl/File-Remove-1.420.0
+ >=virtual/perl-File-Spec-3.280.0
+ >=dev-perl/Module-Build-0.290.0
+ >=virtual/perl-Module-CoreList-2.170.0
+ >=dev-perl/Module-ScanDeps-1.90.0
+ >=virtual/perl-Parse-CPAN-Meta-1.441.300
+ >=dev-perl/YAML-Tiny-1.380.0
+ >=dev-perl/Archive-Zip-1.370.0
+ >=dev-perl/File-HomeDir-1
+ >=dev-perl/JSON-2.900.0
+ >=dev-perl/libwww-perl-6
+ >=dev-perl/PAR-Dist-0.290.0
+"
+
+DEPEND="${RDEPEND}
+ >=virtual/perl-ExtUtils-MakeMaker-6.590.0
+ virtual/perl-autodie
+ >=dev-perl/YAML-Tiny-1.330.0
+ test? (
+ >=virtual/perl-Test-Harness-3.130.0
+ >=virtual/perl-Test-Simple-0.860.0
+ )
+"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/Module-Locate/Manifest b/dev-perl/Module-Locate/Manifest
index 322f80bf49dd..f3d4f1e8579c 100644
--- a/dev-perl/Module-Locate/Manifest
+++ b/dev-perl/Module-Locate/Manifest
@@ -1 +1,2 @@
DIST Module-Locate-1.76.tar.gz 6574 SHA256 c249def507fc8f072e1cd10c1131b45c4f8fb0a1e6d39787539728b0d91002f5 SHA512 241fb679fe80af2360938fbf2fe0d4d20286386a3811e30c03d9daea37bbb498586122a5179bbc87994ee32f6de0b2c4211e2ba4740547f0d6f4c149a26ab70e WHIRLPOOL 171437376ce28159fd9e927a37ac0a8a99ee84173b2d73ed6aff800ed63d973959fb07c561efa40fa13dd3331b9bd92e46de48b3781b16737b5e341d036a2d6f
+DIST Module-Locate-1.79.tar.gz 7339 SHA256 64ef248ec1b0b04015a8bd63cb844ac8c9fc0631715d5892c66cc4d54f9a2da6 SHA512 5c5029c54d82e91821a07274cdf6465f1f4c6ab443f0f3a6283d2177cb0097f164ba52edab3c0b364d4eb926ea50bf4632ab1f9039ed2336559f89dade9545c2 WHIRLPOOL a6f83e1f308261d3caaa56b95adba753dc0694018b3dc51cea047e681ea08604351f0d618e9c27488c333299134b593c71ed61ac6dad15929b0f35e61696f599
diff --git a/dev-perl/Module-Locate/Module-Locate-1.790.0.ebuild b/dev-perl/Module-Locate/Module-Locate-1.790.0.ebuild
new file mode 100644
index 000000000000..a5304899aa27
--- /dev/null
+++ b/dev-perl/Module-Locate/Module-Locate-1.790.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Module-Locate/Module-Locate-1.790.0.ebuild,v 1.1 2015/07/23 23:57:19 dilfridge Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=NEILB
+MODULE_VERSION=1.79
+inherit perl-module
+
+DESCRIPTION="Locate modules in the same fashion as require and use"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE="test"
+
+RDEPEND="
+ virtual/perl-Carp
+ virtual/perl-File-Spec
+ virtual/perl-IO
+"
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? ( virtual/perl-Test-Simple )
+"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/common-sense/Manifest b/dev-perl/common-sense/Manifest
index 82f3a1ef37c5..011d492935b9 100644
--- a/dev-perl/common-sense/Manifest
+++ b/dev-perl/common-sense/Manifest
@@ -1,2 +1,3 @@
DIST common-sense-3.72.tar.gz 10985 SHA256 a4f92ec698cb4100da6295e9931e1cccac6944df49ba3a6c9bdeeb29332e099b SHA512 fbcc7c6b7173c4dcd9fc23fd4ddfa91af0eb3b1d43e8c2c9e0cc4b0ded35146b716f66fd19ee8a85307677f405d12c4eda77ee726d24177bb5e959201f08b508 WHIRLPOOL eec84712cebf0a89e0d442ade57fda37e47362736d2d8a9ea26143ef3d38abdd454bbbab9e3dee74dde48520d1a16ced63a4eaa8619231b332f02ea975e91797
DIST common-sense-3.73.tar.gz 11132 SHA256 8110c5e472641e0c218f8e023cecc1612ef66f9a1b313261fe219862efe3fd10 SHA512 a4ee55326a2c67b782f42751487bd35a96f4cd2b4439dcf2f2117ac0f21786917377360a92ab708bf060baafe5f54105387e10d96bca7df53f6cc7d6172ea1c4 WHIRLPOOL cf86df62652a0e104b2e554741d137c518439462345c1920a73f0b79c65992db72f87bb943defb886a3eb95884895246f5c3b27725836c68634c0e46aa2ce1d1
+DIST common-sense-3.74.tar.gz 13002 SHA256 771f7d02abd1ded94d9e37d3f66e795c8d2026d04defbeb5b679ca058116bbf3 SHA512 658ad70a2d1bbd0b26f91c4ea5d69b4cc0b632ede9532b88282987002a5e280f0475d63ee846b7bd2d38ef82f2680e20c2093803e4b62a984750ed447f318d60 WHIRLPOOL 5ba067e26209ad579f8ea348a51ea4e3e9959b56e8059a0233b4a28e05928ce125f74f1e75009212473b77577158c52d89efc0ebb3557da2ee702671f99ecae7
diff --git a/dev-perl/common-sense/common-sense-3.740.0.ebuild b/dev-perl/common-sense/common-sense-3.740.0.ebuild
new file mode 100644
index 000000000000..e893192d025c
--- /dev/null
+++ b/dev-perl/common-sense/common-sense-3.740.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/common-sense/common-sense-3.740.0.ebuild,v 1.1 2015/07/23 23:37:40 dilfridge Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=MLEHMANN
+MODULE_VERSION=3.74
+inherit perl-module
+
+DESCRIPTION="Save a tree AND a kitten, use common::sense!"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-solaris"
+IUSE=""
+
+DEPEND="virtual/perl-ExtUtils-MakeMaker"
+
+SRC_TEST=do
diff --git a/dev-python/foolscap/foolscap-0.7.0.ebuild b/dev-python/foolscap/foolscap-0.7.0.ebuild
index 9dfb9d13ff64..faeb45483630 100644
--- a/dev-python/foolscap/foolscap-0.7.0.ebuild
+++ b/dev-python/foolscap/foolscap-0.7.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/foolscap/foolscap-0.7.0.ebuild,v 1.3 2015/06/28 11:40:55 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/foolscap/foolscap-0.7.0.ebuild,v 1.4 2015/07/23 19:42:58 pacho Exp $
EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="http://${PN}.lothar.com/releases/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc +ssl test"
RDEPEND=">=dev-python/twisted-core-2.5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/geoip-python/geoip-python-1.3.2.ebuild b/dev-python/geoip-python/geoip-python-1.3.2.ebuild
index fefff0bb14a0..855cefcf02d2 100644
--- a/dev-python/geoip-python/geoip-python-1.3.2.ebuild
+++ b/dev-python/geoip-python/geoip-python-1.3.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/geoip-python/geoip-python-1.3.2.ebuild,v 1.3 2015/04/18 12:56:25 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/geoip-python/geoip-python-1.3.2.ebuild,v 1.4 2015/07/23 21:01:56 pacho Exp $
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/maxmind/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.ta
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ia64 ppc ~sparc ~x86 ~x86-fbsd"
IUSE="examples test"
RDEPEND=">=dev-libs/geoip-1.4.8"
diff --git a/dev-python/kombu/kombu-2.5.16.ebuild b/dev-python/kombu/kombu-2.5.16.ebuild
new file mode 100644
index 000000000000..6b2bb1827ade
--- /dev/null
+++ b/dev-python/kombu/kombu-2.5.16.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-2.5.16.ebuild,v 1.1 2015/07/24 06:12:40 prometheanfire Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3} )
+
+inherit distutils-r1
+
+DESCRIPTION="AMQP Messaging Framework for Python"
+HOMEPAGE="http://pypi.python.org/pypi/kombu https://github.com/celery/kombu"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="amqplib doc examples test"
+
+RDEPEND=">=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+ >=dev-python/py-amqp-1.3.0[${PYTHON_USEDEP}]
+ =dev-python/amqplib-1.0.2[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/django[${PYTHON_USEDEP}]
+ dev-python/beanstalkc[$(python_gen_usedep python2_7)]
+ dev-python/couchdb-python[$(python_gen_usedep python2_7)]
+ >=dev-python/sphinxcontrib-issuetracker-0.9[${PYTHON_USEDEP}] )
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_compile_all() {
+ if use doc; then
+ emake -C docs html || die "kombu docs failed installation"
+ fi
+}
+
+python_install_all() {
+ use examples && local EXAMPLES=( examples/. )
+ use doc && local HTML_DOCS=( docs/.build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/oslo-vmware/oslo-vmware-0.11.2.ebuild b/dev-python/oslo-vmware/oslo-vmware-0.11.2.ebuild
index e03f7ebc8884..f3208ff5a2f2 100644
--- a/dev-python/oslo-vmware/oslo-vmware-0.11.2.ebuild
+++ b/dev-python/oslo-vmware/oslo-vmware-0.11.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/oslo-vmware/oslo-vmware-0.11.2.ebuild,v 1.1 2015/07/23 03:33:58 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oslo-vmware/oslo-vmware-0.11.2.ebuild,v 1.2 2015/07/24 06:07:53 prometheanfire Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 python3_4 )
@@ -55,8 +55,7 @@ RDEPEND="
=dev-python/Babel-1.3[${PYTHON_USEDEP}]
>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
- >=dev-python/suds-0.4[$(python_gen_usedep 'python2*')]
- >=dev-python/suds-jurko-0.6[$(python_gen_usedep 'python3*')]
+ >=dev-python/suds-0.6[${PYTHON_USEDEP}]
>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
!~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
@@ -66,6 +65,9 @@ RDEPEND="
>=dev-python/oslo-concurrency-1.8.0[${PYTHON_USEDEP}]
=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+ =dev-python/hacking-0.8[${PYTHON_USEDEP}]
+ =dev-python/coverage-3.6[${PYTHON_USEDEP}]
+ >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+ >=dev-python/mock-1.0[${PYTHON_USEDEP}]
+ =dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+ =dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+ >=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
+ >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+ !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+ =dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+ !~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+ )"
+RDEPEND=">=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
+ =dev-python/python-keystoneclient-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/python-keystoneclient-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
+ !~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
+ >=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
+ >=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
+
+python_prepare() {
+ sed -i '/^argparse/d' requirements.txt || die
+}
+
+python_test() {
+ testr init
+ testr run --parallel || die "tests failed under python2.7"
+ flake8 cinderclient/tests || die "run by flake8 over tests folder yielded error"
+}
diff --git a/dev-python/pythondialog/pythondialog-3.2.2.ebuild b/dev-python/pythondialog/pythondialog-3.2.2.ebuild
index 4ff8c28650c7..cae366f17ea4 100644
--- a/dev-python/pythondialog/pythondialog-3.2.2.ebuild
+++ b/dev-python/pythondialog/pythondialog-3.2.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pythondialog/pythondialog-3.2.2.ebuild,v 1.3 2015/07/17 08:15:29 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythondialog/pythondialog-3.2.2.ebuild,v 1.4 2015/07/23 20:35:59 pacho Exp $
EAPI=5
PYTHON_COMPAT=( python{3_3,3_4} pypy3 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/pythondialog//${PV}/python3-${P}.tar.bz2"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~ia64 ppc ~sparc ~x86"
IUSE="doc examples"
RDEPEND="dev-util/dialog"
diff --git a/dev-python/simplejson/simplejson-3.7.2.ebuild b/dev-python/simplejson/simplejson-3.7.2.ebuild
index fbecd46c3ae8..6a221897c8e8 100644
--- a/dev-python/simplejson/simplejson-3.7.2.ebuild
+++ b/dev-python/simplejson/simplejson-3.7.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/simplejson/simplejson-3.7.2.ebuild,v 1.5 2015/07/17 06:09:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/simplejson/simplejson-3.7.2.ebuild,v 1.6 2015/07/23 21:01:04 pacho Exp $
EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="|| ( MIT AFL-2.1 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/suds-jurko/Manifest b/dev-python/suds-jurko/Manifest
deleted file mode 100644
index 5c363e1144b7..000000000000
--- a/dev-python/suds-jurko/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST suds-jurko-0.6.tar.bz2 143985 SHA256 29edb72fd21e3044093d86f33c66cf847c5aaab26d64cb90e69e528ef014e57f SHA512 ec078b159bd83c5799e293d9607138ee1da90fdc64da203999555a4324ce7be0235156d3c7ad28e46f84180a6e51e2f3f82228e5e77ae41c61ee20f3db2c916b WHIRLPOOL 9c62762f1c865cf7763d9a7332dfa9927dcb693a99414de063451a11581a7e303b19c3c0f840db339829bd59c116565fba26d98aaa520739a6aa84edaabc90aa
diff --git a/dev-python/suds-jurko/metadata.xml b/dev-python/suds-jurko/metadata.xml
deleted file mode 100644
index 292b65100c51..000000000000
--- a/dev-python/suds-jurko/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- prometheanfire@gentoo.org
- Matthew Thode
-
-
- This is hopefully just a temporary fork of the original suds Python library project created because the original project development seems to have stalled. Should be reintegrated back into the original project if it ever gets revived again.
-
-
diff --git a/dev-python/suds-jurko/suds-jurko-0.6.ebuild b/dev-python/suds-jurko/suds-jurko-0.6.ebuild
deleted file mode 100644
index 1c68d5bccd78..000000000000
--- a/dev-python/suds-jurko/suds-jurko-0.6.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/suds-jurko/suds-jurko-0.6.ebuild,v 1.2 2015/07/23 03:33:20 prometheanfire Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Lightweight SOAP client (Jurko's fork) (py3 support)"
-HOMEPAGE="http://bitbucket.org/jurko/suds"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_prepare() {
- rm -R tests
-}
diff --git a/dev-python/suds/Manifest b/dev-python/suds/Manifest
index 3518e5fab1bc..f9fbfb71a012 100644
--- a/dev-python/suds/Manifest
+++ b/dev-python/suds/Manifest
@@ -1 +1,2 @@
DIST suds-0.4.tar.gz 104013 SHA256 d5524ae523bb9e09c57bcdbd1efae2c287d20603688ea31f6020ed180a489af0 SHA512 5ec53c3e834947a394fec8d51b497d6e5824fd5e6e51addce98d552cfa692cac99e159e270d247fff98a0f669506f4c179fad3f43452600bae1db08f851dec1b WHIRLPOOL 84a63b343e96d06f85757b97c51582305ec0d6d634171260723cafc356b76266f0f2ece5f16ea6772a35a76f0587a15871e3801eb53db7171c5761d74b4ecc18
+DIST suds-0.6.tar.bz2 143985 SHA256 29edb72fd21e3044093d86f33c66cf847c5aaab26d64cb90e69e528ef014e57f SHA512 ec078b159bd83c5799e293d9607138ee1da90fdc64da203999555a4324ce7be0235156d3c7ad28e46f84180a6e51e2f3f82228e5e77ae41c61ee20f3db2c916b WHIRLPOOL 9c62762f1c865cf7763d9a7332dfa9927dcb693a99414de063451a11581a7e303b19c3c0f840db339829bd59c116565fba26d98aaa520739a6aa84edaabc90aa
diff --git a/dev-python/suds/suds-0.6.ebuild b/dev-python/suds/suds-0.6.ebuild
new file mode 100644
index 000000000000..7d3748a7f018
--- /dev/null
+++ b/dev-python/suds/suds-0.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/suds/suds-0.6.ebuild,v 1.1 2015/07/24 05:58:16 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Lightweight SOAP client (Jurko's fork) (py3 support) (active development)"
+HOMEPAGE="http://bitbucket.org/jurko/suds"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}-jurko/${PN}-jurko-${PV}.tar.bz2 -> ${P}.tar.bz2"
+S="${WORKDIR}/${PN}-jurko-${PV}"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_prepare() {
+ rm -R tests
+}
+
+python_compile() {
+ distutils-r1_python_compile
+ mv suds_jurko.egg-info suds.egg-info || die
+ sed -i -e 's/Name\:\ suds-jurko/Name:\ suds/g' -e '/^Obsoletes/d' suds.egg-info/PKG-INFO || die
+}
diff --git a/dev-python/testtools/testtools-1.8.0.ebuild b/dev-python/testtools/testtools-1.8.0.ebuild
index 7fa513db3465..a969e7143673 100644
--- a/dev-python/testtools/testtools-1.8.0.ebuild
+++ b/dev-python/testtools/testtools-1.8.0.ebuild
@@ -1,11 +1,10 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/testtools/testtools-1.8.0.ebuild,v 1.1 2015/05/27 08:24:42 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testtools/testtools-1.8.0.ebuild,v 1.2 2015/07/24 07:29:00 idella4 Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 python3_{3,4} )
-PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
diff --git a/dev-python/torment/Manifest b/dev-python/torment/Manifest
index 2e4c9195adf0..3b2a9f05e3e0 100644
--- a/dev-python/torment/Manifest
+++ b/dev-python/torment/Manifest
@@ -1,3 +1,3 @@
-DIST torment-1.0.1.tar.gz 20391 SHA256 386e7d58d53ae1dec51e11a503a848aa2fdafda3200161137eb6826461948a0c SHA512 40658c17b0435c6601b61f12cb9b58c749f8c7b423b8c29f1da5a514956bb6b7c2e87ce71c833447c2627757bb91e50b1b25bdd475d287fcb14169e0d7ea127a WHIRLPOOL 2a6ecd12a98d9984f0a652e09c44b19dcb6ec503bcbe838acfdc7da8d885f1831771bd3d0c676432974b679921555c1857b339521b60facd97bacd35b1113dda
DIST torment-2.0.0.tar.gz 23235 SHA256 6224b8d426245b9d7764157807587d65fcf41a9b5cebbd1cf8f0f7e617ff1169 SHA512 dddf6e4a2d40333b66a50e45f7acd1fb8f7d89e9db750a9e4b5fd10c8e79b67542b6f352d89e6fa81280954c152dde732304b1af3e6f63cee3ecd2bfa68fc100 WHIRLPOOL 0276fefa72ba3a84a14983ad687ba26128af30b4daf7413e0ad505b761bd65e980bee07ae3d4bd17ffb14e06a219d2086ceff80cde9295838bfff025acde9175
DIST torment-2.0.1.tar.gz 23272 SHA256 882f33063ade787ea94ee7b69755632b2a28b26502441732bb381eb6adbe5e6c SHA512 a14645d945c9efe1a84005d098f7ea9a108316295d900c9b78746dc7b2472d9062be6de27f6cfbb4a35e36f118fc768a09a9eab414174fdabd07d895f5fb1a53 WHIRLPOOL e444c27873224751d5fb067c949e27cfcaf54f2ef49b083cc8af6b66ac93485e4f0559c36d6b047896651e04db73a244a7e019b469217acc89c069a0535e5ab6
+DIST torment-2.0.2.tar.gz 23291 SHA256 09950e60289921cd21403f00b1dc5643dd1c143b6e963bd0ca1e7a6928b18425 SHA512 4f0cbfd080053cc7a8f4556012516d8e7647d6f42e232288b24e84fafdcb36a5098f1e24b734ca62d2e4ce34883e25fdc94795b71835ad3863af670edc200853 WHIRLPOOL 1a3b7e352d2e1667d2b513b8810b58cf01cc15d4439b6a3f2b578d88928b1d687d6e60037e061e3dd412a064dca65909a191e93785bbfa5285a023d8d548ba15
diff --git a/dev-python/torment/torment-1.0.1.ebuild b/dev-python/torment/torment-2.0.2.ebuild
similarity index 89%
rename from dev-python/torment/torment-1.0.1.ebuild
rename to dev-python/torment/torment-2.0.2.ebuild
index 02de81ab1844..3ba21c5cee9a 100644
--- a/dev-python/torment/torment-1.0.1.ebuild
+++ b/dev-python/torment/torment-2.0.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/torment/torment-1.0.1.ebuild,v 1.1 2015/07/21 15:57:52 alunduil Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/torment/torment-2.0.2.ebuild,v 1.1 2015/07/23 22:59:42 alunduil Exp $
EAPI=5
PYTHON_COMPAT=( python3_3 python3_4 )
diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index e2493f43ad86..ab474ac6f917 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -1,4 +1,5 @@
DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
+DIST qtwebkit-2.3.4.tar.gz 51648808 SHA256 c6cfa9d068f7eb024fee3f6c24f5b8b726997f669007587f35ed4a97d40097ca SHA512 f7aa3762f84b8ef6c75ceb40beaad750b5c09bb3f14964cda17b42f489ff2c876e35678b57404057e909948160450a144de67ad1337a42992dc5a1d4b796bec4 WHIRLPOOL 1d8e78a8d7f920b132ed79dbc6a6a71b784080d8aa4b9123f22797efa6062eb4f85236ab66f3232900a131049d7c78fc5fc333511b161dc72c30434cd7fef542
DIST qtwebkit-opensource-src-5.4.2.tar.xz 33460988 SHA256 3e4243e14001f47b8842f72287728b731f8b62b480bd72a1b0e2a9cfe25dce6d SHA512 edb0a8ad63f70d85324af08f46070cc386fd27ff858f590a592f71583cddade897b305527ec3bb8d7a4d491c9d141af04d783ea101e6c40f683df16297652ff3 WHIRLPOOL 49490e7633e8e95abf4d3f0f17b173e40b7df0ce658d56f87dfd4bc73ab9700823e7ea7d5e9c61edb5a06552df5ead701b059d14a8074afa4bad22f77b622fea
diff --git a/dev-qt/qtwebkit/files/4.10.4-use-correct-icu-typedef.patch b/dev-qt/qtwebkit/files/4.10.4-use-correct-icu-typedef.patch
new file mode 100644
index 000000000000..3e4816255fed
--- /dev/null
+++ b/dev-qt/qtwebkit/files/4.10.4-use-correct-icu-typedef.patch
@@ -0,0 +1,40 @@
+From 916f00008b602ae1b260106e7fb1274d2282f61f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Kundr=C3=A1t?=
+Date: Tue, 3 Sep 2013 16:59:35 +0200
+Subject: [PATCH] ICU has defined UChar32 to be an int32_t since 2002
+
+This fixes the build failure of qtwebkit23 on my Gentoo machine.
+---
+ Source/WTF/wtf/unicode/qt4/UnicodeQt4.h | 2 +-
+ Source/WTF/wtf/unicode/wchar/UnicodeWchar.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Source/WTF/wtf/unicode/qt4/UnicodeQt4.h b/Source/WTF/wtf/unicode/qt4/UnicodeQt4.h
+index a2d1ad4..392d2db 100644
+--- a/Source/WTF/wtf/unicode/qt4/UnicodeQt4.h
++++ b/Source/WTF/wtf/unicode/qt4/UnicodeQt4.h
+@@ -69,7 +69,7 @@ typedef uint16_t UChar;
+ #endif
+
+ #if !USE(ICU_UNICODE)
+-typedef uint32_t UChar32;
++typedef int32_t UChar32;
+ #endif
+
+ namespace WTF {
+diff --git a/Source/WTF/wtf/unicode/wchar/UnicodeWchar.h b/Source/WTF/wtf/unicode/wchar/UnicodeWchar.h
+index 10c2026..db8944e 100644
+--- a/Source/WTF/wtf/unicode/wchar/UnicodeWchar.h
++++ b/Source/WTF/wtf/unicode/wchar/UnicodeWchar.h
+@@ -31,7 +31,7 @@
+ #include
+
+ typedef wchar_t UChar;
+-typedef uint32_t UChar32;
++typedef int32_t UChar32;
+
+ namespace WTF {
+ namespace Unicode {
+--
+1.7.1
+
diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml
index 0ca02a93e967..8640de507d56 100644
--- a/dev-qt/qtwebkit/metadata.xml
+++ b/dev-qt/qtwebkit/metadata.xml
@@ -5,8 +5,8 @@