summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Black <dragonheart@gentoo.org>2006-01-03 11:13:58 +0000
committerDaniel Black <dragonheart@gentoo.org>2006-01-03 11:13:58 +0000
commitb0e93adda841bee3f03b124f25ac98579ed24408 (patch)
treee81cb7d3d1bc83a1c39c6ed3da2b7b598731a95f
parentVersion bump wrt security bug #117560. (diff)
downloadgentoo-2-b0e93adda841bee3f03b124f25ac98579ed24408.tar.gz
gentoo-2-b0e93adda841bee3f03b124f25ac98579ed24408.tar.bz2
gentoo-2-b0e93adda841bee3f03b124f25ac98579ed24408.zip
dependency changed to =dev-libs/lzo-1* so that unmasking lzo-2 will not break this package as per bug #112374
(Portage version: 2.1_pre3)
-rw-r--r--media-video/mplayer/ChangeLog7
-rw-r--r--media-video/mplayer/mplayer-1.0.20060102.ebuild4
-rw-r--r--media-video/mplayer/mplayer-1.0_pre7-r1.ebuild6
3 files changed, 11 insertions, 6 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 16d6337a9d9e..5c8e971b10e1 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-video/mplayer
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.335 2006/01/03 00:34:17 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.336 2006/01/03 11:13:58 dragonheart Exp $
+
+ 03 Jan 2006; Daniel Black <dragonheart@gentoo.org>
+ mplayer-1.0_pre7-r1.ebuild, mplayer-1.0.20060102.ebuild:
+ dependency changed to =dev-libs/lzo-1* so that unmasking lzo-2 will not
+ break this package as per bug #112374
*mplayer-1.0.20060102 (03 Jan 2006)
diff --git a/media-video/mplayer/mplayer-1.0.20060102.ebuild b/media-video/mplayer/mplayer-1.0.20060102.ebuild
index bcde60dad677..6b0f4d104da4 100644
--- a/media-video/mplayer/mplayer-1.0.20060102.ebuild
+++ b/media-video/mplayer/mplayer-1.0.20060102.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/media-video/mplayer/mplayer-1.0.20060102.ebuild,v 1.1 2006/01/03 00:34:18 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0.20060102.ebuild,v 1.2 2006/01/03 11:13:58 dragonheart Exp $
inherit eutils flag-o-matic
@@ -61,7 +61,7 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
jpeg? ( media-libs/jpeg )
libcaca? ( media-libs/libcaca )
lirc? ( app-misc/lirc )
- lzo? ( dev-libs/lzo )
+ lzo? ( =dev-libs/lzo-1* )
mad? ( media-libs/libmad )
nas? ( media-libs/nas )
nls? ( sys-devel/gettext )
diff --git a/media-video/mplayer/mplayer-1.0_pre7-r1.ebuild b/media-video/mplayer/mplayer-1.0_pre7-r1.ebuild
index ae097401cd92..759e3e268c3f 100644
--- a/media-video/mplayer/mplayer-1.0_pre7-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre7-r1.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/mplayer/mplayer-1.0_pre7-r1.ebuild,v 1.16 2005/12/12 04:41:08 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre7-r1.ebuild,v 1.17 2006/01/03 11:13:58 dragonheart Exp $
inherit eutils flag-o-matic
@@ -64,7 +64,7 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
jpeg? ( media-libs/jpeg )
libcaca? ( media-libs/libcaca )
lirc? ( app-misc/lirc )
- lzo? ( dev-libs/lzo )
+ lzo? ( =dev-libs/lzo-1* )
mad? ( media-libs/libmad )
nas? ( media-libs/nas )
nls? ( sys-devel/gettext )