Added to ~ppc-macos; bug #61802.

diff --git a/www-client/w3m/ChangeLog b/www-client/w3m/ChangeLog
index 7390aaf07b7b67aca4f0c63116dad9419c493e0b..61ad235937aebc52c3b48d44543039589615fc83 100644 (file)
--- a/www-client/w3m/ChangeLog
+++ b/www-client/w3m/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-client/w3m
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.6 2004/10/13 23:30:38 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.7 2004/11/25 11:31:50 usata Exp $
+
+  25 Nov 2004; Mamoru KOMACHI <usata@gentoo.org> w3m-0.5.1-r2.ebuild:
+  Added to ~ppc-macos; bug #61802.
 
   13 Oct 2004; <agriffis@gentoo.org> w3m-0.5.1-r1.ebuild, w3m-0.5.1-r2.ebuild:
   add ia64 keywords

diff --git a/www-client/w3m/Manifest b/www-client/w3m/Manifest
index 1e55c526c748d4b666c9ee37b85c774a7bcfe216..f0895fb63bfeaaccfca16e4a1c1ebe88a765a529 100644 (file)
--- a/www-client/w3m/Manifest
+++ b/www-client/w3m/Manifest
@@ -1,14 +1,24 @@
-MD5 a158cb7bf7541f3e60f73c49b6b7bf87 ChangeLog 12165
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a1ae93419630d16807b5e6dfffff1e32 ChangeLog 12268
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 MD5 25b86e7a0da9e244a0d9e178599798e5 w3m-0.4.2.ebuild 1909
 MD5 67ba3308344ef9a9805263fab091bb44 w3m-0.5-r2.ebuild 3682
 MD5 e9bb4bcd9708519d000a1e4f5fe17cc3 w3m-0.5.1-r1.ebuild 3506
-MD5 6f634cfef7d6d8b4dcd5efe0dc93a0cf w3m-0.5.1-r2.ebuild 3683
+MD5 34447a7982f687567f1df8a426efb547 w3m-0.5.1-r2.ebuild 3919
 MD5 ccf8db4eb493664368e4e4c77cea99d4 files/digest-w3m-0.4.2 61
 MD5 9cd600ff1ce23fc3ad6e0c17be3ac84e files/digest-w3m-0.5-r2 207
+MD5 6c86671b874374231ff44e3660eedafc files/digest-w3m-0.5.1-r2 271
 MD5 3734d8d1d8c19bfa94a11477e6cc38cd files/digest-w3m-0.5.1-r1 201
 MD5 ca82b0ff2fa196fadebdc71b825b4ccf files/w3m-0.4.2-async-m17n-gentoo.diff 1539
 MD5 5b34b82be16b1b02dd603acbfd11d9db files/w3m-libwc-gentoo.diff 437
 MD5 4deea28e3a4e09f22019b01b52273ab3 files/w3m-m17n-search-gentoo.diff 446
 MD5 0fd075401455ce9205836b4267202e22 files/w3m-w3mman-gentoo.diff 1059
-MD5 6c86671b874374231ff44e3660eedafc files/digest-w3m-0.5.1-r2 271
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (Darwin)
+
+iD8DBQFBpcK0VWNWqTUmv+0RAilFAJ40PrEDD1l9G7UTdlRDhXouW4h/kwCfSypM
+4l6LHyiyFYUEEkzP8uyb8uU=
+=redk
+-----END PGP SIGNATURE-----

diff --git a/www-client/w3m/w3m-0.5.1-r2.ebuild b/www-client/w3m/w3m-0.5.1-r2.ebuild
index 32f5fd0680727d6e66d88db537483da4be3ca964..6cdaf3820439a70a855eb6bc05df08f22e11cc29 100644 (file)
--- a/www-client/w3m/w3m-0.5.1-r2.ebuild
+++ b/www-client/w3m/w3m-0.5.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/w3m-0.5.1-r2.ebuild,v 1.3 2004/10/13 23:30:38 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/w3m-0.5.1-r2.ebuild,v 1.4 2004/11/25 11:31:50 usata Exp $
 
 inherit eutils
 
@@ -21,7 +21,7 @@ SRC_URI="mirror://sourceforge/w3m/${P}.tar.gz
 
 LICENSE="w3m"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~ppc ~sparc ~amd64 ~ppc64 ~ia64"
+KEYWORDS="~x86 ~alpha ~ppc ~sparc ~amd64 ~ppc64 ~ia64 ~ppc-macos"
 IUSE="X gtk gtk2 imlib imlib2 xface ssl migemo gpm cjk nls lynxkeymap"
 #IUSE="canna unicode"
 
@@ -31,10 +31,14 @@ IUSE="X gtk gtk2 imlib imlib2 xface ssl migemo gpm cjk nls lynxkeymap"
 DEPEND=">=sys-libs/ncurses-5.2-r3
        >=sys-libs/zlib-1.1.3-r2
        >=dev-libs/boehm-gc-6.2
-       X? ( gtk? ( gtk2? ( >=x11-libs/gtk+-2 )
-               !gtk2? ( >=media-libs/gdk-pixbuf-0.22.0 ) )
-               !gtk? ( imlib2? ( >=media-libs/imlib2-1.1.0 )
-                       !imlib2? ( >=media-libs/imlib-1.9.8 ) )
+       X? (
+               !ppc-macos? (
+                       gtk? ( gtk2? ( >=x11-libs/gtk+-2 )
+                               !gtk2? ( >=media-libs/gdk-pixbuf-0.22.0 ) )
+                       !gtk? ( imlib2? ( >=media-libs/imlib2-1.1.0 )
+                               !imlib2? ( >=media-libs/imlib-1.9.8 ) )
+               )
+               ppc-macos? ( >=media-libs/imlib2-1.1.2 )
        )
        xface? ( media-libs/compface )
        gpm? ( >=sys-libs/gpm-1.19.3-r5 )
@@ -59,11 +63,17 @@ src_unpack() {
 
 src_compile() {
 
-       local myconf migemo_command imagelib
+       local myconf migemo_command imagelib fb
 
        if use X ; then
-               myconf="${myconf} --enable-image=x11,fb $(use_enable xface)"
-               if use gtk2 ; then
+               # fb depends on Linux
+               use ppc-macos || fb=",fb"
+               myconf="${myconf} --enable-image=x11${fb} $(use_enable xface)"
+
+               if use ppc-macos ; then
+                       # ppc-macos doesn't support gtk2, gtk and imlib
+                       imagelib="imlib2"
+               elif use gtk2 ; then
                        imagelib="gtk2"
                elif use gtk ; then
                        imagelib="gdk-pixbuf"