8 files changed, 29 insertions, 126 deletions
diff --git a/app-text/manedit/ChangeLog b/app-text/manedit/ChangeLog
index 359606a9f537..99a42635f391 100644
--- a/app-text/manedit/ChangeLog
+++ b/app-text/manedit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/manedit
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/manedit/ChangeLog,v 1.21 2005/08/18 18:51:56 hansmi Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/manedit/ChangeLog,v 1.22 2006/03/02 04:00:34 fuzzyray Exp $
+
+  02 Mar 2006; Paul Varner <fuzzyray@gentoo.org> -manedit-0.5.8.ebuild,
+  -manedit-0.5.10.ebuild, manedit-0.6.1.ebuild:
+  Removed old ebuilds and modified dependencies of manedit-0.6.1 for modular X.
 
   18 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> manedit-0.6.1.ebuild:
   Stable on ppc.
diff --git a/app-text/manedit/Manifest b/app-text/manedit/Manifest
index 26ca638b657b..80d561451b42 100644
--- a/app-text/manedit/Manifest
+++ b/app-text/manedit/Manifest
@@ -1,18 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 6de82c3cdfbe0f86a79f7fc58fd82e86 manedit-0.6.1.ebuild 1385
+MD5 39e91eddc8cf8d5cc1515a7ffc402c54 ChangeLog 2330
+RMD160 4a0957459afa5b03273cb7c613db12f642df1184 ChangeLog 2330
+SHA256 c01c7dbd0f402f05da7cd1862da32d37f7ccb71abf0562baf7cc5ab2974f0ae2 ChangeLog 2330
+MD5 48913efe16d5a791d9345146e3af8951 files/digest-manedit-0.6.1 244
+RMD160 46537f22ce43782d58a17216e87504e578a863a6 files/digest-manedit-0.6.1 244
+SHA256 7a10a48dca1e151adc36ae1e2593e55c7d13ce5097a156db98c602ba8ce2661a files/digest-manedit-0.6.1 244
+MD5 be61f88c7eb2e0a276f8162e18101202 manedit-0.6.1.ebuild 1438
+RMD160 a0feb9b85a44b3ef4f97352e9b7e041e44fe391d manedit-0.6.1.ebuild 1438
+SHA256 f9f20dddde9cf5a3da36208008c1a709ddf38b1f5643a044ff80a0c446be5c92 manedit-0.6.1.ebuild 1438
 MD5 d653ccb02640fb8c7bb937974c9cc8fa metadata.xml 220
-MD5 b144e8c7735157e044af49100f77e887 manedit-0.5.8.ebuild 1391
-MD5 685e9eeed3b76ecae9884c5ac4286e32 manedit-0.5.10.ebuild 1392
-MD5 df378b5d689ec6eae05dbda009e7688d ChangeLog 2129
-MD5 1390d92484758cbae2d6fd4745f62718 files/digest-manedit-0.5.8 66
-MD5 597965ae2db264334fb5d42025570902 files/digest-manedit-0.5.10 67
-MD5 b29f4205b9b893aec1e4fb1d498f7a85 files/digest-manedit-0.6.1 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDNJXkgIKl8Uu19MoRAn2AAJ0dU8N3rUGqVdvd4KaTaho1AI12igCfZFoV
-JnVLj+CaC8TASOh5K4Z9vaQ=
-=0f6M
------END PGP SIGNATURE-----
+RMD160 6a284ccc5d5f66186cb12f0f73382dfbeba01b9d metadata.xml 220
+SHA256 fd36e5788255d70949bdea8e8ccdac1b684491325da852c87b3fb9b5c7ffc820 metadata.xml 220
diff --git a/app-text/manedit/files/digest-manedit-0.5.10 b/app-text/manedit/files/digest-manedit-0.5.10
deleted file mode 100644
index 8728090b3c79..000000000000
--- a/app-text/manedit/files/digest-manedit-0.5.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a0d9ff519221fee53e3c7c8b10ddc7af manedit-0.5.10.tar.bz2 497324
diff --git a/app-text/manedit/files/digest-manedit-0.5.8 b/app-text/manedit/files/digest-manedit-0.5.8
deleted file mode 100644
index fc8ace79b1eb..000000000000
--- a/app-text/manedit/files/digest-manedit-0.5.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0305b20abe2dad4eea4c46d6bbc9b847 manedit-0.5.8.tar.bz2 458527
diff --git a/app-text/manedit/files/digest-manedit-0.6.1 b/app-text/manedit/files/digest-manedit-0.6.1
index c9540c60b0c7..ba8f0bd425a6 100644
--- a/app-text/manedit/files/digest-manedit-0.6.1
+++ b/app-text/manedit/files/digest-manedit-0.6.1
@@ -1 +1,3 @@
 MD5 99d9be8009c58808e9ab288bd9dff303 manedit-0.6.1.tar.bz2 515319
