Version bump for Gnome 3.10

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 20 insertions, 70 deletions

diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog
index 658af573f7fa..2a25a24f0dea 100644
--- a/gnome-extra/yelp/ChangeLog
+++ b/gnome-extra/yelp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/yelp
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.305 2013/12/08 19:01:35 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.306 2013/12/24 17:15:46 pacho Exp $
+
+*yelp-3.10.1 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org> +yelp-3.10.1.ebuild,
+  -yelp-3.6.2.ebuild, -yelp-3.8.0.ebuild:
+  Version bump for Gnome 3.10
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> yelp-3.8.1.ebuild:
   x86 stable, bug #478252
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index 54599ec74665..fe4bdbd84eeb 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -7,19 +7,17 @@ AUX yelp-2.30.2-uri-handler.patch 860 SHA256 91e05fc3c5eb36c12e28cd7d2c058baf739
 AUX yelp-2.30.2-xz-support.patch 6328 SHA256 b32e6c4169c4c7d5b0498605d4aa4de1817cd5655cbc70b88db04aff3fdf8aa6 SHA512 c4e03d53eabc9f9e0e20f07828cee51a5830799e48d02f20dbbbce68c373ca605913709fffa914d545e2070a1a0ff1697530877d69a38ade5cd7e2bf2fb05507 WHIRLPOOL b8ab124c1a9ddcd7fa9437d7128e81f8e86bb57e4d02c634dc99a98f2ed708262dab57f5cba9a140111d7ce53114b31dd5421d395439ab536b3f69f53e04e3c2
 AUX yelp-3.0.3-man-compatibility.patch 4226 SHA256 9b76f13236170ccbfa24060a18bdfaaad9bfe3490dc42abd9a1dee106f82c1f1 SHA512 7bb4ce52c8c81ff7bc0782eff963263132a39402f4c66122baa012e9e3046ed51090e548cdf282ef4a1afcb0d4ba7d2036002adf6e2a45032087444f0a68ddd6 WHIRLPOOL cbaf4d86e92a5d127941e5238ac122af137081f6da1c4c5bf70c7a1447c0afc8b563506aa8f99902de9021af926fe7816128aa9c3c54fd07f6c9bb828444da11
 DIST yelp-2.30.2+webkit.tar.xz 739928 SHA256 00d84338e3975174a5735deb39e2b4b49816cbedae8130ccba64abc72ae85cd5 SHA512 711baba2243916f11c4d4e24e1013dcf87f89a411c88dc0c2151ba67213ac720f71a5f17d1a6037b8978b372a95d1902d753e03ac0936fd90bce7dcb6f7da53a WHIRLPOOL 6b3736922b20c5a057c153010883d40eede244729f8f83fb480d8c1fafb8a631b93edc507de341fc59913e28a0af9f048cb3b0f591fa3ac4cf15a76bebaf70dd
-DIST yelp-3.6.2.tar.xz 851824 SHA256 f83d10cb6dfbbaa7d3d5a9ff930edd4a0eef657de0e8aeeaaef0b187038681e1 SHA512 3cbc497b19de4f8f84f4f9159b929eae5b3a92e2cc10dffee56628608a1cf4d8ffa3091620af0e5a3a3a1de9385b1b6c020771de01781e32d695587e51c52f2c WHIRLPOOL d2762e8b90d76f0b07722e6ebe45ead118e79412744961ae74219f9f311ec640fbd49bfb0471a2c1f0032eb30cc6bf6b8e13d718910b7475e7c7b09b4266e32d
-DIST yelp-3.8.0.tar.xz 1431296 SHA256 f4a02dad614bfc04b6a998440123633145f4011c3a1d35415492d2ff76c1707f SHA512 3656ead6538a40894bdc5bcb0d6b81c3f9269fd31dbc8dba8c30f6efa8b5a0e84cab4303daa6e6e206b6e480bb5e6ead93c73d37102e1b4a93f6be8f8e1d9193 WHIRLPOOL f380761257c8c0f71369bde6af52abd85c4f86a8035bd261ba85ed0f4736bbbc917bb87f52214c34bc967f7b0b6ed5b6ec6ecfd9c42246102c4c290b86c11c78
+DIST yelp-3.10.1.tar.xz 1406220 SHA256 17736479b7d0b1128c7d6cb3073f2b09e4bbc82670731b2a0d3a3219a520f816 SHA512 299434d8b1d2c89905a2feee26781f32a1c128e39f7513c1c754cf71b703c9d25fbae4027bcc8b8d4543080834a3c3d7d216780443e0bad3cde543e3c04ff32f WHIRLPOOL cdf5e0b1baa4a71f6342f5e18314363050b984c421df3cd0da5059bc7dc6b9d565c8d1acd431815b9fe7113b472701ff211487318f412821414c29c6ec6c36ec
 DIST yelp-3.8.1.tar.xz 1425460 SHA256 73b3941316194dea8ea7d1d2b1f6612424c5d80ee1871ef627455893ad15606e SHA512 d9bf1cc6fdc500a674e7e56faafcabf7dc89b8051d647749abae254e5d295845cbd147c417d9b634355336244ed1afd4b41e6d76d5f1e853a1c95c58710ac95c WHIRLPOOL 0de23c9648917b325d02f7b6a530f2bc0e6609142f9c5d6e8b6bad2dff7f7a3cc03670e0068329a7cdb957c16edeaf427dbaf6470390e2a54b4028a8b1dc3784
 EBUILD yelp-2.30.2-r200.ebuild 1687 SHA256 0016760e7c3b47608e8d3ad74dcaa4c711b5ce8c4958a679ef4a78a9cb4deb4a SHA512 ab0d6edb620783e8b8ad4a898c3e933b606099a50b426c606b561a1a4f17d28ddcc21c6e10389fd722855db057c52d13e5cf6395ed83d5961b2b94da791f79bc WHIRLPOOL 049a2cad38b88d1c6d274ef7a5fe4046e7b04ddb88aada6b98aec733a1fec9deab327d696a625ca4d8b5aadfd0c4d6683598f47d497fe5681ff0074e4706847b
