commit: feb2244b723c097b3412d70b8bc4fafe1a8495a0
Author: Rongcui Dong <carldong76 <AT> gmail <DOT> com>
AuthorDate: Fri Sep 5 12:43:39 2014 +0000
Commit: Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org>
CommitDate: Fri Sep 5 12:43:39 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=feb2244b
Version bump
Package-Manager: portage-2.3.6-r9
---
sci-libs/calculix-cgx/ChangeLog | 10 ++++--
...ulix-cgx-2.2.ebuild => calculix-cgx-2.7.ebuild} | 23 +++++++------
... => 01_cgx_2.7_Makefile_custom_cxx_flags.patch} | 39 +++++++++++++++++-----
3 files changed, 50 insertions(+), 22 deletions(-)
diff --git a/sci-libs/calculix-cgx/ChangeLog b/sci-libs/calculix-cgx/ChangeLog
index d9b884d..aeec23f 100644
--- a/sci-libs/calculix-cgx/ChangeLog
+++ b/sci-libs/calculix-cgx/ChangeLog
@@ -1,7 +1,14 @@
# ChangeLog for sci-libs/calculix-cgx
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*calculix-cgx-2.7 (05 Sep 2014)
+
+ 05 Sep 2014; Rongcui Dong <carldon...@gmail.com> +calculix-cgx-2.7.ebuild,
+ +files/01_cgx_2.7_Makefile_custom_cxx_flags.patch, -calculix-cgx-2.2.ebuild,
+ -files/01_cgx_2.2_Makefile.patch:
+ Version bump
+
*calculix-cgx-2.2 (29 Oct 2010)
29 Oct 2010; Oliver Borm (boroli) <oli.b...@web.de>
@@ -30,4 +37,3 @@
15 Oct 2008; Oliver Borm (boroli) <oli.b...@web.de>
+files/01_cgx_1.8_Makefile.patch, +calculix-cgx-1.8.ebuild, +metadata.xml:
Reworked ebuild for bug 125775, thanks to pva
-
diff --git a/sci-libs/calculix-cgx/calculix-cgx-2.2.ebuild
b/sci-libs/calculix-cgx/calculix-cgx-2.7.ebuild
similarity index 68%
rename from sci-libs/calculix-cgx/calculix-cgx-2.2.ebuild
rename to sci-libs/calculix-cgx/calculix-cgx-2.7.ebuild
index 14a9627..db1a43d 100644
--- a/sci-libs/calculix-cgx/calculix-cgx-2.2.ebuild
+++ b/sci-libs/calculix-cgx/calculix-cgx-2.7.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=2
+EAPI=5
inherit eutils
@@ -11,14 +11,15 @@ MY_P=cgx_${PV}
DESCRIPTION="A Free Software Three-Dimensional Structural Finite Element
Program"
HOMEPAGE="http://www.calculix.de/";
SRC_URI="http://www.dhondt.de/${MY_P}.all.tar.bz2
- doc? ( http://www.dhondt.de/${MY_P}.ps.bz2 )"
+ doc? ( http://www.dhondt.de/${MY_P}.pdf )"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="doc examples nptl"
+# nptl removed since I cannot work around it
+IUSE="doc examples"
-RDEPEND="media-libs/mesa[nptl=]
+RDEPEND="media-libs/mesa[nptl]
>=media-libs/freeglut-1.0"
DEPEND="${RDEPEND}
doc? ( app-text/ghostscript-gpl )"
@@ -26,15 +27,16 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/CalculiX/${MY_P}/src/
src_prepare() {
- epatch "${FILESDIR}"/01_${MY_P}_Makefile.patch
+ epatch "${FILESDIR}"/01_${MY_P}_Makefile_custom_cxx_flags.patch
}
src_configure () {
- if use nptl; then
- export PTHREAD="-lpthread"
- else
- export PTHREAD=""
- fi
+ # Does not compile without -lpthread
+ #if use nptl; then
+ export PTHREAD="-lpthread"
+ #else
+ # export PTHREAD=""
+ #fi
}
src_install () {
@@ -42,7 +44,6 @@ src_install () {
if use doc; then
cd "${WORKDIR}"
- ps2pdf ${MY_P}.ps ${MY_P}.pdf
dodoc ${MY_P}.pdf
fi
diff --git a/sci-libs/calculix-cgx/files/01_cgx_2.2_Makefile.patch
b/sci-libs/calculix-cgx/files/01_cgx_2.7_Makefile_custom_cxx_flags.patch
similarity index 61%
rename from sci-libs/calculix-cgx/files/01_cgx_2.2_Makefile.patch
rename to sci-libs/calculix-cgx/files/01_cgx_2.7_Makefile_custom_cxx_flags.patch
index f60d17a..0c97613 100644
--- a/sci-libs/calculix-cgx/files/01_cgx_2.2_Makefile.patch
+++ b/sci-libs/calculix-cgx/files/01_cgx_2.7_Makefile_custom_cxx_flags.patch
@@ -1,17 +1,29 @@
---- CalculiX/cgx_2.0/src/Makefile.orig 2009-08-28 10:24:52.000000000 +0200
-+++ CalculiX/cgx_2.0/src/Makefile 2009-08-28 10:26:39.000000000 +0200
-@@ -7,8 +7,8 @@
- -I/usr/X11/include
+diff -rupN CalculiX/cgx_2.7/src/Makefile CalculiX.patched/cgx_2.7/src/Makefile
+--- CalculiX/cgx_2.7/src/Makefile 2014-02-18 13:47:05.000000000 -0500
++++ CalculiX.patched/cgx_2.7/src/Makefile 2014-09-04 17:08:58.043266103
-0400
+@@ -1,15 +1,15 @@
+-CFLAGS = -O3 -Wall \
++CFLAGS := -O3 -Wall \
+ -I./ \
+ -I/usr/include \
+ -I/usr/include/GL \
+ -I../../libSNL/src \
+ -I../../glut-3.5/src \
+- -I/usr/X11/include
++ -I/usr/X11/include $(CFLAGS)
- LFLAGS = \
+-LFLAGS = \
- -L/usr/lib64 -lGL -lGLU \
-- -L/usr/X11R6/lib64 -lX11 -lXext -lXi -lXmu -lXt -lSM -lICE \
+- -L/usr/X11R6/lib64 -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE \
+- -lm -lpthread -lrt
++LFLAGS := \
+ -L/usr/lib -lGL -lGLU -lglut \
-+ -L/usr/X11R6/lib $(PTHREAD) -lX11 -lXext -lXi -lXmu -lXt -lSM -lICE \
- -lm
++ -L/usr/X11R6/lib -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE \
++ -lm $(PTHREAD) -lrt $(LFLAGS)
+
# on 32bit systems change lib64 to lib
-@@ -18,41 +18,6 @@
+@@ -19,41 +19,6 @@ LFLAGS = \
include Makefile.inc
SUTIL = \
@@ -51,5 +63,14 @@
- ../../glut-3.5/src/glut_init.c \
- ../../glut-3.5/src/glut_util.c \
uselibSNL.cpp \
+ generateTet.cpp \
../../libSNL/src/*.cpp
+@@ -62,7 +27,7 @@ OLIB = $(SLIB:.c=.o)
+ OUTIL = $(SUTIL:.c=.o)
+
+ cgx: $(OLIB) $(OUTIL)
+- g++ $(OLIB) $(OUTIL) $(CFLAGS) $(LFLAGS) -o $@
++ $(CXX) $(OLIB) $(OUTIL) $(CFLAGS) $(LFLAGS) -o $@
+
+
