diff --git a/app-misc/rdfind/rdfind-1.4.1.ebuild b/app-misc/rdfind/rdfind-1.4.1.ebuild
index 5b0396fc7b..336b048368 100644
--- a/app-misc/rdfind/rdfind-1.4.1.ebuild
+++ b/app-misc/rdfind/rdfind-1.4.1.ebuild
@@ -19,7 +19,7 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}-releases-${PV}"
 
-src_configure() {
+src_prepare() {
 	# NOTE: Commands are from bootstrap.sh.
 	eaclocal
 	eautoheader
diff --git a/dev-libs/StringiFor/StringiFor-1.1.1.ebuild b/dev-libs/StringiFor/StringiFor-1.1.1.ebuild
index 0147bfa8d9..4bd3e3887a 100644
--- a/dev-libs/StringiFor/StringiFor-1.1.1.ebuild
+++ b/dev-libs/StringiFor/StringiFor-1.1.1.ebuild
@@ -67,9 +67,7 @@ src_prepare() {
 	mv -T "${WORKDIR}"/PENF-"${PENF_sha}" "${S}"/src/third_party/PENF
 	default
 
-	if [ "${FFLAGS}" ] ; then
-		sed -i -e 's:\$OPTIMIZE    = -O2:\$OPTIMIZE    = '"${FFLAGS}"':' fobos || die
-	fi
+	sed -i -e 's:\$OPTIMIZE    = -O2:\$OPTIMIZE    = '"${FFLAGS}"':' fobos || die
 }
 
 src_compile() {
diff --git a/media-libs/libavif/Manifest b/media-libs/libavif/Manifest
new file mode 100644
index 0000000000..5e2026ef11
--- /dev/null
+++ b/media-libs/libavif/Manifest
@@ -0,0 +1 @@
+DIST libavif-0.6.4.tar.gz 2880753 BLAKE2B d42e106a67aa82e4e9cd28488e6393e100e78bf381f8db6f9563c8563eec8c8afe64dedd4b3cdcadc296f15472995cee979469230085aa27a19a48f2d01f5e6a SHA512 ccd9ef462b9a235914f08a75f7acefc1592037e14967089bbc118838ba3603aa527f20b842c658b357f159de28dede15ab80e27f08a19ad3456247970c0ad822
diff --git a/media-libs/libavif/libavif-0.6.4.ebuild b/media-libs/libavif/libavif-0.6.4.ebuild
new file mode 100644
index 0000000000..9abaef946d
--- /dev/null
+++ b/media-libs/libavif/libavif-0.6.4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Library for encoding and decoding .avif files"
+HOMEPAGE="https://github.com/AOMediaCodec/libavif"
+SRC_URI="https://github.com/AOMediaCodec/libavif/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="dav1d +libaom rav1e"
+
+REQUIRED_USE="|| ( dav1d libaom )"
+
+DEPEND="dav1d? ( media-libs/dav1d )
+	libaom? ( >=media-libs/libaom-1.1 )
+	rav1e? ( media-video/rav1e[capi] )
+	media-libs/libpng
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_configure() {
+	local mycmakeargs=(
+		-DAVIF_CODEC_DAV1D=$(usex dav1d ON OFF)
+		-DAVIF_CODEC_AOM=$(usex libaom ON OFF)
+		-DAVIF_CODEC_RAV1E=$(usex rav1e ON OFF)
+		-DBUILD_SHARED_LIBS=ON
+		-DAVIF_BUILD_APPS=ON
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	if ! use libaom && ! use rav1e ; then
+		ewarn "libaom and rav1e flags are not set,"
+		ewarn "libavif will work in read-only mode."
+		ewarn "Enable libaom or rav1e flag if you want to save .AVIF files."
+	fi
+
+	if use libaom ; then
+		elog "When you upgrade libaom in the future,"
+		elog " you may need to re-emerge libavif again"
+		elog " to ensure correct AVIF import/export functions."
+	fi
+
+	if use rav1e ; then
+		elog "When you upgrade rav1e in the future,"
+		elog " you may need to re-emerge libavif again"
+		elog " to ensure correct AVIF export function."
+	fi
+}
diff --git a/media-libs/libavif/metadata.xml b/media-libs/libavif/metadata.xml
new file mode 100644
index 0000000000..4bfda36a7c
--- /dev/null
+++ b/media-libs/libavif/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>dnovomesky@gmail.com</email>
+		<name>Daniel Novomesky</name>
+		<description>Library for encoding and decoding .avif files</description>
+	</maintainer>
+	<use>
+		<flag name="dav1d">Enable faster decoding via dav1d</flag>
+		<flag name="libaom">Use encoding/decoding via libaom</flag>
+		<flag name="rav1e">Allow encoding via rav1e</flag>
+	</use>
+</pkgmetadata>