Add modular X depends

Package-Manager: portage-2.0.51.22-r2

11 files changed, 20 insertions, 149 deletions

diff --git a/www-client/mozilla-launcher/ChangeLog b/www-client/mozilla-launcher/ChangeLog
index 118fcff0148a..1bc4b8e9d268 100644
--- a/www-client/mozilla-launcher/ChangeLog
+++ b/www-client/mozilla-launcher/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/mozilla-launcher
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-launcher/ChangeLog,v 1.31 2005/08/17 16:37:44 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-launcher/ChangeLog,v 1.32 2005/08/17 16:41:54 agriffis Exp $
+
+  17 Aug 2005; Aron Griffis <agriffis@gentoo.org>
+  -mozilla-launcher-1.35.ebuild, -mozilla-launcher-1.39.ebuild,
+  -mozilla-launcher-1.41.ebuild, mozilla-launcher-1.42.ebuild,
+  mozilla-launcher-1.44.ebuild, mozilla-launcher-1.45.ebuild:
+  Add modular X depends
 
 *mozilla-launcher-1.45 (17 Aug 2005)
 
diff --git a/www-client/mozilla-launcher/Manifest b/www-client/mozilla-launcher/Manifest
index b4d7edd6ae1a..a8ffe13bfc76 100644
--- a/www-client/mozilla-launcher/Manifest
+++ b/www-client/mozilla-launcher/Manifest
@@ -1,18 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 6345e8113d69dc31206bcf47b7ebb4d3 mozilla-launcher-1.45.ebuild 932
-MD5 3f7a862c42e829c39f7584466c830172 mozilla-launcher-1.42.ebuild 921
-MD5 e27a084f6eb15720eb5e9182c53a576f mozilla-launcher-1.44.ebuild 932
-MD5 8f813a83fb8f29bd6c860c9dde7d7e63 mozilla-launcher-1.35.ebuild 1015
-MD5 ca39cdecc420c119a976ba736ea46303 mozilla-launcher-1.41.ebuild 1015
-MD5 1ad517839f4bf6b47828cb149333c1b7 ChangeLog 15777
+MD5 333d3f42ae1b0ba773f96f67c80fe566 mozilla-launcher-1.45.ebuild 991
+MD5 7de71c6349a1b8214a62f2f99fc4c620 mozilla-launcher-1.42.ebuild 1014
+MD5 470a366e8cd05547a0b976710fe7e877 mozilla-launcher-1.44.ebuild 1024
+MD5 c0d5d35aca333b48e8ee4bca7a5d6fda ChangeLog 16041
 MD5 cc0891c820a717f0335919e48e686cbe metadata.xml 222
-MD5 70a19e8491ee4674aaa4c92412570584 mozilla-launcher-1.39.ebuild 1025
 MD5 be5a0ad8bb87165cb87a3b52b109b0f5 files/mozilla-launcher-1.41-multilib.patch 1457
-MD5 a69b664a54ef105f276f52f14670092d files/digest-mozilla-launcher-1.35 68
-MD5 a0bbf60e5a59de57c03c4a23e5e3d22d files/digest-mozilla-launcher-1.39 68
-MD5 75b4e03263918476c53b6cac8bac2e9d files/digest-mozilla-launcher-1.41 68
 MD5 8b51f2f7080e8882dfe65666d4fc3c96 files/digest-mozilla-launcher-1.42 68
 MD5 291ed170a9f784d43616dbaa4936381f files/digest-mozilla-launcher-1.44 68
 MD5 d757f8b84d0cc93ac988c839ec461e5b files/digest-mozilla-launcher-1.45 68
@@ -21,7 +15,7 @@ MD5 29ef6c963fe90532a8d9c606f8b6b885 files/mozilla-launcher-1.39-multilib.patch
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFDA2ftBXaUFmZvwyMRAuDIAKCzGmxJ5io9qDBhiviJBJ67zXudIACbBakY
-BFRp6O9ujU22+Sqd+xmCkuo=
-=e2uS
+iD8DBQFDA2jnBXaUFmZvwyMRAucoAJ4rk5PV6HvC5GQ9g8dkHniCSVlOoQCg3SDc
+dCWyWZqgyEv7/gwoBQ+DkPA=
+=IPSr
 -----END PGP SIGNATURE-----
