New unstable version, closing bug #34012

5 files changed, 122 insertions, 9 deletions

diff --git a/x11-wm/ctwm/ChangeLog b/x11-wm/ctwm/ChangeLog
index 827b9d42fba6..c5911549429b 100644
--- a/x11-wm/ctwm/ChangeLog
+++ b/x11-wm/ctwm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/ctwm
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ctwm/ChangeLog,v 1.2 2003/11/07 16:55:30 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ctwm/ChangeLog,v 1.3 2003/12/01 17:02:37 usata Exp $
+
+*ctwm-3.7_alpha4 (02 Dec 2003)
+
+  02 Dec 2003; Mamoru KOMACHI <usata@gentoo.org> ctwm-3.7_alpha4.ebuild,
+  files/ctwm-3.7_alpha4-gentoo.diff:
+  New unstable release.
 
   08 Nov 2003; Mamoru KOMACHI <usata@gentoo.org> ctwm-3.6.ebuild,
   metadata.xml:
diff --git a/x11-wm/ctwm/Manifest b/x11-wm/ctwm/Manifest
index 341a2ed86a2f..1541cd5e21ab 100644
--- a/x11-wm/ctwm/Manifest
+++ b/x11-wm/ctwm/Manifest
@@ -1,14 +1,8 @@
 MD5 a873a7616ad2e4af798466a0d58b08c5 ctwm-3.6.ebuild 918
 MD5 e7307c1653035014c1e36a27ca8ccb45 metadata.xml 163
-MD5 e65b6e73c2d0c85e8b0b25c1a77ed9b8 ChangeLog 482
-MD5 0db37a0d19a48558ec13d0cfe2e79ccf ctwm-3.7_alpha4.ebuild 1084
-MD5 1a3701da3b70737bd7e9656a581fb2f3 ctwm-3.6-r1.ebuild 919
-MD5 0db37a0d19a48558ec13d0cfe2e79ccf ctwm-3.7_alpha4-r1.ebuild 1084
+MD5 eb01abbb3b2d8704446d2097c7cf094a ChangeLog 649
+MD5 95c73612ca58e8f54666e768c93c85d0 ctwm-3.7_alpha4.ebuild 1091
 MD5 f1cb976f1a64837f5e8b7ec456b3a4aa files/digest-ctwm-3.6 60
 MD5 2bf6805304e3e475eba4dae4818102e4 files/ctwm-3.6-gentoo.diff 1169
-MD5 f1cb976f1a64837f5e8b7ec456b3a4aa files/digest-ctwm-3.6-r1 60
 MD5 1161ba997a9299f20a3e154ba80fb99e files/digest-ctwm-3.7_alpha4 67
 MD5 445863ca82184b289f7800ca4bbf3000 files/ctwm-3.7_alpha4-gentoo.diff 1822
