Block rox-base/zeroinstall-injector for all but latest rox-session (and make latest require rox-2.7-r1 which has a native feed installed) - Bug 202275

Package-Manager: portage-2.1.3.19

7 files changed, 92 insertions, 23 deletions

diff --git a/rox-base/rox-session/ChangeLog b/rox-base/rox-session/ChangeLog
index c141b0912c68..156fe9b9bec9 100644
--- a/rox-base/rox-session/ChangeLog
+++ b/rox-base/rox-session/ChangeLog
@@ -1,6 +1,13 @@
 # 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.28 2007/11/29 15:20:44 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-session/ChangeLog,v 1.29 2007/12/14 21:33:46 lack Exp $
+
+*rox-session-0.30-r1 (14 Dec 2007)
+
+  14 Dec 2007; Jim Ramsay <lack@gentoo.org> rox-session-0.29.ebuild,
+  rox-session-0.30.ebuild, +rox-session-0.30-r1.ebuild:
+  Block rox-base/zeroinstall-injector for all but latest rox-session (and make
+  latest require rox-2.7-r1 which has a native feed installed) - Bug 202275
 
   29 Nov 2007; Jim Ramsay <lack@gentoo.org> -rox-session-0.1.21.ebuild,
   -rox-session-0.27-r1.ebuild:
diff --git a/rox-base/rox-session/Manifest b/rox-base/rox-session/Manifest
index 86507d5618b8..e0be1e56b7c7 100644
--- a/rox-base/rox-session/Manifest
+++ b/rox-base/rox-session/Manifest
@@ -4,18 +4,22 @@ RMD160 c3fdf89c98fa8818febcc94af5c11af2501d2008 files/rox-start 1116
 SHA256 13681414d1e98bd58d49ac2e1f2aff2670f2fa02b1172a9d9e39bc9d069bfe15 files/rox-start 1116
 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 1332 RMD160 2fdde11d072de07d6b3399386701484ef8f58ef4 SHA1 a818e3118d690f4b54c469ba44b8f095fa230d91 SHA256 5e03a0bc72ad209d0dd0c17e43cbc105ac509b07849199178472d966bdfbbd87
-MD5 485cb7acf37865b4483b217d16ebc463 rox-session-0.29.ebuild 1332
-RMD160 2fdde11d072de07d6b3399386701484ef8f58ef4 rox-session-0.29.ebuild 1332
-SHA256 5e03a0bc72ad209d0dd0c17e43cbc105ac509b07849199178472d966bdfbbd87 rox-session-0.29.ebuild 1332
-EBUILD rox-session-0.30.ebuild 1358 RMD160 4b177568e726f400d6422ee3c2e33cd1d255f766 SHA1 8c593635069a8c1bb12bd7119cc391d4c5d373da SHA256 9ba656786f48264a32ca66098fe5d2cb2b2fa601f119a123b1b84e62c933cac1
-MD5 6304c6f98873dd77cc63235e306e296c rox-session-0.30.ebuild 1358
-RMD160 4b177568e726f400d6422ee3c2e33cd1d255f766 rox-session-0.30.ebuild 1358
-SHA256 9ba656786f48264a32ca66098fe5d2cb2b2fa601f119a123b1b84e62c933cac1 rox-session-0.30.ebuild 1358
-MISC ChangeLog 4820 RMD160 a90dd366ce0ac1f95e28c865e6e6fd2a5978d0a6 SHA1 e0db7c33e32c9fa9a304849c74032a05b8968384 SHA256 73b0b6432027021d8aa68562af47b4e24446254d7de0f347e5c396a322ef1d6b
-MD5 a8e936294f54775d278dee4f9903634e ChangeLog 4820
-RMD160 a90dd366ce0ac1f95e28c865e6e6fd2a5978d0a6 ChangeLog 4820
-SHA256 73b0b6432027021d8aa68562af47b4e24446254d7de0f347e5c396a322ef1d6b ChangeLog 4820
+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
 MISC metadata.xml 157 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f SHA1 54ccd31d923f052c9111f04c1a7d8b8f04f0a7b2 SHA256 941fe96a972d5a4f49555c01cbfab71d51e81ade3a53322fee549061aa17012c
 MD5 94ae74afbf5ec6b3f8cdcb4ea7c917bb metadata.xml 157
 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f metadata.xml 157
