cjk script #23233

12 files changed, 90 insertions, 207 deletions

diff --git a/x11-wm/waimea/ChangeLog b/x11-wm/waimea/ChangeLog
index cafea2e4ea3b..ec1bf8409058 100644
--- a/x11-wm/waimea/ChangeLog
+++ b/x11-wm/waimea/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for x11-wm/waimea
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/waimea/ChangeLog,v 1.12 2003/04/18 01:52:05 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/waimea/ChangeLog,v 1.13 2003/06/22 23:23:50 vapier Exp $
+
+*waimea-0.4.0-r1 (22 Jun 2003)
+
+  22 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
+  Added cjk patch #23233.
 
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
 *waimea-0.4.0 (06 Nov 2002)
 
   18 Apr 2003; foser <foser@gentoo.org> waimea-0.4.0.ebuild :
@@ -14,7 +17,6 @@
 
   06 Nov 2002; Brad Cowan <bcowan@gentoo.org> waimea-0.4.0.ebuild,
   files/digest-waimea-0.4.0 :
-  
   Version bump, ebuild cleanup.
 
 *waimea-0.3.5 (14 Oct 2002)
diff --git a/x11-wm/waimea/Manifest b/x11-wm/waimea/Manifest
index 0bcb973a0f09..bb6289683210 100644
--- a/x11-wm/waimea/Manifest
+++ b/x11-wm/waimea/Manifest
@@ -1,11 +1,7 @@
-MD5 1a7aec746bb5a1be0efd3804eb53a9a2 ChangeLog 1645
-MD5 f8592ca7f7aa88cef541111264a1e86a waimea-0.3.1-r1.ebuild 1450
-MD5 13c4622fbc77c9f7780e9e144dcc07d4 waimea-0.3.2.ebuild 1447
-MD5 f89200455db8ff8e7dda9aa95f38048d waimea-0.3.3.ebuild 1447
-MD5 e6df6ecd31f99bc7b2ce307211c3406a waimea-0.3.5.ebuild 1353
-MD5 c64730e8df729a81659053fb109bf0b9 waimea-0.4.0.ebuild 1192
-MD5 fd2eb145300004c2e47f8e936e974382 files/digest-waimea-0.3.1-r1 64
-MD5 b9caa22249b54af3a10784c0775285d5 files/digest-waimea-0.3.2 64
-MD5 ad61bc57b13c0af1962309be60fc732b files/digest-waimea-0.3.3 64
+MD5 0b15b4e85778cab73eb8dfbd5fe38007 files/digest-waimea-0.4.0-r1 129
 MD5 99a5f21810e1a4df6ae645f27a60203a files/digest-waimea-0.3.5 64
 MD5 6c13fc081ff9fe081d3ac0b171118fd6 files/digest-waimea-0.4.0 65
