Add manedit-0.8.1, remove manedit-0.6.1

6 files changed, 74 insertions, 19 deletions

diff --git a/app-text/manedit/ChangeLog b/app-text/manedit/ChangeLog
index 708710f369a5..a7b4b4f454d2 100644
--- a/app-text/manedit/ChangeLog
+++ b/app-text/manedit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/manedit
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/manedit/ChangeLog,v 1.28 2007/01/30 05:13:03 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/manedit/ChangeLog,v 1.29 2007/02/19 22:25:17 fuzzyray Exp $
+
+*manedit-0.8.1 (19 Feb 2007)
+
+  19 Feb 2007; Paul Varner <fuzzyray@gentoo.org>
+  +files/manedit-0.8.1-gentoo.patch, -manedit-0.6.1.ebuild,
+  +manedit-0.8.1.ebuild:
+  Add version 0.8.1 and remove version 0.6.1
 
   30 Jan 2007; Steve Dibb <beandog@gentoo.org> manedit-0.7.1.ebuild:
   amd64 stable, bug 160291
diff --git a/app-text/manedit/Manifest b/app-text/manedit/Manifest
index e5d5ad8c4a70..a1a3c8c4e5d2 100644
--- a/app-text/manedit/Manifest
+++ b/app-text/manedit/Manifest
@@ -1,24 +1,28 @@
-DIST manedit-0.6.1.tar.bz2 515319 RMD160 b4679f9387c60f7a8ba065eda3678f8605a78715 SHA1 f73593f85dbb07744c19453796080dbafa1d183b SHA256 d612468b76c59fbbc4461159da853fd98fc151662b75b34b45d2f03ce9f5e76b
+AUX manedit-0.8.1-gentoo.patch 1680 RMD160 04d03a181f5d607e7619e2e6e2d8a680fe8986cb SHA1 287fdcf3b92ff68f759efbe819309f06cbd667f1 SHA256 5d91c9bafc2fa792f1bf0c0509350fe968fa2c37222996971d704d66356ebda2
+MD5 40396d339fe207d93547bc3a9f87017f files/manedit-0.8.1-gentoo.patch 1680
+RMD160 04d03a181f5d607e7619e2e6e2d8a680fe8986cb files/manedit-0.8.1-gentoo.patch 1680
+SHA256 5d91c9bafc2fa792f1bf0c0509350fe968fa2c37222996971d704d66356ebda2 files/manedit-0.8.1-gentoo.patch 1680
 DIST manedit-0.7.1.tar.bz2 524427 RMD160 f1b48ef28c93fe010de0a5c750d0b9f219a0b9c7 SHA1 ddf6bc0ac88c420a1b5404ce1e7b25134b35b228 SHA256 1d54476dbf15bf410e43aeaba69edb7cd7c7d1b03a6f56f73287e60757d6ec3a
-EBUILD manedit-0.6.1.ebuild 1440 RMD160 1886e5ab8e718dc293579e6d053f96663b1fe9c0 SHA1 5feaa3b359349636e886f20df3f876930e8e53d8 SHA256 6f7f3e2728f05bbb754019402440f7868e863314e4ffd073405dd8fd1ea0bc78
-MD5 ab4f43f3ccc4bd977e6dfac187c41b3d manedit-0.6.1.ebuild 1440
-RMD160 1886e5ab8e718dc293579e6d053f96663b1fe9c0 manedit-0.6.1.ebuild 1440
-SHA256 6f7f3e2728f05bbb754019402440f7868e863314e4ffd073405dd8fd1ea0bc78 manedit-0.6.1.ebuild 1440
+DIST manedit-0.8.1.tar.bz2 514226 RMD160 17d378fad7a0dbe8d7b4c09b334dfc0768b0932e SHA1 0b1705383840598ae7ced22ce5eb7f111008885b SHA256 06aaae640b94da545bef2ea96b839e9aaeab1806b9421ddfc99b46c30985db6d
 EBUILD manedit-0.7.1.ebuild 1439 RMD160 89ef7874d756835ed5a07ac1aedb935fbea61797 SHA1 296cbc123e7abe192e264875abbb64e028f5af9e SHA256 c643f2cfbf5c4157164caf3d7c215b35f07d9f2f3b40a759709cd596831b3cbf
 MD5 53ced5530e1b98f37fc34af7b9f6002e manedit-0.7.1.ebuild 1439
 RMD160 89ef7874d756835ed5a07ac1aedb935fbea61797 manedit-0.7.1.ebuild 1439
 SHA256 c643f2cfbf5c4157164caf3d7c215b35f07d9f2f3b40a759709cd596831b3cbf manedit-0.7.1.ebuild 1439
