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

(Portage version: 2.1.3.19)

5 files changed, 65 insertions, 3 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/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}