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

Other minor fixups.

Package-Manager: portage-2.1.10.57/cvs/Linux x86_64

3 files changed, 98 insertions, 16 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/Manifest b/app-editors/qemacs/Manifest
index 38368c7d550a..6c0da92f3bc4 100644
--- a/app-editors/qemacs/Manifest
+++ b/app-editors/qemacs/Manifest
@@ -6,24 +6,24 @@ AUX qemacs-0.4.0_pre20080605-Makefile.patch 754 RMD160 8285c6f2e4afc8e02b37f21bc
 AUX qemacs-0.4.0_pre20080605-make_backup.patch 2151 RMD160 cecdb02970c424d2214cfa03d05646c57e2c12b1 SHA1 6efce3065599bbdf512290bcfeb9ebd7aaa59f5b SHA256 aec0a4566522476a7e31b90895b1b83b02c99f90c43567e52c0152132a2c925e
 AUX qemacs-0.4.0_pre20090420-nostrip.patch 1155 RMD160 f18295743800cf860af7691d316c1c5320a38604 SHA1 1ae8fcf9193a1848957aefeccd70fce77f4a1f83 SHA256 d16ac3848ef14e186f21812ca6ba926c0eb6848676a6dc8f2af8de713025555f
 DIST qemacs-0.4.0_pre20090420.tar.bz2 1393436 RMD160 69889f79319a44015a45a294499ddd4dbd3b2242 SHA1 68d3b78801a3687e714d91b6f8c890bd37b0ce7e SHA256 14f1ffad569f1bdaaa27d2d7ab0251ce69afc9efc347bb244b11f5e34e818ab5
-EBUILD qemacs-0.4.0_pre20090420-r1.ebuild 2021 RMD160 5f8e12671d1037ba34e46a917bd1ba3f8048b7bc SHA1 3e45036cdc7a0110b886b8db89e19d5e231eae16 SHA256 12e40778ad2d39cc8ae65d15330af0981397454f9148180200e677cba1957865
+EBUILD qemacs-0.4.0_pre20090420-r1.ebuild 2023 RMD160 2ff20c2df82c99b49cb66782155e94581b2ca673 SHA1 a9564e1357b33ee9b4786a6df16116cf9a0377b5 SHA256 5419da351d4d401e8eaf6cc5bc2a21b42f3b2af7f534e9b2f8ed6aef0098e1f4
 EBUILD qemacs-0.4.0_pre20090420.ebuild 2018 RMD160 dfa7207e877b949d56e6915e7ae5400b3748676e SHA1 9c8df2eecc3951fc989505d64def1c4e51bffa74 SHA256 7704762febdd6faa627ab8c10a2032850531253c8975704c95b99810d8036255
-MISC ChangeLog 9471 RMD160 b823b583936d2717d31e3b07219d2112e61dbf40 SHA1 d0897a1db3e4c9423ff927757a1f7cb7395de80c SHA256 265f9972be8d14578e7901a9e5aa7f5c03140923cbe49a0415dec428abd27798
+MISC ChangeLog 9657 RMD160 e7fedee1e1576d5be708f2a21058b4b35dc3e8ef SHA1 e9d693142e73262c153732752e27af2d5d64a7a5 SHA256 0ce73bca5d45bdcefc76a38d91667e9c26eb2a6724fc0e47e7ad7adce6f52dde
 MISC metadata.xml 1844 RMD160 57465a488dcb8f94d854bb612e1d0813e9b7f183 SHA1 89f6d34c02548f8867f5e9ec1f890a2f0492d48f SHA256 48e80523ab132a1640c376ea6ec271cafa264f5bcdea29f09c697f0ff6fe31f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPpuqqAAoJEDxpGckxwJCBW4kQAIbzL6fK8m59lV6x745+k12f
-/t6LjWYexFtoeqxnQnTyAx43WfgjzUBQ0zI/Je4VH5FtSAgts/Yt34oB06I51nEu
-GC3+HLltCTEqTSAcSghaYLNcb2f6+wTy1pLB/gJIA55jk0+QdjXmQDGJkfclGtYg
-aPYYf1anEBxc1MwQ13Zbp0TDxinnHUlBaC7SbSPIF2knV/V9iQEv5ywhjuynlTQl
-6TrHZOQZF7OtR1QuCJXjYvY7kfY0xszMAH4kw/oCmLXyWJqC0oXfVPXBzw8SnQRd
-MFzgDTJz/knl4HPcwQ6d8bYpjnG2/0Dt15pa5+3ZR8DKHKI8dAso7RPMUqp3wAiA
-suL0r+oAeLPUlJFJP4o+tR6F+IyUmKdGgZSmcTtsgeME+CqMRR2YFbXQ30b5YTnb
-SRxZDSxAHLzArGWTj119jPSlPLoZRsSMbs/zZTmOX6NCmGAHDsFG/+99YIkI/XH8
-OIQNzBTZ1cmcfmoj/iiRFX6swtkN43Kk9k38Fm9V2NUfw+djSiuwonFjRiQ/2fol
-A9LvCm4AiWymVpRPVBOmT9OyGXTyx6IO/AbI9esHpwZRXxnaNHAzTF00yuJRNfAp
-d62Lxc2AATpnj5kxM6+y02e7Fx4FmZinqjbArxer8B5zbjfykm4Pi1QrV19zi7+v
-wiDxVrjW5PinXluKKI3T
-=smZk
+iQIcBAEBAgAGBQJPpvkmAAoJEDxpGckxwJCBLK0QAIO/qrqacWLGIJOT2qD7C9Ho
+YEfa4E5TPHbDvnx6wfz2D9aidZvXR/538A1ESgUcqx2yKJBnmXUoFbjr9YrJu/LX
+I2qrZSTTnddsyGTVjA0XfwSzQLKJO2z6i/LX3MjPGgshTt8CX+QgL5S6XrX6n/XU
+GxcwOeo2l1zLsz0KQXtLePeevqUNrUJf61X4ZYlOOO+PUjTE6KSwCjsuAWfQt/Q0
+zdnUNnBa36lYwVJJNaw+UimNBBTLDOwYgu5WFQKtxdabIHX1BCQKyaWzDdu8Ogh8
+oOMZQJ7PK5okH3ITqzhQYiPtSZuXeyTl8iwrJ7mZ9MiJGISYNnF+3MJIy4uAjVRg
+ypWyyxrx74zTpOLUg2BLcB0yi+BCZdKVpmyBwCbvKqax/SGyKdGQS+I8N4xqwo7H
+VvfvZGV6Zq7/grtZdoEQ9omxv+xzDK35pLdE1jaN8pZZsiNAWFyeZUrsNf+85MAo
+rJQjHJwgZoigJ6DzyhuSiISWDJf0ntgB0qhhupxSTbYiuUggbVnwCTFU7GMsJ5zI
+M9kxjqcQ/j6HsKt1arLpNu8cjjKU4FUN/JHYqLxmyfWQSLiLa7uTgTw7qIQig4nA
+gLU2AwFR0AU6P5DK3NZ4CJuvtNfzImD7eOvjGGVaLLQVn2ZUFO/K43jda+LWJT3h
+9RdjAAlla7p3zeSQv0ex
+=tZqw
 -----END PGP SIGNATURE-----
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
+}