Bug 153207, Fixed modular X dependency for 0.9.7.9, and removed older 0.9.5 ebuild.

Package-Manager: portage-2.1.2_pre3-r3

3 files changed, 49 insertions, 23 deletions

diff --git a/rox-base/oroborox/ChangeLog b/rox-base/oroborox/ChangeLog
index e8ec6fbbbc5e..c907c8680174 100644
--- a/rox-base/oroborox/ChangeLog
+++ b/rox-base/oroborox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for rox-base/oroborox
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/oroborox/ChangeLog,v 1.7 2006/10/04 14:09:53 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/oroborox/ChangeLog,v 1.8 2006/10/29 18:08:26 lack Exp $
+
+  29 Oct 2006; Jim Ramsay <lack@gentoo.org> oroborox-0.9.7.9.ebuild:
+  Bug 153207, Fixed modular X dependency for 0.9.7.9, and removed older 0.9.5
+  ebuild.
 
   04 Oct 2006; Jim Ramsay <lack@gentoo.org> oroborox-0.9.8.ebuild:
   Fixed order of version variables for 'include rox'
diff --git a/rox-base/oroborox/Manifest b/rox-base/oroborox/Manifest
index 5bc4f3aebbb7..8c3f6c931e4a 100644
--- a/rox-base/oroborox/Manifest
+++ b/rox-base/oroborox/Manifest
@@ -1,29 +1,21 @@
-DIST OroboROX-0.9.5.tar.bz2 406570 RMD160 87142b0148b1dac045691e5bbf37db1313395a6a SHA1 fdd468b7e5f4294a5151065c770d8793959ee30e SHA256 bcf470b97e1f8e0db178e778cc52e613f19cf939c196840964b367a5c7c7cc9b
 DIST OroboROX-0.9.7.9.tar.bz2 464642 RMD160 4ed9fab12c555c18bc3611845d69ad596e967b67 SHA1 952fdab316cd158e82a78d44791d7fafc7bac8f1 SHA256 e550d3a35c20f916f57d8930860d793192c6cd4ddbba1674b46394f33058a8d6
 DIST OroboROX-0.9.8.tar.bz2 463443 RMD160 e1175bbbe20275be4f3440077832eaca470b7afa SHA1 73b4565fce7c178a0a458cd432fcd6d4e65fec6e SHA256 b9ca46928c48eca7659191ce213fe346e48baae44878146cdcb6a236910b817b
-EBUILD oroborox-0.9.5.ebuild 544 RMD160 b5733903b0f62a41bed5353c14973c2e66172d77 SHA1 0183f0fc57e5b5a159168fe5c8fca7c26b30730e SHA256 e26769f6b8427064a0b4bd3f0ec7eb9b416a75d84bd76d9e0a13fed757a95bf1
-MD5 9d458e3b36764708263a9f3254112ef3 oroborox-0.9.5.ebuild 544
-RMD160 b5733903b0f62a41bed5353c14973c2e66172d77 oroborox-0.9.5.ebuild 544
-SHA256 e26769f6b8427064a0b4bd3f0ec7eb9b416a75d84bd76d9e0a13fed757a95bf1 oroborox-0.9.5.ebuild 544
-EBUILD oroborox-0.9.7.9.ebuild 983 RMD160 b0c4c19d24ad548e12269acc5a1f912aa3b478a9 SHA1 b062eddde4b1454acf7e8bee5639bb10dcf59fb4 SHA256 c02fdd1ca360bf9c9b40ada9dc815b9f5cbfb06a0a89e6f81b4c2762093eb90a
-MD5 4c7fe494b5710e2a7bea141cad97b789 oroborox-0.9.7.9.ebuild 983
-RMD160 b0c4c19d24ad548e12269acc5a1f912aa3b478a9 oroborox-0.9.7.9.ebuild 983
-SHA256 c02fdd1ca360bf9c9b40ada9dc815b9f5cbfb06a0a89e6f81b4c2762093eb90a oroborox-0.9.7.9.ebuild 983
+EBUILD oroborox-0.9.7.9.ebuild 1465 RMD160 be55d536f922ddba9a119e1e9bb40e176661682e SHA1 86ff4fe5c427ed53795e4ba3392a7ead527bf6bf SHA256 3f52c6844d688975a917636ba9bfcb8373f2cc8a6fd988d129d6e38297bab649
+MD5 328131f29f725f5fba53ea23ddff105e oroborox-0.9.7.9.ebuild 1465
+RMD160 be55d536f922ddba9a119e1e9bb40e176661682e oroborox-0.9.7.9.ebuild 1465
+SHA256 3f52c6844d688975a917636ba9bfcb8373f2cc8a6fd988d129d6e38297bab649 oroborox-0.9.7.9.ebuild 1465
 EBUILD oroborox-0.9.8.ebuild 1793 RMD160 3e2fea6259bd7e2880beb5f718190dea9e35d4bf SHA1 4157ac67b38ff40201558f5807843f40c650d27e SHA256 5c4af656eed07507179146cd0af78e568aebed65a7d71cfcc102edb61f6bdf39
 MD5 3e139a7e25f987e5931191930c861358 oroborox-0.9.8.ebuild 1793
 RMD160 3e2fea6259bd7e2880beb5f718190dea9e35d4bf oroborox-0.9.8.ebuild 1793
 SHA256 5c4af656eed07507179146cd0af78e568aebed65a7d71cfcc102edb61f6bdf39 oroborox-0.9.8.ebuild 1793
