Added modular X dependencies

(Portage version: 2.1_pre5-r2)

6 files changed, 81 insertions, 31 deletions

diff --git a/x11-wm/kahakai/ChangeLog b/x11-wm/kahakai/ChangeLog
index 0d4e179cf832..45ab98dbc664 100644
--- a/x11-wm/kahakai/ChangeLog
+++ b/x11-wm/kahakai/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/kahakai
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/kahakai/ChangeLog,v 1.22 2005/11/09 12:58:43 gustavoz Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/kahakai/ChangeLog,v 1.23 2006/03/04 14:32:33 nixphoeni Exp $
+
+  04 Mar 2006; Joe Sapp <nixphoeni@gentoo.org> metadata.xml,
+  kahakai-0.6.2_p20040306.ebuild:
+  Added modular X dependencies
 
   09 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kahakai-0.6.2.ebuild,
   kahakai-0.6.2_p20040306.ebuild:
diff --git a/x11-wm/kahakai/Manifest b/x11-wm/kahakai/Manifest
index 43f8cdf1620b..324e1013a9cd 100644
--- a/x11-wm/kahakai/Manifest
+++ b/x11-wm/kahakai/Manifest
@@ -1,20 +1,30 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 792e82456e408b35d5c5e4c1b356b285 kahakai-0.6.2.ebuild 922
-MD5 457ec946aee3a372a2cfb95510c25827 kahakai-0.6.2_p20040306.ebuild 1394
-MD5 699fabc1c2c244d84340f335922e775f kahakai-0.6.1.ebuild 911
-MD5 d44c54204fcd3653a3adb368c969d66e ChangeLog 3433
-MD5 e4b5d6602d355a5e9e4ef0ce55b85d78 metadata.xml 313
-MD5 05643c680d338ffa309acf593c757288 files/digest-kahakai-0.6.2_p20040306 75
-MD5 8ab0d5129e5a4405451162db4ec765c1 files/kahakai-0.6.2_p20040306-compilation_fix.patch 248
+MD5 8d23317c1fd09250905a5247a1e367c5 ChangeLog 3560
+RMD160 cd70b10fd30c42e1f8a2de86d9de81c5a7eab73f ChangeLog 3560
+SHA256 d511853f15113ddfb4c5f01d13bf64563224d50e42e1e4d6cf5afc0a938ae416 ChangeLog 3560
 MD5 a6f928a370849148c784071b429d2322 files/digest-kahakai-0.6.1 66
+RMD160 2b5f085480ec76e840f726ddb6797a523c94ed0d files/digest-kahakai-0.6.1 66
+SHA256 02deaf8886c3e2129333c8de43578fae8d90571019c6c85ff33bf16e4823c9b0 files/digest-kahakai-0.6.1 66
 MD5 389f67e9f9e4c3b7c0d97fa260bc7f0a files/digest-kahakai-0.6.2 66
+RMD160 4221a999f21bc1a9536a5e32e5e534734d6f1305 files/digest-kahakai-0.6.2 66
+SHA256 fed8beb8ea4a4a0eb793b866eac6d02b047025cab3322d6714dc42a3a8dc0b52 files/digest-kahakai-0.6.2 66
+MD5 05643c680d338ffa309acf593c757288 files/digest-kahakai-0.6.2_p20040306 75
+RMD160 dd4df6fce81fe76edfba83fd7514d90af43aceed files/digest-kahakai-0.6.2_p20040306 75
+SHA256 cc237b97950c5d629f468122f0ebd3185ad9d2074f995fd14b39b11d9c9e7f50 files/digest-kahakai-0.6.2_p20040306 75
+MD5 8ab0d5129e5a4405451162db4ec765c1 files/kahakai-0.6.2_p20040306-compilation_fix.patch 248
+RMD160 f5a34bbb9700299c1be19fe47bd43b168f39b7f7 files/kahakai-0.6.2_p20040306-compilation_fix.patch 248
+SHA256 c1852f52d9d17b9bc5be6713b7e1fccda8dc4a5bd44f71c7f5836c42532fb4d2 files/kahakai-0.6.2_p20040306-compilation_fix.patch 248
 MD5 1a798baa62c1a3dcacefef7bdcc1af79 files/kahakai-0.6.2_p20040306-rubyscript-gentoo.diff 229
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDcfKTKRy60XGEcJIRAoZKAJ4x7navtI8DkD4VI5SKYxMCwsyeYwCgtAKZ
-wy1gceTx7U/kEBQQUHWpqQg=
-=iRfw
------END PGP SIGNATURE-----
+RMD160 8833ec270ebe638735b8f26ad3ab74322ad61188 files/kahakai-0.6.2_p20040306-rubyscript-gentoo.diff 229
+SHA256 1300732aa474945acc986ed3c21c2b568d18bb8ca50cd502d936d3c41409e33f files/kahakai-0.6.2_p20040306-rubyscript-gentoo.diff 229
+MD5 7d8112f266d53f80139c2136db2d8678 kahakai-0.6.1.ebuild 1184
+RMD160 b8bab3bb39501dc2fb5d829da734651244818671 kahakai-0.6.1.ebuild 1184
+SHA256 dfaf39323e414be8f97833b47dbe898ff5c2176dce518c9ec12157fb35b27565 kahakai-0.6.1.ebuild 1184
+MD5 296e72cfcf4128a137591c58e2905c51 kahakai-0.6.2.ebuild 1195
+RMD160 786d9bf43ff66f2f7820eb126e1b777c0ad02b36 kahakai-0.6.2.ebuild 1195
+SHA256 023697fb385c0de0386960a776bf41012fe4348ad6025d4dd528ddc35a859b1a kahakai-0.6.2.ebuild 1195
+MD5 4f507fbef4650e3e84d1d6c871bb49f9 kahakai-0.6.2_p20040306.ebuild 1569
+RMD160 cfaa42b422e27f080e95c28c7d42d58f8fb1f786 kahakai-0.6.2_p20040306.ebuild 1569
+SHA256 550f49a5f8d68fe3a6d3d2d5c3111b93a3d04f485a007f6016ddccfbbc1c1db9 kahakai-0.6.2_p20040306.ebuild 1569
+MD5 e966c8a2b35830b228ec70444f8798f9 metadata.xml 404
+RMD160 b41874221734343ae538e6d6a0a2cd1f455ada09 metadata.xml 404
+SHA256 d378d5f4b9a009f4fd022fdec4fd0b4a7b66ae72b81c9a200f8624839cdf515d metadata.xml 404
diff --git a/x11-wm/kahakai/kahakai-0.6.1.ebuild b/x11-wm/kahakai/kahakai-0.6.1.ebuild
index 8aa1e5aeeb62..4648dc225f90 100644
--- a/x11-wm/kahakai/kahakai-0.6.1.ebuild
+++ b/x11-wm/kahakai/kahakai-0.6.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/x11-wm/kahakai/kahakai-0.6.1.ebuild,v 1.7 2005/02/20 10:46:29 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/kahakai/kahakai-0.6.1.ebuild,v 1.8 2006/03/04 14:32:33 nixphoeni Exp $
 
 IUSE="truetype xinerama"
 
