[gentoo-commits] proj/kde:master commit in: kde-base/rocs/files/, kde-base/rocs/

[gentoo-commits] proj/kde:master commit in: kde-base/rocs/files/, kde-base/rocs/

[Johannes Huber]

commit:     26936d2c68fe869fc8c6151dc4f8ddc3323b1f94
Author:     Johannes Huber <johu <AT> gmx <DOT> de>
AuthorDate: Fri Nov 18 16:15:36 2011 +0000
Commit:     Johannes Huber <johu <AT> gmx <DOT> de>
CommitDate: Fri Nov 18 16:15:36 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=26936d2c

[kde-base/rocs] Add upstream patch to build with boost 1.47, fixes bug 390059

(Portage version: 2.2.0_alpha75/git/Linux x86_64, unsigned Manifest commit)

---
 kde-base/rocs/files/rocs-4.7.3-boost.patch |   29 ++++++++++++++++++++++++++++
 kde-base/rocs/rocs-4.7.3-r1.ebuild         |   26 +++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 0 deletions(-)

diff --git a/kde-base/rocs/files/rocs-4.7.3-boost.patch b/kde-base/rocs/files/rocs-4.7.3-boost.patch
new file mode 100644
index 0000000..9671e41
--- /dev/null
+++ b/kde-base/rocs/files/rocs-4.7.3-boost.patch
@@ -0,0 +1,29 @@
+commit 43b6ccf22174629ebec0a0579365c4269cf0fb58
+Author: Andreas Cord-Landwehr <cola@uni-paderborn.de>
+Date:   Sat Oct 22 22:50:26 2011 +0200
+
+    Build Rocs by default with Boost Exceptions.
+    
+    This solves the common build issues with many Boost releases.
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b47ef0a..c636fd5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -8,6 +8,8 @@ find_package(KDE4 REQUIRED)
+ include(KDE4Defaults)
+ remove_definitions(-DQT_NO_STL)
+ 
++set (CMAKE_CXX_FLAGS "${KDE4_ENABLE_EXCEPTIONS}" )
++
+ include_directories(
+   ${KDE4_INCLUDES}
+   ${QT_INCLUDES}
+@@ -15,7 +17,6 @@ include_directories(
+ 
+ if(${CMAKE_BUILD_TYPE} MATCHES coverage)
+   set (CMAKE_CXX_COMPILER cov++)
+-  set (CMAKE_CXX_FLAGS "${KDE4_ENABLE_EXCEPTIONS}" )
+ endif()
+ 
+ find_package(Boost "1.39" REQUIRED)

diff --git a/kde-base/rocs/rocs-4.7.3-r1.ebuild b/kde-base/rocs/rocs-4.7.3-r1.ebuild
new file mode 100644
index 0000000..9c1629c
--- /dev/null
+++ b/kde-base/rocs/rocs-4.7.3-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/rocs/rocs-4.7.3.ebuild,v 1.1 2011/11/02 20:48:23 alexxy Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="KDE4 interface to work with Graph Theory"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="dev-libs/boost"
+DEPEND="
+	${RDEPEND}
+	>=dev-cpp/eigen-2.0.3:2
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.7.3-boost.patch
+)
+
+RESTRICT="test"
+# bug 376909

[gentoo-commits] proj/kde:master commit in: kde-base/rocs/files/, kde-base/rocs/

[Andreas Hüttel]

commit:     323cce73c6fe0798f4dd2e8ae9857754a516f9bc
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 20 13:42:37 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Nov 20 13:42:37 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=323cce73

[kde-base/rocs] exceptions patch moved to main tree

(Portage version: 2.1.10.34/git/Linux x86_64, unsigned Manifest commit)

---
 kde-base/rocs/files/rocs-4.7.3-boost.patch |   29 ----------------------------
 kde-base/rocs/rocs-4.7.3-r1.ebuild         |   26 -------------------------
 2 files changed, 0 insertions(+), 55 deletions(-)

diff --git a/kde-base/rocs/files/rocs-4.7.3-boost.patch b/kde-base/rocs/files/rocs-4.7.3-boost.patch
deleted file mode 100644
index 9671e41..0000000
--- a/kde-base/rocs/files/rocs-4.7.3-boost.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-commit 43b6ccf22174629ebec0a0579365c4269cf0fb58
-Author: Andreas Cord-Landwehr <cola@uni-paderborn.de>
-Date:   Sat Oct 22 22:50:26 2011 +0200
-
-    Build Rocs by default with Boost Exceptions.
-    
-    This solves the common build issues with many Boost releases.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b47ef0a..c636fd5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -8,6 +8,8 @@ find_package(KDE4 REQUIRED)
- include(KDE4Defaults)
- remove_definitions(-DQT_NO_STL)
- 
-+set (CMAKE_CXX_FLAGS "${KDE4_ENABLE_EXCEPTIONS}" )
-+
- include_directories(
-   ${KDE4_INCLUDES}
-   ${QT_INCLUDES}
-@@ -15,7 +17,6 @@ include_directories(
- 
- if(${CMAKE_BUILD_TYPE} MATCHES coverage)
-   set (CMAKE_CXX_COMPILER cov++)
--  set (CMAKE_CXX_FLAGS "${KDE4_ENABLE_EXCEPTIONS}" )
- endif()
- 
- find_package(Boost "1.39" REQUIRED)

diff --git a/kde-base/rocs/rocs-4.7.3-r1.ebuild b/kde-base/rocs/rocs-4.7.3-r1.ebuild
deleted file mode 100644
index 9c1629c..0000000
--- a/kde-base/rocs/rocs-4.7.3-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/rocs/rocs-4.7.3.ebuild,v 1.1 2011/11/02 20:48:23 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="KDE4 interface to work with Graph Theory"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="dev-libs/boost"
-DEPEND="
-	${RDEPEND}
-	>=dev-cpp/eigen-2.0.3:2
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.7.3-boost.patch
-)
-
-RESTRICT="test"
-# bug 376909