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

5 files changed, 34 insertions, 112 deletions

diff --git a/gnome-extra/gnome-system-monitor/ChangeLog b/gnome-extra/gnome-system-monitor/ChangeLog
index 7faf63f57df1..577f85994256 100644
--- a/gnome-extra/gnome-system-monitor/ChangeLog
+++ b/gnome-extra/gnome-system-monitor/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gnome-system-monitor
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/ChangeLog,v 1.228 2012/05/14 06:12:34 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/ChangeLog,v 1.229 2012/12/24 18:04:43 eva Exp $
+
+*gnome-system-monitor-3.6.1 (24 Dec 2012)
+
+  24 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-system-monitor-2.28.2.ebuild, -gnome-system-monitor-3.2.1.ebuild,
+  -gnome-system-monitor-3.4.0.ebuild, +gnome-system-monitor-3.6.1.ebuild:
+  Version bump for Gnome 3.6. Clean up old revisions.
 
 *gnome-system-monitor-3.4.1 (14 May 2012)
 
diff --git a/gnome-extra/gnome-system-monitor/Manifest b/gnome-extra/gnome-system-monitor/Manifest
index 498879f01e1b..56fb3be11a38 100644
--- a/gnome-extra/gnome-system-monitor/Manifest
+++ b/gnome-extra/gnome-system-monitor/Manifest
@@ -1,26 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST gnome-system-monitor-2.28.2-patches.tar.bz2 6400 RMD160 f7a6d875034ad5c657407b9258cbf01db212ded0 SHA1 741174f03d580693961568b5296830bde6e69e63 SHA256 d649ec0e5a63453b3e752fee5cc933ffed4b8d7653d15b039bdeaf3f7c514a06
-DIST gnome-system-monitor-2.28.2.tar.bz2 2432252 RMD160 f2a31f4eae60a6d344cb74e6f235fb27082aecb7 SHA1 5fab2473914663320cf961c2bbe1a13f019edef3 SHA256 b628edfd39e3a6b374ce133f367d3568475eb4e981a367f4f9d62a9784e5ae59
-DIST gnome-system-monitor-3.2.1.tar.xz 2488492 RMD160 5e24833c0959eaf99014fa730e450397318de933 SHA1 2f3d4ec3cf88a9a9d65d30b6ad18124e3261b9aa SHA256 f9ecca05609c0ff346727e0f24e32ba5284aea47dfe958e2b6d4a7912e5c1180
-DIST gnome-system-monitor-3.4.0.tar.xz 2545548 RMD160 71a61699a6b6c5b2392f2676aa5f604a770805d4 SHA1 a6f7fcdbd626574b6ec1735583b35debcac3173f SHA256 e62047983f423f4a178f01d860e9b362e8c9757d4bbeadad0f261b97b4433d12
-DIST gnome-system-monitor-3.4.1.tar.xz 2548064 RMD160 aa247e8f0f348a9032663c79c3bd79ef43579fcf SHA1 c39f90ca98e8245f6771572983dfc639938e7a1e SHA256 60f53f1b37c717b2f12502bf6f3b4b43c8e8f3d2fb1198ba66bf933ec4c3130b
-EBUILD gnome-system-monitor-2.28.2-r1.ebuild 1266 RMD160 da12d5752deb2d63e0833cbb10b7114dcbbd70f8 SHA1 27ae1d4eb488abf7114467a8d66277f7c1dd62a8 SHA256 e2612859f6192f7f12eeb14f7996e95ba6e9f8e7493576ad802407c08e2748c0
-EBUILD gnome-system-monitor-2.28.2.ebuild 983 RMD160 131d809d4cf11458a2464f9c5f68bf2a3c588018 SHA1 532ab7dbd582c67d302442a52a06facf3da26ec6 SHA256 d9e1b4ce024f800a2061f2772447063d857c2267e72a23d8a9578cdcee89c9ba
-EBUILD gnome-system-monitor-3.2.1.ebuild 977 RMD160 616f1de504a20647e8ab39fa0ac94eb78c941bd4 SHA1 a58d724eba68cd741164a8878019487fc4de660d SHA256 615de5a526f59dcc0e830d72dfe4b26cc6ed524dc2f58c8d8c2508237d031f6f
-EBUILD gnome-system-monitor-3.4.0.ebuild 1089 RMD160 dae0cffb683829eea26d9dfc93c545dd709fe07f SHA1 2fe67e260cd8c2d2855e3f43464c6826b7bffd06 SHA256 8c7cc265d454e2b7c6825e3d829903c5a220c508bcb57c53f6dc8ae454daf9c0
-EBUILD gnome-system-monitor-3.4.1.ebuild 1092 RMD160 93420031e2cec821e77667f7577520d9b02b5ac7 SHA1 46d0c9cf9ae82665d0e6a1ce6409c0450e835ec4 SHA256 61757892840a026bffc84b7751dd018b845aed68878a2cd832dd984eaf32ece7
-MISC ChangeLog 32804 RMD160 c44f436b915fdf49cbcf3f8dd1a00bd95d6a2280 SHA1 1c7acbba261ab3920f04c3265f335eab0563f97f SHA256 6b7e46933667b1cb94e9a2044842b8d3d9b140d20b43e7ff47ca451e0fd79ae6
-MISC metadata.xml 287 RMD160 13406ce1aec136016d8e3b4d4d525d3063a3cf99 SHA1 2d2d746c6192828a565b2cfb6c8672e9cc837ca7 SHA256 30b48346b173b2d4f21545e7902416f5f6dd4ce2bb2c34efec34ae8a0d1b77e4
+DIST gnome-system-monitor-2.28.2-patches.tar.bz2 6400 SHA256 d649ec0e5a63453b3e752fee5cc933ffed4b8d7653d15b039bdeaf3f7c514a06 SHA512 bbfe8a7d7feaaa2b7d95906ce985405e59a9a756002040761055bc2347355c569783bc57c9f52b4ac429f5ef6de921a1bede13a378a58d8c294533d9825f03b3 WHIRLPOOL 940caf04d2bd88acfc8e757906e214dc0aa991af44b098b261380771abe23edc4d634f6807b12c464df01f15c6f0a1e73628e818b84003a1e61693acc0a45a55
+DIST gnome-system-monitor-2.28.2.tar.bz2 2432252 SHA256 b628edfd39e3a6b374ce133f367d3568475eb4e981a367f4f9d62a9784e5ae59 SHA512 41d77fa9055ecfa1b379d7fd35c8f6401773f07a640f0b11e787cc985387d264cdb718aa0eed68e8b54f74abd301a98dbe8360160bda1e8e33459f83b3426e27 WHIRLPOOL 9782e92ee8d8e37fdd61dcb2af31ed8a68caa45e39eb2f6f3324d4484bad5b78723b1c03bdd699c6e6cf3c5de0e268f01105aaece6f7e3042118910407fe1c04
+DIST gnome-system-monitor-3.4.1.tar.xz 2548064 SHA256 60f53f1b37c717b2f12502bf6f3b4b43c8e8f3d2fb1198ba66bf933ec4c3130b SHA512 470ca4682b0b73052d9492423fa38d7d909437fa6c8ef3e7323385312f983640295d8e788e71c6b07e71e74b99ceb33f822e368e592ad8b22042c79bc3d6274c WHIRLPOOL 07aeaa037d0c70815cadde017a7309820fccaac7f3983819d32428506cbf35784939fe679e8fc50f7d5d043650718dad9ca7324f58242d7d99070cf93bb1ed49
+DIST gnome-system-monitor-3.6.1.tar.xz 2664660 SHA256 e79e7d50223fc590e1b01afe493e63fd1859c2d2add5abacfe4f2d07ea8edbd8 SHA512 4697f889645f22699a0124385d6617cfe4dd5a32544b453bd6ba9d80271c1b4c36f31e0041addbaf2fdc2ea98043f2f870d369f39df48ffc3a777be52d14fb4e WHIRLPOOL 4d07f3ca3b625f776cab6a7a8c48e66858cd55932f6b6f62f636b5f46258a933ef0f0c8df3a87da9e7ee8f505ce6cf7d46b468087003343e9cf60a2d4829cecb
+EBUILD gnome-system-monitor-2.28.2-r1.ebuild 1266 SHA256 e2612859f6192f7f12eeb14f7996e95ba6e9f8e7493576ad802407c08e2748c0 SHA512 8a23365b4ce043218f42d500527758ba6782d796edd2f7d2c5a44305454ef2276eae10119a3733ef8036c846b73f8def1ba364597bd7d9b837d22a5f8011e8ea WHIRLPOOL 8acb375e2b5d4f0e18faa4a93a1a20b49219d2598b8b5f122d8e0793942e57de08218c6da8ea942b8007557eabbeeb8e63591441b6e1e1813ebe3d890cc14a24
+EBUILD gnome-system-monitor-3.4.1.ebuild 1092 SHA256 61757892840a026bffc84b7751dd018b845aed68878a2cd832dd984eaf32ece7 SHA512 a0b868830b5d5e05d533cf2a8641f562889aab3dbe918a3527fa1ab480d7d51e26bbe51788bfa19ac444e8f82ac38e8ae5dc3d59edabe805590b238eca0cba45 WHIRLPOOL f0a803820b157b020ca3710cc772899b8bbf3967cca8482237fe13e521bbf82da30be9954986cb935e5185c0679ce9dbef6f6653c6d5bdb9473871c2a44e7443
+EBUILD gnome-system-monitor-3.6.1.ebuild 1048 SHA256 701c440921138b703bedef9a26e29fcd221d3152024a9325774f42679ac70bfa SHA512 87af4a21aa4603c0c5d1b52dd269762227aab960742d31548ab97a10f9e496074e61dcc5123b2e9ad72773706b9483263a4e6acb070a7bca20bc6f7196ef9e79 WHIRLPOOL 1567e228e3ac20ff8499460a8600f4a22ea42e0388e3d126c9dcc4801979956e746be68e498545343b9dadeb85199641cb17f94389936f5d6dc61c1039bac79a
+MISC ChangeLog 33099 SHA256 d0d270e41bf639a96d6f8351ccd7a1c1c5d85fdf83ef13c1905b39a5bed6e563 SHA512 2eb16953b696c63757e427f060e96dc372e9691c0914b3cdab030a5c91dee04372523780d37506d9d5b98390a43ebc0ba9bbbb27d2f553df931a0cd7bba38b2e WHIRLPOOL 260f12afede140d239aa93f336f0fb279579da438d852933a5319f425cc6035357683594c1c137c132e405c844c25eda4c920d2c72878eeb4bb06edcc800a17c
+MISC metadata.xml 287 SHA256 30b48346b173b2d4f21545e7902416f5f6dd4ce2bb2c34efec34ae8a0d1b77e4 SHA512 6891bcbdb167ff5d04864dbb507775987f86443033d4c925d8183d50a2bffd0204648f726d8a9eeeb56d9ba5b5ff9198993a68ac3e28a28efec6eb7ff09fd52c WHIRLPOOL 72e5f4a6b3bdbc53b2f580d88eadd16ce558664b8fe2b76c6e406955cd268b36f6017fee106855f5d412e2c23c1a99f1cdcf3bb494238b391257a49cd0ce5ab2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPsKJYAAoJEJ0WA1zPCt1hqcEH/iwZcBoQbAYh8VOI2YrUwNDy
-7znw66L5NYN/KsF3RXJSrW3NrhVsS+SokvfdkAaW+7SdJR+d26p9H2h1AWjud1B+
-yaFHqjiMlSU24boepOKhdYUHRZgBDxanuauhm3TUCtgBNwkq/gR9syeWC3RSbdaT
-/TO07Nt402j6BgbZu/AiEl05wojkWkbUNN/sxXTFz3j/nhSesoBvY5qi6tPUON2x
-OGWEMmm697tX4HUAjzm7MskVJKW8kCSqqQWHp+yJ8PGQpsSQETLjbEImKdSs5d0f
-5FGVt6lbr0Ab6AEF9J8pZGbTX9d1cClh2LaXUz1u8dnRxaF5uxrpWJO4mNoxKg8=
-=7Y9s
+iEYEAREIAAYFAlDYmTwACgkQ1fmVwcYIWAYV8QCeK6ogJ/mFK5TyUGfHKFbmmSvB
+LswAnRXRG77BgAtZrszFxPeCnw07SPiw
+=ATaH
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.28.2.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.28.2.ebuild
deleted file mode 100644
index ec6d558a2c24..000000000000
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.28.2.ebuild
+++ /dev/null
@@ -1,39 +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-system-monitor/gnome-system-monitor-2.28.2.ebuild,v 1.10 2012/05/05 06:25:23 jdhore Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="The Gnome System Monitor"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.20:2
-	>=gnome-base/gconf-2:2
-	>=x11-libs/libwnck-2.5:1
-	>=gnome-base/libgtop-2.23.1:2
-	>=x11-libs/gtk+-2.20:2
-	>=x11-themes/gnome-icon-theme-2.15.3
-	>=dev-cpp/gtkmm-2.8:2.4
-	>=dev-cpp/glibmm-2.16:2
-	dev-libs/libxml2:2
-	>=gnome-base/librsvg-2.12:2
-	>=dev-libs/dbus-glib-0.70"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=app-text/scrollkeeper-0.3.11
-	>=dev-util/intltool-0.35
-	app-text/gnome-doc-utils"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	G2CONF="${G2CONF} --disable-scrollkeeper"
-}
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.2.1.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.2.1.ebuild
deleted file mode 100644
index f0bf115380bb..000000000000
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.2.1.ebuild
+++ /dev/null
@@ -1,39 +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-system-monitor/gnome-system-monitor-3.2.1.ebuild,v 1.2 2012/05/05 06:25:23 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="The Gnome System Monitor"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.28:2
-	>=x11-libs/libwnck-2.91.0:3
-	>=gnome-base/libgtop-2.28.2:2
-	>=x11-libs/gtk+-3.0:3
-	>=x11-themes/gnome-icon-theme-2.31
-	>=dev-cpp/gtkmm-2.99:3.0
-	>=dev-cpp/glibmm-2.27:2
-	>=dev-libs/libxml2-2.0:2
-	>=gnome-base/librsvg-2.12:2"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-util/intltool-0.41.0
-	>=sys-devel/gettext-0.17
-	>=app-text/gnome-doc-utils-0.20"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	G2CONF="${G2CONF}
-		--disable-schemas-compile
-		--disable-scrollkeeper"
-}
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.4.0.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.6.1.ebuild
index 40e76310b321..fbc61e7bf348 100644
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.4.0.ebuild
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.6.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.4.0.ebuild,v 1.2 2012/05/05 06:25:23 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.6.1.ebuild,v 1.1 2012/12/24 18:04:43 eva Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 
 inherit gnome2
@@ -12,8 +12,8 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="systemd"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 RDEPEND=">=dev-libs/glib-2.28:2
 	>=x11-libs/libwnck-2.91.0:3
@@ -25,20 +25,20 @@ RDEPEND=">=dev-libs/glib-2.28:2
 	>=dev-libs/libxml2-2.0:2
 	>=gnome-base/librsvg-2.35:2
 
-	systemd? ( >=sys-apps/systemd-38 )"
-
+	systemd? ( >=sys-apps/systemd-38 )
+"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
+	>=app-text/gnome-doc-utils-0.20
 	>=dev-util/intltool-0.41.0
 	>=sys-devel/gettext-0.17
-	>=app-text/gnome-doc-utils-0.20
+	virtual/pkgconfig
 
-	systemd? ( !=sys-apps/systemd-43* )"
+	systemd? ( !=sys-apps/systemd-43* )
+"
 
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
+src_configure() {
 	G2CONF="${G2CONF}
-		--disable-schemas-compile
-		--disable-scrollkeeper
-		$(use_enable systemd)"
+		$(use_enable systemd)
+		ITSTOOL=$(type -P true)"
+	gnome2_src_configure
 }