Revert.

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

3 files changed, 19 insertions, 90 deletions

diff --git a/app-editors/qemacs/ChangeLog b/app-editors/qemacs/ChangeLog
index 363799139220..0ae69781d5f9 100644
--- a/app-editors/qemacs/ChangeLog
+++ b/app-editors/qemacs/ChangeLog
@@ -1,6 +1,10 @@
 # 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.53 2012/05/06 20:46:45 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/qemacs/ChangeLog,v 1.54 2012/05/06 21:05:47 ulm Exp $
+
+  06 May 2012; Ulrich Müller <ulm@gentoo.org>
+  -qemacs-0.4.0_pre20090420-r1.ebuild:
+  Revert.
 
   06 May 2012; Samuli Suominen <ssuominen@gentoo.org>
   qemacs-0.4.0_pre20090420.ebuild:
diff --git a/app-editors/qemacs/Manifest b/app-editors/qemacs/Manifest
index 43bc68268fdc..80c4230169e3 100644
--- a/app-editors/qemacs/Manifest
+++ b/app-editors/qemacs/Manifest
@@ -6,18 +6,23 @@ 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 2098 RMD160 02e7215287230559c02e8b3238433bcd9df90ed5 SHA1 66558f63a4839bc09922ad14a0c8eefdebd04d58 SHA256 70e3b7e0bbcff8e497485dab4cba4285eabf1eec7570b26b02f0bba0a2b9792a
 EBUILD qemacs-0.4.0_pre20090420.ebuild 2018 RMD160 dfa7207e877b949d56e6915e7ae5400b3748676e SHA1 9c8df2eecc3951fc989505d64def1c4e51bffa74 SHA256 7704762febdd6faa627ab8c10a2032850531253c8975704c95b99810d8036255
-MISC ChangeLog 9381 RMD160 ee39a1fcafd1db8b0d44084ff3f8e1df10a8565c SHA1 58ff069c3d1046b76ecbfcbbc9096295c50e1587 SHA256 b01d3a631d0bc8001d38f189738c40621a6f3da555fe8182f90a2304c6192d6d
+MISC ChangeLog 9472 RMD160 815413fe51b98bf7ab57875b50e5ae2068ea85a7 SHA1 8d03580c183889ca96187c73f1cffc4bd3f8c85e SHA256 6906d6e2d6863a69c9896af61061f2e4ee0c133dcd07cee3053d506390ebfb3d
 MISC metadata.xml 1844 RMD160 57465a488dcb8f94d854bb612e1d0813e9b7f183 SHA1 89f6d34c02548f8867f5e9ec1f890a2f0492d48f SHA256 48e80523ab132a1640c376ea6ec271cafa264f5bcdea29f09c697f0ff6fe31f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPpuKaAAoJEEdUh39IaPFN2wYH+wUaJOj8EAVA0C81qrYmHlJ3
-l1IcFTSBt8bE2M6WntHUYtHY9tiCG21lU4NyIpY16STHgm2bYt1GYrHnpUVa8pBS
-B6HP8y/kPtWTLdU+dqRq2oaphJxnMktAVj9ilLF2gjBAhJA5zPIK82T8xCigJrq4
-c/6S/fubRo7T800DXYCAG+vttvT6WFjQnOFiObH/fbbAbjQyh+g1g0Uhjmg0Ak+L
-yiVni+0MLT/mefmLv94n45WWSPj3f7X48oE+es2pvkxpW4yostCKSyw6fRN2gPPb
-SdgJ7baLumstWMZ0JWcaPj7BIpdDKxbOvYQMMB7IpFiYYePqSsJNS2TDKhzM2hc=
-=Hxtw
+iQIcBAEBAgAGBQJPpuiiAAoJEDxpGckxwJCB8lQQAJP7CfamFU8V6W/Iwzg5Ccsj
+ypN+pWguc2S6D3qfg1jUu4fn+SlRuNNthdOsyBHPlClit9uWvYs7w13OJLT4fydf
+aXvputA+pqxJnaJ722u7BtPvzNgbiY/KIekzQLH+ZOjSVVmoqTvvEFXgARVAML3P
+x56QfDkIie/L+Ql9i4uMiwVXSuDXdryeHAxMlqTpXM6LlzCN+XYLe/IJWJhQsIl7
+UKNuiUj1ugK7RlPnWHcWXEHBn9VkuHXe8MkegIPGEZTff+bAqxfF0I0rPqVvde7m
+KsuKChTl39htaHb9e+vcAFESONxew9ow/M1lZ6khkUnBBFtIx4+8iFvC6K0piUH1
++QTGo6XbSnTp3PeRGd+FuIxgWQQL3Uh1KkzCXmUVmcIkKt0oBenwuaKyJfnVFSeR
+v5DIJHEefvjiONxMSvKfPC5E0M2jQ6K0zDnnrVw2hIGIesCgI23GtIVRiJ6R6reN
+FtVyHyWR+AEAllZgQVyux6XHAsUDwuR4BEpTxb3zWjvXXTuxVZv1N5jbOJBQvE7U
+Rp17GSl0n7Ne7M1WYb5C+1fqrLH2Is5wFpIPrrGy0n+Mj+nsLjdV5bKEXLY9WFOG
+d/1wY14X7yCRO/71bZCvUHo2ifEkX9Qkgu7pnVXlXNSQqzmHpniFf1+qXxvgltbm
+eCHkTA7NBnzWBH9h65gJ
+=eeAD
 -----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
deleted file mode 100644
index 33cc78d2a2c7..000000000000
--- a/app-editors/qemacs/qemacs-0.4.0_pre20090420-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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.4 2012/05/04 11:08:20 ssuominen 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="png unicode X xv"
-
-RDEPEND="png? ( media-libs/libpng:0 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-		xv? ( x11-libs/libXv )
-		)"
-DEPEND="${RDEPEND}
-	>=app-text/texi2html-5"
-
-S=${WORKDIR}/${PN}
-
-RESTRICT="test"
-
-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
-	# 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/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)" \
-		$(use_enable X x11) \
-		$(use_enable png) \
-		$(use_enable xv)
-}
-
-src_compile() {
-	# Does not support parallel building.
-	emake -j1
-}
-
-src_install() {
-	default
-
-	dohtml *.html
-
-	# Fix man page location
-	mv -vf "${ED}"/usr/{,share/}man || die
-
-	# Install headers so users can build their own plugins.
-	insinto /usr/include/qe
-	doins {cfb,config,cutils,display,fbfrender,libfbf,qe,qeconfig,qestyles,qfribidi}.h
-	insinto /usr/include/qe/libqhtml
-	doins libqhtml/{css,cssid,htmlent}.h
-}