summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2014-11-08 19:15:17 +0000
committerJeroen Roovers <jer@gentoo.org>2014-11-08 19:15:17 +0000
commit67cbc4d4e1e2abfad45d664a75507a391e5a5526 (patch)
treead3ae64e9b6ef9fe4a71ad91eb20eaa514c170b9
parentVersion bump. (diff)
downloadgentoo-2-67cbc4d4e1e2abfad45d664a75507a391e5a5526.tar.gz
gentoo-2-67cbc4d4e1e2abfad45d664a75507a391e5a5526.tar.bz2
gentoo-2-67cbc4d4e1e2abfad45d664a75507a391e5a5526.zip
Remove USE=cairo restriction on x11-libs/fltk. Remove unneeded appendage to LDFLAGS.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A792A613)
-rw-r--r--www-client/dillo/ChangeLog6
-rw-r--r--www-client/dillo/dillo-3.0.4.ebuild20
2 files changed, 16 insertions, 10 deletions
diff --git a/www-client/dillo/ChangeLog b/www-client/dillo/ChangeLog
index 8017dc51583d..789ff6779988 100644
--- a/www-client/dillo/ChangeLog
+++ b/www-client/dillo/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-client/dillo
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/ChangeLog,v 1.138 2014/11/05 11:34:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/ChangeLog,v 1.139 2014/11/08 19:15:17 jer Exp $
+
+ 08 Nov 2014; Jeroen Roovers <jer@gentoo.org> dillo-3.0.4.ebuild:
+ Remove USE=cairo restriction on x11-libs/fltk. Remove unneeded appendage to
+ LDFLAGS.
05 Nov 2014; Jeroen Roovers <jer@gentoo.org> -dillo-3.0.3.ebuild:
Old.
diff --git a/www-client/dillo/dillo-3.0.4.ebuild b/www-client/dillo/dillo-3.0.4.ebuild
index 6c31ffbdfb99..ebdabc629176 100644
--- a/www-client/dillo/dillo-3.0.4.ebuild
+++ b/www-client/dillo/dillo-3.0.4.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-3.0.4.ebuild,v 1.9 2014/11/02 08:56:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-3.0.4.ebuild,v 1.10 2014/11/08 19:15:17 jer Exp $
EAPI=5
-inherit eutils flag-o-matic multilib toolchain-funcs
+inherit eutils multilib toolchain-funcs
DESCRIPTION="Lean FLTK based web browser"
HOMEPAGE="http://www.dillo.org/"
@@ -15,21 +15,23 @@ SLOT="0"
KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sparc x86"
IUSE="doc +gif ipv6 +jpeg +png ssl"
-RDEPEND="sys-libs/zlib
- >=x11-libs/fltk-1.3:1[-cairo]
+RDEPEND="
+ >=x11-libs/fltk-1.3
+ sys-libs/zlib
jpeg? ( virtual/jpeg )
png? ( >=media-libs/libpng-1.2:0 )
- ssl? ( dev-libs/openssl:0 )"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )"
+ ssl? ( dev-libs/openssl:0 )
+"
+DEPEND="
+ ${RDEPEND}
+ doc? ( app-doc/doxygen )
+"
src_prepare() {
epatch "${FILESDIR}"/${PN}2-inbuf.patch
}
src_configure() {
- append-ldflags "-L/usr/$(get_libdir)/fltk"
-
econf \
$(use_enable gif) \
$(use_enable ipv6) \