gentoo resync : 12.08.2018

4 files changed, 3 insertions, 124 deletions

diff --git a/app-mobilephone/Manifest.gz b/app-mobilephone/Manifest.gz
index eea85dd553bb..7eb2d6d7f053 100644
--- a/app-mobilephone/Manifest.gz
+++ b/app-mobilephone/Manifest.gz
diff --git a/app-mobilephone/kannel/Manifest b/app-mobilephone/kannel/Manifest
index 9c892df0aa5d..e9872440b307 100644
--- a/app-mobilephone/kannel/Manifest
+++ b/app-mobilephone/kannel/Manifest
@@ -6,8 +6,6 @@ AUX kannel-1.5.0-initgroups.patch 333 BLAKE2B ad24397bf6f9d8af7e4313697e25a6e86f
 AUX kannel-bearerbox.initd 864 BLAKE2B c9b0180a14af5e0ddda02b376b267e51e5b7e0308047c378036bed927e314e662767a06edfa736ff3cb2f06052b8152a1b667e3b97445cd6802c3e6f42159a20 SHA512 626f90e7b66d4fa2db6430682dbfa7201a28d28f8052236683b6ecc27ca7528a1e195bee5fd4bf669a4cd7e70f729fa2072ad6007485c294bf91e912dc4c1830
 AUX kannel-smsbox.initd 849 BLAKE2B 2e3c663b340d624c6e97d1fda12ced252a8357395fae66f6d3a4665d8756c77ae7c840e210cae9897f266b4d750202e94a402ced907bfccc507438446063b9a1 SHA512 f0bad4c7b083c7edb96620e4263495872dbc59c2e911cf981f09e8d7a1ee2d3cc7fea63bec0596d60133aa50eea0e8ffeda1c3422395fe6fd7a35dcfa726426e
 AUX kannel-wapbox.initd 849 BLAKE2B 2e3c663b340d624c6e97d1fda12ced252a8357395fae66f6d3a4665d8756c77ae7c840e210cae9897f266b4d750202e94a402ced907bfccc507438446063b9a1 SHA512 f0bad4c7b083c7edb96620e4263495872dbc59c2e911cf981f09e8d7a1ee2d3cc7fea63bec0596d60133aa50eea0e8ffeda1c3422395fe6fd7a35dcfa726426e
-DIST gateway-1.4.3.tar.gz 2654925 BLAKE2B 822aac6148d088a1808c3e3ca6004ab97055d6d754cf7b2bbf5069a4d11daf95e61f1011574a5443d248f44d13adc80311b1183fae5de2b67f8698f2880cfd47 SHA512 2e727cd3f57ba5af815f1c029dd9125db17b4f980bb555c20cde693e03226f52e1d2969a3d262e0dda1198cbddd3cc1d2f708aaa623f656d91aef686f4925dae
 DIST gateway-1.5.0.tar.gz 3469476 BLAKE2B c77c43ec782884f8404e70dbe8fb76cb66526ba7f313db7b7ee83073aae71fb2a1661b58be297f0dc2e6bffbccc862d5e7f1239bd4431bbfa4f009848d57face SHA512 5bd35ff40e0f5882367f717e67104a0dc8703b5d6d95654e1268ded15cf6fac6366968b10adbe2eec22b3ac17fe3ae33b4142cd38f51fd3d75a56c8fe7653652
-EBUILD kannel-1.4.3-r2.ebuild 2992 BLAKE2B b39e947ca049ec33c7ce68b92d100c786fda674fdace444d78b105fc23cc93dcaa66e325ea6ad6cd5e6b4dc5c487242d3fb5f0cbdf69e8f96f852f4f50bb5827 SHA512 d391f96df59b02a2c0a834fd9049ffa8eeb769cab1b238a45d303f9f9e14e2d518fda620be0589e8922dad031625545ee3c8b5dc65620d939f13ac9374b3cd0a
-EBUILD kannel-1.5.0-r3.ebuild 3030 BLAKE2B 21945f67d0699b09d8ea589696552108734aa06d45d95a9232ce49e971bfc3dd27b4aedbfa2f751b6fe4740c016df0834ec91d9b2912e14999ca1c35a46fb56d SHA512 d53c86aee49d6888cf772aede6e46974ae8f723643ea842459411718dda806136704596fce68ba1e66396908fd8170196dec359685959d84f85652c033a452ee
+EBUILD kannel-1.5.0-r3.ebuild 3029 BLAKE2B 8c7e9f4928eb635f738fb40e88406415a1c8cdca1a229376601b28a9b409a62b2dfd18423f40de986cad771312225491693e2ef26af8b512dd21127ddde2486b SHA512 0bf6cf604585bc7cb7fe1749eacd9e3e67c1fb3e4829091fcf759ebfc176e9d5333ec8d32b789288d954e20774b258150324f3e08025a25d4abc2efdecd4d16b
 MISC metadata.xml 390 BLAKE2B 6465bab424ef3f1ec5eadfa9d79c8f81c32008e1e1d58c23aa781570f3d0233f6ddd1bb5ef1dbb13b7f5714247ba6294a33703385f04f896642d7f08aef16ac3 SHA512 8a41bfb7c62e2d9c247bbab03e7e9d352a2165e668e71f3930592f891d5a2c911064d62f0b1f1f13eefc69c9a6dcaa06d8575499fc9161b661256388cfdcf534
