gentoo resync : 14.07.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-07-14 21:03:06 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-07-14 21:03:06 +0100
commit: 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch)
tree: 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /app-mobilephone
parent: 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff)
137 files changed, 4852 insertions, 355 deletions
diff --git a/app-mobilephone/Manifest.gz b/app-mobilephone/Manifest.gz
index 8403edc1e114..0f5ad479ade3 100644
--- a/app-mobilephone/Manifest.gz
+++ b/app-mobilephone/Manifest.gz
diff --git a/app-mobilephone/anyremote-6.5 b/app-mobilephone/anyremote-6.5
deleted file mode 100644
index f4ebe93a384a..000000000000
--- a/app-mobilephone/anyremote-6.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/glib:2 x11-libs/libX11 x11-libs/libXtst bluetooth? ( net-wireless/bluez ) dbus? ( dev-libs/dbus-glib sys-apps/dbus ) zeroconf? ( net-dns/avahi ) virtual/pkgconfig
-DESCRIPTION=Bluetooth, infrared or cable remote control service
-EAPI=5
-HOMEPAGE=http://anyremote.sourceforge.net/
-IUSE=bluetooth dbus zeroconf
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 x11-libs/libX11 x11-libs/libXtst bluetooth? ( net-wireless/bluez ) dbus? ( dev-libs/dbus-glib sys-apps/dbus ) zeroconf? ( net-dns/avahi )
-SLOT=0
-SRC_URI=mirror://sourceforge/anyremote/anyremote-6.5.tar.gz
-_md5_=4aff29b9ca91ccf500d63d2b71a06b4d
diff --git a/app-mobilephone/anyremote/Manifest b/app-mobilephone/anyremote/Manifest
new file mode 100644
index 000000000000..651e7582a8b6
--- /dev/null
+++ b/app-mobilephone/anyremote/Manifest
@@ -0,0 +1,3 @@
+DIST anyremote-6.5.tar.gz 2440051 BLAKE2B 36945c978790246a675c33d4bea234165c27381a716394e06445a7450bd0b3f4286d762900df2f348a8bcf6e014c061a86fa0fc2e922ab631d31ea5dd0af8595 SHA512 e6190ec9ea4c66b7b85d77a9e056aeaf83d9730356780e9a54c0d27e31ce89399564b20e4bd62543aa72771049f34d359111d2c015e15fca5891d088391d2b73
+EBUILD anyremote-6.5.ebuild 845 BLAKE2B e9b66c19cb05a8ac5457369ff327945d8ebf03003608df58097e7c92493526c27f315e305eb20264b1007afcff6db25c3c8181aabb105550b4b6c98770a6f95b SHA512 b1f12fce4e9d47bcaf9a1f97b6aaeda40de1167a70aee610cd239358fed2c212df532eb7b83d677951564d5ce90168d7ff511b20eedf1a2844e259449bd60eb5
+MISC metadata.xml 246 BLAKE2B 68a1356ab3fd727f1ee98428a5d8edc3452c6d510f8d57cecea1b5cf36a2e0dc40b8b32be858421e041e6d2a18d9aebebbbd4c5d59c2ec560b3e36bc34d3c6aa SHA512 d2929e6457c8072e70cff695c72e7f8e0ee0aa0c10f9850143dc37a05df7af66abdc579ceb750b7e3d8bec5ed246744e42501e66058b4bbd5ebbefcffbb6156a
diff --git a/app-mobilephone/anyremote/anyremote-6.5.ebuild b/app-mobilephone/anyremote/anyremote-6.5.ebuild
new file mode 100644
index 000000000000..8f44f2a4b9c0
--- /dev/null
+++ b/app-mobilephone/anyremote/anyremote-6.5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Bluetooth, infrared or cable remote control service"
+HOMEPAGE="http://anyremote.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="bluetooth dbus zeroconf"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/libX11
+	x11-libs/libXtst
+	bluetooth? ( net-wireless/bluez )
+	dbus? (
+		dev-libs/dbus-glib
+		sys-apps/dbus
+	)
+	zeroconf? ( net-dns/avahi )
+"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_configure() {
+	econf \
+		--docdir="/usr/share/doc/${PF}/" \
+		$(use_enable bluetooth) \
+		$(use_enable dbus) \
+		$(use_enable zeroconf avahi)
+}
+
+src_install() {
+	default
+	mv "${ED}"/usr/share/doc/${PF}/{doc-html,html} || die
+}
diff --git a/app-mobilephone/anyremote/metadata.xml b/app-mobilephone/anyremote/metadata.xml
new file mode 100644
index 000000000000..2df201a28b67
--- /dev/null
+++ b/app-mobilephone/anyremote/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-needed -->
+	<upstream>
+		<remote-id type="sourceforge">anyremote</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-mobilephone/cobex-0.2.13 b/app-mobilephone/cobex-0.2.13
deleted file mode 100644
index 42d4442b10bb..000000000000
--- a/app-mobilephone/cobex-0.2.13
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=dev-libs/libezV24 dev-libs/expat
-DESCRIPTION=small implementation of Obex for phones using the DCU-11 USB-to-serial adapter
-EAPI=0
-HOMEPAGE=http://cobex.sourceforge.net/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libezV24 dev-libs/expat
-SLOT=0
-SRC_URI=mirror://sourceforge/cobex/cobex-0.2.13.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2e791ae5799f3d4c5346ba27c8967b49
diff --git a/app-mobilephone/cobex/Manifest b/app-mobilephone/cobex/Manifest
new file mode 100644
index 000000000000..51ac18de799c
--- /dev/null
+++ b/app-mobilephone/cobex/Manifest
@@ -0,0 +1,4 @@
+AUX cobex-0.2.13-build.patch 2725 BLAKE2B 39fbcc67b43548dcd703ce19a30cd06ac361f280c30b86039728a2d86680ab7ac84179627506119b4c4ddfebee2c44403ee4fbe8c1edc614e42fe010e34616bc SHA512 62458ff64467f3a29f298fa0f54d2fc220f9c4b35fa93eacd1ff7f62b38827940fb4cb7b1fee48136518d61ff008f0612913645183e2a2ffbcd3d4c9faff7fa5
+DIST cobex-0.2.13.tar.gz 27020 BLAKE2B cb5dc2a52f8e94bb3d59d64e15f730f04a8315b9ff668314795621fb0b90fd2293d343b6210a21df9c3c284ae698deba6cd6973b19d439447edaa7077d32fa8a SHA512 f05293d9d9f9fdf04809f2a5395bf8be3dd8bfbc592a9ca93b3b2e9b2a78157291b6d38e53b9c7f86e0e32567ee6d4028a9c48062eab4640c9cd85894e7e6a84
+EBUILD cobex-0.2.13.ebuild 685 BLAKE2B 2872d76b285940dc57df2e6d0c1074a0e1f0afeb5af615c8329ac0cc67a1e21b9a72f42dfb5eb8e5a4dc8f9d91a6fe6f670f3a42f1167b08485868abf987e620 SHA512 77f99af528025fcd010995516d20a46e9a474299ad420b5ddde548726aadcb4dca7746fe20db403c849b177d5a4440316d29fe0861955cf10683c1f7642f8d85
+MISC metadata.xml 242 BLAKE2B afe71b6e55885504e3d6f9c42d6b22980beab6e746009ce8df18a45dc3f43cb3ff76599a7d9793e14c1df4501241ad1db0ba3b458ef2c18dea4e928d572a94f9 SHA512 e5b7fb02f748e2655e6c03a88c34366e510087229269e450465b9d8094983edef80eee1de64e273e435b31961ec0786d6a86cbf6cfed7c7124419b789496215c
diff --git a/app-mobilephone/cobex/cobex-0.2.13.ebuild b/app-mobilephone/cobex/cobex-0.2.13.ebuild
new file mode 100644
index 000000000000..060d72031b58
--- /dev/null
+++ b/app-mobilephone/cobex/cobex-0.2.13.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit eutils
+
+DESCRIPTION="small implementation of Obex for phones using the DCU-11 USB-to-serial adapter"
+HOMEPAGE="http://cobex.sourceforge.net/"
+SRC_URI="mirror://sourceforge/cobex/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND="dev-libs/libezV24
+	dev-libs/expat"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-build.patch
+	local f
+	for f in get ls mkdir put rm ; do mv ${f}.c cobex_${f}.c || die ; done
+}
+
+src_install() {
+	dobin cobex_{ls,mkdir,put,rm} || die
+	dodoc Changelog README Things_to_know_T310.txt
+}
diff --git a/app-mobilephone/cobex/files/cobex-0.2.13-build.patch b/app-mobilephone/cobex/files/cobex-0.2.13-build.patch
new file mode 100644
index 000000000000..32ac20deb671
--- /dev/null
+++ b/app-mobilephone/cobex/files/cobex-0.2.13-build.patch
@@ -0,0 +1,108 @@
+--- Makefile
++++ Makefile
+@@ -1,75 +1,37 @@
+-CC=gcc
+-CCFLAGS=-O2 -Wall
+-EXTRACCFLAGS=-s -lezV24
+-EXPATCCFLAGS=-lexpat
+-CFILES=put.c get.c cobex_core.c ls.c cobex_tools.c cobex_serial.c rm.c mkdir.c
+-HFILES=cobex_defs.h cobex_core.h capabilities.h cobex_tools.h cobex_serial.h
+-O2FILES=cobex_core.o cobex_tools.o cobex_serial.o
+-PUTO=put.o
+-GETO=get.o
+-LSO=ls.o
+-RMO=rm.o
+-MKDIRO=mkdir.o
+-CAPAO=capability.o
+-COBEXPUT=cobex_put
+-COBEXGET=cobex_get
+-COBEXLS=cobex_ls
+-COBEXRM=cobex_rm
+-COBEXCAPA=cobex_capa
+-COBEXMKDIR=cobex_mkdir
++CC ?= gcc
++CFLAGS ?= -O2
++CFLAGS += -Wall
++LDLIBS += -lezV24
++
++PROGS = cobex_put cobex_get cobex_ls cobex_rm cobex_mkdir
++CFILES = $(wildcard *.c)
++HFILES = $(wildcard *.h)
++O2FILES = cobex_core.o cobex_tools.o cobex_serial.o
++
+ EXTRAFILES = README Changelog COPYING Makefile cobex_put.pl Things_to_know_T310.txt Hacking_pl2303_driver.txt
+ VERSION = 0.2.13
+ PROJNAME = cobex-$(VERSION)
+ 
+-all: $(COBEXPUT) $(COBEXGET) $(COBEXLS) $(COBEXRM) $(COBEXMKDIR)
++all: $(PROGS)
+ 
+ model:
+ 	cd modeldb && make all 
+ 
+-$(COBEXPUT): $(O2FILES) $(PUTO)
+-	$(CC) $(CCFLAGS) $(EXTRACCFLAGS) -o $(COBEXPUT) $(PUTO) $(O2FILES)
+-
+-$(COBEXGET): $(O2FILES) $(GETO)
+-	$(CC) $(CCFLAGS) $(EXTRACCFLAGS) -o $(COBEXGET) $(GETO) $(O2FILES)
+-
+-$(COBEXRM): $(O2FILES) $(RMO)
+-	$(CC) $(CCFLAGS) $(EXTRACCFLAGS) -o $(COBEXRM) $(RMO) $(O2FILES)
+-
+-$(COBEXLS): $(O2FILES) $(LSO)
+-	$(CC) $(CCFLAGS) $(EXTRACCFLAGS) $(EXPATCCFLAGS) -o $(COBEXLS) $(LSO) $(O2FILES)
+-
+-$(COBEXCAPA): $(O2FILES) $(CAPAO)
+-	$(CC) $(CCFLAGS) $(EXTRACCFLAGS) -o $(COBEXCAPA) $(CAPAO) $(O2FILES)
+-
+-$(COBEXMKDIR): $(O2FILES) $(MKDIRO)
+-	$(CC) $(CCFLAGS) $(EXTRACCFLAGS) -o $(COBEXMKDIR) $(MKDIRO) $(O2FILES)
+-
+-
+-test2: $(O2FILES) test2.o
+-	$(CC) $(CCFLAGS) $(EXTRACCFLAGS) $(EXPATCCFLAGS) -o test2 test2.o $(O2FILES)
+-
+-.c.o:
+-	$(CC) $(CCFLAGS) $(LOCKSERIAL) -c $<
+-
+-$(PUTO): put.c $(O2FILES)
+-
+-$(GETO): get.c $(O2FILES)
+-
+-$(LSO): ls.c $(O2FILES)
+-
+-$(RMO): rm.c $(O2FILES)
+-
+-test2.o: test2.c $(O2FILES)
+-
+-cobex_core.o: cobex_core.c cobex_core.h cobex_defs.h
+-
+-cobex_tools.o: cobex_tools.c cobex_tools.h cobex_defs.h cobex_core.c cobex_core.h
+-
+-cobex_serial.o: cobex_serial.c cobex_serial.h cobex_core.c cobex_core.h
++cobex_put:   $(O2FILES)
++cobex_get:   $(O2FILES)
++cobex_ls:    $(O2FILES)
++cobex_rm:    $(O2FILES)
++cobex_mkdir: $(O2FILES)
++cobex_capa:  $(O2FILES)
++
++cobex_ls: LDLIBS += -lexpat
++
++-include .depend
++.depend: $(CFILES) $(HFILES)
++	$(CC) -MM $^ > .depend
+ 
+ clean:
+-	rm -f *.o
+-	cd modeldb && make clean
++	rm -f *.o $(PROGS)
+ 
+ printfiles: $(CFILES) $(HFILES)
+ 	@echo $?
+@@ -88,3 +50,5 @@
+ 
+ dist-contrib :
+ 	cd contrib && make dist VERSION=$(VERSION)
++
++.PHONY: all clean dist dist2 dist-modeldb dist-contrib model printfiles
diff --git a/app-mobilephone/cobex/metadata.xml b/app-mobilephone/cobex/metadata.xml
new file mode 100644
index 000000000000..f39727f3d846
--- /dev/null
+++ b/app-mobilephone/cobex/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-needed -->
+	<upstream>
+		<remote-id type="sourceforge">cobex</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-mobilephone/dfu-util-0.9 b/app-mobilephone/dfu-util-0.9
deleted file mode 100644
index f06fb2ff9f41..000000000000
--- a/app-mobilephone/dfu-util-0.9
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=virtual/libusb:1 virtual/pkgconfig
-DESCRIPTION=implements the Host (PC) side of the USB DFU (Device Firmware Upgrade) protocol
-EAPI=6
-HOMEPAGE=http://dfu-util.sourceforge.net/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=virtual/libusb:1
-SLOT=0
-SRC_URI=mirror://sourceforge/dfu-util/dfu-util-0.9.tar.gz
-_md5_=78bc11a2105db3a9960aede6b6c85908
diff --git a/app-mobilephone/dfu-util-9999 b/app-mobilephone/dfu-util-9999
deleted file mode 100644
index 708d86a44be1..000000000000
--- a/app-mobilephone/dfu-util-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=prepare unpack
-DEPEND=virtual/libusb:1 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=implements the Host (PC) side of the USB DFU (Device Firmware Upgrade) protocol
-EAPI=6
-HOMEPAGE=http://dfu-util.sourceforge.net/
-LICENSE=GPL-2
-RDEPEND=virtual/libusb:1
-SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=edd1eefa3393642f54c8d5d4ea4429fd
diff --git a/app-mobilephone/dfu-util/Manifest b/app-mobilephone/dfu-util/Manifest
new file mode 100644
index 000000000000..0d92e3326cbf
--- /dev/null
+++ b/app-mobilephone/dfu-util/Manifest
@@ -0,0 +1,4 @@
+DIST dfu-util-0.9.tar.gz 138397 BLAKE2B e3a9db3276204d25fbcdd7d50caacd28a8e043d2781b5f942cd0df343d046870003abeaa1005a2774d03c4198ce96fa2124040987069c5f444e36e4f365a5e0e SHA512 caa7148b7a9004e2b1f7bc4f1a26b48abfe311743bc0eeed1ab57459910371affc39b6fe7e74b7cac6ca9de41a9901b7a970253ca92d7d66d5008f8a11d2c952
+EBUILD dfu-util-0.9.ebuild 611 BLAKE2B 1684c27777969c7aefefa831a4f93b1e58bee27042d2f57d026aaa3cc8a71597211fad44ee5b7763c22ba307bb6fac6b89318ccaf94998673eccc2f9e536774b SHA512 3df4947a9180bdd44cf3125dfa3d4f8cf4aed05b45397a7365a42de045dc7ed3ce12e2f6c1ae5f0fa5b317fcd0501ee8a40dae514af6baaae48df39cd9eea46f
+EBUILD dfu-util-9999.ebuild 613 BLAKE2B f36bfa2685a0c2ae90a0dae5df42f99a181c9314b4c8d952150e76c6144ecf174693157ee897b281213fb570aa085b8197e18b260a09bcbab8102d5664c2d068 SHA512 6cf5538e2f99326a922767631402887324a7395788bc3435ed410d65b8fa0735ac6fb9414e1ff61f8584f128ce1a992dc3ee1df4c97fb1cc540b7db1edd98727
+MISC metadata.xml 329 BLAKE2B 4785e0777c86743251036916ea3c691e828e772a2fd409b666e36607f96a096ae19b14ad6e70fccf55f0415c4d52f25754d597ddd8e11d2b40c73c487abc7fff SHA512 95b30bccd833523adaadcee075c48621d3d9e783a4c1c514711aa67697d2c2e5f8d773ac4760c95a9d92ba9b13d3df448202116696c412afd2a844ce7815f678
diff --git a/app-mobilephone/dfu-util/dfu-util-0.9.ebuild b/app-mobilephone/dfu-util/dfu-util-0.9.ebuild
new file mode 100644
index 000000000000..e0eaa1553ad5
--- /dev/null
+++ b/app-mobilephone/dfu-util/dfu-util-0.9.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.code.sf.net/p/dfu-util/dfu-util"
+	inherit autotools git-r3
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	KEYWORDS="amd64 x86"
+fi
+
+DESCRIPTION="implements the Host (PC) side of the USB DFU (Device Firmware Upgrade) protocol"
+HOMEPAGE="http://dfu-util.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="virtual/libusb:1"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	[[ ${PV} == "9999" ]] && eautoreconf
+}
diff --git a/app-mobilephone/dfu-util/dfu-util-9999.ebuild b/app-mobilephone/dfu-util/dfu-util-9999.ebuild
new file mode 100644
index 000000000000..9c3ac27b12b1
--- /dev/null
+++ b/app-mobilephone/dfu-util/dfu-util-9999.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.code.sf.net/p/dfu-util/dfu-util"
+	inherit autotools git-r3
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="implements the Host (PC) side of the USB DFU (Device Firmware Upgrade) protocol"
+HOMEPAGE="http://dfu-util.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="virtual/libusb:1"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	[[ ${PV} == "9999" ]] && eautoreconf
+}
diff --git a/app-mobilephone/dfu-util/metadata.xml b/app-mobilephone/dfu-util/metadata.xml
new file mode 100644
index 000000000000..e7237c8d32c6
--- /dev/null
+++ b/app-mobilephone/dfu-util/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">dfu-util</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-mobilephone/gammu-1.38.5 b/app-mobilephone/gammu-1.38.5
deleted file mode 100644
index ac2ab817e8ee..000000000000
--- a/app-mobilephone/gammu-1.38.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2= virtual/libgudev:= bluetooth? ( net-wireless/bluez:= ) curl? ( net-misc/curl:= ) dbi? ( >=dev-db/libdbi-0.8.3:= ) mysql? ( virtual/mysql:= ) postgres? ( dev-db/postgresql:= ) usb? ( virtual/libusb:1= ) irda? ( virtual/os-headers ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A tool to handle your cellular phone
-EAPI=6
-HOMEPAGE=https://wammu.eu/gammu/
-IUSE=bluetooth curl dbi debug irda mysql nls odbc postgres usb
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2= virtual/libgudev:= bluetooth? ( net-wireless/bluez:= ) curl? ( net-misc/curl:= ) dbi? ( >=dev-db/libdbi-0.8.3:= ) mysql? ( virtual/mysql:= ) postgres? ( dev-db/postgresql:= ) usb? ( virtual/libusb:1= ) dev-util/dialog virtual/libiconv
-SLOT=0
-SRC_URI=https://dl.cihar.com/gammu/releases/gammu-1.38.5.tar.bz2
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=576dfb7aaebef9bd486f533d99f1b68f
diff --git a/app-mobilephone/gammu-1.39.0 b/app-mobilephone/gammu-1.39.0
deleted file mode 100644
index 16de8fc20d40..000000000000
--- a/app-mobilephone/gammu-1.39.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2= virtual/libgudev:= bluetooth? ( net-wireless/bluez:= ) curl? ( net-misc/curl:= ) dbi? ( >=dev-db/libdbi-0.8.3:= ) mysql? ( virtual/mysql:= ) postgres? ( dev-db/postgresql:= ) usb? ( virtual/libusb:1= ) irda? ( virtual/os-headers ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A tool to handle your cellular phone
-EAPI=6
-HOMEPAGE=https://wammu.eu/gammu/
-IUSE=bluetooth curl dbi debug irda mysql nls odbc postgres usb
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2= virtual/libgudev:= bluetooth? ( net-wireless/bluez:= ) curl? ( net-misc/curl:= ) dbi? ( >=dev-db/libdbi-0.8.3:= ) mysql? ( virtual/mysql:= ) postgres? ( dev-db/postgresql:= ) usb? ( virtual/libusb:1= ) dev-util/dialog virtual/libiconv
-SLOT=0
-SRC_URI=https://dl.cihar.com/gammu/releases/gammu-1.39.0.tar.bz2
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f0ed962562e235efbb7c0b4f79c0f70d
diff --git a/app-mobilephone/gammu/Manifest b/app-mobilephone/gammu/Manifest
new file mode 100644
index 000000000000..210e1fc835cd
--- /dev/null
+++ b/app-mobilephone/gammu/Manifest
@@ -0,0 +1,5 @@
+DIST gammu-1.38.5.tar.bz2 2138742 BLAKE2B 7a72a7b67475f73dc3580d618dee379893dc82d7950599b41ed1f7efb5fecd80af3a42a0cc0742cb73d055a4a778eaa4d42037c5be74d9b61a4b53cfe827bd00 SHA512 89a6b3872dfd9b4ebaf8b0f51265fec7e7ef72a42178f85846c7f52d926e96b3087bbe6650c4246e66c2624822021c5803b1bb6ca8ac90f3e5c109a644c0ee80
+DIST gammu-1.39.0.tar.bz2 2151226 BLAKE2B 0e9b7a3f5321a166bbafe833134f49ac8dc93a68c5522be1c16e5ceb894cb242b644761a90188fbc9fa9dd62bde51828a72b29d09fc37b2aa2911d301dffac39 SHA512 ed8994f6ec25d8ddbed23680e8a02db05c8e7f85aa6b8c0d409b5e8377e7c9e07fc61e62d80f6741d648709fb58a10ec631155d8b1ffc1c7d3b6e425cf53c797
+EBUILD gammu-1.38.5.ebuild 1370 BLAKE2B 186baca896540594587219a137c496337f85b4270f584d52e2ce6e19969a85c2ca86c93dc55912a788d4c76a4b7a816deca6b6cb3360068644a77e0eba5708c4 SHA512 c6c481ab7206162e59734f04e2c6c5ccf0d9ab27d1de7750b02d89189d71a62db249bc45a0b875a57e9d046f2dd27ccee0be87e4ea2925306e6db81434832c82
+EBUILD gammu-1.39.0.ebuild 1359 BLAKE2B e8ded6da0e4c2b666a2b92c398576b43b82d9fa6376c9bd93644b377bf52a64ad181ba470cef61a93f594d2824e66003cbdaafa0bdbfb430d294ebc09d1fd148 SHA512 dee8d1a1b6197157649d57a8d1e1f6b249e5e03f28916facf0e918fe3eb0dd912bc50f477ba2a04d6c5637bfeb69268e53bc5341fc3eb8bb233d01cc18b10d4f
+MISC metadata.xml 981 BLAKE2B 6918eb352c71db64a9ca356408687888123437160f3cf190e0fca10aa31e614b67aad461884fe7f562a036e8ffe500c49e78afa2ab9070e2a32141adf9a55d21 SHA512 9e50aa06f539259b2f8e5eb8c2b8114435e37a4d84965b86c0629d4933d4dd6a3c1e4e62b7dc5c0e653e3194d5ac0fe50bc7b95b26d0ccea5c02e79d19163595
diff --git a/app-mobilephone/gammu/gammu-1.38.5.ebuild b/app-mobilephone/gammu/gammu-1.38.5.ebuild
new file mode 100644
index 000000000000..2bbb2d63491a
--- /dev/null
+++ b/app-mobilephone/gammu/gammu-1.38.5.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="A tool to handle your cellular phone"
+HOMEPAGE="https://wammu.eu/gammu/"
+SRC_URI="https://dl.cihar.com/${PN}/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="bluetooth curl dbi debug irda mysql nls odbc postgres usb"
+
+COMMON_DEPEND="
+	dev-libs/glib:2=
+	virtual/libgudev:=
+	bluetooth? ( net-wireless/bluez:= )
+	curl? ( net-misc/curl:= )
+	dbi? ( >=dev-db/libdbi-0.8.3:= )
+	mysql? ( virtual/mysql:= )
+	postgres? ( dev-db/postgresql:= )
+	usb? ( virtual/libusb:1= )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	irda? ( virtual/os-headers )
+	nls? ( sys-devel/gettext )
+	odbc? ( dev-db/unixODBC )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	dev-util/dialog
+	virtual/libiconv
+"
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_BLUETOOTH=$(usex bluetooth)
+		-DWITH_CURL=$(usex curl)
+		-DWITH_Gettext=$(usex nls)
+		-DWITH_Iconv=$(usex nls)
+		-DWITH_IRDA=$(usex irda)
+		-DWITH_LibDBI=$(usex dbi)
+		-DWITH_MySQL=$(usex mysql)
+		-DWITH_ODBC=$(usex odbc)
+		-DWITH_Postgres=$(usex postgres)
+		-DWITH_USB=$(usex usb)
+		-DBUILD_SHARED_LIBS=ON
+		-DINSTALL_DOC_DIR="share/doc/${PF}"
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	addwrite "/run/lock/LCK..bar"
+	MAKEOPTS+=" -j1" LD_LIBRARY_PATH="${BUILD_DIR}/libgammu" cmake-utils_src_test
+}
diff --git a/app-mobilephone/gammu/gammu-1.39.0.ebuild b/app-mobilephone/gammu/gammu-1.39.0.ebuild
new file mode 100644
index 000000000000..d33aa0433469
--- /dev/null
+++ b/app-mobilephone/gammu/gammu-1.39.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="A tool to handle your cellular phone"
+HOMEPAGE="https://wammu.eu/gammu/"
+SRC_URI="https://dl.cihar.com/${PN}/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluetooth curl dbi debug irda mysql nls odbc postgres usb"
+
+COMMON_DEPEND="
+	dev-libs/glib:2=
+	virtual/libgudev:=
+	bluetooth? ( net-wireless/bluez:= )
+	curl? ( net-misc/curl:= )
+	dbi? ( >=dev-db/libdbi-0.8.3:= )
+	mysql? ( virtual/mysql:= )
+	postgres? ( dev-db/postgresql:= )
+	usb? ( virtual/libusb:1= )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	irda? ( virtual/os-headers )
+	nls? ( sys-devel/gettext )
+	odbc? ( dev-db/unixODBC )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	dev-util/dialog
+	virtual/libiconv
+"
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_BLUETOOTH=$(usex bluetooth)
+		-DWITH_CURL=$(usex curl)
+		-DWITH_Gettext=$(usex nls)
+		-DWITH_Iconv=$(usex nls)
+		-DWITH_IRDA=$(usex irda)
+		-DWITH_LibDBI=$(usex dbi)
+		-DWITH_MySQL=$(usex mysql)
+		-DWITH_ODBC=$(usex odbc)
+		-DWITH_Postgres=$(usex postgres)
+		-DWITH_USB=$(usex usb)
+		-DBUILD_SHARED_LIBS=ON
+		-DINSTALL_DOC_DIR="share/doc/${PF}"
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	addwrite "/run/lock/LCK..bar"
+	LD_LIBRARY_PATH="${BUILD_DIR}/libgammu" cmake-utils_src_test -j1
+}
diff --git a/app-mobilephone/gammu/metadata.xml b/app-mobilephone/gammu/metadata.xml
new file mode 100644
index 000000000000..c54023b89998
--- /dev/null
+++ b/app-mobilephone/gammu/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>coyote@bks.tv</email>
+        <name>Victor Kustov</name>
+    </maintainer>
+    <maintainer type="project">
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
+    <use>
+        <flag name="bluetooth">Enables bluetooth support</flag>
+        <flag name="curl">Enables curl support</flag>
+        <flag name="irda">Enables infrared support</flag>
+        <flag name="nls">Enable native language support</flag>
+        <flag name="mysql">Use mysql for data storage</flag>
+        <flag name="odbc">Use ODBC as DB connector</flag>
+        <flag name="postgres">Use PostgreSQL for data storage</flag>
+        <flag name="usb">Enable USB suport</flag>
+    </use>
+    <upstream>
+        <remote-id type="github">gammu/gammu</remote-id>
+    </upstream>
+</pkgmetadata>
diff --git a/app-mobilephone/ganyremote-6.3.3 b/app-mobilephone/ganyremote-6.3.3
deleted file mode 100644
index b03dbd34875a..000000000000
--- a/app-mobilephone/ganyremote-6.3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=app-mobilephone/anyremote-6.5[bluetooth=] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] bluetooth? ( dev-python/pybluez[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/gettext >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Gnome frontend to Anyremote
-EAPI=5
-HOMEPAGE=http://anyremote.sourceforge.net/
-IUSE=bluetooth python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=app-mobilephone/anyremote-6.5[bluetooth=] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] bluetooth? ( dev-python/pybluez[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/anyremote/ganyremote-6.3.3.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=88af7d42da1162fd85d4ba9dc8207565
diff --git a/app-mobilephone/ganyremote/Manifest b/app-mobilephone/ganyremote/Manifest
new file mode 100644
index 000000000000..8b8515b351b0
--- /dev/null
+++ b/app-mobilephone/ganyremote/Manifest
@@ -0,0 +1,3 @@
+DIST ganyremote-6.3.3.tar.gz 303612 BLAKE2B 4865e6e4cb94e380e3bea3a4d27eb6ed60d8455bad3b530167a0e1a2aae458e5ead602869f4fba1917bc9887fec7e96393a694a48482fa339abddce48a506e24 SHA512 cfb0d5896c3c4ee575f2d77d17b8f8e13624202100994415147f1ddb2b6c04c179ec4a4b31369830705ae1d0068e50fe0c3a5fd4acc2de6e02ec0a530a0a6182
+EBUILD ganyremote-6.3.3.ebuild 1371 BLAKE2B 79584321fb6bbd5ab7e51401a60b4c87f8cb6eaf2f72c16686dd7031a60ae00c5409966524ded2739c69f8ca24dd476348284b0657356189b0293817dd319706 SHA512 611638025d469c5e66550016adf854c8fdd30cbfc04dbf56230a8b688a29e3c8ced554e60078db5a2e8dec1e44946f45fa3fe91924b46f20358ff44b5c8d3520
+MISC metadata.xml 246 BLAKE2B 68a1356ab3fd727f1ee98428a5d8edc3452c6d510f8d57cecea1b5cf36a2e0dc40b8b32be858421e041e6d2a18d9aebebbbd4c5d59c2ec560b3e36bc34d3c6aa SHA512 d2929e6457c8072e70cff695c72e7f8e0ee0aa0c10f9850143dc37a05df7af66abdc579ceb750b7e3d8bec5ed246744e42501e66058b4bbd5ebbefcffbb6156a
diff --git a/app-mobilephone/ganyremote/ganyremote-6.3.3.ebuild b/app-mobilephone/ganyremote/ganyremote-6.3.3.ebuild
new file mode 100644
index 000000000000..d401aa4313b2
--- /dev/null
+++ b/app-mobilephone/ganyremote/ganyremote-6.3.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit autotools python-r1
+
+DESCRIPTION="Gnome frontend to Anyremote"
+HOMEPAGE="http://anyremote.sourceforge.net/"
+SRC_URI="mirror://sourceforge/anyremote/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="bluetooth"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=app-mobilephone/anyremote-6.5[bluetooth=]
+	dev-python/pygtk[${PYTHON_USEDEP}]
+	bluetooth? ( dev-python/pybluez[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_prepare() {
+	# using gettextize no-interactive example from dev-util/bless package
+	cp $(type -p gettextize) "${T}"/ || die
+	sed -i -e 's:read dummy < /dev/tty::' "${T}/gettextize" || die
+	"${T}"/gettextize -f --no-changelog > /dev/null || die
+
+	# remove deprecated entry
+	sed -e "/Encoding=UTF-8/d" \
+		-i ganyremote.desktop || die "fixing .desktop file failed"
+
+	# fix documentation directory wrt bug #316087
+	sed -i "s/doc\/${PN}/doc\/${PF}/g" Makefile.am || die
+	eautoreconf
+
+	# disable bluetooth check to avoid errors
+	if ! use bluetooth ; then
+		sed -e "s/usepybluez = True/usepybluez = False/" -i ganyremote || die
+	fi
+}
+
+src_install() {
+	default
+
+	python_replicate_script "${D}"/usr/bin/ganyremote
+}
diff --git a/app-mobilephone/ganyremote/metadata.xml b/app-mobilephone/ganyremote/metadata.xml
new file mode 100644
index 000000000000..2df201a28b67
--- /dev/null
+++ b/app-mobilephone/ganyremote/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-needed -->
+	<upstream>
+		<remote-id type="sourceforge">anyremote</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-mobilephone/gnocky-0.0.7 b/app-mobilephone/gnocky-0.0.7
deleted file mode 100644
index 84610bb4678d..000000000000
--- a/app-mobilephone/gnocky-0.0.7
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=app-mobilephone/gnokii dev-libs/glib:2 gnome-base/libglade:2.0 x11-libs/gtk+:2 virtual/pkgconfig
-DESCRIPTION=GTK-2 version of gnokii
-EAPI=5
-HOMEPAGE=http://www.gnokii.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-mobilephone/gnokii dev-libs/glib:2 gnome-base/libglade:2.0 x11-libs/gtk+:2
-SLOT=0
-SRC_URI=http://www.gnokii.org/download/gnocky/gnocky-0.0.7.tar.bz2
-_md5_=840d7047ceb53a15d4d64fa77737ba15
diff --git a/app-mobilephone/gnocky/Manifest b/app-mobilephone/gnocky/Manifest
new file mode 100644
index 000000000000..9c0ee4ef5726
--- /dev/null
+++ b/app-mobilephone/gnocky/Manifest
@@ -0,0 +1,3 @@
+DIST gnocky-0.0.7.tar.bz2 569945 BLAKE2B 581e79d0126a12d3a24efd8abc4e22e0ac6195ef90143b27aedd2b14b8389b539d90b1e56d5b87bd05dd090df73477d248ef0156d4318f4860153bef69a0c126 SHA512 a4387c68bc7c3e59f122be87b5b68ec7cae9016039fb1f76c8ebfbe421bcf2399ba93419a2d27c61afe937f580dd7e9bff14f4b803bee70aa60c95c7d0f6ad53
+EBUILD gnocky-0.0.7.ebuild 424 BLAKE2B ced3c83f801600fb684637a86e191ad6532dd513f554ca139dd48f8375412562c4bfe6c9bf3a80877e11fa01111d40e09cbe5181a630282b73ba8ae80aaa6e02 SHA512 29b47e1b7f55010b6526bad7f198fd62c95c106021d3bcbea174436a41ce706f31ed5b50d836a5f7dde72b0856640d0baf01b13e375ffd8c8485072f8eec806f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-mobilephone/gnocky/gnocky-0.0.7.ebuild b/app-mobilephone/gnocky/gnocky-0.0.7.ebuild
new file mode 100644
index 000000000000..db68d7f735f3
--- /dev/null
+++ b/app-mobilephone/gnocky/gnocky-0.0.7.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="GTK-2 version of gnokii"
+HOMEPAGE="http://www.gnokii.org/"
+SRC_URI="${HOMEPAGE}download/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-mobilephone/gnokii
+	dev-libs/glib:2
+	gnome-base/libglade:2.0
+	x11-libs/gtk+:2
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
diff --git a/app-mobilephone/gnocky/metadata.xml b/app-mobilephone/gnocky/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-mobilephone/gnocky/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-mobilephone/gnokii-0.6.31-r1 b/app-mobilephone/gnokii-0.6.31-r1
deleted file mode 100644
index 427d46420069..000000000000
--- a/app-mobilephone/gnokii-0.6.31-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=!app-mobilephone/smstools bluetooth? ( kernel_linux? ( net-wireless/bluez ) ) ical? ( dev-libs/libical:= ) pcsc-lite? ( sys-apps/pcsc-lite ) sms? ( dev-libs/glib:2 postgres? ( dev-db/postgresql:* ) mysql? ( virtual/mysql:= ) ) usb? ( virtual/libusb:0 ) X? ( x11-libs/gtk+:2 ) dev-util/intltool irda? ( virtual/os-headers ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=User space driver and tools for use with mobile phones
-EAPI=6
-HOMEPAGE=http://www.gnokii.org/
-IUSE=bluetooth debug ical irda mysql nls +pcsc-lite postgres sms usb X kernel_linux
-KEYWORDS=amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=!app-mobilephone/smstools bluetooth? ( kernel_linux? ( net-wireless/bluez ) ) ical? ( dev-libs/libical:= ) pcsc-lite? ( sys-apps/pcsc-lite ) sms? ( dev-libs/glib:2 postgres? ( dev-db/postgresql:* ) mysql? ( virtual/mysql:= ) ) usb? ( virtual/libusb:0 ) X? ( x11-libs/gtk+:2 )
-SLOT=0
-SRC_URI=http://www.gnokii.org/download/gnokii/gnokii-0.6.31.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e3b2a16259100547c759e314f3a22d7b
diff --git a/app-mobilephone/gnokii-9999 b/app-mobilephone/gnokii-9999
deleted file mode 100644
index 65350e789761..000000000000
--- a/app-mobilephone/gnokii-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup test unpack
-DEPEND=!app-mobilephone/smstools bluetooth? ( kernel_linux? ( net-wireless/bluez ) ) ical? ( dev-libs/libical:= ) pcsc-lite? ( sys-apps/pcsc-lite ) sms? ( dev-libs/glib:2 postgres? ( dev-db/postgresql:* ) mysql? ( virtual/mysql:= ) ) usb? ( virtual/libusb:0 ) X? ( x11-libs/gtk+:2 ) dev-util/intltool irda? ( virtual/os-headers ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=User space driver and tools for use with mobile phones
-EAPI=6
-HOMEPAGE=http://www.gnokii.org/
-IUSE=bluetooth debug ical irda mysql nls +pcsc-lite postgres sms usb X kernel_linux
-LICENSE=GPL-2
-RDEPEND=!app-mobilephone/smstools bluetooth? ( kernel_linux? ( net-wireless/bluez ) ) ical? ( dev-libs/libical:= ) pcsc-lite? ( sys-apps/pcsc-lite ) sms? ( dev-libs/glib:2 postgres? ( dev-db/postgresql:* ) mysql? ( virtual/mysql:= ) ) usb? ( virtual/libusb:0 ) X? ( x11-libs/gtk+:2 )
-SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=af1ad7b144d0b22fabadcc237e14e085
diff --git a/app-mobilephone/gnokii/Manifest b/app-mobilephone/gnokii/Manifest
new file mode 100644
index 000000000000..347e2a654ab6
--- /dev/null
+++ b/app-mobilephone/gnokii/Manifest
@@ -0,0 +1,9 @@
+AUX gnokii-0.6.31-fix_xgnokii_inclusion.patch 260 BLAKE2B 7f681ed48bcf8f8cb5b07e9d1208f3a98fc0006f8a436aa160387f3de6b6a49f488028cf0d818e9d29dc1ffbe9c28368641965685a18ddb6743ed61611dab0b7 SHA512 e23b72af4d51c7691b56beab15b36e275e6ea1fb8599d1cee4be98570caf0c9434b2cd61fd3879c41adb219c7ab9b41bd794df27d9be97bb38b3799427039393
+AUX gnokii-0.6.31-gcc5.patch 863 BLAKE2B 4d018cbdc5e071e05811f41db3b0ae936268192978f0588b9e0d6dad4aebdb086d23d1f42bc4c6f878eabef7451e3a5b1d687cd5d989b4c5f9581497b2a0396f SHA512 548a32f93b059e45c8616dedf49a0ce3b0e63463f8ddc3384b473d91bd12c3fab2c6e21de0b09d2b330c189454a2bf3e486aa25122ea58392d9cb11994592086
+AUX gnokii-0.6.31-gcc7.patch 830 BLAKE2B 308123e9f4a341a9ec1b2dd90e6c88b9ba9f2d8bc1114057ed8b0675152ca340cedd4ecc4e6859f84b537ff86c04a193dd24816ce33ed08a1cb3649a7358b138 SHA512 6c6a106d9a0bfd20d35d5ae73537aa3409a721989fc450a315720a11f79c771de077af86434003284c9a187cfd17e9cc6766d8f4db4ccf496a30596ac59b7d8d
+AUX gnokii-9999-icon.patch 239 BLAKE2B 17253cc10ccb2b7520c0967821e4a57f56e2292d2d8692cf5879f3b3b0f5304dba257a56dc3c45b920c29b5fbda120daa7bbd3135f9a53880e09447580fd320b SHA512 11ecd345c1bd93a8c0f316b411106bc22c5fecff2a848d075e9feb1bd1581a255dbf5a7eaa7fc525325af9b1c7d90736a7b58104f870f3d7ec329ea0b43c2dc3
+AUX gnokii-9999-translations.patch 196 BLAKE2B e703e57517f370852858bbe945be12697a249dc9743bce5f05b0f3ac1a04bc5c48d16217b7f2f0ef89ed0930cbadff2d758b6407a16bb1d785d329d1a47afc13 SHA512 ac167f1d93abf9ed00cd4761ae3b86fdfda33ec5690bf1c0c62a136fe09d0f57dd0d3abe172a3adafb499cc01655995111bc84343932bc6054d45a8e70097af6
+DIST gnokii-0.6.31.tar.bz2 1237865 BLAKE2B d94c5d44e7075b875037c55448b63c76a27116ad09eeb3c450597d6d65d0cabae65aefc904dcdd868b30fbd17989ce50aecfb2d08dce8ac55e36d1976f0b61da SHA512 529f6d0d29873f48ac00cf7151ba35dcbd93405ab27d69848ed17dea73f4fba71721d1811d921441b4214777b9b33f760b372631627cc108eb94c39684da343d
+EBUILD gnokii-0.6.31-r1.ebuild 3406 BLAKE2B 05dc21f33f49a26ad64e97dcef8a5664dd5c041e539bd1c52a0a46a4fcdaed78b894e842a4c14dc622b9293a4d0d04c7c05cd1e2d7c63b29e4b163b99471690e SHA512 ee152a9844dc03bf2a006183eef4a494ea98845a56029d4d0aa2ee78355ccac732c3aad6a39953c99fcf6ae1e023bc90b22048b56c29c498152f9b238637630a
+EBUILD gnokii-9999.ebuild 3329 BLAKE2B 86eec528c3dc6ad9e9209d4c6519fe2ad7d5af43c4c72c7b1312330e4c983ce76e9b4292ef40e6e4b3f8f06f1286a6ad3eda95988bcfbc246862d2e4114497bb SHA512 1521e6f7baffbcbbc11d3ed499134ab7f56ece40c809853d03e07f12b77dd6a4d02ef8c001fffcc711d026920f0b5ddc0a0bc8f5058296c75a132e84cc5fca6a
+MISC metadata.xml 756 BLAKE2B 840e51ec7099b1ae34694dfa328d908147c90a32689165201a98bbc6559c1d6db8c63dffc0264210203775ba502d1c64d3245b32c4def375abf7a7685539c458 SHA512 7fbdd7684cd7810fe6114146a3378c346ca8d01df54adbbea292b0727fb039d5ceec29e4a5fd4d3031c17f9f229a4de0d635ae23e57eb507103255ebcb057983
diff --git a/app-mobilephone/gnokii/files/gnokii-0.6.31-fix_xgnokii_inclusion.patch b/app-mobilephone/gnokii/files/gnokii-0.6.31-fix_xgnokii_inclusion.patch
new file mode 100644
index 000000000000..243f78174a0f
--- /dev/null
+++ b/app-mobilephone/gnokii/files/gnokii-0.6.31-fix_xgnokii_inclusion.patch
@@ -0,0 +1,11 @@
+--- a/configure.in
++++ b/configure.in
+@@ -689,7 +689,7 @@
+    fi
+ fi
+ 
+-AM_CONDITIONAL(XGNOKII, test "x$_support" = "xyes")
++AM_CONDITIONAL(XGNOKII, test "x$x_support" = "xyes")
+ 
+ dnl ======================== Check for libsocket
+ AC_CHECK_LIB(socket, socket)
diff --git a/app-mobilephone/gnokii/files/gnokii-0.6.31-gcc5.patch b/app-mobilephone/gnokii/files/gnokii-0.6.31-gcc5.patch
new file mode 100644
index 000000000000..09b65f5b0f81
--- /dev/null
+++ b/app-mobilephone/gnokii/files/gnokii-0.6.31-gcc5.patch
@@ -0,0 +1,27 @@
+Patch by Robert Scheck <robert@fedoraproject.org> for gnokii <= 0.6.31 to avoid
+build failures with GCC 5.x as "gnokii-0.6.31/xgnokii/xgnokii.c:1209: undefined
+reference to `GUI_HideAbout'" and "xgnokii-xgnokii_logos.o:(.data.rel+0xe0):
+undefined reference to `CloseLogosWindow'".
+
+--- gnokii-0.6.31/xgnokii/xgnokii.c		2011-12-02 15:53:04.000000000 +0100
++++ gnokii-0.6.31/xgnokii/xgnokii.c.gcc5	2015-06-20 15:49:59.000000000 +0200
+@@ -798,7 +798,7 @@
+ }
+ 
+ 
+-inline void GUI_HideAbout(void)
++void GUI_HideAbout(void)
+ {
+ 	gtk_widget_hide(AboutDialog);
+ }
+--- gnokii-0.6.31/xgnokii/xgnokii_logos.c	2011-12-02 15:53:04.000000000 +0100
++++ gnokii-0.6.31/xgnokii/xgnokii_logos.c.gcc5	2015-06-20 15:50:15.000000000 +0200
+@@ -1304,7 +1304,7 @@
+ 	return 0;
+ }
+ 
+-inline void CloseLogosWindow(void)
++void CloseLogosWindow(void)
+ {
+ 	gtk_widget_hide(GUI_LogosWindow);
+ }
diff --git a/app-mobilephone/gnokii/files/gnokii-0.6.31-gcc7.patch b/app-mobilephone/gnokii/files/gnokii-0.6.31-gcc7.patch
new file mode 100644
index 000000000000..6637a6af62c4
--- /dev/null
+++ b/app-mobilephone/gnokii/files/gnokii-0.6.31-gcc7.patch
@@ -0,0 +1,17 @@
+Patch by Robert Scheck <robert@fedoraproject.org> for gnokii <= 0.6.31 to avoid
+build failures with GCC 7.x as "../common/.libs/libgnokii.so: undefined reference
+to `local_atoi'". The "inline" is only a hint that the compiler doesn't complain
+about double defined symbols, but does not guarantee that a function is inlined
+or that a symbol is generated when needed.
+
+--- gnokii-0.6.31/common/gsm-filetypes.c	2011-12-02 15:53:04.000000000 +0100
++++ gnokii-0.6.31/common/gsm-filetypes.c.gcc7	2017-02-12 00:55:39.000000000 +0100
+@@ -1409,7 +1409,7 @@
+ #define GET_NEXT_TOKEN()	o = get_next_token(line + offset, ';')
+ #define STORE_TOKEN(a)		strip_slashes(a, line + offset, sizeof(a) - 1, o - 1)
+ 
+-inline int local_atoi(char *str, int len)
++static int local_atoi(char *str, int len)
+ {
+ 	int retval;
+ 	char *aux = strndup(str, len);
diff --git a/app-mobilephone/gnokii/files/gnokii-9999-icon.patch b/app-mobilephone/gnokii/files/gnokii-9999-icon.patch
new file mode 100644
index 000000000000..13ca2cf6e4ce
--- /dev/null
+++ b/app-mobilephone/gnokii/files/gnokii-9999-icon.patch
@@ -0,0 +1,11 @@
+--- a/xgnokii/xgnokii.desktop.in
++++ b/xgnokii/xgnokii.desktop.in
+@@ -2,7 +2,7 @@
+ _Name=Xgnokii
+ _GenericName=Mobile Phone Suite
+ _Comment=Manage your mobile phone
+-Icon=phone
++Icon=xgnokii
+ Exec=xgnokii
+ Terminal=false
+ Type=Application
diff --git a/app-mobilephone/gnokii/files/gnokii-9999-translations.patch b/app-mobilephone/gnokii/files/gnokii-9999-translations.patch
new file mode 100644
index 000000000000..2f61cc222738
--- /dev/null
+++ b/app-mobilephone/gnokii/files/gnokii-9999-translations.patch
@@ -0,0 +1,10 @@
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -57,6 +57,7 @@
+ smsd/pq.c
+ smsd/smsd.c
+ smsd/sqlite.c
++utils/gnokii-configure.glade
+ utils/mgnokiidev.c
+ xgnokii/xgnokii.c
+ xgnokii/xgnokii_calendar.c
diff --git a/app-mobilephone/gnokii/gnokii-0.6.31-r1.ebuild b/app-mobilephone/gnokii/gnokii-0.6.31-r1.ebuild
new file mode 100644
index 000000000000..021722efb00e
--- /dev/null
+++ b/app-mobilephone/gnokii/gnokii-0.6.31-r1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils linux-info
+
+HOMEPAGE="http://www.gnokii.org/"
+if [[ $PV == *9999 ]]; then
+	EGIT_REPO_URI="
+		git://git.savannah.nongnu.org/${PN}.git
+		http://git.savannah.gnu.org/r/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="http://www.gnokii.org/download/${PN}/${P}.tar.bz2"
+	KEYWORDS="amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+fi
+DESCRIPTION="User space driver and tools for use with mobile phones"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="bluetooth debug ical irda mysql nls +pcsc-lite postgres sms usb X"
+
+RDEPEND="
+	!app-mobilephone/smstools
+	bluetooth? ( kernel_linux? ( net-wireless/bluez ) )
+	ical? ( dev-libs/libical:= )
+	pcsc-lite? ( sys-apps/pcsc-lite )
+	sms? (
+		dev-libs/glib:2
+		postgres? ( dev-db/postgresql:* )
+		mysql? ( virtual/mysql:= )
+	)
+	usb? ( virtual/libusb:0 )
+	X? ( x11-libs/gtk+:2 )
+"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	irda? ( virtual/os-headers )
+	nls? ( sys-devel/gettext )
+"
+
+CONFIG_CHECK="~UNIX98_PTYS"
+
+S="${WORKDIR}/${PN}-${PV%.1}"
+
+# Supported languages and translated documentation
+# Be sure all languages are prefixed with a single space!
+MY_AVAILABLE_LINGUAS=" cs de et fi fr it nl pl pt sk sl sv zh_CN"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix_xgnokii_inclusion.patch
+	"${FILESDIR}"/${P}-gcc5.patch
+	"${FILESDIR}"/${P}-gcc7.patch
+)
+
+src_prepare() {
+	[[ $PV == *9999 ]] && \
+		PATCHES=(
+			"${FILESDIR}"/${P}-icon.patch
+			"${FILESDIR}"/${P}-translations.patch
+		)
+
+	sed -i -e "s:/usr/local:${EPREFIX}/usr:" Docs/sample/gnokiirc || die
+
+	default
+	mv configure.{in,ac} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	strip-linguas ${MY_AVAILABLE_LINGUAS}
+
+	local config_xdebug
+	if use X && use debug; then
+		config_xdebug="--enable-xdebug"
+	else
+		config_xdebug="--disable-xdebug"
+	fi
+
+	econf \
+		--disable-static \
+		--enable-security \
+		--disable-unix98test \
+		$(use_enable bluetooth) \
+		${config_xdebug} \
+		$(use_enable debug fulldebug) \
+		$(use_enable debug rlpdebug) \
+		$(use_enable ical libical) \
+		$(use_enable irda) \
+		$(use_enable mysql) \
+		$(use_enable nls) \
+		$(use_enable pcsc-lite libpcsclite) \
+		$(use_enable postgres) \
+		$(use_enable sms smsd) \
+		$(use_enable usb libusb) \
+		$(use_with X x)
+}
+
+src_test() {
+	echo common/phones/fake.c >> po/POTFILES.in || die
+	default
+}
+
+src_install() {
+	default
+
+	# package provides .pc files
+	find "${D}" -name '*.la' -delete || die
+
+	insinto /etc
+	doins Docs/sample/gnokiirc
+
+	# only one file needs suid root to make a pseudo device
+	fperms 4755 /usr/sbin/mgnokiidev
+
+	use X && newicon Docs/sample/logo/gnokii.xpm xgnokii.xpm
+
+	if use sms; then
+		cd smsd || die
+
+		docinto smsd
+		use mysql && dodoc sms.tables.mysql.sql README.MySQL
+		use postgres && dodoc sms.tables.pq.sql
+		dodoc README ChangeLog README.Tru64 action
+	fi
+}
+
+pkg_postinst() {
+	elog "Make sure the user that runs gnokii has read/write access to the device"
+	elog "which your phone is connected to."
+	elog "The simple way of doing that is to add your user to the uucp group."
+	if [[ $PV == *9999 ]]; then
+		elog "This is the GIT version of ${PN}. It is experimental but may have important bug fixes."
+		elog "You can keep track of the most recent commits at:"
+		elog "    http://git.savannah.gnu.org/cgit/gnokii.git/"
+		elog "Whenever there is a change you are interested in, you can re-emerge ${P}."
+	fi
+}
diff --git a/app-mobilephone/gnokii/gnokii-9999.ebuild b/app-mobilephone/gnokii/gnokii-9999.ebuild
new file mode 100644
index 000000000000..af17537e188b
--- /dev/null
+++ b/app-mobilephone/gnokii/gnokii-9999.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils linux-info
+
+HOMEPAGE="http://www.gnokii.org/"
+if [[ $PV == *9999 ]]; then
+	EGIT_REPO_URI="
+		git://git.savannah.nongnu.org/${PN}.git
+		http://git.savannah.gnu.org/r/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="http://www.gnokii.org/download/${PN}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+fi
+DESCRIPTION="User space driver and tools for use with mobile phones"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="bluetooth debug ical irda mysql nls +pcsc-lite postgres sms usb X"
+
+RDEPEND="
+	!app-mobilephone/smstools
+	bluetooth? ( kernel_linux? ( net-wireless/bluez ) )
+	ical? ( dev-libs/libical:= )
+	pcsc-lite? ( sys-apps/pcsc-lite )
+	sms? (
+		dev-libs/glib:2
+		postgres? ( dev-db/postgresql:* )
+		mysql? ( virtual/mysql:= )
+	)
+	usb? ( virtual/libusb:0 )
+	X? ( x11-libs/gtk+:2 )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	irda? ( virtual/os-headers )
+	nls? ( sys-devel/gettext )"
+
+CONFIG_CHECK="~UNIX98_PTYS"
+
+S="${WORKDIR}/${PN}-${PV%.1}"
+
+# Supported languages and translated documentation
+# Be sure all languages are prefixed with a single space!
+MY_AVAILABLE_LINGUAS=" cs de et fi fr it nl pl pt sk sl sv zh_CN"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix_xgnokii_inclusion.patch
+	"${FILESDIR}"/${P}-gcc5.patch
+)
+
+src_prepare() {
+	[[ $PV == *9999 ]] && \
+		PATCHES=(
+			"${FILESDIR}"/${P}-icon.patch
+			"${FILESDIR}"/${P}-translations.patch
+		)
+
+	sed -i -e "s:/usr/local:${EPREFIX}/usr:" Docs/sample/gnokiirc || die
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	strip-linguas ${MY_AVAILABLE_LINGUAS}
+
+	local config_xdebug
+	if use X && use debug; then
+		config_xdebug="--enable-xdebug"
+	else
+		config_xdebug="--disable-xdebug"
+	fi
+
+	econf \
+		--disable-static \
+		--disable-unix98test \
+		$(use_enable bluetooth) \
+		${config_xdebug} \
+		$(use_enable debug fulldebug) \
+		$(use_enable debug rlpdebug) \
+		$(use_enable ical libical) \
+		$(use_enable irda) \
+		$(use_enable mysql) \
+		$(use_enable nls) \
+		$(use_enable pcsc-lite libpcsclite) \
+		$(use_enable postgres) \
+		$(use_enable sms smsd) \
+		$(use_enable usb libusb) \
+		$(use_with X x)
+}
+
+src_test() {
+	echo common/phones/fake.c >> po/POTFILES.in || die
+	default
+}
+
+src_install() {
+	default
+
+	# package provides .pc files
+	find "${D}" -name '*.la' -delete || die
+
+	insinto /etc
+	doins Docs/sample/gnokiirc
+
+	# only one file needs suid root to make a pseudo device
+	fperms 4755 /usr/sbin/mgnokiidev
+
+	use X && newicon Docs/sample/logo/gnokii.xpm xgnokii.xpm
+
+	if use sms; then
+		cd smsd || die
+
+		docinto smsd
+		use mysql && dodoc sms.tables.mysql.sql README.MySQL
+		use postgres && dodoc sms.tables.pq.sql
+		dodoc README ChangeLog README.Tru64 action
+	fi
+}
+
+pkg_postinst() {
+	elog "Make sure the user that runs gnokii has read/write access to the device"
+	elog "which your phone is connected to."
+	elog "The simple way of doing that is to add your user to the uucp group."
+	if [[ $PV == *9999 ]]; then
+		elog "This is the GIT version of ${PN}. It is experimental but may have important bug fixes."
+		elog "You can keep track of the most recent commits at:"
+		elog "    http://git.savannah.gnu.org/cgit/gnokii.git/"
+		elog "Whenever there is a change you are interested in, you can re-emerge ${P}."
+	fi
+}
diff --git a/app-mobilephone/gnokii/metadata.xml b/app-mobilephone/gnokii/metadata.xml
new file mode 100644
index 000000000000..67376429a674
--- /dev/null
+++ b/app-mobilephone/gnokii/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<longdescription>
+gnokii provides tools and a user space driver for use with mobile phones.
+With gnokii you can do such things as make data calls, update your address book, 
+change calendar entires, send and receive SMS messages and load ring tones 
+depending on the phone you have.
+</longdescription>
+<use>
+  <flag name="ical">Enable support for <pkg>dev-libs/libical</pkg></flag>
+  <flag name="irda">Enable infrared support</flag>
+  <flag name="sms">Enable SMS support (build smsd)</flag>
+  <flag name="pcsc-lite">Enable smartcard support with <pkg>sys-apps/pcsc-lite</pkg></flag>
+</use>
+</pkgmetadata>
diff --git a/app-mobilephone/heimdall-1.4.2 b/app-mobilephone/heimdall-1.4.2
deleted file mode 100644
index ada47ee003d8..000000000000
--- a/app-mobilephone/heimdall-1.4.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libusb-1.0.18:1= qt5? ( dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtwidgets:5= ) sys-libs/zlib virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig
-DESCRIPTION=Tool suite used to flash firmware onto Samsung Galaxy S devices
-EAPI=6
-HOMEPAGE=https://glassechidna.com.au/heimdall/
-IUSE=qt5
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-libs/libusb-1.0.18:1= qt5? ( dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtwidgets:5= ) sys-libs/zlib
-SLOT=0
-SRC_URI=https://gitlab.com/BenjaminDobell/Heimdall/-/archive/v1.4.2/Heimdall-v1.4.2.tar.gz -> heimdall-1.4.2.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=91cf1956f60d9c0ac7d5a52f9772e1a4
diff --git a/app-mobilephone/heimdall-9999 b/app-mobilephone/heimdall-9999
deleted file mode 100644
index 9a2ebea172ff..000000000000
--- a/app-mobilephone/heimdall-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/libusb-1.0.18:1= qt5? ( dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtwidgets:5= ) sys-libs/zlib virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Tool suite used to flash firmware onto Samsung Galaxy S devices
-EAPI=6
-HOMEPAGE=https://glassechidna.com.au/heimdall/
-IUSE=qt5
-LICENSE=MIT
-RDEPEND=>=dev-libs/libusb-1.0.18:1= qt5? ( dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtwidgets:5= ) sys-libs/zlib
-SLOT=0
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=91cf1956f60d9c0ac7d5a52f9772e1a4
diff --git a/app-mobilephone/heimdall/Manifest b/app-mobilephone/heimdall/Manifest
new file mode 100644
index 000000000000..b830c5d5cece
--- /dev/null
+++ b/app-mobilephone/heimdall/Manifest
@@ -0,0 +1,4 @@
+DIST heimdall-1.4.2.tar.gz 5486708 BLAKE2B 3846176440f235bc5bb65ac77a2d86b29381dcdf8e999edd38529f02a9f3bd21070bf922ad48fbd8c73c58e1f4834345da4c849549d136dde82df8a68cc4155f SHA512 ed9c5cc7e9377647474ba1af8b7a06d7bbc2371d379d83c2e5cd8463637c52c08c269ab18b6a0a0bec91be8101978748b2d10dd78629ba567bd2c2e452633f63
+EBUILD heimdall-1.4.2.ebuild 1104 BLAKE2B 5c1d639ac2a73ac032a737d3bfdbbf174f07365d090f2ea2d89e8d65e1dbd4403758e68b6220dc50cf6124b1e4c23bdd07e7aac8ea6822c85af2477ebefd7491 SHA512 64f66eb007602f700fe57d78b7eb4fc4af3e23b013708fa2f8232294bedf9bcb91c549126118847bde6dd051e401a15b94e784ad93ab88935b92eedb69f763ea
+EBUILD heimdall-9999.ebuild 1104 BLAKE2B 5c1d639ac2a73ac032a737d3bfdbbf174f07365d090f2ea2d89e8d65e1dbd4403758e68b6220dc50cf6124b1e4c23bdd07e7aac8ea6822c85af2477ebefd7491 SHA512 64f66eb007602f700fe57d78b7eb4fc4af3e23b013708fa2f8232294bedf9bcb91c549126118847bde6dd051e401a15b94e784ad93ab88935b92eedb69f763ea
+MISC metadata.xml 349 BLAKE2B ed767cd626d807128c617828a7b7c8d789644a86d0b88dd6b53806682878714e795461e1abd550e81591ac9c677dd0a906ecffd1de97ccb9e6378bb81590b083 SHA512 c835df6fd37ac66d692a02fbd0b7b2e5b2eed80837be0f15b4b403d25b1588a4343c38021e96733918576f8cce0392abd87d65624264fbd713b4dd9fc2c84b57
diff --git a/app-mobilephone/heimdall/heimdall-1.4.2.ebuild b/app-mobilephone/heimdall/heimdall-1.4.2.ebuild
new file mode 100644
index 000000000000..3bb74e9129de
--- /dev/null
+++ b/app-mobilephone/heimdall/heimdall-1.4.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils udev
+
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="https://gitlab.com/BenjaminDobell/Heimdall/-/archive/v${PV}/Heimdall-v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/Heimdall-v${PV}"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/BenjaminDobell/Heimdall.git"
+fi
+
+DESCRIPTION="Tool suite used to flash firmware onto Samsung Galaxy S devices"
+HOMEPAGE="https://glassechidna.com.au/heimdall/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="qt5"
+
+# virtual/libusb is not precise enough
+RDEPEND="
+	>=dev-libs/libusb-1.0.18:1=
+	qt5? (
+		dev-qt/qtcore:5=
+		dev-qt/qtgui:5=
+		dev-qt/qtwidgets:5=
+	)
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_FRONTEND="$(usex !qt5)"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	dobin "${BUILD_DIR}"/bin/heimdall
+	use qt5 && dobin "${BUILD_DIR}"/bin/heimdall-frontend
+
+	insinto "$(get_udevdir)/rules.d"
+	doins heimdall/60-heimdall.rules
+
+	dodoc README.md Linux/README
+}
diff --git a/app-mobilephone/heimdall/heimdall-9999.ebuild b/app-mobilephone/heimdall/heimdall-9999.ebuild
new file mode 100644
index 000000000000..3bb74e9129de
--- /dev/null
+++ b/app-mobilephone/heimdall/heimdall-9999.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils udev
+
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="https://gitlab.com/BenjaminDobell/Heimdall/-/archive/v${PV}/Heimdall-v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/Heimdall-v${PV}"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/BenjaminDobell/Heimdall.git"
+fi
+
+DESCRIPTION="Tool suite used to flash firmware onto Samsung Galaxy S devices"
+HOMEPAGE="https://glassechidna.com.au/heimdall/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="qt5"
+
+# virtual/libusb is not precise enough
+RDEPEND="
+	>=dev-libs/libusb-1.0.18:1=
+	qt5? (
+		dev-qt/qtcore:5=
+		dev-qt/qtgui:5=
+		dev-qt/qtwidgets:5=
+	)
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_FRONTEND="$(usex !qt5)"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	dobin "${BUILD_DIR}"/bin/heimdall
+	use qt5 && dobin "${BUILD_DIR}"/bin/heimdall-frontend
+
+	insinto "$(get_udevdir)/rules.d"
+	doins heimdall/60-heimdall.rules
+
+	dodoc README.md Linux/README
+}
diff --git a/app-mobilephone/heimdall/metadata.xml b/app-mobilephone/heimdall/metadata.xml
new file mode 100644
index 000000000000..f4846dae2896
--- /dev/null
+++ b/app-mobilephone/heimdall/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>polynomial-c@gentoo.org</email>
+    <name>Lars Wendler</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="gitlab">BenjaminDobell/Heimdall</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-mobilephone/kannel-1.4.3-r2 b/app-mobilephone/kannel-1.4.3-r2
deleted file mode 100644
index f97d4bce1fed..000000000000
--- a/app-mobilephone/kannel-1.4.3-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=config configure install postinst prepare setup
-DEPEND=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 ) >=sys-devel/bison-2.2 doc? ( media-gfx/transfig app-text/jadetex app-text/docbook-dsssl-stylesheets app-text/docbook-sgml-dtd:3.1 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) )
-DESCRIPTION=Powerful SMS and WAP gateway
-EAPI=2
-HOMEPAGE=http://www.kannel.org/
-IUSE=ssl mysql sqlite postgres pcre doc debug pam ssl
-KEYWORDS=~amd64 x86
-LICENSE=Apache-1.1
-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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.kannel.org/download/1.4.3/gateway-1.4.3.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fb0fdc2a8e354b624ab3cdaefac2264f
diff --git a/app-mobilephone/kannel-1.5.0-r3 b/app-mobilephone/kannel-1.5.0-r3
deleted file mode 100644
index 6833988ef246..000000000000
--- a/app-mobilephone/kannel-1.5.0-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=config configure install postinst prepare setup
-DEPEND=sys-libs/e2fsprogs-libs dev-libs/libxml2:2 dev-lang/perl sys-libs/zlib ssl? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) postgres? ( dev-db/postgresql:=[server] ) pcre? ( dev-libs/libpcre:3 ) pam? ( virtual/pam ) >=sys-devel/bison-2.2 doc? ( media-gfx/transfig app-text/jadetex app-text/docbook-dsssl-stylesheets app-text/docbook-sgml-dtd:3.1 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) )
-DESCRIPTION=Powerful SMS and WAP gateway
-EAPI=6
-HOMEPAGE=http://www.kannel.org/
-IUSE=debug doc mysql libressl pam pcre postgres sqlite ssl ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-1.1
-RDEPEND=sys-libs/e2fsprogs-libs dev-libs/libxml2:2 dev-lang/perl sys-libs/zlib ssl? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) postgres? ( dev-db/postgresql:=[server] ) pcre? ( dev-libs/libpcre:3 ) pam? ( virtual/pam )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.kannel.org/download/1.5.0/gateway-1.5.0.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f54545f23e7dbde6d081c6958313d43f
diff --git a/app-mobilephone/kannel-sqlbox-1.5.0-r1 b/app-mobilephone/kannel-sqlbox-1.5.0-r1
deleted file mode 100644
index e6bfee43c72b..000000000000
--- a/app-mobilephone/kannel-sqlbox-1.5.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst setup
-DEPEND=|| ( ~app-mobilephone/kannel-1.5.0[mysql] ~app-mobilephone/kannel-1.5.0[sqlite] ~app-mobilephone/kannel-1.5.0[postgres] ) net-libs/libnsl:0= ssl? ( dev-libs/openssl:0 ) doc? ( media-gfx/transfig app-text/jadetex app-text/docbook-dsssl-stylesheets app-text/docbook-sgml-dtd:3.1 )
-DESCRIPTION=DB-Based Kannel Box for message queueing
-EAPI=5
-HOMEPAGE=http://www.kannel.org/
-IUSE=ssl doc
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-1.1 GPL-2
-RDEPEND=|| ( ~app-mobilephone/kannel-1.5.0[mysql] ~app-mobilephone/kannel-1.5.0[sqlite] ~app-mobilephone/kannel-1.5.0[postgres] ) net-libs/libnsl:0= ssl? ( dev-libs/openssl:0 )
-SLOT=0
-SRC_URI=http://www.kannel.org/download/1.5.0/gateway-1.5.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=af2a1c5944aaf5642f1a18cc78b08cd8
diff --git a/app-mobilephone/kannel-sqlbox/Manifest b/app-mobilephone/kannel-sqlbox/Manifest
new file mode 100644
index 000000000000..1f35b945217a
--- /dev/null
+++ b/app-mobilephone/kannel-sqlbox/Manifest
@@ -0,0 +1,4 @@
+AUX kannel-sqlbox.initd 818 BLAKE2B 0935d27448cab3f3ac6216d04a3b5e5e83cbca961417ee8fa2c3cc2cd133143726a8a85dcb192408345dd7fd323d9c7f85d01ac817ff2b943ec5c2dbc8ebae9e SHA512 80a195dca95e07ae739dd348d0f2bc0d93f283e2897b4a56f249399c9213b8e88c50c43b293ecba8463806ad2682611e3b1addfc1f77b448429d2602572e823e
+DIST gateway-1.5.0.tar.gz 3469476 BLAKE2B c77c43ec782884f8404e70dbe8fb76cb66526ba7f313db7b7ee83073aae71fb2a1661b58be297f0dc2e6bffbccc862d5e7f1239bd4431bbfa4f009848d57face SHA512 5bd35ff40e0f5882367f717e67104a0dc8703b5d6d95654e1268ded15cf6fac6366968b10adbe2eec22b3ac17fe3ae33b4142cd38f51fd3d75a56c8fe7653652
+EBUILD kannel-sqlbox-1.5.0-r1.ebuild 1937 BLAKE2B 237e15e08e547a679c5e76e13262df7c1227240450ca0b241373177fd7dad1d4095612a100da9d05696acf74cce7aaac18dcb8e119322fdfa508b273d9d29fe4 SHA512 084f7b79bc7c55723bde01ca4916a821959d7799e6515932290ce822eb69d0be0333a3a6c63c8d8e3283d6f77124dad08421fee7bd552915709a39da2b6ad444
+MISC metadata.xml 547 BLAKE2B d4a5fd4ff72acf919033017f0b68c750594f8359c9d52ba9fd0a675dc56217bd54e24c4cfd43eb35fe3236cb60c2132aceaf5ea6a42fd95430517ea1f71b9022 SHA512 4fed0437024490404e13873af9b0cfb103cd89cfb878be1c1900a23d506d0c345cb0da2b284b85a940f00c3ab6785ca43e79a92a95cf6bff040f8369d5a610cf
diff --git a/app-mobilephone/kannel-sqlbox/files/kannel-sqlbox.initd b/app-mobilephone/kannel-sqlbox/files/kannel-sqlbox.initd
new file mode 100644
index 000000000000..fd270e65e544
--- /dev/null
+++ b/app-mobilephone/kannel-sqlbox/files/kannel-sqlbox.initd
@@ -0,0 +1,33 @@
+#!/sbin/openrc-run
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+KANNEL_SERVICE=${SVCNAME#*-}
+
+depend() {
+	need kannel-bearerbox
+	before kannel-smsbox
+}
+
+checkconfig() {
+	if [ ! -f /etc/kannel/kannel.conf ] ; then
+		eerror "/etc/kannel/kannel.conf file doesn't exists!"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting kannel ${KANNEL_SERVICE}"
+	start-stop-daemon --start --quiet --exec /usr/sbin/${KANNEL_SERVICE} -- \
+		--daemonize --user kannel --logfile /var/log/kannel/${KANNEL_SERVICE}.log \
+		--pid-file /var/run/kannel/${KANNEL_SERVICE}.pid /etc/kannel/sqlbox.conf
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping kannel ${KANNEL_SERVICE}"
+	start-stop-daemon --stop --verbose --pidfile /var/run/kannel/${KANNEL_SERVICE}.pid
+	eend $?
+}
diff --git a/app-mobilephone/kannel-sqlbox/kannel-sqlbox-1.5.0-r1.ebuild b/app-mobilephone/kannel-sqlbox/kannel-sqlbox-1.5.0-r1.ebuild
new file mode 100644
index 000000000000..06043457fe0c
--- /dev/null
+++ b/app-mobilephone/kannel-sqlbox/kannel-sqlbox-1.5.0-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils flag-o-matic readme.gentoo-r1
+
+DESCRIPTION="DB-Based Kannel Box for message queueing"
+HOMEPAGE="http://www.kannel.org/"
+SRC_URI="http://www.kannel.org/download/${PV}/gateway-${PV}.tar.gz"
+
+LICENSE="Apache-1.1 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl doc"
+
+RDEPEND="|| (
+		~app-mobilephone/kannel-${PV}[mysql]
+		~app-mobilephone/kannel-${PV}[sqlite]
+		~app-mobilephone/kannel-${PV}[postgres]
+	)
+	net-libs/libnsl:0=
+	ssl? ( dev-libs/openssl:0 )"
+DEPEND="${RDEPEND}
+	doc? ( media-gfx/transfig
+		app-text/jadetex
+		app-text/docbook-dsssl-stylesheets
+		app-text/docbook-sgml-dtd:3.1 )"
+
+S="${WORKDIR}/gateway-${PV}/addons/sqlbox/"
+
+pkg_setup() {
+	append-ldflags $(no-as-needed)
+	DISABLE_AUTOFORMATTING="yes"
+	DOC_CONTENTS="Please view the following page for config information:
+http://www.kannel.org/pipermail/users/2006-October/000859.html
+
+In essence you need to do 3 things:
+1. Create the database (tables will be automatically created by kannel)
+2. Point sqlbox to the smsbox-port in kannel [core] group
+3. Point smsbox to smsbox-port in sqlbox [sqlbox] group
+
+This literally puts sqlbox in between the bearerbox and smsbox
+for data storage into a database"
+}
+
+src_configure() {
+	econf --docdir=/usr/share/doc/${PF} \
+		--without-ctlib \
+		--without-mssql \
+		$(use_enable ssl) \
+		$(use_enable doc docs) \
+		|| die "econf failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "failed emake install"
+
+	if use doc; then
+		emake doc/userguide.html || die "emake docs failed"
+		dohtml doc/userguide.html || die "userguide.html not found"
+	fi
+
+	newinitd "${FILESDIR}"/kannel-sqlbox.initd kannel-sqlbox
+
+	dodoc AUTHORS ChangeLog NEWS README
+	insinto /etc/kannel
+	newins example/sqlbox.conf.example sqlbox.conf.sample
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-mobilephone/kannel-sqlbox/metadata.xml b/app-mobilephone/kannel-sqlbox/metadata.xml
new file mode 100644
index 000000000000..fff2720d8361
--- /dev/null
+++ b/app-mobilephone/kannel-sqlbox/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>travisghansen@yahoo.com</email>
+		<name>Travis Hansen</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Gentoo Proxy Maintainers Project</name>
+	</maintainer>
+	<longdescription>Sqlbox is a special Kannel box that sits between bearerbox and
+smsbox and uses a database queue to store and forward messages.</longdescription>
+</pkgmetadata>
diff --git a/app-mobilephone/kannel/Manifest b/app-mobilephone/kannel/Manifest
new file mode 100644
index 000000000000..9c892df0aa5d
--- /dev/null
+++ b/app-mobilephone/kannel/Manifest
@@ -0,0 +1,13 @@
+AUX kannel-1.4.3-autotools.patch 952 BLAKE2B 40817e492326d441e848ad1f1303435d1b13843a380ad9e122190c18f9f1846fff200028484a1ae61b4e92a847d95ed6749eb1ac870be6c92d770f1f04df58d0 SHA512 ff449047fa16d6274682e0c1ccb5741187d397345bdc28bdcdf9aea4c4329d572e63066a75433191a1128302cf529d186a1d493bbc0d9e7de4ff271b59413f4b
+AUX kannel-1.4.3-custom-wap-ports.patch 13135 BLAKE2B b79363fb859eb73c64564f0d18112642d46ea7be48f571aa59bcaf65087c7a360ed6b13a3b7f2711229a13b611a85eb60baaa8e2031a99029964077c9fa92d8e SHA512 5b4830e2c148926cf85e071933e356bc6d82c0e469a6a0887eef65fb95151e7bb864258087783283239cc1dc28fb92637269ea8984a87f1aab3846d00bc4c188
+AUX kannel-1.4.3-external-libuuid.patch 19830 BLAKE2B e33aa303050ad688f7b8efccbfef2048619a33b7edb1fca8845db599e046a80d70284c6c8a179d147c0d21ce787f384651353199ce8303df5ed979daf90a34b5 SHA512 e810d87f5aba6651a87aa3b959780115ed643253b120c2d4da13a7a7fe0cb9ca264e4303aa402ff1401200b9649a663dd203355c3384b28c4152b72b2a2916a2
+AUX kannel-1.5.0-custom-wap-ports.patch 13161 BLAKE2B 2c99902d1d21a61ec54e43ffa0c205889124cc51a36b2650d608cc2c4456980954086ab18c9911c5e2723918234e9925ce5645885fd5f225ede2439498f23256 SHA512 cd71a435feadb43533ed06cf0a1f9e556131f5339951cc1971c9ebf922a5e028b390af978441d7d3fde68022f9c67fe3af69be737d9952614486613f7ba29d23
+AUX kannel-1.5.0-initgroups.patch 333 BLAKE2B ad24397bf6f9d8af7e4313697e25a6e86f1b56af37afd9c2936812338ea8a373ed6d45236725f9f8e9c4b12904f033bcd70db74f58b0fac6a6cf03428e3bb3bd SHA512 06b143b70fd09575adc7bee61c1f48f10ced3da6239fedb9726d56162d53a1f0e6fe6c603e3e56ea4068b26df00196ca6ec4cfb02d321135bbacde6b7f75c217
+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
+MISC metadata.xml 390 BLAKE2B 6465bab424ef3f1ec5eadfa9d79c8f81c32008e1e1d58c23aa781570f3d0233f6ddd1bb5ef1dbb13b7f5714247ba6294a33703385f04f896642d7f08aef16ac3 SHA512 8a41bfb7c62e2d9c247bbab03e7e9d352a2165e668e71f3930592f891d5a2c911064d62f0b1f1f13eefc69c9a6dcaa06d8575499fc9161b661256388cfdcf534
diff --git a/app-mobilephone/kannel/files/kannel-1.4.3-autotools.patch b/app-mobilephone/kannel/files/kannel-1.4.3-autotools.patch
new file mode 100644
index 000000000000..e39cad8708c8
--- /dev/null
+++ b/app-mobilephone/kannel/files/kannel-1.4.3-autotools.patch
@@ -0,0 +1,33 @@
+diff -Nru gateway-1.4.3.orig/configure.in gateway-1.4.3/configure.in
+--- gateway-1.4.3.orig/configure.in	2009-01-12 16:47:01.000000000 +0000
++++ gateway-1.4.3/configure.in	2009-03-01 14:18:51.000000000 +0000
+@@ -95,8 +95,9 @@
+ AC_SUBST(PKGADD_VENDOR)
+ 
+ dnl Target installation directory for documentation
++PACKAGE=kannel
+ AC_SUBST(docdir)
+-docdir='${prefix}/share/doc/kannel'
++AC_SUBST(PACKAGE)
+ 
+ dnl Checks system type.
+ AC_CONFIG_SECTION([Running system checks])
+@@ -112,7 +112,6 @@
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
+ AC_PROG_YACC
+-AC_PROG_LEX
+ AC_CHECK_TOOL(AR, ar)
+ AC_PATH_PROG(CONVERT, convert)
+ AC_PATH_PROG(PERL, perl)
+diff -Nru gateway-1.4.3.orig/Makefile.in gateway-1.4.3/Makefile.in
+--- gateway-1.4.3.orig/Makefile.in	2008-06-24 15:05:24.000000000 +0000
++++ gateway-1.4.3/Makefile.in	2009-03-01 14:18:14.000000000 +0000
+@@ -61,7 +61,6 @@
+ SHELL = @SHELL@
+ VERSION = @VERSION@
+ SUFFIX = @SUFFIX@
+-LEX = @LEX@
+ PERL = @PERL@
+ YACC = @YACC@
+ 
diff --git a/app-mobilephone/kannel/files/kannel-1.4.3-custom-wap-ports.patch b/app-mobilephone/kannel/files/kannel-1.4.3-custom-wap-ports.patch
new file mode 100644
index 000000000000..e1992b08319a
--- /dev/null
+++ b/app-mobilephone/kannel/files/kannel-1.4.3-custom-wap-ports.patch
@@ -0,0 +1,346 @@
+diff -Nru gateway-1.4.3.orig/gw/bb_udp.c gateway-1.4.3/gw/bb_udp.c
+--- gateway-1.4.3.orig/gw/bb_udp.c	2009-01-12 16:46:56.000000000 +0000
++++ gateway-1.4.3/gw/bb_udp.c	2009-03-01 14:20:38.000000000 +0000
+@@ -78,7 +78,7 @@
+ #include "gwlib/gwlib.h"
+ #include "msg.h"
+ #include "bearerbox.h"
+-
++#include "custports.h"
+ /* passed from bearerbox core */
+ 
+ extern volatile sig_atomic_t bb_status;
+@@ -352,13 +352,13 @@
+     while (gwlist_len(ifs) > 0) {
+         iface = gwlist_extract_first(ifs);
+ 	info(0, "Adding interface %s", octstr_get_cstr(iface));
+-        add_service(9200, octstr_get_cstr(iface));   /* wsp 	*/
+-        add_service(9201, octstr_get_cstr(iface));   /* wsp/wtp	*/
++        add_service(port_wsp, octstr_get_cstr(iface));   /* wsp 	*/
++        add_service(port_wtp, octstr_get_cstr(iface));   /* wsp/wtp	*/
+     
+ #ifdef HAVE_WTLS_OPENSSL
+         if (allow_wtls) {
+-             add_service(9202, octstr_get_cstr(iface));   /* wsp/wtls	*/
+-             add_service(9203, octstr_get_cstr(iface));   /* wsp/wtp/wtls */
++             add_service(port_wsps, octstr_get_cstr(iface));   /* wsp/wtls	*/
++             add_service(port_wtps, octstr_get_cstr(iface));   /* wsp/wtp/wtls */
+         }
+ #else
+         if (allow_wtls)
+diff -Nru gateway-1.4.3.orig/gw/bearerbox.c gateway-1.4.3/gw/bearerbox.c
+--- gateway-1.4.3.orig/gw/bearerbox.c	2009-01-12 16:46:56.000000000 +0000
++++ gateway-1.4.3/gw/bearerbox.c	2009-03-01 14:23:05.000000000 +0000
+@@ -78,6 +78,7 @@
+ #include "shared.h"
+ #include "dlr.h"
+ #include "load.h"
++#include "custports.h"
+ 
+ /* global variables; included to other modules as needed */
+ 
+@@ -365,6 +366,7 @@
+     int ssl_enabled = 0;
+ #endif /* HAVE_LIBSSL */
+ 
++    ReadCustomPorts(cfg);
+     /* defaults: use localtime and markers for access-log */
+     lf = m = 1;
+ 	
+diff -Nru gateway-1.4.3.orig/gw/custports.c gateway-1.4.3/gw/custports.c
+--- gateway-1.4.3.orig/gw/custports.c	1970-01-01 00:00:00.000000000 +0000
++++ gateway-1.4.3/gw/custports.c	2009-03-01 14:20:38.000000000 +0000
+@@ -0,0 +1,88 @@
++/* ==================================================================== 
++ * The Kannel Software License, Version 1.0 
++ * 
++ * Copyright (c) 2001-2004 Kannel Group  
++ * Copyright (c) 1998-2001 WapIT Ltd.   
++ * All rights reserved. 
++ * 
++ * Redistribution and use in source and binary forms, with or without 
++ * modification, are permitted provided that the following conditions 
++ * are met: 
++ * 
++ * 1. Redistributions of source code must retain the above copyright 
++ *    notice, this list of conditions and the following disclaimer. 
++ * 
++ * 2. Redistributions in binary form must reproduce the above copyright 
++ *    notice, this list of conditions and the following disclaimer in 
++ *    the documentation and/or other materials provided with the 
++ *    distribution. 
++ * 
++ * 3. The end-user documentation included with the redistribution, 
++ *    if any, must include the following acknowledgment: 
++ *       "This product includes software developed by the 
++ *        Kannel Group (http://www.kannel.org/)." 
++ *    Alternately, this acknowledgment may appear in the software itself, 
++ *    if and wherever such third-party acknowledgments normally appear. 
++ * 
++ * 4. The names "Kannel" and "Kannel Group" must not be used to 
++ *    endorse or promote products derived from this software without 
++ *    prior written permission. For written permission, please  
++ *    contact org@kannel.org. 
++ * 
++ * 5. Products derived from this software may not be called "Kannel", 
++ *    nor may "Kannel" appear in their name, without prior written 
++ *    permission of the Kannel Group. 
++ * 
++ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 
++ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
++ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
++ * DISCLAIMED.  IN NO EVENT SHALL THE KANNEL GROUP OR ITS CONTRIBUTORS 
++ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,  
++ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT  
++ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR  
++ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,  
++ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE  
++ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  
++ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
++ * ==================================================================== 
++ * 
++ * This software consists of voluntary contributions made by many 
++ * individuals on behalf of the Kannel Group.  For more information on  
++ * the Kannel Group, please see <http://www.kannel.org/>. 
++ * 
++ * Portions of this software are based upon software originally written at  
++ * WapIT Ltd., Helsinki, Finland for the Kannel project.  
++ */ 
++
++/*
++ * gw/custports.c
++ *
++ * Implementation of reading custom UDP ports used by wapbox
++ *
++ * Lubor Kolar <kolar@porcus.cz>, 14.03.2006
++ */
++ 
++#include <custports.h>
++
++long port_wsp = 9200; // connectionless default
++long port_wtp = 9201; // connection-oriented default
++long port_wsps = 9202; // connectionless secure default
++long port_wtps = 9203; // connection-oriented secure
++
++
++void ReadCustomPorts(Cfg *config)
++{
++    CfgGroup *grp;
++    grp = cfg_get_single_group(config, octstr_imm("wapbox"));
++    if(grp == NULL)
++        return;
++	         
++    if(cfg_get_integer(&port_wsp, grp, octstr_imm("wsp-port")) != -1)
++        info(0, "Using custom WSP port %ld", port_wsp);
++    if(cfg_get_integer(&port_wtp, grp, octstr_imm("wtp-port")) != -1)
++        info(0, "Using custom WSP/WTP port %ld", port_wtp);
++    if(cfg_get_integer(&port_wsps, grp, octstr_imm("wsps-port")) != -1)
++        info(0, "Using custom WSP/WTLS port %ld", port_wsps);
++    if(cfg_get_integer(&port_wtps, grp, octstr_imm("wtps-port")) != -1)
++        info(0, "Using custom WSP/WTP/WTLS port %ld", port_wtps);
++}
+diff -Nru gateway-1.4.3.orig/gw/custports.h gateway-1.4.3/gw/custports.h
+--- gateway-1.4.3.orig/gw/custports.h	1970-01-01 00:00:00.000000000 +0000
++++ gateway-1.4.3/gw/custports.h	2009-03-01 14:20:38.000000000 +0000
+@@ -0,0 +1,77 @@
++/* ==================================================================== 
++ * The Kannel Software License, Version 1.0 
++ * 
++ * Copyright (c) 2001-2004 Kannel Group  
++ * Copyright (c) 1998-2001 WapIT Ltd.   
++ * All rights reserved. 
++ * 
++ * Redistribution and use in source and binary forms, with or without 
++ * modification, are permitted provided that the following conditions 
++ * are met: 
++ * 
++ * 1. Redistributions of source code must retain the above copyright 
++ *    notice, this list of conditions and the following disclaimer. 
++ * 
++ * 2. Redistributions in binary form must reproduce the above copyright 
++ *    notice, this list of conditions and the following disclaimer in 
++ *    the documentation and/or other materials provided with the 
++ *    distribution. 
++ * 
++ * 3. The end-user documentation included with the redistribution, 
++ *    if any, must include the following acknowledgment: 
++ *       "This product includes software developed by the 
++ *        Kannel Group (http://www.kannel.org/)." 
++ *    Alternately, this acknowledgment may appear in the software itself, 
++ *    if and wherever such third-party acknowledgments normally appear. 
++ * 
++ * 4. The names "Kannel" and "Kannel Group" must not be used to 
++ *    endorse or promote products derived from this software without 
++ *    prior written permission. For written permission, please  
++ *    contact org@kannel.org. 
++ * 
++ * 5. Products derived from this software may not be called "Kannel", 
++ *    nor may "Kannel" appear in their name, without prior written 
++ *    permission of the Kannel Group. 
++ * 
++ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 
++ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
++ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
++ * DISCLAIMED.  IN NO EVENT SHALL THE KANNEL GROUP OR ITS CONTRIBUTORS 
++ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,  
++ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT  
++ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR  
++ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,  
++ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE  
++ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  
++ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
++ * ==================================================================== 
++ * 
++ * This software consists of voluntary contributions made by many 
++ * individuals on behalf of the Kannel Group.  For more information on  
++ * the Kannel Group, please see <http://www.kannel.org/>. 
++ * 
++ * Portions of this software are based upon software originally written at  
++ * WapIT Ltd., Helsinki, Finland for the Kannel project.  
++ */ 
++
++/*
++ * gw/custports.h
++ *
++ * Implementation of wapbox custom UDP ports)
++ *
++ * Lubor Kolar <kolar@porcus.cz>, 14.03.2006
++ */
++
++#ifndef	CUSTPORTS_H
++#define	CUSTPORTS_H
++
++#include "gwlib/gwlib.h"
++
++extern long port_wsp; // connectionless 
++extern long port_wtp; // connection-oriented
++extern long port_wsps; // connectionless secure
++extern long port_wtps; // connection-oriented secure
++
++void ReadCustomPorts(Cfg *config);
++#endif /* CUSTPORTS_H */
++
+diff -Nru gateway-1.4.3.orig/gw/wapbox.c gateway-1.4.3/gw/wapbox.c
+--- gateway-1.4.3.orig/gw/wapbox.c	2009-01-12 16:46:57.000000000 +0000
++++ gateway-1.4.3/gw/wapbox.c	2009-03-01 14:20:38.000000000 +0000
+@@ -84,17 +84,11 @@
+ #include "gwlib/pki.h"
+ #endif
+ #include "radius/radius_acct.h"
++#include "custports.h"
+ 
+ static void config_reload(int reload);
+ static long logfilelevel=-1;
+ 
+-enum {
+-    CONNECTIONLESS_PORT = 9200,
+-    CONNECTION_ORIENTED_PORT = 9201,
+-    WTLS_CONNECTIONLESS_PORT = 9202,
+-    WTLS_CONNECTION_ORIENTED_PORT = 9203
+-};
+-
+ enum { DEFAULT_TIMER_FREQ = 1};
+ 
+ static Octstr *bearerbox_host;
+@@ -131,6 +125,8 @@
+ 
+     cfg_dump(cfg);
+     
++    ReadCustomPorts(cfg);
++    
+     /*
+      * Extract info from the core group.
+      */
+@@ -776,9 +772,9 @@
+ 	     * XXXX here should be suspend/resume, add RSN
+ 	     */
+ 	} else if (msg_type(msg) == wdp_datagram) {
+-        switch (msg->wdp_datagram.destination_port) {
+-        case CONNECTIONLESS_PORT:
+-        case CONNECTION_ORIENTED_PORT:
++	if(msg->wdp_datagram.destination_port == port_wsp 
++	   || msg->wdp_datagram.destination_port == port_wtp)
++	{
+ 	    	dgram = wap_event_create(T_DUnitdata_Ind);
+ 	    	dgram->u.T_DUnitdata_Ind.addr_tuple = wap_addr_tuple_create(
+ 				msg->wdp_datagram.source_address,
+@@ -789,19 +785,22 @@
+ 	    	msg->wdp_datagram.user_data = NULL;
+ 
+           	wap_dispatch_datagram(dgram); 
+-			break;
+-        case WTLS_CONNECTIONLESS_PORT:
+-        case WTLS_CONNECTION_ORIENTED_PORT:
++	}
++	else
++	if(msg->wdp_datagram.destination_port == port_wsps 
++	   || msg->wdp_datagram.destination_port == port_wtps)
++	{
+ #if (HAVE_WTLS_OPENSSL)
+             dgram = wtls_unpack_wdp_datagram(msg);
+             if (dgram != NULL)
+                 wtls_dispatch_event(dgram);
+ #endif
+-			break;
+-        default:
++	}
++        else
++	{
+                 panic(0,"Bad packet received! This shouldn't happen!");
+                 break;
+-        } 
++        } 	
+ 	} else {
+ 	    warning(0, "Received other message than wdp/admin, ignoring!");
+ 	}
+diff -Nru gateway-1.4.3.orig/gw/wap_push_ppg.c gateway-1.4.3/gw/wap_push_ppg.c
+--- gateway-1.4.3.orig/gw/wap_push_ppg.c	2009-01-12 16:46:56.000000000 +0000
++++ gateway-1.4.3/gw/wap_push_ppg.c	2009-03-01 14:20:38.000000000 +0000
+@@ -88,6 +88,7 @@
+ #include "wap_push_pap_compiler.h"
+ #include "wap_push_pap_mime.h"
+ #include "wap_push_ppg_pushuser.h"
++#include "custports.h"
+ 
+ enum {
+     TIME_EXPIRED = 0,
+@@ -1779,10 +1780,10 @@
+ 
+     if (!cless_accepted) {
+         cliport = CONNECTED_CLIPORT;
+-        servport = CONNECTED_SERVPORT;
++        servport = port_wtp;
+     } else {
+         cliport = CONNECTIONLESS_PUSH_CLIPORT;
+-        servport = CONNECTIONLESS_SERVPORT;
++        servport = port_wsp;
+     }
+     
+     address_type = (**e).u.Push_Message.address_type;
+diff -Nru gateway-1.4.3.orig/gw/wap_push_ppg.h gateway-1.4.3/gw/wap_push_ppg.h
+--- gateway-1.4.3.orig/gw/wap_push_ppg.h	2009-01-12 16:46:57.000000000 +0000
++++ gateway-1.4.3/gw/wap_push_ppg.h	2009-03-01 14:20:38.000000000 +0000
+@@ -167,9 +167,7 @@
+  */
+ enum {
+     CONNECTIONLESS_PUSH_CLIPORT = 2948,
+-    CONNECTIONLESS_SERVPORT = 9200,
+     CONNECTED_CLIPORT = 9209,
+-    CONNECTED_SERVPORT = 9201
+ };
+ 
+ struct PPGSessionMachine {
+diff -Nru gateway-1.4.3.orig/gwlib/cfg.def gateway-1.4.3/gwlib/cfg.def
+--- gateway-1.4.3.orig/gwlib/cfg.def	2009-01-12 16:46:55.000000000 +0000
++++ gateway-1.4.3/gwlib/cfg.def	2009-03-01 14:20:38.000000000 +0000
+@@ -159,6 +159,10 @@
+     OCTSTR(concatenation)
+     OCTSTR(max-messages)
+     OCTSTR(wml-strict)
++    OCTSTR(wsp-port)
++    OCTSTR(wtp-port)
++    OCTSTR(wsps-port)
++    OCTSTR(wtps-port)
+ )
+ 
+ 
diff --git a/app-mobilephone/kannel/files/kannel-1.4.3-external-libuuid.patch b/app-mobilephone/kannel/files/kannel-1.4.3-external-libuuid.patch
new file mode 100644
index 000000000000..a29f2c3a8333
--- /dev/null
+++ b/app-mobilephone/kannel/files/kannel-1.4.3-external-libuuid.patch
@@ -0,0 +1,849 @@
+diff -Nru gateway-1.4.3.orig/configure.in gateway-1.4.3/configure.in
+--- gateway-1.4.3.orig/configure.in	2009-03-01 14:42:03.000000000 +0000
++++ gateway-1.4.3/configure.in	2009-03-01 15:06:37.000000000 +0000
+@@ -173,6 +173,9 @@
+ AC_ARG_WITH(libs,
+ [  --with-libs=FLAGS       use FLAGS for extra libraries],
+ LIBS="$LIBS $withval")
++CFLAGS="$CFLAGS -I/usr/include/uuid"
++LIBS="$LIBS -luuid"
++
+ 
+ dnl Check whether compiler supports inline
+ AC_C_INLINE
+@@ -1226,7 +1229,7 @@
+ dnl Final Output
+ 
+ AC_CONFIG_SECTION([Generating output files]) 
+-AC_OUTPUT(gwlib/gw_uuid_types.h Makefile)
++AC_OUTPUT(Makefile)
+ 
+ 
+ dnl LICENSE notice
+diff -Nru gateway-1.4.3.orig/gwlib/gwlib.c gateway-1.4.3/gwlib/gwlib.c
+--- gateway-1.4.3.orig/gwlib/gwlib.c	2009-01-12 16:46:54.000000000 +0000
++++ gateway-1.4.3/gwlib/gwlib.c	2009-03-01 15:01:36.000000000 +0000
+@@ -79,7 +79,6 @@
+ {
+     gw_assert(!init);
+     gw_init_mem();
+-    uuid_init();
+     octstr_init();
+     gwlib_protected_init();
+     gwthread_init();
+@@ -100,7 +99,6 @@
+     gwthread_shutdown();
+     octstr_shutdown();
+     gwlib_protected_shutdown();
+-    uuid_shutdown();
+     cfg_shutdown();
+     gw_check_leaks();
+     log_shutdown();
+diff -Nru gateway-1.4.3.orig/gwlib/gwlib.h gateway-1.4.3/gwlib/gwlib.h
+--- gateway-1.4.3.orig/gwlib/gwlib.h	2009-01-12 16:46:55.000000000 +0000
++++ gateway-1.4.3/gwlib/gwlib.h	2009-03-01 15:01:56.000000000 +0000
+@@ -100,10 +100,12 @@
+ #include "semaphore.h"
+ #include "xmlrpc.h"
+ #include "md5.h"
+-#include "gw_uuid.h"
++#include <uuid.h>
+ #include "gw-rwlock.h"
+ #include "gw-prioqueue.h"
+ 
++#define UUID_STR_LEN 36
++
+ void gwlib_assert_init(void);
+ void gwlib_init(void);
+ void gwlib_shutdown(void);
+diff -Nru gateway-1.4.3.orig/gwlib/gw_uuid.c gateway-1.4.3/gwlib/gw_uuid.c
+--- gateway-1.4.3.orig/gwlib/gw_uuid.c	2004-01-05 16:37:10.000000000 +0000
++++ gateway-1.4.3/gwlib/gw_uuid.c	1970-01-01 00:00:00.000000000 +0000
+@@ -1,632 +0,0 @@
+-/*
+- * clear.c -- Clear a UUID
+- * 
+- * Copyright (C) 1996, 1997 Theodore Ts'o.
+- *
+- * %Begin-Header%
+- * This file may be redistributed under the terms of the GNU 
+- * Library General Public License.
+- * %End-Header%
+- */
+-
+-/*
+- * Force inclusion of SVID stuff since we need it if we're compiling in
+- * gcc-wall wall mode
+- */
+-#ifndef _SVID_SOURCE
+-#define _SVID_SOURCE
+-#endif
+-
+-#include "gw-config.h"
+-
+-#ifdef HAVE_UNISTD_H
+-#include <unistd.h>
+-#endif
+-#ifdef HAVE_STDLIB_H
+-#include <stdlib.h>
+-#endif
+-#include <string.h>
+-#include <ctype.h>
+-#include <fcntl.h>
+-#include <errno.h>
+-#include <sys/types.h>
+-#include <sys/time.h>
+-#include <sys/stat.h>
+-#include <sys/file.h>
+-#ifdef HAVE_SYS_IOCTL_H
+-#include <sys/ioctl.h>
+-#endif
+-#ifdef HAVE_SYS_SOCKET_H
+-#include <sys/socket.h>
+-#endif
+-#ifdef HAVE_SYS_SOCKIO_H
+-#include <sys/sockio.h>
+-#endif
+-#ifdef HAVE_NET_IF_H
+-#include <net/if.h>
+-#endif
+-#ifdef HAVE_NETINET_IN_H
+-#include <netinet/in.h>
+-#endif
+-#include <stdio.h>
+-
+-#include "gwlib/gw_uuid_types.h"
+-#include "gwlib/gw_uuid.h"
+-
+-/*
+- * Offset between 15-Oct-1582 and 1-Jan-70
+- */
+-#define TIME_OFFSET_HIGH 0x01B21DD2
+-#define TIME_OFFSET_LOW  0x13814000
+-
+-struct uuid {
+-        __u32   time_low;
+-        __u16   time_mid;
+-        __u16   time_hi_and_version;
+-        __u16   clock_seq;
+-        __u8    node[6];
+-};
+-
+-
+-/*
+- * prototypes
+- */
+-static void uuid_pack(const struct uuid *uu, uuid_t ptr);
+-static void uuid_unpack(const uuid_t in, struct uuid *uu);
+-static int get_random_fd(void);
+-
+-
+-#ifdef HAVE_SRANDOM
+-#define srand(x) 	srandom(x)
+-#define rand() 		random()
+-#endif
+-
+-
+-
+-void uuid_init(void)
+-{
+-    /* 
+-     * open random device if any.
+-     * We should do it here because otherwise it's
+-     * possible that we open device twice.
+-     */
+-    get_random_fd();
+-}
+-
+-
+-void uuid_shutdown(void)
+-{
+-    int fd = get_random_fd();
+-
+-    if (fd > 0)
+-        close(fd);
+-}
+-
+-void uuid_clear(uuid_t uu)
+-{
+-	memset(uu, 0, 16);
+-}
+-
+-/*
+- * compare.c --- compare whether or not two UUID's are the same
+- *
+- * Returns an integer less than, equal to, or greater than zero if
+- * uu1 respectively, to be less than, to match, or be greater than
+- * uu2.
+- * 
+- * Copyright (C) 1996, 1997 Theodore Ts'o.
+- *
+- * %Begin-Header%
+- * This file may be redistributed under the terms of the GNU 
+- * Library General Public License.
+- * %End-Header%
+- */
+-#define UUCMP(u1,u2) if (u1 != u2) return((u1 < u2) ? -1 : 1);
+-
+-int uuid_compare(const uuid_t uu1, const uuid_t uu2)
+-{
+-	struct uuid	uuid1, uuid2;
+-
+-	uuid_unpack(uu1, &uuid1);
+-	uuid_unpack(uu2, &uuid2);
+-
+-	UUCMP(uuid1.time_low, uuid2.time_low);
+-	UUCMP(uuid1.time_mid, uuid2.time_mid);
+-	UUCMP(uuid1.time_hi_and_version, uuid2.time_hi_and_version);
+-	UUCMP(uuid1.clock_seq, uuid2.clock_seq);
+-	return memcmp(uuid1.node, uuid2.node, 6);
+-}
+-
+-/*
+- * copy.c --- copy UUIDs
+- * 
+- * Copyright (C) 1996, 1997 Theodore Ts'o.
+- *
+- * %Begin-Header%
+- * This file may be redistributed under the terms of the GNU 
+- * Library General Public License.
+- * %End-Header%
+- */
+-void uuid_copy(uuid_t dst, const uuid_t src)
+-{
+-	unsigned char		*cp1;
+-	const unsigned char	*cp2;
+-	int			i;
+-
+-	for (i=0, cp1 = dst, cp2 = src; i < 16; i++)
+-		*cp1++ = *cp2++;
+-}
+-
+-
+-/*
+- * gen_uuid.c --- generate a DCE-compatible uuid
+- *
+- * Copyright (C) 1996, 1997, 1998, 1999 Theodore Ts'o.
+- *
+- * %Begin-Header%
+- * This file may be redistributed under the terms of the GNU 
+- * Library General Public License.
+- * %End-Header%
+- */
+-static int get_random_fd(void)
+-{
+-	struct timeval	tv;
+-	static int	fd = -2;
+-	int		i;
+-
+-	if (fd == -2) {
+-		gettimeofday(&tv, 0);
+-		fd = open("/dev/urandom", O_RDONLY);
+-		if (fd == -1)
+-			fd = open("/dev/random", O_RDONLY | O_NONBLOCK);
+-		srand((getpid() << 16) ^ getuid() ^ tv.tv_sec ^ tv.tv_usec);
+-	}
+-	/* Crank the random number generator a few times */
+-	gettimeofday(&tv, 0);
+-	for (i = (tv.tv_sec ^ tv.tv_usec) & 0x1F; i > 0; i--)
+-		rand();
+-
+-	return fd;
+-}
+-
+-
+-/*
+- * Generate a series of random bytes.  Use /dev/urandom if possible,
+- * and if not, use srandom/random.
+- */
+-static void get_random_bytes(void *buf, int nbytes)
+-{
+-	int i, n = nbytes, fd = get_random_fd();
+-	int lose_counter = 0;
+-	unsigned char *cp = (unsigned char *) buf;
+-
+-	if (fd >= 0) {
+-		while (n > 0) {
+-			i = read(fd, cp, n);
+-			if (i <= 0) {
+-				if (lose_counter++ > 16)
+-					break;
+-				continue;
+-			}
+-			n -= i;
+-			cp += i;
+-			lose_counter = 0;
+-		}
+-	}
+-	
+-	/*
+-	 * We do this all the time, but this is the only source of
+-	 * randomness if /dev/random/urandom is out to lunch.
+-	 */
+-	for (cp = buf, i = 0; i < nbytes; i++)
+-		*cp++ ^= (rand() >> 7) & 0xFF;
+-	return;
+-}
+-
+-/*
+- * Get the ethernet hardware address, if we can find it...
+- */
+-static int get_node_id(unsigned char *node_id)
+-{
+-#ifdef HAVE_NET_IF_H
+-	int 		sd;
+-	struct ifreq 	ifr, *ifrp;
+-	struct ifconf 	ifc;
+-	char buf[1024];
+-	int		n, i;
+-	unsigned char 	*a;
+-	
+-/*
+- * BSD 4.4 defines the size of an ifreq to be
+- * max(sizeof(ifreq), sizeof(ifreq.ifr_name)+ifreq.ifr_addr.sa_len
+- * However, under earlier systems, sa_len isn't present, so the size is 
+- * just sizeof(struct ifreq)
+- */
+-#ifdef HAVE_SA_LEN
+-#ifndef max
+-#define max(a,b) ((a) > (b) ? (a) : (b))
+-#endif
+-#define ifreq_size(i) max(sizeof(struct ifreq),\
+-     sizeof((i).ifr_name)+(i).ifr_addr.sa_len)
+-#else
+-#define ifreq_size(i) sizeof(struct ifreq)
+-#endif /* HAVE_SA_LEN*/
+-
+-	sd = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP);
+-	if (sd < 0) {
+-		return -1;
+-	}
+-	memset(buf, 0, sizeof(buf));
+-	ifc.ifc_len = sizeof(buf);
+-	ifc.ifc_buf = buf;
+-	if (ioctl (sd, SIOCGIFCONF, (char *)&ifc) < 0) {
+-		close(sd);
+-		return -1;
+-	}
+-	n = ifc.ifc_len;
+-	for (i = 0; i < n; i+= ifreq_size(*ifr) ) {
+-		ifrp = (struct ifreq *)((char *) ifc.ifc_buf+i);
+-		strncpy(ifr.ifr_name, ifrp->ifr_name, IFNAMSIZ);
+-#ifdef SIOCGIFHWADDR
+-		if (ioctl(sd, SIOCGIFHWADDR, &ifr) < 0)
+-			continue;
+-		a = (unsigned char *) &ifr.ifr_hwaddr.sa_data;
+-#else
+-#ifdef SIOCGENADDR
+-		if (ioctl(sd, SIOCGENADDR, &ifr) < 0)
+-			continue;
+-		a = (unsigned char *) ifr.ifr_enaddr;
+-#else
+-		/*
+-		 * XXX we don't have a way of getting the hardware
+-		 * address
+-		 */
+-		close(sd);
+-		return 0;
+-#endif /* SIOCGENADDR */
+-#endif /* SIOCGIFHWADDR */
+-		if (!a[0] && !a[1] && !a[2] && !a[3] && !a[4] && !a[5])
+-			continue;
+-		if (node_id) {
+-			memcpy(node_id, a, 6);
+-			close(sd);
+-			return 1;
+-		}
+-	}
+-	close(sd);
+-#endif
+-	return 0;
+-}
+-
+-/* Assume that the gettimeofday() has microsecond granularity */
+-#define MAX_ADJUSTMENT 10
+-
+-static int get_clock(__u32 *clock_high, __u32 *clock_low, __u16 *ret_clock_seq)
+-{
+-	static int			adjustment = 0;
+-	static struct timeval		last = {0, 0};
+-	static __u16			clock_seq;
+-	struct timeval 			tv;
+-	unsigned long long		clock_reg;
+-	
+-try_again:
+-	gettimeofday(&tv, 0);
+-	if ((last.tv_sec == 0) && (last.tv_usec == 0)) {
+-		get_random_bytes(&clock_seq, sizeof(clock_seq));
+-		clock_seq &= 0x1FFF;
+-		last = tv;
+-		last.tv_sec--;
+-	}
+-	if ((tv.tv_sec < last.tv_sec) ||
+-	    ((tv.tv_sec == last.tv_sec) &&
+-	     (tv.tv_usec < last.tv_usec))) {
+-		clock_seq = (clock_seq+1) & 0x1FFF;
+-		adjustment = 0;
+-		last = tv;
+-	} else if ((tv.tv_sec == last.tv_sec) &&
+-	    (tv.tv_usec == last.tv_usec)) {
+-		if (adjustment >= MAX_ADJUSTMENT)
+-			goto try_again;
+-		adjustment++;
+-	} else {
+-		adjustment = 0;
+-		last = tv;
+-	}
+-		
+-	clock_reg = tv.tv_usec*10 + adjustment;
+-	clock_reg += ((unsigned long long) tv.tv_sec)*10000000;
+-	clock_reg += (((unsigned long long) 0x01B21DD2) << 32) + 0x13814000;
+-
+-	*clock_high = clock_reg >> 32;
+-	*clock_low = clock_reg;
+-	*ret_clock_seq = clock_seq;
+-	return 0;
+-}
+-
+-void uuid_generate_time(uuid_t out)
+-{
+-	static unsigned char node_id[6];
+-	static int has_init = 0;
+-	struct uuid uu;
+-	__u32	clock_mid;
+-
+-	if (!has_init) {
+-		if (get_node_id(node_id) <= 0) {
+-			get_random_bytes(node_id, 6);
+-			/*
+-			 * Set multicast bit, to prevent conflicts
+-			 * with IEEE 802 addresses obtained from
+-			 * network cards
+-			 */
+-			node_id[0] |= 0x80;
+-		}
+-		has_init = 1;
+-	}
+-	get_clock(&clock_mid, &uu.time_low, &uu.clock_seq);
+-	uu.clock_seq |= 0x8000;
+-	uu.time_mid = (__u16) clock_mid;
+-	uu.time_hi_and_version = (clock_mid >> 16) | 0x1000;
+-	memcpy(uu.node, node_id, 6);
+-	uuid_pack(&uu, out);
+-}
+-
+-void uuid_generate_random(uuid_t out)
+-{
+-	uuid_t	buf;
+-	struct uuid uu;
+-
+-	get_random_bytes(buf, sizeof(buf));
+-	uuid_unpack(buf, &uu);
+-
+-	uu.clock_seq = (uu.clock_seq & 0x3FFF) | 0x8000;
+-	uu.time_hi_and_version = (uu.time_hi_and_version & 0x0FFF) | 0x4000;
+-	uuid_pack(&uu, out);
+-}
+-
+-/*
+- * This is the generic front-end to uuid_generate_random and
+- * uuid_generate_time.  It uses uuid_generate_random only if
+- * /dev/urandom is available, since otherwise we won't have
+- * high-quality randomness.
+- */
+-void uuid_generate(uuid_t out)
+-{
+-	if (get_random_fd() >= 0) {
+-		uuid_generate_random(out);
+-	}
+-	else
+-		uuid_generate_time(out);
+-}
+-
+-/*
+- * isnull.c --- Check whether or not the UUID is null
+- * 
+- * Copyright (C) 1996, 1997 Theodore Ts'o.
+- *
+- * %Begin-Header%
+- * This file may be redistributed under the terms of the GNU 
+- * Library General Public License.
+- * %End-Header%
+- */
+-/* Returns 1 if the uuid is the NULL uuid */
+-int uuid_is_null(const uuid_t uu)
+-{
+-	const unsigned char 	*cp;
+-	int			i;
+-
+-	for (i=0, cp = uu; i < 16; i++)
+-		if (*cp++)
+-			return 0;
+-	return 1;
+-}
+-
+-/*
+- * Internal routine for packing UUID's
+- * 
+- * Copyright (C) 1996, 1997 Theodore Ts'o.
+- *
+- * %Begin-Header%
+- * This file may be redistributed under the terms of the GNU 
+- * Library General Public License.
+- * %End-Header%
+- */
+-void uuid_pack(const struct uuid *uu, uuid_t ptr)
+-{
+-	__u32	tmp;
+-	unsigned char	*out = ptr;
+-
+-	tmp = uu->time_low;
+-	out[3] = (unsigned char) tmp;
+-	tmp >>= 8;
+-	out[2] = (unsigned char) tmp;
+-	tmp >>= 8;
+-	out[1] = (unsigned char) tmp;
+-	tmp >>= 8;
+-	out[0] = (unsigned char) tmp;
+-	
+-	tmp = uu->time_mid;
+-	out[5] = (unsigned char) tmp;
+-	tmp >>= 8;
+-	out[4] = (unsigned char) tmp;
+-
+-	tmp = uu->time_hi_and_version;
+-	out[7] = (unsigned char) tmp;
+-	tmp >>= 8;
+-	out[6] = (unsigned char) tmp;
+-
+-	tmp = uu->clock_seq;
+-	out[9] = (unsigned char) tmp;
+-	tmp >>= 8;
+-	out[8] = (unsigned char) tmp;
+-
+-	memcpy(out+10, uu->node, 6);
+-}
+-
+-/*
+- * parse.c --- UUID parsing
+- * 
+- * Copyright (C) 1996, 1997 Theodore Ts'o.
+- *
+- * %Begin-Header%
+- * This file may be redistributed under the terms of the GNU 
+- * Library General Public License.
+- * %End-Header%
+- */
+-int uuid_parse(const char *in, uuid_t uu)
+-{
+-	struct uuid	uuid;
+-	int 		i;
+-	const char	*cp;
+-	char		buf[3];
+-
+-	if (strlen(in) != 36)
+-		return -1;
+-	for (i=0, cp = in; i <= 36; i++,cp++) {
+-		if ((i == 8) || (i == 13) || (i == 18) ||
+-		    (i == 23)) {
+-			if (*cp == '-')
+-				continue;
+-			else
+-				return -1;
+-		}
+-		if (i== 36)
+-			if (*cp == 0)
+-				continue;
+-		if (!isxdigit(*cp))
+-			return -1;
+-	}
+-	uuid.time_low = strtoul(in, NULL, 16);
+-	uuid.time_mid = strtoul(in+9, NULL, 16);
+-	uuid.time_hi_and_version = strtoul(in+14, NULL, 16);
+-	uuid.clock_seq = strtoul(in+19, NULL, 16);
+-	cp = in+24;
+-	buf[2] = 0;
+-	for (i=0; i < 6; i++) {
+-		buf[0] = *cp++;
+-		buf[1] = *cp++;
+-		uuid.node[i] = strtoul(buf, NULL, 16);
+-	}
+-	
+-	uuid_pack(&uuid, uu);
+-	return 0;
+-}
+-	
+-
+-/*
+- * Internal routine for unpacking UUID
+- * 
+- * Copyright (C) 1996, 1997 Theodore Ts'o.
+- *
+- * %Begin-Header%
+- * This file may be redistributed under the terms of the GNU 
+- * Library General Public License.
+- * %End-Header%
+- */
+-void uuid_unpack(const uuid_t in, struct uuid *uu)
+-{
+-	const __u8	*ptr = in;
+-	__u32		tmp;
+-
+-	tmp = *ptr++;
+-	tmp = (tmp << 8) | *ptr++;
+-	tmp = (tmp << 8) | *ptr++;
+-	tmp = (tmp << 8) | *ptr++;
+-	uu->time_low = tmp;
+-
+-	tmp = *ptr++;
+-	tmp = (tmp << 8) | *ptr++;
+-	uu->time_mid = tmp;
+-	
+-	tmp = *ptr++;
+-	tmp = (tmp << 8) | *ptr++;
+-	uu->time_hi_and_version = tmp;
+-
+-	tmp = *ptr++;
+-	tmp = (tmp << 8) | *ptr++;
+-	uu->clock_seq = tmp;
+-
+-	memcpy(uu->node, ptr, 6);
+-}
+-
+-/*
+- * unparse.c -- convert a UUID to string
+- * 
+- * Copyright (C) 1996, 1997 Theodore Ts'o.
+- *
+- * %Begin-Header%
+- * This file may be redistributed under the terms of the GNU 
+- * Library General Public License.
+- * %End-Header%
+- */
+-void uuid_unparse(const uuid_t uu, char *out)
+-{
+-	struct uuid uuid;
+-
+-	uuid_unpack(uu, &uuid);
+-	sprintf(out,
+-		"%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+-		uuid.time_low, uuid.time_mid, uuid.time_hi_and_version,
+-		uuid.clock_seq >> 8, uuid.clock_seq & 0xFF,
+-		uuid.node[0], uuid.node[1], uuid.node[2],
+-		uuid.node[3], uuid.node[4], uuid.node[5]);
+-}
+-
+-/*
+- * uuid_time.c --- Interpret the time field from a uuid.  This program
+- * 	violates the UUID abstraction barrier by reaching into the guts
+- *	of a UUID and interpreting it.
+- * 
+- * Copyright (C) 1998, 1999 Theodore Ts'o.
+- *
+- * %Begin-Header%
+- * This file may be redistributed under the terms of the GNU 
+- * Library General Public License.
+- * %End-Header%
+- */
+-time_t uuid_time(const uuid_t uu, struct timeval *ret_tv)
+-{
+-	struct uuid		uuid;
+-	__u32			high;
+-	struct timeval		tv;
+-	unsigned long long	clock_reg;
+-
+-	uuid_unpack(uu, &uuid);
+-	
+-	high = uuid.time_mid | ((uuid.time_hi_and_version & 0xFFF) << 16);
+-	clock_reg = uuid.time_low | ((unsigned long long) high << 32);
+-
+-	clock_reg -= (((unsigned long long) 0x01B21DD2) << 32) + 0x13814000;
+-	tv.tv_sec = clock_reg / 10000000;
+-	tv.tv_usec = (clock_reg % 10000000) / 10;
+-
+-	if (ret_tv)
+-		*ret_tv = tv;
+-
+-	return tv.tv_sec;
+-}
+-
+-int uuid_type(const uuid_t uu)
+-{
+-	struct uuid		uuid;
+-
+-	uuid_unpack(uu, &uuid);	
+-	return ((uuid.time_hi_and_version >> 12) & 0xF);
+-}
+-
+-int uuid_variant(const uuid_t uu)
+-{
+-	struct uuid		uuid;
+-	int			var;
+-
+-	uuid_unpack(uu, &uuid);	
+-	var = uuid.clock_seq;
+-
+-	if ((var & 0x8000) == 0)
+-		return UUID_VARIANT_NCS;
+-	if ((var & 0x4000) == 0)
+-		return UUID_VARIANT_DCE;
+-	if ((var & 0x2000) == 0)
+-		return UUID_VARIANT_MICROSOFT;
+-	return UUID_VARIANT_OTHER;
+-}
+-
+diff -Nru gateway-1.4.3.orig/gwlib/gw_uuid.h gateway-1.4.3/gwlib/gw_uuid.h
+--- gateway-1.4.3.orig/gwlib/gw_uuid.h	2005-06-14 09:31:34.000000000 +0000
++++ gateway-1.4.3/gwlib/gw_uuid.h	1970-01-01 00:00:00.000000000 +0000
+@@ -1,84 +0,0 @@
+-/*
+- * Public include file for the UUID library
+- * 
+- * Copyright (C) 1996, 1997, 1998 Theodore Ts'o.
+- *
+- * %Begin-Header%
+- * This file may be redistributed under the terms of the GNU 
+- * Library General Public License.
+- * %End-Header%
+- */
+-
+-#ifndef _UUID_UUID_H
+-#define _UUID_UUID_H
+-
+-#include <sys/types.h>
+-#include <sys/time.h>
+-#include <time.h>
+-
+-#define UUID_STR_LEN 36
+-
+-#ifdef	DARWIN
+-
+-#ifndef _POSIX_C_SOURCE
+-#ifndef _UUID_T
+-#define _UUID_T
+-typedef __darwin_uuid_t		uuid_t;
+-#endif /* _UUID_T */
+-#endif /* _POSIX_C_SOURCE */
+-
+-#else
+-
+-typedef unsigned char uuid_t[16];
+-
+-#endif
+-
+-/* UUID Variant definitions */
+-#define UUID_VARIANT_NCS 	0
+-#define UUID_VARIANT_DCE 	1
+-#define UUID_VARIANT_MICROSOFT	2
+-#define UUID_VARIANT_OTHER	3
+-
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-
+-/* initialize uuid library */
+-void uuid_init(void);
+-
+-/* shutdown uuid library */
+-void uuid_shutdown(void);
+-
+-/* clear.c */
+-void uuid_clear(uuid_t uu);
+-
+-/* compare.c */
+-int uuid_compare(const uuid_t uu1, const uuid_t uu2);
+-
+-/* copy.c */
+-void uuid_copy(uuid_t dst, const uuid_t src);
+-
+-/* gen_uuid.c */
+-void uuid_generate(uuid_t out);
+-void uuid_generate_random(uuid_t out);
+-void uuid_generate_time(uuid_t out);
+-
+-/* isnull.c */
+-int uuid_is_null(const uuid_t uu);
+-
+-/* parse.c */
+-int uuid_parse(const char *in, uuid_t uu);
+-
+-/* unparse.c */
+-void uuid_unparse(const uuid_t uu, char *out);
+-
+-/* uuid_time.c */
+-time_t uuid_time(const uuid_t uu, struct timeval *ret_tv);
+-int uuid_type(const uuid_t uu);
+-int uuid_variant(const uuid_t uu);
+-
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-#endif /* _UUID_UUID_H */
+diff -Nru gateway-1.4.3.orig/gwlib/gw_uuid_types.h.in gateway-1.4.3/gwlib/gw_uuid_types.h.in
+--- gateway-1.4.3.orig/gwlib/gw_uuid_types.h.in	2003-12-08 11:25:44.000000000 +0000
++++ gateway-1.4.3/gwlib/gw_uuid_types.h.in	1970-01-01 00:00:00.000000000 +0000
+@@ -1,51 +0,0 @@
+-/* 
+- * If linux/types.h is already been included, assume it has defined
+- * everything we need.  (cross fingers)  Other header files may have 
+- * also defined the types that we need.
+- */
+-#if (!defined(_LINUX_TYPES_H) && !defined(_BLKID_TYPES_H) && \
+-	!defined(_UUID_TYPES) && !defined(_EXT2_TYPES_H))
+-#define _UUID_TYPES_H
+-
+-typedef unsigned char __u8;
+-typedef signed char __s8;
+-
+-#if (@SIZEOF_INT@ == 8)
+-typedef int		__s64;
+-typedef unsigned int	__u64;
+-#elif (@SIZEOF_LONG@ == 8)
+-typedef long		__s64;
+-typedef unsigned long	__u64;
+-#elif (@SIZEOF_LONG_LONG@ == 8)
+-#if defined(__GNUC__)
+-typedef __signed__ long long 	__s64;
+-#else
+-typedef signed long long 	__s64;
+-#endif
+-typedef unsigned long long	__u64;
+-#endif
+-
+-#if (@SIZEOF_INT@ == 2)
+-typedef	int		__s16;
+-typedef	unsigned int	__u16;
+-#elif (@SIZEOF_SHORT@ == 2)
+-typedef	short		__s16;
+-typedef	unsigned short	__u16;
+-#else
+-  ?==error: undefined 16 bit type
+-#endif
+-
+-#if (@SIZEOF_INT@ == 4)
+-typedef	int		__s32;
+-typedef	unsigned int	__u32;
+-#elif (@SIZEOF_LONG@ == 4)
+-typedef	long		__s32;
+-typedef	unsigned long	__u32;
+-#elif (@SIZEOF_SHORT@ == 4)
+-typedef	short		__s32;
+-typedef	unsigned short	__u32;
+-#else
+- ?== error: undefined 32 bit type
+-#endif
+-
+-#endif /* _*_TYPES_H */
+diff -Nru gateway-1.4.3.orig/Makefile.in gateway-1.4.3/Makefile.in
+--- gateway-1.4.3.orig/Makefile.in	2009-03-01 14:42:03.000000000 +0000
++++ gateway-1.4.3/Makefile.in	2009-03-01 15:03:45.000000000 +0000
+@@ -322,7 +322,7 @@
+ 	rm -f $(benchoutputs)
+ 
+ distclean: clean
+-	rm -f Makefile gw-config.h config.cache config.log config.status config.nice .depend gwlib/gw_uuid_types.h
++	rm -f Makefile gw-config.h config.cache config.log config.status config.nice .depend
+ 
+ nag:
+ 	utils/find-long-lines
diff --git a/app-mobilephone/kannel/files/kannel-1.5.0-custom-wap-ports.patch b/app-mobilephone/kannel/files/kannel-1.5.0-custom-wap-ports.patch
new file mode 100644
index 000000000000..63981f985989
--- /dev/null
+++ b/app-mobilephone/kannel/files/kannel-1.5.0-custom-wap-ports.patch
@@ -0,0 +1,346 @@
+diff -Nru gateway-1.4.3.orig/gw/bb_udp.c gateway-1.4.3/gw/bb_udp.c
+--- gateway-1.4.3.orig/gw/bb_udp.c	2009-01-12 16:46:56.000000000 +0000
++++ gateway-1.4.3/gw/bb_udp.c	2009-03-01 14:20:38.000000000 +0000
+@@ -78,7 +78,7 @@
+ #include "gwlib/gwlib.h"
+ #include "msg.h"
+ #include "bearerbox.h"
+-
++#include "custports.h"
+ /* passed from bearerbox core */
+ 
+ extern volatile sig_atomic_t bb_status;
+@@ -352,13 +352,13 @@
+     while (gwlist_len(ifs) > 0) {
+         iface = gwlist_extract_first(ifs);
+ 	info(0, "Adding interface %s", octstr_get_cstr(iface));
+-        add_service(9200, octstr_get_cstr(iface));   /* wsp 	*/
+-        add_service(9201, octstr_get_cstr(iface));   /* wsp/wtp	*/
++        add_service(port_wsp, octstr_get_cstr(iface));   /* wsp 	*/
++        add_service(port_wtp, octstr_get_cstr(iface));   /* wsp/wtp	*/
+     
+ #ifdef HAVE_WTLS_OPENSSL
+         if (allow_wtls) {
+-             add_service(9202, octstr_get_cstr(iface));   /* wsp/wtls	*/
+-             add_service(9203, octstr_get_cstr(iface));   /* wsp/wtp/wtls */
++             add_service(port_wsps, octstr_get_cstr(iface));   /* wsp/wtls	*/
++             add_service(port_wtps, octstr_get_cstr(iface));   /* wsp/wtp/wtls */
+         }
+ #else
+         if (allow_wtls)
+diff -Nru gateway-1.4.3.orig/gw/bearerbox.c gateway-1.4.3/gw/bearerbox.c
+--- gateway-1.4.3.orig/gw/bearerbox.c	2009-01-12 16:46:56.000000000 +0000
++++ gateway-1.4.3/gw/bearerbox.c	2009-03-01 14:23:05.000000000 +0000
+@@ -78,6 +78,7 @@
+ #include "shared.h"
+ #include "dlr.h"
+ #include "load.h"
++#include "custports.h"
+ 
+ /* global variables; included to other modules as needed */
+ 
+@@ -365,6 +366,7 @@
+     int ssl_enabled = 0;
+ #endif /* HAVE_LIBSSL */
+ 
++    ReadCustomPorts(cfg);
+     /* defaults: use localtime and markers for access-log */
+     lf = m = 1;
+ 	
+diff -Nru gateway-1.4.3.orig/gw/custports.c gateway-1.4.3/gw/custports.c
+--- gateway-1.4.3.orig/gw/custports.c	1970-01-01 00:00:00.000000000 +0000
++++ gateway-1.4.3/gw/custports.c	2009-03-01 14:20:38.000000000 +0000
+@@ -0,0 +1,88 @@
++/* ==================================================================== 
++ * The Kannel Software License, Version 1.0 
++ * 
++ * Copyright (c) 2001-2004 Kannel Group  
++ * Copyright (c) 1998-2001 WapIT Ltd.   
++ * All rights reserved. 
++ * 
++ * Redistribution and use in source and binary forms, with or without 
++ * modification, are permitted provided that the following conditions 
++ * are met: 
++ * 
++ * 1. Redistributions of source code must retain the above copyright 
++ *    notice, this list of conditions and the following disclaimer. 
++ * 
++ * 2. Redistributions in binary form must reproduce the above copyright 
++ *    notice, this list of conditions and the following disclaimer in 
++ *    the documentation and/or other materials provided with the 
++ *    distribution. 
++ * 
++ * 3. The end-user documentation included with the redistribution, 
++ *    if any, must include the following acknowledgment: 
++ *       "This product includes software developed by the 
++ *        Kannel Group (http://www.kannel.org/)." 
++ *    Alternately, this acknowledgment may appear in the software itself, 
++ *    if and wherever such third-party acknowledgments normally appear. 
++ * 
++ * 4. The names "Kannel" and "Kannel Group" must not be used to 
++ *    endorse or promote products derived from this software without 
++ *    prior written permission. For written permission, please  
++ *    contact org@kannel.org. 
++ * 
++ * 5. Products derived from this software may not be called "Kannel", 
++ *    nor may "Kannel" appear in their name, without prior written 
++ *    permission of the Kannel Group. 
++ * 
++ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 
++ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
++ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
++ * DISCLAIMED.  IN NO EVENT SHALL THE KANNEL GROUP OR ITS CONTRIBUTORS 
++ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,  
++ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT  
++ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR  
++ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,  
++ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE  
++ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  
++ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
++ * ==================================================================== 
++ * 
++ * This software consists of voluntary contributions made by many 
++ * individuals on behalf of the Kannel Group.  For more information on  
++ * the Kannel Group, please see <http://www.kannel.org/>. 
++ * 
++ * Portions of this software are based upon software originally written at  
++ * WapIT Ltd., Helsinki, Finland for the Kannel project.  
++ */ 
++
++/*
++ * gw/custports.c
++ *
++ * Implementation of reading custom UDP ports used by wapbox
++ *
++ * Lubor Kolar <kolar@porcus.cz>, 14.03.2006
++ */
++ 
++#include <custports.h>
++
++long port_wsp = 9200; // connectionless default
++long port_wtp = 9201; // connection-oriented default
++long port_wsps = 9202; // connectionless secure default
++long port_wtps = 9203; // connection-oriented secure
++
++
++void ReadCustomPorts(Cfg *config)
++{
++    CfgGroup *grp;
++    grp = cfg_get_single_group(config, octstr_imm("wapbox"));
++    if(grp == NULL)
++        return;
++	         
++    if(cfg_get_integer(&port_wsp, grp, octstr_imm("wsp-port")) != -1)
++        info(0, "Using custom WSP port %ld", port_wsp);
++    if(cfg_get_integer(&port_wtp, grp, octstr_imm("wtp-port")) != -1)
++        info(0, "Using custom WSP/WTP port %ld", port_wtp);
++    if(cfg_get_integer(&port_wsps, grp, octstr_imm("wsps-port")) != -1)
++        info(0, "Using custom WSP/WTLS port %ld", port_wsps);
++    if(cfg_get_integer(&port_wtps, grp, octstr_imm("wtps-port")) != -1)
++        info(0, "Using custom WSP/WTP/WTLS port %ld", port_wtps);
++}
+diff -Nru gateway-1.4.3.orig/gw/custports.h gateway-1.4.3/gw/custports.h
+--- gateway-1.4.3.orig/gw/custports.h	1970-01-01 00:00:00.000000000 +0000
++++ gateway-1.4.3/gw/custports.h	2009-03-01 14:20:38.000000000 +0000
+@@ -0,0 +1,77 @@
++/* ==================================================================== 
++ * The Kannel Software License, Version 1.0 
++ * 
++ * Copyright (c) 2001-2004 Kannel Group  
++ * Copyright (c) 1998-2001 WapIT Ltd.   
++ * All rights reserved. 
++ * 
++ * Redistribution and use in source and binary forms, with or without 
++ * modification, are permitted provided that the following conditions 
++ * are met: 
++ * 
++ * 1. Redistributions of source code must retain the above copyright 
++ *    notice, this list of conditions and the following disclaimer. 
++ * 
++ * 2. Redistributions in binary form must reproduce the above copyright 
++ *    notice, this list of conditions and the following disclaimer in 
++ *    the documentation and/or other materials provided with the 
++ *    distribution. 
++ * 
++ * 3. The end-user documentation included with the redistribution, 
++ *    if any, must include the following acknowledgment: 
++ *       "This product includes software developed by the 
++ *        Kannel Group (http://www.kannel.org/)." 
++ *    Alternately, this acknowledgment may appear in the software itself, 
++ *    if and wherever such third-party acknowledgments normally appear. 
++ * 
++ * 4. The names "Kannel" and "Kannel Group" must not be used to 
++ *    endorse or promote products derived from this software without 
++ *    prior written permission. For written permission, please  
++ *    contact org@kannel.org. 
++ * 
++ * 5. Products derived from this software may not be called "Kannel", 
++ *    nor may "Kannel" appear in their name, without prior written 
++ *    permission of the Kannel Group. 
++ * 
++ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 
++ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
++ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
++ * DISCLAIMED.  IN NO EVENT SHALL THE KANNEL GROUP OR ITS CONTRIBUTORS 
++ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,  
++ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT  
++ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR  
++ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,  
++ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE  
++ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  
++ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
++ * ==================================================================== 
++ * 
++ * This software consists of voluntary contributions made by many 
++ * individuals on behalf of the Kannel Group.  For more information on  
++ * the Kannel Group, please see <http://www.kannel.org/>. 
++ * 
++ * Portions of this software are based upon software originally written at  
++ * WapIT Ltd., Helsinki, Finland for the Kannel project.  
++ */ 
++
++/*
++ * gw/custports.h
++ *
++ * Implementation of wapbox custom UDP ports)
++ *
++ * Lubor Kolar <kolar@porcus.cz>, 14.03.2006
++ */
++
++#ifndef	CUSTPORTS_H
++#define	CUSTPORTS_H
++
++#include "gwlib/gwlib.h"
++
++extern long port_wsp; // connectionless 
++extern long port_wtp; // connection-oriented
++extern long port_wsps; // connectionless secure
++extern long port_wtps; // connection-oriented secure
++
++void ReadCustomPorts(Cfg *config);
++#endif /* CUSTPORTS_H */
++
+diff -Nru gateway-1.4.3.orig/gw/wapbox.c gateway-1.4.3/gw/wapbox.c
+--- gateway-1.4.3.orig/gw/wapbox.c	2009-01-12 16:46:57.000000000 +0000
++++ gateway-1.4.3/gw/wapbox.c	2009-03-01 14:20:38.000000000 +0000
+@@ -84,17 +84,11 @@
+ #include "gwlib/pki.h"
+ #endif
+ #include "radius/radius_acct.h"
++#include "custports.h"
+ 
+ static void config_reload(int reload);
+ static long logfilelevel=-1;
+ 
+-enum {
+-    CONNECTIONLESS_PORT = 9200,
+-    CONNECTION_ORIENTED_PORT = 9201,
+-    WTLS_CONNECTIONLESS_PORT = 9202,
+-    WTLS_CONNECTION_ORIENTED_PORT = 9203
+-};
+-
+ enum { DEFAULT_TIMER_FREQ = 1};
+ 
+ static Octstr *bearerbox_host;
+@@ -131,6 +125,8 @@
+ 
+     cfg_dump(cfg);
+     
++    ReadCustomPorts(cfg);
++    
+     /*
+      * Extract info from the core group.
+      */
+@@ -776,9 +772,9 @@
+ 	     * XXXX here should be suspend/resume, add RSN
+ 	     */
+ 	} else if (msg_type(msg) == wdp_datagram) {
+-        switch (msg->wdp_datagram.destination_port) {
+-        case CONNECTIONLESS_PORT:
+-        case CONNECTION_ORIENTED_PORT:
++	if(msg->wdp_datagram.destination_port == port_wsp 
++	   || msg->wdp_datagram.destination_port == port_wtp)
++	{
+ 	    	dgram = wap_event_create(T_DUnitdata_Ind);
+ 	    	dgram->u.T_DUnitdata_Ind.addr_tuple = wap_addr_tuple_create(
+ 				msg->wdp_datagram.source_address,
+@@ -789,19 +785,22 @@
+ 	    	msg->wdp_datagram.user_data = NULL;
+ 
+           	wap_dispatch_datagram(dgram); 
+-			break;
+-        case WTLS_CONNECTIONLESS_PORT:
+-        case WTLS_CONNECTION_ORIENTED_PORT:
++	}
++	else
++	if(msg->wdp_datagram.destination_port == port_wsps 
++	   || msg->wdp_datagram.destination_port == port_wtps)
++	{
+ #if (HAVE_WTLS_OPENSSL)
+             dgram = wtls_unpack_wdp_datagram(msg);
+             if (dgram != NULL)
+                 wtls_dispatch_event(dgram);
+ #endif
+-			break;
+-        default:
++	}
++        else
++	{
+                 panic(0,"Bad packet received! This shouldn't happen!");
+                 break;
+-        } 
++        } 	
+ 	} else {
+ 	    warning(0, "Received other message than wdp/admin, ignoring!");
+ 	}
+diff -Nru gateway-1.4.3.orig/gw/wap_push_ppg.c gateway-1.4.3/gw/wap_push_ppg.c
+--- gateway-1.4.3.orig/gw/wap_push_ppg.c	2009-01-12 16:46:56.000000000 +0000
++++ gateway-1.4.3/gw/wap_push_ppg.c	2009-03-01 14:20:38.000000000 +0000
+@@ -88,6 +88,7 @@
+ #include "wap_push_pap_compiler.h"
+ #include "wap_push_pap_mime.h"
+ #include "wap_push_ppg_pushuser.h"
++#include "custports.h"
+ 
+ enum {
+     TIME_EXPIRED = 0,
+@@ -1779,10 +1780,10 @@
+ 
+     if (!cless_accepted) {
+         cliport = CONNECTED_CLIPORT;
+-        servport = CONNECTED_SERVPORT;
++        servport = port_wtp;
+     } else {
+         cliport = CONNECTIONLESS_PUSH_CLIPORT;
+-        servport = CONNECTIONLESS_SERVPORT;
++        servport = port_wsp;
+     }
+     
+     address_type = (**e).u.Push_Message.address_type;
+diff -Nru gateway-1.4.3.orig/gw/wap_push_ppg.h gateway-1.4.3/gw/wap_push_ppg.h
+--- gateway-1.4.3.orig/gw/wap_push_ppg.h	2009-01-12 16:46:57.000000000 +0000
++++ gateway-1.4.3/gw/wap_push_ppg.h	2009-03-01 14:20:38.000000000 +0000
+@@ -167,9 +167,7 @@
+  */
+ enum {
+     CONNECTIONLESS_PUSH_CLIPORT = 2948,
+-    CONNECTIONLESS_SERVPORT = 9200,
+     CONNECTED_CLIPORT = 9209,
+-    CONNECTED_SERVPORT = 9201
+ };
+ 
+ struct PPGSessionMachine {
+diff -ruN gateway-1.5.0/gwlib/cfg.def gateway-1.5.0-patched/gwlib/cfg.def
+--- gateway-1.5.0.orig/gwlib/cfg.def 2010-10-07 10:03:35.000000000 -0400
++++ gateway-1.5.0/gwlib/cfg.def 2013-08-25 15:07:47.544662379 -0400
+@@ -160,6 +160,10 @@
+     OCTSTR(concatenation)
+     OCTSTR(max-messages)
+     OCTSTR(wml-strict)
++    OCTSTR(wsp-port)
++    OCTSTR(wtp-port)
++    OCTSTR(wsps-port)
++    OCTSTR(wtps-port)
+     OCTSTR(http-timeout)
+ )
+
diff --git a/app-mobilephone/kannel/files/kannel-1.5.0-initgroups.patch b/app-mobilephone/kannel/files/kannel-1.5.0-initgroups.patch
new file mode 100644
index 000000000000..665ca6dc5953
--- /dev/null
+++ b/app-mobilephone/kannel/files/kannel-1.5.0-initgroups.patch
@@ -0,0 +1,11 @@
+--- a/gwlib/utils.c.old	2016-08-25 18:52:59.944949612 +0200
++++ b/gwlib/utils.c	2016-08-25 18:53:30.352659566 +0200
+@@ -387,7 +387,7 @@
+     }
+ 
+ #ifndef __INTERIX
+-    if (initgroups(user, -1) == -1) {
++    if (initgroups(user, pass->pw_gid) == -1) {
+         error(errno, "Could not set supplementary group ID's.");
+     }
+ #endif
diff --git a/app-mobilephone/kannel/files/kannel-bearerbox.initd b/app-mobilephone/kannel/files/kannel-bearerbox.initd
new file mode 100644
index 000000000000..717d12d1a174
--- /dev/null
+++ b/app-mobilephone/kannel/files/kannel-bearerbox.initd
@@ -0,0 +1,34 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+KANNEL_SERVICE=${SVCNAME#*-}
+
+depend() {
+	need net
+	after dns mysql postgresql
+}
+
+checkconfig() {
+	if [ ! -f /etc/kannel/kannel.conf ] ; then
+		eerror "/etc/kannel/kannel.conf file doesn't exists!"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	checkpath -o root:kannel -m 0770 -d /var/run/kannel
+
+	ebegin "Starting kannel ${KANNEL_SERVICE}"
+	start-stop-daemon --start --quiet --exec /usr/sbin/${KANNEL_SERVICE} -- \
+		--daemonize --user kannel --logfile /var/log/kannel/${KANNEL_SERVICE}.log \
+		--pid-file /var/run/kannel/${KANNEL_SERVICE}.pid /etc/kannel/kannel.conf
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping kannel ${KANNEL_SERVICE}"
+	start-stop-daemon --stop --verbose --pidfile /var/run/kannel/${KANNEL_SERVICE}.pid
+	eend $?
+}
diff --git a/app-mobilephone/kannel/files/kannel-smsbox.initd b/app-mobilephone/kannel/files/kannel-smsbox.initd
new file mode 100644
index 000000000000..76cb49ac5252
--- /dev/null
+++ b/app-mobilephone/kannel/files/kannel-smsbox.initd
@@ -0,0 +1,33 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+KANNEL_SERVICE=${SVCNAME#*-}
+
+depend() {
+	need kannel-bearerbox
+}
+
+checkconfig() {
+	if [ ! -f /etc/kannel/kannel.conf ] ; then
+		eerror "/etc/kannel/kannel.conf file doesn't exists!"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	checkpath -o root:kannel -m 0770 -d /var/run/kannel
+
+	ebegin "Starting kannel ${KANNEL_SERVICE}"
+	start-stop-daemon --start --quiet --exec /usr/sbin/${KANNEL_SERVICE} -- \
+		--daemonize --user kannel --logfile /var/log/kannel/${KANNEL_SERVICE}.log \
+		--pid-file /var/run/kannel/${KANNEL_SERVICE}.pid /etc/kannel/kannel.conf
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping kannel ${KANNEL_SERVICE}"
+	start-stop-daemon --stop --verbose --pidfile /var/run/kannel/${KANNEL_SERVICE}.pid
+	eend $?
+}
diff --git a/app-mobilephone/kannel/files/kannel-wapbox.initd b/app-mobilephone/kannel/files/kannel-wapbox.initd
new file mode 100644
index 000000000000..76cb49ac5252
--- /dev/null
+++ b/app-mobilephone/kannel/files/kannel-wapbox.initd
@@ -0,0 +1,33 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+KANNEL_SERVICE=${SVCNAME#*-}
+
+depend() {
+	need kannel-bearerbox
+}
+
+checkconfig() {
+	if [ ! -f /etc/kannel/kannel.conf ] ; then
+		eerror "/etc/kannel/kannel.conf file doesn't exists!"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	checkpath -o root:kannel -m 0770 -d /var/run/kannel
+
+	ebegin "Starting kannel ${KANNEL_SERVICE}"
+	start-stop-daemon --start --quiet --exec /usr/sbin/${KANNEL_SERVICE} -- \
+		--daemonize --user kannel --logfile /var/log/kannel/${KANNEL_SERVICE}.log \
+		--pid-file /var/run/kannel/${KANNEL_SERVICE}.pid /etc/kannel/kannel.conf
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping kannel ${KANNEL_SERVICE}"
+	start-stop-daemon --stop --verbose --pidfile /var/run/kannel/${KANNEL_SERVICE}.pid
+	eend $?
+}
diff --git a/app-mobilephone/kannel/kannel-1.4.3-r2.ebuild b/app-mobilephone/kannel/kannel-1.4.3-r2.ebuild
new file mode 100644
index 000000000000..a61e50f8cc18
--- /dev/null
+++ b/app-mobilephone/kannel/kannel-1.4.3-r2.ebuild
@@ -0,0 +1,119 @@
+# 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
new file mode 100644
index 000000000000..da9badd3016d
--- /dev/null
+++ b/app-mobilephone/kannel/kannel-1.5.0-r3.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WANT_AUTOMAKE=none
+
+inherit 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="debug doc mysql libressl pam pcre postgres sqlite ssl"
+
+RESTRICT="test" # some tests fail with "address already in use"
+
+RDEPEND="
+	sys-libs/e2fsprogs-libs
+	dev-libs/libxml2:2
+	dev-lang/perl
+	sys-libs/zlib
+	ssl? (
+		libressl? ( dev-libs/libressl:0= )
+		!libressl? ( dev-libs/openssl:0= ) )
+	mysql? ( virtual/mysql )
+	sqlite? ( dev-db/sqlite:3 )
+	postgres? ( dev-db/postgresql:=[server] )
+	pcre? ( dev-libs/libpcre:3 )
+	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}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.5.0-custom-wap-ports.patch"
+	"${FILESDIR}/${PN}-1.4.3-autotools.patch"
+	"${FILESDIR}/${PN}-1.4.3-external-libuuid.patch"
+	"${FILESDIR}/${PN}-1.5.0-initgroups.patch"
+)
+
+pkg_setup() {
+	enewgroup kannel
+	enewuser kannel -1 -1 /var/log/kannel kannel
+}
+
+src_prepare() {
+	default
+
+	#by default, use current directory for logging
+	sed -i -e 's:/tmp/::' doc/examples/kannel.conf
+
+	mv configure.in configure.ac || die
+	eautoconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing # some code breaks strict aliasing
+	econf \
+		--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)
+}
+
+# phase disabled by RESTRICT
+# src_test() {
+# 	emake check || die "emake check failed"
+# }
+
+src_install() {
+	default
+
+	if use doc; then
+		emake -j1 DESTDIR="${D}" install-docs || die "emake install-docs failed"
+	fi
+
+	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
+}
+
+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/metadata.xml b/app-mobilephone/kannel/metadata.xml
new file mode 100644
index 000000000000..4eb9c367c77d
--- /dev/null
+++ b/app-mobilephone/kannel/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-needed -->
+<longdescription>Kannel is a compact and very powerful open source WAP and SMS gateway, 
+used widely across the globe both for serving millions of short messages (SMS) 
+and pushing WAP service indications.</longdescription>
+</pkgmetadata>
diff --git a/app-mobilephone/lightblue-0.4-r1 b/app-mobilephone/lightblue-0.4-r1
deleted file mode 100644
index 6bb58c6b289a..000000000000
--- a/app-mobilephone/lightblue-0.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/openobex-1.3 >=dev-python/pybluez-0.9[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
-DESCRIPTION=API for Python which provides simple access to Bluetooth operations
-EAPI=5
-HOMEPAGE=http://lightblue.sourceforge.net/
-IUSE=examples python_targets_pypy python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/openobex-1.3 >=dev-python/pybluez-0.9[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/lightblue/lightblue-0.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cb6743dfd2943283a5b77f20fee13039
diff --git a/app-mobilephone/lightblue/Manifest b/app-mobilephone/lightblue/Manifest
new file mode 100644
index 000000000000..28f6db6b1c4f
--- /dev/null
+++ b/app-mobilephone/lightblue/Manifest
@@ -0,0 +1,3 @@
+DIST lightblue-0.4.tar.gz 204072 BLAKE2B ca3b39aaf729602c1a2a0022f1a5112604b94eea780239337137d5ff9f4bb24b6a9ee1443e1d5bd09dd2a6ff04d0562684d7f0c98028a838a4e4601ed7af2a40 SHA512 aa1446bacc1a75492e9bd604a41f89b72144642e029066f1d5ab85410f701a3c7e45bad9f4a33be1b3c65ac5525e0c9ab0f0fcaa0481795bc412d9e8bd97dac0
+EBUILD lightblue-0.4-r1.ebuild 617 BLAKE2B c6ffbb7326acccd4a13f6681ec95657143438699fc720a4c33a000c0e438ef1f80bcdf4ab262f561773584b767df8f6e9a71d2df89cab9ccb0791cc591f8a39f SHA512 66ed59445edaf5cc1c1dc4d897e1906e64fbc46f5eb5b0ffc49dbd1260b9df5dfb3fa08062bdda8ce1f1c2c7b501aace7fc0ce11ee7642cb1350472243b57929
+MISC metadata.xml 319 BLAKE2B aced104936b20e220b7307488878813f9be4af9285e6ae7e8e0a2422419758f2ecbb0d062f20e392cb663aabf936b5d04ed8c309ae24457f3ccdd30df7445cda SHA512 1c34ee3368d5af5b7e361dda14dbd46207b3d0ef3b787530f2e5c5b6dd39414dfe9094945dea7ed57cedea5c7df803a3a37264099bb90b64a39fe375c8a73153
diff --git a/app-mobilephone/lightblue/lightblue-0.4-r1.ebuild b/app-mobilephone/lightblue/lightblue-0.4-r1.ebuild
new file mode 100644
index 000000000000..1ddc89fd0cb2
--- /dev/null
+++ b/app-mobilephone/lightblue/lightblue-0.4-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+inherit distutils-r1
+
+DESCRIPTION="API for Python which provides simple access to Bluetooth operations"
+HOMEPAGE="http://lightblue.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="examples"
+
+DEPEND="
+	>=dev-libs/openobex-1.3
+	>=dev-python/pybluez-0.9[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/app-mobilephone/lightblue/metadata.xml b/app-mobilephone/lightblue/metadata.xml
new file mode 100644
index 000000000000..075af935775b
--- /dev/null
+++ b/app-mobilephone/lightblue/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">lightblue</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-mobilephone/metadata.xml b/app-mobilephone/metadata.xml
new file mode 100644
index 000000000000..f1c904e355a5
--- /dev/null
+++ b/app-mobilephone/metadata.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The app-mobilephone category contains software for working with mobile phones.
+	</longdescription>
+	<longdescription lang="ja">
+		app-mobilephoneカテゴリにはケタイと使うソフトウェアが含まれます。
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm app-mobilephone chứa các phần mềm hoạt động với
+		điện thoại di động.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie app-mobilephone enthält Software für das Arbeiten mit Mobiltelefonen.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria app-mobilephone contiene software per la telefonia mobile.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria app-mobilephone contém programas para trabalhar com
+		telefones celulares.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria app-mobilephone zawiera oprogramowanie do współpracy z
+		telefonami komórkowymi.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría app-mobilephone contiene software para trabajar con
+		teléfonos móviles.
+	</longdescription>
+</catmetadata>
+
diff --git a/app-mobilephone/obexftp-0.24-r1 b/app-mobilephone/obexftp-0.24-r1
deleted file mode 100644
index 384b14cfe275..000000000000
--- a/app-mobilephone/obexftp-0.24-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/openobex-1.7 net-wireless/bluez perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) tcl? ( dev-lang/tcl:0= ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) tcl? ( dev-lang/swig ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=File transfer over OBEX for mobile phones
-EAPI=5
-HOMEPAGE=http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp
-IUSE=perl python ruby tcl python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=amd64 hppa ppc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/openobex-1.7 net-wireless/bluez perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) tcl? ( dev-lang/tcl:0= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/openobex/obexftp-0.24-Source.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=08d5675be3c2fd382c155584d4eff84a
diff --git a/app-mobilephone/obexftp-0.24.2 b/app-mobilephone/obexftp-0.24.2
deleted file mode 100644
index fcad23a3502e..000000000000
--- a/app-mobilephone/obexftp-0.24.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/openobex-1.7 net-wireless/bluez perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) tcl? ( dev-lang/tcl:0= ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) tcl? ( dev-lang/swig ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=File transfer over OBEX for mobile phones
-EAPI=6
-HOMEPAGE=http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp
-IUSE=perl python ruby tcl python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~hppa ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/openobex-1.7 net-wireless/bluez perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) tcl? ( dev-lang/tcl:0= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/openobex/obexftp-0.24.2-Source.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e3cb342ad09b95bbac040edc90848a08
diff --git a/app-mobilephone/obexftp/Manifest b/app-mobilephone/obexftp/Manifest
new file mode 100644
index 000000000000..9e2f45e8e59a
--- /dev/null
+++ b/app-mobilephone/obexftp/Manifest
@@ -0,0 +1,13 @@
+AUX obexftp-0.23-gentoo.patch 388 BLAKE2B f45673c18551bf3278d5722f1156e0259a665a00c5f0c97f2489c4ec30fef6b097923cfacfad099879a2249fd8aa372a759742fba7157b8a9fe4091aa148f21f SHA512 73dba3d616e92f198d1ef7a1e3da720c83f5ce02869f9a677630e78451e360728db01fc98ab0a67b9e49ac04fbf801a27d5402dc2c210a82ac13fa57e94972cc
+AUX obexftp-0.24-config.patch 165 BLAKE2B 83e337f534d9ef6763ca6d31a2c3982ce747470f4673344ddb01c5523b2e08bd15995191cafc2d6ab7f97de7784580934d63153e786995806db3fee352de4c2c SHA512 8ac60a20d98c020d90d232d0c823052a6d183cca39405d72295136271a388e562586622ea5432edd94cdc0c52745381e03c7e162aba10fa9c07d6763570e66f4
+AUX obexftp-0.24-enable_bluetooth.patch 421 BLAKE2B 35fc565da087b00fe194f8407a2119547413d2adf2671aa1a9026b95da8ab3c937e7ead692c53c85b06b5615df3c76c84a13531a30f1135c6cb08d3c0ce42b75 SHA512 1ebd5ab061dc733f7d8b7650bd4c27bcd2eff8b816cb283afcc2c984332903ac6f9d4cd08e49e3b64e0bcf976d8781d561b6666e43d5567fa8ee2ec91a232902
+AUX obexftp-0.24-fuse.patch 786 BLAKE2B 77153b0773be2c11c6a63a0c77daaf67a66fbaa47047e4b0e49106138009f3c0ca0284a7dc17c6f8ef6e5536f5d74f89f610fc998635bfadf017be9fac0fc794 SHA512 0c5fed0db46021056e21decb70d4c93a2e691e4f919447fb9ec3818376564ea742936104a07c77448456b5320030e0ce66678ba1f210d4a4c9c0942964db9838
+AUX obexftp-0.24-norpath.patch 641 BLAKE2B ba8de051365bc6417a6421cde50399a92754aa7c2b5523888580cf5d58e2d41f1393b21bf74ce38ecf1f292cca512dd929407443ba50dba65d53204654b38de3 SHA512 876502ac2325e0969e9e8bcdb59325e6dce07468fc106b7fb44befcf6e45d766e7e333d58a5392e376d70baa1532fe5f93cfc7d6a8125735df54a09849e68203
+AUX obexftp-0.24-pkgconfig_requires.patch 399 BLAKE2B 56e8debd7f0a4231acb27423284c18a365df9a6c0f04efbc7c3da05210021770da8de5b4676455bd962031726874bad60a1b3bbc14769aeda095080720adb82d SHA512 ade75cf148d50223d30bd0a075303c8ca686dbf7f1e099c317e7a5d9d2b929743f5fd613b29a4c6af46b48e8a3dd74cd0db8d08df9823699dce6da9e84222749
+AUX obexftp-0.24-python_sitedir.patch 544 BLAKE2B d86883dca5cc9795a07a0a306692cfe63774054d7f6358a3c2a581e2a77f85fef2c3e9fbaff8d8d21d860ced636159532d2fede546ff28146c452e0a2ea33910 SHA512 519e77d8a3ff4b7a9779e350191b8389c27f7bf42abd44704508341d9fdabb0bf9b456fc4cccd93779fc4b54ddcf3cabb38e55f2ea3389b90a85e27de18e0b6a
+AUX obexftp-0.24.2-parallel-build.patch 1251 BLAKE2B 538d82b8e14ec874323d1578c6ccd10d3418cd0efda61bf3752aaea04b22ac357b2792783cf3a86d6c7ec2aa33bd0bbacdf9b99f2082b427fc56d241b2a57849 SHA512 0f7bf40bde282faa6e6c5fc9bab4d5f4d95c9c09581b2e5bfa2f7490714da09c41c3b02789c3ddd7bb2be5d5960aa59587796685a4a250b7f60095237ce77eba
+DIST obexftp-0.24-Source.tar.gz 88154 BLAKE2B 6124a59e8e8af555256fb910b1efd3ae630e97e71559fa3d5e488e911251d98f3f4ba543cb88723f0bc561b4753afc9b613410da51d7d8695182cdfb9cbaf7ab SHA512 785449665f5e9269d7bfd15f379bd8fbad321780292e56341e2089d6894255b7301fc23bb27a80e4e6f6317a130b658dedd307b7ece0fd31ef8f1a109c6f21b9
+DIST obexftp-0.24.2-Source.tar.gz 110291 BLAKE2B 7de93f5f5a367481b22b49c7812357ab5f704830c83770378de13f9c4ffb5f114d48beafca193b52670563b397656ec185519a8d004eb1f9785787e8cc5caaff SHA512 91a5d7e52c00bbaf24837384ceadc987a89297e672b246df1370bbd669fae05459281bc46bb60ba562607bfbead321926cdf11422059cd918819d80321e190c2
+EBUILD obexftp-0.24-r1.ebuild 1818 BLAKE2B 70751aa65c9eaf57b53e832981ccfeaca312d9b2ae444d9ae3c223ce51276def863968d1ad2db3a360f4aa5335098a7d3209de1533bb07a5fb2453ea165f9f93 SHA512 52c97c1785a9524f3ff9d17f6198248f5459312fa21600a5bf04a6466e06c9bcc2d3f662414a20f205d9de4b3c4cbabb0105edc113d5425681805da0d259fc66
+EBUILD obexftp-0.24.2.ebuild 1674 BLAKE2B 250925656ecc33b16c59f0b37e098958f86ca77836e391b7b9ac805efb900cee624204c02425a0dc2feb4d97baba4d9137f07c9a2885003b4149dacba0296487 SHA512 d495aa0502def2c9a4cc6c9f660f7b73a4791f4ba96f2add74d6cedf3f63d75fcec4025056eab682e6d0b7351611b5c3a1beeb8b0786b0eb970c2cdef63f12a5
+MISC metadata.xml 245 BLAKE2B e86e15e6196c5caa30c4dbbcc46d970e3d1fc51b5986c9c5855da2914e104cdc3abe7d23eae94b143047e21603bbd49c23684cca7eed166d90579ccc9dcc742e SHA512 f2f864248cda1ce42c75a7d993ea9d80592f4b5bf957ba7d10e3a26d55429720530c96974403e9d732e2ca67724645f7dfb8b880617a3cc6a3b9d36dd201f433
diff --git a/app-mobilephone/obexftp/files/obexftp-0.23-gentoo.patch b/app-mobilephone/obexftp/files/obexftp-0.23-gentoo.patch
new file mode 100644
index 000000000000..caf0611ff071
--- /dev/null
+++ b/app-mobilephone/obexftp/files/obexftp-0.23-gentoo.patch
@@ -0,0 +1,22 @@
+--- a/obexftp/client.c
++++ b/obexftp/client.c
+@@ -51,8 +51,6 @@
+ 
+ #ifdef HAVE_BLUETOOTH
+ #include "bt_kit.h"
+-#else
+-#define ESOCKTNOSUPPORT	WSAESOCKTNOSUPPORT
+ #endif /* HAVE_BLUETOOTH */
+ 
+ #include <openobex/obex.h>
+--- a/apps/obexftp.c
++++ b/apps/obexftp.c
+@@ -29,6 +29,8 @@
+ 
+ #include <sys/types.h>
+ 
++#include <config.h>
++
+ #ifdef HAVE_SYS_TIMES_H
+ #include <sys/times.h>
+ #endif
diff --git a/app-mobilephone/obexftp/files/obexftp-0.24-config.patch b/app-mobilephone/obexftp/files/obexftp-0.24-config.patch
new file mode 100644
index 000000000000..f923a4b0ed2c
--- /dev/null
+++ b/app-mobilephone/obexftp/files/obexftp-0.24-config.patch
@@ -0,0 +1,11 @@
+--- a/apps/obexftp.c
++++ b/apps/obexftp.c
+@@ -43,8 +43,6 @@
+ 
+ #include <common.h>
+ 
+-#include <config.h>
+-
+ #ifdef HAVE_SYS_TIMES_H
+ #include <sys/times.h>
+ #endif
diff --git a/app-mobilephone/obexftp/files/obexftp-0.24-enable_bluetooth.patch b/app-mobilephone/obexftp/files/obexftp-0.24-enable_bluetooth.patch
new file mode 100644
index 000000000000..ff72fff17e7c
--- /dev/null
+++ b/app-mobilephone/obexftp/files/obexftp-0.24-enable_bluetooth.patch
@@ -0,0 +1,16 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -52,11 +52,13 @@
+ #
+ # some code is only included if bluetooth is available
+ #
++if ( ENABLE_BLUETOOTH )
+ find_package ( Bluetooth )
+ if ( Bluetooth_FOUND )
+   include_directories ( ${Bluetooth_INCLUDE_DIRS} )
+   add_definitions ( -DHAVE_BLUETOOTH -DHAVE_SDP )
+ endif ( Bluetooth_FOUND )
++endif ( ENABLE_BLUETOOTH )
+ 
+ add_subdirectory ( bfb )
+ add_subdirectory ( multicobex )
diff --git a/app-mobilephone/obexftp/files/obexftp-0.24-fuse.patch b/app-mobilephone/obexftp/files/obexftp-0.24-fuse.patch
new file mode 100644
index 000000000000..260cfc2d9a56
--- /dev/null
+++ b/app-mobilephone/obexftp/files/obexftp-0.24-fuse.patch
@@ -0,0 +1,35 @@
+From 2cc82e0ab5a30eaab5461dcc4eed41b095edba3f Mon Sep 17 00:00:00 2001
+From: Hendrik Sattler <post@hendrik-sattler.de>
+Date: Sun, 11 Aug 2013 20:27:29 +0200
+Subject: [PATCH] Install fuse apps
+
+---
+ fuse/CMakeLists.txt |    7 ++++++-
+ 1 files changed, 6 insertions(+), 1 deletions(-)
+
+diff --git a/fuse/CMakeLists.txt b/fuse/CMakeLists.txt
+index c31a5fc..7d5f7ea 100644
+--- a/fuse/CMakeLists.txt
++++ b/fuse/CMakeLists.txt
+@@ -14,7 +14,6 @@ if ( Fuse_FOUND )
+     ${Fuse_LIBRARIES}
+   )
+ 
+-
+   add_executable ( obexautofs
+     obexautofs.c
+   )
+@@ -23,4 +22,10 @@ if ( Fuse_FOUND )
+     obexftp
+     ${Fuse_LIBRARIES}
+   )
++
++  install ( TARGETS obexfs obexautofs
++    RUNTIME
++      DESTINATION ${CMAKE_INSTALL_BINDIR}
++      COMPONENT applications
++  )
+ endif ( Fuse_FOUND )
+-- 
+1.7.1
+
diff --git a/app-mobilephone/obexftp/files/obexftp-0.24-norpath.patch b/app-mobilephone/obexftp/files/obexftp-0.24-norpath.patch
new file mode 100644
index 000000000000..75a240177182
--- /dev/null
+++ b/app-mobilephone/obexftp/files/obexftp-0.24-norpath.patch
@@ -0,0 +1,11 @@
+--- obexftp-0.22/swig/perl/Makefile.PL.in.norpath	2007-07-11 21:22:30.000000000 +0200
++++ obexftp-0.22/swig/perl/Makefile.PL.in	2007-08-06 20:17:39.000000000 +0200
+@@ -11,7 +11,7 @@ WriteMakefile(
+     'INC'       =>	q[-I@top_srcdir@ @CPPFLAGS@],
+ # Default value for LDDLFLAGS is $Config{lddlflags}="-shared -L/usr/local/lib"
+ # but we want rpath to be @libdir@ or @exec_prefix@/lib
+-    'LDDLFLAGS' =>      q[-shared -Wl,-rpath=@prefix@/lib],
++    'LDDLFLAGS' =>      q[-shared],
+     'LIBS'      =>	q[-L@top_builddir@/obexftp/.libs -lobexftp
+     			  -L@top_builddir@/multicobex/.libs -lmulticobex
+ 			  -L@top_builddir@/bfb/.libs -lbfb
diff --git a/app-mobilephone/obexftp/files/obexftp-0.24-pkgconfig_requires.patch b/app-mobilephone/obexftp/files/obexftp-0.24-pkgconfig_requires.patch
new file mode 100644
index 000000000000..ded4a583330f
--- /dev/null
+++ b/app-mobilephone/obexftp/files/obexftp-0.24-pkgconfig_requires.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -71,7 +71,7 @@
+ set ( exec_prefix "\${prefix}" )
+ set ( libdir      "\${prefix}/${CMAKE_INSTALL_LIBDIR}" )
+ set ( includedir  "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}" )
+-set ( REQUIRES    "bluetooth openobex" )
++set ( REQUIRES    "bluez openobex" )
+ configure_file (
+   ${CMAKE_CURRENT_SOURCE_DIR}/obexftp.pc.in
+   ${CMAKE_CURRENT_BINARY_DIR}/obexftp.pc
diff --git a/app-mobilephone/obexftp/files/obexftp-0.24-python_sitedir.patch b/app-mobilephone/obexftp/files/obexftp-0.24-python_sitedir.patch
new file mode 100644
index 000000000000..24cc46050ab4
--- /dev/null
+++ b/app-mobilephone/obexftp/files/obexftp-0.24-python_sitedir.patch
@@ -0,0 +1,16 @@
+--- a/swig/python/CMakeLists.txt
++++ b/swig/python/CMakeLists.txt
+@@ -40,11 +40,13 @@
+   OUTPUT_VARIABLE PYTHON_PREFIX
+ )
+ file ( TO_CMAKE_PATH "${PYTHON_PREFIX}" PYTHON_PREFIX )
++if ( NOT PYTHON_SITE_DIR )
+ execute_process (
+   COMMAND ${PYTHON_EXECUTABLE} -c
+   	"import site, sys; sys.stdout.write(site.getsitepackages()[-1])"
+   OUTPUT_VARIABLE PYTHON_SITE_DIR
+ )
++endif ( PYTHON_SITE_DIR )
+ file ( TO_CMAKE_PATH "${PYTHON_SITE_DIR}" PYTHON_SITE_DIR )
+ string ( REGEX REPLACE "^${PYTHON_PREFIX}/" ""
+   PYTHON_SITE_DIR "${PYTHON_SITE_DIR}"
diff --git a/app-mobilephone/obexftp/files/obexftp-0.24.2-parallel-build.patch b/app-mobilephone/obexftp/files/obexftp-0.24.2-parallel-build.patch
new file mode 100644
index 000000000000..78a8a7426320
--- /dev/null
+++ b/app-mobilephone/obexftp/files/obexftp-0.24.2-parallel-build.patch
@@ -0,0 +1,53 @@
+diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
+index b5c84e4..63af134 100644
+--- a/apps/CMakeLists.txt
++++ b/apps/CMakeLists.txt
+@@ -5,14 +5,23 @@ add_definitions( -DVERSION="${obexftp_VERSION}" )
+ add_definitions ( -DHAVE_USB )
+ 
+ add_executable ( obexftp_app obexftp.c )
+-target_link_libraries ( obexftp_app obexftp )
++target_link_libraries ( obexftp_app
++  PRIVATE multicobex
++  PRIVATE bfb
++  obexftp
++)
+ set_target_properties ( obexftp_app PROPERTIES
+   OUTPUT_NAME obexftp
+ )
+ 
+ 
+ add_executable ( obexftpd_app obexftpd.c )
+-target_link_libraries ( obexftpd_app obexftp openobex )
++target_link_libraries ( obexftpd_app
++  PRIVATE multicobex
++  PRIVATE bfb
++  obexftp
++  openobex
++)
+ set_target_properties ( obexftpd_app PROPERTIES
+   OUTPUT_NAME obexftpd
+ )
+diff --git a/fuse/CMakeLists.txt b/fuse/CMakeLists.txt
+index 0c80d3d..ff5e3cd 100644
+--- a/fuse/CMakeLists.txt
++++ b/fuse/CMakeLists.txt
+@@ -13,6 +13,8 @@ if ( Fuse_FOUND )
+   )
+ 
+   target_link_libraries ( obexfs
++    PRIVATE multicobex
++    PRIVATE bfb
+     obexftp
+     ${Fuse_LIBRARIES}
+     ${EXPAT_LIBRARIES}
+@@ -23,6 +25,8 @@ if ( Fuse_FOUND )
+   )
+ 
+   target_link_libraries ( obexautofs
++    PRIVATE multicobex
++    PRIVATE bfb
+     obexftp
+     ${Fuse_LIBRARIES}
+   )
+
diff --git a/app-mobilephone/obexftp/metadata.xml b/app-mobilephone/obexftp/metadata.xml
new file mode 100644
index 000000000000..1b474448ed2d
--- /dev/null
+++ b/app-mobilephone/obexftp/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-needed -->
+	<upstream>
+		<remote-id type="sourceforge">openobex</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-mobilephone/obexftp/obexftp-0.24-r1.ebuild b/app-mobilephone/obexftp/obexftp-0.24-r1.ebuild
new file mode 100644
index 000000000000..88e346c57503
--- /dev/null
+++ b/app-mobilephone/obexftp/obexftp-0.24-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+USE_RUBY="ruby23 ruby24 ruby25"
+
+inherit cmake-utils python-single-r1 python-utils-r1 ruby-single eutils multilib
+
+DESCRIPTION="File transfer over OBEX for mobile phones"
+HOMEPAGE="http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp"
+SRC_URI="mirror://sourceforge/openobex/${P}-Source.tar.gz"
+SLOT="0"
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 hppa ppc x86"
+
+# bluetooth support is not really optional, bug #529068
+IUSE="perl python ruby tcl" #bluetooth
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-libs/openobex-1.7
+	net-wireless/bluez
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( ${RUBY_DEPS} )
+	tcl? ( dev-lang/tcl:0= )
+"
+DEPEND="
+	${RDEPEND}
+	perl? ( dev-lang/swig )
+	python? ( dev-lang/swig )
+	ruby? ( dev-lang/swig )
+	tcl? ( dev-lang/swig )
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${P}-Source
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.23-gentoo.patch
+	"${FILESDIR}"/${PN}-0.24-config.patch
+	"${FILESDIR}"/${PN}-0.24-enable_bluetooth.patch
+	"${FILESDIR}"/${PN}-0.24-python_sitedir.patch
+	"${FILESDIR}"/${PN}-0.24-norpath.patch
+	"${FILESDIR}"/${PN}-0.24-fuse.patch
+	"${FILESDIR}"/${PN}-0.24-pkgconfig_requires.patch
+)
+
+src_configure() {
+# -DENABLE_BLUETOOTH=$(usex bluetooth)
+	local mycmakeargs=(
+		-DCMAKE_BUILD_TYPE=Release
+		-DCMAKE_SKIP_RPATH=ON
+		-DENABLE_PERL=$(usex perl)
+		-DENABLE_BLUETOOTH=yes
+		-DENABLE_PYTHON=$(usex python)
+		$(usex python -DPYTHON_SITE_DIR=$(python_get_sitedir) '')
+		-DENABLE_RUBY=$(usex ruby)
+		-DENABLE_TCL=$(usex tcl)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	rm -rf "${ED}"/usr/share/doc/${PN}/html || die #524866
+}
diff --git a/app-mobilephone/obexftp/obexftp-0.24.2.ebuild b/app-mobilephone/obexftp/obexftp-0.24.2.ebuild
new file mode 100644
index 000000000000..3527d2552090
--- /dev/null
+++ b/app-mobilephone/obexftp/obexftp-0.24.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+USE_RUBY="ruby23 ruby24 ruby25"
+
+inherit cmake-utils python-single-r1 ruby-single
+
+DESCRIPTION="File transfer over OBEX for mobile phones"
+HOMEPAGE="http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp"
+SRC_URI="mirror://sourceforge/openobex/${P}-Source.tar.gz"
+SLOT="0"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+
+# bluetooth support is not really optional, bug #529068
+IUSE="perl python ruby tcl"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-libs/openobex-1.7
+	net-wireless/bluez
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( ${RUBY_DEPS} )
+	tcl? ( dev-lang/tcl:0= )
+"
+DEPEND="${RDEPEND}
+	perl? ( dev-lang/swig )
+	python? ( dev-lang/swig )
+	ruby? ( dev-lang/swig )
+	tcl? ( dev-lang/swig )
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${P}-Source
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.23-gentoo.patch
+	"${FILESDIR}"/${PN}-0.24-config.patch
+	"${FILESDIR}"/${PN}-0.24-enable_bluetooth.patch
+	"${FILESDIR}"/${PN}-0.24-python_sitedir.patch
+	"${FILESDIR}"/${PN}-0.24-norpath.patch
+	"${FILESDIR}"/${P}-parallel-build.patch
+)
+
+src_configure() {
+# -DENABLE_BLUETOOTH=$(usex bluetooth)
+	local mycmakeargs=(
+		-DCMAKE_BUILD_TYPE=Release
+		-DCMAKE_SKIP_RPATH=ON
+		-DENABLE_PERL=$(usex perl)
+		-DENABLE_BLUETOOTH=yes
+		-DENABLE_PYTHON=$(usex python)
+		$(usex python -DPYTHON_SITE_DIR=$(python_get_sitedir) '')
+		-DENABLE_RUBY=$(usex ruby)
+		-DENABLE_TCL=$(usex tcl)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	rm -rf "${ED}"/usr/share/doc/${PN}/html || die #524866
+}
diff --git a/app-mobilephone/pysms-0.9.4-r1 b/app-mobilephone/pysms-0.9.4-r1
deleted file mode 100644
index e760432cfc02..000000000000
--- a/app-mobilephone/pysms-0.9.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Tool for sending text messages for various Swiss providers
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/pysms/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/pysms/pysms-0.9.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ffc48973beaf30c1a0ef10dd17c20b68
diff --git a/app-mobilephone/pysms/Manifest b/app-mobilephone/pysms/Manifest
new file mode 100644
index 000000000000..28315b45823f
--- /dev/null
+++ b/app-mobilephone/pysms/Manifest
@@ -0,0 +1,3 @@
+DIST pysms-0.9.4.tar.gz 57843 BLAKE2B eded164faa92d70a288e483868b518dc68e1096565642816d13ca1ac4e23c3ed57cef6d497293a6245e0df64bb64b23cf52e29ae62b393ed0de35503001555ee SHA512 7f2a1279368b68ef17e16f346079aa5f3daf50c7ab43570425e9be8c5144e6c291390e4178fded52f7fcd16aeb2960993897036d09ee265f2717fe60d583e8d9
+EBUILD pysms-0.9.4-r1.ebuild 612 BLAKE2B 041d5783985c7edaef556b4f69699770f909d7edb902e5982a6bb5fe67b6d76158f6d3b68acacc59cb425eba57873245eef7c0a5faf13574cae5006ec8f1b0a0 SHA512 7f51e465ec57a4af5c216ca8dc69d5912331b760b6d98d88b000fbce653afe0ede8cbc18010dc28645da6296c49704568291a93356cf2ffff720f90b234570d4
+MISC metadata.xml 337 BLAKE2B 68ded48ec58a70583592db601d1ef5d6a4e22783a6fa83a1c58524ebbba2bcd5141b809eaf4cea084bd1f49a28f73829899311e37b383e5a91103ed0bee46d81 SHA512 0aabed409e114ac8ce489ddd5caae70fcd10f02b9d62baab5749a7612275b2abfd555e584734d30cf1b9b60d205bf3769e8445b1e048ec8e7251e8e759a4fd2d
diff --git a/app-mobilephone/pysms/metadata.xml b/app-mobilephone/pysms/metadata.xml
new file mode 100644
index 000000000000..012e58409b5f
--- /dev/null
+++ b/app-mobilephone/pysms/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>Tool for sending text messages for various Swiss providers</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">pysms</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-mobilephone/pysms/pysms-0.9.4-r1.ebuild b/app-mobilephone/pysms/pysms-0.9.4-r1.ebuild
new file mode 100644
index 000000000000..492f6b098e02
--- /dev/null
+++ b/app-mobilephone/pysms/pysms-0.9.4-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Tool for sending text messages for various Swiss providers"
+HOMEPAGE="https://sourceforge.net/projects/pysms/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/pygtk[${PYTHON_USEDEP}]"
+
+python_prepare() {
+	sed -e "s:0.9.1:0.9.4:" \
+		-e "s/Application;Network/Network/" \
+		-i data/pysms.desktop || die
+	rm -f MANIFEST.in
+
+	distutils-r1_python_prepare
+}
diff --git a/app-mobilephone/qtadb-0.8.1-r1 b/app-mobilephone/qtadb-0.8.1-r1
deleted file mode 100644
index 38cda69d00a0..000000000000
--- a/app-mobilephone/qtadb-0.8.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 app-arch/unzip
-DESCRIPTION=Android phone manager via ADB
-EAPI=6
-HOMEPAGE=https://qtadb.wordpress.com
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5
-SLOT=0
-SRC_URI=https://bitbucket.org/michalmotyczko/qtadb/get/ccbb0c86c9eb.zip -> qtadb-0.8.1.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=e1c00c6ee8982a9a2bd4c5950314ebe2
diff --git a/app-mobilephone/qtadb/Manifest b/app-mobilephone/qtadb/Manifest
new file mode 100644
index 000000000000..68c94d7d1d8f
--- /dev/null
+++ b/app-mobilephone/qtadb/Manifest
@@ -0,0 +1,5 @@
+AUX qtadb-0.8.1-qt5-5.11.patch 384 BLAKE2B 76487036a89f895231b81193bd556b0d4d6587eb44b2d71ce2c4d14cbf236869513763490031c72dd94f5320a1b1985fefdd1c6f1f87aff073f0c33e60af92ae SHA512 364fa51f7185d09c642b770764cf86ceafceb25b1040b7949e69ae929fd7a3ab9ff3dd9556780466de79ac4a90bbc88e0a71d742b8f279072bd3aa87d2b9b04c
+AUX qtadb-0.8.1-qt5.patch 3359 BLAKE2B 05dd84a9ebc3ab983949e9ce8c10ac675298513e14df1cf2a52a8ed8335d57cdfb04a9c65e05cba7811a9e3f2ec79853102749a3b8009cf36fc0ce3ad91ff1d6 SHA512 f7f9c7521dd0803d588e4393b33bf967ac9d67fddae91f1ca9d4627655690375074ac0f50ab9207fc8ed35b430d91586ce36a519b848685f0b900fe362921306
+DIST qtadb-0.8.1.zip 1104845 BLAKE2B f6f7c08b07c2e59d79e9807850f3ccdedbbc1aff2b94556de748aadc7c26ff8f8bc41275e44e4b4f8249bc1806803c5fea27426d5f895959d546610c0ae07245 SHA512 b407198edd6267ef70e5e2e3b8a094c7b9d9a0bc49dce7e60787e76a1da6e752dd92d7ddbf62a133c44b79118365820b0e710c862c15c9b79f2d7ddf3bc13fd7
+EBUILD qtadb-0.8.1-r1.ebuild 1869 BLAKE2B 335eb5089a109d7af23f4999da7b0c92f7ad9dffaba54cd918c7e29f2626ec73d1d8ba27e4835c3d34f7550c5dce9ae04e42512323b4773800935e69920be619 SHA512 930e186fc27d1e936da2f3b264806fd3413284291dcd5e3f2bf54776d7d45d1b417958d63de0f5291443fbc1f3d2d170b9e2ab4ef6b1c03c2135bb4847f76bee
+MISC metadata.xml 246 BLAKE2B 3c4b49dc551db6bcb78e0cb748e76e98d3df5450d27e9ce4cc5f4df0ea5151bdd183641418042aa15a405753813c32817ec2140e987fcc603aecb71ff927f712 SHA512 ae23d702d83f56528c1f09a14f7f5643e28d91fe80a5af5cfa1126288bb1c66f1dc8262a06e4d539921d1564cc4ef33302d5d5db77bfad1bb0391f6bbab66653
diff --git a/app-mobilephone/qtadb/files/qtadb-0.8.1-qt5-5.11.patch b/app-mobilephone/qtadb/files/qtadb-0.8.1-qt5-5.11.patch
new file mode 100644
index 000000000000..49cd49384810
--- /dev/null
+++ b/app-mobilephone/qtadb/files/qtadb-0.8.1-qt5-5.11.patch
@@ -0,0 +1,14 @@
+--- a/widgets/filewidget.cpp	2014-11-22 12:44:42.000000000 +0100
++++ b/widgets/filewidget.cpp	2018-03-17 22:52:25.103930971 +0100
+@@ -21,9 +21,10 @@
+ #include "filewidget.h"
+ #include "ui_filewidget.h"
+ 
+-#include <QStandardPaths>
++#include <QHeaderView>
+ #include <QMenu>
+ #include <QScrollBar>
++#include <QStandardPaths>
+ 
+ quint32 qbytearrayToInt32(QByteArray array)
+ {
diff --git a/app-mobilephone/qtadb/files/qtadb-0.8.1-qt5.patch b/app-mobilephone/qtadb/files/qtadb-0.8.1-qt5.patch
new file mode 100644
index 000000000000..a9d182a0b6d2
--- /dev/null
+++ b/app-mobilephone/qtadb/files/qtadb-0.8.1-qt5.patch
@@ -0,0 +1,100 @@
+--- a/QtADB.pro	2018-03-17 12:44:50.933918102 -0400
++++ b/QtADB.pro	2018-03-17 12:46:04.896502772 -0400
+@@ -14,11 +14,13 @@
+ #   limitations under the License.
+ #
+ #   @author Jakub Motyczko
+ # -------------------------------------------------
+ QT += network
+-QT += declarative
++QT += widgets
++QT += qml
++QT += quick
+ TARGET = QtADB
+ 
+ TEMPLATE = app
+ SOURCES += main.cpp \
+     ./dialogs/mainwindow.cpp \
+--- a/widgets/messagewidget.h	2018-03-17 12:48:28.691864775 -0400
++++ b/widgets/messagewidget.h	2018-03-17 12:49:55.190870634 -0400
+@@ -21,12 +21,13 @@
+ #ifndef MESSAGEWIDGET_H
+ #define MESSAGEWIDGET_H
+ 
+ #include <QtGui>
+ #include <QtNetwork>
++#include <QtWidgets>
++#include <QQmlContext>
++#include <QQuickView>
+-#include <QDeclarativeView>
+-#include <QDeclarativeContext>
+ 
+ #include "../classes/models/messagethreadmodel.h"
+ #include "../classes/models/contactmodel.h"
+ 
+ 
+@@ -46,12 +49,12 @@
+ protected:
+     void changeEvent(QEvent *e);
+ 
+ private:
+     Ui::MessageWidget *ui;
+-    QDeclarativeView *qmlView;
+-    QDeclarativeContext *qmlViewCtx;
++    QQuickView *qmlView;
++    QQmlContext *qmlViewCtx;
+ 
+     MessageModel messageModel;
+     MessageThreadModel messageThreadModel;
+     ContactModel contactModel;
+     QSortFilterProxyModel sortModel;
+--- a/widgets/appwidget.h	2018-03-17 12:58:56.731870593 -0400
++++ b/widgets/appwidget.h	2018-03-17 13:03:39.366822784 -0400
+@@ -20,10 +20,11 @@
+ 
+ #ifndef APPWIDGET_H
+ #define APPWIDGET_H
+ 
+ #include <QtGui>
++#include <QtWidgets>
+ 
+ #include "../classes/phone.h"
+ #include "../classes/computer.h"
+ #include "../dialogs/appinfo.h"
+ #include "../dialogs/appdialog.h"
+--- a/widgets/messagewidget.cpp	2018-03-17 16:34:54.003310530 -0400
++++ b/widgets/messagewidget.cpp	2018-03-17 16:34:14.545124690 -0400
+@@ -51,11 +51,11 @@
+     this->sortContactModel.setSortRole(ContactModel::NameRole);
+     this->sortContactModel.sort(0, Qt::AscendingOrder);
+ 
+     this->messageCount=0;
+ 
+-    this->qmlView =  new QDeclarativeView;
++    this->qmlView =  new QQuickView;
+     this->qmlViewCtx = this->qmlView->rootContext();
+     if (QFile::exists("qml/messageView.qml"))
+         this->qmlView->setSource(QUrl::fromLocalFile("qml/messageView.qml"));
+     else
+         //this->qmlView->setSource(QUrl::fromLocalFile("../messages/qml/messageView.qml"));
+@@ -63,15 +63,17 @@
+     this->qmlViewCtx->setContextProperty("threadModel", &sortThreadModel);
+     this->qmlViewCtx->setContextProperty("contactModel", &sortContactModel);
+     this->qmlViewCtx->setContextProperty("messageModel", &sortModel);
+     this->qmlViewCtx->setContextProperty("myNickname", "Me");
+     this->qmlViewCtx->setContextProperty("contactDefault", "qrc:/icons/contactDefault.png");
+-    qmlView->setResizeMode(QDeclarativeView::SizeRootObjectToView);
+-
++    qmlView->setResizeMode(QQuickView::SizeRootObjectToView);
++    
+     this->qmlViewCtx->setContextProperty("messageWidget", this);
++    QWidget *container = QWidget::createWindowContainer(qmlView, this);
++    container->setFocusPolicy(Qt::TabFocus);
+ 
+-    ui->layoutMessages->addWidget(this->qmlView,1,1);
++    ui->layoutMessages->addWidget(container);
+ 
+     //QSettings settings;
+     //this->sdk = settings.value("sdkPath").toString();
+     this->tcpServer.listen(QHostAddress::Any,4445);
+ 
diff --git a/app-mobilephone/qtadb/metadata.xml b/app-mobilephone/qtadb/metadata.xml
new file mode 100644
index 000000000000..ccb32db02551
--- /dev/null
+++ b/app-mobilephone/qtadb/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="person">
+	<email>hwoarang@gentoo.org</email>
+	<name>Markos Chandras</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-mobilephone/qtadb/qtadb-0.8.1-r1.ebuild b/app-mobilephone/qtadb/qtadb-0.8.1-r1.ebuild
new file mode 100644
index 000000000000..1c1f06337939
--- /dev/null
+++ b/app-mobilephone/qtadb/qtadb-0.8.1-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT=ccbb0c86c9eb
+inherit desktop qmake-utils readme.gentoo-r1
+
+DESCRIPTION="Android phone manager via ADB"
+HOMEPAGE="https://qtadb.wordpress.com"
+SRC_URI="https://bitbucket.org/michalmotyczko/${PN}/get/${COMMIT}.zip -> ${P}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-qt5.patch
+	"${FILESDIR}"/${P}-qt5-5.11.patch
+)
+
+S="${WORKDIR}/michalmotyczko-${PN}-${COMMIT}"
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	newicon images/android.png ${PN}.png
+	make_desktop_entry QtADB QtADB ${PN} \
+		"Qt;PDA;Utility;" || ewarn "Desktop entry creation failed"
+	dobin QtADB
+
+	local DOC_CONTENTS="
+You will need a working Android SDK installation (adb and aapt executables)
+You can install Android SDK a) through portage (emerge android-sdk-update-manager
+and run android to download the actual sdk), b) manually from
+http://developer.android.com/sdk/index.html or c) just grab the adb, aapt linux
+binaries from http://qtadb.wordpress.com/download/
+adb and aapt executables are in the platform-tools subdir of Android SDK.  You
+must run QtADB from this directory as a user able to write a log file in this
+directory.
+
+Also you will need to have ROOT access to your phone along with busybox
+The latter can be found in the Android market
+
+Last, if you want to use the SMS manager of QtADB, you have to install
+QtADB.apk to your device, available here: http://qtadb.wordpress.com/download/
+
+If you have trouble getting your phone connected through usb (driver problem),
+try adbWireless from Android market to get connected through WiFi
+"
+	readme.gentoo_create_doc
+}
diff --git a/app-mobilephone/scmxx-0.9.0 b/app-mobilephone/scmxx-0.9.0
deleted file mode 100644
index 6901d45cd5d5..000000000000
--- a/app-mobilephone/scmxx-0.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=bluetooth? ( net-wireless/bluez ) nls? ( sys-devel/gettext )
-DESCRIPTION=Exchange data with Siemens phones
-EAPI=6
-HOMEPAGE=http://www.hendrik-sattler.de/scmxx/
-IUSE=bluetooth nls
-KEYWORDS=~amd64 x86
-LICENSE=GPL-2
-RDEPEND=bluetooth? ( net-wireless/bluez )
-SLOT=0
-SRC_URI=mirror://sourceforge/scmxx/scmxx-0.9.0.tar.bz2
-_md5_=6f99ad807de59d618b7501512268dbdd
diff --git a/app-mobilephone/scmxx/Manifest b/app-mobilephone/scmxx/Manifest
new file mode 100644
index 000000000000..0970fad39db9
--- /dev/null
+++ b/app-mobilephone/scmxx/Manifest
@@ -0,0 +1,3 @@
+DIST scmxx-0.9.0.tar.bz2 250681 BLAKE2B b9426df1a4c3a78eae17048490a7627b6cd49e91839fa254fc1a06174337ce532228a217c911b7743bf6d87ad986c3148056b63f4f1cc6f82be948315dfdf22c SHA512 755877badfc846fa33ea29a38c9f8408f62d5343e0927438640ac923e8fccfcc1a0ffeae82f707d5ac1632022a15eaa2d9816602420212f171e29505c109f20f
+EBUILD scmxx-0.9.0.ebuild 598 BLAKE2B 8f9dd65cca771acc7787f863407d0ceeca4fc4fd5907a44a49c9bcac9cf5418f0b2189d11d493f1999ba4df5cb42e133591dfc9e346fd37e6516b16d4dc91395 SHA512 6541bd9a4d4620b1ed373ec785ba208f436fc96b573d613ba4007cb944de5b05aa5cf6b501536fe92e5fb518653b43f910700418690f62be193611b77055aff6
+MISC metadata.xml 242 BLAKE2B 1a91514a9e6d19922b92abfd1e5594337c6d665c2e66d8679ff62adf411fa6bf7137f2159a822c89c76f55e23299a5a3e8c32af9e82c1d5b1afa23bafd3976fc SHA512 d0c351265118151d9fba7777f52e66caf64edd684b9b7262536a19e227acd994c7ca7188579ff7aac7a64bf3aed1faa476494c2873359db2be3031284899d7ef
diff --git a/app-mobilephone/scmxx/metadata.xml b/app-mobilephone/scmxx/metadata.xml
new file mode 100644
index 000000000000..126b557691c7
--- /dev/null
+++ b/app-mobilephone/scmxx/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-needed -->
+	<upstream>
+		<remote-id type="sourceforge">scmxx</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-mobilephone/scmxx/scmxx-0.9.0.ebuild b/app-mobilephone/scmxx/scmxx-0.9.0.ebuild
new file mode 100644
index 000000000000..2df2b2dcf4ea
--- /dev/null
+++ b/app-mobilephone/scmxx/scmxx-0.9.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Exchange data with Siemens phones"
+HOMEPAGE="http://www.hendrik-sattler.de/scmxx/"
+SRC_URI="mirror://sourceforge/scmxx/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+IUSE="bluetooth nls"
+
+RDEPEND="bluetooth? ( net-wireless/bluez )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_install() {
+	default
+
+	exeinto /usr/lib/scmxx
+	doexe contrib/*
+
+	doman docs/*.1
+
+	rm docs/README_WIN32.txt || die
+	dodoc AUTHORS BUGS CHANGELOG README TODO docs/*.txt
+}
diff --git a/app-mobilephone/smsclient-2.0.9a-r1 b/app-mobilephone/smsclient-2.0.9a-r1
deleted file mode 100644
index bcdf0a2941ff..000000000000
--- a/app-mobilephone/smsclient-2.0.9a-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup
-DESCRIPTION=Utility to send SMS messages to mobile phones and pagers
-EAPI=5
-HOMEPAGE=http://www.smsclient.org
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.smsclient.org/download/smsclient-2.0.9/smsclient-2.0.9a.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f09365eea8881fa4c30c64ce62fe0e0e
diff --git a/app-mobilephone/smsclient/Manifest b/app-mobilephone/smsclient/Manifest
new file mode 100644
index 000000000000..2b80e4a00f7a
--- /dev/null
+++ b/app-mobilephone/smsclient/Manifest
@@ -0,0 +1,5 @@
+AUX smsclient-2.0.9a-gentoo.patch 6145 BLAKE2B 47844bd58422f1eb7e9beea18f89e5f7dc9e91d3a7201f07b7bbb119b098bc7876621ecb4160276ff914149c4d7dba01a05260339c07a6bc58756d37c22f1440 SHA512 6a1e0f82d430e12050c1b5525d84d3b916790c6b413b15c1cffe61cab815f7c08576edfa06ee66717a475f6c843040bdfc0d12767a22b90c79a800db47417406
+AUX smsclient-2.0.9a-sender.patch 6223 BLAKE2B eac74ed01e7d7737e12902c2a2c5e2fcb9614d2a902b9130c4333ab5d07ca5f8a40f92756fb97b1ff7a4604576a0c9e019f33f4d4c21a6c7ef0df7541160b25a SHA512 13f588aaae9379c44285a7a6a72de196dddd7d31be2fc98b09a0d721492f6ff2a81d4314fee544932876b1996724274a22de78b800f90050c7be4b3bba41a3d6
+DIST smsclient-2.0.9a.tar.gz 151600 BLAKE2B be51d81770d89626d0bb86a013c970add6f2fb60bf5dba4faff898ea7b542a9649274d3ea5a3b76e43ff34494b5e073a78030134af33b9b9cb5f787db0d0ce7c SHA512 85ab34b34cb1b3e1cfeeefed6618ca5cf7c66f26a1f5fe211b079a65694259fc2272abc6fe2e74d008e680d67f057288a704a87558e65e015554517fb99ba89d
+EBUILD smsclient-2.0.9a-r1.ebuild 1340 BLAKE2B a2520fa540c56b1efbfe4055fba39a09122a8b8e3563974081150dd471b5832dabefd956862a67a459eeb7c18e6afa1eed7431e5593d3fb7529f168e9adf7a3a SHA512 38b810b4650bff84218d0bc219ea1934c7c4a02160b6fe2d228a19a3c3c27c61b35b0eee1f44420cc1197d97f82ea7b97c841c847d64041ffd2306c780cd9c95
+MISC metadata.xml 318 BLAKE2B 940df32013c737c9111fe0336d2aba0e5a2fbb6df515a30799a5496feebc25cb1339167c48cb69af4c5521749b608e69671fe901667910583e129d47883077ab SHA512 bad4778937d1a9e0b1b6e4d2dc75f34a15c91ab6a5a865fa823335349127e81a93f874e55f5961bc0e77ac4744105293326128aaafe0360ed11279f5ed856348
diff --git a/app-mobilephone/smsclient/files/smsclient-2.0.9a-gentoo.patch b/app-mobilephone/smsclient/files/smsclient-2.0.9a-gentoo.patch
new file mode 100644
index 000000000000..b38b1309c339
--- /dev/null
+++ b/app-mobilephone/smsclient/files/smsclient-2.0.9a-gentoo.patch
@@ -0,0 +1,122 @@
+diff -Nur smsclient-2.0.9a.orig/config/Makefile.config.linux smsclient-2.0.9a/config/Makefile.config.linux
+--- smsclient-2.0.9a.orig/config/Makefile.config.linux	2006-02-25 12:52:12.203797250 +0200
++++ smsclient-2.0.9a/config/Makefile.config.linux	2006-02-25 12:52:38.837461750 +0200
+@@ -39,7 +39,7 @@
+ PLATFORM = -DLINUX
+ CC       = gcc
+ MAKE     = make
+-CFLAGS   = -O2 -g -I. -Wall -pedantic -fsigned-char $(PLATFORM)
++CFLAGS   += -I. -Wall -pedantic -fsigned-char $(PLATFORM)
+ XTRALIBS = 
+ 
+ # --------------------------------------------------------------------
+@@ -59,7 +59,7 @@
+ MLOCALSMSRC   = .sms_addressbook
+ MGLOBALSMSRC  = $(ETCPREFIX)/etc/smsclient/sms_addressbook
+ MSERVICEDIR   = $(ETCPREFIX)/etc/smsclient
+-MLIBDIR	      = $(PREFIX)/usr/lib/smsclient
++MLIBDIR	      = $(PREFIX)/usr/share/smsclient
+ MLOGFILE      = $(LOGDIR)/smsclient.log
+ MSNPPDLOGFILE = $(LOGDIR)/smsclient.snppdlog
+ MSMSDLOGFILE  = $(LOGDIR)/smsclient.smsdlog
+@@ -80,10 +80,10 @@
+ 
+ # --------------------------------------------------------------------
+ 
+-BINDIR  = $(DESTDIR)/usr/bin
+-ETCDIR  = $(DESTDIR)/etc
+-LIBDIR	= $(DESTDIR)/usr/lib
+-MANDIR  = $(DESTDIR)/usr/share/man
++BINDIR  = /usr/bin
++ETCDIR  = /etc
++LIBDIR	= /usr/lib
++MANDIR  = /usr/share/man
+ MANEXT  = 1
+ INSTALL = /usr/bin/install
+ RM      = /bin/rm -f
+diff -Nur smsclient-2.0.9a.orig/sms/Makefile smsclient-2.0.9a/sms/Makefile
+--- smsclient-2.0.9a.orig/sms/Makefile	2006-02-25 12:52:12.203797250 +0200
++++ smsclient-2.0.9a/sms/Makefile	2006-02-25 12:49:49.166858000 +0200
+@@ -34,28 +34,26 @@
+ all:
+ 
+ install: 
+-	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(MLIBDIR)/services
+-	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(SPOOLDIR)/smsclient
+-	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(SPOOLDIR)/smsclient/errors
+-	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(SPOOLDIR)/smsclient/locks
+-	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(SPOOLDIR)/smsclient/incoming
+-	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(SPOOLDIR)/smsclient/named_pipes
+-	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(SPOOLDIR)/smsclient/services
+-	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(MSERVICEDIR)/scripts
++	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -m 755 -d $(DESTDIR)$(MLIBDIR)/services
++#	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(SPOOLDIR)/smsclient
++#	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(SPOOLDIR)/smsclient/errors
++#	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(SPOOLDIR)/smsclient/locks
++#	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(SPOOLDIR)/smsclient/incoming
++#	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(SPOOLDIR)/smsclient/named_pipes
++#	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(SPOOLDIR)/smsclient/services
++	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -m 755 -d $(DESTDIR)$(MSERVICEDIR)/scripts
+ 
+ 	( cd services ;\
+ 	  for service in * ; do \
+ 		  $(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 644 $$service $(DESTDIR)$(MLIBDIR)/services; \
+-		  $(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(SPOOLDIR)/smsclient/services/$$service ; \
+-		  $(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(SPOOLDIR)/smsclient/errors/$$service ; \
+ 	  done )
+ 
+-	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 644 scripts/email $(DESTDIR)$(MSERVICEDIR)/scripts
+-	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 644 sms_config $(DESTDIR)$(MSERVICEDIR)
+-	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 644 sms_addressbook $(DESTDIR)$(MSERVICEDIR)
+-	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 644 sms_modem $(DESTDIR)$(MSERVICEDIR)
+-	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 644 sms_services $(DESTDIR)$(MSERVICEDIR)
+-	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 644 sms_daemons $(DESTDIR)$(MSERVICEDIR)
++	$(INSTALL) -m 644 scripts/email $(DESTDIR)$(MSERVICEDIR)/scripts
++	$(INSTALL) -m 644 sms_config $(DESTDIR)$(MSERVICEDIR)
++	$(INSTALL) -m 644 sms_addressbook $(DESTDIR)$(MSERVICEDIR)
++	$(INSTALL) -m 644 sms_modem $(DESTDIR)$(MSERVICEDIR)
++	$(INSTALL) -m 644 sms_services $(DESTDIR)$(MSERVICEDIR)
++	$(INSTALL) -m 644 sms_daemons $(DESTDIR)$(MSERVICEDIR)
+ 	
+ uninstall:
+ 	$(RM) $(DESTDIR)$(MLIBDIR)/services/*
+diff -Nur smsclient-2.0.9a.orig/sms/sms_config smsclient-2.0.9a/sms/sms_config
+--- smsclient-2.0.9a.orig/sms/sms_config	2006-02-25 12:52:12.203797250 +0200
++++ smsclient-2.0.9a/sms/sms_config	2006-02-25 12:49:49.166858000 +0200
+@@ -9,7 +9,7 @@
+ 
+ 	SMS_lock_action	     = "BLOCK"
+ 	SMS_lock_retry_delay = 5000000
+-	SMS_lockfile         = "/var/lock/smslock"
++	SMS_lockfile         = "/var/lock/sms/client.lock"
+ 
+ 	# SMS_lockfile        = "/var/opt/sms/smslock"	# UNIXWARE
+ }
+diff -Nur smsclient-2.0.9a.orig/src/client/Makefile smsclient-2.0.9a/src/client/Makefile
+--- smsclient-2.0.9a.orig/src/client/Makefile	2006-02-25 12:52:12.203797250 +0200
++++ smsclient-2.0.9a/src/client/Makefile	2006-02-25 12:49:49.166858000 +0200
+@@ -35,9 +35,9 @@
+ all: ../../bin/sms_client ../../bin/sms_address 
+ 
+ install: ../../bin/sms_client ../../bin/sms_address
+-	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(BINDIR)
+-	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -s ../../bin/sms_client $(BINDIR)
+-	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -s ../../bin/sms_address $(BINDIR)
++	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)/$(BINDIR)
++	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 ../../bin/sms_client $(DESTDIR)/$(BINDIR)
++	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 ../../bin/sms_address $(DESTDIR)/$(BINDIR)
+ 
+ uninstall:
+ 	$(RM) $(BINDIR)/sms_client
+diff -Nur smsclient-2.0.9a.orig/src/logfile/Makefile smsclient-2.0.9a/src/logfile/Makefile
+--- smsclient-2.0.9a.orig/src/logfile/Makefile	2006-02-25 12:52:12.203797250 +0200
++++ smsclient-2.0.9a/src/logfile/Makefile	2006-02-25 12:49:49.166858000 +0200
+@@ -34,7 +34,7 @@
+ all: logfile.o
+ 
+ install:
+-	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(LOGDIR)
++#	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(LOGDIR)
+ 
+ clean:
+ 	$(RM) *.o
diff --git a/app-mobilephone/smsclient/files/smsclient-2.0.9a-sender.patch b/app-mobilephone/smsclient/files/smsclient-2.0.9a-sender.patch
new file mode 100644
index 000000000000..f7339d71cbc5
--- /dev/null
+++ b/app-mobilephone/smsclient/files/smsclient-2.0.9a-sender.patch
@@ -0,0 +1,139 @@
+diff -Nru smsclient-2.0.9a.orig/Changelog smsclient-2.0.9a/Changelog
+--- smsclient-2.0.9a.orig/Changelog	2007-02-03 08:43:40.000000000 +0200
++++ smsclient-2.0.9a/Changelog	2007-02-03 08:43:12.000000000 +0200
+@@ -1,3 +1,7 @@
++2007-02-02 12:00  Andreas Bollhalder <bolle@geodb.org>
++
++	* Added SMS_sender_number to UCP driver
++
+ 2002-03-26 14:00  Koenraad Heijlen <vipie@ulyssis.org>
+ 	
+ 	RELEASED as 2.0.9a
+diff -Nru smsclient-2.0.9a.orig/sms/services/d2 smsclient-2.0.9a/sms/services/d2
+--- smsclient-2.0.9a.orig/sms/services/d2	2002-03-07 00:04:51.000000000 +0200
++++ smsclient-2.0.9a/sms/services/d2	2007-02-03 08:44:55.000000000 +0200
+@@ -14,6 +14,12 @@
+ 	SMS_centre_number = "01722278020"  # D2 SMSC Number
+ 
+ 	# +49 must be added for dialing from outside germany
++
++    # ------------------------------------------------------------
++    # Your sender number.
++    # ------------------------------------------------------------
++
++    # SMS_sender_number = "1234567890"
+ }
+ 
+ # --------------------------------------------------------------------
+diff -Nru smsclient-2.0.9a.orig/sms/services/kpntext smsclient-2.0.9a/sms/services/kpntext
+--- smsclient-2.0.9a.orig/sms/services/kpntext	2007-02-03 08:43:40.000000000 +0200
++++ smsclient-2.0.9a/sms/services/kpntext	2007-02-03 08:43:12.000000000 +0200
+@@ -16,6 +16,12 @@
+ 
+         SMS_centre_number = "0665181802"  # PTT/KPN Telcom service
+                                           # centre number
++
++        # ------------------------------------------------------------
++        # Your sender number.
++        # ------------------------------------------------------------
++
++        # SMS_sender_number = "1234567890"
+ }
+ 
+ # --------------------------------------------------------------------
+diff -Nru smsclient-2.0.9a.orig/sms/services/kpnucp smsclient-2.0.9a/sms/services/kpnucp
+--- smsclient-2.0.9a.orig/sms/services/kpnucp	2007-02-03 08:43:40.000000000 +0200
++++ smsclient-2.0.9a/sms/services/kpnucp	2007-02-03 08:43:12.000000000 +0200
+@@ -16,6 +16,12 @@
+ 
+         SMS_centre_number = "0653141414"  # PTT/KPN Telcom service
+                                           # centre number
++
++        # ------------------------------------------------------------
++        # Your sender number.
++        # ------------------------------------------------------------
++
++        # SMS_sender_number = "1234567890"
+ }
+ 
+ # --------------------------------------------------------------------
+diff -Nru smsclient-2.0.9a.orig/sms/services/swisscom smsclient-2.0.9a/sms/services/swisscom
+--- smsclient-2.0.9a.orig/sms/services/swisscom	2007-02-03 08:43:40.000000000 +0200
++++ smsclient-2.0.9a/sms/services/swisscom	2007-02-03 08:43:12.000000000 +0200
+@@ -13,6 +13,12 @@
+ 
+ 	  SMS_centre_number = "0794998990"  # SWISSCOM SMSC Number (Analog V.34)
+ 	# SMS_centre_number = "0900900941"  # SWISSCOM SMSC Number (ISDN V.120)
++
++    # ------------------------------------------------------------
++    # Your sender number.
++    # ------------------------------------------------------------
++
++    # SMS_sender_number = "1234567890"
+ }
+ 
+ # --------------------------------------------------------------------
+diff -Nru smsclient-2.0.9a.orig/sms/services/telenor smsclient-2.0.9a/sms/services/telenor
+--- smsclient-2.0.9a.orig/sms/services/telenor	2007-02-03 08:43:40.000000000 +0200
++++ smsclient-2.0.9a/sms/services/telenor	2007-02-03 08:43:12.000000000 +0200
+@@ -13,6 +13,12 @@
+ 
+ 	SMS_centre_number =  "90002198"  # TELENOR SMSC Number
+ 	                                 # From Inside Norway
++
++    # ------------------------------------------------------------
++    # Your sender number.
++    # ------------------------------------------------------------
++
++    # SMS_sender_number = "1234567890"
+ }
+ 
+ # --------------------------------------------------------------------
+diff -Nru smsclient-2.0.9a.orig/sms/services/telia smsclient-2.0.9a/sms/services/telia
+--- smsclient-2.0.9a.orig/sms/services/telia	2007-02-03 08:43:40.000000000 +0200
++++ smsclient-2.0.9a/sms/services/telia	2007-02-03 08:43:12.000000000 +0200
+@@ -16,6 +16,12 @@
+ 	# ------------------------------------------------------------
+ 	# +46 must be added for dialing from outside Sweden
+ 	# ------------------------------------------------------------
++
++    # ------------------------------------------------------------
++    # Your sender number.
++    # ------------------------------------------------------------
++
++    # SMS_sender_number = "1234567890"
+ }
+ 
+ #  --------------------------------------------------------------------
+diff -Nru smsclient-2.0.9a.orig/src/driver/ucp.c smsclient-2.0.9a/src/driver/ucp.c
+--- smsclient-2.0.9a.orig/src/driver/ucp.c	2007-02-03 08:43:40.000000000 +0200
++++ smsclient-2.0.9a/src/driver/ucp.c	2007-02-03 08:43:12.000000000 +0200
+@@ -184,6 +184,8 @@
+         /* Place any extended driver    */
+         /* variables here               */
+ 
++        char *szSenderNumber;
++
+ } driver_env;
+ 
+ /* -------------------------------------------------------------------- */
+@@ -197,6 +199,7 @@
+     { RESOURCE_NUMERIC, "SMS_timeout",              0, 0, NULL, 0,  NULL,       10,   &(driver_env.def.timeout)             },
+     { RESOURCE_NUMERIC, "SMS_write_timeout",        0, 0, NULL, 0,  NULL,       10,   &(driver_env.def.write_timeout)       },
+     { RESOURCE_NUMERIC, "SMS_max_deliver",          0, 0, NULL, 0,  NULL,       1,    &(driver_env.def.max_deliver)         },
++    { RESOURCE_STRING,  "SMS_sender_number",        0, 1, NULL, 0,    "",       0,    &(driver_env.szSenderNumber)          },
+     { RESOURCE_NULL,     NULL,                      0, 1, NULL, 0,  NULL,       0,    NULL                                  }
+   };
+ 
+@@ -248,9 +251,9 @@
+ 
+ 
+                             /* data:  AdC/OAdc/OAC/MT/..   */
+-                            /*    ->  recipient///3/...    */
++                            /*    ->  recipient/sender//3/...    */
+ 
+-   nc = sprintf(msgData, "%s///%1.1d/", msisdn, msgType);
++   nc = sprintf(msgData, "%s/%s//%1.1d/", msisdn, driver_env.szSenderNumber, msgType);
+ 
+                             /* ... additional parameters depending on MT */
+                             /* For MT=3 (alphanumeric) this is hex coded */
diff --git a/app-mobilephone/smsclient/metadata.xml b/app-mobilephone/smsclient/metadata.xml
new file mode 100644
index 000000000000..4ac469947f7d
--- /dev/null
+++ b/app-mobilephone/smsclient/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>SMS Client is a UNIX command line based utility which allows you to send SMS messages to mobile phones and pagers.</longdescription>
+</pkgmetadata>
diff --git a/app-mobilephone/smsclient/smsclient-2.0.9a-r1.ebuild b/app-mobilephone/smsclient/smsclient-2.0.9a-r1.ebuild
new file mode 100644
index 000000000000..0bfc36b2e36b
--- /dev/null
+++ b/app-mobilephone/smsclient/smsclient-2.0.9a-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils user
+
+DESCRIPTION="Utility to send SMS messages to mobile phones and pagers"
+HOMEPAGE="http://www.smsclient.org"
+SRC_URI="http://www.smsclient.org/download/${PN}-${PV%?}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+pkg_setup() {
+	enewgroup dialout
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	epatch "${FILESDIR}/${P}-sender.patch"
+	sed -i -e \
+		"s:\$(CFLAGS) -o:\$(CFLAGS) \$(LDFLAGS) -o:g" \
+		src/client/Makefile
+}
+
+src_configure() {
+	rm .configured && ./configure
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR) rc" \
+		RANLIB="$(tc-getRANLIB)" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dosym sms_client /usr/bin/smsclient
+	dosym sms_address /usr/bin/smsaddress
+
+	diropts -g dialout -m 0770
+	keepdir /var/lock/sms
+	diropts
+
+	doman docs/sms_client.1
+	dodoc AUTHORS Changelog* FAQ README* TODO docs/sms_protocol
+}
+
+pkg_config() {
+	local MY_LOGFILE="${ROOT}/var/log/smsclient.log"
+	[ -f "${MY_LOGFILE}" ] || touch "${MY_LOGFILE}"
+	fowners :dialout "${MY_LOGFILE}"
+	fperms g+rwx,o-rwx "${MY_LOGFILE}"
+}
+
+pkg_postinst() {
+	einfo "If you run sms_client as normal user, make sure you are member of dialout group."
+}
diff --git a/app-mobilephone/smstools-3.1.15-r2 b/app-mobilephone/smstools-3.1.15-r2
deleted file mode 100644
index e107babaa738..000000000000
--- a/app-mobilephone/smstools-3.1.15-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Send and receive short messages through GSM modems
-EAPI=5
-HOMEPAGE=http://smstools3.kekekasvi.com/
-IUSE=stats
-KEYWORDS=~x86 ~amd64 ~ppc
-LICENSE=GPL-2
-RDEPEND=sys-process/procps stats? ( >=dev-libs/mm-1.4.0 )
-SLOT=0
-SRC_URI=http://smstools3.kekekasvi.com/packages/smstools3-3.1.15.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b453c81794f53abaf3539312dba2bbd9
diff --git a/app-mobilephone/smstools-3.1.21-r1 b/app-mobilephone/smstools-3.1.21-r1
deleted file mode 100644
index 10fb959c4470..000000000000
--- a/app-mobilephone/smstools-3.1.21-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Send and receive short messages through GSM modems
-EAPI=6
-HOMEPAGE=http://smstools3.kekekasvi.com/
-IUSE=stats
-KEYWORDS=~x86 ~amd64 ~ppc
-LICENSE=GPL-2
-RDEPEND=sys-process/procps stats? ( >=dev-libs/mm-1.4.0 )
-SLOT=0
-SRC_URI=http://smstools3.kekekasvi.com/packages/smstools3-3.1.21.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2d79953e8d22c58cd9f78ef2f498d3f9
diff --git a/app-mobilephone/smstools/Manifest b/app-mobilephone/smstools/Manifest
new file mode 100644
index 000000000000..11536f793ff0
--- /dev/null
+++ b/app-mobilephone/smstools/Manifest
@@ -0,0 +1,11 @@
+AUX 3.1.15-makefile-whitespace.patch 332 BLAKE2B b054af95777e475c16cad361f16860d0193a7b3a444f598308c65e21d33a6de9f81418ea2de4de6ec35c51e6b0152a17a427961226f6d350178f89a70d683be7 SHA512 d8a018b0af45a067fe49a2afe00fa9906d9e9424eec20d75701b903618b6c02929ca4dda17064bf157bd319fc3d2be8803ff71f6a2b6ab8aa2663e528b0f9378
+AUX 3.1.21-gawk-location.patch 395 BLAKE2B c112570a1eb50fab5f28b0e534b7ed2f5039faea9f13b3340ac117cddfc3071185e4bd8636b3649d50959917d8dd2b124c1d43cf92537ed25d7fac40bca5fdb6 SHA512 ec7ebfe9198743c34297b88d082811a597732d3a74b0609a558dac7c4d00d8de02154052e30ffd266600ddc20b6f056e768aa7de4f670ccd0ebc87c061ece321
+AUX smsd.initd3 656 BLAKE2B 51723d4bffe650d5756677a328797d9d634687a0e009553d2a7c2af7eb2f84f0fca7459e11d86dd48929566d6914c6ac7a21c252103ec76116962fa696a4e53e SHA512 36ae79a4d8661a66be5e74fdac4a3055f45ee64049167892fbe4301e8dfe01a3c3365eb7939eda5de6b5d512923078019a1a427f98c33e034f76d253df91ef1d
+AUX smsd.initd4 544 BLAKE2B 7e8ea8dfa369d65beda7b6262c8c5bbf75dccc3a9dd1530c986e26212a51ee2fd5396f559414fdf6bf6c2c116ba0d06e2dbf588619962bfd3e5fb126c4d2e280 SHA512 4060e8ca95ccd7b237f2d32be35e30de532dd03a1b2e88e9c516e7f94383a790bdbac9ed20b482103f425f3b84097bc02308588b313a3651c5d251d92d5f61e2
+AUX smsd.service 232 BLAKE2B e02904692d7d397618e03a759a5d515c95b6c3d7e34f6e8a68642518a412c93738bb9ee3afc9604dc93ea96787dfefc9727e84fa848a647e49d4be67c80d5a28 SHA512 60b2d56b4fb5f174c9a9111891633a1eca6e831a0abad7d348c04d63776af832256a1bf0ed300196c429056106226e98178e60215c867e6ec9f998a7029295d1
+AUX smsd.tmpfiles 28 BLAKE2B 1f7dc406901d08d362ad2ca8ad236c8d5c45166c97501d0b314a644f2fb9994e2d3f9071f61dc8d42f1d1b7aa272b1741aa97bcdffce457a385d0c3f6ec4ad1a SHA512 e8169ac96bff820996b13971f47e40550cbfa87a46f74304c4a42afe5a0fb779e65244dda5c7b3fae40d3eb0a669f2b4d5f5bfeeb576e88e04ddda812da9234a
+DIST smstools3-3.1.15.tar.gz 300088 BLAKE2B 4dcafad43979fff642a26da2ce7850ff09d66678525171643f1fec6bb1358cc48705d73de7b22f77b267a741f740a408ddea5062d75d98561e2381010e56a37b SHA512 6a4cc852327fac27b00fc58def4bbc8caa395552586fe1b84f0f4a9f7f6b00008943b85c86de0821036629c58cf04840a189d711b4ac96f7ddaafd6b340b11fa
+DIST smstools3-3.1.21.tar.gz 356548 BLAKE2B 8bbb65761128a86200a6d47e90456fef076be10cd4081b4e3cdc9456c0176996ee6ee9afbe3d9f2a989d93db706bf5461ddf7f739bc8d70337a842b96eb27a5c SHA512 0587e5020a0318351ca99b68baa1c19411824279055857a5b5aa4e346cae373fe94a811eaca6767bcf991cf849eaaa66ec120f046420531a6088cdde9373db31
+EBUILD smstools-3.1.15-r2.ebuild 1708 BLAKE2B 4d8b9d6889808f333cbe2a5e16f967ee7afe7c14e9ba26e5355d4913a0206151e4226ed8eec9c6e4c48341f23704a2a1d8382fa4e7e95972d3bb78ae7f4c4247 SHA512 a9a50637b3c91ec6d2359d2337c568fb64aa742a18ca6301f3bad37463011dce385640ff58fdd71aea2ad976a696e0b133caf5654990b562ceee1080055dea62
+EBUILD smstools-3.1.21-r1.ebuild 1711 BLAKE2B 8a2a5cb8a7758644d51994f02eaf87158a18a8589b6cfda6ad12fca794f5d4b822c2e09e4e4a58c10d4a183a3eb5d123b1bd34f142e08bf28a7fcc60e59aabc6 SHA512 7ac449c3e40a3fde4144f909b9a368dd1d38fd964333d2c7fe16eebab7865864b395bac86d9a34773306f3cce1ae7c5fd452d3ca4f72b36000d6efeab0b5a35b
+MISC metadata.xml 311 BLAKE2B 7f50942d5ff32e7025c5f0289555117e7c3b22d22ba9a2589ceae11c80d98d8ca00658ab0540a79576ba2b9f807c4a59f4539d253645d4c336079f4db4a5c7f0 SHA512 0ff7191917f66832a0c60952bc0e187f5c82656f6e422d81d4bf4d4d38c9edef5519d696976a3668682c40feb932b510fd96591ea698d7f08d9e4d84d12f641d
diff --git a/app-mobilephone/smstools/files/3.1.15-makefile-whitespace.patch b/app-mobilephone/smstools/files/3.1.15-makefile-whitespace.patch
new file mode 100644
index 000000000000..70455bef6c56
--- /dev/null
+++ b/app-mobilephone/smstools/files/3.1.15-makefile-whitespace.patch
@@ -0,0 +1,11 @@
+--- smstools3/src/Makefile.old	2014-04-25 23:28:46.324045112 +1000
++++ smstools3/src/Makefile	2014-04-25 23:33:26.453061496 +1000
+@@ -43,7 +43,7 @@
+ 
+ ifneq (,$(findstring SOLARIS,$(CFLAGS)))
+ ifeq (,$(findstring DISABLE_INET_SOCKET,$(CFLAGS)))
+-override LFLAGS += -lsocket -lnsl
++	override LFLAGS += -lsocket -lnsl
+ endif
+ endif
+ 
diff --git a/app-mobilephone/smstools/files/3.1.21-gawk-location.patch b/app-mobilephone/smstools/files/3.1.21-gawk-location.patch
new file mode 100644
index 000000000000..e8070a329b99
--- /dev/null
+++ b/app-mobilephone/smstools/files/3.1.21-gawk-location.patch
@@ -0,0 +1,9 @@
+diff -uNr smstools3.ORIG/scripts/hex2bin smstools3/scripts/hex2bin
+--- smstools3.ORIG/scripts/hex2bin	2017-09-11 14:11:48.040928533 +0100
++++ smstools3/scripts/hex2bin	2017-09-11 14:12:00.925927820 +0100
+@@ -1,4 +1,4 @@
+-#!/bin/gawk -f
++#!/usr/bin/gawk -f
+ 
+ # This script reads a hex-dump and converts it to a binary file.
+ # The hex-dump must contain one or more hexadecimal numbers separated
diff --git a/app-mobilephone/smstools/files/smsd.initd3 b/app-mobilephone/smstools/files/smsd.initd3
new file mode 100644
index 000000000000..ae53a7fc0e08
--- /dev/null
+++ b/app-mobilephone/smstools/files/smsd.initd3
@@ -0,0 +1,30 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need localmount
+}
+
+start() {
+	if ! [ -d /var/run/smsd ]; then
+		ebegin "Creating /var/run/smsd for ${SVCNAME}"
+		mkdir /var/run/smsd \
+			&& chown smsd:sms /var/run/smsd \
+			&& chmod 770 /var/run/smsd
+		eend $?
+	fi
+
+	chown smsd:sms /var/log/smsd.log
+	ebegin "Starting smsd"
+	start-stop-daemon -b -u smsd:sms --start --exec /usr/bin/smsd -- \
+		-c /etc/smsd.conf -p /var/run/smsd/smsd.pid \
+		-i /var/run/smsd/smsd.working
+	eend ${?}
+}
+
+stop() {
+	ebegin "Stopping smsd"
+	start-stop-daemon --stop -n smsd
+	eend ${?}
+}
diff --git a/app-mobilephone/smstools/files/smsd.initd4 b/app-mobilephone/smstools/files/smsd.initd4
new file mode 100644
index 000000000000..ff40d472896e
--- /dev/null
+++ b/app-mobilephone/smstools/files/smsd.initd4
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need localmount
+}
+
+start() {
+	checkpath -q -d -m 0770 -o smsd:sms /run/smsd || return 1
+	checkpath -q -f -o smsd:sms /var/log/smsd.log || return 1
+	ebegin "Starting smsd"
+	start-stop-daemon -b -u smsd:sms --start --exec /usr/bin/smsd -- \
+		-c /etc/smsd.conf -p /run/smsd/smsd.pid \
+		-i /run/smsd/smsd.working
+	eend ${?}
+}
+
+stop() {
+	ebegin "Stopping smsd"
+	start-stop-daemon --stop -n smsd
+	eend ${?}
+}
diff --git a/app-mobilephone/smstools/files/smsd.service b/app-mobilephone/smstools/files/smsd.service
new file mode 100644
index 000000000000..1fb436681b4b
--- /dev/null
+++ b/app-mobilephone/smstools/files/smsd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=SMS Server Tools 3
+
+[Service]
+User=smsd
+PIDFile=/run/smsd/smsd.pid
+ExecStart=/usr/bin/smsd -n MAINPROCESS -l/var/log/smsd.log \
+	-p/run/smsd/smsd.pid -i/run/smsd/smsd.working
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-mobilephone/smstools/files/smsd.tmpfiles b/app-mobilephone/smstools/files/smsd.tmpfiles
new file mode 100644
index 000000000000..8978d18f54ad
--- /dev/null
+++ b/app-mobilephone/smstools/files/smsd.tmpfiles
@@ -0,0 +1 @@
+d /run/smsd 0755 smsd sms -
diff --git a/app-mobilephone/smstools/metadata.xml b/app-mobilephone/smstools/metadata.xml
new file mode 100644
index 000000000000..4fedfbd15bb2
--- /dev/null
+++ b/app-mobilephone/smstools/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>chainsaw@gentoo.org</email>
+  <name>Tony Vroon</name>
+</maintainer>
+<use>
+  <flag name="stats">Enable statistic reporting</flag>
+</use>
+</pkgmetadata>
diff --git a/app-mobilephone/smstools/smstools-3.1.15-r2.ebuild b/app-mobilephone/smstools/smstools-3.1.15-r2.ebuild
new file mode 100644
index 000000000000..91694836c4f5
--- /dev/null
+++ b/app-mobilephone/smstools/smstools-3.1.15-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit systemd toolchain-funcs user eutils
+
+DESCRIPTION="Send and receive short messages through GSM modems"
+HOMEPAGE="http://smstools3.kekekasvi.com/"
+SRC_URI="http://smstools3.kekekasvi.com/packages/smstools3-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE="stats"
+
+DEPEND=""
+RDEPEND="sys-process/procps
+	stats? ( >=dev-libs/mm-1.4.0 )"
+
+S="${WORKDIR}/${PN}3"
+
+pkg_setup() {
+	enewgroup sms
+	enewuser smsd -1 -1 /var/spool/sms sms
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-makefile-whitespace.patch"
+	if use stats; then
+		sed -i -e "s:CFLAGS += -D NOSTATS:#CFLAGS += -D NOSTATS:" \
+			"${S}/src/Makefile" || die
+	fi
+	echo "CFLAGS += ${CFLAGS}" >> src/Makefile || die
+}
+
+src_compile() {
+	cd src || die
+	emake \
+		CC="$(tc-getCC)" \
+		LFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin src/smsd
+	cd scripts || die
+	dobin sendsms sms2html sms2unicode unicode2sms
+	dobin hex2bin hex2dec email2sms
+	dodoc mysmsd smsevent smsresend sms2xml sql_demo \
+		smstest.php checkhandler-utf-8 eventhandler-utf-8 \
+		forwardsms regular_run
+	cd .. || die
+
+	keepdir /var/spool/sms/incoming
+	keepdir /var/spool/sms/outgoing
+	keepdir /var/spool/sms/checked
+	fowners -R smsd:sms /var/spool/sms
+	fperms g+s /var/spool/sms/incoming
+
+	newinitd "${FILESDIR}"/smsd.initd3 smsd
+	insopts -o smsd -g sms -m0644
+	insinto /etc
+	newins examples/smsd.conf.easy smsd.conf
+	dohtml -r doc
+
+	systemd_dounit "${FILESDIR}"/smsd.service
+	systemd_newtmpfilesd "${FILESDIR}"/smsd.tmpfiles smsd.conf
+}
+
+pkg_postinst() {
+	touch "${ROOT}"/var/log/smsd.log || die
+	chown -f smsd:sms "${ROOT}"/var/log/smsd.log
+}
diff --git a/app-mobilephone/smstools/smstools-3.1.21-r1.ebuild b/app-mobilephone/smstools/smstools-3.1.21-r1.ebuild
new file mode 100644
index 000000000000..96dfea8f1069
--- /dev/null
+++ b/app-mobilephone/smstools/smstools-3.1.21-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd toolchain-funcs user eutils
+
+DESCRIPTION="Send and receive short messages through GSM modems"
+HOMEPAGE="http://smstools3.kekekasvi.com/"
+SRC_URI="http://smstools3.kekekasvi.com/packages/smstools3-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE="stats"
+
+DEPEND=""
+RDEPEND="sys-process/procps
+	stats? ( >=dev-libs/mm-1.4.0 )"
+
+PATCHES="${FILESDIR}/${PV}-gawk-location.patch"
+S="${WORKDIR}/${PN}3"
+
+pkg_setup() {
+	enewgroup sms
+	enewuser smsd -1 -1 /var/spool/sms sms
+}
+
+src_prepare() {
+	default
+	if use stats; then
+		sed -i -e "s:CFLAGS += -D NOSTATS:#CFLAGS += -D NOSTATS:" \
+			"${S}/src/Makefile" || die
+	fi
+	echo "CFLAGS += ${CFLAGS}" >> src/Makefile || die
+}
+
+src_compile() {
+	cd src || die
+	emake \
+		CC="$(tc-getCC)" \
+		LFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin src/smsd
+	cd scripts || die
+	dobin sendsms sms2html sms2unicode unicode2sms
+	dobin hex2bin hex2dec email2sms
+	dodoc mysmsd smsevent smsresend sms2xml sql_demo \
+		smstest.php checkhandler-utf-8 eventhandler-utf-8 \
+		forwardsms regular_run
+	cd .. || die
+
+	keepdir /var/spool/sms/incoming
+	keepdir /var/spool/sms/outgoing
+	keepdir /var/spool/sms/checked
+	fowners -R smsd:sms /var/spool/sms
+	fperms g+s /var/spool/sms/incoming
+
+	newinitd "${FILESDIR}"/smsd.initd4 smsd
+	insopts -o smsd -g sms -m0644
+	insinto /etc
+	newins examples/smsd.conf.easy smsd.conf
+	dohtml -r doc
+
+	systemd_dounit "${FILESDIR}"/smsd.service
+	systemd_newtmpfilesd "${FILESDIR}"/smsd.tmpfiles smsd.conf
+}
+
+pkg_postinst() {
+	touch "${ROOT}"/var/log/smsd.log || die
+	chown -f smsd:sms "${ROOT}"/var/log/smsd.log
+}
diff --git a/app-mobilephone/sobexsrv-1.0.1-r1 b/app-mobilephone/sobexsrv-1.0.1-r1
deleted file mode 100644
index 12657febd086..000000000000
--- a/app-mobilephone/sobexsrv-1.0.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=dev-libs/openobex net-wireless/bluez gtk? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
-DESCRIPTION=Scripting/Secure OBEX Server (for BlueZ Linux)
-EAPI=6
-HOMEPAGE=http://www.mulliner.org/bluetooth/sobexsrv.php
-IUSE=gtk python_targets_python2_7
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/openobex net-wireless/bluez gtk? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) gtk? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.2 )
-REQUIRED_USE=gtk? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://www.mulliner.org/bluetooth/sobexsrv-1.0.1.tar.gz https://dev.gentoo.org/~joker/sobexsrv-1.0.1-fix64.patch
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=9c81610513951faff24fd41cfe314213
diff --git a/app-mobilephone/sobexsrv/Manifest b/app-mobilephone/sobexsrv/Manifest
new file mode 100644
index 000000000000..c72980197f28
--- /dev/null
+++ b/app-mobilephone/sobexsrv/Manifest
@@ -0,0 +1,7 @@
+AUX conf.d_sobexsrv 1095 BLAKE2B 858ca7030f7809c7eabc1ccd5b856b010a79bc693ef279232ecafa07ccfd99006a72190785308c27c6cd6d9f0422c1fb252e4e85ccb1be11c7445aad59cd2c9e SHA512 c38b6105826208c72392b7e781831ec28e93c60ba63f95e6042c3de9a3097af1e370ccdb832f1993b6e85a0224180b36a92ba97cf9af8a606044a61d9ddf7a05
+AUX init.d_sobexsrv 1473 BLAKE2B f5ed1fccc6de4419a62185fee1460b2acbd101602c09b516c7944a84507f84912b4a493dd9483611ecafbb6ee5083300ba6bf5354e7645240759845c102d6a1f SHA512 0ab5c6020af3c8de1e7f302f1f9b1fb6c8d9f6ef8518f878c48ee396032aa96f2da148e197655a1235a072abf30767e3db8047d0c9c6d7d3606bf9ad30398ec4
+AUX sobexsrv-1.0.1-openobex16.patch 1346 BLAKE2B ec63105eb6db6fd959044134fd66b8b3018093a5efec4b6b6b63c45d9bcca84c678addc56bfefaad0fca1696c148107513a1640473cb37f5320c2fab9a623ded SHA512 a1db1a916c0c2f6f237a4434bf1f11b0b6f540ad62fa9687d886e4ff97f6bb916be7763a24bdc56bf8fd3334ead426e0ed2003c0208c3c743f49b13b2bf8ab2a
+DIST sobexsrv-1.0.1-fix64.patch 25040 BLAKE2B 9796779fdde39c79371a978d4bdb9d6761f9467ecc353096c3d1b13fe1d5aa4f7ceef137d07c52467a175b7bc756e6c747a2800a2dbb2dcd281be463499106c9 SHA512 9d555bee8d03c13061bbe132df6442daa4d8817ef713e92e5150b1994af110c5b01b34f8bcc1c3ae734529e36bb70f56976ab261f860e95e3de3ffe440a7b393
+DIST sobexsrv-1.0.1.tar.gz 27683 BLAKE2B f1aa103aa8a70ea7408ced7b0a3944d0ba61dc9750425160ee95bb69e1f1cf4479fbecef7be3ba4b6cbec2a7f518bed18318ca694545a4606888e7663adb0d38 SHA512 52fe5eff812596caa1f4b8579740ce8b2591db17950d68c093cfdb33ca5b899bfc5c142594843948a29ae0b1bdbe4499a1e24c270c92e61d02fd07a02d9d40cd
+EBUILD sobexsrv-1.0.1-r1.ebuild 1997 BLAKE2B ff1f1ee9b4e2f151744a4e85564c03109871af976c472c454d67db26564d4de199a3e8aac34552e081df3c8f85e0dba75ca7b9cfdb13e1aa6d905967b58c01b5 SHA512 c6df47e37562c499f5fcdc362d463ab008af8743f0dce91ab77f1260a51041f22c5010f45d895fd19b523cef3e27af101e05e46e3ff3a6df7bc0a65b3b4add28
+MISC metadata.xml 920 BLAKE2B ac1ea1fc1f85d7dd43c548d89ef3473bb5b78f2e3ab4275c28db702865e492261db1ab908496661ebda406771d7d8080e9057bed865b703b9920ee86b48c8b34 SHA512 30b149f3e197dc0a45cd27a618a0dcc6c9968dae44576c47dd6ebdedda06d5fed8b03ae1e0f94133804551366a90a97614d5d5eca334dbdabd4398278645aab9
diff --git a/app-mobilephone/sobexsrv/files/conf.d_sobexsrv b/app-mobilephone/sobexsrv/files/conf.d_sobexsrv
new file mode 100644
index 000000000000..1afdc0c772e3
--- /dev/null
+++ b/app-mobilephone/sobexsrv/files/conf.d_sobexsrv
@@ -0,0 +1,35 @@
+# /etc/conf.d/sobexsrv
+# Config file for sobexsrv daemon
+
+# owner of sobexsrv process (don't change, must be existing)
+USER="sobexsrv"
+GROUP="sobexsrv"
+
+# Incomming of pushed files
+INBOX="/var/spool/sobexsrv"
+
+# chroot to INBOX.
+# *NEEDS* the binary to be suid root (not installed by default).
+#CHROOT="yes"
+
+# Listen  on the specified RFCOMM channel. If this option is not specified the
+# first available channel will be used. Legal range for channel is 1-31 and  0
+# to  force  auto  selection of first available channel.
+CHANNEL="10"
+
+# Set Bluetooth security mode-2 level. Legal values are: 1  (insecure)  every-
+# body can connect, 2 authentication required and 3 authentication and encryp-
+# tion required.
+SECURITY_LEVEL="2"
+
+# Don't register OPUSH service at local ServiceDiscoveryProtocol Server.
+#DISABLE_OPUSH="yes"
+# Don't register OBEX-FTP service at local ServiceDiscoveryProtocol Server.
+DISABLE_OBEXFTP="yes"
+DISABLE_OBEXFTP_LISTING="yes"
+
+# Enable transfer log via syslog(8).
+USE_SYSLOG="yes"
+
+# Additional options. See sobexsrv(8)
+#SOBEXSRV_OPT="-l NPTD -m /etc/sobexsrv-mime"
diff --git a/app-mobilephone/sobexsrv/files/init.d_sobexsrv b/app-mobilephone/sobexsrv/files/init.d_sobexsrv
new file mode 100644
index 000000000000..e02530314ca8
--- /dev/null
+++ b/app-mobilephone/sobexsrv/files/init.d_sobexsrv
@@ -0,0 +1,58 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need bluetooth
+	use logger
+}
+
+check_config() {
+	if [ -z "${USER}" ] ; then
+		eerror "Please set \$USER in /etc/conf.d/sobexsrv!"
+		return 1
+	fi
+	if [ -z "${GROUP}" ] ; then
+		eerror "Please set \$GROUP in /etc/conf.d/sobexsrv!"
+		return 1
+	fi
+
+	if [ ${CHROOT} = "yes" ] ; then
+		if [ ! -u /usr/bin/sobexsrv ] ; then
+			eerror "The \$CHROOT option requires /usr/bin/sobexsrv to be suid root!"
+			return 1
+		fi
+	fi
+
+	if [ -z "${INBOX}" ] || [ ! -e "${INBOX}" ] ; then
+		eerror "Please configure \$INBOX correctly in /etc/conf.d/sobexsrv!"
+		return 1
+	fi
+}
+
+
+start() {
+	check_config || return 1
+
+	ebegin "Starting sobexsrv"
+
+	OPTIONS=""
+	[ -n "${CHANNEL}" ] && OPTIONS="${OPTIONS} -c ${CHANNEL}"
+	[ -n "${SECURITY_LEVEL}" ] && OPTIONS="${OPTIONS} -s ${SECURITY_LEVEL}"
+	[ "${CHROOT}" = "yes" ] && OPTIONS="${OPTIONS} -R"
+	[ "${DISABLE_OPUSH}" = "yes" ] && OPTIONS="${OPTIONS} -o"
+	[ "${DISABLE_OBEXFTP}" = "yes" ] && OPTIONS="${OPTIONS} -f"
+	[ "${DISABLE_OBEXFTP_LISTING}" = "yes" ] && OPTIONS="${OPTIONS} -F"
+	[ "${USE_SYSLOG}" = "yes" ] && OPTIONS="${OPTIONS} -S"
+
+	OPTIONS="-I -r ${INBOX} ${OPTIONS} ${SOBEXSRV_OPT}"
+
+	start-stop-daemon --chuid ${USER}:${GROUP} --start --quiet --exec /usr/bin/sobexsrv -- $OPTIONS
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping sobexsrv"
+	start-stop-daemon --stop --quiet --exec /usr/bin/sobexsrv
+	eend $?
+}
diff --git a/app-mobilephone/sobexsrv/files/sobexsrv-1.0.1-openobex16.patch b/app-mobilephone/sobexsrv/files/sobexsrv-1.0.1-openobex16.patch
new file mode 100644
index 000000000000..57fff87e4d2b
--- /dev/null
+++ b/app-mobilephone/sobexsrv/files/sobexsrv-1.0.1-openobex16.patch
@@ -0,0 +1,49 @@
+--- sobexsrv-1.0.1/src/obexsrv.c.orig	2016-06-13 01:59:28.000000000 +0300
++++ sobexsrv-1.0.1/src/obexsrv.c	2016-06-13 12:20:15.501101147 +0300
+@@ -32,6 +32,10 @@
+ #include <langinfo.h>
+ #include <assert.h>
+ 
++#if ((OPENOBEX_VERSION_MAJOR==1) && (OPENOBEX_VERSION_MINOR>=6))
++#include <string.h>
++#endif
++
+ #include "obexsrv.h"
+ #include "util.h"
+ #include "sdp.h"
+@@ -46,7 +50,8 @@
+ 
+ void UnicodeToChar(uint8_t *c, const uint8_t *uc, int size)
+ {
+-	iconv_t dsc = iconv_open(nl_langinfo(CODESET),"UTF16BE");
++	char *lang = nl_langinfo(CODESET);
++	iconv_t dsc = iconv_open(lang,"UTF16BE");
+ 	size_t isiz,osiz;
+ 	char *ip = (char*)uc;
+ 	char *op = (char*)c;
+@@ -54,7 +59,25 @@
+ 
+ 	if (iconv(dsc,&ip,&isiz,&op,&osiz) == -1) {
+ 		debug_printf("iconv: error %s\n", strerror(errno));
++#if ((OPENOBEX_VERSION_MAJOR==1) && (OPENOBEX_VERSION_MINOR>=6))
++		// try to convert ignoring errors
++		iconv_close(dsc);
++		debug_printf("iconv: characters that cannot be converted will be discarded\n");
++
++		// append "//IGNORE"
++		const char *const suf = "//IGNORE";
++		size_t len = strlen(lang);
++		char *cd = malloc(len + 9);
++		memcpy(cd, lang, len);
++		memcpy(cd+len, suf, 8);
++		cd[len+8] = '\0';
++
++		dsc = iconv_open(cd,"UTF16BE");
++		iconv(dsc,&ip,&isiz,&op,&osiz);
++		free(cd);
++#else
+ 		OBEX_UnicodeToChar(c,uc,size);
++#endif
+ 	}
+ 	iconv_close(dsc);
+ }
diff --git a/app-mobilephone/sobexsrv/metadata.xml b/app-mobilephone/sobexsrv/metadata.xml
new file mode 100644
index 000000000000..99bdbeccf4c8
--- /dev/null
+++ b/app-mobilephone/sobexsrv/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>bircoph@gentoo.org</email>
+		<name>Andrew Savchenko</name>
+	</maintainer>
+	<longdescription>
+		sobexsrv is a Bluetooth OBEX server with Bluetooth Security
+		Mode-2 (application triggered security) support. It implements
+		OPUSH (put), OPULL (get) and OBEX-FTP (setpath + directory
+		listing) and therefore is a full OBEX server. Further it
+		supports pulling generic mime-types and provides a capability
+		object. sobexsrv was designed with flexibility and security in
+		mind and supports chroot (if suid root drop to calling uid
+		immediately). For flexibility a scripting interface provides
+		access to all functionalities of the server and therefore
+		allows implementation of further OBEX services on top of
+		sobexsrv.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-mobilephone/sobexsrv/sobexsrv-1.0.1-r1.ebuild b/app-mobilephone/sobexsrv/sobexsrv-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..14cde193148e
--- /dev/null
+++ b/app-mobilephone/sobexsrv/sobexsrv-1.0.1-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 toolchain-funcs user
+
+MY_P="${P/_pre/pre}"
+
+DESCRIPTION="Scripting/Secure OBEX Server (for BlueZ Linux)"
+SRC_URI="http://www.mulliner.org/bluetooth/${MY_P}.tar.gz
+		 https://dev.gentoo.org/~joker/${P}-fix64.patch"
+HOMEPAGE="http://www.mulliner.org/bluetooth/sobexsrv.php"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc x86"
+IUSE="gtk"
+
+DEPEND="
+	dev-libs/openobex
+	net-wireless/bluez
+	gtk? ( ${PYTHON_DEPS} )"
+RDEPEND="${DEPEND}
+	gtk? (
+		${PYTHON_DEPS}
+		>=dev-python/pygtk-2.2
+	)"
+REQUIRED_USE="
+	gtk? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${DISTDIR}/${P}"-fix64.patch
+	"${FILESDIR}/${P}"-openobex16.patch
+)
+
+pkg_setup() {
+	use gtk && python-single-r1_pkg_setup
+
+	enewgroup sobexsrv
+	enewuser sobexsrv -1 -1 /var/spool/sobexsrv sobexsrv
+}
+
+src_prepare() {
+	default
+
+	sed -e 's:/usr/man/man8:/usr/share/man/man8:' \
+		-e 's/install: all/install:/' \
+	    -i Makefile || die
+
+	sed -e 's/^CFLAGS =/CFLAGS +=/' \
+	    -e 's/^CC =/CC ?=/' \
+	    -e 's/$(CC) $(CFLAGS)/$(CC) $(LDFLAGS) $(CFLAGS)/' \
+	    -i src/Makefile || die
+}
+
+src_compile() {
+	tc-export CC
+	emake -C src
+}
+
+src_install() {
+	default
+	dodoc AUTHOR CONFIG SECURITY THANKS
+
+	if use gtk; then
+		python_doscript "${D}/usr/bin/sobexsrv_handler"
+		newdoc "${S}/scripts/test" sobexsrv_handler.sample_script
+	else
+		rm "${D}/usr/bin/sobexsrv_handler" || die
+	fi
+
+	newinitd "${FILESDIR}/init.d_sobexsrv" sobexsrv
+	newconfd "${FILESDIR}/conf.d_sobexsrv" sobexsrv
+
+	keepdir /var/spool/sobexsrv
+	fowners sobexsrv:sobexsrv /var/spool/sobexsrv
+}
+
+pkg_postinst() {
+	elog
+	elog "/usr/bin/sobexsrv is *NOT* installed set-uid root by"
+	elog "default. suid is required for the chroot option (-R)."
+	elog
+	elog "Execute the following commands to enable suid:"
+	elog
+	elog "chown root:sobexsrv /usr/bin/sobexsrv"
+	elog "chmod 4710 /usr/bin/sobexsrv"
+	elog
+}
diff --git a/app-mobilephone/vmoconv-1.0-r1 b/app-mobilephone/vmoconv-1.0-r1
deleted file mode 100644
index 7c11464fc30d..000000000000
--- a/app-mobilephone/vmoconv-1.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=media-sound/gsm >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A tool that converts Siemens phones VMO and VMI audio files to gsm and wav
-EAPI=5
-HOMEPAGE=http://triq.net/obex/
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=media-sound/gsm
-SLOT=0
-SRC_URI=http://triq.net/obexftp/vmoconv-1.0.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1732a34a9a343fc678fc95d04e2ffed5
diff --git a/app-mobilephone/vmoconv/Manifest b/app-mobilephone/vmoconv/Manifest
new file mode 100644
index 000000000000..87b8de0be234
--- /dev/null
+++ b/app-mobilephone/vmoconv/Manifest
@@ -0,0 +1,6 @@
+AUX vmoconv-1.0-external-libgsm.patch 863 BLAKE2B 3468d81dfcb51ca6da6b9dba74f3a8536955686456a4e055823184cad06f7d28908338c0bc61f109cd48594d89718fc2e3d0fb6818b4ab15d95d31898a496e34 SHA512 d02dc343c59ef15d21b08478d3e9f6393f95c59ecf340afb09945d4897481e9c859f83752b6d79e1ae03563b9d9deb129a0a1db5e0acd69ed1a815b5be408058
+AUX vmoconv-1.0-flags.patch 683 BLAKE2B 9320d396eaf46480c7473fa52934c8786ca31dac2d638a8463a8e5350d5006f73938e4085622034ec0abc1d866d7ceefee59b17f3e8cfe987fe1fd6ad550be67 SHA512 431e10787bed24cc775a43f44c60a64610f03c25956efb8892d7117476e01261ae06c644a1ac9ada6f9dc94ad5a38745beb8fb2dbe3dfe8546ecfa51902f0770
+AUX vmoconv-1.0-glibc28.patch 876 BLAKE2B 5d58b8ddda99b268748bdcea1004dfc4ddb48547ea502fd5a3f98683338230f23a15584d854bfa2147e702be06a22621a03767c9563522cf6c350155c7e13cfd SHA512 14477a9c13fabae162dfe8fc4b701019fb52e387198c70542275b1e9562a683532f8b88a96a9b8c7d9aea8e5f27224baa27046a04ce164adcd2d260f0a22e011
+DIST vmoconv-1.0.tar.gz 315028 BLAKE2B c31d2f4f5c45511b52a80b829b9c632519eccaf6aeb3bb74deef8ff9cdf0aea244e52c82751f8d23865e5250004d33dfc2c0b101fd03ce7cf0c08f94c3a79ce2 SHA512 c4bd65f2c034317e43736198eaea6a3cfbbc6be015dc1ac5efa51633c2779bf5af87ea037084173b377a7521538e4a235f264b5f09fedcdaf7f4a815289a7ec2
+EBUILD vmoconv-1.0-r1.ebuild 752 BLAKE2B 22f7972256f0bf71c839357c95e08e980fe2e319d1ab16170466660d1e88e9553d6bf165db90edfee75979fd6e5b7a5c29c942b950515b1fbd1100932e880d2a SHA512 e8e28d1de9e9c58fcf80313bbf9feb8e0fd23981574b512f268cbcc9792cff861c09cbdfd86745e75b9fbc066c6aecd9477889ea71f3dc719d2370a97835ac91
+MISC metadata.xml 296 BLAKE2B 1d34ceee0f682bb05def16df979d321f3da6ac51a494dc1656aaeacffa37d4964a8520de1818d0f838c473e24419536dc02ae587b8224fd27d0d5e6b99514a3b SHA512 725dd98a8cdf1814e9a91472eb7f51131193c3825fdce5507a397b1a833040de9fb067b9fc8b3fac3459b3e14f61257032164ed63c1fadaaa5107a508f5a069e
diff --git a/app-mobilephone/vmoconv/files/vmoconv-1.0-external-libgsm.patch b/app-mobilephone/vmoconv/files/vmoconv-1.0-external-libgsm.patch
new file mode 100644
index 000000000000..8ab3670aa098
--- /dev/null
+++ b/app-mobilephone/vmoconv/files/vmoconv-1.0-external-libgsm.patch
@@ -0,0 +1,36 @@
+diff -Nru vmoconv-1.0.orig/src/Makefile.am vmoconv-1.0/src/Makefile.am
+--- vmoconv-1.0.orig/src/Makefile.am	2003-02-17 21:39:18.000000000 +0000
++++ vmoconv-1.0/src/Makefile.am	2009-03-03 21:24:12.000000000 +0000
+@@ -1,32 +1,6 @@
+ 
+-noinst_LTLIBRARIES =		libgsm.la
+-
+ INCLUDES =			-I.
+ 
+-libgsm_la_SOURCES =		add.c            \
+-				code.c           \
+-				debug.c          \
+-				decode.c         \
+-				long_term.c      \
+-				lpc.c            \
+-				preprocess.c     \
+-				rpe.c            \
+-				gsm_destroy.c    \
+-				gsm_decode.c     \
+-				gsm_encode.c     \
+-				gsm_explode.c    \
+-				gsm_implode.c    \
+-				gsm_create.c     \
+-				gsm_print.c      \
+-				gsm_option.c     \
+-				short_term.c     \
+-				table.c		\
+-				proto.h		\
+-				unproto.h	\
+-				config.h	\
+-				private.h	\
+-				gsm.h
+-
+ vmo2wav_LDADD =			-lgsm
+ 
+ vmo2wav_SOURCES =		vmo2wav.c
diff --git a/app-mobilephone/vmoconv/files/vmoconv-1.0-flags.patch b/app-mobilephone/vmoconv/files/vmoconv-1.0-flags.patch
new file mode 100644
index 000000000000..031b6eefaaca
--- /dev/null
+++ b/app-mobilephone/vmoconv/files/vmoconv-1.0-flags.patch
@@ -0,0 +1,17 @@
+diff -Nru vmoconv-1.0.orig/configure.in vmoconv-1.0/configure.in
+--- vmoconv-1.0.orig/configure.in	2004-09-26 15:17:48.000000000 +0000
++++ vmoconv-1.0/configure.in	2009-03-03 21:32:40.000000000 +0000
+@@ -26,10 +26,10 @@
+     [printf(__func__)],,
+     [AC_DEFINE(__func__, "", [non-C99 fake support for __func__])])
+ 
+-dnl Turn on debugging and all warnings when using gcc
++dnl Turn on all warnings when using gcc
+ if test "$ac_cv_prog_gcc" = "yes"; then
+-	CFLAGS="$CFLAGS -g -Wall -Wmissing-declarations -Wmissing-prototypes"
+-	LDFLAGS="$LDFLAGS -g -Wall"
++	CFLAGS="$CFLAGS -Wall -Wmissing-declarations -Wmissing-prototypes"
++	LDFLAGS="$LDFLAGS -Wall"
+ fi
+        
+ AC_SUBST(CFLAGS)
diff --git a/app-mobilephone/vmoconv/files/vmoconv-1.0-glibc28.patch b/app-mobilephone/vmoconv/files/vmoconv-1.0-glibc28.patch
new file mode 100644
index 000000000000..ec957b40c5cd
--- /dev/null
+++ b/app-mobilephone/vmoconv/files/vmoconv-1.0-glibc28.patch
@@ -0,0 +1,24 @@
+diff -Naur vmoconv-1.0.orig/src/gsm2vmo.c vmoconv-1.0/src/gsm2vmo.c
+--- vmoconv-1.0.orig/src/gsm2vmo.c	2008-06-15 12:57:07.000000000 -0400
++++ vmoconv-1.0/src/gsm2vmo.c	2008-06-15 12:57:36.000000000 -0400
+@@ -27,7 +27,7 @@
+  * 12 bit header and 260 bits standard GSM frame, as described
+  * in GSM 06.10 and GSM 06.12. The header is 0x2010 always.
+  */
+-
++#include <limits.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+diff -Naur vmoconv-1.0.orig/src/vmo2gsm.c vmoconv-1.0/src/vmo2gsm.c
+--- vmoconv-1.0.orig/src/vmo2gsm.c	2008-06-15 12:57:07.000000000 -0400
++++ vmoconv-1.0/src/vmo2gsm.c	2008-06-15 12:57:36.000000000 -0400
+@@ -27,7 +27,7 @@
+  * 12 bit header and 260 bits standard GSM frame, as described
+  * in GSM 06.10 and GSM 06.12. The header is 0x2010 always.
+  */
+-
++#include <limits.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/app-mobilephone/vmoconv/metadata.xml b/app-mobilephone/vmoconv/metadata.xml
new file mode 100644
index 000000000000..fd8646d07b57
--- /dev/null
+++ b/app-mobilephone/vmoconv/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		A tool that converts Siemens phones VMO and VMI audio files to gsm and
+		wav.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-mobilephone/vmoconv/vmoconv-1.0-r1.ebuild b/app-mobilephone/vmoconv/vmoconv-1.0-r1.ebuild
new file mode 100644
index 000000000000..d7f1da29f215
--- /dev/null
+++ b/app-mobilephone/vmoconv/vmoconv-1.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils autotools
+
+DESCRIPTION="A tool that converts Siemens phones VMO and VMI audio files to gsm and wav"
+HOMEPAGE="http://triq.net/obex/"
+SRC_URI="http://triq.net/obexftp/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+DEPEND="media-sound/gsm"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-glibc28.patch"
+	epatch "${FILESDIR}/${P}-flags.patch"
+	epatch "${FILESDIR}/${P}-external-libgsm.patch"
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in || die
+	eautoreconf
+}
+
+src_install() {
+	dobin src/vmo2gsm src/gsm2vmo src/vmo2wav
+	dodoc AUTHORS ChangeLog NEWS README THANKS
+}
diff --git a/app-mobilephone/wammu-0.43 b/app-mobilephone/wammu-0.43
deleted file mode 100644
index 93408d37d855..000000000000
--- a/app-mobilephone/wammu-0.43
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-mobilephone/gammu-1.36 dev-python/python-gammu >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] bluetooth? ( dev-python/pybluez[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gnome? ( net-wireless/gnome-bluetooth ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Front-end for gammu to access mobile phones easily
-EAPI=6
-HOMEPAGE=http://www.wammu.eu/
-IUSE=bluetooth gnome python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-mobilephone/gammu-1.36 dev-python/python-gammu >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] bluetooth? ( dev-python/pybluez[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gnome? ( net-wireless/gnome-bluetooth ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://dl.cihar.com/wammu/v0/wammu-0.43.tar.xz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=29d2e5a448d5a24fc02c4482fff6f1d0
diff --git a/app-mobilephone/wammu-0.44 b/app-mobilephone/wammu-0.44
deleted file mode 100644
index 575025576b30..000000000000
--- a/app-mobilephone/wammu-0.44
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-mobilephone/gammu-1.36 dev-python/python-gammu >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] bluetooth? ( dev-python/pybluez[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gnome? ( net-wireless/gnome-bluetooth ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Front-end for gammu to access mobile phones easily
-EAPI=6
-HOMEPAGE=https://www.wammu.eu/
-IUSE=bluetooth gnome python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-mobilephone/gammu-1.36 dev-python/python-gammu >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] bluetooth? ( dev-python/pybluez[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gnome? ( net-wireless/gnome-bluetooth ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://dl.cihar.com/wammu/v0/wammu-0.44.tar.xz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=92d4358f47ed28a36e048e60a2fbe69c
diff --git a/app-mobilephone/wammu/Manifest b/app-mobilephone/wammu/Manifest
new file mode 100644
index 000000000000..6a669cc92634
--- /dev/null
+++ b/app-mobilephone/wammu/Manifest
@@ -0,0 +1,5 @@
+DIST wammu-0.43.tar.xz 563832 BLAKE2B 26b075d16d6b26608022eac58260083b7883a3c0b0fe8b73984c625f3ecb2a6ce972cb73bc8e5ebe280726447b6fa188716206f7540a9de42013c221a05589dd SHA512 c8f0aad8d8fc2c852638a77b45d48ba3c512a1e1cf8f8dc54b99a614f7338f366494ef88d786143defd77e55ab9597d9c705569c4e0fceb856f29a05b9c6a843
+DIST wammu-0.44.tar.xz 582284 BLAKE2B ba0523d4778c0fcebc8c86354d503880ea4a34f8ba05e9c4c8ef9b206366ad11c16f85dba2ce19977587aba0bc791adade4d35422a1727b1e042d5be29f39b54 SHA512 9b1a8c9fad2abc618d3e778338446b154516fff9e176aff02ed8daa64ff6e69a591324368dacd50f40c832d16d197447c575644520102317d95c573ed8d6bc7e
+EBUILD wammu-0.43.ebuild 1284 BLAKE2B e22bf2a9425e6dbe1b600cf54c46c9068589d26528f05be0493fd9e41e781899daef8f9e65770d7665c8665e9aa7e33ce1190d13acc48e098a02ceca38e85651 SHA512 f8075664077424838531afc315bccbc256f5de02a7dcd1e2bbb0d5c02dcb986d32ad62ebdf0cb2fd482ad6f7f6fb0126984579ffbb11c54e2c1f3b979f4fed79
+EBUILD wammu-0.44.ebuild 807 BLAKE2B 30eb9847b8ba9417d818b6914a66b278918b5f40cad0c64d089ca992738a43aa8dae1867abdd0c968e722cd9bd7d98af436e0f64327c8bd68142feefa66489ba SHA512 2dfb76c503ed27e92b1b35d1e944435061738e1e1c2d207e7d1b926004e4e33d182cc4d7e2efb8599afd94d308e75a0486b407c9c8093c822bcc93c438b51450
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-mobilephone/wammu/metadata.xml b/app-mobilephone/wammu/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-mobilephone/wammu/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-mobilephone/wammu/wammu-0.43.ebuild b/app-mobilephone/wammu/wammu-0.43.ebuild
new file mode 100644
index 000000000000..dd959761aaee
--- /dev/null
+++ b/app-mobilephone/wammu/wammu-0.43.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Front-end for gammu to access mobile phones easily"
+HOMEPAGE="http://www.wammu.eu/"
+SRC_URI="http://dl.cihar.com/wammu/v0/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluetooth gnome"
+
+RDEPEND="
+	>=app-mobilephone/gammu-1.36
+	dev-python/python-gammu
+	>=dev-python/wxpython-2.8:*[${PYTHON_USEDEP}]
+	bluetooth? (
+		dev-python/pybluez[${PYTHON_USEDEP}]
+		gnome? ( net-wireless/gnome-bluetooth )
+	)
+"
+DEPEND="${RDEPEND}"
+
+# Supported languages and translated documentation
+MY_AVAILABLE_LINGUAS=" af ar bg bn ca cs da de el en_GB es et fi fr gl he hu id it ko nl pl pt_BR ro ru sk sv sw tr uk zh_CN zh_TW"
+
+# Required to source locale content out of the box
+DISTUTILS_IN_SOURCE_BUILD=1
+
+src_prepare() {
+	local lang
+	for lang in ${MY_AVAILABLE_LINGUAS} ; do
+		if ! has ${lang} ${LINGUAS-${lang}} ; then
+			rm -r locale/${lang} || die
+		fi
+	done
+
+	distutils-r1_src_prepare
+}
+
+src_compile() {
+	# SKIPWXCHECK: else 'import wx' results in
+	# Xlib: connection to ":0.0" refused by server
+	SKIPWXCHECK=yes distutils-r1_src_compile
+}
+
+src_install() {
+	SKIPWXCHECK=yes distutils-r1_src_install
+}
diff --git a/app-mobilephone/wammu/wammu-0.44.ebuild b/app-mobilephone/wammu/wammu-0.44.ebuild
new file mode 100644
index 000000000000..9abeda111418
--- /dev/null
+++ b/app-mobilephone/wammu/wammu-0.44.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Front-end for gammu to access mobile phones easily"
+HOMEPAGE="https://www.wammu.eu/"
+SRC_URI="http://dl.cihar.com/wammu/v0/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluetooth gnome"
+
+RDEPEND="
+	>=app-mobilephone/gammu-1.36
+	dev-python/python-gammu
+	>=dev-python/wxpython-2.8:*[${PYTHON_USEDEP}]
+	bluetooth? (
+		dev-python/pybluez[${PYTHON_USEDEP}]
+		gnome? ( net-wireless/gnome-bluetooth )
+	)
+"
+DEPEND="${RDEPEND}"
+
+# Required to source locale content out of the box
+DISTUTILS_IN_SOURCE_BUILD=1
+
+# SKIPWXCHECK: else 'import wx' results in
+# Xlib: connection to ":0.0" refused by server
+SKIPWXCHECK=yes
author	V3n3RiX <venerix@redcorelinux.org>	2018-07-14 21:03:06 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-07-14 21:03:06 +0100
commit	8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch)
tree	7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /app-mobilephone
parent	30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff)