10 files changed, 54 insertions, 281 deletions
diff --git a/x11-terms/aterm/ChangeLog b/x11-terms/aterm/ChangeLog
index 3be9e77ac157..4e0c931e156f 100644
--- a/x11-terms/aterm/ChangeLog
+++ b/x11-terms/aterm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-terms/aterm
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/ChangeLog,v 1.80 2006/01/03 21:21:40 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/ChangeLog,v 1.81 2006/02/13 21:39:02 spock Exp $
+
+  13 Feb 2006; Michał Januszewski <spock@gentoo.org>
+  -aterm-0.4.2-r7.ebuild, aterm-0.4.2-r9.ebuild, aterm-0.4.2-r11.ebuild,
+  -aterm-0.4.2-r12.ebuild, aterm-0.4.2-r13.ebuild, -aterm-1.00_beta2.ebuild:
+  Ported aterm to modular X. Removed old ebuilds.
 
   03 Jan 2006; Karol Wojtaszek <sekretarz@gentoo.org> aterm-1.0.0.ebuild:
   Add modular X dependencies, bug #115160 by Ben Skeggs
diff --git a/x11-terms/aterm/aterm-0.4.2-r11.ebuild b/x11-terms/aterm/aterm-0.4.2-r11.ebuild
index ccb2e01f6e3c..7314cb96cbb6 100644
--- a/x11-terms/aterm/aterm-0.4.2-r11.ebuild
+++ b/x11-terms/aterm/aterm-0.4.2-r11.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/x11-terms/aterm/aterm-0.4.2-r11.ebuild,v 1.20 2005/12/28 22:26:12 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/aterm-0.4.2-r11.ebuild,v 1.21 2006/02/13 21:39:02 spock Exp $
 
 inherit eutils flag-o-matic
 
@@ -14,9 +14,21 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ~ppc-macos ppc64 sparc x86"
 IUSE="cjk"
 
-DEPEND="media-libs/jpeg
+RDEPEND="media-libs/jpeg
 	media-libs/libpng
