summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMamoru Komachi <usata@gentoo.org>2003-10-31 15:38:32 +0000
committerMamoru Komachi <usata@gentoo.org>2003-10-31 15:38:32 +0000
commit7c930d48dec5c9aca07e13b31e4a927f1f7323e4 (patch)
tree82ad9844fec335f585a14a106d06ffaa0dc7525d /net-www
parentnew local use flag for gnupg. (diff)
downloadgentoo-2-7c930d48dec5c9aca07e13b31e4a927f1f7323e4.tar.gz
gentoo-2-7c930d48dec5c9aca07e13b31e4a927f1f7323e4.tar.bz2
gentoo-2-7c930d48dec5c9aca07e13b31e4a927f1f7323e4.zip
Corrected IUSE flags and fixed || dependencies in USE flags.
Diffstat (limited to 'net-www')
-rw-r--r--net-www/w3m-m17n/ChangeLog6
-rw-r--r--net-www/w3m-m17n/Manifest4
-rw-r--r--net-www/w3m-m17n/w3m-m17n-0.4.2.ebuild18
3 files changed, 22 insertions, 6 deletions
diff --git a/net-www/w3m-m17n/ChangeLog b/net-www/w3m-m17n/ChangeLog
index 69ae976fb56b..a0f2d1bfb002 100644
--- a/net-www/w3m-m17n/ChangeLog
+++ b/net-www/w3m-m17n/ChangeLog
@@ -1,9 +1,13 @@
# ChangeLog for net-www/w3m-m17n
# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/w3m-m17n/ChangeLog,v 1.11 2003/10/12 16:18:29 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m-m17n/ChangeLog,v 1.12 2003/10/31 15:38:27 usata Exp $
*w3m-m17n-0.4.2 (25 Sep 2003)
+ 01 Nov 2003; Mamoru KOMACHI <usata@gentoo.org> w3m-m17n-0.4.2.ebuild:
+ Removed unused gtk IUSE flag and added nopixbuf IUSE flag (not listed).
+ Added pkg_setup to alert users who set USE="nopixbuf -imlib -imlib2".
+
13 Oct 2003; Mamoru KOMACHI <usata@gentoo.org> w3m-m17n-0.4.2.ebuild,
w3m-m17n-20030916.ebuild:
Considered as stable. Removed old CVS snapshot (It blocks upgrade to
diff --git a/net-www/w3m-m17n/Manifest b/net-www/w3m-m17n/Manifest
index 88e90494c7d3..0b671a748506 100644
--- a/net-www/w3m-m17n/Manifest
+++ b/net-www/w3m-m17n/Manifest
@@ -1,6 +1,6 @@
-MD5 5129b9dc80c51bcdb5b9bbf4027152d9 ChangeLog 2692
+MD5 1fcb369f5978546916e8e9e42a773d2d ChangeLog 2911
MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 27bd246801cabfac6ed4d67aa40b781f w3m-m17n-0.4.2.ebuild 3640
+MD5 6247de21207eba1a41ce29d7adab831e w3m-m17n-0.4.2.ebuild 4004
MD5 c2bb2e68c5a3b9e3e753aa39e9b1070c w3m-m17n-0.4.1.20030308-r2.ebuild 2715
MD5 84a4529fdf4d9541fb3a111080687261 files/digest-w3m-m17n-0.4.2 210
MD5 1be9f4e35558ba722185319b64c707d8 files/digest-w3m-m17n-0.4.1.20030308-r2 146
diff --git a/net-www/w3m-m17n/w3m-m17n-0.4.2.ebuild b/net-www/w3m-m17n/w3m-m17n-0.4.2.ebuild
index 643af608d0ec..b851343481ea 100644
--- a/net-www/w3m-m17n/w3m-m17n-0.4.2.ebuild
+++ b/net-www/w3m-m17n/w3m-m17n-0.4.2.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/w3m-m17n/w3m-m17n-0.4.2.ebuild,v 1.3 2003/10/12 16:18:29 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m-m17n/w3m-m17n-0.4.2.ebuild,v 1.4 2003/10/31 15:38:27 usata Exp $
-IUSE="X imlib imlib2 gtk xface migemo gpm ssl"
+IUSE="X nopixbuf imlib imlib2 xface migemo gpm ssl"
#IUSE="nls"
W3M_CVS_PV="1.862"
@@ -34,7 +34,8 @@ RDEPEND=">=sys-libs/ncurses-5.2-r3
>=dev-libs/boehm-gc-6.2
X? ( || ( !nopixbuf? ( >=media-libs/gdk-pixbuf-0.22.0 )
imlib2? ( >=media-libs/imlib2-1.0.5 )
- imlib? ( >=media-libs/imlib-1.9.8 ) )
+ imlib? ( >=media-libs/imlib-1.9.8 )
+ virtual/glibc )
)
xface? ( media-libs/compface )
gpm? ( >=sys-libs/gpm-1.19.3-r5 )
@@ -46,6 +47,17 @@ PROVIDE="virtual/textbrowser
S="${WORKDIR}/${P/-m17n/}"
+pkg_setup() {
+
+ if [ -n "`use X`" -a -n "`use nopixbuf`" -a -z "`use imlib2`" -a -z "`use imlib`" ] ; then
+ ewarn
+ ewarn "If you set USE=\"nopixbuf\" (disable gdk-pixbuf for w3mimgdisplay),"
+ ewarn "you need to enable either imlib2 or imlib USE flag."
+ ewarn
+ die "w3m-m17n requires gdk-pixbuf, imlib2 or imlib for image support."
+ fi
+}
+
src_unpack() {
unpack ${W3M_P}.tar.gz