Added fixes for sparc as having PLATFORM set causes problems between how rox is built and how it is run.

5 files changed, 36 insertions, 10 deletions

diff --git a/app-misc/rox/ChangeLog b/app-misc/rox/ChangeLog
index 9908d8405d05..f636c88388d3 100644
--- a/app-misc/rox/ChangeLog
+++ b/app-misc/rox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/rox
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/rox/ChangeLog,v 1.33 2004/08/13 21:38:55 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/rox/ChangeLog,v 1.34 2004/09/25 15:27:10 weeve Exp $
+
+  25 Sep 2004; Jason Wever <weeve@gentoo.org> rox-2.1.1.ebuild,
+  rox-2.1.2-r1.ebuild, rox-2.1.2.ebuild:
+  Added fixes for sparc as having PLATFORM set causes problems between how rox
+  is built and how it is run.
 
   13 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> rox-2.1.2.ebuild:
   Stable on alpha.
diff --git a/app-misc/rox/Manifest b/app-misc/rox/Manifest
index 82a7f3ab0889..1583e0841d3c 100644
--- a/app-misc/rox/Manifest
+++ b/app-misc/rox/Manifest
@@ -1,13 +1,13 @@
+MD5 4500a7a1a1ae6be6673a4da9c22da0ca ChangeLog 4323
 MD5 3e120dc78986425a06869aa67e7802ca rox-1.3.8.ebuild 988
-MD5 0bd26deb6ee401fbca2d4a1d7672c73e rox-2.1.2.ebuild 1366
 MD5 a70e66be5239d3edca7647afb969e077 rox-2.0.1.ebuild 1154
-MD5 12304275ee9463b5622d2f31984e20a3 rox-2.1.2-r1.ebuild 1491
-MD5 b0fb821a4de5fc6fdc59d3f56f786c15 rox-2.1.1.ebuild 1326
-MD5 450d6eb9085a96858cc5d875ee718e2b ChangeLog 4109
+MD5 c31a97b0caf824cdb2792fb0230966f9 rox-2.1.1.ebuild 1613
+MD5 8a0ddbe1e2538eb694bf6601504ec045 rox-2.1.2.ebuild 1655
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
+MD5 8520d1d6709a7aa08deab8ebce947d61 rox-2.1.2-r1.ebuild 1780
 MD5 526e20f6955fdb00bf18b1efec738419 files/digest-rox-1.3.8 59
 MD5 afcd1529de493af9538a32697d7e9425 files/digest-rox-2.0.1 59
-MD5 28718b65c90c80b4504087b0a962c5b7 files/digest-rox-2.1.1 59
 MD5 1b87808842975d1a74679c0e1ec956e9 files/digest-rox-2.1.2 59
-MD5 1b87808842975d1a74679c0e1ec956e9 files/digest-rox-2.1.2-r1 59
+MD5 28718b65c90c80b4504087b0a962c5b7 files/digest-rox-2.1.1 59
 MD5 16ef34ea63806f156b1cf68e34055f12 files/2.1.2-crash-save-display-settings.patch.bz2 1910
+MD5 1b87808842975d1a74679c0e1ec956e9 files/digest-rox-2.1.2-r1 59
diff --git a/app-misc/rox/rox-2.1.1.ebuild b/app-misc/rox/rox-2.1.1.ebuild
index d8bc69308fa4..de10b3c2f996 100644
--- a/app-misc/rox/rox-2.1.1.ebuild
+++ b/app-misc/rox/rox-2.1.1.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/app-misc/rox/rox-2.1.1.ebuild,v 1.6 2004/06/24 22:31:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/rox/rox-2.1.1.ebuild,v 1.7 2004/09/25 15:27:10 weeve Exp $
 
 DESCRIPTION="ROX is a desktop environment, like GNOME, KDE and XFCE.  It is an attempt to bring some of the good features from RISC OS to Unix and Linux."
 HOMEPAGE="http://rox.sourceforge.net/"
@@ -18,6 +18,13 @@ DEPEND=">=x11-libs/gtk+-2.0.5
 
 src_compile() {
 #	rm ROX-Filer/src/configure # see bug #26162
+
+	# If the env variable PLATFORM is set, rox will build using that
+	# string.  This causes issues as while the package will compile fine,
+	# it will try to rebuild it the first time rox is run because it will
+	# not be able to find a proper executable to run.
+	use sparc && unset PLATFORM
+
 	ROX-Filer/AppRun --compile || die "make failed"
 	(cd ROX-Filer/src; make clean) > /dev/null
 }
diff --git a/app-misc/rox/rox-2.1.2-r1.ebuild b/app-misc/rox/rox-2.1.2-r1.ebuild
index e7f57893a24a..8a65dc210e47 100644
--- a/app-misc/rox/rox-2.1.2-r1.ebuild
+++ b/app-misc/rox/rox-2.1.2-r1.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/app-misc/rox/rox-2.1.2-r1.ebuild,v 1.1 2004/08/02 08:07:33 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/rox/rox-2.1.2-r1.ebuild,v 1.2 2004/09/25 15:27:10 weeve Exp $
 
 inherit eutils
 
@@ -28,6 +28,13 @@ src_unpack() {
 
 src_compile() {
 #	rm ROX-Filer/src/configure # see bug #26162
+
+	# If the env variable PLATFORM is set, rox will build using that
+	# string.  This causes issues as while the package will compile fine,
+	# it will try to rebuild it the first time rox is run because it will
+	# not be able to find a proper executable to run.
+	use sparc && unset PLATFORM
+
 	ROX-Filer/AppRun --compile || die "make failed"
 	(cd ROX-Filer/src; make clean) > /dev/null
 }
diff --git a/app-misc/rox/rox-2.1.2.ebuild b/app-misc/rox/rox-2.1.2.ebuild
index a0a6c3a0c7ea..68b44d173c9d 100644
--- a/app-misc/rox/rox-2.1.2.ebuild
+++ b/app-misc/rox/rox-2.1.2.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/app-misc/rox/rox-2.1.2.ebuild,v 1.6 2004/08/13 21:38:55 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/rox/rox-2.1.2.ebuild,v 1.7 2004/09/25 15:27:10 weeve Exp $
 
 DESCRIPTION="ROX is a desktop environment, like GNOME, KDE and XFCE.  It is an attempt to bring some of the good features from RISC OS to Unix and Linux."
 HOMEPAGE="http://rox.sourceforge.net/"
@@ -20,6 +20,13 @@ IUSE="svg"
 
 src_compile() {
 #	rm ROX-Filer/src/configure # see bug #26162
+
+	# If the env variable PLATFORM is set, rox will build using that
+	# string.  This causes issues as while the package will compile fine,
+	# it will try to rebuild it the first time rox is run because it will
+	# not be able to find a proper executable to run.
+	use sparc && unset PLATFORM
+
 	ROX-Filer/AppRun --compile || die "make failed"
 	(cd ROX-Filer/src; make clean) > /dev/null
 }