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

[Mike Frysinger (vapier)]

vapier      09/08/23 01:59:57

  Modified:             ChangeLog jpeg-7.ebuild
  Log:
  Move from custom jpeg extras to Debian extras since ours is just a copy.
  (Portage version: 2.2_rc38/cvs/Linux x86_64)

Revision  Changes    Path
1.74                 media-libs/jpeg/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- ChangeLog	23 Aug 2009 00:52:55 -0000	1.73
+++ ChangeLog	23 Aug 2009 01:59:57 -0000	1.74
@@ -1,6 +1,10 @@
 # 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.73 2009/08/23 00:52:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.74 2009/08/23 01:59:57 vapier Exp $
+
+  23 Aug 2009; Mike Frysinger <vapier@g.o> jpeg-7.ebuild,
+  +files/Makefile.extra, +files/Makefile.in.extra:
+  Move from custom jpeg extras to Debian extras since ours is just a copy.
 
   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



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

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

Index: jpeg-7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-7.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jpeg-7.ebuild	23 Aug 2009 00:52:55 -0000	1.4
+++ jpeg-7.ebuild	23 Aug 2009 01:59:57 -0000	1.5
@@ -1,32 +1,38 @@
 # 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.4 2009/08/23 00:52:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-7.ebuild,v 1.5 2009/08/23 01:59:57 vapier Exp $
 
 EAPI="2"
+
+DEB_PV="7-1"
+DEB_PN="libjpeg${PV}"
+DEB="${DEB_PN}_${DEB_PV}"
+
 inherit eutils libtool
 
 DESCRIPTION="Library to load, handle and manipulate images in the JPEG format"
 HOMEPAGE="http://www.ijg.org/"
 SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz
-	mirror://gentoo/${P}-extra.tar.bz2"
+	mirror://debian/pool/main/libj/${DEB_PN}/${DEB}.diff.gz"
 
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE=""
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${WORKDIR}"/${DEB}.diff
+	cp "${FILESDIR}"/Makefile.extra debian/extra/Makefile
+	cp "${FILESDIR}"/Makefile.in.extra debian/extra/Makefile.in
+}
+
 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
+	# hook the Debian extra dir into the normal jpeg build env
+	sed -i '/all:/s:$:\n\t$(MAKE) -C debian/extra $@:' Makefile.in
 }
 
 src_configure() {