Merge updates from master

8 files changed, 53 insertions, 122 deletions

diff --git a/app-i18n/libskk/Manifest b/app-i18n/libskk/Manifest
index 49d342d852fa..1664f7afa1e4 100644
--- a/app-i18n/libskk/Manifest
+++ b/app-i18n/libskk/Manifest
@@ -1,4 +1,2 @@
-DIST libskk-0.0.11.tar.gz 840232 SHA256 ce4a7ce8072481461671bfa066f7069c88696e6475dde547c73efb37c310684e SHA512 6c2f4f03cad0b464237d0352d7cacaf1a10531847af415b7a4e1ac3ff0784d01fa8895e46835448a2c3e6dc6a8892331ead8a09e075ccf6fa98e0c8db5150c22 WHIRLPOOL 501096fda5cefeff92a2b90815c895a0511c1adc75cbc39b7345d31fa15520d079758c927919005ee768e3884f2784caf7323e18f25fb754881aec48a6895bed
-DIST libskk-0.0.12.tar.gz 847745 SHA256 6d2eb10595cf810c2f31258505cfbb0be41f44b4d8541b99402ed47e71c68576 SHA512 7489b7475f7de4f11fd4394e6a916fd96cd3197e431a325085d2888f69e6afc27eed8ba6989829e98617cfb811b36c83b188ab4475398df83b0f7c46fb3e5360 WHIRLPOOL 32d9c3b6c652a8382008c621763354436a8f373e95811def17ffa116c020aa2e7e524ea62251b9771dc580c4ffeaefa7949e1b5dab0bdabd6a6577eb03e3668c
-DIST libskk-0.0.9.tar.gz 719373 SHA256 1c691c658d160229928a72ef102731f8ab44a135fab7e4bdf2d17f264b359333 SHA512 09b6d58097a843a28e3c67f0652cbe194eefbafcc3cb9520db5bbf8dfa0bea275a3b0b0b4ec4d5577c19fbcd6b66db791c3773ccc5ed6b9781fb31620c70d0ce WHIRLPOOL 3835019a5bca597e353bb3ca1d2b05d93c40c39d9ed44a92d92c490e65f2fb45b97ab5047cef4edeefde5c22875cae58e3a26cbc9db4dac3b580434717f40111
 DIST libskk-1.0.1.tar.gz 860453 SHA256 37bb7859deffd038319a8bc7f9c7d3b207d7dce6afea5e3da519381d7a05388c SHA512 17dc7c0361083c08c29267b4fe2d066b079e5156728f461717044f99579ec2674b56c960d2be5a42a2dffb693106d2d3d78ec8cb833e8f189d48e421a25d91b0 WHIRLPOOL c40970c33b807ee37e27888dda7220ed4e979a05a18c742f0fbfe39444192363b82d2e4b10f837b015ae8d0e359c4e67f7e548269b5b032a3e944f1ca0ff7791
+DIST libskk-1.0.2.tar.gz 867572 SHA256 e4e0a13493cf3a8ac87a4724dfdddfd2ae795659cbb3431bf94719fd6e016d40 SHA512 f8fff94b216c18f66bf1004ee068f8d737177f1b70ac36d054d9a68ce02ba9b8d1b7b4127d9a330f64054b2fe06f352070c750a3562d4be36fecf20cb854e6c0 WHIRLPOOL 5f56466be5c197e3bf5b920cd9eac150274bc5779d3d0a758197133b3c824df7b6e317aa0320ba15850f0d02b79853f9a41da75c43567ad8dc75119a49455460
diff --git a/app-i18n/libskk/libskk-0.0.11.ebuild b/app-i18n/libskk/libskk-0.0.11.ebuild
deleted file mode 100644
index 487e3fba719d..000000000000
--- a/app-i18n/libskk/libskk-0.0.11.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-VALA_MIN_API_VERSION=0.14
-
-inherit virtualx vala
-
-DESCRIPTION="GObject-based library to deal with Japanese kana-to-kanji conversion method"
-HOMEPAGE="https://github.com/ueno/libskk"
-SRC_URI="mirror://github/ueno/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls +introspection static-libs"
-
-RDEPEND=">=dev-libs/glib-2.16
-	dev-libs/libgee:0
-	dev-libs/json-glib
-	introspection? ( >=dev-libs/gobject-introspection-0.10.8 )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	virtual/pkgconfig
-	nls? (
-		dev-util/intltool
-		sys-devel/gettext
-		)"
-# doc? ( >=dev-util/valadoc-0.3.1 )
-
-DOCS="ChangeLog NEWS README"
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		$(use_enable introspection)
-}
-
-src_test() {
-	Xemake check || die "emake check failed."
-}
-
-src_install() {
-	default
-	rm -f "${ED}"/usr/lib*/lib*.la
-}
diff --git a/app-i18n/libskk/libskk-0.0.12.ebuild b/app-i18n/libskk/libskk-0.0.12.ebuild
deleted file mode 100644
index 487e3fba719d..000000000000
--- a/app-i18n/libskk/libskk-0.0.12.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-VALA_MIN_API_VERSION=0.14
-
-inherit virtualx vala
-
-DESCRIPTION="GObject-based library to deal with Japanese kana-to-kanji conversion method"
-HOMEPAGE="https://github.com/ueno/libskk"
-SRC_URI="mirror://github/ueno/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls +introspection static-libs"
-
-RDEPEND=">=dev-libs/glib-2.16
-	dev-libs/libgee:0
-	dev-libs/json-glib
-	introspection? ( >=dev-libs/gobject-introspection-0.10.8 )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	virtual/pkgconfig
-	nls? (
-		dev-util/intltool
-		sys-devel/gettext
-		)"
-# doc? ( >=dev-util/valadoc-0.3.1 )
-
-DOCS="ChangeLog NEWS README"
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		$(use_enable introspection)
-}
-
-src_test() {
-	Xemake check || die "emake check failed."
-}
-
-src_install() {
-	default
-	rm -f "${ED}"/usr/lib*/lib*.la
-}
diff --git a/app-i18n/libskk/libskk-0.0.9.ebuild b/app-i18n/libskk/libskk-1.0.2.ebuild
index 1f394805b322..c03b9f52026e 100644
--- a/app-i18n/libskk/libskk-0.0.9.ebuild
+++ b/app-i18n/libskk/libskk-1.0.2.ebuild
@@ -1,45 +1,47 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI="6"
 