-MISC ChangeLog 2986 RMD160 870c07a7f90d3f18b0c4f31455c094475bc71d6f SHA1 bee9b5121541ea48dc3ba946dbb166328ea14c85 SHA256 47383695578f5d21c9911bdf354c8c2659222fb9067b95b2a65a49d584ce22db
-MD5 9526cf572db7711a4b66fa1c68f61d3b ChangeLog 2986
-RMD160 870c07a7f90d3f18b0c4f31455c094475bc71d6f ChangeLog 2986
-SHA256 47383695578f5d21c9911bdf354c8c2659222fb9067b95b2a65a49d584ce22db ChangeLog 2986
+EBUILD manedit-0.8.1.ebuild 1495 RMD160 8b390e8550032ea73058076fed10498169911ce0 SHA1 ddc8ed2edf042c05e1e56e934cd0357312c50767 SHA256 b1d58786f013028a61839ae09eb980c3a2ae23d5886b894a1a2628209020a91e
+MD5 9c211d9963be28c226fc59627d484e8c manedit-0.8.1.ebuild 1495
+RMD160 8b390e8550032ea73058076fed10498169911ce0 manedit-0.8.1.ebuild 1495
+SHA256 b1d58786f013028a61839ae09eb980c3a2ae23d5886b894a1a2628209020a91e manedit-0.8.1.ebuild 1495
+MISC ChangeLog 3196 RMD160 aece6d95c3cafd17ada8be03ebb9008c12e3ae3f SHA1 058b0441e76a19f9e0358092e33b376ce4ea10f8 SHA256 0a994b2d1abd425e9c764ab9655323535dfc0b079df58270d362e316f135bd9c
+MD5 fb955e82d4a6cf67b0b6a4a84916d124 ChangeLog 3196
+RMD160 aece6d95c3cafd17ada8be03ebb9008c12e3ae3f ChangeLog 3196
+SHA256 0a994b2d1abd425e9c764ab9655323535dfc0b079df58270d362e316f135bd9c ChangeLog 3196
 MISC metadata.xml 220 RMD160 6a284ccc5d5f66186cb12f0f73382dfbeba01b9d SHA1 ed2c09d9c81d7212ed1e9205bd5cdbab2f4662be SHA256 fd36e5788255d70949bdea8e8ccdac1b684491325da852c87b3fb9b5c7ffc820
 MD5 d653ccb02640fb8c7bb937974c9cc8fa metadata.xml 220
 RMD160 6a284ccc5d5f66186cb12f0f73382dfbeba01b9d metadata.xml 220
 SHA256 fd36e5788255d70949bdea8e8ccdac1b684491325da852c87b3fb9b5c7ffc820 metadata.xml 220
-MD5 4806eb41cfd281d634f7504d94241897 files/digest-manedit-0.6.1 244
-RMD160 45f8e5e9c3393fc582fff00d8d942c9c264da402 files/digest-manedit-0.6.1 244
-SHA256 6904839af046dc3f09e6b76b10170655551cbb60c2e642d85e4bf933c99e766e files/digest-manedit-0.6.1 244
 MD5 feab2b318ed67ca5632fa850eb1684a2 files/digest-manedit-0.7.1 244
 RMD160 8a2652b519225a46528df58a40863bc814a6f04f files/digest-manedit-0.7.1 244
 SHA256 bea2502d7e87b9b4f9446b5f81c7ccd8bc6bc6d489e099cfd875b7dd6fbe3ef8 files/digest-manedit-0.7.1 244
