commit: 48a522381cf0f031d4b3b7cdc766ab2d85260265 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Dec 7 13:58:38 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Dec 7 13:58:55 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48a52238
app-text/xournal: EAPI 8 Bug: https://bugs.gentoo.org/875158 Signed-off-by: Sam James <sam <AT> gentoo.org> app-text/xournal/xournal-0.4.8.2016-r1.ebuild | 19 +++++++++--------- app-text/xournal/xournal-9999.ebuild | 29 +++++++++++++++++---------- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/app-text/xournal/xournal-0.4.8.2016-r1.ebuild b/app-text/xournal/xournal-0.4.8.2016-r1.ebuild index eb0427c142d3..3ebf59e8631a 100644 --- a/app-text/xournal/xournal-0.4.8.2016-r1.ebuild +++ b/app-text/xournal/xournal-0.4.8.2016-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 [[ ${PV} == *9999 ]] && GNOME2_EAUTORECONF=yes @@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://git.code.sf.net/p/xournal/code"; unset SRC_URI else - KEYWORDS="amd64 ~ppc64 ~x86" + KEYWORDS="~amd64 ~ppc64 ~x86" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" fi @@ -23,7 +23,7 @@ LICENSE="GPL-2" SLOT="0" IUSE="+pdf vanilla" -COMMONDEPEND=" +DEPEND=" app-text/poppler[cairo] dev-libs/atk dev-libs/glib @@ -36,27 +36,26 @@ COMMONDEPEND=" x11-libs/gtk+:2 x11-libs/pango " -RDEPEND="${COMMONDEPEND} +RDEPEND=" + ${DEPEND} pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl ) " -DEPEND="${COMMONDEPEND} - virtual/pkgconfig -" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}/${PN}"-0.4.8-c99-fix.patch ) src_prepare() { - default_src_prepare + default + if ! use vanilla; then eapply "${FILESDIR}"/xournal-0.4.8-aspectratio.patch fi } src_install() { - emake DESTDIR="${D}" install - emake DESTDIR="${D}" desktop-install + emake DESTDIR="${D}" install desktop-install dodoc ChangeLog AUTHORS README dodoc -r html-doc/* diff --git a/app-text/xournal/xournal-9999.ebuild b/app-text/xournal/xournal-9999.ebuild index 5afafb130f7e..d7fc7a1b87ab 100644 --- a/app-text/xournal/xournal-9999.ebuild +++ b/app-text/xournal/xournal-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 [[ ${PV} == *9999 ]] && GNOME2_EAUTORECONF=yes @@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://git.code.sf.net/p/xournal/code"; unset SRC_URI else - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~ppc64 ~x86" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" fi @@ -21,9 +21,9 @@ HOMEPAGE="http://xournal.sourceforge.net/"; LICENSE="GPL-2" SLOT="0" -IUSE="+pdf" +IUSE="+pdf vanilla" -COMMONDEPEND=" +DEPEND=" app-text/poppler[cairo] dev-libs/atk dev-libs/glib @@ -36,16 +36,23 @@ COMMONDEPEND=" x11-libs/gtk+:2 x11-libs/pango " -RDEPEND="${COMMONDEPEND} +RDEPEND=" + ${DEPEND} pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl ) " -DEPEND="${COMMONDEPEND} - virtual/pkgconfig -" +BDEPEND="virtual/pkgconfig" -src_install() { +src_prepare() { default - emake DESTDIR="${D}" desktop-install + if ! use vanilla; then + eapply "${FILESDIR}"/xournal-0.4.8-aspectratio.patch + fi +} + +src_install() { + emake DESTDIR="${D}" install desktop-install + + dodoc ChangeLog AUTHORS README dodoc -r html-doc/* }
