Version bump for gnome-3.6. Update license. Drop old.

Package-Manager: portage-2.2.0_alpha148/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

5 files changed, 35 insertions, 14 deletions

diff --git a/gnome-extra/yelp-xsl/ChangeLog b/gnome-extra/yelp-xsl/ChangeLog
index 3bb0e03be5fa..59db1a7cef63 100644
--- a/gnome-extra/yelp-xsl/ChangeLog
+++ b/gnome-extra/yelp-xsl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/yelp-xsl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp-xsl/ChangeLog,v 1.9 2012/10/04 14:55:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp-xsl/ChangeLog,v 1.10 2012/12/16 10:12:24 tetromino Exp $
+
+*yelp-xsl-3.6.1 (16 Dec 2012)
+
+  16 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  yelp-xsl-3.2.1.ebuild, -yelp-xsl-3.4.1.ebuild, yelp-xsl-3.4.2.ebuild,
+  +yelp-xsl-3.6.1.ebuild:
+  Version bump for gnome-3.6. Update license. Drop old.
 
   04 Oct 2012; Agostino Sarubbo <ago@gentoo.org> yelp-xsl-3.4.2.ebuild:
   Stable for amd64, wrt bug #427544
diff --git a/gnome-extra/yelp-xsl/Manifest b/gnome-extra/yelp-xsl/Manifest
index 48157cb9ff1e..f3bace9ea2cd 100644
--- a/gnome-extra/yelp-xsl/Manifest
+++ b/gnome-extra/yelp-xsl/Manifest
@@ -1,8 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST yelp-xsl-3.2.1.tar.xz 556512 SHA256 76159759ccff4003c13a9fd14de82f334978165f88dd3716efa98382285a06a6 SHA512 08f94c8e5668aaa1f2e9c01d699aeccf644631d238574b0de295d0813368e05434abeef126e8dca3a01029beb5f09947a56c3b6402e31f90ca2ad4441910bc66 WHIRLPOOL 9982d8b389b711ce49a57918336cca6bfe983293dd868cdb37b5005d71782de7c21fd9eeef80d710d5ad437409eb5be61401003354cd47b4fa0f0b8a6d56361a
-DIST yelp-xsl-3.4.1.tar.xz 581160 SHA256 f667b26dca7b9e09fb6855d0626a003adc102dcbf59c3a2c37ac9aefe1d6c867
 DIST yelp-xsl-3.4.2.tar.xz 585248 SHA256 421b622da421f310add15c9d0cf23f3d66c3e0847292f45341e2f6b2db326325 SHA512 31a662ba0ba20871f89a26c254c3f13030541f592901913f76d1c0010148ad84a809cbd0c7335fa1ba534c5d6da64bca49ea1b79775c927107c21425a7fb77b9 WHIRLPOOL 388515bfbd9dc6910c57452e92b28d747278ad0e47a4356aef6821e4fab0c46fc510a98b03ad5a7c885cf53ebf76f5006b188a306cd000b6c286158d81f8db3e
