[gentoo-commits] gentoo-x86 commit in media-libs/freeimage: ChangeLog freeimage-3.11.0.ebuild

["Tristan Heaven (nyhm)" <nyhm@gentoo.org>]

nyhm        08/11/25 09:17:05

  Modified:             ChangeLog freeimage-3.11.0.ebuild
  Log:
  Add cxx USE flag, bug #242888
  (Portage version: 2.2_rc15/cvs/Linux 2.6.27.7 i686)

Revision  Changes    Path
1.6                  media-libs/freeimage/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/freeimage/ChangeLog?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/freeimage/ChangeLog?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/freeimage/ChangeLog?r1=1.5&r2=1.6

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/freeimage/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ChangeLog	2 Sep 2008 00:12:06 -0000	1.5
+++ ChangeLog	25 Nov 2008 09:17:05 -0000	1.6
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/freeimage
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freeimage/ChangeLog,v 1.5 2008/09/02 00:12:06 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freeimage/ChangeLog,v 1.6 2008/11/25 09:17:05 nyhm Exp $
+
+  25 Nov 2008; Tristan Heaven <nyhm@gentoo.org> freeimage-3.11.0.ebuild:
+  Add cxx USE flag, bug #242888
 
 *freeimage-3.11.0 (02 Sep 2008)
 



1.2                  media-libs/freeimage/freeimage-3.11.0.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/freeimage/freeimage-3.11.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/freeimage/freeimage-3.11.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/freeimage/freeimage-3.11.0.ebuild?r1=1.1&r2=1.2

Index: freeimage-3.11.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/freeimage/freeimage-3.11.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- freeimage-3.11.0.ebuild	2 Sep 2008 00:12:06 -0000	1.1
+++ freeimage-3.11.0.ebuild	25 Nov 2008 09:17:05 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freeimage/freeimage-3.11.0.ebuild,v 1.1 2008/09/02 00:12:06 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freeimage/freeimage-3.11.0.ebuild,v 1.2 2008/11/25 09:17:05 nyhm Exp $
 
 inherit toolchain-funcs multilib
 
@@ -14,7 +14,7 @@
 LICENSE="|| ( GPL-2 FIPL-1.0 )"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc"
+IUSE="cxx doc"
 
 DEPEND="app-arch/unzip"
 RDEPEND=""
@@ -32,13 +32,23 @@
 		-e "/^INSTALLDIR = /s:/usr/lib:${D}/usr/$(get_libdir):" \
 		-e '/^COMPILERFLAGS =/s:-O3::' \
 		-e "/\$(CC) -s /s: -s : ${LDFLAGS} :" \
-		Makefile.gnu \
+		Makefile.{gnu,fip} \
 		|| die "sed failed"
 }
 
+src_compile() {
+	emake -f Makefile.gnu || die "emake failed"
+	if use cxx ; then
+		emake -f Makefile.fip || die "emake fip failed"
+	fi
+}
+
 src_install() {
 	dodir /usr/include /usr/$(get_libdir)
-	emake install || die "emake install failed"
+	emake -f Makefile.gnu install || die "emake install failed"
+	if use cxx ; then
+		emake -f Makefile.fip install || die "emake install fip failed"
+	fi
 	dodoc README.linux Whatsnew.txt
 	use doc && dodoc "${DISTDIR}"/${MY_P}.pdf
 }