6 files changed, 32 insertions, 60 deletions
diff --git a/x11-terms/cxterm/ChangeLog b/x11-terms/cxterm/ChangeLog
index de6f93357c60..7625971cdb24 100644
--- a/x11-terms/cxterm/ChangeLog
+++ b/x11-terms/cxterm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-terms/cxterm
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/cxterm/ChangeLog,v 1.9 2005/12/25 19:59:35 usata Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/cxterm/ChangeLog,v 1.10 2006/02/13 04:26:51 liquidx Exp $
+
+  13 Feb 2006; Alastair Tse <liquidx@gentoo.org> metadata.xml,
+  -cxterm-5.2.2.ebuild, cxterm-5.2.3.ebuild:
+  modular-x-ified
 
   25 Dec 2005; Mamoru KOMACHI <usata@gentoo.org> cxterm-5.2.3.ebuild:
   Cosmetic change and regenerate distfiles checksum. Fix no available
diff --git a/x11-terms/cxterm/Manifest b/x11-terms/cxterm/Manifest
index e244e0385edb..fb5385d2020c 100644
--- a/x11-terms/cxterm/Manifest
+++ b/x11-terms/cxterm/Manifest
@@ -1,6 +1,22 @@
-MD5 bb955419f394af83fb74e7188d4bd010 ChangeLog 1045
-MD5 d936e70632c5d8d47103a36818c9168d cxterm-5.2.2.ebuild 985
-MD5 baee57f69b51cd160952fb879e239efa cxterm-5.2.3.ebuild 620
-MD5 2c25f54b0f6b9d3dc8b81bf720df0ea9 files/digest-cxterm-5.2.2 62
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 81ba6f9091277f2b828b60b533eae198 ChangeLog 1175
+RMD160 ac8b9a4b40c4882a7de88f91baaff048dfb991a2 ChangeLog 1175
+SHA256 8bcc1810b51f0adc761f5cfc0a3ae69eca6e55c53fa2287f92a5fe3eb9774fde ChangeLog 1175
+MD5 1366a65e1d2d5c5b1a3c2d4156577b64 cxterm-5.2.3.ebuild 671
+RMD160 bb911b5e8706b77fbd3536b3a83767083eaafb54 cxterm-5.2.3.ebuild 671
+SHA256 57449039b5e76f2274ea9fb952ea8ac28bf62a8efa3b1b3e265f76d6bd26cb2e cxterm-5.2.3.ebuild 671
 MD5 b98da66b2a1d01ba3176b90cefae738f files/digest-cxterm-5.2.3 62
-MD5 f32bbe937e03a25a8ac7b65e08c92763 metadata.xml 204
+RMD160 471a49ae716a12395ce10ccfc26554b5bee475f7 files/digest-cxterm-5.2.3 62
+SHA256 7214ca3b22c266baa842565d6922813984e3d2be1c6d06bc19a50607fdba172e files/digest-cxterm-5.2.3 62
+MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
+RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad metadata.xml 156
+SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFD8Aqa9ZFPrqoILX8RArVGAKDo9ZBCblMgMQlXBBB7XVbU7d8rdwCgxi2x
+naoXzWXAPDqLAxhxlQvGMio=
+=wbAO
+-----END PGP SIGNATURE-----
diff --git a/x11-terms/cxterm/cxterm-5.2.2.ebuild b/x11-terms/cxterm/cxterm-5.2.2.ebuild
deleted file mode 100644
index 4581f90becc9..000000000000
--- a/x11-terms/cxterm/cxterm-5.2.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/cxterm/cxterm-5.2.2.ebuild,v 1.10 2004/07/15 01:01:26 agriffis Exp $
-
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-HOMEPAGE="http://cxterm.sourceforge.net/"
-DESCRIPTION="A Chinese/Japanese/Korean X-Terminal"
-
-DEPEND="virtual/x11
-	>=sys-apps/sed-4"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="x86"
-IUSE=""
-
-# hyper-optimizations untested...
-#
-src_compile() {
-
-	cd ${S}
-	sed -i "s/genCxterm/\.\/genCxterm/g" ${S}/scripts/Makefile.in
-
-	./configure --prefix=/usr \
-				--mandir=/usr/share/man \
-				--infodir=/usr/share/info || die "./configure failed"
-
-	make CFLAGS="${CFLAGS}" || die
-
-}
-
-src_install() {
-
-	emake \
-			prefix=${D}/usr \
-			mandir=${D}/usr/share/man \
-			infodir=${D}/usr/share/info \
-			install || die
-
-	dodoc README-5.2 INSTALL-5.2 Doc/*
-	docinto tutorial-1
-	dodoc Doc/tutorial-1/*
-	docinto tutorial-2
-	dodoc Doc/tutorial-2/*
-}
diff --git a/x11-terms/cxterm/cxterm-5.2.3.ebuild b/x11-terms/cxterm/cxterm-5.2.3.ebuild
index 82b1cb309bbb..5adab5f4c5b9 100644
--- a/x11-terms/cxterm/cxterm-5.2.3.ebuild
+++ b/x11-terms/cxterm/cxterm-5.2.3.ebuild
@@ -1,12 +1,12 @@
-# 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/x11-terms/cxterm/cxterm-5.2.3.ebuild,v 1.7 2005/12/25 19:59:35 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/cxterm/cxterm-5.2.3.ebuild,v 1.8 2006/02/13 04:26:51 liquidx Exp $
 
 SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 HOMEPAGE="http://cxterm.sourceforge.net/"
 DESCRIPTION="A Chinese/Japanese/Korean X-Terminal"
-
-DEPEND="virtual/x11
+DEPEND="|| ( ( x11-libs/libXmu x11-libs/libXaw )
+		     virtual/x11 )
 	>=sys-apps/sed-4"
 
 SLOT="0"
diff --git a/x11-terms/cxterm/files/digest-cxterm-5.2.2 b/x11-terms/cxterm/files/digest-cxterm-5.2.2
deleted file mode 100644
index 4dc4f0ccbdd6..000000000000
--- a/x11-terms/cxterm/files/digest-cxterm-5.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f1b6d78d06352af8c51d33e8fb541946 cxterm-5.2.2.tgz 2499014
diff --git a/x11-terms/cxterm/metadata.xml b/x11-terms/cxterm/metadata.xml
index 427a38f23777..2d5852c16c60 100644
--- a/x11-terms/cxterm/metadata.xml
+++ b/x11-terms/cxterm/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>cjk@gentoo.org</email>
-  </maintainer>
+<herd>cjk</herd>
 </pkgmetadata>