Merge updates from master

10 files changed, 299 insertions, 0 deletions

diff --git a/app-text/languagetool/Manifest b/app-text/languagetool/Manifest
index a3e18373c589..6c7e79775436 100644
--- a/app-text/languagetool/Manifest
+++ b/app-text/languagetool/Manifest
@@ -1 +1,2 @@
 DIST LanguageTool-3.4.zip 95764120 SHA256 ff36380c5807c5bdc67d222c5f2adeeb0a047a02661885c29cd8297443846c9c SHA512 450c5faa98b61cd2ed132f1e3ff592914e0abd58ed02d9c372fb9ef57d566d32d7bbb3a3ecf6a3d26248379bbecd35934e4ae0e33bb5ae821eaa0eb17d6e07e2 WHIRLPOOL 9f44486917581ed723f61d5d8af7100c4ab679a7ca36362b2426f04575bf90966e2a5b6de15b28cbec517bae5f1d6ae1ec18c6c9b0643880130da03e838dc09d
+DIST LanguageTool-3.5.zip 93540212 SHA256 643029da89041ccfb48772deaf0dd0e16942de2d381c5dc8ae9372f1b043bcab SHA512 ad49dd292ca6841e1ef439b2dbe55748f621333b418bd6a596534cd5b2cb7019170c98046c8e2c68c3d75a9e5d132cf329de6481eaaccb8f78aae2233bdb8e45 WHIRLPOOL d518d0eaee5447115f09dfac0071462d9a2c51e3327da7f9500a251571fb9186920f9c68eb008f151bc8db173ad22a4068b4953165d1219f05e6857fe8554369
diff --git a/app-text/languagetool/languagetool-3.5.ebuild b/app-text/languagetool/languagetool-3.5.ebuild
new file mode 100644
index 000000000000..06b03fe708d7
--- /dev/null
+++ b/app-text/languagetool/languagetool-3.5.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit java-pkg-2
+
+MY_PN=LanguageTool
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="a proof-reading tool for many languages"
+HOMEPAGE="http://www.languagetool.org/"
+SRC_URI="http://www.languagetool.org/download/${MY_P}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8
+	dev-java/commons-cli:1
+	dev-java/commons-io:1
+	dev-java/commons-lang:2.1
+	dev-java/commons-logging:0
+	dev-java/guava:18
+	dev-java/hamcrest-core:1.3
+	dev-java/jna:0
+	dev-java/jcommander:0
+	dev-java/slf4j-api:0
+	dev-java/slf4j-nop:0
+"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	default
+}
+
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins *.jar
+	doins -r org META-INF
+
+	cat >>"${T}/${PN}" <<-EOF
+		#!/bin/sh
+		cd "${EROOT}usr/share/${PN}"
+		java -jar ${PN}-commandline.jar \$@
+	EOF
+
+	cat >>"${T}/${PN}-gui" <<-EOF
+		#!/bin/sh
+		cd "${EROOT}usr/share/${PN}"
+		java -jar ${PN}.jar \$@
+	EOF
+	exeinto /usr/bin
+	doexe "${T}"/${PN} "${T}"/${PN}-gui
+
+	dodoc CHANGES.md README.md
+
+	pushd libs >/dev/null || die
+	rm {commons-io,commons-lang,commons-logging,jcommander,jna,junit}.jar || die
+	java-pkg_jarinto /usr/share/${PN}/libs
+	java-pkg_jar-from commons-io-1 commons-io.jar
+	java-pkg_jar-from commons-lang-2.1 commons-lang.jar
+	java-pkg_jar-from commons-logging commons-logging.jar
+	java-pkg_jar-from commons-cli-1 commons-cli.jar
+	java-pkg_jar-from guava-18 guava.jar
+	java-pkg_jar-from hamcrest-core-1.3 hamcrest-core.jar
+	java-pkg_jar-from jcommander jcommander.jar
+	java-pkg_jar-from jna jna.jar
+	java-pkg_jar-from slf4j-api slf4j-api.jar
+	java-pkg_jar-from slf4j-nop slf4j-nop.jar
+	java-pkg_dojar *.jar
+	popd >/dev/null || die
+}
diff --git a/app-vim/languagetool/Manifest b/app-vim/languagetool/Manifest
index 51de5d0b16b0..d2dfc1e7bd8a 100644
--- a/app-vim/languagetool/Manifest
+++ b/app-vim/languagetool/Manifest
@@ -1 +1,2 @@
 DIST languagetool-1.29.tar.bz2 8059 SHA256 92fd4bf94c65828f1c309da5257336a2287c07cae7ab6a4709ae1b79dcbbbcca SHA512 09b5bdc1d3590afe26578f687064a7a62493a11fafca903759dc1e9048cb22a04c6352127b13e4a63acb867d73d943b56fcae7f733350626f05b66a6d1f1626d WHIRLPOOL d5c8d411b465fdad629493e834d154e7e3a25898b20bc009c4ff9977593ab46ca6e0f6f57ae7933da08b9f7283ebc793106a4eb31a17d670050a94f27a2f2af5
