diff --git a/app-admin/collectd/metadata.xml b/app-admin/collectd/metadata.xml
index 565ba3c074db..5f027424cee4 100644
--- a/app-admin/collectd/metadata.xml
+++ b/app-admin/collectd/metadata.xml
@@ -4,12 +4,6 @@
whissi@gentoo.org
Thomas Deutschmann
- Primary maintainer
-
-
- bugs@bergstroem.nu
- Johan Bergström
- Proxy maintainer; CC him on bugs
Collectd gathers statistics about the system it is running on and stores this
diff --git a/app-admin/mms-agent/metadata.xml b/app-admin/mms-agent/metadata.xml
index 13663f799b51..153f98e5eac6 100644
--- a/app-admin/mms-agent/metadata.xml
+++ b/app-admin/mms-agent/metadata.xml
@@ -5,15 +5,6 @@
ultrabug@gentoo.org
Alexys Jacob
-
- bugs@bergstroem.nu
- Johan Bergström
- Proxied maintainer; set to assignee in all bugs
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
MongoDB MMS agents collection.
diff --git a/app-admin/mongo-tools/metadata.xml b/app-admin/mongo-tools/metadata.xml
index a7d803f29f2b..7a01cd8f7c90 100644
--- a/app-admin/mongo-tools/metadata.xml
+++ b/app-admin/mongo-tools/metadata.xml
@@ -5,15 +5,6 @@
ultrabug@gentoo.org
Alexys Jacob
-
- bugs@bergstroem.nu
- Johan Bergström
- Proxied maintainer; set to assignee in all bugs
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
MongoDB operation tools such as mongodump, mongoexport, mongorestore, bsondump...
diff --git a/app-admin/puppet-lint/puppet-lint-2.0.2.ebuild b/app-admin/puppet-lint/puppet-lint-2.0.2.ebuild
index 019ceaea090f..cc7f9826db1a 100644
--- a/app-admin/puppet-lint/puppet-lint-2.0.2.ebuild
+++ b/app-admin/puppet-lint/puppet-lint-2.0.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://puppet-lint.com/"
LICENSE="MIT"
SLOT="0"
IUSE=""
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
ruby_add_bdepend "test? (
dev-ruby/rspec-its:1
diff --git a/app-misc/beanstalkd/metadata.xml b/app-misc/beanstalkd/metadata.xml
index c55ced297870..f0352343e9be 100644
--- a/app-misc/beanstalkd/metadata.xml
+++ b/app-misc/beanstalkd/metadata.xml
@@ -5,10 +5,6 @@
patrick@gentoo.org
Patrick Lauer
-
- bugs@bergstroem.nu
- Johan Bergstroem
-
beanstalked is a fast distributed workqueue service
diff --git a/app-misc/ignuit/Manifest b/app-misc/ignuit/Manifest
index 0d64423fde3c..cc3333d7034a 100644
--- a/app-misc/ignuit/Manifest
+++ b/app-misc/ignuit/Manifest
@@ -1 +1,2 @@
DIST ignuit-2.20.0.tar.gz 541546 SHA256 5dc75cef0707677421c272c430cebf5c3730cbcfaeba6428fe14f6bd085d3630 SHA512 3d3a786ce87e252b1529ba427da52356d43554da6c23dfd3353f91b2c3962a83769431794c433c8ba8478ef48b8ef470a042416c5d2b2c0683711b09c959e106 WHIRLPOOL d93d2acb472bd23721c866f7231d301da8d9ee1f6894d51e1166bdc538ce0b99af2d3a79dd27ca72fd7ca6ab9a5a8b6aefd97d0219292e893ada9bdb7e8dd649
+DIST ignuit-2.24.2.tar.gz 572815 SHA256 71d6b21f75a927ab733084603659cf8e0360cad8f83fef62853d96ed7834eebe SHA512 d77f8a08d8f48c6319a600cda29a12cbd66e6fd884093e3d9fd983e349abce27d8d33276d8835f46e8a2c6fa4fb267929a47c0f99768d1ca774d07319b33195a WHIRLPOOL 06f2eaa4265977b8d075764c76905d993ac11668b098473bfec25477ce6b44e785a6845bd6fff72fd2f574666f1ccb54523416ac59098d0cae663dab61585000
diff --git a/app-misc/ignuit/ignuit-2.24.2.ebuild b/app-misc/ignuit/ignuit-2.24.2.ebuild
new file mode 100644
index 000000000000..57cf3e1cf3bd
--- /dev/null
+++ b/app-misc/ignuit/ignuit-2.24.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools gnome2
+
+DESCRIPTION="Memorization aid based on the Leitner flashcard system"
+HOMEPAGE="http://homepages.ihug.co.nz/~trmusson/programs.html#ignuit"
+SRC_URI="http://homepages.ihug.co.nz/~trmusson/stuff/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="examples"
+
+RDEPEND="
+ app-text/dvipng
+ >=app-text/gnome-doc-utils-0.3.2
+ dev-libs/glib:2
+ dev-libs/libxml2:2
+ >=dev-libs/libxslt-1.1.28
+ >=gnome-base/libgnomeui-2.24.5
+ >=gnome-base/gconf-3.2.6:2
+ gnome-base/libglade:2.0
+ >=media-libs/gstreamer-0.10.36:0.10
+ x11-libs/gtk+:2
+ x11-libs/pango
+ virtual/latex-base
+"
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.50.0
+ sys-devel/gettext
+"
+
+src_prepare() {
+ eautoreconf # Needed to fix bogus intltool rules
+ gnome2_src_prepare
+}
+
+src_install() {
+ gnome2_src_install
+ if use examples; then
+ insinto /usr/share/doc/${PF}
+ doins -r examples
+ fi
+}
diff --git a/app-office/glabels/Manifest b/app-office/glabels/Manifest
index 6fe1db1f76a9..be81548805b3 100644
--- a/app-office/glabels/Manifest
+++ b/app-office/glabels/Manifest
@@ -1,2 +1 @@
-DIST glabels-3.2.1.tar.xz 3368052 SHA256 db615f653b6e78ef1209814b5e6d8d3af4f8d3444a259ddbcc0dfb279c7df855 SHA512 d68fab2697cc596d45fe19c0a4c02a7bceffcb12ff72d71aaff565c62e95afeab6c2cc5b0eb00581c992b576b7ffe81d7b7a0763be2044186ba07929de78a266 WHIRLPOOL 3c0c9d1fba0548442d19a3271f466c1cf84db361d527da4b6c00d231c56a6fb7c1c61b4015d640e805878b7774ba89920c3c4ebc19b2f3fb1049d9bef12bbbc7
DIST glabels-3.4.0.tar.xz 3412796 SHA256 d40e079395d30adbcd8204f41d08f7a8da9ec130bffa4cb3c130fbe2322b6410 SHA512 ae67474645b58418c75cd186c088ce7ec6916192d5dd207f429fe8e0f37ba34e467a6d707352ee120fd47e551d793545968dd916bf4f635a75dff094b1f86357 WHIRLPOOL fd8a9fa8b6f05a3fafb5ef17aaf4542389b7fca2f5e7a08c6fbd59cbfa041fa2addc0f53f3d209dbdcc474a6edc3f8d24ca9415d06cef540d9d9a67255ce79ee
diff --git a/app-office/glabels/glabels-3.2.1.ebuild b/app-office/glabels/glabels-3.2.1.ebuild
deleted file mode 100644
index 8d3a9b48a82c..000000000000
--- a/app-office/glabels/glabels-3.2.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2
-
-DESCRIPTION="Program for creating labels and business cards"
-HOMEPAGE="http://www.glabels.org/"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE="barcode eds"
-
-RDEPEND="
- >=dev-libs/glib-2.28.2:2
- >=x11-libs/gtk+-3.0.9:3
- >=dev-libs/libxml2-2.7.8:2
- >=gnome-base/librsvg-2.32.0:2
- >=x11-libs/cairo-1.10.0
- >=x11-libs/pango-1.28.1
- barcode? (
- >=app-text/barcode-0.98
- >=media-gfx/qrencode-3.1 )
- eds? ( >=gnome-extra/evolution-data-server-2.30.3:= )
-"
-DEPEND="${RDEPEND}
- app-text/scrollkeeper
- app-text/docbook-xml-dtd:4.1.2
- app-text/yelp-tools
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.28
- virtual/pkgconfig
-"
-
-src_configure() {
- gnome2_src_configure \
- $(use_with eds libebook) \
- --disable-static
-}
diff --git a/app-office/mdbtools/mdbtools-0.7.1-r1.ebuild b/app-office/mdbtools/mdbtools-0.7.1-r1.ebuild
deleted file mode 100644
index c10673da33d2..000000000000
--- a/app-office/mdbtools/mdbtools-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1 # needed for proper man generation
-inherit autotools-utils
-
-DESCRIPTION="A set of libraries and utilities for reading Microsoft Access database (MDB) files"
-HOMEPAGE="http://mdbtools.sourceforge.net"
-SRC_URI="https://github.com/brianb/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-IUSE="gnome odbc static-libs"
-
-RDEPEND="
- dev-libs/glib:2
- sys-libs/ncurses
- sys-libs/readline:0
- gnome? (
- app-text/scrollkeeper
- gnome-base/libglade:2.0
- gnome-base/libgnomeui
- )
- odbc? ( >=dev-db/unixODBC-2.0 )"
-DEPEND="${RDEPEND}
- app-text/txt2man
- sys-devel/flex
- virtual/pkgconfig
- virtual/yacc"
-
-DOCS=( AUTHORS ChangeLog HACKING NEWS README TODO )
-
-PATCHES=( "${FILESDIR}/${P}-parallel-make.patch" )
-
-src_configure() {
- local myeconfargs=(
- --disable-gtk-doc
- $(use_enable gnome gmdb2)
- $(use odbc && echo "--with-unixodbc=${EPREFIX}/usr")
- )
- autotools-utils_src_configure
-}
diff --git a/app-office/mdbtools/mdbtools-0.7.1.ebuild b/app-office/mdbtools/mdbtools-0.7.1-r2.ebuild
similarity index 80%
rename from app-office/mdbtools/mdbtools-0.7.1.ebuild
rename to app-office/mdbtools/mdbtools-0.7.1-r2.ebuild
index a54cd1b751ca..cddecbb419fa 100644
--- a/app-office/mdbtools/mdbtools-0.7.1.ebuild
+++ b/app-office/mdbtools/mdbtools-0.7.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -8,7 +8,7 @@ AUTOTOOLS_AUTORECONF=1
AUTOTOOLS_IN_SOURCE_BUILD=1 # needed for proper man generation
inherit autotools-utils
-DESCRIPTION="A set of libraries and utilities for reading Microsoft Access database (MDB) files"
+DESCRIPTION="Set of libraries and utilities for reading Microsoft Access database (MDB) files"
HOMEPAGE="http://mdbtools.sourceforge.net"
SRC_URI="https://github.com/brianb/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
@@ -20,8 +20,8 @@ IUSE="gnome odbc static-libs"
RDEPEND="
dev-libs/glib:2
- sys-libs/ncurses
- sys-libs/readline:0
+ sys-libs/ncurses:0=
+ sys-libs/readline:0=
gnome? (
gnome-base/libglade:2.0
gnome-base/libgnomeui
@@ -31,7 +31,9 @@ DEPEND="${RDEPEND}
app-text/txt2man
sys-devel/flex
virtual/pkgconfig
- virtual/yacc"
+ virtual/yacc
+ gnome? ( app-text/rarian )
+"
DOCS=( AUTHORS ChangeLog HACKING NEWS README TODO )
diff --git a/app-office/planner/planner-0.14.6_p20130520.ebuild b/app-office/planner/planner-0.14.6_p20130520.ebuild
index 279f9f00fbd9..9a7eabfb8cc3 100644
--- a/app-office/planner/planner-0.14.6_p20130520.ebuild
+++ b/app-office/planner/planner-0.14.6_p20130520.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="5"
-GCONF_DEBUG="no"
+EAPI=6
GNOME2_LA_PUNT="yes"
PYTHON_COMPAT=( python2_7 )
inherit gnome2 python-single-r1
DESCRIPTION="Project manager for Gnome"
-HOMEPAGE="https://live.gnome.org/Planner/"
+HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Planner"
SRC_URI="https://dev.gentoo.org/~eva/distfiles/${PN}/${P}.tar.xz"
SLOT="0"
LICENSE="GPL-2"
KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
+
IUSE="eds examples python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -33,10 +33,10 @@ RDEPEND="
>=dev-python/pygtk-2.6:2[${PYTHON_USEDEP}] )
eds? (
>=gnome-extra/evolution-data-server-3.6:=
- >=mail-client/evolution-3.6 )"
-
+ >=mail-client/evolution-3.6 )
+"
DEPEND="${RDEPEND}
- app-text/scrollkeeper
+ app-text/rarian
dev-util/gtk-doc-am
>=dev-util/intltool-0.35.5
gnome-base/gnome-common
diff --git a/app-portage/repoman/files/repoman-2.3.0-bug-586864.patch b/app-portage/repoman/files/repoman-2.3.0-bug-586864.patch
new file mode 100644
index 000000000000..adba72fdcc57
--- /dev/null
+++ b/app-portage/repoman/files/repoman-2.3.0-bug-586864.patch
@@ -0,0 +1,32 @@
+From ef33db45a0c1d462411d4ced1857a322c0ab28f6 Mon Sep 17 00:00:00 2001
+From: Zac Medico
+Date: Thu, 23 Jun 2016 23:22:41 -0700
+Subject: repoman: skip QA checks in manifest mode (bug 586864)
+
+The relevent Scanner loop control logic broke in commit 4062c69dc27a
+because it was relying on the return value from the Manifest module's
+"check" method.
+
+Fixes: 4062c69dc27a ("repoman: Move manifest generation to modules/commit/manifest.py")
+X-Gentoo-Bug: 586864
+X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=586864
+---
+ pym/repoman/scanner.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
+index d7cd81f..8999751 100644
+--- a/pym/repoman/scanner.py
++++ b/pym/repoman/scanner.py
+@@ -294,6 +294,8 @@ class Scanner(object):
+
+ if self.generate_manifest:
+ manifest.Manifest(**self.kwargs).update_manifest(checkdir)
++ if self.options.mode == 'manifest':
++ continue
+ checkdirlist = os.listdir(checkdir)
+
+ dynamic_data = {
+--
+cgit v0.12
+
diff --git a/app-portage/repoman/repoman-2.3.0-r2.ebuild b/app-portage/repoman/repoman-2.3.0-r2.ebuild
new file mode 100644
index 000000000000..aa0f82ac85d3
--- /dev/null
+++ b/app-portage/repoman/repoman-2.3.0-r2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_REQ_USE='bzip2(+)'
+
+inherit distutils-r1
+
+DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="
+ !=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.3.0-bug-586864.patch )
+
+python_prepare_all() {
+ distutils-r1_python_prepare_all
+
+ if [[ -n "${EPREFIX}" ]] ; then
+ einfo "Prefixing shebangs ..."
+
+ local file
+ while read -r -d $'\0' file; do
+ local shebang=$(head -n1 "${file}")
+
+ if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+ sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "${file}" || \
+ die "sed failed"
+ fi
+ done < <(find . -type f -print0)
+ fi
+}
+
+python_test() {
+ esetup.py test
+}
+
+python_install() {
+ # Install sbin scripts to bindir for python-exec linking
+ # they will be relocated in pkg_preinst()
+ distutils-r1_python_install \
+ --system-prefix="${EPREFIX}/usr" \
+ --bindir="$(python_get_scriptdir)" \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+ --sbindir="$(python_get_scriptdir)" \
+ --sysconfdir="${EPREFIX}/etc" \
+ "${@}"
+}
+
+pkg_postinst() {
+ einfo ""
+ einfo "This release of repoman is from the new portage/repoman split"
+ einfo "release code base."
+ einfo "This new repoman code base is still being developed. So its API's"
+ einfo "are not to be considered stable and are subject to change."
+ einfo "The code released has been tested and considered ready for use."
+ einfo "This however does not guarantee it to be completely bug free."
+ einfo "Please report any bugs you may encounter."
+ einfo ""
+}
diff --git a/app-text/xapian-omega/metadata.xml b/app-text/xapian-omega/metadata.xml
index 3544284ecc6f..d920e3ba3e56 100644
--- a/app-text/xapian-omega/metadata.xml
+++ b/app-text/xapian-omega/metadata.xml
@@ -5,12 +5,4 @@
blueness@gentoo.org
Anthony G. Basile
-
- bugs@bergstroem.nu
- Johan Bergström
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
diff --git a/dev-db/kyotocabinet/metadata.xml b/dev-db/kyotocabinet/metadata.xml
index 86f6ff0665d0..40aa45df2b01 100644
--- a/dev-db/kyotocabinet/metadata.xml
+++ b/dev-db/kyotocabinet/metadata.xml
@@ -5,12 +5,4 @@
patrick@gentoo.org
Patrick Lauer
-
- bugs@bergstroem.nu
- Johan Bergström
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
diff --git a/dev-db/libzdb/metadata.xml b/dev-db/libzdb/metadata.xml
index 7646f959efb5..e97f3c9a8559 100644
--- a/dev-db/libzdb/metadata.xml
+++ b/dev-db/libzdb/metadata.xml
@@ -5,13 +5,4 @@
lordvan@gentoo.org
Thomas Raschbacher
-
- bugs@bergstroem.nu
- Johan Bergström
- Proxy Maintainer. CC on bugs
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
diff --git a/dev-libs/bitset/metadata.xml b/dev-libs/bitset/metadata.xml
index 0eb21971ae87..d1af046aa04c 100644
--- a/dev-libs/bitset/metadata.xml
+++ b/dev-libs/bitset/metadata.xml
@@ -1,19 +1,9 @@
-
- bugs@bergstroem.nu
- Johan Bergström
- Maintainer. Assign bugs to him
-
pinkbyte@gentoo.org
Sergey Popov
- Proxy maintainer. CC him on bugs
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers