Various patches from James Rowe <jnrowe@ukfsn.org>; bug #82915.

Package-Manager: portage-2.0.51.19

8 files changed, 283 insertions, 6 deletions

diff --git a/app-editors/qemacs/ChangeLog b/app-editors/qemacs/ChangeLog
index 8a835d78f322..b9f09c2e248a 100644
--- a/app-editors/qemacs/ChangeLog
+++ b/app-editors/qemacs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-editors/qemacs
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/qemacs/ChangeLog,v 1.15 2005/04/21 18:27:01 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/qemacs/ChangeLog,v 1.16 2005/04/23 07:50:20 usata Exp $
+
+*qemacs-0.3.1-r2 (23 Apr 2005)
+
+  23 Apr 2005; Mamoru KOMACHI <usata@gentoo.org>
+  +files/qemacs-0.3.1-Makefile-gentoo.patch,
+  +files/qemacs-0.3.1-manpage-ref-fix.patch,
+  +files/qemacs-0.3.1-qemacs-datadir.patch, +qemacs-0.3.1-r2.ebuild:
+  Various patches from James Rowe <jnrowe@ukfsn.org>; bug #82915.
 
   21 Apr 2005; Simon Stelling <blubb@gentoo.org> qemacs-0.3.1.ebuild:
   stable on amd64
diff --git a/app-editors/qemacs/Manifest b/app-editors/qemacs/Manifest
index 7646b255afb7..4b18eea763bf 100644
--- a/app-editors/qemacs/Manifest
+++ b/app-editors/qemacs/Manifest
@@ -1,11 +1,17 @@
-MD5 91f56f493dd37ffbf9430c9d1198fb1d ChangeLog 2219
+MD5 f15986efb8df5a5527369225d3bbceb6 ChangeLog 2526
 MD5 d655335395140037a868fb820f86594f qemacs-0.3.1-r1.ebuild 1265
 MD5 1da60ddbab718b543d530c3d3dc9a380 qemacs-0.3.1.ebuild 1217
+MD5 9a7799ceb5f60b593691596a156377b6 qemacs-0.3.1-r2.ebuild 2930
+MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
+MD5 a4c613ab493b62325669d8d1353c8b2e files/qemacs-Makefile-gentoo.patch 421
 MD5 1bef560680eaab10f0524f228c5dc6eb files/digest-qemacs-0.3.1 64
-MD5 1bef560680eaab10f0524f228c5dc6eb files/digest-qemacs-0.3.1-r1 64
 MD5 26f2791358b330724fe8dfa7a4dba22a files/qemacs-0.3.1-configure-gentoo.patch 496
-MD5 fe9962c046aca07cf1ede091345ea97a files/qemacs-0.3.1-gcc-3.4.patch 249
-MD5 635697c90ee6f2498f3f566a0932f2c2 files/qemacs-0.3.1-make_backup.patch 2141
 MD5 e7a9a6e25a384848c2b87891e7e7c973 files/qemacs-0.3.1-tty_utf8.patch 952
-MD5 a4c613ab493b62325669d8d1353c8b2e files/qemacs-Makefile-gentoo.patch 421
+MD5 635697c90ee6f2498f3f566a0932f2c2 files/qemacs-0.3.1-make_backup.patch 2141
+MD5 1bef560680eaab10f0524f228c5dc6eb files/digest-qemacs-0.3.1-r1 64
+MD5 b290b7c114e0e00c88618d1f9567cef6 files/qemacs-0.3.1-Makefile-gentoo.patch 2427
+MD5 15367c95b748438df7b023042082b9ad files/qemacs-0.3.1-manpage-ref-fix.patch 446
+MD5 262fce6e28282e7f9bd39d23e37d4f4e files/qemacs-0.3.1-qemacs-datadir.patch 3221
+MD5 1bef560680eaab10f0524f228c5dc6eb files/digest-qemacs-0.3.1-r2 64
+MD5 fe9962c046aca07cf1ede091345ea97a files/qemacs-0.3.1-gcc-3.4.patch 249
 MD5 4087c1cb48fcda9de6fe14a956748b1a files/qemacs-ppc-segfault.patch 918
