x11-libs/fltk SLOTMOVE 1.1 -> 1, corrected ebuild accordingly

(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)

3 files changed, 26 insertions, 16 deletions

diff --git a/media-gfx/monica/ChangeLog b/media-gfx/monica/ChangeLog
index e940442374c1..d6b636bf57b4 100644
--- a/media-gfx/monica/ChangeLog
+++ b/media-gfx/monica/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/monica
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/monica/ChangeLog,v 1.6 2009/11/09 12:50:48 maekke Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/monica/ChangeLog,v 1.7 2011/03/20 20:14:46 jlec Exp $
+
+  20 Mar 2011; Justin Lecher <jlec@gentoo.org> monica-3.6.ebuild,
+  monica-3.7.ebuild:
+  x11-libs/fltk SLOTMOVE 1.1 -> 1, corrected ebuild accordingly
 
   09 Nov 2009; Markus Meier <maekke@gentoo.org> monica-3.7.ebuild:
   amd64/x86 stable, bug #286511
diff --git a/media-gfx/monica/monica-3.6.ebuild b/media-gfx/monica/monica-3.6.ebuild
index d9283c92c3eb..7c20139cb4f0 100644
--- a/media-gfx/monica/monica-3.6.ebuild
+++ b/media-gfx/monica/monica-3.6.ebuild
@@ -1,19 +1,23 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/monica/monica-3.6.ebuild,v 1.2 2008/11/14 20:59:15 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/monica/monica-3.6.ebuild,v 1.3 2011/03/20 20:14:46 jlec Exp $
 
-inherit eutils
+EAPI="1"
+
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Monica is a Monitor Calibration Tool"
 HOMEPAGE="http://www.pcbypaul.com/software/monica.html"
 SRC_URI="http://www.pcbypaul.com/software/dl/${P}.tar.bz2"
+
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
 IUSE=""
-DEPEND="<x11-libs/fltk-2"
-RDEPEND="x11-apps/xgamma
-		 ${DEPEND}"
+
+DEPEND="x11-libs/fltk:1"
+RDEPEND="${DEPEND}
+	x11-apps/xgamma"
 
 src_unpack() {
 	unpack ${A}
@@ -23,10 +27,10 @@ src_unpack() {
 }
 
 src_compile() {
-	emake CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
+	emake CXX=$(tc-getCXX) LINK=$(tc-getCXX) CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed"
 }
 
 src_install() {
-	dobin monica
-	dodoc AUTHORS ChangeLog NEWS README
+	dobin monica || die "dobin failed"
+	dodoc authors ChangeLog news readme
 }
diff --git a/media-gfx/monica/monica-3.7.ebuild b/media-gfx/monica/monica-3.7.ebuild
index 371b03ca8905..06784f4d7b13 100644
--- a/media-gfx/monica/monica-3.7.ebuild
+++ b/media-gfx/monica/monica-3.7.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/monica/monica-3.7.ebuild,v 1.5 2009/11/09 12:50:48 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/monica/monica-3.7.ebuild,v 1.6 2011/03/20 20:14:46 jlec Exp $
 
-inherit eutils
+EAPI="1"
+
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Monica is a Monitor Calibration Tool"
 HOMEPAGE="http://www.pcbypaul.com/software/monica.html"
@@ -13,7 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-DEPEND="<x11-libs/fltk-2"
+DEPEND="x11-libs/fltk:1"
 RDEPEND="${DEPEND}
 	x11-apps/xgamma"
 
@@ -26,7 +28,7 @@ src_unpack() {
 }
 
 src_compile() {
-	emake CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed"
+	emake CXX=$(tc-getCXX) LINK=$(tc-getCXX) CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed"
 }
 
 src_install() {