Fixed build for USE=-handbook

Package-Manager: portage-2.1.9.24/cvs/Linux x86_64

5 files changed, 53 insertions, 43 deletions

diff --git a/kde-base/rocs/ChangeLog b/kde-base/rocs/ChangeLog
index 1f762b5a0ea5..f16db050d611 100644
--- a/kde-base/rocs/ChangeLog
+++ b/kde-base/rocs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/rocs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/rocs/ChangeLog,v 1.21 2010/11/11 22:45:55 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/rocs/ChangeLog,v 1.22 2010/11/21 22:05:15 dilfridge Exp $
+
+  21 Nov 2010; Andreas K. Huettel <dilfridge@gentoo.org> rocs-4.5.3.ebuild,
+  files/rocs-4.5.3-double.patch, +files/rocs-4.5.3-double-handbook.patch:
+  Fixed build for USE=-handbook
 
   11 Nov 2010; Andreas K. Huettel <dilfridge@gentoo.org> rocs-4.5.3.ebuild,
   +files/rocs-4.5.3-double.patch:
diff --git a/kde-base/rocs/Manifest b/kde-base/rocs/Manifest
index 5c6f75bcb7b5..8a38f0a63003 100644
--- a/kde-base/rocs/Manifest
+++ b/kde-base/rocs/Manifest
@@ -1,29 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX rocs-4.5.3-double.patch 5518 RMD160 25617d25c1b603c60128a6cc59018ecd648822b9 SHA1 94e379d0bfe71116870a06a20080e5c59430e59a SHA256 7fbbc21ac35f5d91c4605a6caadb27cfcb820978425c5601c9c239d0cbd15b1b
+AUX rocs-4.5.3-double-handbook.patch 667 RMD160 1ae333cb7862f5327b7a7ddbc9ac1fbdd9f3767d SHA1 8c1cfe82667d790e0bf23ecb594725d1c9de5ac5 SHA256 3c37dd53e2e92e57c783fe222cf4cb1b07e5d43165d97537d247d2e07ddecdd2
+AUX rocs-4.5.3-double.patch 4851 RMD160 9197d9b07bcc3bad9ece9967e3de8d5481a5fece SHA1 170e1e7937564a591b794afb6d85d19cf586c0ff SHA256 4e96c399551964d72c24f41955afff3d3015d262807e8481e24218ebea6e97cb
 DIST kdeedu-4.4.5.tar.bz2 59799070 RMD160 13c2ad8d67a961ab062bba989f7c86fa5e1cabc5 SHA1 7b84fa9dd9e91e117df5dc1af19bcd212cac707a SHA256 13272a8585a168a7d5c63d2ba10f57412e82cc5fb32b77a8c81284623828b9d8
 DIST kdeedu-4.5.2.tar.bz2 65714910 RMD160 25de7ca7b712f29f4c2466a224642c099ebb9fd3 SHA1 44f6cbb0029ae23b0aa6e16e0e6125ad07771be4 SHA256 2512f80ea203cb1be24ab2b18d12be876afc2182c586d864d082d658aa2c57d2
 DIST kdeedu-4.5.3.tar.bz2 65711657 RMD160 5d952896ecb18246694947ae8595c2ecb2656d91 SHA1 3bb03536603aafbe317fa9ed5f02579f76ba5157 SHA256 29c02c490e6b9a36d3d515ea729d08383322852bc642f6ac0834c2f4c0bc14a0
 EBUILD rocs-4.4.5.ebuild 440 RMD160 476e704ab6b6c4338267a94d29f12c7a01017230 SHA1 25f2e941db98acf1143ad9852ba56b6d3d60de3c SHA256 71b609b6a8a1c23688f95e332b428f1dcc5bc9d76882b1b9487011476080f385
 EBUILD rocs-4.5.2.ebuild 458 RMD160 0a5ac60c832d5020a4f731564e82c271ffab4393 SHA1 61d43b6ee292f2316858325ab61fdb4b4b8e81a6 SHA256 bd43c8f4b864ded67d54913305021af94cfb01fe122b00fd7c6381362dd53282
