diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2011-03-20 19:54:42 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2011-03-20 19:54:42 +0000 |
| commit | a872548c7e79928f74d6a525ea1094ad46218134 (patch) | |
| tree | 6bb9f10a99860d03b82be7b29ca66ea750a39e5a /x11-wm | |
| parent | x11-libs/fltk SLOTMOVE 1.1 -> 1 (diff) | |
| download | gentoo-2-a872548c7e79928f74d6a525ea1094ad46218134.tar.gz gentoo-2-a872548c7e79928f74d6a525ea1094ad46218134.tar.bz2 gentoo-2-a872548c7e79928f74d6a525ea1094ad46218134.zip | |
x11-libs/fltk SLOTMOVE 1.1 -> 1, corrected ebuild accordingly
(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/flwm/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-wm/flwm/flwm-1.02.ebuild | 16 |
2 files changed, 14 insertions, 9 deletions
diff --git a/x11-wm/flwm/ChangeLog b/x11-wm/flwm/ChangeLog index 970790b7b6cb..6db2dee908fa 100644 --- a/x11-wm/flwm/ChangeLog +++ b/x11-wm/flwm/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-wm/flwm -# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/flwm/ChangeLog,v 1.15 2007/12/26 13:57:47 coldwind Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/flwm/ChangeLog,v 1.16 2011/03/20 19:54:42 jlec Exp $ + + 20 Mar 2011; Justin Lecher <jlec@gentoo.org> flwm-1.02.ebuild: + x11-libs/fltk SLOTMOVE 1.1 -> 1, corrected ebuild accordingly 26 Dec 2007; Santiago M. Mola <coldwind@gentoo.org> -flwm-1.00-r4.ebuild: Punt old versions. diff --git a/x11-wm/flwm/flwm-1.02.ebuild b/x11-wm/flwm/flwm-1.02.ebuild index c54fa06f6db0..baf3be232fef 100644 --- a/x11-wm/flwm/flwm-1.02.ebuild +++ b/x11-wm/flwm/flwm-1.02.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/flwm/flwm-1.02.ebuild,v 1.1 2007/12/15 21:15:38 coldwind Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/flwm/flwm-1.02.ebuild,v 1.2 2011/03/20 19:54:42 jlec Exp $ EAPI=1 -inherit savedconfig eutils flag-o-matic multilib +inherit savedconfig eutils flag-o-matic multilib toolchain-funcs DESCRIPTION="A lightweight window manager based on fltk" -HOMEPAGE="http://flwm.sourceforge.net" +HOMEPAGE="http://flwm.sourceforge.net/" SRC_URI="http://flwm.sourceforge.net/${P}.tgz" SLOT="0" @@ -15,7 +15,8 @@ LICENSE="GPL-2" KEYWORDS="~amd64 ~ppc ~x86" IUSE="opengl" -DEPEND=">=x11-libs/fltk-1.1.7-r3:1.1 +DEPEND=" + x11-libs/fltk:1 opengl? ( virtual/opengl )" RDEPEND="${DEPEND}" @@ -25,12 +26,13 @@ src_unpack() { epatch "${FILESDIR}/${P}-strip.patch" restore_config config.h + tc-export CXX } src_compile() { use opengl && export X_EXTRA_LIBS=-lGL - append-flags -I/usr/include/fltk-1.1 - append-ldflags -L/usr/$(get_libdir)/fltk-1.1 + append-flags -I$(fltk-config --includedir) + append-ldflags -L$(dirname $(fltk-config --libs)) econf || die "econf failed" emake || die "emake failed" |