Clean up X RDEPEND, add desktop-file-utils as crossover uses that to generate menu entires, and stabilize.

(Portage version: 2.1.2_pre1)

8 files changed, 68 insertions, 39 deletions

diff --git a/app-emulation/crossover-office-bin/ChangeLog b/app-emulation/crossover-office-bin/ChangeLog
index 7c38df58c989..33d6fd9fdf30 100644
--- a/app-emulation/crossover-office-bin/ChangeLog
+++ b/app-emulation/crossover-office-bin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/crossover-office-bin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/ChangeLog,v 1.10 2006/06/28 03:27:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/ChangeLog,v 1.11 2006/09/24 10:11:33 vapier Exp $
+
+  24 Sep 2006; Mike Frysinger <vapier@gentoo.org>
+  crossover-office-bin-3.0.1.ebuild, crossover-office-bin-4.0.ebuild,
+  crossover-office-bin-4.1.ebuild, crossover-office-bin-4.2.ebuild,
+  crossover-office-bin-5.0.0.ebuild, crossover-office-bin-5.0.1.ebuild,
+  crossover-office-bin-5.0.3.ebuild:
+  Clean up X RDEPEND, add desktop-file-utils as crossover uses that to
+  generate menu entires, and stabilize.
 
 *crossover-office-bin-5.0.3 (28 Jun 2006)
 
diff --git a/app-emulation/crossover-office-bin/crossover-office-bin-3.0.1.ebuild b/app-emulation/crossover-office-bin/crossover-office-bin-3.0.1.ebuild
index 98b7f412eae3..81d319f7564c 100644
--- a/app-emulation/crossover-office-bin/crossover-office-bin-3.0.1.ebuild
+++ b/app-emulation/crossover-office-bin/crossover-office-bin-3.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-3.0.1.ebuild,v 1.8 2006/06/05 16:15:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-3.0.1.ebuild,v 1.9 2006/09/24 10:11:33 vapier Exp $
 
 inherit eutils
 
@@ -15,10 +15,13 @@ IUSE="nas"
 RESTRICT="fetch nostrip"
 
 RDEPEND="sys-libs/glibc
-	|| (
-		( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXmu x11-libs/libXxf86dga x11-libs/libXxf86vm )
-		virtual/x11
-	)
+	x11-libs/libXrandr
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXmu
+	x11-libs/libXxf86dga
+	x11-libs/libXxf86vm
+	dev-util/desktop-file-utils
 	nas? ( media-libs/nas )"
 
 S=${WORKDIR}
diff --git a/app-emulation/crossover-office-bin/crossover-office-bin-4.0.ebuild b/app-emulation/crossover-office-bin/crossover-office-bin-4.0.ebuild
index 4a0da73df839..fb7f8f63f9fb 100644
--- a/app-emulation/crossover-office-bin/crossover-office-bin-4.0.ebuild
+++ b/app-emulation/crossover-office-bin/crossover-office-bin-4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-4.0.ebuild,v 1.8 2006/06/05 16:15:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-4.0.ebuild,v 1.9 2006/09/24 10:11:33 vapier Exp $
 
 inherit eutils
 
@@ -15,10 +15,13 @@ IUSE="nas"
 RESTRICT="fetch nostrip"
 
 RDEPEND="sys-libs/glibc
-	|| (
-		( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXmu x11-libs/libXxf86dga x11-libs/libXxf86vm )
-		virtual/x11
-	)
+	x11-libs/libXrandr
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXmu
+	x11-libs/libXxf86dga
+	x11-libs/libXxf86vm
+	dev-util/desktop-file-utils
 	nas? ( media-libs/nas )"
 
 S=${WORKDIR}
diff --git a/app-emulation/crossover-office-bin/crossover-office-bin-4.1.ebuild b/app-emulation/crossover-office-bin/crossover-office-bin-4.1.ebuild
index 407036b8a2d4..97d80511336e 100644
--- a/app-emulation/crossover-office-bin/crossover-office-bin-4.1.ebuild
+++ b/app-emulation/crossover-office-bin/crossover-office-bin-4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-4.1.ebuild,v 1.9 2006/06/05 16:15:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-4.1.ebuild,v 1.10 2006/09/24 10:11:33 vapier Exp $
 
 inherit eutils
 
@@ -15,10 +15,13 @@ IUSE="nas"
 RESTRICT="fetch nostrip"
 
 RDEPEND="sys-libs/glibc
-	|| (
-		( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXmu x11-libs/libXxf86dga x11-libs/libXxf86vm )
-		virtual/x11
-	)
+	x11-libs/libXrandr
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXmu
+	x11-libs/libXxf86dga
+	x11-libs/libXxf86vm
+	dev-util/desktop-file-utils
 	nas? ( media-libs/nas )"
 
 S=${WORKDIR}
