Fix build with USE=doc. Bug #521340

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x0145142D

4 files changed, 44 insertions, 7 deletions

diff --git a/dev-games/clanlib/ChangeLog b/dev-games/clanlib/ChangeLog
index 71ed4a36efa6..69dd72a3001c 100644
--- a/dev-games/clanlib/ChangeLog
+++ b/dev-games/clanlib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/clanlib
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/ChangeLog,v 1.64 2013/10/28 23:31:47 mr_bones_ Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/ChangeLog,v 1.65 2014/09/12 19:12:38 tupone Exp $
+
+  12 Sep 2014; Tupone Alfredo <tupone@gentoo.org> clanlib-2.3.7.ebuild,
+  +files/clanlib-2.3.7-doc.patch:
+  Fix build with USE=doc. Bug #521340 by flameeyes
 
 *clanlib-2.3.7 (28 Oct 2013)
 
diff --git a/dev-games/clanlib/Manifest b/dev-games/clanlib/Manifest
index 75793bf6ce93..079d254f858f 100644
--- a/dev-games/clanlib/Manifest
+++ b/dev-games/clanlib/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX clanlib-0.8.1-gcc43.patch 605 SHA256 97420cdbef4a3f09b61ddf54881a907616b8c73337928fcdc6e11d783f584320 SHA512 c1269c01852fd2912e895af82f2b109e7d81120a18dc3a7e2542a7bdc80e1da151c5e8a82914eb1fece2e51db17b7f1b99198dde6a36fa437dad3e9b4d6a8b83 WHIRLPOOL 8ac30a9eb0fff42711af134ca4f1f6559c902c76cbdc4584723b40bf48da47df40531205556cddc95bcb6efe022311e890c1a15474ee19c371f15a8faea39bff
 AUX clanlib-0.8.1-gcc44.patch 1523 SHA256 e6b8dc302fc3587fae86d1ecf4ac5fbaf2a0563996887b38ea3f55d84b79e979 SHA512 7c3b154affede758a0ac93f5c142144e8a26c65b7c50a443b49633e0c2835fdfab90c6363d4b1997bfb53b0112bc16ca12abc44aacf7af927329e102fc1424b7 WHIRLPOOL 9551cfd00c00711127a51f1680b148b0b93ccd3bfa22d60150a73e1d45d7e7df949c3571f932bbd695e229bccf4a5fc2463d9e5bb4d152838db52553a1b9b26a
 AUX clanlib-0.8.1-gcc47.patch 338 SHA256 fd5a02a670575f6298516d201bdaecabacb13ea01015e8d6abca1ee1fa41b06f SHA512 08f9719c97e0bf5fab83e56a881ac7a3edd162b052b5e8fea5878badedbf266b36788f77afd93032f4129ea8e50a83046f5672675e6616cdb29cb6fc5b6c635a WHIRLPOOL 6231a9b6270ac4da92c1a7d8645bb0dc492454eba89f51b559d103e37a3ce56bd1905726515fea18cff1bce8e1b50b2d8cf69db3a516dbda99174e471b67b2cd
@@ -6,11 +9,19 @@ AUX clanlib-0.8.1-ndebug.patch 866 SHA256 d48bdb0b6dee6b84b139eb951da657fa4d2c84
 AUX clanlib-2.3.6-autotools.patch 1602 SHA256 9e75ca32d249d8103906a3ba681eb2b8b007939971630c7dd81fc01b006828d8 SHA512 d19fb6435adfe54fe1a6b2bff78dbb87bcf037ded720c4535dbfafef6bdd92c6c002f2ffdd6e563a360531b9a62817baf65ff959e44c0881fb0d95253a92b6fa WHIRLPOOL 46b6c21469a435656b6422eec7fa8c6237b5826c773372450ad177e62036e021d9c4708cf6b25646b0686c879b669d842813c63c4ce8281f87d3911752abbe10
 AUX clanlib-2.3.6-mesa.patch 337 SHA256 ea50a9be570050bdaa47d2e6543d77b349afa4ac00ae219de820f18a9a53914a SHA512 b2e63bb6808bed2da05773ac955da46dca110e10e26be08c1649a465af8d0a9fdfb597c2a88f456a5ac58e54260787050edeffa6e5679777dbf8d4d1a3fc4049 WHIRLPOOL 8a1b46f27e1e5424cdf83ebfc0eb959b89403df52978d8f9f0f9cb26d5665ffb970ed9268baf854d12afec023c6b0df6964bfdcea2cb7251061f10b8c77900a7
 AUX clanlib-2.3.7-autotools.patch 1602 SHA256 9e75ca32d249d8103906a3ba681eb2b8b007939971630c7dd81fc01b006828d8 SHA512 d19fb6435adfe54fe1a6b2bff78dbb87bcf037ded720c4535dbfafef6bdd92c6c002f2ffdd6e563a360531b9a62817baf65ff959e44c0881fb0d95253a92b6fa WHIRLPOOL 46b6c21469a435656b6422eec7fa8c6237b5826c773372450ad177e62036e021d9c4708cf6b25646b0686c879b669d842813c63c4ce8281f87d3911752abbe10
