Version bump fixing problems with xft fonts, thanks to Stephen Tallowitz. Fixes bugs #145907, #145913 and #172307.

Package-Manager: portage-2.1.2.7

7 files changed, 94 insertions, 63 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/Manifest b/x11-wm/windowlab/Manifest
index 36f01d203310..6082d22219a8 100644
--- a/x11-wm/windowlab/Manifest
+++ b/x11-wm/windowlab/Manifest
@@ -1,9 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX windowlab-1.34-fixed-font.patch 386 RMD160 6e082c2b3fee202e46b79bd97c7265465f86184b SHA1 98df5ad21b90d31d80d454a666e60c5b0f4bd834 SHA256 8fa27ca0da6c06a5eaf85dcf38af7fbf3546b7c1d39895ab9ba3cb46217fb596
+MD5 b76213d98d5f327422478a52eb8506dc files/windowlab-1.34-fixed-font.patch 386
+RMD160 6e082c2b3fee202e46b79bd97c7265465f86184b files/windowlab-1.34-fixed-font.patch 386
+SHA256 8fa27ca0da6c06a5eaf85dcf38af7fbf3546b7c1d39895ab9ba3cb46217fb596 files/windowlab-1.34-fixed-font.patch 386
 DIST windowlab-1.30.tar 163840 RMD160 1baa50e0409e9e8f10f93ad2f79a1ebc8d7a61f1 SHA1 89b80385722bfe75036315757102084dd76fa1de SHA256 9a90a131eaabca48342cee27e0060596be7d161a3f59cd37ebb25549e6d49313
 DIST windowlab-1.31.tar 163840 RMD160 c17ccea976f387ac7a6a723950901638bd0c2fc0 SHA1 c63a6583e80d1aa6a9878d2d8fda9be9a6261c1a SHA256 1613c04a3cff7f5d7e918314c0457ccd86a64ae595e10f6dbedf7ea7dd59dd1e
-DIST windowlab-1.32.tar 163840 RMD160 ad192bf1a7ceddaf6ac078cebfafaeb582248923 SHA1 3927f214a0411d725aa14afc4f881d9bbda9ed81 SHA256 71f5e50d8fe5e80154049b988fdfb0cc59ef6f0b7c37ceb03405e5dafd0d3b89
+DIST windowlab-1.34.tar 163840 RMD160 19b1ffad8134463b6970e886bdfebd7bfefb10e1 SHA1 b9e8b08a6c119f5e5536b76aaab980dc5d0c4951 SHA256 a646abd1a7b1c548621ba8fcadc32311555e89f2a45b78a0f105421d618e4d35
 EBUILD windowlab-1.30.ebuild 920 RMD160 294017e1295e59a263bc6e932b235e85415cadac SHA1 7d4fe67b3df7b46c5508947093e30f2959e20407 SHA256 e2b92f69927a91828c661b35d14214b466185393ed2780a8a6573af8678fdc11
 MD5 23fe02709fbf7412fbd1935de9b36884 windowlab-1.30.ebuild 920
 RMD160 294017e1295e59a263bc6e932b235e85415cadac windowlab-1.30.ebuild 920
@@ -12,14 +13,14 @@ EBUILD windowlab-1.31.ebuild 920 RMD160 d57fcb6a1cccd986c212203ad998242d97d1bdec
 MD5 6e364f29b43f03e08a538489ee556979 windowlab-1.31.ebuild 920
 RMD160 d57fcb6a1cccd986c212203ad998242d97d1bdec windowlab-1.31.ebuild 920
 SHA256 50bb6a948a2371ef663935ed3ddac2786eed1e14c9b7c6513b210be97be874d2 windowlab-1.31.ebuild 920
