4 files changed, 68 insertions, 27 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 03c9e4003189..fbd912d5ae57 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/ffmpegsource/Manifest b/media-libs/ffmpegsource/Manifest
index 7ad9a1cc7fca..15cd1004b785 100644
--- a/media-libs/ffmpegsource/Manifest
+++ b/media-libs/ffmpegsource/Manifest
@@ -1,4 +1,6 @@
 DIST ffmpegsource-2.23.tar.gz 488940 BLAKE2B 0e565a02606a73ea0b6ee7bce64fcaea825a2beb473127b4d9c768981519e92cf29bd792b1524369fb44344ce63cb0777adb672f6ee1ec5eae35d92ed549748e SHA512 dbbc3c53062f9b66beeea57b57250abbc331807aad9300966ace4ddd3603273c6345e20d105b668cd852442b494e047ade8b8b1d8340c464ca748f6b11a5292c
+DIST ffmpegsource-2.40.tar.gz 140356 BLAKE2B 57fbc3d979f31108b257b6720045f4e157fca6714bf0f8601e8123c0026a14bb55d343549ff6b246b55a44b4f69c541c58f4b19f1051e338f1f97b2b7557b6de SHA512 407c4b0871f5046b9d364c2946eae88c46eec381b5748530d82918742fd4a36849de590024f8235af2785bd631c0299e591499dc43ae157ff2c6a6f2dab78b67
 EBUILD ffmpegsource-2.23.ebuild 889 BLAKE2B d78b543265e46b59372205fe536cfbb6bb89241b50e5398b3791f118bdbed7785441f26da0343ce312a8c07026b1744030a0e8cb37ff423e3812ea2ca69d6837 SHA512 c5383f24b5aa3e15099986b01923b979c627a12e970706e1d86da64c71e7bbf57487dfd894ce753b102d79bc7b475b26eb85a1570df478e64221d139cba11b9f
-EBUILD ffmpegsource-9999.ebuild 876 BLAKE2B 0795f81616af113fb5e6851e6ccf4178970f7da7c49989297a793947110da244eccbb6e11730f1d8c17e333aa676aeafb9058fef0d03931dfc7b0eba2210430d SHA512 6ecf74c9b62a4b8c126fff5cdf11a2bc35ed36dff04325412f9b05b965bc8970072766b0dca14b5a78843e266438f6aa14877ee0d7db1535cfae5cc31fc1bf60
+EBUILD ffmpegsource-2.40.ebuild 824 BLAKE2B 01f59dfb928ad0fe748e9042de2ae6020f753f94cd9c979c9a57adbccdad5de712936d8cd9c28b9b68a1481b99d4c4f06554ba7f2b5a68957d421dce114433fb SHA512 f7170484b5166eb6f5fa88f028499d92d049fc48394481e45f5037f71e8e5858d6ddfa3f3881ab40e455547f966174423cce78825c705e6f9a94c77170668d5a
+EBUILD ffmpegsource-9999.ebuild 824 BLAKE2B 01f59dfb928ad0fe748e9042de2ae6020f753f94cd9c979c9a57adbccdad5de712936d8cd9c28b9b68a1481b99d4c4f06554ba7f2b5a68957d421dce114433fb SHA512 f7170484b5166eb6f5fa88f028499d92d049fc48394481e45f5037f71e8e5858d6ddfa3f3881ab40e455547f966174423cce78825c705e6f9a94c77170668d5a
 MISC metadata.xml 309 BLAKE2B e5aabf12d7ca299430ffa834802b671bd6462fd9b0ecbf2fad095f34bedc11514558fecdd2546f627165574bbde8c8e595c08de6bb7eab0aec9d6fa4ade3e10e SHA512 5a8b3d4291d5cd988162c1819c5febf3bfdd1be55b6ec7fba6608fe66ce503bb8c1d243dbdc33dcd94b7ade36bdf80590c4dc1adab895c34950757f9d487a699
diff --git a/media-libs/ffmpegsource/ffmpegsource-2.40.ebuild b/media-libs/ffmpegsource/ffmpegsource-2.40.ebuild
new file mode 100644
index 000000000000..1ea646b97aa7
--- /dev/null
+++ b/media-libs/ffmpegsource/ffmpegsource-2.40.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1-2)
+inherit autotools
+
+DESCRIPTION="A libav/ffmpeg based source library for easy frame accurate access"
+HOMEPAGE="https://github.com/FFMS/ffms2"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/FFMS/ffms2.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/FFMS/ffms2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/ffms2-${PV}
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/4"
+
+RDEPEND="
+	>=media-video/ffmpeg-2.4:=
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	# Cheesy hack from autogen.sh
+	mkdir src/config || die
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/ffmpegsource/ffmpegsource-9999.ebuild b/media-libs/ffmpegsource/ffmpegsource-9999.ebuild
index 6393bcca9c70..1ea646b97aa7 100644
--- a/media-libs/ffmpegsource/ffmpegsource-9999.ebuild
+++ b/media-libs/ffmpegsource/ffmpegsource-9999.ebuild
@@ -1,47 +1,43 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit autotools flag-o-matic git-r3
+QA_PKGCONFIG_VERSION=$(ver_cut 1-2)
+inherit autotools
 
 DESCRIPTION="A libav/ffmpeg based source library for easy frame accurate access"
 HOMEPAGE="https://github.com/FFMS/ffms2"
-EGIT_REPO_URI="https://github.com/FFMS/ffms2.git"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/FFMS/ffms2.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/FFMS/ffms2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/ffms2-${PV}
+
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="MIT"
 SLOT="0/4"
-KEYWORDS=""
 
 RDEPEND="
+	>=media-video/ffmpeg-2.4:=
 	sys-libs/zlib
-	>=media-video/ffmpeg-2.4:0=
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
 "
-
-ffms_check_compiler() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
-		die "Your compiler lacks C++11 support. Use GCC>=4.7.0 or Clang>=3.3."
-	fi
-}
-
-pkg_pretend() {
-	ffms_check_compiler
-}
-
-pkg_setup() {
-	ffms_check_compiler
-}
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
-	mkdir -p "${S}/src/config"
-	default_src_prepare
+	default
+
+	# Cheesy hack from autogen.sh
+	mkdir src/config || die
 	eautoreconf
 }
 
 src_install() {
-	default_src_install
+	default
+
 	find "${ED}" -name '*.la' -delete || die
 }