+AUX clanlib-2.3.7-doc.patch 506 SHA256 072d83c56768f06af13ff23a3b8eeeee25cd0f05bed3044f049dc0f5fcf5a525 SHA512 df75223e466799bde70b07e8ea6f3724792dcd5fe96e417dad47b27d44a3d87b6b7157035f388a48ecce9985473a9e1d84a24de1c8f58247eb952fce457ceccb WHIRLPOOL 6632f9d2568174ad03865e87afe88d25a7b4f57f1e8eba363da69579f1e974a463a92959ecbd1ed40aeb4af549b8d66cb48e16125314d85e4f36c0608f6634f4
 DIST ClanLib-0.8.1.tgz 7629019 SHA256 094331dda35b0d263431d1551991eb208d8e969824434925548a9fcd1d34e495 SHA512 277daaf1055ae0198be7a6bbfd415c79cfae9e2145f62553e83849d670f56e50b8484c83f8b85f23290002e0b0c72c1e01ca597ad608a0954a4add828177293b WHIRLPOOL be486125f406a307676c4957f977b6ccc6bc2ce527a72fb4febcb3d1c7e2acdc4fc6706b66b75412184c3a0744c53e962011b0c3ac22958da5e987f0fccc9d87
 DIST ClanLib-2.3.6.tgz 25605576 SHA256 b8dc9b41028bf16c0a6082aa15cdee5d8b1ecd5256797576970f09a63e3fafde SHA512 572b51984f960a93dd03ad9f48a9f81a7c21c471616fe376c4b54e6cb0855b1043e35486c3eacdc8beadb30e48290a5a2da0cb287ec9aaf5f409f299861ab72c WHIRLPOOL 4389c13bbc71a61adb0330f0edea2be474071b721a90a920872f0d1c6d00ad4e1fcd2b8510144ffacb4f5ff5235ee702d64f9f56b338b449b3f908686ee70c26
 DIST ClanLib-2.3.7.tgz 26132425 SHA256 d46127c08103f48d15936ceb9f95b3dfb1ff8ccba667cef1b3f8e639cb2601c2 SHA512 73169afc0f639390f80403150757a8a14f842bc291a9457c9bca1319642b78bc4d03a93327d75254230e39545c5b4b690e56dc0149ed7b60b223e5a5364e882a WHIRLPOOL a6547d0bc8d254e887c427dfff63deb2b69790124da3db49d54cf853f8c834d44172a06e92ef7fc5222c8c81f903ab29f186f85da698dc085f4138d147ddad68
 EBUILD clanlib-0.8.1.ebuild 2294 SHA256 695a61567e00bbe0c5dbade1d6d83749fedc34033ae04585c1b0254a3c6ce488 SHA512 26deac7967f1ec34c9b7a8b345c25882f8bbd1669d5b4ec336ec3631f792e43678698ce3be87e727819cfe2ae4a1ed518e7d1d1b1eb583ca5b7786c89994aa02 WHIRLPOOL a38d3c41aa7ebd5b9c25a9da73cb5dac2738e3f3a53adf07622955c5a102af9b5ecc0444bce7b018d53b899117764c8c348eeeaa32ddf14e4eb16089923767a9
 EBUILD clanlib-2.3.6.ebuild 2080 SHA256 c49cefb9823bcc966ff7bbb091fa900d5a4a54ca0f7819ae299f5349a306db09 SHA512 d4560c6788aadc372e899ddca47aa2c60708afca26987e93ca2b06cf03a1486d16a329ee8a6da5b0d31271613fded08e5b7834f6104eb7c63d1eaecbfd98395a WHIRLPOOL af7cadc5686f26882f7e872adbc29842c6d7b4bc1f475ffe82631b7d3c63fa6f0c7b0b8b367229a4e81cca0beecc883cc05de4f09e4e2906176833ee7e84fa17