+MD5 e9623dbc6d4a16f20d03628f7f89d11b waimea-0.4.0-r1.ebuild 1230
+MD5 860b21a22a5ee8d943c5502def5dc8c0 waimea-0.3.5.ebuild 1150
+MD5 a35a7dd75a39f272f1d1270333fd756d waimea-0.4.0.ebuild 1005
+MD5 32f6b8b675ebb9020cdadacdedce7077 ChangeLog 1673
diff --git a/x11-wm/waimea/files/digest-waimea-0.3.1-r1 b/x11-wm/waimea/files/digest-waimea-0.3.1-r1
deleted file mode 100644
index 1d47cf0c9945..000000000000
--- a/x11-wm/waimea/files/digest-waimea-0.3.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7235bf3394d933679ed211e8623d9f34 waimea-0.3.1.tar.gz 414777
diff --git a/x11-wm/waimea/files/digest-waimea-0.3.2 b/x11-wm/waimea/files/digest-waimea-0.3.2
deleted file mode 100644
index 8cb56a749424..000000000000
--- a/x11-wm/waimea/files/digest-waimea-0.3.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 97ab7c52590aac56a3acebdf2f8bf1fa waimea-0.3.2.tar.gz 413575
diff --git a/x11-wm/waimea/files/digest-waimea-0.3.3 b/x11-wm/waimea/files/digest-waimea-0.3.3
deleted file mode 100644
index de5c4f0997cd..000000000000
--- a/x11-wm/waimea/files/digest-waimea-0.3.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 64c2b9009ead3b95f78a2365bad94cec waimea-0.3.3.tar.gz 415421
diff --git a/x11-wm/waimea/files/digest-waimea-0.4.0-r1 b/x11-wm/waimea/files/digest-waimea-0.4.0-r1
new file mode 100644
index 000000000000..803815fb1334
--- /dev/null
+++ b/x11-wm/waimea/files/digest-waimea-0.4.0-r1
@@ -0,0 +1,2 @@
+MD5 0ce2ce92451e4e757a75c958b6acb87a waimea-0.4.0.tar.bz2 206805
+MD5 6270da6d89c6ad6fdfd3387777fac643 waimea-0.4.0-ja.patch 5108
diff --git a/x11-wm/waimea/waimea-0.3.1-r1.ebuild b/x11-wm/waimea/waimea-0.3.1-r1.ebuild
deleted file mode 100644
index 39d979f93346..000000000000
--- a/x11-wm/waimea/waimea-0.3.1-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/waimea/waimea-0.3.1-r1.ebuild,v 1.8 2003/02/13 17:54:51 vapier Exp $
- 
-S=${WORKDIR}/${P}
-DESCRIPTION="Window manager based on BlackBox"
-SRC_URI="http://download.sourceforge.net/${PN}/${P}.tar.gz
-http://130.239.134.83/waimea/files/unstable/source/${P}.tar.gz"
-HOMEPAGE="http://waimea.sf.net"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc "
-
-DEPEND="virtual/x11 media-libs/imlib2"
-	
-PROVIDE="virtual/blackbox"
-
-src_compile() {
-	local myconf
-	econf || die "configure failure whine whine"
-	emake || die
-}
-
-src_install () {
-	make \
-		prefix=${D}/usr \
-		sysconfdir=${D}/etc/X11/waimea \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		datadir=${D}/usr/share \
-		install || die
-	
-	insinto /etc/skel
-	newins data/waimearc.example .waimearc
-	
-	# just for careful
-	insinto /usr/share/Waimea/
-	doins data/waimearc.example
-	
-
-	dodoc ChangeLog AUTHORS COPYING INSTALL README TODO NEWS
-
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/waimea" > ${D}/etc/X11/Sessions/waimea
-	chmod +x ${D}/etc/X11/Sessions/waimea
-}
-pkg_postinst () {
-	einfo "unfortunately the older version of this package broke the /etc/skel/.waimearc and made it a directory, please remove this if you want the package to install perfectly"
-	einfo "copy /etc/skel/.waimearc to your homedir (cp -a /etc/skel/.waimearc $HOME)"
-	
-}
diff --git a/x11-wm/waimea/waimea-0.3.2.ebuild b/x11-wm/waimea/waimea-0.3.2.ebuild
deleted file mode 100644
index f02dbc370fc0..000000000000
--- a/x11-wm/waimea/waimea-0.3.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/waimea/waimea-0.3.2.ebuild,v 1.8 2003/02/13 17:54:57 vapier Exp $
- 
-S=${WORKDIR}/${P}
-DESCRIPTION="Window manager based on BlackBox"
-SRC_URI="http://download.sourceforge.net/${PN}/${P}.tar.gz
-http://130.239.134.83/waimea/files/unstable/source/${P}.tar.gz"
-HOMEPAGE="http://waimea.sf.net"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc "
-
-DEPEND="virtual/x11 media-libs/imlib2"
-	
-PROVIDE="virtual/blackbox"
-
-src_compile() {
-	local myconf
-	econf || die "configure failure whine whine"
-	emake || die
-}
-
-src_install () {
-	make \
-		prefix=${D}/usr \
-		sysconfdir=${D}/etc/X11/waimea \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		datadir=${D}/usr/share \
-		install || die
-	
-	insinto /etc/skel
-	newins data/waimearc.example .waimearc
-	
-	# just for careful
-	insinto /usr/share/Waimea/
-	doins data/waimearc.example
-	
-
-	dodoc ChangeLog AUTHORS COPYING INSTALL README TODO NEWS
-
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/waimea" > ${D}/etc/X11/Sessions/waimea
-	chmod +x ${D}/etc/X11/Sessions/waimea
-}
-pkg_postinst () {
-	einfo "unfortunately the older version of this package broke the /etc/skel/.waimearc and made it a directory, please remove this if you want the package to install perfectly"
-	einfo "copy /etc/skel/.waimearc to your homedir (cp -a /etc/skel/.waimearc $HOME)"
-	
-}
diff --git a/x11-wm/waimea/waimea-0.3.3.ebuild b/x11-wm/waimea/waimea-0.3.3.ebuild
deleted file mode 100644
index 095ab9c717f5..000000000000
--- a/x11-wm/waimea/waimea-0.3.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/waimea/waimea-0.3.3.ebuild,v 1.8 2003/02/13 17:55:03 vapier Exp $
- 
-S=${WORKDIR}/${P}
-DESCRIPTION="Window manager based on BlackBox"
-SRC_URI="http://download.sourceforge.net/${PN}/${P}.tar.gz
-http://130.239.134.83/waimea/files/unstable/source/${P}.tar.gz"
-HOMEPAGE="http://waimea.sf.net"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc "
-
-DEPEND="virtual/x11 media-libs/imlib2"
-	
-PROVIDE="virtual/blackbox"
-
-src_compile() {
-	local myconf
-	econf || die "configure failure whine whine"
-	emake || die
-}
-
-src_install () {
-	make \
-		prefix=${D}/usr \
-		sysconfdir=${D}/etc/X11/waimea \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		datadir=${D}/usr/share \
-		install || die
-	
-	insinto /etc/skel
-	newins data/waimearc.example .waimearc
-	
-	# just for careful
-	insinto /usr/share/Waimea/
-	doins data/waimearc.example
-	
-
-	dodoc ChangeLog AUTHORS COPYING INSTALL README TODO NEWS
-
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/waimea" > ${D}/etc/X11/Sessions/waimea
-	chmod +x ${D}/etc/X11/Sessions/waimea
-}
-pkg_postinst () {
-	einfo "unfortunately the older version of this package broke the /etc/skel/.waimearc and made it a directory, please remove this if you want the package to install perfectly"
-	einfo "copy /etc/skel/.waimearc to your homedir (cp -a /etc/skel/.waimearc $HOME)"
-	
-}
diff --git a/x11-wm/waimea/waimea-0.3.5.ebuild b/x11-wm/waimea/waimea-0.3.5.ebuild
index c83dd1099901..a1279c9c49e2 100644
--- a/x11-wm/waimea/waimea-0.3.5.ebuild
+++ b/x11-wm/waimea/waimea-0.3.5.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/waimea/waimea-0.3.5.ebuild,v 1.4 2003/02/13 17:55:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/waimea/waimea-0.3.5.ebuild,v 1.5 2003/06/22 23:23:50 vapier Exp $
  
