[gentoo-commits] gentoo-x86 commit in media-libs/jpeg: ChangeLog jpeg-7.ebuild

[Mike Frysinger (vapier)]

vapier      09/08/23 00:52:55

  Modified:             ChangeLog jpeg-7.ebuild
  Log:
  Hook the extra subdir into the normal jpeg dir so we can re-use the configure environment and thus simplify the rest of the ebuild.  Drop external libtool dep since jpeg bundles its own sane version.
  (Portage version: 2.2_rc38/cvs/Linux x86_64)

Revision  Changes    Path
1.73                 media-libs/jpeg/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- ChangeLog	22 Aug 2009 12:16:57 -0000	1.72
+++ ChangeLog	23 Aug 2009 00:52:55 -0000	1.73
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/jpeg
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.72 2009/08/22 12:16:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.73 2009/08/23 00:52:55 vapier Exp $
+
+  23 Aug 2009; Mike Frysinger <vapier@g.o> jpeg-7.ebuild:
+  Hook the extra subdir into the normal jpeg dir so we can re-use the
+  configure environment and thus simplify the rest of the ebuild. Drop
+  external libtool dep since jpeg bundles its own sane version.
 
   22 Aug 2009; Samuli Suominen <ssuominen@g.o> jpeg-7.ebuild,
   +files/jpeg-7-maxmem_sysconf.patch:



1.4                  media-libs/jpeg/jpeg-7.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/jpeg/jpeg-7.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/jpeg/jpeg-7.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/jpeg/jpeg-7.ebuild?r1=1.3&r2=1.4

Index: jpeg-7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-7.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jpeg-7.ebuild	22 Aug 2009 12:16:57 -0000	1.3
+++ jpeg-7.ebuild	23 Aug 2009 00:52:55 -0000	1.4
@@ -1,9 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-7.ebuild,v 1.3 2009/08/22 12:16:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-7.ebuild,v 1.4 2009/08/23 00:52:55 vapier Exp $
 
-EAPI=2
-inherit eutils libtool toolchain-funcs
+EAPI="2"
+inherit eutils libtool
 
 DESCRIPTION="Library to load, handle and manipulate images in the JPEG format"
 HOMEPAGE="http://www.ijg.org/"
@@ -15,13 +15,18 @@
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND=""
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
-
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-maxmem_sysconf.patch
 	elibtoolize
+
+	# hook the extra dir into the normal jpeg build env
+	mv ../${P}-extra extra
+	sed -i '/all:/s:$:\n\t$(MAKE) -C extra $@:' Makefile.in
+	# newer extra tarball has this integrated
+	cd extra
+	sed -e 's:mandir:man1dir:' Makefile > Makefile.in
+	grep ' = @' ../Makefile.in >> Makefile.in
+	printf 'all %%:\n\t../config.status --file=Makefile:Makefile.in\n\t$(MAKE) $@' > Makefile
 }
 
 src_configure() {
@@ -32,16 +37,7 @@
 		--enable-maxmem=64
 }
 
-src_compile() {
-	emake || die "emake failed"
-	tc-export CC
-	emake -C "${WORKDIR}"/${P}-extra || die "emake failed"
-}
-
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	emake -C "${WORKDIR}"/${P}-extra DESTDIR="${D}" \
-		install || die "emake install failed"
-
-	dodoc example.c README *.{log,txt} || die "dodoc failed"
+	emake DESTDIR="${D}" install || die
+	dodoc example.c README *.{log,txt}
 }