-EBUILD rocs-4.5.3.ebuild 506 RMD160 7f866d2a39d96c6544463c482255ca65afa5b94c SHA1 bc708d12da87eaf2ac79b00c65350ba9cd5fa712 SHA256 af23f47ccca158b640e8d18aa42175d9bb872de6c46c8bda4af4eadb42f82b15
-MISC ChangeLog 2587 RMD160 08e9dd053c33b7b8622d2bc2db18aa6f01a3e0be SHA1 18b0ecd70164579f6244cc7253584b108505f0c7 SHA256 52d247a25bb2a82afeb9ea3bd9772399c2140b6bad1963b011e1741c3a193d1b
+EBUILD rocs-4.5.3.ebuild 613 RMD160 c4f54d7f490170b93a58f12ee8f16796902edcc9 SHA1 80e3baec8121c51d67e3182ea3bcabad0d71bef3 SHA256 5805ff735925f25c7bda62c3ea359ef274a26734cf9c6648402c91ef97163d22
+MISC ChangeLog 2770 RMD160 1a8c16d6c9361cb21919eb9ad8818366cb6c7f30 SHA1 51ca5efb42037749726783649477e2bc1b4d2833 SHA256 b86e6950cb2841f3a04bf6a7eead29914a8c51cdd9f4daecce666c30483a38d7
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQIcBAEBAgAGBQJM3HG6AAoJENwGBM22xffep10P/RiTGlbONqBV2Wmz1uXqWM3v
-6Y+4ltpGJpJ7LvlXVZ8mmSIcAKypH9zQrS3JrRUvg6eSdgi4LeuVw1DzsbhCJQ0N
-y/o7MeM9Nw/zQEgP8ULiCX3mEE8D7NlyG45BG3JXefyk3bHeiL1b2XtGsaN4lqLJ
-mX9rK397RpiPc2kCpksEAn41Xk4JAAy0MhYNgSu2KvjmX5RQ+x8YIWM4qNNcMDZJ
-qjNU85ayDiQ+D7+53XRHUdY+47G7S1GhmbqAnS8Jz4TAbHkGumfNstPMlJawVgM3
-gEr9mMDq0jnYLgCyON9OWTRuxp512qFtRCA/CizBLh+nKFYAMAN9ezz/FUa74ov2
-mjRSPc7vf6CFEgvlM0SdBJkQuUBqfxV1x7W/M8qVhkNawN7bd1S4eP5gnEsvkxfh
-A9Sq7fgiEUuMu04SpMKfzN92nQ6Q8o2zdQWUpOC5a96wwszGtD9JfwpO4Az54S8U
-KYsT3Mwy8DHfaYIW+eMC4U/ZKOQv0tHdvH42WFrRG5ejwEoWKjEECSQBLvn1RrSd
-O6hf+MxdaF9DMyD+RgmHqT/2HbpwF1D5rtnHTxgxsissFuB1LOfzk/v6VyOeWu6t
-v4awB3bx2rKnh781yox6I46bSBgcfI5hjSQjJEiVACypUecmRTTB1r67Nxoq3MWk
-OaAHdT7pClDAmoi0VOhb
-=xsOm
+iQIcBAEBAgAGBQJM6ZZHAAoJENwGBM22xffeZnQP/0fjM0+2huVZ67DszBCEszNE
+eZbQa1G1YV6SXoBB20UF8wV8MbL5QIeOGtT/1zfml5mzXsqyQ/XlQmC3QbOIdb/x
+pNzZPL3uFSv/rDdAFv9p9+5xrdPAS5elr04nsqUq+g5/lygH93GAbUOkXm/IiyVt
+3XAnNrQC3vB9+sSdBa0VYiqefTE7VXifnYLPZiIw4WGtwnP9pcPrYQIpxDquAECX
+/f/yWWkHjRGcpK/Lx4ELBgAGkm7o43bfJD6FvUbmzS5Jpva+F6+TYWbnaITOZf1t
+xAjwfdN/tbSF6IHwQT+icbzjqa3QPqHJqHSi/H4btrTR2KH3UFqYxrfBzU5ZPIes
++o48eh7L6MDblRPHRq5OV97cP8yHd+GayifX94PkcRj6Ve7CpbC+kUuw13PsIdKh
+RO2hXGgbDQ3JUym9iWyzKddwiFb9bd+4lMxHgLGwwJpZEUsa6Ia+Tso9MXlWLKIZ
+ABN4UIYPDURoX9ep5fESnnjuYMfOT+bqizrE8kaiDxv/HM5H25XAsJyPVmSNcyRA
+v25wFBNV2a8jZovVcEusuNmHHKmgR0lBPuz1jlHe2N/CNkpmQScNQCD10/1jjyLo
+mpFzJ69k+2vGTL178Etil9YAnAviOMBhrweJksDot26IbHMguGP3EK2hHPA6xZUx
+bmFYML9p/h+VsSGNkVBP
+=CxAP
 -----END PGP SIGNATURE-----
