Adding modular X dependencies

Package-Manager: portage-2.0.53_rc7

diff --git a/sys-apps/apmd/ChangeLog b/sys-apps/apmd/ChangeLog
index 0333c766fa0eba2321e82e9f4f93cc7c2b305b27..8268fe1df015804a4e6378f314e4250d258287d8 100644 (file)
--- a/sys-apps/apmd/ChangeLog
+++ b/sys-apps/apmd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/apmd
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/ChangeLog,v 1.25 2005/09/15 01:43:20 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/ChangeLog,v 1.26 2005/11/09 07:19:24 compnerd Exp $
+
+  10 Nov 2005; Saleem Abdulrasool <compnerd@gentoo.org>
+  apmd-3.2.1_p4.ebuild:
+  Adding modular X dependencies
 
   15 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org> apmd-3.2.1_p4.ebuild:
   proper quoting and error checking

diff --git a/sys-apps/apmd/Manifest b/sys-apps/apmd/Manifest
index e872d9c0ca424f62187de1458a5da106c4a1cfb6..eb5302b11f000449a619c8e16bf022ef324e5aaa 100644 (file)
--- a/sys-apps/apmd/Manifest
+++ b/sys-apps/apmd/Manifest
@@ -1,14 +1,14 @@
+MD5 c69b7ddde24380ff318642f9d2bc0326 ChangeLog 3960
 MD5 88e3463d354ae8c261776456764ad06e apmd-3.0.2-r3.ebuild 1781
-MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159
-MD5 d7eac5d73a82b549ea0729c362e88a91 apmd-3.2.1_p4.ebuild 1732
 MD5 27e5317f463949dfc99f018f5fcc2527 apmd-3.2.0.ebuild 1856
-MD5 2375e71cebe5c1511de8c35225c34d7c ChangeLog 3848
-MD5 7bb0220959a949bad3d9726cf05ebcf9 files/digest-apmd-3.0.2-r3 61
-MD5 5aa18e3b8ad79d8893bddb038e29ab98 files/apmd.confd 161
-MD5 ad21c10734c08e19968e2c8c9560957c files/apmsleep.c.diff 367
+MD5 b1f0bde94ec7b38f1065226d075862df apmd-3.2.1_p4.ebuild 1881
 MD5 bed1c6668552bbf528df267c302a75eb files/apmd-3.2.0.kernel26x.patch 627
+MD5 5aa18e3b8ad79d8893bddb038e29ab98 files/apmd.confd 161
 MD5 02fc246d5b2fde52708927cb672239f1 files/apmd.kernel26x.patch 644
-MD5 648c4b025de00c2bf42aafaebed2f4ef files/digest-apmd-3.2.1_p4 130
 MD5 bdb989641f5be7797a3232a8691ebc66 files/apmd.rc6 672
-MD5 a2b499e3ffda161e88b518f5b830a434 files/digest-apmd-3.2.0 66
+MD5 ad21c10734c08e19968e2c8c9560957c files/apmsleep.c.diff 367
 MD5 253b79375ab72606e4fdf89109ed2c03 files/apmsleep.c.diff.3.2.0 301
+MD5 7bb0220959a949bad3d9726cf05ebcf9 files/digest-apmd-3.0.2-r3 61
+MD5 a2b499e3ffda161e88b518f5b830a434 files/digest-apmd-3.2.0 66
+MD5 d37ae27d1835ba334535714614c799dd files/digest-apmd-3.2.1_p4 130
+MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159

diff --git a/sys-apps/apmd/apmd-3.2.1_p4.ebuild b/sys-apps/apmd/apmd-3.2.1_p4.ebuild
index 9af22ee18733d0097ad87c25b73a31c5d25445bf..d56262ce1c4c814f8de551a234e1bb68ad013522 100644 (file)
--- a/sys-apps/apmd/apmd-3.2.1_p4.ebuild
+++ b/sys-apps/apmd/apmd-3.2.1_p4.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/sys-apps/apmd/apmd-3.2.1_p4.ebuild,v 1.15 2005/09/15 01:43:20 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.2.1_p4.ebuild,v 1.16 2005/11/09 07:19:24 compnerd Exp $
 
 inherit eutils multilib
 
@@ -19,7 +19,14 @@ KEYWORDS="amd64 ia64 ppc ppc64 x86"
 IUSE="X nls"
 
 RDEPEND=">=sys-apps/debianutils-1.16
-       X? ( virtual/x11 )"
+       X? ( || ( ( x11-libs/libX11
+                               x11-libs/libXaw
+                               x11-libs/libXmu
+                               x11-libs/libSM
+                               x11-libs/libICE
+                               x11-libs/libXt
+                               x11-libs/libXext )
+                               virtual/x11 ) )"
 DEPEND="${RDEPEND}
        virtual/os-headers"
 

diff --git a/sys-apps/apmd/files/digest-apmd-3.2.1_p4 b/sys-apps/apmd/files/digest-apmd-3.2.1_p4
index cb2b0a74303e59e615232e1f3abb088e9f798794..fc8c91abc105ab378899af1c0ddca1b19af43bc0 100644 (file)
--- a/sys-apps/apmd/files/digest-apmd-3.2.1_p4
+++ b/sys-apps/apmd/files/digest-apmd-3.2.1_p4
@@ -1,2 +1,2 @@
-MD5 99523e709f5033d3d64ad38d3954f7fc apmd_3.2.1.orig.tar.gz 72610
 MD5 3bec6042cc90c730209046fdc0b99ec1 apmd_3.2.1-4.diff.gz 22350
+MD5 99523e709f5033d3d64ad38d3954f7fc apmd_3.2.1.orig.tar.gz 72610