From a54c7d1ef02d6c8c4aeec6a506c45730f896897e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ulrich=20M=C3=BCller?= Date: Sun, 14 Aug 2011 08:50:59 +0000 Subject: [PATCH] Don't strip binaries in Makefile. Remove RESTRICT=strip. Package-Manager: portage-2.1.10.11/cvs/Linux x86_64 --- app-editors/qemacs/ChangeLog | 11 ++- app-editors/qemacs/Manifest | 14 +++- .../qemacs-0.4.0_pre20090420-nostrip.patch | 36 +++++++++ .../qemacs/qemacs-0.4.0_pre20090420-r1.ebuild | 76 +++++++++++++++++++ 4 files changed, 134 insertions(+), 3 deletions(-) create mode 100644 app-editors/qemacs/files/qemacs-0.4.0_pre20090420-nostrip.patch create mode 100644 app-editors/qemacs/qemacs-0.4.0_pre20090420-r1.ebuild diff --git a/app-editors/qemacs/ChangeLog b/app-editors/qemacs/ChangeLog index ab5c14ccba91..2435bb23e8d2 100644 --- a/app-editors/qemacs/ChangeLog +++ b/app-editors/qemacs/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-editors/qemacs -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/qemacs/ChangeLog,v 1.50 2009/12/09 16:02:19 fauli Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/qemacs/ChangeLog,v 1.51 2011/08/14 08:50:59 ulm Exp $ + +*qemacs-0.4.0_pre20090420-r1 (14 Aug 2011) + + 14 Aug 2011; Ulrich Mueller + +qemacs-0.4.0_pre20090420-r1.ebuild, + +files/qemacs-0.4.0_pre20090420-nostrip.patch: + Don't strip binaries in Makefile. Remove RESTRICT=strip. 09 Dec 2009; Christian Faulhammer -files/qemacs-0.3.1-manpage-ref-fix.patch, diff --git a/app-editors/qemacs/Manifest b/app-editors/qemacs/Manifest index c598ce5c9cec..ef006604c931 100644 --- a/app-editors/qemacs/Manifest +++ b/app-editors/qemacs/Manifest @@ -1,7 +1,19 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX qemacs-0.3.2_pre20070226-tty_utf8.patch 1128 RMD160 7cce385e2c8390f3a331aa9231ca05b690615a97 SHA1 f5042b69b6345fd8e578f84d910ea251ddf8b012 SHA256 a310aad2df48c18202b57834dd18095f7d2ea0366e15108d0ea525deaa29c8a4 AUX qemacs-0.4.0_pre20080605-Makefile.patch 754 RMD160 8285c6f2e4afc8e02b37f21bcd0f0fc71bee51fc SHA1 49bf92d015535f7d37e79fab59b314e7ce4cd149 SHA256 66030e45fa8f782a98174de9828f411e6fb65a48e7f7dd288bd3228916c7f535 AUX qemacs-0.4.0_pre20080605-make_backup.patch 2151 RMD160 cecdb02970c424d2214cfa03d05646c57e2c12b1 SHA1 6efce3065599bbdf512290bcfeb9ebd7aaa59f5b SHA256 aec0a4566522476a7e31b90895b1b83b02c99f90c43567e52c0152132a2c925e +AUX qemacs-0.4.0_pre20090420-nostrip.patch 1155 RMD160 f18295743800cf860af7691d316c1c5320a38604 SHA1 1ae8fcf9193a1848957aefeccd70fce77f4a1f83 SHA256 d16ac3848ef14e186f21812ca6ba926c0eb6848676a6dc8f2af8de713025555f DIST qemacs-0.4.0_pre20090420.tar.bz2 1393436 RMD160 69889f79319a44015a45a294499ddd4dbd3b2242 SHA1 68d3b78801a3687e714d91b6f8c890bd37b0ce7e SHA256 14f1ffad569f1bdaaa27d2d7ab0251ce69afc9efc347bb244b11f5e34e818ab5 +EBUILD qemacs-0.4.0_pre20090420-r1.ebuild 2015 RMD160 cb9414ad78385bb1ce0b9b64bcb38ea996dfce36 SHA1 4edec46b42b47d012e7e8b3885c6255035460fb1 SHA256 571e18a6b0042ca1d8bf625a3cc1d103bd3905d0dafd47fcab81ef28a4c1a1fa EBUILD qemacs-0.4.0_pre20090420.ebuild 2014 RMD160 cdbdcf2212db3fd4032c6e7563e6229bb933b730 SHA1 0b6f9f1850693d464dfb33bab0252ff4ef64b97a SHA256 43d4c6b551a14d74b780967eab178bbfacc245e9ee47196adb4028e991432652 -MISC ChangeLog 8816 RMD160 a1b5d0918202b7803f82e92f77a13319d26b4a14 SHA1 b44032e13b893d54dba4a129aaf671c7febe7e99 SHA256 55614e340b2c2746afaa51cccac373f1edc71d0c66dfc1133c47e76f59d3b0ce +MISC ChangeLog 9053 RMD160 4c7fe90133a3d11a9fcb2f79d50c16b86e778146 SHA1 87eee02b365c1760a917491741d94f9da81421fd SHA256 99489bc1a79f2c1657baa4cbebad03fc4275faceeae9d7a2cdc641ab70260418 MISC metadata.xml 1844 RMD160 57465a488dcb8f94d854bb612e1d0813e9b7f183 SHA1 89f6d34c02548f8867f5e9ec1f890a2f0492d48f SHA256 48e80523ab132a1640c376ea6ec271cafa264f5bcdea29f09c697f0ff6fe31f8 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.18 (GNU/Linux) + +iEYEARECAAYFAk5HjcQACgkQOeoy/oIi7uyc6gCgsmTOn/lQ1uYlSiM4ye7dRbCC +zKgAoNPApBamurVbPP8+crGO2qdeftBB +=dxNM +-----END PGP SIGNATURE----- diff --git a/app-editors/qemacs/files/qemacs-0.4.0_pre20090420-nostrip.patch b/app-editors/qemacs/files/qemacs-0.4.0_pre20090420-nostrip.patch new file mode 100644 index 000000000000..120b09c2129d --- /dev/null +++ b/app-editors/qemacs/files/qemacs-0.4.0_pre20090420-nostrip.patch @@ -0,0 +1,36 @@ +--- qemacs-orig/Makefile ++++ qemacs/Makefile +@@ -151,7 +151,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 +@@ -165,7 +164,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 +@@ -329,7 +327,7 @@ + $(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/bin + $(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/man/man1 + $(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/share/qe +- $(INSTALL) -m 755 -s qe$(EXE) $(DESTDIR)$(prefix)/bin/qemacs$(EXE) ++ $(INSTALL) -m 755 qe$(EXE) $(DESTDIR)$(prefix)/bin/qemacs$(EXE) + ln -sf qemacs $(DESTDIR)$(prefix)/bin/qe$(EXE) + ifdef CONFIG_FFMPEG + ln -sf qemacs$(EXE) $(DESTDIR)$(prefix)/bin/ffplay$(EXE) +@@ -337,7 +335,7 @@ + $(INSTALL) -m 644 kmaps ligatures $(DESTDIR)$(prefix)/share/qe + $(INSTALL) -m 644 qe.1 $(DESTDIR)$(prefix)/man/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.0_pre20090420-r1.ebuild b/app-editors/qemacs/qemacs-0.4.0_pre20090420-r1.ebuild new file mode 100644 index 000000000000..7614446850a8 --- /dev/null +++ b/app-editors/qemacs/qemacs-0.4.0_pre20090420-r1.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/qemacs/qemacs-0.4.0_pre20090420-r1.ebuild,v 1.1 2011/08/14 08:50:59 ulm Exp $ + +EAPI=4 + +inherit eutils flag-o-matic toolchain-funcs + +DESCRIPTION="QEmacs is a very small but powerful UNIX editor" +HOMEPAGE="http://savannah.nongnu.org/projects/qemacs" +SRC_URI="mirror://gentoo/${P}.tar.bz2" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~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 )" + +DEPEND="${RDEPEND} + app-text/texi2html" + +S="${WORKDIR}/${PN}" + +src_prepare() { + # Removes forced march setting and align-functions on x86, as they + # would override user's CFLAGS.. + epatch "${FILESDIR}/${PN}-0.4.0_pre20080605-Makefile.patch" + # Make backup files optional + epatch "${FILESDIR}/${PN}-0.4.0_pre20080605-make_backup.patch" + # Suppress stripping + epatch "${FILESDIR}/${P}-nostrip.patch" + + use unicode && epatch "${FILESDIR}/${PN}-0.3.2_pre20070226-tty_utf8.patch" + + # Change the manpage to reference a /real/ file instead of just an + # approximation. Purely cosmetic! + sed -i "s,^/usr/share/doc/qe,&-${PVR}," qe.1 || die +} + +src_configure() { + # when using any other CFLAGS than -O0, qemacs will segfault on startup, + # see bug 92011 + replace-flags -O? -O0 + econf --cc="$(tc-getCC)" \ + $(use_enable X x11) \ + $(use_enable png) \ + $(use_enable xv) +} + +src_compile() { + # Does not support parallel building. + emake -j1 +} + +src_install() { + emake install DESTDIR="${D}" + dodoc Changelog README TODO config.eg + dohtml *.html + + # Fix man page location + mv "${D}"/usr/{,share/}man || die + + # Install headers so users can build their own plugins. + insinto /usr/include/qe + doins cfb.h config.h cutils.h display.h fbfrender.h libfbf.h qe.h \ + qeconfig.h qestyles.h qfribidi.h + cd libqhtml + insinto /usr/include/qe/libqhtml + doins css.h cssid.h htmlent.h +} -- 2.26.2