now that app-editors/qe is gone we can live with a simple block and clean up patches

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 128 insertions, 5 deletions

diff --git a/app-editors/qemacs/ChangeLog b/app-editors/qemacs/ChangeLog
index 58b706338b69..a9690fee1cc1 100644
--- a/app-editors/qemacs/ChangeLog
+++ b/app-editors/qemacs/ChangeLog
@@ -1,6 +1,14 @@
 # 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.43 2009/06/08 18:41:06 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/qemacs/ChangeLog,v 1.44 2009/08/19 22:17:52 fauli Exp $
+
+*qemacs-0.4.0_pre20080605-r1 (19 Aug 2009)
+
+  19 Aug 2009; Christian Faulhammer <fauli@gentoo.org>
+  +qemacs-0.4.0_pre20080605-r1.ebuild,
+  +files/qemacs-0.4.0_pre20080605-Makefile.patch:
+  now that app-editors/qe is gone we can live with a simple block and clean
+  up patches
 
   08 Jun 2009; Christian Faulhammer <fauli@gentoo.org>
   -qemacs-0.3.2_pre20070226.ebuild,
diff --git a/app-editors/qemacs/Manifest b/app-editors/qemacs/Manifest
index e4bbb0208ae2..985b7036c2f1 100644
--- a/app-editors/qemacs/Manifest
+++ b/app-editors/qemacs/Manifest
@@ -4,16 +4,18 @@ 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.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-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
+EBUILD qemacs-0.4.0_pre20080605-r1.ebuild 2242 RMD160 ce4510defd5f98e27bf83fe7a1b21a58a9dd7d08 SHA1 3d5304ecc7b84a72df98f2eeedbf304b77e01b3c SHA256 6bb79dc66670fd988818d87b0286df4aa373bb7d2f455eebbbcdab9a9f345814
 EBUILD qemacs-0.4.0_pre20080605.ebuild 2747 RMD160 80ab0ac9f5d809128cd53f01ffbe1fa64b5f1149 SHA1 bb07f4a48edd0d83c73fbe2bb019e640cbc0cd8c SHA256 545c70f88e95150753cf42e9f6c263c258840fe4a966a5968eb1da3382ded6cd
-MISC ChangeLog 7541 RMD160 1ae4cfcf08d1788db31d262eac8fe0b4130d44ec SHA1 98667e150329d2787296d98f1005e001af37b185 SHA256 96e614141da65da4c4ae538053475d1d714089e258dcb6bc7c2128dfc19aed76
+MISC ChangeLog 7819 RMD160 5d02e5a7c6975a983f96c71146c36845b53ff791 SHA1 9c5ec8eef2b8f2c97e5f94494e39d3dcbf74d643 SHA256 20255cc996d1a2070efb0fdaec5c606445722b696f3ce2d342f8fcf994980b03
 MISC metadata.xml 1844 RMD160 57465a488dcb8f94d854bb612e1d0813e9b7f183 SHA1 89f6d34c02548f8867f5e9ec1f890a2f0492d48f SHA256 48e80523ab132a1640c376ea6ec271cafa264f5bcdea29f09c697f0ff6fe31f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkotW1EACgkQNQqtfCuFneM7zACeLIYRXkAqVtsFgq11+cE4eT17
-8PQAnjPh7s2Y/IrTL3efn8SMtt33GjBP
-=K30z
+iEYEARECAAYFAkqMeg8ACgkQNQqtfCuFnePBrgCfcxMHVD7XSVYEapZdU4yAPirF
+pfQAn2HMNp5wtrw2BrMQ/cpX5BIqv2zx
+=kJJB
 -----END PGP SIGNATURE-----
diff --git a/app-editors/qemacs/files/qemacs-0.4.0_pre20080605-Makefile.patch b/app-editors/qemacs/files/qemacs-0.4.0_pre20080605-Makefile.patch
new file mode 100644
index 000000000000..73c3f68b13a3
--- /dev/null
+++ b/app-editors/qemacs/files/qemacs-0.4.0_pre20080605-Makefile.patch
@@ -0,0 +1,35 @@
+--- 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
+ 
+ ########################################################
diff --git a/app-editors/qemacs/qemacs-0.4.0_pre20080605-r1.ebuild b/app-editors/qemacs/qemacs-0.4.0_pre20080605-r1.ebuild
new file mode 100644
index 000000000000..d152c65d4764
--- /dev/null
+++ b/app-editors/qemacs/qemacs-0.4.0_pre20080605-r1.ebuild
@@ -0,0 +1,78 @@
+# 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.1 2009/08/19 22:17:52 fauli 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"
+
+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_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
+}