+DIST languagetool-1.30.tar.bz2 8089 SHA256 b99b27e06a43e5ea0c1a3d3e02dcef9b8339c55bd725782fd0ea4cd1efc0592d SHA512 c04115752f8a601e85b718ea8d68cbdaa7628d14c252b4bb5bd11449ae2c5558ddee3d0f3a1bc2db84364e127fc211a0c4fe51e4ff9b442ebe99aa4f9d1db935 WHIRLPOOL b65931b68dd4a47f8ba77cfb4e9a08c58686495a6d095cddff7acc51c76969ec60c51f207bee73b5614fddbea95d35152c334df29f6f956d39c57335636a8fe8
diff --git a/app-vim/languagetool/languagetool-1.30.ebuild b/app-vim/languagetool/languagetool-1.30.ebuild
new file mode 100644
index 000000000000..16017609ba22
--- /dev/null
+++ b/app-vim/languagetool/languagetool-1.30.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit vim-plugin
+
+MY_PN=LanguageTool
+DESCRIPTION="grammar checker for various languages"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3223"
+LICENSE="vim"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${MY_PN}"
+
+RDEPEND="app-text/languagetool"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.29-script.patch )
diff --git a/dev-vcs/bfg/Manifest b/dev-vcs/bfg/Manifest
index de227b9c4fb4..5aa772d278f3 100644
--- a/dev-vcs/bfg/Manifest
+++ b/dev-vcs/bfg/Manifest
@@ -1,2 +1,3 @@
 DIST bfg-1.12.12.jar 14664691 SHA256 03291c9cd9cdc664104f49b22b76bd39edc73052936cbfd72fc8d8595971fd9a SHA512 f3a9d39c764a8d42054ed346a51ac2402814a4a18f2802640e776653a3081800e38e3052ac447fd82f0d1667aa1ca5d6745a2e7b9c7503d3fec7c25d364c8cf3 WHIRLPOOL eca6191885752bf8af5e84a97c31f6c0ad191ea3f49a009e0fd99ea09c69c6c95337bbe82f6b8e5e3220286d25c66b86f1f8ea9e183c51ac56bdaa42d9abb1b2
 DIST bfg-1.12.13.jar 14774921 SHA256 fbeb45314d45c7ff26bb513154675a2e1e822282e0d095c6d911fcf68fd089c0 SHA512 a65586b84b10bbbc3ba2058862348010c2513c5f4f5e91dbbdc3392622811aa40e473cc19ad4a7bf4eaa2cd2f9c49b60fdb4e557cb68b2d66afc6c47e34b4484 WHIRLPOOL 920cd40ad66d65087ad12e76893c5e591b41ac0cf99e3fce6acf492d61042c12c078a41824944762f1528a575f6d67ec2973d0d13a137876cf412e18a8a70c9b
