Move from custom jpeg extras to Debian extras since ours is just a copy.

(Portage version: 2.2_rc38/cvs/Linux x86_64)

4 files changed, 62 insertions, 12 deletions

diff --git a/media-libs/jpeg/ChangeLog b/media-libs/jpeg/ChangeLog
index 2b1c4a6679c0..0c2026c917f9 100644
--- a/media-libs/jpeg/ChangeLog
+++ b/media-libs/jpeg/ChangeLog
@@ -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@gentoo.org> 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@gentoo.org> jpeg-7.ebuild:
   Hook the extra subdir into the normal jpeg dir so we can re-use the
diff --git a/media-libs/jpeg/files/Makefile.extra b/media-libs/jpeg/files/Makefile.extra
new file mode 100644
index 000000000000..2afa77896d5c
--- /dev/null
+++ b/media-libs/jpeg/files/Makefile.extra
@@ -0,0 +1,3 @@
+all %:
+	../../config.status --file=Makefile:Makefile.in
+	$(MAKE) $@
diff --git a/media-libs/jpeg/files/Makefile.in.extra b/media-libs/jpeg/files/Makefile.in.extra
new file mode 100644
index 000000000000..df81038498f0
--- /dev/null
+++ b/media-libs/jpeg/files/Makefile.in.extra
@@ -0,0 +1,37 @@
+CC = @CC@
+EXEEXT = @EXEEXT@
+CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+bindir = @bindir@
+datarootdir = @datarootdir@
+mandir = @mandir@
+man1dir = $(mandir)/man1
+
+MKDIR_P = @MKDIR_P@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+
+SCRIPTS = exifautotran
+PROGRAMS = jpegexiforient$(EXEEXT)
+
+all: $(SCRIPTS) $(PROGRAMS)
+
+jpegexiforient$(EXEEXT): jpegexiforient.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $<
+
+clean:
+	rm -f $(PROGRAMS) *.o
+
+install: all
+	$(MKDIR_P) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir)
+	$(INSTALL_PROGRAM) $(PROGRAMS) $(DESTDIR)$(bindir)
+	$(INSTALL_SCRIPT) $(SCRIPTS) $(DESTDIR)$(bindir)
+	$(INSTALL_DATA) *.1 $(DESTDIR)$(man1dir)
+
+.PHONY: all clean install
diff --git a/media-libs/jpeg/jpeg-7.ebuild b/media-libs/jpeg/jpeg-7.ebuild
index 2fee8b58d636..9708c7688e89 100644
--- a/media-libs/jpeg/jpeg-7.ebuild
+++ b/media-libs/jpeg/jpeg-7.ebuild
@@ -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() {