summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-libs/glib/ChangeLog8
-rw-r--r--dev-libs/glib/glib-2.38.2-r1.ebuild9
-rw-r--r--dev-libs/glib/glib-2.40.0-r1.ebuild (renamed from dev-libs/glib/glib-2.40.0.ebuild)9
3 files changed, 23 insertions, 3 deletions
diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 7b6b3f33d544..0259e6fdf301 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-libs/glib
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.610 2014/06/03 04:20:36 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.611 2014/06/17 17:49:16 mgorny Exp $
+
+*glib-2.40.0-r1 (17 Jun 2014)
+
+ 17 Jun 2014; Michał Górny <mgorny@gentoo.org> +glib-2.40.0-r1.ebuild,
+ -glib-2.40.0.ebuild, glib-2.38.2-r1.ebuild:
+ Fix gtk-doc install, bug #492544.
03 Jun 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
glib-2.38.2-r1.ebuild, glib-2.40.0.ebuild, metadata.xml:
diff --git a/dev-libs/glib/glib-2.38.2-r1.ebuild b/dev-libs/glib/glib-2.38.2-r1.ebuild
index 2e31cdac8052..2dc26f1663d5 100644
--- a/dev-libs/glib/glib-2.38.2-r1.ebuild
+++ b/dev-libs/glib/glib-2.38.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.38.2-r1.ebuild,v 1.12 2014/06/03 04:20:36 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.38.2-r1.ebuild,v 1.13 2014/06/17 17:49:16 mgorny Exp $
EAPI="5"
PYTHON_COMPAT=( python2_{6,7} )
@@ -216,6 +216,13 @@ multilib_src_configure() {
--enable-man \
--with-pcre=internal \
--with-xml-catalog="${EPREFIX}/etc/xml/catalog"
+
+ if multilib_is_native_abi; then
+ local d
+ for d in glib gio gobject; do
+ ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+ done
+ fi
}
multilib_src_install_all() {
diff --git a/dev-libs/glib/glib-2.40.0.ebuild b/dev-libs/glib/glib-2.40.0-r1.ebuild
index e9f0ddc839db..518a3754dbee 100644
--- a/dev-libs/glib/glib-2.40.0.ebuild
+++ b/dev-libs/glib/glib-2.40.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.40.0.ebuild,v 1.3 2014/06/03 04:20:36 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.40.0-r1.ebuild,v 1.1 2014/06/17 17:49:16 mgorny Exp $
EAPI="5"
PYTHON_COMPAT=( python2_{6,7} )
@@ -214,6 +214,13 @@ multilib_src_configure() {
--enable-man \
--with-pcre=internal \
--with-xml-catalog="${EPREFIX}/etc/xml/catalog"
+
+ if multilib_is_native_abi; then
+ local d
+ for d in glib gio gobject; do
+ ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+ done
+ fi
}
multilib_src_install_all() {