Sync with portage [Wed Jun 10 11:04:43 MSK 2015].

2015-06-10 11:04:44 +03:00 · 2015-06-10 11:04:44 +03:00 · 5e8600fcb2
commit 5e8600fcb2
parent f48401894b
2125 changed files with 20015 additions and 11529 deletions
--- a/app-accessibility/at-spi2-atk/Manifest
+++ b/app-accessibility/at-spi2-atk/Manifest
@ -1,2 +1,3 @@
 DIST at-spi2-atk-2.12.1.tar.xz 280568 SHA256 5fa9c527bdec028e06797563cd52d49bcf06f638549df983424d88db89bb1336 SHA512 a7fc3cbc3665741ea6cee716cc68467ed110c0f6425fe418ea0f1b702931e4a07306e48264e9cd160d98c5bf762f076cad66ff2e46690af226ce33146d11aee2 WHIRLPOOL dc84563059d24ae56029989853d9e5a9a8cca5eecbed1227c4e36cd760aed4035beefbb71668221646cbd03057f1e30e44128081e2a6b32cfe48baabf4a631e5
 DIST at-spi2-atk-2.14.1.tar.xz 280952 SHA256 058f34ea60edf0a5f831c9f2bdd280fe95c1bcafb76e466e44aa0fb356d17bcb SHA512 1daee942d3c477444aaa42fb6ede6d821ff9b613f0686dd4a545406c97ceb819a3544419e0cb5d2e661f3a1b6fc92af9394801f3c51377db0ab77620e5c3d437 WHIRLPOOL 75d7e4569eed83df842e363c6203571b7bc26dbfdd71555ead0c1656eb61923817673ce18f8042c4a989a45af956ad9fd85aee5386c8aafb121bf71de99c04c6
+DIST at-spi2-atk-2.16.0.tar.xz 286668 SHA256 78efc45ec36383bf785f8636e64a8d866defeb020e00a08f92978f1fc3772ff9 SHA512 fcd40693e5ef55c640a52158996dc8bc66f53ef211c343cd5401c4bcd1669110ea836e0550eb41caee9c9f3a4f9670095a7dd8252600af943ddcb374bf50f011 WHIRLPOOL 0865cb8bfd62449bf345938a382c2a7d8efd425154e7e674c8097702e6873d98b8d2be8ac841858ba7dce166c2be4e18be1b1daf4fed43f667430ac3eeccebe2
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.16.0.ebuild
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.16.0.ebuild
@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.16.0.ebuild,v 1.1 2015/06/09 09:52:47 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2 multilib-minimal virtualx
+
+DESCRIPTION="Gtk module for bridging AT-SPI to Atk"
+HOMEPAGE="http://live.gnome.org/Accessibility"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="test"
+
+COMMON_DEPEND="
+	>=app-accessibility/at-spi2-core-2.15.5[${MULTILIB_USEDEP}]
+	>=dev-libs/atk-2.15.4[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
+	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
+"
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-extra/at-spi-1.32.0-r1
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-gtklibs-20140508-r3
+		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	test? ( >=dev-libs/libxml2-2.9.1 )
+"
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure --enable-p2p $(use_with test tests)
+}
+
+multilib_src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check
+}
+
+multilib_src_compile() { gnome2_src_compile; }
+multilib_src_install() { gnome2_src_install; }
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@ -1,3 +1,3 @@
-DIST at-spi2-core-2.10.2.tar.xz 446272 SHA256 d3da58f84f4c8e4d5fe940ecb52fb27b4d9ea2b4dcdb3e1fae0f46b5eaa2dde1 SHA512 51b3ec2f77933622ad3aa52e2bd91cab3a7ffbc396e1ec01a52ea277e5cbc972ab0998d3a54deeaf18fc67c5767c1958d4a0ff6bdc77768ca3a51b567013d5da WHIRLPOOL 480ab9c3c037e53f220abc42be9f09ea179a19de62b640efe0697ced1c04122d387eff8fc3fe7e359ea853de4415a3eddc42aa3fa18a00ddb57a1fa426a030e6
 DIST at-spi2-core-2.12.0.tar.xz 454668 SHA256 db550edd98e53b4252521459c2dcaf0f3b060a9bad52489b9dbadbaedad3fb89 SHA512 955249568e28441201d0a079e26bd703e21716b9189e372bfa20cda70e1079bbb51f62246cdeb1b914953f448e0432b749d402d723710247f2a1b8b343b37ccc WHIRLPOOL 67870b40b3c0e343b3119bae93b23540f8ab2c71137d033c9b4ee000d28a4c66353dae8a72d815367ac8b291471dd3c21d985a0cdd4c6812e43f95ca1931010a
 DIST at-spi2-core-2.14.1.tar.xz 456272 SHA256 eef9660b14fdf0fb1f30d1be7c72d591fa7cbb87b00ca3a444425712f46ce657 SHA512 263f2353961787b510a22ede6243ebd6f9eba7fe00740b252ba372e78a2b4a20bd6ed1a9f509b2e33342fc5516d1e8b95f886573d51962755e51584771ac86b9 WHIRLPOOL 54d02cd41f1039c3b166c01215d983b768011c99b81831fc3256a4dde66b3a2fbff7b0fafa4958bbce367fee164c5f5c90531de11f57d65a1972af009b5afd62
