Fix for a issues which surfaced with sandbox enabled. a patch for the makefile.*

4 files changed, 50 insertions, 4 deletions

diff --git a/x11-wm/afterstep/ChangeLog b/x11-wm/afterstep/ChangeLog
index c9324245177e..ef277611c0c3 100644
--- a/x11-wm/afterstep/ChangeLog
+++ b/x11-wm/afterstep/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/afterstep
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.13 2003/10/18 19:59:19 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.14 2003/10/21 09:59:04 raker Exp $
+
+  21 Oct 2003; Nick Hadaway <raker@gentoo.org> afterstep-2.00_beta2.ebuild:
+  See bug #31541.  Thanks to Doug Weimer and Mike Gardiner for providing
+  quick answers to a pesky little problem.
 
 *afterstep-2.0_beta2 (18 Oct 2003)
 
diff --git a/x11-wm/afterstep/Manifest b/x11-wm/afterstep/Manifest
index 046048c204d8..7d58a342d508 100644
--- a/x11-wm/afterstep/Manifest
+++ b/x11-wm/afterstep/Manifest
@@ -1,7 +1,7 @@
-MD5 6a10ba98d276d4ac297ae57c12e40ae0 afterstep-2.0_beta2.ebuild 3455
+MD5 9de9a95844ac45af0aae3f26169d7111 afterstep-2.0_beta2.ebuild 3492
 MD5 a32908f7e2101611a17ddb1aad85cf11 afterstep-1.8.11-r2.ebuild 1569
 MD5 98d3f2ff8a9e176c8a6e12867bd25e36 afterstep-1.8.11-r1.ebuild 1437
-MD5 e730e2803018d02fe83adf1a3862e0cb ChangeLog 2371
+MD5 03e738266245843d6a304425d87ab568 ChangeLog 2564
 MD5 9735d9a9bce29bcbd35792c0c4064ea0 files/digest-afterstep-1.8.11-r1 70
 MD5 9735d9a9bce29bcbd35792c0c4064ea0 files/digest-afterstep-1.8.11-r2 70
 MD5 f91d4b766b1c70d8c899ab9ffa55f7c2 files/digest-afterstep-2.0_beta2 74
diff --git a/x11-wm/afterstep/afterstep-2.0_beta2.ebuild b/x11-wm/afterstep/afterstep-2.0_beta2.ebuild
index 4a36e3d53dff..dc206c47093a 100644
--- a/x11-wm/afterstep/afterstep-2.0_beta2.ebuild
+++ b/x11-wm/afterstep/afterstep-2.0_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.0_beta2.ebuild,v 1.1 2003/10/18 19:59:19 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.0_beta2.ebuild,v 1.2 2003/10/21 09:59:04 raker Exp $
 
 IUSE="png jpeg gif tiff truetype xinerama debug mmx"
 
@@ -24,6 +24,13 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}/AfterStep-2.00.beta2"
 
+src_unpack () {
+	unpack ${A}
+	cd ${S}
+	# see bug #31541
+	epatch ${FILESDIR}/as2-gnome.diff
+}
+
 src_compile() {
 	local myconf
 
@@ -75,6 +82,9 @@ src_compile() {
 }
 
 src_install() {
+	# see bug #31541
+	dodir /usr/share/gnome/wm-properties
+
 	make DESTDIR=${D} install || die "make install failed"
 
 	# This fixes a bug with shared libraries
diff --git a/x11-wm/afterstep/files/as2-gnome.diff b/x11-wm/afterstep/files/as2-gnome.diff
new file mode 100644
index 000000000000..57b9343f62b9
--- /dev/null
+++ b/x11-wm/afterstep/files/as2-gnome.diff
@@ -0,0 +1,32 @@
+--- Makefile.in.old	2003-09-25 14:07:20.000000000 -0700
++++ Makefile.in	2003-10-19 16:17:00.000000000 -0700
+@@ -63,12 +63,13 @@
+ 	echo "If you want AfterStep to appear in your Gnome menu, please install as root."; \
+ 	fi \
+ 	fi
+-	@if [ -d /usr/share/gnome/wm-properties ] ; then \
+-	if [ -w /usr/share/gnome/wm-properties ] ; then \
+-	 echo $(CP) AfterStep.desktop /usr/share/gnome/wm-properties/; \
+-	 $(CP) AfterStep.desktop /usr/share/gnome/wm-properties/; \
++	@if [ -d $(GNOME_SHAREDIR)/wm-properties ] ; then \
++	if [ -w $(GNOME_SHAREDIR)/wm-properties ] ; then \
++	 echo $(CP) AfterStep.desktop $(GNOME_SHAREDESTDIR)/wm-properties/; \
++	 $(MKDIR) -p $(GNOME_SHAREDESTDIR)/wm-properties; \
++	 $(CP) AfterStep.desktop $(GNOME_SHAREDESTDIR)/wm-properties/; \
+ 	else \
+-	echo "/usr/share/gnome/wm-properties exists but is not writable."; \
++	echo "$(GNOME_SHAREDIR)/wm-properties exists but is not writable."; \
+ 	echo "If you want AfterStep to appear in your Gnome menu, please install as root."; \
+ 	fi \
+ 	fi
+--- autoconf/Makefile.defines.in.old	2003-08-22 23:28:44.000000000 -0700
++++ autoconf/Makefile.defines.in	2003-10-19 16:20:53.000000000 -0700
+@@ -55,6 +55,8 @@
+ AFTER_MAN_DIR	= $(DESTDIR)@mandir@/man1
+ AFTER_DOC_DIR	= $(DESTDIR)@datadir@/afterstep/doc
+ AFTER_SHAREDIR	= $(DESTDIR)@datadir@/afterstep
++GNOME_SHAREDIR  = @datadir@/gnome
++GNOME_SHAREDESTDIR  = $(DESTDIR)$(GNOME_SHAREDIR)
+ AFTER_DIR	= @with_afterdir@
+ AFTER_SAVE	= @with_afterdir@/.workspace_state
+ AFTER_NONCF	= @with_afterdir@/non-configurable