Fix build with USE=doc, bug #361067.

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

5 files changed, 61 insertions, 13 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/Manifest b/net-libs/libdmapsharing/Manifest
index d43f1da0a23e..6862d1a29d2f 100644
--- a/net-libs/libdmapsharing/Manifest
+++ b/net-libs/libdmapsharing/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX libdmapsharing-2.1.13-slotability-fix.patch 3445 RMD160 85f24f799c2b249528392b72bcb94292f2a9affd SHA1 e3e856a66af2d68bd9c3601f90d6665dc08788f8 SHA256 7659b94122cfccd96fe06a46e2eff851982e5b87d205c530506de04d23d884ac
+AUX libdmapsharing-2.1.13-build-order.patch 616 RMD160 119b688b121a4a052c147b28aa862f5e81a2e979 SHA1 6c5defebacb0987d3198f8aae921d1525e68b6d0 SHA256 aefbc59129acaff39204a68be61a9d85fa11199a176cdbb4a8158d14d18c6db3
+AUX libdmapsharing-2.1.13-slotability-fix.patch 3698 RMD160 4b21306db15e5982cbaf597909e882e20003d0fe SHA1 48b1f55e9628e0715f4d494bf71043feba5293fc SHA256 3c0de833f78e932c4f89567ed14ff3ea07fd784abb5e4cb0bda6d5af9bbc55b5
 DIST libdmapsharing-2.1.13.tar.gz 645475 RMD160 144ff83e87096ea77031eef8dac3fece266084e9 SHA1 f5873a7cfe61228aabe763d1692bede1e9050b20 SHA256 bc4bcedf5da41c1f85fc36931877044f6eaf6043277a0fcfe7d1dc24a401ee1a
-EBUILD libdmapsharing-2.1.13.ebuild 1182 RMD160 3e8c6c32adb1a05feb13a09b597ba0ee69781e2a SHA1 e04aed4b9897fba9922f347647dd368212eb5412 SHA256 dcdd5968288e802ebda589e544a008d763d0dc5b9b221241a864c00c17e941f0
-MISC ChangeLog 464 RMD160 add5dc468dfbad01cdab4defee2949990484905f SHA1 b6ff8dc19c5a1a166e3fbf3f907b233937bb4c0f SHA256 4491c29bb1a007ba0ea86e92212e6dc6f6a9c4c5115285218c6ebeb4bd44e8a5
+EBUILD libdmapsharing-2.1.13.ebuild 1623 RMD160 1df5b4cd23aca169a18d165578b97d64776c7bb0 SHA1 843257a7556c5286303408ccfca77b1b3d6151bc SHA256 92c33eba49060ddde594849b35bba0a3ee797fb077bdb762b2d4427ba7992f23
+MISC ChangeLog 691 RMD160 27aac2d73578227a293d98d6b097a31bc811c584 SHA1 431fe9afcb97277a12e9431dc47cf99667f4e037 SHA256 7787e95af11c8f56194d41c253a44a2738e738e4c1b371e0286f28eb80e8543d
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2KeZMACgkQ1fmVwcYIWAZ67QCg2SRmYHqbhWGGnvXMB294G/Y8
-E6MAoLgfJtrxivfE5Ia5/CiFDSLdGtn3
-=DtSS
+iEYEARECAAYFAk2fg3sACgkQ1fmVwcYIWAYK8wCfbR38burtfHdBGIngwMVRONsC
+6psAoLOtrVimWSdoz67/6hyMJ9gw8Xt4
+=PCqn
 -----END PGP SIGNATURE-----
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
 }