From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (unknown [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 143D61393EA for ; Thu, 15 May 2014 12:46:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 86280E0B23; Thu, 15 May 2014 12:46:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E65F5E0B28 for ; Thu, 15 May 2014 12:46:45 +0000 (UTC) Received: from spoonbill.gentoo.org (unknown [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AEC9833FD69 for ; Thu, 15 May 2014 12:46:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 5E722182D3 for ; Thu, 15 May 2014 12:46:43 +0000 (UTC) From: "Michael Weber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Weber" Message-ID: <1400157165.ea3d500ffb1a49fd6e097aa537e98222d09a38f2.xmw@gentoo> Subject: [gentoo-commits] dev/xmw:master commit in: dev-util/eclipse-cpl/, dev-util/eclipse-cpl/files/ X-VCS-Repository: dev/xmw X-VCS-Files: dev-util/eclipse-cpl/ChangeLog dev-util/eclipse-cpl/Manifest dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-automagic-doc.patch dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-disable-ecrc-solver.patch dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-disable-icparc-solver.patch dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-includedir.patch dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-shm-respect-ar.patch dev-util/eclipse-cpl/metadata.xml X-VCS-Directories: dev-util/eclipse-cpl/ dev-util/eclipse-cpl/files/ X-VCS-Committer: xmw X-VCS-Committer-Name: Michael Weber X-VCS-Revision: ea3d500ffb1a49fd6e097aa537e98222d09a38f2 X-VCS-Branch: master Date: Thu, 15 May 2014 12:46:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 62f90fed-f4b6-40e4-9e73-0c183026033e X-Archives-Hash: 9443ca9b7d379c1c68ede3f0ab471780 commit: ea3d500ffb1a49fd6e097aa537e98222d09a38f2 Author: Michael Weber xmw de> AuthorDate: Thu May 15 12:32:45 2014 +0000 Commit: Michael Weber gentoo org> CommitDate: Thu May 15 12:32:45 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=ea3d500f Iniital import Package-Manager: portage-2.2.10 Manifest-Sign-Key: 62EEF090 --- dev-util/eclipse-cpl/ChangeLog | 9 +++ dev-util/eclipse-cpl/Manifest | 11 +++ dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild | 88 ++++++++++++++++++++++ .../files/eclipse-cpl-6.1.187-automagic-doc.patch | 23 ++++++ .../eclipse-cpl-6.1.187-disable-ecrc-solver.patch | 12 +++ ...eclipse-cpl-6.1.187-disable-icparc-solver.patch | 10 +++ .../files/eclipse-cpl-6.1.187-includedir.patch | 11 +++ .../files/eclipse-cpl-6.1.187-shm-respect-ar.patch | 38 ++++++++++ dev-util/eclipse-cpl/metadata.xml | 8 ++ 9 files changed, 210 insertions(+) diff --git a/dev-util/eclipse-cpl/ChangeLog b/dev-util/eclipse-cpl/ChangeLog new file mode 100644 index 0000000..f6e4860 --- /dev/null +++ b/dev-util/eclipse-cpl/ChangeLog @@ -0,0 +1,9 @@ +*eclipse-cpl-6.1.187 (15 May 2014) + + 15 May 2014; Michael Weber +eclipse-cpl-6.1.187.ebuild, + +files/eclipse-cpl-6.1.187-automagic-doc.patch, + +files/eclipse-cpl-6.1.187-disable-ecrc-solver.patch, + +files/eclipse-cpl-6.1.187-disable-icparc-solver.patch, + +files/eclipse-cpl-6.1.187-includedir.patch, + +files/eclipse-cpl-6.1.187-shm-respect-ar.patch, +metadata.xml: + Iniital import diff --git a/dev-util/eclipse-cpl/Manifest b/dev-util/eclipse-cpl/Manifest new file mode 100644 index 0000000..feafafd --- /dev/null +++ b/dev-util/eclipse-cpl/Manifest @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +DIST eclipse-cpl-6.1.187.tar.gz 8624698 SHA256 cfddbdc4a45b6e8f8fbb1c0e36881264d2b68169d6fbaf55c09e9ddb66612a72 SHA512 ff14a81f7ae9b9ba0805016e856f01fdd9fa67edf0fe4a3048f375b82d1795f9ad52fd078da94da4ebf13aa269f5035dbbe15c119453949597942183e899152a WHIRLPOOL 5ae43380b0458814d94a9e7a5919d61ae1ad9cf12dbdf65f3c7c8b77f60498e3d5162d0f3a530992f6d4e1157b62b88420a54eda65d40562176ff6c5eff054c4 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.22 (GNU/Linux) + +iF4EAREIAAYFAlN0s+0ACgkQknrdDGLu8JC9HAD/QcUKnkzfUXYz7y2/FJTy82AF +0U1TIIuGZpqmMM/3SxkA/3sw+qH+KUDf9mjCVyIgCYKaCH5so77sp7DwTH4N3RSh +=mH9N +-----END PGP SIGNATURE----- diff --git a/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild b/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild new file mode 100644 index 0000000..f6743d6 --- /dev/null +++ b/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +inherit autotools eutils flag-o-matic toolchain-funcs versionator + +DESCRIPTION="OSS system for the cost-effective development and deployment of constraint programming applications" +HOMEPAGE="http://eclipseclp.org/" + +MY_PV=$(replace_version_separator 2 _ ${PV}) +SRC_URI="http://eclipseclp.org/Distribution/${MY_PV}/src/${PN/-cpl}_src.tgz -> ${P}.tar.gz" + +LICENSE="${pn} LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64" +IUSE="doc tcl threads" + +RDEPEND="" +DEPEND="doc? ( + app-text/ghostscript-gpl + dev-tex/hevea + dev-texlive/texlive-latex + ) " + +S="${WORKDIR}/Eclipse_${MY_PV}" + +src_prepare() { + append-cflags -DUSE_INTERP_RESULT -fPIC + tc-export AR + + epatch \ + "${FILESDIR}"/${P}-automagic-doc.patch \ + "${FILESDIR}"/${P}-includedir.patch \ + "${FILESDIR}"/${P}-shm-respect-ar.patch + + eautoreconf + + #replace arch guessing script + rm ARCH || die + case "${ARCH}" in + amd64) export ARCH=x86_64_linux ;; + x86) export ARCH=i386_linux ;; + *) die "unsupported arch ${ARCH}" ;; + esac + mkdir build + echo -e '#!/bin/sh\necho $ARCH' > build/ARCH + chmod +x build/ARCH +} + +src_configure() { + econf \ + --with-gmp + --without-cplex \ + --without-cpviz \ + --without-flexlm \ + --without-gfd \ + --without-graphviz \ + --without-gurobi \ + --without-mysql \ + --without-osi \ + --without-xpress \ + $(use_with threads pthreads) \ + $(use_with doc) \ + $(use_with tcl) +} + +src_compile() { + emake -f Makefile.${ARCH} PREFIX="${S}/build" +} + +src_install() { + local my_file + for my_file in "build/bin/${ARCH}/"* ; do + sed -e "s:${S}/build:${EROOT}opt/${PN}:g" \ + -i "${my_file}" || die + done + + rmdir build/tcltk{/x86_64_linux,} + use doc || rm -rf build/doc + dodir /opt + mv build "${ED}"opt/${PN} + + for my_file in "${EROOT}opt/${PN}/bin/${ARCH}/"* ; do + make_wrapper "$(basename "${my_file}")" "${my_file}" + done +} diff --git a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-automagic-doc.patch b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-automagic-doc.patch new file mode 100644 index 0000000..8549af6 --- /dev/null +++ b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-automagic-doc.patch @@ -0,0 +1,23 @@ +--- Eclipse_6.1_187/configure.ac ++++ Eclipse_6.1_187/configure.ac +@@ -1962,13 +1962,20 @@ + AC_CHECK_PROG(PROG_PS2PDF,ps2pdf,yes,no) + AC_CHECK_PROG(PROG_HEVEA, hevea, yes,no) + ++AC_ARG_WITH([doc], [[ --without-doc ++ Build ECLiPSe without documentation ++ ]], ++ [doc_requested="$withval"], [doc_requested=yes]) ++ + MAKE_DOCUMENTS= ++if test "$doc_requested" != "no"; then + if test "$PROG_LATEX" = yes -a "$PROG_PS2PDF" = yes -a "$PROG_HEVEA" = yes; then + MAKE_DOCUMENTS="make_documents" + AC_MSG_NOTICE([Can build ECLiPSe documentation]) + else + AC_MSG_WARN([No tools to build ECLiPSe documentation]) + fi ++fi + + + #---------------------------------------------------------------------- diff --git a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-disable-ecrc-solver.patch b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-disable-ecrc-solver.patch new file mode 100644 index 0000000..41fdd4d --- /dev/null +++ b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-disable-ecrc-solver.patch @@ -0,0 +1,12 @@ +--- Eclipse_6.1_187/Makefile.in ++++ Eclipse_6.1_187/Makefile.in +@@ -27,9 +27,7 @@ + # (e.g. because they try to make .eco/.eci files and need to run eclipse, + # or requires the making of such a subsystem) + install_all: install_cross \ +- make_ecrc_solvers \ + make_pt_libraries \ +- make_zincinterface \ + make_compiler \ + make_contrib \ + make_mercury diff --git a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-disable-icparc-solver.patch b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-disable-icparc-solver.patch new file mode 100644 index 0000000..5e2c5bf --- /dev/null +++ b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-disable-icparc-solver.patch @@ -0,0 +1,10 @@ +--- Eclipse_6.1_187/Makefile.in ++++ Eclipse_6.1_187/Makefile.in +@@ -18,7 +18,6 @@ + make_flexlm \ + make_eplex \ + make_gecodeinterface \ +- make_icparc_solvers \ + make_javainterface \ + make_visualisation \ + make_oci \ diff --git a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-includedir.patch b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-includedir.patch new file mode 100644 index 0000000..3fa08bd --- /dev/null +++ b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-includedir.patch @@ -0,0 +1,11 @@ +--- Eclipse_6.1_187/icparc_solvers/Makefile.in ++++ Eclipse_6.1_187/icparc_solvers/Makefile.in +@@ -47,7 +47,7 @@ + GMP_LD = @GMP_LD@ + FLOAT_ROUND_FLAGS = @FLOAT_ROUND_FLAGS@ + +-CPPFLAGS = -I. -I$(ECLIPSEDIR)/include/$(ARCH) -I$(ECLIPSEDIR)/Kernel/src -I- $(OS_INCLUDES) ++CPPFLAGS = -I. -I$(ECLIPSEDIR)/include/$(ARCH) -I$(top_srcdir)/Kernel/src -iquote $(OS_INCLUDES) + STDCXXLIB = @STDCXXLIB@ + ECLIBS = -L$(ECLIPSEDIR)/lib/$(ARCH) -leclipse @LIBS@ + diff --git a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-shm-respect-ar.patch b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-shm-respect-ar.patch new file mode 100644 index 0000000..16bacaf --- /dev/null +++ b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-shm-respect-ar.patch @@ -0,0 +1,38 @@ +--- Eclipse_6.1_187/Shm/src/Makefile.in ++++ Eclipse_6.1_187/Shm/src/Makefile.in +@@ -33,7 +33,7 @@ + RANLIB = @RANLIB@ + LOCK = @LOCK@ + +-AR = ar ruv ++AR = @AR@ ruv + RM = /bin/rm -f + CP = /bin/cp + +@@ -66,7 +66,7 @@ + + + libshm.a: $(SHM_OBJ) +- ar rcv libshm.a $(SHM_OBJ) ++ $(AR) libshm.a $(SHM_OBJ) + $(RANLIB) libshm.a + + alloc.o: config.h memman.h +--- Eclipse_6.1_187/Shm/src/configure.in ++++ Eclipse_6.1_187/Shm/src/configure.in +@@ -35,6 +35,7 @@ + # + + AC_PROG_CC ++AC_PROG_AR + CFLAGS="-O" + LOCK="" + +@@ -199,6 +200,7 @@ + AC_SUBST(LIB) + AC_SUBST(RANLIB) + AC_SUBST(ARCH) ++AC_SUBST(AR) + AC_SUBST(LOCK) + AC_SUBST(S_TO_O) + diff --git a/dev-util/eclipse-cpl/metadata.xml b/dev-util/eclipse-cpl/metadata.xml new file mode 100644 index 0000000..5b80fb9 --- /dev/null +++ b/dev-util/eclipse-cpl/metadata.xml @@ -0,0 +1,8 @@ + + + + +xmw@gentoo.org +Michael Weber + +