diff --git a/dev-libs/xz-embedded/xz-embedded-20130513-r1.ebuild b/dev-libs/xz-embedded/xz-embedded-20130513-r2.ebuild
similarity index 100%
rename from dev-libs/xz-embedded/xz-embedded-20130513-r1.ebuild
rename to dev-libs/xz-embedded/xz-embedded-20130513-r2.ebuild
diff --git a/dev-libs/xz-embedded/xz-embedded-20130513.ebuild b/dev-libs/xz-embedded/xz-embedded-20130513.ebuild
index 9a821e1..b223510 100644
--- a/dev-libs/xz-embedded/xz-embedded-20130513.ebuild
+++ b/dev-libs/xz-embedded/xz-embedded-20130513.ebuild
@@ -1,13 +1,13 @@
 # Copyright 2015 The ChromiumOS Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI="7"
 
-inherit flag-o-matic multilib
+inherit flag-o-matic multilib toolchain-funcs
 
 DESCRIPTION="Small XZ decompressor"
-HOMEPAGE="http://tukaani.org/xz/embedded.html"
-SRC_URI="http://tukaani.org/xz/xz-embedded-${PV}.tar.gz"
+HOMEPAGE="https://tukaani.org/xz/embedded.html"
+SRC_URI="https://tukaani.org/xz/xz-embedded-${PV}.tar.gz"
 
 # See top-level COPYING file for the license description.
 LICENSE="public-domain"
@@ -20,13 +20,11 @@
 	cp "${FILESDIR}"/{Makefile,xz-embedded.pc.in} "${S}" || die "Copying files"
 }
 
-src_prepare() {
+src_configure() {
 	# Enable support for BCJ filters for the common architectures. See other
 	# available architectures in userspace/xz_config.h.
 	append-cppflags -DXZ_DEC_X86 -DXZ_DEC_ARM -DXZ_DEC_ARMTHUMB
-}
 
-src_configure() {
 	export GENTOO_LIBDIR=$(get_libdir)
 	tc-export AR CC
 }