+MD5 953b07df77d4300fd0a09725b4c8f038 files/digest-manedit-0.8.1 244
+RMD160 bcda43c0ed386b141be781206b6c85128e53aa57 files/digest-manedit-0.8.1 244
+SHA256 dfdc49b6cfbb3478d38b4132454bf95cc4a1468657d1a011c8bb02e1b2631ac0 files/digest-manedit-0.8.1 244
diff --git a/app-text/manedit/files/digest-manedit-0.6.1 b/app-text/manedit/files/digest-manedit-0.6.1
deleted file mode 100644
index a796825f0b63..000000000000
--- a/app-text/manedit/files/digest-manedit-0.6.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 99d9be8009c58808e9ab288bd9dff303 manedit-0.6.1.tar.bz2 515319
-RMD160 b4679f9387c60f7a8ba065eda3678f8605a78715 manedit-0.6.1.tar.bz2 515319
-SHA256 d612468b76c59fbbc4461159da853fd98fc151662b75b34b45d2f03ce9f5e76b manedit-0.6.1.tar.bz2 515319
diff --git a/app-text/manedit/files/digest-manedit-0.8.1 b/app-text/manedit/files/digest-manedit-0.8.1
new file mode 100644
index 000000000000..c846947702c3
--- /dev/null
+++ b/app-text/manedit/files/digest-manedit-0.8.1
@@ -0,0 +1,3 @@
+MD5 8eb21d77aaffe14534e7aee754547b74 manedit-0.8.1.tar.bz2 514226
+RMD160 17d378fad7a0dbe8d7b4c09b334dfc0768b0932e manedit-0.8.1.tar.bz2 514226
+SHA256 06aaae640b94da545bef2ea96b839e9aaeab1806b9421ddfc99b46c30985db6d manedit-0.8.1.tar.bz2 514226
diff --git a/app-text/manedit/files/manedit-0.8.1-gentoo.patch b/app-text/manedit/files/manedit-0.8.1-gentoo.patch
new file mode 100644
index 000000000000..988ae2c18954
--- /dev/null
+++ b/app-text/manedit/files/manedit-0.8.1-gentoo.patch
@@ -0,0 +1,35 @@
+diff -r -u manedit-0.8.1/work/manedit-0.8.1/manedit/editor.c manedit-0.8.1-fixed/work/manedit-0.8.1/manedit/editor.c
+--- manedit-0.8.1/work/manedit-0.8.1/manedit/editor.c	2007-02-11 02:00:00.000000000 -0600
++++ manedit-0.8.1-fixed/work/manedit-0.8.1/manedit/editor.c	2007-02-19 15:41:20.000000000 -0600
+@@ -1,6 +1,7 @@
+ #include <gtk/gtk.h>
+ #include <gdk/gdkkeysyms.h>
+ 
++#include <string.h>
+ #include "../include/string.h"
+ 
+ #include "guiutils.h"
+diff -r -u manedit-0.8.1/work/manedit-0.8.1/manedit/main.c manedit-0.8.1-fixed/work/manedit-0.8.1/manedit/main.c
+--- manedit-0.8.1/work/manedit-0.8.1/manedit/main.c	2007-02-11 02:00:00.000000000 -0600
++++ manedit-0.8.1-fixed/work/manedit-0.8.1/manedit/main.c	2007-02-19 15:41:33.000000000 -0600
+@@ -1,3 +1,4 @@
++#include <stdlib.h>
+ #include <signal.h>
+ #include <locale.h>
+ #include <gtk/gtk.h>
+diff -r -u manedit-0.8.1/work/manedit-0.8.1/manedit/makefile_append.ini manedit-0.8.1-fixed/work/manedit-0.8.1/manedit/makefile_append.ini
+--- manedit-0.8.1/work/manedit-0.8.1/manedit/makefile_append.ini	2007-02-11 02:00:00.000000000 -0600
++++ manedit-0.8.1-fixed/work/manedit-0.8.1/manedit/makefile_append.ini	2007-02-19 15:48:46.000000000 -0600
+@@ -39,9 +39,9 @@
+ 
+ manpage:
+ 	@echo "Generating manual page $(BIN).1.bz2"
+-	@-$(SED) 's|%%PREFIX%%|$(PREFIX)|g ; \
+-                  s|%%LOCALBASE%%|${LOCALBASE}|g ; \
+-                  s|%%X11BASE%%|${X11BASE}|g' $(BIN).1 > $(BIN).1.out
++	@-$(SED) -e 's|%%PREFIX%%|$(PREFIX)|g ;' \
++	         -e 's|%%LOCALBASE%%|${LOCALBASE}|g ;' \
++	         -e 's|%%X11BASE%%|${X11BASE}|g' $(BIN).1 > $(BIN).1.out
+ 	@-$(BZIP2) $(BIN).1.out --stdout > $(BIN).1.bz2
+ 
+ modules: $(OBJ_C) $(OBJ_CPP)
diff --git a/app-text/manedit/manedit-0.6.1.ebuild b/app-text/manedit/manedit-0.8.1.ebuild
index 50e0d3d16b76..3453a22911c9 100644
--- a/app-text/manedit/manedit-0.6.1.ebuild
+++ b/app-text/manedit/manedit-0.8.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/manedit/manedit-0.6.1.ebuild,v 1.6 2006/03/02 04:00:34 fuzzyray Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/manedit/manedit-0.8.1.ebuild,v 1.1 2007/02/19 22:25:17 fuzzyray Exp $
+
+inherit eutils
 
 DESCRIPTION="Man page editor using XML tags"
 HOMEPAGE="http://wolfpack.twu.net/ManEdit/"
@@ -8,7 +10,7 @@ SRC_URI="ftp://wolfpack.twu.net/users/wolfpack/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
 RDEPEND="=x11-libs/gtk+-1*
@@ -21,6 +23,13 @@ RDEPEND="=x11-libs/gtk+-1*
 
 DEPEND="${RDEPEND}"
 
+src_unpack() {
+	# Patch to fix QA warnings and to generate man page
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PF}-gentoo.patch
+}
+
 src_compile() {
 	# It autodetects x86 processors and adds the -march option itself
 	# but we don't actually want that.