diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2021-08-31 18:37:45 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2021-09-02 18:46:27 +0200 |
| commit | e971c2fcc9d9d7cf7cbe16a06e33d14cc855d29e (patch) | |
| tree | 9059f1418d0a961945c366587c3c68683a6e4e47 /app-arch/brotli | |
| parent | cmake-multilib.eclass: Set @PROVIDES (diff) | |
| download | gentoo-e971c2fcc9d9d7cf7cbe16a06e33d14cc855d29e.tar.gz gentoo-e971c2fcc9d9d7cf7cbe16a06e33d14cc855d29e.tar.bz2 gentoo-e971c2fcc9d9d7cf7cbe16a06e33d14cc855d29e.zip | |
app-arch/brotli: EAPI-8 bump, fix IUSE=python
Fix weird ebuild variable order.
Sync live with release ebuild pypy3 support and ~m68k keyword.
Thanks-to: Alex Xu (Hello71) <alex_y_xu@yahoo.ca>
Closes: https://bugs.gentoo.org/788448
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'app-arch/brotli')
| -rw-r--r-- | app-arch/brotli/brotli-1.0.9-r3.ebuild | 43 | ||||
| -rw-r--r-- | app-arch/brotli/brotli-9999.ebuild | 37 |
2 files changed, 34 insertions, 46 deletions
diff --git a/app-arch/brotli/brotli-1.0.9-r3.ebuild b/app-arch/brotli/brotli-1.0.9-r3.ebuild index aecf41b5cb6d..2b3a1620cf76 100644 --- a/app-arch/brotli/brotli-1.0.9-r3.ebuild +++ b/app-arch/brotli/brotli-1.0.9-r3.ebuild @@ -1,49 +1,42 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8..10} pypy3 ) DISTUTILS_OPTIONAL="1" -DISTUTILS_IN_SOURCE_BUILD="1" -CMAKE_ECLASS=cmake - +PYTHON_COMPAT=( python3_{8..10} pypy3 ) inherit cmake-multilib distutils-r1 +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://github.com/google/${PN}.git" + inherit git-r3 +else + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +fi + DESCRIPTION="Generic-purpose lossless compression algorithm" HOMEPAGE="https://github.com/google/brotli" +LICENSE="MIT python? ( Apache-2.0 )" SLOT="0/$(ver_cut 1)" - -RDEPEND="python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND}" - IUSE="python static-libs test" + REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -LICENSE="MIT python? ( Apache-2.0 )" +# tests are currently broken, see https://github.com/google/brotli/issues/850 +RESTRICT="test" DOCS=( README.md CONTRIBUTING.md ) -if [[ ${PV} == "9999" ]] ; then - SRC_URI="" - EGIT_REPO_URI="https://github.com/google/${PN}.git" - inherit git-r3 -else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" - SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -fi - -# tests are currently broken, see https://github.com/google/brotli/issues/850 -RESTRICT="test" +PATCHES=( "${FILESDIR}/${PV}-linker.patch" ) -PATCHES=( - "${FILESDIR}/${PV}-linker.patch" -) +RDEPEND="python? ( ${PYTHON_DEPS} )" +DEPEND="${RDEPEND}" src_prepare() { - use python && distutils-r1_src_prepare cmake_src_prepare + use python && distutils-r1_src_prepare } multilib_src_configure() { diff --git a/app-arch/brotli/brotli-9999.ebuild b/app-arch/brotli/brotli-9999.ebuild index 07a2175c735c..16d89922f83c 100644 --- a/app-arch/brotli/brotli-9999.ebuild +++ b/app-arch/brotli/brotli-9999.ebuild @@ -1,44 +1,39 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) DISTUTILS_OPTIONAL="1" -DISTUTILS_IN_SOURCE_BUILD="1" -CMAKE_ECLASS=cmake - +PYTHON_COMPAT=( python3_{8..10} pypy3 ) inherit cmake-multilib distutils-r1 +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://github.com/google/${PN}.git" + inherit git-r3 +else + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +fi + DESCRIPTION="Generic-purpose lossless compression algorithm" HOMEPAGE="https://github.com/google/brotli" +LICENSE="MIT python? ( Apache-2.0 )" SLOT="0/$(ver_cut 1)" - -RDEPEND="python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND}" - IUSE="python static-libs test" + REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -LICENSE="MIT python? ( Apache-2.0 )" +RESTRICT="!test? ( test )" DOCS=( README.md CONTRIBUTING.md ) -if [[ ${PV} == "9999" ]] ; then - SRC_URI="" - EGIT_REPO_URI="https://github.com/google/${PN}.git" - inherit git-r3 -else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" - SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -fi - -RESTRICT="!test? ( test )" +RDEPEND="python? ( ${PYTHON_DEPS} )" +DEPEND="${RDEPEND}" src_prepare() { - use python && distutils-r1_src_prepare cmake_src_prepare + use python && distutils-r1_src_prepare } multilib_src_configure() { |