Version bump for Gnome 3.6. Clean up old revisions.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

4 files changed, 34 insertions, 114 deletions

diff --git a/gnome-extra/gnome-color-manager/ChangeLog b/gnome-extra/gnome-color-manager/ChangeLog
index 7c3481551062..4931dec487e4 100644
--- a/gnome-extra/gnome-color-manager/ChangeLog
+++ b/gnome-extra/gnome-color-manager/ChangeLog
@@ -1,6 +1,13 @@
 # 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.23 2012/12/11 14:09:43 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-color-manager/ChangeLog,v 1.24 2012/12/24 18:17:54 eva Exp $
+
+*gnome-color-manager-3.6.0 (24 Dec 2012)
+
+  24 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-color-manager-3.2.3.ebuild, -gnome-color-manager-3.2.4.ebuild,
+  +gnome-color-manager-3.6.0.ebuild:
+  Version bump for Gnome 3.6. Clean up old revisions.
 
   11 Dec 2012; Ian Stakenvicius <axs@gentoo.org>
   gnome-color-manager-2.32.0.ebuild:
diff --git a/gnome-extra/gnome-color-manager/Manifest b/gnome-extra/gnome-color-manager/Manifest
index 38d006fcff25..2c40ac4886f9 100644
--- a/gnome-extra/gnome-color-manager/Manifest
+++ b/gnome-extra/gnome-color-manager/Manifest
@@ -4,19 +4,17 @@ Hash: SHA256
 AUX gnome-color-manager-2.32.0-libnotify-0.7.patch 732 SHA256 a4ac10d8bda2fb8e9d7580524d086b87cede2b8188f2cace17032f735b7773dd SHA512 f1f89a14c8f5e59fc37bb733673a106ffad549c0e6cac857b08da3d66f87a801f10ceb49b22d650119a252a619a7b60378c344ab4a07455175b40690d1187c6b WHIRLPOOL fc072bbe0ea317972aef48dd2b76f6d0a7bc5493efdfddd09eb64f2da2a1ef0b53122aa3e00c5fe7cdb93a8c3e3942fb013fa49de8a797446f948badf37baad6
 AUX gnome-color-manager-3.2.2-argyll-prefix.patch 3227 SHA256 71155ed2a7fb6a893c187760654a1673215e9373d505a1b9bad9be5a1a3fe02c SHA512 5e3b7a2673caf70c0dc108552af093a889494a9b6e38a8ccfbef3cb601f31c6f8151802786114c60a5ae36541a7f335695eba1ef20e7b3f0ce9cbb04aea3e875 WHIRLPOOL 0370e0391f3562f542b425d519b7948bbac2a967c05894b01c8dad3b0ea6b051d03c7361ff08808c3c1b6b9f0545da48938d8262b6a53f7e0c51a4af931776d0
 DIST gnome-color-manager-2.32.0.tar.bz2 2491525 SHA256 fa287ef12d329643d1f01b8f35c2b104dd293cd30e91a012f04929c203da54cf SHA512 d21286f2dac6f1984aa4210892489c2faefd47eddb89d5ecfd05afd7590cfd3fbf446a75194a44feabbdc9b35feb20dee06f87fe208e641335fb3efa8c170915 WHIRLPOOL 905aad3a609b8393d617b311e25c7286a9f8181303db6731faacb5f117a0d2ebd3d4db08b9ae13afd3f5e9a3b86df1bce0dada391eb1bd456d42552813c8bd48
-DIST gnome-color-manager-3.2.3.tar.xz 2495852 SHA256 5fc3073f97df5ddd98e2e85d75e9f4763129e62a565568c7b3c48aa6cf8cdb36 SHA512 f1015cd5b5a905adda12cd8e96cb79ce976f5bda2185feb44008be8790e809149b6a3f109c1783d600102313e4798099c971dc3a985fef536ff8624821d8267c WHIRLPOOL 79d963be671a7c2caca64bbc0e9d8831f5a9a2d0df41af9a5d3ab1b2fdb72e2d9c11404c4066db29bb328cd37efe705e3ba098965c7653a62ecc8742a47a6c69
-DIST gnome-color-manager-3.2.4.tar.xz 2496792 SHA256 3b6146edf551b3cff9313658f9deccc5a7a595718b1e14313011ff5a0f1b2137 SHA512 68654b317dff1ff6428119c8cd7e6734779bd5ac81caa3e4b8e5dd73c05f5841c2c2699e1ac5c46dc409973e5082553c215dd483a6cc6b25ade1122554435150 WHIRLPOOL 9987189be1eb15cd9341f135e053ddbfcb096b6e605741aa10c0d8de1b4452ac768a767f604028c51f52534e71eb003397e31aad47f42c0bd713f0699de7062d
 DIST gnome-color-manager-3.4.2.tar.xz 2520548 SHA256 ad69ac0ac242be0ad5b7966e0c2978a9a1440e52ee816993e4a8eb2cf6f0c922 SHA512 446c90789075036b7af008964c5c976670de6723c99ed88f8b9a3f0cc8a082e7988e8734fb6ac8a9bbade11c7dcd439a7a34e56063aa502e3531338eb7df6c49 WHIRLPOOL b4f2c0bbc27e1cc2f2931321e98480523992f4d2c5db0a82098034292b3bdbd6158ef6728a8887cfb9abe5cf2c7cbea603d739599468dfbb53b5407dbfd215b7
