From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CBD49138334 for ; Fri, 30 Nov 2018 22:45:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7FD37E09BD; Fri, 30 Nov 2018 22:45:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 46439E09BD for ; Fri, 30 Nov 2018 22:45:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5F3BE335C47 for ; Fri, 30 Nov 2018 22:45:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C9DD62A7 for ; Fri, 30 Nov 2018 22:45:02 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1543617883.b01246dd43f29611331530be23b5f1f8a1a5053b.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/kvazaar/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/kvazaar/kvazaar-1.2.0.ebuild media-libs/kvazaar/kvazaar-9999.ebuild X-VCS-Directories: media-libs/kvazaar/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: b01246dd43f29611331530be23b5f1f8a1a5053b X-VCS-Branch: master Date: Fri, 30 Nov 2018 22:45:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 59725985-e2bb-446e-89f8-85e87bcb7529 X-Archives-Hash: 2ceda4a5c02406a60b63a058eada149d commit: b01246dd43f29611331530be23b5f1f8a1a5053b Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Nov 30 22:05:35 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Nov 30 22:44:43 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b01246dd media-libs/kvazaar: EAPI-6 bump and general cleanup Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/kvazaar/kvazaar-1.2.0.ebuild | 45 +++++++++++++------------------ media-libs/kvazaar/kvazaar-9999.ebuild | 47 ++++++++++++++------------------- 2 files changed, 39 insertions(+), 53 deletions(-) diff --git a/media-libs/kvazaar/kvazaar-1.2.0.ebuild b/media-libs/kvazaar/kvazaar-1.2.0.ebuild index 3c2dc94003a..46bae358eb2 100644 --- a/media-libs/kvazaar/kvazaar-1.2.0.ebuild +++ b/media-libs/kvazaar/kvazaar-1.2.0.ebuild @@ -1,45 +1,40 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 - -SCM="" +EAPI=6 GREATEST_PV="1.2.1" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM="git-r3" +if [[ ${PV} = *9999 ]] ; then + inherit git-r3 EGIT_REPO_URI="https://github.com/ultravideo/kvazaar" -fi - -inherit eutils multilib autotools multilib-minimal toolchain-funcs flag-o-matic ${SCM} - -DESCRIPTION="An open-source HEVC encoder" -HOMEPAGE="http://ultravideo.cs.tut.fi/ https://github.com/ultravideo/kvazaar" - -if [ "${PV#9999}" = "${PV}" ] ; then +else SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz test? ( https://github.com/silentbicycle/greatest/archive/v${GREATEST_PV}.tar.gz -> greatest-${GREATEST_PV}.tar.gz )" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" fi +inherit autotools flag-o-matic multilib-minimal toolchain-funcs + +DESCRIPTION="Open-source HEVC encoder" +HOMEPAGE="http://ultravideo.cs.tut.fi/ https://github.com/ultravideo/kvazaar" LICENSE="LGPL-2.1" # subslot = libkvazaar major SLOT="0/4" IUSE="static-libs test" - -DEPEND="" -RDEPEND="${DEPEND}" REQUIRED_USE="test? ( static-libs )" ASM_DEP=">=dev-lang/yasm-1.2.0" -DEPEND="${DEPEND} +RDEPEND="" +DEPEND="${RDEPEND} abi_x86_32? ( ${ASM_DEP} ) - abi_x86_64? ( ${ASM_DEP} )" + abi_x86_64? ( ${ASM_DEP} ) +" src_prepare() { + default eautoreconf - if use test && [ "${PV#9999}" = "${PV}" ]; then + if use test && [[ ${PV} != *9999 ]]; then # https://bugs.gentoo.org/show_bug.cgi?id=595932 rmdir "${S}/greatest" || die mv "${WORKDIR}/greatest-${GREATEST_PV}" "${S}/greatest" || die @@ -49,13 +44,11 @@ src_prepare() { } multilib_src_configure() { - ECONF_SOURCE="${S}" \ - econf \ - --disable-werror \ - --docdir "/usr/share/doc/${PF}" \ - $(use_enable static-libs static) + ECONF_SOURCE="${S}" econf \ + --disable-werror \ + $(use_enable static-libs static) } multilib_src_install_all() { - find "${ED}" -name '*.la' -delete + find "${ED}" -name '*.la' -delete || die } diff --git a/media-libs/kvazaar/kvazaar-9999.ebuild b/media-libs/kvazaar/kvazaar-9999.ebuild index 17d2a2b7eca..46bae358eb2 100644 --- a/media-libs/kvazaar/kvazaar-9999.ebuild +++ b/media-libs/kvazaar/kvazaar-9999.ebuild @@ -1,45 +1,40 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 - -SCM="" +EAPI=6 GREATEST_PV="1.2.1" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM="git-r3" +if [[ ${PV} = *9999 ]] ; then + inherit git-r3 EGIT_REPO_URI="https://github.com/ultravideo/kvazaar" -fi - -inherit eutils multilib autotools multilib-minimal toolchain-funcs flag-o-matic ${SCM} - -DESCRIPTION="An open-source HEVC encoder" -HOMEPAGE="http://ultravideo.cs.tut.fi/ https://github.com/ultravideo/kvazaar" - -if [ "${PV#9999}" = "${PV}" ] ; then +else SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz test? ( https://github.com/silentbicycle/greatest/archive/v${GREATEST_PV}.tar.gz -> greatest-${GREATEST_PV}.tar.gz )" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" fi +inherit autotools flag-o-matic multilib-minimal toolchain-funcs + +DESCRIPTION="Open-source HEVC encoder" +HOMEPAGE="http://ultravideo.cs.tut.fi/ https://github.com/ultravideo/kvazaar" LICENSE="LGPL-2.1" # subslot = libkvazaar major SLOT="0/4" IUSE="static-libs test" - -DEPEND="" -RDEPEND="${DEPEND}" REQUIRED_USE="test? ( static-libs )" ASM_DEP=">=dev-lang/yasm-1.2.0" -DEPEND="${DEPEND} +RDEPEND="" +DEPEND="${RDEPEND} abi_x86_32? ( ${ASM_DEP} ) - abi_x86_64? ( ${ASM_DEP} )" + abi_x86_64? ( ${ASM_DEP} ) +" src_prepare() { + default eautoreconf - if use test && [ "${PV#9999}" = "${PV}" ]; then + if use test && [[ ${PV} != *9999 ]]; then # https://bugs.gentoo.org/show_bug.cgi?id=595932 rmdir "${S}/greatest" || die mv "${WORKDIR}/greatest-${GREATEST_PV}" "${S}/greatest" || die @@ -49,13 +44,11 @@ src_prepare() { } multilib_src_configure() { - ECONF_SOURCE="${S}" \ - econf \ - --disable-werror \ - --docdir "/usr/share/doc/${PF}" \ - $(use_enable static-libs static) + ECONF_SOURCE="${S}" econf \ + --disable-werror \ + $(use_enable static-libs static) } multilib_src_install_all() { - find "${ED}" -name '*.la' -delete + find "${ED}" -name '*.la' -delete || die }