Included images and changed image directory from /usr/share/${PF} to /usr/share/${PN}. Closing bug #38329

6 files changed, 150 insertions, 3 deletions

diff --git a/x11-wm/ctwm/Manifest b/x11-wm/ctwm/Manifest
index d75e3553ef23..c56c044a0913 100644
--- a/x11-wm/ctwm/Manifest
+++ b/x11-wm/ctwm/Manifest
@@ -1,9 +1,9 @@
 MD5 95c73612ca58e8f54666e768c93c85d0 ctwm-3.7_alpha4.ebuild 1091
 MD5 a873a7616ad2e4af798466a0d58b08c5 ctwm-3.6.ebuild 918
-MD5 eb01abbb3b2d8704446d2097c7cf094a ChangeLog 649
+MD5 b57cddebbb06ec491a85731e42f1bdff ChangeLog 892
 MD5 e7307c1653035014c1e36a27ca8ccb45 metadata.xml 163
-MD5 5426107ff93b48728c0f56313ba01a0e ctwm-3.6-r1.ebuild 1032
-MD5 8dba6e513c2cb21f1d4c4e6beec5cbad ctwm-3.7_alpha4-r1.ebuild 1093
+MD5 7476a6fe83329905f35bb4b839912a08 ctwm-3.6-r1.ebuild 1035
+MD5 db9a47531e08a0e2e5d032fffa99e181 ctwm-3.7_alpha4-r1.ebuild 1096
 MD5 2bf6805304e3e475eba4dae4818102e4 files/ctwm-3.6-gentoo.diff 1169
 MD5 445863ca82184b289f7800ca4bbf3000 files/ctwm-3.7_alpha4-gentoo.diff 1822
 MD5 f1cb976f1a64837f5e8b7ec456b3a4aa files/digest-ctwm-3.6 60
diff --git a/x11-wm/ctwm/ctwm-3.6-r1.ebuild b/x11-wm/ctwm/ctwm-3.6-r1.ebuild
new file mode 100644
index 000000000000..71d318c9e153
--- /dev/null
+++ b/x11-wm/ctwm/ctwm-3.6-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ctwm/ctwm-3.6-r1.ebuild,v 1.1 2004/01/15 22:57:51 usata Exp $
+
+IUSE=""
+
+DESCRIPTION="A clean, light window manager."
+
+SRC_URI="http://ctwm.free.lp.se/dist/${P}.tar.gz
+	http://slpc1.epfl.ch/public/software/ctwm/${PN}-images.tar.gz"
+HOMEPAGE="http://ctwm.free.lp.se/"
+
+SLOT="0"
+KEYWORDS="~x86"
+LICENSE="MIT"
+
+DEPEND="virtual/x11"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${S}
+	unpack ${PN}-images.tar.gz
+	epatch ${FILESDIR}/${PF}-gentoo.diff
+}
+
+src_compile() {
+	xmkmf || die
+	make TWMDIR=/usr/share/${PN} || die
+}
+
+src_install() {
+	make BINDIR=/usr/bin \
+		 MANPATH=/usr/share/man \
+		 TWMDIR=/usr/share/${PN} \
+		 DESTDIR=${D} install || die
+
+	make MANPATH=/usr/share/man \
+		DOCHTMLDIR=/usr/share/doc/${PF}/html \
+		DESTDIR=${D} install.man || die
+
+	echo "#!/bin/sh" > ctwm
+	echo "/usr/bin/ctwm" >> ctwm
+
+	exeinto /etc/X11/Sessions
+	doexe ctwm
+
+	dodoc CHANGES README PROBLEMS
+}
diff --git a/x11-wm/ctwm/ctwm-3.7_alpha4-r1.ebuild b/x11-wm/ctwm/ctwm-3.7_alpha4-r1.ebuild
new file mode 100644
index 000000000000..a4b32f3a7006
--- /dev/null
+++ b/x11-wm/ctwm/ctwm-3.7_alpha4-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2004 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-r1.ebuild,v 1.1 2004/01/15 22:57:51 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/${PN} || die
+}
+
+src_install() {
+	make BINDIR=/usr/bin \
+		 MANPATH=/usr/share/man \
+		 TWMDIR=/usr/share/${PN} \
+		 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.6-r1-gentoo.diff b/x11-wm/ctwm/files/ctwm-3.6-r1-gentoo.diff
new file mode 100644
index 000000000000..b58c09d1f77b
--- /dev/null
+++ b/x11-wm/ctwm/files/ctwm-3.6-r1-gentoo.diff
@@ -0,0 +1,45 @@
+--- gram.y-orig	2001-12-11 16:38:52.000000000 +0100
++++ gram.y	2003-05-08 13:11:55.000000000 +0200
+@@ -427,6 +427,7 @@
+ 
+ 		| WINDOW_GEOMETRIES 	 {  }
+ 		  wingeom_list
++		;
+ 
+ noarg		: KEYWORD		{ if (!do_single_keyword ($1)) {
+ 					    twmrc_error_prefix();
+@@ -683,8 +684,8 @@
+ 		| wingeom_entries wingeom_entry
+ 		;
+ 
+-wingeom_entry	: string string	{ AddToList (&Scr->WindowGeometries, $1, $2) }
+-
++wingeom_entry	: string string	{ AddToList (&Scr->WindowGeometries, $1, $2); }
++		;
+ 
+ 
+ squeeze		: SQUEEZE_TITLE { 
+@@ -835,6 +836,7 @@
+ 				AddToClientsList ($1, client);
+ 			  }
+ 
++		;
+ occupy_window_list	: LB occupy_window_entries RB {}
+ 			;
+ 
+@@ -845,7 +847,7 @@
+ occupy_window_entry	: string {
+ 				AddToClientsList (workspace, $1);
+ 			  }
+-
++		;
+ icon_list	: LB icon_entries RB {}
+ 		;
+ 
+@@ -962,6 +964,7 @@
+ 					  RemoveDQuote(ptr);
+ 					  $$ = (unsigned char*)ptr;
+ 					}
++		;
+ number		: NUMBER		{ $$ = $1; }
+ 		;
diff --git a/x11-wm/ctwm/files/digest-ctwm-3.6-r1 b/x11-wm/ctwm/files/digest-ctwm-3.6-r1
new file mode 100644
index 000000000000..d86821771f9b
--- /dev/null
+++ b/x11-wm/ctwm/files/digest-ctwm-3.6-r1
@@ -0,0 +1,2 @@
+MD5 c9e9e161e07e3d1c7e27684436f01e2b ctwm-3.6.tar.gz 370563
+MD5 4b0c784213af4afa2d736773863e53b4 ctwm-images.tar.gz 244749
diff --git a/x11-wm/ctwm/files/digest-ctwm-3.7_alpha4-r1 b/x11-wm/ctwm/files/digest-ctwm-3.7_alpha4-r1
new file mode 100644
index 000000000000..9d8999895166
--- /dev/null
+++ b/x11-wm/ctwm/files/digest-ctwm-3.7_alpha4-r1
@@ -0,0 +1 @@
+MD5 5dcd43f8e3112139e10d08b55c8aa3d5 ctwm-3.7-alpha4.tar.gz 661909