Fix prev commit, something wrong happened there

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 18 insertions, 21 deletions

diff --git a/media-gfx/gimageview/ChangeLog b/media-gfx/gimageview/ChangeLog
index c9d46233a06f..dd336371b91c 100644
--- a/media-gfx/gimageview/ChangeLog
+++ b/media-gfx/gimageview/ChangeLog
@@ -1,9 +1,6 @@
 # ChangeLog for media-gfx/gimageview
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimageview/ChangeLog,v 1.28 2012/01/09 16:14:47 ssuominen Exp $
-
-  09 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> Manifest:
-  Pull in version < 1.2.0 of xine-lib.
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimageview/ChangeLog,v 1.29 2012/01/09 16:17:00 ssuominen Exp $
 
   09 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
   gimageview-0.2.27-r2.ebuild:
diff --git a/media-gfx/gimageview/Manifest b/media-gfx/gimageview/Manifest
index 570812282f76..06fdf1b14aca 100644
--- a/media-gfx/gimageview/Manifest
+++ b/media-gfx/gimageview/Manifest
@@ -6,18 +6,18 @@ AUX gimageview-0.2.27-gtk2.patch 624 RMD160 308bc209c09cb5b7d64f5d9e6683cd72cf6a
 AUX gimageview-0.2.27-libpng15.patch 601 RMD160 ba486ead1e69ede8fe5bc4a8a72d5959d54b880d SHA1 bc5868df1ad55d15bcd8d18dce46029ba691d5a1 SHA256 04b468f51bb6b806a2d46860a2bc53eda7bcb49590d918482498ccbde8b9461f
 AUX gimageview-0.2.27-sort_fix.diff 714 RMD160 bd477ae61ca1a592c2d919299b0612f5284af89c SHA1 2429a326b55f77336876ddefa3c48ca4d2fcbd84 SHA256 fbb4e239b49daad78d27d5cd6b029ab1f68813fe4ca07be090a45206a1c72100
 DIST gimageview-0.2.27.tar.gz 1348286 RMD160 1d35b3a1b453f87dc232b84407524c3011ec91eb SHA1 333f0682e4f8f8ead4abb24f6eddf86f776c2478 SHA256 4bc899d734e9833478c1ae8fc6d9db0971d812aeefe6f1295b5edbd4e4639060
-EBUILD gimageview-0.2.27-r2.ebuild 1537 RMD160 76892678b768d64f8890c4c58594f4ab1560355c SHA1 569e7e7e99540bd80bfae32b942d51e90cdef651 SHA256 915c2ea747787ee3695925b015ce77541e0cadd402a325c24e95abd40f534c39
-EBUILD gimageview-0.2.27-r3.ebuild 1628 RMD160 ab150f422668ecfc7eca89a2e5a2702c63a217b1 SHA1 e2b32e0310b330793fa3c2854b0fae5dc84724d0 SHA256 827cc93bf80441a18b041ce937591401ab49a9b700ae4d951816636792e521c7
-MISC ChangeLog 4219 RMD160 477494242514d76c155d5d712c769c07ba7d8367 SHA1 d5610dfa96a86c6571a77baaa32f85d3c957c91f SHA256 0a791d0cd70a0cf35db21c8faf5d1e43cd341ac2f84ac90022bc283927ec1856
+EBUILD gimageview-0.2.27-r2.ebuild 1539 RMD160 5d6183effcadfc6a9bf00229cd335db2f8fd2d28 SHA1 b1cda49759606f50cf6c9259529cc6375dcd05e8 SHA256 d16c72f184a859263347b7cb70e675e61c7005bbd9506f2f283266253b04f703
+EBUILD gimageview-0.2.27-r3.ebuild 1628 RMD160 d40212a7cbf3d0ac7c3c9fd22ca4935afffac32c SHA1 09a409f7b25cc2ebbf8c6df8f1e7489f6b8fcfe8 SHA256 85ac5a868f8a933d4eaebe1afc6e0210e5661170ba7536fa6937b816578e48d2
+MISC ChangeLog 4115 RMD160 6e5a6b8fa426ace5d7566675ff34e0ee08f7b844 SHA1 eaa77911e3defab5dec3a6c67365225c8c525a82 SHA256 d7cc6c1791224710833340d8ddcfda6fea9a70c474d115da15371e9c585c6787
 MISC metadata.xml 162 RMD160 724f25e8bd2d17056a9f820449e0ddc858f31cce SHA1 620b205b2cddc55f63199267eeb30e9f4c6a817b SHA256 7cccbeab15ef93a962010750e32971ffff1226321adc83df7ff572dea8ff63c2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPCxIjAAoJEEdUh39IaPFN9fkH/2VCoGnIwR0YBfxfoEgftyG7
