diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-04-18 19:50:23 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-04-18 19:50:23 +0000 |
| commit | 52de0dddf4b5d582289c77d972ca4f0bcb85b149 (patch) | |
| tree | 5a4d99eaf41e86bdb5d07495e8e7d505a87779ee /kde-base | |
| parent | Stable on sparc wrt #129885 (diff) | |
| download | historical-52de0dddf4b5d582289c77d972ca4f0bcb85b149.tar.gz historical-52de0dddf4b5d582289c77d972ca4f0bcb85b149.tar.bz2 historical-52de0dddf4b5d582289c77d972ca4f0bcb85b149.zip | |
Fix dependencies for modular X. See bug #130341.
Package-Manager: portage-2.1_pre7-r5
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/kdemultimedia/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/kdemultimedia/kdemultimedia-3.5.2.ebuild | 17 | ||||
| -rw-r--r-- | kde-base/mpeglib/ChangeLog | 5 | ||||
| -rw-r--r-- | kde-base/mpeglib/mpeglib-3.5.1.ebuild | 20 |
4 files changed, 40 insertions, 8 deletions
diff --git a/kde-base/kdemultimedia/ChangeLog b/kde-base/kdemultimedia/ChangeLog index 38e52eac2b9d..50b7a2fd9237 100644 --- a/kde-base/kdemultimedia/ChangeLog +++ b/kde-base/kdemultimedia/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdemultimedia # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.198 2006/04/05 22:59:26 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.199 2006/04/18 19:50:23 flameeyes Exp $ + + 18 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> + kdemultimedia-3.5.2.ebuild: + Fix dependencies for modular X. See bug #130341. 05 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> -kdemultimedia-3.5.0.ebuild, -kdemultimedia-3.5.1.ebuild: diff --git a/kde-base/kdemultimedia/kdemultimedia-3.5.2.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.5.2.ebuild index aab445cc21b2..f5c160b52d39 100644 --- a/kde-base/kdemultimedia/kdemultimedia-3.5.2.ebuild +++ b/kde-base/kdemultimedia/kdemultimedia-3.5.2.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/kde-base/kdemultimedia/kdemultimedia-3.5.2.ebuild,v 1.1 2006/03/25 19:47:28 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.5.2.ebuild,v 1.2 2006/04/18 19:50:23 flameeyes Exp $ inherit kde-dist @@ -23,7 +23,12 @@ DEPEND="~kde-base/kdebase-${PV} media-libs/musicbrainz ) encode? ( mp3? ( media-sound/lame ) vorbis? ( media-sound/vorbis-tools ) - flac? ( media-libs/flac ) )" + flac? ( media-libs/flac ) ) + || ( ( + x11-libs/libXext + x11-libs/libXxf86dga + x11-libs/libXxf86vm + ) virtual/x11 )" RDEPEND="${DEPEND} gstreamer? ( mp3? ( =media-plugins/gst-plugins-mad-0.8* ) @@ -32,7 +37,13 @@ RDEPEND="${DEPEND} flac? ( =media-plugins/gst-plugins-flac-0.8* ) )" DEPEND="${DEPEND} - dev-util/pkgconfig" + dev-util/pkgconfig + || ( ( + x11-proto/xf86dgaproto + x11-proto/xf86vidmodeproto + x11-proto/videoproto + x11-proto/xextproto + ) virtual/x11 )" src_compile() { local myconf="--with-cdparanoia --with-taglib diff --git a/kde-base/mpeglib/ChangeLog b/kde-base/mpeglib/ChangeLog index db3aaa3c79fd..0a5b784bd109 100644 --- a/kde-base/mpeglib/ChangeLog +++ b/kde-base/mpeglib/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for kde-base/mpeglib # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/mpeglib/ChangeLog,v 1.29 2006/04/06 03:19:26 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/mpeglib/ChangeLog,v 1.30 2006/04/18 19:48:24 flameeyes Exp $ + + 18 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> mpeglib-3.5.1.ebuild: + Fix dependencies for modular X. See bug #130341. 06 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> -mpeglib-3.5.0.ebuild: Removed old 3.5.0/3.5.1 packages. diff --git a/kde-base/mpeglib/mpeglib-3.5.1.ebuild b/kde-base/mpeglib/mpeglib-3.5.1.ebuild index e734c2091143..a260fe9ec364 100644 --- a/kde-base/mpeglib/mpeglib-3.5.1.ebuild +++ b/kde-base/mpeglib/mpeglib-3.5.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/kde-base/mpeglib/mpeglib-3.5.1.ebuild,v 1.2 2006/03/22 20:15:45 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/mpeglib/mpeglib-3.5.1.ebuild,v 1.3 2006/04/18 19:48:24 flameeyes Exp $ KMNAME=kdemultimedia MAXKDEVER=3.5.2 @@ -10,6 +10,20 @@ inherit kde-meta eutils DESCRIPTION="KDE mpeg library" KEYWORDS="~amd64 ~ppc ~x86" IUSE="" -DEPEND="media-sound/cdparanoia" +RDEPEND="media-sound/cdparanoia + || ( ( + x11-libs/libXext + x11-libs/libXxf86dga + x11-libs/libXxf86vm + ) virtual/x11 ) + media-libs/libvorbis" + +DEPEND="${RDEPEND} + || ( ( + x11-proto/xf86dgaproto + x11-proto/xf86vidmodeproto + x11-proto/videoproto + x11-proto/xextproto + ) virtual/x11 )" myconf="--with-cdparanoia --enable-cdparanoia" |