public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/xmw:master commit in: dev-util/eclipse-cpl/
@ 2014-05-15 12:46 Michael Weber
  0 siblings, 0 replies; 7+ messages in thread
From: Michael Weber @ 2014-05-15 12:46 UTC (permalink / raw
  To: gentoo-commits

commit:     2ebe28a76688396b701583d9483f0d5879c6ae7f
Author:     Michael Weber <michael <AT> xmw <DOT> de>
AuthorDate: Thu May 15 12:46:35 2014 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Thu May 15 12:46:35 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=2ebe28a7

meh, no parallel build

Package-Manager: portage-2.2.10
Manifest-Sign-Key: 62EEF090

---
 dev-util/eclipse-cpl/ChangeLog                  | 3 +++
 dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev-util/eclipse-cpl/ChangeLog b/dev-util/eclipse-cpl/ChangeLog
index f6e4860..1b5048a 100644
--- a/dev-util/eclipse-cpl/ChangeLog
+++ b/dev-util/eclipse-cpl/ChangeLog
@@ -1,3 +1,6 @@
+  15 May 2014; Michael Weber <xmw@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 <xmw@gentoo.org> +eclipse-cpl-6.1.187.ebuild,

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 f6743d6..1645a11 100644
--- a/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild
+++ b/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild
@@ -67,7 +67,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake -f Makefile.${ARCH} PREFIX="${S}/build"
+	emake -f Makefile.${ARCH} PREFIX="${S}/build" -j1
 }
 
 src_install() {


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] dev/xmw:master commit in: dev-util/eclipse-cpl/
@ 2014-05-15 15:50 Michael Weber
  0 siblings, 0 replies; 7+ messages in thread
From: Michael Weber @ 2014-05-15 15:50 UTC (permalink / raw
  To: gentoo-commits

commit:     0cbaacd5aae2501481212b5614691e014d93167c
Author:     Michael Weber <michael <AT> xmw <DOT> de>
AuthorDate: Thu May 15 15:50:07 2014 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Thu May 15 15:50:07 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=0cbaacd5

second approach generating wrappers

Package-Manager: portage-2.2.10
Manifest-Sign-Key: 62EEF090

---
 dev-util/eclipse-cpl/ChangeLog                  | 3 +++
 dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild | 5 +----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-util/eclipse-cpl/ChangeLog b/dev-util/eclipse-cpl/ChangeLog
index 1b5048a..8b16acd 100644
--- a/dev-util/eclipse-cpl/ChangeLog
+++ b/dev-util/eclipse-cpl/ChangeLog
@@ -1,4 +1,7 @@
   15 May 2014; Michael Weber <xmw@gentoo.org> eclipse-cpl-6.1.187.ebuild:
+  second approach generating wrappers
+
+  15 May 2014; Michael Weber <xmw@gentoo.org> eclipse-cpl-6.1.187.ebuild:
   meh, no parallel build
 
 *eclipse-cpl-6.1.187 (15 May 2014)

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 1645a11..5e4e618 100644
--- a/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild
+++ b/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild
@@ -75,14 +75,11 @@ src_install() {
 	for my_file in "build/bin/${ARCH}/"* ; do
 		sed -e "s:${S}/build:${EROOT}opt/${PN}:g" \
 			-i "${my_file}" || die
+		make_wrapper "$(basename "${my_file}")" "${EROOT}opt/${PN}/bin/${ARCH}/$(basename "${my_file}")"
 	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
 }


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] dev/xmw:master commit in: dev-util/eclipse-cpl/
@ 2014-05-18 16:06 Michael Weber
  0 siblings, 0 replies; 7+ messages in thread
