6 files changed, 78 insertions, 41 deletions
diff --git a/x11-wm/windowlab/ChangeLog b/x11-wm/windowlab/ChangeLog
index 0591940fd619..a28736d7e24d 100644
--- a/x11-wm/windowlab/ChangeLog
+++ b/x11-wm/windowlab/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-wm/windowlab
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowlab/ChangeLog,v 1.20 2007/02/21 22:42:45 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowlab/ChangeLog,v 1.21 2007/06/29 11:05:50 coldwind Exp $
+
+*windowlab-1.34 (29 Jun 2007)
+
+  29 Jun 2007; Santiago M. Mola <coldwind@gentoo.org>
+  +files/windowlab-1.34-fixed-font.patch, -windowlab-1.32.ebuild,
+  +windowlab-1.34.ebuild:
+  Version bump fixing problems with xft fonts, thanks to Stephen Tallowitz.
+  Fixes bugs #145907, #145913 and #172307.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-wm/windowlab/files/digest-windowlab-1.32 b/x11-wm/windowlab/files/digest-windowlab-1.32
deleted file mode 100644
index 977d606fe210..000000000000
--- a/x11-wm/windowlab/files/digest-windowlab-1.32
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 86198600b72fc1a21ec39ca394621f66 windowlab-1.32.tar 163840
-RMD160 ad192bf1a7ceddaf6ac078cebfafaeb582248923 windowlab-1.32.tar 163840
-SHA256 71f5e50d8fe5e80154049b988fdfb0cc59ef6f0b7c37ceb03405e5dafd0d3b89 windowlab-1.32.tar 163840
diff --git a/x11-wm/windowlab/files/digest-windowlab-1.34 b/x11-wm/windowlab/files/digest-windowlab-1.34
new file mode 100644
index 000000000000..a9fa7251f717
--- /dev/null
+++ b/x11-wm/windowlab/files/digest-windowlab-1.34
@@ -0,0 +1,3 @@
+MD5 d566b989f8e59b169f7affa462762c17 windowlab-1.34.tar 163840
+RMD160 19b1ffad8134463b6970e886bdfebd7bfefb10e1 windowlab-1.34.tar 163840
+SHA256 a646abd1a7b1c548621ba8fcadc32311555e89f2a45b78a0f105421d618e4d35 windowlab-1.34.tar 163840
diff --git a/x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch b/x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch
new file mode 100644
index 000000000000..0dd095ce0733
--- /dev/null
+++ b/x11-wm/windowlab/files/windowlab-1.34-fixed-font.patch
@@ -0,0 +1,11 @@
+--- windowlab.h.orig    2006-09-01 23:47:36.000000000 +0200
++++ windowlab.h 2006-09-01 23:47:49.000000000 +0200
+@@ -49,7 +49,7 @@
+ #ifdef XFT
+ #define DEF_FONT "-bitstream-bitstream vera sans-medium-r-*-*-*-100-*-*-*-*-*-*"
+ #else
+-#define DEF_FONT "-b&h-lucida-medium-r-*-*-10-*-*-*-*-*-*-*"
++#define DEF_FONT "fixed"
+ #endif
+
+ // use named colours, #rgb, #rrggbb or #rrrgggbbb format
diff --git a/x11-wm/windowlab/windowlab-1.32.ebuild b/x11-wm/windowlab/windowlab-1.32.ebuild
deleted file mode 100644
index 19bb1e272a0a..000000000000
--- a/x11-wm/windowlab/windowlab-1.32.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowlab/windowlab-1.32.ebuild,v 1.2 2006/03/15 07:54:09 spyderous Exp $
-
-IUSE=""
-
-DESCRIPTION="WindowLab is a small and simple window manager of novel design."
-HOMEPAGE="http://www.nickgravgaard.com/windowlab/"
-SRC_URI="http://www.nickgravgaard.com/${PN}/${P}.tar"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-
-RDEPEND="|| ( x11-libs/libXext virtual/x11 )"
-
-DEPEND="${RDEPEND}
-	|| ( x11-proto/xextproto virtual/x11 )"
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" || die
-}
-
-src_install() {
-	dobin windowlab
-
-	newman windowlab.1x windowlab.1
-	dodoc CHANGELOG README
-
-	dodir /etc/X11/windowlab
-	insinto /etc/X11/windowlab
-	newins menurc.sample menurc
-
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/${PN}" > ${D}/etc/X11/Sessions/${PN}
-	fperms a+x /etc/X11/Sessions/${PN}
-}
diff --git a/x11-wm/windowlab/windowlab-1.34.ebuild b/x11-wm/windowlab/windowlab-1.34.ebuild
new file mode 100644
index 000000000000..956d3b8e7895
--- /dev/null
+++ b/x11-wm/windowlab/windowlab-1.34.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowlab/windowlab-1.34.ebuild,v 1.1 2007/06/29 11:05:50 coldwind Exp $
+
+inherit eutils
+
+DESCRIPTION="small and simple window manager of novel design."
+HOMEPAGE="http://www.nickgravgaard.com/windowlab/"
+SRC_URI="http://www.nickgravgaard.com/${PN}/${P}.tar"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="truetype"
+
+RDEPEND="truetype? ( virtual/xft )
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-1.34-fixed-font.patch"
+}
+
+src_compile() {
+	if use truetype ; then
+		export DEFINES=-DXFT
+		export EXTRA_INC=$(pkg-config --cflags xft)
+		export EXTRA_LIBS=$(pkg-config --libs xft)
+	fi
+	emake CFLAGS="${CFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	dobin ${PN} || die
+
+	newman ${PN}.1x ${PN}.1 || die
+	dodoc CHANGELOG README TODO || die
+
+	dodir /etc/X11/${PN} || die
+	insinto /etc/X11/${PN}
+	doins ${PN}.menurc || die
+
+	dodir /etc/X11/Sessions || die
+	echo "/usr/bin/${PN}" > ${D}/etc/X11/Sessions/${PN}
+	fperms a+x /etc/X11/Sessions/${PN}
+}
+
+pkg_postinst() {
+	elog "${PN}'s menu config file has been changed from"
+	elog "/etc/X11/${PN}/menurc to /etc/X11/${PN}/${PN}.menurc"
+}