From d2377699716b0fe6814f5d7cd1c3ad374609720d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulrich=20M=C3=BCller?= Date: Sat, 4 Mar 2017 09:41:56 +0100 Subject: app-editors/qemacs: New snapshot. Package-Manager: Portage-2.3.4, Repoman-2.3.2 --- app-editors/qemacs/Manifest | 1 + .../files/qemacs-0.4.1_pre20170225-Makefile.patch | 42 +++++++++++++++ .../files/qemacs-0.4.1_pre20170225-manpage.patch | 11 ++++ .../files/qemacs-0.4.1_pre20170225-nostrip.patch | 61 +++++++++++++++++++++ app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild | 63 ++++++++++++++++++++++ 5 files changed, 178 insertions(+) create mode 100644 app-editors/qemacs/files/qemacs-0.4.1_pre20170225-Makefile.patch create mode 100644 app-editors/qemacs/files/qemacs-0.4.1_pre20170225-manpage.patch create mode 100644 app-editors/qemacs/files/qemacs-0.4.1_pre20170225-nostrip.patch create mode 100644 app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild diff --git a/app-editors/qemacs/Manifest b/app-editors/qemacs/Manifest index fa2ea2e683a..6f2977c8a6d 100644 --- a/app-editors/qemacs/Manifest +++ b/app-editors/qemacs/Manifest @@ -1,2 +1,3 @@ DIST qemacs-0.4.0_pre20090420.tar.bz2 1393436 SHA256 14f1ffad569f1bdaaa27d2d7ab0251ce69afc9efc347bb244b11f5e34e818ab5 SHA512 4595e34d3a83cbd7f25514dd96b7578976b30de80eb19b1391448ecdb9c06d24088880978961e5abb94b3f715057e7563ae0976d704bc5afaaf83e62a67e8dd4 WHIRLPOOL 63ba6950a0340731cd9a041a5929d18f1769d915a7343a94b2b0c48d82a0af1680b2163426e8d268240d3c0c740895853439d96c2d49791e106f0798f5d88a8b DIST qemacs-0.4.1_pre20150916.tar.xz 1136592 SHA256 1f019c7fc7aceaa2c5608a7ca251e244ee8bf67086e4b285c28f88849e1269b0 SHA512 e9775ff3dfef6d6b6b263029a620e6575f9f4718b94c0acfcddc8e5da8cd835e57dfbd5fbd948778135b609ae0588924fc9a727b2e763a25148aa27886a9f467 WHIRLPOOL 4f97d931eb3880a8ce0f1f09a6f404297797f230cfcc4d2507fcf0b6fcf0c4d28d5868e943905d316cb0d5d22581095c4cd1a8bf00c44f11ed7606a357f7cc19 +DIST qemacs-0.4.1_pre20170225.tar.xz 1147408 SHA256 9a3f754effbd9253b7aec9909fea801fc233cf69f98f6c807e5334ae1c8a08a6 SHA512 a17c8901c917f91401e16b4f857735957ab0d3533d9dcc7a0decf768f453b68023f45e1241225a84d35ba793beb69754e0f2caa857165f8223882d5041d56c99 WHIRLPOOL b430a0fd8ecef701d4727acb023d0a56553cf109e18ae64dfec886923ec6e5395d1dae9484c274d298675928c69e0e966f3443c0f9f4f8c6890af15bc0fd52ae diff --git a/app-editors/qemacs/files/qemacs-0.4.1_pre20170225-Makefile.patch b/app-editors/qemacs/files/qemacs-0.4.1_pre20170225-Makefile.patch new file mode 100644 index 00000000000..0540bcd767c --- /dev/null +++ b/app-editors/qemacs/files/qemacs-0.4.1_pre20170225-Makefile.patch @@ -0,0 +1,42 @@ +Removes forced march setting and align-functions on x86, as they would +override user's CFLAGS. + +--- qemacs-orig/Makefile ++++ qemacs/Makefile +@@ -29,35 +29,11 @@ + cmd := + endif + +-ifeq ($(CC),gcc) +- CFLAGS += -Wall -g -O2 -funsigned-char +- # do not warn about zero-length formats. +- CFLAGS += -Wno-format-zero-length +- LDFLAGS += -g +-endif +- +-#include local compiler configuration file +--include $(DEPTH)/cflags.mk +- +-ifdef TARGET_GPROF +- CFLAGS += -p +- LDFLAGS += -p +-endif +- + #TCFLAGS := -DCONFIG_TINY -m32 $(CFLAGS) -Os + #TLDFLAGS := -m32 $(LDFLAGS) +-TCFLAGS := -DCONFIG_TINY $(CFLAGS) -Os ++TCFLAGS := -DCONFIG_TINY $(CFLAGS) + TLDFLAGS := $(LDFLAGS) + +-ifdef TARGET_ARCH_X86 +- #CFLAGS+=-fomit-frame-pointer +- ifeq ($(GCC_MAJOR),2) +- CFLAGS += -m386 -malign-functions=0 +- else +- CFLAGS += -march=i386 -falign-functions=0 +- endif +-endif +- + DEFINES=-DHAVE_QE_CONFIG_H + + ######################################################## diff --git a/app-editors/qemacs/files/qemacs-0.4.1_pre20170225-manpage.patch b/app-editors/qemacs/files/qemacs-0.4.1_pre20170225-manpage.patch new file mode 100644 index 00000000000..b73f3ee356b --- /dev/null +++ b/app-editors/qemacs/files/qemacs-0.4.1_pre20170225-manpage.patch @@ -0,0 +1,11 @@ +--- qemacs-orig/qe.1 ++++ qemacs/qe.1 +@@ -44,7 +44,7 @@ + anti aliased font display. + .PP + For more information and a list of key bindings please see +-/usr/share/doc/qemacs/README.gz. ++the README file in /usr/share/doc/@PF@/. + .SH AUTHOR + This manual page was written by Edmund GRIMLEY EVANS , + for the Debian GNU/Linux system (but may be used by others). diff --git a/app-editors/qemacs/files/qemacs-0.4.1_pre20170225-nostrip.patch b/app-editors/qemacs/files/qemacs-0.4.1_pre20170225-nostrip.patch new file mode 100644 index 00000000000..60519dca5c3 --- /dev/null +++ b/app-editors/qemacs/files/qemacs-0.4.1_pre20170225-nostrip.patch @@ -0,0 +1,61 @@ +Suppress stripping. + +--- qemacs-orig/Makefile ++++ qemacs/Makefile +@@ -203,7 +203,6 @@ + qe$(EXE): qe_g$(EXE) Makefile + @rm -f $@ + cp $< $@ +- -$(STRIP) $@ + @ls -l $@ + @echo `size $@` `wc -c $@` qe $(OPTIONS) \ + | cut -d ' ' -f 7-10,13,15-40 >> STATS +@@ -218,7 +217,6 @@ + xqe$(EXE): xqe_g$(EXE) Makefile + @rm -f $@ + cp $< $@ +- -$(STRIP) $@ + @ls -l $@ + @echo `size $@` `wc -c $@` xqe $(OPTIONS) \ + | cut -d ' ' -f 7-10,13,15-40 >> STATS +@@ -233,7 +231,6 @@ + tqe$(EXE): tqe_g$(EXE) Makefile + @rm -f $@ + cp $< $@ +- -$(STRIP) $@ + @ls -l $@ + @echo `size $@` `wc -c $@` tqe $(OPTIONS) \ + | cut -d ' ' -f 7-10,13,15-40 >> STATS +@@ -245,7 +242,6 @@ + t1qe$(EXE): t1qe_g$(EXE) Makefile + @rm -f $@ + cp $< $@ +- -$(STRIP) $@ + @ls -l $@ + @echo `size $@` `wc -c $@` t1qe $(OPTIONS) \ + | cut -d ' ' -f 7-10,13,15-40 >> STATS +@@ -478,12 +474,12 @@ + $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1 + $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/qe + ifdef CONFIG_X11 +- $(INSTALL) -m 755 -s xqe$(EXE) $(DESTDIR)$(prefix)/bin/qemacs$(EXE) ++ $(INSTALL) -m 755 xqe$(EXE) $(DESTDIR)$(prefix)/bin/qemacs$(EXE) + else + ifdef CONFIG_TINY +- $(INSTALL) -m 755 -s tqe$(EXE) $(DESTDIR)$(prefix)/bin/qemacs$(EXE) ++ $(INSTALL) -m 755 tqe$(EXE) $(DESTDIR)$(prefix)/bin/qemacs$(EXE) + else +- $(INSTALL) -m 755 -s qe$(EXE) $(DESTDIR)$(prefix)/bin/qemacs$(EXE) ++ $(INSTALL) -m 755 qe$(EXE) $(DESTDIR)$(prefix)/bin/qemacs$(EXE) + endif + endif + ln -sf qemacs$(EXE) $(DESTDIR)$(prefix)/bin/qe$(EXE) +@@ -493,7 +489,7 @@ + $(INSTALL) -m 644 kmaps ligatures $(DESTDIR)$(datadir)/qe + $(INSTALL) -m 644 qe.1 $(DESTDIR)$(mandir)/man1 + ifdef CONFIG_HTML +- $(INSTALL) -m 755 -s html2png$(EXE) $(DESTDIR)$(prefix)/bin ++ $(INSTALL) -m 755 html2png$(EXE) $(DESTDIR)$(prefix)/bin + endif + + uninstall: diff --git a/app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild b/app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild new file mode 100644 index 00000000000..dc55a56850d --- /dev/null +++ b/app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit toolchain-funcs + +DESCRIPTION="QEmacs is a very small but powerful UNIX editor" +HOMEPAGE="https://savannah.nongnu.org/projects/qemacs/" +# snapshot of http://cvs.savannah.gnu.org/viewvc/?root=qemacs +SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz" + +LICENSE="LGPL-2.1+ GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~x86" +IUSE="X png unicode xv" +RESTRICT="test" + +RDEPEND=" + X? ( x11-libs/libX11 + x11-libs/libXext + xv? ( x11-libs/libXv ) ) + png? ( >=media-libs/libpng-1.2:0= )" + +DEPEND="${RDEPEND} + >=app-text/texi2html-5" + +S="${WORKDIR}/${PN}" + +src_prepare() { + eapply "${FILESDIR}/${P}-Makefile.patch" + eapply "${FILESDIR}/${P}-nostrip.patch" + eapply_user + + # Change the manpage to reference a /real/ file instead of just an + # approximation. Purely cosmetic! + eapply "${FILESDIR}/${P}-manpage.patch" + sed -i -e "s:@PF@:${PF}:" qe.1 || die +} + +src_configure() { + # Home-grown configure script, doesn't support most standard options + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --cc="$(tc-getCC)" \ + $(use_enable X x11) \ + $(use_enable png) \ + $(use_enable xv) || die +} + +src_install() { + emake install DESTDIR="${D}" + dodoc Changelog README TODO.org config.eg + docinto html + dodoc qe-doc.html + + # Install headers so users can build their own plugins + insinto /usr/include/qe + doins *.h + insinto /usr/include/qe/libqhtml + doins libqhtml/*.h +} -- cgit v1.2.1