-VALA_MIN_API_VERSION=0.12
-
-inherit vala
+inherit ltprune virtualx vala
 
 DESCRIPTION="GObject-based library to deal with Japanese kana-to-kanji conversion method"
 HOMEPAGE="https://github.com/ueno/libskk"
-SRC_URI="mirror://github/ueno/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/ueno/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="nls static-libs"
+IUSE="+introspection nls static-libs"
 
-RDEPEND="dev-libs/glib
-	dev-libs/libgee:0
+RDEPEND="dev-libs/glib:2
 	dev-libs/json-glib
-	>=dev-libs/gobject-introspection-0.9
-	$(vala_depend)
+	dev-libs/libgee:0.8
+	introspection? ( dev-libs/gobject-introspection )
 	nls? ( virtual/libintl )"
-#	>=dev-util/valadoc-0.3.1
 DEPEND="${RDEPEND}
+	$(vala_depend)
+	dev-util/intltool
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
+src_prepare() {
+	vala_src_prepare
+	default
+}
+
 src_configure() {
 	econf \
+		$(use_enable introspection) \
 		$(use_enable nls) \
 		$(use_enable static-libs static)
 }
 
+src_test() {
+	Xemake check
+}
+
 src_install() {
 	default
-
-	if ! use static-libs ; then
-		find "${ED}" -name '*.la' -delete
-	fi
-
-	doman docs/skk.1
-	dodoc AUTHORS ChangeLog NEWS README
+	prune_libtool_files
 }
diff --git a/app-i18n/mecab-skkserv/mecab-skkserv-0.03.ebuild b/app-i18n/mecab-skkserv/mecab-skkserv-0.03.ebuild
index 638db34c5b9c..a988749886da 100644
--- a/app-i18n/mecab-skkserv/mecab-skkserv-0.03.ebuild
+++ b/app-i18n/mecab-skkserv/mecab-skkserv-0.03.ebuild
@@ -22,7 +22,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-cflags.patch
 	"${FILESDIR}"/${PN}-dicrc.patch
 )
-DOCS=( AUTHORS NEWS README )
 HTML_DOCS=( index.html ${PN}.css )
 
 src_prepare() {
diff --git a/app-office/geierlein/Manifest b/app-office/geierlein/Manifest
index df2723c555f1..0e03ea51a692 100644
--- a/app-office/geierlein/Manifest
+++ b/app-office/geierlein/Manifest
@@ -1 +1,2 @@
 DIST geierlein-0.9.10.tar.gz 1124924 SHA256 ac1c8cf481beb346488dfb4b053a87de72128884fef39f4cae409ba49bec0bb9 SHA512 d10a97471b3b3620ea993d281fcc1880b09d8a6fbfbbb638e2f036206a05f9daef3ff248d5434e31d9e240f9d9dd8b2e88011449ce3218918ae6bd374ecd62f6 WHIRLPOOL 1e36de28ac49489f7f229b566e6a1f25469626e1b80365d81f6d7aed2e69e7fb8b52befba3389d7c8b8840454d24a9ea9937910445ad668f16fdcfadfe4347ef
+DIST geierlein-0.9.11.tar.gz 1124776 SHA256 6ae358f4855c84a51bc10013bbb0b44877ef384854be2d7f1bb9b18ecc512ce8 SHA512 f82790364990ac08c7a130c44130e4c4ede7fc2d2410181c6b9608ede38b23a881b05c4742bdfe8b101751db8aedef552029a2c719c29fb25234e0fea0b67f20 WHIRLPOOL 1de028b31d2fb1a02da8453b9374643e1b3718c2cdd4b7367294736ffba1f495c95a141333c92aba72a8ffdf212d8682bb2121fdf498a27569dea4d3cda9f6f4
diff --git a/app-office/geierlein/geierlein-0.9.11.ebuild b/app-office/geierlein/geierlein-0.9.11.ebuild
new file mode 100644
index 000000000000..782e682a6819
--- /dev/null
+++ b/app-office/geierlein/geierlein-0.9.11.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Submit tax forms (Umsatzsteuervoranmeldung) to German ELSTER"
+HOMEPAGE="https://stesie.github.com/geierlein/"
+SRC_URI="https://github.com/stesie/geierlein/archive/V${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RDEPEND="|| ( www-client/firefox www-client/firefox-bin )"
+DEPEND=""
+
+# needs nodejs and a couple of modules we don't have packaged
+RESTRICT="test"
+
+src_compile() {
+	emake prefix=/usr
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		prefix=/usr \
+		install || die
+	dodoc README.md
+}
diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass
index 121db46e62b5..777fce905f3e 100644
--- a/eclass/toolchain-funcs.eclass
+++ b/eclass/toolchain-funcs.eclass
@@ -572,7 +572,7 @@ tc-endian() {
 	case ${host} in
 		aarch64*be)	echo big;;
 		aarch64)	echo little;;
-		alpha*)		echo big;;
+		alpha*)		echo little;;
 		arm*b*)		echo big;;
 		arm*)		echo little;;
 		cris*)		echo little;;