Version bump. Fix man page location.

Package-Manager: portage-2.2_rc46/cvs/Linux i686

5 files changed, 100 insertions, 14 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/Manifest b/app-editors/qemacs/Manifest
index 0c9123b11d5d..d7b17eca3629 100644
--- a/app-editors/qemacs/Manifest
+++ b/app-editors/qemacs/Manifest
@@ -2,20 +2,22 @@
 Hash: SHA1
 
 AUX qemacs-0.3.1-manpage-ref-fix.patch 446 RMD160 2a2e9ab6a1db88a124a502212544e17e7678da31 SHA1 b6d919c13a4882043557502c31aca55d1baece18 SHA256 b6148e3c8e054422619d9d002c5bd883237343ce962755cdace5c3c56c9fba4a
-AUX qemacs-0.3.2_pre20070226-tty_utf8.patch 1298 RMD160 0082bc3ca8514c9ba9ce8fb591628eb940a145a6 SHA1 96a1d832c4fdaa02281a7222fe9c34cd2b565db7 SHA256 84383cf13c294c29333547b7e7d4cd18cb30303687c3d8cc6024d47a24c9e6aa
+AUX qemacs-0.3.2_pre20070226-tty_utf8.patch 1128 RMD160 7cce385e2c8390f3a331aa9231ca05b690615a97 SHA1 f5042b69b6345fd8e578f84d910ea251ddf8b012 SHA256 a310aad2df48c18202b57834dd18095f7d2ea0366e15108d0ea525deaa29c8a4
 AUX qemacs-0.4.0_pre20080605-Makefile-gentoo.patch 1636 RMD160 c490ca98ad3c810adb9950cb589a4a0210147a01 SHA1 a174a5ce65e99c39d11adb5cfcd2d0d7c599566c SHA256 80077f8e49f6840403bfdea8570d4d3fdb03dc145ad7e2059241aaa255d1f076
 AUX qemacs-0.4.0_pre20080605-Makefile.patch 754 RMD160 8285c6f2e4afc8e02b37f21bcd0f0fc71bee51fc SHA1 49bf92d015535f7d37e79fab59b314e7ce4cd149 SHA256 66030e45fa8f782a98174de9828f411e6fb65a48e7f7dd288bd3228916c7f535
-AUX qemacs-0.4.0_pre20080605-make_backup.patch 1973 RMD160 7f947c0e5883197c4c07ffe301fe1c8083f8927d SHA1 bf3ff475d105902a2ff40d089e375256b905f86b SHA256 6e76081bd0ea24274260a1b1de39afc0d0f8d79c039fa4c61715130a218e5c48
+AUX qemacs-0.4.0_pre20080605-make_backup.patch 2151 RMD160 cecdb02970c424d2214cfa03d05646c57e2c12b1 SHA1 6efce3065599bbdf512290bcfeb9ebd7aaa59f5b SHA256 aec0a4566522476a7e31b90895b1b83b02c99f90c43567e52c0152132a2c925e
 AUX qemacs-0.4.0_pre20080605-qemacs-datadir.patch 3863 RMD160 b3e942477d981089f24da7c7e94f2b9961e0d8ec SHA1 71633a139d9d565213064f290d5a78963e59b869 SHA256 017ea9487ae830611ca12545c05ceed3b89b6b96fc137065cae30cf266d8e0dd
 DIST qemacs-0.4.0_pre20080605.tar.bz2 1420637 RMD160 2201311b0bcb40ae00e949e71045ac681644d4d0 SHA1 9b8ff5bb47f2330d10c0e8a2cb351d590c3a9990 SHA256 306d85e8d8cbe0e6554543267cc8fdd25612bd23289fe7cf71e12159e8730ce4
+DIST qemacs-0.4.0_pre20090420.tar.bz2 1393436 RMD160 69889f79319a44015a45a294499ddd4dbd3b2242 SHA1 68d3b78801a3687e714d91b6f8c890bd37b0ce7e SHA256 14f1ffad569f1bdaaa27d2d7ab0251ce69afc9efc347bb244b11f5e34e818ab5
 EBUILD qemacs-0.4.0_pre20080605-r1.ebuild 1910 RMD160 4601081fe14741f5100d1188b5a04ce658eb76f7 SHA1 9508e3f62934ea65af5536990bcaa314e7e6c817 SHA256 af71e5f0b2965aa5022ab9dacb39ffbf49b3df7586b86036dd63326c8b70220b
 EBUILD qemacs-0.4.0_pre20080605.ebuild 2747 RMD160 80ab0ac9f5d809128cd53f01ffbe1fa64b5f1149 SHA1 bb07f4a48edd0d83c73fbe2bb019e640cbc0cd8c SHA256 545c70f88e95150753cf42e9f6c263c258840fe4a966a5968eb1da3382ded6cd
-MISC ChangeLog 7951 RMD160 449ff03cac6c7449a2729712a828fef81e5e53ea SHA1 457418ccd2c0134865d2f7557f7dff9095a648bf SHA256 95b7048931feb6935d0cde8379147107b3cb46f3e3b7ea036c8ad391209a9779
+EBUILD qemacs-0.4.0_pre20090420.ebuild 2009 RMD160 4ce9a2b0743666c049aac831756e00f4bc3d858d SHA1 b7aa319f8c4662b5489a620a19ecc5f745dcd422 SHA256 1c12cbe98aee03a3a97f3308ea2ff464277dfbdcd03693f2382ba272dc99dfa3
+MISC ChangeLog 8191 RMD160 c65ab9bf2a1508937d570e2a3abe00b635e9eeb5 SHA1 ae34dde730a280f41c103bb3bff712228621cc35 SHA256 51d25ca71ca09d2b7b13ef62175aa4a78a8d92154f1486369e18fb207de14b5c
 MISC metadata.xml 1844 RMD160 57465a488dcb8f94d854bb612e1d0813e9b7f183 SHA1 89f6d34c02548f8867f5e9ec1f890a2f0492d48f SHA256 48e80523ab132a1640c376ea6ec271cafa264f5bcdea29f09c697f0ff6fe31f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (GNU/Linux)
 
-iEYEARECAAYFAkrY7hMACgkQOeoy/oIi7uxTAQCg3mj4T5ngsqEjTBT1mqVyWmwy
-oYQAni3uVGnhuEY6PYeZZ5333FNOMYcu
-=UBpH
+iEYEARECAAYFAkrbHiUACgkQOeoy/oIi7uxQNACfYl7lvGDFfCsU/7jNCp9DmJvw
+F9wAnjepFzQ9M3ojzmEMWOkTSkAUzzYA
+=biVp
 -----END PGP SIGNATURE-----
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
+}