diff --git a/www-client/mozilla-launcher/files/digest-mozilla-launcher-1.35 b/www-client/mozilla-launcher/files/digest-mozilla-launcher-1.35
deleted file mode 100644
index 1e439b423757..000000000000
--- a/www-client/mozilla-launcher/files/digest-mozilla-launcher-1.35
+++ /dev/null
@@ -1 +0,0 @@
-MD5 87ff82c6f62d6d34f02a7820ba213996 mozilla-launcher-1.35.bz2 6987
diff --git a/www-client/mozilla-launcher/files/digest-mozilla-launcher-1.39 b/www-client/mozilla-launcher/files/digest-mozilla-launcher-1.39
deleted file mode 100644
index cc19c5da4242..000000000000
--- a/www-client/mozilla-launcher/files/digest-mozilla-launcher-1.39
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fd611e8d3d6676ae9ca0c5c3041afba9 mozilla-launcher-1.39.bz2 6471
diff --git a/www-client/mozilla-launcher/files/digest-mozilla-launcher-1.41 b/www-client/mozilla-launcher/files/digest-mozilla-launcher-1.41
deleted file mode 100644
index d2c736707a10..000000000000
--- a/www-client/mozilla-launcher/files/digest-mozilla-launcher-1.41
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0a19920e6d25ac6227cac1a9bbb7b2d3 mozilla-launcher-1.41.bz2 6591
diff --git a/www-client/mozilla-launcher/mozilla-launcher-1.35.ebuild b/www-client/mozilla-launcher/mozilla-launcher-1.35.ebuild
deleted file mode 100644
index fbe5a5abed0b..000000000000
--- a/www-client/mozilla-launcher/mozilla-launcher-1.35.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-launcher/mozilla-launcher-1.35.ebuild,v 1.2 2005/07/18 15:03:17 agriffis Exp $
-
-inherit eutils
-
-DESCRIPTION="Script that launches mozilla or firefox"
-HOMEPAGE="http://dev.gentoo.org/~agriffis/dist/"
-SRC_URI="mirror://gentoo/${P}.bz2 \
-		http://dev.gentoo.org/~agriffis/dist/${P}.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	use amd64 && epatch ${FILESDIR}/${P}-multilib.patch
-}
-
-src_install() {
-	exeinto /usr/libexec
-	newexe ${P} mozilla-launcher || die
-}
-
-pkg_postinst() {
-	local f
-
-	find ${ROOT}/usr/bin -maxdepth 1 -type l | \
-	while read f; do
-		[[ $(readlink ${f}) == mozilla-launcher ]] || continue
-		einfo "Updating ${f} symlink to /usr/libexec/mozilla-launcher"
-		ln -sfn /usr/libexec/mozilla-launcher ${f}
-	done
-}
diff --git a/www-client/mozilla-launcher/mozilla-launcher-1.39.ebuild b/www-client/mozilla-launcher/mozilla-launcher-1.39.ebuild
deleted file mode 100644
index 7c7f8e424296..000000000000
--- a/www-client/mozilla-launcher/mozilla-launcher-1.39.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-launcher/mozilla-launcher-1.39.ebuild,v 1.1 2005/07/21 12:46:49 agriffis Exp $
-
-inherit eutils
-
-DESCRIPTION="Script that launches mozilla or firefox"
-HOMEPAGE="http://dev.gentoo.org/~agriffis/dist/"
-SRC_URI="mirror://gentoo/${P}.bz2 \
-		http://dev.gentoo.org/~agriffis/dist/${P}.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	use amd64 && epatch ${FILESDIR}/${P}-multilib.patch
-}
-
-src_install() {
-	exeinto /usr/libexec
-	newexe ${P} mozilla-launcher || die
-}
-
-pkg_postinst() {
-	local f
-
-	find ${ROOT}/usr/bin -maxdepth 1 -type l | \
-	while read f; do
-		[[ $(readlink ${f}) == mozilla-launcher ]] || continue
-		einfo "Updating ${f} symlink to /usr/libexec/mozilla-launcher"
-		ln -sfn /usr/libexec/mozilla-launcher ${f}
-	done
-}
diff --git a/www-client/mozilla-launcher/mozilla-launcher-1.41.ebuild b/www-client/mozilla-launcher/mozilla-launcher-1.41.ebuild
deleted file mode 100644
index 85c3661f1107..000000000000
--- a/www-client/mozilla-launcher/mozilla-launcher-1.41.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-launcher/mozilla-launcher-1.41.ebuild,v 1.2 2005/07/22 20:35:46 agriffis Exp $
-
-inherit eutils
-
-DESCRIPTION="Script that launches mozilla or firefox"
-HOMEPAGE="http://dev.gentoo.org/~agriffis/dist/"
-SRC_URI="mirror://gentoo/${P}.bz2 \
-		http://dev.gentoo.org/~agriffis/dist/${P}.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	use amd64 && epatch ${FILESDIR}/${P}-multilib.patch
-}
-
-src_install() {
-	exeinto /usr/libexec
-	newexe ${P} mozilla-launcher || die
-}
-
-pkg_postinst() {
-	local f
-
-	find ${ROOT}/usr/bin -maxdepth 1 -type l | \
-	while read f; do
-		[[ $(readlink ${f}) == mozilla-launcher ]] || continue
-		einfo "Updating ${f} symlink to /usr/libexec/mozilla-launcher"
-		ln -sfn /usr/libexec/mozilla-launcher ${f}
-	done
-}
diff --git a/www-client/mozilla-launcher/mozilla-launcher-1.42.ebuild b/www-client/mozilla-launcher/mozilla-launcher-1.42.ebuild
index 2ff7c5ae8ef3..83d73577d05f 100644
--- a/www-client/mozilla-launcher/mozilla-launcher-1.42.ebuild
+++ b/www-client/mozilla-launcher/mozilla-launcher-1.42.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-launcher/mozilla-launcher-1.42.ebuild,v 1.2 2005/08/10 00:36:02 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-launcher/mozilla-launcher-1.42.ebuild,v 1.3 2005/08/17 16:41:54 agriffis Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND=""
-RDEPEND=""
+RDEPEND="|| ( ( x11-misc/xtoolwait x11-apps/xwininfo x11-apps/xdpyinfo x11-apps/xprop ) virtual/x11 )"
 
 S=${WORKDIR}
 