diff --git a/app-mobilephone/kannel/kannel-1.4.3-r2.ebuild b/app-mobilephone/kannel/kannel-1.4.3-r2.ebuild
deleted file mode 100644
index a61e50f8cc18..000000000000
--- a/app-mobilephone/kannel/kannel-1.4.3-r2.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-WANT_AUTOMAKE=none
-
-inherit eutils autotools flag-o-matic ssl-cert user
-
-DESCRIPTION="Powerful SMS and WAP gateway"
-HOMEPAGE="http://www.kannel.org/"
-SRC_URI="http://www.kannel.org/download/${PV}/gateway-${PV}.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="ssl mysql sqlite postgres pcre doc debug pam"
-
-RESTRICT="test" # some tests fail with "address already in use"
-
-RDEPEND="sys-libs/e2fsprogs-libs
-	dev-libs/libxml2
-	dev-lang/perl
-	sys-libs/zlib
-	ssl? ( dev-libs/openssl )
-	mysql? ( virtual/mysql )
-	sqlite? ( dev-db/sqlite:3 )
-	postgres? ( dev-db/postgresql[server] )
-	pcre? ( dev-libs/libpcre )
-	pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
-	>=sys-devel/bison-2.2
-	doc? ( media-gfx/transfig
-		app-text/jadetex
-		app-text/docbook-dsssl-stylesheets
-		app-text/docbook-sgml-dtd:3.1 )"
-
-S="${WORKDIR}/gateway-${PV}"
-
-pkg_setup() {
-	enewgroup kannel
-	enewuser kannel -1 -1 /var/log/kannel kannel
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-custom-wap-ports.patch"
-	epatch "${FILESDIR}/${P}-autotools.patch"
-	epatch "${FILESDIR}/${P}-external-libuuid.patch"
-
-	#by default, use current directory for logging
-	sed -i -e 's:/tmp/::' doc/examples/kannel.conf
-
-	eautoconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing # some code breaks strict aliasing
-	econf --docdir=/usr/share/doc/${PF} \
-		--enable-localtime \
-		--disable-start-stop-daemon \
-		--without-sqlite2 \
-		$(use_enable pam) \
-		$(use_enable debug debug) \
-		$(use_enable pcre) \
-		$(use_enable doc docs) \
-		$(use_enable ssl) \
-		$(use_with mysql) \
-		$(use_with sqlite sqlite3) \
-		$(use_with postgres pgsql) \
-		|| die "econf failed"
-}
-
-# phase disabled by RESTRICT
-# src_test() {
-# 	emake check || die "emake check failed"
-# }
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	if use doc; then
-		emake DESTDIR="${D}" install-docs || die "emake install-docs failed"
-	fi
-	dodoc README
-
-	diropts -g kannel -m0750
-	dodir /etc/kannel
-	insinto /etc/kannel
-	newins doc/examples/kannel.conf kannel.conf.sample
-
-	local f
-	for f in bearerbox smsbox wapbox; do
-		newinitd "${FILESDIR}/kannel-$f.initd" kannel-$f
-	done
-
-	diropts -g kannel -m0770
-	keepdir /var/log/kannel /var/run/kannel
-}
-
-pkg_postinst() {
-	if use ssl; then
-		elog "SSL certificate can be created by running"
-		elog "   emerge --config =${CATEGORY}/${PF}"
-	fi
-}
-
-pkg_config() {
-	if use ssl; then
-		if install_cert /etc/ssl/kannel; then
-			chown kannel "${ROOT}"etc/ssl/kannel.{pem,key}
-			einfo "For using this certificate, you have to add following line to your kannel.conf:"
-			einfo '   ssl-client-certkey-file = "/etc/ssl/kannel.pem"'
-			einfo '   ssl-server-cert-file = "/etc/ssl/kannel.crt"'
-			einfo '   ssl-server-key-file = "/etc/ssl/kannel.key"'
-		fi
-	else
-		eerror "This phase exists only for creating kannel SSL certificate"
-		eerror "and ssl USE flag is disabled for this package!"
-	fi
-}
diff --git a/app-mobilephone/kannel/kannel-1.5.0-r3.ebuild b/app-mobilephone/kannel/kannel-1.5.0-r3.ebuild
index da9badd3016d..843a498c682f 100644
--- a/app-mobilephone/kannel/kannel-1.5.0-r3.ebuild
+++ b/app-mobilephone/kannel/kannel-1.5.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="http://www.kannel.org/download/${PV}/gateway-${PV}.tar.gz"
 
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="debug doc mysql libressl pam pcre postgres sqlite ssl"
 
 RESTRICT="test" # some tests fail with "address already in use"