aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHonza Macháček <Hloupy.Honza@centrum.cz>2013-09-23 08:49:37 +0200
committerHonza Macháček <Hloupy.Honza@centrum.cz>2013-09-23 08:49:37 +0200
commitd5bb620f967ea83ff4ae93cd591e254a530fb45b (patch)
tree5863dcb892a7e5230674eca5b557325da1d31007
parentThe metadata of sci-physics/abinit augmented by the description of the etsf_i... (diff)
parentsci-chemistry/freeon-1.0.3: Fixed broken ebuild. (diff)
downloadsci-d5bb620f967ea83ff4ae93cd591e254a530fb45b.tar.gz
sci-d5bb620f967ea83ff4ae93cd591e254a530fb45b.tar.bz2
sci-d5bb620f967ea83ff4ae93cd591e254a530fb45b.zip
Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/sci
-rw-r--r--dev-perl/Bio-BigFile/Bio-BigFile-1.07.ebuild (renamed from dev-perl/Bio-BigFile/Bio-BigFile-1.06.ebuild)9
-rw-r--r--dev-perl/Bio-BigFile/ChangeLog6
-rw-r--r--dev-perl/Bio-BigFile/Manifest2
-rw-r--r--dev-perl/Bio-BigFile/metadata.xml10
-rw-r--r--sci-chemistry/coot/ChangeLog3
-rw-r--r--sci-chemistry/coot/coot-9999.ebuild8
-rw-r--r--sci-chemistry/freeon/ChangeLog9
-rw-r--r--sci-chemistry/freeon/Manifest1
-rw-r--r--sci-chemistry/freeon/freeon-1.0.3.ebuild33
-rw-r--r--sci-chemistry/freeon/metadata.xml3
-rw-r--r--sci-chemistry/modeller/ChangeLog4
-rw-r--r--sci-chemistry/modeller/modeller-9.12-r3.ebuild (renamed from sci-chemistry/modeller/modeller-9.12-r2.ebuild)7
-rw-r--r--sci-libs/modglue/ChangeLog6
-rw-r--r--sci-libs/modglue/files/modglue-1.16-lib64.patch61
-rw-r--r--sci-libs/modglue/files/modglue-1.19-Makefiles.patch113
-rw-r--r--sci-libs/modglue/files/modglue-1.19-ldflags.patch14
-rw-r--r--sci-libs/modglue/files/modglue-1.19-parallelmake.patch53
-rw-r--r--sci-libs/modglue/modglue-1.19.ebuild9
-rw-r--r--sci-libs/scikits_image/ChangeLog7
-rw-r--r--sci-libs/scikits_image/metadata.xml16
-rw-r--r--sci-libs/scikits_image/scikits_image-9999.ebuild6
21 files changed, 217 insertions, 163 deletions
diff --git a/dev-perl/Bio-BigFile/Bio-BigFile-1.06.ebuild b/dev-perl/Bio-BigFile/Bio-BigFile-1.07.ebuild
index 7da661606..c9264eaf6 100644
--- a/dev-perl/Bio-BigFile/Bio-BigFile-1.06.ebuild
+++ b/dev-perl/Bio-BigFile/Bio-BigFile-1.07.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
MODULE_AUTHOR="LDS"
@@ -15,7 +15,10 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-RDEPEND="sci-biology/ucsc-genome-browser"
+RDEPEND="
+ dev-perl/IO-String
+ sci-biology/bioperl
+ sci-biology/ucsc-genome-browser[static-libs]"
DEPEND="${RDEPEND}
virtual/perl-Module-Build"
diff --git a/dev-perl/Bio-BigFile/ChangeLog b/dev-perl/Bio-BigFile/ChangeLog
index d899200ff..3af2a5639 100644
--- a/dev-perl/Bio-BigFile/ChangeLog
+++ b/dev-perl/Bio-BigFile/ChangeLog
@@ -1,7 +1,11 @@
# ChangeLog for dev-perl/Bio-BigFile
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 18 Sep 2013; Justin Lecher <jlec@gentoo.org> -Bio-BigFile-1.06.ebuild,
+ +Bio-BigFile-1.07.ebuild, metadata.xml:
+ Version BUmp, fix deps
+
22 May 2012; Justin Lecher <jlec@gentoo.org> Bio-BigFile-1.06.ebuild:
Add missing eutils.eclass, bump to EAPI=4, remove unnecessary bits
diff --git a/dev-perl/Bio-BigFile/Manifest b/dev-perl/Bio-BigFile/Manifest
index e4ed7f064..cec303381 100644
--- a/dev-perl/Bio-BigFile/Manifest
+++ b/dev-perl/Bio-BigFile/Manifest
@@ -1 +1 @@
-DIST Bio-BigFile-1.06.tar.gz 603786 SHA256 15f1ece2563096a301cff533a9ac91b8fc31af7643b4c4d7fd5d4fa75d4cb5ef SHA512 c018eb0787c4912e777721cd8f863c48e933dce179a0f223820648ecda736ca7e2d6647bb46b51fe500d8f5712b6ce0d2df98bebdfed7cffc7c58933e55a5387 WHIRLPOOL a13cb43f8f897fbf872e798828750e3f196b8710be8a389e4f4a315b5a63fab9abf2de27e565a196a8403a3ef5e3181c8e6579d5ffb7df07290bd7c18c6a5f78
+DIST Bio-BigFile-1.07.tar.gz 605804 SHA256 277b66ce8acbdd52399e2c5a0cf4e3bd5c74c12b94877cd383d0c4c97740d16d SHA512 2a65556b52c220881c3f0534b324889d3ac5284fc62f6a8fffe301be9bef7c8f3278e50bd6af11ac5bbb22a5c928b08442c427e3931aec8422c0fbff3fcba314 WHIRLPOOL 0713ad699b4f2fbc13a3a29a0e3fb22c6d73ae06ef784508bcd0b071b24166e858b591b8d87c79ed133fb95d78662582ed91cb65e4b13dd407211313227e1963
diff --git a/dev-perl/Bio-BigFile/metadata.xml b/dev-perl/Bio-BigFile/metadata.xml
index 07b525505..2bc893037 100644
--- a/dev-perl/Bio-BigFile/metadata.xml
+++ b/dev-perl/Bio-BigFile/metadata.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sci-biology</herd>
- <maintainer>
- <email>mmokrejs@fold.natur.cuni.cz</email>
- <name>Martin Mokrejs</name>
- </maintainer>
+ <herd>sci-biology</herd>
+ <maintainer>
+ <email>mmokrejs@fold.natur.cuni.cz</email>
+ <name>Martin Mokrejs</name>
+ </maintainer>
</pkgmetadata>
diff --git a/sci-chemistry/coot/ChangeLog b/sci-chemistry/coot/ChangeLog
index a8ab290f1..43da81892 100644
--- a/sci-chemistry/coot/ChangeLog
+++ b/sci-chemistry/coot/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 19 Sep 2013; Justin Lecher <jlec@gentoo.org> coot-9999.ebuild:
+ Clean for latest HEAD
+
28 Aug 2013; Justin Lecher <jlec@gentoo.org> coot-9999.ebuild:
Install missing syminfo, #482734
diff --git a/sci-chemistry/coot/coot-9999.ebuild b/sci-chemistry/coot/coot-9999.ebuild
index 3d39cf95a..dcebce6a6 100644
--- a/sci-chemistry/coot/coot-9999.ebuild
+++ b/sci-chemistry/coot/coot-9999.ebuild
@@ -18,7 +18,7 @@ MY_P=${PN}-${MY_PV}
DESCRIPTION="Crystallographic Object-Oriented Toolkit for model building, completion and validation"
HOMEPAGE="http://www.biop.ox.ac.uk/coot/"
-SRC_URI="test? ( http://www.biop.ox.ac.uk/coot/devel/greg-data.tar.gz )"
+SRC_URI="test? ( http://www2.mrc-lmb.cam.ac.uk/personal/pemsley/coot/data/greg-data.tar.gz )"
ESVN_REPO_URI="http://coot.googlecode.com/svn/trunk"
SLOT="0"
@@ -175,9 +175,3 @@ src_test() {
"${S}"/src/coot-real --no-graphics --script command-line-greg.scm || die
"${S}"/src/coot-real --no-graphics --script python-tests/coot_unittest.py || die
}
-
-src_install() {
- autotools-utils_src_install
- insinto /usr/share/${PN}
- doins syminfo.lib
-}
diff --git a/sci-chemistry/freeon/ChangeLog b/sci-chemistry/freeon/ChangeLog
index 45eef4827..ccc74ddae 100644
--- a/sci-chemistry/freeon/ChangeLog
+++ b/sci-chemistry/freeon/ChangeLog
@@ -2,6 +2,15 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 20 Sep 2013; Nicolas Bock <nicolasbock@gmail.com> freeon-1.0.3.ebuild:
+ sci-chemistry/freeon-1.0.3: Fixed broken ebuild.
+
+*freeon-1.0.3 (20 Sep 2013)
+
+ 20 Sep 2013; Nicolas Bock <nicolasbock@gmail.com> +freeon-1.0.3.ebuild,
+ metadata.xml:
+ sci-chemistry/freeon-1.0.3: Version bump.
+
*freeon-1.0.2 (18 Sep 2013)
18 Sep 2013; Nicolas Bock <nicolasbock@gmail.com> +freeon-1.0.2.ebuild:
diff --git a/sci-chemistry/freeon/Manifest b/sci-chemistry/freeon/Manifest
index f2dc98e33..c11115d32 100644
--- a/sci-chemistry/freeon/Manifest
+++ b/sci-chemistry/freeon/Manifest
@@ -1,5 +1,6 @@
DIST freeon-1.0.1.tar.bz2 6081683 SHA256 91832ebf84bcaf7f3cfacee0bad45745b1f77839c8ef6d1fa9118abee73c0910 SHA512 4971bece35d32d680f2b2d57f366695d7f46a78e24a55840db71e492ccb7bf8ba0001e3c5fba9a6f8aea2bb5a231c02b9aac0722574e0fddc169089b2d84c43e WHIRLPOOL 3509bd6e8a76b8fb72b701abceda2ab44a7587aa5ddd41b3a7eec294f6989bf37b0045b268e8d1af355ad88e5445598c4c6bc31a5442e8f0b84779cb6782070b
DIST freeon-1.0.2.tar.bz2 6081976 SHA256 d391f3648f0d795a836eddddf70ed4b43b91e94cb18823f03f8c999fad1491ed SHA512 e3169dd3a2c543d44c7a7e7c8b32af0055832a11239175581c38294904f43a0c2f3a567172841b977497325a9bdd9f1634b57606d4054bda106bdf632b31956f WHIRLPOOL 28bc95853a6cd2d99ac1550112fb2ec44920915ba183eb4f6c5cd3152388ceaad093f72628052a5eb4ceb4838d5ee5e111484ea3b594f7abeed4ef3b05c4160c
+DIST freeon-1.0.3.tar.bz2 6094060 SHA256 d17cf00e8b861a3c8d12d562d436fdf4cbf5e75e2e130af0b0b659c91a6b38a8 SHA512 b86979471b1f8c3d1af59f2562ec6f7b71ffe44d28276483db6ab2b9aef20de4c4edbdf9d4c7f6d0ad25e216e23a6ef0e1e5e4e5487d06c5d7268fc18b4da6b9 WHIRLPOOL 6a44726558ecb85e5bd21e8c201f1c01527ef1c06632b1f042a8f6d9539225914830688b7ac100c9322f0c543aa609881eb91c3a2258ac4d9cc929b6696f575b
DIST freeon-1.0.tar.bz2 6053346 SHA256 4cd7618402cea91eba90377546001e975b81b7e5ff533c36f650f9e2b5c1363c SHA512 4161f020beb5e55ed1d352c8c309c1ae6237d982a858cef61c1343f379d0142890fa45eb5de8cb8a93591cfec74485ed50b51d663038e4496febb9673a6bf646 WHIRLPOOL 6da7320e730359e4599a8312037b2e276e68835d0b05aedd913f1dbcb529dfb22c38cb76f0fd8c5eb96060a6c3bfe0b8bd70d5388a21fbcafab2f09b42b79d1c
DIST freeon-2013-09-12.tar.bz2 6058108 SHA256 5a2b76f590110e960885369f158c828d3b1c4ae28308940b620ce78b59550dd1 SHA512 5946b6add17dc753a0a249ef640ec6eb6df5ce48d25fd3ed086da5a23b16d3c5d63fbaf26543ac27dedf7f2f1376525a10a1c6b41ad66bdddd82364951d4faa0 WHIRLPOOL 1bc739f6d6dbeaef486da282a4bf225553b108e5896674b252ee61a1dd66f44db72531f5c1e632cfe6fc54c655e312856f86b78dbb48a138941d0787b9ea441f
DIST freeon-2013-09-16.tar.bz2 6057203 SHA256 0d213d419265030cee4eed8b43a35d39467ee1d1d1df9a7efc5ad4df15b9ca59 SHA512 cef0687aa5febbb1270719696c807b8438f18cb7c000b87f51b3562af644ed2604f57ecf9f43a92f16c2e337e8c487d0bcb13d9626ce638c5ccc313d5e681bf4 WHIRLPOOL d9d76712920152803a5aae59de70776e124f3e93d6102b50aa6f51ba06f6175946cbd24494945d60fbfa90c3580e5bb02fadf64a78cbe4c4c49abfa60c41e9d1
diff --git a/sci-chemistry/freeon/freeon-1.0.3.ebuild b/sci-chemistry/freeon/freeon-1.0.3.ebuild
new file mode 100644
index 000000000..91f6cd97d
--- /dev/null
+++ b/sci-chemistry/freeon/freeon-1.0.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+FORTRAN_STANDARD=90
+
+inherit autotools-utils fortran-2
+
+DESCRIPTION="An experimental suite of programs for linear scaling quantum chemistry."
+HOMEPAGE="http://www.freeon.org"
+SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${PN}-${PV}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="standalone-BCSR static-libs"
+
+RDEPEND="
+ sci-libs/hdf5
+ virtual/blas
+ virtual/lapack"
+DEPEND="${DEPEND}
+ virtual/pkgconfig"
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable standalone-BCSR)
+ )
+ autotools-utils_src_configure
+}
diff --git a/sci-chemistry/freeon/metadata.xml b/sci-chemistry/freeon/metadata.xml
index bf041ec0c..5f6f63b37 100644
--- a/sci-chemistry/freeon/metadata.xml
+++ b/sci-chemistry/freeon/metadata.xml
@@ -9,4 +9,7 @@
<email>nicolasbock@gmail.com</email>
<name>Nicolas Bock</name>
</maintainer>
+ <use>
+ <flag name="standalone-BCSR">Enables a self-contained BCSR file format</flag>
+ </use>
</pkgmetadata>
diff --git a/sci-chemistry/modeller/ChangeLog b/sci-chemistry/modeller/ChangeLog
index cedd72b92..01374fb4e 100644
--- a/sci-chemistry/modeller/ChangeLog
+++ b/sci-chemistry/modeller/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 20 Sep 2013; Justin Lecher <jlec@gentoo.org> -modeller-9.12-r2.ebuild,
+ +modeller-9.12-r3.ebuild:
+ Mask lib dir for revdep-rebuild, #474696
+
26 Jun 2013; Justin Lecher <jlec@gentoo.org> -modeller-9.12-r1.ebuild,
+modeller-9.12-r2.ebuild:
Fix lib position, #474696
diff --git a/sci-chemistry/modeller/modeller-9.12-r2.ebuild b/sci-chemistry/modeller/modeller-9.12-r3.ebuild
index 9cfd2e3d3..a01b74960 100644
--- a/sci-chemistry/modeller/modeller-9.12-r2.ebuild
+++ b/sci-chemistry/modeller/modeller-9.12-r3.ebuild
@@ -42,6 +42,7 @@ pkg_setup() {
python_prepare_all(){
sed "s:i386-intel8:${EXECTYPE}:g" -i src/swig/setup.py || die
+ distutils-r1_python_prepare_all
}
python_compile(){
@@ -92,6 +93,12 @@ python_install_all(){
insinto /usr/share/${PN}/
doins -r examples
fi
+
+ insinto /etc/revdep-rebuild
+ cat >> "${T}"/40-${PN} <<- EOF
+ SEARCH_DIRS_MASK="${EPREFIX}/opt/modeller/lib/"
+ EOF
+ doins "${T}"/40-${PN}
}
pkg_postinst() {
diff --git a/sci-libs/modglue/ChangeLog b/sci-libs/modglue/ChangeLog
index bc9c7e433..36095f3ef 100644
--- a/sci-libs/modglue/ChangeLog
+++ b/sci-libs/modglue/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 19 Sep 2013; François Bissey <francois.bissey@canterbury.ac.nz>
+ +files/modglue-1.19-Makefiles.patch, -files/modglue-1.16-lib64.patch,
+ -files/modglue-1.19-ldflags.patch, -files/modglue-1.19-parallelmake.patch,
+ modglue-1.19.ebuild:
+ Fixing sandbox violations
+
*modglue-1.19 (18 Sep 2013)
18 Sep 2013; François Bissey <francois.bissey@canterbury.ac.nz>
diff --git a/sci-libs/modglue/files/modglue-1.16-lib64.patch b/sci-libs/modglue/files/modglue-1.16-lib64.patch
deleted file mode 100644
index e67adba2e..000000000
--- a/sci-libs/modglue/files/modglue-1.16-lib64.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- Makefile.in.orig 2010-03-04 10:34:54.000000000 +1300
-+++ Makefile.in 2010-08-23 23:21:34.931886424 +1200
-@@ -3,6 +3,9 @@
-
- .PHONY: all install library static examples uninstall clean distclean
-
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+
- all: library
- #examples
-
-@@ -17,8 +20,8 @@
-
- install:
- ( cd src && $(MAKE) install );
-- @INSTALL@ -d -m 755 ${DESTDIR}@prefix@/@libdir@/pkgconfig
-- @INSTALL@ -m 644 modglue.pc ${DESTDIR}@prefix@/@libdir@/pkgconfig/
-+ @INSTALL@ -d -m 755 ${DESTDIR}@libdir@/pkgconfig
-+ @INSTALL@ -m 644 modglue.pc ${DESTDIR}@libdir@/pkgconfig/
- @INSTALL@ -d -m 755 ${DESTDIR}@prefix@/share/man/man1
- @INSTALL@ man/man1/prompt.1 ${DESTDIR}@prefix@/share/man/man1
- @INSTALL@ man/man1/ptywrap.1 ${DESTDIR}@prefix@/share/man/man1
---- src/Makefile.in.orig 2010-03-04 10:34:54.000000000 +1300
-+++ src/Makefile.in 2010-08-23 23:21:41.165883457 +1200
-@@ -1,6 +1,8 @@
-
-
- MACTEST= @MAC_OS_X@
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-
- ifeq ($(strip $(MACTEST)),)
- LIBTOOL = libtool
-@@ -18,7 +20,7 @@
- LPHASE = ${LIBTOOL} --tag=CXX --mode=link @CXX@ -version-info ${LTRELEASE} -rpath @prefix@/@libdir@ @LIBS@
- MPHASE = ${LIBTOOL} --tag=CXX --mode=link @CXX@
- IPHASE = ${LIBTOOL} --mode=install @INSTALL@
--FPHASE = ${LIBTOOL} --mode=finish @prefix@/@libdir@
-+FPHASE = ${LIBTOOL} --mode=finish @libdir@
-
- TIMESTAMP = -D"DATETIME=\"`date | sed -e 's/ / /'`\"" -DHOSTNAME=\"`hostname`\"
-
-@@ -98,13 +100,13 @@
-
- install: library tools
- @INSTALL@ -m 755 -d ${DESTDIR}@prefix@
-- @INSTALL@ -m 755 -d ${DESTDIR}@prefix@/@libdir@
-- @INSTALL@ -m 755 -d ${DEVDESTDIR}@prefix@/@libdir@
-+ @INSTALL@ -m 755 -d ${DESTDIR}@libdir@
-+ @INSTALL@ -m 755 -d ${DEVDESTDIR}@libdir@
- @INSTALL@ -m 755 -d ${DESTDIR}@prefix@/bin
- @INSTALL@ -m 755 -d ${DEVDESTDIR}@prefix@/include/modglue
-- ${IPHASE} libmodglue.la ${DESTDIR}@prefix@/@libdir@
-+ ${IPHASE} libmodglue.la ${DESTDIR}@libdir@
- ifneq ($(DESTDIR),$(DEVDESTDIR))
-- mv ${DESTDIR}@prefix@/@libdir@/libmodglue*.so ${DEVDESTDIR}@prefix@/@libdir@
-+ mv ${DESTDIR}@libdir@/libmodglue*.so ${DEVDESTDIR}@libdir@
- endif
- # ${IPHASE} libmid.la ${DESTDIR}@prefix@/lib
- ${FPHASE}
diff --git a/sci-libs/modglue/files/modglue-1.19-Makefiles.patch b/sci-libs/modglue/files/modglue-1.19-Makefiles.patch
new file mode 100644
index 000000000..a1dae99f0
--- /dev/null
+++ b/sci-libs/modglue/files/modglue-1.19-Makefiles.patch
@@ -0,0 +1,113 @@
+--- Makefile.in.orig 2013-02-24 11:18:44.000000000 +1300
++++ Makefile.in 2013-09-20 10:05:25.316018672 +1200
+@@ -3,12 +3,15 @@
+
+ .PHONY: all install library static examples uninstall clean distclean
+
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
+ all: library
+ #examples
+
+ library:
+ echo @libdir@
+- ( cd src && $(MAKE) );
++ ( cd src $(MAKE) library tools );
+
+ static:
+ ( cd src && $(MAKE) static );
+@@ -18,8 +21,8 @@
+
+ install:
+ ( cd src && $(MAKE) install );
+- @INSTALL@ -d -m 755 ${DESTDIR}@prefix@/@libdir@/pkgconfig
+- @INSTALL@ -m 644 modglue.pc ${DESTDIR}@prefix@/@libdir@/pkgconfig/
++ @INSTALL@ -d -m 755 ${DESTDIR}@libdir@/pkgconfig
++ @INSTALL@ -m 644 modglue.pc ${DESTDIR}@libdir@/pkgconfig/
+ @INSTALL@ -d -m 755 ${DESTDIR}@prefix@/share/man/man1
+ @INSTALL@ man/man1/prompt.1 ${DESTDIR}@prefix@/share/man/man1
+ @INSTALL@ man/man1/ptywrap.1 ${DESTDIR}@prefix@/share/man/man1
+--- src/Makefile.in.orig 2013-02-24 11:18:44.000000000 +1300
++++ src/Makefile.in 2013-09-20 10:07:56.956164930 +1200
+@@ -1,6 +1,8 @@
+
+
+ MACTEST= @MAC_OS_X@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
+
+ ifeq ($(strip $(MACTEST)),)
+ LIBTOOL = libtool
+@@ -21,11 +23,11 @@
+ LTRELEASE = `echo ${RELEASE} | sed -e "s/\./:/g"`
+
+ CPHASE = ${LIBTOOL} --tag=CXX --mode=compile @CXX@ -c @CFLAGS@
+-LPHASE = ${LIBTOOL} --tag=CXX --mode=link @CXX@ -version-info ${LTRELEASE} -rpath @prefix@@libdir@ @LIBS@
++LPHASE = ${LIBTOOL} --tag=CXX --mode=link @CXX@ -version-info ${LTRELEASE} -rpath @libdir@ @LIBS@
+ #LPHASE = ${LIBTOOL} --tag=CXX --mode=link @CXX@ -version-info ${LTRELEASE} @LIBS@
+ MPHASE = ${LIBTOOL} --tag=CXX --mode=link @CXX@
+ IPHASE = ${LIBTOOL} --mode=install @INSTALL@
+-FPHASE = ${LIBTOOL} --mode=finish @prefix@/@libdir@
++FPHASE = ${LIBTOOL} --mode=finish ${DESTDIR}@libdir@
+
+ TIMESTAMP = -D"DATETIME=\"`date | sed -e 's/ / /'`\"" -DHOSTNAME=\"`hostname`\"
+
+@@ -56,21 +58,21 @@
+
+ #------- Tests ----------------------------------------
+
+-test_child_process: test_child_process.o
++test_child_process: library test_child_process.o
+ ${MPHASE} -o test_child_process $< libmodglue.la
+
+-test_ext_process: test_ext_process.o
++test_ext_process: library test_ext_process.o
+ ${MPHASE} -o test_ext_process $< libmodglue.la
+
+-test_pipe: test_pipe.o
++test_pipe: library test_pipe.o
+ ${MPHASE} -o test_pipe $< libmodglue.la
+
+-test_writes: test_writes.o
++test_writes: library test_writes.o
+ ${MPHASE} -o test_writes $< libmodglue.la
+
+ #------- Tools ----------------------------------------
+
+-prompt: prompt.o
++prompt: library prompt.o
+ ${MPHASE} -o prompt prompt.o `pkg-config sigc++-2.0 --libs` libmodglue.la
+ # chrpath -d .libs/prompt
+
+@@ -85,10 +87,10 @@
+ endif
+
+
+-ptywrap: ptywrap.o
++ptywrap: library ptywrap.o
+ ${MPHASE} -o ptywrap ptywrap.o @LINK_UTIL@
+
+-ptywrap_static: ptywrap.o
++ptywrap_static: library ptywrap.o
+ ${CPHASE} ${TIMESTAMP} -o ptywrap.o \
+ -I@top_srcdir@/include -DSTATICBUILD ptywrap.cc
+ ifeq ($(strip $(MACTEST)),)
+@@ -109,13 +111,13 @@
+ DEVDESTDIR=${DESTDIR}
+ endif
+ @INSTALL@ -m 755 -d ${DESTDIR}@prefix@
+- @INSTALL@ -m 755 -d ${DESTDIR}@prefix@/@libdir@
+- @INSTALL@ -m 755 -d ${DEVDESTDIR}@prefix@/@libdir@
++ @INSTALL@ -m 755 -d ${DESTDIR}@libdir@
++ @INSTALL@ -m 755 -d ${DEVDESTDIR}@libdir@
+ @INSTALL@ -m 755 -d ${DESTDIR}@prefix@/bin
+ @INSTALL@ -m 755 -d ${DEVDESTDIR}@prefix@/include/modglue
+- ${IPHASE} libmodglue.la ${DESTDIR}@prefix@/@libdir@
++ ${IPHASE} libmodglue.la ${DESTDIR}@libdir@
+ ifneq ($(DESTDIR),$(DEVDESTDIR))
+- mv ${DESTDIR}@prefix@/@libdir@/libmodglue*.so ${DEVDESTDIR}@prefix@/@libdir@
++ mv ${DESTDIR}@libdir@/libmodglue*.so ${DEVDESTDIR}@libdir@
+ endif
+ # ${IPHASE} libmid.la ${DESTDIR}@prefix@/lib
+ ${FPHASE}
diff --git a/sci-libs/modglue/files/modglue-1.19-ldflags.patch b/sci-libs/modglue/files/modglue-1.19-ldflags.patch
deleted file mode 100644
index a564d4fb2..000000000
--- a/sci-libs/modglue/files/modglue-1.19-ldflags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/Makefile.in.orig 2013-09-04 14:20:05.437329795 +1200
-+++ src/Makefile.in 2013-09-04 14:25:11.533806416 +1200
-@@ -21,9 +21,9 @@
- LTRELEASE = `echo ${RELEASE} | sed -e "s/\./:/g"`
-
- CPHASE = ${LIBTOOL} --tag=CXX --mode=compile @CXX@ -c @CFLAGS@
--LPHASE = ${LIBTOOL} --tag=CXX --mode=link @CXX@ -version-info ${LTRELEASE} -rpath @prefix@@libdir@ @LIBS@
-+LPHASE = ${LIBTOOL} --tag=CXX --mode=link @CXX@ -version-info ${LTRELEASE} @LDFLAGS@ -rpath @libdir@ @LIBS@
- #LPHASE = ${LIBTOOL} --tag=CXX --mode=link @CXX@ -version-info ${LTRELEASE} @LIBS@
--MPHASE = ${LIBTOOL} --tag=CXX --mode=link @CXX@
-+MPHASE = ${LIBTOOL} --tag=CXX --mode=link @CXX@ @LDFLAGS@
- IPHASE = ${LIBTOOL} --mode=install @INSTALL@
- FPHASE = ${LIBTOOL} --mode=finish @prefix@/@libdir@
-
diff --git a/sci-libs/modglue/files/modglue-1.19-parallelmake.patch b/sci-libs/modglue/files/modglue-1.19-parallelmake.patch
deleted file mode 100644
index b3dc35e7b..000000000
--- a/sci-libs/modglue/files/modglue-1.19-parallelmake.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- Makefile.in.orig 2013-09-04 14:12:33.436620240 +1200
-+++ Makefile.in 2013-09-04 14:13:31.051711085 +1200
-@@ -8,7 +8,7 @@
-
- library:
- echo @libdir@
-- ( cd src && $(MAKE) );
-+ ( cd src && $(MAKE) library tools );
-
- static:
- ( cd src && $(MAKE) static );
---- src/Makefile.in.orig 2013-09-04 14:13:46.820735926 +1200
-+++ src/Makefile.in 2013-09-04 14:15:46.020923434 +1200
-@@ -56,21 +56,21 @@
-
- #------- Tests ----------------------------------------
-
--test_child_process: test_child_process.o
-+test_child_process: library test_child_process.o
- ${MPHASE} -o test_child_process $< libmodglue.la
-
--test_ext_process: test_ext_process.o
-+test_ext_process: library test_ext_process.o
- ${MPHASE} -o test_ext_process $< libmodglue.la
-
--test_pipe: test_pipe.o
-+test_pipe: library test_pipe.o
- ${MPHASE} -o test_pipe $< libmodglue.la
-
--test_writes: test_writes.o
-+test_writes: library test_writes.o
- ${MPHASE} -o test_writes $< libmodglue.la
-
- #------- Tools ----------------------------------------
-
--prompt: prompt.o
-+prompt: library prompt.o
- ${MPHASE} -o prompt prompt.o `pkg-config sigc++-2.0 --libs` libmodglue.la
- # chrpath -d .libs/prompt
-
-@@ -85,10 +85,10 @@
- endif
-
-
--ptywrap: ptywrap.o
-+ptywrap: library ptywrap.o
- ${MPHASE} -o ptywrap ptywrap.o @LINK_UTIL@
-
--ptywrap_static: ptywrap.o
-+ptywrap_static: library ptywrap.o
- ${CPHASE} ${TIMESTAMP} -o ptywrap.o \
- -I@top_srcdir@/include -DSTATICBUILD ptywrap.cc
- ifeq ($(strip $(MACTEST)),)
diff --git a/sci-libs/modglue/modglue-1.19.ebuild b/sci-libs/modglue/modglue-1.19.ebuild
index ca843118c..022049ce8 100644
--- a/sci-libs/modglue/modglue-1.19.ebuild
+++ b/sci-libs/modglue/modglue-1.19.ebuild
@@ -24,13 +24,8 @@ DEPEND="${RDEPEND}
AUTOTOOLS_IN_SOURCE_BUILD=1
PATCHES=(
- # Respect LDFLAGS (and a last bit of 64bit problem)
- "${FILESDIR}"/${PN}-1.19-ldflags.patch
- # fix parallel make. test are made at the same time as the library??
- "${FILESDIR}"/${PN}-1.19-parallelmake.patch
- # take care of the lib/lib64 problem. Without this modglue installs
- # stuff in /usr/usr/lib64 on 64bits systems.
- "${FILESDIR}"/${PN}-1.16-lib64.patch
+ # consolidated (src/)Makefile.in patch
+ "${FILESDIR}"/${PN}-1.19-Makefiles.patch
)
src_install() {
diff --git a/sci-libs/scikits_image/ChangeLog b/sci-libs/scikits_image/ChangeLog
index 2b3abdf68..116468d3f 100644
--- a/sci-libs/scikits_image/ChangeLog
+++ b/sci-libs/scikits_image/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 20 Sep 2013; Justin Lecher <jlec@gentoo.org> scikits_image-9999.ebuild:
+ Merge tree changes
+
+ 18 Sep 2013; Justin Lecher <jlec@gentoo.org> scikits_image-9999.ebuild,
+ metadata.xml:
+ Drop KEYWORDS from live ebuild
+
17 Sep 2013; Sébastien Fabbro <bicatali@gentoo.org> +metadata.xml,
scikits_image-9999.ebuild:
sci-libs/scikits_image: Fix source directory, update dependencies, cleanup
diff --git a/sci-libs/scikits_image/metadata.xml b/sci-libs/scikits_image/metadata.xml
index 51476ec31..4e57c7f06 100644
--- a/sci-libs/scikits_image/metadata.xml
+++ b/sci-libs/scikits_image/metadata.xml
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+ <herd>sci</herd>
+ <longdescription lang="en">
This SciKit (toolkit for SciPy) includes useful image processing
algorithms for use with Python and NumPy. While SciPy’s ndimage
provides low-level manipulation, scikits.image centres around
algorithms and applications.
</longdescription>
-<use>
- <flag name="freeimage">Enable support for image i/o via <pkg>media-libs/freeimage</pkg></flag>
-</use>
-<upstream>
- <remote-id type="pypi">scikit-image</remote-id>
-</upstream>
+ <use>
+ <flag name="freeimage">Enable support for image i/o via <pkg>media-libs/freeimage</pkg></flag>
+ </use>
+ <upstream>
+ <remote-id type="pypi">scikit-image</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/sci-libs/scikits_image/scikits_image-9999.ebuild b/sci-libs/scikits_image/scikits_image-9999.ebuild
index bcb232c18..ebedf7b5d 100644
--- a/sci-libs/scikits_image/scikits_image-9999.ebuild
+++ b/sci-libs/scikits_image/scikits_image-9999.ebuild
@@ -16,7 +16,7 @@ EGIT_REPO_URI="https://github.com/scikit-image/scikit-image.git"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS=""
IUSE="doc freeimage gtk qt4 test"
RDEPEND="
@@ -40,8 +40,8 @@ python_test() {
# distutils_install_for_testing not working here
esetup.py \
install --root="${T}/test-${EPYTHON}" \
- --no-compile || die "install test failed"
+ --no-compile
cd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die
- echo "backend: Agg" > matplotlibrc
+ echo "backend: Agg" > matplotlibrc || die
MPLCONFIGDIR=. nosetests -v skimage || die
}