clean up

Package-Manager: portage-2.1.3.9

14 files changed, 22 insertions, 497 deletions

diff --git a/app-editors/qemacs/ChangeLog b/app-editors/qemacs/ChangeLog
index b6bc12b75f39..967abb7db286 100644
--- a/app-editors/qemacs/ChangeLog
+++ b/app-editors/qemacs/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for app-editors/qemacs
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/qemacs/ChangeLog,v 1.32 2007/09/22 15:48:21 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/qemacs/ChangeLog,v 1.33 2007/09/22 16:23:00 opfer Exp $
+
+  22 Sep 2007; Christian Faulhammer <opfer@gentoo.org>
+  -files/qemacs-0.3.1-Makefile-gentoo.patch,
+  -files/qemacs-0.3.1-configure-gentoo.patch,
+  -files/qemacs-0.3.1-gcc-3.4.patch,
+  -files/qemacs-0.3.1-gcc4_charset_c.patch,
+  -files/qemacs-0.3.1-gcc4_tty_c.patch,
+  -files/qemacs-0.3.1-gcc4_x11_c.patch,
+  -files/qemacs-0.3.1-make_backup.patch,
+  -files/qemacs-0.3.1-manpage-ref-fix.patch,
+  -files/qemacs-0.3.1-qemacs-datadir.patch,
+  -files/qemacs-0.3.1-tty_utf8.patch, -qemacs-0.3.1-r3.ebuild:
+  clean up
 
   22 Sep 2007; Christoph Mende <angelos@gentoo.org>
   qemacs-0.3.2_pre20070226.ebuild:
diff --git a/app-editors/qemacs/Manifest b/app-editors/qemacs/Manifest
index 4434140a8e65..7c7fe20a527e 100644
--- a/app-editors/qemacs/Manifest
+++ b/app-editors/qemacs/Manifest
@@ -1,50 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX qemacs-0.3.1-Makefile-gentoo.patch 2427 RMD160 4f5811fa7374a1130433e938369b4200d799967e SHA1 b56e504bfbd170c1e2254fc14c49a00ef9fe6201 SHA256 3a4a6bc4ec30fa570899b3e57b628353d24ebb8c2d00f450993563df55cc2344
-MD5 b290b7c114e0e00c88618d1f9567cef6 files/qemacs-0.3.1-Makefile-gentoo.patch 2427
-RMD160 4f5811fa7374a1130433e938369b4200d799967e files/qemacs-0.3.1-Makefile-gentoo.patch 2427
-SHA256 3a4a6bc4ec30fa570899b3e57b628353d24ebb8c2d00f450993563df55cc2344 files/qemacs-0.3.1-Makefile-gentoo.patch 2427
-AUX qemacs-0.3.1-configure-gentoo.patch 496 RMD160 db8f37ff483e306e7b63af4ce86a9ecdf2f93690 SHA1 c46f9cbfa74efdce6e9cf219073ed248a5240f8a SHA256 e51e2af7b482c3cddee9517025b35dfb20e169d27fd6430e51bc76accd4cb409
-MD5 26f2791358b330724fe8dfa7a4dba22a files/qemacs-0.3.1-configure-gentoo.patch 496
-RMD160 db8f37ff483e306e7b63af4ce86a9ecdf2f93690 files/qemacs-0.3.1-configure-gentoo.patch 496
-SHA256 e51e2af7b482c3cddee9517025b35dfb20e169d27fd6430e51bc76accd4cb409 files/qemacs-0.3.1-configure-gentoo.patch 496
-AUX qemacs-0.3.1-gcc-3.4.patch 249 RMD160 2f3106f0c0d9496efc7d4d6d93f7ea73cc93d10b SHA1 42e654d62fa83b7792dfc39b3b549a69d74e03e8 SHA256 6f441db3b01b3a47eaac773811605180c02fafc44734fea182e51036a059fbbc
-MD5 fe9962c046aca07cf1ede091345ea97a files/qemacs-0.3.1-gcc-3.4.patch 249
-RMD160 2f3106f0c0d9496efc7d4d6d93f7ea73cc93d10b files/qemacs-0.3.1-gcc-3.4.patch 249
-SHA256 6f441db3b01b3a47eaac773811605180c02fafc44734fea182e51036a059fbbc files/qemacs-0.3.1-gcc-3.4.patch 249
-AUX qemacs-0.3.1-gcc4_charset_c.patch 470 RMD160 c05261e8f10e0df1273aeef6eec132ba598ba86d SHA1 05439dffef7b5fc1d72c631b3d1e5021fed8ca7a SHA256 6c84fbf3b57f57e9ec7600bdf403b2fc58af36b35d13d514534254e535c0a037
-MD5 858ebb820e3985a18b467fece6683c34 files/qemacs-0.3.1-gcc4_charset_c.patch 470
-RMD160 c05261e8f10e0df1273aeef6eec132ba598ba86d files/qemacs-0.3.1-gcc4_charset_c.patch 470
-SHA256 6c84fbf3b57f57e9ec7600bdf403b2fc58af36b35d13d514534254e535c0a037 files/qemacs-0.3.1-gcc4_charset_c.patch 470
-AUX qemacs-0.3.1-gcc4_tty_c.patch 426 RMD160 dcaa1be926d926e0438b10d5478a82b6cf1c9d9a SHA1 bf1ea21a502861d8da4a27503c77731245b98a9a SHA256 d37ae3f389cb2b228f4fdfcd39c24e06f7a7d06b98f6282d008a0921e3e24158
-MD5 b9d7121933394ac39a2260774c962be9 files/qemacs-0.3.1-gcc4_tty_c.patch 426
-RMD160 dcaa1be926d926e0438b10d5478a82b6cf1c9d9a files/qemacs-0.3.1-gcc4_tty_c.patch 426
-SHA256 d37ae3f389cb2b228f4fdfcd39c24e06f7a7d06b98f6282d008a0921e3e24158 files/qemacs-0.3.1-gcc4_tty_c.patch 426
-AUX qemacs-0.3.1-gcc4_x11_c.patch 284 RMD160 838af2a6338b63c93b1703369ef8eec2e8ab559b SHA1 a8803d4fed034298e92d06dda8a29215d6f6ce78 SHA256 2a2b639540dc6633a07dca426eca235d04d57146ac827a958a9205aa2cc356e3
-MD5 62b6777c0a3145cdbceb7b6379039835 files/qemacs-0.3.1-gcc4_x11_c.patch 284
-RMD160 838af2a6338b63c93b1703369ef8eec2e8ab559b files/qemacs-0.3.1-gcc4_x11_c.patch 284
-SHA256 2a2b639540dc6633a07dca426eca235d04d57146ac827a958a9205aa2cc356e3 files/qemacs-0.3.1-gcc4_x11_c.patch 284
 AUX qemacs-0.3.1-libpng-1_2.patch 2127 RMD160 2d7ea36256c9da684f0c6326bde71d34ebefdbd1 SHA1 96e18d88849568cf0f23a999a18bea41f59ef6b6 SHA256 bd5a75a5985916c545b420e05bb2d613123b909a60a61cd71f0f71cb7ba655d6
 MD5 7e2d72773332e9b101002410297fe2b1 files/qemacs-0.3.1-libpng-1_2.patch 2127
 RMD160 2d7ea36256c9da684f0c6326bde71d34ebefdbd1 files/qemacs-0.3.1-libpng-1_2.patch 2127
 SHA256 bd5a75a5985916c545b420e05bb2d613123b909a60a61cd71f0f71cb7ba655d6 files/qemacs-0.3.1-libpng-1_2.patch 2127
