summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-misc/byobu/Manifest1
-rw-r--r--app-misc/byobu/byobu-5.112.ebuild44
-rw-r--r--app-misc/task/Manifest2
-rw-r--r--app-misc/task/task-2.4.4.ebuild59
-rw-r--r--app-misc/task/task-2.5.0.ebuild59
-rw-r--r--app-misc/task/task-2.5.1.ebuild2
-rw-r--r--app-text/languagetool/Manifest1
-rw-r--r--app-text/languagetool/languagetool-3.4.ebuild75
-rw-r--r--app-text/languagetool/metadata.xml8
-rw-r--r--app-vim/languagetool/Manifest1
-rw-r--r--app-vim/languagetool/files/languagetool-1.29-script.patch38
-rw-r--r--app-vim/languagetool/languagetool-1.29.ebuild18
-rw-r--r--app-vim/languagetool/metadata.xml8
-rw-r--r--dev-lang/python/python-2.7.10-r1.ebuild4
-rw-r--r--dev-lang/python/python-2.7.12.ebuild4
-rw-r--r--dev-lang/python/python-3.4.3-r1.ebuild8
-rw-r--r--dev-lang/python/python-3.4.5.ebuild8
-rw-r--r--dev-lang/python/python-3.5.2.ebuild8
-rw-r--r--eclass/python-utils-r1.eclass2
-rw-r--r--media-libs/exiftool/Manifest4
-rw-r--r--media-libs/exiftool/exiftool-10.20.ebuild23
-rw-r--r--media-libs/exiftool/exiftool-10.24.ebuild23
-rw-r--r--media-libs/exiftool/exiftool-10.25.ebuild2
-rw-r--r--media-libs/exiftool/exiftool-10.27.ebuild (renamed from media-libs/exiftool/exiftool-10.23.ebuild)0
-rw-r--r--media-sound/abcm2ps/Manifest1
-rw-r--r--media-sound/abcm2ps/abcm2ps-8.12.3.ebuild49
-rw-r--r--media-sound/abcmidi/Manifest1
-rw-r--r--media-sound/abcmidi/abcmidi-2016.09.20.ebuild41
-rw-r--r--net-misc/tor/files/tor.initd-r842
-rw-r--r--net-misc/tor/tor-0.2.8.8-r1.ebuild (renamed from net-misc/tor/tor-0.2.8.8.ebuild)2
-rw-r--r--net-misc/tor/tor-0.2.9.3_alpha-r1.ebuild (renamed from net-misc/tor/tor-0.2.9.3_alpha.ebuild)2
31 files changed, 346 insertions, 194 deletions
diff --git a/app-misc/byobu/Manifest b/app-misc/byobu/Manifest
index 83497b264898..a10315d8c07b 100644
--- a/app-misc/byobu/Manifest
+++ b/app-misc/byobu/Manifest
@@ -1,2 +1,3 @@
DIST byobu_5.111.orig.tar.gz 664384 SHA256 b28c93f72cd9a62e1b1aa11abc8d8863f06c43da2c7089f6529683bbf13a50fc SHA512 f4b20fd3ac01b4361a9ea02428326c3920a8bf728b03c309d491413daf603b3b2807ab1770274034f08299947d66a759777a1b2ddd087d7c9c19c67c7baec48a WHIRLPOOL 32cddcc542137a438bffde637190663d7f56ba44de622110134b79f536b5f33ff3e80a28824d33b12ad792efd27e9bf898ee13e186df7923f46dce29d0a01b44
+DIST byobu_5.112.orig.tar.gz 664274 SHA256 4d67fb7bc18cb6ceb74f800fc312c3a1c6b1cb19c1d6e0e6cfe60fd8900e7b2b SHA512 57545ac86e1f6bf6601250bfd9d46ada17b22728a17453f9810b723c393655db97723d068b2452467dc4b4e9c2d9d52b76011191f4f09c01ad4bb91d93f15bea WHIRLPOOL 5a30f25a50ebf2a6ca30765a18d1850dc1c6433aed39e2dc56d9da1cbd4a3aec3c4d9d8d74fe6b965e912abd52d289b8f801050c9454ff865e508281b9014de5
DIST byobu_5.94.orig.tar.gz 660103 SHA256 4917013f590110d25b18293a51af02bd1ebcd1c665474f62e2566fb9b8f62916 SHA512 b4e07d7d197f8796c26f33aa08c1d61dab463ce5cd2d646bf32c4c5a4be17ffe2b8996cb305c999ca0be20a1fab81c24dbd0eae5588b74e8da1e7726c293b2e6 WHIRLPOOL d2832c4ecac9d4d6907051d33efb8f51816866ce4bd0d75d5684322dd83a56d0a4717d2b6fd7736a0ca488d5e2e648a0e48a09de6a0bffcd779aa63cefd50c4c
diff --git a/app-misc/byobu/byobu-5.112.ebuild b/app-misc/byobu/byobu-5.112.ebuild
new file mode 100644
index 000000000000..7bd23b5ebffa
--- /dev/null
+++ b/app-misc/byobu/byobu-5.112.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
+HOMEPAGE="http://byobu.co"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="screen"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ dev-libs/newt[${PYTHON_USEDEP}]
+ screen? ( app-misc/screen )
+ !screen? ( app-misc/tmux )"
+
+src_prepare() {
+ default
+
+ python_fix_shebang .
+
+ # Set default system backend to screen
+ if use screen ; then
+ sed -i -e 's/#\(BYOBU_BACKEND\).*/\1="screen"/' etc/byobu/backend || die
+ fi
+}
+
+src_install() {
+ default
+
+ # Create symlinks for backends
+ dosym ${PN} /usr/bin/${PN}-screen
+ dosym ${PN} /usr/bin/${PN}-tmux
+
+ docompress -x /usr/share/doc/${PN}
+}
diff --git a/app-misc/task/Manifest b/app-misc/task/Manifest
index 0c0d0a298d6f..e54136649b65 100644
--- a/app-misc/task/Manifest
+++ b/app-misc/task/Manifest
@@ -1,3 +1 @@
-DIST task-2.4.4.tar.gz 2352265 SHA256 7ff406414e0be480f91981831507ac255297aab33d8246f98dbfd2b1b2df8e3b SHA512 23565dc21bb5a05af5fe44235756ac5ecbd3b7cd94b2edc2ed0b0bd4efc5a12739cc8e3474174878595188ba726428b865dee3a79f0ad2550d5a0bc25415b103 WHIRLPOOL f071926d77a228289e2fb6a9e5c53e9db9e2d278879bf6249b04b0e7f7afe5f4195f9ea3fb42ac4aac318d0f53eda378ac24c73321d99a83c0f22295ad1dcaf4
-DIST task-2.5.0.tar.gz 900285 SHA256 4d8e67415a6993108c11b8eeef99b76a991af11b22874adbb7ae367e09334636 SHA512 911ed33553c71d0578dda20774ff1c5762700957ed637ed849ef51c4cd00a53feabc18c477dbc4b618371d9ddc8fec71795f96d8474acbec8a91be8bb1ff1bfd WHIRLPOOL e17995f173c6935f46ab476517e16157771a52bb930a6287e3f17b68ebae19db380da0643ae7a1fe6ce549ccb11d8ebe71ed45b5b650eef4343902b70459e1e6
DIST task-2.5.1.tar.gz 903428 SHA256 d87bcee58106eb8a79b850e9abc153d98b79e00d50eade0d63917154984f2a15 SHA512 ec17e5cefff55ecd2c1cb717801c02683d94030906c8d86450c3c79c0bc5a18d82559a5e9e26a91411a1025a241b78ddbc1de51cafc1a2dd531e8229e5e61c10 WHIRLPOOL e4502a4f545eb5c044943758e3b4710db34c9011ccb58b95e70486c09593620a91cf547100025182867b69c87099cd8614b6bc28e21d5e0c0b88216f6df419ac
diff --git a/app-misc/task/task-2.4.4.ebuild b/app-misc/task/task-2.4.4.ebuild
deleted file mode 100644
index b3b3f3465567..000000000000
--- a/app-misc/task/task-2.4.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils cmake-utils bash-completion-r1
-
-DESCRIPTION="Taskwarrior is a command-line todo list manager"
-HOMEPAGE="http://taskwarrior.org/"
-SRC_URI="http://taskwarrior.org/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~x64-macos"
-IUSE="gnutls vim-syntax zsh-completion"
-
-DEPEND="sys-libs/readline:0
- gnutls? ( net-libs/gnutls )
- elibc_glibc? ( sys-apps/util-linux )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- # use the correct directory locations
- sed -i "s:/usr/local/bin:${EPREFIX}/usr/bin:" \
- scripts/add-ons/* || die
-
- # don't automatically install scripts
- sed -i '/scripts/d' CMakeLists.txt || die
-}
-
-src_configure() {
- mycmakeargs=(
- $(cmake-utils_use_use gnutls GNUTLS)
- -DTASK_DOCDIR=share/doc/${PF}
- -DTASK_RCDIR=share/${PN}/rc
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- newbashcomp scripts/bash/task.sh task
-
- if use vim-syntax ; then
- rm scripts/vim/README
- insinto /usr/share/vim/vimfiles
- doins -r scripts/vim/*
- fi
-
- if use zsh-completion ; then
- insinto /usr/share/zsh/site-functions
- doins scripts/zsh/*
- fi
-
- exeinto /usr/share/${PN}/scripts
- doexe scripts/add-ons/*
-}
diff --git a/app-misc/task/task-2.5.0.ebuild b/app-misc/task/task-2.5.0.ebuild
deleted file mode 100644
index 338e35f63c15..000000000000
--- a/app-misc/task/task-2.5.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils cmake-utils bash-completion-r1
-
-DESCRIPTION="Taskwarrior is a command-line todo list manager"
-HOMEPAGE="http://taskwarrior.org/"
-SRC_URI="http://taskwarrior.org/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
-IUSE="gnutls vim-syntax zsh-completion"
-
-DEPEND="sys-libs/readline:0
- gnutls? ( net-libs/gnutls )
- elibc_glibc? ( sys-apps/util-linux )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- # use the correct directory locations
- sed -i "s:/usr/local/bin:${EPREFIX}/usr/bin:" \
- scripts/add-ons/* || die
-
- # don't automatically install scripts
- sed -i '/scripts/d' CMakeLists.txt || die
-}
-
-src_configure() {
- mycmakeargs=(
- $(cmake-utils_use_use gnutls GNUTLS)
- -DTASK_DOCDIR=share/doc/${PF}
- -DTASK_RCDIR=share/${PN}/rc
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- newbashcomp scripts/bash/task.sh task
-
- if use vim-syntax ; then
- rm scripts/vim/README
- insinto /usr/share/vim/vimfiles
- doins -r scripts/vim/*
- fi
-
- if use zsh-completion ; then
- insinto /usr/share/zsh/site-functions
- doins scripts/zsh/*
- fi
-
- exeinto /usr/share/${PN}/scripts
- doexe scripts/add-ons/*
-}
diff --git a/app-misc/task/task-2.5.1.ebuild b/app-misc/task/task-2.5.1.ebuild
index 5f3af4a8d86e..e60483b2d2a0 100644
--- a/app-misc/task/task-2.5.1.ebuild
+++ b/app-misc/task/task-2.5.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://taskwarrior.org/download/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm x86 ~x64-macos"
IUSE="gnutls vim-syntax zsh-completion"
DEPEND="sys-libs/readline:0
diff --git a/app-text/languagetool/Manifest b/app-text/languagetool/Manifest
new file mode 100644
index 000000000000..a3e18373c589
--- /dev/null
+++ b/app-text/languagetool/Manifest
@@ -0,0 +1 @@
+DIST LanguageTool-3.4.zip 95764120 SHA256 ff36380c5807c5bdc67d222c5f2adeeb0a047a02661885c29cd8297443846c9c SHA512 450c5faa98b61cd2ed132f1e3ff592914e0abd58ed02d9c372fb9ef57d566d32d7bbb3a3ecf6a3d26248379bbecd35934e4ae0e33bb5ae821eaa0eb17d6e07e2 WHIRLPOOL 9f44486917581ed723f61d5d8af7100c4ab679a7ca36362b2426f04575bf90966e2a5b6de15b28cbec517bae5f1d6ae1ec18c6c9b0643880130da03e838dc09d
diff --git a/app-text/languagetool/languagetool-3.4.ebuild b/app-text/languagetool/languagetool-3.4.ebuild
new file mode 100644
index 000000000000..b5431c40bc6d
--- /dev/null
+++ b/app-text/languagetool/languagetool-3.4.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-lang:2.1
+ dev-java/commons-logging:0
+ dev-java/guava:18
+ dev-java/hamcrest-core:1.3
+ dev-java/jna: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-lang,commons-logging,jna,junit}.jar || die
+ java-pkg_jarinto /usr/share/${PN}/libs
+ java-pkg_jar-from commons-lang-2.1
+ 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 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-text/languagetool/metadata.xml b/app-text/languagetool/metadata.xml
new file mode 100644
index 000000000000..84f8f1cf6bcb
--- /dev/null
+++ b/app-text/languagetool/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/languagetool/Manifest b/app-vim/languagetool/Manifest
new file mode 100644
index 000000000000..51de5d0b16b0
--- /dev/null
+++ b/app-vim/languagetool/Manifest
@@ -0,0 +1 @@
+DIST languagetool-1.29.tar.bz2 8059 SHA256 92fd4bf94c65828f1c309da5257336a2287c07cae7ab6a4709ae1b79dcbbbcca SHA512 09b5bdc1d3590afe26578f687064a7a62493a11fafca903759dc1e9048cb22a04c6352127b13e4a63acb867d73d943b56fcae7f733350626f05b66a6d1f1626d WHIRLPOOL d5c8d411b465fdad629493e834d154e7e3a25898b20bc009c4ff9977593ab46ca6e0f6f57ae7933da08b9f7283ebc793106a4eb31a17d670050a94f27a2f2af5
diff --git a/app-vim/languagetool/files/languagetool-1.29-script.patch b/app-vim/languagetool/files/languagetool-1.29-script.patch
new file mode 100644
index 000000000000..f2737feca8c9
--- /dev/null
+++ b/app-vim/languagetool/files/languagetool-1.29-script.patch
@@ -0,0 +1,38 @@
+Use launcher script instead of directly running from the jar file.
+
+--- languagetool-1.29/plugin/LanguageTool.vim
++++ languagetool-1.29/plugin/LanguageTool.vim
+@@ -162,23 +162,6 @@
+ endif
+ endif
+ endif
+-
+- let s:languagetool_jar = exists("g:languagetool_jar")
+- \ ? g:languagetool_jar
+- \ : $HOME . '/languagetool/languagetool-commandline.jar'
+-
+- if !filereadable(s:languagetool_jar)
+- " Hmmm, can't find the jar file. Try again with expand() in case user
+- " set it up as: let g:languagetool_jar = '$HOME/languagetool-commandline.jar'
+- let l:languagetool_jar = expand(s:languagetool_jar)
+- if !filereadable(expand(l:languagetool_jar))
+- echomsg "LanguageTool cannot be found at: " . s:languagetool_jar
+- echomsg "You need to install LanguageTool and/or set up g:languagetool_jar"
+- echomsg "to indicate the location of the languagetool-commandline.jar file."
+- return -1
+- endif
+- let s:languagetool_jar = l:languagetool_jar
+- endif
+ return 0
+ endfunction
+
+@@ -242,8 +225,7 @@
+ let l:range = a:line1 . ',' . a:line2
+ silent exe l:range . 'w!' . l:tmpfilename
+
+- let l:languagetool_cmd = 'java'
+- \ . ' -jar ' . s:languagetool_jar
++ let l:languagetool_cmd = 'languagetool'
+ \ . ' -c ' . s:languagetool_encoding
+ \ . (empty(s:languagetool_disable_rules) ? '' : ' -d '.s:languagetool_disable_rules)
+ \ . ' -l ' . s:languagetool_lang
diff --git a/app-vim/languagetool/languagetool-1.29.ebuild b/app-vim/languagetool/languagetool-1.29.ebuild
new file mode 100644
index 000000000000..1bd45287194b
--- /dev/null
+++ b/app-vim/languagetool/languagetool-1.29.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}"/${P}-script.patch )
diff --git a/app-vim/languagetool/metadata.xml b/app-vim/languagetool/metadata.xml
new file mode 100644
index 000000000000..84f8f1cf6bcb
--- /dev/null
+++ b/app-vim/languagetool/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-lang/python/python-2.7.10-r1.ebuild b/dev-lang/python/python-2.7.10-r1.ebuild
index 180d7beeaa5b..de85de70feb8 100644
--- a/dev-lang/python/python-2.7.10-r1.ebuild
+++ b/dev-lang/python/python-2.7.10-r1.ebuild
@@ -146,10 +146,6 @@ src_configure() {
einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
fi
- # Ensure sed works as expected
- # https://bugs.gentoo.org/594768
- export LC_COLLATE=C
-
if [[ "$(gcc-major-version)" -ge 4 ]]; then
append-flags -fwrapv
fi
diff --git a/dev-lang/python/python-2.7.12.ebuild b/dev-lang/python/python-2.7.12.ebuild
index 1066b16c21cf..0856ef255289 100644
--- a/dev-lang/python/python-2.7.12.ebuild
+++ b/dev-lang/python/python-2.7.12.ebuild
@@ -144,10 +144,6 @@ src_configure() {
einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
fi
- # Ensure sed works as expected
- # https://bugs.gentoo.org/594768
- export LC_COLLATE=C
-
if [[ "$(gcc-major-version)" -ge 4 ]]; then
append-flags -fwrapv
fi
diff --git a/dev-lang/python/python-3.4.3-r1.ebuild b/dev-lang/python/python-3.4.3-r1.ebuild
index 67492b30bbfc..43e136944bea 100644
--- a/dev-lang/python/python-3.4.3-r1.ebuild
+++ b/dev-lang/python/python-3.4.3-r1.ebuild
@@ -115,10 +115,6 @@ src_configure() {
einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
fi
- # Ensure sed works as expected
- # https://bugs.gentoo.org/594768
- export LC_COLLATE=C
-
if [[ "$(gcc-major-version)" -ge 4 ]]; then
append-flags -fwrapv
fi
@@ -177,6 +173,10 @@ src_configure() {
}
src_compile() {
+ # Ensure sed works as expected
+ # https://bugs.gentoo.org/594768
+ local -x LC_ALL=C
+
# Avoid invoking pgen for cross-compiles.
touch Include/graminit.h Python/graminit.c || die
diff --git a/dev-lang/python/python-3.4.5.ebuild b/dev-lang/python/python-3.4.5.ebuild
index 860da679f226..f5c7f7d72247 100644
--- a/dev-lang/python/python-3.4.5.ebuild
+++ b/dev-lang/python/python-3.4.5.ebuild
@@ -112,10 +112,6 @@ src_configure() {
einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
fi
- # Ensure sed works as expected
- # https://bugs.gentoo.org/594768
- export LC_COLLATE=C
-
if [[ "$(gcc-major-version)" -ge 4 ]]; then
append-flags -fwrapv
fi
@@ -173,6 +169,10 @@ src_configure() {
}
src_compile() {
+ # Ensure sed works as expected
+ # https://bugs.gentoo.org/594768
+ local -x LC_ALL=C
+
# Avoid invoking pgen for cross-compiles.
touch Include/graminit.h Python/graminit.c || die
diff --git a/dev-lang/python/python-3.5.2.ebuild b/dev-lang/python/python-3.5.2.ebuild
index 4875c2d15d28..0dfc3504b209 100644
--- a/dev-lang/python/python-3.5.2.ebuild
+++ b/dev-lang/python/python-3.5.2.ebuild
@@ -111,10 +111,6 @@ src_configure() {
einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
fi
- # Ensure sed works as expected
- # https://bugs.gentoo.org/594768
- export LC_COLLATE=C
-
if [[ "$(gcc-major-version)" -ge 4 ]]; then
append-flags -fwrapv
fi
@@ -174,6 +170,10 @@ src_configure() {
}
src_compile() {
+ # Ensure sed works as expected
+ # https://bugs.gentoo.org/594768
+ local -x LC_ALL=C
+
cd "${BUILD_DIR}" || die
emake CPPFLAGS= CFLAGS= LDFLAGS=
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index bf833eb99007..60eedf7e2ab3 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -1232,7 +1232,7 @@ python_export_utf8_locale() {
if [[ $(locale charmap) != UTF-8 ]]; then
# Try English first, then everything else.
- local lang locales="en_US.UTF-8 $(locale -a)"
+ local lang locales="C.UTF-8 en_US.UTF-8 en_GB.UTF-8 $(locale -a)"
for lang in ${locales}; do
if [[ $(LC_ALL=${lang} locale charmap 2>/dev/null) == UTF-8 ]]; then
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index 764d828ef12f..1100e015451d 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -1,4 +1,2 @@
-DIST Image-ExifTool-10.20.tar.gz 4142166 SHA256 f06ae200950cd3f441f20f7532163365965aa45a91d96114672b0eb176b76d2a SHA512 0c96010d39b4b5af1595f74df5ac7e27c88a5a610b8dd5eaeda8d3a7bdc335d237659d076b890784baa2e791e007a33d3aa60dc169c901c3771a2e308eccf93a WHIRLPOOL fdb4d34f0bda105bcf9a2355bebb15b0b7255ecda483331aa9e075840cf76dc76c2cfa5b9b796df41a654b1cf59eec1e37ad24b9d0bcd124b5058b73059c8e45
-DIST Image-ExifTool-10.23.tar.gz 4158833 SHA256 ce0d0bade2ee205c5e1251bb564c3bcaa9f9afc6b952e5b43b25ab53805b490c SHA512 ce0e0b761a3bfbe65028c5a213e69a6e2bfc14975f6ace040150057d36639f4abeca9e8eac86787411df71c0946929f955b813d0a1ac2c26d6add566e38f4e6a WHIRLPOOL 4ddc0653d8697a7cba3229459dbf07db19626d1add869b3984c23babf6673da9bea55893389324bfd06252019e91e6eed5481c8f610497d63fe58ee9351117d2
-DIST Image-ExifTool-10.24.tar.gz 4161183 SHA256 c5315c75acf74db713746e6889e8d6c4c394934952c0151a3b053b429c66f58d SHA512 d748bf627b37d0b42c6fc0712d8ac01e69636d0e779a4375d0ff8bf3728e56116b30f29ba1a7c7e02be0536a89a692bb40b32033d1e4fe6de0e71cd292b3f82c WHIRLPOOL c93b3c36154ddecf1f9f5f9ac8585124823227284c6a7c00c55998d5567354d561e180e1faa8fece3c471ad45c5976fafd349b585aa808d4c770b824c5f2e771
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
diff --git a/media-libs/exiftool/exiftool-10.20.ebuild b/media-libs/exiftool/exiftool-10.20.ebuild
deleted file mode 100644
index 2a3c8fef617d..000000000000
--- a/media-libs/exiftool/exiftool-10.20.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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-libs/exiftool/exiftool-10.24.ebuild b/media-libs/exiftool/exiftool-10.24.ebuild
deleted file mode 100644
index e1513a94b78d..000000000000
--- a/media-libs/exiftool/exiftool-10.24.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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-libs/exiftool/exiftool-10.25.ebuild b/media-libs/exiftool/exiftool-10.25.ebuild
index e1513a94b78d..2a3c8fef617d 100644
--- a/media-libs/exiftool/exiftool-10.25.ebuild
+++ b/media-libs/exiftool/exiftool-10.25.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ppc ppc64 x86 ~x64-macos"
IUSE="doc"
SRC_TEST="do"
diff --git a/media-libs/exiftool/exiftool-10.23.ebuild b/media-libs/exiftool/exiftool-10.27.ebuild
index e1513a94b78d..e1513a94b78d 100644
--- a/media-libs/exiftool/exiftool-10.23.ebuild
+++ b/media-libs/exiftool/exiftool-10.27.ebuild
diff --git a/media-sound/abcm2ps/Manifest b/media-sound/abcm2ps/Manifest
index 7bfbfd63b20b..3afe90f778e9 100644
--- a/media-sound/abcm2ps/Manifest
+++ b/media-sound/abcm2ps/Manifest
@@ -1,3 +1,4 @@
DIST abcm2ps-8.12.1.tar.gz 237316 SHA256 792eb95495f8b731d9487728a97778c7bcc2f3a389ad775e9dc0392fbb4bce60 SHA512 2cd21cdc842ef000ce8aaaac372842d0056b3df43c1741a80b4653dc584bcd1279196835917b5f16869896f3b0ad2c8f7bffaff0cf159547985607b251e37be7 WHIRLPOOL 8c572a5e0f74e624d7e39abf1871becc227ede2267b2d38a4d5b3430151472238e7c87e9fe07916615988ba544b6b4694ab64b02463ce822e08547610ca64f71
+DIST abcm2ps-8.12.3.tar.gz 237918 SHA256 d599a851b51e93659813445efe9b31177d62f779daffc9e5a67e67a5324789a6 SHA512 d64d993b94aa8faa432cb43d54d23fff84dbe4fb3caac6cd215149b7802780ba8a885410880239498331b5c980cc3f243b8cda016e0afbc836260f71b6087591 WHIRLPOOL 43dc1dd23ade129562ca0deab5f3850fb006dbb0d2b50ffec47ead9ce1f1c215b628ef1c6f45df265a10e8f097674f849c1add4b163d05ef292482b6b2505b1a
DIST abcm2ps-8.8.4.tar.gz 238574 SHA256 961ba76372832bbff5e07eb89c8e9ff98817fa3d7f4d13b6eedd16937120937b SHA512 f139f2bd324742a23ee9db3768746792974e6e8a78e65547cec527a7b10d4bcbacf1687dd7966791910efb8ea972042031186f89913d1051d52fb46787b34229 WHIRLPOOL 11f6287d2549d9a8d804eb9c363f505385552a5a6b3c80c676214890c0fdbd874124ff2f3cf5f4e4b72d4611e2805cea8c4a45e1ad7c65cc71b8d8a1783d3ca6
DIST transpose_abc.pl 21045 SHA256 bd6960872bfbc9f71f183f36d533ea33b8cf62a6027b447f0b0b8adfa25a2848 SHA512 dc2623608a7b59d7e0c4d25160e69f696f170e9938dc3e035edbaf6f0163b4c6139892ec8734ea2aaba997507dcf32208562e898690600dc3c199046d4d151f3 WHIRLPOOL 81e327bbd76b40826adab06f7756c79c60289b21432b792c848db3ba1354528fa4f1a074cba890b6087cfac6e712427c6cbb2c9e6679c8ced22c362f6ec005f3
diff --git a/media-sound/abcm2ps/abcm2ps-8.12.3.ebuild b/media-sound/abcm2ps/abcm2ps-8.12.3.ebuild
new file mode 100644
index 000000000000..ab13763bc47c
--- /dev/null
+++ b/media-sound/abcm2ps/abcm2ps-8.12.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="A program to convert abc files to Postscript files"
+HOMEPAGE="http://moinejf.free.fr/"
+SRC_URI="http://moinejf.free.fr/${P}.tar.gz
+ http://moinejf.free.fr/transpose_abc.pl"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="examples pango"
+
+RDEPEND="pango? ( x11-libs/pango media-libs/freetype:2 )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_configure() {
+ econf \
+ --enable-a4 \
+ --enable-deco-is-roll \
+ $(use_enable pango)
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+ dobin abcm2ps
+
+ insinto /usr/share/${PN}
+ doins *.fmt
+
+ dodoc Changes README *.txt
+
+ if use examples ; then
+ docinto examples
+ dodoc *.{abc,eps}
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+
+ docinto contrib
+ dodoc "${DISTDIR}"/transpose_abc.pl
+}
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index fc2c3a796b74..cf648b2728ec 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -1,3 +1,4 @@
DIST abcMIDI-2015-08-25.zip 665906 SHA256 614d8e7bac0d9092e08b69ec79066fe202e0dd5dd79a2d99b16e88dcda9f7c31 SHA512 2253d13611c41d2faff6393497f15dbbda583ff99093df6c368942ce2227ac22f2c0f84a33eb96ba7e6553325c6363dd9f550d432571a253f83e9a94cd0ed12b WHIRLPOOL b36e3af032f298954630e3adc25397054c4b5c2ddde42b48d2bb92736f91b8a1ad6814446d9acb8688021ea743bd2d24c532702e54c1b1e59c5dfc227561a154
DIST abcMIDI-2016.05.05.zip 671937 SHA256 6000e11172552c3eb0194267c1acadca620514bd35e141978f85bc4ec47aa22b SHA512 c3525ea399a5b71d7d0604cb04334e07e8d92613cd62313c8500143ed776a49c45b6ee22dd251d35a690b774ec807a2a8ba4533d81d33b1c146c3233d163aba0 WHIRLPOOL 3ef0ec16df40ae1dadbbda9b78c7561f29de394b70eaba950f6a0ad1cbf0f71060b64f273fe3f40c6c58a731f380b5791e9cc9afa702558152f35d3073f4bc2b
DIST abcMIDI-2016.07.20.zip 672095 SHA256 a5539c2c3b3b23aec75ac2b9bafa79ea26e70cc0de021096f021e47a0641e75e SHA512 414ea0386747f26e3d1dabd5960e5f46e0da26e818671bfcf31621be9a60caf41ef49069ccff021a416125cbc2fe5cb4a61d60b579b03f5d6463408a63c0522f WHIRLPOOL 3a02f8349eaf27a854534fd48555ef12d572fd0c934aa347b00453e95969952fd8854286027a286ab71d9143d1c69f8545b6b4562668bbd385ed4d9915544015
+DIST abcMIDI-2016.09.20.zip 672225 SHA256 1f42170d767dc4ded941ad00735ed7e88073237d4b10ae4f3f70d715663b7ff2 SHA512 c18942ccc4c14fd2fda7f1a3b68d745109ef3432d4fcfa28f2bd19fcc1aba7df49dc6f3bbd563f6cec921da2d88d5b8e8f32a5520f155be253c1e876da1e40a7 WHIRLPOOL 23c8e3120ea985d620a6245b3ff8fef529ed251dd22295be4066e1929cddddacc498e616a19a5a602465e8f6280d326776c886a1249966d47ed6958f6695faeb
diff --git a/media-sound/abcmidi/abcmidi-2016.09.20.ebuild b/media-sound/abcmidi/abcmidi-2016.09.20.ebuild
new file mode 100644
index 000000000000..9d2ae4c6fd16
--- /dev/null
+++ b/media-sound/abcmidi/abcmidi-2016.09.20.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools
+
+MY_P="abcMIDI-${PV}"
+DESCRIPTION="Programs for processing ABC music notation files"
+HOMEPAGE="http://ifdo.ca/~seymour/runabc/top.html"
+SRC_URI="http://ifdo.ca/~seymour/runabc/${MY_P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+ local PATCHES=( "${FILESDIR}"/${PN}-2016.05.05-docs.patch )
+ default
+
+ rm configure makefile || die
+ sed -i "s:-O2::" configure.ac || die
+
+ eautoreconf
+}
+
+src_install() {
+ default
+ dodoc doc/{AUTHORS,CHANGES,abcguide.txt,abcmatch.txt,history.txt,readme.txt,yapshelp.txt}
+
+ if use examples ; then
+ docinto examples
+ dodoc samples/*.abc
+ fi
+}
diff --git a/net-misc/tor/files/tor.initd-r8 b/net-misc/tor/files/tor.initd-r8
new file mode 100644
index 000000000000..e1f6c599ca46
--- /dev/null
+++ b/net-misc/tor/files/tor.initd-r8
@@ -0,0 +1,42 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+command=/usr/bin/tor
+pidfile=/var/run/tor/tor.pid
+command_args="--hush --runasdaemon 1 --pidfile \"${pidfile}\""
+retry=${GRACEFUL_TIMEOUT:-60}
+
+extra_commands="checkconfig"
+extra_started_commands="reload"
+description="Anonymizing overlay network for TCP"
+description_checkconfig="Check for valid config file"
+description_reload="Reload the configuration"
+
+checkconfig() {
+ ${command} --verify-config --hush > /dev/null 2>&1
+ if [ $? -ne 0 ] ; then
+ eerror "Tor configuration (/etc/tor/torrc) is not valid."
+ eerror "Example is in /etc/tor/torrc.sample"
+ return 1
+ fi
+}
+
+start_pre() {
+ checkconfig || return 1
+ checkpath -d -m 0755 -o tor:tor /var/run/tor
+}
+
+stop() {
+ ebegin "Stopping Tor (waiting up to ${retry} seconds)"
+ start-stop-daemon -K -s INT -R ${retry} -P -p ${pidfile}
+ eend $?
+}
+
+reload() {
+ checkconfig || return 1
+ ebegin "Reloading Tor configuration"
+ start-stop-daemon -s HUP --pidfile ${pidfile}
+ eend $?
+}
diff --git a/net-misc/tor/tor-0.2.8.8.ebuild b/net-misc/tor/tor-0.2.8.8-r1.ebuild
index aeefa9fc3aa7..ee36db79dda2 100644
--- a/net-misc/tor/tor-0.2.8.8.ebuild
+++ b/net-misc/tor/tor-0.2.8.8-r1.ebuild
@@ -69,7 +69,7 @@ src_install() {
readme.gentoo_create_doc
newconfd "${FILESDIR}"/tor.confd tor
- newinitd "${FILESDIR}"/tor.initd-r7 tor
+ newinitd "${FILESDIR}"/tor.initd-r8 tor
systemd_dounit "${FILESDIR}/${PN}.service"
systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
diff --git a/net-misc/tor/tor-0.2.9.3_alpha.ebuild b/net-misc/tor/tor-0.2.9.3_alpha-r1.ebuild
index 0f889a958bc9..cd286ff23125 100644
--- a/net-misc/tor/tor-0.2.9.3_alpha.ebuild
+++ b/net-misc/tor/tor-0.2.9.3_alpha-r1.ebuild
@@ -67,7 +67,7 @@ src_install() {
readme.gentoo_create_doc
newconfd "${FILESDIR}"/tor.confd tor
- newinitd "${FILESDIR}"/tor.initd-r7 tor
+ newinitd "${FILESDIR}"/tor.initd-r8 tor
systemd_dounit "${FILESDIR}/${PN}.service"
systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"