commit: a87472c1c93040526dcbd64f64d5f976c86716db Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Mon Mar 18 09:15:36 2019 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Mon Mar 18 17:22:49 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a87472c1
x11-apps/mesa-progs: Bumped live ebuild to EAPI-7 - Added new gitlab repo URI - Removed some redundant ebuild code - Added alternate SRC_URI Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/11402 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> x11-apps/mesa-progs/mesa-progs-9999.ebuild | 40 +++++++++++------------------- 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild index 5d949f23bd5..248a1db51fc 100644 --- a/x11-apps/mesa-progs/mesa-progs-9999.ebuild +++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild @@ -1,29 +1,26 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -MY_PN=${PN/progs/demos} -MY_P=${MY_PN}-${PV} -EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/demos.git"; +inherit toolchain-funcs -if [[ ${PV} = 9999* ]]; then - GIT_ECLASS="git-r3" - EXPERIMENTAL="true" -fi - -inherit base autotools toolchain-funcs ${GIT_ECLASS} +MY_PN="${PN/progs/demos}" +MY_P="${MY_PN}-${PV}" DESCRIPTION="Mesa's OpenGL utility and demo programs (glxgears and glxinfo)" HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"; -if [[ ${PV} == 9999* ]]; then - SRC_URI="" - KEYWORDS="" +if [[ ${PV} = 9999* ]]; then + inherit autotools git-r3 + EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/demos.git"; + EGIT_CHECKOUT_DIR="${S}" + EXPERIMENTAL="true" else - SRC_URI="https://mesa.freedesktop.org/archive/demos/${PV}/${MY_P}.tar.bz2"; + SRC_URI="https://mesa.freedesktop.org/archive/demos/${MY_P}.tar.bz2 + https://mesa.freedesktop.org/archive/demos/${PV}/${MY_P}.tar.bz2"; KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" + S="${WORKDIR}/${MY_P}" fi - LICENSE="LGPL-2" SLOT="0" IUSE="egl gles2" @@ -37,17 +34,8 @@ DEPEND="${RDEPEND} virtual/glu x11-base/xorg-proto" -S=${WORKDIR}/${MY_P} -EGIT_CHECKOUT_DIR=${S} - -src_unpack() { - default - [[ $PV = 9999* ]] && git-r3_src_unpack -} - src_prepare() { - base_src_prepare - + default [[ $PV = 9999* ]] && eautoreconf }