+RMD160 b4679f9387c60f7a8ba065eda3678f8605a78715 manedit-0.6.1.tar.bz2 515319
+SHA256 7dd198fca720e4a295ab05ff81f510298fd691d059af9b359e2fefa4d5cf5e2f manedit-0.6.1.tar.bz2 515319
diff --git a/app-text/manedit/manedit-0.5.10.ebuild b/app-text/manedit/manedit-0.5.10.ebuild
deleted file mode 100644
index 9f5f22c563b3..000000000000
--- a/app-text/manedit/manedit-0.5.10.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/manedit/manedit-0.5.10.ebuild,v 1.12 2005/04/24 11:40:02 hansmi Exp $
-
-DESCRIPTION="Man page editor using XML tags"
-SRC_URI="ftp://wolfpack.twu.net/users/wolfpack/${P}.tar.bz2"
-HOMEPAGE="http://wolfpack.twu.net/ManEdit/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc ppc"
-IUSE=""
-
-DEPEND="virtual/libc
-	virtual/x11
-	=x11-libs/gtk+-1*
-	sys-libs/zlib
-	app-arch/bzip2"
-
-src_compile() {
-	# It autodetects x86 processors and adds the -march option itself
-	# but we don't actually want that.
-	env CFLAGS="${CFLAGS}" ./configure Linux \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--datadir=/usr/share \
-		--enable=bzip2 \
-		--enable=zlib \
-		--disable="arch-i486" \
-		--disable="arch-i586" \
-		--disable="arch-i686" \
-		--disable="arch-pentiumpro" || die "Bad Configure"
-	emake || die "Compile Error"
-}
-
-src_install() {
-	# fix strip error (tries to strip a shell script)
-	cp manedit/Makefile.install.UNIX{,.orig}
-	sed -e '/INST.*FLAGS.*-s$/s:-s::' \
-		manedit/Makefile.install.UNIX.orig > manedit/Makefile.install.UNIX
-
-	# set man dir too or FHS is violated (/usr/man)
-	make \
-		PREFIX=${D}/usr \
-		MAN_DIR=${D}/usr/share/man/man1 \
-		ICONS_DIR=${D}/usr/share/pixmaps \
-		install || die "make install failed."
-
-	dodoc AUTHORS LICENSE README
-}
diff --git a/app-text/manedit/manedit-0.5.8.ebuild b/app-text/manedit/manedit-0.5.8.ebuild
deleted file mode 100644
index 7ac875e76a1b..000000000000
--- a/app-text/manedit/manedit-0.5.8.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/manedit/manedit-0.5.8.ebuild,v 1.12 2005/01/01 16:25:28 eradicator Exp $
-
-DESCRIPTION="Man page editor using XML tags"
-SRC_URI="ftp://wolfpack.twu.net/users/wolfpack/${P}.tar.bz2"
-HOMEPAGE="http://wolfpack.twu.net/ManEdit/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc"
-IUSE=""
-
-DEPEND="virtual/libc
-	virtual/x11
-	=x11-libs/gtk+-1*
-	sys-libs/zlib
-	app-arch/bzip2"
-
-src_compile() {
-	# It autodetects x86 processors and adds the -march option itself
-	# but we don't actually want that.
-	env CFLAGS="${CFLAGS}" ./configure Linux \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--datadir=/usr/share \
-		--enable=bzip2 \
-		--enable=zlib \
-		--disable="arch-i486" \
-		--disable="arch-i586" \
-		--disable="arch-i686" \
-		--disable="arch-pentiumpro" || die "Bad Configure"
-	emake || die "Compile Error"
-}
-
-src_install() {
-	# fix strip error (tries to strip a shell script)
-	cp manedit/Makefile.install.UNIX{,.orig}
-	sed -e '/INST.*FLAGS.*-s$/s:-s::' \
-		manedit/Makefile.install.UNIX.orig > manedit/Makefile.install.UNIX
-
-	# set man dir too or FHS is violated (/usr/man)
-	make \
-		PREFIX=${D}/usr \
-		MAN_DIR=${D}/usr/share/man/man1 \
-		ICONS_DIR=${D}/usr/share/pixmaps \
-		install || die "make install failed."
-
-	dodoc AUTHORS LICENSE README
-}
diff --git a/app-text/manedit/manedit-0.6.1.ebuild b/app-text/manedit/manedit-0.6.1.ebuild
index 2bdef1d50893..50e0d3d16b76 100644
--- a/app-text/manedit/manedit-0.6.1.ebuild
+++ b/app-text/manedit/manedit-0.6.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 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.5 2005/09/23 23:54:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/manedit/manedit-0.6.1.ebuild,v 1.6 2006/03/02 04:00:34 fuzzyray Exp $
 
 DESCRIPTION="Man page editor using XML tags"
 HOMEPAGE="http://wolfpack.twu.net/ManEdit/"
@@ -11,10 +11,15 @@ SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
 
-DEPEND="virtual/x11
-	=x11-libs/gtk+-1*
+RDEPEND="=x11-libs/gtk+-1*
 	sys-libs/zlib
-	app-arch/bzip2"
+	app-arch/bzip2
+	|| ( ( x11-libs/libXi
+		)
+		virtual/x11
+	)"
+
+DEPEND="${RDEPEND}"
 
 src_compile() {
 	# It autodetects x86 processors and adds the -march option itself