summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-video/mpeg-tools')
-rw-r--r--media-video/mpeg-tools/ChangeLog6
-rw-r--r--media-video/mpeg-tools/mpeg-tools-1.5b-r2.ebuild6
2 files changed, 8 insertions, 4 deletions
diff --git a/media-video/mpeg-tools/ChangeLog b/media-video/mpeg-tools/ChangeLog
index b1655658257e..0f1407861c71 100644
--- a/media-video/mpeg-tools/ChangeLog
+++ b/media-video/mpeg-tools/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/mpeg-tools
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-tools/ChangeLog,v 1.14 2006/01/21 07:14:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-tools/ChangeLog,v 1.15 2006/02/11 16:12:55 joshuabaergen Exp $
+
+ 11 Feb 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+ mpeg-tools-1.5b-r2.ebuild:
+ Added modular X dependencies (bug #121011, Moshe Kaminsky).
21 Jan 2006; Michael Sterrett <mr_bones_@gentoo.org>
-files/1.5b/mpeg-tools-1.5b-fix-exit-call.patch, -files/1.5b/libpnmrw.c,
diff --git a/media-video/mpeg-tools/mpeg-tools-1.5b-r2.ebuild b/media-video/mpeg-tools/mpeg-tools-1.5b-r2.ebuild
index 3f66f6672496..cf6634a3496d 100644
--- a/media-video/mpeg-tools/mpeg-tools-1.5b-r2.ebuild
+++ b/media-video/mpeg-tools/mpeg-tools-1.5b-r2.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-video/mpeg-tools/mpeg-tools-1.5b-r2.ebuild,v 1.4 2005/10/26 03:51:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-tools/mpeg-tools-1.5b-r2.ebuild,v 1.5 2006/02/11 16:12:55 joshuabaergen Exp $
inherit eutils
@@ -14,7 +14,7 @@ SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""
-DEPEND="virtual/x11
+DEPEND="|| ( x11-libs/libX11 virtual/x11 )
media-libs/jpeg"
S=${WORKDIR}/${MY_PN}