+DIST at-spi2-core-2.16.0.tar.xz 455264 SHA256 1c0b77fb8ce81abbf1d80c0afee9858b3f9229f673b7881995fe0fc16b1a74d0 SHA512 b61cb6dad15e2a6f6cd4788e6b63fed37d0098a56d1417b43aed2ba111a7dd7fccbe7c393f0be794bcaf900f38decbd3974c36e395548000d429086f8717df57 WHIRLPOOL 556c504ba9aef2e4ad2b63e3b4d0417ce24a49fafd45287cf3d669612c2d23058f3e7b373a69a569d63938a0333b62d5c601e8a0f1f4b78d0252bea4b64ede3e
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.10.2.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.10.2.ebuild
@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-core/at-spi2-core-2.10.2.ebuild,v 1.14 2014/04/21 10:28:26 ago Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2
-
-DESCRIPTION="D-Bus accessibility specifications and registration daemon"
-HOMEPAGE="http://live.gnome.org/Accessibility"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-IUSE="+X +introspection"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos"
-
-# x11-libs/libSM is needed until upstream #719808 is solved either
-# making the dep unneeded or fixing their configure
-# Only libX11 is optional right now
-RDEPEND="
-	>=dev-libs/glib-2.28:2
-	>=sys-apps/dbus-1
-	x11-libs/libSM
-	x11-libs/libXi
-	x11-libs/libXtst
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
-	X? ( x11-libs/libX11 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# disable teamspaces test since that requires Novell.ICEDesktop.Daemon
-	epatch "${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# xevie is deprecated/broken since xorg-1.6/1.7
-	gnome2_src_configure \
-		--disable-xevie \
-		$(use_enable introspection) \
-		$(use_enable X x11)
-}
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.16.0.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.16.0.ebuild
@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-core/at-spi2-core-2.16.0.ebuild,v 1.1 2015/06/09 09:52:21 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2 multilib-minimal
+
+DESCRIPTION="D-Bus accessibility specifications and registration daemon"
+HOMEPAGE="http://live.gnome.org/Accessibility"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+IUSE="+X +introspection"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+
+# x11-libs/libSM is needed until upstream #719808 is solved either
+# making the dep unneeded or fixing their configure
+# Only libX11 is optional right now
+COMMON_DEPEND="
+	>=dev-libs/glib-2.36:2[${MULTILIB_USEDEP}]
+	>=sys-apps/dbus-1[${MULTILIB_USEDEP}]
+	x11-libs/libSM[${MULTILIB_USEDEP}]
+	x11-libs/libXi[${MULTILIB_USEDEP}]
+	x11-libs/libXtst[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
+	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-gtklibs-20140508-r3
+		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+
+src_prepare() {
+	# disable teamspaces test since that requires Novell.ICEDesktop.Daemon
+	epatch "${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	# xevie is deprecated/broken since xorg-1.6/1.7
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--disable-xevie \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable X x11)
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi; then
+		ln -s "${S}"/doc/libatspi/html doc/libatspi/html || die
+	fi
+}
+
+multilib_src_compile() { gnome2_src_compile; }
+multilib_src_install() { gnome2_src_install; }
--- a/app-accessibility/festival/festival-2.1.ebuild
+++ b/app-accessibility/festival/festival-2.1.ebuild
@ -1,123 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-2.1.ebuild,v 1.13 2012/12/28 18:19:42 ulm Exp $
-
-EAPI="2"
-inherit eutils multilib toolchain-funcs user
-
-MY_PV="${PV}-release"
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Festival Text to Speech engine"
-HOMEPAGE="http://www.cstr.ed.ac.uk/projects/festival/"
-SITE="http://www.festvox.org/packed/${PN}/${PV}"
-SRC_URI="${SITE}/${MY_P}.tar.gz
-	${SITE}/festlex_CMU.tar.gz
-	${SITE}/festlex_OALD.tar.gz
-	${SITE}/festlex_POSLEX.tar.gz
-	${SITE}/festvox_cmu_us_awb_cg.tar.gz
-	${SITE}/festvox_cmu_us_rms_cg.tar.gz
-	${SITE}/festvox_cmu_us_slt_arctic_hts.tar.gz
-	${SITE}/festvox_rablpc16k.tar.gz
-	${SITE}/festvox_kallpc16k.tar.gz
-	${SITE}/speech_tools-${MY_PV}.tar.gz"
-
-LICENSE="FESTIVAL HPND BSD rc regexp-UofT free-noncomm"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="~app-accessibility/speech-tools-2.1
-		>=sys-libs/ncurses-5.6-r2"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/festival
-
-pkg_setup() {
-	enewuser festival -1 -1 -1 audio
-}
-
-src_prepare() {
-	# tell festival to use the speech-tools we have installed.
-	sed -i -e "s:\(EST=\).*:\1${EPREFIX}/usr/share/speech-tools:" "${S}"/config/config.in
-	sed -i -e "s:\$(EST)/lib:/usr/$(get_libdir):" "${S}"/config/project.mak
-
-	# fix the reference  to /usr/lib/festival
-	sed -i -e "s:\(FTLIBDIR.*=.*\)\$.*:\1${EPREFIX}/usr/share/festival:" "${S}"/config/project.mak
-
-	# Fix path for examples in festival.scm
-	sed -i -e "s:\.\./examples/:${EPREFIX}/usr/share/doc/${PF}/examples/:" "${S}"/lib/festival.scm
-
-	epatch "${FILESDIR}/${P}-ldflags.patch"
-	epatch "${FILESDIR}/${P}-init-scm.patch"
-	epatch "${FILESDIR}/${P}-gentoo-system.patch"
-
-	# copy what we need for MultiSyn from speech_tools.
-	cp -pr "${WORKDIR}"/speech_tools/base_class "${S}"/src/modules/MultiSyn
-
-	echo "(Parameter.set 'Audio_Command \"aplay -q -c 1 -t raw -f s16 -r \$SR \$FILE\")" >> "${S}"/lib/siteinit.scm
-	echo "(Parameter.set 'Audio_Method 'Audio_Command)" >> "${S}"/lib/siteinit.scm
-}
-
-src_configure() {
-	econf || die "econf failed"
-}
-
-src_compile() {
-	emake -j1 PROJECT_LIBDEPS="" REQUIRED_LIBDEPS="" LOCAL_LIBDEPS="" \
-		OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die "emake failed"
-}
-
-src_install() {
-	# Install the binaries
-	dobin src/main/festival
-	dobin lib/etc/*Linux*/audsp
-	dolib.a src/lib/libFestival.a
-
-	# Install the main libraries
-	insinto /usr/share/festival
-	doins -r lib/*
-
-	# Install the examples
-	insinto /usr/share/doc/${PF}
-	doins -r examples
-
-	# Need to fix saytime, etc. to look for festival in the correct spot
-	for ex in "${D}"/usr/share/doc/${PF}/examples/*.sh; do
-		exnoext=${ex%%.sh}
-		chmod a+x "${exnoext}"
-		dosed "s:${S}/bin/festival:/usr/bin/festival:" "${exnoext##$D}"
-	done
-
-	# Install the header files
-	insinto /usr/include/festival
-	doins src/include/*.h
-
-	insinto /etc/festival
-	doins lib/site*
-
-	# Install the docs
-	dodoc "${S}"/{ACKNOWLEDGMENTS,NEWS,README}
-	doman "${S}"/doc/{festival.1,festival_client.1}
-
-	# create the directory where our log file will go.
-	diropts -m 0755 -o festival -g audio
-	keepdir /var/log/festival
-
-}
-
-pkg_postinst() {
-	elog
-	elog "    Useful examples include saytime, text2wave. For example, try:"
-	elog "        \"/usr/share/doc/${PF}/examples/saytime\""
-	elog
-	elog "    Or for something more fun:"
-	elog '        "echo "Gentoo can speak" | festival --tts"'
-	elog
-	elog "This version also allows configuration of site specific"
-	elog "initialization in /etc/festival/siteinit.scm and"
-	elog "variables in /etc/festival/sitevars.scm."
-	elog
-}
--- a/app-accessibility/orca/Manifest
+++ b/app-accessibility/orca/Manifest
@ -1,2 +1,3 @@
 DIST orca-3.14.3.tar.xz 1998804 SHA256 8258dc3174572a4bf1a266ad36df46cf5f2c5a8dc5df1a071f49f812bec2a315 SHA512 579eb592ab99a98598ce7405e180b9e8657c5b418d792f1209684bca7b309bb8e0857fd2766a39fb53835ae44f12e3447dda08402b21113e16c92bb7f60e661d WHIRLPOOL 624fc3c89ad20e734ab61160839a4d469243c587ed8c72b413ee011275e27eff73ac8ffa82f03dfa69902450c0db970b402d4b371e647298ee4b193218851e64
 DIST orca-3.14.4.tar.xz 2016596 SHA256 94a522e0a29143858be0d092346d9996e62b55fefdf4651b5edf79bcb9f4a1ef SHA512 1270c18c83817f02c0804db711915d112ff8e3b336c2dd39eb3ff5e2110393ce0afb030f82bdefb1a56acf6471107d2f237100aa22b85ac88ab04c7325cebfc8 WHIRLPOOL 298004708658a62d8fde7bb0f2ec53a7d4b64188ed663cfc5edd7d788bcc8de7f07bff5ce58ad625572692233652a251e2666640f1309d23a7ab67574cd20125
+DIST orca-3.16.2.tar.xz 2078728 SHA256 cd14b28878cc04166ec43c7d9a8e6b0056c66cbfb1e4f934f12f74568937789a SHA512 768628c4630d84929a8a2b12b73771de7b104b1754e9462b1fe63c2bbadca192e56416a1e2a43ad5f5594c91a4fe94941d2deb1e44cccaf253d4f03704f31ee1 WHIRLPOOL eea3f9a1a0b1aebb4ca3a6da1a5cf016b1ea6d042c4e8e1b7275325cd08e77c6a7c6519048651ace34ef10d69c22663e9009dab20502ff3fca7d6c6c9a888c9a
--- a/app-accessibility/orca/orca-3.16.2.ebuild
+++ b/app-accessibility/orca/orca-3.16.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-accessibility/orca/orca-3.16.2.ebuild,v 1.1 2015/06/09 09:54:04 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python3_{3,4} )
+PYTHON_REQ_USE="threads"
+
+inherit gnome2 python-r1
+
+DESCRIPTION="Extensible screen reader that provides access to the desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/Orca"
+
+LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE="+braille"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# liblouis is not in portage yet
+# it is used to provide contracted braille support
+# XXX: Check deps for correctness
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-accessibility/at-spi2-atk-2.10:2
+	>=app-accessibility/at-spi2-core-2.10:2[introspection]
+	>=dev-libs/atk-2.10
+	>=dev-libs/glib-2.28:2
+	>=dev-python/pygobject-3.10:3[${PYTHON_USEDEP}]
+	>=x11-libs/gtk+-3.6.2:3[introspection]
+	braille? (
+		>=app-accessibility/brltty-5.0-r3[python,${PYTHON_USEDEP}]
+		dev-libs/liblouis[python,${PYTHON_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_USEDEP}]
+	dev-libs/atk[introspection]
+	dev-python/pyatspi[${PYTHON_USEDEP}]
+	dev-python/setproctitle[${PYTHON_USEDEP}]
+	x11-libs/libwnck:3[introspection]
+	x11-libs/pango[introspection]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.50
+	virtual/pkgconfig
+"
+#	app-text/yelp-tools
+
+src_prepare() {
+	gnome2_src_prepare
+
+	python_copy_sources
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir gnome2_src_configure \
+		ITSTOOL="$(type -P true)" \
+		$(use_with braille liblouis)
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO"
+	installing() {
+		gnome2_src_install
+		# Massage shebang to make python_doscript happy
+		sed -e 's:#!'"${PYTHON}:#!/usr/bin/python:" \
+			-i src/orca/orca || die
+		python_doscript src/orca/orca
+	}
+	python_foreach_impl run_in_build_dir installing
+}
--- a/app-accessibility/speech-tools/Manifest
+++ b/app-accessibility/speech-tools/Manifest
@ -1,3 +1,2 @@
-DIST speech_tools-2.1-patches.tar.gz 5688 SHA256 4b1a3579a39fe78e4d524e69c2199f19509ff9d15f8e74c1ea8c6865efc23f65 SHA512 6b33e8831da2c26fe3d8fe4e1a9628916c6c0b20d01df02131eb2f95dec837eb68f2c2008160e237eb0eefa7f1a9772ff108d9e9937482c48fd4dc3e5555d0c1 WHIRLPOOL 190fdeeac41c282fcf2300786e8b8572575f9e9a152f969f2a031df4b5f48e8831d2718cd3822938cfbb0318a0381bd81c6c4c1ba48eec2d4b9afb5410706a0b
 DIST speech_tools-2.1-r3-patches.tar.gz 6876 SHA256 c37357211aa88ca6038932222f664ee332d58c553960d13ef93c489d2bb41e11 SHA512 db4d656a77e3fcfc43447c11b160cf9b45f0c4ec10f2697e4357f0ec86ea56e2841f1b887493a781406975003f5d8065ffbb75eeebb79fcd9873055b52c248e3 WHIRLPOOL a038534ab83819e5c36e74026ee510bfc279e41b6eea62e6fcb54df599a888d51e7398bd91db615e8e6cdc140b52bc99d8d7c7e52c158ce161d2a74e5909cb2c
 DIST speech_tools-2.1-release.tar.gz 1681999 SHA256 ff6167cd929a88e2f91b47191c6c4dae87c9c06ba39fccc4465af9d79e9b2be9 SHA512 6ef9a7dd01ede152c4dafd0b2037312d62a79d875813d74ea048899a52eee505b93ffbabef9b6c0a1d15aeadb5508fd18a2f392e85276847fe071173aec5db96 WHIRLPOOL 6df6ca5168462599fadf209827e367c963af5ca6be05277618c9d09aac34a3b151665b860a14fa4742482cc77246e372671ac94b23bdca63bbbb7b8c7b234644
--- a/app-accessibility/speech-tools/speech-tools-2.1-r1.ebuild
+++ b/app-accessibility/speech-tools/speech-tools-2.1-r1.ebuild
@ -1,100 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-2.1-r1.ebuild,v 1.10 2012/12/28 18:24:29 ulm Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-MY_P=${P/speech-/speech_}
-
-DESCRIPTION="Speech tools for Festival Text to Speech engine"
-HOMEPAGE="http://www.cstr.ed.ac.uk/projects/speech_tools/"
-SRC_URI="http://www.festvox.org/packed/festival/${PV}/${MY_P}-release.tar.gz
-		 mirror://gentoo/${MY_P}-patches.tar.gz"
-
-LICENSE="FESTIVAL HPND BSD rc regexp-UofT"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="nas X"
-
-DEPEND="nas? ( media-libs/nas )
-	X? ( x11-libs/libX11
-		x11-libs/libXt )
-	>=media-libs/alsa-lib-1.0.20-r1
-	!<app-accessibility/festival-1.96_beta
-	!sys-power/powerman
-	>=sys-libs/ncurses-5.6-r2"
-
-RDEPEND=${DEPEND}
-
-S="${WORKDIR}/speech_tools"
-
-src_prepare() {
-	EPATCH_SUFFIX="patch"
-	epatch
-	sed -i -e 's,{{HORRIBLELIBARCHKLUDGE}},"/usr/$(get_libdir)",' main/siod_main.cc
-
-	#WRT bug #309983
-	sed -i -e "s:\(GCC_SYSTEM_OPTIONS =\).*:\1:" "${S}"/config/systems/sparc_SunOS5.mak
-}
-
-src_configure() {
-	local CONFIG=config/config.in
-	sed -i -e 's/@COMPILERTYPE@/gcc42/' ${CONFIG}
-	if use nas; then
-		sed -i -e "s/#.*\(INCLUDE_MODULES += NAS_AUDIO\)/\1/" ${CONFIG}
-	fi
-	if ! use X; then
-		sed -i -e "s/-lX11 -lXt//" config/modules/esd_audio.mak
-	fi
-	econf || die
-}
-
-src_compile() {
-	emake -j1 CC="$(tc-getCC)" CXX="$(tc-getCXX)" CC_OTHER_FLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" || die "Compile failed"
-}
-
-src_install() {
-	dolib.so lib/libest*.so*
-
-	dodoc "${S}"/README
-	dodoc "${S}"/lib/cstrutt.dtd
-
-	insinto /usr/share/doc/${PF}
-	doins -r lib/example_data
-
-	insinto /usr/share/speech-tools
-	doins -r config base_class
-
-	insinto /usr/share/speech-tools/lib
-	doins -r lib/siod
-
-	cd include
-	insinto /usr/include/speech-tools
-	doins -r *
-	dosym /usr/include/speech-tools /usr/share/speech-tools/include
-
-	cd ../bin
-	for file in *; do
-		[ "${file}" = "Makefile" ] && continue
-		dobin ${file}
-		dstfile="${D}/usr/bin/${file}"
-		sed -i -e "s:${S}/testsuite/data:/usr/share/speech-tools/testsuite:g" ${dstfile}
-		sed -i -e "s:${S}/bin:/usr/$(get_libdir)/speech-tools:g" ${dstfile}
-		sed -i -e "s:${S}/main:/usr/$(get_libdir)/speech-tools:g" ${dstfile}
-
-		# This just changes LD_LIBRARY_PATH
-		sed -i -e "s:${S}/lib:/usr/$(get_libdir):g" ${dstfile}
-	done
-
-	cd "${S}"
-	exeinto /usr/$(get_libdir)/speech-tools
-	for file in `find main -perm +100 -type f`; do
-		doexe ${file}
-	done
-
-	#Remove /usr/bin/resynth as it is broken. See bug #253556
-	rm "${D}/usr/bin/resynth"
-}
--- a/app-admin/abrt/abrt-2.0.12-r1.ebuild
+++ b/app-admin/abrt/abrt-2.0.12-r1.ebuild
@ -1,116 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/abrt/abrt-2.0.12-r1.ebuild,v 1.4 2013/09/11 08:59:06 mgorny Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2:2.6"
-
-# Need gnome2-utils for gnome2_icon_cache_update
-inherit autotools eutils gnome2-utils python systemd user
-
-DESCRIPTION="Automatic bug detection and reporting tool"
-HOMEPAGE="https://fedorahosted.org/abrt/"
-SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-COMMON_DEPEND=">=dev-libs/btparser-0.18
-	>=dev-libs/glib-2.21:2
-	>=dev-libs/libreport-2.0.11
-	dev-libs/libxml2
-	dev-libs/nss
-	sys-apps/dbus
-	sys-auth/polkit
-	sys-fs/inotify-tools
-	x11-libs/gtk+:3
-	x11-libs/libnotify"
-RDEPEND="${COMMON_DEPEND}
-	app-arch/cpio
-	dev-libs/elfutils
-	>=sys-devel/gdb-7"
-DEPEND="${COMMON_DEPEND}
-	app-text/asciidoc
-	app-text/xmlto
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-
-	enewgroup abrt
-	enewuser abrt -1 -1 -1 abrt
-}
-
-src_prepare() {
-	# Disable redhat-specific code not usable in gentoo, or that requires
-	# bugs.gentoo.org infra support.
-	epatch "${FILESDIR}/${PN}-2.0.12-gentoo.patch"
-
-	# Using a server response as a format string is a bad idea
-	epatch "${FILESDIR}/${PN}-2.0.6-format-security.patch"
-
-	# pyhook test is sensitive to the format of python's error messages, and
-	# fails with certain python versions
-	sed -e '/pyhook.at/ d' \
-		-i tests/Makefile.* tests/testsuite.at || die "sed 2 failed"
-
-	# automake-1.12, #427926
-	epatch "${FILESDIR}/${PN}-2.0.12-automake-1.12.patch"
-
-	# Fix dbus timeout in gui; in next release
-	epatch "${FILESDIR}/${P}-dbus-fallback.patch"
-
-	eautoreconf
-
-	python_clean_py-compile_files
-	python_convert_shebangs -r 2 src
-}
-
-src_configure() {
-	myeconfargs=(
-		"--localstatedir=${EPREFIX}/var"
-		"$(systemd_with_unitdir)"
-	)
-	# --disable-debug enables debug!
-	use debug && myeconfargs=( "${myeconfargs[@]}" --enable-debug )
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	keepdir /var/run/abrt
-	# /var/spool/abrt is created by dev-libs/libreport
-
-	diropts -m 700 -o abrt -g abrt
-	keepdir /var/spool/abrt-upload
-
-	diropts -m 775 -o abrt -g abrt
-	keepdir /var/cache/abrt-di
-
-	find "${D}" -name '*.la' -exec rm -f {} + || die
-
-	newinitd "${FILESDIR}/${PN}-2.0.12-r1-init" abrt
-	newconfd "${FILESDIR}/${PN}-2.0.12-r1-conf" abrt
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	python_mod_optimize abrt_exception_handler.py
-	elog "To start the bug detection service on an openrc-based system, do"
-	elog "# /etc/init.d/abrt start"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	python_mod_cleanup abrt_exception_handler.py
-}
--- a/app-admin/bcfg2/Manifest
+++ b/app-admin/bcfg2/Manifest
@ -1,2 +1 @@
-DIST bcfg2-1.2.3.tar.gz 1960494 SHA256 236b4ba7ff349243459c18a9cfdd52f69f477cc7a528902c21c01698af4ec45d SHA512 58b4053f0d32fb9f305b1c9ec9d64dcf8346c3232cf2b47ff567dcb73554e441e231a96deff4d903106c7e0583ea8a4d2936488cbe8b4e7a4e8a27b48a6410d8 WHIRLPOOL 841168db75d5650e8cb6c1955a1746286f3282c920af0a786775a5f42742b0bfd9f6b23b093dcbfcdf5f51d348c017ae398b19228e183a7ffe7935dceb267683
 DIST bcfg2-1.2.4.tar.gz 1959767 SHA256 c874139508c7a1c31c224548ae53dc40fe54e091cc0c036cc9d9c382263d4d16 SHA512 15f9079dd18485088464da5ea63e53435e2a2141970e6c0400797424bd3c612928349438ed0f6bb2874eb4599768e210e3fef970ed09f8fb2c2d673b986221d9 WHIRLPOOL 4b87826149ef86e9e5f955c2f0b79351c6fd46b9a3c18f773e25e35d60424605bfc47125c9ed3ac3b5174017595d9a173a20b9b0fe9aa69da51e0bde1836da65
--- a/app-admin/bcfg2/bcfg2-1.2.3-r1.ebuild
+++ b/app-admin/bcfg2/bcfg2-1.2.3-r1.ebuild
@ -1,80 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bcfg2/bcfg2-1.2.3-r1.ebuild,v 1.1 2013/03/18 09:50:56 xmw Exp $
-
-EAPI="4"
-
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-# ssl module required.
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
-
-inherit distutils
-
-DESCRIPTION="configuration management tool"
-HOMEPAGE="http://bcfg2.org"
-SRC_URI="ftp://ftp.mcs.anl.gov/pub/bcfg/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="doc cheetah genshi server"
-
-DEPEND="dev-python/setuptools
-	doc? ( dev-python/sphinx )"
-RDEPEND="app-portage/gentoolkit
-	cheetah? ( dev-python/cheetah )
-	genshi? ( dev-python/genshi )
-	server? (
-		dev-libs/libgamin[python]
-		dev-python/lxml
-		dev-python/nose
-		virtual/fam )"
-
-PYTHON_MODNAME="Bcfg2"
-
-distutils_src_install_post_hook() {
-	if ! use server; then
-		rm -f "$(distutils_get_intermediate_installation_image)${EPREFIX}/usr/sbin/bcfg2-"*
-	fi
-}
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc; then
-		einfo "Building Bcfg2 documentation"
-		PYTHONPATH="build-$(PYTHON -f --ABI)" \
-			sphinx-build doc doc_output || die
-	fi
-}
-
-src_install() {
-	distutils_src_install --record=PY_SERVER_LIBS --install-scripts "${EPREFIX}/usr/sbin"
-
-	if ! use server; then
-		rm -rf "${ED}usr/share/bcfg2" || die
-		rm -rf "${ED}usr/share/man/man8" || die
-	else
-		newinitd "${FILESDIR}/${PN}-server-1.2.0.rc" bcfg2-server
-	fi
-
-	insinto /etc
-	doins examples/bcfg2.conf
-
-	if use doc; then
-		pushd doc_output > /dev/null
-		insinto /usr/share/doc/${PF}/html
-		doins -r [a-z]* _images _static || die "Failed to install documentation"
-		popd > /dev/null
-	fi
-}
-
-pkg_postinst () {
-	distutils_pkg_postinst
-
-	if use server; then
-		einfo "If this is a new installation, you probably need to run:"
-		einfo "    bcfg2-admin init"
-	fi
-}
--- a/app-admin/bcfg2/bcfg2-1.2.3.ebuild
+++ b/app-admin/bcfg2/bcfg2-1.2.3.ebuild
@ -1,79 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bcfg2/bcfg2-1.2.3.ebuild,v 1.1 2012/07/23 07:04:17 xmw Exp $
-
-EAPI="4"
-
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-# ssl module required.
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
-
-inherit distutils
-
-DESCRIPTION="configuration management tool"
-HOMEPAGE="http://bcfg2.org"
-SRC_URI="ftp://ftp.mcs.anl.gov/pub/bcfg/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="doc cheetah genshi server"
-
-DEPEND="dev-python/setuptools
-	doc? ( dev-python/sphinx )"
-RDEPEND="app-portage/gentoolkit
-	cheetah? ( dev-python/cheetah )
-	genshi? ( dev-python/genshi )
-	server? (
-		virtual/fam
-		dev-python/lxml
-		dev-libs/libgamin[python] )"
-
-PYTHON_MODNAME="Bcfg2"
-
-distutils_src_install_post_hook() {
-	if ! use server; then
-		rm -f "$(distutils_get_intermediate_installation_image)${EPREFIX}/usr/sbin/bcfg2-"*
-	fi
-}
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc; then
-		einfo "Building Bcfg2 documentation"
-		PYTHONPATH="build-$(PYTHON -f --ABI)" \
-			sphinx-build doc doc_output || die
-	fi
-}
-
-src_install() {
-	distutils_src_install --record=PY_SERVER_LIBS --install-scripts "${EPREFIX}/usr/sbin"
-
-	if ! use server; then
-		rm -rf "${ED}usr/share/bcfg2" || die
-		rm -rf "${ED}usr/share/man/man8" || die
-	else
-		newinitd "${FILESDIR}/${PN}-server-1.2.0.rc" bcfg2-server
-	fi
-
-	insinto /etc
-	doins examples/bcfg2.conf
-
-	if use doc; then
-		pushd doc_output > /dev/null
-		insinto /usr/share/doc/${PF}/html
-		doins -r [a-z]* _images _static || die "Failed to install documentation"
-		popd > /dev/null
-	fi
-}
-
-pkg_postinst () {
-	distutils_pkg_postinst
-
-	if use server; then
-		einfo "If this is a new installation, you probably need to run:"
-		einfo "    bcfg2-admin init"
-	fi
-}
--- a/app-admin/bcfg2/bcfg2-1.2.4.ebuild
+++ b/app-admin/bcfg2/bcfg2-1.2.4.ebuild
@ -1,80 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bcfg2/bcfg2-1.2.4.ebuild,v 1.1 2013/04/21 07:56:34 xmw Exp $
-
-EAPI="4"
-
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-# ssl module required.
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
-
-inherit distutils
-
-DESCRIPTION="configuration management tool"
-HOMEPAGE="http://bcfg2.org"
-SRC_URI="ftp://ftp.mcs.anl.gov/pub/bcfg/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="doc cheetah genshi server"
-
-DEPEND="dev-python/setuptools
-	doc? ( dev-python/sphinx )"
-RDEPEND="app-portage/gentoolkit
-	cheetah? ( dev-python/cheetah )
-	genshi? ( dev-python/genshi )
-	server? (
-		dev-libs/libgamin[python]
-		dev-python/lxml
-		dev-python/nose
-		virtual/fam )"
-
-PYTHON_MODNAME="Bcfg2"
-
-distutils_src_install_post_hook() {
-	if ! use server; then
-		rm -f "$(distutils_get_intermediate_installation_image)${EPREFIX}/usr/sbin/bcfg2-"*
-	fi
-}
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc; then
-		einfo "Building Bcfg2 documentation"
-		PYTHONPATH="build-$(PYTHON -f --ABI)" \
-			sphinx-build doc doc_output || die
-	fi
-}
-
-src_install() {
-	distutils_src_install --record=PY_SERVER_LIBS --install-scripts "${EPREFIX}/usr/sbin"
-
-	if ! use server; then
-		rm -rf "${ED}usr/share/bcfg2" || die
-		rm -rf "${ED}usr/share/man/man8" || die
-	else
-		newinitd "${FILESDIR}/${PN}-server-1.2.0.rc" bcfg2-server
-	fi
-
-	insinto /etc
-	doins examples/bcfg2.conf
-
-	if use doc; then
-		pushd doc_output > /dev/null
-		insinto /usr/share/doc/${PF}/html
-		doins -r [a-z]* _images _static || die "Failed to install documentation"
-		popd > /dev/null
-	fi
-}
-
-pkg_postinst () {
-	distutils_pkg_postinst
-
-	if use server; then
-		einfo "If this is a new installation, you probably need to run:"
-		einfo "    bcfg2-admin init"
-	fi
-}
--- a/app-admin/elektra/Manifest
+++ b/app-admin/elektra/Manifest
@ -1,3 +1,4 @@
 DIST elektra-0.7.1.tar.gz 1347524 SHA256 ff90ae274935eac9c9c5c85ca7e66049be46a31d9ef08bc59a59858a15284c8c SHA512 25ca25e95d1a20a79ba97b094dc9630fb791f6653c2bacec751cc51492202831b7d28ae0786081e6be91581245bda3f5b7e2f3b523f7faa6bfb1d97b3d209684 WHIRLPOOL e90e7c126f2467c8ae29e3cffd5d8a6bfa444dfd38edcc8809d49562825aff8ec6c826139da4a2aa09e38935ee63b48674431c7cc27e2a14d372b2b8270b170d
 DIST elektra-0.8.3.tar.gz 1092409 SHA256 48fab82a6b1e8f0038c43ae9ade4da25b697d0aa74e39b7b94056ab7febc4be1 SHA512 e298c0515515a3a59fe28e695fd347ce775465d95f95f8d08c54e0223baf24300ec7e876d35fd3a07f2348290fdc7f740557333b26e847d09b4c41df63a1d886 WHIRLPOOL 64673416e96cc0a8f3ffbfc3f88525de3bc1270b381d0642b59f0a4f9d49db5cb296bd10a2839bc2baea82f58dcb6416ada1031553d378cba858d8f94df2d3b9
 DIST elektra-0.8.6.tar.gz 1188337 SHA256 e815cf69b070c339784472841aa0ee0b169fab7c78f41cbbd7044f53fa9ed216 SHA512 4df585e07ab461b924a506a8c58bcfbe55e6c1df72710bfdc13760559054ffef6b92f8da94c08f2d8f6a7a7692983d0e92d4ffa98506fcbfc166a71bf989e488 WHIRLPOOL b0dfa2841dcef35e03dfa04e5613576d5d8d74586e959c538399adbebf2d4d4842b15e912845c07f5c309614e33217b112124ec0971accf9fa4e521e1283732a
+DIST elektra-0.8.7.tar.gz 1566800 SHA256 698ebd41d540eb0c6427c17c13a6a0f03eef94655fbd40655c9b42d612ea1c9b SHA512 37b34abeb392e170f89a97f825153f925d7b11ea980832cb8f1bf8dbd8b098f8bd553b3998728ef84ce4f4c53ea1f420824984fe670f6752c1b50e98821eb07e WHIRLPOOL 7f3f290f9064488fd1c9927a76d3f9e235e144b1ebe91a02b392ee468b2bcc4881906a71b88822a75ac1506200c3c8d5857c31f35bdc8f9832eae67c2647a768
--- a/app-admin/elektra/elektra-0.8.7.ebuild
+++ b/app-admin/elektra/elektra-0.8.7.ebuild
@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/elektra/elektra-0.8.7.ebuild,v 1.1 2015/06/09 16:45:41 xmw Exp $
+
+EAPI=5
+
+inherit cmake-multilib eutils
+
+DESCRIPTION="universal and secure framework to store config parameters in a hierarchical key-value pair mechanism"
+HOMEPAGE="http://freedesktop.org/wiki/Software/Elektra"
+SRC_URI="ftp://ftp.markus-raab.org/${PN}/releases/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus doc examples iconv ini keytometa simpleini static-libs syslog tcl test +uname xml yajl"
+
+RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
+	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
+	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
+	uname? ( sys-apps/coreutils )
+	yajl? (
+		<dev-libs/yajl-2[${MULTILIB_USEDEP}]
+		>=dev-libs/yajl-1.0.11-r1[${MULTILIB_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+	doc? ( app-doc/doxygen )"
+
+DOCS="README.md doc/AUTHORS doc/CHANGES doc/NEWS doc/todo/TODO"
+# tries to write to user's home directory (and doesn't respect HOME)
+RESTRICT="test"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-conditional-glob-tests.patch"
+
+	einfo remove bundled libs
+	# TODO: Remove bundled inih from src/plugins/ini (add to portage):
+	# https://code.google.com/p/inih/
+	rm -rf src/external || die
+
+	local tests="augeas fstab hosts ini yajl"
+	if ! use test ; then
+		einfo remove test data
+		for test in ${tests}; do
+			sed -e '/TARGET_TEST_DATA_FOLDER/ s/^#*/#/' \
+				-i src/plugins/${test}/CMakeLists.txt || die
+		done
+	fi
+
+	#move doc files to correct location
+	sed -e "s/elektra-api/${PF}/" \
+		-i cmake/ElektraCache.cmake || die
+
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	local my_plugins="ccode;dump;error;fstab;glob;hexcode;hidden;hosts;network;ni;null;path;resolver;struct;success;template;timeofday;tracer;type;validation"
+
+	use dbus      && my_plugins+=";dbus"
+	use iconv     && my_plugins+=";iconv"
+	use ini       && my_plugins+=";ini"		#bundles inih
+	use keytometa && my_plugins+=";keytometa"
+	use simpleini && my_plugins+=";simpleini"
+	use syslog    && my_plugins+=";syslog"
+	use tcl       && my_plugins+=";tcl"
+	use uname     && my_plugins+=";uname"
+	use xml       && my_plugins+=";xmltool"
+	use yajl      && my_plugins+=";yajl"
+
+	mycmakeargs=(
+		"-DPLUGINS=${my_plugins}"
+		"-DLATEX_COMPILER=OFF"
+		"-DTARGET_CMAKE_FOLDER=share/cmake/Modules"
+		$(multilib_is_native_abi && cmake-utils_use doc BUILD_DOCUMENTATION \
+			|| echo -DBUILD_DOCUMENTATION=OFF)
+		$(multilib_is_native_abi && cmake-utils_use examples BUILD_EXAMPLES \
+			|| echo -DBUILD_EXAMPLES=OFF)
+		$(cmake-utils_use static-libs BUILD_STATIC)
+		$(cmake-utils_use test BUILD_TESTING)
+		$(cmake-utils_use test ENABLE_TESTING)
+	)
+
+	cmake-utils_src_configure
+}
--- a/app-admin/elektra/files/elektra-0.8.7-conditional-glob-tests.patch
+++ b/app-admin/elektra/files/elektra-0.8.7-conditional-glob-tests.patch
@ -0,0 +1,21 @@
+--- elektra-0.87/src/libtools/tests/CMakeLists.txt
+++ elektra-0.87/src/libtools/tests/CMakeLists.txt
+@@ -4,10 +4,12 @@
+ add_cppheaders (HDR_FILES)
+ add_toolheaders(HDR_FILES)
+ 
+-include (LibAddTest)
+if (ENABLE_TESTING)
+	include (LibAddTest)
+ 
+-file (GLOB TESTS testtool_*.cpp)
+-foreach (file ${TESTS})
+-	get_filename_component (name ${file} NAME_WE)
+-	add_gtest (${name})
+-endforeach (file ${TESTS})
+	file (GLOB TESTS testtool_*.cpp)
+	foreach (file ${TESTS})
+		get_filename_component (name ${file} NAME_WE)
+		add_gtest (${name})
+	endforeach (file ${TESTS})
+endif (ENABLE_TESTING)
--- a/app-admin/elektra/metadata.xml
+++ b/app-admin/elektra/metadata.xml
@ -10,6 +10,8 @@
 	<flag name="simpleini">Enable simpleini support</flag>
 	<flag name="uname">Enable uname information for the key database</flag>
 	<flag name="yajl">Enable yajl support</flag>