@@ -12,13 +12,25 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ~ppc -alpha ~sparc"
 
-DEPEND="virtual/x11
-	truetype? ( virtual/xft )
+RDEPEND="|| ( ( x11-libs/libX11
+		x11-libs/libXrandr
+		x11-libs/libXft
+		x11-libs/libXrender
+		x11-proto/xextproto
+		xinerama? ( x11-libs/libXinerama )
+		)
+		virtual/x11
+	)
+	truetype? ( || ( x11-libs/libXft virtual/xft ) )
 	>=dev-lang/swig-1.3.20
 	media-libs/imlib2
 	dev-util/pkgconfig
 	media-fonts/artwiz-fonts
 	dev-libs/boost"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.57-r1
+	>=sys-devel/automake-1.7.2
+	sys-devel/libtool"
 
 src_compile() {
 	econf \
diff --git a/x11-wm/kahakai/kahakai-0.6.2.ebuild b/x11-wm/kahakai/kahakai-0.6.2.ebuild
index 175a3172b5b8..4c6d92f9a4ff 100644
--- a/x11-wm/kahakai/kahakai-0.6.2.ebuild
+++ b/x11-wm/kahakai/kahakai-0.6.2.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/x11-wm/kahakai/kahakai-0.6.2.ebuild,v 1.7 2005/11/09 12:58:43 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/kahakai/kahakai-0.6.2.ebuild,v 1.8 2006/03/04 14:32:33 nixphoeni Exp $
 
 IUSE="truetype xinerama"
 
@@ -12,13 +12,25 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ~ppc -alpha ~sparc"
 
-DEPEND="virtual/x11
-	truetype? ( virtual/xft )
+RDEPEND="|| ( ( x11-libs/libX11
+		x11-libs/libXrandr
+		x11-libs/libXft
+		x11-libs/libXrender
+		x11-proto/xextproto
+		xinerama? ( x11-libs/libXinerama )
+		)
+		virtual/x11
+	)
+	truetype? ( || ( x11-libs/libXft virtual/xft ) )
 	>=dev-lang/swig-1.3.20
 	>=media-libs/imlib2-1.1.0
 	dev-util/pkgconfig
 	media-fonts/artwiz-fonts
 	dev-libs/boost"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.57-r1
+	>=sys-devel/automake-1.7.2
+	sys-devel/libtool"
 
 src_compile() {
 	econf \
diff --git a/x11-wm/kahakai/kahakai-0.6.2_p20040306.ebuild b/x11-wm/kahakai/kahakai-0.6.2_p20040306.ebuild
index 24bec77dddbc..4e77062a9b74 100644
--- a/x11-wm/kahakai/kahakai-0.6.2_p20040306.ebuild
+++ b/x11-wm/kahakai/kahakai-0.6.2_p20040306.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/x11-wm/kahakai/kahakai-0.6.2_p20040306.ebuild,v 1.6 2005/11/09 12:58:43 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/kahakai/kahakai-0.6.2_p20040306.ebuild,v 1.7 2006/03/04 14:32:33 nixphoeni Exp $
 
 inherit eutils
 
@@ -15,8 +15,16 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="-alpha ppc ~sparc x86"
 
-RDEPEND="virtual/x11
-	truetype? ( virtual/xft )
+RDEPEND="|| ( ( x11-libs/libX11
+		x11-libs/libXrandr
+		x11-libs/libXft
+		x11-libs/libXrender
+		x11-proto/xextproto
+		xinerama? ( x11-libs/libXinerama )
+		)
+		virtual/x11
+	)
+	truetype? ( || ( x11-libs/libXft virtual/xft ) )
 	ruby? ( || ( >=dev-lang/ruby-1.8 dev-lang/ruby-cvs ) )
 	>=dev-lang/swig-1.3.20
 	>=media-libs/imlib2-1.1.0
diff --git a/x11-wm/kahakai/metadata.xml b/x11-wm/kahakai/metadata.xml
index d5fa247ca52a..a221aad10180 100644
--- a/x11-wm/kahakai/metadata.xml
+++ b/x11-wm/kahakai/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>desktop-wm</herd>
+	<maintainer>
+		<email>nixphoeni@gentoo.org</email>
+		<name>Joe Sapp</name>
+	</maintainer>
 	<longdescription>
 	Kahakai is a fork of the Waimea window manager, adding scripting support 
 	for many languages through SWIG.