@@ -26,3 +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
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-r1
new file mode 100644
index 000000000000..2c6780d8dd0c
--- /dev/null
+++ b/rox-base/rox-session/files/digest-rox-session-0.30-r1
@@ -0,0 +1,3 @@
+MD5 2fa5d235a779050bacc64d9852d825dd rox-session-0.30.tar.bz2 131563
+RMD160 0c28efc9a86b0c3b2d7af05485dc510b6faf3373 rox-session-0.30.tar.bz2 131563
+SHA256 c58f861aae4796a5191ee9a471fca9b8ac30978af954316ec1f650f5a1c336bd rox-session-0.30.tar.bz2 131563
diff --git a/rox-base/rox-session/rox-session-0.29.ebuild b/rox-base/rox-session/rox-session-0.29.ebuild
index 3f7a3023ebf4..aa025819ea1b 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
 # 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.7 2007/11/29 15:20:44 lack Exp $
+# $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 $
 
 ROX_LIB_VER="2.0.0"
 inherit eutils rox
@@ -15,6 +15,7 @@ KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
 RDEPEND=">=dev-python/dbus-python-0.71"
+DEPEND="!rox-base/zeroinstall-injector"
 
 MY_PN="ROX-Session"
 APPNAME=${MY_PN}
diff --git a/rox-base/rox-session/rox-session-0.30-r1.ebuild b/rox-base/rox-session/rox-session-0.30-r1.ebuild
new file mode 100644
index 000000000000..edf61244d00a
--- /dev/null
+++ b/rox-base/rox-session/rox-session-0.30-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2007 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 $
+
+ROX_LIB_VER="2.0.4-r1"
+ROX_VER="2.7-r1"
+inherit eutils rox multilib
+
+DESCRIPTION="Rox-Session is a really simple session manager"
+HOMEPAGE="http://rox.sourceforge.net/rox_session.html"
+SRC_URI="mirror://sourceforge/rox/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+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
+
+	dobin "${FILESDIR}/rox-start"
+
+	local wm="rox"
+	make_session_desktop "ROX Desktop" /usr/bin/rox-start
+
+	dodir /etc/X11/Sessions
+	echo "/usr/bin/rox-start" > "${D}/etc/X11/Sessions/ROX_Desktop"
+	fperms a+x /etc/X11/Sessions/ROX_Desktop
+}
+
+pkg_postinst() {
+	echo
+	einfo "ROX-Session has been installed into ${APPDIR}"
+	einfo "Please review its documentation about proper use. A symlink"
+	einfo "for the executable has been created as /usr/bin/${WRAPPERNAME}."
+	echo
+	einfo "It has also been installed as an X Session, so you should be"
+	einfo "able to select it in the Session list of gdm or kdm"
+}
diff --git a/rox-base/rox-session/rox-session-0.30.ebuild b/rox-base/rox-session/rox-session-0.30.ebuild
index b569c29bb0f2..f2ae460e8b7e 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
 # 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.5 2007/11/15 19:35:23 drac Exp $
+# $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 $
 
 ROX_LIB_VER="2.0.0"
 inherit eutils rox multilib
@@ -15,6 +15,7 @@ KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-python/dbus-python-0.71"
+DEPEND="!rox-base/zeroinstall-injector"
 
 MY_PN="ROX-Session"
 APPNAME=${MY_PN}