-	virtual/x11"
+	|| ( (
+			x11-libs/libXmu
+			x11-libs/libXt
+			x11-libs/libX11
+			x11-libs/libXpm
+			x11-libs/libICE
+			x11-libs/libSM
+		)
+		virtual/x11
+	)"
+
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xproto virtual/x11 )"
 
 src_unpack() {
 	unpack ${P}.tar.bz2
diff --git a/x11-terms/aterm/aterm-0.4.2-r12.ebuild b/x11-terms/aterm/aterm-0.4.2-r12.ebuild
deleted file mode 100644
index 983069765ca7..000000000000
--- a/x11-terms/aterm/aterm-0.4.2-r12.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/aterm-0.4.2-r12.ebuild,v 1.5 2005/12/28 22:26:12 grobian Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="A terminal emulator with transparency support as well as rxvt backwards compatibility"
-HOMEPAGE="http://aterm.sourceforge.net"
-SRC_URI="mirror://sourceforge/aterm/${P}.tar.bz2
-	cjk? ( http://dev.gentoo.org/~spock/portage/distfiles/aterm-0.4.2-ja.patch )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~sparc ~x86"
-IUSE="cjk xgetdefault"
-
-DEPEND="media-libs/jpeg
-	media-libs/libpng
-	virtual/x11"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	cd ${S}/src
-	cp feature.h feature.h.orig
-	sed "s:\(#define LINUX_KEYS\):/\*\1\*/:" \
-		feature.h.orig > feature.h
-
-	sed -i "s:    KeySym          keysym;:    KeySym          keysym = 0;:" command.c
-
-	cd ${S}
-	epatch ${FILESDIR}/aterm-0.4.2-borderless.patch
-	epatch ${FILESDIR}/aterm-0.4.2-paste.patch
-	epatch ${FILESDIR}/aterm-0.4.2-paste_mouse_outside.patch
-
-	if use cjk ; then
-		epatch ${DISTDIR}/aterm-0.4.2-ja.patch
-	else
-		epatch ${FILESDIR}/aterm-0.4.2-copynpaste-r3.patch
-	fi
-
-	epatch ${FILESDIR}/aterm-0.4.2-patch-pack000.patch
-
-	if use cjk ; then
-		epatch ${FILESDIR}/aterm-0.4.2-ja-savelines.patch
-	else
-		epatch ${FILESDIR}/aterm-0.4.2-savelines.patch
-	fi
-
-	epatch ${FILESDIR}/aterm-0.4.2-internal-border.patch
-	epatch ${FILESDIR}/aterm-0.4.2-scroll-double-free.patch
-}
-
-src_compile() {
-	local myconf
-
-	append-ldflags $(bindnow-flags)
-
-	# You can't --enable-big5 with aterm-0.4.2-ja.patch
-	# I think it's very bad thing but as nobody complains it
-	# and we don't have per-language flag atm, I stick to
-	# use --enable-kanji/--enable-thai (and leave --enable-big5)
-	use cjk && myconf="$myconf
-		--enable-kanji
-		--enable-thai
-		--enable-xim
-		--enable-linespace"
-
-	econf \
-		$(use_enable xgetdefault) \
-		--with-terminfo=/usr/share/terminfo \
-		--enable-transparency \
-		--enable-fading \
-		--enable-background-image \
-		--enable-menubar \
-		--enable-graphics \
-		--enable-utmp \
-		--with-x \
-		${myconf} || die
-
-	sed -i -re 's#^XLIB = (.*)#XLIB = \1 -lXmu#' src/Makefile
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	fowners root:utmp /usr/bin/aterm
-	fperms g+s /usr/bin/aterm
-
-	doman doc/aterm.1
-	dodoc ChangeLog INSTALL doc/BUGS doc/FAQ doc/README.*
-	docinto menu
-	dodoc doc/menu/*
-	dohtml -r .
-}
-
-pkg_postinst () {
-	echo
-	einfo "Hint: you can copy text from aterm to the clipboard by holding the ALT key"
-	einfo "while highlighting the text."
-	echo
-	ewarn "The transparent background will only work if you have the 'real' root wallpaper"
-	ewarn "set. Use Esetroot (x11-terms/eterm) or fbsetbg (x11-wm/fluxbox) if you are"
-	ewarn "experiencing problems with transparency in aterm."
-	echo
-}
diff --git a/x11-terms/aterm/aterm-0.4.2-r13.ebuild b/x11-terms/aterm/aterm-0.4.2-r13.ebuild
index 7673d190bccb..ac1b81916bd7 100644
--- a/x11-terms/aterm/aterm-0.4.2-r13.ebuild
+++ b/x11-terms/aterm/aterm-0.4.2-r13.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/x11-terms/aterm/aterm-0.4.2-r13.ebuild,v 1.3 2005/12/28 22:26:12 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/aterm-0.4.2-r13.ebuild,v 1.4 2006/02/13 21:39:02 spock Exp $
 
 inherit eutils flag-o-matic
 
@@ -14,9 +14,21 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~sparc ~x86"
 IUSE="xgetdefault"
 
-DEPEND="media-libs/jpeg
+RDEPEND="media-libs/jpeg
 	media-libs/libpng
-	virtual/x11"
+	|| ( (
+			x11-libs/libXmu
+			x11-libs/libXt
+			x11-libs/libX11
+			x11-libs/libXpm
+			x11-libs/libICE
+			x11-libs/libSM
+		)
+		virtual/x11
+	)"
+
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xproto virtual/x11 )"
 
 pkg_setup() {
 	if use linguas_ja && use linguas_zh_TW ; then
diff --git a/x11-terms/aterm/aterm-0.4.2-r7.ebuild b/x11-terms/aterm/aterm-0.4.2-r7.ebuild
deleted file mode 100644
index 57cf5a5a1519..000000000000
--- a/x11-terms/aterm/aterm-0.4.2-r7.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/aterm-0.4.2-r7.ebuild,v 1.18 2005/12/28 22:26:12 grobian Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="A terminal emulator with transparency support as well as rxvt backwards compatibility"
-HOMEPAGE="http://aterm.sourceforge.net"
-SRC_URI="mirror://sourceforge/aterm/${P}.tar.bz2
-	cjk? ( http://dev.gentoo.org/~spock/portage/distfiles/aterm-0.4.2-ja.patch )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 mips ppc ~sparc x86"
-IUSE="cjk"
-
-DEPEND="media-libs/jpeg
-	media-libs/libpng
-	virtual/x11"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	cd ${S}/src
-	cp feature.h feature.h.orig
-	sed "s:\(#define LINUX_KEYS\):/\*\1\*/:" \
-		feature.h.orig > feature.h
-
-	cd ${S}
-	epatch ${FILESDIR}/aterm-0.4.2-borderless.patch
-	epatch ${FILESDIR}/aterm-0.4.2-paste.patch
-	epatch ${FILESDIR}/aterm-0.4.2-paste_mouse_outside.patch
-
-	if use cjk ; then
-		epatch ${DISTDIR}/aterm-0.4.2-ja.patch
-	else
-		epatch ${FILESDIR}/aterm-0.4.2-copynpaste.patch
-	fi
-}
-
-src_compile() {
-	local myconf
-
-	append-ldflags $(bindnow-flags)
-
-	# You can't --enable-big5 with aterm-0.4.2-ja.patch
-	# I think it's very bad thing but as nobody complains it
-	# and we don't have per-language flag atm, I stick to
-	# use --enable-kanji/--enable-thai (and leave --enable-big5)
-	use cjk && myconf="$myconf
-		--enable-kanji
-		--enable-thai
-		--enable-xim
-		--enable-linespace"
-
-	econf \
-		--enable-transparency \
-		--enable-fading \
-		--enable-background-image \
-		--enable-menubar \
-		--enable-graphics \
-		--enable-utmp \
-		--with-x \
-		${myconf} || die
-
-	sed -i -re 's#^XLIB = (.*)#XLIB = \1 -lXmu#' src/Makefile
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	fowners root:utmp /usr/bin/aterm
-	fperms g+s /usr/bin/aterm
-
-	doman doc/aterm.1
-	dodoc ChangeLog INSTALL doc/BUGS doc/FAQ doc/README.*
-	docinto menu
-	dodoc doc/menu/*
-	dohtml -r .
-}
diff --git a/x11-terms/aterm/aterm-0.4.2-r9.ebuild b/x11-terms/aterm/aterm-0.4.2-r9.ebuild
index 8cdd79e36792..403b1b0288a6 100644
--- a/x11-terms/aterm/aterm-0.4.2-r9.ebuild
+++ b/x11-terms/aterm/aterm-0.4.2-r9.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/x11-terms/aterm/aterm-0.4.2-r9.ebuild,v 1.27 2005/12/28 22:26:12 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/aterm-0.4.2-r9.ebuild,v 1.28 2006/02/13 21:39:02 spock Exp $
 
 inherit eutils flag-o-matic
 
@@ -14,9 +14,21 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ppc-macos sparc x86"
 IUSE="cjk"
 
-DEPEND="media-libs/jpeg
+RDEPEND="media-libs/jpeg
 	media-libs/libpng
-	virtual/x11"
+	|| ( (
+			x11-libs/libXmu
+			x11-libs/libXt
+			x11-libs/libX11
+			x11-libs/libXpm
+			x11-libs/libICE
+			x11-libs/libSM
+		)
+		virtual/x11
+	)"
+
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xproto virtual/x11 )"
 
 src_unpack() {
 	unpack ${P}.tar.bz2
diff --git a/x11-terms/aterm/aterm-1.00_beta2.ebuild b/x11-terms/aterm/aterm-1.00_beta2.ebuild
deleted file mode 100644
index 23f69ac2fccd..000000000000
--- a/x11-terms/aterm/aterm-1.00_beta2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/aterm-1.00_beta2.ebuild,v 1.10 2005/12/28 22:26:12 grobian Exp $
-
-inherit eutils flag-o-matic
-
-MY_P="${P/_/.}"
-
-DESCRIPTION="A terminal emulator with transparency support as well as rxvt backwards compatibility"
-HOMEPAGE="http://aterm.sourceforge.net"
-SRC_URI="ftp://ftp.afterstep.org/apps/${PN}/${MY_P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cjk xgetdefault"
-
-DEPEND="media-libs/jpeg
-		media-libs/libpng
-		>=x11-wm/afterstep-2
-		virtual/x11"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/aterm-0.4.2-scroll-double-free.patch
-	epatch ${FILESDIR}/aterm-1.00-beta2-bgfix.patch
-}
-
-src_compile() {
-	local myconf
-
-	append-ldflags $(bindnow-flags)
-
-	use cjk && myconf="$myconf
-		--enable-kanji
-		--enable-thai
-		--enable-big5"
-
-	econf \
-		$(use_enable xgetdefault) \
-		--with-terminfo=/usr/share/terminfo \
-		--enable-transparency \
-		--enable-fading \
-		--enable-background-image \
-		--enable-menubar \
-		--enable-graphics \
-		--enable-utmp \
-		--enable-wtmp \
-		--with-x \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	fowners root:utmp /usr/bin/aterm
-	fperms g+s /usr/bin/aterm
-
-	doman doc/aterm.1
-	dodoc ChangeLog doc/BUGS doc/FAQ doc/README.*
-	docinto menu
-	dodoc doc/menu/*
-	dohtml -r .
-}
-
-pkg_postinst() {
-	echo
-	ewarn "The transparent background will only work if you have the 'real' root wallpaper"
-	ewarn "set. Use Esetroot (x11-terms/eterm) or fbsetbg (x11-wm/fluxbox) if you are"
-	ewarn "experiencing problems with transparency in aterm."
-	echo
-}
-
diff --git a/x11-terms/aterm/files/digest-aterm-0.4.2-r12 b/x11-terms/aterm/files/digest-aterm-0.4.2-r12
deleted file mode 100644
index a1aafd5e085e..000000000000
--- a/x11-terms/aterm/files/digest-aterm-0.4.2-r12
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5c29d0cde4225bdbd63ccb6a4dd94c56 aterm-0.4.2.tar.bz2 243419
-MD5 2bd8629ea2a1926bca13841b0aca6604 aterm-0.4.2-ja.patch 84282
diff --git a/x11-terms/aterm/files/digest-aterm-0.4.2-r7 b/x11-terms/aterm/files/digest-aterm-0.4.2-r7
deleted file mode 100644
index a1aafd5e085e..000000000000
--- a/x11-terms/aterm/files/digest-aterm-0.4.2-r7
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5c29d0cde4225bdbd63ccb6a4dd94c56 aterm-0.4.2.tar.bz2 243419
-MD5 2bd8629ea2a1926bca13841b0aca6604 aterm-0.4.2-ja.patch 84282
diff --git a/x11-terms/aterm/files/digest-aterm-1.00_beta2 b/x11-terms/aterm/files/digest-aterm-1.00_beta2
deleted file mode 100644
index 29bb36efc4ac..000000000000
--- a/x11-terms/aterm/files/digest-aterm-1.00_beta2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2fd4c621b74e0726544f7c0a13bb1cb5 aterm-1.00.beta2.tar.bz2 242053