-Q7hSEsgkkT3XLjREjFT2IJ7f5wvBu+/6B9GzNHghBX4cKVXclaZceEnDIcq1YjNb
-UFtUaUE/eQlkO0dk/JchUF6NABGCu6Y3h/+gX1qfx0L3ofZVmcZiC+xCZ4ebU5Ba
-D+j8HA80wOGVR6g3EsSm2fwzX43IY/FJFrkHGrlmYFLqeyeO01AkD2YGTOsqc6at
-wzCrgZaMBq0FElGA2R/xYJVKpV81ydDsE5wi8K/dDcDdfUDq/shtOO6IGbwn0i32
-TK5VDKI1hTzWtxd97nCplWc0roqy9YchDVYujS63+2catpwl17qLgYeVk+fdTN4=
-=/W4E
+iQEcBAEBAgAGBQJPCxKpAAoJEEdUh39IaPFNqFoH/1pw+n+Kz17/AzhWeD0Rq7dR
+ZtK/GoAMQ9opxul2GENlWckmi6MYrzgH1jMyXXe30UyZBi1/T7lXeAWnCvWDEel9
+N0MDjz3gATD5KCok/FhQzy57wX++p/6W7EwAO/p/96OYvO7StY+KkrDd1oSUdyQe
+ZktH+LRB9Dje4z7GfpVVyjgxX3XY5DeW0UEAlE7xMVSXBccxjNdJX+FmJIchL+xy
+EYh+E7nPBd351Rsyf+OPf9EfEozZh5bwznDs4yYZVATyG3WtzfIGl9I+WacMd57e
+hGzk2brAgIKRBNtzuh9p+DexqaeV1VmEyU6Pxd+RaoRrgsRXrWNW7TvkUJX7lXg=
+=yLSv
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/gimageview/gimageview-0.2.27-r2.ebuild b/media-gfx/gimageview/gimageview-0.2.27-r2.ebuild
index 8479f8ca4c69..ba26cc3cb6b7 100644
--- a/media-gfx/gimageview/gimageview-0.2.27-r2.ebuild
+++ b/media-gfx/gimageview/gimageview-0.2.27-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimageview/gimageview-0.2.27-r2.ebuild,v 1.10 2012/01/09 16:12:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimageview/gimageview-0.2.27-r2.ebuild,v 1.11 2012/01/09 16:17:00 ssuominen Exp $
 
 EAPI=4
 inherit eutils libtool
@@ -12,16 +12,16 @@ SRC_URI="mirror://sourceforge/gtkmmviewer/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-IUSE="nls wmf mng svg xine mplayer"
+IUSE="mng nls mplayer svg xine wmf"
 
 RDEPEND="app-arch/bzip2
 	x11-libs/gtk+:2
-	>=media-libs/libpng-1.4
+	>=media-libs/libpng-1.2:0
 	x11-libs/libXinerama
 	wmf? ( >=media-libs/libwmf-0.2.8 )
 	mng? ( media-libs/libmng )
 	svg? ( gnome-base/librsvg )
-	xine? ( media-libs/xine-lib )
+	xine? ( <media-libs/xine-lib-1.2.0 )
 	mplayer? ( media-video/mplayer )"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
diff --git a/media-gfx/gimageview/gimageview-0.2.27-r3.ebuild b/media-gfx/gimageview/gimageview-0.2.27-r3.ebuild
index 8ba55df25036..b074b392aba1 100644
--- a/media-gfx/gimageview/gimageview-0.2.27-r3.ebuild
+++ b/media-gfx/gimageview/gimageview-0.2.27-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimageview/gimageview-0.2.27-r3.ebuild,v 1.1 2012/01/09 16:12:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimageview/gimageview-0.2.27-r3.ebuild,v 1.2 2012/01/09 16:17:00 ssuominen Exp $
 
 # TODO: USE xine could be restored if support for xine-lib-1.2.x
 # is patched in wrt #397639
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/gtkmmviewer/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="nls wmf mng svg mplayer" #xine
+IUSE="mng nls mplayer svg wmf" #xine
 
 RDEPEND="app-arch/bzip2
 	x11-libs/gtk+:2