-S=${WORKDIR}/${P}
 DESCRIPTION="Window manager based on BlackBox"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-http://130.239.134.83/waimea/files/unstable/source/${P}.tar.gz"
+	http://130.239.134.83/waimea/files/unstable/source/${P}.tar.gz"
 HOMEPAGE="http://waimea.sf.net/"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc "
+KEYWORDS="x86 sparc"
 
-DEPEND="virtual/x11 media-libs/imlib2"
-	
+DEPEND="virtual/x11
+	media-libs/imlib2"
 PROVIDE="virtual/blackbox"
 
 src_compile() {
@@ -21,19 +21,13 @@ src_compile() {
 }
 
 src_install() {
-	make \
-		prefix=${D}/usr \
-		sysconfdir=${D}/etc/X11/waimea \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		datadir=${D}/usr/share \
-		install || die "make install died"
+	einstall sysconfdir=${D}/etc/X11/waimea || die
 
 	dodoc ChangeLog AUTHORS COPYING INSTALL README TODO NEWS
 
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/waimea" > ${D}/etc/X11/Sessions/waimea
-	chmod +x ${D}/etc/X11/Sessions/waimea
+	exeinto /etc/X11/Sessions
+	echo "/usr/bin/waimea" > waimea
+	doexe waimea
 }
 
 pkg_postinst() {
@@ -41,5 +35,5 @@ pkg_postinst() {
 	einfo "/etc/skel/.waimearc and made it a directory, please remove"
 	einfo "this if you want the package to install perfectly"
 	einfo "copy /etc/skel/.waimearc to your homedir:"
-	einfo "  cp -a /etc/skel/.waimearc $HOME"
+	einfo "  cp -a /etc/skel/.waimearc ${HOME}/"
 }
diff --git a/x11-wm/waimea/waimea-0.4.0-r1.ebuild b/x11-wm/waimea/waimea-0.4.0-r1.ebuild
new file mode 100644
index 000000000000..24e53cb3ee4e
--- /dev/null
+++ b/x11-wm/waimea/waimea-0.4.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/waimea/waimea-0.4.0-r1.ebuild,v 1.1 2003/06/22 23:23:50 vapier Exp $
+
+inherit eutils
+ 
+DESCRIPTION="Window manager based on BlackBox"
+SRC_URI="http://www.waimea.org/files/stable/source/${P}.tar.bz2
+	cjk? ( http://www.kasumi.sakura.ne.jp/~zoe/tdiary/patch/${P}-ja.patch )"
+HOMEPAGE="http://www.waimea.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ~sparc ~ppc"
+IUSE="truetype xinerama cjk"
+
+DEPEND="virtual/x11 
+	media-libs/imlib2
+	virtual/xft"
+
+PROVIDE="virtual/blackbox"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	use cjk && epatch ${DISTDIR}/${P}-ja.patch
+}
+
+src_compile() {
+	econf \
+		`use_enable xinerama` \
+		`use_enable truetype xft` \
+		--enable-shape \
+		--enable-render \
+		--enable-randr \
+		--enable-pixmap \
+		|| die
+	emake || die
+}
+
+src_install() {
+	einstall sysconfdir=${D}/etc/X11/waimea || die
+
+	dodoc ChangeLog AUTHORS COPYING INSTALL README TODO NEWS
+
+	exeinto /etc/X11/Sessions
+	echo "/usr/bin/waimea" > waimea
+	doexe waimea
+}
+
+pkg_postinst() {
+	einfo "Please read the README in /usr/share/doc/${PF}"
+	einfo "for info on setting up and configuring waimea"
+}
diff --git a/x11-wm/waimea/waimea-0.4.0.ebuild b/x11-wm/waimea/waimea-0.4.0.ebuild
index 093e4fbfc175..23cb5ff7c5f9 100644
--- a/x11-wm/waimea/waimea-0.4.0.ebuild
+++ b/x11-wm/waimea/waimea-0.4.0.ebuild
@@ -1,52 +1,43 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/waimea/waimea-0.4.0.ebuild,v 1.6 2003/04/18 01:52:06 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/waimea/waimea-0.4.0.ebuild,v 1.7 2003/06/22 23:23:50 vapier Exp $
  
-S=${WORKDIR}/${P}
-
 DESCRIPTION="Window manager based on BlackBox"
-
 SRC_URI="http://www.waimea.org/files/stable/source/${P}.tar.bz2"
-HOMEPAGE="http://www.waimea.org"
+HOMEPAGE="http://www.waimea.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~sparc ~ppc"
+KEYWORDS="x86 ppc sparc"
 
 DEPEND="virtual/x11 
 	media-libs/imlib2
 	virtual/xft"
-	
 PROVIDE="virtual/blackbox"
 
 src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
+	econf \
 		--enable-shape \
 		--enable-xinerama \
 		--enable-render \
 		--enable-randr \
 		--enable-xft \
-		--enable-pixmap
+		--enable-pixmap \
+		|| die
 	emake || die
 }
 
 src_install() {
-	einstall \
-		sysconfdir=${D}/etc/X11/waimea \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		datadir=${D}/usr/share 
-	
+	einstall sysconfdir=${D}/etc/X11/waimea || die
+
 	dodoc ChangeLog AUTHORS COPYING INSTALL README TODO NEWS
 
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/waimea" > ${D}/etc/X11/Sessions/waimea
-	chmod +x ${D}/etc/X11/Sessions/waimea
+	exeinto /etc/X11/Sessions
+	echo "/usr/bin/waimea" > waimea
+	doexe waimea
 }
 
 pkg_postinst() {
-	einfo "Please read the README in /usr/share/doc/${P}"
+	einfo "Please read the README in /usr/share/doc/${PF}"
 	einfo "for info on setting up and configuring waimea"
 }