Fix bug 392449 with doc installation

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

3 files changed, 148 insertions, 12 deletions

diff --git a/dev-python/pygobject/ChangeLog b/dev-python/pygobject/ChangeLog
index 5456bac06a2c..1a80da7d393d 100644
--- a/dev-python/pygobject/ChangeLog
+++ b/dev-python/pygobject/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pygobject
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.130 2011/12/20 21:29:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.131 2011/12/24 11:35:43 maksbotan Exp $
+
+*pygobject-2.28.6-r51 (24 Dec 2011)
+
+  24 Dec 2011; Maxim Koltsov <maksbotan@gentoo.org>
+  +pygobject-2.28.6-r51.ebuild:
+  Fix bug 392449 with doc installation
 
   20 Dec 2011; Jeroen Roovers <jer@gentoo.org> pygobject-2.28.6-r50.ebuild,
   pygobject-3.0.2.ebuild:
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index 9ce91427dd82..19fcf113cc54 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX pygobject-2.15.4-fix-codegen-location.patch 1519 RMD160 e4721ae2d9a2d05e3b129627c762acf177521974 SHA1 02e9446db952de3b934a264ce77648d2cd5c6d97 SHA256 6ab22def2c57a4dd44dedc787cb660dc326a62b518c3dc747fbe600ca2c20b8c
 AUX pygobject-2.18.0-support_multiple_python_versions.patch 2349 RMD160 054080d2a62b466ffe2ba9e182e5e796c652161f SHA1 d1ac7d308cb82caab4a5c56256ebd53b13cb9a3b SHA256 d66bcf31acf8b310ad346b9803d5e41d9840cfbca3c62d19b5c99f605c58066d
 AUX pygobject-2.20.0-tmpdir-makefile.patch 1817 RMD160 6e2032012f65a74ed140f777e0e7d5addfbc5c1f SHA1 ea47d992fed96f2cea63543232cc3b9ed9e160a9 SHA256 88245480666f05f302a6abd3ef52d8e3a581a2842774f52a484a02d2ea389699
@@ -21,15 +18,9 @@ DIST pygobject-3.0.1.tar.xz 543732 RMD160 304e569d428197bbf3770a9dd9e14cba6437c3
 DIST pygobject-3.0.2.tar.xz 545072 RMD160 afb2479933c047025ee8d467efda163915c074ce SHA1 6bb3cd5977d6992792cbfabc919b5b46bb8c2a8f SHA256 e1eccc37afd2d4cbeb329b92ce3d71287d662dc2fec430c08a0471153e52a462
 EBUILD pygobject-2.26.0-r1.ebuild 3830 RMD160 6db1713d6596915de44239c5c6d5d9c44afb51d9 SHA1 4fc1689b121dd155f5157470b4e2891de14b4b82 SHA256 113ab87b63626714b579f49dc79bfc737dc944ef9042db4991a883f411cb391d
 EBUILD pygobject-2.28.6-r50.ebuild 4150 RMD160 99b9d6f95c45dc4cfff9333d0fb2e61a5809b7b5 SHA1 36f5959604ff9962926f01047659b4e020c8f80a SHA256 248c4828e1a5ece8a32ac1f18aa2a30d96feaafbd60058bd2deb2d0b6d0d3f1a
+EBUILD pygobject-2.28.6-r51.ebuild 4158 RMD160 a9ce8275c7b77784308b6ac86a4bfe88583e6301 SHA1 527dc609c624a7195bbaa675056c8b6cc5ed4066 SHA256 11dd63e82c51740a2c8adc036a57cf8cb37771c17c1b596898fca9fdcfdbf050
 EBUILD pygobject-2.28.6.ebuild 3824 RMD160 ef6d826a91364b81146ad747ea4e80b2175a99bf SHA1 6c49e563e4815aa50468c016d24fef03b932b4e7 SHA256 b04e06df9a5ee43c5e24dc70056f23b6afe2dc3dac530deff21e1fa760736b00
 EBUILD pygobject-3.0.1.ebuild 3120 RMD160 57b9bd613c89c27f459d688696a4f102cf8ec919 SHA1 99d2f8fcbabc7a483fc7dc0cff83867b4ad9b9d0 SHA256 6885c1c802b3b927db8a37515a6d083b4aebea6561e9072fab22dc449226eadb
 EBUILD pygobject-3.0.2.ebuild 3234 RMD160 c11d9efbed2402c376cd040b40ac07212a5fe1bc SHA1 2b6d212e90f0fdb5d1a81990e8e424ba90cdd9ac SHA256 0681c4ff1abc5d46ba087d2fbd57ca336990b81779f5f326be721e365f4e8df9
-MISC ChangeLog 20362 RMD160 a6f333756279afb76b1ca1d5b15b1c0a38464a31 SHA1 0b9821aeb8b2cd471df999b15ae1ffa86ad1468a SHA256 b34fd774167bff57c7958bc0e473d983886d3ac4e842081472f85fafe6d5f2c3
+MISC ChangeLog 20529 RMD160 a43344e15fff33ee6e086b254aefd63885d99a7c SHA1 afba958779fd9b0769d46e8260a13806144d601b SHA256 d604820395bc7d49095cfafc2a7ad6275370fc1ff82ca9e9b9141b02b20e027b
 MISC metadata.xml 291 RMD160 2226a820b502bdd20583331e1601bb9cd04f96be SHA1 f5d19f3ae1f337179858f1818fc195a20ad7e4d9 SHA256 5a3c7fa667eaf9da2744f966afc82db0a4a45cc642157b8224104f17bdb4af5c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk7w/koACgkQVWmRsqeSphN2zwCfdN8pK/qMAFdDo8V03nwfGwgk
