commit: 8e83394116f819cec34cbcc66fbe787e630cfcbf Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Aug 15 11:18:36 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Aug 15 11:22:04 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e833941
media-video/simplescreenrecorder: Drop src_prepare obsolete in EAPI-8 Fix typo, HOMEPAGE redirection, ebuild style. Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../simplescreenrecorder-0.4.4-r1.ebuild | 24 ++++++++-------------- .../simplescreenrecorder-0.4.4.ebuild | 20 +++++++----------- .../simplescreenrecorder-9999.ebuild | 20 +++++++----------- 3 files changed, 22 insertions(+), 42 deletions(-) diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.4.4-r1.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.4.4-r1.ebuild index 667f701f5639..ec483db9038f 100644 --- a/media-video/simplescreenrecorder/simplescreenrecorder-0.4.4-r1.ebuild +++ b/media-video/simplescreenrecorder/simplescreenrecorder-0.4.4-r1.ebuild @@ -3,13 +3,11 @@ EAPI=8 -CMAKE_ECLASS=cmake +PKGNAME="ssr" inherit cmake-multilib flag-o-matic xdg DESCRIPTION="A Simple Screen Recorder" -HOMEPAGE="https://www.maartenbaert.be/simplescreenrecorder"; -LICENSE="GPL-3" -PKGNAME="ssr" +HOMEPAGE="https://www.maartenbaert.be/simplescreenrecorder/"; if [[ ${PV} = 9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/MaartenBaert/${PKGNAME}.git"; @@ -20,9 +18,12 @@ else S="${WORKDIR}/${PKGNAME}-${PV}" fi +LICENSE="GPL-3" SLOT="0" IUSE="+asm jack mp3 opengl pulseaudio theora v4l vorbis vpx x264" +REQUIRED_USE="abi_x86_32? ( opengl )" + RDEPEND=" dev-qt/qtcore:5 dev-qt/qtgui:5 @@ -36,19 +37,15 @@ RDEPEND=" x11-libs/libXi x11-libs/libXinerama virtual/glu[${MULTILIB_USEDEP}] - v4l? ( media-libs/libv4l ) jack? ( virtual/jack ) opengl? ( media-libs/libglvnd[${MULTILIB_USEDEP},X] ) pulseaudio? ( media-sound/pulseaudio ) + v4l? ( media-libs/libv4l ) " DEPEND="${RDEPEND}" BDEPEND="dev-qt/linguist-tools:5" -REQUIRED_USE="abi_x86_32? ( opengl )" - -PATCHES=( - "${FILESDIR}"/${P}-ffmpeg5.patch -) +PATCHES=( "${FILESDIR}"/${P}-ffmpeg5.patch ) pkg_pretend() { if [[ "${ABI}" == amd64 ]] ; then @@ -69,17 +66,12 @@ pkg_pretend() { } pkg_setup() { - # QT requires -fPIC. Compile fails otherwise. + # Qt requires -fPIC. Compile fails otherwise. # Recently removed from the default compile options upstream # https://github.com/MaartenBaert/ssr/commit/25fe1743058f0d1f95f6fbb39014b6ac146b5180 append-flags -fPIC } -src_prepare() { - # required because xdg.eclass overrides default cmake_src_prepare - cmake_src_prepare -} - multilib_src_configure() { local mycmakeargs=( -DENABLE_JACK_METADATA="$(multilib_native_usex jack)" diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.4.4.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.4.4.ebuild index 3140f84c1dce..e732de6afde8 100644 --- a/media-video/simplescreenrecorder/simplescreenrecorder-0.4.4.ebuild +++ b/media-video/simplescreenrecorder/simplescreenrecorder-0.4.4.ebuild @@ -3,13 +3,11 @@ EAPI=8 -CMAKE_ECLASS=cmake +PKGNAME="ssr" inherit cmake-multilib flag-o-matic xdg DESCRIPTION="A Simple Screen Recorder" -HOMEPAGE="https://www.maartenbaert.be/simplescreenrecorder"; -LICENSE="GPL-3" -PKGNAME="ssr" +HOMEPAGE="https://www.maartenbaert.be/simplescreenrecorder/"; if [[ ${PV} = 9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/MaartenBaert/${PKGNAME}.git"; @@ -20,9 +18,12 @@ else S="${WORKDIR}/${PKGNAME}-${PV}" fi +LICENSE="GPL-3" SLOT="0" IUSE="+asm jack mp3 opengl pulseaudio theora v4l vorbis vpx x264" +REQUIRED_USE="abi_x86_32? ( opengl )" + RDEPEND=" dev-qt/qtcore:5 dev-qt/qtgui:5 @@ -36,16 +37,14 @@ RDEPEND=" x11-libs/libXi x11-libs/libXinerama virtual/glu[${MULTILIB_USEDEP}] - v4l? ( media-libs/libv4l ) jack? ( virtual/jack ) opengl? ( media-libs/libglvnd[${MULTILIB_USEDEP},X] ) pulseaudio? ( media-sound/pulseaudio ) + v4l? ( media-libs/libv4l ) " DEPEND="${RDEPEND}" BDEPEND="dev-qt/linguist-tools:5" -REQUIRED_USE="abi_x86_32? ( opengl )" - pkg_pretend() { if [[ "${ABI}" == amd64 ]] ; then einfo "You may want to add USE flag 'abi_x86_32' when running a 64bit system" @@ -65,17 +64,12 @@ pkg_pretend() { } pkg_setup() { - # QT requires -fPIC. Compile fails otherwise. + # Qt requires -fPIC. Compile fails otherwise. # Recently removed from the default compile options upstream # https://github.com/MaartenBaert/ssr/commit/25fe1743058f0d1f95f6fbb39014b6ac146b5180 append-flags -fPIC } -src_prepare() { - # required because xdg.eclass overrides default cmake_src_prepare - cmake_src_prepare -} - multilib_src_configure() { local mycmakeargs=( -DENABLE_JACK_METADATA="$(multilib_native_usex jack)" diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild index 5c2e985195d7..a365a63c3e5d 100644 --- a/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild +++ b/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild @@ -3,13 +3,11 @@ EAPI=8 -CMAKE_ECLASS=cmake +PKGNAME="ssr" inherit cmake-multilib flag-o-matic xdg DESCRIPTION="A Simple Screen Recorder" -HOMEPAGE="https://www.maartenbaert.be/simplescreenrecorder"; -LICENSE="GPL-3" -PKGNAME="ssr" +HOMEPAGE="https://www.maartenbaert.be/simplescreenrecorder/"; if [[ ${PV} = 9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/MaartenBaert/${PKGNAME}.git"; @@ -20,9 +18,12 @@ else S="${WORKDIR}/${PKGNAME}-${PV}" fi +LICENSE="GPL-3" SLOT="0" IUSE="+asm jack mp3 opengl pulseaudio theora v4l vorbis vpx x264" +REQUIRED_USE="abi_x86_32? ( opengl )" + RDEPEND=" dev-qt/qtcore:5 dev-qt/qtgui:5 @@ -36,16 +37,14 @@ RDEPEND=" x11-libs/libXi x11-libs/libXinerama virtual/glu[${MULTILIB_USEDEP}] - v4l? ( media-libs/libv4l ) jack? ( virtual/jack ) opengl? ( media-libs/libglvnd[${MULTILIB_USEDEP},X] ) pulseaudio? ( media-sound/pulseaudio ) + v4l? ( media-libs/libv4l ) " DEPEND="${RDEPEND}" BDEPEND="dev-qt/linguist-tools:5" -REQUIRED_USE="abi_x86_32? ( opengl )" - pkg_pretend() { if [[ "${ABI}" == amd64 ]] ; then einfo "You may want to add USE flag 'abi_x86_32' when running a 64bit system" @@ -65,17 +64,12 @@ pkg_pretend() { } pkg_setup() { - # QT requires -fPIC. Compile fails otherwise. + # Qt requires -fPIC. Compile fails otherwise. # Recently removed from the default compile options upstream # https://github.com/MaartenBaert/ssr/commit/25fe1743058f0d1f95f6fbb39014b6ac146b5180 append-flags -fPIC } -src_prepare() { - # required because xdg.eclass overrides default cmake_src_prepare - cmake_src_prepare -} - multilib_src_configure() { local mycmakeargs=( -DENABLE_JACK_METADATA="$(multilib_native_usex jack)"