+DIST gnome-color-manager-3.6.0.tar.xz 2564388 SHA256 c4e9d63c53061c65c4d1bcdd14952dd01aed7332c2e36d34f4a243a9e5097ec9 SHA512 404f3a3db2f7f7a19d5d7e7c367bc06490fb81a896a41aa8e2195a701bf8bf571a43f85baf6884a5eed83d9e44a81e85d10c6f4f0215c1c9c09ab8f79bf207ff WHIRLPOOL b0df68836f08d0cf49da53d26440334cf4ba0b2d1e7e9d61dd03944c8eb60699e0b0d80f9ad0705456d0f0d010555adc231827c43758191ec7f8489f24638ed2
 EBUILD gnome-color-manager-2.32.0.ebuild 1287 SHA256 45ffe56cf7b328e9e56a1ba5974751960a5fcd90ad445ac27dbbe56e0c556c78 SHA512 03f0e8707bbd1990567bf86704989d24c6dfa02ca6d27a09a3a2b632f375e95ecff87bea088f97f469f4823df68a821782f6838479d04154f6a0b88ac1fe6071 WHIRLPOOL f361bc0faa2034dbaf8a242e76aec523724cbc8f202c3e6cfa2c186d118c277f3576f32f2cf1ce2ae0ed048742bd1f84ce1b01fbd7c0626a60653d1e452b5d09
-EBUILD gnome-color-manager-3.2.3.ebuild 1937 SHA256 057f5e58fa2ea899e195755a0882d4d8332d80d98a6f0824dd7a8479e3db3147 SHA512 9d93b1e523677dc102f2287d0b432fc91ac4ea7dfff77f9810370ea323105f6aeb72148b4343f55f80e4a7aa98fb06a8d44f0b7dd01b7192e83826c5a08fa93f WHIRLPOOL 9b130c3fde830f3db98d450b24556af3c0d89cfd31f417fe1306b87d68fac6c34fa04672047cd9dc891189399c0f7121f3c7506819ec357840a055ecdfeb3f5d
-EBUILD gnome-color-manager-3.2.4.ebuild 1956 SHA256 9443783d4317c5f8728465252621db618de9236d4072b3e023839c4f64476ea4 SHA512 d5f26709e4baa526a41f9586c0cdb28a58ea57a190bb76d9d88e99e4308ecc152d9a477d0122ccf2266682eed1aa9384947facb67d87370fa42618788fd620a6 WHIRLPOOL 0828a8346068fafe105b5840cd3db344ecd80f4f4afa10ba5e1549f15a6902bc26b195fba74c89bd66f69cfe37b594aa809c95b8719256fafd9b173113892e7d
 EBUILD gnome-color-manager-3.4.2.ebuild 1860 SHA256 8f6031b2047418174614f7ec3b2357aee6bfbc942cbc7e7ea5c0ad487a8c8c2d SHA512 beeccac397ea985cae7fe5149f017fc0bfac501b3d0acddd23f82289504c6988ec26b0d569faf954bf8b91d2703135d1434e9dfcacee4d9790d6f5f0d8adcabf WHIRLPOOL 393d72edfc1c70210e06e6e8ab38fbdbe80cef6f8c058f9135f81a0eaed115f0b3981ec46d09dfd73011179cf8cc6a414f6fcee183f38363441f3db9eb9b4abe
