commit: 241acff2f4cfdcd385aff4837b3ac73f87c6ce9d Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Jul 2 15:10:20 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Jul 2 15:10:27 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=241acff2
app-text/xournalpp: add missing Lua dep Closes: https://bugs.gentoo.org/854615 Signed-off-by: Sam James <sam <AT> gentoo.org> ...nalpp-9999.ebuild => xournalpp-1.1.1-r2.ebuild} | 23 ++++++++++------------ app-text/xournalpp/xournalpp-9999.ebuild | 23 ++++++++++------------ 2 files changed, 20 insertions(+), 26 deletions(-) diff --git a/app-text/xournalpp/xournalpp-9999.ebuild b/app-text/xournalpp/xournalpp-1.1.1-r2.ebuild similarity index 78% copy from app-text/xournalpp/xournalpp-9999.ebuild copy to app-text/xournalpp/xournalpp-1.1.1-r2.ebuild index 761bc8769f66..a1105db47c04 100644 --- a/app-text/xournalpp/xournalpp-9999.ebuild +++ b/app-text/xournalpp/xournalpp-1.1.1-r2.ebuild @@ -3,15 +3,16 @@ EAPI=8 -inherit cmake xdg +# Upstream only support 5.3 (see CMakeLists.txt), also bug #854615 +LUA_COMPAT=( lua5-3 ) +inherit cmake lua-single xdg if [[ ${PV} == *9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/xournalpp/xournalpp.git"; - unset SRC_URI else - KEYWORDS="~amd64 ~ppc64" SRC_URI="https://github.com/xournalpp/xournalpp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tgz" + KEYWORDS="~amd64 ~ppc64" fi DESCRIPTION="Handwriting notetaking software with PDF annotation support" @@ -19,9 +20,11 @@ HOMEPAGE="https://github.com/xournalpp/xournalpp"; LICENSE="GPL-2" SLOT="0" -IUSE="" -COMMONDEPEND=" +REQUIRED_USE="${LUA_REQUIRED_USE}" + +COMMON_DEPEND=" + ${LUA_DEPS} app-text/poppler[cairo] dev-libs/glib dev-libs/libxml2 @@ -32,10 +35,8 @@ COMMONDEPEND=" sys-libs/zlib:= x11-libs/gtk+:3 " -RDEPEND="${COMMONDEPEND} -" -DEPEND="${COMMONDEPEND} -" +RDEPEND="${COMMON_DEPEND}" +DEPEND="${COMMON_DEPEND}" BDEPEND=" virtual/pkgconfig sys-apps/lsb-release @@ -46,7 +47,3 @@ PATCHES=( "${FILESDIR}/${PN}-1.1.1-nostrip.patch" "${FILESDIR}/${PN}-1.1.1-nocompress.patch" ) - -src_prepare() { - cmake_src_prepare -} diff --git a/app-text/xournalpp/xournalpp-9999.ebuild b/app-text/xournalpp/xournalpp-9999.ebuild index 761bc8769f66..a1105db47c04 100644 --- a/app-text/xournalpp/xournalpp-9999.ebuild +++ b/app-text/xournalpp/xournalpp-9999.ebuild @@ -3,15 +3,16 @@ EAPI=8 -inherit cmake xdg +# Upstream only support 5.3 (see CMakeLists.txt), also bug #854615 +LUA_COMPAT=( lua5-3 ) +inherit cmake lua-single xdg if [[ ${PV} == *9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/xournalpp/xournalpp.git"; - unset SRC_URI else - KEYWORDS="~amd64 ~ppc64" SRC_URI="https://github.com/xournalpp/xournalpp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tgz" + KEYWORDS="~amd64 ~ppc64" fi DESCRIPTION="Handwriting notetaking software with PDF annotation support" @@ -19,9 +20,11 @@ HOMEPAGE="https://github.com/xournalpp/xournalpp"; LICENSE="GPL-2" SLOT="0" -IUSE="" -COMMONDEPEND=" +REQUIRED_USE="${LUA_REQUIRED_USE}" + +COMMON_DEPEND=" + ${LUA_DEPS} app-text/poppler[cairo] dev-libs/glib dev-libs/libxml2 @@ -32,10 +35,8 @@ COMMONDEPEND=" sys-libs/zlib:= x11-libs/gtk+:3 " -RDEPEND="${COMMONDEPEND} -" -DEPEND="${COMMONDEPEND} -" +RDEPEND="${COMMON_DEPEND}" +DEPEND="${COMMON_DEPEND}" BDEPEND=" virtual/pkgconfig sys-apps/lsb-release @@ -46,7 +47,3 @@ PATCHES=( "${FILESDIR}/${PN}-1.1.1-nostrip.patch" "${FILESDIR}/${PN}-1.1.1-nocompress.patch" ) - -src_prepare() { - cmake_src_prepare -}
