Split cjk USE into linguas_ja, linguas_zh_TW and linguas_th. This closes bug #78548.

(Portage version: 2.0.51.19)

4 files changed, 141 insertions, 19 deletions

diff --git a/x11-terms/aterm/ChangeLog b/x11-terms/aterm/ChangeLog
index b3d219075e5a..edf4ad249d58 100644
--- a/x11-terms/aterm/ChangeLog
+++ b/x11-terms/aterm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-terms/aterm
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/ChangeLog,v 1.65 2005/04/09 13:42:14 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/ChangeLog,v 1.66 2005/04/23 09:19:04 usata Exp $
+
+*aterm-0.4.2-r13 (23 Apr 2005)
+
+  23 Apr 2005; Mamoru KOMACHI <usata@gentoo.org> +aterm-0.4.2-r13.ebuild:
+  Split cjk USE into linguas_ja, linguas_zh_TW and linguas_th.
+  This closes bug #78548.
 
   09 Apr 2005; Markus Rothe <corsair@gentoo.org> aterm-0.4.2-r11.ebuild:
   Stable on ppc64
@@ -8,17 +14,17 @@
   07 Apr 2005; Simon Stelling <blubb@gentoo.org> aterm-0.4.2-r11.ebuild:
   stable on amd64
 
-  07 Apr 2005; Michał Januszewski <spock@gentoo.org>
+  07 Apr 2005; Micha? Januszewski <spock@gentoo.org>
   aterm-1.00_beta2.ebuild:
   Fixed the dependency on afterstep. Aterm-1.00 will not work properly with
   afterstep < 2.00.
 
-  14 Feb 2005; Michał Januszewski <spock@gentoo.org>
+  14 Feb 2005; Micha? Januszewski <spock@gentoo.org>
   aterm-0.4.2-r11.ebuild, aterm-0.4.2-r12.ebuild, aterm-0.4.2-r7.ebuild,
   aterm-0.4.2-r9.ebuild:
   Removed references to 'macos'.
 
-  13 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> aterm-0.4.2-r11.ebuild:
+  13 Feb 2005; Bryan ?stergaard <kloeri@gentoo.org> aterm-0.4.2-r11.ebuild:
   Stable on alpha.
 
   07 Feb 2005; Sven Wegener <swegener@gentoo.org> aterm-0.4.2-r11.ebuild,
@@ -27,7 +33,7 @@
 
 *aterm-0.4.2-r12 (06 Feb 2005)
 
-  06 Feb 2005; Michał Januszewski <spock@gentoo.org>
+  06 Feb 2005; Micha? Januszewski <spock@gentoo.org>
   +files/aterm-0.4.2-scroll-double-free.patch, +aterm-0.4.2-r12.ebuild,
   aterm-1.00_beta2.ebuild:
   Added a fix for bug #75604. aterm-0.4.2-r12 is the first 0.4.2 ebuild that
@@ -36,7 +42,7 @@
 
 *aterm-1.00_beta2 (06 Feb 2005)
 
