Fix compability with app-text/texi2html >= 5 by vadmeste (from Freenode)

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

3 files changed, 45 insertions, 30 deletions

diff --git a/app-editors/qemacs/ChangeLog b/app-editors/qemacs/ChangeLog
index 2435bb23e8d2..a02f825f5277 100644
--- a/app-editors/qemacs/ChangeLog
+++ b/app-editors/qemacs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/qemacs
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/qemacs/ChangeLog,v 1.51 2011/08/14 08:50:59 ulm Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/qemacs/ChangeLog,v 1.52 2012/05/04 10:59:35 ssuominen Exp $
+
+  04 May 2012; Samuli Suominen <ssuominen@gentoo.org>
+  qemacs-0.4.0_pre20090420-r1.ebuild:
+  Fix compability with app-text/texi2html >= 5 by vadmeste (from Freenode)
 
 *qemacs-0.4.0_pre20090420-r1 (14 Aug 2011)
 
diff --git a/app-editors/qemacs/Manifest b/app-editors/qemacs/Manifest
index ef006604c931..6120abc049e7 100644
--- a/app-editors/qemacs/Manifest
+++ b/app-editors/qemacs/Manifest
@@ -6,14 +6,18 @@ 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 2015 RMD160 cb9414ad78385bb1ce0b9b64bcb38ea996dfce36 SHA1 4edec46b42b47d012e7e8b3885c6255035460fb1 SHA256 571e18a6b0042ca1d8bf625a3cc1d103bd3905d0dafd47fcab81ef28a4c1a1fa
+EBUILD qemacs-0.4.0_pre20090420-r1.ebuild 2136 RMD160 2b65e52e93f592e657bc4f7d33278b2df4f21a4c SHA1 2c8a857841898a8a432e60e10e53338bed22f787 SHA256 dc4457354f75d08d755844b53e32be67a3166d16ac49cf0cf895e80bbfb8d10e
 EBUILD qemacs-0.4.0_pre20090420.ebuild 2014 RMD160 cdbdcf2212db3fd4032c6e7563e6229bb933b730 SHA1 0b6f9f1850693d464dfb33bab0252ff4ef64b97a SHA256 43d4c6b551a14d74b780967eab178bbfacc245e9ee47196adb4028e991432652
-MISC ChangeLog 9053 RMD160 4c7fe90133a3d11a9fcb2f79d50c16b86e778146 SHA1 87eee02b365c1760a917491741d94f9da81421fd SHA256 99489bc1a79f2c1657baa4cbebad03fc4275faceeae9d7a2cdc641ab70260418
+MISC ChangeLog 9227 RMD160 d91d53e4f4b178676ae3fdcd9634c671aeed4f6e SHA1 94034f9d5e6034db8a990f986a44d472545375eb SHA256 919cc84a94517dc86b2ae21451c7fd33e9cc98e4bd42b1573d5bf5fe473adda0
 MISC metadata.xml 1844 RMD160 57465a488dcb8f94d854bb612e1d0813e9b7f183 SHA1 89f6d34c02548f8867f5e9ec1f890a2f0492d48f SHA256 48e80523ab132a1640c376ea6ec271cafa264f5bcdea29f09c697f0ff6fe31f8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk5HjcQACgkQOeoy/oIi7uyc6gCgsmTOn/lQ1uYlSiM4ye7dRbCC
-zKgAoNPApBamurVbPP8+crGO2qdeftBB
-=dxNM
+iQEcBAEBAgAGBQJPo7YJAAoJEEdUh39IaPFNuvkH+gMSNo8QRfflmh01eC5L7see
+hIwVSFRXpTKtaMWeRtnDi+gAwXUW8f/BKiftjpTPN8Gq7H2NiWmLC3QreH7FmmR0
+ckJXow5LJC6KfGu5stOdPo0CRoKQqCrL0U3xMklYX0bCZZ6HusYK6NpuBGJIsYrR
+6ytWfK6ezVGXJnz2vGc4knYfL5PqIpkhvk02zijKUUo98cVIsOSJy5/ntbHZ6GQt
+ri2MQjf34LHLBphaW+9S/vNvbrCk0oWiQyaQ8HP4S07o/qGBqJ+jN3IgVmZ9/8nm
+kl6Rgitdm793egkn9mJa7F4jb2Lf+xomPR3rz2UGwIsrtHjrmYfDcCZuH6TG8RA=
+=hmRb
 -----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
index 7614446850a8..b28159fe6bf3 100644
--- a/app-editors/qemacs/qemacs-0.4.0_pre20090420-r1.ebuild
+++ b/app-editors/qemacs/qemacs-0.4.0_pre20090420-r1.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.1 2011/08/14 08:50:59 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/qemacs/qemacs-0.4.0_pre20090420-r1.ebuild,v 1.2 2012/05/04 10:59:35 ssuominen Exp $
 
 EAPI=4
-
 inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="QEmacs is a very small but powerful UNIX editor"
@@ -14,40 +13,47 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="X png unicode xv"
+
 RESTRICT="test"
 
-RDEPEND="
-	X? ( x11-libs/libX11
+RDEPEND="png? ( media-libs/libpng:0 )
+	X? (
+		x11-libs/libX11
 		x11-libs/libXext
-		xv? ( x11-libs/libXv ) )
-	png? ( >=media-libs/libpng-1.2 )"
-
+		xv? ( x11-libs/libXv )
+		)"
 DEPEND="${RDEPEND}
-	app-text/texi2html"
+	>=app-text/texi2html-5"
+
+S=${WORKDIR}/${PN}
 
-S="${WORKDIR}/${PN}"
+DOCS="Changelog config.eg README TODO"
 
 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"
+	epatch "${FILESDIR}"/${PN}-0.4.0_pre20080605-Makefile.patch
 	# Make backup files optional
-	epatch "${FILESDIR}/${PN}-0.4.0_pre20080605-make_backup.patch"
+	epatch "${FILESDIR}"/${PN}-0.4.0_pre20080605-make_backup.patch
 	# Suppress stripping
-	epatch "${FILESDIR}/${P}-nostrip.patch"
+	epatch "${FILESDIR}"/${P}-nostrip.patch
 
-	use unicode && epatch "${FILESDIR}/${PN}-0.3.2_pre20070226-tty_utf8.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
+	sed -i -e "s,^/usr/share/doc/qe,&-${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)" \
+	econf \
+		--cc="$(tc-getCC)" \
 		$(use_enable X x11) \
 		$(use_enable png) \
 		$(use_enable xv)
@@ -59,18 +65,19 @@ src_compile() {
 }
 
 src_install() {
-	emake install DESTDIR="${D}"
-	dodoc Changelog README TODO config.eg
+	default
+
 	dohtml *.html
 
 	# Fix man page location
-	mv "${D}"/usr/{,share/}man || die
+	mv -vf "${ED}"/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
-	cd libqhtml
+	doins {cfb,config,cutils,display,fbfrender,libfbf,qe,qeconfig,qestyles,qfribidi}.h
+
+	pushd libqhtml >/dev/null
 	insinto /usr/include/qe/libqhtml
 	doins css.h cssid.h htmlent.h
+	popd >/dev/null
 }