| 1 |
commit: 3e6f2c3058ecec47412b31b7a44f9737b230db56 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 30 23:14:12 2020 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 30 23:14:12 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e6f2c30 |
| 7 |
|
| 8 |
app-office/plan: Port to EAPI 7 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/726664 |
| 11 |
Closes: https://bugs.gentoo.org/729516 |
| 12 |
Closes: https://bugs.gentoo.org/734346 |
| 13 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
| 14 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 15 |
|
| 16 |
app-office/plan/Manifest | 2 +- |
| 17 |
app-office/plan/plan-1.10.ebuild | 49 +++++++++++++++++----------------------- |
| 18 |
2 files changed, 22 insertions(+), 29 deletions(-) |
| 19 |
|
| 20 |
diff --git a/app-office/plan/Manifest b/app-office/plan/Manifest |
| 21 |
index 547915e2fff..1b53f3c15fb 100644 |
| 22 |
--- a/app-office/plan/Manifest |
| 23 |
+++ b/app-office/plan/Manifest |
| 24 |
@@ -1,2 +1,2 @@ |
| 25 |
-DIST plan-1.10-gentoo.tar.xz 5976 BLAKE2B 598c92a750fc0a305d7f51211f9e42eae36644de1a83175fcb86c8c30450b8fc1e7d2eabbaced62779d80b557f7f725c97395bc744171952970faa3543abba2f SHA512 60fcfe1fec1d7911a155d6737e6a808ea897ce7c4207bd2f4e95f57b1d154d8d594c6f5ecc8a959cc0d7f47f1415f86797e0c4053873775decfc048bc16048a3 |
| 26 |
+DIST plan-1.10-patches.txz 6132 BLAKE2B 617c68a012e4757f7ef039557cfe15e04706129501f044005e554a50aa9ebbe9e33e2e406ec5647060a7b67efb81b671c35eb6846d426a26c517c38b10e7eabb SHA512 c0802f12e935d7ab18d89b6c4e8ae8373ca620b8149520b8bc9d9fb8e871ad4c2b0bc0e7ca84c34e72d0a25cb406af51fac1fc1907844867f4fd7fdff8a06d54 |
| 27 |
DIST plan-1.10.tar.gz 460150 BLAKE2B a44c79537ff6aae8fa5c65c8b6514f0f37d1417522f4e54823ad14cf6306bb88223377de13f22c365516e2861fa561902e31245c9729786f425140bed30b320d SHA512 fde17ef17f25412cbe69427364f4130564f46a940859066c25d837d14eca6920752b843211192a6c1cdc83be05de9ac57c88424ca555928b67eb219fa8564fe8 |
| 28 |
|
| 29 |
diff --git a/app-office/plan/plan-1.10.ebuild b/app-office/plan/plan-1.10.ebuild |
| 30 |
index bb35e518156..e16129ffdb1 100644 |
| 31 |
--- a/app-office/plan/plan-1.10.ebuild |
| 32 |
+++ b/app-office/plan/plan-1.10.ebuild |
| 33 |
@@ -1,65 +1,58 @@ |
| 34 |
# Copyright 1999-2020 Gentoo Authors |
| 35 |
# Distributed under the terms of the GNU General Public License v2 |
| 36 |
|
| 37 |
-EAPI=5 |
| 38 |
+EAPI=7 |
| 39 |
|
| 40 |
-inherit eutils toolchain-funcs |
| 41 |
+inherit toolchain-funcs |
| 42 |
|
| 43 |
DESCRIPTION="Motif based schedule planner" |
| 44 |
HOMEPAGE="https://www.bitrot.de/plan.html" |
| 45 |
-SRC_URI="ftp://ftp.fu-berlin.de/unix/X11/apps/plan/${P}.tar.gz |
| 46 |
- mirror://gentoo/${P}-gentoo.tar.xz" |
| 47 |
+SRC_URI=" |
| 48 |
+ ftp://ftp.fu-berlin.de/unix/X11/apps/plan/${P}.tar.gz |
| 49 |
+ https://dev.gentoo.org/~soap/distfiles/${P}-patches.txz" |
| 50 |
|
| 51 |
LICENSE="GPL-2+" #448646 |
| 52 |
SLOT="0" |
| 53 |
KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86" |
| 54 |
-IUSE="" |
| 55 |
|
| 56 |
-DEPEND=" |
| 57 |
- x11-libs/libXpm |
| 58 |
- >=x11-libs/motif-2.3:0 |
| 59 |
-" |
| 60 |
-RDEPEND="${DEPEND}" |
| 61 |
+RDEPEND=" |
| 62 |
+ x11-libs/libX11 |
| 63 |
+ x11-libs/libXt |
| 64 |
+ x11-libs/motif:0" |
| 65 |
+DEPEND="${RDEPEND}" |
| 66 |
+BDEPEND=" |
| 67 |
+ sys-devel/bison |
| 68 |
+ sys-devel/flex" |
| 69 |
|
| 70 |
-QA_PRESTRIPPED=" |
| 71 |
-/usr/bin/netplan |
| 72 |
-/usr/bin/plan |
| 73 |
-" |
| 74 |
-src_prepare() { |
| 75 |
- epatch "${WORKDIR}"/${P}-patches/*.patch |
| 76 |
-} |
| 77 |
+PATCHES=( "${WORKDIR}"/patches ) |
| 78 |
|
| 79 |
src_compile() { |
| 80 |
- pushd src |
| 81 |
- emake CC=$(tc-getCC) SHARE=/usr/share/plan linux |
| 82 |
- popd |
| 83 |
+ emake -C src CC="$(tc-getCC)" SHARE=/usr/share/plan linux |
| 84 |
} |
| 85 |
|
| 86 |
src_install() { |
| 87 |
- pushd src |
| 88 |
- emake \ |
| 89 |
- DESTDIR="${D}" \ |
| 90 |
+ emake -C src \ |
| 91 |
+ DESTDIR="${ED}" \ |
| 92 |
SHARE=/usr/share/plan \ |
| 93 |
install |
| 94 |
keepdir /usr/share/plan/netplan.dir |
| 95 |
- popd |
| 96 |
|
| 97 |
dodoc HISTORY README |
| 98 |
|
| 99 |
- pushd misc |
| 100 |
+ pushd misc >/dev/null || die |
| 101 |
doman netplan.1 plan.1 plan.4 |
| 102 |
insinto /usr/share/${PN}/misc |
| 103 |
doins netplan.boot BlackWhite Monochrome plan.fti Plan.xpm plan.xpm |
| 104 |
exeinto /usr/share/${PN}/misc |
| 105 |
doexe Killpland cvs vsc msschedule2plan plan2vcs |
| 106 |
- popd |
| 107 |
+ popd >/dev/null || die |
| 108 |
|
| 109 |
- pushd web |
| 110 |
+ pushd web >/dev/null || die |
| 111 |
insinto /usr/share/${PN}/web |
| 112 |
doins help.html bottom.html cgi-lib.pl common.pl holiday_webplan rtsban.jpg |
| 113 |
exeinto /usr/share/${PN}/web |
| 114 |
doexe *.cgi |
| 115 |
- popd |
| 116 |
+ popd >/dev/null || die |
| 117 |
} |
| 118 |
|
| 119 |
pkg_postinst() { |
Archives