From 6d92fe7551f9395ad182baffc2cb69ff83e95830 Mon Sep 17 00:00:00 2001 From: Michael Januszewski Date: Sun, 22 Jan 2006 14:54:50 +0000 Subject: Fixed X-related dependencies (support for modular X). Package-Manager: portage-2.1_pre3-r1 --- media-gfx/fbida/ChangeLog | 6 +++++- media-gfx/fbida/Manifest | 24 ++++++------------------ media-gfx/fbida/fbida-2.03-r1.ebuild | 14 ++++++++++---- media-gfx/fbida/fbida-2.03.ebuild | 12 +++++++++--- 4 files changed, 30 insertions(+), 26 deletions(-) (limited to 'media-gfx') diff --git a/media-gfx/fbida/ChangeLog b/media-gfx/fbida/ChangeLog index 0e6a4ab64322..2ebebc7be30a 100644 --- a/media-gfx/fbida/ChangeLog +++ b/media-gfx/fbida/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/fbida # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.8 2006/01/10 11:00:37 ferringb Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.9 2006/01/22 14:54:50 spock Exp $ + + 22 Jan 2006; Michał Januszewski fbida-2.03.ebuild, + fbida-2.03-r1.ebuild: + Fixed X-related dependencies (support for modular X). 10 Jan 2006; ferringb@gentoo.org fbida-2.03.ebuild: remove the ungif choice due to bug 118386 diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest index b1fa3a1f2df8..6e4b4f1c43c9 100644 --- a/media-gfx/fbida/Manifest +++ b/media-gfx/fbida/Manifest @@ -1,28 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 0f43647e134eaa087d22a5e3c68c1129 ChangeLog 1234 -RMD160 389b9ee81aa256b56abc2e51be2053ef522dc3ba ChangeLog 1234 -SHA256 cf51395d15f46a4dc2a827b88b2fe7738852a2fc57ce512740de0bc2b20c8519 ChangeLog 1234 -MD5 e37647448ea8b48da72c3d30b5f4defe fbida-2.03-r1.ebuild 1529 -RMD160 667ebefb70de9e9e9c56db55500c81be74700f25 fbida-2.03-r1.ebuild 1529 -SHA256 65bb137440918cd8b994356ba66c2250804bbe557d3aa01315f0f2843f69c61a fbida-2.03-r1.ebuild 1529 -MD5 36c58d96d5515ed0fdf8d3221a7f66f8 fbida-2.03.ebuild 1628 -RMD160 f4110b0d4b5143cf3da9950b15368c0413b86de2 fbida-2.03.ebuild 1628 -SHA256 37f87452a8dab3b8be1d9d87502b76d34f5db426ff908f54c07690ff0b6a38db fbida-2.03.ebuild 1628 +MD5 22752be788c3494016b9bd215c44cba5 ChangeLog 1385 +MD5 60fbefbce9ff84961cb2fd38909eadc9 fbida-2.03-r1.ebuild 1685 +MD5 344646ff54c886814deb29c517ba47fe fbida-2.03.ebuild 1781 MD5 bfb6e027022ffa3822ed655578c0046f files/digest-fbida-2.03 62 -RMD160 f82befbb0807fe2a10f24f0b7d34e0ae35fa597c files/digest-fbida-2.03 62 -SHA256 799f41a2f2b9a0daea8119d9142a1e467ef8b9aa211a44c9d1081ad4b4d4283b files/digest-fbida-2.03 62 MD5 bfb6e027022ffa3822ed655578c0046f files/digest-fbida-2.03-r1 62 -RMD160 f82befbb0807fe2a10f24f0b7d34e0ae35fa597c files/digest-fbida-2.03-r1 62 -SHA256 799f41a2f2b9a0daea8119d9142a1e467ef8b9aa211a44c9d1081ad4b4d4283b files/digest-fbida-2.03-r1 62 MD5 cfe1b5f88cc51ac6ffc42809178d2a06 metadata.xml 221 -RMD160 90fef1dff5d0b3945073e90bb7ffec583ff1bbe8 metadata.xml 221 -SHA256 fd573abb9cf89f320d00d1c107a25a46a5dfba633087d4179d0b8bd9aa539c8e metadata.xml 221 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDw5OqvdBxRoA3VU0RAnG7AJ9JMBZM5WDHYJeTBgFaqG0YaA285wCgxqaw -Q++SOQDPJdKipV8sBPcIPHo= -=OldG +iD8DBQFD05zNchej4aZK9/cRAuowAJ90j6QIIonvKE/iM36Ml72+veSWygCfZdVy +RQ62xp+3/ZancIdVeOW2jZE= +=QiNp -----END PGP SIGNATURE----- diff --git a/media-gfx/fbida/fbida-2.03-r1.ebuild b/media-gfx/fbida/fbida-2.03-r1.ebuild index 5e375edb298c..1dd3885c19ae 100644 --- a/media-gfx/fbida/fbida-2.03-r1.ebuild +++ b/media-gfx/fbida/fbida-2.03-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-gfx/fbida/fbida-2.03-r1.ebuild,v 1.4 2005/12/03 13:34:21 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.03-r1.ebuild,v 1.5 2006/01/22 14:54:50 spock Exp $ DESCRIPTION="Image viewers for the framebuffer console (fbi) and X11 (ida)." HOMEPAGE="http://linux.bytesex.org/fbida/" @@ -11,18 +11,24 @@ SLOT="0" KEYWORDS="~ppc x86" IUSE="png jpeg gif tiff curl lirc X fbcon" -DEPEND="jpeg? ( >=media-libs/jpeg-6b ) +RDEPEND="jpeg? ( >=media-libs/jpeg-6b ) png? ( media-libs/libpng ) gif? ( media-libs/giflib ) tiff? ( media-libs/tiff ) curl? ( net-misc/curl ) lirc? ( app-misc/lirc ) - X? ( virtual/x11 virtual/motif ) + X? ( || ( ( x11-libs/libX11 x11-libs/libXt x11-libs/libXpm ) + virtual/x11 ) + virtual/motif ) !media-gfx/fbi media-libs/libexif >=media-libs/freetype-2.0 >=media-libs/fontconfig-2.2" +DEPEND="${RDEPEND} + X? ( || ( ( x11-proto/xextproto x11-proto/xproto ) + virtual/x11 ) )" + src_unpack() { unpack ${A} sed -e 's/DGifOpenFileName,ungif/DGifOpenFileName,gif/' \ diff --git a/media-gfx/fbida/fbida-2.03.ebuild b/media-gfx/fbida/fbida-2.03.ebuild index b371466996ca..2ebd053eebe0 100644 --- a/media-gfx/fbida/fbida-2.03.ebuild +++ b/media-gfx/fbida/fbida-2.03.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-gfx/fbida/fbida-2.03.ebuild,v 1.4 2006/01/10 11:00:37 ferringb Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.03.ebuild,v 1.5 2006/01/22 14:54:50 spock Exp $ DESCRIPTION="Image viewers for the framebuffer console (fbi) and X11 (ida)." HOMEPAGE="http://linux.bytesex.org/fbida/" @@ -11,16 +11,22 @@ SLOT="0" KEYWORDS="x86" IUSE="png jpeg gif tiff curl lirc X fbcon" -DEPEND="jpeg? ( >=media-libs/jpeg-6b ) +RDEPEND="jpeg? ( >=media-libs/jpeg-6b ) png? ( media-libs/libpng ) gif? ( media-libs/giflib ) tiff? ( media-libs/tiff ) curl? ( net-misc/curl ) lirc? ( app-misc/lirc ) - X? ( virtual/x11 virtual/motif ) + X? ( || ( ( x11-libs/libX11 x11-libs/libXt x11-libs/libXpm ) + virtual/x11 ) + virtual/motif ) media-libs/libexif !media-gfx/fbi" +DEPEND="${RDEPEND} + X? ( || ( ( x11-proto/xextproto x11-proto/xproto ) + virtual/x11 ) )" + src_compile() { # let autoconf do its job and then fix things to build fbida # according to our specifications -- cgit v1.2.3-65-gdbad