diff --git a/kde-base/rocs/files/rocs-4.5.3-double-handbook.patch b/kde-base/rocs/files/rocs-4.5.3-double-handbook.patch
new file mode 100644
index 000000000000..8a73450272a7
--- /dev/null
+++ b/kde-base/rocs/files/rocs-4.5.3-double-handbook.patch
@@ -0,0 +1,25 @@
+diff -ru rocs-4.5.3.orig/doc/rocs/index.docbook rocs-4.5.3/doc/rocs/index.docbook
+--- rocs-4.5.3.orig/doc/rocs/index.docbook	2010-06-08 12:10:55.000000000 +0200
++++ rocs-4.5.3/doc/rocs/index.docbook	2010-11-10 01:21:53.467410347 +0100
+@@ -180,9 +180,9 @@
+ </programlisting> 
+ <para>Node Variables:</para>
+ <programlisting>
+-    double x
+-    double y
+-    double width
++    qreal x
++    qreal y
++    qreal width
+     string value
+     string name
+     string color  // in HEXA
+@@ -197,7 +197,7 @@
+     string color ( em hexa )
+     string value
+     string name
+-    double width
++    qreal width
+     string style ( dot, dash, dash dot, solid )
+ 
+     node start();
diff --git a/kde-base/rocs/files/rocs-4.5.3-double.patch b/kde-base/rocs/files/rocs-4.5.3-double.patch
index 2e4152776d00..2a654df9932d 100644
--- a/kde-base/rocs/files/rocs-4.5.3-double.patch
+++ b/kde-base/rocs/files/rocs-4.5.3-double.patch
@@ -1,28 +1,3 @@
-diff -ru rocs-4.5.3.orig/doc/rocs/index.docbook rocs-4.5.3/doc/rocs/index.docbook
---- rocs-4.5.3.orig/doc/rocs/index.docbook	2010-06-08 12:10:55.000000000 +0200
-+++ rocs-4.5.3/doc/rocs/index.docbook	2010-11-10 01:21:53.467410347 +0100
-@@ -180,9 +180,9 @@
- </programlisting> 
- <para>Node Variables:</para>
- <programlisting>
--    double x
--    double y
--    double width
-+    qreal x
-+    qreal y
-+    qreal width
-     string value
-     string name
-     string color  // in HEXA
-@@ -197,7 +197,7 @@
-     string color ( em hexa )
-     string value
-     string name
--    double width
-+    qreal width
-     string style ( dot, dash, dash dot, solid )
- 
-     node start();
 diff -ru rocs-4.5.3.orig/rocs/src/Core/edge.h rocs-4.5.3/rocs/src/Core/edge.h
 --- rocs-4.5.3.orig/rocs/src/Core/edge.h	2010-06-08 12:10:59.000000000 +0200
 +++ rocs-4.5.3/rocs/src/Core/edge.h	2010-11-10 01:23:28.283410355 +0100
diff --git a/kde-base/rocs/rocs-4.5.3.ebuild b/kde-base/rocs/rocs-4.5.3.ebuild
index 2126f56293e5..833c8b6c38b3 100644
--- a/kde-base/rocs/rocs-4.5.3.ebuild
+++ b/kde-base/rocs/rocs-4.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/rocs/rocs-4.5.3.ebuild,v 1.2 2010/11/11 22:45:55 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/rocs/rocs-4.5.3.ebuild,v 1.3 2010/11/21 22:05:15 dilfridge Exp $
 
 EAPI="3"
 
@@ -18,3 +18,8 @@ DEPEND="
 RDEPEND=""
 
 PATCHES=( "${FILESDIR}/${P}-double.patch" )
+
+src_prepare() {
+	kde4-meta_src_prepare
+	use handbook && epatch "${FILESDIR}/${P}-double-handbook.patch"
+}