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.

(Portage version: 2.1.9.24/cvs/Linux x86_64)

2 files changed, 25 insertions, 5 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/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 {} +
 }