+	<flag name="ini">Enable ini support</flag>
+	<flag name="keytometa">Enable keytometa support</flag>
 </use>
 </pkgmetadata>

--- a/app-admin/integrit/integrit-4.1.ebuild
+++ b/app-admin/integrit/integrit-4.1.ebuild
@ -1,66 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/integrit/integrit-4.1.ebuild,v 1.1 2009/01/04 23:03:27 patrick Exp $
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="file integrity verification program"
-HOMEPAGE="http://integrit.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i -e "/^CC/d" configure.in hashtbl/configure.in || die
-	sed -i -e "/^AC_PROGRAM_PATH/d" configure.in hashtbl/configure.in || die
-
-	eautoreconf
-}
-
-src_compile() {
-	tc-export AR
-	econf
-	emake || die
-	emake utils || die
-	cd "${S}"/doc
-	emake || die
-	cd "${S}"/hashtbl
-	emake hashtest || die
-	mv README README.hashtbl
-}
-
-src_install() {
-	dosbin integrit || die
-	dolib libintegrit.a
-	dodoc Changes HACKING README todo.txt
-
-	cd "${S}"/utils
-	dosbin i-viewdb
-	dobin i-ls
-
-	cd "${S}"/hashtbl
-	dolib libhashtbl.a
-	insinto /usr/include
-	doins hashtbl.h
-	dobin hashtest
-	dodoc README.hashtbl
-
-	cd "${S}"/doc
-	doman i-ls.1 i-viewdb.1 integrit.1
-	doinfo integrit.info
-
-	cd "${S}"/examples
-	docinto examples
-	dodoc *
-}
-
-pkg_postinst() {
-	elog "It is recommended that the integrit binary is copied to a secure"
-	elog "location and re-copied at runtime or run from a secure medium."
-	elog "You should also create a configuration file (see examples)."
-}
--- a/app-admin/keepass/metadata.xml
+++ b/app-admin/keepass/metadata.xml
@ -15,6 +15,6 @@
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">keepass</remote-id>
-		<bugs-to>http://sourceforge.net/tracker/?group_id=95013</bugs-to>
+		<bugs-to>http://sourceforge.net/p/keepass/bugs/</bugs-to>
 	</upstream>
 </pkgmetadata>
