Version bump

Package-Manager: portage-2.0.51.22-r1

4 files changed, 171 insertions, 2 deletions

diff --git a/x11-wm/windowmaker/ChangeLog b/x11-wm/windowmaker/ChangeLog
index fcd14fee2309..693ae78901b1 100644
--- a/x11-wm/windowmaker/ChangeLog
+++ b/x11-wm/windowmaker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/windowmaker
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.51 2005/06/24 00:32:26 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.52 2005/07/04 23:46:33 fafhrd Exp $
+
+*windowmaker-0.92.0 (04 Jul 2005)
+
+  04 Jul 2005; Armando Di Cianno <fafhrd@gentoo.org>
+  +windowmaker-0.92.0.ebuild:
+  Version bump
 
   24 Jun 2005; Armando Di Cianno <fafhrd@gentoo.org>
   windowmaker-0.80.2-r2.ebuild, windowmaker-0.80.2-r4.ebuild,
diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index 9e6e672d83a8..bcf4ea07ff06 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -2,13 +2,15 @@ MD5 af77ad41a8f29bcb58d36f2816d8f91c windowmaker-0.91.0-r1.ebuild 5921
 MD5 350d1c8fc3f110fa9bbd0f7a681ec880 windowmaker-0.80.2-r2.ebuild 3463
 MD5 056f320591b95b4adaec5b906ae25035 windowmaker-0.80.2-r4.ebuild 4094
 MD5 6dfb07e767918268038ad952d0e38029 windowmaker-0.91.0-r7.ebuild 6800
-MD5 c7b5eeda22c550245cd2004dab7dc59f ChangeLog 13624
+MD5 0ae4e6348309e808c04a207dc84ae102 ChangeLog 13758
 MD5 641b83c6027dc91a4ac14e1749a58b41 metadata.xml 222
+MD5 228801166ef0c9232fb3d2bb112d8113 windowmaker-0.92.0.ebuild 4774
 MD5 b5304655d4ff5441989ab94a1bdc9506 files/digest-windowmaker-0.80.2-r2 144
 MD5 b5304655d4ff5441989ab94a1bdc9506 files/digest-windowmaker-0.80.2-r4 144
 MD5 8b11b75a0ece3b854bf47e03ded7e0ba files/digest-windowmaker-0.91.0-r1 144
 MD5 4c748a4dd9d3e57dfe5c1d01ccac4b54 files/digest-windowmaker-0.91.0-r7 227
 MD5 f70c1e1b121cfc32dbd802678f3b111f files/wmaker.desktop 221
+MD5 56fa606e28d04ba426e4d4cacc8d0b2d files/digest-windowmaker-0.92.0 144
 MD5 a42a33a349ca84fb6e2cc5fdbd627b99 files/0.80.2/trance.patch.WM-0.80.2.diff 9738
 MD5 c8eb68627dc7b53b10143626018ff597 files/0.80.2/gtk2flickerfix.patch 1969
 MD5 a062e261bd5aaca39bc17be01f07f1b6 files/0.80.2/wlist.patch 2776
diff --git a/x11-wm/windowmaker/files/digest-windowmaker-0.92.0 b/x11-wm/windowmaker/files/digest-windowmaker-0.92.0
new file mode 100644
index 000000000000..627c148d3bf4
--- /dev/null
+++ b/x11-wm/windowmaker/files/digest-windowmaker-0.92.0
@@ -0,0 +1,2 @@
+MD5 678cb4a9b22a557cfb524dc3cb457c08 WindowMaker-0.92.0.tar.gz 2758524
+MD5 07c7700daaaf232bc490f5abaabef085 WindowMaker-extra-0.1.tar.gz 238018
diff --git a/x11-wm/windowmaker/windowmaker-0.92.0.ebuild b/x11-wm/windowmaker/windowmaker-0.92.0.ebuild
new file mode 100644
index 000000000000..0130ffd385da
--- /dev/null
+++ b/x11-wm/windowmaker/windowmaker-0.92.0.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2005 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.ebuild,v 1.1 2005/07/04 23:46:33 fafhrd Exp $
+
+inherit eutils gnustep-funcs flag-o-matic
+
+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 xinerama"
+DEPEND="x11-base/xorg-x11
+	media-libs/fontconfig
+	gif? ( >=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="${DEPEND}
+	nls? ( >=sys-devel/gettext-0.10.39 )
+	gnustep? ( gnustep-base/gnustep-env )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~mips ~alpha"
+
+if use gnustep; then
+	egnustep_install_domain "Local"
+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
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV/0.92/0.91}/singleclick-shadeormaxopts-0.9x.patch2 || die "single click and shade-or-maximize-options patch failed"
+	epatch ${FILESDIR}/${PV/0.92/0.91}/wlist-0.9x.patch || die "window list patch failed"
+#	epatch ${FILESDIR}/${PV}/64bit+endian-fixes-0.9x.patch || die "64-bit + endian fix patch failed"
+}
+
+src_compile() {
+	local myconf
+	local gs_user_postfix
+
+	# 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 xinerama)"
+
+	# integrate with GNUstep environment, or not
+	if use gnustep ; then
+		egnustep_env
+		myconf="${myconf} --with-gnustepdir=$(egnustep_system_root)/Applications"
+	else
+		# no change from wm-0.80* ebuilds, as to not pollute things more
+		myconf="${myconf} --with-gnustepdir=/usr/lib/GNUstep/Applications"
+	fi
+
+	use nls \
+		&& export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" \
+		|| myconf="${myconf} --disable-locale"
+
+	# default settings with $myconf appended
+	econf \
+		--sysconfdir=/etc/X11 \
+		--with-x \
+		--enable-usermenu \
+		--with-pixmapdir=/usr/share/pixmaps \
+		${myconf} || die
+
+#	# call here needed as some users report breakage with one of the above
+#	#  patches (though patched after autoreconf)
+#	libtoolize --copy --force
+
+#	# 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/`cat ${TMP}/sed.gs_prefix`System/g;
+					s/XXX_SED_FSLASH/\//g;" < $file > $file.tmp
+			else
+				sed -e 's/\/usr\/local\/GNUstep/\/usr\/lib\/GNUstep/g;' < $file > $file.tmp
+			fi
+			mv $file.tmp $file;
+
+			sed -e 's/\/usr\/local\/share\/WindowMaker/\/usr\/share\/WindowMaker/g;' < $file > $file.tmp;
+			mv $file.tmp $file;
+		fi;
+	done;
+
+	cd ${S}
+	emake -j1 || die "windowmaker: make has failed"
+
+	cd ${S}
+	for file in ${S}/WindowMaker/Defaults/W*; do
+		if [ -r $file ]; then
+			if use gnustep; then
+				sed -e "s/\$HOME\/GNUstep\//\$HOME`cat ${TMP}/sed.gs_user_root_suffix`/g;
+						s/XXX_SED_FSLASH/\//g;" < $file > $file.tmp
+				mv $file.tmp $file;
+
+				sed -e "s/~\/GNUstep\//~`cat ${TMP}/sed.gs_user_root_suffix`/g;
+						s/XXX_SED_FSLASH/\//g;" < $file > $file.tmp
+				mv $file.tmp $file;
+			fi
+		fi
+	done;
+
+	# 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
+
+	insinto /etc/X11/dm/Sessions
+	doins ${FILESDIR}/wmaker.desktop
+	make_desktop_entry /usr/bin/wmaker
+}
+
+pkg_postinst() {
+	if use gnustep ; then
+		einfo "WPrefs.app is installed in you GNUstep System Applications directory."
+	fi
+}
+