summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2013-12-31 17:59:50 +0000
committerMike Gilbert <floppym@gentoo.org>2013-12-31 17:59:50 +0000
commitb4d15d5caa1096549cf4597c27887049249a63d2 (patch)
tree5f59384aa3e6ba115032cd8bf25c0d8c95535725 /sys-apps
parentFix stdc++ underlinking (easy to reproduce with LDFLAGS=-Wl,--no-undefined). (diff)
downloadgentoo-2-b4d15d5caa1096549cf4597c27887049249a63d2.tar.gz
gentoo-2-b4d15d5caa1096549cf4597c27887049249a63d2.tar.bz2
gentoo-2-b4d15d5caa1096549cf4597c27887049249a63d2.zip
Stub-out docs/gtk-doc.make if we are not building docs, thanks to David Heidelberger on bug 496310.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/systemd/ChangeLog6
-rw-r--r--sys-apps/systemd/systemd-9999.ebuild11
2 files changed, 12 insertions, 5 deletions
diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index cfcdd87f537e..b4270ad6aca0 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/systemd
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.205 2013/12/28 13:01:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.206 2013/12/31 17:59:50 floppym Exp $
+
+ 31 Dec 2013; Mike Gilbert <floppym@gentoo.org> systemd-9999.ebuild:
+ Stub-out docs/gtk-doc.make if we are not building docs, thanks to David
+ Heidelberger on bug 496310.
28 Dec 2013; Pacho Ramos <pacho@gentoo.org> -systemd-204-r2.ebuild,
-systemd-204-r3.ebuild, -systemd-207-r2.ebuild, -systemd-208-r1.ebuild,
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 47ea7ee20749..cf618a649511 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.76 2013/12/28 13:01:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.77 2013/12/31 17:59:50 floppym Exp $
EAPI=5
@@ -86,14 +86,17 @@ DEPEND="${COMMON_DEPEND}
#if LIVE
DEPEND="${DEPEND}
dev-libs/gobject-introspection
- >=dev-libs/libgcrypt-1.4.5:0
- >=dev-util/gtk-doc-1.18"
+ >=dev-libs/libgcrypt-1.4.5:0"
SRC_URI=
KEYWORDS=
src_prepare() {
- gtkdocize --docdir docs/ || die
+ if use doc; then
+ gtkdocize --docdir docs/ || die
+ else
+ echo 'EXTRA_DIST =' > docs/gtk-doc.make
+ fi
autotools-utils_src_prepare
}