-EBUILD yelp-xsl-3.2.1.ebuild 600 SHA256 483d1107f4ad0ecbef9194e091cfa6fd41c55d4d1e51a6435aa0265d36aa6548 SHA512 16c53aac1edacbc4274a8c16d9114c4d086bd4774050b750f0c47a50d2c212c61328cf10fa9e9305c05f14b52cb9ad51cffd8803df0a993c2480a9879ef3bc18 WHIRLPOOL fd83dac1aa3654bf9d2d5cdb087e94fab4ec7cbdec315dcdafb9c74c573c53029b24ad150f88148f6c39fe1475cc3ae6885dd6b7cbb98e499ca255b73979a702
-EBUILD yelp-xsl-3.4.1.ebuild 605 SHA256 8f827b95dfa9ede35d3d1b18016bd34c7130d0dc517d2c72fb7ebc808c06a3ae SHA512 fe2661f79bfde1ffc13e08f2dd5e686773cceae6f1fed79d0b9da9edb8e1122af07d1099f11115bec6882076d34c75b00ad9990e715b5e048975bee16c196e1d WHIRLPOOL d78852a28ef6e0b1e50248235b115f3c4147fbfaa97d608e159b6c292541d7d52ea1a95b9e0e427cde1a02b187a3252d815926e26add16fc7f640271eeca9d39
-EBUILD yelp-xsl-3.4.2.ebuild 597 SHA256 0ef75b0c237d21bbd213b06c9605896c797c3e09c73a48bd7bc44c6897511c0e SHA512 439d0ff0214213c511d3634e206c0fa3800faeb4f83ac25256eb5fed911893749cc507111b2ad78def0a19032771153b25fd6d380b62f66462392f08fcce71ab WHIRLPOOL 2bebafa1ac6367556fd1f698ce1d9b8b505284febd9fc2ed239667412ef2359ecbfdfbc5777aafbc19d3c56bc3959782b04321eab2036d6365239da1efb30226
-MISC ChangeLog 1593 SHA256 fd7d2d9c81606987db82c6d789b0407ce929f258da25e9141db682c84c85f5af SHA512 021413eb357137e0ab92c2dfa1a3cb021d4f776b266093e48a6a5599b5f9d85b42fcb4bdf7d66d18012210173b8b60534f4b154b6dbbcecad17b4609a6ffb8fb WHIRLPOOL 8ed655d799ce75aea7195315321460e02d5ad7d829da12c5ba8206650880b9a184f71afeea8d68a56c95990acb5a79e6a6efe051fe67cb665b2eaad122cd7802
+DIST yelp-xsl-3.6.1.tar.xz 589500 SHA256 9cac9770d6ace354f3e56a2e60933bb0cd894a4263a3bf1db6e8900f86f8cdd6 SHA512 8c097361d1f238b02d750e702f4eb72d56630e71b168634f4cabbfa9724719fced9b582c6c2e693b94f9045ec00313478b04e8d7a1f3fc87fd7ad140f7e5847a WHIRLPOOL 15e90968cf321ae8ca5f9acc6e1407f6b15a3d17b779ffdbe0380c4b5905870b3e3917f46e4a87ac19c07eccd105f1513e3f0041932af25d68abc9abc6c53475
+EBUILD yelp-xsl-3.2.1.ebuild 618 SHA256 ea61ed794b30b58baddb6ce9b2569d87ad265f46dafbcb3da406abebc5d89265 SHA512 1287d59a24258c52dfef53bd5dd291d78dfe0d4df2bbde3b06c8e7bcd15c1a22b2258d565c1ca8ed5cff0ce88352659314cb6464e6b0917227cd5e792de7647d WHIRLPOOL 0976e589cd6da1ff4d742af5a04433cd095742746dd595c29f70471442a3a01b560ab40699c122d3553d7aecda6d1af176a1fdb916c9de15480455743141d12d
+EBUILD yelp-xsl-3.4.2.ebuild 618 SHA256 206d4df79182bc060a06f9df2250e772d1fad5c55be44424fede9a03517bd0ee SHA512 e55d69066efbcf7207e915bf00bf642084e1ce1ec5bd5ed8a6f0899380527089211172704eeb8e8aa87a49e52f62c7749924d9461a35eb818d4768073923625f WHIRLPOOL c459f63d7578ea8965bf170924ab0422607f019af358a04b925d07c5c07055463069c0ef536bfddf84792ff3ecc37bb3d8f4dedcf10f1bf74e631e63b5dedcd4
+EBUILD yelp-xsl-3.6.1.ebuild 620 SHA256 4651065f02ca76697e32a0d81b018e705cc89e44c26abbab12f17d3ee727d061 SHA512 e16b32a3345c380c42bb44a8dc4650d16c1240b991d5c9e85f53a5fbba905d21900108aaf5037caa2e0904a139f1b96508bb70c31b60025b292768dc68520c68 WHIRLPOOL 0b22f73a49fbbd6e83e801fced39b915a13c0e801a6b78457baed8bf41166fd1e39b1d0a9c5bad22a3c844439c8dc4037f8f337341a5b94e6f3eb6a6786ea889
+MISC ChangeLog 1845 SHA256 a1e622422e9be343101385ff7c5d7e7468af88f80adc37376cfe9400a061c1ff SHA512 e3ef7ca7254fc7d59529d44941ad0b24b4d2f8ea6a479b78266eba9e479b2285e41d6971bc8f6952bd5e7a640f183df9f70dc48ca5781381df966fabbf220a28 WHIRLPOOL 5841e378a373a34b0aa45e6890e288e51554719b9e960a6b29bb9ef572a4d8dcd1b2f45a83065903c70e31473a5a1e3eb54fe5a479a3fec4073c6a028d808f26
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQzZ6JAAoJEJ0WA1zPCt1hjiIH/jlNO2kpFMRu3MJrV0N1QSZA
+BrNAsr2YdjICuEfuat46jzInvWZjFTAS7pUGfvG4/UqkNwcMKqF/6LUeVexT6L2w
+TOQj4+Fpc17c+fWuqJ/pld7j7qt7+oYVSy132tAPi/1tgHRpyTQLPYeip1fads9x
+G6OjcOZnxguXKNFC8jSM9dOABwrLzJYeb0W3tA3RWwCVfq6q7BgBzAEDFMB/R5dB
+wNkM3yTsDlVCjWV/W9toiWuWezSQuSmGyTrLspQkxvxiND6FNvve7mfqPREmOVUn
+MAXq4Mf94WrQjhf4QVunHH2anvhIeorsNtWJR+8YIm8xl7MUHXw2UUpB0gyRDQk=
+=92BY
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-3.2.1.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.2.1.ebuild
index 6fb446edc725..fc6418d8e32b 100644
--- a/gnome-extra/yelp-xsl/yelp-xsl-3.2.1.ebuild
+++ b/gnome-extra/yelp-xsl/yelp-xsl-3.2.1.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/yelp-xsl/yelp-xsl-3.2.1.ebuild,v 1.4 2012/05/05 06:25:24 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp-xsl/yelp-xsl-3.2.1.ebuild,v 1.5 2012/12/16 10:12:24 tetromino Exp $
 
 EAPI="4"
 
