Version bump. Drop old.

(Portage version: 2.1.9.24/cvs/Linux x86_64)

3 files changed, 20 insertions, 64 deletions

diff --git a/media-libs/vips/ChangeLog b/media-libs/vips/ChangeLog
index 19fc459e8033..eb681365707e 100644
--- a/media-libs/vips/ChangeLog
+++ b/media-libs/vips/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/vips
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vips/ChangeLog,v 1.35 2010/11/23 20:38:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vips/ChangeLog,v 1.36 2010/11/24 12:33:11 pva Exp $
+
+*vips-7.22.5 (24 Nov 2010)
+
+  24 Nov 2010; Peter Volkov <pva@gentoo.org> -vips-7.20.7.ebuild,
+  -vips-7.22.2.ebuild, +vips-7.22.5.ebuild:
+  Version bump. Drop old.
 
   23 Nov 2010; Jeroen Roovers <jer@gentoo.org> vips-7.22.4.ebuild:
   Stable for PPC (bug #344561).
diff --git a/media-libs/vips/vips-7.20.7.ebuild b/media-libs/vips/vips-7.20.7.ebuild
deleted file mode 100644
index 5f419e98fefe..000000000000
--- a/media-libs/vips/vips-7.20.7.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vips/vips-7.20.7.ebuild,v 1.7 2010/11/09 15:02:07 ssuominen Exp $
-
-EAPI=2
-inherit eutils versionator
-
-# TODO:
-# matio? ( sci-libs/matio ) - in sunrise
-# cimg support?
-
-DESCRIPTION="VIPS Image Processing Library"
-SRC_URI="http://www.vips.ecs.soton.ac.uk/supported/$(get_version_component_range 1-2)/${P}.tar.gz"
-HOMEPAGE="http://vips.sourceforge.net"
-
-LICENSE="LGPL-2.1"
-SLOT="1"
-KEYWORDS="amd64 ppc x86"
-IUSE="exif fftw imagemagick jpeg lcms openexr png python tiff v4l"
-
-RDEPEND=">=dev-libs/glib-2.6:2
-	>=dev-libs/liboil-0.3
-	dev-libs/libxml2
-	sys-libs/zlib
-	>=x11-libs/pango-1.8
-	fftw? ( sci-libs/fftw:3.0 )
-	imagemagick? ( >=media-gfx/imagemagick-5.0.0 )
-	lcms? ( =media-libs/lcms-1* )
-	openexr? ( >=media-libs/openexr-1.2.2 )
-	python? ( >=dev-lang/python-2.2 )
-	exif? ( >=media-libs/libexif-0.6 )
-	tiff? ( media-libs/tiff )
-	jpeg? ( virtual/jpeg )
-	png? ( media-libs/libpng )"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
-}
-
-src_configure() {
-	econf \
-		$(use_with fftw fftw3) \
-		$(use_with lcms) \
-		$(use_with openexr OpenEXR) \
-		$(use_with exif libexif) \
-		$(use_with imagemagick magick) \
-		$(use_with png) \
-		$(use_with tiff) \
-		$(use_with jpeg) \
-		$(use_with python) \
-		$(use_with v4l)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die
-}
diff --git a/media-libs/vips/vips-7.22.2.ebuild b/media-libs/vips/vips-7.22.5.ebuild
index 30394baa3ad3..6385ffdbed17 100644
--- a/media-libs/vips/vips-7.22.2.ebuild
+++ b/media-libs/vips/vips-7.22.5.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/media-libs/vips/vips-7.22.2.ebuild,v 1.2 2010/11/09 15:02:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vips/vips-7.22.5.ebuild,v 1.1 2010/11/24 12:33:11 pva Exp $
 
 EAPI=2
 PYTHON_DEPEND="python? 2"
@@ -17,7 +17,7 @@ HOMEPAGE="http://vips.sourceforge.net"
 LICENSE="LGPL-2.1"
 SLOT="1"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="exif fftw imagemagick jpeg lcms openexr png python tiff v4l"
+IUSE="exif fftw imagemagick jpeg lcms openexr png python static-libs tiff v4l"
 
 RDEPEND=">=dev-libs/glib-2.6:2
 	>=dev-libs/liboil-0.3
@@ -25,7 +25,8 @@ RDEPEND=">=dev-libs/glib-2.6:2
 	sys-libs/zlib
 	>=x11-libs/pango-1.8
 	fftw? ( sci-libs/fftw:3.0 )
-	imagemagick? ( >=media-gfx/imagemagick-5.0.0 )
+	imagemagick? ( || ( >=media-gfx/imagemagick-5.0.0
+		media-gfx/graphicsmagick[imagemagick] ) )
 	lcms? ( =media-libs/lcms-1* >=media-libs/lcms-1.0.8 )
 	openexr? ( >=media-libs/openexr-1.2.2 )
 	exif? ( >=media-libs/libexif-0.6 )
@@ -53,10 +54,18 @@ src_configure() {
 		$(use_with tiff) \
 		$(use_with jpeg) \
 		$(use_with python) \
-		$(use_with v4l)
+		$(use_with v4l) \
+		$(use_enable static-libs static)
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die
+
+	# 314101
+	mv "${D}"/usr/share/doc/${PN}/* "${D}"/usr/share/doc/${PF} || die
+	rmdir "${D}"/usr/share/doc/${PN}/ || die
+	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}
+
+	find "${D}" -name '*.la' -exec rm -f {} +
 }