--- a/app-arch/advancecomp/Manifest
+++ b/app-arch/advancecomp/Manifest
@ -1,3 +1,4 @@
 DIST advancecomp-1.15.tar.gz 259340 SHA256 0d235c78224d450666bdd852a301159d53b9570e9cd28f015e222797ba4d5fe1 SHA512 18d6abb4c739c16e340bad2e87f89b545d0ecb660897a109a038b2a236bab6ce3d3b3ad572839fb4ce7981c5f150d8ed2447654291a8d808bbb85e70152e47ba WHIRLPOOL 34b44dd464092f442d5b9945e97abb4cd6fee1363c61df7573792d6a315cdab64197653b63c545b55587f37da7353e68d4cc3e26cbad961e700729b0a3f76aa2
 DIST advancecomp-1.16.tar.gz 280510 SHA256 de5617d561935f41522f04e332d9db01f910c2acb3eb231d2fb0774a86539bc0 SHA512 51e80758bb290a59b1d2faaccd7b0ead18ce6abfd85e47a57d3123e80334fe0676d4e6ec82496c228db4aef46a18050409811c7f74c833b7aa52bc57ff4aaae5 WHIRLPOOL 90e1c5c2c48dde3d9646691a92188ff28f58fd11a1e632492882e190a7090364d8bc9018e219d55eb5cf67e69e4bd54edbd4c5ac012afa556fdeb03acd8721ec
 DIST advancecomp-1.17.tar.gz 1189646 SHA256 856d064e064c6105986b7cc29d6e2cba477e9ffca4a8830631161f5e7cd18e82 SHA512 8a75204ae98e3b0a55eea2ba82f23a31203d052b568031529b08bcd3028a241c64e30537db6d360d1a7717a7d0f8ea087340121c0224e288abd62267abe7287d WHIRLPOOL fc2ef6b9b767f8a9cffbe4f8493ca279aec1883b105845a284f8c7c88168c36552e14d50fbc5953fa2fc4b60b6b5af9ae8dbafde4c04217693993b44fbfdc185