diff --git a/app-emulation/crossover-office-bin/crossover-office-bin-4.2.ebuild b/app-emulation/crossover-office-bin/crossover-office-bin-4.2.ebuild
index 7fe8ed7e976b..3efbee8096f5 100644
--- a/app-emulation/crossover-office-bin/crossover-office-bin-4.2.ebuild
+++ b/app-emulation/crossover-office-bin/crossover-office-bin-4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-4.2.ebuild,v 1.8 2006/06/05 16:15:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-4.2.ebuild,v 1.9 2006/09/24 10:11:33 vapier Exp $
 
 inherit eutils
 
@@ -15,10 +15,13 @@ IUSE="nas"
 RESTRICT="fetch nostrip"
 
 RDEPEND="sys-libs/glibc
-	|| (
-		( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXmu x11-libs/libXxf86dga x11-libs/libXxf86vm )
-		virtual/x11
-	)
+	x11-libs/libXrandr
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXmu
+	x11-libs/libXxf86dga
+	x11-libs/libXxf86vm
+	dev-util/desktop-file-utils
 	nas? ( media-libs/nas )
 	amd64? ( app-emulation/emul-linux-x86-xlibs )"
 
diff --git a/app-emulation/crossover-office-bin/crossover-office-bin-5.0.0.ebuild b/app-emulation/crossover-office-bin/crossover-office-bin-5.0.0.ebuild
index 35d354f245b8..0bea39df3dd1 100644
--- a/app-emulation/crossover-office-bin/crossover-office-bin-5.0.0.ebuild
+++ b/app-emulation/crossover-office-bin/crossover-office-bin-5.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-5.0.0.ebuild,v 1.6 2006/06/05 16:15:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-5.0.0.ebuild,v 1.7 2006/09/24 10:11:33 vapier Exp $
 
 inherit eutils
 
@@ -10,15 +10,18 @@ SRC_URI="install-crossover-standard-${PV}.sh"
 
 LICENSE="CROSSOVER"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="nas"
 RESTRICT="fetch nostrip"
 
 RDEPEND="sys-libs/glibc
-	|| (
-		( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXmu x11-libs/libXxf86dga x11-libs/libXxf86vm )
-		virtual/x11
-	)
+	x11-libs/libXrandr
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXmu
+	x11-libs/libXxf86dga
+	x11-libs/libXxf86vm
+	dev-util/desktop-file-utils
 	nas? ( media-libs/nas )
 	amd64? ( app-emulation/emul-linux-x86-xlibs )"
 
diff --git a/app-emulation/crossover-office-bin/crossover-office-bin-5.0.1.ebuild b/app-emulation/crossover-office-bin/crossover-office-bin-5.0.1.ebuild
index f5b044e4d7be..18af6d334736 100644
--- a/app-emulation/crossover-office-bin/crossover-office-bin-5.0.1.ebuild
+++ b/app-emulation/crossover-office-bin/crossover-office-bin-5.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-5.0.1.ebuild,v 1.3 2006/06/05 16:15:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-5.0.1.ebuild,v 1.4 2006/09/24 10:11:33 vapier Exp $
 
 inherit eutils
 
@@ -10,15 +10,18 @@ SRC_URI="install-crossover-standard-${PV}.sh"
 
 LICENSE="CROSSOVER"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="nas"
 RESTRICT="fetch nostrip"
 
 RDEPEND="sys-libs/glibc
-	|| (
-		( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXmu x11-libs/libXxf86dga x11-libs/libXxf86vm )
-		virtual/x11
-	)
+	x11-libs/libXrandr
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXmu
+	x11-libs/libXxf86dga
+	x11-libs/libXxf86vm
+	dev-util/desktop-file-utils
 	nas? ( media-libs/nas )
 	amd64? ( app-emulation/emul-linux-x86-xlibs )"
 
diff --git a/app-emulation/crossover-office-bin/crossover-office-bin-5.0.3.ebuild b/app-emulation/crossover-office-bin/crossover-office-bin-5.0.3.ebuild
index c4f986404839..b179172abd69 100644
--- a/app-emulation/crossover-office-bin/crossover-office-bin-5.0.3.ebuild
+++ b/app-emulation/crossover-office-bin/crossover-office-bin-5.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-5.0.3.ebuild,v 1.1 2006/06/28 03:27:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-5.0.3.ebuild,v 1.2 2006/09/24 10:11:33 vapier Exp $
 
 inherit eutils
 
@@ -10,15 +10,18 @@ SRC_URI="install-crossover-standard-${PV}.sh"
 
 LICENSE="CROSSOVER"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="nas"
 RESTRICT="fetch nostrip"
 
 RDEPEND="sys-libs/glibc
-	|| (
-		( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXmu x11-libs/libXxf86dga x11-libs/libXxf86vm )
-		virtual/x11
-	)
+	x11-libs/libXrandr
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXmu
+	x11-libs/libXxf86dga
+	x11-libs/libXxf86vm
+	dev-util/desktop-file-utils
 	nas? ( media-libs/nas )
 	amd64? ( app-emulation/emul-linux-x86-xlibs )"