Fixes for bug 97960 and bug 97961

(Portage version: 2.0.51.22-r1)

4 files changed, 26 insertions, 15 deletions

diff --git a/x11-wm/windowmaker/ChangeLog b/x11-wm/windowmaker/ChangeLog
index b7b63529c1bc..fe09f391fad6 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.55 2005/07/05 07:18:29 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.56 2005/07/06 23:07:18 fafhrd Exp $
+
+*windowmaker-0.92.0-r1 (06 Jul 2005)
+
+  06 Jul 2005; Armando Di Cianno <fafhrd@gentoo.org>
+  -windowmaker-0.92.0.ebuild, +windowmaker-0.92.0-r1.ebuild:
+  Fixes for bug 97960 and bug 97961
 
   05 Jul 2005; Armando Di Cianno <fafhrd@gentoo.org>
   windowmaker-0.92.0.ebuild:
diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index a670b48aca03..21c37f69cd75 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -1,16 +1,16 @@
 MD5 af77ad41a8f29bcb58d36f2816d8f91c windowmaker-0.91.0-r1.ebuild 5921
 MD5 350d1c8fc3f110fa9bbd0f7a681ec880 windowmaker-0.80.2-r2.ebuild 3463
+MD5 7dc9d4911f0fab546fec536ca6a6acff windowmaker-0.92.0-r1.ebuild 5193
 MD5 056f320591b95b4adaec5b906ae25035 windowmaker-0.80.2-r4.ebuild 4094
 MD5 6dfb07e767918268038ad952d0e38029 windowmaker-0.91.0-r7.ebuild 6800
 MD5 f755b394f5eb8cf550b56271032fb28e ChangeLog 14108
 MD5 641b83c6027dc91a4ac14e1749a58b41 metadata.xml 222
-MD5 c3d7cec14eac11ddae08b1fb772e62d9 windowmaker-0.92.0.ebuild 4911
 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 56fa606e28d04ba426e4d4cacc8d0b2d files/digest-windowmaker-0.92.0-r1 144
 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-r1
index 627c148d3bf4..627c148d3bf4 100644
--- a/x11-wm/windowmaker/files/digest-windowmaker-0.92.0
+++ b/x11-wm/windowmaker/files/digest-windowmaker-0.92.0-r1
diff --git a/x11-wm/windowmaker/windowmaker-0.92.0.ebuild b/x11-wm/windowmaker/windowmaker-0.92.0-r1.ebuild
index a27c719d0d8f..29cfd9fe901f 100644
--- a/x11-wm/windowmaker/windowmaker-0.92.0.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.92.0-r1.ebuild
@@ -1,8 +1,8 @@
 # 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.4 2005/07/05 07:18:29 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.92.0-r1.ebuild,v 1.1 2005/07/06 23:07:18 fafhrd Exp $
 
-inherit eutils gnustep-funcs flag-o-matic
+inherit eutils gnustep-funcs flag-o-matic multilib
 
 S=${WORKDIR}/${P/windowm/WindowM}
 
@@ -17,10 +17,10 @@ DEPEND="x11-base/xorg-x11
 	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 )"
+	tiff? ( >=media-libs/tiff-3.6.1-r2 )
+	gnustep? ( gnustep-base/gnustep-make )"
 RDEPEND="${DEPEND}
-	nls? ( >=sys-devel/gettext-0.10.39 )
-	gnustep? ( gnustep-base/gnustep-env )"
+	nls? ( >=sys-devel/gettext-0.10.39 )"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -53,11 +53,12 @@ src_compile() {
 
 	# integrate with GNUstep environment, or not
 	if use gnustep ; then
+		# install WPrefs.app into GS Local Domain after setting up the GS env
 		egnustep_env
-		myconf="${myconf} --with-gnustepdir=$(egnustep_system_root)/Applications"
+#		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"
+		myconf="${myconf} --with-gnustepdir=/usr/$(get_libdir)/GNUstep"
 	fi
 
 	if use nls; then
@@ -94,14 +95,18 @@ src_compile() {
 	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
+#				sed -e "s/\/usr\/local\/GNUstep/`cat ${TMP}/sed.gs_prefix`System/g;
+#					s/XXX_SED_FSLASH/\//g;" < $file > $file.tmp
+				sed -e "s:/usr/local/GNUstep:`cat ${TMP}/sed.gs_prefix`System:g;" \
+					-e "s:XXX_SED_FSLASH:/:g;" < $file > $file.tmp
 			else
-				sed -e 's/\/usr\/local\/GNUstep/\/usr\/lib\/GNUstep/g;' < $file > $file.tmp
+#				sed -e 's/\/usr\/local\/GNUstep/\/usr\/lib\/GNUstep/g;' < $file > $file.tmp
+				sed -e "s:/usr/local/GNUstep:/usr/$(get_libdir)/GNUstep:g;" < $file > $file.tmp
 			fi
 			mv $file.tmp $file;
 
-			sed -e 's/\/usr\/local\/share\/WindowMaker/\/usr\/share\/WindowMaker/g;' < $file > $file.tmp;
+#			sed -e 's/\/usr\/local\/share\/WindowMaker/\/usr\/share\/WindowMaker/g;' < $file > $file.tmp;
+			sed -e 's:/usr/local/share/WindowMaker:/usr/share/WindowMaker:g;' < $file > $file.tmp;
 			mv $file.tmp $file;
 		fi;
 	done;
@@ -158,7 +163,7 @@ src_install() {
 
 pkg_postinst() {
 	if use gnustep ; then
-		einfo "WPrefs.app is installed in you GNUstep System Applications directory."
+		einfo "WPrefs.app is installed in you GNUstep Local Domain Applications directory."
 	fi
 }