[gentoo-commits] repo/gentoo:master commit in: media-libs/libde265/

[Thomas Deutschmann]

commit:     c2ba61f77034815605f470745da96bb979d4004f
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  8 19:27:33 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Sep  8 22:04:41 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2ba61f7

media-libs/libde265: update live ebuild

- Bump to EAPI=7

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 media-libs/libde265/libde265-9999.ebuild | 40 ++++++++++++++++++++++++--------
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/media-libs/libde265/libde265-9999.ebuild 
b/media-libs/libde265/libde265-9999.ebuild
index 5fd5bc2676d..271e443495b 100644
--- a/media-libs/libde265/libde265-9999.ebuild
+++ b/media-libs/libde265/libde265-9999.ebuild
@@ -1,15 +1,22 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI="7"
 
-AUTOTOOLS_IN_SOURCE_BUILD=1
-AUTOTOOLS_AUTORECONF=1
-inherit git-r3 autotools-multilib
+inherit autotools multilib-minimal
+
+PATCHES=( "${FILESDIR}/${PN}-1.0.2-qtbindir.patch" )
+
+if [[ ${PV} == "9999" ]] ; then
+       EGIT_REPO_URI="https://github.com/strukturag/${PN}.git";
+       inherit git-r3
+else
+       SRC_URI="https://github.com/strukturag/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+       KEYWORDS="~amd64 ~x86"
+fi
 
 DESCRIPTION="Open h.265 video codec implementation"
 HOMEPAGE="https://github.com/strukturag/libde265";
-EGIT_REPO_URI="https://github.com/strukturag/${PN}.git";
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -27,9 +34,16 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-1.0.2-qtbindir.patch" )
+src_prepare() {
+       default
+
+       eautoreconf
 
-src_configure() {
+       # without this, headers would be missing and make would fail
+       multilib_copy_sources
+}
+
+multilib_src_configure() {
        local myeconfargs=(
                $(use_enable cpu_flags_x86_sse sse)
                $(use_enable static-libs static)
@@ -38,8 +52,14 @@ src_configure() {
                $(use_enable debug log-trace)
                $(use_enable qt5 dec265)
                $(use_enable qt5 sherlock265)
-               --disable-silent-rules
                --enable-log-error
        )
-       autotools-multilib_src_configure "${myeconfargs[@]}"
+       econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+       find "${ED}" -name '*.la' -delete || die
+       if ! use static-libs ; then
+               find "${ED}" -name "*.a" -delete || die
+       fi
 }