From 7bf6b375c456004d8dea402f177145fd88803769 Mon Sep 17 00:00:00 2001 From: Thomas Kahle Date: Sun, 25 Dec 2011 15:21:50 +0000 Subject: [PATCH] bump to 2.11, remove 2.9 Package-Manager: portage-2.1.10.43/cvs/Linux x86_64 --- sci-mathematics/polymake/ChangeLog | 10 +++++- sci-mathematics/polymake/Manifest | 15 ++++---- .../files/2.9.9-gentoo-binutils.patch | 22 ------------ ...atch => polymake-2.11-drop-jreality.patch} | 24 +++++-------- ...e-2.9.9-r1.ebuild => polymake-2.11.ebuild} | 36 ++++++++++++------- 5 files changed, 48 insertions(+), 59 deletions(-) delete mode 100644 sci-mathematics/polymake/files/2.9.9-gentoo-binutils.patch rename sci-mathematics/polymake/files/{2.9.9-drop-jreality.patch => polymake-2.11-drop-jreality.patch} (54%) rename sci-mathematics/polymake/{polymake-2.9.9-r1.ebuild => polymake-2.11.ebuild} (67%) diff --git a/sci-mathematics/polymake/ChangeLog b/sci-mathematics/polymake/ChangeLog index 6134c2372457..be326db6ebea 100644 --- a/sci-mathematics/polymake/ChangeLog +++ b/sci-mathematics/polymake/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sci-mathematics/polymake # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/polymake/ChangeLog,v 1.6 2011/08/20 22:57:21 tomka Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/polymake/ChangeLog,v 1.7 2011/12/25 15:21:49 tomka Exp $ + +*polymake-2.11 (25 Dec 2011) + + 25 Dec 2011; Thomas Kahle + -files/2.9.9-drop-jreality.patch, -polymake-2.9.9-r1.ebuild, + +polymake-2.11.ebuild, +files/polymake-2.11-drop-jreality.patch, + -files/2.9.9-gentoo-binutils.patch: + bump to 2.11, remove 2.9 *polymake-2.10 (20 Aug 2011) diff --git a/sci-mathematics/polymake/Manifest b/sci-mathematics/polymake/Manifest index 0011433c4aeb..11c4e9b39f29 100644 --- a/sci-mathematics/polymake/Manifest +++ b/sci-mathematics/polymake/Manifest @@ -3,18 +3,17 @@ Hash: SHA256 AUX 2.10-drop-jreality.patch 1091 RMD160 6b1e49f3ca55319413db31479d501904a846c7b8 SHA1 ad9917f637def387799f5dd090e2f48d684944bb SHA256 25790558e1ba2a5491805c9d3851569db73036d658ac749f05e1f5ce8a0f5c7d AUX 2.10-soname.patch 1057 RMD160 a9b2344dacdde91ec1d3fa5d57e54ddaf6e53050 SHA1 a3a4830253d24731eeeb31a852dcb3ad49298f0f SHA256 3f1a3f2cebb4d2bebd26bc7b906bb3787e05efdab49075d37c736b5bec5cf204 -AUX 2.9.9-drop-jreality.patch 1336 RMD160 ff15f3a2847ed808d9f6f52cbf4c108c1749e996 SHA1 62979df738095c922bd22f19250e97c28f9ee782 SHA256 254a346f610f199b391a53004cee8d6a9b7632fedd887879dbe02750ab73d01b -AUX 2.9.9-gentoo-binutils.patch 1193 RMD160 956cebb0a2579a748926c2c334d97c55715d2664 SHA1 32265c66312cb13cb756c9117b9286b9a7674bec SHA256 7dc0029fafce553de9205fb9e0e1566c47b851f418bd2151dd164641e6b1f733 +AUX polymake-2.11-drop-jreality.patch 1083 RMD160 4cde9a92437aceba4aedf4a86cd574678e5cc614 SHA1 dac30cdfa6aa0aa99bb3e9a0ce70340e55890967 SHA256 e85181b8fee89532ce36223e3bd52ff57e73474394fb8096c570a38ebb2e91e8 DIST polymake-2.10-2.tar.bz2 22276991 RMD160 c32687b1361eddfc27aeef3cec7719ed3b35c0dd SHA1 2990537954725d7da763f1f1fdcf6c2e954d94dc SHA256 48ecf60bbb52cbb190bc7800e949793c68c322615d67a4f8a481e06059e45752 -DIST polymake-2.9.9.tar.bz2 12656699 RMD160 460364c8d0b897eeb0c3aa4d838dd15e16b3b4e0 SHA1 3aff2105ce2903a25afbd01418b80905a278b354 SHA256 f914dbb4283e3f11c94d2fa7e0da9383c506e15678fe7b05c52eeb939508215e +DIST polymake-2.11_rc2.tar.bz2 22487813 RMD160 c53e2811861322d530d9b688c1f08ba9798ce166 SHA1 69342929b3bf5d40dde7fe3df0563b7f7c69c472 SHA256 6efac71d7d93d232a0d6a72874728e3f1276c18d537a6e5340f65b0d6b9caec8 EBUILD polymake-2.10.ebuild 2364 RMD160 4471d47328b9f7db8fc353c389aa51ac141605ab SHA1 b46ec59ef9a35a94231188d71a3b3c1d589ae4c6 SHA256 734906c5508680910d0f5c53ab4a7d7859f19d7ad733ead423242ed7456f414b -EBUILD polymake-2.9.9-r1.ebuild 2056 RMD160 8eb87a31267e3bd03244b0ec1a9e9dabbe8513c2 SHA1 5e0cc081738a1b9e247e34ac79eb1cb66bba66ca SHA256 9dd920d4f5058471082f8c80913a92c0b2535245a3386827119334ae3c91c994 -MISC ChangeLog 1297 RMD160 4612dbce51d017a4159339cc16ea8fa02c20ff97 SHA1 e7e54498468260a91dd8ca896cba071a7db2b797 SHA256 afdf07a86b19c82ff8184b937400e606e922ba3690f7bf09c22c0b0c6e6a03e4 +EBUILD polymake-2.11.ebuild 2344 RMD160 aa1e1b63a59d0852017b273009c52a0d0ccc8d75 SHA1 ebebdf14c901b328209b0c6b28f9485acd75c7a6 SHA256 be8289591ba52b0e6f35b9435fc07503e2ac4a36b842afc6063e2c107cd46b65 +MISC ChangeLog 1570 RMD160 36ceace51de37504f20d97ed539cdeb0e8df34d4 SHA1 46afd74c612eecf40b4928b1ce8052d11d402564 SHA256 4d11f9da2f6493b0f714ecc6ce5e8dcb75e8f635083a195b416bd9615d854c69 MISC metadata.xml 615 RMD160 1779fe920cb0ac998ddc9477b005ba5d4bce073d SHA1 4ae7194efb2d6f693d8f24658e0da7210e335bbf SHA256 05a17f47de10b29c32a8edd01ed12ad2584e6f2762c931605af0e1845bed6895 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk5QO9cACgkQodBTJSDyo67KrQD/W/mafbCtaMFo1EIFBG4fjM5W -pqkpTjEQHeCaibL2LzsA/2SvpqN8I0afa15fAs3hzVxCRHcfyXYXkRtloc6IAGTH -=X2hY +iF4EAREIAAYFAk73P5QACgkQodBTJSDyo654IQD+KiGZHmqA9HuThUyzQNeOjwLh +f387DtQGoYH96D0Q13QA/RBouyU6qH5rsjC4XvhhnAPOL79GBE7vB4qxs7ui2BGc +=fNlt -----END PGP SIGNATURE----- diff --git a/sci-mathematics/polymake/files/2.9.9-gentoo-binutils.patch b/sci-mathematics/polymake/files/2.9.9-gentoo-binutils.patch deleted file mode 100644 index f65f15ae32b0..000000000000 --- a/sci-mathematics/polymake/files/2.9.9-gentoo-binutils.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -U 3 -dHrN polymake-2.9.9.orig/perllib/Polymake/Core/CPlusPlus_config.pm polymake-2.9.9/perllib/Polymake/Core/CPlusPlus_config.pm ---- polymake-2.9.9.orig/perllib/Polymake/Core/CPlusPlus_config.pm 2010-11-17 00:09:21.000000000 +0100 -+++ polymake-2.9.9/perllib/Polymake/Core/CPlusPlus_config.pm 2010-11-17 00:10:49.000000000 +0100 -@@ -83,7 +83,7 @@ - open my $nm, "$nm_util $file.exe |" or die "can't run nm utility: $!\n"; - my %mangled; - while (<$nm>) { -- if (my ($mangled)=/\s[TW]\s+(\S*PolymakeTest\S*)/) { -+ if (my ($mangled)=/\s[TWV]\s+(\S*PolymakeTest\S*)/) { - my $case= $mangled =~ /TestWrap/ ? 3 : $mangled =~ /TestNam/ ? 2 : $mangled =~ /TestGlob/ ? 1 : 0; - next if exists $mangled{$case}; - dbg_print( "nm extracted global name $mangled" ) if $DebugLevel; -@@ -109,7 +109,8 @@ - to proper utility paths and optional flags if necessary - . - } -- if ($demangled =~ ($case<=2 ? $constructor_re : $wrapped_constructor_re)) { -+ declare $wr_con_re=qr{.*}xo; -+ if ($demangled =~ ($case<=2 ? $constructor_re : $wr_con_re)) { - $mangled{$case}=$mangled; - } else { - dbg_print( "c++filt returned '$demangled',\n", diff --git a/sci-mathematics/polymake/files/2.9.9-drop-jreality.patch b/sci-mathematics/polymake/files/polymake-2.11-drop-jreality.patch similarity index 54% rename from sci-mathematics/polymake/files/2.9.9-drop-jreality.patch rename to sci-mathematics/polymake/files/polymake-2.11-drop-jreality.patch index 2811b4fc93fc..21485804ab2f 100644 --- a/sci-mathematics/polymake/files/2.9.9-drop-jreality.patch +++ b/sci-mathematics/polymake/files/polymake-2.11-drop-jreality.patch @@ -1,31 +1,23 @@ ---- Makefile 2010-11-19 14:34:32.000000000 +0100 -+++ Makefile.new 2010-11-19 15:10:41.000000000 +0100 -@@ -89,7 +89,7 @@ - @+$(call _MakeAppsBin,all-lib) - - ifeq (${JavaBuild},n) -- all-java% clean-java : -+ all-java all-java-native all-java-jars clean-java : - @echo Build architecture ${Arch} was configured --without-java or ant utility was not found. - @echo Please repeat the configure step if you want to recompile the java modules. - false +diff -U 3 -dHrN polymake-2.11.orig/Makefile polymake-2.11/Makefile +--- polymake-2.11.orig/Makefile 2011-12-23 15:51:41.762207359 +0100 ++++ polymake-2.11/Makefile 2011-12-23 15:52:13.889973019 +0100 @@ -134,11 +134,11 @@ @case "$$(uname -s)" in \ *linux*|*Linux*) \ for d in linux32 linux64; do \ - ${PERL} ${INSTALL_PL} -m ${DirMask} -U external/jreality/jni/$$d ${InstallArch}/lib/jreality/jni/$$d; \ -+ true ; \ ++ ;; \ done; \ ;; \ Darwin*|darwin*) \ - ${PERL} ${INSTALL_PL} -m ${DirMask} -U external/jreality/jni/macosx ${InstallArch}/lib/jreality/jni/macosx; \ -+ true ; \ ++ ;; \ ;; \ esac [ -d ${InstallBin} ] || $(call _CreateDir,${InstallBin}) -@@ -169,7 +169,6 @@ - @+$(call _MakeAppsBin, install-src) - $(if ${.svn},${PERL} perl/polymake --script filter_rules -m ${InstallTop} ${Apps}) +@@ -166,7 +166,6 @@ + @+$(call _MakeApps, install-src) + $(if ${.svn},${CallPolymake} --no-config --script filter_rules -m ${InstallTop} ${Apps}) [ ! -d java_build ] || $(call _InstallSubdir,java_build,-X de) - [ ! -d java_build ] || $(call _InstallSubdirRenamed,external/jreality/lib,java_build/jreality/lib) $(call _InstallSubdir,povray) diff --git a/sci-mathematics/polymake/polymake-2.9.9-r1.ebuild b/sci-mathematics/polymake/polymake-2.11.ebuild similarity index 67% rename from sci-mathematics/polymake/polymake-2.9.9-r1.ebuild rename to sci-mathematics/polymake/polymake-2.11.ebuild index c013f84c7355..8862851c91f7 100644 --- a/sci-mathematics/polymake/polymake-2.9.9-r1.ebuild +++ b/sci-mathematics/polymake/polymake-2.11.ebuild @@ -1,23 +1,25 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/polymake/polymake-2.9.9-r1.ebuild,v 1.2 2011/03/02 21:08:21 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/polymake/polymake-2.11.ebuild,v 1.1 2011/12/25 15:21:49 tomka Exp $ EAPI=2 inherit eutils flag-o-matic -DESCRIPTION="research tool for polyhedral geometry and combinatorics" -SRC_URI="http://www.opt.tu-darmstadt.de/polymake/lib/exe/fetch.php/download/${P}.tar.bz2" +MY_PV=${PV}_rc2 -HOMEPAGE="http://www.opt.tu-darmstadt.de/polymake" +DESCRIPTION="research tool for polyhedral geometry and combinatorics" +SRC_URI="http://polymake.org/lib/exe/fetch.php/download/${PN}-${MY_PV}.tar.bz2" +HOMEPAGE="http://polymake.org" -IUSE="" +IUSE="libpolymake" SLOT="0" LICENSE="GPL-2" KEYWORDS="~amd64 ~x86" DEPEND="dev-libs/gmp + dev-libs/boost dev-libs/libxml2:2 dev-perl/XML-LibXML dev-libs/libxslt @@ -27,9 +29,10 @@ DEPEND="dev-libs/gmp RDEPEND="${DEPEND}" src_prepare() { - # Upstream provided patch. Remove in version 3.0! - epatch "${FILESDIR}/${PV}-gentoo-binutils.patch" - epatch "${FILESDIR}/${PV}-drop-jreality.patch" + # embedded jreality is a precompiled desaster (bug #346073) + epatch "${FILESDIR}/${P}"-drop-jreality.patch + # Assign a soname (reported upstream, no answer) + epatch "${FILESDIR}/2.10"-soname.patch rm -rf java_build/jreality # Don't strip @@ -41,15 +44,24 @@ src_prepare() { } src_configure () { - export CXXOPT=$(get-flag -O) + local myconf + if use libpolymake ; then + # WTF: If we leave myconf as the empty string here + # then configure will fail. + myconf="--without-prereq" + else + # --with-callable is not supported :( + myconf="--without-callable" + fi + echo ${myconf} # Configure does not accept --host, therefore econf cannot be used - # Note 'libdir' does not mean where to put .so files! - # --libdir=/usr/$(get_libdir) \ ./configure --prefix=/usr \ --without-java \ --without-prereq \ - ${myconf} || die + --libdir=/usr/$(get_libdir) \ + --libexecdir=/usr/$(get_libdir) \ + "${myconf}" || die } src_install(){ -- 2.26.2