+DIST advancecomp-1.19.tar.gz 1193228 SHA256 d594c50c3da356aa961f75b00e958a4ed1e142c6530b42926092e46419af3047 SHA512 9bce761f315e94ea9ebe59273cc810297e6227d914b498501f159f05c3a002236570c2d4248b397c5cdd3cf9a60565bb8d7f1470b079d5f50249031d3c78348d WHIRLPOOL cbf67f173d4cac1ef90266c5dfc9f8b65903828de26bdbafa467aada602d5858eb5eeeddaba08d665dad8a829d394e60d67bb6100322fa501c7d80144e74e91f
--- a/app-arch/advancecomp/advancecomp-1.19.ebuild
+++ b/app-arch/advancecomp/advancecomp-1.19.ebuild
@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/advancecomp/advancecomp-1.19.ebuild,v 1.1 2015/06/09 16:31:47 xmw Exp $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Recompress ZIP, PNG and MNG using deflate 7-Zip, considerably improving compression"
+HOMEPAGE="http://advancemame.sourceforge.net/comp-readme.html"
+SRC_URI="mirror://sourceforge/project/advancemame/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="mng png test"
+
+RDEPEND="app-arch/bzip2
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+#	test? (
+#		app-text/tofrodos
+#		dev-util/valgrind
+#	)"
+
+RESTRICT="test" #282441, #523212
+
+src_configure() {
+	econf --enable-bzip2 \
+		$(use_enable test valgrind)
+}
+
+src_install() {
+	dobin advdef advzip
+
+	if use png; then
+		dobin advpng
+		doman doc/advpng.1
+	fi
+
+	if use mng; then
+		dobin advmng
+		doman doc/advmng.1
+	fi
+
+	dodoc HISTORY AUTHORS README
+	doman doc/advdef.1 doc/advzip.1
+}
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@ -1,2 +1,2 @@
-DIST file-roller-3.12.2.tar.xz 1396796 SHA256 0677be6618dba609eae2d76420e8a5a8d9a414bcec654e7b71e65b941764eacf SHA512 8e47ca0b8ee619da161d55909647ac6aac5645e7120c5f71f34dd8911b6ca2b530031b8efaeab10d668e9a3428fc4e03159605dac626aa600026719d8741f22f WHIRLPOOL 61be4185d82adbd8dabc6fc9a007490596b373b249cebeb9c2a615fd6cdf6575a31c01196588ae3ab2e839dea2136a976bf03b40fce54ba0dba571e7f7972b5e
 DIST file-roller-3.14.2.tar.xz 1387784 SHA256 1815e736715afe8c0f3fbda41c76c07289220d4855345f779c632adf5e074e50 SHA512 92ff42e4fe06e3ea54e71806157fbb95f9e5f247142e9e857f61f61748fd0e1b99a73cfb35fd3ea890c3e19da0d2176af9a017a8eb918eff9ddc0371b09ed11d WHIRLPOOL db4e5519fe298759dbb0f048a597d4cd8ef6610b04eab9f77ee21905726f19e15312cdfc47aa80c2f55490ad4f400e7cac0664e24376b40a340d780e5f0809bf
+DIST file-roller-3.16.2.tar.xz 1409944 SHA256 60897ff24d4822395a227b62811c3b8768b701844961e93303d6d6d9463d7e3f SHA512 ac8c36c3b186bd4eb2ae41fe2e777a15074f09863402a56614a8ad0a89d6e480046fb2566db1be907ea1155ebe4aff6733e32e0f59547435db451757fb3cb15f WHIRLPOOL 3e20ba55d57d69a838f1602322478752eb2f172e8f713c23099edd3446c4b811306d101e23393a8d088382145d4bbf72c66c7ec62796e6eba47e4a4f46fd3ff7
--- a/app-arch/file-roller/file-roller-3.16.2.ebuild
+++ b/app-arch/file-roller/file-roller-3.16.2.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-arch/file-roller/file-roller-3.12.2.ebuild,v 1.3 2014/07/23 15:12:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/file-roller-3.16.2.ebuild,v 1.1 2015/06/09 09:57:41 eva Exp $

 EAPI="5"
 GCONF_DEBUG="no"
@ -14,7 +14,7 @@ HOMEPAGE="http://fileroller.sourceforge.net/ https://wiki.gnome.org/Apps/FileRol
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
 IUSE="nautilus packagekit"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"

 # gdk-pixbuf used extensively in the source
 # cairo used in eggtreemultidnd.c
@ -23,13 +23,11 @@ RDEPEND="
 	>=app-arch/libarchive-3:=
 	>=dev-libs/glib-2.36:2
 	>=dev-libs/json-glib-0.14
-	>=x11-libs/gtk+-3.9.3:3
+	>=x11-libs/gtk+-3.13.2:3
 	>=x11-libs/libnotify-0.4.3:=
 	sys-apps/file
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE
-	x11-libs/libSM
 	x11-libs/pango
 	nautilus? ( >=gnome-base/nautilus-3 )
 	packagekit? ( app-admin/packagekit-base )
@ -68,7 +66,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.10.3-use_bin_tar.patch

 	# File providing Gentoo package names for various archivers
-	cp -f "${FILESDIR}/3.6.0-packages.match" data/packages.match || die
+	cp -f "${FILESDIR}"/3.6.0-packages.match data/packages.match || die

 	gnome2_src_prepare
 }