-EBUILD yelp-3.6.2.ebuild 1326 SHA256 571bad5dadb827f905c17c43d10774f0726accc2070b9d68477dc4a37a8813ac SHA512 ecaaea725e67d963366bc283fc3581bdde61155b04886c51fce390e598405d7cf27178724c7bb28f4af092177d18c7b310ebaf9d06faffbab0179c42997e84d9 WHIRLPOOL c21c401bab071584abf3aff2c777faa09d21244dadd5456f74cd9c146a0b7e340a288dc47f514da8e232c67160a7d24e32da947617f9dd1efa3a9c771bbd6d4b
-EBUILD yelp-3.8.0.ebuild 1308 SHA256 382e0a94baad622ca6c3b8c87817a540a5d77bbb849b4650066acfd950c42d0e SHA512 ceced2592a3569d147b9399eb22dc9722c73c9313b690fb29e914ac5c88e7d89531d961b2e1b147ee735e4e3b6a297240fc451059132e412f9cb2e1a72802e7f WHIRLPOOL 75bd1d90fd084ffdbee702a1b4e7c681ec1ab7e52f3aeb30a658d3958a9ab64f132ac7590eab2fe7c222198e7683d80d6e47415d3181655356ef98f9b15f257b
+EBUILD yelp-3.10.1.ebuild 1349 SHA256 a411a1972af3d56e8a46699bb9ef63ead3ba6044bae7f9f34ff492cdf4183c22 SHA512 3bfa8c0c68a71070f1390bf402a631360cf61f383ad10fa512915c95de9ca6025eafebd150a1da7ab7d84a19349b7c345e81b1b73bc30f5c10ae253fc3e79ad6 WHIRLPOOL 054e29aa871264b30c6ff397f24387d8b4e74ffee3375ebb23ea8cc8cf7759520d2e8e79909fa9dc63c2567fd6b589c6090ad92528ece8c74ca536e46874655a
 EBUILD yelp-3.8.1.ebuild 1346 SHA256 da0746b30142823825bba8edc96cc936c73151a9edbe4ec547a0172ba19ce6a7 SHA512 67634d01c3cae88d60f44e97441d8079641b56a1561f39e4cdef67fa52ecdb0a7da5e702b3cf0c0b3e8abe2747210711d0fbc9a78f126b9f15c59ea670767904 WHIRLPOOL 7a6c2e151bf628f473a59c1a277b5ba720c717f8868aaf301c67b37acd4c8e6f90309485a2e19da7f369ebda68bed925bc750fea6b1cc98b59fc1b66c39b0f92
