diff options
Diffstat (limited to 'app-editors/qemacs')
6 files changed, 8 insertions, 321 deletions
diff --git a/app-editors/qemacs/ChangeLog b/app-editors/qemacs/ChangeLog index b578d86606e0..ab5c14ccba91 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.49 2009/12/08 19:33:49 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/qemacs/ChangeLog,v 1.50 2009/12/09 16:02:19 fauli Exp $ + + 09 Dec 2009; Christian Faulhammer <fauli@gentoo.org> + -files/qemacs-0.3.1-manpage-ref-fix.patch, + -qemacs-0.4.0_pre20080605.ebuild, -qemacs-0.4.0_pre20080605-r1.ebuild, + -files/qemacs-0.4.0_pre20080605-Makefile-gentoo.patch, + -files/qemacs-0.4.0_pre20080605-qemacs-datadir.patch: + clean up 08 Dec 2009; nixnut <nixnut@gentoo.org> qemacs-0.4.0_pre20090420.ebuild: ppc stable #289402 diff --git a/app-editors/qemacs/files/qemacs-0.3.1-manpage-ref-fix.patch b/app-editors/qemacs/files/qemacs-0.3.1-manpage-ref-fix.patch deleted file mode 100644 index 0dca195bd2eb..000000000000 --- a/app-editors/qemacs/files/qemacs-0.3.1-manpage-ref-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- qemacs-0.3.1/qe.1 2005-02-03 03:47:34.000000000 +0000 -+++ qemacs-0.3.1/qe.1 2005-02-03 03:47:34.000000000 +0000 -@@ -1,10 +1,10 @@ - .\" Hey, EMACS: -*- nroff -*- --.TH QE 1 "October 21, 2001" -+.TH QEMACS 1 "October 21, 2001" - .\" Please adjust this date whenever revising the manpage. - .SH NAME - QEmacs \- tiny full-screen editor - .SH SYNOPSIS --.B qe -+.B qemacs - .RB [options] - .RI file... - .SH DESCRIPTION diff --git a/app-editors/qemacs/files/qemacs-0.4.0_pre20080605-Makefile-gentoo.patch b/app-editors/qemacs/files/qemacs-0.4.0_pre20080605-Makefile-gentoo.patch deleted file mode 100644 index a3571518851b..000000000000 --- a/app-editors/qemacs/files/qemacs-0.4.0_pre20080605-Makefile-gentoo.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- Makefile.orig 2009-03-07 21:27:48.000000000 +0100 -+++ Makefile 2009-03-07 21:28:43.000000000 +0100 -@@ -19,32 +19,6 @@ - - include config.mak - --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 cflags.mk -- --ifdef TARGET_GPROF -- CFLAGS += -p -- LDFLAGS += -p --endif -- --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 - - ######################################################## -@@ -354,16 +328,16 @@ - install: $(TARGETS) qe.1 - $(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 -d $(DESTDIR)$(prefix)/share/qemacs - $(INSTALL) -m 755 -s 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) - endif -- $(INSTALL) -m 644 kmaps ligatures $(DESTDIR)$(prefix)/share/qe -- $(INSTALL) -m 644 qe.1 $(DESTDIR)$(prefix)/man/man1 -+ $(INSTALL) -m 644 kmaps ligatures $(DESTDIR)$(prefix)/share/qemacs -+ $(INSTALL) -m 644 qe.1 $(DESTDIR)$(prefix)/man/man1/qemacs.1 - ifdef CONFIG_HTML - $(INSTALL) -m 755 -s html2png$(EXE) $(DESTDIR)$(prefix)/bin -+ $(INSTALL) -m 755 libqhtml/csstoqe $(DESTDIR)$(prefix)/bin/csstoqe - endif - - uninstall: diff --git a/app-editors/qemacs/files/qemacs-0.4.0_pre20080605-qemacs-datadir.patch b/app-editors/qemacs/files/qemacs-0.4.0_pre20080605-qemacs-datadir.patch deleted file mode 100644 index 84a001f65eb7..000000000000 --- a/app-editors/qemacs/files/qemacs-0.4.0_pre20080605-qemacs-datadir.patch +++ /dev/null @@ -1,96 +0,0 @@ ---- qe.c.orig 2009-03-07 21:00:39.000000000 +0100 -+++ qe.c 2009-03-07 21:10:50.000000000 +0100 -@@ -7505,15 +7505,15 @@ - /* compute resources path */ - qs->res_path[0] = '\0'; - -- /* put source directory first if qe invoked as ./qe */ -+ /* put source directory first if qe invoked as ./qemacs */ - // should use actual directory -- if (stristart(qs->argv[0], "./qe", NULL)) { -+ if (stristart(qs->argv[0], "./qemacs", NULL)) { - pstrcat(qs->res_path, sizeof(qs->res_path), ".:"); - } - - /* put user directory before standard list */ - if (user) { -- /* use ~USER/.qe instead of ~/.qe */ -+ /* use ~USER/.qemacs instead of ~/.qemacs */ - /* CG: should get user homedir */ - snprintf(path, sizeof(path), "/home/%s", user); - home_path = path; -@@ -7522,14 +7522,14 @@ - } - if (home_path) { - pstrcat(qs->res_path, sizeof(qs->res_path), home_path); -- pstrcat(qs->res_path, sizeof(qs->res_path), "/.qe:"); -+ pstrcat(qs->res_path, sizeof(qs->res_path), "/.qemacs:"); - } - - pstrcat(qs->res_path, sizeof(qs->res_path), -- CONFIG_QE_PREFIX "/share/qe:" -- CONFIG_QE_PREFIX "/lib/qe:" -- "/usr/share/qe:" -- "/usr/lib/qe"); -+ CONFIG_QE_PREFIX "/share/qemacs:" -+ CONFIG_QE_PREFIX "/lib/qemacs:" -+ "/usr/share/qemacs:" -+ "/usr/lib/qemacs"); - } - - void set_tty_charset(const char *name) -@@ -7545,7 +7545,7 @@ - { .int_ptr = &no_init_file }}, - { "ttycharset", "c", "CHARSET", CMD_OPT_ARG, "specify tty charset", - { .func_arg = set_tty_charset }}, -- { "user", "u", "USER", CMD_OPT_ARG, "load ~USER/.qe/config instead of your own", -+ { "user", "u", "USER", CMD_OPT_ARG, "load ~USER/.qemacs/config instead of your own", - { .func_arg = set_user_option }}, - { "version", "V", NULL, 0, "display version information and exit", - { .func_noarg = show_version }}, ---- qe-doc.texi.orig 2009-03-07 21:00:56.000000000 +0100 -+++ qe-doc.texi 2009-03-07 21:08:49.000000000 +0100 -@@ -274,11 +274,11 @@ - @section Resource path - - All resources and configuration files are looked in the following paths: --@file{/usr/share/qe:/usr/local/share/qe:/usr/lib/qe:/usr/local/lib/qe:~/.qe} -+@file{/usr/share/qemacs:/usr/local/share/qemacs:/usr/lib/qemacs:/usr/local/lib/qemacs:~/.qemacs} - - @section Configuration file - --QEmacs tries to load a configuration file in @file{~/.qe/config}. Each -+QEmacs tries to load a configuration file in @file{~/.qemacs/config}. Each - line of the configuration file is a QEmacs command with a C like syntax - ('-' in command name can be replaced by '_'). - ---- qe-doc.html.orig 2009-03-07 21:01:02.000000000 +0100 -+++ qe-doc.html 2009-03-07 21:08:49.000000000 +0100 -@@ -619,7 +619,7 @@ - <h2 class="section"> 4.1 Resource path </h2> - - <p>All resources and configuration files are looked in the following paths: --‘<tt>/usr/share/qe:/usr/local/share/qe:/usr/lib/qe:/usr/local/lib/qe:~/.qe</tt>’ -+‘<tt>/usr/share/qemacs:/usr/local/share/qemacs:/usr/lib/qemacs:/usr/local/lib/qemacs:~/.qemacs</tt>’ - </p> - <hr size="6"> - <a name="SEC19"></a> -@@ -641,7 +641,7 @@ - </tr></table> - <h2 class="section"> 4.2 Configuration file </h2> - --<p>QEmacs tries to load a configuration file in ‘<tt>~/.qe/config</tt>’. Each -+<p>QEmacs tries to load a configuration file in ‘<tt>~/.qemacs/config</tt>’. Each - line of the configuration file is a QEmacs command with a C like syntax - ('-' in command name can be replaced by '_'). - </p> ---- config.eg.orig 2009-03-07 21:00:21.000000000 +0100 -+++ config.eg 2009-03-07 21:08:49.000000000 +0100 -@@ -1,6 +1,6 @@ - // Sample qemacs config file - // --// copy it in ~/.qe/config -+// copy it in ~/.qemacs/config - // - // You can call any Qemacs command with a C like syntax. - // diff --git a/app-editors/qemacs/qemacs-0.4.0_pre20080605-r1.ebuild b/app-editors/qemacs/qemacs-0.4.0_pre20080605-r1.ebuild deleted file mode 100644 index 9c5014c0f167..000000000000 --- a/app-editors/qemacs/qemacs-0.4.0_pre20080605-r1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2009 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_pre20080605-r1.ebuild,v 1.2 2009/10/16 22:05:03 ulm Exp $ - -EAPI=1 - -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="strip test" - -DEPEND="X? ( x11-libs/libX11 - x11-libs/libXext - xv? ( x11-libs/libXv ) ) - png? ( media-libs/libpng:1.2 ) - !app-editors/qe" - -RDEPEND="${DEPEND}" - -DEPEND="${DEPEND} - app-text/texi2html" - -src_unpack() { - unpack ${A} - cd "${S}" - # Removes forced march setting and align-functions on x86, as they - # would override user's CFLAGS.. - epatch "${FILESDIR}/${P}-Makefile.patch" - # Make backup files optional - epatch "${FILESDIR}/${P}-make_backup.patch" - - useq 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 -} - -src_compile() { - # 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) \ - || die "econf failed" - # Does not support parallel building - emake -j1 || die -} - -src_install() { - emake install DESTDIR="${D}" || die - dodoc Changelog README TODO config.eg - dohtml *.html - - # Install headers so users can build their own plugins. - insinto /usr/include/qemacs - 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/qemacs/libqhtml - doins {css{,id},htmlent}.h -} diff --git a/app-editors/qemacs/qemacs-0.4.0_pre20080605.ebuild b/app-editors/qemacs/qemacs-0.4.0_pre20080605.ebuild deleted file mode 100644 index 604ccb91b069..000000000000 --- a/app-editors/qemacs/qemacs-0.4.0_pre20080605.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2009 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_pre20080605.ebuild,v 1.4 2009/04/22 20:40:18 maekke Exp $ - -inherit eutils flag-o-matic toolchain-funcs - -DESCRIPTION="QEmacs is a very small but powerful UNIX editor" -HOMEPAGE="http://fabrice.bellard.free.fr/qemacs/" -SRC_URI="mirror://gentoo/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="X png unicode xv" -RESTRICT="strip" - -DEPEND="X? ( x11-libs/libX11 - x11-libs/libXext - xv? ( x11-libs/libXv ) ) - png? ( =media-libs/libpng-1.2* )" - -RDEPEND="${DEPEND}" - -DEPEND="${DEPEND} - app-text/texi2html" - -src_unpack() { - unpack ${A} - cd "${S}" - # Add a patch to install to DESTDIR, make directories during install - # and install the binary/man page using the qemacs name to avoid clash - # with app-editors/qe. - # Also removes forced march setting and align-functions on x86, as - # they would override user's CFLAGS.. - epatch "${FILESDIR}/${P}-Makefile-gentoo.patch" - # Change the references to the qe binary to reflect the installed name - # qemacs. - epatch "${FILESDIR}/${PN}-0.3.1-manpage-ref-fix.patch" - # Set the datadir to qemacs, upstream installs in to qe which conflicts - # with files installed in app-editors/qe. Currently no breakage - # occurs, but it makes sense to change before that happens. - epatch "${FILESDIR}/${P}-qemacs-datadir.patch" - epatch "${FILESDIR}/${P}-make_backup.patch" - - useq 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/qemacs,&-${PVR}," qe.1 -} - -src_compile() { - # 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) \ - || die "econf failed" - # Does not support parallel building - emake -j1 || die -} - -src_test() { - # There are some files purporting to be tests in the tarball, however - # there is no defined way to use them and I imagine even if there was - # it would require user interaction. - # The toplevel Makefile calls the test target from the non-existant - # tests/Makefile, so just noop to stop errors if maketest is set. - : -} - -src_install() { - emake install DESTDIR="${D}" || die - dodoc Changelog README TODO config.eg - dohtml *.html - - # Install headers so users can build their own plugins. - insinto /usr/include/qemacs - 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/qemacs/libqhtml - doins {css{,id},htmlent}.h -} |