@ -82,7 +80,6 @@ src_configure() {
 		--disable-debug \
 		--enable-magic \
 		--enable-libarchive \
-		--with-smclient=xsmp \
 		$(use_enable nautilus nautilus-actions) \
 		$(use_enable packagekit) \
 		ITSTOOL=$(type -P true)
--- a/app-arch/lzip/Manifest
+++ b/app-arch/lzip/Manifest
@ -1,2 +1,2 @@
 DIST lzip-1.16.tar.gz 86035 SHA256 128cc25baf92c8b69700831e6f984d954016318cc78edca87870d0c033112751 SHA512 8a1c0b254fd10428ddee8b26a2e426b57c4799bdc690e08211c3bc8fdef0d86e3ed69c48a3f6b7be1fe6c65f1e09f44cd3481b233632b60b58f4b8a806175b63 WHIRLPOOL fdb9462a4f7c3efc05b00785f1124e491d316ca44eb0d280542675593861cdca993654b5e6fcbbbabf7a1aa96c552b8ebc3307493af87ee4e154790e448ff8e5
-DIST lzip-1.17-pre1.tar.gz 85976 SHA256 1b1d3ea3816adee0beb19744a445d4e1ad1f5aa541dbcac7bf3a988fd4f66b86 SHA512 664fcd1252e209a78417b02af87fa9e15ce2ab7364406b1f932aa7bff9d7052915432afd77a5a454139b2f8c29fbb644cc66069a94f992be2c6b35b251246957 WHIRLPOOL ba34af85b9cc991c48ccdbb1dd1b189fcfd12adf8bbd21519e8f52ad47fa0ff44d2c8d3a28c32c97bba3014dc42c014db5f255b1a69ab4178366744a1e37b2aa
+DIST lzip-1.17-rc2.tar.gz 90157 SHA256 1fe32245661b999bbcaa5935f95653b26c7d6740f27cf4753072ab409556850e SHA512 a9177a97231f233de29417d2ad9a287ce50e38ec677c7b97077f44ddce35c0b9517735d4e4c4bdfa9b12a99373f69cd38946132e96e892701a60287462167bed WHIRLPOOL 2507c84d8536f13853aa66123a966e94959207b3aa2edaae8c4141b4369f8af51a64938b628a67bceb8dd2ff7f485cde6e7f5fe3a1ae527328a5090a0a5f0e8e
--- a/app-arch/lzip/lzip-1.17_pre1.ebuild
+++ b/app-arch/lzip/lzip-1.17_pre1.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/lzip/lzip-1.17_pre1.ebuild,v 1.1 2015/04/15 14:41:53 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lzip/lzip-1.17_rc2.ebuild,v 1.1 2015/06/09 13:41:05 polynomial-c Exp $

 EAPI="4"

--- a/app-backup/bacula/metadata.xml
+++ b/app-backup/bacula/metadata.xml
@ -7,10 +7,13 @@
 		<name>Thomas Beierlein</name>
 	</maintainer>
 	<use>
-		<flag name='bacula-clientonly'>Disable DB support, and just build a
+		<flag name="bacula-clientonly">Disable DB support, and just build a
 			client</flag>
-		<flag name='bacula-nodir'>Disable building of director</flag>
-		<flag name='bacula-nosd'>Disable building of storage daemon</flag>
-		<flag name='logwatch'>Install support files for logwatch</flag>
+		<flag name="bacula-nodir">Disable building of director</flag>
+		<flag name="bacula-nosd">Disable building of storage daemon</flag>
+		<flag name="logwatch">Install support files for logwatch</flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">bacula</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-backup/burp/metadata.xml
+++ b/app-backup/burp/metadata.xml
@ -11,4 +11,7 @@
 		by each backup. It also uses VSS (Volume Shadow Copy Service) to make
 		snapshots when backing up Windows computers.
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">burp</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-backup/cdbkup/metadata.xml
+++ b/app-backup/cdbkup/metadata.xml
@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>app-backup</herd>
-<longdescription>A backup application capable of full/incremental backups on
+	<herd>app-backup</herd>
+	<longdescription>A backup application capable of full/incremental backups on
 	local and remote systems onto cd-r and cd-rw discs.</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">cdbkup</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-backup/dar/metadata.xml
+++ b/app-backup/dar/metadata.xml
@ -1,20 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>rich0@gentoo.org</email>
-</maintainer>
-<longdescription>
+	<maintainer>
+		<email>rich0@gentoo.org</email>
+	</maintainer>
+	<longdescription>
 Backup directory tree and files.
 Full featured archiver with support for differential backups, slices,
 compression, ATTR/ACL support. DAR also supports Pipes for remote
 operations, including with ssh.
 </longdescription>
-<use>
-	<flag name='dar32'>Enables --enable-mode=32 option, which replace infinite
+	<use>
+		<flag name="dar32">Enables --enable-mode=32 option, which replace infinite
 		by 32 bit integers</flag>
-	<flag name='dar64'>Enables --enable-mode=64 option, which replace infinite
+		<flag name="dar64">Enables --enable-mode=64 option, which replace infinite
 		by 64 bit integers</flag>
-	<flag name='gcrypt'>Enables strong encryption support</flag>
-</use>
+		<flag name="gcrypt">Enables strong encryption support</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">dar</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-backup/deja-dup/metadata.xml
+++ b/app-backup/deja-dup/metadata.xml
@ -8,4 +8,7 @@
  <use>
    <flag name="nautilus">Build gnome-base/nautilus extension</flag>
  </use>
+  <upstream>
+    <remote-id type="launchpad">deja-dup</remote-id>
+  </upstream>
 </pkgmetadata>
--- a/app-backup/duply/metadata.xml
+++ b/app-backup/duply/metadata.xml
@ -12,4 +12,7 @@
  </maintainer>
  <longdescription lang="en">
 </longdescription>
+  <upstream>
+    <remote-id type="sourceforge">ftplicity</remote-id>
+  </upstream>
 </pkgmetadata>
--- a/app-backup/flexbackup/metadata.xml
+++ b/app-backup/flexbackup/metadata.xml
@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>graaff@gentoo.org</email></maintainer>
+	<maintainer>
+		<email>graaff@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">flexbackup</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-backup/fsarchiver/metadata.xml
+++ b/app-backup/fsarchiver/metadata.xml
@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>hwoarang@gentoo.org</email>
-	<name>Markos Chandras</name>
-</maintainer>
+	<maintainer>
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">fsarchiver</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-backup/luckybackup/metadata.xml
+++ b/app-backup/luckybackup/metadata.xml
@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qt</herd>
+	<herd>qt</herd>
+	<upstream>
+		<remote-id type="sourceforge">luckybackup</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-backup/mirdir/metadata.xml
+++ b/app-backup/mirdir/metadata.xml
@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer>
-        <email>robbat2@gentoo.org</email>
-        <name>Robin H. Johnson</name>
-    </maintainer>
+  <maintainer>
+    <email>robbat2@gentoo.org</email>
+    <name>Robin H. Johnson</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">mirdir</remote-id>
+  </upstream>
 </pkgmetadata>
--- a/app-backup/qt4-fsarchiver/metadata.xml
+++ b/app-backup/qt4-fsarchiver/metadata.xml
@ -4,4 +4,7 @@
 	<maintainer>
 		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">qt4-fsarchiver</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-backup/rear/metadata.xml
+++ b/app-backup/rear/metadata.xml
@ -10,6 +10,9 @@
 		Relax and Recover (Rear) is the leading Open Source disaster recovery solution, and successor to mkcdrec. It comprises of a modular framework and ready-to-go workflows for many common situations to produce a bootable image and restore from backup using this image. As a benefit, it allows to restore to different hardware and can therefore be used as a migration tool as well.
 	</longdescription>
 	<use>
-		<flag name='udev'>Have ReaR start backup when attaching your USB drive.</flag>
+		<flag name="udev">Have ReaR start backup when attaching your USB drive.</flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">rear</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-backup/reoback/metadata.xml
+++ b/app-backup/reoback/metadata.xml
@ -5,4 +5,7 @@
    <email>maintainer-needed@gentoo.org</email>
    <name>Default assignee for orphaned packages</name>
  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">reoback</remote-id>
+  </upstream>
 </pkgmetadata>
--- a/app-backup/sarab/metadata.xml
+++ b/app-backup/sarab/metadata.xml
@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>rich0@gentoo.org</email>
-</maintainer>
-<longdescription>
+  <maintainer>
+    <email>rich0@gentoo.org</email>
+  </maintainer>
+  <longdescription>
 SaraB works with DAR (Disk ARchive) to schedule backups.  SaraB provides a
 powerful, automated rotation schedule which allows administrators to create a
 custom rotation that fits the needs of their network.
 </longdescription>
+  <upstream>
+    <remote-id type="sourceforge">sarab</remote-id>
+  </upstream>
 </pkgmetadata>
--- a/app-backup/simplebackup/metadata.xml
+++ b/app-backup/simplebackup/metadata.xml
@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>app-backup</herd>
+	<herd>app-backup</herd>
+	<upstream>
+		<remote-id type="sourceforge">migas-sbackup</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-benchmarks/filebench/metadata.xml
+++ b/app-benchmarks/filebench/metadata.xml
@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>benchmarks</herd>
+	<herd>benchmarks</herd>
+	<upstream>
+		<remote-id type="sourceforge">filebench</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-benchmarks/gtkperf/metadata.xml
+++ b/app-benchmarks/gtkperf/metadata.xml
@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>xmw@gentoo.org</email>
-</maintainer>
-<longdescription lang="en">
+	<maintainer>
+		<email>xmw@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
 	GtkPerf is an application designed to test GTK+ performance. The point
 	is to create common testing platform to run predefined GTK+ widgets
 	(opening comboboxes, toggling buttons, scrolling text yms.) and this
 	way define the speed of device/platform.
 </longdescription>
+	<upstream>
+		<remote-id type="sourceforge">gtkperf</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-benchmarks/ltp/metadata.xml
+++ b/app-benchmarks/ltp/metadata.xml
@ -1,22 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>benchmarks</herd>
-<maintainer>
-	<email>hwoarang@gentoo.org</email>
-	<name>Markos Chandras</name>
-</maintainer>
-<use>
-	<flag name="open-posix">Build and install the POSIX testsuite</flag>
-	<flag name="pm">Build and install the power management testsuite</flag>
-	<flag name="expect">Build against the expect library for interactive testing</flag>
-	<flag name="rt">Build and install the realtime testsuite</flag>
-</use>
-<longdescription>
+	<herd>benchmarks</herd>
+	<maintainer>
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+	</maintainer>
+	<use>
+		<flag name="open-posix">Build and install the POSIX testsuite</flag>
+		<flag name="pm">Build and install the power management testsuite</flag>
+		<flag name="expect">Build against the expect library for interactive testing</flag>
+		<flag name="rt">Build and install the realtime testsuite</flag>
+	</use>
+	<longdescription>
 	The Linux Test Project is a joint project started by SGI and maintained by
 	IBM, that has a goal to deliver test suites to the open source community
 	that validate the reliability, robustness, and stability of Linux. The LTP
 	testsuite contains a collection of tools for testing the Linux kernel and
 	related features.
 </longdescription>
+	<upstream>
+		<remote-id type="sourceforge">ltp</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-benchmarks/sysbench/metadata.xml
+++ b/app-benchmarks/sysbench/metadata.xml
@ -3,6 +3,9 @@
 <pkgmetadata>
 	<herd>benchmarks</herd>
 	<use>
-	<flag name='aio'>Enable libaio support</flag>
+		<flag name="aio">Enable libaio support</flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">sysbench</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-benchmarks/tiobench/metadata.xml
+++ b/app-benchmarks/tiobench/metadata.xml
@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>alicef@gentoo.org</email>
-	<name>Alice Ferrazzi</name>
-</maintainer>
+	<maintainer>
+		<email>alicef@gentoo.org</email>
+		<name>Alice Ferrazzi</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">tiobench</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-cdr/acetoneiso/metadata.xml
+++ b/app-cdr/acetoneiso/metadata.xml
@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <herd>media-optical</herd>
+  <upstream>
+    <remote-id type="sourceforge">acetoneiso</remote-id>
+  </upstream>
 </pkgmetadata>
--- a/app-cdr/backlite/metadata.xml
+++ b/app-cdr/backlite/metadata.xml
@ -5,9 +5,11 @@
 		<email>billie@gentoo.org</email>
 		<name>Daniel Pielmeier</name>
 	</maintainer>
-
 	<use>
 		<flag name="mplayer">Add support for mplayer preview in addition to X11
 		and phonon</flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">k9copy</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-cdr/burn-cd/metadata.xml
+++ b/app-cdr/burn-cd/metadata.xml
@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-optical</herd>
-<longdescription>CD and DVD command line recording and ripping tools.</longdescription>
+	<herd>media-optical</herd>
+	<longdescription>CD and DVD command line recording and ripping tools.</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">burn-cd</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-cdr/ccd2iso/metadata.xml
+++ b/app-cdr/ccd2iso/metadata.xml
@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-optical</herd>
-<longdescription>
+	<herd>media-optical</herd>
+	<longdescription>
 CloneCD image to ISO image file converter
 </longdescription>
+	<upstream>
+		<remote-id type="sourceforge">ccd2iso</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-cdr/cdcover/metadata.xml
+++ b/app-cdr/cdcover/metadata.xml
@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-optical</herd>
+	<herd>media-optical</herd>
+	<upstream>
+		<remote-id type="sourceforge">cdcover</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-cdr/cdrtools/metadata.xml
+++ b/app-cdr/cdrtools/metadata.xml
@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-optical</herd>
-<maintainer>
-<email>billie@gentoo.org</email>
-<name>Daniel Pielmeier</name>
-</maintainer>
-<upstream>
-<maintainer>
-<email>joerg.schilling@fokus.fraunhofer.de</email>
-<description>Upstream author, please CC on bugs</description>
-</maintainer>
-</upstream>
-<longdescription>CD and DVD command line recording and ripping tools.</longdescription>
+	<herd>media-optical</herd>
+	<maintainer>
+		<email>billie@gentoo.org</email>
+		<name>Daniel Pielmeier</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>joerg.schilling@fokus.fraunhofer.de</email>
+			<description>Upstream author, please CC on bugs</description>
+		</maintainer>
+		<remote-id type="sourceforge">cdrtools</remote-id>
+	</upstream>
+	<longdescription>CD and DVD command line recording and ripping tools.</longdescription>
 </pkgmetadata>
--- a/app-cdr/cue2toc/metadata.xml
+++ b/app-cdr/cue2toc/metadata.xml
@ -10,4 +10,7 @@
 		of session type and conversion of data files by user configurable commands
 		based on file name extension matching.
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">cue2toc</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-cdr/dvd95/metadata.xml
+++ b/app-cdr/dvd95/metadata.xml
@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-optical</herd>
+	<herd>media-optical</herd>
+	<upstream>
+		<remote-id type="sourceforge">dvd95</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-cdr/dvdshrink/metadata.xml
+++ b/app-cdr/dvdshrink/metadata.xml
@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-optical</herd>
-<longdescription>
+	<herd>media-optical</herd>
+	<longdescription>
 XDVDShrink is a project in BASH and Perl-Gtk2 that allows you to create fair-use
 archival copies of DVD content on single-layer writable DVDs.
 </longdescription>
+	<upstream>
+		<remote-id type="sourceforge">dvdshrink</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-cdr/extract-xiso/metadata.xml
+++ b/app-cdr/extract-xiso/metadata.xml
@ -3,4 +3,7 @@
 <pkgmetadata>
  <herd>xbox</herd>
  <longdescription>Tool for extracting and creating optimised Xbox ISO images</longdescription>
+  <upstream>
+    <remote-id type="sourceforge">extract-xiso</remote-id>
+  </upstream>
 </pkgmetadata>
--- a/app-cdr/gaffitter/metadata.xml
+++ b/app-cdr/gaffitter/metadata.xml
@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>hwoarang@gentoo.org</email>
-<name>Markos Chandras</name>
-</maintainer>
-<use>
-<flag name="scripts">Install additional gaffitter scripts for external programs</flag>
-</use>
-<longdescription lang="en">
+	<maintainer>
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+	</maintainer>
+	<use>
+		<flag name="scripts">Install additional gaffitter scripts for external programs</flag>
+	</use>
+	<longdescription lang="en">
 </longdescription>
+	<upstream>
+		<remote-id type="sourceforge">gaffitter</remote-id>
+	</upstream>
 </pkgmetadata>
-
--- a/app-cdr/gcdemu/metadata.xml
+++ b/app-cdr/gcdemu/metadata.xml
@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>tetromino@gentoo.org</email>
-  <name>Alexandre Rostovtsev</name>
-</maintainer>
+  <maintainer>
+    <email>tetromino@gentoo.org</email>
+    <name>Alexandre Rostovtsev</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">cdemu</remote-id>
+  </upstream>
 </pkgmetadata>
--- a/app-cdr/gnomebaker/metadata.xml
+++ b/app-cdr/gnomebaker/metadata.xml
@ -2,5 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>media-optical</herd>
+	<upstream>
+		<remote-id type="sourceforge">gnomebaker</remote-id>
+	</upstream>
 </pkgmetadata>
-
--- a/app-cdr/gtkcdlabel/metadata.xml
+++ b/app-cdr/gtkcdlabel/metadata.xml
@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>media-optical</herd>
+	<upstream>
+		<remote-id type="sourceforge">gtkcdlabel</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-cdr/k3b/files/k3b-2.0.3-libav-10.patch
+++ b/app-cdr/k3b/files/k3b-2.0.3-libav-10.patch
@ -1,17 +0,0 @@
-https://bugs.gentoo.org/509332
-
--- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.
-+++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-@@ -423,9 +423,9 @@
-         // mp3 being one of them sadly. Most importantly: allow the libsndfile decoder to do
-         // its thing.
-         //
-        if( file->type() == CODEC_ID_WMAV1 ||
-            file->type() == CODEC_ID_WMAV2 ||
-            file->type() == CODEC_ID_AAC )
-+        if( file->type() == AV_CODEC_ID_WMAV1 ||
-+            file->type() == AV_CODEC_ID_WMAV2 ||
-+            file->type() == AV_CODEC_ID_AAC )
- #endif
-             return file;
-     }
--- a/app-cdr/k3b/k3b-2.0.3-r1.ebuild
+++ b/app-cdr/k3b/k3b-2.0.3-r1.ebuild
@ -1,113 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-2.0.3-r1.ebuild,v 1.8 2015/06/04 18:58:16 kensington Exp $
-
-EAPI=5
-
-MULTIMEDIA_REQUIRED="always"
-WEBKIT_REQUIRED="always"
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-
-# Translations are not available, since this is a snapshot
-KDE_LINGUAS="ast be bg bs ca ca@valencia cs csb da de el en_GB eo es et eu fi fr
-ga gl he hi hne hr hu is it ja kk km ko ku lt lv mai mr ms nb nds nl nn oc pa pl
-pt pt_BR ro ru se sk sl sr sr@ijekavian sr@ijekavianlatin sr@latin sv th tr ug uk
-zh_CN zh_TW"
-
-SRC_URI="mirror://kde/stable/${PN}/${P}a.tar.xz"
-DOCS=( FAQ PERMISSIONS README )
-
-inherit kde4-base
-
-DESCRIPTION="The CD/DVD Kreator for KDE"
-HOMEPAGE="http://www.k3b.org/"
-
-LICENSE="GPL-2 FDL-1.2"
-SLOT="4"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="debug dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis"
-
-CDEPEND="
-	$(add_kdeapps_dep libkcddb)
-	media-libs/libsamplerate
-	dvd? ( media-libs/libdvdread )
-	ffmpeg? (
-		libav? ( media-video/libav:= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	flac? ( >=media-libs/flac-1.2[cxx] )
-	mp3? ( media-sound/lame )
-	mad? ( media-libs/libmad )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	sndfile? ( media-libs/libsndfile )
-	taglib? ( >=media-libs/taglib-1.5 )
-	vorbis? ( media-libs/libvorbis )
-"
-DEPEND="${CDEPEND}
-	sys-devel/gettext
-"
-RDEPEND="${CDEPEND}
-	$(add_kdebase_dep kdelibs 'udev,udisks(+)')
-	app-cdr/cdrdao
-	media-sound/cdparanoia
-	virtual/cdrtools
-	dvd? (
-		>=app-cdr/dvd+rw-tools-7
-		encode? ( media-video/transcode[dvd] )
-	)
-	emovix? ( media-video/emovix )
-	sox? ( media-sound/sox )
-	vcd? ( media-video/vcdimager )
-"
-
-DOCS+=( ChangeLog )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.3-libav-10.patch" #509332
-)
-
-REQUIRED_USE="
-	mp3? ( encode )
-	sox? ( encode )
-"
-
-src_configure() {
-	mycmakeargs=(
-		-DK3B_BUILD_API_DOCS=OFF
-		-DK3B_BUILD_K3BSETUP=OFF
-		-DK3B_BUILD_WAVE_DECODER_PLUGIN=ON
-		-DK3B_ENABLE_HAL_SUPPORT=OFF
-		-DK3B_ENABLE_MUSICBRAINZ=OFF
-		$(cmake-utils_use debug K3B_DEBUG)
-		$(cmake-utils_use dvd K3B_ENABLE_DVD_RIPPING)
-		$(cmake-utils_use encode K3B_BUILD_EXTERNAL_ENCODER_PLUGIN)
-		$(cmake-utils_use ffmpeg K3B_BUILD_FFMPEG_DECODER_PLUGIN)
-		$(cmake-utils_use flac K3B_BUILD_FLAC_DECODER_PLUGIN)
-		$(cmake-utils_use mp3 K3B_BUILD_LAME_ENCODER_PLUGIN)
-		$(cmake-utils_use mad K3B_BUILD_MAD_DECODER_PLUGIN)
-		$(cmake-utils_use musepack K3B_BUILD_MUSE_DECODER_PLUGIN)
-		$(cmake-utils_use sndfile K3B_BUILD_SNDFILE_DECODER_PLUGIN)
-		$(cmake-utils_use sox K3B_BUILD_SOX_ENCODER_PLUGIN)
-		$(cmake-utils_use taglib K3B_ENABLE_TAGLIB)
-		$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_DECODER_PLUGIN)
-		$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN)
-	)
-	kde4-base_src_configure
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	echo
-	elog "We don't install k3bsetup anymore because Gentoo doesn't need it."
-	elog "If you get warnings on start-up, uncheck the \"Check system"
-	elog "configuration\" option in the \"Misc\" settings window."
-	echo
-
-	local group=cdrom
-	use kernel_linux || group=operator
-	elog "Make sure you have proper read/write permissions on the cdrom device(s)."
-	elog "Usually, it is sufficient to be in the ${group} group."
-	echo
-}
--- a/app-cdr/mkcdtoc/metadata.xml
+++ b/app-cdr/mkcdtoc/metadata.xml
@ -10,4 +10,7 @@
 		can be extended via plugins. There is plugins to fill CD-TEXT blocks
 		and perform audio file conversion.
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">mkcdtoc</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-cdr/mp3burn/metadata.xml
+++ b/app-cdr/mp3burn/metadata.xml
@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>media-optical</herd>
+	<upstream>
+		<remote-id type="sourceforge">mp3burn</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-cdr/mybashburn/metadata.xml
+++ b/app-cdr/mybashburn/metadata.xml
@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-optical</herd>
-<use>
-	<flag name='normalize'>Add support for normalizing audio file volume levels</flag>
-</use>
+	<herd>media-optical</herd>
+	<use>
+		<flag name="normalize">Add support for normalizing audio file volume levels</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">mybashburn</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-cdr/plextor-tool/metadata.xml
+++ b/app-cdr/plextor-tool/metadata.xml
@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-optical</herd>
-<longdescription>A console utility that can set certain parameters of Plextor/MMC cdrom and cd-rw drives.</longdescription>
+	<herd>media-optical</herd>
+	<longdescription>A console utility that can set certain parameters of Plextor/MMC cdrom and cd-rw drives.</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">plextor-tool</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-cdr/qpxtool/metadata.xml
+++ b/app-cdr/qpxtool/metadata.xml
@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-optical</herd>
+	<herd>media-optical</herd>
+	<upstream>
+		<remote-id type="sourceforge">qpxtool</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-cdr/xbiso/metadata.xml
+++ b/app-cdr/xbiso/metadata.xml
@ -3,4 +3,7 @@
 <pkgmetadata>
  <herd>media-optical</herd>
  <longdescription>Tools for manipulating Xbox ISO images</longdescription>
