* [gentoo-commits] gentoo-x86 commit in sci-libs/coinor-vol: coinor-vol-1.4.4.ebuild ChangeLog
@ 2014-01-15 19:52 Sebastien Fabbro (bicatali)
0 siblings, 0 replies; 3+ messages in thread
From: Sebastien Fabbro (bicatali) @ 2014-01-15 19:52 UTC (permalink / raw
To: gentoo-commits
bicatali 14/01/15 19:52:49
Modified: coinor-vol-1.4.4.ebuild ChangeLog
Log:
Cleanup, as-needed applied upstream
(Portage version: 2.2.8-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)
Revision Changes Path
1.2 sci-libs/coinor-vol/coinor-vol-1.4.4.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/coinor-vol/coinor-vol-1.4.4.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/coinor-vol/coinor-vol-1.4.4.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/coinor-vol/coinor-vol-1.4.4.ebuild?r1=1.1&r2=1.2
Index: coinor-vol-1.4.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/coinor-vol/coinor-vol-1.4.4.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- coinor-vol-1.4.4.ebuild 14 Jan 2014 18:00:42 -0000 1.1
+++ coinor-vol-1.4.4.ebuild 15 Jan 2014 19:52:49 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-vol/coinor-vol-1.4.4.ebuild,v 1.1 2014/01/14 18:00:42 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-vol/coinor-vol-1.4.4.ebuild,v 1.2 2014/01/15 19:52:49 bicatali Exp $
EAPI=5
@@ -18,8 +18,8 @@
IUSE="doc examples static-libs test"
RDEPEND="
- sci-libs/coinor-osi
- sci-libs/coinor-utils"
+ sci-libs/coinor-osi:=
+ sci-libs/coinor-utils:="
DEPEND="${RDEPEND}
virtual/pkgconfig
doc? ( app-doc/doxygen[dot] )
@@ -27,23 +27,12 @@
S="${WORKDIR}/${MYPN}-${PV}/${MYPN}"
-src_prepare() {
- # as-needed fix
- # hack to avoid eautoreconf (coinor has its own weird autotools)
- sed -i \
- -e 's:\(libOsiVol_la_LIBADD.*=\).*:\1 $(top_builddir)/src/libVol.la @OSI_LIBS@:g' \
- src/OsiVol*/Makefile.in || die
- sed -i \
- -e 's:\(libVol_la_LIBADD.*=\).*:\1 @VOLLIB_LIBS@:g' \
- src/Makefile.in || die
-}
-
src_configure() {
local myeconfargs=(
+ --enable-dependency-linking
$(use_with doc dot)
)
- PKG_CONFIG_PATH+="${ED}"/usr/$(get_libdir)/pkgconfig \
- autotools-utils_src_configure
+ autotools-utils_src_configure
}
src_compile() {
@@ -53,9 +42,7 @@
}
src_test() {
- pushd "${BUILD_DIR}" > /dev/null || die
- emake test
- popd > /dev/null || die
+ autotools-utils_src_test test
}
src_install() {
1.2 sci-libs/coinor-vol/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/coinor-vol/ChangeLog?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/coinor-vol/ChangeLog?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/coinor-vol/ChangeLog?r1=1.1&r2=1.2
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/coinor-vol/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ChangeLog 14 Jan 2014 18:00:42 -0000 1.1
+++ ChangeLog 15 Jan 2014 19:52:49 -0000 1.2
@@ -1,6 +1,9 @@
# ChangeLog for sci-libs/coinor-vol
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-vol/ChangeLog,v 1.1 2014/01/14 18:00:42 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-vol/ChangeLog,v 1.2 2014/01/15 19:52:49 bicatali Exp $
+
+ 14 Jan 2014; Sébastien Fabbro <bicatali@gentoo.org> coinor-vol-1.4.4.ebuild:
+ Cleanup, as-needed applied upstream
*coinor-vol-1.4.4 (14 Jan 2014)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-libs/coinor-vol: coinor-vol-1.4.4.ebuild ChangeLog
@ 2014-02-04 7:36 Justin Lecher (jlec)
0 siblings, 0 replies; 3+ messages in thread
From: Justin Lecher (jlec) @ 2014-02-04 7:36 UTC (permalink / raw
To: gentoo-commits
jlec 14/02/04 07:36:41
Modified: coinor-vol-1.4.4.ebuild ChangeLog
Log:
Fix the common coinor pkg-config installation problem, #500222
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Revision Changes Path
1.3 sci-libs/coinor-vol/coinor-vol-1.4.4.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/coinor-vol/coinor-vol-1.4.4.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/coinor-vol/coinor-vol-1.4.4.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/coinor-vol/coinor-vol-1.4.4.ebuild?r1=1.2&r2=1.3
Index: coinor-vol-1.4.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/coinor-vol/coinor-vol-1.4.4.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- coinor-vol-1.4.4.ebuild 15 Jan 2014 19:52:49 -0000 1.2
+++ coinor-vol-1.4.4.ebuild 4 Feb 2014 07:36:41 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-vol/coinor-vol-1.4.4.ebuild,v 1.2 2014/01/15 19:52:49 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-vol/coinor-vol-1.4.4.ebuild,v 1.3 2014/02/04 07:36:41 jlec Exp $
EAPI=5
@@ -27,9 +27,18 @@
S="${WORKDIR}/${MYPN}-${PV}/${MYPN}"
+src_prepare() {
+ sed -i \
+ -e "s:lib/pkgconfig:$(get_libdir)/pkgconfig:g" \
+ configure || die
+ autotools-utils_src_prepare
+}
src_configure() {
+ # needed for the --with-coin-instdir
+ dodir /usr
local myeconfargs=(
--enable-dependency-linking
+ --with-coin-instdir="${ED}"/usr
$(use_with doc dot)
)
autotools-utils_src_configure
1.3 sci-libs/coinor-vol/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/coinor-vol/ChangeLog?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/coinor-vol/ChangeLog?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/coinor-vol/ChangeLog?r1=1.2&r2=1.3
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/coinor-vol/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ChangeLog 15 Jan 2014 19:52:49 -0000 1.2
+++ ChangeLog 4 Feb 2014 07:36:41 -0000 1.3
@@ -1,6 +1,9 @@
# ChangeLog for sci-libs/coinor-vol
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-vol/ChangeLog,v 1.2 2014/01/15 19:52:49 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-vol/ChangeLog,v 1.3 2014/02/04 07:36:41 jlec Exp $
+
+ 04 Feb 2014; Justin Lecher <jlec@gentoo.org> coinor-vol-1.4.4.ebuild:
+ Fix the common coinor pkg-config installation problem, #500222
14 Jan 2014; Sébastien Fabbro <bicatali@gentoo.org> coinor-vol-1.4.4.ebuild:
Cleanup, as-needed applied upstream
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-libs/coinor-vol: coinor-vol-1.4.4.ebuild ChangeLog
@ 2014-02-04 10:45 Justin Lecher (jlec)
0 siblings, 0 replies; 3+ messages in thread
From: Justin Lecher (jlec) @ 2014-02-04 10:45 UTC (permalink / raw
To: gentoo-commits
jlec 14/02/04 10:45:21
Modified: coinor-vol-1.4.4.ebuild ChangeLog
Log:
Move preparations to src_prepare; use usex()
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Revision Changes Path
1.4 sci-libs/coinor-vol/coinor-vol-1.4.4.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/coinor-vol/coinor-vol-1.4.4.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/coinor-vol/coinor-vol-1.4.4.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/coinor-vol/coinor-vol-1.4.4.ebuild?r1=1.3&r2=1.4
Index: coinor-vol-1.4.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/coinor-vol/coinor-vol-1.4.4.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- coinor-vol-1.4.4.ebuild 4 Feb 2014 07:36:41 -0000 1.3
+++ coinor-vol-1.4.4.ebuild 4 Feb 2014 10:45:21 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-vol/coinor-vol-1.4.4.ebuild,v 1.3 2014/02/04 07:36:41 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-vol/coinor-vol-1.4.4.ebuild,v 1.4 2014/02/04 10:45:21 jlec Exp $
EAPI=5
@@ -28,14 +28,15 @@
S="${WORKDIR}/${MYPN}-${PV}/${MYPN}"
src_prepare() {
+ # needed for the --with-coin-instdir
+ dodir /usr
sed -i \
-e "s:lib/pkgconfig:$(get_libdir)/pkgconfig:g" \
configure || die
autotools-utils_src_prepare
}
+
src_configure() {
- # needed for the --with-coin-instdir
- dodir /usr
local myeconfargs=(
--enable-dependency-linking
--with-coin-instdir="${ED}"/usr
@@ -47,7 +48,7 @@
src_compile() {
# hack for parallel build, to overcome not patching Makefile.am above
autotools-utils_src_compile -C src libVol.la
- autotools-utils_src_compile all $(use doc && echo doxydoc)
+ autotools-utils_src_compile all $(usex doc doxydoc "")
}
src_test() {
1.4 sci-libs/coinor-vol/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/coinor-vol/ChangeLog?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/coinor-vol/ChangeLog?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/coinor-vol/ChangeLog?r1=1.3&r2=1.4
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/coinor-vol/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ChangeLog 4 Feb 2014 07:36:41 -0000 1.3
+++ ChangeLog 4 Feb 2014 10:45:21 -0000 1.4
@@ -1,6 +1,9 @@
# ChangeLog for sci-libs/coinor-vol
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-vol/ChangeLog,v 1.3 2014/02/04 07:36:41 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-vol/ChangeLog,v 1.4 2014/02/04 10:45:21 jlec Exp $
+
+ 04 Feb 2014; Justin Lecher <jlec@gentoo.org> coinor-vol-1.4.4.ebuild:
+ Move preparations to src_prepare; use usex()
04 Feb 2014; Justin Lecher <jlec@gentoo.org> coinor-vol-1.4.4.ebuild:
Fix the common coinor pkg-config installation problem, #500222
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-02-04 10:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-02-04 10:45 [gentoo-commits] gentoo-x86 commit in sci-libs/coinor-vol: coinor-vol-1.4.4.ebuild ChangeLog Justin Lecher (jlec)
-- strict thread matches above, loose matches on Subject: below --
2014-02-04 7:36 Justin Lecher (jlec)
2014-01-15 19:52 Sebastien Fabbro (bicatali)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox