Version bump. Drop old.

Package-Manager: portage-2.1.9.24/cvs/Linux x86_64

4 files changed, 23 insertions, 69 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/Manifest b/media-libs/vips/Manifest
index 55c3db5ca534..81b885d87109 100644
--- a/media-libs/vips/Manifest
+++ b/media-libs/vips/Manifest
@@ -1,9 +1,7 @@
 AUX vips-7.20.7-build.patch 1530 RMD160 ee1fee0007f55afc35bc68b2639677da0e985f76 SHA1 47eef2a75b34b53148bc7baa65efe8663e4bde4c SHA256 5e33c1c5f2419e2436fac28af98fcf28a38c411efaa43908609c81cac187dbae
-DIST vips-7.20.7.tar.gz 3082797 RMD160 cddd6175307030bc6aacd02a56253e45e884d2db SHA1 48566a8bdeaf2a060ddd40a71c69813b6aef8c5e SHA256 3738ed5efac6676862c1ff310cc5baa63f2401b5bc931fb3671b29ddc1b1a899
-DIST vips-7.22.2.tar.gz 3218801 RMD160 e41bea14ef3351081232da9fa2c1cf7ac404891d SHA1 18193d7dcc9206c9a71623a06c20bc56e7ee3061 SHA256 57d80bc8c2a1a4756528432d91546e9b5aa3db2bdfa3ba4006230e206e7031a7
 DIST vips-7.22.4.tar.gz 3226315 RMD160 9f31c01a6a757b51aff5e5bc05d2102f83fc2afd SHA1 77fb29e97b31b45ae62e163f379e5bd7397e703f SHA256 b46e261208d83fc79ca3a3c87c54ccac432d1d2117c3f789715491e35bb9a514
-EBUILD vips-7.20.7.ebuild 1522 RMD160 da71c6eac84f410ea9a35681640b9a72769fead4 SHA1 86c005193f250594f52fb97046031d525e252701 SHA256 de53400c9e137b57529ce8f6deef45f4a0e3e132514a88b1db9e89cedc75d12d
-EBUILD vips-7.22.2.ebuild 1580 RMD160 7a0b492937a120c08ef9fba132a386015248a67a SHA1 d6c174baf484bb9ea06785f5c7d1bc6904a1d916 SHA256 2a31d07cb771e2eab8c3e850f38eef1105d9cbf7e91402de537ab3bee823d340
+DIST vips-7.22.5.tar.gz 3226360 RMD160 32f8d19997a50356cc838a32209fd44fccd7daac SHA1 fe07b4bb655cdb2f7a2355d98fcf1ed1556ea704 SHA256 c557845527eb31266cd8473915785c122c29ba86eb2e26edf243d60de7ffd91f
 EBUILD vips-7.22.4.ebuild 1880 RMD160 ac720e9bc0c6970cfb8865ad1559009f1f76f7d9 SHA1 1e9fb35ede43972e000e81de1bdce5cbbfd2f7c3 SHA256 556236c13eedde8b7eac10eadfaa3cdbb1ffaa0679925f0dbe29106d5676034a
-MISC ChangeLog 4995 RMD160 d551a232ae0924b46583009e0044e92bafa2a159 SHA1 d7c7bc75d298aa0492d379c05c559791b108c21e SHA256 114d712cd9f9b6183d64be0ff8574d87e0c07b2ee47f197f95bcf6f046fa0655
+EBUILD vips-7.22.5.ebuild 1883 RMD160 71bb6c4e979cd03008348f84eb4ba800c0049ec6 SHA1 d239648cf8b85113ad2d949f965fd0958ed38af3 SHA256 51bf2dd6fc4c13c5835c2c2ed0b51e4b7d378a06e75183f983679fcaa6a7f3bf
+MISC ChangeLog 5160 RMD160 df082a5ba5f49145515e702e8ad85c53e5c344f5 SHA1 b00f43222d4a9e0ce5f2ebde83e9dea1104fd11b SHA256 46300b67f9d4c753d4fe8f92ba5dbf7ae308846febfcfcaaaf3a9c72a9039678
 MISC metadata.xml 251 RMD160 d329d8bf85ea35912d9cf8beb95035c37fefa835 SHA1 1860ebb1a70050d2f391bc1c22ca84923c2d1092 SHA256 41c90647285a5a56d63195420408513ff39ee338d867759a7426a3b0d9112bbd
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 {} +
 }