media-libs/jpeg -> virtual/jpeg. Drop old.

(Portage version: 2.1.9.24/cvs/Linux x86_64)

6 files changed, 12 insertions, 84 deletions

diff --git a/sci-libs/libgeotiff/ChangeLog b/sci-libs/libgeotiff/ChangeLog
index 9c0ca38d8d0e..7ffaa84d0894 100644
--- a/sci-libs/libgeotiff/ChangeLog
+++ b/sci-libs/libgeotiff/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/libgeotiff
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libgeotiff/ChangeLog,v 1.32 2010/05/19 07:59:40 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libgeotiff/ChangeLog,v 1.33 2010/11/08 17:41:42 xarthisius Exp $
+
+  08 Nov 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  libgeotiff-1.2.4.ebuild, -libgeotiff-1.2.5.ebuild,
+  -files/libgeotiff-1.2.5-listgeo-link-hack.patch,
+  -files/libgeotiff-1.2.5-make.patch, libgeotiff-1.3.0.ebuild:
+  media-libs/jpeg -> virtual/jpeg. Drop old.
 
 *libgeotiff-1.3.0 (19 May 2010)
 
diff --git a/sci-libs/libgeotiff/files/libgeotiff-1.2.5-listgeo-link-hack.patch b/sci-libs/libgeotiff/files/libgeotiff-1.2.5-listgeo-link-hack.patch
deleted file mode 100644
index eaa06da1a2bb..000000000000
--- a/sci-libs/libgeotiff/files/libgeotiff-1.2.5-listgeo-link-hack.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- bin/Makefile.in.orig	2009-10-10 12:04:15.972291516 -0700
-+++ bin/Makefile.in	2009-10-10 12:07:34.459886566 -0700
-@@ -49,10 +49,10 @@
- 	${CC} ${COPTS} makegeo.o -L${libdir} ${LIBS} -o $@
-   
- geotifcp$(EXEEXT): geotifcp.o  ${GEOTIFFDIR}/libgeotiff.a
--	${CC} ${COPTS} geotifcp.o -L${libdir} ${LIBS} -o $@
-+	${CC} ${COPTS} geotifcp.o -L${libdir} ../libgeotiff.a ${LIBS} -o $@
-   
- listgeo$(EXEEXT): listgeo.o  ${GEOTIFFDIR}/libgeotiff.a
--	${CC} ${COPTS} listgeo.o -L${libdir} ${LIBS} -o $@
-+	${CC} ${COPTS} listgeo.o -L${libdir} ../libgeotiff.a ${LIBS} -o $@
-   
- csv2html$(EXEEXT): csv2html.o  ${GEOTIFFDIR}/libgeotiff.a
- 	${CC} ${COPTS} csv2html.o -L${libdir} ${LIBS} -o $@
diff --git a/sci-libs/libgeotiff/files/libgeotiff-1.2.5-make.patch b/sci-libs/libgeotiff/files/libgeotiff-1.2.5-make.patch
deleted file mode 100644
index 719a3e0b5384..000000000000
--- a/sci-libs/libgeotiff/files/libgeotiff-1.2.5-make.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.orig	2009-10-10 10:32:26.665288828 -0700
-+++ Makefile.in		2009-10-10 10:35:36.098484182 -0700
-@@ -104,6 +104,7 @@
- 	${LD_SHARED} ${OBJS} ${LIBS} -o $(GEOTIFF_SO)
- 	rm -f libgeotiff.$(SO_EXT)
- 	${LN} $(GEOTIFF_SO) libgeotiff.$(SO_EXT)
-+	${LN} $(GEOTIFF_SO) libgeotiff.$(SO_EXT).$(VERSION_MAJOR).$(VERSION_MINOR)
- 
- Progs:	$(GEOTIFF_SO)
- 	${CD} ${BIN};\
diff --git a/sci-libs/libgeotiff/libgeotiff-1.2.4.ebuild b/sci-libs/libgeotiff/libgeotiff-1.2.4.ebuild
index 3056ee50f2d2..40559d804d99 100644
--- a/sci-libs/libgeotiff/libgeotiff-1.2.4.ebuild
+++ b/sci-libs/libgeotiff/libgeotiff-1.2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libgeotiff/libgeotiff-1.2.4.ebuild,v 1.9 2008/05/12 16:02:34 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libgeotiff/libgeotiff-1.2.4.ebuild,v 1.10 2010/11/08 17:41:42 xarthisius Exp $
 
 inherit autotools eutils flag-o-matic
 
@@ -14,7 +14,7 @@ KEYWORDS="alpha amd64 ~mips ~ppc ppc64 sparc x86"
 IUSE="doc python"
 
 RDEPEND=">=media-libs/tiff-3.7
-	media-libs/jpeg
+	virtual/jpeg
 	sci-libs/proj"
 
 DEPEND="${RDEPEND}
diff --git a/sci-libs/libgeotiff/libgeotiff-1.2.5.ebuild b/sci-libs/libgeotiff/libgeotiff-1.2.5.ebuild
deleted file mode 100644
index 307079b1ca9b..000000000000
--- a/sci-libs/libgeotiff/libgeotiff-1.2.5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libgeotiff/libgeotiff-1.2.5.ebuild,v 1.1 2010/04/17 17:14:03 nerdboy Exp $
-
-EAPI=2
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="Library for reading TIFF files with embedded tags for geographic (cartographic) information"
-HOMEPAGE="http://geotiff.osgeo.org/"
-SRC_URI="ftp://ftp.remotesensing.org/pub/geotiff/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc python"
-
-RDEPEND=">=media-libs/tiff-3.9.1
-	media-libs/jpeg
-	sci-libs/proj"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.2.4-soname.patch
-	epatch "${FILESDIR}"/${P}-make.patch
-	epatch "${FILESDIR}"/${P}-listgeo-link-hack.patch
-	filter-ldflags -Wl,-O1
-	eautoconf
-	eautomake
-}
-
-src_compile() {
-	emake -j1 || die "emake failed"
-
-	if use doc; then
-	    emake dox || die "emake dox failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dobin bin/makegeo || die "dobin makegeo failed"
-
-	if use python; then
-		dobin csv/*.py || die "dobin python failed"
-	fi
-
-	dodoc README
-	newdoc csv/README README.csv
-	use doc && dohtml docs/api/*
-}
diff --git a/sci-libs/libgeotiff/libgeotiff-1.3.0.ebuild b/sci-libs/libgeotiff/libgeotiff-1.3.0.ebuild
index 9420f3dcdfe3..fb9b4b9a5262 100644
--- a/sci-libs/libgeotiff/libgeotiff-1.3.0.ebuild
+++ b/sci-libs/libgeotiff/libgeotiff-1.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libgeotiff/libgeotiff-1.3.0.ebuild,v 1.1 2010/05/19 07:59:40 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libgeotiff/libgeotiff-1.3.0.ebuild,v 1.2 2010/11/08 17:41:42 xarthisius Exp $
 
 EAPI="3"
 inherit base
@@ -17,7 +17,7 @@ KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~p
 IUSE="debug doc static-libs"
 
 RDEPEND="
-	media-libs/jpeg
+	virtual/jpeg
 	>=media-libs/tiff-3.9.1
 	sci-libs/proj
 	sys-libs/zlib"