modular-x-ified

(Portage version: 2.1_pre4-r1)

5 files changed, 11 insertions, 55 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/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>