From: Michael Weber @ 2014-05-18 16:06 UTC (permalink / raw
  To: gentoo-commits

commit:     55ef5cb162aadd761ae5d04bd6e8427e197bd44e
Author:     Michael Weber <michael <AT> xmw <DOT> de>
AuthorDate: Sun May 18 16:06:23 2014 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sun May 18 16:06:23 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=55ef5cb1

building version

Package-Manager: portage-2.2.10
Manifest-Sign-Key: 62EEF090

---
 dev-util/eclipse-cpl/ChangeLog                  | 3 +++
 dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dev-util/eclipse-cpl/ChangeLog b/dev-util/eclipse-cpl/ChangeLog
index e06bd28..797904e 100644
--- a/dev-util/eclipse-cpl/ChangeLog
+++ b/dev-util/eclipse-cpl/ChangeLog
@@ -1,3 +1,6 @@
+  18 May 2014; Michael Weber <xmw@gentoo.org> eclipse-cpl-6.1.187.ebuild:
+  building version
+
   18 May 2014; Michael Weber <xmw@gentoo.org>
   +files/eclipse-cpl-6.1.187-AR.patch,
   +files/eclipse-cpl-6.1.187-Eplex-include.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 66c81e1..b2a0b49 100644
--- a/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild
+++ b/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild
@@ -74,10 +74,10 @@ src_prepare() {
 src_configure() {
 	local my_osi="--without-osi"
 	if use coin ; then
+		my_osi="--with-osi=symclp"
+		#my_osi=" ... clpcbc" doesn't build jet
 		if use glpk ; then
-			my_osi="--with-osi=clpcbc symclp glpk"
-		else
-			my_osi="--with-osi=clpcbc symclp"
+			my_osi="${my_osi} glpk"
 		fi
 	fi
 	econf \


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] dev/xmw:master commit in: dev-util/eclipse-cpl/
@ 2014-05-20 10:44 Michael Weber
  0 siblings, 0 replies; 7+ messages in thread
From: Michael Weber @ 2014-05-20 10:44 UTC (permalink / raw
  To: gentoo-commits

commit:     e6d3a577cfa18dd1ad3109517262f7e9ba33591f
Author:     Michael Weber <michael <AT> xmw <DOT> de>
AuthorDate: Tue May 20 10:44:47 2014 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Tue May 20 10:44:47 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=e6d3a577

make use of USE=coin

Package-Manager: portage-2.2.10
Manifest-Sign-Key: 62EEF090

---
 dev-util/eclipse-cpl/ChangeLog                  |  3 +++
 dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild | 10 ++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/dev-util/eclipse-cpl/ChangeLog b/dev-util/eclipse-cpl/ChangeLog
index e46844c..bbf03bc 100644
--- a/dev-util/eclipse-cpl/ChangeLog
+++ b/dev-util/eclipse-cpl/ChangeLog
@@ -1,3 +1,6 @@
+  20 May 2014; Michael Weber <xmw@gentoo.org> eclipse-cpl-6.1.187.ebuild:
+  make use of USE=coin
+
   18 May 2014; Michael Weber <xmw@gentoo.org>
   +files/eclipse-cpl-6.1.187-Eplex-Makefile.patch,
   +files/eclipse-cpl-6.1.187-Oci-mkdir.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 a44e7c1..dfcd591 100644
--- a/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild
+++ b/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild
@@ -42,10 +42,12 @@ pkg_setup() {
 
 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
+	if use coin ; then
+		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
+	fi
 }
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] dev/xmw:master commit in: dev-util/eclipse-cpl/
@ 2014-05-20 11:47 Michael Weber
  0 siblings, 0 replies; 7+ messages in thread
From: Michael Weber @ 2014-05-20 11:47 UTC (permalink / raw
  To: gentoo-commits

commit:     5eee70b7626f3b9b416d06b1d31d0fa1197c65a8
Author:     Michael Weber <michael <AT> xmw <DOT> de>
AuthorDate: Tue May 20 11:47:09 2014 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Tue May 20 11:47:09 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=5eee70b7

fix tempdir

Package-Manager: portage-2.2.10
Manifest-Sign-Key: 62EEF090

---
 dev-util/eclipse-cpl/ChangeLog                  | 3 +++
 dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dev-util/eclipse-cpl/ChangeLog b/dev-util/eclipse-cpl/ChangeLog
index bbf03bc..5b74253 100644
--- a/dev-util/eclipse-cpl/ChangeLog
+++ b/dev-util/eclipse-cpl/ChangeLog
@@ -1,4 +1,7 @@
   20 May 2014; Michael Weber <xmw@gentoo.org> eclipse-cpl-6.1.187.ebuild:
+  fix tempdir
+
+  20 May 2014; Michael Weber <xmw@gentoo.org> eclipse-cpl-6.1.187.ebuild:
   make use of USE=coin
 
   18 May 2014; Michael Weber <xmw@gentoo.org>

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 dfcd591..35af3d4 100644
--- a/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild
+++ b/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild
@@ -183,8 +183,8 @@ src_install() {
 		make_wrapper jeclipse "${EROOT}opt/${PN}/bin/${ARCH}/jeclipse"
 	fi
 
-	echo "ECLIPSEDIR=\"${EROOT}opt/${PN}\"" > "${TMP}"/90${PN}
-	doenvd "${TMP}"/90${PN}
+	echo "ECLIPSEDIR=\"${EROOT}opt/${PN}\"" > "${T}"/90${PN}
+	doenvd "${T}"/90${PN}
 
 	dodoc README_UNIX
 	readme.gentoo_create_doc


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] dev/xmw:master commit in: dev-util/eclipse-cpl/
@ 2014-05-20 14:34 Michael Weber
  0 siblings, 0 replies; 7+ messages in thread
From: Michael Weber @ 2014-05-20 14:34 UTC (permalink / raw
  To: gentoo-commits

commit:     646ea59cc00894d8861892f0b630030bd15456a0
Author:     Michael Weber <michael <AT> xmw <DOT> de>
AuthorDate: Tue May 20 14:33:57 2014 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Tue May 20 14:33:57 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=646ea59c

more non-parallel build

Package-Manager: portage-2.2.10
Manifest-Sign-Key: 62EEF090

---
 dev-util/eclipse-cpl/ChangeLog                  | 3 +++
 dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev-util/eclipse-cpl/ChangeLog b/dev-util/eclipse-cpl/ChangeLog
index 5b74253..707a93b 100644
--- a/dev-util/eclipse-cpl/ChangeLog
+++ b/dev-util/eclipse-cpl/ChangeLog
@@ -1,4 +1,7 @@
   20 May 2014; Michael Weber <xmw@gentoo.org> eclipse-cpl-6.1.187.ebuild:
+  more non-parallel build
+
+  20 May 2014; Michael Weber <xmw@gentoo.org> eclipse-cpl-6.1.187.ebuild:
   fix tempdir
 
   20 May 2014; Michael Weber <xmw@gentoo.org> eclipse-cpl-6.1.187.ebuild:

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 35af3d4..9cf6cd8 100644
--- a/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild
+++ b/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild
@@ -148,7 +148,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
+		emake -C icparc_solvers -f Makefile.${ARCH} PREFIX="${S}/build" install -j1
 	fi
 	if use gecode ; then
 		einfo "compile & install GecodeInterface"


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] dev/xmw:master commit in: dev-util/eclipse-cpl/
@ 2014-05-20 16:30 Michael Weber
  0 siblings, 0 replies; 7+ messages in thread
From: Michael Weber @ 2014-05-20 16:30 UTC (permalink / raw
  To: gentoo-commits

commit:     ac31185d31097116bf65116355065d442c1afbe5
Author:     Michael Weber <michael <AT> xmw <DOT> de>
AuthorDate: Tue May 20 16:30:28 2014 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Tue May 20 16:30:28 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=ac31185d

revert to default use flags

Package-Manager: portage-2.2.10
Manifest-Sign-Key: 62EEF090

---
 dev-util/eclipse-cpl/ChangeLog                  | 3 +++
 dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev-util/eclipse-cpl/ChangeLog b/dev-util/eclipse-cpl/ChangeLog
index 707a93b..5835420 100644
--- a/dev-util/eclipse-cpl/ChangeLog
+++ b/dev-util/eclipse-cpl/ChangeLog
@@ -1,4 +1,7 @@
   20 May 2014; Michael Weber <xmw@gentoo.org> eclipse-cpl-6.1.187.ebuild:
+  revert to default use flags
+
+  20 May 2014; Michael Weber <xmw@gentoo.org> eclipse-cpl-6.1.187.ebuild:
   more non-parallel build
 
   20 May 2014; Michael Weber <xmw@gentoo.org> eclipse-cpl-6.1.187.ebuild:

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 9cf6cd8..0ac0e93 100644
--- a/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild
+++ b/dev-util/eclipse-cpl/eclipse-cpl-6.1.187.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://eclipseclp.org/Distribution/${MY_PV}/src/${PN/-cpl}_src.tgz -> $
 LICENSE="${pn} LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="doc +coin +gecode +glpk +gmp +java +mysql +tcl +threads"
+IUSE="doc +coin +gecode +glpk +gmp java mysql tcl +threads"
 
 RDEPEND=""
 DEPEND="${RDEPEND}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2014-05-20 16:30 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-15 15:50 [gentoo-commits] dev/xmw:master commit in: dev-util/eclipse-cpl/ Michael Weber
  -- strict thread matches above, loose matches on Subject: below --
2014-05-20 16:30 Michael Weber
2014-05-20 14:34 Michael Weber
2014-05-20 11:47 Michael Weber
2014-05-20 10:44 Michael Weber
2014-05-18 16:06 Michael Weber
2014-05-15 12:46 Michael Weber

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox