Merge updates from master

9 files changed, 189 insertions, 67 deletions

diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index c86c49e31ab3..366e7dbc5c1a 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -1,2 +1,3 @@
 DIST pkgconf-0.9.11.tar.bz2 86489 SHA256 3bdae1b2672133943dc0dda694ed57074f8b03c3fea10efb215d76d3cabe2c3b SHA512 21313ef29afcaa7c49a8cb512ecd3a821693945c22fb1a670ada74f41bca320e1b9ffb64e79adc2c33cb86822b74ddc850fadb16ddcde7eb805b81a50096992f WHIRLPOOL 7442a456af7e959c86f318ee74ec89883cc4e2ad16c9708f98d8ab30cdcf71ea7ef13f7e0f9bf945717b1dea8a317ffc5322878f88a5084c2dcbdc2aeafaf4d2
 DIST pkgconf-0.9.12.tar.bz2 87109 SHA256 7ec8b516e655e247f4ba976837cee808134785819ab8f538f652fe919cc6c09f SHA512 efe13db7a46992eb44ead493fc12b3fc6a5567e0206f701b6c48d9b5eb0bc90fcc9ae7a7e08ae641bb10df869287e5b68291701d4013d6cf27bd2b1518c29192 WHIRLPOOL 9fa7336e111f29648f5c37310bdeb2266bead1b86ff18183cfb57c06054916d235da20a5723bd364497d20a1f4db399eaf77f38c0bfc1519f2b7b825ab4666d0
+DIST pkgconf-1.0.1.tar.gz 362653 SHA256 45ce2f6ab032451345185b800badd77c054040879bd2e56225dafc7fbe583cf1 SHA512 b379ed366327eb4de3a7ed732be58a3757fdcd231637f0fbc2f9b762fda08173244d05fd853d683cfa6bdad90f1d8ee663b3eae9aee024456ef46e8a021e7122 WHIRLPOOL ba9a26874d14b6dfd62858da1b50397bc0aa9637bfe0824d4911f4df1e430e60a9f589242f8dc60a792b16f5201f9e0944d637e0d3a4749a211b976459152d69
diff --git a/dev-util/pkgconf/metadata.xml b/dev-util/pkgconf/metadata.xml
index 818df191a08c..bd273d83de0f 100644
--- a/dev-util/pkgconf/metadata.xml
+++ b/dev-util/pkgconf/metadata.xml
@@ -4,7 +4,6 @@
 	<maintainer type="person">
 		<email>elizabeth@interlinked.me</email>
 		<name>Elizabeth Myers</name>
