Fix build with USE=doc, bug #361067.

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

4 files changed, 54 insertions, 7 deletions

diff --git a/net-libs/libdmapsharing/ChangeLog b/net-libs/libdmapsharing/ChangeLog
index d3befb563dfc..1fa261ffaba2 100644
--- a/net-libs/libdmapsharing/ChangeLog
+++ b/net-libs/libdmapsharing/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libdmapsharing
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libdmapsharing/ChangeLog,v 1.1 2011/03/23 22:51:57 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libdmapsharing/ChangeLog,v 1.2 2011/04/08 21:51:49 eva Exp $
+
+  08 Apr 2011; Gilles Dartiguelongue <eva@gentoo.org>
+  libdmapsharing-2.1.13.ebuild, +files/libdmapsharing-2.1.13-build-order.patch,
+  files/libdmapsharing-2.1.13-slotability-fix.patch:
+  Fix build with USE=doc, bug #361067.
 
 *libdmapsharing-2.1.13 (23 Mar 2011)
 
diff --git a/net-libs/libdmapsharing/files/libdmapsharing-2.1.13-build-order.patch b/net-libs/libdmapsharing/files/libdmapsharing-2.1.13-build-order.patch
new file mode 100644
index 000000000000..5cafd371a543
--- /dev/null
+++ b/net-libs/libdmapsharing/files/libdmapsharing-2.1.13-build-order.patch
@@ -0,0 +1,22 @@
+From e6433e978c3be048a5ff640325fd589677d14e5b Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Fri, 8 Apr 2011 11:24:08 +0200
+Subject: [PATCH 2/2] gentoo: gtk-doc needs to have the library built
+
+---
+ Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 3a1498e..099c054 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = docs libdmapsharing tests
++SUBDIRS = libdmapsharing docs tests
+ DIST_SUBDIRS = docs libdmapsharing m4 media tests
+ 
+ ### all of the standard pc files we need to generate
+-- 
+1.7.4.1
+
diff --git a/net-libs/libdmapsharing/files/libdmapsharing-2.1.13-slotability-fix.patch b/net-libs/libdmapsharing/files/libdmapsharing-2.1.13-slotability-fix.patch
index f4f68ef0547e..25b38f681925 100644
--- a/net-libs/libdmapsharing/files/libdmapsharing-2.1.13-slotability-fix.patch
+++ b/net-libs/libdmapsharing/files/libdmapsharing-2.1.13-slotability-fix.patch
@@ -1,17 +1,17 @@
-From 6b9b056cdf128c7d40b26ee6615b56510d71c341 Mon Sep 17 00:00:00 2001
+From d7cab09c8c6afe6c8da35932ba99579542764934 Mon Sep 17 00:00:00 2001
 From: Gilles Dartiguelongue <eva@gentoo.org>
 Date: Wed, 23 Mar 2011 23:31:07 +0100
-Subject: [PATCH] gentoo: fix slotability
+Subject: [PATCH 1/2] gentoo: fix slotability
 
 ---
- docs/Makefile.am           |    2 +-
+ docs/Makefile.am           |    4 ++--
  libdmapsharing.pc.in       |    2 +-
  libdmapsharing/Makefile.am |   16 ++++++++--------
  tests/Makefile.am          |    4 ++--
- 4 files changed, 12 insertions(+), 12 deletions(-)
+ 4 files changed, 13 insertions(+), 13 deletions(-)
 
 diff --git a/docs/Makefile.am b/docs/Makefile.am
-index bd6f455..d88a349 100644
+index bd6f455..205aa5c 100644
 --- a/docs/Makefile.am
 +++ b/docs/Makefile.am
 @@ -9,7 +9,7 @@ AUTOMAKE_OPTIONS = 1.6
@@ -23,6 +23,15 @@ index bd6f455..d88a349 100644
  
  # Uncomment for versioned docs and specify the version of the module, e.g. '2'.
  #DOC_MODULE_VERSION=2
+@@ -95,7 +95,7 @@ GTKDOC_CFLAGS= \
+ 	$(MDNS_CFLAGS)
+ 
+ GTKDOC_LIBS= \
+-	$(top_builddir)/libdmapsharing/libdmapsharing.la \
++	$(top_builddir)/libdmapsharing/libdmapsharing-@API_VERSION@.la \
+ 	$(GLIB_LIBS) \
+ 	$(GTHREAD_LIBS) \
+ 	$(GOBJECT_LIBS) \
 diff --git a/libdmapsharing.pc.in b/libdmapsharing.pc.in
 index c95a5cf..c46f912 100644
 --- a/libdmapsharing.pc.in
diff --git a/net-libs/libdmapsharing/libdmapsharing-2.1.13.ebuild b/net-libs/libdmapsharing/libdmapsharing-2.1.13.ebuild
index 61b6f8ab02e0..dd02c7ef6822 100644
--- a/net-libs/libdmapsharing/libdmapsharing-2.1.13.ebuild
+++ b/net-libs/libdmapsharing/libdmapsharing-2.1.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libdmapsharing/libdmapsharing-2.1.13.ebuild,v 1.1 2011/03/23 22:51:57 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libdmapsharing/libdmapsharing-2.1.13.ebuild,v 1.2 2011/04/08 21:51:49 eva Exp $
 
 EAPI="3"
 
@@ -36,6 +36,17 @@ src_prepare() {
 
 	# Fix slot support
 	epatch "${FILESDIR}/${P}-slotability-fix.patch"
+	sed "s/name=\"${PN}\"/name=\"${PN}-${SLOT}\"/" \
+		-i ${S}/docs/html/${PN}.devhelp* || die "sed 1 failed"
+	mv ${S}/docs/html/${PN}{,-${SLOT}}.devhelp
+	mv ${S}/docs/html/${PN}{,-${SLOT}}.devhelp2
+	mv ${S}/docs/${PN}{,-${SLOT}}-docs.sgml
+	mv ${S}/docs/${PN}{,-${SLOT}}-overrides.txt
+	mv ${S}/docs/${PN}{,-${SLOT}}-sections.txt
+	mv ${S}/docs/${PN}{,-${SLOT}}.types
+
+	# Fix build order, bug #361067
+	epatch "${FILESDIR}/${P}-build-order.patch"
 
 	AT_M4DIR="m4" eautoreconf
 }