1 |
commit: be705aef09e7a6868a05a48aae30a08e283002eb |
2 |
Author: Amy Liffey <amynka <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri May 3 11:43:43 2019 +0000 |
4 |
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 3 11:52:21 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be705aef |
7 |
|
8 |
app-editors/nedit: version bump 5.7 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/675706 |
11 |
Signed-off-by: Amy Liffey <amynka <AT> gentoo.org> |
12 |
Package-Manager: Portage-2.3.62, Repoman-2.3.11 |
13 |
|
14 |
app-editors/nedit/Manifest | 1 + |
15 |
app-editors/nedit/files/nedit-5.7-doc.patch | 13 ++++ |
16 |
app-editors/nedit/files/nedit-5.7-ldflags.patch | 17 ++++++ |
17 |
app-editors/nedit/nedit-5.7.ebuild | 80 +++++++++++++++++++++++++ |
18 |
4 files changed, 111 insertions(+) |
19 |
|
20 |
diff --git a/app-editors/nedit/Manifest b/app-editors/nedit/Manifest |
21 |
index 373266df0be..305b7346869 100644 |
22 |
--- a/app-editors/nedit/Manifest |
23 |
+++ b/app-editors/nedit/Manifest |
24 |
@@ -1,2 +1,3 @@ |
25 |
DIST nedit-5.6a-src.tar.gz 1353454 BLAKE2B e3e8ed86b12a4c3673513b65c7ca08c11b22dcac4816287be680f112c5c8de0c59510f26605a7f288846fb4bb8c28dd958c534a52450a905f7639712d832e69a SHA512 4d4dcd661f67a4a40549f26774c0ffb90f9059d2e06b0db2becef6848273fe76b7b68fae42319c0badd3c637d96c8dae129b4d0dfa7adccc00ee76f9366e27d0 |
26 |
+DIST nedit-5.7-src.tar.gz 1344754 BLAKE2B 595b652050569cc480e29931088d8780a1d815b3e5d79529bf60a83142f9ce5e11cd5b59bead42baf032b8530388081f10f054230b0bd181ba59d9179b59c49a SHA512 cf242d2f8eea4c78649dbeb741f545a3dc8ffaf5bb36239794a4b2635420e5445fa1c77472add79c05ec081d71a0b9df4431f48db365a71692e43869fd4e7932 |
27 |
DIST nedit.png.xz 14000 BLAKE2B dd50757a52fe3a2c57490cd0783f323877dc23733acc28b2c303d73724b6b66ed73dc819827ea52b96410fd7264a991040f00d609070bd87945d406328567ca0 SHA512 69d5dbea98a5b4065e73cc5c846125c5059e3a50ee1fa3ec4ef99f8f868cf3729ffe73510729534289a91d1a54683b84b6a37bc640c60205be709732dfcb01e3 |
28 |
|
29 |
diff --git a/app-editors/nedit/files/nedit-5.7-doc.patch b/app-editors/nedit/files/nedit-5.7-doc.patch |
30 |
new file mode 100644 |
31 |
index 00000000000..fceb9e1773c |
32 |
--- /dev/null |
33 |
+++ b/app-editors/nedit/files/nedit-5.7-doc.patch |
34 |
@@ -0,0 +1,13 @@ |
35 |
+--- a/doc/Makefile 2019-05-03 13:18:33.343246393 +0200 |
36 |
++++ b/doc/Makefile 2019-05-03 13:19:33.110902639 +0200 |
37 |
+@@ -48,8 +48,8 @@ |
38 |
+ ../source/help_topic.h ../source/help_data.h: .version help.etx setext |
39 |
+ @ echo "Creating NEdit help code `cat .version`" |
40 |
+ @ ./setext -m -v version="`cat .version`" help.etx |
41 |
+- @ mv -f help_topic.h ../source |
42 |
+- @ mv -f help_data.h ../source |
43 |
++ @ cp -f help_topic.h ../source |
44 |
++ @ cp -f help_data.h ../source |
45 |
+ |
46 |
+ nedit.html: .version help.etx setext |
47 |
+ @ echo "Creating NEdit HTML documentation..." |
48 |
|
49 |
diff --git a/app-editors/nedit/files/nedit-5.7-ldflags.patch b/app-editors/nedit/files/nedit-5.7-ldflags.patch |
50 |
new file mode 100644 |
51 |
index 00000000000..b529d3327dd |
52 |
--- /dev/null |
53 |
+++ b/app-editors/nedit/files/nedit-5.7-ldflags.patch |
54 |
@@ -0,0 +1,17 @@ |
55 |
+--- a/source/Makefile.common 2019-01-19 14:27:14.927734607 +0100 |
56 |
++++ b/source/Makefile.common 2019-01-19 14:28:46.186729890 +0100 |
57 |
+@@ -20,12 +20,12 @@ |
58 |
+ # we only want natural rebuilds to regenerate the link date. |
59 |
+ nedit: $(OBJS) ../util/libNUtil.a $(XMLLIB) $(XLTLIB) |
60 |
+ $(CC) $(CFLAGS) -c linkdate.c -o linkdate.o |
61 |
+- $(CC) $(CFLAGS) $(OBJS) linkdate.o $(XMLLIB) \ |
62 |
++ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) linkdate.o $(XMLLIB) \ |
63 |
+ $(XLTLIB) ../util/libNUtil.a $(LIBS) -o $@ |
64 |
+ |
65 |
+ # Note LIBS isn't quite right here; it links unnecessarily against Motif |
66 |
+ nc: nc.o server_common.o ../util/libNUtil.a |
67 |
+- $(CC) $(CFLAGS) nc.o server_common.o ../util/libNUtil.a $(LIBS) -o $@ |
68 |
++ $(CC) $(CFLAGS) $(LDFLAGS) nc.o server_common.o ../util/libNUtil.a $(LIBS) -o $@ |
69 |
+ |
70 |
+ help.o: help.c |
71 |
+ $(CC) $(CFLAGS) $(BIGGER_STRINGS) -c help.c -o $@ |
72 |
|
73 |
diff --git a/app-editors/nedit/nedit-5.7.ebuild b/app-editors/nedit/nedit-5.7.ebuild |
74 |
new file mode 100644 |
75 |
index 00000000000..ba195aaf484 |
76 |
--- /dev/null |
77 |
+++ b/app-editors/nedit/nedit-5.7.ebuild |
78 |
@@ -0,0 +1,80 @@ |
79 |
+# Copyright 1999-2018 Gentoo Foundation |
80 |
+# Distributed under the terms of the GNU General Public License v2 |
81 |
+ |
82 |
+EAPI=7 |
83 |
+ |
84 |
+inherit desktop toolchain-funcs |
85 |
+ |
86 |
+DESCRIPTION="Multi-purpose text editor for the X Window System" |
87 |
+HOMEPAGE="https://sourceforge.net/projects/nedit" |
88 |
+SRC_URI=" |
89 |
+ https://downloads.sourceforge.net/project/${PN}/${PN}-source/${P}-src.tar.gz |
90 |
+ https://dev.gentoo.org/~jlec/distfiles/${PN}.png.xz" |
91 |
+ |
92 |
+LICENSE="GPL-2" |
93 |
+SLOT="0" |
94 |
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" |
95 |
+IUSE="doc" |
96 |
+ |
97 |
+RDEPEND=">=x11-libs/motif-2.3:0 |
98 |
+ x11-libs/libXt |
99 |
+ x11-libs/libX11" |
100 |
+DEPEND="${RDEPEND} |
101 |
+ || ( dev-util/yacc sys-devel/bison ) |
102 |
+ dev-lang/perl" |
103 |
+ |
104 |
+S="${WORKDIR}/${PN}-${PV}" |
105 |
+ |
106 |
+PATCHES=( |
107 |
+ "${FILESDIR}/${P}-ldflags.patch" |
108 |
+ "${FILESDIR}/${PN}-5.6-security.patch" |
109 |
+ "${FILESDIR}/${P}-doc.patch" |
110 |
+) |
111 |
+ |
112 |
+ |
113 |
+src_prepare() { |
114 |
+ #respecting LDFLAGS, bug #208189 |
115 |
+ default |
116 |
+ sed \ |
117 |
+ -e "s:bin/:${EPREFIX}/bin/:g" \ |
118 |
+ -i Makefile source/preferences.c source/help_data.h source/nedit.c Xlt/Makefile || die |
119 |
+ sed \ |
120 |
+ -e "s:nc:neditc:g" -i doc/nc.pod || die |
121 |
+ sed -i -e "s:CFLAGS=-O:CFLAGS=${CFLAGS}:" -e "s:check_tif_rule::" \ |
122 |
+ makefiles/Makefile.linux || die |
123 |
+ sed -i -e "s:CFLAGS=-O:CFLAGS=${CFLAGS}:" \ |
124 |
+ -e "s:MOTIFDIR=/usr/local:MOTIFDIR=${EPREFIX}/usr:" \ |
125 |
+ -e "s:-lX11:-lX11 -lXmu -liconv:" \ |
126 |
+ -e "s:check_tif_rule::" \ |
127 |
+ makefiles/Makefile.macosx || die |
128 |
+} |
129 |
+ |
130 |
+src_compile() { |
131 |
+ case "${CHOST}" in |
132 |
+ *-darwin*) |
133 |
+ emake CC="$(tc-getCC)" AR="$(tc-getAR)" macosx |
134 |
+ ;; |
135 |
+ *-linux*) |
136 |
+ emake CC="$(tc-getCC)" AR="$(tc-getAR)" linux |
137 |
+ ;; |
138 |
+ esac |
139 |
+ if use doc; then |
140 |
+ emake VERSION="NEdit ${PV}" -C doc all |
141 |
+ fi |
142 |
+} |
143 |
+ |
144 |
+src_install() { |
145 |
+ dobin source/nedit |
146 |
+ newbin source/nc neditc |
147 |
+ |
148 |
+ make_desktop_entry "${PN}" |
149 |
+ doicon "${WORKDIR}/${PN}.png" |
150 |
+ |
151 |
+ if use doc; then |
152 |
+ newman doc/nedit.man nedit.1 |
153 |
+ newman doc/nc.man neditc.1 |
154 |
+ |
155 |
+ dodoc README ReleaseNotes ChangeLog |
156 |
+ dodoc doc/nedit.doc doc/NEdit.ad doc/faq.txt doc/nedit.html |
157 |
+ fi |
158 |
+} |