+  <upstream>
+    <remote-id type="sourceforge">xbiso</remote-id>
+  </upstream>
 </pkgmetadata>
--- a/app-cdr/xcdroast/metadata.xml
+++ b/app-cdr/xcdroast/metadata.xml
@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-<herd>media-optical</herd>
-<longdescription>Menu based front-end to mkisofs and cdrecord</longdescription>
+	<herd>media-optical</herd>
+	<longdescription>Menu based front-end to mkisofs and cdrecord</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">xcdroast</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-crypt/bcrypt/metadata.xml
+++ b/app-crypt/bcrypt/metadata.xml
@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
+	<herd>crypto</herd>
+	<upstream>
+		<remote-id type="sourceforge">bcrypt</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-crypt/ckpass/metadata.xml
+++ b/app-crypt/ckpass/metadata.xml
@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>joker@gentoo.org</email>
-<name>Christian Birchinger</name>
-</maintainer>
+	<maintainer>
+		<email>joker@gentoo.org</email>
+		<name>Christian Birchinger</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">ckpass</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-crypt/crackpkcs12/metadata.xml
+++ b/app-crypt/crackpkcs12/metadata.xml
@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
- <email>vapier@gentoo.org</email>
-</maintainer>
+	<maintainer>
+		<email>vapier@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">crackpkcs12</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-crypt/gcr/Manifest
+++ b/app-crypt/gcr/Manifest
@ -1,2 +1,3 @@
 DIST gcr-3.12.2.tar.xz 1331884 SHA256 456e20615ab178aa92eeabdea64dcce535c10d5af189171d9375291a2447d21c SHA512 7c74302a4485e6909e39721b0beeeeb5920d218c4e8ab5a1878be33457f2b6d59df165bf2e6b606efc8275b8e45dffe8d28ac202cf835f7f2483237258a4d6b2 WHIRLPOOL 9655f1997ececce77f1b179f89798b5b9363ea94e0f2024772575ca05d88dd3b15432c1e0d69095b020726bc0fab1df023dfd6cc975488360f90e43fd9069a8c
 DIST gcr-3.14.0.tar.xz 1340764 SHA256 2a2231147a01e2061f57fa9ca77557ff97bc6ceab028cee5528079f4b2fca63d SHA512 2538b2575c0d325587f8b5423ac6f9c522a69b415977398dc5c4330ce1de896c966e541eb6e536e87e81013bb2dedea4d0ae8baabdab9318db5b97e0977671b8 WHIRLPOOL 755842ad30608162bb81ed58a027a26be6d12ecb12e037b826841612c2481ea564f727e2bc4e03f13f8100257b2d2ee3dae213b56b5f04319718ff30c5eee2a9
+DIST gcr-3.16.0.tar.xz 1335348 SHA256 ecfe8df41cc88158364bb15addc670b11e539fe844742983629ba2323888d075 SHA512 1db6e2532d2d0ceb6f339551b009baae5815fcf8a12b76b0eb9e13f301d1205c2e2c9b8f555ae011a84521e55fe9cccb703c3dd539d638b476e0474c34672be4 WHIRLPOOL 88a0d5936b6dd54923fd476f3af0acac9c068268416cb30c65670ae8bf8bec3940cdee84e72e6218c3cf9e59a023508e5961357b2e80a297428e573cddc6bd7b
--- a/app-crypt/gcr/gcr-3.16.0.ebuild
+++ b/app-crypt/gcr/gcr-3.16.0.ebuild
@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gcr/gcr-3.16.0.ebuild,v 1.1 2015/06/09 10:01:27 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-any-r1 vala virtualx
+
+DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
+HOMEPAGE="https://developer.gnome.org/gcr/"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0/1" # subslot = suffix of libgcr-3
+IUSE="debug gtk +introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+COMMON_DEPEND="
+	>=app-crypt/gnupg-2
+	>=app-crypt/p11-kit-0.19
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/libgcrypt-1.2.2:0=
+	>=dev-libs/libtasn1-1:=
+	>=sys-apps/dbus-1
+	gtk? ( >=x11-libs/gtk+-3.10:3[X,introspection?] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/gnome-keyring-3.3
+"
+# gcr was part of gnome-keyring until 3.3
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	dev-libs/gobject-introspection-common
+	dev-libs/libxslt
+	dev-libs/vala-common
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+# eautoreconf needs:
+#	dev-libs/gobject-introspection-common
+#	dev-libs/vala-common
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Disable stupid flag changes
+	sed -e 's/CFLAGS="$CFLAGS -g"//' \
+		-e 's/CFLAGS="$CFLAGS -O0"//' \
+		-i configure.ac configure || die
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+	gnome2_src_configure \
+		$(use_with gtk) \
+		$(use_enable introspection) \
+		$(use_enable vala) \
+		$(usex debug --enable-debug=yes --enable-debug=default) \
+		--disable-update-icon-cache \
+		--disable-update-mime
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check
+}
--- a/app-crypt/gnupg-pkcs11-scd/metadata.xml
+++ b/app-crypt/gnupg-pkcs11-scd/metadata.xml
@ -5,4 +5,7 @@
 	<longdescription>
 		GnuPG scd replacement that enables the use of PKCS#11 tokens.
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">gnupg-pkcs11</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-crypt/jacksum/metadata.xml
+++ b/app-crypt/jacksum/metadata.xml
@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">jacksum</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-crypt/mcrypt/metadata.xml
+++ b/app-crypt/mcrypt/metadata.xml
@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>crypto</herd>
-    <maintainer>
-        <email>robbat2@gentoo.org</email>
-        <name>Robin H. Johnson</name>
-    </maintainer>
+  <herd>crypto</herd>
+  <maintainer>
+    <email>robbat2@gentoo.org</email>
+    <name>Robin H. Johnson</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">mcrypt</remote-id>
+  </upstream>
 </pkgmetadata>
