fix various encoding corruption

67 files changed, 105 insertions, 105 deletions

diff --git a/app-accessibility/brltty/metadata.xml b/app-accessibility/brltty/metadata.xml
index 395bfb3cec4..e8e32d543cd 100644
--- a/app-accessibility/brltty/metadata.xml
+++ b/app-accessibility/brltty/metadata.xml
@@ -18,9 +18,9 @@ display. It drives the braille display, and provides complete screen review
 functionality. Some speech capability has also been incorporated. 
 </longdescription>
 <longdescription lang="ja">
-BRLTTYは、盲人用ブライユ点字ディスプレイのためのLinux/Unixコンソールを制御するバ
-ックグラウンド・プロセス(デーモン)です。ブライユ点字ディスプレイを動かし、その多
-機能な完全なスクリーン・レビューを提供します。幾つかの台詞読み上げ機能も統合され
-ています。
+BRLTTYは、盲人用ブライユ点字ディスプレイのためのLinux/Unixコンソールを制御するバ
+ックグラウンド・プロセス(デーモン)です。ブライユ点字ディスプレイを動かし、その多
+機能な完全なスクリーン・レビューを提供します。幾つかの台詞読み上げ機能も統合され
+ています。
 </longdescription>
 </pkgmetadata>
diff --git a/app-cdr/bashburn/bashburn-3.1.0.ebuild b/app-cdr/bashburn/bashburn-3.1.0.ebuild
index 4e9c800283d..8903968e9ff 100644
--- a/app-cdr/bashburn/bashburn-3.1.0.ebuild
+++ b/app-cdr/bashburn/bashburn-3.1.0.ebuild
@@ -32,7 +32,7 @@ S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	# Fix for "warning: jobserver unavailable: using -j1."
-	sed -i -e 's:make -C:$(MAKE) -C:' Makefile || die
+	sed -i -e 's:make -C:$(MAKE) -C:' Makefile || die
 }
 
 src_install() {
diff --git a/app-emulation/libspectrum/metadata.xml b/app-emulation/libspectrum/metadata.xml
index 1995e4955b8..c54cad01d6b 100644
--- a/app-emulation/libspectrum/metadata.xml
+++ b/app-emulation/libspectrum/metadata.xml
@@ -10,7 +10,7 @@
 	<maintainer>
 		<email>jmfo1982@yahoo.es</email>
 		<description>Proxied Maintainer. Please CC on bugs.</description>
-		<name>José Manuel Ferrer Ortiz</name>
+		<name>José Manuel Ferrer Ortiz</name>
 	</maintainer>
 	<longdescription>
 libspectrum is a library designed to make the input and output of some ZX
diff --git a/app-shells/tcsh/tcsh-6.18.01-r2.ebuild b/app-shells/tcsh/tcsh-6.18.01-r2.ebuild
index e9beec7d76a..59104edfb56 100644
--- a/app-shells/tcsh/tcsh-6.18.01-r2.ebuild
+++ b/app-shells/tcsh/tcsh-6.18.01-r2.ebuild
@@ -37,7 +37,7 @@ src_prepare() {
 	# fix dependency on ncurses[tinfo], #459484
 	sed \
 		-e "s:\(ncurses\):\1 tinfo:g" \
-		-i configure.in || die
+		-i configure.in || die
 
 	eautoreconf
 
diff --git a/app-shells/tcsh/tcsh-6.18.01-r3.ebuild b/app-shells/tcsh/tcsh-6.18.01-r3.ebuild
index f21d6054418..785e3170858 100644
--- a/app-shells/tcsh/tcsh-6.18.01-r3.ebuild
+++ b/app-shells/tcsh/tcsh-6.18.01-r3.ebuild
@@ -38,7 +38,7 @@ src_prepare() {
 	# fix dependency on ncurses[tinfo], #459484
 	sed \
 		-e "s:\(ncurses\):\1 tinfo:g" \
-		-i configure.in || die
+		-i configure.in || die
 
 	eautoreconf
 
diff --git a/app-shells/tcsh/tcsh-6.18.01-r4.ebuild b/app-shells/tcsh/tcsh-6.18.01-r4.ebuild
index 46d06012c06..48d21cacda9 100644
--- a/app-shells/tcsh/tcsh-6.18.01-r4.ebuild
+++ b/app-shells/tcsh/tcsh-6.18.01-r4.ebuild
@@ -44,7 +44,7 @@ src_prepare() {
 	# fix dependency on ncurses[tinfo], #459484
 	sed \
 		-e "s:\(ncurses\):\1 tinfo:g" \
-		-i configure.in || die
+		-i configure.in || die
 
 	eautoreconf
 
diff --git a/app-text/calibre/calibre-1.48-r1.ebuild b/app-text/calibre/calibre-1.48-r1.ebuild
index dbd132c636a..099fe1f113a 100644
--- a/app-text/calibre/calibre-1.48-r1.ebuild
+++ b/app-text/calibre/calibre-1.48-r1.ebuild
@@ -206,7 +206,7 @@ python_install_all() {
 
 	domenu "${HOME}"/.local/share/applications/*.desktop
 
-	find "${ED}"usr/share -type d -empty -delete || die
+	find "${ED}"usr/share -type d -empty -delete || die
 
 	cd "${ED}"/usr/share/calibre/fonts/liberation || die
 	local x
diff --git a/dev-libs/libgit2/libgit2-0.20.0-r1.ebuild b/dev-libs/libgit2/libgit2-0.20.0-r1.ebuild
index e6f27acdbfe..3fdf8df9d77 100644
--- a/dev-libs/libgit2/libgit2-0.20.0-r1.ebuild
+++ b/dev-libs/libgit2/libgit2-0.20.0-r1.ebuild
@@ -58,7 +58,7 @@ src_install() {
 	cmake-utils_src_install
 
 	if use examples ; then
-		find examples -name .gitignore -delete || die
+		find examples -name .gitignore -delete || die
 		dodoc -r examples
 		docompress -x /usr/share/doc/${PF}/examples
 	fi
diff --git a/dev-libs/libgit2/libgit2-0.21.5.ebuild b/dev-libs/libgit2/libgit2-0.21.5.ebuild
index 239be84eed4..4397ec8e00a 100644
--- a/dev-libs/libgit2/libgit2-0.21.5.ebuild
+++ b/dev-libs/libgit2/libgit2-0.21.5.ebuild
@@ -56,7 +56,7 @@ src_install() {
 	cmake-utils_src_install
 
 	if use examples ; then
-		find examples -name .gitignore -delete || die
+		find examples -name .gitignore -delete || die
 		dodoc -r examples
 		docompress -x /usr/share/doc/${PF}/examples
 	fi
diff --git a/dev-libs/libgit2/libgit2-0.22.3.ebuild b/dev-libs/libgit2/libgit2-0.22.3.ebuild
index 4371996aca8..cfd605b8394 100644
--- a/dev-libs/libgit2/libgit2-0.22.3.ebuild
+++ b/dev-libs/libgit2/libgit2-0.22.3.ebuild
@@ -68,7 +68,7 @@ src_install() {
 	cmake-utils_src_install
 
 	if use examples ; then
-		find examples -name .gitignore -delete || die
+		find examples -name .gitignore -delete || die
 		dodoc -r examples
 		docompress -x /usr/share/doc/${PF}/examples
 	fi
diff --git a/dev-libs/libgit2/libgit2-0.23.0.ebuild b/dev-libs/libgit2/libgit2-0.23.0.ebuild
index b5c16eaf1cb..304a08db010 100644
--- a/dev-libs/libgit2/libgit2-0.23.0.ebuild
+++ b/dev-libs/libgit2/libgit2-0.23.0.ebuild
@@ -68,7 +68,7 @@ src_install() {
 	cmake-utils_src_install
 
 	if use examples ; then
-		find examples -name .gitignore -delete || die
+		find examples -name .gitignore -delete || die
 		dodoc -r examples
 		docompress -x /usr/share/doc/${PF}/examples
 	fi
diff --git a/dev-libs/libgit2/libgit2-0.23.1.ebuild b/dev-libs/libgit2/libgit2-0.23.1.ebuild
index b5c16eaf1cb..304a08db010 100644
--- a/dev-libs/libgit2/libgit2-0.23.1.ebuild
+++ b/dev-libs/libgit2/libgit2-0.23.1.ebuild
@@ -68,7 +68,7 @@ src_install() {
 	cmake-utils_src_install
 
 	if use examples ; then
-		find examples -name .gitignore -delete || die
+		find examples -name .gitignore -delete || die
 		dodoc -r examples
 		docompress -x /usr/share/doc/${PF}/examples
 	fi
diff --git a/dev-libs/libgit2/libgit2-0.23.2-r1.ebuild b/dev-libs/libgit2/libgit2-0.23.2-r1.ebuild
index 3b1c9582ecb..ab7043ec22f 100644
--- a/dev-libs/libgit2/libgit2-0.23.2-r1.ebuild
+++ b/dev-libs/libgit2/libgit2-0.23.2-r1.ebuild
@@ -69,7 +69,7 @@ src_install() {
 	cmake-utils_src_install
 
 	if use examples ; then
-		find examples -name .gitignore -delete || die
+		find examples -name .gitignore -delete || die
 		dodoc -r examples
 		docompress -x /usr/share/doc/${PF}/examples
 	fi
diff --git a/dev-libs/libgit2/libgit2-0.23.2.ebuild b/dev-libs/libgit2/libgit2-0.23.2.ebuild
index b5c16eaf1cb..304a08db010 100644
--- a/dev-libs/libgit2/libgit2-0.23.2.ebuild
+++ b/dev-libs/libgit2/libgit2-0.23.2.ebuild
@@ -68,7 +68,7 @@ src_install() {
 	cmake-utils_src_install
 
 	if use examples ; then
-		find examples -name .gitignore -delete || die
+		find examples -name .gitignore -delete || die
 		dodoc -r examples
 		docompress -x /usr/share/doc/${PF}/examples
 	fi
diff --git a/dev-libs/libgit2/libgit2-9999.ebuild b/dev-libs/libgit2/libgit2-9999.ebuild
index 3b1c9582ecb..ab7043ec22f 100644
--- a/dev-libs/libgit2/libgit2-9999.ebuild
+++ b/dev-libs/libgit2/libgit2-9999.ebuild
@@ -69,7 +69,7 @@ src_install() {
 	cmake-utils_src_install
 
 	if use examples ; then
-		find examples -name .gitignore -delete || die
+		find examples -name .gitignore -delete || die
 		dodoc -r examples
 		docompress -x /usr/share/doc/${PF}/examples
 	fi
diff --git a/dev-libs/liboil/liboil-0.3.17.ebuild b/dev-libs/liboil/liboil-0.3.17.ebuild
index 9cee2b8d8bb..b4500f4dd41 100644
--- a/dev-libs/liboil/liboil-0.3.17.ebuild
+++ b/dev-libs/liboil/liboil-0.3.17.ebuild
@@ -46,7 +46,7 @@ src_configure() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS BUG-REPORTING HACKING NEWS README || die
+	dodoc AUTHORS BUG-REPORTING HACKING NEWS README || die
 }
 
 pkg_postinst() {
diff --git a/dev-python/django/django-1.6.11.ebuild b/dev-python/django/django-1.6.11.ebuild
index e3f0bb0d3d8..fc8df50693a 100644
--- a/dev-python/django/django-1.6.11.ebuild
+++ b/dev-python/django/django-1.6.11.ebuild
@@ -89,7 +89,7 @@ python_install_all() {
 	bashcomp_alias ${PN}-admin django-admin.py
 
 	if use doc; then
-		rm -fr docs/_build/html/_sources || die
+		rm -fr docs/_build/html/_sources || die
 		local HTML_DOCS=( docs/_build/html/. )
 	fi
 
diff --git a/dev-python/pycuda/pycuda-2012.1.ebuild b/dev-python/pycuda/pycuda-2012.1.ebuild
index 17edba43c1a..d0511b0adbf 100644
--- a/dev-python/pycuda/pycuda-2012.1.ebuild
+++ b/dev-python/pycuda/pycuda-2012.1.ebuild
@@ -52,7 +52,7 @@ python_configure() {
 	local myopts=()
 	use opengl && myopts+=( --cuda-enable-gl )
 
-	mkdir "${BUILD_DIR}" || die
+	mkdir "${BUILD_DIR}" || die
 	cd "${BUILD_DIR}" || die
 	[[ -e ./siteconf.py ]] && rm -f ./siteconf.py
 	"${EPYTHON}" "${S}"/configure.py \
diff --git a/dev-python/pycuda/pycuda-2013.1.1.ebuild b/dev-python/pycuda/pycuda-2013.1.1.ebuild
index 6f04a049548..0066748a2f7 100644
--- a/dev-python/pycuda/pycuda-2013.1.1.ebuild
+++ b/dev-python/pycuda/pycuda-2013.1.1.ebuild
@@ -52,7 +52,7 @@ python_configure() {
 	local myopts=()
 	use opengl && myopts+=( --cuda-enable-gl )
 
-	mkdir "${BUILD_DIR}" || die
+	mkdir "${BUILD_DIR}" || die
 	cd "${BUILD_DIR}" || die
 	[[ -e ./siteconf.py ]] && rm -f ./siteconf.py
 	"${EPYTHON}" "${S}"/configure.py \
diff --git a/dev-python/pycuda/pycuda-2014.1.ebuild b/dev-python/pycuda/pycuda-2014.1.ebuild
index 5c547e827a8..bfb7af9d68c 100644
--- a/dev-python/pycuda/pycuda-2014.1.ebuild
+++ b/dev-python/pycuda/pycuda-2014.1.ebuild
@@ -52,7 +52,7 @@ python_configure() {
 	local myopts=()
 	use opengl && myopts+=( --cuda-enable-gl )
 
-	mkdir "${BUILD_DIR}" || die
+	mkdir "${BUILD_DIR}" || die
 	cd "${BUILD_DIR}" || die
 	[[ -e ./siteconf.py ]] && rm -f ./siteconf.py
 	"${EPYTHON}" "${S}"/configure.py \
diff --git a/dev-python/pycuda/pycuda-9999.ebuild b/dev-python/pycuda/pycuda-9999.ebuild
index f799fcea2e8..b0a16971a96 100644
--- a/dev-python/pycuda/pycuda-9999.ebuild
+++ b/dev-python/pycuda/pycuda-9999.ebuild
@@ -53,7 +53,7 @@ python_configure() {
 	local myopts=()
 	use opengl && myopts+=( --cuda-enable-gl )
 
-	mkdir "${BUILD_DIR}" || die
+	mkdir "${BUILD_DIR}" || die
 	cd "${BUILD_DIR}" || die
 	[[ -e ./siteconf.py ]] && rm -f ./siteconf.py
 	"${EPYTHON}" "${S}"/configure.py \
diff --git a/dev-python/pysnmp-apps/metadata.xml b/dev-python/pysnmp-apps/metadata.xml
index c1fc8a2e198..2cf1edd5bc7 100644
--- a/dev-python/pysnmp-apps/metadata.xml
+++ b/dev-python/pysnmp-apps/metadata.xml
@@ -13,13 +13,13 @@ PySNMP is written entirely in Python and is self-sufficient in terms
 that it does not rely on any third party tool (it is not a wrapper!).
 </longdescription>
   <longdescription lang="ja">
-これは SNMP v.1/v.2 エンジンのPython言語での実装です。関連値に沿ったSNMPオブジェ
-クトIDから/へSNMPメッセージをアセンブル/ディスアセンブルするのが一般的な機能です
-。PySNMPは幾つかのTCP/IPネットワーキングを特定するトランスポート・メソッドも提供
-します。
+これは SNMP v.1/v.2 エンジンのPython言語での実装です。関連値に沿ったSNMPオブジェ
+クトIDから/へSNMPメッセージをアセンブル/ディスアセンブルするのが一般的な機能です
+。PySNMPは幾つかのTCP/IPネットワーキングを特定するトランスポート・メソッドも提供
+します。
 
-PySNMPは全体をPython言語で記述され、どのサードパーティ製ツールも信用しない立場で
-自給自足します。(これはラッパー・ツールではありません。)
+PySNMPは全体をPython言語で記述され、どのサードパーティ製ツールも信用しない立場で
+自給自足します。(これはラッパー・ツールではありません。)
 </longdescription>
   <upstream>
     <remote-id type="pypi">pysnmp-apps</remote-id>
diff --git a/dev-python/python-geoclue/python-geoclue-0.1.0-r1.ebuild b/dev-python/python-geoclue/python-geoclue-0.1.0-r1.ebuild
index 26eb3852ca3..4b7388f30e3 100644
--- a/dev-python/python-geoclue/python-geoclue-0.1.0-r1.ebuild
+++ b/dev-python/python-geoclue/python-geoclue-0.1.0-r1.ebuild
@@ -32,6 +32,6 @@ python_prepare_all() {
 
 python_test() {
 	VIRTUALX_COMMAND="${PYTHON}"
-	cd "${BUILD_DIR}" || die
+	cd "${BUILD_DIR}" || die
 	virtualmake "${S}"/tests/test.py
 }
diff --git a/dev-python/tlslite/tlslite-0.4.8.ebuild b/dev-python/tlslite/tlslite-0.4.8.ebuild
index ec5c39495a6..05d33589b35 100644
--- a/dev-python/tlslite/tlslite-0.4.8.ebuild
+++ b/dev-python/tlslite/tlslite-0.4.8.ebuild
@@ -30,7 +30,7 @@ RESTRICT="test"
 
 # Tests still hang
 python_test() {
-	cd tests || die
+	cd tests || die
 	"${PYTHON}" "${S}"/tests/tlstest.py client localhost:4443 . || die
 	"${PYTHON}" "${S}"/tests/tlstest.py server localhost:4442 . || die
 }
diff --git a/dev-python/traits/traits-4.5.0.ebuild b/dev-python/traits/traits-4.5.0.ebuild
index 388d99d83d3..101e65fc172 100644
--- a/dev-python/traits/traits-4.5.0.ebuild
+++ b/dev-python/traits/traits-4.5.0.ebuild
@@ -22,7 +22,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( ${RDEPEND} )"
 
 python_prepare_all() {
-	sed -i -e "s/'-O3'//g" setup.py || die
+	sed -i -e "s/'-O3'//g" setup.py || die
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-scheme/stalin/stalin-0.11.ebuild b/dev-scheme/stalin/stalin-0.11.ebuild
index b9edc676a3b..db6e73cbd21 100644
--- a/dev-scheme/stalin/stalin-0.11.ebuild
+++ b/dev-scheme/stalin/stalin-0.11.ebuild
@@ -21,7 +21,7 @@ DEPEND="${RDEPEND}"
 RESTRICT="strip"
 
 src_prepare() {
-	sed -i -e "s/-O3 -fomit-frame-pointer/${CFLAGS}/" makefile  || die
+	sed -i -e "s/-O3 -fomit-frame-pointer/${CFLAGS}/" makefile || die
 }
 
 src_compile() {
diff --git a/dev-util/cmt/cmt-1.26.ebuild b/dev-util/cmt/cmt-1.26.ebuild
index 508853a705d..f2224b21f6d 100644
--- a/dev-util/cmt/cmt-1.26.ebuild
+++ b/dev-util/cmt/cmt-1.26.ebuild
@@ -25,7 +25,7 @@ RDEPEND="${DEPEND}
 S="${WORKDIR}/CMT/${CMT_PV}"
 
 src_configure() {
-	cd "${S}"/mgr || die
+	cd "${S}"/mgr || die
 	./INSTALL || die
 	source setup.sh
 }
diff --git a/dev-util/lttng-ust/metadata.xml b/dev-util/lttng-ust/metadata.xml
index 1c98ff2ecd2..8cd43e982af 100644
--- a/dev-util/lttng-ust/metadata.xml
+++ b/dev-util/lttng-ust/metadata.xml
@@ -7,6 +7,6 @@
 	</maintainer>
 
 	<longdescription>
-		The userspace tracer is designed to provide detailed information about userspace activity. UST is a port of the LTTng kernel tracer to userspace. Like the LTTng kernel tracer, performance is the main goal. Tracing does not require system calls or traps. UST instrumentation points may be added in any userspace code including signal handlers and libraries­.
+		The userspace tracer is designed to provide detailed information about userspace activity. UST is a port of the LTTng kernel tracer to userspace. Like the LTTng kernel tracer, performance is the main goal. Tracing does not require system calls or traps. UST instrumentation points may be added in any userspace code including signal handlers and libraries.
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-util/stressapptest/files/stressapptest-1.0.6-autotools.patch b/dev-util/stressapptest/files/stressapptest-1.0.6-autotools.patch
index db5103d3458..01f7cb0d962 100644
--- a/dev-util/stressapptest/files/stressapptest-1.0.6-autotools.patch
+++ b/dev-util/stressapptest/files/stressapptest-1.0.6-autotools.patch
@@ -10,7 +10,7 @@ Content-Transfer-Encoding: 8bit
 * Correctly use autoconf host rather than target.
 * Use autoconf host_os.
 * Warn rather than error on unknown configs.
-* Add --disable-default-optimizations to avoid forced flags.
+* Add --disable-default-optimizations to avoid forced flags.
 * Fix manfile install
 
 
diff --git a/games-board/gnugo/files/gnugo-3.9.1-invalid-move.patch b/games-board/gnugo/files/gnugo-3.9.1-invalid-move.patch
index fc8fd8f524d..1da388a043b 100644
--- a/games-board/gnugo/files/gnugo-3.9.1-invalid-move.patch
+++ b/games-board/gnugo/files/gnugo-3.9.1-invalid-move.patch
@@ -1,5 +1,5 @@
 From 84a32e9cee2a70c0ec6ef58c1be279fed84a9a53 Mon Sep 17 00:00:00 2001
-From: Gunnar Farnebäck <gunnar@lysator.liu.se>
+From: Gunnar Farnebäck <gunnar@lysator.liu.se>
 Date: Thu, 13 Jun 2013 18:45:03 +0000
 Subject: Avoid crashing due to registering an invalid loss move reason.
 
diff --git a/gnome-base/orbit/orbit-2.14.19-r4.ebuild b/gnome-base/orbit/orbit-2.14.19-r4.ebuild
index c0ae2a19826..56e4a7ca4cd 100644
--- a/gnome-base/orbit/orbit-2.14.19-r4.ebuild
+++ b/gnome-base/orbit/orbit-2.14.19-r4.ebuild
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	# Fix wrong process kill, bug #268142
 	sed "s:killall lt-timeout-server:killall timeout-server:" \
-		-i test/timeout.sh || die "sed 1 failed"
+		-i test/timeout.sh || die "sed 1 failed"
 
 	# Do not mess with CFLAGS
 	sed 's/-ggdb -O0//' -i configure.in configure || die "sed 2 failed"
diff --git a/licenses/Google-TOS b/licenses/Google-TOS
index c50b61c6e20..694bffbe72b 100644
--- a/licenses/Google-TOS
+++ b/licenses/Google-TOS
@@ -7,11 +7,11 @@
 
    [3]Skip to content
 
-    1. [4]Overview
-    2. Terms of Service
+    1. [4]Overview
+    2. Terms of Service
 
-     * Terms of Service
-     * [5]Updates
+     * Terms of Service
+     * [5]Updates
 
                             Google Terms of Service
 
@@ -249,30 +249,30 @@ About these Terms
 
   Good to Know
 
-     * Our Good to Know site helps you stay safe and protect your family’s
+     * Our Good to Know site helps you stay safe and protect your family’s
        information online. [11]Visit to learn more
 
   Our legal policies
 
-     * [12]Privacy Policy
-     * Terms of Service
-     * [13]FAQ
+     * [12]Privacy Policy
+     * Terms of Service
+     * [13]FAQ
 
   Some technical details
 
-     * [14]Technologies and Principles
-     * [15]Advertising
-     * [16]How Google uses cookies
-     * [17]How Google uses pattern recognition
-     * [18]Types of location data used by Google
-     * [19]How Google Wallet uses credit card numbers
-     * [20]How Google Voice works
+     * [14]Technologies and Principles
+     * [15]Advertising
+     * [16]How Google uses cookies
+     * [17]How Google uses pattern recognition
+     * [18]Types of location data used by Google
+     * [19]How Google Wallet uses credit card numbers
+     * [20]How Google Voice works
 
    Change language: [[21]________________________]
 
-     * [22]Google
-     * [23]About Google
-     * [24]Privacy & Terms
+     * [22]Google
+     * [23]About Google
+     * [24]Privacy & Terms
 
 References
 
diff --git a/licenses/OAL-1.0.1 b/licenses/OAL-1.0.1
index 03f93ca9299..b9a23712532 100644
--- a/licenses/OAL-1.0.1
+++ b/licenses/OAL-1.0.1
@@ -103,7 +103,7 @@ addressed below are outside the scope of this license.
 	the identity of the Original Author; (3) the title of the work (at
 	Original Author's option); and (4) how the first listed Original
 	Author may be contacted (at Original Author's option).
-Ê
+
 	Where a common, widely-adopted method for attribution is available
 	(such as ID3 tagging for MP3 files), Original Author attribution
 	should be implemented using the common, widely-adopted method. In
diff --git a/licenses/RTCW-ETEULA b/licenses/RTCW-ETEULA
index 61d40eba6f2..0d72c9f7442 100644
--- a/licenses/RTCW-ETEULA
+++ b/licenses/RTCW-ETEULA
@@ -20,7 +20,7 @@ e.	distribute the Software by any means, except as permitted by section 4 herein
 
 f.	in any other manner and through any medium whatsoever commercially exploit the Software, or use the Software for any commercial purpose, including, without limitation, giving away copies of the Software for free to promote or market any other material;
 
-g.	disassemble, reverse engineer, decompile, modify, except as permitted by section 2 hereinabove, or alter the Software;
+g.	disassemble, reverse engineer, decompile, modify, except as permitted by section 2 hereinabove, or alter the Software;
 
 h.	translate the Software;
 
@@ -34,9 +34,9 @@ l.	modify, remove or alter this Agreement or any notices or other markings or le
 
 4.	Permitted Distribution and Copying.  So long as this Agreement accompanies each copy you make of the Software and so long as you fully comply at all times with this Agreement, ID grants to you the non-exclusive and limited right to:  (i) copy the Software from the download onto your computer hard drive; (ii) copy the Software from your computer hard drive into your computer RAM; (iii) copy on one (1) hard disk one (1) "back up" or archival copy of the Software; and (iv) copy the Software and distribute such copies as standalone copies on physical media or in electronic format of the Software free of charge for non-commercial purposes and not in connection with any other material.  You shall not distribute copies of the Software as mounted on or attached to the covers or any other part of magazines or other printed material.  You shall not copy or distribute the Software in any manner that infringes against, misappropriates or otherwise violates any third-party right or that is libelous, defamatory, obscene, false, misleading, or otherwise illegal or unlawful.  You shall not receive any postage, shipping, handling or other charge, payment, fee, or other consideration, including items in trade, in exchange for or in connection with copies of Software you may distribute, even if only for reimbursement.  You shall not receive any value or consideration in exchange for or in connection with copies of the Software you may distribute.  You shall not distribute the Software bundled, co-packaged or together with any material.  You shall not distribute the Software in connection with the promotion or marketing of any material.  Except as such are included by ID within copies of the Software that you are permitted to make under this Agreement, you shall not reproduce, depict, display or copy the title of the Software, the ID name or any screen display or other element or part of the Software.  In exercising your limited rights hereunder, you shall comply, at all times, with all applicable laws, regulations, ordinances and statutes.  ID reserves all rights not granted in this Agreement. You shall not commercially distribute the Software unless you first enter into a separate contract with ID, on terms and conditions determined in ID's sole discretion, and only upon your receipt of a written agreement executed by an authorized officer of ID.
 
-5.	Intellectual Property Rights.  The Software and all copyrights, trademarks and all other conceivable intellectual property rights related to the Software are owned by ID and are protected by United States copyright laws, international treaty provisions and all applicable law, such as the Lanham Act.  You must treat the Software like any other copyrighted material, as required by 17 U.S.C. § 101 et seq. and other applicable law.  You agree to use your best efforts to see that any user of the Software licensed hereunder, or the New Creations, complies with this Agreement.  You agree that you are receiving a copy of the Software by limited license only and not by sale and that the "first sale" doctrine of 17 U.S.C. § 109 does not apply to your receipt or use of the Software. This section shall survive the cancellation or termination of this Agreement.
+5.	Intellectual Property Rights.  The Software and all copyrights, trademarks and all other conceivable intellectual property rights related to the Software are owned by ID and are protected by United States copyright laws, international treaty provisions and all applicable law, such as the Lanham Act.  You must treat the Software like any other copyrighted material, as required by 17 U.S.C. § 101 et seq. and other applicable law.  You agree to use your best efforts to see that any user of the Software licensed hereunder, or the New Creations, complies with this Agreement.  You agree that you are receiving a copy of the Software by limited license only and not by sale and that the "first sale" doctrine of 17 U.S.C. § 109 does not apply to your receipt or use of the Software. This section shall survive the cancellation or termination of this Agreement.
 
-6.         NO ID WARRANTIES.  ID DISCLAIMS , AND ITS LICENSEE'S (INCLUDING, WITHOUT LIMITATION, ACTIVISION INC. AND ITS AFFILIATES) DISCLAIM, ALL WARRANTIES, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE AND ANY WARRANTY OF NON-INFRINGEMENT, WITH RESPECT TO THE SOFTWARE, THE SOFTWARE IMAGES AND OTHERWISE.  THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY.  ID DOES NOT (AND ITS LICENSEES DO NOT) WARRANT THAT THE SOFTWARE OR THE OPERATION OF THE SOFTWARE WILL BE UNINTERRUPTED OR ERROR FREE OR THAT THE SOFTWARE WILL MEET YOUR SPECIFIC OR SPECIAL REQUIREMENTS.  ADDITIONAL STATEMENTS, WHETHER ORAL OR WRITTEN, DO NOT CONSTITUTE WARRANTIES BY ID (OR ANY ID LICENSEE) AND SHOULD NOT BE RELIED UPON.  THIS SECTION SHALL SURVIVE THE CANCELLATION OR TERMINATION OF THIS AGREEMENT.
+6.         NO ID WARRANTIES.  ID DISCLAIMS , AND ITS LICENSEE'S (INCLUDING, WITHOUT LIMITATION, ACTIVISION INC. AND ITS AFFILIATES) DISCLAIM, ALL WARRANTIES, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE AND ANY WARRANTY OF NON-INFRINGEMENT, WITH RESPECT TO THE SOFTWARE, THE SOFTWARE IMAGES AND OTHERWISE.  THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY.  ID DOES NOT (AND ITS LICENSEES DO NOT) WARRANT THAT THE SOFTWARE OR THE OPERATION OF THE SOFTWARE WILL BE UNINTERRUPTED OR ERROR FREE OR THAT THE SOFTWARE WILL MEET YOUR SPECIFIC OR SPECIAL REQUIREMENTS.  ADDITIONAL STATEMENTS, WHETHER ORAL OR WRITTEN, DO NOT CONSTITUTE WARRANTIES BY ID (OR ANY ID LICENSEE) AND SHOULD NOT BE RELIED UPON.  THIS SECTION SHALL SURVIVE THE CANCELLATION OR TERMINATION OF THIS AGREEMENT.
 
 7.	Governing Law, Venue, Indemnity and Liability Limitation.  This Agreement shall be construed in accordance with and governed by the applicable laws of the State of Texas and applicable United States federal law.  Exclusive venue for all litigation regarding this Agreement shall be in Dallas County, Texas, and you agree to submit to the jurisdiction of the federal and state courts in Dallas County, Texas, for any such litigation.  You hereby agree to indemnify, defend and hold harmless ID and ID's officers, employees, directors, agents, licensees (excluding you), sub-licensees (excluding you), successors and assigns from and against all losses, lawsuits, damages, causes of action and claims relating to and/or arising from the New Creations or the distribution or other use of the New Creations or relating to and/or arising from your breach of this Agreement.  You agree that your unauthorized use of the Software Images, or the Software, or any part thereof, immediately and irreparably will damage ID such that ID could not be compensated adequately solely by a monetary award, and upon such actual or threatened unauthorized use, at ID's option, that ID shall be entitled to an injunctive order, in addition to all other available remedies, including a monetary award, to prohibit such unauthorized use without the necessity of ID posting bond or other security.  IN ANY CASE, ID, AND ID'S OFFICERS, EMPLOYEES, DIRECTORS, SHAREHOLDERS, REPRESENTATIVES, AGENTS, LICENSEES (EXCLUDING YOU), SUBLICENSEES (EXCLUDING YOU), SUCCESSORS AND ASSIGNS SHALL NOT BE LIABLE FOR ANY CLAIM BY ANY THIRD PARTY OR FOR ANY LOSS OF DATA, LOSS OF PROFITS, LOST SAVINGS, SPECIAL, INCIDENTAL, CONSEQUENTIAL, INDIRECT OR PUNITIVE DAMAGES OR ANY OTHER DAMAGES ARISING FROM ANY ALLEGED CLAIM FOR BREACH OF WARRANTY, BREACH OF CONTRACT, NEGLIGENCE, STRICT PRODUCT LIABILITY, OR OTHER LEGAL THEORY EVEN IF ID OR ID'S REPRESENTATIVES HAVE BEEN ADVISED OF THE POSSIBILITY OF ANY SUCH DAMAGES, OR EVEN IF SUCH DAMAGES ARE FORESEEABLE.  Some jurisdictions do not allow the exclusion or limitation of incidental or consequential damages, so the above limitation or exclusion may not apply to you.  This section shall survive the cancellation or termination of this Agreement.
 
diff --git a/licenses/WPS-EULA b/licenses/WPS-EULA
index b5fe974fa37..aa9f47306f4 100644
--- a/licenses/WPS-EULA
+++ b/licenses/WPS-EULA
@@ -6,7 +6,7 @@ As a reference, you may print out the text of the EULA from this page now. You m
 
 The EULA is a legal agreement entered into between you and Kingsoft regarding the "Product". The "Product" includes computer software and any associated documents and printed materials. Before first using the "Product", you shall agree to all the terms of the EULA. If there is any disagreement, please uninstall the "Product" and do not use the "Product" in any way. 
 
-The "Product" is protected by copyright laws, international copyright treaties and other related laws and treaties. The "Product" is licensed, not sold.
+The "Product" is protected by copyright laws, international copyright treaties and other related laws and treaties. The "Product" is licensed, not sold.
 
 1. Kingsoft grants you a nonexclusive license to the "Product" in the territorial scope of the world. You are entitled to:
 1) Install, use, display and run (collectively referred as to "run") a copy of the "Product" on one computer based on Linux system;
@@ -32,7 +32,7 @@ b.each node and terminal which has been legally granted the license is based on
 3. You may make a one-time permanent assignment of the "Product" accompanied by the EULA to a third party, provided that the following conditions shall be wholly satisfied: 
 1) The whole and complete "Product" (including but not limited to computer software and any associated documents and printed materials) are assigned. 
 2) Any assignment comprises all former editions of the "Product", if the "Product" is an upgraded edition.
-3) You retain no copies of the "Product" .
+3) You retain no copies of the "Product" .
 4) Your license is terminated upon the assignment. 
 5) The third party receiving the "Product" agrees to all the terms of the EULA.
 
diff --git a/licenses/WebStorm_Academic b/licenses/WebStorm_Academic
index f2827d44a0e..35ca7f3d672 100644
--- a/licenses/WebStorm_Academic
+++ b/licenses/WebStorm_Academic
@@ -65,7 +65,7 @@ Licensee will pay to Licensor the license fee and other charges and expenses as
 
 8. UPGRADES
 
-(a) All generally available Upgrades to the Software will be free of charge to Licensee during the initial one (1) year period after purchase of the Software. If Licensee obtains a new License Key for upgrade, Licensee shall destroy a License Key obtained for the previous version of the Software.
+(a) All generally available Upgrades to the Software will be free of charge to Licensee during the initial one (1) year period after purchase of the Software. If Licensee obtains a new License Key for upgrade, Licensee shall destroy a License Key obtained for the previous version of the Software.
 
 (b) If not agreed otherwise in writing between Licensor and Licensee, upon upgrading to new version of Software the relationship between parties shall be governed and amended (if applicable) by the terms and conditions of Licensee agreement related to Software available at www.jetbrains.com on the day of upgrade purchase.
 
diff --git a/licenses/abyss b/licenses/abyss
index 787bc865829..8e9f366c40c 100644
--- a/licenses/abyss
+++ b/licenses/abyss
@@ -98,7 +98,7 @@ Section 2; or
    acquired by or licensed to BCCA. You will take all reasonable
    precautions necessary to safeguard the confidentiality of the
    Product, and will not disclose any information about the Product to
-   any other person without BCCA¡Çs prior written consent. You will
+   any other person without BCCA's prior written consent. You will
    not allow the removal or defacement of any confidential or
    proprietary notice placed on the Product. You acknowledge that any
    breach of this Section 6 will cause irreparable harm to BCCA and
@@ -136,12 +136,12 @@ AND THE AMOUNT OF FEES PAID BY YOU IN RESPECT OF THE PRODUCT.
 9. INDEMNITY: You will indemnify, defend and hold harmless BCCA, its
    board of directors, staff and agents from and against any and all
    liability, loss, damage, action, claim or expense (including
-   attorney¡Çs fees and costs at trial and appellate levels) in
+   attorney's fees and costs at trial and appellate levels) in
    connection with any claim, suit, action, demand or judgement
    (collectively, "Claim") arising out of, connected with, resulting
    from, or sustained as a result of Your use of the Product or the
    downloading of the Product, including without limitation, any Claim
-   relating to infringement of BCCA¡Çs intellectual property rights or
+   relating to infringement of BCCA's intellectual property rights or
    the intellectual property rights of any third party. 
 
 10. SUPPORT AND MAINTENANCE: You acknowledge and agree that, unless
diff --git a/licenses/bea.ri.jsr173 b/licenses/bea.ri.jsr173
index 3da20e28bc7..db026f53b4a 100644
--- a/licenses/bea.ri.jsr173
+++ b/licenses/bea.ri.jsr173
@@ -26,12 +26,12 @@ READ THE TERMS OF THIS (THE "AGREEMENT") CAREFULLY BEFORE VIEWING OR USING THE S
 
 1.8. "Patent Claims" means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent for which the grantor has the right to grant a license.
 
-1.9.  “Reference Implementation” means the prototype or “proof of concept” implementa­tion of the Specification developed and made available for license by or on behalf of BEA.
+1.9.  “Reference Implementation” means the prototype or “proof of concept” implementation of the Specification developed and made available for license by or on behalf of BEA.
 
 1.10. "Source Code" means the preferred form of the Covered Code for making modifications to it, including all modules it contains, plus any associated documentation, interface definition files, scripts used to control compilation and installation of an Executable, or source code differential comparisons against either the Original Code or another well known, available Covered Code of the Contributor's choice. 
 
 1.11.  “Specification” means the written specification for the Streaming API for XML , Java technology developed pursuant to the Java Community Process.
-1.12. "Technology Compatibility Kit" or “TCK” means the documentation, testing tools and test suites associated with the Specification as may be revised by BEA from time to time, that is provided so that an implementer of the Specifi­cation may determine if its implementation is compliant with the Specification.
+1.12. "Technology Compatibility Kit" or “TCK” means the documentation, testing tools and test suites associated with the Specification as may be revised by BEA from time to time, that is provided so that an implementer of the Specification may determine if its implementation is compliant with the Specification.
 
 1.13. "You" (or "Your") means an individual or a legal entity exercising rights under, and complying with all of the terms of, this Agreement or a future version of this Agreement issued under Section 6.1. For legal entities, "You" includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, "control" means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.
 
diff --git a/licenses/ipw2200-fw b/licenses/ipw2200-fw
index fa26c671a30..1e219cac28d 100644
--- a/licenses/ipw2200-fw
+++ b/licenses/ipw2200-fw
@@ -101,7 +101,7 @@ this Agreement shall be effective unless in writing and signed by an officer of
 Intel.  No failure or delay in exercising any right, power, or remedy under
 this Agreement shall operate as a waiver of any such right, power or remedy. 
 Without limiting the foregoing, terms and conditions on any purchase orders or
-similar materials submitted by you to Intel, and any terms contained in Intel’s
+similar materials submitted by you to Intel, and any terms contained in Intel's
 standard acknowledgment form that are in conflict with these terms, shall be of
 no force or effect.
 
diff --git a/mail-mta/nullmailer/files/remotes.sample-1.13 b/mail-mta/nullmailer/files/remotes.sample-1.13
index 34cc234a27e..d04aee24ecb 100644
--- a/mail-mta/nullmailer/files/remotes.sample-1.13
+++ b/mail-mta/nullmailer/files/remotes.sample-1.13
@@ -1,7 +1,7 @@
 # Format is: HOST PROTOCOL [OPTIONS]
 # HOST = IP or DNS
 # PROTOCOL = smtp | qmtp
-# OPTIONS = [--port=NUMBER] [--user] [--pass] [--starttls | --ssl [--insecure] ]
+# OPTIONS = [--port=NUMBER] [--user] [--pass] [--starttls | --ssl [--insecure] ]
 #
 # Examples:
 # A standard SMTP server:
diff --git a/media-libs/libmikmod/files/3.2.0/007_all_loopingvolume-fix.patch b/media-libs/libmikmod/files/3.2.0/007_all_loopingvolume-fix.patch
index a6ccdb8784d..b70ede8a812 100644
--- a/media-libs/libmikmod/files/3.2.0/007_all_loopingvolume-fix.patch
+++ b/media-libs/libmikmod/files/3.2.0/007_all_loopingvolume-fix.patch
@@ -5,7 +5,7 @@ Samuli Suominen (17 Nov 2012)
  * Refresh the patch against libmikmod 3.2.0 release since it didn't make it upstream
    $ wget http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.12.tar.gz
    $ tar -vzxf SDL_mixer-1.2.12.tar.gz (or "tar xf" with GNU tar)
-   $ unzip libmikmod-3.1.12.zip
+   $ unzip libmikmod-3.1.12.zip
    $ ls -l libmikmod-3.1.12-loopingvolume-fix.diff
 
 --- playercode/mplayer.c
diff --git a/media-libs/libwebp/libwebp-0.3.1.ebuild b/media-libs/libwebp/libwebp-0.3.1.ebuild
index 9d5e95d9bd8..360e507fec5 100644
--- a/media-libs/libwebp/libwebp-0.3.1.ebuild
+++ b/media-libs/libwebp/libwebp-0.3.1.ebuild
@@ -30,7 +30,7 @@ ECONF_SOURCE=${S}
 src_prepare() {
 	# This is conflicting with `usex` later on, upstream is using ac_cv_ wrong
 	# If modifying configure.ac, eautoreconf is required because of "Maintainer mode"
-	sed -i -e '/unset ac_cv_header_GL_glut_h/d' configure || die
+	sed -i -e '/unset ac_cv_header_GL_glut_h/d' configure || die
 }
 
 multilib_src_configure() {
diff --git a/media-libs/libwebp/libwebp-0.4.0.ebuild b/media-libs/libwebp/libwebp-0.4.0.ebuild
index 10039152cb8..48c4994f7dc 100644
--- a/media-libs/libwebp/libwebp-0.4.0.ebuild
+++ b/media-libs/libwebp/libwebp-0.4.0.ebuild
@@ -30,7 +30,7 @@ ECONF_SOURCE=${S}
 src_prepare() {
 	# This is conflicting with `usex` later on, upstream is using ac_cv_ wrong
 	# If modifying configure.ac, eautoreconf is required because of "Maintainer mode"
-	sed -i -e '/unset ac_cv_header_GL_glut_h/d' configure || die
+	sed -i -e '/unset ac_cv_header_GL_glut_h/d' configure || die
 
 	# Fix libtool relinking, bug 499270.
 	elibtoolize
diff --git a/media-libs/libwebp/libwebp-0.4.2.ebuild b/media-libs/libwebp/libwebp-0.4.2.ebuild
index 6c9ebc29049..6740c477a67 100644
--- a/media-libs/libwebp/libwebp-0.4.2.ebuild
+++ b/media-libs/libwebp/libwebp-0.4.2.ebuild
@@ -30,7 +30,7 @@ ECONF_SOURCE=${S}
 src_prepare() {
 	# This is conflicting with `usex` later on, upstream is using ac_cv_ wrong
 	# If modifying configure.ac, eautoreconf is required because of "Maintainer mode"
-	sed -i -e '/unset ac_cv_header_GL_glut_h/d' configure || die
+	sed -i -e '/unset ac_cv_header_GL_glut_h/d' configure || die
 
 	# Fix libtool relinking, bug 499270.
 	elibtoolize
diff --git a/net-analyzer/nikto/nikto-2.1.5.ebuild b/net-analyzer/nikto/nikto-2.1.5.ebuild
index aa1e74e0c6b..694c4affa5d 100644
--- a/net-analyzer/nikto/nikto-2.1.5.ebuild
+++ b/net-analyzer/nikto/nikto-2.1.5.ebuild
@@ -28,7 +28,7 @@ src_prepare() {
 	sed -i -e 's:/etc/nikto.conf:/etc/nikto/nikto.conf:;
 	s:# EXECDIR=/usr/local/nikto:EXECDIR=/usr/share/nikto:;
 	s:# use LW2:use LW2:;
-	s:require "$CONFIGFILE{'\''PLUGINDIR'\''}/LW2.pm":# require "$CONFIGFILE{'\''PLUGINDIR'\''}/LW2.pm":;' nikto.pl || die
+	s:require "$CONFIGFILE{'\''PLUGINDIR'\''}/LW2.pm":# require "$CONFIGFILE{'\''PLUGINDIR'\''}/LW2.pm":;' nikto.pl || die
 }
 
 src_compile() { :; }
diff --git a/net-fs/cifs-utils/files/cifs-utils-6.1-hardcoded-path.patch b/net-fs/cifs-utils/files/cifs-utils-6.1-hardcoded-path.patch
index c2e2ea21d81..2c2067fa1f9 100644
--- a/net-fs/cifs-utils/files/cifs-utils-6.1-hardcoded-path.patch
+++ b/net-fs/cifs-utils/files/cifs-utils-6.1-hardcoded-path.patch
@@ -12,7 +12,7 @@ to be in ${PATH} and popen() passes the command to shell, just pass
 'systemd-ask-password' and let the shell find it.
 
 Fixes: https://bugzilla.samba.org/show_bug.cgi?id=10054
-Signed-off-by: Michał Górny <mgorny@gentoo.org>
+Signed-off-by: Michał Górny <mgorny@gentoo.org>
 ---
  mount.cifs.c |    4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-mail/courier-imap/courier-imap-4.15-r1.ebuild b/net-mail/courier-imap/courier-imap-4.15-r1.ebuild
index ab8717f35d0..baf71854a23 100644
--- a/net-mail/courier-imap/courier-imap-4.15-r1.ebuild
+++ b/net-mail/courier-imap/courier-imap-4.15-r1.ebuild
@@ -169,8 +169,8 @@ src_install() {
 	done
 
 	cd ../share || die
-	mv -f * ../sbin || die
-	mv -f ../sbin/man . || die
+	mv -f * ../sbin || die
+	mv -f ../sbin/man . || die
 	cd .. || die
 
 	for x in mkimapdcert mkpop3dcert ; do
diff --git a/net-misc/aget/metadata.xml b/net-misc/aget/metadata.xml
index d89103058ab..7026f2a9f3c 100644
--- a/net-misc/aget/metadata.xml
+++ b/net-misc/aget/metadata.xml
@@ -6,7 +6,7 @@
 	<name>Michael Weber</name>
 </maintainer>
 <longdescription>Aget fetches HTTP URLs in a manner similar to wget, but segments the retrieval into multiple parts to increase download speed. It can be many times as fast as wget in some circumstances.</longdescription>
-<longdescription lang="ja">Aget は wget 風の振舞いで URL 上から HTTP 
-経由で取り寄せますが、異なる点としてはダウンロードのスピードアップのため対象を分割します。分割しても 
-wget と変わらない場合もあります。</longdescription>
+<longdescription lang="ja">
+Aget は wget 風の振舞いで URL 上から HTTP 経由で取り寄せますが、異なる点としてはダウンロードのスピードアップのため対象を分割します。分割しても wget と変わらない場合もあります。
+</longdescription>
 </pkgmetadata>
diff --git a/net-misc/ser/ser-0.9.7-r1.ebuild b/net-misc/ser/ser-0.9.7-r1.ebuild
index 13538c49388..244f4df6089 100644
--- a/net-misc/ser/ser-0.9.7-r1.ebuild
+++ b/net-misc/ser/ser-0.9.7-r1.ebuild
@@ -94,7 +94,7 @@ src_prepare() {
 		MY_A=$(eval echo ${x}-\${$(echo ${x} | tr "[:lower:]" "[:upper:]")_PV}-${PN}-${MODULES_PV})
 		MY_PATCH_A="${P}-extmod-${x}"
 		mkdir -p "${S}"/modules/${x} || die
-		cd "${S}"/modules/${x} || die
+		cd "${S}"/modules/${x} || die
 		unpack ${MY_A}.tar.gz
 		# fix makefiles
 		if [[ -f "${FILESDIR}"/${MY_A}.diff ]]; then
@@ -154,7 +154,7 @@ src_install () {
 
 	chown -R root:ser "${D}"/etc/ser || die
 	chmod 750 "${D}"/etc/ser || die
-	chmod 640 "${D}"/etc/ser/* || die
+	chmod 640 "${D}"/etc/ser/* || die
 
 	# fix manpages
 	sed -i	-e "s:^.B /ser-${PV}AUTHORS:.B /usr/share/doc/${PF}/AUTHORS:" \
diff --git a/profiles/hardened/linux/amd64/no-multilib/package.use.mask b/profiles/hardened/linux/amd64/no-multilib/package.use.mask
index 140a2982bee..b552f1cc468 100644
--- a/profiles/hardened/linux/amd64/no-multilib/package.use.mask
+++ b/profiles/hardened/linux/amd64/no-multilib/package.use.mask
@@ -7,7 +7,7 @@
 # Disable 32-bit parts of wine, bug #351436
 app-emulation/wine mono win32
 
-# Apr 28, 2008 Sébastien Fabbro <bicatali@gentoo.org>
+# Apr 28, 2008 Sébastien Fabbro <bicatali@gentoo.org>
 # ifc masked
 sci-libs/acml ifc
 
diff --git a/sci-biology/phylip/phylip-3.69-r1.ebuild b/sci-biology/phylip/phylip-3.69-r1.ebuild
index ecc44200ac5..6068d8b12f8 100644
--- a/sci-biology/phylip/phylip-3.69-r1.ebuild
+++ b/sci-biology/phylip/phylip-3.69-r1.ebuild
@@ -36,7 +36,7 @@ src_compile() {
 }
 
 src_install() {
-	cd "${WORKDIR}/${P}" || die
+	cd "${WORKDIR}/${P}" || die
 
 	mv exe/font* fonts || die "Font move failed."
 	mv exe/factor exe/factor-${PN} || die "Renaming factor failed."
diff --git a/sci-biology/phylip/phylip-3.696.ebuild b/sci-biology/phylip/phylip-3.696.ebuild
index d5960bb62bb..cf6fe4072cb 100644
--- a/sci-biology/phylip/phylip-3.696.ebuild
+++ b/sci-biology/phylip/phylip-3.696.ebuild
@@ -38,7 +38,7 @@ src_compile() {
 }
 
 src_install() {
-	cd "${WORKDIR}/${P}" || die
+	cd "${WORKDIR}/${P}" || die
 
 	mv exe/font* fonts || die "Font move failed."
 	mv exe/factor exe/factor-${PN} || die "Renaming factor failed."
diff --git a/sci-chemistry/coot/coot-0.8.2-r1.ebuild b/sci-chemistry/coot/coot-0.8.2-r1.ebuild
index 2663fba892c..0f95e676b90 100644
--- a/sci-chemistry/coot/coot-0.8.2-r1.ebuild
+++ b/sci-chemistry/coot/coot-0.8.2-r1.ebuild
@@ -134,7 +134,7 @@ src_configure() {
 
 src_test() {
 	source "${EPREFIX}/etc/profile.d/40ccp4.setup.sh"
-	mkdir "${T}"/coot_test || die
+	mkdir "${T}"/coot_test || die
 
 	export COOT_STANDARD_RESIDUES="${S}/standard-residues.pdb"
 	export COOT_SCHEME_DIR="${S}/scheme/"
diff --git a/sci-libs/arpack/arpack-3.1.5.ebuild b/sci-libs/arpack/arpack-3.1.5.ebuild
index 17640a9af0d..fc71a163d0d 100644
--- a/sci-libs/arpack/arpack-3.1.5.ebuild
+++ b/sci-libs/arpack/arpack-3.1.5.ebuild
@@ -43,7 +43,7 @@ src_configure() {
 }
 
 src_test() {
-	cp "${S}"/TESTS/testA.mtx "${BUILD_DIR}"/TESTS || die
+	cp "${S}"/TESTS/testA.mtx "${BUILD_DIR}"/TESTS || die
 	autotools-utils_src_test
 }
 
diff --git a/sci-libs/balbes-db/balbes-db-6.1.3-r1.ebuild b/sci-libs/balbes-db/balbes-db-6.1.3-r1.ebuild
index befa38413e5..bd973c5120d 100644
--- a/sci-libs/balbes-db/balbes-db-6.1.3-r1.ebuild
+++ b/sci-libs/balbes-db/balbes-db-6.1.3-r1.ebuild
@@ -36,7 +36,7 @@ src_install() {
 	# db files shouldn't be executable
 	find "${ED}"/usr/share/balbes/BALBES_0.0.1/ \
 		-type f \
-		-exec chmod 664 '{}' \; || die
+		-exec chmod 664 '{}' \; || die
 	dosym ../../ccp4/data/monomers /usr/share/balbes/BALBES_0.0.1/dic
 
 	cat >> "${T}"/20balbes <<- EOF
diff --git a/sci-libs/cdf/cdf-3.4.1.ebuild b/sci-libs/cdf/cdf-3.4.1.ebuild
index 7db24ca42e7..a6a3ccebec5 100644
--- a/sci-libs/cdf/cdf-3.4.1.ebuild
+++ b/sci-libs/cdf/cdf-3.4.1.ebuild
@@ -114,7 +114,7 @@ src_install() {
 	fi
 
 	if use java; then
-		cd cdfjava || die
+		cd cdfjava || die
 		dolib.so jni/libcdfNativeLibrary.so.${PV_SO}
 		dosym libcdfNativeLibrary.so.${PV_SO} \
 			/usr/$(get_libdir)/libcdfNativeLibrary.so
diff --git a/sci-libs/cdf/cdf-3.5.0.2.ebuild b/sci-libs/cdf/cdf-3.5.0.2.ebuild
index c370eb3e385..b58223247b2 100644
--- a/sci-libs/cdf/cdf-3.5.0.2.ebuild
+++ b/sci-libs/cdf/cdf-3.5.0.2.ebuild
@@ -114,7 +114,7 @@ src_install() {
 	fi
 
 	if use java; then
-		cd cdfjava || die
+		cd cdfjava || die
 		dolib.so jni/libcdfNativeLibrary.so.${PV_SO}
 		dosym libcdfNativeLibrary.so.${PV_SO} \
 			/usr/$(get_libdir)/libcdfNativeLibrary.so
diff --git a/sci-libs/inchi/inchi-1.04.ebuild b/sci-libs/inchi/inchi-1.04.ebuild
index 06370f2fd48..25ed6f88d5a 100644
--- a/sci-libs/inchi/inchi-1.04.ebuild
+++ b/sci-libs/inchi/inchi-1.04.ebuild
@@ -67,7 +67,7 @@ src_install() {
 	fi
 	dobin "${S}"/INCHI/gcc/inchi-1/inchi-1
 	cd "${S}/INCHI_API/gcc_so_makefile/result" || die
-	rm *gz || die
+	rm *gz || die
 	dolib.so lib*so*
 	use static-libs && dolib.a lib*a
 	doheader ../../inchi_main/inchi_api.h
diff --git a/sci-mathematics/reduce/reduce-20110414-r1.ebuild b/sci-mathematics/reduce/reduce-20110414-r1.ebuild
index 7394f78f5e6..244dd4680cb 100644
--- a/sci-mathematics/reduce/reduce-20110414-r1.ebuild
+++ b/sci-mathematics/reduce/reduce-20110414-r1.ebuild
@@ -62,7 +62,7 @@ src_install() {
 	pushd bin > /dev/null
 	cp "${FILESDIR}"/redcsl "${FILESDIR}"/csl . || die
 	sed -e "s/lib/${lib}/" -i redcsl || die
-	sed -e "s/lib/${lib}/" -i csl || die
+	sed -e "s/lib/${lib}/" -i csl || die
 	dobin redcsl csl
 	popd > /dev/null
 
@@ -77,7 +77,7 @@ src_install() {
 	dosym /usr/share/${PN}/doc /usr/${lib}/${PN}/${PN}.doc
 	if use X; then
 		doins -r ${PN}.fonts
-		mv "${D}"usr/share/${PN}/${PN}.fonts "${D}"usr/share/${PN}/fonts || die
+		mv "${D}"usr/share/${PN}/${PN}.fonts "${D}"usr/share/${PN}/fonts || die
 		dosym /usr/share/${PN}/fonts /usr/${lib}/${PN}/${PN}.fonts
 	fi
 	popd > /dev/null
diff --git a/sys-devel/prelink/files/prelink-20130503-libiberty-md5.patch b/sys-devel/prelink/files/prelink-20130503-libiberty-md5.patch
index 36b8bcecb31..5a9fffb838f 100644
--- a/sys-devel/prelink/files/prelink-20130503-libiberty-md5.patch
+++ b/sys-devel/prelink/files/prelink-20130503-libiberty-md5.patch
@@ -8,7 +8,7 @@ Content-Transfer-Encoding: 8bit
 
 Current libiberty md5 code triggers these warnings with gcc-4.7.1 for me:
 
-libiberty/md5.c: In function ‘md5_finish_ctx’:
+libiberty/md5.c: In function ‘md5_finish_ctx’:
 libiberty/md5.c:117:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
 libiberty/md5.c:118:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
 
diff --git a/sys-kernel/pf-sources/files/2100_proc-mem-handling-fix.patch b/sys-kernel/pf-sources/files/2100_proc-mem-handling-fix.patch
index ef86a3b076a..c32934daf89 100644
--- a/sys-kernel/pf-sources/files/2100_proc-mem-handling-fix.patch
+++ b/sys-kernel/pf-sources/files/2100_proc-mem-handling-fix.patch
@@ -10,7 +10,7 @@ From: Linus Torvalds <torvalds@linux-foundation.org>
 
 commit e268337dfe26dfc7efd422a804dbb27977a3cccc upstream.
 
-Jüri Aedla reported that the /proc/<pid>/mem handling really isn't very
+Jüri Aedla reported that the /proc/<pid>/mem handling really isn't very
 robust, and it also doesn't match the permission checking of any of the
 other related files.
 
@@ -29,7 +29,7 @@ addresses will also have changed as part of the execve.  So you cannot
 actually usefully access the fd across a VM change simply because all
 the offsets for IO would have changed too.
 
-Reported-by: Jüri Aedla <asd@ut.ee>
+Reported-by: Jüri Aedla <asd@ut.ee>
 Cc: Al Viro <viro@zeniv.linux.org.uk>
 Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
diff --git a/www-apache/mod_rpaf/files/003_ipv6.patch b/www-apache/mod_rpaf/files/003_ipv6.patch
index 67edd55e45a..49554efe459 100644
--- a/www-apache/mod_rpaf/files/003_ipv6.patch
+++ b/www-apache/mod_rpaf/files/003_ipv6.patch
@@ -1,6 +1,6 @@
 Description: ipv6 fixes
 Author: Piotr Roszatycki <dexter@debian.org>
-Reviewed-by: Sergey B Kirpichev <skirpichev@gmail.com>
+Reviewed-by: Sergey B Kirpichev <skirpichev@gmail.com>
 Bug-Debian: http://bugs.debian.org/726529
 
 ---
diff --git a/www-apache/mod_rpaf/files/012_Add-missing-header-for-inet_addr.patch b/www-apache/mod_rpaf/files/012_Add-missing-header-for-inet_addr.patch
index 250a23bf918..b31f91db29a 100644
--- a/www-apache/mod_rpaf/files/012_Add-missing-header-for-inet_addr.patch
+++ b/www-apache/mod_rpaf/files/012_Add-missing-header-for-inet_addr.patch
@@ -1,4 +1,4 @@
-Description: Add missing header for inet_addr
+Description: Add missing header for inet_addr
 Author: Sergey B Kirpichev <skirpichev@gmail.com>
 
 ---
diff --git a/www-apps/sugarcrm/metadata.xml b/www-apps/sugarcrm/metadata.xml
index 4ec56314c58..a6e3b05753c 100644
--- a/www-apps/sugarcrm/metadata.xml
+++ b/www-apps/sugarcrm/metadata.xml
@@ -8,7 +8,7 @@
 	</maintainer>
 	<maintainer>
 		<email>maksbotan@gentoo.org</email>
-		<name>Maxim Koltsov</name>
+		<name>Maxim Koltsov</name>
 	</maintainer>
 	<use>
 		<flag name="json">Add JSON (JavaScript Object Notation) support</flag>
diff --git a/x11-misc/alltray/alltray-0.7.5.1.ebuild b/x11-misc/alltray/alltray-0.7.5.1.ebuild
index 64e07674074..e743ae66da5 100644
--- a/x11-misc/alltray/alltray-0.7.5.1.ebuild
+++ b/x11-misc/alltray/alltray-0.7.5.1.ebuild
@@ -40,7 +40,7 @@ src_prepare() {
 		-e '/Encoding/d' \
 		-e '/Categories/s:Application;::' \
 		-e '/Icon/s:.png::' \
-		data/alltray.desktop{,.in} || die
+		data/alltray.desktop{,.in} || die
 
 	vala_src_prepare
 	sed -i -e '/AC_PATH_PROG/s:valac:${VALAC}:g' configure.ac || die
diff --git a/x11-terms/roxterm/roxterm-2.6.3.ebuild b/x11-terms/roxterm/roxterm-2.6.3.ebuild
index 3ce0b3dee6a..290c67a3933 100644
--- a/x11-terms/roxterm/roxterm-2.6.3.ebuild
+++ b/x11-terms/roxterm/roxterm-2.6.3.ebuild
@@ -37,14 +37,14 @@ src_prepare() {
 	python_convert_shebangs 2 mscript.py
 
 	# the "maitch" build system is complete junk. let's stab it...
-	sed -i -e 's:TerminalEmulator:System;&:' roxterm.desktop || die
+	sed -i -e 's:TerminalEmulator:System;&:' roxterm.desktop || die
 	sed -i -e '/ctx.install_doc/s:COPYING COPYING-LGPL ::' mscript.py || die
 	sed -i -e "/CFLAGS/s:-O2 -g:${CFLAGS}:" {maitch,mscript}.py || die
 	sed -i \
 		-e 's:gcc:${CC}:' \
 		-e "/LDFLAGS/s:'':'${LDFLAGS}':" \
 		-e 's:--mode=link:--mode=link --tag=CC:' \
-		maitch.py || die
+		maitch.py || die
 }
 
 src_configure() {
diff --git a/xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.1.4.ebuild b/xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.1.4.ebuild
index c35177b8734..365a07843f9 100644
--- a/xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.1.4.ebuild
+++ b/xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.1.4.ebuild
@@ -48,7 +48,7 @@ src_prepare() {
 	# http://git.xfce.org/thunar-plugins/thunar-vcs-plugin/commit/?id=e87584f7b87627a322f6e41025e5e52d65ebb4d8
 	local lang
 	for lang in el eu ru ug uk; do
-		mv "${WORKDIR}"/${P}-${lang}.po po/${lang}.po || die
+		mv "${WORKDIR}"/${P}-${lang}.po po/${lang}.po || die
 	done
 	xfconf_src_prepare
 }