-AUX qemacs-0.3.1-make_backup.patch 2141 RMD160 ca81c8d89b9fc103dc8b33b3a9611b28967f4ce7 SHA1 d109fce148556eb6684be56612896e02249a1e63 SHA256 6de998734feb698423c4cd1d988cb3dc61f870b25f7c9d85f36491b0415301ed
-MD5 635697c90ee6f2498f3f566a0932f2c2 files/qemacs-0.3.1-make_backup.patch 2141
-RMD160 ca81c8d89b9fc103dc8b33b3a9611b28967f4ce7 files/qemacs-0.3.1-make_backup.patch 2141
-SHA256 6de998734feb698423c4cd1d988cb3dc61f870b25f7c9d85f36491b0415301ed files/qemacs-0.3.1-make_backup.patch 2141
-AUX qemacs-0.3.1-manpage-ref-fix.patch 446 RMD160 2a2e9ab6a1db88a124a502212544e17e7678da31 SHA1 b6d919c13a4882043557502c31aca55d1baece18 SHA256 b6148e3c8e054422619d9d002c5bd883237343ce962755cdace5c3c56c9fba4a
-MD5 15367c95b748438df7b023042082b9ad files/qemacs-0.3.1-manpage-ref-fix.patch 446
-RMD160 2a2e9ab6a1db88a124a502212544e17e7678da31 files/qemacs-0.3.1-manpage-ref-fix.patch 446
-SHA256 b6148e3c8e054422619d9d002c5bd883237343ce962755cdace5c3c56c9fba4a files/qemacs-0.3.1-manpage-ref-fix.patch 446
-AUX qemacs-0.3.1-qemacs-datadir.patch 3221 RMD160 23e0fc284b1117360ad8182e57eb1eca819c938f SHA1 dc6c99c5ad5f6bb79f1bf4ea819c01fecd893874 SHA256 9f2b23b66447ac02174d3b2da2c38de6da706b14f268a03f315f3cf487b6aa91
-MD5 262fce6e28282e7f9bd39d23e37d4f4e files/qemacs-0.3.1-qemacs-datadir.patch 3221
-RMD160 23e0fc284b1117360ad8182e57eb1eca819c938f files/qemacs-0.3.1-qemacs-datadir.patch 3221
-SHA256 9f2b23b66447ac02174d3b2da2c38de6da706b14f268a03f315f3cf487b6aa91 files/qemacs-0.3.1-qemacs-datadir.patch 3221
-AUX qemacs-0.3.1-tty_utf8.patch 952 RMD160 52e1f46ce58112539d188f5c5d8f083cf1f63464 SHA1 b8b7490486b214079c5a8ef9e02ef892319f374a SHA256 e5819c89327f512b3dfee2f1899e4fa960b67d70299e5f9e5022dde4322a9517
-MD5 e7a9a6e25a384848c2b87891e7e7c973 files/qemacs-0.3.1-tty_utf8.patch 952
-RMD160 52e1f46ce58112539d188f5c5d8f083cf1f63464 files/qemacs-0.3.1-tty_utf8.patch 952
-SHA256 e5819c89327f512b3dfee2f1899e4fa960b67d70299e5f9e5022dde4322a9517 files/qemacs-0.3.1-tty_utf8.patch 952
 AUX qemacs-0.3.2_pre20070226-Makefile-gentoo.patch 1371 RMD160 84ec85b6466f175d60ce6527cd8a4e570a32bd6e SHA1 e3f900404aac4a36d2a667b9ec7e144ae9b6bd4d SHA256 de4f3b478c0437c8bb98397b69d5758196d29bb5c426cc6ca230d049860fd919
 MD5 1c78ea9b6992b7e6b2491a2c26d42fb3 files/qemacs-0.3.2_pre20070226-Makefile-gentoo.patch 1371
 RMD160 84ec85b6466f175d60ce6527cd8a4e570a32bd6e files/qemacs-0.3.2_pre20070226-Makefile-gentoo.patch 1371
