diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-01-22 18:41:30 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-01-22 18:41:30 +0000 |
commit | 580f05ea8f512d11e23e8da80177d27835cbdbbc (patch) | |
tree | 48f1c956bdc671653181038c8d67d35bc8569d41 /app-text/mpage | |
parent | f29eb0598f62fc3b5f09f2de5a89c0437c6164d9 (diff) |
gentoo resync : 22.02.2020
Diffstat (limited to 'app-text/mpage')
-rw-r--r-- | app-text/mpage/Manifest | 3 | ||||
-rw-r--r-- | app-text/mpage/mpage-2.5.6-r1.ebuild | 47 |
2 files changed, 28 insertions, 22 deletions
diff --git a/app-text/mpage/Manifest b/app-text/mpage/Manifest index a9f6d764cad7..bac5f72f3af7 100644 --- a/app-text/mpage/Manifest +++ b/app-text/mpage/Manifest @@ -1,4 +1,5 @@ +AUX mpage-2.5.6-fix-buildsystem.patch 1014 BLAKE2B ef8b13e878060eda2ff5d0de8984bbf0b6bc1f6888e435aead416e2e8eb8eb6c68982fa16f9ec863ce129d8b15697d60f1b9c901ebc962811e285ee1d7965e13 SHA512 d7b9df3250bfe763d72241e83c64b8c220099b9859ce88534162090d8fe18d7583b8f884d31ecff22e2d9da9e6489f6a87802022c8a5d00f2085adbfbdb9e608 DIST mpage-2.5.6-gentoo-patchset.tar.bz2 12853 BLAKE2B 69adf941b43fdd7c4e43f3c793063f8d4c1d7f5eeed4b4e01cee7c7a7f5b70554cf1d2e4f73278231d5d95b99de7925ca6f355b8933bb5b7ea2d850d802b567c SHA512 2bfbe4689e02fb76af58a6db3415227df38e71b45fcc3d563a12f505fab8ea78de0415c9ac6d7c9b873f23a9f65e1c8f708f902965ab10e18b2a217b67cc5f0d DIST mpage-2.5.6.tgz 86748 BLAKE2B 44558be1272c90a83de37bf9854c96dd1f5b9b38d8588bae66adcfdaa938da351f606424f4d9049231bddae2d03ebc632570a7c80a0037ba1536147aa33df872 SHA512 79a51d0fa08848b22f758e8bc3f57680d33492d261a0061c6cce002c3cb5f129a78221d2af1749c79d4e46385136d9996294499531e60e8fc501f9fd61f8077d -EBUILD mpage-2.5.6-r1.ebuild 970 BLAKE2B 17de01d5e612540093fc011c37ba8d9944ee321c11cdba31ecadaeecd6ede3ba3ad18bf51e3f0c8b9ddf956c14dda4f276a14b132c823b047c5db480380dd64b SHA512 312066f12c7fbfbcf68ec5c3b595a4ce5fa41cb7328be95291aadfa58a0a13e555cb727bc800192be9457ba46bbb55130533b41dadfa0253856ad604aa22f4da +EBUILD mpage-2.5.6-r1.ebuild 1003 BLAKE2B 974fa91cf7211af2d930e7e0d6226fa604252c48f4d06a19b5c1c079adffa8aca4f215ac959815f211806c3c2be0534d98c3aa6ec4a23e4497cbbad64d245426 SHA512 6f282bd32d9c45bd087e3e92481a7060401f48cb2f7194c417ec17097eef7e9d2b91a3ffd4ff5f3a8b08a5d58e9fa7b8a255446ee85143df15bd75902d72c4ef MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/app-text/mpage/mpage-2.5.6-r1.ebuild b/app-text/mpage/mpage-2.5.6-r1.ebuild index 0b6a0146109e..6ab60421dd8f 100644 --- a/app-text/mpage/mpage-2.5.6-r1.ebuild +++ b/app-text/mpage/mpage-2.5.6-r1.ebuild @@ -1,39 +1,44 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 -inherit eutils toolchain-funcs +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="Many to one page printing utility" HOMEPAGE="http://www.mesa.nl/" -SRC_URI="http://www.mesa.nl/pub/${PN}/${P}.tgz +SRC_URI=" + http://www.mesa.nl/pub/${PN}/${P}.tgz https://dev.gentoo.org/~mgorny/dist/${P}-gentoo-patchset.tar.bz2" -KEYWORDS="amd64 ppc x86" LICENSE="freedist" SLOT="0" -IUSE="" - -src_prepare() { - sed -i Makefile \ - -e '/^CFLAGS/s|=.*| += $(DEFS)|g' \ - -e 's|$(CFLAGS) -o|$(LDFLAGS) &|g' \ - || die "sed Makefile" - EPATCH_SOURCE="${WORKDIR}/${P}-gentoo-patchset" epatch \ - 01_previous_changes.patch 10_bts354935_fix_fontdefs.patch \ - 20_bts416573_manpage_fixes.patch 30_bts443280_libdir_manpage.patch +KEYWORDS="amd64 ppc x86" + +PATCHES=( + "${FILESDIR}"/${P}-fix-buildsystem.patch + "${WORKDIR}"/${P}-gentoo-patchset/01_previous_changes.patch + "${WORKDIR}"/${P}-gentoo-patchset/10_bts354935_fix_fontdefs.patch + "${WORKDIR}"/${P}-gentoo-patchset/20_bts416573_manpage_fixes.patch + "${WORKDIR}"/${P}-gentoo-patchset/30_bts443280_libdir_manpage.patch +) + +src_configure() { + tc-export CC } src_compile() { emake \ - CC="$(tc-getCC)" \ - PREFIX=/usr \ - MANDIR=/usr/share/man/man1 + PREFIX="${EPREFIX}"/usr \ + MANDIR="${EPREFIX}"/usr/share/man/man1 } src_install () { emake \ - PREFIX="${D}/usr" \ - MANDIR="${D}/usr/share/man/man1" install - dodoc CHANGES Encoding.format FAQ NEWS README TODO + PREFIX="${ED}"/usr \ + MANDIR="${ED}"/usr/share/man/man1 install + + rm README.{amiga,OS2} || die + einstalldocs + dodoc Encoding.format } |