summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-12-10 14:18:53 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-12-10 14:18:53 +0000
commit984f966ae5c679cf06d8e67d6c493d9d22f2f849 (patch)
tree663286f7148babdfdb669a1a9888050d85cd53b9 /app-office/teapot
parentold (diff)
downloadgentoo-2-984f966ae5c679cf06d8e67d6c493d9d22f2f849.tar.gz
gentoo-2-984f966ae5c679cf06d8e67d6c493d9d22f2f849.tar.bz2
gentoo-2-984f966ae5c679cf06d8e67d6c493d9d22f2f849.zip
Fix paths to fltk-1.3.0 wrt #378539 by Dennis Nezic
(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)
Diffstat (limited to 'app-office/teapot')
-rw-r--r--app-office/teapot/ChangeLog5
-rw-r--r--app-office/teapot/teapot-2.2.0.ebuild8
2 files changed, 8 insertions, 5 deletions
diff --git a/app-office/teapot/ChangeLog b/app-office/teapot/ChangeLog
index 7cc6592d4849..67e51267122c 100644
--- a/app-office/teapot/ChangeLog
+++ b/app-office/teapot/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-office/teapot
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/teapot/ChangeLog,v 1.2 2011/02/21 16:22:52 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/teapot/ChangeLog,v 1.3 2011/12/10 14:18:53 ssuominen Exp $
+
+ 10 Dec 2011; Samuli Suominen <ssuominen@gentoo.org> teapot-2.2.0.ebuild:
+ Fix paths to fltk-1.3.0 wrt #378539 by Dennis Nezic
21 Feb 2011; Kevin McCarthy <signals@gentoo.org> metadata.xml:
Remove proxy maintainers and take direct maintainership.
diff --git a/app-office/teapot/teapot-2.2.0.ebuild b/app-office/teapot/teapot-2.2.0.ebuild
index bf44cee0ab31..2cca7fb6fab8 100644
--- a/app-office/teapot/teapot-2.2.0.ebuild
+++ b/app-office/teapot/teapot-2.2.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/teapot/teapot-2.2.0.ebuild,v 1.2 2011/03/21 18:34:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/teapot/teapot-2.2.0.ebuild,v 1.3 2011/12/10 14:18:53 ssuominen Exp $
EAPI=4
inherit cmake-utils flag-o-matic
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
IUSE="doc fltk"
RDEPEND="sys-libs/ncurses
- fltk? ( >=x11-libs/fltk-1.3.0_rc:1 )"
+ fltk? ( >=x11-libs/fltk-1.3.0:1 )"
DEPEND="${RDEPEND}
doc? (
app-office/lyx
@@ -41,8 +41,8 @@ src_configure() {
-DFLTK_DIR=/usr/share/cmake/Modules
-DFLTK_FLUID_EXECUTABLE=/usr/bin/fluid
)
- append-cxxflags -I/usr/include/fltk-1.1
- append-ldflags -L/usr/$(get_libdir)/fltk-1.1
+ append-cxxflags -I/usr/include/fltk-1
+ append-ldflags -L/usr/$(get_libdir)/fltk-1
fi
cmake-utils_src_configure