Fix gtk+ version dependency. Drop old.

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

4 files changed, 17 insertions, 87 deletions

diff --git a/gnome-extra/gnome-color-manager/ChangeLog b/gnome-extra/gnome-color-manager/ChangeLog
index 7757a4ad610a..15963205589c 100644
--- a/gnome-extra/gnome-color-manager/ChangeLog
+++ b/gnome-extra/gnome-color-manager/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/gnome-color-manager
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-color-manager/ChangeLog,v 1.19 2012/05/24 07:54:52 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-color-manager/ChangeLog,v 1.20 2012/07/02 22:26:13 tetromino Exp $
+
+  02 Jul 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gnome-color-manager-3.4.0.ebuild, gnome-color-manager-3.4.2.ebuild:
+  Fix gtk+ version dependency. Drop old.
 
 *gnome-color-manager-3.4.2 (24 May 2012)
 
diff --git a/gnome-extra/gnome-color-manager/Manifest b/gnome-extra/gnome-color-manager/Manifest
index 5b0dcaee8409..6b081c99b19a 100644
--- a/gnome-extra/gnome-color-manager/Manifest
+++ b/gnome-extra/gnome-color-manager/Manifest
@@ -6,23 +6,21 @@ AUX gnome-color-manager-3.2.2-argyll-prefix.patch 3227 RMD160 34d5ebb5fd56f4af6b
 DIST gnome-color-manager-2.32.0.tar.bz2 2491525 RMD160 6ad3b2d3a4cd84ba78988411d7402abca46aebcf SHA1 18cdc922188c2872c5e0c32b215e6cbea878e289 SHA256 fa287ef12d329643d1f01b8f35c2b104dd293cd30e91a012f04929c203da54cf
 DIST gnome-color-manager-3.2.3.tar.xz 2495852 RMD160 30ee004cfaf79f65db7991a69a05974ad3f871eb SHA1 a2f34b2a339d4aa7ae611d59cb1bea28f00c58b9 SHA256 5fc3073f97df5ddd98e2e85d75e9f4763129e62a565568c7b3c48aa6cf8cdb36
 DIST gnome-color-manager-3.2.4.tar.xz 2496792 RMD160 a4599e9fd1357b710565c1979bbc3d46db06940f SHA1 f21adf1c5d202f8279da1f218ef35df57e695481 SHA256 3b6146edf551b3cff9313658f9deccc5a7a595718b1e14313011ff5a0f1b2137
-DIST gnome-color-manager-3.4.0.tar.xz 2519920 RMD160 373ac322a23cdecacef18fb7a5013ebdeb2eba8f SHA1 3cf9063639f44abeb4af52127e1abf4c3c1f892a SHA256 fcca7292d14dcffea01463bb24833346b415ee189611821399ca96d6638d812d
 DIST gnome-color-manager-3.4.2.tar.xz 2520548 RMD160 cd09904b4d037e38a2b034bae35879eb43adb14b SHA1 143644a936e0847aa6508ca2aa34e2099d74470c SHA256 ad69ac0ac242be0ad5b7966e0c2978a9a1440e52ee816993e4a8eb2cf6f0c922
 EBUILD gnome-color-manager-2.32.0.ebuild 1292 RMD160 b818cda3c49644419bd8c6f7747cfe646321df60 SHA1 da56e3ace8686faeac19cc239c1ca6a5544f6834 SHA256 e7d977ba95713ec0a043bcfc68b520068c3038a7cac9719dea2d9918cbbcfe08
 EBUILD gnome-color-manager-3.2.3.ebuild 1937 RMD160 9a0591ad9c9ae5ac9f0adaf5cf17c90b93953548 SHA1 391fc9f26acc586e733b998b8200790b3cb93d08 SHA256 057f5e58fa2ea899e195755a0882d4d8332d80d98a6f0824dd7a8479e3db3147
 EBUILD gnome-color-manager-3.2.4.ebuild 1956 RMD160 cde6a74d51fd2885b63547b59a49777d1eb017d6 SHA1 a6b83b871073b03d668eb79a396a97cf6d5de6eb SHA256 9443783d4317c5f8728465252621db618de9236d4072b3e023839c4f64476ea4