diff --git a/rox-base/zeroinstall-injector/Manifest b/rox-base/zeroinstall-injector/Manifest
index 16cbc3eee115..911f922cf526 100644
--- a/rox-base/zeroinstall-injector/Manifest
+++ b/rox-base/zeroinstall-injector/Manifest
@@ -7,14 +7,14 @@ MD5 bc8c747409ee57787778ffeee9d7c00c files/global.cfg 74
 RMD160 bb2aa8c35d498342388c7e280c303f9869f9e6a3 files/global.cfg 74
 SHA256 00e469a631692d515af084f43e9d854ae0ae4fa7a312b61a3050d4fb5caf6f47 files/global.cfg 74
 DIST zeroinstall-injector-0.31.tar.bz2 121422 RMD160 6ad3e2490beca3ab40a073f896d0d8e38ac3263d SHA1 c784bd4d0b57d27c58bb37830bae67e2267c64b2 SHA256 ffb821bc30c298122800557bea60fbcf8370dd10324f1a10d6862d131cd4b462
-EBUILD zeroinstall-injector-0.31-r1.ebuild 893 RMD160 5f67c59bafcc1729e12b3d957e082fe5e3dc03f0 SHA1 954a77ec5208ec771e28860c47a396f3bef01ade SHA256 edc5ad110e5830202756fa6b3e9fa177c808cbb8a9c53489f94bb6652840e2a7
-MD5 5c6064de874730790949d8bf7c8d3937 zeroinstall-injector-0.31-r1.ebuild 893
-RMD160 5f67c59bafcc1729e12b3d957e082fe5e3dc03f0 zeroinstall-injector-0.31-r1.ebuild 893
-SHA256 edc5ad110e5830202756fa6b3e9fa177c808cbb8a9c53489f94bb6652840e2a7 zeroinstall-injector-0.31-r1.ebuild 893
-MISC ChangeLog 813 RMD160 9595e9fa11d1ee7fce308ac6c876a2012346a48f SHA1 6077fd73111e786e5b36e879553f5cbaaf7f9669 SHA256 f17ae60047b70305f0236d1950df733c881a0db55216025292400f2cddb091de
-MD5 601a50e8f2cd54d56a3ea87a5400243f ChangeLog 813
-RMD160 9595e9fa11d1ee7fce308ac6c876a2012346a48f ChangeLog 813
-SHA256 f17ae60047b70305f0236d1950df733c881a0db55216025292400f2cddb091de ChangeLog 813
+EBUILD zeroinstall-injector-0.31-r1.ebuild 918 RMD160 da723f7929cadcb46575f140c46b3d8a9c225482 SHA1 eb2610dae5ee6a16630ff66bc360f4c122c0958b SHA256 9af1b074ff5487147fa22c070a98f7f8b45a67bf3f669ec2f1eacf5f92b1da96
+MD5 3915e906a60747c299def701abb00f8a zeroinstall-injector-0.31-r1.ebuild 918
+RMD160 da723f7929cadcb46575f140c46b3d8a9c225482 zeroinstall-injector-0.31-r1.ebuild 918
+SHA256 9af1b074ff5487147fa22c070a98f7f8b45a67bf3f669ec2f1eacf5f92b1da96 zeroinstall-injector-0.31-r1.ebuild 918
+MISC ChangeLog 946 RMD160 0eae64e18bc2b731e96a45ab55572e99343235c9 SHA1 530781533801f3059cbd0c21a28fcc10d73aed77 SHA256 3438e736e69708fb7e0b50d542fd7532b187afec1824d2ba79b134a05be52105
+MD5 55c70f6df3a0d12b00ec7ee3ef1d5438 ChangeLog 946
+RMD160 0eae64e18bc2b731e96a45ab55572e99343235c9 ChangeLog 946
+SHA256 3438e736e69708fb7e0b50d542fd7532b187afec1824d2ba79b134a05be52105 ChangeLog 946
 MISC metadata.xml 157 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f SHA1 54ccd31d923f052c9111f04c1a7d8b8f04f0a7b2 SHA256 941fe96a972d5a4f49555c01cbfab71d51e81ade3a53322fee549061aa17012c
 MD5 94ae74afbf5ec6b3f8cdcb4ea7c917bb metadata.xml 157
 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f metadata.xml 157