Updated ebuild for modular X

Package-Manager: portage-2.1_pre4-r1

diff --git a/app-portage/portagemaster/ChangeLog b/app-portage/portagemaster/ChangeLog
index 68a63f5f766469b6de6ee17de38988e14f2b7ee3..bf5ef607ae1b6bed58cef01933744be479948fa7 100644 (file)
--- a/app-portage/portagemaster/ChangeLog
+++ b/app-portage/portagemaster/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-portage/portagemaster
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/portagemaster/ChangeLog,v 1.17 2005/07/20 16:25:57 axxo Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/portagemaster/ChangeLog,v 1.18 2006/02/17 17:08:22 fuzzyray Exp $
+
+  17 Feb 2006; Paul Varner <fuzzyray@gentoo.org> portagemaster-0.2.1.ebuild:
+  Updated ebuild for modular X
 
   20 Jul 2005; Thomas Matthijs <axxo@gentoo.org>
   -portagemaster-0.2.0.ebuild, portagemaster-0.2.1.ebuild:

diff --git a/app-portage/portagemaster/Manifest b/app-portage/portagemaster/Manifest
index 47484261dbed4da782d82b1a4b2c0cd60adc9c13..506ca047420cf19f81608629319232b57253af9f 100644 (file)
--- a/app-portage/portagemaster/Manifest
+++ b/app-portage/portagemaster/Manifest
@@ -1,14 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 42001491f5e2a3dccaeb1a6cda31abcf portagemaster-0.2.1.ebuild 1038
-MD5 d4ed795ab9c91bc1530b212444f2bacc ChangeLog 3928
-MD5 fbb6fe345e65c9b7fa51b2ae10f85067 metadata.xml 166
+MD5 4574f6f5592a7d847a0ecb7edb8978ed ChangeLog 4041
+RMD160 fff382c69d0c6493186f2c72b622286eb3d5924d ChangeLog 4041
+SHA256 9249974f13c941a47d59f16d5c4b47ff329d44a6bc9949f970fabd9cfe865234 ChangeLog 4041
 MD5 bdde03313d53829930a6d1b30faa2681 files/digest-portagemaster-0.2.1 71
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC3nsu/rLF9B432nYRAgjpAKCqcN/KLPF6iNpt7ycOxH8VTZwOIQCcCrrB
-yoRkPp7UuUtSzYGkSGhNSyQ=
-=HPol
------END PGP SIGNATURE-----
+RMD160 a156d47c377e3e0d88a6011a866bb504a1ee8735 files/digest-portagemaster-0.2.1 71
+SHA256 b37d993d67c64402e65540b89c780134f1b8c175c5b236957e71906064f2f11f files/digest-portagemaster-0.2.1 71
+MD5 fbb6fe345e65c9b7fa51b2ae10f85067 metadata.xml 166
+RMD160 ca32b35979234f4c3cb4b824fb3c4b5c41bbb1b5 metadata.xml 166
+SHA256 3837555db151fa9c3afbe9eb1edff296df030efb574605d6d2b5b37228c2a021 metadata.xml 166
+MD5 a73ad94a3dc67d81de653fd961d3bfb3 portagemaster-0.2.1.ebuild 1222
+RMD160 ffb3840838583d2a759915cd012c20e6892515d0 portagemaster-0.2.1.ebuild 1222
+SHA256 ed7a621c4264416fd21487485fc609cc267636ca0f3ab3f2f369e4cb693f0f32 portagemaster-0.2.1.ebuild 1222

diff --git a/app-portage/portagemaster/portagemaster-0.2.1.ebuild b/app-portage/portagemaster/portagemaster-0.2.1.ebuild
index d8d5e6dceffa3d2e66c11ec242fd962a0d3b02ae..80777471058bdc2b640611bc6bc1f82f22bca060 100644 (file)
--- a/app-portage/portagemaster/portagemaster-0.2.1.ebuild
+++ b/app-portage/portagemaster/portagemaster-0.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/portagemaster/portagemaster-0.2.1.ebuild,v 1.16 2005/07/20 16:25:57 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/portagemaster/portagemaster-0.2.1.ebuild,v 1.17 2006/02/17 17:08:22 fuzzyray Exp $
 
 inherit java-pkg
 
@@ -17,7 +17,19 @@ DEPEND=">=virtual/jdk-1.4.1
        dev-java/ant-core
        jikes? ( >=dev-java/jikes-1.16 )"
 RDEPEND=">=virtual/jre-1.4.1
-                virtual/x11"
+       ( || ( (
+                               x11-libs/libICE
+                               x11-libs/libSM
+                               x11-libs/libX11
+                               x11-libs/libXext
+                               x11-libs/libXi
+                               x11-libs/libXp
+                               x11-libs/libXt
+                               x11-libs/libXtst
+                       )
+                       virtual/x11
+               )
+       )"
 
 S=${WORKDIR}/${PN}