Fixed install bug (#204157), and removed unnecessary pkg_preinst in all ebuilds

(Portage version: 2.1.4_rc14)

6 files changed, 18 insertions, 28 deletions

diff --git a/rox-base/rox-session/ChangeLog b/rox-base/rox-session/ChangeLog
index 156fe9b9bec9..580833472da6 100644
--- a/rox-base/rox-session/ChangeLog
+++ b/rox-base/rox-session/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for rox-base/rox-session
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-session/ChangeLog,v 1.29 2007/12/14 21:33:46 lack Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-session/ChangeLog,v 1.30 2008/01/03 18:49:26 lack Exp $
+
+*rox-session-0.30-r2 (03 Jan 2008)
+
+  03 Jan 2008; Jim Ramsay <lack@gentoo.org> files/rox-start,
+  rox-session-0.29.ebuild, rox-session-0.30.ebuild,
+  -rox-session-0.30-r1.ebuild, +rox-session-0.30-r2.ebuild:
+  Fixed major install bug in 0.30-r1 (#204157), and removed unneeded pkg_preinst
+  in all ebuilds
 
 *rox-session-0.30-r1 (14 Dec 2007)
 
diff --git a/rox-base/rox-session/files/digest-rox-session-0.30-r1 b/rox-base/rox-session/files/digest-rox-session-0.30-r2
index 2c6780d8dd0c..2c6780d8dd0c 100644
--- a/rox-base/rox-session/files/digest-rox-session-0.30-r1
+++ b/rox-base/rox-session/files/digest-rox-session-0.30-r2
diff --git a/rox-base/rox-session/files/rox-start b/rox-base/rox-session/files/rox-start
index e2105396656a..6e16a4112f8d 100644
--- a/rox-base/rox-session/files/rox-start
+++ b/rox-base/rox-session/files/rox-start
@@ -17,7 +17,7 @@ fi
 
 # Load a window manager. Keep trying until we find one that works!
 
-for wm in xfwm4 sawfish sawmill enlightenment wmaker icewm blackbox fluxbox \\
+for wm in xfwm4 sawfish sawmill enlightenment wmaker icewm blackbox fluxbox \
    metacity kwin kwm fvwm2 fvwm 4Dwm twm; do
   if [ -x "`which $wm`" ]; then break; fi;
 done
diff --git a/rox-base/rox-session/rox-session-0.29.ebuild b/rox-base/rox-session/rox-session-0.29.ebuild
index aa025819ea1b..283e1b1cb38b 100644
--- a/rox-base/rox-session/rox-session-0.29.ebuild
+++ b/rox-base/rox-session/rox-session-0.29.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-session/rox-session-0.29.ebuild,v 1.8 2007/12/14 21:33:46 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-session/rox-session-0.29.ebuild,v 1.9 2008/01/03 18:49:26 lack Exp $
 
 ROX_LIB_VER="2.0.0"
 inherit eutils rox
@@ -20,12 +20,6 @@ DEPEND="!rox-base/zeroinstall-injector"
 MY_PN="ROX-Session"
 APPNAME=${MY_PN}
 
-pkg_preinst() {
-	# need to fixup some permissions
-	cd "${D}/usr/lib/rox/${APPNAME}"
-	chmod 0755 browser Login RunROX SetupPanel
-}
-
 src_install() {
 	rox_src_install
 
diff --git a/rox-base/rox-session/rox-session-0.30-r1.ebuild b/rox-base/rox-session/rox-session-0.30-r2.ebuild
index edf61244d00a..0feaf30310da 100644
--- a/rox-base/rox-session/rox-session-0.30-r1.ebuild
+++ b/rox-base/rox-session/rox-session-0.30-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-session/rox-session-0.30-r1.ebuild,v 1.1 2007/12/14 21:33:46 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-session/rox-session-0.30-r2.ebuild,v 1.1 2008/01/03 18:49:26 lack Exp $
 
 ROX_LIB_VER="2.0.4-r1"
 ROX_VER="2.7-r1"
-inherit eutils rox multilib
+inherit eutils rox-0install multilib
 
 DESCRIPTION="Rox-Session is a really simple session manager"
 HOMEPAGE="http://rox.sourceforge.net/rox_session.html"
@@ -20,12 +20,6 @@ RDEPEND=">=dev-python/dbus-python-0.71"
 MY_PN="ROX-Session"
 APPNAME=${MY_PN}
 
-pkg_preinst() {
-	# need to fixup some permissions
-	cd "${D}/usr/$(get_libdir)/rox/${APPNAME}"
-	chmod 0755 browser Login RunROX SetupPanel
-}
-
 src_install() {
 	rox-0install_src_install
 
diff --git a/rox-base/rox-session/rox-session-0.30.ebuild b/rox-base/rox-session/rox-session-0.30.ebuild
index f2ae460e8b7e..03eda7464c7e 100644
--- a/rox-base/rox-session/rox-session-0.30.ebuild
+++ b/rox-base/rox-session/rox-session-0.30.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-session/rox-session-0.30.ebuild,v 1.6 2007/12/14 21:33:46 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-session/rox-session-0.30.ebuild,v 1.7 2008/01/03 18:49:26 lack Exp $
 
 ROX_LIB_VER="2.0.0"
 inherit eutils rox multilib
@@ -20,12 +20,6 @@ DEPEND="!rox-base/zeroinstall-injector"
 MY_PN="ROX-Session"
 APPNAME=${MY_PN}
 
-pkg_preinst() {
-	# need to fixup some permissions
-	cd "${D}/usr/$(get_libdir)/rox/${APPNAME}"
-	chmod 0755 browser Login RunROX SetupPanel
-}
-
 src_install() {
 	rox_src_install