From 1739c8014a4a0a86915af25a8db3b95c1c15e34e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 25 Nov 2016 21:18:04 +0000 Subject: update ssr, keep going with EAPI 6 porting --- lxqt-base/lxqt-wallet/lxqt-wallet-3.0.0-r1.ebuild | 48 +++++++++ lxqt-base/lxqt-wallet/lxqt-wallet-3.0.0.ebuild | 48 --------- .../pavucontrol-qt/pavucontrol-qt-0.1.0.ebuild | 4 +- media-video/simplescreenrecorder/Manifest | 2 +- .../simplescreenrecorder-0.3.7.ebuild | 112 --------------------- .../simplescreenrecorder-0.3.8.ebuild | 112 +++++++++++++++++++++ 6 files changed, 163 insertions(+), 163 deletions(-) create mode 100644 lxqt-base/lxqt-wallet/lxqt-wallet-3.0.0-r1.ebuild delete mode 100644 lxqt-base/lxqt-wallet/lxqt-wallet-3.0.0.ebuild delete mode 100644 media-video/simplescreenrecorder/simplescreenrecorder-0.3.7.ebuild create mode 100644 media-video/simplescreenrecorder/simplescreenrecorder-0.3.8.ebuild diff --git a/lxqt-base/lxqt-wallet/lxqt-wallet-3.0.0-r1.ebuild b/lxqt-base/lxqt-wallet/lxqt-wallet-3.0.0-r1.ebuild new file mode 100644 index 00000000..3bd27058 --- /dev/null +++ b/lxqt-base/lxqt-wallet/lxqt-wallet-3.0.0-r1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit eutils git-r3 cmake-utils + +DESCRIPTION="Create a Kwallet/Gnome-keyring like functionality for lxqt" +HOMEPAGE="https://github.com/mhogomchungu/lxqt_wallet" + +EGIT_REPO_URI="https://github.com/mhogomchungu/lxqt_wallet.git" +EGIT_COMMIT="1ad0c22c169c6fa43b767ae8bdbc972af376b8d1" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="kwallet +libsecret" + +DEPEND="dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/linguist-tools:5 + libsecret? ( + app-crypt/libsecret + ) + kwallet? ( + kde-frameworks/kwallet + kde-frameworks/knotifications + )" +RDEPEND="${DEPEND}" + +src_configure() { + if use kwallet && use libsecret ; then + local mycmakeargs=( + -DNOKDESUPPORT=false -DNOSECRETSUPPORT=false) + elif ! use kwallet && use libsecret ; then + local mycmakeargs=( + -DNOKDESUPPORT=true -DNOSECRETSUPPORT=false) + elif use kwallet && ! use libsecret ; then + local mycmakeargs=( + -DNOKDESUPPORT=false -DNOSECRETSUPPORT=true) + elif ! use kwallet && ! use libsecret ; then + local mycmakeargs=( + -DNOKDESUPPORT=true -DNOSECRETSUPPORT=true) + fi + cmake-utils_src_configure +} diff --git a/lxqt-base/lxqt-wallet/lxqt-wallet-3.0.0.ebuild b/lxqt-base/lxqt-wallet/lxqt-wallet-3.0.0.ebuild deleted file mode 100644 index 8ce30b7e..00000000 --- a/lxqt-base/lxqt-wallet/lxqt-wallet-3.0.0.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils git-2 cmake-utils - -DESCRIPTION="Create a Kwallet/Gnome-keyring like functionality for lxqt" -HOMEPAGE="https://github.com/mhogomchungu/lxqt_wallet" - -EGIT_REPO_URI="https://github.com/mhogomchungu/lxqt_wallet.git" -EGIT_COMMIT="1ad0c22c169c6fa43b767ae8bdbc972af376b8d1" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="kwallet +libsecret" - -DEPEND="dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/linguist-tools:5 - libsecret? ( - app-crypt/libsecret - ) - kwallet? ( - kde-frameworks/kwallet - kde-frameworks/knotifications - )" -RDEPEND="${DEPEND}" - -src_configure() { - if use kwallet && use libsecret ; then - local mycmakeargs=( - -DNOKDESUPPORT=false -DNOSECRETSUPPORT=false) - elif ! use kwallet && use libsecret ; then - local mycmakeargs=( - -DNOKDESUPPORT=true -DNOSECRETSUPPORT=false) - elif use kwallet && ! use libsecret ; then - local mycmakeargs=( - -DNOKDESUPPORT=false -DNOSECRETSUPPORT=true) - elif ! use kwallet && ! use libsecret ; then - local mycmakeargs=( - -DNOKDESUPPORT=true -DNOSECRETSUPPORT=true) - fi - cmake-utils_src_configure -} diff --git a/media-sound/pavucontrol-qt/pavucontrol-qt-0.1.0.ebuild b/media-sound/pavucontrol-qt/pavucontrol-qt-0.1.0.ebuild index 33407933..b42c54b1 100644 --- a/media-sound/pavucontrol-qt/pavucontrol-qt-0.1.0.ebuild +++ b/media-sound/pavucontrol-qt/pavucontrol-qt-0.1.0.ebuild @@ -2,9 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 -inherit eutils git-2 cmake-utils +inherit eutils git-r3 cmake-utils DESCRIPTION="Qt port of pavucontrol" HOMEPAGE="http://lxqt.org" diff --git a/media-video/simplescreenrecorder/Manifest b/media-video/simplescreenrecorder/Manifest index 4ecd06ce..9f83a89c 100644 --- a/media-video/simplescreenrecorder/Manifest +++ b/media-video/simplescreenrecorder/Manifest @@ -1 +1 @@ -DIST 0.3.7.tar.gz 2036840 SHA256 e889fc177b8fed0aa907578478d8110420d2c553a32a5052249e54337f04f870 SHA512 359faa83e8abccf54998dcf8e58145755d8c24fbd8e3b7696a8cddbba7b0c784aa036ed1fc43236967abb8f6eb3161b94fb1abc23fd824d548faa14886abf459 WHIRLPOOL f36df8c955d46d993a09971455dabd646884fefdf3587794913a2a645d7180d7a52f9d386388d9c3fa117681063450f3d0224be34ba8bbfec7a0577f4dd66069 +DIST 0.3.8.tar.gz 2037017 SHA256 ef05f1b4c36e1d82a4e96f59c5f29aaae986ad6711ccc311d0e21c8e6c191c6d SHA512 f94c7ac7d5f6fdebd1c68da7469b6c46a21b399e2ad8744c52d3e9959d2ec74d15e6ac061d7fe41f02ebb9ee9a89fbd8feecf4e0a10110975f3857a7fbb66365 WHIRLPOOL 23a811f5af9921bfdaf8d5546b9497e4a46d923d6eeb38d572b4d243ca55e75f0528df4b31936f23684e9a3cd54f47c1289682d196a04d97927501e19362013b diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.7.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.3.7.ebuild deleted file mode 100644 index 8da970e7..00000000 --- a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.7.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit flag-o-matic multilib-minimal - -if [[ ${PV} = 9999 ]]; then - inherit git-2 -fi - -DESCRIPTION="A Simple Screen Recorder" -HOMEPAGE="http://www.maartenbaert.be/simplescreenrecorder" -LICENSE="GPL-3" -PKGNAME="ssr" -S=${WORKDIR}/${PKGNAME}-${PV} -if [[ ${PV} = 9999 ]]; then - EGIT_REPO_URI="git://github.com/MaartenBaert/${PKGNAME}.git - https://github.com/MaartenBaert/${PKGNAME}.git" - EGIT_BOOTSTRAP="" - KEYWORDS="" -else - SRC_URI="https://github.com/MaartenBaert/${PKGNAME}/archive/${PV}.tar.gz" - KEYWORDS="amd64" -fi - -SLOT="0" -IUSE="+asm debug jack mp3 pulseaudio theora vorbis vpx x264 +qt4 qt5" -REQUIRED_USE="^^ ( qt4 qt5 )" - -RDEPEND=" - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - ) - virtual/glu[${MULTILIB_USEDEP}] - media-libs/alsa-lib - media-libs/mesa[${MULTILIB_USEDEP}] - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libXext - x11-libs/libXfixes[${MULTILIB_USEDEP}] - jack? ( media-sound/jack-audio-connection-kit ) - pulseaudio? ( media-sound/pulseaudio ) - || ( - media-video/ffmpeg:0[vorbis?,vpx?,x264?,mp3?,theora?] - media-video/libav[vorbis?,vpx?,x264?,mp3?,theora?] - ) - " -DEPEND="${RDEPEND}" - -pkg_setup() { - if [[ ${PV} == "9999" ]]; then - elog - elog "This ebuild merges the latest revision available from upstream's" - elog "git repository, and might fail to compile or work properly once" - elog "merged." - elog - fi - - if [[ ${ABI} == amd64 ]]; then - elog "You may want to add USE flag 'abi_x86_32' when running a 64bit system" - elog "When added 32bit GLInject libraries are also included. This is" - elog "required if you want to use OpenGL recording on 32bit applications." - elog - fi - - if ( has_version media-video/ffmpeg[x264] || has_version media-video/libav[x264] ) && has_version media-libs/x264[10bit]; then - ewarn - ewarn "media-libs/x264 is currently built with 10bit useflag." - ewarn "This is known to prevent simplescreenrecorder from recording x264 videos" - ewarn "correctly. Please build media-libs/x264 without 10bit if you want to " - ewarn "record videos with x264." - ewarn - fi - - # QT requires -fPIC. Compile fails otherwise. - # Recently removed from the default compile options upstream - # https://github.com/MaartenBaert/ssr/commit/25fe1743058f0d1f95f6fbb39014b6ac146b5180 - append-flags -fPIC -} - -multilib_src_configure() { - - local myconf=( - --enable-dependency-tracking - $(multilib_native_use_enable debug assert) - $(multilib_native_use_with pulseaudio) - $(multilib_native_use_with jack) - $(multilib_native_use_with qt5) - $(use_enable asm x86-asm) - ) - - # libav doesn't have AVFrame::channels - # https://github.com/MaartenBaert/ssr/issues/195#issuecomment-45646159 - if has_version media-video/libav; then - myconf+=( --disable-ffmpeg-versions ) - fi - - multilib_is_native_abi || myconf+=( --disable-ssrprogram ) - - ECONF_SOURCE="${S}" \ - econf \ - ${myconf[@]} - -} diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.8.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.3.8.ebuild new file mode 100644 index 00000000..8da970e7 --- /dev/null +++ b/media-video/simplescreenrecorder/simplescreenrecorder-0.3.8.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit flag-o-matic multilib-minimal + +if [[ ${PV} = 9999 ]]; then + inherit git-2 +fi + +DESCRIPTION="A Simple Screen Recorder" +HOMEPAGE="http://www.maartenbaert.be/simplescreenrecorder" +LICENSE="GPL-3" +PKGNAME="ssr" +S=${WORKDIR}/${PKGNAME}-${PV} +if [[ ${PV} = 9999 ]]; then + EGIT_REPO_URI="git://github.com/MaartenBaert/${PKGNAME}.git + https://github.com/MaartenBaert/${PKGNAME}.git" + EGIT_BOOTSTRAP="" + KEYWORDS="" +else + SRC_URI="https://github.com/MaartenBaert/${PKGNAME}/archive/${PV}.tar.gz" + KEYWORDS="amd64" +fi + +SLOT="0" +IUSE="+asm debug jack mp3 pulseaudio theora vorbis vpx x264 +qt4 qt5" +REQUIRED_USE="^^ ( qt4 qt5 )" + +RDEPEND=" + qt4? ( + dev-qt/qtcore:4 + dev-qt/qtgui:4 + ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + ) + virtual/glu[${MULTILIB_USEDEP}] + media-libs/alsa-lib + media-libs/mesa[${MULTILIB_USEDEP}] + x11-libs/libX11[${MULTILIB_USEDEP}] + x11-libs/libXext + x11-libs/libXfixes[${MULTILIB_USEDEP}] + jack? ( media-sound/jack-audio-connection-kit ) + pulseaudio? ( media-sound/pulseaudio ) + || ( + media-video/ffmpeg:0[vorbis?,vpx?,x264?,mp3?,theora?] + media-video/libav[vorbis?,vpx?,x264?,mp3?,theora?] + ) + " +DEPEND="${RDEPEND}" + +pkg_setup() { + if [[ ${PV} == "9999" ]]; then + elog + elog "This ebuild merges the latest revision available from upstream's" + elog "git repository, and might fail to compile or work properly once" + elog "merged." + elog + fi + + if [[ ${ABI} == amd64 ]]; then + elog "You may want to add USE flag 'abi_x86_32' when running a 64bit system" + elog "When added 32bit GLInject libraries are also included. This is" + elog "required if you want to use OpenGL recording on 32bit applications." + elog + fi + + if ( has_version media-video/ffmpeg[x264] || has_version media-video/libav[x264] ) && has_version media-libs/x264[10bit]; then + ewarn + ewarn "media-libs/x264 is currently built with 10bit useflag." + ewarn "This is known to prevent simplescreenrecorder from recording x264 videos" + ewarn "correctly. Please build media-libs/x264 without 10bit if you want to " + ewarn "record videos with x264." + ewarn + fi + + # QT requires -fPIC. Compile fails otherwise. + # Recently removed from the default compile options upstream + # https://github.com/MaartenBaert/ssr/commit/25fe1743058f0d1f95f6fbb39014b6ac146b5180 + append-flags -fPIC +} + +multilib_src_configure() { + + local myconf=( + --enable-dependency-tracking + $(multilib_native_use_enable debug assert) + $(multilib_native_use_with pulseaudio) + $(multilib_native_use_with jack) + $(multilib_native_use_with qt5) + $(use_enable asm x86-asm) + ) + + # libav doesn't have AVFrame::channels + # https://github.com/MaartenBaert/ssr/issues/195#issuecomment-45646159 + if has_version media-video/libav; then + myconf+=( --disable-ffmpeg-versions ) + fi + + multilib_is_native_abi || myconf+=( --disable-ssrprogram ) + + ECONF_SOURCE="${S}" \ + econf \ + ${myconf[@]} + +} -- cgit v1.2.3