+DIST bfg-1.12.14.jar 14811487 SHA256 7a44d53ef626a4282c34cc363166e678c5d9e91e4c6815e8e069036edd9fab64 SHA512 ff6bf60a8cba67537f46968c2f24dd91a15c9d533b503396b28bcc0af368d2852228e276d87e44013aba612e24b23d094563fc4d166957aac9ab7349be9f8a26 WHIRLPOOL 2e176efa35eeb61763550748695a1cc789530c42072facb19fd833b54b76ef048f8ee8265ce73173ab7c7af807278961cea5ee9ac30d5cedcf5de9079f7f347e
diff --git a/dev-vcs/bfg/bfg-1.12.14.ebuild b/dev-vcs/bfg/bfg-1.12.14.ebuild
new file mode 100644
index 000000000000..ad54a9d338cb
--- /dev/null
+++ b/dev-vcs/bfg/bfg-1.12.14.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit java-pkg-2
+
+DESCRIPTION="a faster alternative to git-filter-branch for removing bad data from git repos"
+HOMEPAGE="http://rtyley.github.io/bfg-repo-cleaner/"
+SRC_URI="http://repo1.maven.org/maven2/com/madgag/${PN}/${PV}/${P}.jar"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.6"
+
+S=${WORKDIR}
+
+src_prepare() {
+	default
+	java-pkg-2_src_prepare
+}
+
+src_unpack() { :; }
+src_compile() { :; }
+
+src_install() {
+	java-pkg_newjar "${DISTDIR}"/${P}.jar
+	java-pkg_dolauncher ${PN}
+}
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index 1923e5203918..27049522dcef 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -1,3 +1,4 @@
 DIST Image-ExifTool-10.25.tar.gz 4161833 SHA256 edc2de5848375f7ccb88cd7d0260c98c4c581ffd509c4c249949f0cd1f522dd0 SHA512 6f3c9e432198a0be00efed1dc6044ea1be330099ec3d47bab8e761230c8fadc48bc26571202aea16e82890a9315ea752f25e06a2c7e5fd6d7690387e681870c7 WHIRLPOOL 49f11b61ada48c3d4d3d36d79f110a248c535bb8eb8625cdd7f5c4ef714c94676369b765abe63076589ea05b7c5cbf7ee5401c1c93e344cf704e26a091c5d464
 DIST Image-ExifTool-10.27.tar.gz 4176031 SHA256 344f201a37f61a9f02ed7831cd86c89ccb14ea163ea77e129f094dc92e4b8852 SHA512 2f90c36afb7d870e4ea39e598afd15ab6183645b53d760cd2b1c883e424df22e1e50d4e2851abe8bf54a4e04a015597ca947053f9d1597f0709e6c0ff342f1c2 WHIRLPOOL fee344bc2354f16cb303a24f7f6b530d28fc4b4823b9cf11adbc2215c18c2a2e5c2608cfeeb5732e420b64f8cefbc35fb4c49a714a0da87a0e8313729c4291d2
 DIST Image-ExifTool-10.28.tar.gz 4252944 SHA256 18cee8c0fb9331f63b883a5e5e42f5b40f5e30696289c00f1fe9e5e536f90bef SHA512 8fa37bdb5b52ea657dcdd86468cbce4ad113ef3afe7c52ca30b9ace6368d0dfe4bead69cd799bd403fd3d3dd8f7fdb24f8015eee19fec6d852bf8186b66f9b99 WHIRLPOOL c38fa5b29a4d82a74477acd593b968f8986098b02c5114093b497711f8669140a51040c358cf2c4665ce78f57609e67670fc8a3699eb31c15a58e5ba445ec9d3
+DIST Image-ExifTool-10.31.tar.gz 4201613 SHA256 192884639ff4934ecdb9edc107a0b9f1a49c9afadf457bae8fa97e15816dc1ea SHA512 6ae905be7f4670d9110d6dc9b7248b25a8aec50db89286aa85cb0bcf2de0a3f4cfabc89e32abd5cabcaa4da34d26b4efe3ed64fb7678076ea5999219502f70b4 WHIRLPOOL 73140eb16a5837e0784ef09ca8403d607070e53c22e4a182a3d381a926f24cf1b58082326ddc615dd2cc802d17377f12e329399bf6b757defb87b927eae752fa
diff --git a/media-libs/exiftool/exiftool-10.31.ebuild b/media-libs/exiftool/exiftool-10.31.ebuild
new file mode 100644
index 000000000000..e1513a94b78d
--- /dev/null
+++ b/media-libs/exiftool/exiftool-10.31.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_NAME=Image-ExifTool
+inherit perl-module
+
+DESCRIPTION="Read and write meta information in image, audio and video files"
+HOMEPAGE="http://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
+SRC_URI="http://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos"
+IUSE="doc"
+
+SRC_TEST="do"
+
+src_install() {
+	perl-module_src_install
+	use doc && dodoc -r html/
+}
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 3424cb0af5b1..432e084232aa 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -2,3 +2,4 @@ DIST lilypond-2.18.2.tar.gz 16027977 SHA256 329d733765b0ba7be1878ae3f457dbbb875c
 DIST lilypond-2.19.46.tar.gz 16899476 SHA256 f609051e2128c40da17698c0432fe8a96858583d197a8264fc4bceeab0378674 SHA512 594921b784f6604bfb2210569fac03911cb5c4c11e2e9241f62153d7c012b5e10cd2cacd3ac3d69c1719c9b6fddc550d381a9fa9b96f22ada63019b38ef95de1 WHIRLPOOL b77b1bc76ccdf6e17179fd9b1497beac96da2bd1ce83b7944a2a8f4a5d6274581c8e7f4c9e2de44b53912df702731456cd2658d96cccb186347f1a4577146a4d
 DIST lilypond-2.19.47.tar.gz 16926783 SHA256 842312813a9144b6b54a33f13fb19addbfc779d7bbfe3b2075be1235287de08c SHA512 8720a11f0410bd462db1bf11508a7181953b099918b01fc3707a52a2269a840473fc22065b82fad59d98fdd84e54d3810c2c6a4302754d36f1bd6d847e7f72bd WHIRLPOOL ccd8eee71067b0811a32a0ad6572031f936e95637266909534a5212783f0c0fe99eac7406aadae21b17e632c3fb1f1c50b945d4d0e9b64b32ec1c976bf8406c1
 DIST lilypond-2.19.48.tar.gz 16928689 SHA256 84b586cfe933a330e964b1c3e95c41525499eca6a5625089044d943e9cc768c8 SHA512 aa128a651af69579ef7fead0a88b57697c2a4a2604f9e81232b48d6b355a0f6e1f372b12454f7154126c78516341a7123bba8aa2dcd4eb17c819030e51a893f9 WHIRLPOOL 5f8d31a93355ec9c0871bec73d0e9ed8ac57989a3e0d8d40df3953c1439ad986529a1f7665025c4e68473f4d87805f17c1a42ef8fa8bb604c8ff21871e65f14a