-		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
diff --git a/dev-util/pkgconf/pkgconf-1.0.1.ebuild b/dev-util/pkgconf/pkgconf-1.0.1.ebuild
new file mode 100644
index 000000000000..eff8a40f5340
--- /dev/null
+++ b/dev-util/pkgconf/pkgconf-1.0.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI=( {https,git}://github.com/pkgconf/${PN}.git )
+	inherit autotools git-r3
+else
+	SRC_URI="https://github.com/pkgconf/pkgconf/releases/download/${P}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
+		~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux
+		~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
+fi
+
+inherit multilib-minimal
+
+DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
+HOMEPAGE="https://github.com/pkgconf/pkgconf"
+
+LICENSE="BSD-1"
+SLOT="0"
+IUSE="+pkg-config strict"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	pkg-config? (
+		!dev-util/pkgconfig
+		!dev-util/pkg-config-lite
+		!dev-util/pkgconfig-openbsd[pkg-config]
+	)"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/pkgconf
+)
+
+src_prepare() {
+	default
+
+	[[ ${PV} == "9999" ]] && eautoreconf
+	if use pkg-config; then
+		MULTILIB_CHOST_TOOLS+=(
+			/usr/bin/pkg-config
+		)
+	fi
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf $(use_enable strict)
+}
+
+multilib_src_install() {
+	default
+
+	if use pkg-config; then
+		dosym pkgconf /usr/bin/pkg-config
+	else
+		rm "${ED%/}"/usr/share/aclocal/pkg.m4 || die
+	fi
+}
diff --git a/dev-util/pkgconf/pkgconf-9999.ebuild b/dev-util/pkgconf/pkgconf-9999.ebuild
index aed82b201943..eff8a40f5340 100644
--- a/dev-util/pkgconf/pkgconf-9999.ebuild
+++ b/dev-util/pkgconf/pkgconf-9999.ebuild
@@ -1,18 +1,21 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://github.com/pkgconf/pkgconf.git"
-	inherit autotools git-2 multilib-minimal
+	EGIT_REPO_URI=( {https,git}://github.com/pkgconf/${PN}.git )
+	inherit autotools git-r3
 else
-	inherit autotools multilib-minimal vcs-snapshot
-	SRC_URI="https://github.com/pkgconf/pkgconf/tarball/${P} -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+	SRC_URI="https://github.com/pkgconf/pkgconf/releases/download/${P}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
+		~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux
+		~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
 fi
 
+inherit multilib-minimal
+
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
 HOMEPAGE="https://github.com/pkgconf/pkgconf"
 
@@ -33,8 +36,9 @@ MULTILIB_CHOST_TOOLS=(
 )
 
 src_prepare() {
-	[[ -e configure ]] || eautoreconf
+	default
 
+	[[ ${PV} == "9999" ]] && eautoreconf
 	if use pkg-config; then
 		MULTILIB_CHOST_TOOLS+=(
 			/usr/bin/pkg-config
@@ -49,8 +53,10 @@ multilib_src_configure() {
 
 multilib_src_install() {
 	default
-	use pkg-config \
-		&& dosym pkgconf /usr/bin/pkg-config \
-		|| rm "${ED}"/usr/share/aclocal/pkg.m4 \
-		|| die
+
+	if use pkg-config; then
+		dosym pkgconf /usr/bin/pkg-config
+	else
+		rm "${ED%/}"/usr/share/aclocal/pkg.m4 || die
+	fi
 }
diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass
index 5bac36b6737c..63f0d6b20912 100644
--- a/eclass/toolchain-funcs.eclass
+++ b/eclass/toolchain-funcs.eclass
@@ -421,6 +421,27 @@ tc-has-openmp() {
 	return ${ret}
 }
 
+# @FUNCTION: tc-check-openmp
+# @DESCRIPTION:
+# Test for OpenMP support with the current compiler and error out with
+# a clear error message, telling the user how to rectify the missing
+# OpenMP support that has been requested by the ebuild. Using this function
+# to test for OpenMP support should be preferred over tc-has-openmp and
+# printing a custom message, as it presents a uniform interface to the user.
+tc-check-openmp() {
+	if ! tc-has-openmp; then
+		eerror "Your current compiler does not support OpenMP!"
+
+		if tc-is-gcc; then
+			eerror "Enable OpenMP support by building sys-devel/gcc with USE=\"openmp\"."
+		elif tc-is-clang; then
+			eerror "OpenMP support in sys-devel/clang is provided by sys-libs/libomp."
+		fi
+
+		die "Active compiler does not have required support for OpenMP"
+	fi
+}
+
 # @FUNCTION: tc-has-tls
 # @USAGE: [-s|-c|-l] [toolchain prefix]
 # @DESCRIPTION:
diff --git a/media-sound/qjackctl/qjackctl-0.4.3-r1.ebuild b/media-sound/qjackctl/qjackctl-0.4.3-r1.ebuild
new file mode 100644
index 000000000000..34b55a5a3c20
--- /dev/null
+++ b/media-sound/qjackctl/qjackctl-0.4.3-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit flag-o-matic qmake-utils
+
+DESCRIPTION="Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections"
+HOMEPAGE="http://qjackctl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="alsa dbus debug portaudio"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	virtual/jack
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( dev-qt/qtdbus:5 )
+	portaudio? ( media-libs/portaudio )"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5"
+
+src_configure() {
+	append-cxxflags -std=c++11
+	econf \
+		--with-qt5="$(qt5_get_bindir)/.." \
+		$(use_enable alsa alsa-seq) \
+		$(use_enable dbus) \
+		$(use_enable debug) \
+		$(use_enable portaudio)
+
+	eqmake5 ${PN}.pro -o ${PN}.mak
+}
+
+src_compile() {
+	emake -f ${PN}.mak
+}
diff --git a/media-sound/qjackctl/qjackctl-0.4.3.ebuild b/media-sound/qjackctl/qjackctl-0.4.3.ebuild
deleted file mode 100644
index 744606ed6bc1..000000000000
--- a/media-sound/qjackctl/qjackctl-0.4.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit qmake-utils
-
-DESCRIPTION="A Qt application to control the JACK Audio Connection Kit and ALSA sequencer connections"
-HOMEPAGE="http://qjackctl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="alsa dbus debug portaudio +qt5"
-
-RDEPEND="
-	virtual/jack
-	qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
-	!qt5? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )
-	alsa? ( media-libs/alsa-lib )
-	dbus? (
-		qt5? ( dev-qt/qtdbus:5 )
-		!qt5? ( dev-qt/qtdbus:4 )
-	)
-	portaudio? ( media-libs/portaudio )"
-DEPEND="${RDEPEND}
-	qt5? ( dev-qt/linguist-tools:5 )"
-
-DOCS="AUTHORS ChangeLog README TODO TRANSLATORS"
-
-src_configure() {
-	econf \
-		$(use_with !qt5 qt4 "$(qt4_get_bindir)/..") \
-		$(use_with qt5 qt5 "$(qt5_get_bindir)/..") \
-		$(use_enable alsa alsa-seq) \
-		$(use_enable dbus) \
-		$(use_enable debug) \
-		$(use_enable portaudio)
-
-	# Emulate what the Makefile does, so that we can get the correct
-	# compiler used.
-	if use qt5 ; then
-		eqmake5 ${PN}.pro -o ${PN}.mak
-	else
-		eqmake4 ${PN}.pro -o ${PN}.mak
-	fi
-}
-
-src_compile() {
-	emake -f ${PN}.mak
-}
diff --git a/media-sound/qmidiarp/Manifest b/media-sound/qmidiarp/Manifest
index 73eee71868b6..22a4b9a50c1c 100644
--- a/media-sound/qmidiarp/Manifest
+++ b/media-sound/qmidiarp/Manifest
@@ -1,2 +1,3 @@
 DIST qmidiarp-0.3.9.tar.bz2 185426 SHA256 0e9b9de1e8f0e54e253a20d985ea923275a006eacc17281f48644b96ae3d01fc SHA512 f015e95ee099c135352b641101042b4042de486de374d2bbac491a464191e6a9399fac121603aa2e96d6b45987835b4d74d40056d57568ecb91db17c950b1ae4 WHIRLPOOL 3b77d772da2cf50ef8c6c2b9dbba13831a7ff3465010eda06757b316fd3ef2db1625f56797b7824e13f56e7a2ddd973e72d80971fd3b6e4be602e7b23d5c35ff
 DIST qmidiarp-0.6.1.tar.bz2 536640 SHA256 f81f0b51ab8cfc57eeecd8873d07b3bec56b193b2287a36ec4ab75d7754f6d9d SHA512 8b63e0744a42458d395b8003123514394db01d2a15ba4727725fb54fb2b8234d7dd7c241d84c9ec46bf84d56d84aaf84916fb59627c7863d15582cbf1fe63bba WHIRLPOOL 66075dbb34c273e12ccbc5bcd18b59458df7fb5ae4afed08f58c08fd9fe97967035b4fb9ef2cc7b9037d5e92d97cdd84b8c8bf88108befdbd12d5aa5d624e9c9
+DIST qmidiarp-0.6.3.tar.bz2 541646 SHA256 10f5f4784cb3d0e131978f455bff57bf82fae71956a923d83a3809ea92b4f07f SHA512 0dbb916e4d27cf03924ce5c76928d01afe677331ec9b2a1ea7ca0c06725ead012458956d254e811908f9c351b00bf309bdf806b0ff68cdd40d129d73dab683c9 WHIRLPOOL 823d0130bd90e45132ba6d423b11c4713225208353382df9ae0824d55e2d439e566a30d9c2e5184263b956cf5fa1cda301cb4449fde0a950ca6961f7791c9bcf
diff --git a/media-sound/qmidiarp/qmidiarp-0.6.3.ebuild b/media-sound/qmidiarp/qmidiarp-0.6.3.ebuild
new file mode 100644
index 000000000000..0557d1177b14
--- /dev/null
+++ b/media-sound/qmidiarp/qmidiarp-0.6.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit flag-o-matic qmake-utils
+
+DESCRIPTION="An arpeggiator, sequencer and MIDI LFO for ALSA"
+HOMEPAGE="http://qmidiarp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls lv2 osc"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+	media-sound/jack-audio-connection-kit
+	lv2? ( media-libs/lv2 )
+	osc? ( media-libs/liblo )"
+DEPEND="${RDEPEND}
+	nls? ( dev-qt/qttranslations:5 )
+	virtual/pkgconfig"
+
+src_configure() {
+	export PATH="$(qt5_get_bindir):${PATH}"
+
+	append-cxxflags -std=c++11
+
+	econf \
+		--enable-qt5 \
+		$(use_enable lv2 lv2plugins) \
+		$(use_enable nls translations) \
+		$(use_enable osc nsm)
+}