-  06 Feb 2005; Michał Januszewski <spock@gentoo.org>
+  06 Feb 2005; Micha? Januszewski <spock@gentoo.org>
   +aterm-1.00_beta2.ebuild:
   Version bump (closes #77615). All arches other than x86 got dropped due to
   changes in the code and the new dependency on AfterStep. Most of the patches
@@ -51,7 +57,7 @@
   aterm-0.4.2-r11.ebuild:
   Stable on ppc.
 
-  18 Jan 2005; Michał Januszewski <spock@gentoo.org>
+  18 Jan 2005; Micha? Januszewski <spock@gentoo.org>
   files/aterm-0.4.2-internal-border.patch:
   Added a simple fix for the internal-border related bug #72970.
 
@@ -154,7 +160,7 @@
   13 Jun 2004; Michal Januszewski <spock@gentoo.org> aterm-0.4.2-r9.ebuild:
   Added a fix for bug #52770.
 
-  12 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> aterm-0.4.2-r9.ebuild:
+  12 Jun 2004; Bryan ?stergaard <kloeri@gentoo.org> aterm-0.4.2-r9.ebuild:
   Stable on alpha.
 
   09 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> aterm-0.4.2-r7.ebuild,
diff --git a/x11-terms/aterm/Manifest b/x11-terms/aterm/Manifest
index 397c83586ad5..9630d7a8334c 100644
--- a/x11-terms/aterm/Manifest
+++ b/x11-terms/aterm/Manifest
@@ -1,24 +1,25 @@
+MD5 b0e5c7daeef78147c48fdf3e5e3d130e aterm-0.4.2-r13.ebuild 2955
 MD5 6cfabf0a1167fc48cfb856d59d73a2d1 ChangeLog 11681
 MD5 96c04cd17b1253d644ee72648f403f5f aterm-0.4.2-r11.ebuild 2860
-MD5 748501b37a2d5b4c9912a95e75c83100 aterm-0.4.2-r12.ebuild 2940
 MD5 759826a0870371ca962b3f4bc49959cf aterm-0.4.2-r7.ebuild 2034
-MD5 2d4c4b6450bdc1d73536d06fb0f1f092 aterm-0.4.2-r9.ebuild 2354
-MD5 b0bc48ddff73c867cf05650c443eccc4 aterm-1.00_beta2.ebuild 1656
 MD5 d94d306da3804e41296e1bf04c7c9cae metadata.xml 255
+MD5 b0bc48ddff73c867cf05650c443eccc4 aterm-1.00_beta2.ebuild 1656
+MD5 2d4c4b6450bdc1d73536d06fb0f1f092 aterm-0.4.2-r9.ebuild 2354
+MD5 4f1a0f3cc352be6439ac5810085e1be0 files/digest-aterm-0.4.2-r12 128
 MD5 56383dccdb085d09e33858081b774724 files/aterm-0.4.2-borderless.patch 4692
-MD5 cc3291cba64add4b46d22268878043f7 files/aterm-0.4.2-copynpaste-r2.patch 5308
-MD5 80558db5a2d61eaaf6998877b616bbd0 files/aterm-0.4.2-copynpaste-r3.patch 6358
 MD5 1c869d8199dea55badd3758c5967e182 files/aterm-0.4.2-copynpaste.patch 3668
-MD5 18e59b417ce4b6394317ac17da46c122 files/aterm-0.4.2-internal-border.patch 3246
-MD5 001fefd640df8a6318e8597f86c6e08c files/aterm-0.4.2-ja-savelines.patch 4459
 MD5 c2aedeeb3e7cc1dcc9361a021a570973 files/aterm-0.4.2-paste.patch 2160
 MD5 e91e244a20f4bff5ed4238e4cdb4d87a files/aterm-0.4.2-paste_mouse_outside.patch 6267
-MD5 1ddbe9b625c32cb9e67d8ee23af57110 files/aterm-0.4.2-patch-pack000.patch 4124
 MD5 df2652026f1f4f3e4444db9cddc145b6 files/aterm-0.4.2-qtpaste.patch 2510
-MD5 8faf173b6f8032958f1bc48d7877353c files/aterm-0.4.2-savelines.patch 4081
-MD5 64a8e39eb81e3b76ec3a28e0c36b2c30 files/aterm-0.4.2-scroll-double-free.patch 1826
 MD5 4f1a0f3cc352be6439ac5810085e1be0 files/digest-aterm-0.4.2-r11 128
-MD5 4f1a0f3cc352be6439ac5810085e1be0 files/digest-aterm-0.4.2-r12 128
 MD5 4f1a0f3cc352be6439ac5810085e1be0 files/digest-aterm-0.4.2-r7 128
+MD5 cc3291cba64add4b46d22268878043f7 files/aterm-0.4.2-copynpaste-r2.patch 5308
+MD5 1ddbe9b625c32cb9e67d8ee23af57110 files/aterm-0.4.2-patch-pack000.patch 4124
+MD5 64a8e39eb81e3b76ec3a28e0c36b2c30 files/aterm-0.4.2-scroll-double-free.patch 1826
+MD5 80558db5a2d61eaaf6998877b616bbd0 files/aterm-0.4.2-copynpaste-r3.patch 6358
 MD5 4f1a0f3cc352be6439ac5810085e1be0 files/digest-aterm-0.4.2-r9 128
+MD5 001fefd640df8a6318e8597f86c6e08c files/aterm-0.4.2-ja-savelines.patch 4459
+MD5 8faf173b6f8032958f1bc48d7877353c files/aterm-0.4.2-savelines.patch 4081
 MD5 f35d671ae7390589e50cb67736e90fc3 files/digest-aterm-1.00_beta2 69
+MD5 18e59b417ce4b6394317ac17da46c122 files/aterm-0.4.2-internal-border.patch 3246
+MD5 4f1a0f3cc352be6439ac5810085e1be0 files/digest-aterm-0.4.2-r13 128
diff --git a/x11-terms/aterm/aterm-0.4.2-r13.ebuild b/x11-terms/aterm/aterm-0.4.2-r13.ebuild
new file mode 100644
index 000000000000..bde496a16c4f
--- /dev/null
+++ b/x11-terms/aterm/aterm-0.4.2-r13.ebuild
@@ -0,0 +1,113 @@
+# 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-r13.ebuild,v 1.1 2005/04/23 09:19:04 usata 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
+	linguas_ja? ( 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="xgetdefault"
+
+DEPEND="media-libs/jpeg
+	media-libs/libpng
+	virtual/x11"
+
+pkg_setup() {
+	if use linguas_ja && use linguas_zh_TW ; then
+		eerror
+		eerror "You cannot have both ja and zh_TW enabled."
+		eerror
+		die "Please remove either ja or zh_TW from your LINGUAS."
+	fi
+}
+
+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 linguas_ja ; 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 linguas_ja ; 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
+
+	# macos doesn't support -z flag
+	if ! use ppc-macos ; then
+		append-ldflags -Wl,-z,now
+	fi
+
+	econf \
+		$(use_enable xgetdefault) \
+		$(use_enable linguas_ja kanji) \
+		$(use_enable linguas_zh_TW big5) \
+		$(use_enable linguas_th thai) \
+		--with-terminfo=/usr/share/terminfo \
+		--enable-transparency \
+		--enable-fading \
+		--enable-background-image \
+		--enable-menubar \
+		--enable-graphics \
+		--enable-utmp \
+		--enable-linespace \
+		--enable-xim \
+		--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/files/digest-aterm-0.4.2-r13 b/x11-terms/aterm/files/digest-aterm-0.4.2-r13
new file mode 100644
index 000000000000..a1aafd5e085e
--- /dev/null
+++ b/x11-terms/aterm/files/digest-aterm-0.4.2-r13
@@ -0,0 +1,2 @@
+MD5 5c29d0cde4225bdbd63ccb6a4dd94c56 aterm-0.4.2.tar.bz2 243419
+MD5 2bd8629ea2a1926bca13841b0aca6604 aterm-0.4.2-ja.patch 84282