modular X deps

Package-Manager: portage-2.0.54

4 files changed, 31 insertions, 23 deletions

diff --git a/media-libs/smpeg/ChangeLog b/media-libs/smpeg/ChangeLog
index 98b087a26036..53a2d56a9f05 100644
--- a/media-libs/smpeg/ChangeLog
+++ b/media-libs/smpeg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/smpeg
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg/ChangeLog,v 1.26 2005/12/17 01:11:31 vapier Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg/ChangeLog,v 1.27 2006/01/30 06:41:50 mr_bones_ Exp $
+
+  30 Jan 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  smpeg-0.4.4-r6.ebuild, smpeg-0.4.4-r7.ebuild:
+  modular X deps
 
   17 Dec 2005; Mike Frysinger <vapier@gentoo.org>
   +files/smpeg-0.4.4-gcc41.patch, smpeg-0.4.4-r7.ebuild:
diff --git a/media-libs/smpeg/Manifest b/media-libs/smpeg/Manifest
index 03a38e744278..5ef324cc970e 100644
--- a/media-libs/smpeg/Manifest
+++ b/media-libs/smpeg/Manifest
@@ -1,7 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 548a306dd5320b3022c6aa7d4992a9bd ChangeLog 3913
+MD5 5aeb764f743772a2717a215f7178cb96 ChangeLog 4037
 MD5 228adf6a40bb4eef222c38d23f97014b files/digest-smpeg-0.4.4-r6 63
 MD5 228adf6a40bb4eef222c38d23f97014b files/digest-smpeg-0.4.4-r7 63
 MD5 3ab2c17a1fa8a3c293ec83d7f4d45515 files/smpeg-0.4.4-PIC.patch 9472
@@ -10,12 +7,5 @@ MD5 8b979a58307d7196655758bd3d2466c4 files/smpeg-0.4.4-gcc41.patch 1390
 MD5 7d1d2f2e55e8d98f7d62dcbb680cec7d files/smpeg-0.4.4-gnu-stack.patch 955
 MD5 dcc2db7c8aa509096fc557b99bd35490 files/smpeg-0.4.4-m4.patch 233
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 b06aefcfd7c56746451214c6a0c6bf8b smpeg-0.4.4-r6.ebuild 1530
-MD5 fd577d7f2d35385ff4bee413c0f7852c smpeg-0.4.4-r7.ebuild 1636
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDo2Xh2+ySkm8kpY0RArwjAJ9wCzaeiA8lagz9kS/Bb0uX8Aa9SACgrfzC
-byOIWLJEncNcoxDFDq5uPjo=
-=M1H2
------END PGP SIGNATURE-----
+MD5 b63e03b493d3ddac7e67c5189de1a1d4 smpeg-0.4.4-r6.ebuild 1608
+MD5 3ce7ddf94dd0d81be020d5b1739cbe34 smpeg-0.4.4-r7.ebuild 1693
diff --git a/media-libs/smpeg/smpeg-0.4.4-r6.ebuild b/media-libs/smpeg/smpeg-0.4.4-r6.ebuild
index 756bb212057e..2f30debc72d0 100644
--- a/media-libs/smpeg/smpeg-0.4.4-r6.ebuild
+++ b/media-libs/smpeg/smpeg-0.4.4-r6.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/media-libs/smpeg/smpeg-0.4.4-r6.ebuild,v 1.5 2005/09/30 18:48:47 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg/smpeg-0.4.4-r6.ebuild,v 1.6 2006/01/30 06:41:50 mr_bones_ Exp $
 
 inherit eutils toolchain-funcs
 
@@ -14,9 +14,16 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc-macos ppc64 sparc x86"
 IUSE="X debug gtk mmx opengl"
 
 DEPEND=">=media-libs/libsdl-1.2.0
-	opengl? ( virtual/opengl virtual/glu )
+	opengl? (
+		virtual/opengl
+		virtual/glu )
 	gtk? ( =x11-libs/gtk+-1.2* )
-	X? ( virtual/x11 )"
+	X? ( || (
+		(
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libX11 )
+		virtual/x11 ) )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-libs/smpeg/smpeg-0.4.4-r7.ebuild b/media-libs/smpeg/smpeg-0.4.4-r7.ebuild
index 01a752a885d7..ccb16c5bf268 100644
--- a/media-libs/smpeg/smpeg-0.4.4-r7.ebuild
+++ b/media-libs/smpeg/smpeg-0.4.4-r7.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/media-libs/smpeg/smpeg-0.4.4-r7.ebuild,v 1.3 2005/12/17 01:11:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg/smpeg-0.4.4-r7.ebuild,v 1.4 2006/01/30 06:41:50 mr_bones_ Exp $
 
 inherit eutils toolchain-funcs
 
@@ -14,9 +14,16 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x8
 IUSE="X debug gtk mmx opengl"
 
 DEPEND=">=media-libs/libsdl-1.2.0
-	opengl? ( virtual/opengl virtual/glu )
+	opengl? (
+		virtual/opengl
+		virtual/glu )
 	gtk? ( =x11-libs/gtk+-1.2* )
-	X? ( || ( x11-libs/libXt virtual/x11 ) )"
+	X? ( || (
+		(
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libX11 )
+		virtual/x11 ) )"
 
 src_unpack() {
 	unpack ${A}