@@ -61,34 +21,26 @@ AUX qemacs-0.3.2_pre20070226-tty_utf8.patch 1298 RMD160 0082bc3ca8514c9ba9ce8fb5
 MD5 0f609e0a57af7677b5d8c1af8b7f180f files/qemacs-0.3.2_pre20070226-tty_utf8.patch 1298
 RMD160 0082bc3ca8514c9ba9ce8fb591628eb940a145a6 files/qemacs-0.3.2_pre20070226-tty_utf8.patch 1298
 SHA256 84383cf13c294c29333547b7e7d4cd18cb30303687c3d8cc6024d47a24c9e6aa files/qemacs-0.3.2_pre20070226-tty_utf8.patch 1298
-DIST qemacs-0.3.1.tar.gz 809124 RMD160 05eaddf872cbf6c187a63c80ed1eb02a23a1a13d SHA1 70671e905f65c8402af6a9938a12db29c8954710 SHA256 a3db57e09729d8c83be5ff9ab028ece173d8f5f10aaf61ca41f88aecb64996c7
 DIST qemacs-0.3.2_pre20070226.tar.bz2 806174 RMD160 024982b3c62093c6377be2836ee0d5d7c12cd55b SHA1 e909fd36b1eda59f21a7d0cd63b4f0a535b0c0a1 SHA256 0611c5fee1f7c6538fa1c5b4108f1968f5f05eeb9165b84c72d4c6d7dd8556af
-EBUILD qemacs-0.3.1-r3.ebuild 3472 RMD160 7f2216cb44e0e7dea2e9216c68a9e11da651ef78 SHA1 8214420366556b66e1167065ba356bdb3de623d1 SHA256 81ff26fcc2c5ea5e00250bb318f9b11d4c1ad77c75fbd10b9587179161162b8a
-MD5 d5954214fd8c2a53aa16ba55ddb36c78 qemacs-0.3.1-r3.ebuild 3472
-RMD160 7f2216cb44e0e7dea2e9216c68a9e11da651ef78 qemacs-0.3.1-r3.ebuild 3472
-SHA256 81ff26fcc2c5ea5e00250bb318f9b11d4c1ad77c75fbd10b9587179161162b8a qemacs-0.3.1-r3.ebuild 3472
 EBUILD qemacs-0.3.2_pre20070226.ebuild 3122 RMD160 01f1caef50e5de35edbd97e4e133ce2b7b313317 SHA1 88b1a93fa2d4b053c39dc3568a8158aad6d879e8 SHA256 2e88ded189abe47edb1092a9d5b18a0b25154cea673c6fb5cb84c1567b439a63
 MD5 a222e52d2d9626f59a5598349913cf43 qemacs-0.3.2_pre20070226.ebuild 3122
 RMD160 01f1caef50e5de35edbd97e4e133ce2b7b313317 qemacs-0.3.2_pre20070226.ebuild 3122
 SHA256 2e88ded189abe47edb1092a9d5b18a0b25154cea673c6fb5cb84c1567b439a63 qemacs-0.3.2_pre20070226.ebuild 3122