-MISC ChangeLog 39651 SHA256 824c67ebbc65fdf7845e043c0b57ca635c80f339b089e16edd55d9e70e4544e9 SHA512 a0db965b05c5eed03d285186a989b18e49eaa16851a48b852e4ba6c89c7bcbc13be65a122d9548a8c86a5b0fd4661bdbc63e34051d2676eb022e0aa71be93cbc WHIRLPOOL fcbcd8a73ab0dad96c6c5ccc6013c4001dda757c16f155993d35200a4e08fb1e7500e571d9ea9748483c2a8c470908af4bcc0d92a360cb3d7b99fda7dcfe13f9
+MISC ChangeLog 39819 SHA256 487f6e1320ead7773c0205fd2e398d6ed9323d32699f61e53b6f1d79700eb049 SHA512 0c5fd41418b44779dcd9a0565b2361976e5d88d78add0fcd2e35c38bab1881621860b892bbaa0afba01e7b2f536bae359dcf6b258f88eca13185a07774454988 WHIRLPOOL a5d9c29582d0e4f00b3a0a7fe96be3ccea9fd1381686960a38aba37ffc9cddd5708b5ea1ea79e51852f5ce5a7fb23e1d7acc8f0f1c1ecb44ef5c5bad77f76516
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKkwhAACgkQCaWpQKGI+9TVvQCfVqNf6jdsFvpkqHfpZvTwagmw
-zpwAnjN4IUNNvPdAyhNVcvpIEiTCh5/M
-=kZpG
+iEYEAREIAAYFAlK5wUMACgkQCaWpQKGI+9Q0MgCfZ2m3paISncMnrBPy8Awa7CR8
+1KUAn2rC4L12NECW9NJdeXv0Wc65C+Vf
+=qkWd
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/yelp/yelp-3.8.0.ebuild b/gnome-extra/yelp/yelp-3.10.1.ebuild
index d920bfe30774..c3ade62a65d4 100644
--- a/gnome-extra/yelp/yelp-3.8.0.ebuild
+++ b/gnome-extra/yelp/yelp-3.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-3.8.0.ebuild,v 1.2 2013/03/29 22:56:20 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-3.10.1.ebuild,v 1.1 2013/12/24 17:15:46 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -8,12 +8,12 @@ GCONF_DEBUG="yes"
 inherit autotools eutils gnome2
 
 DESCRIPTION="Help browser for GNOME"
-HOMEPAGE="http://www.gnome.org/"
+HOMEPAGE="http://projects.gnome.org/yelp/ https://live.gnome.org/Yelp"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND="
 	app-arch/bzip2:=
@@ -25,13 +25,15 @@ RDEPEND="
 	>=gnome-extra/yelp-xsl-3.6.1
 	>=net-libs/webkit-gtk-1.3.10:3
 	>=x11-libs/gtk+-2.91.8:3
-	x11-themes/gnome-icon-theme-symbolic"
+	x11-themes/gnome-icon-theme-symbolic
+"
 DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.13
 	>=dev-util/intltool-0.41.0
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
-	gnome-base/gnome-common"
+	gnome-base/gnome-common
+"
 # If eautoreconf:
 #	gnome-base/gnome-common
 
@@ -39,9 +41,7 @@ src_prepare() {
 	# Fix compatibility with Gentoo's sys-apps/man
 	# https://bugzilla.gnome.org/show_bug.cgi?id=648854
 	epatch "${FILESDIR}/${PN}-3.0.3-man-compatibility.patch"
-
 	eautoreconf
-
 	gnome2_src_prepare
 }
 
diff --git a/gnome-extra/yelp/yelp-3.6.2.ebuild b/gnome-extra/yelp/yelp-3.6.2.ebuild
deleted file mode 100644
index cdd0b2acbcb5..000000000000
--- a/gnome-extra/yelp/yelp-3.6.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-3.6.2.ebuild,v 1.7 2013/02/02 22:41:58 ago Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Help browser for GNOME"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-RDEPEND="
-	app-arch/bzip2:=
-	>=app-arch/xz-utils-4.9:=
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.25.11:2
-	>=dev-libs/libxml2-2.6.5:2
-	>=dev-libs/libxslt-1.1.4
-	>=gnome-extra/yelp-xsl-3.6.1
-	>=net-libs/webkit-gtk-1.3.2:3
-	>=x11-libs/gtk+-2.91.8:3
-	x11-themes/gnome-icon-theme-symbolic"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.13
-	>=dev-util/intltool-0.41.0
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	gnome-base/gnome-common"
-# If eautoreconf:
-#	gnome-base/gnome-common
-
-src_prepare() {
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-schemas-compile
-		--enable-bz2
-		--enable-lzma
-		ITSTOOL=$(type -P true)"
-
-	# Fix compatibility with Gentoo's sys-apps/man
-	# https://bugzilla.gnome.org/show_bug.cgi?id=648854
-	epatch "${FILESDIR}/${PN}-3.0.3-man-compatibility.patch"
-
-	eautoreconf
-
-	gnome2_src_prepare
-}