From d470282409fbf01fd826354cf890ce4a1451f9e1 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Sun, 10 Jan 2010 10:37:34 +0000 Subject: old (Portage version: 2.2_rc61/cvs/Linux x86_64) --- sci-mathematics/cgal/Manifest | 5 - sci-mathematics/cgal/cgal-3.3.1.ebuild | 98 ------------------ sci-mathematics/cgal/files/cgal-3.3.1-gcc44.patch | 30 ------ sci-mathematics/cgal/files/cgal-3.3.1-qt.patch | 71 ------------- sci-mathematics/cgal/files/cgal-3.3.1-rpath.patch | 116 ---------------------- 5 files changed, 320 deletions(-) delete mode 100644 sci-mathematics/cgal/cgal-3.3.1.ebuild delete mode 100644 sci-mathematics/cgal/files/cgal-3.3.1-gcc44.patch delete mode 100644 sci-mathematics/cgal/files/cgal-3.3.1-qt.patch delete mode 100644 sci-mathematics/cgal/files/cgal-3.3.1-rpath.patch (limited to 'sci-mathematics/cgal') diff --git a/sci-mathematics/cgal/Manifest b/sci-mathematics/cgal/Manifest index 009467a132f8..cb719dcb4473 100644 --- a/sci-mathematics/cgal/Manifest +++ b/sci-mathematics/cgal/Manifest @@ -1,9 +1,4 @@ -AUX cgal-3.3.1-gcc44.patch 1323 RMD160 83b187a7367eb1a240ad23c9c7173857ed4bcd69 SHA1 58537d80a7324f620075a7ec8830aa9275992678 SHA256 60d134c5abde6f9bc01a8dfcd7d4b275039e1727c049245b9e80ad5bca9e23de -AUX cgal-3.3.1-qt.patch 2029 RMD160 340035482282e118b72adfdd45945b82bc951175 SHA1 3b19e7d0d3ef92526ecc54daa6a5676a9ca9cf9a SHA256 9177a289eddd4356f79baecb19e20c126462c585314ee67512eb116accf32f94 -AUX cgal-3.3.1-rpath.patch 5043 RMD160 3eae61377d17487576ffb06b7ba3928ac5e1358f SHA1 8b241d9523bb464c0ac774a50ef878872135a7a4 SHA256 d9559cf91ca90dad8cb4a4b13f0b624da84205ae563fb10a9f471d43a4d20d49 -DIST CGAL-3.3.1.tar.gz 8593200 RMD160 e2c2e785a7c61bc9b651903df539bb00ce689b07 SHA1 b17b12fdf106003e1257e1465b0ba1d17e6cefb9 SHA256 c6e4e5a284ccb07b38321cd265f07a0cb8eaa4df67efb7f40f70a311cae00d37 DIST CGAL-3.5.1.tar.gz 13529161 RMD160 165d325393878f12eb928bf74dde65135f1c8af3 SHA1 12518977d42cb2d689395526f64599ee5bcb6849 SHA256 ae30577b946f5d486ec35f4778d99f27d9879c08ed0bed61edb113d4e2cddd35 -EBUILD cgal-3.3.1.ebuild 2803 RMD160 e4b0d366a9f0e9314288ee30cebfd3108a595a6f SHA1 ca92ee7a70950cbb694cadd1944335e1cfa80196 SHA256 5bf77a95bc52e14a538a6d1a38b8ce2ac29e78d3c5f2e251f0adcd8e411e1688 EBUILD cgal-3.5.1.ebuild 1569 RMD160 17544bc9ff0f48a709bf9907a6f61e79a1b87e54 SHA1 6f6aa5a5fb0b89873880a491c957d4c2a1af894c SHA256 e4a727fca4dd1d2832aa774956ca7e729a273d2ce091cf83fa447be78e63aaec MISC ChangeLog 1013 RMD160 63082b5305193a7ac09c1a718fe138cb023cf61e SHA1 8bc1b5bdce8f3f863f317e7dadaab14e7df37b13 SHA256 b3a2db751fe224900675e6163630927d9bde01ec73bcfb93b6ef6cef6b34e253 MISC metadata.xml 1025 RMD160 da14e8b7ef6f3ce0aa192b47bbd509a66b5c07af SHA1 449624b3734ca4c2b5da1e3018536d8fe8580b5e SHA256 29cf5a72c2119df2fbb5b0ca0bb8f3abd1779e8b0ac31e99408cc0895ade515b diff --git a/sci-mathematics/cgal/cgal-3.3.1.ebuild b/sci-mathematics/cgal/cgal-3.3.1.ebuild deleted file mode 100644 index 432a12c6fcce..000000000000 --- a/sci-mathematics/cgal/cgal-3.3.1.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/cgal-3.3.1.ebuild,v 1.4 2009/08/12 21:29:10 bicatali Exp $ - -EAPI=2 - -inherit eutils toolchain-funcs - -MYP=CGAL-${PV} - -DESCRIPTION="C++ library for geometric algorithms and data structures" -HOMEPAGE="http://www.cgal.org/" -SRC_URI="ftp://ftp.mpi-sb.mpg.de/pub/outgoing/CGAL/${MYP}.tar.gz" - -LICENSE="LGPL-2.1 QPL" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="examples gmp lapack opengl qt3 taucs X zlib" - -RDEPEND="dev-libs/boost - dev-libs/mpfr - lapack? ( virtual/lapack ) - opengl? ( virtual/opengl ) - qt3? ( x11-libs/qt:3 ) - taucs? ( sci-libs/taucs ) - X? ( x11-libs/libX11 ) - zlib? ( sys-libs/zlib )" -DEPEND="${RDEPEND} - lapack? ( dev-util/pkgconfig )" - -S="${WORKDIR}/${MYP}" - -src_prepare() { - epatch "${FILESDIR}"/${P}-rpath.patch - # a patch from debian on missing qt headers - epatch "${FILESDIR}"/${P}-qt.patch - epatch "${FILESDIR}"/${P}-gcc44.patch - # sed for blas and lapack gentoo style - sed -e 's:Intel MKL:Gentoo BLAS-LAPACK:' \ - -e "s:^LIBS.=.*:LIBS=$(pkg-config --libs-only-l lapack | sed 's/-l//g'):" \ - -e "s:^STDLIBDIRS.=*:STDLIBDIRS=$(pkg-config --libs-only-L lapack | sed 's/-L//g'):" \ - config/support/S48a-MKL64 \ - > config/support/S48e-GENTOOLAPACK || die - sed -i -e 's/-O2//' install_cgal || die -} - -src_configure() { - CGALDIR="${S}/usr" - MYCONF="-ni - --prefix=${CGALDIR} - --cxx=$(tc-getCXX) - --without-autofind - --with-boost - --with-boost_program_options - --with-mpfr - --with-gmp - --with-gmpxx" - - use lapack && MYCONF="${MYCONF} --with-gentoolapack" - use opengl && MYCONF="${MYCONF} --with-opengl" - use taucs && MYCONF="${MYCONF} --with-gentoolapack --with-taucslapack" - use X && MYCONF="${MYCONF} --with-x11" - use zlib && MYCONF="${MYCONF} --with-zlib" - use qt3 && MYCONF="${MYCONF} --with-qt3mt --qt_incl_dir ${QTDIR}/include --qt_lib_dir ${QTDIR}/lib" -} - -src_compile() { - ./install_cgal ${MYCONF} || die "compilation failed" - grep -q failed compile.log && die "see ${S}/compile.log for problems" -} - -src_test() { - cd "${S}"/examples - export CGAL_MAKEFILE="${CGALDIR}/share/cgal/cgal.mk" - emake || die "emake examples failed" - # basic testing, does not compare with original - for t in */*.cpp; do - local run_testt=${t%.cpp} - if [[ -x ${run_test} ]]; then - ${run_test} || die "Running test from ${t} failed" - fi - done -} - -src_install(){ - mv usr/lib usr/$(get_libdir) - sed -i \ - -e "s:${CGALDIR}:/usr:g" \ - "${CGALDIR}/share/cgal/cgal.mk" || die "sed cgal.mk failed" - cp -pPR usr "${D}" || die "install failed" - - if use examples; then - insinto /usr/share/doc/${PF} - doins -r demo examples || die "samples install failed" - fi - echo "CGAL_MAKEFILE=/usr/share/cgal/cgal.mk" > 99cgal - doenvd 99cgal || die -} diff --git a/sci-mathematics/cgal/files/cgal-3.3.1-gcc44.patch b/sci-mathematics/cgal/files/cgal-3.3.1-gcc44.patch deleted file mode 100644 index 3707bd83d67c..000000000000 --- a/sci-mathematics/cgal/files/cgal-3.3.1-gcc44.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- include/CGAL/Lazy_exact_nt.h.orig 2009-08-12 22:17:43.000000000 +0100 -+++ include/CGAL/Lazy_exact_nt.h 2009-08-12 22:19:06.000000000 +0100 -@@ -329,11 +329,11 @@ - struct Lazy_exact_Min : public Lazy_exact_binary - { - Lazy_exact_Min (const Lazy_exact_nt &a, const Lazy_exact_nt &b) -- : Lazy_exact_binary((min)(a.approx(), b.approx()), a, b) {} -+ : Lazy_exact_binary((CGAL::min)(a.approx(), b.approx()), a, b) {} - - void update_exact() - { -- this->et = new ET((min)(this->op1.exact(), this->op2.exact())); -+ this->et = new ET((CGAL::min)(this->op1.exact(), this->op2.exact())); - if (!this->approx().is_point()) this->approx() = CGAL_NTS to_interval(*(this->et)); - this->prune_dag(); - } -@@ -344,11 +344,11 @@ - struct Lazy_exact_Max : public Lazy_exact_binary - { - Lazy_exact_Max (const Lazy_exact_nt &a, const Lazy_exact_nt &b) -- : Lazy_exact_binary((max)(a.approx(), b.approx()), a, b) {} -+ : Lazy_exact_binary((CGAL::max)(a.approx(), b.approx()), a, b) {} - - void update_exact() - { -- this->et = new ET((max)(this->op1.exact(), this->op2.exact())); -+ this->et = new ET((CGAL::max)(this->op1.exact(), this->op2.exact())); - if (!this->approx().is_point()) this->approx() = CGAL_NTS to_interval(*(this->et)); - this->prune_dag(); - } diff --git a/sci-mathematics/cgal/files/cgal-3.3.1-qt.patch b/sci-mathematics/cgal/files/cgal-3.3.1-qt.patch deleted file mode 100644 index 406c025bcf78..000000000000 --- a/sci-mathematics/cgal/files/cgal-3.3.1-qt.patch +++ /dev/null @@ -1,71 +0,0 @@ ---- config/support/test_QT.cpp.orig 2007-08-25 21:01:03.000000000 +0200 -+++ config/support/test_QT.cpp 2008-02-06 18:34:06.000000000 +0100 -@@ -25,7 +25,7 @@ - - #include - #include --#include -+#include - - QArray fib( int num ) // returns fibonacci array - { ---- demo/Apollonius_graph_2/qt_file_toolbar.h.orig 2007-08-25 21:00:54.000000000 +0200 -+++ demo/Apollonius_graph_2/qt_file_toolbar.h 2008-02-06 18:34:51.000000000 +0100 -@@ -21,7 +21,7 @@ - #define QT_FILE_TOOLBAR_H - - // include files for QT --#include -+#include - #include - #include - #include -@@ -32,7 +32,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- demo/Segment_Delaunay_graph_2/qt_file_toolbar.h.orig 2007-08-25 21:01:03.000000000 +0200 -+++ demo/Segment_Delaunay_graph_2/qt_file_toolbar.h 2008-02-06 18:35:06.000000000 +0100 -@@ -21,7 +21,7 @@ - #define QT_FILE_TOOLBAR_H - - // include files for QT --#include -+#include - #include - #include - #include -@@ -32,7 +32,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- demo/Voronoi_diagram_2/qt_file_toolbar.h.orig 2007-08-25 21:00:21.000000000 +0200 -+++ demo/Voronoi_diagram_2/qt_file_toolbar.h 2008-02-06 18:34:36.000000000 +0100 -@@ -21,7 +21,7 @@ - #define QT_FILE_TOOLBAR_H - - // include files for QT --#include -+#include - #include - #include - #include -@@ -32,7 +32,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include diff --git a/sci-mathematics/cgal/files/cgal-3.3.1-rpath.patch b/sci-mathematics/cgal/files/cgal-3.3.1-rpath.patch deleted file mode 100644 index b104c678e0a6..000000000000 --- a/sci-mathematics/cgal/files/cgal-3.3.1-rpath.patch +++ /dev/null @@ -1,116 +0,0 @@ -diff -urNad cgal-3.3.1~/install_cgal cgal-3.3.1/install_cgal ---- cgal-3.3.1~/install_cgal 2008-04-16 19:37:23.000000000 +0200 -+++ cgal-3.3.1/install_cgal 2008-04-16 19:37:25.000000000 +0200 -@@ -836,7 +836,7 @@ - CGAL_SHARED_LIB_SONAME="" - CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME)" - CGAL_SHARED_LIBNAME_WITH_SOMAJOR="\$(CGAL_SHARED_LIBNAME)" -- RUNTIME_LINKER_FLAG='' -+# RUNTIME_LINKER_FLAG='' - PRINT_STACKTRACE_PROGRAM="gdb" - WINDOWS_COMPILER="" - CYGWIN_COMPILER="" -@@ -937,7 +937,7 @@ - #### settings for sgi mipspro compiler on irix5 - CGAL_SHARED_LIB_CXXFLAGS= - CGAL_SHARED_LIB_LDFLAGS="-lm" -- RUNTIME_LINKER_FLAG="-rpath " -+# RUNTIME_LINKER_FLAG="-rpath " - PRINT_STACKTRACE_PROGRAM="dbx" - ;; - *IRIX*6.*CC*7.3*) -@@ -946,14 +946,14 @@ - ADDITIONAL_LDFLAGS="-LANG:std" - CGAL_STATIC_LIB_CREATE="\$(CGAL_CXX) -ar -o''" - CGAL_SHARED_LIB_CXXFLAGS= -- RUNTIME_LINKER_FLAG="-rpath " -+# RUNTIME_LINKER_FLAG="-rpath " - PRINT_STACKTRACE_PROGRAM="dbx" - ;; - *IRIX*6.*CC*) - #### settings for sgi mipspro compiler on irix6 - CGAL_STATIC_LIB_CREATE="\$(CGAL_CXX) -ar -o''" - CGAL_SHARED_LIB_CXXFLAGS= -- RUNTIME_LINKER_FLAG="-rpath " -+# RUNTIME_LINKER_FLAG="-rpath " - PRINT_STACKTRACE_PROGRAM="dbx" - ;; - *IRIX*g++*) -@@ -961,7 +961,7 @@ - ADDITIONAL_CXXFLAGS="-Wall" - LONG_NAME_PROBLEM_LDFLAGS="-U -s" - CGAL_SHARED_LIB_LDFLAGS="-lm" -- RUNTIME_LINKER_FLAG="-Xlinker -rpath -Xlinker " -+# RUNTIME_LINKER_FLAG="-Xlinker -rpath -Xlinker " - CGAL_SHARED_LIB_SONAME="-Wl,-soname,\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)" - CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)" - CGAL_SHARED_LIBNAME_WITH_SOMAJOR="\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)" -@@ -973,7 +973,7 @@ - CGAL_STATIC_LIB_CREATE="\$(CGAL_CXX) -xar -o ''" - CGAL_SHARED_LIB_CXXFLAGS="-PIC" - CGAL_SHARED_LIB_CREATE="\$(CGAL_CXX) -G" -- RUNTIME_LINKER_FLAG="-R " -+# RUNTIME_LINKER_FLAG="-R " - PRINT_STACKTRACE_PROGRAM="dbx" - CGAL_SHARED_LIB_SONAME="-Qoption ld -h\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)" - CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)" -@@ -986,7 +986,7 @@ - LONG_NAME_PROBLEM_CXXFLAGS="-g" - LONG_NAME_PROBLEM_LDFLAGS="-z nodefs -s" - CGAL_SHARED_LIB_CREATE="\$(CGAL_CXX) -G" -- RUNTIME_LINKER_FLAG="-R " -+# RUNTIME_LINKER_FLAG="-R " - CGAL_SHARED_LIB_SONAME="-h \$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)" - CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)" - CGAL_SHARED_LIBNAME_WITH_SOMAJOR="\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)" -@@ -995,7 +995,7 @@ - #### settings for g++ on alpha-linux (special FPU handling) - #### LONG_NAME_PROBLEM is cured by disabling debugging - ADDITIONAL_CXXFLAGS="-Wall -mieee -mfp-rounding-mode=d" -- RUNTIME_LINKER_FLAG='-Wl,-R' -+# RUNTIME_LINKER_FLAG='-Wl,-R' - CGAL_SHARED_LIB_SONAME="-Wl,-soname,\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)" - CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)" - CGAL_SHARED_LIBNAME_WITH_SOMAJOR="\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)" -@@ -1003,7 +1003,7 @@ - *Linux*g++*) - #### settings for g++ on linux - ADDITIONAL_CXXFLAGS="-Wall" -- RUNTIME_LINKER_FLAG='-Wl,-R' -+# RUNTIME_LINKER_FLAG='-Wl,-R' - CGAL_SHARED_LIB_SONAME="-Wl,-soname,\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)" - CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)" - CGAL_SHARED_LIBNAME_WITH_SOMAJOR="\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)" -@@ -1013,12 +1013,12 @@ - # -mp is required for correct enough floating point operations - # necessary for interval arithmetic. - ADDITIONAL_CXXFLAGS="-mp" -- RUNTIME_LINKER_FLAG='-Wl,-R' -+# RUNTIME_LINKER_FLAG='-Wl,-R' - PRINT_STACKTRACE_PROGRAM="idb" - ;; - *Linux*pgCC*|*Linux*pgcpp*) - #### settings for Portland Group Compiler on linux -- RUNTIME_LINKER_FLAG='-Wl,-R' -+# RUNTIME_LINKER_FLAG='-Wl,-R' - # PGCC has long name problems with "-g". - DEBUG_OPT="" - ;; -@@ -1029,7 +1029,7 @@ - CGAL_STATIC_LIB_CREATE="\$(CGAL_CXX) -xar -o ''" - CGAL_SHARED_LIB_CXXFLAGS="-PIC" - CGAL_SHARED_LIB_CREATE="\$(CGAL_CXX) -G" -- RUNTIME_LINKER_FLAG="-R " -+# RUNTIME_LINKER_FLAG="-R " - PRINT_STACKTRACE_PROGRAM="dbx" - CGAL_SHARED_LIB_SONAME="-Qoption ld -h\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)" - CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)" -@@ -4335,7 +4335,7 @@ - _buildlog_marker="log for $1 $2 shown" - - ${_printf} "%s %s\n" "${MAKE}" "${MAKE_OPTION}" > "${COMPILE_LOGFILE}" -- if ${MAKE} ${MAKE_OPTION} >"${COMPILE_LOGFILE}" 2>&1; then -+ if ${MAKE} ${MAKE_OPTION} | tee "${COMPILE_LOGFILE}" 2>&1; then - log_print "Compilation of $1 $2 ${_libname} succeeded." - log_print "vvvvvvvvvvvv build ${_buildlog_marker} below vvvvvvvvvvvv" - eval ${_cat} \"${COMPILE_LOGFILE}\" ${INSTALL_LOGFILE_REDIRECTION} -- cgit v1.2.3-65-gdbad