-EBUILD clanlib-2.3.7.ebuild 2075 SHA256 c309f236c455e4e96a4737a18e1a0a22447395eec796e54608dc65fab1ab15e3 SHA512 6a1501a42d2bbef761c66e8abad7005126293fa4c5883e234d22915238a8685e5b1054c664918a8a276b3e0e24a3460f7ee93a16301a2db18b3dad9769fbcd82 WHIRLPOOL 25a5ad50e02e4ecc86b38a6f36039344e2791e979a86e053973504957fc8cf63ce390493c43218c79096e36ee7aee4d32f40d6673a1bdd2ae39c923ebe1fc67b
-MISC ChangeLog 11984 SHA256 beb6a1354d51ea13c93d1255ce19ddb879ee33c52533b00d9781c818218849b6 SHA512 19a58459eb77f3f7db4d484d34e7ca3292be0033da086a4192bf30620f6469a42e95fc44313556ae98cf1f2b281178ea270c8e4bddc2d437230b91afae9285e9 WHIRLPOOL eefb67e2f3494a4cbad2e2eba7422890b76bba9c8ee718cc11d39eaafc63ba75ce530276c280c21cda4531e95c3a6660d02bc67c6eba9c94b0e7a7306e71e49a
+EBUILD clanlib-2.3.7.ebuild 2226 SHA256 38b84754ada40dde228c64657b5b579ce20d8e2f405d721baf883049fac038b5 SHA512 e16999580aa8b1250ca08856701039b1a0f85a8928b3eff92cd111050f4d3f1db8e6091b92a769cd8f6cca78e5d9d5a79be59b2d6c7e907c2ffd833d1af3a46d WHIRLPOOL 2617d55dc861aa8a63f3445a7c33df76a9a6e7f7638c819f1c5485f7eda2d55872588d542d79d988d6f0751aae0a8974fc6d8024d9e4ddae27a75239e116ed58
+MISC ChangeLog 12139 SHA256 97a394b552d806469e0067213d528be7d6ddb1a0c4009f25100bf4d62d25c06c SHA512 da5e9eebf0ae337d1638c8abbeaf0b6693fd7ab1ded114725af9051de11a9dfac9c90f99c9b9b1c3ce1404217ad254f9b4557b4d618dc1e3502d5c23def771ad WHIRLPOOL 714efba3bb179420d04ef549aea139b6752ecd56e951a1b4a50b1b9af2ebb942074e6412681722c99d89da7bd64f127cd491efdf536c5ce22e4e50cd1e59cef9
 MISC metadata.xml 2920 SHA256 390505368337501a27b0d5eb795582bd656627c828d4bb982375fecdfbea8dec SHA512 4795475271093f9a5537d6b485c3b2fc6b29291a57e48e7efb73e39ba94825216cb80e17c8e4f545accecc3af930161fc18a1e5c34c20901480723f7f5c0def3 WHIRLPOOL 0670b35d690693f9329de60396b7697ba12d16ba2118cfce397d97f36b2e7595d965f4d48afaf9c44332a197dec8bac81946763d1251ce6272362c6c65536d1b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlQTRasACgkQIY77eQFFFC2eHQCgnGiESV+IwWUyXNrdVG30H1wC
+6tEAn36dIHsTp9zeRLtdTCpGMxyc7DzI
+=NKK7
+-----END PGP SIGNATURE-----
diff --git a/dev-games/clanlib/clanlib-2.3.7.ebuild b/dev-games/clanlib/clanlib-2.3.7.ebuild
index 95713d2b00d4..9d7c5ad5f18f 100644
--- a/dev-games/clanlib/clanlib-2.3.7.ebuild
+++ b/dev-games/clanlib/clanlib-2.3.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-2.3.7.ebuild,v 1.1 2013/10/28 23:31:47 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-2.3.7.ebuild,v 1.2 2014/09/12 19:12:38 tupone Exp $
 
 EAPI=4
 inherit flag-o-matic eutils autotools-utils
@@ -44,7 +44,10 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
-PATCHES=( "${FILESDIR}"/${P}-autotools.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-autotools.patch
+	"${FILESDIR}"/${P}-doc.patch
+)
 AUTOTOOLS_AUTORECONF=1
 AUTOTOOLS_IN_SOURCE_BUILD=1
 DOCS=(
@@ -54,6 +57,11 @@ DOCS=(
 	README
 )
 
+src_prepare() {
+	autotools-utils_src_prepare
+	ln -sf ../../../Sources/API Documentation/Utilities/ReferenceDocs/ClanLib
+}
+
 src_configure() {
 	myeconfargs=(
 		$(use_enable doc docs)
diff --git a/dev-games/clanlib/files/clanlib-2.3.7-doc.patch b/dev-games/clanlib/files/clanlib-2.3.7-doc.patch
new file mode 100644
index 000000000000..627df26785b4
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-2.3.7-doc.patch
@@ -0,0 +1,14 @@
+--- Documentation/Utilities/ReferenceDocs/Makefile.old	2014-09-12 20:06:52.970459560 +0200
++++ Documentation/Utilities/ReferenceDocs/Makefile	2014-09-12 20:08:17.387048685 +0200
+@@ -3,7 +3,10 @@
+ LIBS=clanCore
+ EXTRA_LIBS=-lpthread
+ 
+-include ../../../Examples/Makefile.conf
++CXXFLAGS += -pthread -std=c++0x -I.
++all: $(EXAMPLE_BIN)
++$(EXAMPLE_BIN): $(OBJF)
++	$(CXX) $(CXXFLAGS) $(OBJF) -o $(EXAMPLE_BIN) -Wl,-R../../Sources/Core/.libs -L../../../Sources/Core/.libs -lclan23Core $(EXTRA_LIBS)
+ 
+ # EOF #
+