commit: 8dac6041d8685f7bba21e9f5815b3659d66c8547 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Sep 15 22:23:21 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Sep 15 22:39:29 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dac6041
media-libs/waffle: Bump 1.5.2 to EAPI-6 Package-Manager: Portage-2.3.49, Repoman-2.3.10 media-libs/waffle/waffle-1.5.2.ebuild | 47 ++++++++++++++--------------------- 1 file changed, 19 insertions(+), 28 deletions(-) diff --git a/media-libs/waffle/waffle-1.5.2.ebuild b/media-libs/waffle/waffle-1.5.2.ebuild index ec71eacc2bf..2be51a34280 100644 --- a/media-libs/waffle/waffle-1.5.2.ebuild +++ b/media-libs/waffle/waffle-1.5.2.ebuild @@ -1,25 +1,19 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 -EGIT_REPO_URI="https://github.com/waffle-gl/${PN}.git"; - -if [[ ${PV} = 9999* ]]; then - GIT_ECLASS="git-2" -fi - -inherit cmake-utils cmake-multilib ${GIT_ECLASS} - -DESCRIPTION="Library that allows selection of GL API and of window system at runtime" -HOMEPAGE="https://people.freedesktop.org/~chadversary/waffle/"; - -if [[ $PV = 9999* ]]; then - KEYWORDS="~ppc ~ppc64" +if [[ ${PV} = *9999* ]]; then + EGIT_REPO_URI="https://github.com/waffle-gl/${PN}.git"; + GIT_ECLASS="git-r3" else SRC_URI="https://people.freedesktop.org/~chadversary/${PN}/files/release/${P}/${P}.tar.xz"; KEYWORDS="amd64 arm ~ppc ~ppc64 x86" fi +inherit cmake-multilib ${GIT_ECLASS} + +DESCRIPTION="Library that allows selection of GL API and of window system at runtime" +HOMEPAGE="https://people.freedesktop.org/~chadversary/waffle/"; LICENSE="BSD-2" SLOT="0" @@ -28,31 +22,28 @@ IUSE="doc egl gbm test wayland" RDEPEND=" >=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}] >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] - wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] ) - gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] ) >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]" + >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] + gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] ) + wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] ) +" DEPEND="${RDEPEND} >=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}] doc? ( dev-libs/libxslt app-text/docbook-xml-dtd:4.2 - )" - -src_unpack() { - default - [[ $PV = 9999* ]] && git-2_src_unpack -} + ) +" src_configure() { local mycmakeargs=( -Dwaffle_has_glx=ON -Dwaffle_build_examples=OFF - $(cmake-utils_use doc waffle_build_manpages) - $(cmake-utils_use egl waffle_has_x11_egl) - $(cmake-utils_use gbm waffle_has_gbm) - $(cmake-utils_use test waffle_build_tests) - $(cmake-utils_use wayland waffle_has_wayland) + -Dwaffle_build_manpages=$(usex doc ) + -Dwaffle_has_x11_egl=$(usex egl) + -Dwaffle_has_gbm=$(usex gbm) + -Dwaffle_build_tests=$(usex test) + -Dwaffle_has_wayland=$(usex wayland) ) cmake-multilib_src_configure
