From eab5731cdf11d4ae8cdf111461d46fd96c5bdd37 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 4 May 2019 12:02:00 +0100 Subject: gentoo resync : 04.05.2019 --- app-editors/nedit/Manifest | 4 ++ app-editors/nedit/files/nedit-5.7-doc.patch | 13 ++++ app-editors/nedit/files/nedit-5.7-ldflags.patch | 17 ++++++ app-editors/nedit/nedit-5.7.ebuild | 79 +++++++++++++++++++++++++ 4 files changed, 113 insertions(+) create mode 100644 app-editors/nedit/files/nedit-5.7-doc.patch create mode 100644 app-editors/nedit/files/nedit-5.7-ldflags.patch create mode 100644 app-editors/nedit/nedit-5.7.ebuild (limited to 'app-editors/nedit') diff --git a/app-editors/nedit/Manifest b/app-editors/nedit/Manifest index d7aac0a872a6..ef7b5f1d1922 100644 --- a/app-editors/nedit/Manifest +++ b/app-editors/nedit/Manifest @@ -3,8 +3,12 @@ AUX nedit-5.6-fix-crash-with-noX.patch 4726 BLAKE2B 1378cd446adf148d5a69b772e790 AUX nedit-5.6-format.patch 453 BLAKE2B b8a226e93e2c1666caefb5032706d8ac08284af3e2a2658f794b4af6eaae18311db52ed01a49c368d050958e55ef2fbc0893ee3b8bc63418bce676c5c4d7aae1 SHA512 50e93d7f297ae0b10bec34176c707cc61d4c205e1293cb02b94f85359604864df8698bf35725f007b9c9eb585d0cf18c2498b6d7f55960fabb93b3d98bfe02b8 AUX nedit-5.6-ldflags.patch 800 BLAKE2B ee06dcdd07f7d01c23c943e85382d33d316e85c364b1c3bc243ee3468078e8a47a770191389dd53a94d83b6e896e9dbe15b40d365aab4f3a8ef5c8705941ea9a SHA512 65818ef8b425414bf4c9f0bd9b71b56df5a6ef05f0e2914558733cbc7bbe435199e8c69c66b2f460964d1913bbc6fb8722a77d881ea4efa1be07f8fb55ad66e4 AUX nedit-5.6-security.patch 1944 BLAKE2B 8b3e21d074f274c5ba24f1888d9d13d71ac08f80c0e063a5e0e85794a1677c10f7d6d64298e0588a73e86af1d3dfdacb32a389a53ff7a4e408f9006006adc60e SHA512 437ff658c4ae4918fa73dee97773d9b8bf9b2dbfd4af3752ab3bdb735ded2508e449170e2aeea43d9bfbdb48e75d52154a847cb9a3a59e7f4b6ad0ec9027bfcd +AUX nedit-5.7-doc.patch 522 BLAKE2B a52ae4cb7d9e2bb0b629024a0e5caf12e54f56905ee49fd2c1b83596e56aa403b5c1f71207e5f41c839de9070a2208e70e90e16a06119d744c8200a33d4747e0 SHA512 5ba978e599f34c348645d727a307ab9e68e666b3494daf380f177cb2f71aec5da94a8dd5884bf70aeae35ec1da31a7cccfc51812278c72935166fdf909ec9040 +AUX nedit-5.7-ldflags.patch 814 BLAKE2B 5d300f5006c41ef378d4cadfa2daa287034338c7e8cb692669873853f1082338af7eb0ef4295c823dfea7eb17f0920a9eace16f04c05dbdb6baa495b21e207de SHA512 2e72fb97f2bad7aec225cea2a86b2f0c40e22b8604bdc0288232df3b304c6a28924bf45425bf0ce3f3c753f7d2fb0133adbe041ff747093e2a6207c86378bd9c DIST nedit-5.6a-src.tar.gz 1353454 BLAKE2B e3e8ed86b12a4c3673513b65c7ca08c11b22dcac4816287be680f112c5c8de0c59510f26605a7f288846fb4bb8c28dd958c534a52450a905f7639712d832e69a SHA512 4d4dcd661f67a4a40549f26774c0ffb90f9059d2e06b0db2becef6848273fe76b7b68fae42319c0badd3c637d96c8dae129b4d0dfa7adccc00ee76f9366e27d0 +DIST nedit-5.7-src.tar.gz 1344754 BLAKE2B 595b652050569cc480e29931088d8780a1d815b3e5d79529bf60a83142f9ce5e11cd5b59bead42baf032b8530388081f10f054230b0bd181ba59d9179b59c49a SHA512 cf242d2f8eea4c78649dbeb741f545a3dc8ffaf5bb36239794a4b2635420e5445fa1c77472add79c05ec081d71a0b9df4431f48db365a71692e43869fd4e7932 DIST nedit.png.xz 14000 BLAKE2B dd50757a52fe3a2c57490cd0783f323877dc23733acc28b2c303d73724b6b66ed73dc819827ea52b96410fd7264a991040f00d609070bd87945d406328567ca0 SHA512 69d5dbea98a5b4065e73cc5c846125c5059e3a50ee1fa3ec4ef99f8f868cf3729ffe73510729534289a91d1a54683b84b6a37bc640c60205be709732dfcb01e3 EBUILD nedit-5.6-r1.ebuild 1989 BLAKE2B 8d5cde4cb3ecd3a20db4ecc763a1a97db7ba9a86dbea7c5355d8c5c7056ef3afe7d90fb94f97dd4652b8d71a7163ef17346b71fdd0a1ad9dfaa966d5b2c8a203 SHA512 147d9308121e65466d22b9973f8d0ab69b0fca53769b51dce8da933a8a069e025cf1222f4ff5d03af3df71fd4c0a93def2f99c0b9402456e3903bce5ebf5dc3b EBUILD nedit-5.6-r2.ebuild 2037 BLAKE2B b881666c19e2d9aa63e219ad2a1a0d4d632470d80bbe74bbddfcbd7272a210882bc172e9499d61c77afd8fa63fa30f465fd9c7814c893e635ad0833adf05bb31 SHA512 ed954cd69acc1652f597d188c72c38f38e8ff0d06ede0f7b98c818b1c0a442c9e688a1ade3cb245ab3de907966c86210dd6b28528ddef448fc367c6d8aab20ed +EBUILD nedit-5.7.ebuild 1993 BLAKE2B 84f90d629c8bfef4107a645848614181cc38bb5e6fdc669e0b2b433b6aea8a5327379540ed9bcb8615f6621a3289053820da4234db824ca2104776d20a60c852 SHA512 b103f021cc3a3e58fc5191b050f865bce33fcc716eb7c6432bea66f138a718208ea39c2db8a3967b9c5f92b744bedaec36ae1981f6df4a129882ab2dae1250c3 MISC metadata.xml 292 BLAKE2B 10ee90c2d8d7cc7bdef834d511467fe8dc1bf90929caf19a919d2e428c6d42f432f996bddd4cf1e4f2fbee70621e85144a7458b70b8c139aac20e3f7f82a0710 SHA512 0c0cc8a66f8640a0239d6b971d6faf8ca3b5a50909306b47c02b6f5b401b71534e6965cec6cfb38a47bdb09cb871cd217f9316220b6d7ca2a1019b27bf2f7699 diff --git a/app-editors/nedit/files/nedit-5.7-doc.patch b/app-editors/nedit/files/nedit-5.7-doc.patch new file mode 100644 index 000000000000..fceb9e1773c8 --- /dev/null +++ b/app-editors/nedit/files/nedit-5.7-doc.patch @@ -0,0 +1,13 @@ +--- a/doc/Makefile 2019-05-03 13:18:33.343246393 +0200 ++++ b/doc/Makefile 2019-05-03 13:19:33.110902639 +0200 +@@ -48,8 +48,8 @@ + ../source/help_topic.h ../source/help_data.h: .version help.etx setext + @ echo "Creating NEdit help code `cat .version`" + @ ./setext -m -v version="`cat .version`" help.etx +- @ mv -f help_topic.h ../source +- @ mv -f help_data.h ../source ++ @ cp -f help_topic.h ../source ++ @ cp -f help_data.h ../source + + nedit.html: .version help.etx setext + @ echo "Creating NEdit HTML documentation..." diff --git a/app-editors/nedit/files/nedit-5.7-ldflags.patch b/app-editors/nedit/files/nedit-5.7-ldflags.patch new file mode 100644 index 000000000000..b529d3327dd2 --- /dev/null +++ b/app-editors/nedit/files/nedit-5.7-ldflags.patch @@ -0,0 +1,17 @@ +--- a/source/Makefile.common 2019-01-19 14:27:14.927734607 +0100 ++++ b/source/Makefile.common 2019-01-19 14:28:46.186729890 +0100 +@@ -20,12 +20,12 @@ + # we only want natural rebuilds to regenerate the link date. + nedit: $(OBJS) ../util/libNUtil.a $(XMLLIB) $(XLTLIB) + $(CC) $(CFLAGS) -c linkdate.c -o linkdate.o +- $(CC) $(CFLAGS) $(OBJS) linkdate.o $(XMLLIB) \ ++ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) linkdate.o $(XMLLIB) \ + $(XLTLIB) ../util/libNUtil.a $(LIBS) -o $@ + + # Note LIBS isn't quite right here; it links unnecessarily against Motif + nc: nc.o server_common.o ../util/libNUtil.a +- $(CC) $(CFLAGS) nc.o server_common.o ../util/libNUtil.a $(LIBS) -o $@ ++ $(CC) $(CFLAGS) $(LDFLAGS) nc.o server_common.o ../util/libNUtil.a $(LIBS) -o $@ + + help.o: help.c + $(CC) $(CFLAGS) $(BIGGER_STRINGS) -c help.c -o $@ diff --git a/app-editors/nedit/nedit-5.7.ebuild b/app-editors/nedit/nedit-5.7.ebuild new file mode 100644 index 000000000000..264b42660216 --- /dev/null +++ b/app-editors/nedit/nedit-5.7.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop toolchain-funcs + +DESCRIPTION="Multi-purpose text editor for the X Window System" +HOMEPAGE="https://sourceforge.net/projects/nedit" +SRC_URI=" + https://downloads.sourceforge.net/project/${PN}/${PN}-source/${P}-src.tar.gz + https://dev.gentoo.org/~jlec/distfiles/${PN}.png.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="doc" + +RDEPEND=">=x11-libs/motif-2.3:0 + x11-libs/libXt + x11-libs/libX11" +DEPEND="${RDEPEND} + || ( dev-util/yacc sys-devel/bison ) + dev-lang/perl" + +S="${WORKDIR}/${PN}-${PV}" + +PATCHES=( + "${FILESDIR}/${P}-ldflags.patch" + "${FILESDIR}/${PN}-5.6-security.patch" + "${FILESDIR}/${P}-doc.patch" +) + +src_prepare() { + #respecting LDFLAGS, bug #208189 + default + sed \ + -e "s:bin/:${EPREFIX}/bin/:g" \ + -i Makefile source/preferences.c source/help_data.h source/nedit.c Xlt/Makefile || die + sed \ + -e "s:nc:neditc:g" -i doc/nc.pod || die + sed -i -e "s:CFLAGS=-O:CFLAGS=${CFLAGS}:" -e "s:check_tif_rule::" \ + makefiles/Makefile.linux || die + sed -i -e "s:CFLAGS=-O:CFLAGS=${CFLAGS}:" \ + -e "s:MOTIFDIR=/usr/local:MOTIFDIR=${EPREFIX}/usr:" \ + -e "s:-lX11:-lX11 -lXmu -liconv:" \ + -e "s:check_tif_rule::" \ + makefiles/Makefile.macosx || die +} + +src_compile() { + case "${CHOST}" in + *-darwin*) + emake CC="$(tc-getCC)" AR="$(tc-getAR)" macosx + ;; + *-linux*) + emake CC="$(tc-getCC)" AR="$(tc-getAR)" linux + ;; + esac + if use doc; then + emake VERSION="NEdit ${PV}" -C doc all + fi +} + +src_install() { + dobin source/nedit + newbin source/nc neditc + + make_desktop_entry "${PN}" + doicon "${WORKDIR}/${PN}.png" + + if use doc; then + newman doc/nedit.man nedit.1 + newman doc/nc.man neditc.1 + + dodoc README ReleaseNotes ChangeLog + dodoc doc/nedit.doc doc/NEdit.ad doc/faq.txt doc/nedit.html + fi +} -- cgit v1.2.3