-EBUILD gnome-color-manager-3.4.0.ebuild 1787 RMD160 01ce562dde41fb57569b5363c8487d98d55ad712 SHA1 0cd0132c869ce2a4a793a9a8b33cad52a0795790 SHA256 6d1cdb6dd75a958456951d51f0aadab12e48660b2398c83ae12d68656952813b
-EBUILD gnome-color-manager-3.4.2.ebuild 1787 RMD160 b76b2aa3abadff12575b68bd95b4d81b5518275a SHA1 138a5f555bbc19eddfcfca29e028705153efa893 SHA256 fe77b777257c0ca20ba749eb6f58f9b08d6aa73ed04c639fdceb9e3942fc6598
-MISC ChangeLog 4253 RMD160 8827648b3e0d621246b73decf6b658748dac4223 SHA1 c1cc72f479716ec526ac63186732ce9a1846bb68 SHA256 3b4eff4fa61935df412ee1afbd5600983dfe12c9b45c435636b22f51cc445b12
+EBUILD gnome-color-manager-3.4.2.ebuild 1860 RMD160 c3b22c763d10dda6fb02230cc1e469fd88b909ab SHA1 637166da581260df2fdb962e345f67e8fac70561 SHA256 8f6031b2047418174614f7ec3b2357aee6bfbc942cbc7e7ea5c0ad487a8c8c2d
+MISC ChangeLog 4425 RMD160 bd8672a3ccbde075c4654c387c2286684f8b9c62 SHA1 b55b1ea24eb235fbc84f4a88dce2bd53f0d17323 SHA256 00de621b029baecca2742dd9ffe46d709d2aa4a9a3a34417f454d4187d0ab628
 MISC metadata.xml 513 RMD160 b2c842ce4de899e7f1355e10febb7bd89bea69e5 SHA1 cf78374e23a7c67c42f7aae9af9e290d91377800 SHA256 1fa9edf8be6f927f45a6248c095e5697be128cc01aa274c02782b33953354495
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPvelSAAoJEJ0WA1zPCt1hS7IH/RJ3SkUSNQXpJPguPxwfDQfW
-lAET7X6uo4ev3VwbM2v+XsXhQqKtbqkk7GZ1I2g7KHeSSJWMA00LwhKrkGFreJDP
-VHyD3gHoILa3leKZw5wOIkHfRLJ6ZrcbYxsTeYwKfRS4fbZ57XtFxIZc6Kp2IDo2
-7myxK0p37Do35D+tY9mr4NtZN5Swib92GlZV07nKpu/10kl1+qcXZU3JSH1fOpca
-7pQUdopSGs+5c6mtTxqZKtBWUMU/5B5FJv0WQFWsoxy7InXJ5gfTl8yLtphppDTZ
-dUxSXXrJgnwzCnmmvxQbsDH4ekAvjLOXCAO2d2JKXxYLtuqd76GFQ5/MTkDkXTw=
-=KBDU
+iQEcBAEBAgAGBQJP8iAOAAoJEJ0WA1zPCt1hP7QIAJ/wTCGTdgB2vAtykHzXJUu1
+dDgWIwNKz/SePQwcmfCgRXdNipeyTa+tkQFxDH8bXA6j3kvAarU3mNj7JyLk5s57
+zIuOrNaPoef4QSeLsrc8AfNG3+5bf154LO79MTAPM1w3zJ/wQUfKnGB1oFnk27Rf
+g2mmrQovidUQi0B5y1RthV3pa4T06raesgGr7SyeE5B7TLeIxxFgdtDrPJui3f2y
+qCSFV9yHrF3IZVXxXGShA1Law4zvRRtGhhxTom7pn6ujx+XsDIj64EzsPdXK7E1N
+C9DsrhVtAhHH5m8ntPqkMhrSvPFpw1PFzLhtdgq+BG5V1vITH0G7zMX6bEmxA1w=
+=Dr8i
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.4.0.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.4.0.ebuild
deleted file mode 100644
index 0e443c5c046b..000000000000
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.4.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-color-manager/gnome-color-manager-3.4.0.ebuild,v 1.1 2012/05/13 23:36:49 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Color profile manager for the GNOME desktop"
-HOMEPAGE="http://projects.gnome.org/gnome-color-manager/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="clutter packagekit raw"
-
-# FIXME: fix detection of docbook2man
-COMMON_DEPEND=">=dev-libs/glib-2.31.10:2
-	gnome-base/gnome-desktop:3
-	>=media-libs/lcms-2.2:2
-	>=media-libs/libcanberra-0.10[gtk3]
-	media-libs/libexif
-	media-libs/tiff
-
-	x11-libs/libX11
-	x11-libs/libXrandr
-	>=x11-libs/gtk+-2.91:3
-	>=x11-libs/vte-0.25.1:2.90
-	>=x11-misc/colord-0.1.12
-
-	clutter? (
-		>=media-libs/clutter-1.9.11:1.0
-		media-libs/clutter-gtk:1.0
-		media-libs/mash:0.2 )
-	packagekit? ( app-admin/packagekit-base )
-	raw? ( media-gfx/exiv2 )
-"
-RDEPEND="${COMMON_DEPEND}
-	media-gfx/shared-color-profiles
-"
-# docbook-sgml-{utils,dtd:4.1} needed to generate man pages
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-sgml-dtd:4.1
-	app-text/docbook-sgml-utils
-	app-text/gnome-doc-utils
-	dev-libs/libxslt
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-"
-
-# FIXME: run test-suite with files on live file-system
-RESTRICT="test"
-
-pkg_setup() {
-	# Always enable tests since they are check_PROGRAMS anyway
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-schemas-compile
-		--disable-scrollkeeper
-		--enable-tests
-		$(use_enable clutter)
-		$(use_enable packagekit)
-		$(use_enable raw exiv)"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	elog "If you want to do display or scanner calibration, you will need to"
-	elog "install media-gfx/argyllcms"
-}
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.4.2.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.4.2.ebuild
index 398ec86dbeb9..616fa8947c05 100644
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.4.2.ebuild
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.4.2.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/gnome-extra/gnome-color-manager/gnome-color-manager-3.4.2.ebuild,v 1.1 2012/05/24 07:54:52 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-color-manager/gnome-color-manager-3.4.2.ebuild,v 1.2 2012/07/02 22:26:13 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -17,6 +17,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="clutter packagekit raw"
 
 # FIXME: fix detection of docbook2man
+# Need gtk+-3.3.8 for https://bugzilla.gnome.org/show_bug.cgi?id=673331
 COMMON_DEPEND=">=dev-libs/glib-2.31.10:2
 	gnome-base/gnome-desktop:3
 	>=media-libs/lcms-2.2:2
@@ -26,7 +27,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.31.10:2
 
 	x11-libs/libX11
 	x11-libs/libXrandr
-	>=x11-libs/gtk+-2.91:3
+	>=x11-libs/gtk+-3.3.8:3
 	>=x11-libs/vte-0.25.1:2.90
 	>=x11-misc/colord-0.1.12