-UNQAnjVIQNx/YcNnifPMfuAKGF5pDV0E
-=PXoZ
------END PGP SIGNATURE-----
diff --git a/dev-python/pygobject/pygobject-2.28.6-r51.ebuild b/dev-python/pygobject/pygobject-2.28.6-r51.ebuild
new file mode 100644
index 000000000000..9be6f8a8ad8b
--- /dev/null
+++ b/dev-python/pygobject/pygobject-2.28.6-r51.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.28.6-r51.ebuild,v 1.1 2011/12/24 11:35:43 maksbotan Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="xz"
+GNOME2_LA_PUNT="yes"
+SUPPORT_PYTHON_ABIS="1"
+# pygobject is partially incompatible with Python 3.
+# PYTHON_DEPEND="2:2.6 3:3.1"
+# RESTRICT_PYTHON_ABIS="2.4 2.5 3.0 *-jython"
+PYTHON_DEPEND="2:2.6"
+RESTRICT_PYTHON_ABIS="2.4 2.5 3.* *-jython"
+
+# XXX: Is the alternatives stuff needed anymore?
+inherit alternatives autotools gnome2 python virtualx
+
+DESCRIPTION="GLib's GObject library bindings for Python"
+HOMEPAGE="http://www.pygtk.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples +introspection libffi test"
+# FIXME: tests require introspection support, but we can't enable introspection,
+# or we get file collisions with slot 3 :/
+RESTRICT="test"
+
+COMMON_DEPEND=">=dev-libs/glib-2.24.0:2
+	libffi? ( virtual/libffi )"
+DEPEND="${COMMON_DEPEND}
+	doc? (
+		dev-libs/libxslt
+		>=app-text/docbook-xsl-stylesheets-1.70.1 )
+	test? (
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc )
+	>=dev-util/pkgconfig-0.12"
+RDEPEND="${COMMON_DEPEND}
+	!<dev-python/pygtk-2.13"
+# Use slot 3 for introspection support per upstream recommendation
+# (see https://bugzilla.gnome.org/show_bug.cgi?id=642048#c9);
+# keep introspection USE flag in slot 2 for backward compatibility for now.
+PDEPEND="introspection? ( dev-python/pygobject:3 )"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog* NEWS README"
+	# --disable-introspection and --disable-cairo because we use pygobject:3
+	# for introspection support
+	G2CONF="${G2CONF}
+		--disable-dependency-tracking
+		--disable-introspection
+		--disable-cairo
+		$(use_enable doc docs)
+		$(use_with libffi ffi)"
+}
+
+src_prepare() {
+	# Fix FHS compliance, see upstream bug #535524
+	epatch "${FILESDIR}/${PN}-2.28.3-fix-codegen-location.patch"
+
+	# Do not build tests if unneeded, bug #226345
+	epatch "${FILESDIR}/${PN}-2.28.3-make_check.patch"
+
+	# Support installation for multiple Python versions, upstream bug #648292
+	epatch "${FILESDIR}/${PN}-2.28.3-support_multiple_python_versions.patch"
+
+	# Disable tests that fail
+	epatch "${FILESDIR}/${PN}-2.28.3-disable-failing-tests.patch"
+
+	# disable pyc compiling
+	ln -sfn $(type -P true) py-compile
+
+	eautoreconf
+	gnome2_src_prepare
+
+	python_copy_sources
+}
+
+src_configure() {
+	python_execute_function -s gnome2_src_configure
+}
+
+src_compile() {
+	python_execute_function -d -s
+}
+
+# FIXME: With python multiple ABI support, tests return 1 even when they pass
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+
+	testing() {
+		XDG_CACHE_HOME="${T}/$(PYTHON --ABI)"
+		Xemake check PYTHON=$(PYTHON -a)
+	}
+	python_execute_function -s testing
+}
+
+src_install() {
+	[[ -z ${ED} ]] && local ED="${D}"
+	installation() {
+		gnome2_src_install
+		mv "${ED}$(python_get_sitedir)/pygtk.py" "${ED}$(python_get_sitedir)/pygtk.py-2.0"
+		mv "${ED}$(python_get_sitedir)/pygtk.pth" "${ED}$(python_get_sitedir)/pygtk.pth-2.0"
+	}
+	python_execute_function -s installation
+
+	python_clean_installation_image
+
+	sed "s:/usr/bin/python:/usr/bin/python2:" \
+		-i "${ED}"/usr/bin/pygobject-codegen-2.0 \
+		|| die "Fix usage of python interpreter"
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples || die "doins failed"
+	fi
+}
+
+pkg_postinst() {
+	create_symlinks() {
+		alternatives_auto_makesym "$(python_get_sitedir)/pygtk.py" pygtk.py-[0-9].[0-9]
+		alternatives_auto_makesym "$(python_get_sitedir)/pygtk.pth" pygtk.pth-[0-9].[0-9]
+	}
+	python_execute_function create_symlinks
+
+	python_mod_optimize glib gobject gtk-2.0 pygtk.py
+}
+
+pkg_postrm() {
+	python_mod_cleanup glib gobject gtk-2.0 pygtk.py
+
+	create_symlinks() {
+		alternatives_auto_makesym "$(python_get_sitedir)/pygtk.py" pygtk.py-[0-9].[0-9]
+		alternatives_auto_makesym "$(python_get_sitedir)/pygtk.pth" pygtk.pth-[0-9].[0-9]
+	}
+	python_execute_function create_symlinks
+}