commit: 9f6727ef1b4673be4f9c0884bafd52c2acf55836 Author: James Beddek <telans <AT> posteo <DOT> de> AuthorDate: Sun Oct 31 02:40:28 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Nov 14 05:24:35 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f6727ef
app-text/libetonyek: fix build with dev-util/mdds:1/2.0 Signed-off-by: James Beddek <telans <AT> posteo.de> Signed-off-by: Sam James <sam <AT> gentoo.org> .../{libetonyek-9999.ebuild => libetonyek-0.1.10-r1.ebuild} | 10 +++++++--- app-text/libetonyek/libetonyek-9999.ebuild | 7 +++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/app-text/libetonyek/libetonyek-9999.ebuild b/app-text/libetonyek/libetonyek-0.1.10-r1.ebuild similarity index 84% copy from app-text/libetonyek/libetonyek-9999.ebuild copy to app-text/libetonyek/libetonyek-0.1.10-r1.ebuild index a9b34322cd7f..e8b2ff71f53d 100644 --- a/app-text/libetonyek/libetonyek-9999.ebuild +++ b/app-text/libetonyek/libetonyek-0.1.10-r1.ebuild @@ -1,14 +1,17 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 if [[ ${PV} == *9999 ]]; then + MDDS_VER="9999" EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libetonyek.git" inherit autotools git-r3 else + MDDS_VER="2.0" SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + # Unkeyworded while libreoffice has no release making use of this slot + # KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" fi DESCRIPTION="Library parsing Apple Keynote presentations" HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek" @@ -26,7 +29,7 @@ RDEPEND=" app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 - >=dev-util/mdds-1.5:1= + >=dev-util/mdds-${MDDS_VER}:1= sys-libs/zlib " DEPEND="${RDEPEND} @@ -45,6 +48,7 @@ src_prepare() { src_configure() { local myeconfargs=( --disable-werror + --with-mdds="${MDDS_VER}" $(use_with doc docs) $(use_enable static-libs static) $(use_enable test tests) diff --git a/app-text/libetonyek/libetonyek-9999.ebuild b/app-text/libetonyek/libetonyek-9999.ebuild index a9b34322cd7f..7493c2947bb9 100644 --- a/app-text/libetonyek/libetonyek-9999.ebuild +++ b/app-text/libetonyek/libetonyek-9999.ebuild @@ -1,12 +1,14 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 if [[ ${PV} == *9999 ]]; then + MDDS_VER="9999" EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libetonyek.git" inherit autotools git-r3 else + MDDS_VER="2.0" SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" fi @@ -26,7 +28,7 @@ RDEPEND=" app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 - >=dev-util/mdds-1.5:1= + >=dev-util/mdds-${MDDS_VER}:1= sys-libs/zlib " DEPEND="${RDEPEND} @@ -45,6 +47,7 @@ src_prepare() { src_configure() { local myeconfargs=( --disable-werror + --with-mdds="${MDDS_VER}" $(use_with doc docs) $(use_enable static-libs static) $(use_enable test tests)