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.

(Portage version: 2.2.0_alpha72/cvs/Linux x86_64)

3 files changed, 57 insertions, 34 deletions

diff --git a/gnome-extra/gnome-user-docs/ChangeLog b/gnome-extra/gnome-user-docs/ChangeLog
index 96d7bd20ad13..5402df66f74e 100644
--- 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/gnome-user-docs-3.0.4.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-3.0.4.ebuild
deleted file mode 100644
index 2be52a33bec8..000000000000
--- 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
index 000000000000..8bb754eb1ac8
--- /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
+}