Bump. Respect CC, CFLAGS, LDFLAGS. Disable GNOME support for now.

Package-Manager: portage-2.2_rc82/cvs/Linux i686

3 files changed, 81 insertions, 3 deletions

diff --git a/x11-wm/ctwm/ChangeLog b/x11-wm/ctwm/ChangeLog
index ff75073db6d0..99983bc7a18e 100644
--- a/x11-wm/ctwm/ChangeLog
+++ b/x11-wm/ctwm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/ctwm
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ctwm/ChangeLog,v 1.20 2008/07/19 10:00:12 aballier Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ctwm/ChangeLog,v 1.21 2010/09/16 14:46:03 jer Exp $
+
+*ctwm-3.8a (16 Sep 2010)
+
+  16 Sep 2010; Jeroen Roovers <jer@gentoo.org> +ctwm-3.8a.ebuild:
+  Bump. Respect CC, CFLAGS, LDFLAGS. Disable GNOME support for now.
 
   19 Jul 2008; Alexis Ballier <aballier@gentoo.org> ctwm-3.7.ebuild:
   keyword ~x86-fbsd thanks to Davide Italiano <dav_it@gentoo.org>, bug
diff --git a/x11-wm/ctwm/Manifest b/x11-wm/ctwm/Manifest
index c2ee2dd5513d..a914b501e723 100644
--- a/x11-wm/ctwm/Manifest
+++ b/x11-wm/ctwm/Manifest
@@ -1,5 +1,7 @@
 AUX ctwm-3.6-r1-gentoo.diff 1329 RMD160 4f99f36e7c96e70be2efa6da7a5916e1925de4b3 SHA1 cfe4819b37427472c58bd89f7df123ae86967cf9 SHA256 e263f47c575b556ed4a4f6f58b00d02c000f05f880337a92328d5071e07d4aa6
 DIST ctwm-3.7.tar.gz 1139461 RMD160 9809df2555b3eb2bf0c46c041df8c1c089b67255 SHA1 6140e82ec23499146eaab5bf3bd592f92e95683e SHA256 fa16dbaef6992cdbcdbe05a9dc12c2c16910f5e51a2df54607aeb74f9b4a5171
+DIST ctwm-3.8a.tar.gz 738226 RMD160 cc1c3c862c3cfb1d66593d9a95d28ec0bbbbaf3c SHA1 c3a31d669bef7dd5ec78d89950c0e575d6c51c77 SHA256 39322cc6b0d12dc286af0944f9a10d3a099a5f04c5d9c47b75742cdf65dbd4a4
 EBUILD ctwm-3.7.ebuild 1314 RMD160 5d5d53b38b18c267a597e57690b2a5f47d946d04 SHA1 d09cbb22a0d1e2981ca9fb6f2b61f64a5785371e SHA256 3354a8a4fe64427f5baa8679f966b4bca4d7f06cee19fc58e12931562009fc9c
-MISC ChangeLog 2918 RMD160 90b98f5c3f4d159141e3c5af57d66c9714fe5234 SHA1 9db9848ada344d38989c95d5ca1a0c404e200b96 SHA256 001feb785a0627f9a7c500cc09eb2efcc42abe3876987b43804f45e824eb4236
+EBUILD ctwm-3.8a.ebuild 1564 RMD160 11cdbe2e9aaf7c0760c00831e5184ecc5887b210 SHA1 1daa827affc6647d296d0294efb39fd46ed79d81 SHA256 b4dbef47ccefb7a95fbc13cedf681d5510550897763e67d81ece916adaa280a5
+MISC ChangeLog 3074 RMD160 d38864a886d8f62c5f84d8443ea194e9a6b5bb31 SHA1 b75ca6324deb1952afc05c2320f2c45942b0bd68 SHA256 9e53cc45eef8e0980b1d4c8c7c3ed88d88f1c12085abac511fde0ccf7fca7007
 MISC metadata.xml 163 RMD160 7c2ff9d5408196433d3c5d74537d222335183899 SHA1 8be4981b79174c7879a386bd8e0fd4609ad9d41f SHA256 e8dcd61085d237c64dc37b1d7dd932b2c5e75010f9b6d9fd19b103bfe3a47797
diff --git a/x11-wm/ctwm/ctwm-3.8a.ebuild b/x11-wm/ctwm/ctwm-3.8a.ebuild
new file mode 100644
index 000000000000..73914c9b4fbc
--- /dev/null
+++ b/x11-wm/ctwm/ctwm-3.8a.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ctwm/ctwm-3.8a.ebuild,v 1.1 2010/09/16 14:46:03 jer Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A clean, light window manager."
+HOMEPAGE="http://ctwm.free.lp.se/"
+SRC_URI="http://ctwm.free.lp.se/dist/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="gnome"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt"
+DEPEND="${RDEPEND}
+	app-text/rman
+	media-libs/jpeg
+	x11-misc/imake
+	x11-proto/xextproto
+	x11-proto/xproto"
+
+src_prepare() {
+	sed -i Imakefile \
+		-e "s@\(CONFDIR =\).*@\1 /etc/X11/twm@g" \
+		|| die "sed Imakefile"
+
+	cp Imakefile.local-template Imakefile.local
+
+	# TODO: Add GNOME support
+	sed -i Imakefile.local \
+		-e '/^#define GNOME/d' \
+		|| die "sed Imakefile.local"
+}
+
+src_compile() {
+	xmkmf || die "xmkmf failed"
+	emake \
+		CC=$(tc-getCC) \
+		CFLAGS="${CFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}" \
+		TWMDIR=/usr/share/${PN} \
+		|| die "emake failed"
+}
+
+src_install() {
+	make BINDIR=/usr/bin \
+		MANPATH=/usr/share/man \
+		TWMDIR=/usr/share/${PN} \
+		DESTDIR="${D}" install || die "make install failed"
+
+	make MANPATH=/usr/share/man \
+		DOCHTMLDIR=/usr/share/doc/${PF}/html \
+		DESTDIR="${D}" install.man || die "make install.man failed"
+
+	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*
+}