Version bump. Fix man page location.

(Portage version: 2.2_rc46/cvs/Linux i686)

4 files changed, 92 insertions, 8 deletions

diff --git a/app-editors/qemacs/ChangeLog b/app-editors/qemacs/ChangeLog
index 7154d8ce994c..ff48ec2b2f6c 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.45 2009/10/16 22:05:03 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/qemacs/ChangeLog,v 1.46 2009/10/18 13:54:43 ulm Exp $
+
+*qemacs-0.4.0_pre20090420 (18 Oct 2009)
+
+  18 Oct 2009; Ulrich Mueller <ulm@gentoo.org>
+  +qemacs-0.4.0_pre20090420.ebuild:
+  Version bump. Fix man page location. Install headers in /usr/include/qe/
+  to be consistent with /usr/share/qe/.
 
   16 Oct 2009; Ulrich Mueller <ulm@gentoo.org>
   qemacs-0.4.0_pre20080605-r1.ebuild:
diff --git a/app-editors/qemacs/files/qemacs-0.3.2_pre20070226-tty_utf8.patch b/app-editors/qemacs/files/qemacs-0.3.2_pre20070226-tty_utf8.patch
index 31a890cd123b..1f51ada5c2b7 100644
--- a/app-editors/qemacs/files/qemacs-0.3.2_pre20070226-tty_utf8.patch
+++ b/app-editors/qemacs/files/qemacs-0.3.2_pre20070226-tty_utf8.patch
@@ -1,10 +1,9 @@
-Gemeinsame Unterverzeichnisse: ../qemacs/fonts und ./fonts.
-Gemeinsame Unterverzeichnisse: ../qemacs/libqhtml und ./libqhtml.
-Gemeinsame Unterverzeichnisse: ../qemacs/plugin-example und ./plugin-example.
-Gemeinsame Unterverzeichnisse: ../qemacs/tests und ./tests.
-diff -u ../qemacs/tty.c ./tty.c
---- ../qemacs/tty.c	2007-02-08 00:27:33.000000000 +0100
-+++ ./tty.c	2007-02-26 15:07:41.000000000 +0100
+utf8 input in tty.c
+http://lists.gnu.org/archive/html/qemacs-devel/2004-03/msg00000.html
+http://bugs.gentoo.org/62829
+
+--- qemacs-orig/tty.c	2007-02-08 00:27:33.000000000 +0100
++++ qemacs/tty.c	2007-02-26 15:07:41.000000000 +0100
 @@ -78,7 +78,6 @@
      /* input handling */
      enum InputState input_state;
diff --git a/app-editors/qemacs/files/qemacs-0.4.0_pre20080605-make_backup.patch b/app-editors/qemacs/files/qemacs-0.4.0_pre20080605-make_backup.patch
index 9eb5f57c4ede..cdfe4c439db8 100644
--- a/app-editors/qemacs/files/qemacs-0.4.0_pre20080605-make_backup.patch
+++ b/app-editors/qemacs/files/qemacs-0.4.0_pre20080605-make_backup.patch
@@ -1,3 +1,7 @@
+Add make-backup-files command for backup toggling, from upstream mailing list:
+http://lists.gnu.org/archive/html/qemacs-devel/2004-11/msg00007.html
+http://bugs.gentoo.org/75052
+
 --- buffer.c.orig	2009-03-07 21:14:02.000000000 +0100
 +++ buffer.c	2009-03-07 21:15:40.000000000 +0100
 @@ -1657,12 +1657,14 @@
diff --git a/app-editors/qemacs/qemacs-0.4.0_pre20090420.ebuild b/app-editors/qemacs/qemacs-0.4.0_pre20090420.ebuild
new file mode 100644
index 000000000000..1767343bb1db
--- /dev/null
+++ b/app-editors/qemacs/qemacs-0.4.0_pre20090420.ebuild
@@ -0,0 +1,74 @@
+# 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_pre20090420.ebuild,v 1.1 2009/10/18 13:54:43 ulm Exp $
+
+EAPI=2
+
+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"
+
+RDEPEND="!app-editors/qe
+	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"
+
+	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 || die
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc Changelog README TODO config.eg || die
+	dohtml *.html || die
+
+	# 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 || die
+	cd libqhtml
+	insinto /usr/include/qe/libqhtml
+	doins css.h cssid.h htmlent.h || die
+}