-MISC ChangeLog 4819 SHA256 8c9b3021097c97d45d10ea800909afdd0db0b97c85a2747e30d3a378a2299c0f SHA512 9e545aa6188491e43d95783ea65e0f49b9d3392cde06a3e4d945e28052f3093eab1b7f0e1b65a1fb6c2888afec7fc83ff6006018b795de8968cafd3336194dbd WHIRLPOOL a7f38e959d3c48d0bb58f9f68908c6ad09757d538671b6226ee4ce81a55f0f240469df8355d6494a0e7d9d5ff2387da07adde66629da83b124910de2220c417a
+EBUILD gnome-color-manager-3.6.0.ebuild 1847 SHA256 866607e30d6a9fa6be769552e3f5c7c646019f490ab887305bfa149151273665 SHA512 b868d640262d398309fb59fe6c61c0d172fb05405861e0c1061234f69dc3a77025ea2c72f9f34ef08d0b0871d287f5382b14d6f909d44566246906a6fb3d245f WHIRLPOOL 72cbe43350bfd50ba5fb1edf16821ebe3e7bf1a35ba9e8335a9833953c5d877e3522331d9f5b03ac5fbf787332fa13eb24cc672e2061cf6a77b713a89b0c7593
+MISC ChangeLog 5079 SHA256 76dc3858f6ddeeb97b61f64595fd51f7308f2eee1b4c5ec8c102ff429f020b2e SHA512 22e8383339df73850b17d600bba88a3fb6d7937cd780ac518966bb011d09ceae9cb83b0b8083aa44fd3a4aca9e274d0b5f1f79128f31641321e9d7accca9ee90 WHIRLPOOL b60b2254d2959b43aac616c78227118feffcad995daae571e01d405821b534c03b60b90d97caa0aadd920bfde15f540577e5c2455cff378c18a2e35a0780ef82
 MISC metadata.xml 405 SHA256 f82bb70feca62d01a995a6a970f1f71863e0ebb21ea32a7d21b100ba781f14d3 SHA512 1afde296b80e385f277629445443ec20e37a2fe0f6c2dbf1670075603d0e93b9231adc46c47bd6a3523bd01809f7628ad4026e90e86ab703875bfcf7e317c04c WHIRLPOOL 22fe14171a739cea6712e366b9a388ca2d7ada1b100d987549eb307296143b552a9398e35d50cef1a5178cfeabc248c898a6c36ba4b700e4e42de7bc607fce5f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlDHPsQACgkQ2ugaI38ACPANewEAodpifnv5w6ZlFzhYLQW16P8s
-G8/fo2ZMSyEP5les9G0BAL6dzL2GmMepOC5Y4OcXyMuAN1GshjkdXIVyw4Bi+Wts
-=DmSh
+iEYEAREIAAYFAlDYnFMACgkQ1fmVwcYIWAa+5QCgwitAqi4CzOzrfhuN8Tazsx15
+L/0AoMCasIlr6Klazq2LEFgSCL1kglu5
+=Jy6E
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.2.3.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.2.3.ebuild
deleted file mode 100644
index d64a20c05948..000000000000
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.2.3.ebuild
+++ /dev/null
@@ -1,79 +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.2.3.ebuild,v 1.2 2012/05/21 19:02:27 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils 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.30.0:2
-
-	>=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-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
-"
-
-# 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)"
-}
-
-src_prepare() {
-	# argyllcms executables are prefixed with "argyll-" in Gentoo; bug #407319,
-	# https://bugzilla.gnome.org/show_bug.cgi?id=672028
-	epatch "${FILESDIR}/${PN}-3.2.2-argyll-prefix.patch"
-
-	gnome2_src_prepare
-}
-
-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.2.4.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.6.0.ebuild
index 5c89d4ae6997..9943c4e4d9b9 100644
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.2.4.ebuild
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.6.0.ebuild
@@ -1,24 +1,25 @@
 # 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.2.4.ebuild,v 1.2 2012/05/21 19:02:27 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-color-manager/gnome-color-manager-3.6.0.ebuild,v 1.1 2012/12/24 18:17:54 eva Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils gnome2
+inherit gnome2
 
 DESCRIPTION="Color profile manager for the GNOME desktop"
 HOMEPAGE="http://projects.gnome.org/gnome-color-manager/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="clutter packagekit raw"
 
-# FIXME: fix detection of docbook2man
-COMMON_DEPEND=">=dev-libs/glib-2.30.0:2
-
+# 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
 	>=media-libs/libcanberra-0.10[gtk3]
 	media-libs/libexif
@@ -26,24 +27,23 @@ COMMON_DEPEND=">=dev-libs/glib-2.30.0: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
+	>=x11-libs/colord-gtk-0.1.20
 
 	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
-"
+	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
@@ -52,29 +52,23 @@ DEPEND="${COMMON_DEPEND}
 # FIXME: run test-suite with files on live file-system
 RESTRICT="test"
 
-pkg_setup() {
+src_configure() {
 	# 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)"
-}
-
-src_prepare() {
-	# argyllcms executables are prefixed with "argyll-" in Gentoo; bug #407319,
-	# https://bugzilla.gnome.org/show_bug.cgi?id=672028
-	epatch "${FILESDIR}/${PN}-3.2.2-argyll-prefix.patch"
-
-	gnome2_src_prepare
+		$(use_enable raw exiv)
+		ITSTOOL=$(type -P true)"
+	gnome2_src_configure
 }
 
 pkg_postinst() {
 	gnome2_pkg_postinst
 
-	elog "If you want to do display or scanner calibration, you will need to"
-	elog "install media-gfx/argyllcms"
+	if ! has_version media-gfx/argyllcms ; then
+		elog "If you want to do display or scanner calibration, you will need to"
+		elog "install media-gfx/argyllcms"
+	fi
 }