[patch] freeimage-3.11.0.ebuild.patch

freeimage-3.11.0.ebuild.patch (text/plain), 1.70 KB, created by Christian Ruppert (idl0r) on 2009-02-04 22:07:40 UTC

--- freeimage-3.11.0.ebuild	2009-02-02 13:28:39.733292841 +0100
+++ freeimage-3.11.0-r1.ebuild	2009-02-02 13:37:54.010295645 +0100
@@ -2,10 +2,11 @@
 # 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.2 2008/11/25 09:17:05 nyhm Exp $
 
-inherit toolchain-funcs multilib
+inherit eutils multilib
 
 MY_PN=FreeImage
 MY_P=${MY_PN}${PV//.}
+
 DESCRIPTION="Image library supporting many formats"
 HOMEPAGE="http://freeimage.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
@@ -23,17 +24,7 @@ S=${WORKDIR}/${MY_PN}
 
 src_unpack() {
 	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e "/^CC =/s:gcc:$(tc-getCC) ${CFLAGS} -Wall:" \
-		-e "/^CXX =/s:g++:$(tc-getCXX) ${CXXFLAGS} -Wall:" \
-		-e "/^AR = /s:ar:$(tc-getAR):" \
-		-e "/^INCDIR = /s:/usr/include:${D}/usr/include:" \
-		-e "/^INSTALLDIR = /s:/usr/lib:${D}/usr/$(get_libdir):" \
-		-e '/^COMPILERFLAGS =/s:-O3::' \
-		-e "/\$(CC) -s /s: -s : ${LDFLAGS} :" \
-		Makefile.{gnu,fip} \
-		|| die "sed failed"
+	epatch "${FILESDIR}/Makefiles.patch"
 }
 
 src_compile() {
@@ -44,11 +35,13 @@ src_compile() {
 }
 
 src_install() {
-	dodir /usr/include /usr/$(get_libdir)
-	emake -f Makefile.gnu install || die "emake install failed"
+	local paths="DESTDIR=\"${D}\" INSTALLDIR=\"${D}/usr/$(get_libdir)\""
+
+	emake -f Makefile.gnu ${paths} install || die "emake install failed"
 	if use cxx ; then
-		emake -f Makefile.fip install || die "emake install fip failed"
+		emake -f Makefile.fip ${paths} install || die "emake install fip failed"
 	fi
-	dodoc README.linux Whatsnew.txt
+
+	dodoc README.linux Whatsnew.txt || die "dodoc failed"
 	use doc && dodoc "${DISTDIR}"/${MY_P}.pdf
 }