-MISC ChangeLog 5277 RMD160 6f8b6211b09a014c95799c8f3b0c92da73bcb811 SHA1 d7365f282275c211f12edd533c521eebf71f22a5 SHA256 980efbba4a677a79455c607c8b702bcbcc798d8bc2ec01695a4ba889bf57934b
-MD5 2dd9ff47e2164f54a8bf26bf9063823b ChangeLog 5277
-RMD160 6f8b6211b09a014c95799c8f3b0c92da73bcb811 ChangeLog 5277
-SHA256 980efbba4a677a79455c607c8b702bcbcc798d8bc2ec01695a4ba889bf57934b ChangeLog 5277
+MISC ChangeLog 5787 RMD160 5ab37575bf3f585f79bf33bd1334da639e866759 SHA1 1a122ae748ff0339a298c9898bccad0a3dac6cad SHA256 708132d6755f7969521ba99bf5b95688ef9f9d84387614af10c1e0112f7121c3
+MD5 9fe7d6551160ae551dcd5f14c1c2541e ChangeLog 5787
+RMD160 5ab37575bf3f585f79bf33bd1334da639e866759 ChangeLog 5787
+SHA256 708132d6755f7969521ba99bf5b95688ef9f9d84387614af10c1e0112f7121c3 ChangeLog 5787
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata.xml 158
-MD5 34bcf83006d626e2774e1d2f5ea52450 files/digest-qemacs-0.3.1-r3 238
-RMD160 a5537bf978079760d433788b94f476c47072cf51 files/digest-qemacs-0.3.1-r3 238
-SHA256 bdd7dbafcad5ff3037b835d5959c2397b0b649f30dad5e0797024185dc836f46 files/digest-qemacs-0.3.1-r3 238
 MD5 3f30fa4c00a2234c228d0e8c48f3a586 files/digest-qemacs-0.3.2_pre20070226 277
 RMD160 eb92b8a221a441c82d896649bdf3e80ad575364f files/digest-qemacs-0.3.2_pre20070226 277
 SHA256 7c91ed001b105cabc8416de6093e0c03758b7e0b9fc3c601a22ddd7927162475 files/digest-qemacs-0.3.2_pre20070226 277
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFG9TlLKhnDs22gwa8RAljKAJ43CqlpogD7PnwO06aQ6P9VSRMTvwCg4S+y
-vGcW+PY2Wy7MwhQlXnQMPNI=
-=CjQH
+iD8DBQFG9UFpNQqtfCuFneMRAkGtAKCCE4SBpYFmAcdSImu5iZYD772O5QCePUxA
+db55TvBGYaZFDECAlIDblHM=
+=4AL9
 -----END PGP SIGNATURE-----
