Fixed circular dependencies (Bug #204006)

Package-Manager: portage-2.1.4_rc13

5 files changed, 20 insertions, 169 deletions

diff --git a/rox-base/rox/ChangeLog b/rox-base/rox/ChangeLog
index 31a415fc8951..d379aaa6c716 100644
--- a/rox-base/rox/ChangeLog
+++ b/rox-base/rox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for rox-base/rox
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/rox/ChangeLog,v 1.51 2007/12/21 17:28:20 lack Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox/ChangeLog,v 1.52 2008/01/02 12:39:49 lack Exp $
+
+  02 Jan 2008; Jim Ramsay <lack@gentoo.org> -rox-2.7-r1.ebuild,
+  rox-2.7-r2.ebuild:
+  Fixed circular dependencies (Bug #204006)
 
   21 Dec 2007; Jim Ramsay <lack@gentoo.org> rox-2.7-r2.ebuild:
   Minor QA fixes from a dberkholz review
diff --git a/rox-base/rox/Manifest b/rox-base/rox/Manifest
index df8a5feff733..7f1dd7f5fdf2 100644
--- a/rox-base/rox/Manifest
+++ b/rox-base/rox/Manifest
@@ -12,22 +12,18 @@ EBUILD rox-2.6.1.ebuild 2845 RMD160 21801617c5532fd71e63c4de6872c5f1e3d10ee1 SHA
 MD5 39916c579b032ac94a820ce86ee5b0dd rox-2.6.1.ebuild 2845
 RMD160 21801617c5532fd71e63c4de6872c5f1e3d10ee1 rox-2.6.1.ebuild 2845
 SHA256 18acd291bfeb0d42e17dfa613c09ff7e7b46e449d9af7234446760838c11b2a9 rox-2.6.1.ebuild 2845
-EBUILD rox-2.7-r1.ebuild 3627 RMD160 c7e3a764b0f475f4c2f43962353cf0e2dafbd1e1 SHA1 70f03a1921bc9be27b1c000614b9b460c5a5f7a0 SHA256 1f753f488a452eb9be92652a88b299b6fd68b67c46f4412268adf0ebcd7687f4
-MD5 95ec8e53a574c22bac9c7e9995fdb4c6 rox-2.7-r1.ebuild 3627
-RMD160 c7e3a764b0f475f4c2f43962353cf0e2dafbd1e1 rox-2.7-r1.ebuild 3627
-SHA256 1f753f488a452eb9be92652a88b299b6fd68b67c46f4412268adf0ebcd7687f4 rox-2.7-r1.ebuild 3627
-EBUILD rox-2.7-r2.ebuild 3627 RMD160 0f6c8ac4f471dd3ffdcef8b0f2801c733de7fe63 SHA1 2f6b76f66b00e7460e3ebb747b08b556bd2cb689 SHA256 c68e4988a126536f0e1f64b74fc1849a475c13296243e9d0b3d08852a23334c4
-MD5 7d441a635ed443e9890c56d6371369b3 rox-2.7-r2.ebuild 3627
-RMD160 0f6c8ac4f471dd3ffdcef8b0f2801c733de7fe63 rox-2.7-r2.ebuild 3627
-SHA256 c68e4988a126536f0e1f64b74fc1849a475c13296243e9d0b3d08852a23334c4 rox-2.7-r2.ebuild 3627
+EBUILD rox-2.7-r2.ebuild 3627 RMD160 d3e3204d7cf66f14bef5a673e5082428c994499e SHA1 041495c40045a2c1eaf5c0b35d66750ddd89b811 SHA256 063243fdc8f245f713c7f39a59ea818ebba6634b3748102bccbc9b9ad7e26f65
+MD5 28de79f6537454c2f557b2d2463d64d1 rox-2.7-r2.ebuild 3627
+RMD160 d3e3204d7cf66f14bef5a673e5082428c994499e rox-2.7-r2.ebuild 3627
+SHA256 063243fdc8f245f713c7f39a59ea818ebba6634b3748102bccbc9b9ad7e26f65 rox-2.7-r2.ebuild 3627
 EBUILD rox-2.7.ebuild 2845 RMD160 5903769110b983ce4661de3777268250ec2ab8c6 SHA1 e5b2f16ad1b4e21693f181407b4aec12acc7f54b SHA256 aaa9149406e454e0db341b4c1bb7a270d462477f6d9b2c0184da392922fb4726
 MD5 d64d7d908b21b1e0269df03c078f1c85 rox-2.7.ebuild 2845
 RMD160 5903769110b983ce4661de3777268250ec2ab8c6 rox-2.7.ebuild 2845
 SHA256 aaa9149406e454e0db341b4c1bb7a270d462477f6d9b2c0184da392922fb4726 rox-2.7.ebuild 2845
-MISC ChangeLog 11852 RMD160 b25681f1faa88050bce8b47487c0317ca0ff5d48 SHA1 bf9b8cc69f59b580a77e622e06f2d6bdcf252b9a SHA256 46137cf6564b8def181ea6942edbc10259429121b09466bd372423d7900cc0ae
-MD5 711dcefd22df73cfc64d9ee7cddfce39 ChangeLog 11852
-RMD160 b25681f1faa88050bce8b47487c0317ca0ff5d48 ChangeLog 11852
-SHA256 46137cf6564b8def181ea6942edbc10259429121b09466bd372423d7900cc0ae ChangeLog 11852
+MISC ChangeLog 11982 RMD160 190c1a477e33ef5090daeed9c3200c765687dce5 SHA1 2681e83562af28dda423d6cc327e00322174dfa8 SHA256 8530fa51bbfa8bb111d4df79e03c69a7a042147cc29ae878635dab4d46fc90d5
+MD5 14e7fa87fc3ae38ac79d10f214fe57a1 ChangeLog 11982
+RMD160 190c1a477e33ef5090daeed9c3200c765687dce5 ChangeLog 11982
+SHA256 8530fa51bbfa8bb111d4df79e03c69a7a042147cc29ae878635dab4d46fc90d5 ChangeLog 11982
 MISC metadata.xml 157 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f SHA1 54ccd31d923f052c9111f04c1a7d8b8f04f0a7b2 SHA256 941fe96a972d5a4f49555c01cbfab71d51e81ade3a53322fee549061aa17012c
 MD5 94ae74afbf5ec6b3f8cdcb4ea7c917bb metadata.xml 157
 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f metadata.xml 157
@@ -38,9 +34,6 @@ SHA256 f5661e10c0f8c11a2669919a00605727b7c259c8da5520ff44654075fdacdb9f files/di
 MD5 f4dab615e605d9428476e058ecad6f0d files/digest-rox-2.7 247
 RMD160 2f94fb7dbf60f13e48cc0cc6d7d93b55a2096c56 files/digest-rox-2.7 247
 SHA256 0568d16caeb6ed526c70d3beb69c674d9c4b3592ded4845d1281cd41cd628433 files/digest-rox-2.7 247
-MD5 f4dab615e605d9428476e058ecad6f0d files/digest-rox-2.7-r1 247
-RMD160 2f94fb7dbf60f13e48cc0cc6d7d93b55a2096c56 files/digest-rox-2.7-r1 247
-SHA256 0568d16caeb6ed526c70d3beb69c674d9c4b3592ded4845d1281cd41cd628433 files/digest-rox-2.7-r1 247
 MD5 f4dab615e605d9428476e058ecad6f0d files/digest-rox-2.7-r2 247
 RMD160 2f94fb7dbf60f13e48cc0cc6d7d93b55a2096c56 files/digest-rox-2.7-r2 247
 SHA256 0568d16caeb6ed526c70d3beb69c674d9c4b3592ded4845d1281cd41cd628433 files/digest-rox-2.7-r2 247
diff --git a/rox-base/rox/files/digest-rox-2.7-r1 b/rox-base/rox/files/digest-rox-2.7-r1
deleted file mode 100644
index b0b67dd7b832..000000000000
--- a/rox-base/rox/files/digest-rox-2.7-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6bdebb307c56173a0031ae3b0df6c6ac rox-filer-2.7.tar.bz2 1829001
-RMD160 f378129073b00e388559380fc551b23437cd4cbf rox-filer-2.7.tar.bz2 1829001
-SHA256 c43ad72760e5ef2c9150d00c7beae24c99c1df102443e87e6ccd969427a47c92 rox-filer-2.7.tar.bz2 1829001
diff --git a/rox-base/rox/rox-2.7-r1.ebuild b/rox-base/rox/rox-2.7-r1.ebuild
deleted file mode 100644
index e7d7ad80467b..000000000000
--- a/rox-base/rox/rox-2.7-r1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/rox/rox-2.7-r1.ebuild,v 1.1 2007/12/14 18:08:49 lack Exp $
-
-inherit eutils multilib
-
-MY_P="rox-filer-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="ROX is a desktop environment and filer based on RISC OS."
-HOMEPAGE="http://rox.sourceforge.net/"
-SRC_URI="mirror://sourceforge/rox/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="svg"
-
-RDEPEND=">=x11-libs/gtk+-2.4
-	>=dev-libs/glib-2.2
-	>=dev-libs/libxml2-2.4.23
-	>=x11-misc/shared-mime-info-0.14
-	svg? ( gnome-base/librsvg )
-	!ppc? ( rox-base/mime-editor
-		rox-base/thumbs
-		rox-extra/videothumbnail )"
-
-DEPEND="${RDEPEND}
-	>=rox-base/zeroinstall-injector-0.31-r1
-	>=dev-util/pkgconfig-0.20"
-
-APPNAME="ROX-Filer"
-APPDIR="/usr/$(get_libdir)/rox"
-LIBDIR="/usr/$(get_libdir)/"
-WRAPPERNAME="rox"
-MIMEDIR="/usr/share/mime"
-MIMECONFDIR="/etc/xdg/rox.sourceforge.net"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-nostrip.patch
-}
-
-src_compile() {
-
-	cd ${APPNAME}
-
-	# Most rox self-compiles have a 'read' call to wait for the user to
-	# press return if the compile fails.
-	# Find and remove this:
-	sed -i.bak -e 's/\<read WAIT\>/#read/' AppRun
-
-	./AppRun --compile || die "make failed"
-	(cd src; make clean) > /dev/null
-	# don't need these directories anymore
-	if [ -n "${KEEP_SRC}" ]; then
-		(cd src; make clean) > /dev/null
-	else
-		rm -rf src
-	fi
-	rm -fr build
-
-	# Restore the original AppRun
-	mv AppRun.bak AppRun
-}
-
-# new streamlined install
-
-src_install() {
-	doman rox.1
-
-	dodir ${APPDIR}
-	cp -r ${APPNAME}/ "${D}/${APPDIR}"
-
-	# add documentation to be proper
-	( cd ${APPNAME}/Help
-	dodoc Changes README README-es TODO
-	)
-
-	# install shell script
-	dodir /usr/bin
-
-	cat >"${D}/usr/bin/${WRAPPERNAME}" <<EOF
-#!/bin/sh
-if [[ "\${LIBDIRPATH}" ]]; then
-	export LIBDIRPATH="\${LIBDIRPATH}:${LIBDIR}"
-else
-	export LIBDIRPATH="${LIBDIR}"
-fi
-
-if [[ "\${APPDIRPATH}" ]]; then
-	export APPDIRPATH="\${APPDIRPATH}:${APPDIR}"
-else
-	export APPDIRPATH="${APPDIR}"
-fi
-exec "${APPDIR}/${APPNAME}/AppRun" "\$@"
-EOF
-
-	cat >"${D}/usr/bin/${WRAPPERNAME}uri" <<EOF
-#!/bin/sh
-exec "${APPDIR}/${APPNAME}/AppRun" -U "\$@"
-EOF
-
-	chmod 0755 "${D}/usr/bin/${WRAPPERNAME}"
-	chmod 0755 "${D}/usr/bin/${WRAPPERNAME}uri"
-
-	# install rox.xml
-	insinto ${MIMEDIR}/packages
-	doins rox.xml
-
-	# CHOICES system is gone. Now use XDG only
-	# these are shell scripts and must be +x.
-	exeinto ${MIMECONFDIR}/MIME-types
-	doexe Choices/MIME-types/*
-
-	insinto /usr/share/pixmaps
-	newins ${APPNAME}/.DirIcon ${APPNAME}.png
-
-	make_desktop_entry ${WRAPPERNAME} ${APPNAME} ${APPNAME}.png "System;Utility;Core;ROX"
-
-	# Install the 0install feed
-	local NATIVE_FEED_DIR="/usr/share/0install.net/native_feeds"
-	local ICON_CACHE_DIR="/var/cache/0install.net/interface_icons"
-
-	0distutils ${APPNAME}.xml > tmp.native_feed || die "0distutils feed edit	failed"
-	insinto "${APPDIR}/${APPNAME}"
-	newins tmp.native_feed ${APPNAME}.xml
-
-	local feedname
-	feedname=$(0distutils -e tmp.native_feed) || die "0distutils URI escape	failed"
-	dosym "${APPDIR}/${APPNAME}/${APPNAME}.xml" "${NATIVE_FEED_DIR}/${feedname}"
-
-	local cachedname
-	cachedname=$(0distutils -c tmp.native_feed) || die "0distutils URI escape	failed"
-	dosym "${APPDIR}/${APPNAME}/.DirIcon" "${ICON_CACHE_DIR}/${cachedname}"
-}
-
-pkg_postinst() {
-	update-mime-database ${MIMEDIR}
-	einfo "${APPNAME} has been installed in ${APPDIR}."
-	einfo "To run, you may type ${WRAPPERNAME} at a prompt (within a WM) or"
-	einfo "add it to an .xinit or other script during WM startup."
-}
diff --git a/rox-base/rox/rox-2.7-r2.ebuild b/rox-base/rox/rox-2.7-r2.ebuild
index 1953c7e0a43b..7dd39ec4ca50 100644
--- a/rox-base/rox/rox-2.7-r2.ebuild
+++ b/rox-base/rox/rox-2.7-r2.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/rox-2.7-r2.ebuild,v 1.2 2007/12/21 17:28:20 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox/rox-2.7-r2.ebuild,v 1.3 2008/01/02 12:39:49 lack Exp $
 
 EAPI=1
 inherit eutils multilib
@@ -21,10 +21,11 @@ RDEPEND=">=x11-libs/gtk+-2.4
 	>=dev-libs/glib-2.2
 	>=dev-libs/libxml2-2.4.23
 	>=x11-misc/shared-mime-info-0.14
-	svg? ( gnome-base/librsvg )
-	!ppc? ( rox-base/mime-editor
+	svg? ( gnome-base/librsvg )"
+
+PDEPEND="rox-base/mime-editor
 		rox-base/thumbs
-		video? ( rox-extra/videothumbnail ) )"
+		video? ( rox-extra/videothumbnail )"
 
 DEPEND="${RDEPEND}
 	>=rox-base/zeroinstall-injector-0.31-r1