From dfccaed6b74305ef81a10d4e4129762ae6b0d2cf Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Sat, 4 Feb 2012 20:44:35 +0000 Subject: Everything from gentoo-x86 is using FLTK 1.3.0 from SLOT="1". Remove keywording from unused (and deprecated) SLOT="2". (Portage version: 2.2.0_alpha84/cvs/Linux x86_64) --- x11-libs/fltk/ChangeLog | 7 ++++++- x11-libs/fltk/fltk-2.0_pre6970-r1.ebuild | 12 +++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) (limited to 'x11-libs/fltk') diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog index a57c7c90da83..0004515787eb 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.203 2012/02/04 20:34:36 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.204 2012/02/04 20:44:35 ssuominen Exp $ + + 04 Feb 2012; Samuli Suominen + fltk-2.0_pre6970-r1.ebuild: + Everything from gentoo-x86 is using FLTK 1.3.0 from SLOT="1". Remove + keywording from unused (and deprecated) SLOT="2". 04 Feb 2012; Samuli Suominen -files/fltk-1.1.9-as-needed.patch, -files/fltk-1.1.9-conf-tests.patch, diff --git a/x11-libs/fltk/fltk-2.0_pre6970-r1.ebuild b/x11-libs/fltk/fltk-2.0_pre6970-r1.ebuild index a6a2d84f4788..37ee21cddce9 100644 --- a/x11-libs/fltk/fltk-2.0_pre6970-r1.ebuild +++ b/x11-libs/fltk/fltk-2.0_pre6970-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2011 Gentoo Foundation +# 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-2.0_pre6970-r1.ebuild,v 1.9 2011/10/23 16:26:57 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-2.0_pre6970-r1.ebuild,v 1.10 2012/02/04 20:44:35 ssuominen Exp $ -EAPI="2" +EAPI=2 inherit multilib autotools flag-o-matic MY_P=${P/_pre/.x-r} @@ -10,7 +10,9 @@ DESCRIPTION="C++ user interface toolkit for X and OpenGL" HOMEPAGE="http://www.fltk.org/" SRC_URI="mirror://easysw/fltk/snapshots/${MY_P}.tar.bz2" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86" +# NOTE: KEYWORDS removed in purpose since everything from gentoo-x86 is using +# FLTK 1.3.0 series from SLOT="1" now +#KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86" LICENSE="FLTK LGPL-2" SLOT="2" IUSE="cairo debug doc +jpeg +png opengl +xft xinerama zlib" @@ -20,7 +22,7 @@ RDEPEND="x11-libs/libXext x11-libs/libSM x11-libs/libXt xft? ( x11-libs/libXft ) - png? ( media-libs/libpng ) + png? ( media-libs/libpng:0 ) jpeg? ( virtual/jpeg ) opengl? ( virtual/opengl ) cairo? ( x11-libs/cairo ) -- cgit v1.2.3-65-gdbad