Fix compatibility with >=texi2html-5, bug 414927. Update libpng dependency.

Other minor fixups.

(Portage version: 2.1.10.57/cvs/Linux x86_64)

2 files changed, 83 insertions, 1 deletions

diff --git a/app-editors/qemacs/ChangeLog b/app-editors/qemacs/ChangeLog
index bd531f9d23d7..9408f34d88ba 100644
--- a/app-editors/qemacs/ChangeLog
+++ b/app-editors/qemacs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/qemacs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/qemacs/ChangeLog,v 1.55 2012/05/06 21:14:27 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/qemacs/ChangeLog,v 1.56 2012/05/06 22:16:14 ulm Exp $
+
+  06 May 2012; Ulrich Müller <ulm@gentoo.org>
+  qemacs-0.4.0_pre20090420-r1.ebuild:
+  Fix compatibility with >=texi2html-5, bug 414927. Update libpng dependency.
+  Other minor fixups.
 
   06 May 2012; Ulrich Müller <ulm@gentoo.org>
   qemacs-0.4.0_pre20090420-r1.ebuild:
diff --git a/app-editors/qemacs/qemacs-0.4.0_pre20090420-r1.ebuild b/app-editors/qemacs/qemacs-0.4.0_pre20090420-r1.ebuild
new file mode 100644
index 000000000000..927a2f488cf5
--- /dev/null
+++ b/app-editors/qemacs/qemacs-0.4.0_pre20090420-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2012 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-r1.ebuild,v 1.6 2012/05/06 22:16:14 ulm Exp $
+
+EAPI=4
+
+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="test"
+
+RDEPEND="
+	X? ( x11-libs/libX11
+		x11-libs/libXext
+		xv? ( x11-libs/libXv ) )
+	png? ( >=media-libs/libpng-1.2:0 )"
+
+DEPEND="${RDEPEND}
+	>=app-text/texi2html-5"
+
+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"
+	# Suppress stripping
+	epatch "${FILESDIR}/${P}-nostrip.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 -e "s,^/usr/share/doc/qemacs,&-${PVR}," qe.1 || die
+
+	# Fix compability with >=app-text/texi2html-5
+	sed -i -e "/texi2html/s,-number,&-sections," Makefile || 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
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+	dodoc Changelog README TODO config.eg
+	dohtml *.html
+
+	# Fix man page location
+	mv "${D}"/usr/{,share/}man || die
+
+	# Install headers so users can build their own plugins.
+	insinto /usr/include/qe
+	doins *.h
+	insinto /usr/include/qe/libqhtml
+	doins libqhtml/*.h
+}