[gentoo-commits] dev/xmw:master commit in: dev-util/eclipse-cpl/, dev-util/eclipse-cpl/files/
commit: e825bdfd7531cb68141fd98bd9362ce3ebd961aa Author: Michael Weber michael AT xmw DOT de AuthorDate: Thu Jun 5 13:42:58 2014 + Commit: Michael Weber xmw AT gentoo DOT org CommitDate: Thu Jun 5 13:42:58 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=e825bdfd eclipse-cpl - eclipse-clp (part2) --- dev-util/eclipse-cpl/ChangeLog | 57 -- dev-util/eclipse-cpl/Manifest | 11 -- dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild| 191 dev-util/eclipse-cpl/files/README.gentoo | 1 - .../eclipse-cpl/files/eclipse-cpl-6.1.187-AR.patch | 31 .../files/eclipse-cpl-6.1.187-Eplex-Makefile.patch | 196 - .../files/eclipse-cpl-6.1.187-Eplex-include.patch | 10 -- .../files/eclipse-cpl-6.1.187-Oci-mkdir.patch | 21 --- .../files/eclipse-cpl-6.1.187-icparc_solvers.patch | 111 .../files/eclipse-cpl-6.1.187-mysql.patch | 11 -- .../files/eclipse-cpl-6.1.187-tcl8.6.patch | 46 - dev-util/eclipse-cpl/metadata.xml | 13 -- 12 files changed, 699 deletions(-) diff --git a/dev-util/eclipse-cpl/ChangeLog b/dev-util/eclipse-cpl/ChangeLog deleted file mode 100644 index 5835420..000 --- a/dev-util/eclipse-cpl/ChangeLog +++ /dev/null @@ -1,57 +0,0 @@ - 20 May 2014; Michael Weber x...@gentoo.org eclipse-cpl-6.1.187.ebuild: - revert to default use flags - - 20 May 2014; Michael Weber x...@gentoo.org eclipse-cpl-6.1.187.ebuild: - more non-parallel build - - 20 May 2014; Michael Weber x...@gentoo.org eclipse-cpl-6.1.187.ebuild: - fix tempdir - - 20 May 2014; Michael Weber x...@gentoo.org eclipse-cpl-6.1.187.ebuild: - make use of USE=coin - - 18 May 2014; Michael Weber x...@gentoo.org - +files/eclipse-cpl-6.1.187-Eplex-Makefile.patch, - +files/eclipse-cpl-6.1.187-Oci-mkdir.patch, - -files/eclipse-cpl-6.1.187-configure-osi.patch, eclipse-cpl-6.1.187.ebuild, - files/eclipse-cpl-6.1.187-icparc_solvers.patch, - files/eclipse-cpl-6.1.187-tcl8.6.patch: - parallel fooo - - 18 May 2014; Michael Weber x...@gentoo.org eclipse-cpl-6.1.187.ebuild: - building version - - 18 May 2014; Michael Weber x...@gentoo.org - +files/eclipse-cpl-6.1.187-AR.patch, - +files/eclipse-cpl-6.1.187-Eplex-include.patch, - +files/eclipse-cpl-6.1.187-configure-osi.patch, - +files/eclipse-cpl-6.1.187-icparc_solvers.patch, - -files/eclipse-cpl-6.1.187-automagic-doc.patch, - -files/eclipse-cpl-6.1.187-includedir.patch, - -files/eclipse-cpl-6.1.187-shm-respect-ar.patch, eclipse-cpl-6.1.187.ebuild, - metadata.xml: - work in progress - - 16 May 2014; Michael Weber x...@gentoo.org +files/README.gentoo, - +files/eclipse-cpl-6.1.187-mysql.patch, - +files/eclipse-cpl-6.1.187-tcl8.6.patch, - -files/eclipse-cpl-6.1.187-disable-ecrc-solver.patch, - -files/eclipse-cpl-6.1.187-disable-icparc-solver.patch, - eclipse-cpl-6.1.187.ebuild, metadata.xml: - work in progress - - 15 May 2014; Michael Weber x...@gentoo.org eclipse-cpl-6.1.187.ebuild: - second approach generating wrappers - - 15 May 2014; Michael Weber x...@gentoo.org eclipse-cpl-6.1.187.ebuild: - meh, no parallel build - -*eclipse-cpl-6.1.187 (15 May 2014) - - 15 May 2014; Michael Weber x...@gentoo.org +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 deleted file mode 100644 index feafafd..000 --- a/dev-util/eclipse-cpl/Manifest +++ /dev/null @@ -1,11 +0,0 @@ --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 deleted file mode 100644 index 0ac0e93..000 --- a/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild +++ /dev/null @@ -1,191 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -inherit autotools eutils readme.gentoo versionator - -DESCRIPTION=OSS system for the cost-effective
[gentoo-commits] dev/xmw:master commit in: dev-util/eclipse-cpl/, dev-util/eclipse-cpl/files/
commit: f5efa292ef11c9442cbca075a17bde92994e8fbf
Author: Michael Weber michael AT xmw DOT de
AuthorDate: Sun May 18 08:09:49 2014 +
Commit: Michael Weber xmw AT gentoo DOT org
CommitDate: Sun May 18 08:09:49 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=f5efa292
work in progress
Package-Manager: portage-2.2.10
Manifest-Sign-Key: 62EEF090
---
dev-util/eclipse-cpl/ChangeLog | 11 ++
dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild| 82 ++-
.../eclipse-cpl/files/eclipse-cpl-6.1.187-AR.patch | 31 ++
.../files/eclipse-cpl-6.1.187-Eplex-include.patch | 10 ++
.../files/eclipse-cpl-6.1.187-automagic-doc.patch | 23 -
.../files/eclipse-cpl-6.1.187-configure-osi.patch | 113 +
...ch = eclipse-cpl-6.1.187-icparc_solvers.patch} | 2 +-
.../files/eclipse-cpl-6.1.187-shm-respect-ar.patch | 38 ---
dev-util/eclipse-cpl/metadata.xml | 2 +
9 files changed, 226 insertions(+), 86 deletions(-)
diff --git a/dev-util/eclipse-cpl/ChangeLog b/dev-util/eclipse-cpl/ChangeLog
index 9fc9fa6..e06bd28 100644
--- a/dev-util/eclipse-cpl/ChangeLog
+++ b/dev-util/eclipse-cpl/ChangeLog
@@ -1,3 +1,14 @@
+ 18 May 2014; Michael Weber x...@gentoo.org
+ +files/eclipse-cpl-6.1.187-AR.patch,
+ +files/eclipse-cpl-6.1.187-Eplex-include.patch,
+ +files/eclipse-cpl-6.1.187-configure-osi.patch,
+ +files/eclipse-cpl-6.1.187-icparc_solvers.patch,
+ -files/eclipse-cpl-6.1.187-automagic-doc.patch,
+ -files/eclipse-cpl-6.1.187-includedir.patch,
+ -files/eclipse-cpl-6.1.187-shm-respect-ar.patch, eclipse-cpl-6.1.187.ebuild,
+ metadata.xml:
+ work in progress
+
16 May 2014; Michael Weber x...@gentoo.org +files/README.gentoo,
+files/eclipse-cpl-6.1.187-mysql.patch,
+files/eclipse-cpl-6.1.187-tcl8.6.patch,
diff --git a/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild
b/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild
index f5ab7a4..66c81e1 100644
--- a/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild
+++ b/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-inherit autotools eutils flag-o-matic readme.gentoo toolchain-funcs versionator
+inherit autotools eutils flag-o-matic readme.gentoo versionator
DESCRIPTION=OSS system for the cost-effective development and deployment of
constraint programming applications
HOMEPAGE=http://eclipseclp.org/;
@@ -15,30 +15,47 @@
SRC_URI=http://eclipseclp.org/Distribution/${MY_PV}/src/${PN/-cpl}_src.tgz - $
LICENSE=${pn} LGPL-2.1
SLOT=0
KEYWORDS=~amd64
-IUSE=doc gecode gmp java mysql tcl threads
+IUSE=doc +coin +gecode +glpk +gmp +java +mysql +tcl +threads
-RDEPEND=dev-libs/gmp
+RDEPEND=
DEPEND=${RDEPEND}
+ gmp? ( dev-libs/gmp )
doc? ( app-text/ghostscript-gpl
- dev-tex/hevea
- dev-texlive/texlive-latex )
+ dev-tex/hevea
+ dev-texlive/texlive-latex )
gecode? ( dev-libs/gecode )
mysql? ( virtual/mysql )
- java? ( dev-java/batik dev-java/javahelp )
+ java? ( dev-java/batik dev-java/javahelp )
+ coin? ( sci-libs/coinor-cbc[examples]
+ sci-libs/coinor-osi[glpk?]
+ sci-libs/coinor-symphony[glpk?]
+ glpk? ( sci-mathematics/glpk-4.54 ) )
S=${WORKDIR}/Eclipse_${MY_PV}
+REQUIRED_USE=coin? ( gmp ) glpk? ( coin )
+
pkg_setup() {
use gecode ewarn gecode does not work yet
use doc ewarn doc does not work yet
}
+src_unpack() {
+ default
+ local my_cbc=$(best_version sci-libs/coinor-cbc)
+ cp
${EROOT}usr/share/doc/${my_cbc/sci-libs\//}/examples/Cbc{Branch,Compare}User.{c,h}pp.*
. || die
+ unpack ./Cbc{Branch,Compare}User.{c,h}pp.*
+ mv Cbc{Branch,Compare}User.{c,h}pp ${S}/Eplex || die
+}
+
src_prepare() {
epatch \
- ${FILESDIR}/${P}-automagic-doc.patch \
${FILESDIR}/${P}-mysql.patch \
- ${FILESDIR}/${P}-shm-respect-ar.patch \
- ${FILESDIR}/${P}-tcl8.6.patch
+ ${FILESDIR}/${P}-tcl8.6.patch \
+ ${FILESDIR}/${P}-configure-osi.patch \
+ ${FILESDIR}/${P}-AR.patch \
+ ${FILESDIR}/${P}-Eplex-include.patch \
+ ${FILESDIR}/${P}-icparc_solvers.patch
append-cflags -DUSE_INTERP_RESULT
rm ARCH RUNME || die
@@ -49,21 +66,30 @@ src_prepare() {
*) die unsupported arch ${ARCH} ;;
esac
export ECLIPSEDIR=${EROOT}opt/${PN}
-
+ export MYSQLDIR=${EROOT}usr/include/mysql
+ export prefix=${S}/build
eautoreconf
}
src_configure() {
- MYSQLDIR=${EROOT}usr/include/mysql econf \
- $(use_with gmp) \
+ local my_osi=--without-osi
+ if use coin ; then
+ if use glpk ; then
+ my_osi=--with-osi=clpcbc symclp glpk
+ else
+ my_osi=--with-osi=clpcbc symclp
+
[gentoo-commits] dev/xmw:master commit in: dev-util/eclipse-cpl/, dev-util/eclipse-cpl/files/
commit: ef0c892d474a21d1245ab3fb603f06100106c47b
Author: Michael Weber michael AT xmw DOT de
AuthorDate: Sun May 18 21:25:15 2014 +
Commit: Michael Weber xmw AT gentoo DOT org
CommitDate: Sun May 18 21:25:15 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=ef0c892d
parallel fooo
Package-Manager: portage-2.2.10
Manifest-Sign-Key: 62EEF090
---
dev-util/eclipse-cpl/ChangeLog | 8 +
dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild| 10 +-
.../files/eclipse-cpl-6.1.187-Eplex-Makefile.patch | 196 +
.../files/eclipse-cpl-6.1.187-Oci-mkdir.patch | 21 +++
.../files/eclipse-cpl-6.1.187-configure-osi.patch | 113
.../files/eclipse-cpl-6.1.187-icparc_solvers.patch | 100 +++
.../files/eclipse-cpl-6.1.187-tcl8.6.patch | 11 ++
7 files changed, 341 insertions(+), 118 deletions(-)
diff --git a/dev-util/eclipse-cpl/ChangeLog b/dev-util/eclipse-cpl/ChangeLog
index 797904e..e46844c 100644
--- a/dev-util/eclipse-cpl/ChangeLog
+++ b/dev-util/eclipse-cpl/ChangeLog
@@ -1,3 +1,11 @@
+ 18 May 2014; Michael Weber x...@gentoo.org
+ +files/eclipse-cpl-6.1.187-Eplex-Makefile.patch,
+ +files/eclipse-cpl-6.1.187-Oci-mkdir.patch,
+ -files/eclipse-cpl-6.1.187-configure-osi.patch, eclipse-cpl-6.1.187.ebuild,
+ files/eclipse-cpl-6.1.187-icparc_solvers.patch,
+ files/eclipse-cpl-6.1.187-tcl8.6.patch:
+ parallel fooo
+
18 May 2014; Michael Weber x...@gentoo.org eclipse-cpl-6.1.187.ebuild:
building version
diff --git a/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild
b/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild
index b2a0b49..a44e7c1 100644
--- a/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild
+++ b/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-inherit autotools eutils flag-o-matic readme.gentoo versionator
+inherit autotools eutils readme.gentoo versionator
DESCRIPTION=OSS system for the cost-effective development and deployment of
constraint programming applications
HOMEPAGE=http://eclipseclp.org/;
@@ -52,12 +52,12 @@ src_prepare() {
epatch \
${FILESDIR}/${P}-mysql.patch \
${FILESDIR}/${P}-tcl8.6.patch \
- ${FILESDIR}/${P}-configure-osi.patch \
+ ${FILESDIR}/${P}-Eplex-Makefile.patch \
${FILESDIR}/${P}-AR.patch \
${FILESDIR}/${P}-Eplex-include.patch \
- ${FILESDIR}/${P}-icparc_solvers.patch
+ ${FILESDIR}/${P}-icparc_solvers.patch \
+ ${FILESDIR}/${P}-Oci-mkdir.patch
- append-cflags -DUSE_INTERP_RESULT
rm ARCH RUNME || die
case ${ARCH} in
@@ -146,7 +146,7 @@ EOF
emake -C Eplex -f Makefile.${ARCH} PREFIX=${S}/build install
-j1
einfo compile install icparc_solvers
- emake -C icparc_solvers -f Makefile.${ARCH} PREFIX=${S}/build
install -j1
+ emake -C icparc_solvers -f Makefile.${ARCH} PREFIX=${S}/build
install
fi
if use gecode ; then
einfo compile install GecodeInterface
diff --git
a/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-Eplex-Makefile.patch
b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-Eplex-Makefile.patch
new file mode 100644
index 000..f069c70
--- /dev/null
+++ b/dev-util/eclipse-cpl/files/eclipse-cpl-6.1.187-Eplex-Makefile.patch
@@ -0,0 +1,196 @@
+--- Eclipse_6.1_187/configure.ac
Eclipse_6.1_187/configure.ac
+@@ -1494,7 +1494,7 @@
+
+ AC_ARG_WITH([osi], [[ --with-osi[=versions]
+ Build ECLiPSe interface to COIN-OR Osi. You can
+- optionally specify a version list, e.g. clpcbc symclp.
++ optionally specify a version list, e.g. clpcbc symclp
glpk.
+ Default is to build all available versions.
+ ]],
+ [osi_versions_requested=$withval], [osi_versions_requested=yes])
+@@ -1504,34 +1504,22 @@
+ OSICLP_ADDDEF=
+ if test $osi_versions_requested != no; then
+ if test $osi_versions_requested = yes; then
+- osi_versions_requested=clpcbc symclp
++ osi_versions_requested=clpcbc symclp glpk
+ fi
++OSI_VERSIONS=
++PKG_CHECK_MODULES(OSI, [osi])
+ for version in $osi_versions_requested; do
+- found_osi_version=
+- dnl For backward compatibility, allow ${version}amd as well
+- OSIDIRS=$OSIBASEDIR${version}amd $OSIBASEDIR$version
+- for OSIDIR in $OSIDIRS; do
+- if test -d $OSIDIR/$ARCH/lib; then
+- found_osi_version=yes
+- OSI_VERSIONS=$OSI_VERSIONS $version
+- AC_MSG_NOTICE([Using OSI $version in $OSIDIR])
+- case $version in
+- clpcbc) CLPCBCDIR=$OSIDIR ;;
+- symclp) SYMCLPDIR=$OSIDIR ;;
+- glpk) OSIGLPKDIR=$OSIDIR ;;
+- esac
+- ls -d $OSIDIR/$ARCH/lib/*amd* /dev/null 2/dev/null
+- if test
[gentoo-commits] dev/xmw:master commit in: dev-util/eclipse-cpl/, dev-util/eclipse-cpl/files/
commit: ea3d500ffb1a49fd6e097aa537e98222d09a38f2
Author: Michael Weber michael AT xmw DOT de
AuthorDate: Thu May 15 12:32:45 2014 +
Commit: Michael Weber xmw AT gentoo DOT org
CommitDate: Thu May 15 12:32:45 2014 +
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 000..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 x...@gentoo.org +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 000..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 000..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}
[gentoo-commits] dev/xmw:master commit in: dev-util/eclipse-cpl/, dev-util/eclipse-cpl/files/
commit: 89d0ddab14cd59329afcc56bb941dec6df2e846a
Author: Michael Weber michael AT xmw DOT de
AuthorDate: Fri May 16 00:06:07 2014 +
Commit: Michael Weber xmw AT gentoo DOT org
CommitDate: Fri May 16 00:06:07 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=89d0ddab
work in progress
Package-Manager: portage-2.2.10
Manifest-Sign-Key: 62EEF090
---
dev-util/eclipse-cpl/ChangeLog | 8 ++
dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild| 144 +++--
dev-util/eclipse-cpl/files/README.gentoo | 1 +
.../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-mysql.patch | 11 ++
.../files/eclipse-cpl-6.1.187-tcl8.6.patch | 35 +
dev-util/eclipse-cpl/metadata.xml | 3 +
8 files changed, 165 insertions(+), 59 deletions(-)
diff --git a/dev-util/eclipse-cpl/ChangeLog b/dev-util/eclipse-cpl/ChangeLog
index 8b16acd..9fc9fa6 100644
--- a/dev-util/eclipse-cpl/ChangeLog
+++ b/dev-util/eclipse-cpl/ChangeLog
@@ -1,3 +1,11 @@
+ 16 May 2014; Michael Weber x...@gentoo.org +files/README.gentoo,
+ +files/eclipse-cpl-6.1.187-mysql.patch,
+ +files/eclipse-cpl-6.1.187-tcl8.6.patch,
+ -files/eclipse-cpl-6.1.187-disable-ecrc-solver.patch,
+ -files/eclipse-cpl-6.1.187-disable-icparc-solver.patch,
+ eclipse-cpl-6.1.187.ebuild, metadata.xml:
+ work in progress
+
15 May 2014; Michael Weber x...@gentoo.org eclipse-cpl-6.1.187.ebuild:
second approach generating wrappers
diff --git a/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild
b/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild
index 5e4e618..f5ab7a4 100644
--- a/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild
+++ b/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-inherit autotools eutils flag-o-matic toolchain-funcs versionator
+inherit autotools eutils flag-o-matic readme.gentoo toolchain-funcs versionator
DESCRIPTION=OSS system for the cost-effective development and deployment of
constraint programming applications
HOMEPAGE=http://eclipseclp.org/;
@@ -15,71 +15,141 @@
SRC_URI=http://eclipseclp.org/Distribution/${MY_PV}/src/${PN/-cpl}_src.tgz - $
LICENSE=${pn} LGPL-2.1
SLOT=0
KEYWORDS=~amd64
-IUSE=doc tcl threads
+IUSE=doc gecode gmp java mysql tcl threads
-RDEPEND=
-DEPEND=doc? (
- app-text/ghostscript-gpl
+RDEPEND=dev-libs/gmp
+DEPEND=${RDEPEND}
+ doc? ( app-text/ghostscript-gpl
dev-tex/hevea
- dev-texlive/texlive-latex
- )
+ dev-texlive/texlive-latex )
+ gecode? ( dev-libs/gecode )
+ mysql? ( virtual/mysql )
+ java? ( dev-java/batik dev-java/javahelp )
-S=${WORKDIR}/Eclipse_${MY_PV}
+S=${WORKDIR}/Eclipse_${MY_PV}
-src_prepare() {
- append-cflags -DUSE_INTERP_RESULT -fPIC
- tc-export AR
+pkg_setup() {
+ use gecode ewarn gecode does not work yet
+ use doc ewarn doc does not work yet
+}
+src_prepare() {
epatch \
${FILESDIR}/${P}-automagic-doc.patch \
- ${FILESDIR}/${P}-includedir.patch \
- ${FILESDIR}/${P}-shm-respect-ar.patch
+ ${FILESDIR}/${P}-mysql.patch \
+ ${FILESDIR}/${P}-shm-respect-ar.patch \
+ ${FILESDIR}/${P}-tcl8.6.patch
- eautoreconf
+ append-cflags -DUSE_INTERP_RESULT
+ rm ARCH RUNME || die
- #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
+ export ECLIPSEDIR=${EROOT}opt/${PN}
+
+ eautoreconf
}
src_configure() {
- econf \
- --with-gmp
+ MYSQLDIR=${EROOT}usr/include/mysql econf \
+ $(use_with gmp) \
--without-cplex \
- --without-cpviz \
- --without-flexlm \
- --without-gfd \
+ --with-osi \
+ --with-flexlm \
+ $(use_with gecode gfd) \
--without-graphviz \
--without-gurobi \
- --without-mysql \
- --without-osi \
+ $(use_with mysql) \
--without-xpress \
+ $(use_with java) \
+ $(use_with java cpviz) \
$(use_with threads pthreads) \
$(use_with doc) \
$(use_with tcl)
}
src_compile() {
- emake -f Makefile.${ARCH} PREFIX=${S}/build -j1
+ mkdir -p ${S}/build/bin/${ARCH}
+
+ #replace toplevel Makefile.${ARCH}, -j1 bug etc.
+ rm -fv Makefile.${ARCH} || die
+ einfo compile install Shm
+ emake -C Shm/${ARCH} AR=$(tc-getAR) ruv
