diff --git a/media-gfx/synfig/Manifest b/media-gfx/synfig/Manifest
index 328da35..66ed825 100644
--- a/media-gfx/synfig/Manifest
+++ b/media-gfx/synfig/Manifest
@@ -1,2 +1 @@
 DIST synfig-1.5.1.tar.gz 4988207 BLAKE2B a2683fdaca0a3840ea5b07f173c899e7224e4c4de01303ec99294c36755aa54e44974058ccccac0401e6e1e63637b1a80e0ed8f7539d2dd7b52829414f1b1ece SHA512 ef972792f110906affd51483a6314d642fc9f629c56214979cb3c971497b0383adb6aab3d791deb3d52a49b9eaa7d469cc56dd20a5db7d1841df8af3e684aa03
-DIST synfigstudio-1.5.0.tar.gz 11633997 BLAKE2B fbdba1f310cabe105267a3aa90b94e0be76e36a238246f18e1e6e396e9eaefd79b7ac3dbe2075caddbb4c319e8a5e66850f1139925a61962431c230ab25e9e99 SHA512 a3beecdfae5508c6ccf0aa9ec44d817264266a5bb4b7dd580ade53c613658d34e5edc860c17ba5a2d7aa5c3c91a30bb8550b87623ccaad53a4b584cc93852c40
diff --git a/media-gfx/synfig/synfig-1.5.0-r1.ebuild b/media-gfx/synfig/synfig-1.5.0-r1.ebuild
deleted file mode 100644
index aee130c..0000000
--- a/media-gfx/synfig/synfig-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-#Ebuild based on the booboo overlay version
-
-EAPI=7
-
-inherit autotools
-
-# Original TODO from bgo-overlay
-# Todo: enable OpenGL (currently not compiling)
-#       enable OpenCl, needs check whether OpenCL is actually usable
-
-DESCRIPTION="Film-Quality Vector Animation (core engine)"
-HOMEPAGE="http://www.synfig.org/"
-SRC_URI="https://github.com/synfig/synfig/archive/refs/tags/v${PV}.tar.gz -> synfigstudio-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dv fontconfig jpeg opencl openexr truetype"
-
-REQUIRED_USE="fontconfig? ( truetype )"
-
-DEPEND="
-	~dev-cpp/ETL-${PV}
-	>=dev-cpp/glibmm-2.4:2
-	dev-cpp/libxmlpp:2.6
-	dev-libs/glib:2
-	dev-libs/libltdl
-	dev-libs/libsigc++:2
-	media-gfx/imagemagick:=[cxx]
-	media-libs/libmng:=
-	media-libs/libpng:=
-	<media-libs/mlt-7.0.0
-	media-video/ffmpeg:=
-	sci-libs/fftw:3.0=
-	sys-libs/zlib:=
-	fontconfig? ( media-libs/fontconfig )
-	jpeg? ( virtual/jpeg )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr:=
-	)
-	truetype? ( media-libs/freetype )
-	"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	>=dev-util/intltool-0.35.0
-	sys-devel/libtool
-	opencl? ( virtual/opencl )
-	"
-
-PATCHES=(
-	"${FILESDIR}"/synfigstudio-1.5.0-fix-cflags.patch
-)
-
-S="${WORKDIR}/synfig-${PV}/synfig-core"
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-imagemagick \
-		--with-ffmpeg \
-		$(use_with fontconfig) \
-		$(use_with dv libdv) \
-		$(use_with openexr ) \
-		$(use_with truetype freetype) \
-		$(use_with jpeg) \
-		$(use_with opencl)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS NEWS README TODO
-
-	find "${ED}" -name '*.la' -delete || die
-
-	echo "LDPATH=\"${EPREFIX}/usr/$(get_libdir)/synfig/modules\"" > "${T}/99synfig"
-	doenvd "${T}/99synfig"
-}
diff --git a/media-gfx/synfig/synfig-1.5.1-r1.ebuild b/media-gfx/synfig/synfig-1.5.1-r2.ebuild
similarity index 94%
rename from media-gfx/synfig/synfig-1.5.1-r1.ebuild
rename to media-gfx/synfig/synfig-1.5.1-r2.ebuild
index dfe1f01..a2e94d9 100644
--- a/media-gfx/synfig/synfig-1.5.1-r1.ebuild
+++ b/media-gfx/synfig/synfig-1.5.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 #Ebuild based on the booboo overlay version
@@ -41,10 +41,7 @@ DEPEND="
 	sys-libs/zlib:=
 	fontconfig? ( media-libs/fontconfig )
 	jpeg? ( virtual/jpeg )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr:0=
-	)
+	openexr? ( media-libs/openexr:0= )
 	truetype? (
 		media-libs/freetype
 	)
diff --git a/media-gfx/synfig/synfig-1.5.1.ebuild b/media-gfx/synfig/synfig-1.5.1.ebuild
deleted file mode 100644
index cd9bbaa..0000000
--- a/media-gfx/synfig/synfig-1.5.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-#Ebuild based on the booboo overlay version
-
-EAPI=7
-
-inherit autotools
-
-# Original TODO from bgo-overlay
-# Todo: enable OpenGL (currently not compiling)
-#       enable OpenCl, needs check whether OpenCL is actually usable
-
-DESCRIPTION="Film-Quality Vector Animation (core engine)"
-HOMEPAGE="http://www.synfig.org/"
-SRC_URI="https://github.com/synfig/synfig/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dv fontconfig harfbuzz jpeg opencl openexr truetype"
-
-REQUIRED_USE="
-	fontconfig? ( truetype )
-	harfbuzz? ( truetype )
-	"
-
-DEPEND="
-	~dev-cpp/ETL-${PV}
-	>=dev-cpp/glibmm-2.4:2
-	dev-cpp/libxmlpp:2.6
-	dev-libs/glib:2
-	dev-libs/libltdl
-	dev-libs/libsigc++:2
-	media-gfx/imagemagick:=[cxx]
-	media-libs/libmng:=
-	media-libs/libpng:=
-	<media-libs/mlt-7.0.0
-	media-video/ffmpeg:=
-	sci-libs/fftw:3.0=
-	sys-libs/zlib:=
-	fontconfig? ( media-libs/fontconfig )
-	jpeg? ( virtual/jpeg )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr:0=
-	)
-	truetype? (
-		media-libs/freetype
-	)
-	harfbuzz? (
-		dev-libs/fribidi
-		media-libs/harfbuzz:=
-	)
-	"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	>=dev-util/intltool-0.35.0
-	sys-devel/libtool
-	opencl? ( virtual/opencl )
-	"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.0-fix-cflags.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-imagemagick \
-		--with-ffmpeg \
-		$(use_with fontconfig) \
-		$(use_with dv libdv) \
-		$(use_with openexr ) \
-		$(use_with truetype freetype) \
-		$(use_with harfbuzz) \
-		$(use_with jpeg) \
-		$(use_with opencl)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS NEWS README TODO
-
-	find "${ED}" -name '*.la' -delete || die
-
-	echo "LDPATH=\"${EPREFIX}/usr/$(get_libdir)/synfig/modules\"" > "${T}/99synfig"
-	doenvd "${T}/99synfig"
-}