New version; upstream fixes for better NETWM support; keyworded for ~ppc

5 files changed, 161 insertions, 5 deletions

diff --git a/x11-wm/windowmaker/ChangeLog b/x11-wm/windowmaker/ChangeLog
index 9ab0b5545b80..d9624ab34630 100644
--- a/x11-wm/windowmaker/ChangeLog
+++ b/x11-wm/windowmaker/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/windowmaker
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.21 2004/10/29 19:58:05 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.22 2004/10/30 00:31:54 fafhrd Exp $
+
+*windowmaker-0.91.0 (29 Oct 2004)
+
+  29 Oct 2004; Armando Di Cianno <fafhrd@gentoo.org>
+  windowmaker-0.90.0.ebuild, +windowmaker-0.91.0.ebuild:
+  Version bump; new version for upstream changes for better NETWM support;
+  keyworded for ~ppc
 
   29 Oct 2004; Armando Di Cianno <fafhrd@gentoo.org> :
   Added depend for media-libs/fontconfig to 0.90.0
diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index 670cee07f614..162fc1b1b90d 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -1,10 +1,11 @@
-MD5 e8b1bce6f78c9ea2d2ee33a9a8e04791 ChangeLog 7321
 MD5 091028d21186597cb01d1440ed387951 metadata.xml 221
 MD5 ecb31937eebc5b0afa6785ec0afefe4d windowmaker-0.80.2-r1.ebuild 3408
 MD5 58b92f8943bac08e53aeeb01f640537a windowmaker-0.80.2-r2.ebuild 3437
 MD5 20ba3ee0e4036e307342671f74921913 windowmaker-0.80.2-r3.ebuild 3749
 MD5 3c3d6a630b21bdf50c422943b2cc79fe windowmaker-0.80.2-r4.ebuild 4034
-MD5 884afbc3930959726f4583659189ad62 windowmaker-0.90.0.ebuild 4317
+MD5 50d5ba4cd21cebfd55405d4a0fed8cd8 ChangeLog 7670
+MD5 248585ccd01b24785a7ce882b96d9d7f windowmaker-0.90.0.ebuild 4469
+MD5 8f3ef40b281864d1a0f778de5a5d92dd windowmaker-0.91.0.ebuild 4457
 MD5 b5304655d4ff5441989ab94a1bdc9506 files/digest-windowmaker-0.80.2-r1 144
 MD5 b5304655d4ff5441989ab94a1bdc9506 files/digest-windowmaker-0.80.2-r2 144
 MD5 b5304655d4ff5441989ab94a1bdc9506 files/digest-windowmaker-0.80.2-r3 144
@@ -16,3 +17,4 @@ MD5 9a5c9f1b2b44a678526f0fd71b2cf51d files/windowmaker-0.80.2-r1-gentoo.patch 43
 MD5 a062e261bd5aaca39bc17be01f07f1b6 files/wlist.patch 2776
 MD5 37aefa1e6f793583e8fa7890231d1721 files/wmfpo.patch 7696
 MD5 915c0fe65c24d54a1507f662d7b24114 files/xinerama.patch 26662
+MD5 8b11b75a0ece3b854bf47e03ded7e0ba files/digest-windowmaker-0.91.0 144
diff --git a/x11-wm/windowmaker/files/digest-windowmaker-0.91.0 b/x11-wm/windowmaker/files/digest-windowmaker-0.91.0
new file mode 100644
index 000000000000..8973161344f4
--- /dev/null
+++ b/x11-wm/windowmaker/files/digest-windowmaker-0.91.0
@@ -0,0 +1,2 @@
+MD5 be07953e905d1e42fe7a65ac2193a5f9 WindowMaker-0.91.0.tar.gz 2742380
+MD5 07c7700daaaf232bc490f5abaabef085 WindowMaker-extra-0.1.tar.gz 238018
diff --git a/x11-wm/windowmaker/windowmaker-0.90.0.ebuild b/x11-wm/windowmaker/windowmaker-0.90.0.ebuild
index bbb20256311d..5e0f7df7bfea 100644
--- a/x11-wm/windowmaker/windowmaker-0.90.0.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.90.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.90.0.ebuild,v 1.5 2004/10/29 19:55:42 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.90.0.ebuild,v 1.6 2004/10/30 00:31:54 fafhrd Exp $
 
 
 inherit eutils gnustep
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.g
 HOMEPAGE="http://www.windowmaker.org/"
 
 IUSE="gif gnustep jpeg nls png tiff modelock vdesktop xinerama"
-DEPEND="virtual/x11
+DEPEND="x11-base/xorg-x11
 	media-libs/fontconfig
 	gif? ( || ( >=media-libs/libungif-4.1.0
 			>=media-libs/giflib-4.1.0-r3))
@@ -133,6 +133,9 @@ pkg_postinst() {
 		ewarn "  are not off the screen, but rather in another virtual desktop."
 	fi
 
+	ewarn "This package provides libwraster.so.3.  Packages depending on"
+	ewarn "  libwraster.so.2 will have to be rebuilt, i.e. 'revdep-rebuild'"
+
 	ebeep 4
 	epause 4
 }