-EBUILD windowlab-1.32.ebuild 923 RMD160 b9d6cfa837432e89abe96f83ed53cc7865619b7c SHA1 3b0c0258d514371eaaacd960446578a0996c3d29 SHA256 183dd86983b7367a9557d6b8a2dfe3d1ec4943bc11c2147052d86083d437d316
-MD5 0ca35e74328c98dac7d76bcd08d4621b windowlab-1.32.ebuild 923
-RMD160 b9d6cfa837432e89abe96f83ed53cc7865619b7c windowlab-1.32.ebuild 923
-SHA256 183dd86983b7367a9557d6b8a2dfe3d1ec4943bc11c2147052d86083d437d316 windowlab-1.32.ebuild 923
-MISC ChangeLog 3107 RMD160 ce26a21bcd7400ecc1069dad5c679f27e550235b SHA1 a5f44f2cec8b63828f5310ebfa363aa602a4d696 SHA256 9b3de9f47223f8a46fe19c37505232a9e114f93c4a3b4cb96d21408122de77ea
-MD5 24ecacde0de89cf3b2b62704c6428a51 ChangeLog 3107
-RMD160 ce26a21bcd7400ecc1069dad5c679f27e550235b ChangeLog 3107
-SHA256 9b3de9f47223f8a46fe19c37505232a9e114f93c4a3b4cb96d21408122de77ea ChangeLog 3107
+EBUILD windowlab-1.34.ebuild 1341 RMD160 1a77585ec3cdae04180ce9065bba76891e5aaa64 SHA1 646d51530d607788ab41d99a9222b501b1c458e6 SHA256 386d19a93f2f0e0080738c63a03eebcbc17f7a30c806af09d1d24d74eb0e6002
+MD5 3f2bebae82fa500b83700a5c269f896a windowlab-1.34.ebuild 1341
+RMD160 1a77585ec3cdae04180ce9065bba76891e5aaa64 windowlab-1.34.ebuild 1341
+SHA256 386d19a93f2f0e0080738c63a03eebcbc17f7a30c806af09d1d24d74eb0e6002 windowlab-1.34.ebuild 1341
+MISC ChangeLog 3407 RMD160 6738eb7ec2691ff8924aaee9edc76f81db9ce977 SHA1 bad1c4b9aa25ec9a5bad4374522c47f1ceb9b12e SHA256 837c749bbd160edaf9878a65e02a268c0ba923b8f75113943c71ccc9c79a51c9
+MD5 6ed9ec727a05b6c15b191a299af75d78 ChangeLog 3407
+RMD160 6738eb7ec2691ff8924aaee9edc76f81db9ce977 ChangeLog 3407
+SHA256 837c749bbd160edaf9878a65e02a268c0ba923b8f75113943c71ccc9c79a51c9 ChangeLog 3407
 MISC metadata.xml 744 RMD160 83e4563f874fbb164a1a2a17419a3beb7f31d019 SHA1 b00f637e675ed8bf9696d9489a41537bcd74eab0 SHA256 29878d31b1ff6c703334e4876e25a1aec0e0801116da2e336cec3d00fa117c39
 MD5 631a87a06351ea5153017bd01ef1a90a metadata.xml 744
 RMD160 83e4563f874fbb164a1a2a17419a3beb7f31d019 metadata.xml 744
@@ -30,13 +31,6 @@ SHA256 ba6af10cd8d604959e66df69615766109217a17a953068a68ec312f9a09ff8a2 files/di
 MD5 33c2f3318a266559a00d4ff311f369c3 files/digest-windowlab-1.31 235
 RMD160 408bd795b06255b6b719c69b8936a6195e89a2d9 files/digest-windowlab-1.31 235
 SHA256 3ef9e60bf64b377683a3ed14dd72f431d45f86ae41fbe464b542958ee738ae11 files/digest-windowlab-1.31 235
-MD5 cb78c8aa413050a96acdbe3e40aab5c9 files/digest-windowlab-1.32 235
-RMD160 63a23b2cf21d584fda18716291a0514678a3f8a3 files/digest-windowlab-1.32 235
-SHA256 cce7c3d8d2d214ed6ec197b92f88f9c5656d65a3ca969dda1bb0c3272fbd7d94 files/digest-windowlab-1.32 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFF3Mp9z974XjDVpbkRAoAEAJ9uc2Ts0JzLhB6EQPSSWm9BXb0PBACgvkA9
-JMNmXrq+NDVGRZ3qDtvnFms=
-=HdCC
------END PGP SIGNATURE-----
+MD5 d83d675f3d07e64c04ff842e71bb9d88 files/digest-windowlab-1.34 235
+RMD160 efb484fdc814f4bebfa38782df79d2476809ba76 files/digest-windowlab-1.34 235
+SHA256 622fb4b697270bd0a05df884813a904f5b908a6afddc68dc6117e1265b4b30c6 files/digest-windowlab-1.34 235
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"
+}