Bump to 3.2.1 from the gnome overlay; drop old. The documenation has been relicensed...

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

diff --git a/gnome-extra/gnome-user-docs/ChangeLog b/gnome-extra/gnome-user-docs/ChangeLog
index 96d7bd20ad131803433356a8f2660ead077df751..5402df66f74ee838c3edb824f1e397031dbbceb8 100644 (file)
--- a/gnome-extra/gnome-user-docs/ChangeLog
+++ b/gnome-extra/gnome-user-docs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/gnome-user-docs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-docs/ChangeLog,v 1.56 2011/08/16 13:44:00 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-docs/ChangeLog,v 1.57 2011/11/04 06:21:46 tetromino Exp $
+
+*gnome-user-docs-3.2.1 (04 Nov 2011)
+
+  04 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gnome-user-docs-3.0.4.ebuild, +gnome-user-docs-3.2.1.ebuild:
+  Bump to 3.2.1 from the gnome overlay; drop old. The documenation has been
+  relicensed under Creative Commons, many parts of it have been rewritten, and
+  the documentation build system has been completely overhauled.
 
 *gnome-user-docs-3.0.4 (16 Aug 2011)
 

diff --git a/gnome-extra/gnome-user-docs/Manifest b/gnome-extra/gnome-user-docs/Manifest
index 147f2d3bb9a531dace987f3eaed72adfb607e020..742799b1ad5215b009a87461762d78d37cbff694 100644 (file)
--- a/gnome-extra/gnome-user-docs/Manifest
+++ b/gnome-extra/gnome-user-docs/Manifest
@@ -1,26 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 DIST gnome-user-docs-2.32.0.tar.bz2 17858824 RMD160 d01a316adce5407c14bb9316eb695122e91faf84 SHA1 c621e303f63fad663f1a58dddba0f7c8b475427e SHA256 d42c4435590e5b79c8fcf1d917aee485096c02cdc84338bc31f769219ccc87f7
-DIST gnome-user-docs-3.0.4.tar.bz2 2610996 RMD160 7622b9f2ea8caed47fe88bae10809c91a3495ac1 SHA1 bb5527e5466c423f7046e44f3d541357d400d71f SHA256 6f762aee8783f6bd06296854784d1bb856191e4fec97d6433e65b8e740996635
+DIST gnome-user-docs-3.2.1.tar.xz 2985248 RMD160 5501bddf738fca88d8fa814881c4e1b39014c1fa SHA1 ab40c28ac4792e5b9d4ad2817eade453c589479b SHA256 0b7ea48d945e304bc5b22c9afb8377b419922c53287c2f9c583c65c66ca680f8
 EBUILD gnome-user-docs-2.32.0.ebuild 739 RMD160 38f9f03f33fe76d7c04609a47919fd898262add9 SHA1 d81d2dcaa52ace726da3140884ed0122b5882574 SHA256 24f86ded56e519ea106a084125b6619d191fefa73eebf51370f93d2326894809
