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

(Portage version: 2.1.2_pre1)

5 files changed, 49 insertions, 33 deletions

diff --git a/app-emulation/crossover-office-pro-bin/ChangeLog b/app-emulation/crossover-office-pro-bin/ChangeLog
index b1b32ec6763c..c459d901455c 100644
--- a/app-emulation/crossover-office-pro-bin/ChangeLog
+++ b/app-emulation/crossover-office-pro-bin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/crossover-office-pro-bin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/ChangeLog,v 1.7 2006/07/20 05:05:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/ChangeLog,v 1.8 2006/09/24 10:12:28 vapier Exp $
+
+  24 Sep 2006; Mike Frysinger <vapier@gentoo.org>
+  crossover-office-pro-bin-4.2.ebuild,
+  crossover-office-pro-bin-5.0.0.ebuild,
+  crossover-office-pro-bin-5.0.1.ebuild,
+  crossover-office-pro-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-pro-bin-5.0.3 (20 Jul 2006)
 
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-4.2.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-4.2.ebuild
index 48e61b85ce2d..b93a38de90bc 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-4.2.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-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-pro-bin/crossover-office-pro-bin-4.2.ebuild,v 1.6 2006/06/05 16:14:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-4.2.ebuild,v 1.7 2006/09/24 10:12:28 vapier Exp $
 
 inherit eutils
 
@@ -10,16 +10,18 @@ SRC_URI="install-crossover-pro-${PV}.sh"
 
 LICENSE="CROSSOVER"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="nas"
 RESTRICT="fetch nostrip"
 
-RDEPEND="nas? ( media-libs/nas )
-	|| (
-		( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86dga x11-libs/libXxf86vm )
-		virtual/x11
-	)
-	sys-libs/glibc
+RDEPEND="sys-libs/glibc
+	x11-libs/libXrandr
+	x11-libs/libXi
+	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 )"
 
 S=${WORKDIR}
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.0.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.0.ebuild
index 6e78f634d2e3..08d015069e5e 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.0.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-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-pro-bin/crossover-office-pro-bin-5.0.0.ebuild,v 1.5 2006/06/05 16:14:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.0.ebuild,v 1.6 2006/09/24 10:12:28 vapier Exp $
 
 inherit eutils
 
@@ -10,16 +10,18 @@ SRC_URI="install-crossover-pro-${PV}.sh"
 
 LICENSE="CROSSOVER"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="nas"
 RESTRICT="fetch nostrip"
 
-RDEPEND="nas? ( media-libs/nas )
-	|| (
-		( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86dga x11-libs/libXxf86vm )
-		virtual/x11
-	)
-	sys-libs/glibc
+RDEPEND="sys-libs/glibc
+	x11-libs/libXrandr
+	x11-libs/libXi
+	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 )"
 
 S=${WORKDIR}
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.1.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.1.ebuild
index 400fe68ee484..9b400475fbf1 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.1.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-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-pro-bin/crossover-office-pro-bin-5.0.1.ebuild,v 1.3 2006/06/05 16:14:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.1.ebuild,v 1.4 2006/09/24 10:12:28 vapier Exp $
 
 inherit eutils
 
@@ -10,16 +10,18 @@ SRC_URI="install-crossover-pro-${PV}.sh"
 
 LICENSE="CROSSOVER"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="nas"
 RESTRICT="fetch nostrip"
 
-RDEPEND="nas? ( media-libs/nas )
-	|| (
-		( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86dga x11-libs/libXxf86vm )
-		virtual/x11
-	)
-	sys-libs/glibc
+RDEPEND="sys-libs/glibc
+	x11-libs/libXrandr
+	x11-libs/libXi
+	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 )"
 
 S=${WORKDIR}
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.3.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.3.ebuild
index 9a31d6976cd4..e763d1a93b71 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.3.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-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-pro-bin/crossover-office-pro-bin-5.0.3.ebuild,v 1.1 2006/07/20 05:05:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.3.ebuild,v 1.2 2006/09/24 10:12:28 vapier Exp $
 
 inherit eutils
 
@@ -10,16 +10,18 @@ SRC_URI="install-crossover-pro-${PV}.sh"
 
 LICENSE="CROSSOVER"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="nas"
 RESTRICT="fetch nostrip"
 
-RDEPEND="nas? ( media-libs/nas )
-	|| (
-		( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86dga x11-libs/libXxf86vm )
-		virtual/x11
-	)
-	sys-libs/glibc
+RDEPEND="sys-libs/glibc
+	x11-libs/libXrandr
+	x11-libs/libXi
+	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 )"
 
 S=${WORKDIR}