Version bump to fix privelege escalation, #344561, thank Tim Sammut for report. Don't install .la files and add static-libs USE flag, #344805, thank Samuli Suominen for report. Install documentation to /usr/share/doc/, bug #314101, thank Diego Elio Pettenò for report. Add graphicsmagick as an alternative for imagemagick, bug #314297, thank Wojciech Porczyk for report. Drop old.

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

3 files changed, 28 insertions, 8 deletions

diff --git a/media-libs/vips/ChangeLog b/media-libs/vips/ChangeLog
index d4589c932a9a..45853105b157 100644
--- a/media-libs/vips/ChangeLog
+++ b/media-libs/vips/ChangeLog
@@ -1,6 +1,17 @@
 # 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.31 2010/11/09 15:02:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vips/ChangeLog,v 1.32 2010/11/10 05:54:59 pva Exp $
+
+*vips-7.22.4 (10 Nov 2010)
+
+  10 Nov 2010; Peter Volkov <pva@gentoo.org> -vips-7.22.1.ebuild,
+  +vips-7.22.4.ebuild:
+  Version bump to fix privelege escalation, #344561, thank Tim Sammut for
+  report. Don't install .la files and add static-libs USE flag, #344805,
+  thank Samuli Suominen for report. Install documentation to
+  /usr/share/doc/, bug #314101, thank Diego Elio Pettenò for report. Add
+  graphicsmagick as an alternative for imagemagick, bug #314297, thank
+  Wojciech Porczyk for report. Drop old.
 
   09 Nov 2010; Samuli Suominen <ssuominen@gentoo.org> vips-7.20.7.ebuild,
   vips-7.22.1.ebuild, vips-7.22.2.ebuild:
diff --git a/media-libs/vips/Manifest b/media-libs/vips/Manifest
index 07bb5ceff528..76d435063f29 100644
--- a/media-libs/vips/Manifest
+++ b/media-libs/vips/Manifest
@@ -1,9 +1,9 @@
 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.1.tar.gz 3963160 RMD160 6badb5541f8cf992d3a1716febbe7fbc385a28e7 SHA1 1ddbd019c3b1629137d816a00e33e3003cf906d1 SHA256 cb0355e44e5a5511d36ed81bb96b23200cf5e64b5d9031e4bf27a201269468a8
 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.1.ebuild 1580 RMD160 3f2f5c0dd2cc5a230eac6e4733df1dc946dba1f5 SHA1 01b1a4ce0d93eb2b2a48cf3dc4324252486ad6f4 SHA256 704cc3b183e70ec7d9c304f8e1f3f0edc60c9dd3ae92230813ba1ce11ad23062
 EBUILD vips-7.22.2.ebuild 1580 RMD160 7a0b492937a120c08ef9fba132a386015248a67a SHA1 d6c174baf484bb9ea06785f5c7d1bc6904a1d916 SHA256 2a31d07cb771e2eab8c3e850f38eef1105d9cbf7e91402de537ab3bee823d340
-MISC ChangeLog 4171 RMD160 54020033117c724ed301d6615f86133cd555584f SHA1 fafa2fa7e596babbfc0d9f7ecb4a360d20b3ac24 SHA256 581924524682d79893b1e60c9cffd4d84d6fcd1b78a66f63bc262bf1ac862646
+EBUILD vips-7.22.4.ebuild 1883 RMD160 951bc68d03aadc277f319bae224d4605c0de1f9d SHA1 ae8a835983997a5a99d116384aeaa003ea6fdf37 SHA256 36f6a0d5a623e9e0d7dfe5b44784cd99c9a4163574db95cfb8c88d516bc34ad7
+MISC ChangeLog 4677 RMD160 0a5600f3231c18b37169009df0f169c8825fb79f SHA1 f6831ec17ce61086ff4b9bde66cff90c456d4e5d SHA256 07c400ce2ec798ee0d851cc9ccf84f7c99be6f91607c76d9c21ae7910c2f5b65
 MISC metadata.xml 251 RMD160 d329d8bf85ea35912d9cf8beb95035c37fefa835 SHA1 1860ebb1a70050d2f391bc1c22ca84923c2d1092 SHA256 41c90647285a5a56d63195420408513ff39ee338d867759a7426a3b0d9112bbd
diff --git a/media-libs/vips/vips-7.22.1.ebuild b/media-libs/vips/vips-7.22.4.ebuild
index 39330f33b457..c818fc89aa1b 100644
--- a/media-libs/vips/vips-7.22.1.ebuild
+++ b/media-libs/vips/vips-7.22.4.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.1.ebuild,v 1.3 2010/11/09 15:02:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vips/vips-7.22.4.ebuild,v 1.1 2010/11/10 05:54:59 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 {} +
 }