diff --git a/www-client/mozilla-launcher/mozilla-launcher-1.44.ebuild b/www-client/mozilla-launcher/mozilla-launcher-1.44.ebuild
index 4d6a220e2b51..0c61a3d30bf1 100644
--- a/www-client/mozilla-launcher/mozilla-launcher-1.44.ebuild
+++ b/www-client/mozilla-launcher/mozilla-launcher-1.44.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-launcher/mozilla-launcher-1.44.ebuild,v 1.1 2005/07/25 03:47:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-launcher/mozilla-launcher-1.44.ebuild,v 1.2 2005/08/17 16:41:54 agriffis Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND=""
-RDEPEND=""
+RDEPEND="|| ( ( x11-misc/xtoolwait x11-apps/xwininfo x11-apps/xdpyinfo x11-apps/xprop ) virtual/x11 )"
 
 S=${WORKDIR}
 
diff --git a/www-client/mozilla-launcher/mozilla-launcher-1.45.ebuild b/www-client/mozilla-launcher/mozilla-launcher-1.45.ebuild
index f5000648ffa5..ab61c84e11b1 100644
--- a/www-client/mozilla-launcher/mozilla-launcher-1.45.ebuild
+++ b/www-client/mozilla-launcher/mozilla-launcher-1.45.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-launcher/mozilla-launcher-1.45.ebuild,v 1.1 2005/08/17 16:37:44 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-launcher/mozilla-launcher-1.45.ebuild,v 1.2 2005/08/17 16:41:54 agriffis Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND=""
-RDEPEND=""
+RDEPEND="|| ( ( x11-misc/xtoolwait x11-apps/xdpyinfo ) virtual/x11 )"
 
 S=${WORKDIR}