-MD5 0b87f748b55f22da5d702c8826b07e8b files/ctwm-3.6-r1-gentoo.diff 930
-MD5 a45e9eb11b1446a468738aac6b9cb966 files/ctwm-3.7_alpha4-r1-gentoo.diff 995
-MD5 1161ba997a9299f20a3e154ba80fb99e files/digest-ctwm-3.7_alpha4-r1 67
diff --git a/x11-wm/ctwm/ctwm-3.7_alpha4.ebuild b/x11-wm/ctwm/ctwm-3.7_alpha4.ebuild
new file mode 100644
index 000000000000..35801b67e386
--- /dev/null
+++ b/x11-wm/ctwm/ctwm-3.7_alpha4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ctwm/ctwm-3.7_alpha4.ebuild,v 1.1 2003/12/01 17:02:37 usata Exp $
+
+IUSE=""
+
+MY_P="${P/_/-}"
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="A clean, light window manager."
+#SRC_URI="http://ctwm.free.lp.se/dist/${MY_P}.tar.gz"
+SRC_URI="http://ctwm.free.lp.se/preview/${MY_P}.tar.gz"
+HOMEPAGE="http://ctwm.free.lp.se/"
+
+SLOT="0"
+KEYWORDS="~x86"
+LICENSE="MIT"
+
+DEPEND="virtual/x11
+	media-libs/jpeg"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.diff
+}
+
+src_compile() {
+	xmkmf || die
+	make TWMDIR=/usr/share/${P} || die
+}
+
+src_install() {
+	make BINDIR=/usr/bin \
+		 MANPATH=/usr/share/man \
+		 TWMDIR=/usr/share/${P} \
+		 DESTDIR=${D} install || die
+
+	make MANPATH=/usr/share/man \
+		DOCHTMLDIR=/usr/share/doc/${PF}/html \
+		DESTDIR=${D} install.man || die
+
+	echo "#!/bin/sh" > ${T}/ctwm
+	echo "/usr/bin/ctwm" >> ${T}/ctwm
+
+	exeinto /etc/X11/Sessions
+	doexe ${T}/ctwm
+
+	dodoc CHANGES README* TODO* PROBLEMS
+	dodoc *.ctwmrc*
+}
diff --git a/x11-wm/ctwm/files/ctwm-3.7_alpha4-gentoo.diff b/x11-wm/ctwm/files/ctwm-3.7_alpha4-gentoo.diff
new file mode 100644
index 000000000000..2334a43423a2
--- /dev/null
+++ b/x11-wm/ctwm/files/ctwm-3.7_alpha4-gentoo.diff
@@ -0,0 +1,61 @@
+diff -urN ctwm-3.7-alpha4.ORIG/Imakefile ctwm-3.7-alpha4/Imakefile
+--- ctwm-3.7-alpha4.ORIG/Imakefile	2003-03-01 01:36:35.000000000 +0900
++++ ctwm-3.7-alpha4/Imakefile	2003-11-22 22:08:54.000000000 +0900
+@@ -161,7 +161,7 @@
+ 
+ AllTarget(ctwm)
+ 
+-SpecialObjectRule(parse.o,parse.c,'-DSYSTEM_INIT_FILE="'$(DESTDIR)$(TWMDIR)'/system.ctwmrc"')
++SpecialObjectRule(parse.o,parse.c,'-DSYSTEM_INIT_FILE="'$(DESTDIR)/etc/X11/twm'/system.ctwmrc"')
+ SpecialObjectRule(ctwm.o,ctwm.c,'-DPIXMAP_DIRECTORY="'$(DESTDIR)$(TWMDIR)'/images"')
+ #if !HasPutenv
+ SpecialObjectRule(util.o,util.c,-DNOPUTENV)
+@@ -171,7 +171,7 @@
+ 
+ NormalLibraryTarget(ctwm, libctwm.o)
+ ComplexProgramTarget(ctwm)
+-InstallNonExecFile(system.ctwmrc,$(TWMDIR))
++InstallNonExecFile(system.ctwmrc,/etc/X11/twm)
+ #ifdef XPM
+ install::
+ 	MakeDir($(DESTDIR)$(TWMDIR)/images)
+diff -urN ctwm-3.7-alpha4.ORIG/gram.y ctwm-3.7-alpha4/gram.y
+--- ctwm-3.7-alpha4.ORIG/gram.y	2003-02-21 04:27:28.000000000 +0900
++++ ctwm-3.7-alpha4/gram.y	2003-11-22 20:15:52.000000000 +0900
+@@ -433,6 +433,7 @@
+ 
+ 		| VIRTUAL_SCREENS      	{ }
+ 		  geom_list
++		  ;
+ 
+ noarg		: KEYWORD		{ if (!do_single_keyword ($1)) {
+ 					    twmrc_error_prefix();
+@@ -700,7 +701,8 @@
+ geom_entries	: /* Empty */
+ 		| geom_entries geom_entry
+ 		;
+-geom_entry	: string { AddToList (&Scr->VirtualScreens, $1, "") }
++geom_entry	: string { AddToList (&Scr->VirtualScreens, $1, ""); }
++		;
+ 
+ squeeze		: SQUEEZE_TITLE { 
+ 				    if (HasShape) Scr->SqueezeTitle = TRUE;
+@@ -849,8 +851,7 @@
+ occupy_workspc_entry	: string {
+ 				AddToClientsList ($1, client);
+ 			  }
+-                          ;
+-
++		;
+ occupy_window_list	: LB occupy_window_entries RB {}
+ 			;
+ 
+@@ -861,7 +862,7 @@
+ occupy_window_entry	: string {
+ 				AddToClientsList (workspace, $1);
+ 			  }
+-
++		;
+ icon_list	: LB icon_entries RB {}
+ 		;
+ 
diff --git a/x11-wm/ctwm/files/digest-ctwm-3.7_alpha4 b/x11-wm/ctwm/files/digest-ctwm-3.7_alpha4
new file mode 100644
index 000000000000..9d8999895166
--- /dev/null
+++ b/x11-wm/ctwm/files/digest-ctwm-3.7_alpha4
@@ -0,0 +1 @@
+MD5 5dcd43f8e3112139e10d08b55c8aa3d5 ctwm-3.7-alpha4.tar.gz 661909