diff --git a/x11-wm/windowmaker/windowmaker-0.91.0.ebuild b/x11-wm/windowmaker/windowmaker-0.91.0.ebuild
new file mode 100644
index 000000000000..b953e2bb9061
--- /dev/null
+++ b/x11-wm/windowmaker/windowmaker-0.91.0.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.91.0.ebuild,v 1.1 2004/10/30 00:31:54 fafhrd Exp $
+
+
+inherit eutils gnustep
+
+S=${WORKDIR}/${P/windowm/WindowM}
+
+DESCRIPTION="The fast and light GNUstep window manager"
+SRC_URI="ftp://ftp.windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz
+	http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"
+HOMEPAGE="http://www.windowmaker.org/"
+
+IUSE="gif gnustep jpeg nls png tiff modelock vdesktop xinerama"
+DEPEND="x11-base/xorg-x11
+	media-libs/fontconfig
+	gif? ( || ( >=media-libs/libungif-4.1.0
+			>=media-libs/giflib-4.1.0-r3))
+	png? ( >=media-libs/libpng-1.2.1 )
+	jpeg? ( >=media-libs/jpeg-6b-r2 )
+	tiff? ( >=media-libs/tiff-3.6.1-r2 )"
+RDEPEND="nls? ( >=sys-devel/gettext-0.10.39 )
+	gnustep? ( gnustep-base/gnustep-env )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~ppc"
+
+src_compile() {
+	local myconf
+
+	# image format types
+	# xpm is provided by X itself
+	myconf="--enable-xpm $(use_enable png) $(use_enable jpeg) $(use_enable gif) $(use_enable tiff)"
+
+	# non required X capabilities
+	myconf="${myconf} $(use_enable modelock) $(use_enable vdesktop) $(use_enable xinerama)"
+
+	# integrate with GNUstep environment, or not
+	if use gnustep ; then
+		egnustep_env
+		myconf="${myconf} --with-appspath=${GNUSTEP_SYSTEM_ROOT}/Applications"
+	else
+		# no change from wm-0.80* ebuilds, as to not pollute things more
+		myconf="${myconf} --with-appspath=/usr/lib/GNUstep/Applications"
+	fi
+
+	use nls \
+		&& export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" \
+		|| myconf="${myconf} --disable-nls --disable-locale"
+
+	# default settings with $myconf appended
+	econf \
+		--sysconfdir=/etc/X11 \
+		--with-x \
+		--enable-usermenu \
+		--with-pixmapdir=/usr/share/pixmaps \
+		${myconf} || die
+
+	# don't know if zh_TW is still non-functional, but leaving it out still
+	#  for now
+	cd ${S}/po
+	cp Makefile Makefile.orig
+	sed 's:zh_TW.*::' \
+		Makefile.orig > Makefile
+
+	cd ${S}/WPrefs.app/po
+	cp Makefile Makefile.orig
+	sed 's:zh_TW.*::' \
+		Makefile.orig > Makefile
+
+	cd ${S}
+	for file in ${S}/WindowMaker/*menu*; do
+		if [ -r $file ]; then
+			if use gnustep ; then
+				sed -e 's/\/usr\/local\/GNUstep/\/usr\/GNUstep\/System/g;
+						s/\/usr\/local\/share\/WindowMaker/\/usr\/share\/WindowMaker/g;' < $file > $file.tmp;
+			else
+				sed -e 's/\/usr\/local\/GNUstep/\/usr\/lib\/GNUstep/g;
+						s/\/usr\/local\/share\/WindowMaker/\/usr\/share\/WindowMaker/g;' < $file > $file.tmp;
+			fi
+			mv $file.tmp $file;
+		fi;
+	done;
+
+	cd ${S}
+	emake -j1 || die "windowmaker: make has failed"
+
+	# WindowMaker Extra Package (themes and icons)
+	cd ../WindowMaker-extra-0.1
+	econf || die "windowmaker-extra: configure has failed"
+	emake || die "windowmaker-extra: make has failed"
+}
+
+src_install() {
+	emake install DESTDIR=${D} || die "windowmaker: install has failed."
+
+	dodoc AUTHORS BUGFORM BUGS ChangeLog COPYING* INSTALL* FAQ* \
+	      MIRRORS README* NEWS TODO
+
+	# WindowMaker Extra
+	cd ../WindowMaker-extra-0.1
+	emake install DESTDIR=${D} || die "windowmaker-extra: install failed"
+
+	newdoc README README.extra
+
+	# create wmaker session shell script
+	echo "#!/bin/bash" > wmaker
+	echo "/usr/bin/wmaker" >> wmaker
+	exeinto /etc/X11/Sessions/
+	doexe wmaker
+}
+
+pkg_postinst() {
+	einfo "If you are using 'startx' from the command line, and require"
+	einfo "  .xinitrc, you may need to execute 'wmaker.inst', which will"
+	einfo "  setup default configurations for you."
+
+	if use gnustep ; then
+		einfo "WPrefs.app is installed in you GNUstep System Applications directory."
+	else
+		einfo "Even though you are not using the GNUstep environment, wmaker.inst will"
+		einfo "  create a 'GNUstep' directory in your home -- it uses this dirctory"
+		einfo "  to store your WindowMaker configuration files."
+		einfo "WPrefs.app can be launched at /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs"
+		einfo "  or by simply clicking on it in the WindowMaker default dock."
+	fi
+
+	if use vdesktop ; then
+		ewarn "Note that enabling support for NETWM virtual desktops will make"
+		ewarn "  menus that should be autoscrolling seem to not scroll, as they"
+		ewarn "  are not off the screen, but rather in another virtual desktop."
+	fi
+
+	ewarn "This package provides libwraster.so.3.  Packages depending on"
+	ewarn "  libwraster.so.2 will have to be rebuilt, i.e. 'revdep-rebuild'"
+
+	ebeep 4
+	epause 4
+}
+