-MISC ChangeLog 1244 RMD160 5c652c9bd53b0f34a845191980f47f6cf28eb935 SHA1 4fc785094358f961657ff139c427b6c502397d2d SHA256 a6ffeb37fb399910582209812771f1fbf6b198758e6813fb1004ba7f70897b88
-MD5 927be0860015d5c9c82d1b049b64e6d5 ChangeLog 1244
-RMD160 5c652c9bd53b0f34a845191980f47f6cf28eb935 ChangeLog 1244
-SHA256 a6ffeb37fb399910582209812771f1fbf6b198758e6813fb1004ba7f70897b88 ChangeLog 1244
+MISC ChangeLog 1402 RMD160 dd2dd19fdf052a9f1e4114bc1d0f7f368fdb54f3 SHA1 88fb0755720b17e151185e61a864052aa09227c3 SHA256 75d3101d64e7a8c3cfd59604f453e04f3ca6a26fd86f54e80753a45df3957d13
+MD5 5459a8c62140d0b6522e87d489d39cd0 ChangeLog 1402
+RMD160 dd2dd19fdf052a9f1e4114bc1d0f7f368fdb54f3 ChangeLog 1402
+SHA256 75d3101d64e7a8c3cfd59604f453e04f3ca6a26fd86f54e80753a45df3957d13 ChangeLog 1402
 MISC metadata.xml 249 RMD160 e2c6dd05c9bf06ba99d0236eb34f4c7cf87b72eb SHA1 abf2616bc3f2b616c282ca9388fa8a65c513c64e SHA256 b1a6408e0e6a8defd1faf2265bd303646d0f0acda955cadd0c1bd795e98feabf
 MD5 afe0e5c29d53da08182cfcb52338da43 metadata.xml 249
 RMD160 e2c6dd05c9bf06ba99d0236eb34f4c7cf87b72eb metadata.xml 249
 SHA256 b1a6408e0e6a8defd1faf2265bd303646d0f0acda955cadd0c1bd795e98feabf metadata.xml 249
-MD5 8fde988186602b1c02214e4c95390156 files/digest-oroborox-0.9.5 247
-RMD160 34d9171a748d239ef7e5db8474759ae30d1dc04c files/digest-oroborox-0.9.5 247
-SHA256 6894927642dd110d2ba40dd06406a7c8aaf0aa554bb652fa19872f0bfbaf9661 files/digest-oroborox-0.9.5 247
 MD5 9df56c02a14c3ccef78950879a166cee files/digest-oroborox-0.9.7.9 253
 RMD160 f40a1edf2ab21ec821a207ffcd0e12139842400e files/digest-oroborox-0.9.7.9 253
 SHA256 74b88029bf479b5e7ac004d126686f75905367d76ce4b39d3acc5943ca20fe9b files/digest-oroborox-0.9.7.9 253
diff --git a/rox-base/oroborox/oroborox-0.9.7.9.ebuild b/rox-base/oroborox/oroborox-0.9.7.9.ebuild
index a277e62a7fd5..935e252ffdce 100644
--- a/rox-base/oroborox/oroborox-0.9.7.9.ebuild
+++ b/rox-base/oroborox/oroborox-0.9.7.9.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/rox-base/oroborox/oroborox-0.9.7.9.ebuild,v 1.3 2006/04/16 14:13:11 svyatogor Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/oroborox/oroborox-0.9.7.9.ebuild,v 1.4 2006/10/29 18:08:26 lack Exp $
 
 MY_PN="OroboROX"
 
@@ -8,15 +8,45 @@ DESCRIPTION="OroboROX is a small window manager for the ROX Desktop."
 HOMEPAGE="http://rox.sourceforge.net/"
 SRC_URI="http://roxos.sunsite.dk/dev-contrib/guido/${MY_PN}-${PV}.tar.bz2"
 
-
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE=""
+IUSE="xinerama"
+
+
+DEPEND="
+	>=media-libs/freetype-2.0
+	virtual/xft
+	|| ( (
+		x11-proto/xproto
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
+		x11-libs/libXpm
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		xinerama? ( x11-proto/xineramaproto )
+	)
+		virtual/x11
+	)
+	"
 
-DEPEND="virtual/x11
-		virtual/xft
-		>=media-libs/freetype-2.0"
+RDEPEND="
+	>=media-libs/freetype-2.0
+	virtual/xft
+	|| ( (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libXxf86vm
+		xinerama? ( x11-libs/libXinerama )
+	)
+		virtual/x11
+	)
+	"
 
 S=${WORKDIR}
 ROX_LIB_VER=1.9.14