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

Package-Manager: portage-2.1.4_rc14

7 files changed, 41 insertions, 51 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/Manifest b/rox-base/rox-session/Manifest
index e0be1e56b7c7..d29cba54e45b 100644
--- a/rox-base/rox-session/Manifest
+++ b/rox-base/rox-session/Manifest
@@ -1,25 +1,25 @@
-AUX rox-start 1116 RMD160 c3fdf89c98fa8818febcc94af5c11af2501d2008 SHA1 0d440126df1e9e60053adf1c35834785ff29c44d SHA256 13681414d1e98bd58d49ac2e1f2aff2670f2fa02b1172a9d9e39bc9d069bfe15
-MD5 fbbaab840519a479100468ecbf57479e files/rox-start 1116
-RMD160 c3fdf89c98fa8818febcc94af5c11af2501d2008 files/rox-start 1116
-SHA256 13681414d1e98bd58d49ac2e1f2aff2670f2fa02b1172a9d9e39bc9d069bfe15 files/rox-start 1116
+AUX rox-start 1115 RMD160 adb4c4ca3a5892da82e99f952165ed556322a2e5 SHA1 7992d2f67dd7e0dbd96e8c220450de83a84a3711 SHA256 0c8fc2a8562f42f2ffc05631ddfbc4237e2186f7ab013dcba92d3c3c0f21b1f3
+MD5 23039f746199e34cbf4d0724a2978e8f files/rox-start 1115
+RMD160 adb4c4ca3a5892da82e99f952165ed556322a2e5 files/rox-start 1115
+SHA256 0c8fc2a8562f42f2ffc05631ddfbc4237e2186f7ab013dcba92d3c3c0f21b1f3 files/rox-start 1115
 DIST rox-session-0.29.tar.bz2 130948 RMD160 1a9cbd125db8b3c949a04e798ebefa482b0e57ee SHA1 318833b3cb9901e72f2be432c9d32bc5e68c825e SHA256 c0899a372d7d39c787ae2cc3e02649dd1d6957156829f1689c7d3600f6e0d5b6
 DIST rox-session-0.30.tar.bz2 131563 RMD160 0c28efc9a86b0c3b2d7af05485dc510b6faf3373 SHA1 df506e6c3be111e015059bc70f983a9f0cea7d51 SHA256 c58f861aae4796a5191ee9a471fca9b8ac30978af954316ec1f650f5a1c336bd