+DIST lilypond-2.19.49.tar.gz 17037279 SHA256 cd190de273cfef61a76c7dec74700b1e8a5d0b44cc98d8a11b58325706c6a3ee SHA512 1b1cd356f332994855f67a1dd8d0aef02f0b133d3aa9c91ddba0950b78b1cb4dc243b0926f7ce0ac46677c8b3cd267cd03db965cb26f74928a645c9d358c6ba2 WHIRLPOOL e0ffd3cde364d234b2bc1f75a453cf40412accab69852befe5d6cc81e5e8dbf91afbb1f5bb3c05b43ff0444b7854621edf1a95dfad5dc46c869530b086685242
diff --git a/media-sound/lilypond/lilypond-2.19.49.ebuild b/media-sound/lilypond/lilypond-2.19.49.ebuild
new file mode 100644
index 000000000000..63535e73399f
--- /dev/null
+++ b/media-sound/lilypond/lilypond-2.19.49.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+[[ "${PV}" = "9999" ]] && inherit git-r3
+inherit elisp-common autotools python-single-r1
+
+if [[ "${PV}" = "9999" ]]; then
+	EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git"
+else
+	SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86"
+fi
+
+DESCRIPTION="GNU Music Typesetter"
+HOMEPAGE="http://lilypond.org/"
+
+LICENSE="GPL-3 FDL-1.3"
+SLOT="0"
+LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW"
+IUSE="debug emacs profile vim-syntax ${LANGS// / linguas_}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=app-text/ghostscript-gpl-8.15
+	>=dev-scheme/guile-1.8.2:12[deprecated,regex]
+	media-fonts/tex-gyre
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=x11-libs/pango-1.12.3
+	emacs? ( virtual/emacs )
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	app-text/t1utils
+	dev-lang/perl
+	dev-libs/kpathsea
+	>=dev-texlive/texlive-metapost-2013
+	|| (
+		>=app-text/texlive-core-2013
+		>=dev-tex/metapost-1.803
+	)
+	virtual/pkgconfig
+	media-gfx/fontforge[png]
+	>=sys-apps/texinfo-4.11
+	>=sys-devel/bison-2.0
+	sys-devel/flex
+	sys-devel/gettext
+	sys-devel/make"
+
+# Correct output data for tests isn't bundled with releases
+RESTRICT="test"
+
+DOCS=( DEDICATION HACKING README.txt ROADMAP )
+
+pkg_setup() {
+	# make sure >=metapost-1.803 is selected if it's installed, bug 498704
+	if [[ ${MERGE_TYPE} != binary ]] && has_version ">=dev-tex/metapost-1.803" ; then
+		if [[ $(readlink "${EROOT}"/usr/bin/mpost) =~ mpost-texlive-* ]] ; then
+			einfo "Updating metapost symlink"
+			eselect mpost update || die
+		fi
+	fi
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if ! use vim-syntax ; then
+		sed -i 's/vim//' GNUmakefile.in || die
+	fi
+
+	# respect CFLAGS
+	sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
+
+	for lang in ${LANGS}; do
+		use linguas_${lang} || rm po/${lang}.po || die
+	done
+
+	# respect AR
+	sed -i "s/^AR=ar/AR=$(tc-getAR)/" stepmake/stepmake/library-vars.make || die
+
+	# remove bundled texinfo file (fixes bug #448560)
+	rm tex/texinfo.tex || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# documentation generation currently not supported since it requires a newer
+	# version of texi2html than is currently in the tree
+
+	local myeconfargs+=(
+		--with-texgyre-dir=/usr/share/fonts/tex-gyre
+		--disable-documentation
+		--disable-optimising
+		--disable-pipe
+		$(use_enable debug debugging)
+		$(use_enable profile profiling)
+	)
+
+	has_version ">=dev-scheme/guile-2" && myeconfargs+=( --enable-guile2 )
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use emacs ; then
+		elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \
+			|| die "elisp-compile failed"
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
+
+	# remove elisp files since they are in the wrong directory
+	rm -r "${ED}"/usr/share/emacs || die
+
+	if use emacs ; then
+		elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \
+			|| die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
+	fi
+
+	python_fix_shebang "${ED}"
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}