@@ -9,7 +9,7 @@ inherit gnome.org
 DESCRIPTION="XSL stylesheets for yelp"
 HOMEPAGE="http://www.gnome.org/"
 
-LICENSE="GPL-2 LGPL-2.1"
+LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
 SLOT="0"
 KEYWORDS="amd64 ~mips x86 ~amd64-linux ~x86-linux"
 IUSE=""
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-3.4.2.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.4.2.ebuild
index 151f37ceca5f..54c70857c055 100644
--- a/gnome-extra/yelp-xsl/yelp-xsl-3.4.2.ebuild
+++ b/gnome-extra/yelp-xsl/yelp-xsl-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/yelp-xsl/yelp-xsl-3.4.2.ebuild,v 1.3 2012/10/04 14:55:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp-xsl/yelp-xsl-3.4.2.ebuild,v 1.4 2012/12/16 10:12:24 tetromino Exp $
 
 EAPI="4"
 
@@ -9,7 +9,7 @@ inherit gnome.org
 DESCRIPTION="XSL stylesheets for yelp"
 HOMEPAGE="http://www.gnome.org/"
 
-LICENSE="GPL-2 LGPL-2.1"
+LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
 SLOT="0"
 KEYWORDS="amd64 ~mips x86 ~amd64-linux ~x86-linux"
 IUSE=""
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-3.4.1.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.6.1.ebuild
index 3787205b6576..08787820e1d6 100644
--- a/gnome-extra/yelp-xsl/yelp-xsl-3.4.1.ebuild
+++ b/gnome-extra/yelp-xsl/yelp-xsl-3.6.1.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp-xsl/yelp-xsl-3.4.1.ebuild,v 1.1 2012/05/06 08:19:21 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp-xsl/yelp-xsl-3.6.1.ebuild,v 1.1 2012/12/16 10:12:24 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit gnome.org
 
 DESCRIPTION="XSL stylesheets for yelp"
 HOMEPAGE="http://www.gnome.org/"
 
-LICENSE="GPL-2 LGPL-2.1"
+LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
+KEYWORDS="~amd64 ~mips ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=">=dev-libs/libxml2-2.6.12
 	>=dev-libs/libxslt-1.1.8"