diff --git a/net-libs/libsearpc/Manifest b/net-libs/libsearpc/Manifest
index 83cb7350c..f85943630 100644
--- a/net-libs/libsearpc/Manifest
+++ b/net-libs/libsearpc/Manifest
@@ -1 +1 @@
-DIST libsearpc-3.1.tar.gz 51768 BLAKE2B c58d82ac5a798d8730cd72935a07ae85c4b66b1833caa5bd48a8a545c17e48d7785ad589fd25b05d8ac607d386c8722e95b136812b7586dcedbef18991921236 SHA512 d5453399d4ca7579f8500204db183350b75eebe31580f0c7b19c967ea937b8faf35a448738f6e2dc1250f46d4f291d3596b94b40d3f26bf7e6877546d68a61b2
+DIST libsearpc-3.1_p20190712.tar.gz 51785 BLAKE2B f7b9a8629d2fa5ce7a5866ee49934176fb12cb3c1fec6fd0a684cc65ed933d5731f3eaedcfb35e0da4587c382d4cbc6ca607aaefcbe5c9f25fdc48930019795d SHA512 2af83cf5436cbf6acef7388efa322e71a0dc2f2f006eb2df6307b39e405b604cbac4e9399b681c792e98573c59466ca3e057afa3b8634c1883c27359c72c10fb
diff --git a/net-libs/libsearpc/libsearpc-3.1.ebuild b/net-libs/libsearpc/libsearpc-3.1_p20190712.ebuild
similarity index 59%
rename from net-libs/libsearpc/libsearpc-3.1.ebuild
rename to net-libs/libsearpc/libsearpc-3.1_p20190712.ebuild
index 23605ce88..ccd381135 100644
--- a/net-libs/libsearpc/libsearpc-3.1.ebuild
+++ b/net-libs/libsearpc/libsearpc-3.1_p20190712.ebuild
@@ -1,36 +1,45 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 PYTHON_COMPAT=( python2_7 )
-inherit autotools python-single-r1 vcs-snapshot
+
+inherit autotools python-single-r1
 
 DESCRIPTION="A simple C language RPC framework"
 HOMEPAGE="https://github.com/haiwen/libsearpc/ http://seafile.com/"
-#TODO: Use commit hash tarball on next version bump.
-SRC_URI="https://github.com/haiwen/${PN}/archive/v3.1-latest.tar.gz -> ${P}.tar.gz"
+
+HASH_COMMIT="c161cb90a5cb494947b1bda63f8664619dd3ca94" # 20190712
+SRC_URI="https://github.com/haiwen/libsearpc/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
-SLOT="0"
+SLOT=0
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.26.0
-	>=dev-libs/jansson-2.2.1"
+	dev-libs/jansson"
+
 RDEPEND="${DEPEND}
 	dev-python/simplejson[${PYTHON_USEDEP}]"
 
+S="${WORKDIR}/${PN}-${HASH_COMMIT}"
+
 src_prepare() {
-	default
-	sed -i -e "s/(DESTDIR)//" ${PN}.pc.in || die
+	sed -e "s/(DESTDIR)//" \
+		-i ${PN}.pc.in || die
+
+	python_fix_shebang "${S}"
+
 	eautoreconf
+	default
 }
 
 src_install() {
 	default
+
 	# Remove unnecessary .la files, as recommended by ltprune.eclass
 	find "${ED}" -name '*.la' -delete || die
-	python_fix_shebang "${ED}"usr/bin
 }