diff --git a/app-mobilephone/gsmlib/gsmlib-1.11_pre041028.ebuild b/app-mobilephone/gsmlib/gsmlib-1.11_pre041028.ebuild
index 2b9a496e..c8d3bd78 100644
--- a/app-mobilephone/gsmlib/gsmlib-1.11_pre041028.ebuild
+++ b/app-mobilephone/gsmlib/gsmlib-1.11_pre041028.ebuild
@@ -1,28 +1,32 @@
 # Copyright 1999-2010 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+EAPI="7"
+
 inherit eutils
 
 DESCRIPTION="Library and applications to access GSM mobile phones"
 SRC_URI="http://www.pxh.de/fs/gsmlib/snapshots/${PN}-pre${PV%_pre*}-${PV#*_pre}.tar.gz"
 HOMEPAGE="http://www.pxh.de/fs/gsmlib/"
 
-IUSE=""
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="amd64 ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 ia64 ppc ppc64 sparc x86"
 
 RESTRICT="test"
 
 S="${WORKDIR}/${PN}-${PV%_pre*}"
 
+PATCHES=(
+	"${FILESDIR}/${P%_pre*}-include-gcc34-fix.patch"
+	"${FILESDIR}/${P%_pre*}-gcc41.patch"
+	"${FILESDIR}/${P%_pre*}-gcc43.patch"
+)
+
 src_unpack() {
 	unpack ${A}
-
-	epatch "${FILESDIR}/${P%_pre*}-include-gcc34-fix.patch"
-	epatch "${FILESDIR}/${P%_pre*}-gcc41.patch"
-	epatch "${FILESDIR}"/${P%_pre*}-gcc43.patch
 }
 
 src_install () {
diff --git a/app-mobilephone/smssend/smssend-3.4-r2.ebuild b/app-mobilephone/smssend/smssend-3.4-r2.ebuild
index f1c63093..0d34b9cb 100644
--- a/app-mobilephone/smssend/smssend-3.4-r2.ebuild
+++ b/app-mobilephone/smssend/smssend-3.4-r2.ebuild
@@ -1,24 +1,22 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=6
+EAPI="7"
 
 inherit autotools
 
 DESCRIPTION="Universal SMS sender"
-# Was: http://zekiller.skytech.org/smssend_menu_en.html
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 
-# -r5 of skyutils fixes a runtime crash, bug 588326.
 # Without SSL support in skyutils, some providers fail.
-DEPEND=">=dev-libs/skyutils-2.8-r5[ssl]"
+DEPEND="dev-libs/skyutils[ssl]"
 RDEPEND="${DEPEND}"
 
 PATCHES=( "${FILESDIR}/${P}-verizon.patch" )