-EBUILD gnome-user-docs-3.0.4.ebuild 864 RMD160 6a1316a45beef460e3b05aae94f3f2428d176659 SHA1 520d93ef402b565b6e9ad6f2fda34f78d15495e6 SHA256 1dc72f7631c2ae64003b82431fe2b820d6fb292e3c7ec7acf90f222714556da8
-MISC ChangeLog 20721 RMD160 b96f764ba99c75b86f921fc3847d222decf3022e SHA1 0e19ecb03bf902cfa6b9c65c28f299f4ccc51ff4 SHA256 515c8e8cd4839fe97bf0964996039e988dd7353cf7745ae75ca6b4a9e5de6e7d
+EBUILD gnome-user-docs-3.2.1.ebuild 1313 RMD160 6997223a48e07a94fa6e733a01d6c3693eaf5df5 SHA1 88b4226f5cf71e88cb1a152e50220ade776906f3 SHA256 a9e6b348b37317f067ea9440b2c1e0b985d201115ee0182791644ada9bdc6840
+MISC ChangeLog 21104 RMD160 b4c7b73c258c5e9d2997adcb01a6aec3ad647391 SHA1 4e4135984073b6887c789fc7419553c82e643d96 SHA256 66d8ef22b1ae0534b279e418509025ad0889c7f87a7628ef0893f1bd618da282
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOSnQnAAoJEO/kOhxWD91kOHAP/RKs9BuOJXj8iuznwMEqapar
-JB6mwHWCP8wsj745NxNqWA8WUUR/WeE1h5dgVPRjgZCtT6/tMXb9yuyXgxk+ez5m
-n+nMQOlXs3bxV4CRi1hgoDI/5CQcYfLMfzA1Gq+vFUFBwe5vRaWWnpFDtshvXByE
-+rmJCNd0bYztUHJNwtOhGteNdEcbxNkFGWYlg838rFy3GIKzj1mzlgqQ7FFaqQEu
-TrQ9rs2Z7zAcgLn7n0ykXIaoUdm/w6n8/2VZgE7M6o7pSVIIwaLBVJZQ8sUsNlYt
-4kKoRa/FSPkUR337AjEsU+d1N3bMz64S1fjJKRjPTpf92GVHK3ZVg0ff6ADZNbDm
-a+kBfVBCDgJQ7pAA+ra5Xkl5cSxR9pXLaCmAiLAV6vyJvXEaHtS4tUl5rYlwb7cW
-dp/VuryvTUMYME93HakTWnthP+xm0x6cXt5BjX5MYBXVkBEMvR6BpMk8wOeTt7Z4
-ZI3aIxGfNyDMUYVoLvs4l1IuXThYK0WmtfrMPpUX8Ku283tyDvbOrsmN262x3xuN
-9NnwodQNTdGOpEjMzsamWFrAdzDJ0Ils9DDAZtOkf2GGRT6SPisaEGqaaDEquf/b
-KsrTkHuMzTkInBJ5MPlmLpr+B8fb07NIYGQCIIUex2K+6kxsVg8yAy/f2KDISmQP
-trmErr1gYfwlYIOvbBH1
-=3h9e
+iF4EAREIAAYFAk6zhH8ACgkQdjK8w9WeBnDSxAD/XTfbcshA36ozLZuyfoB9ncja
+jx8XysVgcgAZ/w0U9EgBAJNNgGOy2GAmo7EpoefOuAog/7Lu1ojth1CljHzJzBHh
+=qhFl
 -----END PGP SIGNATURE-----

diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-3.0.4.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-3.0.4.ebuild
deleted file mode 100644 (file)
index 2be52a3..0000000
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-3.0.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-docs/gnome-user-docs-3.0.4.ebuild,v 1.1 2011/08/16 13:44:00 nirbheek Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="GNOME end user documentation"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="FDL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="test"
-
-# Newer gnome-doc-utils is needed for RNGs
-RDEPEND=""
-DEPEND="app-text/scrollkeeper
-       >=app-text/gnome-doc-utils-0.20.5
-       >=dev-util/pkgconfig-0.9
-       test? (
-               ~app-text/docbook-xml-dtd-4.1.2
-               ~app-text/docbook-xml-dtd-4.3 )"
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-
-pkg_setup() {
-       G2CONF="${G2CONF} --disable-scrollkeeper"
-       DOCS="AUTHORS ChangeLog NEWS README"
-}

diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-3.2.1.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-3.2.1.ebuild
new file mode 100644 (file)
index 0000000..8bb754e
--- /dev/null
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-3.2.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-docs/gnome-user-docs-3.2.1.ebuild,v 1.1 2011/11/04 06:21:46 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="GNOME end user documentation"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="CCPL-Attribution-3.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="test"
+
+# Newer gnome-doc-utils is needed for RNGs
+# libxml2 needed for xmllint
+# scrollkeeper is referenced in gnome-user-docs.spec, but is not used
+RDEPEND=""
+DEPEND="test? (
+               >=app-text/gnome-doc-utils-0.20.5
+               dev-libs/libxml2 )"
+# eautoreconf requires:
+#      app-text/yelp-tools
+# rebuilding translations requires:
+#      dev-libs/libxml2
+#      dev-util/gettext
+#      dev-util/itstool
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+pkg_setup() {
+       # itstool is only needed for rebuilding translations
+       G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
+       # xmllint is only needed for tests
+       use test || G2CONF="${G2CONF} XMLLINT=$(type -P true)"
+}
+
+src_compile() {
+       # Do not compile; "make all" with unset LINGUAS rebuilds all translations,
+       # which can take > 2 hours on a Core i7.
+       return
+}