-EBUILD rox-session-0.29.ebuild 1372 RMD160 4a1ca3df8f58910cec920e97d41f6a2f0af39d7c SHA1 11c842345d39df2cd5504c59efead1225a928a84 SHA256 859c3d355ff04b565dea4e50f3705e59899c49f65113b3ee9ee4792c60ce5e29
-MD5 84b1141428d5de2adfd33e707dccfdf7 rox-session-0.29.ebuild 1372
-RMD160 4a1ca3df8f58910cec920e97d41f6a2f0af39d7c rox-session-0.29.ebuild 1372
-SHA256 859c3d355ff04b565dea4e50f3705e59899c49f65113b3ee9ee4792c60ce5e29 rox-session-0.29.ebuild 1372
-EBUILD rox-session-0.30-r1.ebuild 1392 RMD160 025be39466f303d84c8e52f12baa343061c6db1d SHA1 eb9e02d2d314437aae8c85de201a0349a85e137b SHA256 dddf873612343c2ee35990a58cb18398cca4b0aaab995305c2158de90eea734d
-MD5 8b25de8025e688897ce084a76dd9d200 rox-session-0.30-r1.ebuild 1392
-RMD160 025be39466f303d84c8e52f12baa343061c6db1d rox-session-0.30-r1.ebuild 1392
-SHA256 dddf873612343c2ee35990a58cb18398cca4b0aaab995305c2158de90eea734d rox-session-0.30-r1.ebuild 1392
-EBUILD rox-session-0.30.ebuild 1398 RMD160 ae2a513850ad0066d8f28ea5f4c46ba728b5f7d9 SHA1 1d9e54bd0d1164573fbd86404f878e9c074a8087 SHA256 f0703f4b46923096e92b2e05d7a09368d813e2920ca54edbaad6a8c40d672fb5
-MD5 17af6c7163c7f74d6abd64648fb63165 rox-session-0.30.ebuild 1398
-RMD160 ae2a513850ad0066d8f28ea5f4c46ba728b5f7d9 rox-session-0.30.ebuild 1398
-SHA256 f0703f4b46923096e92b2e05d7a09368d813e2920ca54edbaad6a8c40d672fb5 rox-session-0.30.ebuild 1398
-MISC ChangeLog 5137 RMD160 c0f413a3ba0cde55cb4cafec7ac301a172bf1352 SHA1 8f2462f736737711723677c0515378b5f4060289 SHA256 922c3d1727c9328f5ed93c6450ea804ed9f565c0a83df07ca554cc3a1453abe2
-MD5 9de9da9817c5660d22b095eeec246aa4 ChangeLog 5137
-RMD160 c0f413a3ba0cde55cb4cafec7ac301a172bf1352 ChangeLog 5137
-SHA256 922c3d1727c9328f5ed93c6450ea804ed9f565c0a83df07ca554cc3a1453abe2 ChangeLog 5137
+EBUILD rox-session-0.29.ebuild 1241 RMD160 95137e9cfce191ef2e732433a6065fa516e14eac SHA1 312c816956061f81b961dafea74de22839ae6eed SHA256 ccd0b015cbc592b34f8a6b51390fda0b7f0eea40a3d891c15b1f1eb456aa0e2c
+MD5 4c55ff22b0a7b40288941f7ff25c79bc rox-session-0.29.ebuild 1241
+RMD160 95137e9cfce191ef2e732433a6065fa516e14eac rox-session-0.29.ebuild 1241
+SHA256 ccd0b015cbc592b34f8a6b51390fda0b7f0eea40a3d891c15b1f1eb456aa0e2c rox-session-0.29.ebuild 1241
+EBUILD rox-session-0.30-r2.ebuild 1260 RMD160 43fb88b36a542c082a22631f7dfb5b52eb49a44f SHA1 2956ece706a1d3a28eaa7720d4265c76ecb4ab69 SHA256 db1f8244ac1e20e8efa6b97d374748e8ce121ede6acd3984a95a172bff92d338
+MD5 f673da7640366a15fcc3fbb5613e09ad rox-session-0.30-r2.ebuild 1260
+RMD160 43fb88b36a542c082a22631f7dfb5b52eb49a44f rox-session-0.30-r2.ebuild 1260
+SHA256 db1f8244ac1e20e8efa6b97d374748e8ce121ede6acd3984a95a172bff92d338 rox-session-0.30-r2.ebuild 1260
+EBUILD rox-session-0.30.ebuild 1257 RMD160 a07595837c722be1d01ee35a50fb95e821bb0acf SHA1 75d893b73f872b052dd81f72cc85ccc77776a1ed SHA256 e5d55d05176d304305d3ce4193acb5283f44150eca75e86995ce7ac9b9151ef9
+MD5 ea0e044086a1b938966c5c5c31418fa9 rox-session-0.30.ebuild 1257
+RMD160 a07595837c722be1d01ee35a50fb95e821bb0acf rox-session-0.30.ebuild 1257
+SHA256 e5d55d05176d304305d3ce4193acb5283f44150eca75e86995ce7ac9b9151ef9 rox-session-0.30.ebuild 1257
+MISC ChangeLog 5445 RMD160 29c5717e881a0e1dcdd5eadfe0c846c5e71e5787 SHA1 5bb06e456fadaeb9f551ae3c9773ef80ce55d299 SHA256 6b09782f021b4fdc669300b1a005db53990afebbf019e7d3b4003637a1ddc881
+MD5 053b4707a17d65d6e09dc6d31f9f9f49 ChangeLog 5445
+RMD160 29c5717e881a0e1dcdd5eadfe0c846c5e71e5787 ChangeLog 5445
+SHA256 6b09782f021b4fdc669300b1a005db53990afebbf019e7d3b4003637a1ddc881 ChangeLog 5445
 MISC metadata.xml 157 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f SHA1 54ccd31d923f052c9111f04c1a7d8b8f04f0a7b2 SHA256 941fe96a972d5a4f49555c01cbfab71d51e81ade3a53322fee549061aa17012c
 MD5 94ae74afbf5ec6b3f8cdcb4ea7c917bb metadata.xml 157
 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f metadata.xml 157
@@ -30,6 +30,6 @@ SHA256 28cb7605e63b93b97dacfef90cf3e92e94603c63abc746f54a35356b869898ed files/di
 MD5 9fd7883126a104216fe17dd7f6ffec09 files/digest-rox-session-0.30 253
 RMD160 cf4bda797af2410646065f391dc85d8b59b566de files/digest-rox-session-0.30 253
 SHA256 4d9d57f170d22f4f616166e232ce9547afe8c1e1d8b2138a0a049457e16c953a files/digest-rox-session-0.30 253
-MD5 9fd7883126a104216fe17dd7f6ffec09 files/digest-rox-session-0.30-r1 253
-RMD160 cf4bda797af2410646065f391dc85d8b59b566de files/digest-rox-session-0.30-r1 253
-SHA256 4d9d57f170d22f4f616166e232ce9547afe8c1e1d8b2138a0a049457e16c953a files/digest-rox-session-0.30-r1 253
+MD5 9fd7883126a104216fe17dd7f6ffec09 files/digest-rox-session-0.30-r2 253
+RMD160 cf4bda797af2410646065f391dc85d8b59b566de files/digest-rox-session-0.30-r2 253
+SHA256 4d9d57f170d22f4f616166e232ce9547afe8c1e1d8b2138a0a049457e16c953a files/digest-rox-session-0.30-r2 253
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