5 files changed, 22 insertions, 17 deletions
diff --git a/x11-wm/windowmaker/ChangeLog b/x11-wm/windowmaker/ChangeLog
index 7ac0564be141..5493baa5f0ff 100644
--- a/x11-wm/windowmaker/ChangeLog
+++ b/x11-wm/windowmaker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/windowmaker
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.63 2006/01/10 01:08:14 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.64 2006/01/12 01:07:56 metalgod Exp $
+
+  12 Jan 2006; Luis Medinas <metalgod@gentoo.org>
+  windowmaker-0.80.2-r2.ebuild, windowmaker-0.80.2-r4.ebuild,
+  windowmaker-0.92.0-r2.ebuild:
+  Fix dependency of 0.80.2 version to depend only of giflib. Filter -Os flag
+  that seems to be broken fixes bug #105155.
 
 *windowmaker-0.92.0-r2 (10 Jan 2006)
 
diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index 8926c287d518..8f9b37043cff 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 778f741143423fb239d69ee176cbaf36 ChangeLog 15424
+MD5 2df446e770e19ec748c922eac1cb3f7c ChangeLog 15691
 MD5 c8eb68627dc7b53b10143626018ff597 files/0.80.2/gtk2flickerfix.patch 1969
 MD5 a42a33a349ca84fb6e2cc5fdbd627b99 files/0.80.2/trance.patch.WM-0.80.2.diff 9738
 MD5 9a5c9f1b2b44a678526f0fd71b2cf51d files/0.80.2/windowmaker-0.80.2-r1-gentoo.patch 4331
@@ -23,16 +23,16 @@ MD5 56fa606e28d04ba426e4d4cacc8d0b2d files/digest-windowmaker-0.92.0-r1 144
 MD5 56fa606e28d04ba426e4d4cacc8d0b2d files/digest-windowmaker-0.92.0-r2 144
 MD5 f70c1e1b121cfc32dbd802678f3b111f files/wmaker.desktop 221
 MD5 5b56537f049f24c1e822d5d279e0fff4 metadata.xml 288
-MD5 350d1c8fc3f110fa9bbd0f7a681ec880 windowmaker-0.80.2-r2.ebuild 3463
-MD5 056f320591b95b4adaec5b906ae25035 windowmaker-0.80.2-r4.ebuild 4094
+MD5 4c2fa2e58f69afaa7e8b53a09868e07f windowmaker-0.80.2-r2.ebuild 3435
+MD5 1cd863edc032e958fe6cc7c58fbf8d26 windowmaker-0.80.2-r4.ebuild 4066
 MD5 0b7d5f0f23bea9a4793a92f25117d9f3 windowmaker-0.91.0-r1.ebuild 5881
 MD5 6dfb07e767918268038ad952d0e38029 windowmaker-0.91.0-r7.ebuild 6800
 MD5 7cd4046827ba9b7b99679af4c0a14586 windowmaker-0.92.0-r1.ebuild 5354
-MD5 21e5037aa8d2c458702857a109ed3530 windowmaker-0.92.0-r2.ebuild 5199
+MD5 fc719636563d4ef47b1be6726231374d windowmaker-0.92.0-r2.ebuild 5217
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDwwjwwUpWvClEHQoRAjpLAJsFs5HrSufX5jUkLOeOYBEiAFj8KQCfVYpZ
-/cFplHT8jVSznmRyb4wHyeM=
-=99Mj
+iD8DBQFDxau9wUpWvClEHQoRAtE0AJ0dMLfHxP3N9FyyZC2J+kmgj+j4LgCfTgii
+Tnqy8T8x+V+o/4/rbpWzyf0=
+=vRDT
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/windowmaker/windowmaker-0.80.2-r2.ebuild b/x11-wm/windowmaker/windowmaker-0.80.2-r2.ebuild
index d6342458ce6f..887f1b7e5e3d 100644
--- a/x11-wm/windowmaker/windowmaker-0.80.2-r2.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.80.2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.80.2-r2.ebuild,v 1.11 2005/06/24 00:32:26 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.80.2-r2.ebuild,v 1.12 2006/01/12 01:07:56 metalgod Exp $
 
 inherit eutils
 
@@ -16,8 +16,7 @@ HOMEPAGE="http://www.windowmaker.org/"
 DEPEND="virtual/x11
 	media-libs/hermes
 	>=media-libs/tiff-3.5.5
-	gif? ( >=media-libs/giflib-4.1.0-r3
-		>=media-libs/libungif-4.1.0 )
+	gif? ( >=media-libs/giflib-4.1.0-r3 )
 	png? ( >=media-libs/libpng-1.2.1 )
 	jpeg? ( >=media-libs/jpeg-6b-r2 )"
 
diff --git a/x11-wm/windowmaker/windowmaker-0.80.2-r4.ebuild b/x11-wm/windowmaker/windowmaker-0.80.2-r4.ebuild
index ba03cc98708f..f66193503adf 100644
--- a/x11-wm/windowmaker/windowmaker-0.80.2-r4.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.80.2-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.80.2-r4.ebuild,v 1.11 2005/06/24 00:32:26 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.80.2-r4.ebuild,v 1.12 2006/01/12 01:07:56 metalgod Exp $
 
 inherit eutils flag-o-matic
 filter-mfpmath "sse" "387"
@@ -18,8 +18,7 @@ HOMEPAGE="http://www.windowmaker.org/"
 DEPEND="virtual/x11
 	media-libs/hermes
 	>=media-libs/tiff-3.5.5
-	gif? ( >=media-libs/giflib-4.1.0-r3
-		>=media-libs/libungif-4.1.0 )
+	gif? ( >=media-libs/giflib-4.1.0-r3 )
 	png? ( >=media-libs/libpng-1.2.1 )
 	jpeg? ( >=media-libs/jpeg-6b-r2 )"
 
diff --git a/x11-wm/windowmaker/windowmaker-0.92.0-r2.ebuild b/x11-wm/windowmaker/windowmaker-0.92.0-r2.ebuild
index 7da31bea6352..c585e523c371 100644
--- a/x11-wm/windowmaker/windowmaker-0.92.0-r2.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.92.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.92.0-r2.ebuild,v 1.1 2006/01/10 01:08:14 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.92.0-r2.ebuild,v 1.2 2006/01/12 01:07:56 metalgod Exp $
 
 inherit eutils gnustep-funcs flag-o-matic multilib
 
@@ -33,6 +33,7 @@ fi
 src_unpack() {
 	is-flag -fstack-protector && filter-flags -fstack-protector \
 		&& ewarn "CFLAG -fstack-protector has been disabled, as it is known to cause bugs with WindowMaker (bug #78051)" && ebeep 2
+	filter-flags -Os
 	unpack ${A}
 	cd "${S}"
 	epatch ${FILESDIR}/${PV/0.92/0.91}/singleclick-shadeormaxopts-0.9x.patch2