[gentoo-commits] gentoo-x86 commit in app-office/teapot: ChangeLog teapot-2.2.0.ebuild

[gentoo-commits] gentoo-x86 commit in app-office/teapot: ChangeLog teapot-2.2.0.ebuild

[Samuli Suominen (ssuominen)]

ssuominen    11/12/10 14:18:53

  Modified:             ChangeLog teapot-2.2.0.ebuild
  Log:
  Fix paths to fltk-1.3.0 wrt #378539 by Dennis Nezic
  
  (Portage version: 2.2.0_alpha79/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  app-office/teapot/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/teapot/ChangeLog?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/teapot/ChangeLog?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/teapot/ChangeLog?r1=1.2&r2=1.3

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/teapot/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ChangeLog	21 Feb 2011 16:22:52 -0000	1.2
+++ ChangeLog	10 Dec 2011 14:18:53 -0000	1.3
@@ -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.



1.3                  app-office/teapot/teapot-2.2.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/teapot/teapot-2.2.0.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/teapot/teapot-2.2.0.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/teapot/teapot-2.2.0.ebuild?r1=1.2&r2=1.3

Index: teapot-2.2.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/teapot/teapot-2.2.0.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- teapot-2.2.0.ebuild	21 Mar 2011 18:34:38 -0000	1.2
+++ teapot-2.2.0.ebuild	10 Dec 2011 14:18:53 -0000	1.3
@@ -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 @@
 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 @@
 			-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