diff options
Diffstat (limited to 'app-editors/qemacs')
5 files changed, 9 insertions, 321 deletions
diff --git a/app-editors/qemacs/ChangeLog b/app-editors/qemacs/ChangeLog index 11d0eb834ef1..58b706338b69 100644 --- a/app-editors/qemacs/ChangeLog +++ b/app-editors/qemacs/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-editors/qemacs -# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/qemacs/ChangeLog,v 1.42 2009/04/22 20:40:18 maekke Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/qemacs/ChangeLog,v 1.43 2009/06/08 18:41:06 fauli Exp $ + + 08 Jun 2009; Christian Faulhammer <fauli@gentoo.org> + -qemacs-0.3.2_pre20070226.ebuild, + -files/qemacs-0.3.2_pre20070226-Makefile-gentoo.patch, + -files/qemacs-0.3.2_pre20070226-make_backup.patch, + -files/qemacs-0.3.2_pre20070226-qemacs-datadir.patch: + clean up 22 Apr 2009; Markus Meier <maekke@gentoo.org> qemacs-0.4.0_pre20080605: amd64 stable, bug #265309 diff --git a/app-editors/qemacs/files/qemacs-0.3.2_pre20070226-Makefile-gentoo.patch b/app-editors/qemacs/files/qemacs-0.3.2_pre20070226-Makefile-gentoo.patch deleted file mode 100644 index 339ae8458285..000000000000 --- a/app-editors/qemacs/files/qemacs-0.3.2_pre20070226-Makefile-gentoo.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -u ../qemacs/Makefile ./Makefile ---- ../qemacs/Makefile 2007-02-06 18:41:16.000000000 +0100 -+++ ./Makefile 2007-02-26 14:03:24.000000000 +0100 -@@ -38,15 +38,6 @@ - LDFLAGS+= -p - endif - --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 - - ######################################################## -@@ -211,15 +202,19 @@ - rm -f config.h config.mak - - install: $(TARGETS) qe.1 kmaps ligatures -- install -m 755 qe$(EXE) $(prefix)/bin/qemacs -- ln -sf qemacs $(prefix)/bin/qe$(EXE) -+ mkdir -p $(DESTDIR)$(prefix)/bin -+ install -m 755 qe $(DESTDIR)$(prefix)/bin/qemacs -+ifdef CONFIG_HTML -+ install -m 755 libqhtml/csstoqe $(DESTDIR)$(prefix)/bin/csstoqe -+endif - ifdef CONFIG_FFMPEG -- ln -sf qemacs $(prefix)/bin/ffplay -+ ln -sf qemacs $(DESTDIR)$(prefix)/bin/qemacs-ffplay - endif -- mkdir -p $(prefix)/share/qe -- install kmaps ligatures $(prefix)/share/qe -- install qe.1 $(prefix)/man/man1 -+ mkdir -p $(DESTDIR)$(prefix)/share/qemacs -+ install -m644 kmaps ligatures $(DESTDIR)$(prefix)/share/qe -+ mkdir -p $(DESTDIR)$(prefix)/share/man/man1 -+ install -m644 qe.1 $(DESTDIR)$(prefix)/share/man/man1/qemacs.1 - ifdef CONFIG_HTML -- install -m 755 -s html2png$(EXE) $(prefix)/bin -+ install -m 755 -s html2png $(DESTDIR)$(prefix)/bin - endif - - TAGS: force
\ No newline at end of file diff --git a/app-editors/qemacs/files/qemacs-0.3.2_pre20070226-make_backup.patch b/app-editors/qemacs/files/qemacs-0.3.2_pre20070226-make_backup.patch deleted file mode 100644 index 6d96be603127..000000000000 --- a/app-editors/qemacs/files/qemacs-0.3.2_pre20070226-make_backup.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -u ../qemacs/buffer.c ./buffer.c ---- ../qemacs/buffer.c 2006-12-31 20:34:01.000000000 +0100 -+++ ./buffer.c 2007-02-26 15:00:50.000000000 +0100 -@@ -1528,10 +1528,12 @@ - if (stat(filename, &st) == 0) - mode = st.st_mode & 0777; - -- /* backup old file if present */ -- strcpy(buf1, filename); -- strcat(buf1, "~"); -- rename(filename, buf1); -+ /* backup old file if present and make-backup-files is on */ -+ if(mbf == 1) { -+ strcpy(buf1, filename); -+ strcat(buf1, "~"); -+ rename(filename, buf1); -+ } - - ret = b->data_type->buffer_save(b, filename); - if (ret < 0) -Gemeinsame Unterverzeichnisse: ../qemacs/fonts und ./fonts. -Gemeinsame Unterverzeichnisse: ../qemacs/libqhtml und ./libqhtml. -Nur in ../qemacs: Makefile.orig. -Gemeinsame Unterverzeichnisse: ../qemacs/plugin-example und ./plugin-example. -diff -u ../qemacs/qe.c ./qe.c ---- ../qemacs/qe.c 2007-02-26 14:58:27.000000000 +0100 -+++ ./qe.c 2007-02-26 15:02:13.000000000 +0100 -@@ -67,6 +67,7 @@ - int trace_buffer_state; - int no_init_file; - const char *user_option; -+mbf = 1; - - /* mode handling */ - -@@ -4816,6 +4817,14 @@ - do_refresh(qs->first_window); - } - -+static void make_backup_files(EditState *s) { -+ if(mbf == 1) { -+ mbf = 0; -+ } else { -+ mbf = 1; -+ } -+} -+ - /* compute default path for find/save buffer */ - static void get_default_path(EditState *s, char *buf, int buf_size) - { -diff -u ../qemacs/qeconfig.h ./qeconfig.h ---- ../qemacs/qeconfig.h 2007-01-12 16:06:16.000000000 +0100 -+++ ./qeconfig.h 2007-02-26 15:03:30.000000000 +0100 -@@ -86,6 +86,7 @@ - do_changecase_region, 0, "*v") - CMDV( KEY_CTRLX(KEY_CTRL('u')), KEY_NONE, "upcase-region", - do_changecase_region, 1, "*v") -+ CMD0( KEY_NONE, KEY_NONE, "make-backup-files", make_backup_files) - - /* keyboard macros */ - CMD0( KEY_CTRLX('('), KEY_NONE, "start-kbd-macro", do_start_macro) -diff -u ../qemacs/qe.h ./qe.h ---- ../qemacs/qe.h 2007-01-12 16:06:16.000000000 +0100 -+++ ./qe.h 2007-02-26 15:02:41.000000000 +0100 -@@ -1422,6 +1422,8 @@ - void fill_border(EditState *s, int x, int y, int w, int h, int color); - int qe_bitmap_format_to_pix_fmt(int format); - -+int mbf; -+ - /* shell.c */ - EditBuffer *new_shell_buffer(const char *name, const char *path, - const char **argv, int is_shell); -Gemeinsame Unterverzeichnisse: ../qemacs/tests und ./tests. diff --git a/app-editors/qemacs/files/qemacs-0.3.2_pre20070226-qemacs-datadir.patch b/app-editors/qemacs/files/qemacs-0.3.2_pre20070226-qemacs-datadir.patch deleted file mode 100644 index f34700dff609..000000000000 --- a/app-editors/qemacs/files/qemacs-0.3.2_pre20070226-qemacs-datadir.patch +++ /dev/null @@ -1,101 +0,0 @@ -diff -u ../qemacs/config.eg ./config.eg ---- ../qemacs/config.eg 2006-12-09 20:02:07.000000000 +0100 -+++ ./config.eg 2007-02-26 14:55:51.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. - // -Gemeinsame Unterverzeichnisse: ../qemacs/fonts und ./fonts. -Gemeinsame Unterverzeichnisse: ../qemacs/libqhtml und ./libqhtml. -diff -u ../qemacs/Makefile ./Makefile ---- ../qemacs/Makefile 2007-02-26 14:57:04.000000000 +0100 -+++ ./Makefile 2007-02-26 14:56:34.000000000 +0100 -@@ -209,7 +209,7 @@ - ln -sf qemacs $(DESTDIR)$(prefix)/bin/qemacs-ffplay - endif - mkdir -p $(DESTDIR)$(prefix)/share/qemacs -- install -m644 kmaps ligatures $(DESTDIR)$(prefix)/share/qe -+ install -m644 kmaps ligatures $(DESTDIR)$(prefix)/share/qemacs - mkdir -p $(DESTDIR)$(prefix)/share/man/man1 - install -m644 qe.1 $(DESTDIR)$(prefix)/share/man/man1/qemacs.1 - ifdef CONFIG_HTML -Nur in ../qemacs: Makefile.orig. -Gemeinsame Unterverzeichnisse: ../qemacs/plugin-example und ./plugin-example. -diff -u ../qemacs/qe.c ./qe.c ---- ../qemacs/qe.c 2007-02-06 18:41:16.000000000 +0100 -+++ ./qe.c 2007-02-26 14:55:51.000000000 +0100 -@@ -6920,10 +6920,10 @@ - user_option = user; - /* compute resources path */ - pstrcpy(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"); - 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; -@@ -6933,7 +6933,7 @@ - if (home_path) { - pstrcat(qs->res_path, sizeof(qs->res_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"); - } - } - -@@ -6942,7 +6942,7 @@ - {func_noarg: show_usage}}, - { "no-init-file", "q", NULL, CMD_OPT_BOOL, "do not load config files", - {int_ptr: &no_init_file}}, -- { "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}}, -diff -u ../qemacs/qe-doc.html ./qe-doc.html ---- ../qemacs/qe-doc.html 2006-12-09 19:37:12.000000000 +0100 -+++ ./qe-doc.html 2007-02-26 14:55:51.000000000 +0100 -@@ -519,7 +519,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="SEC16"></a> -@@ -541,7 +541,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> -diff -u ../qemacs/qe-doc.texi ./qe-doc.texi ---- ../qemacs/qe-doc.texi 2006-12-09 19:37:12.000000000 +0100 -+++ ./qe-doc.texi 2007-02-26 14:55:51.000000000 +0100 -@@ -237,11 +237,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 '_'). - -Gemeinsame Unterverzeichnisse: ../qemacs/tests und ./tests. diff --git a/app-editors/qemacs/qemacs-0.3.2_pre20070226.ebuild b/app-editors/qemacs/qemacs-0.3.2_pre20070226.ebuild deleted file mode 100644 index 8dc1ce0f3d27..000000000000 --- a/app-editors/qemacs/qemacs-0.3.2_pre20070226.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/qemacs/qemacs-0.3.2_pre20070226.ebuild,v 1.10 2008/10/24 17:36:11 ulm Exp $ - -inherit eutils flag-o-matic toolchain-funcs - -DESCRIPTION="QEmacs (for Quick Emacs) is a very small but powerful UNIX editor" -HOMEPAGE="http://fabrice.bellard.free.fr/qemacs/" -SRC_URI="http://fabrice.bellard.free.fr/qemacs/${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}/${P}-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" - 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() { - make install DESTDIR="${D}" || die - dodoc Changelog README TODO config.eg - dohtml *.html - - insinto /usr/share/doc/${PF}/plugin-example/ - doins plugin-example/* - - # 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 -} - -pkg_postinst() { - einfo "This version of qemacs is not entirely backwards compatible with" - einfo "versions prior to 0.3.1-r1." - echo - einfo "The name of the binary has been changed to qemacs, to fix a name" - einfo "clash with app-editors/qe." - echo - einfo "The location of user config files have been changed to ~/.qemacs, to" - einfo "remove some ambiguity." -} |