--- a/app-crypt/md6sum/metadata.xml
+++ b/app-crypt/md6sum/metadata.xml
@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
-<longdescription lang="en">
+	<herd>crypto</herd>
+	<longdescription lang="en">
 </longdescription>
+	<upstream>
+		<remote-id type="sourceforge">md6sum</remote-id>
+	</upstream>
 </pkgmetadata>
-
--- a/app-crypt/mhash/metadata.xml
+++ b/app-crypt/mhash/metadata.xml
@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer>
-        <email>robbat2@gentoo.org</email>
-        <name>Robin H. Johnson</name>
-    </maintainer>
+  <maintainer>
+    <email>robbat2@gentoo.org</email>
+    <name>Robin H. Johnson</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">mhash</remote-id>
+  </upstream>
 </pkgmetadata>
--- a/app-crypt/nwipe/metadata.xml
+++ b/app-crypt/nwipe/metadata.xml
@ -6,4 +6,7 @@
    <email>ssuominen@gentoo.org</email>
    <name>Samuli Suominen</name>
  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">nwipe</remote-id>
+  </upstream>
 </pkgmetadata>
--- a/app-crypt/openssl-blacklist/metadata.xml
+++ b/app-crypt/openssl-blacklist/metadata.xml
@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>hanno@gentoo.org</email></maintainer>
+	<maintainer>
+		<email>hanno@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="launchpad">ubuntu/+source/openssl-blacklist</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-crypt/openssl-tpm-engine/metadata.xml
+++ b/app-crypt/openssl-tpm-engine/metadata.xml
@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
+	<herd>crypto</herd>
+	<upstream>
+		<remote-id type="sourceforge">trousers</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-crypt/ophcrack-tables/metadata.xml
+++ b/app-crypt/ophcrack-tables/metadata.xml
@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>ikelos@gentoo.org</email>
-    <name>Mike Auty</name>
-</maintainer>
-<use>
-	<flag name='vistafree'>Installs the free Vista ophcrack tables</flag>
-	<flag name='xpfast'>Installs the fast XP ophcrack tables</flag>
-	<flag name='xpsmall'>Installs the small free XP ophcrack tables</flag>
-</use>
+	<maintainer>
+		<email>ikelos@gentoo.org</email>
+		<name>Mike Auty</name>
+	</maintainer>
+	<use>
+		<flag name="vistafree">Installs the free Vista ophcrack tables</flag>
+		<flag name="xpfast">Installs the fast XP ophcrack tables</flag>
+		<flag name="xpsmall">Installs the small free XP ophcrack tables</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">ophcrack</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-crypt/ophcrack/metadata.xml
+++ b/app-crypt/ophcrack/metadata.xml
@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>ikelos@gentoo.org</email>
+  <maintainer>
+    <email>ikelos@gentoo.org</email>
    <name>Mike Auty</name>
-</maintainer>
-<use>
-  <flag name="tables">Require the additional tables used to carry out cracking (<pkg>app-crypt/ophcrack-tables</pkg>)</flag>
-</use>
+  </maintainer>
+  <use>
+    <flag name="tables">Require the additional tables used to carry out cracking (<pkg>app-crypt/ophcrack-tables</pkg>)</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">ophcrack</remote-id>
+  </upstream>
 </pkgmetadata>
--- a/app-crypt/osslsigncode/metadata.xml
+++ b/app-crypt/osslsigncode/metadata.xml
@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
- <email>vapier@gentoo.org</email>
- <description>do whatever</description>
-</maintainer>
+	<maintainer>
+		<email>vapier@gentoo.org</email>
+		<description>do whatever</description>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">osslsigncode</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-crypt/pdfcrack/metadata.xml
+++ b/app-crypt/pdfcrack/metadata.xml
@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
+	<herd>crypto</herd>
+	<upstream>
+		<remote-id type="sourceforge">pdfcrack</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-crypt/pius/metadata.xml
+++ b/app-crypt/pius/metadata.xml
@ -12,4 +12,7 @@
 		one to it's respective email address. This drastically reduces the time
 		and errors involved in signing keys after a keysigning party.
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">pgpius</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-crypt/sbsigntool/metadata.xml
+++ b/app-crypt/sbsigntool/metadata.xml
@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
- <email>vapier@gentoo.org</email>
- <description>do whatever</description>
-</maintainer>
+	<maintainer>
+		<email>vapier@gentoo.org</email>
+		<description>do whatever</description>
+	</maintainer>
+	<upstream>
+		<remote-id type="launchpad">ubuntu</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@ -1 +1,2 @@
 DIST seahorse-3.14.1.tar.xz 1504128 SHA256 092a890982fa594da8a384f156b961392f69ce5d9518a9801035e6deb1f05e93 SHA512 1147ea601c1cb17dd1606d02f86261b0381dfdab14329fee7d68bd635420fec98174b2509b09c68216918bd9ca31f22ea538fa34cae1a8e0f4c44714b9693c0f WHIRLPOOL 208c841a28b8c7c0916c02e1a68eaa7c74681c5a3b8e0be30f65a4da953cefd9bb94d57373640513b68de9b204e9d1fc65429bf5dca0344336390068fe4a47e1
+DIST seahorse-3.16.0.tar.xz 1496188 SHA256 770a5f03b8745054ef04cef9923dd713b1fbf309169150bc8dd32d7e5f7ee131 SHA512 54e020e907c0053762bf78fd1b4a47ed30d253a89d9063f6daa33598fc3cd97dca0af0cd66bb4a140223b6ae18db88a52bfc50f46987cb3a8d0351c115fba923 WHIRLPOOL 5e3c3ee17be55849c22019c7a9669380ae101e39d9c81e66d6140d500ef3882c2019f39491bfb37a9019c3fda78304aab9743dc3ae112646a4e9106493704372
--- a/app-crypt/seahorse/seahorse-3.16.0.ebuild
+++ b/app-crypt/seahorse/seahorse-3.16.0.ebuild
@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-3.16.0.ebuild,v 1.1 2015/06/09 10:04:01 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="A GNOME application for managing encryption keys"
+HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="0"
+IUSE="debug ldap zeroconf"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+COMMON_DEPEND="
+	>=app-crypt/gcr-3.11.91:=
+	>=dev-libs/glib-2.10:2
+	>=x11-libs/gtk+-3.4:3
+	>=app-crypt/libsecret-0.16
+	>=net-libs/libsoup-2.33.92:2.4
+	x11-misc/shared-mime-info
+
+	net-misc/openssh
+	>=app-crypt/gpgme-1
+	>=app-crypt/gnupg-1.4
+	<app-crypt/gnupg-2.1
+
+	ldap? ( net-nds/openldap:= )
+	zeroconf? ( >=net-dns/avahi-0.6:= )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+# Need seahorse-plugins git snapshot
+RDEPEND="${COMMON_DEPEND}
+	!<app-crypt/seahorse-plugins-2.91.0_pre20110114
+"
+
+src_prepare() {
+	# Do not mess with CFLAGS with USE="debug"
+	sed -e '/CFLAGS="$CFLAGS -g/d' \
+		-e '/CFLAGS="$CFLAGS -O0/d' \
+		-i configure.ac configure || die "sed 1 failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# bindir is needed due to bad macro expansion in desktop file, bug #508610
+	gnome2_src_configure \
+		--bindir=/usr/bin \
+		--enable-pgp \
+		--enable-ssh \
+		--enable-pkcs11 \
+		--enable-hkp \
+		$(use_enable debug) \
+		$(use_enable ldap) \
+		$(use_enable zeroconf sharing) \
+		ITSTOOL=$(type -P true) \
+		VALAC=$(type -P true)
+}
--- a/app-crypt/ssdeep/metadata.xml
+++ b/app-crypt/ssdeep/metadata.xml
@ -1,5 +1,8 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
+	<herd>crypto</herd>
+	<upstream>
+		<remote-id type="sourceforge">ssdeep</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-crypt/tpm-emulator/metadata.xml
+++ b/app-crypt/tpm-emulator/metadata.xml
@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
+	<herd>crypto</herd>
+	<upstream>
+		<remote-id type="sourceforge">tpm-emulator</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-crypt/tpm-tools/metadata.xml
+++ b/app-crypt/tpm-tools/metadata.xml
@ -3,9 +3,12 @@
 <pkgmetadata>
  <herd>crypto</herd>
  <use>
-    <flag name='pkcs11'>
+    <flag name="pkcs11">
      Build Token data management utilities based on OpenCryptoki's
      (<pkg>dev-libs/opencryptoki</pkg>) PKCS#11 implementation.
    </flag>
  </use>
+  <upstream>
+    <remote-id type="sourceforge">trousers</remote-id>
+  </upstream>
 </pkgmetadata>
--- a/app-crypt/trousers/metadata.xml
+++ b/app-crypt/trousers/metadata.xml
@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
-<upstream>
-  <remote-id type="cpe">cpe:/a:debian:trousers</remote-id>
-</upstream>
+  <herd>crypto</herd>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:debian:trousers</remote-id>
+    <remote-id type="sourceforge">trousers</remote-id>
+  </upstream>
 </pkgmetadata>
--- a/app-crypt/truecrypt/metadata.xml
+++ b/app-crypt/truecrypt/metadata.xml
@ -3,6 +3,9 @@
 <pkgmetadata>
 	<herd>crypto</herd>
 	<use>
-		<flag name='asm'>Enable assembly for optimization</flag>
+		<flag name="asm">Enable assembly for optimization</flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">truecrypt</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-crypt/xca/metadata.xml
+++ b/app-crypt/xca/metadata.xml
@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
+	<herd>crypto</herd>
+	<upstream>
+		<remote-id type="sourceforge">xca</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-dicts/aspell-it/metadata.xml
+++ b/app-dicts/aspell-it/metadata.xml
@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">linguistico</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-dicts/duali-data/metadata.xml
+++ b/app-dicts/duali-data/metadata.xml
@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">arabeyes</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-dicts/edictionary/metadata.xml
+++ b/app-dicts/edictionary/metadata.xml
@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">edictionary</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/Show more
+++ b/Show more