diff --git a/app-editors/qemacs/files/digest-qemacs-0.3.1-r3 b/app-editors/qemacs/files/digest-qemacs-0.3.1-r3
deleted file mode 100644
index 52039e47f4ea..000000000000
--- a/app-editors/qemacs/files/digest-qemacs-0.3.1-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 74d85dee9861d494bf1f9c53bbc85298 qemacs-0.3.1.tar.gz 809124
-RMD160 05eaddf872cbf6c187a63c80ed1eb02a23a1a13d qemacs-0.3.1.tar.gz 809124
-SHA256 a3db57e09729d8c83be5ff9ab028ece173d8f5f10aaf61ca41f88aecb64996c7 qemacs-0.3.1.tar.gz 809124
diff --git a/app-editors/qemacs/files/qemacs-0.3.1-Makefile-gentoo.patch b/app-editors/qemacs/files/qemacs-0.3.1-Makefile-gentoo.patch
deleted file mode 100644
index c2cbd7355587..000000000000
--- a/app-editors/qemacs/files/qemacs-0.3.1-Makefile-gentoo.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- qemacs-0.3.1/Makefile	2005-02-21 10:04:00.000000000 +0000
-+++ qemacs-0.3.1/Makefile	2005-02-21 10:04:00.000000000 +0000
-@@ -29,14 +29,6 @@ ifdef TARGET_GPROF
- CFLAGS+= -p
- LDFLAGS+= -p
- endif
--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
- 
- ########################################################
-@@ -190,15 +182,17 @@ distclean: clean
- 	rm -f config.h config.mak
- 
- install: qe qe.1 kmaps ligatures html2png
--	install -m 755 qe $(prefix)/bin/qemacs
--	ln -sf qemacs $(prefix)/bin/qe
-+	mkdir -p $(DESTDIR)$(prefix)/bin
-+	install -m 755 qe $(DESTDIR)$(prefix)/bin/qemacs
-+	install -m 755 libqhtml/csstoqe $(DESTDIR)$(prefix)/bin/csstoqe
- ifdef CONFIG_FFMPEG
--	ln -sf qemacs $(prefix)/bin/ffplay
-+	ln -sf qemacs $(DESTDIR)$(prefix)/bin/qemacs-ffplay
- endif
--	mkdir -p $(prefix)/share/qe
--	install kmaps ligatures $(prefix)/share/qe
--	install qe.1 $(prefix)/man/man1
--	install -m 755 -s html2png $(prefix)/bin
-+	mkdir -p $(DESTDIR)$(prefix)/share/qemacs
-+	install -m644 kmaps ligatures $(DESTDIR)$(prefix)/share/qe
-+	mkdir -p $(DESTDIR)$(prefix)/share/man/man1
-+	install -m644 qe.1 $(DESTDIR)$(prefix)/share/man/man1/qemacs.1
-+	install -m 755 -s html2png $(DESTDIR)$(prefix)/bin
- 
- TAGS: force
- 	etags *.[ch]
---- qemacs-0.3.1/plugin-example/Makefile	2005-02-21 03:24:37.000000000 +0000
-+++ qemacs-0.3.1/plugin-example/Makefile	2005-02-21 03:24:37.000000000 +0000
-@@ -6,7 +6,7 @@
- #
- 
- # modify to get the path of the qemacs sources
--QEMACS_PATH=../
-+QEMACS_PATH=/usr/include/qemacs
- # define the name of your plugin
- LIB=my_plugin.so
- # define the object files it contains
-@@ -20,7 +20,7 @@ CFLAGS=-O2 -Wall -g -fPIC $(INCLUDES) $(
- 
- # by default, the plugin is copied in ~/.qe/ some that qemacs can load
- # it automatically.
--all: $(DIST_LIB)
-+all: $(LIB)
- 
- $(DIST_LIB): $(LIB)
- 	install -s -m 644 $< $@
---- qemacs-0.3.1/libqhtml/Makefile	2005-02-21 03:24:37.000000000 +0000
-+++ qemacs-0.3.1/libqhtml/Makefile	2005-02-21 03:24:37.000000000 +0000
-@@ -5,14 +5,6 @@ ifdef TARGET_GPROF
- CFLAGS+= -p
- LDFLAGS+= -p
- endif
--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
- CFLAGS+=-I..
- 
- OBJS=css.o xmlparse.o cssparse.o html_style.o docbook_style.o
diff --git a/app-editors/qemacs/files/qemacs-0.3.1-configure-gentoo.patch b/app-editors/qemacs/files/qemacs-0.3.1-configure-gentoo.patch
deleted file mode 100644
index c7c230941b2a..000000000000
--- a/app-editors/qemacs/files/qemacs-0.3.1-configure-gentoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur qemacs-0.3.1.orig/configure qemacs-0.3.1/configure
---- qemacs-0.3.1.orig/configure	2003-12-11 22:24:37.607928696 -0500
-+++ qemacs-0.3.1/configure	2003-12-11 22:27:07.656117904 -0500
-@@ -311,7 +311,7 @@
- head $source_path/VERSION >>config.mak
- echo "" >>config.mak
- echo -n "#define QE_VERSION \"" >> $TMPH
--head $source_path/VERSION >> $TMPH
-+echo -n `head $source_path/VERSION` >> $TMPH
- echo "\"" >> $TMPH
- if test "$network" = "yes" ; then
-   echo "#define CONFIG_NETWORK 1" >> $TMPH
diff --git a/app-editors/qemacs/files/qemacs-0.3.1-gcc-3.4.patch b/app-editors/qemacs/files/qemacs-0.3.1-gcc-3.4.patch
deleted file mode 100644
index 4506b9e3ab5a..000000000000
--- a/app-editors/qemacs/files/qemacs-0.3.1-gcc-3.4.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- unicode_join.c	2005-03-06 13:20:10.849453136 +1100
-+++ unicode_join.c.new	2005-03-06 13:20:05.472270592 +1100
-@@ -182,6 +182,7 @@
-             *q++ = l1;
-             i++;
-         found:
-+	     break;
-         }
-     }
-     return q - buf_out;
diff --git a/app-editors/qemacs/files/qemacs-0.3.1-gcc4_charset_c.patch b/app-editors/qemacs/files/qemacs-0.3.1-gcc4_charset_c.patch
deleted file mode 100644
index 5c8942bc2318..000000000000
--- a/app-editors/qemacs/files/qemacs-0.3.1-gcc4_charset_c.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# This patch has been taken from the Debian bug tracker found at
-# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=288175
-# resolving compile problems with GCC 4, see bug #141292
---- /tmp/charset.c	2006-07-25 09:30:28.000000000 +0200
-+++ charset.c	2006-07-25 09:31:18.000000000 +0200
-@@ -20,7 +20,7 @@
- 
- QECharset *first_charset = NULL;
- 
--extern QECharset charset_7bit;
-+static QECharset charset_7bit;
- 
- /* specific tables */
- static unsigned short table_idem[256];
diff --git a/app-editors/qemacs/files/qemacs-0.3.1-gcc4_tty_c.patch b/app-editors/qemacs/files/qemacs-0.3.1-gcc4_tty_c.patch
deleted file mode 100644
index f7fe13f7d1bb..000000000000
--- a/app-editors/qemacs/files/qemacs-0.3.1-gcc4_tty_c.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# This patch has been taken from the Debian bug tracker found at
-# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=288175
-# resolving compile problems with GCC 4, see bug #141292
---- /tmp/tty.c	2006-07-25 09:26:08.000000000 +0200
-+++ tty.c	2006-07-25 09:26:28.000000000 +0200
-@@ -69,7 +69,7 @@
-     return 1;
- }
- 
--extern QEDisplay tty_dpy;
-+static QEDisplay tty_dpy;
- 
- static int term_init(QEditScreen *s, int w, int h)
- {
diff --git a/app-editors/qemacs/files/qemacs-0.3.1-gcc4_x11_c.patch b/app-editors/qemacs/files/qemacs-0.3.1-gcc4_x11_c.patch
deleted file mode 100644
index 9dc8b011c306..000000000000
--- a/app-editors/qemacs/files/qemacs-0.3.1-gcc4_x11_c.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /tmp/x11.c	2006-07-25 09:30:34.000000000 +0200
-+++ x11.c	2006-07-25 09:31:13.000000000 +0200
-@@ -76,7 +76,7 @@
- static CSSRect update_rects[UPDATE_MAX_REGIONS];
- #endif
- 
--extern QEDisplay x11_dpy;
-+static QEDisplay x11_dpy;
- static int visual_depth;
- 
- static int force_tty = 0;
diff --git a/app-editors/qemacs/files/qemacs-0.3.1-make_backup.patch b/app-editors/qemacs/files/qemacs-0.3.1-make_backup.patch
deleted file mode 100644
index c8839bff58a2..000000000000
--- a/app-editors/qemacs/files/qemacs-0.3.1-make_backup.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -ruN qemacs-0.3.1/buffer.c qemacs-0.3.1-aon1/buffer.c
---- qemacs-0.3.1/buffer.c 2003-04-22 01:01:42.000000000 +0300
-+++ qemacs-0.3.1-aon1/buffer.c 2004-11-12 18:53:18.510488192 +0200
-@@ -1437,11 +1437,12 @@
-     if (stat(filename, &st) == 0)
-         mode = st.st_mode & 0777;
- 
--    /* backup old file if present */
--    strcpy(buf1, filename);
--    strcat(buf1, "~");
--    rename(filename, buf1);
--
-+    /* backup old file if present and make-backup-files is on */
-+    if(mbf == 1) {
-+ strcpy(buf1, filename);
-+ strcat(buf1, "~");
-+ rename(filename, buf1);
-+    }
-     ret = b->data_type->buffer_save(b, filename);
-     if (ret < 0)
-         return ret;
-diff -ruN qemacs-0.3.1/qe.c qemacs-0.3.1-aon1/qe.c
---- qemacs-0.3.1/qe.c 2003-04-22 01:01:42.000000000 +0300
-+++ qemacs-0.3.1-aon1/qe.c 2004-11-12 18:53:52.524317304 +0200
-@@ -61,7 +61,7 @@
- static QEditScreen global_screen;
- static int screen_width = 0;
- static int screen_height = 0;
--
-+mbf = 1;
- /* mode handling */
- 
- void qe_register_mode(ModeDef *m)
-@@ -4319,6 +4319,14 @@
-     do_refresh(qs->first_window);
- }
- 
-+static void make_backup_files(EditState *s) {
-+     if(mbf == 1) {
-+  mbf = 0;
-+     } else {
-+  mbf = 1;
-+     }
-+}
-+
- /* compute default path for find/save buffer */
- static void get_default_path(EditState *s, char *buf, int buf_size)
- {
-diff -ruN qemacs-0.3.1/qe.h qemacs-0.3.1-aon1/qe.h
---- qemacs-0.3.1/qe.h 2003-04-22 01:01:42.000000000 +0300
-+++ qemacs-0.3.1-aon1/qe.h 2004-11-12 18:53:18.516487280 +0200
-@@ -1140,3 +1140,5 @@
- int qe_bitmap_format_to_pix_fmt(int format);
- 
- #endif
-+
-+int mbf;
-diff -ruN qemacs-0.3.1/qeconfig.h qemacs-0.3.1-aon1/qeconfig.h
---- qemacs-0.3.1/qeconfig.h 2003-04-22 01:01:42.000000000 +0300
-+++ qemacs-0.3.1-aon1/qeconfig.h 2004-11-12 18:53:18.516487280 +0200
-@@ -68,5 +68,7 @@
-     CMD1( KEY_CTRLX(KEY_CTRL('u')), KEY_NONE, "upcase-region", 
-           do_changecase_region, 1)
- 
-+    CMD0( KEY_NONE, KEY_NONE, "make-backup-files", make_backup_files)
-+
-     /* keyboard macros */
-     CMD0( KEY_CTRLX('('), KEY_NONE, "start-kbd-macro", do_start_macro)
-     CMD0( KEY_CTRLX(')'), KEY_NONE, "end-kbd-macro", do_end_macro)
diff --git a/app-editors/qemacs/files/qemacs-0.3.1-manpage-ref-fix.patch b/app-editors/qemacs/files/qemacs-0.3.1-manpage-ref-fix.patch
deleted file mode 100644
index 0dca195bd2eb..000000000000
--- a/app-editors/qemacs/files/qemacs-0.3.1-manpage-ref-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- qemacs-0.3.1/qe.1	2005-02-03 03:47:34.000000000 +0000
-+++ qemacs-0.3.1/qe.1	2005-02-03 03:47:34.000000000 +0000
-@@ -1,10 +1,10 @@
- .\"                                      Hey, EMACS: -*- nroff -*-
--.TH QE 1 "October 21, 2001"
-+.TH QEMACS 1 "October 21, 2001"
- .\" Please adjust this date whenever revising the manpage.
- .SH NAME
- QEmacs \- tiny full-screen editor
- .SH SYNOPSIS
--.B qe
-+.B qemacs
- .RB [options]
- .RI file...
- .SH DESCRIPTION
diff --git a/app-editors/qemacs/files/qemacs-0.3.1-qemacs-datadir.patch b/app-editors/qemacs/files/qemacs-0.3.1-qemacs-datadir.patch
deleted file mode 100644
index 437389204808..000000000000
--- a/app-editors/qemacs/files/qemacs-0.3.1-qemacs-datadir.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- qemacs-0.3.1/qe-doc.html	2005-02-21 12:10:35.000000000 +0000
-+++ qemacs-0.3.1/qe-doc.html	2005-02-21 12:10:35.000000000 +0000
-@@ -382,7 +382,7 @@ C-x C-d                 : dired
- 
- <P>
- All resources and configuration files are looked in the following paths:
--<TT>`/usr/share/qe:/usr/local/share/qe:/usr/lib/qe:/usr/local/lib/qe:~/.qe'</TT>
-+<TT>`/usr/share/qemacs:/usr/local/share/qemacs:/usr/lib/qemacs:/usr/local/lib/qemacs:~/.qemacs'</TT>
- 
- 
- 
-@@ -390,7 +390,7 @@ All resources and configuration files ar
- <H2><A NAME="SEC16" HREF="qe-doc.html#TOC16">4.2 Configuration file</A></H2>
- 
- <P>
--QEmacs tries to load a configuration file in <TT>`~/.qe/config'</TT>. Each
-+QEmacs tries to load a configuration file in <TT>`~/.qemacs/config'</TT>. Each
- line of the configuration file is a QEmacs command with a C like syntax
- ('-' in command name can be replaced by '_'). 
- 
---- qemacs-0.3.1/qe.c	2005-02-21 12:10:35.000000000 +0000
-+++ qemacs-0.3.1/qe.c	2005-02-21 12:10:35.000000000 +0000
-@@ -6250,13 +6250,13 @@ void qe_init(void *opaque)
- 
-     /* compute resources path */
-     strcpy(qe_state.res_path, 
--           CONFIG_QE_PREFIX "/share/qe:" CONFIG_QE_PREFIX "/lib/qe:"
--           "/usr/share/qe:/usr/lib/qe");
-+           CONFIG_QE_PREFIX "/share/qemacs:" CONFIG_QE_PREFIX "/lib/qemacs:"
-+           "/usr/share/qemacs:/usr/lib/qemacs");
-     home_path = getenv("HOME");
-     if (home_path) {
-         pstrcat(qe_state.res_path, sizeof(qe_state.res_path), ":");
-         pstrcat(qe_state.res_path, sizeof(qe_state.res_path), home_path);
--        pstrcat(qe_state.res_path, sizeof(qe_state.res_path), "/.qe");
-+        pstrcat(qe_state.res_path, sizeof(qe_state.res_path), "/.qemacs");
-     }
-     qe_state.macro_key_index = -1; /* no macro executing */
-     qe_state.ungot_key = -1; /* no unget key */
---- qemacs-0.3.1/config.eg	2005-02-21 12:10:35.000000000 +0000
-+++ qemacs-0.3.1/config.eg	2005-02-21 12:10:35.000000000 +0000
-@@ -1,6 +1,6 @@
- // Sample qemacs config file 
- //
--// copy it in ~/.qe/config
-+// copy it in ~/.qemacs/config
- //
- // You can call any Qemacs command with a C like syntax.
- //
---- qemacs-0.3.1/Makefile	2005-02-21 12:10:35.000000000 +0000
-+++ qemacs-0.3.1/Makefile	2005-02-21 12:10:35.000000000 +0000
-@@ -189,7 +189,7 @@ ifdef CONFIG_FFMPEG
- 	ln -sf qemacs $(DESTDIR)$(prefix)/bin/ffplay
- endif
- 	mkdir -p $(DESTDIR)$(prefix)/share/qemacs
--	install -m644 kmaps ligatures $(DESTDIR)$(prefix)/share/qe
-+	install -m644 kmaps ligatures $(DESTDIR)$(prefix)/share/qemacs
- 	mkdir -p $(DESTDIR)$(prefix)/share/man/man1
- 	install -m644 qe.1 $(DESTDIR)$(prefix)/share/man/man1/qemacs.1
- 	install -m 755 -s html2png $(DESTDIR)$(prefix)/bin
---- qemacs-0.3.1/plugin-example/Makefile	2005-02-21 12:11:08.000000000 +0000
-+++ qemacs-0.3.1/plugin-example/Makefile	2005-02-21 12:11:08.000000000 +0000
-@@ -14,11 +14,11 @@ OBJS=my_plugin.o
- 
- INCLUDES=-I$(QEMACS_PATH)
- DEFINES=-DQE_MODULE
--DIST_LIB:=$(HOME)/.qe/$(LIB)
-+DIST_LIB:=$(HOME)/.qemacs/$(LIB)
- CC=gcc
- CFLAGS=-O2 -Wall -g -fPIC $(INCLUDES) $(DEFINES)
- 
--# by default, the plugin is copied in ~/.qe/ some that qemacs can load
-+# by default, the plugin is copied in ~/.qemacs/ some that qemacs can load
- # it automatically.
- all: $(LIB)
- 
diff --git a/app-editors/qemacs/files/qemacs-0.3.1-tty_utf8.patch b/app-editors/qemacs/files/qemacs-0.3.1-tty_utf8.patch
deleted file mode 100644
index 6ca528074975..000000000000
--- a/app-editors/qemacs/files/qemacs-0.3.1-tty_utf8.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- qemacs-0.3.1/tty.c	2003-04-22 00:01:42.000000000 +0200
-+++ qemacs-0.3.1-tty_utf8/tty.c	2004-03-14 17:38:58.000000000 +0100
-@@ -53,7 +53,6 @@
-     /* input handling */
-     enum InputState input_state;
-     int input_param;
--    int utf8_state;
-     int utf8_index;
-     unsigned char buf[10];
- } TTYState;
-@@ -211,15 +210,20 @@
- 
-     /* charset handling */
-     if (s->charset == &charset_utf8) {
--        if (ts->utf8_state == 0) {
-+
-+      /* Make sure utf8 input works correctly 20040314 <damm@opensource.se> */
-+
-+      ts->utf8_index++;
-+
-+      if (utf8_length[ts->buf[0]] == ts->utf8_index) {;
-             const char *p;
-             p = ts->buf;
-             ch = utf8_decode(&p);
--        } else {
--            ts->utf8_state = utf8_length[ts->buf[0]] - 1;
--            ts->utf8_index = 0;
--            return;
--        }
-+	    ts->utf8_index = 0;
-+      }
-+      else {
-+	return;
-+      }
-     } else {
-         ch = ts->buf[0];
-     }
diff --git a/app-editors/qemacs/qemacs-0.3.1-r3.ebuild b/app-editors/qemacs/qemacs-0.3.1-r3.ebuild
deleted file mode 100644
index a85e4ba0dccc..000000000000
--- a/app-editors/qemacs/qemacs-0.3.1-r3.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/qemacs/qemacs-0.3.1-r3.ebuild,v 1.9 2007/07/22 18:47:18 ulm Exp $
-
-inherit eutils versionator flag-o-matic
-
-DESCRIPTION="QEmacs (for Quick Emacs) is a very small but powerful UNIX editor"
-HOMEPAGE="http://fabrice.bellard.free.fr/qemacs/"
-SRC_URI="http://fabrice.bellard.free.fr/qemacs/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="X png unicode xv"
-
-DEPEND="X? ( x11-libs/libX11
-			x11-libs/libXext
-			xv? ( x11-libs/libXv ) )
-	png? ( =media-libs/libpng-1.2* )"
-
-RDEPEND="${DEPEND}"
-PROVIDE="virtual/editor"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# Add a patch to install to DESTDIR, make directories during install
-	# and install the binary/man page using the qemacs name to avoid clash
-	# with app-editors/qe.
-	# Also removes forced march setting and align-functions on x86, as
-	# they would override user's CFLAGS..
-	epatch "${FILESDIR}/${P}-Makefile-gentoo.patch"
-	# Change the references to the qe binary to reflect the installed name
-	# qemacs.
-	epatch "${FILESDIR}/${P}-manpage-ref-fix.patch"
-	# Set the datadir to qemacs, upstream installs in to qe which conflicts
-	# with files installed in app-editors/qe.  Currently no breakage
-	# occurs, but it makes sense to change before that happens.
-	epatch "${FILESDIR}/${P}-qemacs-datadir.patch"
-	epatch "${FILESDIR}/${P}-configure-gentoo.patch"
-	epatch "${FILESDIR}/${P}-make_backup.patch"
-	useq unicode && epatch "${FILESDIR}/${P}-tty_utf8.patch"
-	epatch "${FILESDIR}/${P}-gcc-3.4.patch"
-	# Patches to avoid compilation errors with GCC 4, see bug #141292
-	epatch "${FILESDIR}/${P}-gcc4_tty_c.patch"
-	epatch "${FILESDIR}/${P}-gcc4_x11_c.patch"
-	epatch "${FILESDIR}/${P}-gcc4_charset_c.patch"
-	# port to new libpng API, see bug #141566
-	useq png && epatch "${FILESDIR}/${P}-libpng-1_2.patch"
-	# Change the manpage to reference a /real/ file instead of just an
-	# approximation.  Purely cosmetic!
-	sed -i "s,^/usr/share/doc/qemacs,&-${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 $(use_enable X x11) \
-		$(use_enable png) \
-		$(use_enable xv) \
-		|| die "econf failed"
-	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() {
-	make install DESTDIR=${D} || die
-	dodoc Changelog README TODO config.eg
-	dohtml *.html
-
-	insinto /usr/share/doc/${PF}/plugin-example/
-	doins plugin-example/*
-
-	# 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
-}
-
-pkg_postinst() {
-	einfo "This version of qemacs is not entirely backwards compatible with"
-	einfo "versions prior to 0.3.1-r1."
-	echo
-	einfo "The name of the binary has been changed to qemacs, to fix a name"
-	einfo "clash with app-editors/qe."
-	echo
-	einfo "The location of user config files have been changed to ~/.qemacs, to"
-	einfo "remove some ambiguity."
-}