From: Samuli Suominen <ssuominen@gentoo.org>
Date: Thu, 5 Jan 2012 18:23:21 +0000 (+0000)
Subject: old. clean up a bit...
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=386f8b38987031cadf8df12f4db40fb9caf86031;p=gentoo.git

old. clean up a bit...

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64
---

diff --git a/media-gfx/monica/ChangeLog b/media-gfx/monica/ChangeLog
index d6b636bf57b4..e6f8b3c1bfa5 100644
--- a/media-gfx/monica/ChangeLog
+++ b/media-gfx/monica/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/monica
-# 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 $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/monica/ChangeLog,v 1.8 2012/01/05 18:23:21 ssuominen Exp $
+
+  05 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> -monica-3.6.ebuild:
+  old
 
   20 Mar 2011; Justin Lecher <jlec@gentoo.org> monica-3.6.ebuild,
   monica-3.7.ebuild:
diff --git a/media-gfx/monica/monica-3.6.ebuild b/media-gfx/monica/monica-3.6.ebuild
deleted file mode 100644
index 7c20139cb4f0..000000000000
--- a/media-gfx/monica/monica-3.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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.3 2011/03/20 20:14:46 jlec Exp $
-
-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:1"
-RDEPEND="${DEPEND}
-	x11-apps/xgamma"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${P}-makefile-cleanup.patch
-	cd "${S}"
-	make clean
-}
-
-src_compile() {
-	emake CXX=$(tc-getCXX) LINK=$(tc-getCXX) CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	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 06784f4d7b13..e7eadee75a25 100644
--- a/media-gfx/monica/monica-3.7.ebuild
+++ b/media-gfx/monica/monica-3.7.ebuild
@@ -1,9 +1,8 @@
 # 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.6 2011/03/20 20:14:46 jlec Exp $
-
-EAPI="1"
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/monica/monica-3.7.ebuild,v 1.7 2012/01/05 18:23:21 ssuominen Exp $
 
+EAPI=4
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Monica is a Monitor Calibration Tool"
@@ -15,23 +14,25 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-DEPEND="x11-libs/fltk:1"
+DEPEND=">=x11-libs/fltk-1.1:1"
 RDEPEND="${DEPEND}
 	x11-apps/xgamma"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.6-makefile-cleanup.patch
 	epatch "${FILESDIR}"/${P}-gcc44.patch
-	emake clean || die "emake clean failed"
+	emake clean
 }
 
 src_compile() {
-	emake CXX=$(tc-getCXX) LINK=$(tc-getCXX) CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed"
+	emake \
+		CXX="$(tc-getCXX)" \
+		CXXFLAGS="${CXXFLAGS}" \
+		LINK="$(tc-getCXX)" \
+		LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
-	dobin monica || die "dobin failed"
+	dobin monica
 	dodoc authors ChangeLog news readme
 }