summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Huettel (dilfridge) <mail@akhuettel.de>2010-11-21 23:03:28 +0100
committerAndreas K. Huettel (dilfridge) <mail@akhuettel.de>2010-11-21 23:05:27 +0100
commitf229d3d19790716b79dac635566443069567b450 (patch)
treea6792e90fba28e47327e517ec869b308ea247d83
parent3f5c602a2a5b4f459efc65a0100950eb661625c3 (diff)
downloadkde-f229d3d19790716b79dac635566443069567b450.tar.gz
kde-f229d3d19790716b79dac635566443069567b450.tar.bz2
kde-f229d3d19790716b79dac635566443069567b450.zip
[kde-base/rocs] Fixed build for USE=-handbook
(Portage version: 2.1.9.24/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)
-rw-r--r--kde-base/rocs/Manifest7
-rw-r--r--kde-base/rocs/files/rocs-4.5.3-double-handbook.patch25
-rw-r--r--kde-base/rocs/files/rocs-4.5.3-double.patch25
-rw-r--r--kde-base/rocs/rocs-4.5.9999.ebuild5
-rw-r--r--kde-base/rocs/rocs-9999.ebuild5
5 files changed, 39 insertions, 28 deletions
diff --git a/kde-base/rocs/Manifest b/kde-base/rocs/Manifest
index 1e47196fd2f..d564e5b70e3 100644
--- a/kde-base/rocs/Manifest
+++ b/kde-base/rocs/Manifest
@@ -1,7 +1,8 @@
-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.5.80.tar.bz2 67464019 RMD160 a97b1627f87d22f5951bfb4223c2e63be650d13e SHA1 26a5e8f165738b0e10c733d4a5ad70e3d8c0f6b9 SHA256 8130ebaa4972b9ae536d04814c8187d837c85d3cb0ca2d150143c358898d9873
EBUILD rocs-4.4.9999.ebuild 304 RMD160 e45fed45d7e978dbe946d3e8991c3f155b4df304 SHA1 0a3f4d358fd0645602c894a912d3c1d2322667a7 SHA256 0febec8613dd326f6bcd02ecdb5855c361afc98bf4a250ab0c1f4adbf767696f
EBUILD rocs-4.5.80.ebuild 381 RMD160 858e896c03255b7833a44555846e96741ce7a9f9 SHA1 ddab5c92e1c40c7ef6d92d98a42614b03475ee46 SHA256 5e12b7a1eb5844e68652d3f1c144b7d4d301f93c26a13fcdba9b47b6ebc30711
-EBUILD rocs-4.5.9999.ebuild 370 RMD160 dd74834dd81613e2d932c84815cda6cbb770d2b9 SHA1 2c335427affa787dd6e819de25f92b554fe35ae2 SHA256 b06f9a1ac3c71085128b42079682989cecdb388e1d64f27fdd06fc5a314e7a6d
-EBUILD rocs-9999.ebuild 370 RMD160 dd74834dd81613e2d932c84815cda6cbb770d2b9 SHA1 2c335427affa787dd6e819de25f92b554fe35ae2 SHA256 b06f9a1ac3c71085128b42079682989cecdb388e1d64f27fdd06fc5a314e7a6d
+EBUILD rocs-4.5.9999.ebuild 477 RMD160 1c9c0687e8344e0de714672ea5355eff5c097cc0 SHA1 015fa1943eb3beef1bb95c103e67b638c859b471 SHA256 c377da023e8b37958c8ef87d42771f4ad68dca23b3276f2bc75ea8ca68b8a479
+EBUILD rocs-9999.ebuild 477 RMD160 1c9c0687e8344e0de714672ea5355eff5c097cc0 SHA1 015fa1943eb3beef1bb95c103e67b638c859b471 SHA256 c377da023e8b37958c8ef87d42771f4ad68dca23b3276f2bc75ea8ca68b8a479
MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
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 00000000000..8a73450272a
--- /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 2e4152776d0..2a654df9932 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.9999.ebuild b/kde-base/rocs/rocs-4.5.9999.ebuild
index f24bf738de5..9f1adfb4402 100644
--- a/kde-base/rocs/rocs-4.5.9999.ebuild
+++ b/kde-base/rocs/rocs-4.5.9999.ebuild
@@ -18,3 +18,8 @@ DEPEND="
RDEPEND=""
PATCHES=( "${FILESDIR}/${PN}-4.5.3-double.patch" )
+
+src_prepare() {
+ kde4-meta_src_prepare
+ use handbook && epatch "${FILESDIR}/${P}-double-handbook.patch"
+}
diff --git a/kde-base/rocs/rocs-9999.ebuild b/kde-base/rocs/rocs-9999.ebuild
index f24bf738de5..9f1adfb4402 100644
--- a/kde-base/rocs/rocs-9999.ebuild
+++ b/kde-base/rocs/rocs-9999.ebuild
@@ -18,3 +18,8 @@ DEPEND="
RDEPEND=""
PATCHES=( "${FILESDIR}/${PN}-4.5.3-double.patch" )
+
+src_prepare() {
+ kde4-meta_src_prepare
+ use handbook && epatch "${FILESDIR}/${P}-double-handbook.patch"
+}