summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-03-12 07:10:07 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-03-12 07:10:07 +0000
commit04b5428e5ad3268cf3e05b37e87d9f0f33d2dccf (patch)
tree200afd6837180238ade4a6dc93d92fb0ae324c99 /x11-libs
parentBump 5.0.1's rev to include a patch that addresses a compile-time failure onl... (diff)
downloadgentoo-2-04b5428e5ad3268cf3e05b37e87d9f0f33d2dccf.tar.gz
gentoo-2-04b5428e5ad3268cf3e05b37e87d9f0f33d2dccf.tar.bz2
gentoo-2-04b5428e5ad3268cf3e05b37e87d9f0f33d2dccf.zip
Missing x11-libs/cairo RDEPEND for USE="cairo" wrt #407595 by Karl-Johan Karlsson
(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/fltk/ChangeLog7
-rw-r--r--x11-libs/fltk/fltk-1.3.0-r1.ebuild5
-rw-r--r--x11-libs/fltk/fltk-1.3.0.ebuild5
3 files changed, 12 insertions, 5 deletions
diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog
index 12f55ef9e2ea..ee9a8ab4c5b9 100644
--- a/x11-libs/fltk/ChangeLog
+++ b/x11-libs/fltk/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-libs/fltk
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.207 2012/03/02 09:40:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.208 2012/03/12 07:10:07 ssuominen Exp $
+
+ 12 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> fltk-1.3.0.ebuild,
+ fltk-1.3.0-r1.ebuild:
+ Missing x11-libs/cairo RDEPEND for USE="cairo" wrt #407595 by Karl-Johan
+ Karlsson
02 Mar 2012; Justin Lecher <jlec@gentoo.org> fltk-1.3.0-r1.ebuild:
Add some more prefix awareness
diff --git a/x11-libs/fltk/fltk-1.3.0-r1.ebuild b/x11-libs/fltk/fltk-1.3.0-r1.ebuild
index 0728207c81b3..b27609b94a13 100644
--- a/x11-libs/fltk/fltk-1.3.0-r1.ebuild
+++ b/x11-libs/fltk/fltk-1.3.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.3.0-r1.ebuild,v 1.3 2012/03/02 09:40:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.3.0-r1.ebuild,v 1.4 2012/03/12 07:10:07 ssuominen Exp $
EAPI=3
@@ -25,6 +25,7 @@ RDEPEND="
x11-libs/libSM
x11-libs/libXext
x11-libs/libXt
+ cairo? ( x11-libs/cairo )
opengl? ( virtual/opengl )
xinerama? ( x11-libs/libXinerama )
xft? ( x11-libs/libXft )"
@@ -39,7 +40,7 @@ DEPEND="${RDEPEND}
INCDIR=${EPREFIX}/usr/include/fltk-${SLOT}
LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk-${SLOT}
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
src_prepare() {
rm -rf zlib jpeg png || die
diff --git a/x11-libs/fltk/fltk-1.3.0.ebuild b/x11-libs/fltk/fltk-1.3.0.ebuild
index 56e3ed398860..a32e3be0cd83 100644
--- a/x11-libs/fltk/fltk-1.3.0.ebuild
+++ b/x11-libs/fltk/fltk-1.3.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.3.0.ebuild,v 1.7 2012/02/09 05:06:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.3.0.ebuild,v 1.8 2012/03/12 07:10:07 ssuominen Exp $
EAPI=3
@@ -25,6 +25,7 @@ RDEPEND="
x11-libs/libSM
x11-libs/libXext
x11-libs/libXt
+ cairo? ( x11-libs/cairo )
opengl? ( virtual/opengl )
xinerama? ( x11-libs/libXinerama )
xft? ( x11-libs/libXft )"
@@ -39,7 +40,7 @@ DEPEND="${RDEPEND}
INCDIR=${EPREFIX}/usr/include/fltk-${SLOT}
LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk-${SLOT}
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
src_prepare() {
rm -rf zlib jpeg png || die