diff --git a/app-editors/qemacs/files/digest-qemacs-0.3.1-r2 b/app-editors/qemacs/files/digest-qemacs-0.3.1-r2
new file mode 100644
index 000000000000..86ccf24a3138
--- /dev/null
+++ b/app-editors/qemacs/files/digest-qemacs-0.3.1-r2
@@ -0,0 +1 @@
+MD5 74d85dee9861d494bf1f9c53bbc85298 qemacs-0.3.1.tar.gz 809124
diff --git a/app-editors/qemacs/files/qemacs-0.3.1-Makefile-gentoo.patch b/app-editors/qemacs/files/qemacs-0.3.1-Makefile-gentoo.patch
new file mode 100644
index 000000000000..c2cbd7355587
--- /dev/null
+++ b/app-editors/qemacs/files/qemacs-0.3.1-Makefile-gentoo.patch
@@ -0,0 +1,79 @@
+--- qemacs-0.3.1/Makefile	2005-02-21 10:04:00.000000000 +0000
++++ qemacs-0.3.1/Makefile	2005-02-21 10:04:00.000000000 +0000
+@@ -29,14 +29,6 @@ ifdef TARGET_GPROF
+ CFLAGS+= -p
+ 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
+ 
+ ########################################################
+@@ -190,15 +182,17 @@ distclean: clean
+ 	rm -f config.h config.mak
+ 
+ install: qe qe.1 kmaps ligatures html2png
+-	install -m 755 qe $(prefix)/bin/qemacs
+-	ln -sf qemacs $(prefix)/bin/qe
++	mkdir -p $(DESTDIR)$(prefix)/bin
++	install -m 755 qe $(DESTDIR)$(prefix)/bin/qemacs
++	install -m 755 libqhtml/csstoqe $(DESTDIR)$(prefix)/bin/csstoqe
+ 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
+-	install -m 755 -s html2png $(prefix)/bin
++	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
++	install -m 755 -s html2png $(DESTDIR)$(prefix)/bin
+ 
+ TAGS: force
+ 	etags *.[ch]
+--- qemacs-0.3.1/plugin-example/Makefile	2005-02-21 03:24:37.000000000 +0000
++++ qemacs-0.3.1/plugin-example/Makefile	2005-02-21 03:24:37.000000000 +0000
+@@ -6,7 +6,7 @@
+ #
+ 
+ # modify to get the path of the qemacs sources
+-QEMACS_PATH=../
++QEMACS_PATH=/usr/include/qemacs
+ # define the name of your plugin
+ LIB=my_plugin.so
+ # define the object files it contains
+@@ -20,7 +20,7 @@ CFLAGS=-O2 -Wall -g -fPIC $(INCLUDES) $(
+ 
+ # by default, the plugin is copied in ~/.qe/ some that qemacs can load
+ # it automatically.
+-all: $(DIST_LIB)
++all: $(LIB)
+ 
+ $(DIST_LIB): $(LIB)
+ 	install -s -m 644 $< $@
+--- qemacs-0.3.1/libqhtml/Makefile	2005-02-21 03:24:37.000000000 +0000
++++ qemacs-0.3.1/libqhtml/Makefile	2005-02-21 03:24:37.000000000 +0000
+@@ -5,14 +5,6 @@ ifdef TARGET_GPROF
+ CFLAGS+= -p
+ 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
+ CFLAGS+=-I..
+ 
+ OBJS=css.o xmlparse.o cssparse.o html_style.o docbook_style.o
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
new file mode 100644
index 000000000000..0dca195bd2eb
--- /dev/null
+++ b/app-editors/qemacs/files/qemacs-0.3.1-manpage-ref-fix.patch
@@ -0,0 +1,15 @@
+--- 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.3.1-qemacs-datadir.patch b/app-editors/qemacs/files/qemacs-0.3.1-qemacs-datadir.patch
new file mode 100644
index 000000000000..437389204808
--- /dev/null
+++ b/app-editors/qemacs/files/qemacs-0.3.1-qemacs-datadir.patch
@@ -0,0 +1,76 @@
+--- qemacs-0.3.1/qe-doc.html	2005-02-21 12:10:35.000000000 +0000
++++ qemacs-0.3.1/qe-doc.html	2005-02-21 12:10:35.000000000 +0000
+@@ -382,7 +382,7 @@ C-x C-d                 : dired
+ 
+ <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>
+ 
+ 
+ 
+@@ -390,7 +390,7 @@ All resources and configuration files ar
+ <H2><A NAME="SEC16" HREF="qe-doc.html#TOC16">4.2 Configuration file</A></H2>
+ 
+ <P>
+-QEmacs tries to load a configuration file in <TT>`~/.qe/config'</TT>. Each
++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 '_'). 
+ 
+--- qemacs-0.3.1/qe.c	2005-02-21 12:10:35.000000000 +0000
++++ qemacs-0.3.1/qe.c	2005-02-21 12:10:35.000000000 +0000
+@@ -6250,13 +6250,13 @@ void qe_init(void *opaque)
+ 
+     /* compute resources path */
+     strcpy(qe_state.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");
+     home_path = getenv("HOME");
+     if (home_path) {
+         pstrcat(qe_state.res_path, sizeof(qe_state.res_path), ":");
+         pstrcat(qe_state.res_path, sizeof(qe_state.res_path), home_path);
+-        pstrcat(qe_state.res_path, sizeof(qe_state.res_path), "/.qe");
++        pstrcat(qe_state.res_path, sizeof(qe_state.res_path), "/.qemacs");
+     }
+     qe_state.macro_key_index = -1; /* no macro executing */
+     qe_state.ungot_key = -1; /* no unget key */
+--- qemacs-0.3.1/config.eg	2005-02-21 12:10:35.000000000 +0000
++++ qemacs-0.3.1/config.eg	2005-02-21 12:10:35.000000000 +0000
+@@ -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.
+ //
+--- qemacs-0.3.1/Makefile	2005-02-21 12:10:35.000000000 +0000
++++ qemacs-0.3.1/Makefile	2005-02-21 12:10:35.000000000 +0000
+@@ -189,7 +189,7 @@ ifdef CONFIG_FFMPEG
+ 	ln -sf qemacs $(DESTDIR)$(prefix)/bin/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
+ 	install -m 755 -s html2png $(DESTDIR)$(prefix)/bin
+--- qemacs-0.3.1/plugin-example/Makefile	2005-02-21 12:11:08.000000000 +0000
++++ qemacs-0.3.1/plugin-example/Makefile	2005-02-21 12:11:08.000000000 +0000
+@@ -14,11 +14,11 @@ OBJS=my_plugin.o
+ 
+ INCLUDES=-I$(QEMACS_PATH)
+ DEFINES=-DQE_MODULE
+-DIST_LIB:=$(HOME)/.qe/$(LIB)
++DIST_LIB:=$(HOME)/.qemacs/$(LIB)
+ CC=gcc
+ CFLAGS=-O2 -Wall -g -fPIC $(INCLUDES) $(DEFINES)
+ 
+-# by default, the plugin is copied in ~/.qe/ some that qemacs can load
++# by default, the plugin is copied in ~/.qemacs/ some that qemacs can load
+ # it automatically.
+ all: $(LIB)
+ 
diff --git a/app-editors/qemacs/metadata.xml b/app-editors/qemacs/metadata.xml
new file mode 100644
index 000000000000..bc306fe58224
--- /dev/null
+++ b/app-editors/qemacs/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>emacs</herd>
+</pkgmetadata>
diff --git a/app-editors/qemacs/qemacs-0.3.1-r2.ebuild b/app-editors/qemacs/qemacs-0.3.1-r2.ebuild
new file mode 100644
index 000000000000..2051c7047682
--- /dev/null
+++ b/app-editors/qemacs/qemacs-0.3.1-r2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/qemacs/qemacs-0.3.1-r2.ebuild,v 1.1 2005/04/23 07:50:20 usata Exp $
+
+inherit eutils
+
+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.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE="X png unicode xv"
+
+DEPEND="X? ( virtual/x11 )
+	png? ( =media-libs/libpng-1.2* )"
+
+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}/${P}-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}-configure-gentoo.patch
+	epatch ${FILESDIR}/${P}-make_backup.patch
+	useq unicode && epatch ${FILESDIR}/${P}-tty_utf8.patch
+	epatch ${FILESDIR}/${P}-gcc-3.4.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() {
+	econf $(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."
+}