* [gentoo-commits] gentoo-x86 commit in sci-visualization/hippodraw: ChangeLog hippodraw-1.21.3-r3.ebuild
@ 2010-05-21 19:08 Justin Lecher (jlec)
0 siblings, 0 replies; 7+ messages in thread
From: Justin Lecher (jlec) @ 2010-05-21 19:08 UTC (permalink / raw
To: gentoo-commits
jlec 10/05/21 19:08:31
Modified: ChangeLog
Added: hippodraw-1.21.3-r3.ebuild
Log:
Fix for Python ABI #316253, PREFIX fixes
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.16 sci-visualization/hippodraw/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/hippodraw/ChangeLog?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/hippodraw/ChangeLog?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/hippodraw/ChangeLog?r1=1.15&r2=1.16
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/ChangeLog,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ChangeLog 12 Jan 2010 04:46:24 -0000 1.15
+++ ChangeLog 21 May 2010 19:08:31 -0000 1.16
@@ -1,6 +1,11 @@
# ChangeLog for sci-visualization/hippodraw
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/ChangeLog,v 1.15 2010/01/12 04:46:24 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/ChangeLog,v 1.16 2010/05/21 19:08:31 jlec Exp $
+
+*hippodraw-1.21.3-r3 (21 May 2010)
+
+ 21 May 2010; Justin Lecher <jlec@gentoo.org> +hippodraw-1.21.3-r3.ebuild:
+ Fix for Python ABI #316253, PREFIX fixes
*hippodraw-1.21.3-r2 (12 Jan 2010)
1.1 sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild?rev=1.1&content-type=text/plain
Index: hippodraw-1.21.3-r3.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild,v 1.1 2010/05/21 19:08:31 jlec Exp $
EAPI=3
PYTHON_DEPEND="*"
PYTHON_USE_WITH="threads"
SUPPORT_PYTHON_ABIS="1"
inherit autotools eutils multilib python qt4
MY_PN=HippoDraw
DESCRIPTION="Highly interactive data analysis Qt environment for C++ and python"
HOMEPAGE="http://www.slac.stanford.edu/grp/ek/hippodraw/"
SRC_URI="ftp://ftp.slac.stanford.edu/users/pfkeb/${PN}/${MY_PN}-${PV}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc examples +fits +numpy root wcs"
CDEPEND="dev-libs/boost[python]
virtual/latex-base
media-libs/netpbm
fits? ( sci-libs/cfitsio )
numpy? ( dev-python/numpy )
x11-libs/qt-gui:4
x11-libs/qt-qt3support:4
x11-libs/qt-assistant:4
root? ( >=sci-physics/root-5 )
!root? ( sci-libs/minuit )
wcs? ( sci-astronomy/wcslib )"
DEPEND="${CDEPEND}
doc? ( app-doc/doxygen )"
RDEPEND="${CDEPEND}
numpy? ( fits? ( dev-python/pyfits ) )"
RESTRICT_PYTHON_ABIS="3.*"
S="${WORKDIR}/${MY_PN}-${PV}"
src_prepare() {
epatch "${FILESDIR}"/${P}-gcc4.3.patch
epatch "${FILESDIR}"/${P}-gcc4.4.patch
epatch "${FILESDIR}"/${P}-numarray.patch
epatch "${FILESDIR}"/${P}-test-fix.patch
epatch "${FILESDIR}"/${P}-minuit2.patch
epatch "${FILESDIR}"/${P}-wcslib.patch
epatch "${FILESDIR}"/${P}-qt4.patch
epatch "${FILESDIR}"/${P}-autoconf-2.64.patch
echo "#!${EPREFIX}/bin/sh" > config/py-compile
# fix the install doc directory to gentoo's one
local docdir="${EPREFIX}"/usr/share/doc/${PF}
sed -i \
-e "s:\(docdir\).*=.*:\1= ${docdir}:" \
-e "s:\(INSTALLDIR\).*=.*:\1= \$(DESTDIR)${docdir}/html:" \
-e "/^DOCS_STR/s:\(DOCS_STR\).*=.*:\1 = \\\\\"${docdir}/html\\\\\":" \
-e "s:\$(pkgdatadir)/examples:${docdir}/examples:" \
-e 's:LICENSE:README:' \
-e "s:BOOSTDIR = python:BOOSTDIR =:g" \
{.,doc,examples,qt}/Makefile.am || die "sed for docdir failed"
AT_M4DIR=config/m4 eautoreconf
}
src_configure() {
local myconf="
--disable-numarraybuild
$(use_enable numpy numpybuild)
$(use_enable doc help)"
# All these longuish conf options are necessary
# or else a huge patch
myconf="${myconf} --with-Qt-include-dir=no"
myconf="${myconf} --with-Qt-lib-dir=no"
myconf="${myconf} --with-Qt-bin-dir=no"
myconf="${myconf} --with-qt4-include=${EPREFIX}/usr/include/qt4"
myconf="${myconf} --with-qt4-lib=${EPREFIX}/usr/$(get_libdir)/qt4"
myconf="${myconf} --with-qt4-dir=${EPREFIX}/usr"
if use root; then
myconf="${myconf} --with-root-include=$(root-config --incdir)"
myconf="${myconf} --with-root-lib=$(root-config --libdir)"
myconf="${myconf} --with-minuit2-lib=no"
else
myconf="${myconf} --with-minuit2-include=${EPREFIX}/usr/include"
myconf="${myconf} --with-minuit2-lib=${EPREFIX}/usr/$(get_libdir)"
myconf="${myconf} --with-root-lib=no"
fi
if use fits; then
myconf="${myconf} --with-cfitsio-include=${EPREFIX}/usr/include"
myconf="${myconf} --with-cfitsio-lib=${EPREFIX}/usr/$(get_libdir)"
else
myconf="${myconf} --with-cfitsio-lib=no"
fi
if use wcs; then
myconf="${myconf} --with-wcslib-include=${EPREFIX}/usr/include"
myconf="${myconf} --with-wcslib-lib=${EPREFIX}/usr/$(get_libdir)"
else
myconf="${myconf} --with-wcslib-include=no"
myconf="${myconf} --with-wcslib-lib=no"
fi
econf ${myconf} || die "econf failed"
}
src_compile() {
emake || die "emake failed"
if use doc; then
emake docs || die "emake docs failed"
fi
python_copy_sources python
compilation() {
emake \
PYTHON_INCLUDES="$(python_get_includedir)" \
PYTHON_SITE_PACKAGES="$(python_get_sitedir)" \
NUMARRAY_INCLUDE="$(python_get_sitedir)/numpy/core/include" \
PY_INCLUDE="$(python_get_includedir)"
}
python_execute_function -s --source-dir python compilation
}
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"
installation() {
emake DESTDIR="${D}" \
PYTHON_SITE_PACKAGES="$(python_get_sitedir)" \
docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
install
}
python_execute_function -s --source-dir python installation
python_clean_installation_image
dosym ../${MY_PN}/hippoApp.png /usr/share/pixmaps/hippoApp.png
make_desktop_entry hippodraw HippoDraw hippoApp
if use examples; then
insinto /usr/share/doc/${PF}/testsuite
doins testsuite/*.py || die "examples install failed"
insinto /usr/share/doc/${PF}/examples
doins examples/*.{fits,tnt,data,baddata}* || die
else
# these are automatically installed
rm -rf "${D}"usr/share/doc/${PF}/examples || die
fi
}
pkg_postinst() {
python_mod_optimize ${MY_PN}
}
pkg_postrm() {
python_mod_cleanup ${MY_PN}
}
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-visualization/hippodraw: ChangeLog hippodraw-1.21.3-r3.ebuild
@ 2010-05-29 16:43 Fabian Groffen (grobian)
0 siblings, 0 replies; 7+ messages in thread
From: Fabian Groffen (grobian) @ 2010-05-29 16:43 UTC (permalink / raw
To: gentoo-commits
grobian 10/05/29 16:43:31
Modified: ChangeLog hippodraw-1.21.3-r3.ebuild
Log:
Fix Prefix awareness (python_ functions don't return the prefix)
(Portage version: 2.2.00.15842-prefix/cvs/Darwin powerpc)
Revision Changes Path
1.17 sci-visualization/hippodraw/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/hippodraw/ChangeLog?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/hippodraw/ChangeLog?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/hippodraw/ChangeLog?r1=1.16&r2=1.17
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/ChangeLog,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ChangeLog 21 May 2010 19:08:31 -0000 1.16
+++ ChangeLog 29 May 2010 16:43:31 -0000 1.17
@@ -1,6 +1,10 @@
# ChangeLog for sci-visualization/hippodraw
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/ChangeLog,v 1.16 2010/05/21 19:08:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/ChangeLog,v 1.17 2010/05/29 16:43:31 grobian Exp $
+
+ 29 May 2010; Fabian Groffen <grobian@gentoo.org>
+ hippodraw-1.21.3-r3.ebuild:
+ Fix Prefix awareness (python_ functions don't return the prefix)
*hippodraw-1.21.3-r3 (21 May 2010)
1.3 sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild?r1=1.2&r2=1.3
Index: hippodraw-1.21.3-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hippodraw-1.21.3-r3.ebuild 23 May 2010 14:07:59 -0000 1.2
+++ hippodraw-1.21.3-r3.ebuild 29 May 2010 16:43:31 -0000 1.3
@@ -1,8 +1,8 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild,v 1.2 2010/05/23 14:07:59 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild,v 1.3 2010/05/29 16:43:31 grobian Exp $
-EAPI=3
+EAPI="3"
PYTHON_DEPEND="2"
PYTHON_USE_WITH="threads"
@@ -122,10 +122,10 @@
python_copy_sources python
compilation() {
emake \
- PYTHON_INCLUDES="$(python_get_includedir)" \
- PYTHON_SITE_PACKAGES="$(python_get_sitedir)" \
- NUMARRAY_INCLUDE="$(python_get_sitedir)/numpy/core/include" \
- PY_INCLUDE="$(python_get_includedir)"
+ PYTHON_INCLUDES="${EPREFIX}$(python_get_includedir)" \
+ PYTHON_SITE_PACKAGES="${EPREFIX}$(python_get_sitedir)" \
+ NUMARRAY_INCLUDE="${EPREFIX}$(python_get_sitedir)/numpy/core/include" \
+ PY_INCLUDE="${EPREFIX}$(python_get_includedir)"
}
python_execute_function -s --source-dir python compilation
}
@@ -134,10 +134,10 @@
emake DESTDIR="${D}" install || die "emake install failed"
installation() {
emake DESTDIR="${D}" \
- PYTHON_SITE_PACKAGES="$(python_get_sitedir)" \
- docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
- exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
- install
+ PYTHON_SITE_PACKAGES="${EPREFIX}$(python_get_sitedir)" \
+ docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
+ exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
+ install
}
python_execute_function -s --source-dir python installation
python_clean_installation_image
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-visualization/hippodraw: ChangeLog hippodraw-1.21.3-r3.ebuild
@ 2010-06-02 10:12 Kacper Kowalik (xarthisius)
0 siblings, 0 replies; 7+ messages in thread
From: Kacper Kowalik (xarthisius) @ 2010-06-02 10:12 UTC (permalink / raw
To: gentoo-commits
xarthisius 10/06/02 10:12:05
Modified: ChangeLog hippodraw-1.21.3-r3.ebuild
Log:
Fixing build with GCC-4.5 wrt bug 322227. Thanks Diego for the report.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.18 sci-visualization/hippodraw/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/hippodraw/ChangeLog?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/hippodraw/ChangeLog?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/hippodraw/ChangeLog?r1=1.17&r2=1.18
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/ChangeLog,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ChangeLog 29 May 2010 16:43:31 -0000 1.17
+++ ChangeLog 2 Jun 2010 10:12:04 -0000 1.18
@@ -1,6 +1,10 @@
# ChangeLog for sci-visualization/hippodraw
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/ChangeLog,v 1.17 2010/05/29 16:43:31 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/ChangeLog,v 1.18 2010/06/02 10:12:04 xarthisius Exp $
+
+ 02 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org>
+ hippodraw-1.21.3-r3.ebuild, +files/hippodraw-1.21.3-gcc45.patch:
+ Fixing build with GCC-4.5 wrt bug 322227. Thanks Diego for the report.
29 May 2010; Fabian Groffen <grobian@gentoo.org>
hippodraw-1.21.3-r3.ebuild:
1.4 sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild?r1=1.3&r2=1.4
Index: hippodraw-1.21.3-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hippodraw-1.21.3-r3.ebuild 29 May 2010 16:43:31 -0000 1.3
+++ hippodraw-1.21.3-r3.ebuild 2 Jun 2010 10:12:04 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild,v 1.3 2010/05/29 16:43:31 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild,v 1.4 2010/06/02 10:12:04 xarthisius Exp $
EAPI="3"
@@ -47,14 +47,15 @@
}
src_prepare() {
- epatch "${FILESDIR}"/${P}-gcc4.3.patch
- epatch "${FILESDIR}"/${P}-gcc4.4.patch
- epatch "${FILESDIR}"/${P}-numarray.patch
- epatch "${FILESDIR}"/${P}-test-fix.patch
- epatch "${FILESDIR}"/${P}-minuit2.patch
- epatch "${FILESDIR}"/${P}-wcslib.patch
- epatch "${FILESDIR}"/${P}-qt4.patch
- epatch "${FILESDIR}"/${P}-autoconf-2.64.patch
+ epatch "${FILESDIR}"/${P}-gcc4.3.patch \
+ "${FILESDIR}"/${P}-gcc4.4.patch \
+ "${FILESDIR}"/${P}-gcc45.patch \
+ "${FILESDIR}"/${P}-numarray.patch \
+ "${FILESDIR}"/${P}-test-fix.patch \
+ "${FILESDIR}"/${P}-minuit2.patch \
+ "${FILESDIR}"/${P}-wcslib.patch \
+ "${FILESDIR}"/${P}-qt4.patch \
+ "${FILESDIR}"/${P}-autoconf-2.64.patch
echo "#!${EPREFIX}/bin/sh" > config/py-compile
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-visualization/hippodraw: ChangeLog hippodraw-1.21.3-r3.ebuild
@ 2010-07-16 17:32 Kacper Kowalik (xarthisius)
0 siblings, 0 replies; 7+ messages in thread
From: Kacper Kowalik (xarthisius) @ 2010-07-16 17:32 UTC (permalink / raw
To: gentoo-commits
xarthisius 10/07/16 17:32:31
Modified: ChangeLog hippodraw-1.21.3-r3.ebuild
Log:
Fix install with automake-1.11 wrt bug 328545. Thanks to Diego for reporting
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Revision Changes Path
1.19 sci-visualization/hippodraw/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/hippodraw/ChangeLog?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/hippodraw/ChangeLog?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/hippodraw/ChangeLog?r1=1.18&r2=1.19
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/ChangeLog,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ChangeLog 2 Jun 2010 10:12:04 -0000 1.18
+++ ChangeLog 16 Jul 2010 17:32:30 -0000 1.19
@@ -1,6 +1,11 @@
# ChangeLog for sci-visualization/hippodraw
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/ChangeLog,v 1.18 2010/06/02 10:12:04 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/ChangeLog,v 1.19 2010/07/16 17:32:30 xarthisius Exp $
+
+ 16 Jul 2010; Kacper Kowalik <xarthisius@gentoo.org>
+ hippodraw-1.21.3-r3.ebuild, +files/hippodraw-1.21.3-automake-1.11.patch:
+ Fix install with automake-1.11 wrt bug 328545. Thanks to Diego for
+ reporting
02 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org>
hippodraw-1.21.3-r3.ebuild, +files/hippodraw-1.21.3-gcc45.patch:
1.5 sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild?r1=1.4&r2=1.5
Index: hippodraw-1.21.3-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hippodraw-1.21.3-r3.ebuild 2 Jun 2010 10:12:04 -0000 1.4
+++ hippodraw-1.21.3-r3.ebuild 16 Jul 2010 17:32:30 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild,v 1.4 2010/06/02 10:12:04 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild,v 1.5 2010/07/16 17:32:30 xarthisius Exp $
EAPI="3"
@@ -40,7 +40,7 @@
numpy? ( fits? ( dev-python/pyfits ) )"
RESTRICT_PYTHON_ABIS="3.*"
-S="${WORKDIR}/${MY_PN}-${PV}"
+S=${WORKDIR}/${MY_PN}-${PV}
pkg_setup() {
python_pkg_setup
@@ -55,7 +55,8 @@
"${FILESDIR}"/${P}-minuit2.patch \
"${FILESDIR}"/${P}-wcslib.patch \
"${FILESDIR}"/${P}-qt4.patch \
- "${FILESDIR}"/${P}-autoconf-2.64.patch
+ "${FILESDIR}"/${P}-autoconf-2.64.patch \
+ "${FILESDIR}"/${P}-automake-1.11.patch
echo "#!${EPREFIX}/bin/sh" > config/py-compile
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-visualization/hippodraw: ChangeLog hippodraw-1.21.3-r3.ebuild
@ 2010-07-17 12:45 Kacper Kowalik (xarthisius)
0 siblings, 0 replies; 7+ messages in thread
From: Kacper Kowalik (xarthisius) @ 2010-07-17 12:45 UTC (permalink / raw
To: gentoo-commits
xarthisius 10/07/17 12:45:28
Modified: ChangeLog hippodraw-1.21.3-r3.ebuild
Log:
Moved patches to gentoo mirrors
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Revision Changes Path
1.21 sci-visualization/hippodraw/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/hippodraw/ChangeLog?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/hippodraw/ChangeLog?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/hippodraw/ChangeLog?r1=1.20&r2=1.21
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/ChangeLog,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ChangeLog 16 Jul 2010 17:33:40 -0000 1.20
+++ ChangeLog 17 Jul 2010 12:45:27 -0000 1.21
@@ -1,6 +1,17 @@
# ChangeLog for sci-visualization/hippodraw
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/ChangeLog,v 1.20 2010/07/16 17:33:40 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/ChangeLog,v 1.21 2010/07/17 12:45:27 xarthisius Exp $
+
+ 17 Jul 2010; Kacper Kowalik <xarthisius@gentoo.org>
+ hippodraw-1.21.3-r3.ebuild, -files/hippodraw-1.21.3-autoconf-2.64.patch,
+ -files/hippodraw-1.21.3-automake-1.11.patch,
+ -files/hippodraw-1.21.3-gcc4.3.patch,
+ -files/hippodraw-1.21.3-gcc4.4.patch, -files/hippodraw-1.21.3-gcc45.patch,
+ -files/hippodraw-1.21.3-minuit2.patch,
+ -files/hippodraw-1.21.3-numarray.patch, -files/hippodraw-1.21.3-qt4.patch,
+ -files/hippodraw-1.21.3-test-fix.patch,
+ -files/hippodraw-1.21.3-wcslib.patch:
+ Moved patches to gentoo mirrors
16 Jul 2010; Kacper Kowalik <xarthisius@gentoo.org>
-hippodraw-1.21.3-r2.ebuild:
1.6 sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild?r1=1.5&r2=1.6
Index: hippodraw-1.21.3-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- hippodraw-1.21.3-r3.ebuild 16 Jul 2010 17:32:30 -0000 1.5
+++ hippodraw-1.21.3-r3.ebuild 17 Jul 2010 12:45:27 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild,v 1.5 2010/07/16 17:32:30 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild,v 1.6 2010/07/17 12:45:27 xarthisius Exp $
EAPI="3"
@@ -14,7 +14,8 @@
DESCRIPTION="Highly interactive data analysis Qt environment for C++ and python"
HOMEPAGE="http://www.slac.stanford.edu/grp/ek/hippodraw/"
-SRC_URI="ftp://ftp.slac.stanford.edu/users/pfkeb/${PN}/${MY_PN}-${PV}.tar.gz"
+SRC_URI="ftp://ftp.slac.stanford.edu/users/pfkeb/${PN}/${MY_PN}-${PV}.tar.gz
+ mirror://gentoo/${P}-gentoo.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
@@ -47,16 +48,16 @@
}
src_prepare() {
- epatch "${FILESDIR}"/${P}-gcc4.3.patch \
- "${FILESDIR}"/${P}-gcc4.4.patch \
- "${FILESDIR}"/${P}-gcc45.patch \
- "${FILESDIR}"/${P}-numarray.patch \
- "${FILESDIR}"/${P}-test-fix.patch \
- "${FILESDIR}"/${P}-minuit2.patch \
- "${FILESDIR}"/${P}-wcslib.patch \
- "${FILESDIR}"/${P}-qt4.patch \
- "${FILESDIR}"/${P}-autoconf-2.64.patch \
- "${FILESDIR}"/${P}-automake-1.11.patch
+ epatch "${WORKDIR}"/${P}-gcc4.3.patch \
+ "${WORKDIR}"/${P}-gcc4.4.patch \
+ "${WORKDIR}"/${P}-gcc45.patch \
+ "${WORKDIR}"/${P}-numarray.patch \
+ "${WORKDIR}"/${P}-test-fix.patch \
+ "${WORKDIR}"/${P}-minuit2.patch \
+ "${WORKDIR}"/${P}-wcslib.patch \
+ "${WORKDIR}"/${P}-qt4.patch \
+ "${WORKDIR}"/${P}-autoconf-2.64.patch \
+ "${WORKDIR}"/${P}-automake-1.11.patch
echo "#!${EPREFIX}/bin/sh" > config/py-compile
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-visualization/hippodraw: ChangeLog hippodraw-1.21.3-r3.ebuild
@ 2010-10-10 17:09 Justin Lecher (jlec)
0 siblings, 0 replies; 7+ messages in thread
From: Justin Lecher (jlec) @ 2010-10-10 17:09 UTC (permalink / raw
To: gentoo-commits
jlec 10/10/10 17:09:34
Modified: ChangeLog hippodraw-1.21.3-r3.ebuild
Log:
Fix DEP to || ( >=x11-libs/qt-assistant-4.7.0:4[compat] <x11-libs/qt-assistant-4.7.0:4 )
(Portage version: 2.2_rc91/cvs/Linux x86_64)
Revision Changes Path
1.22 sci-visualization/hippodraw/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/hippodraw/ChangeLog?rev=1.22&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/hippodraw/ChangeLog?rev=1.22&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/hippodraw/ChangeLog?r1=1.21&r2=1.22
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/ChangeLog,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ChangeLog 17 Jul 2010 12:45:27 -0000 1.21
+++ ChangeLog 10 Oct 2010 17:09:34 -0000 1.22
@@ -1,6 +1,10 @@
# ChangeLog for sci-visualization/hippodraw
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/ChangeLog,v 1.21 2010/07/17 12:45:27 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/ChangeLog,v 1.22 2010/10/10 17:09:34 jlec Exp $
+
+ 10 Oct 2010; Justin Lecher <jlec@gentoo.org> hippodraw-1.21.3-r3.ebuild:
+ Fix DEP to || ( >=x11-libs/qt-assistant-4.7.0:4[compat]
+ <x11-libs/qt-assistant-4.7.0:4 )
17 Jul 2010; Kacper Kowalik <xarthisius@gentoo.org>
hippodraw-1.21.3-r3.ebuild, -files/hippodraw-1.21.3-autoconf-2.64.patch,
1.7 sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild?r1=1.6&r2=1.7
Index: hippodraw-1.21.3-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- hippodraw-1.21.3-r3.ebuild 17 Jul 2010 12:45:27 -0000 1.6
+++ hippodraw-1.21.3-r3.ebuild 10 Oct 2010 17:09:34 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild,v 1.6 2010/07/17 12:45:27 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild,v 1.7 2010/10/10 17:09:34 jlec Exp $
EAPI="3"
@@ -29,7 +29,7 @@
numpy? ( dev-python/numpy )
x11-libs/qt-gui:4
x11-libs/qt-qt3support:4
- x11-libs/qt-assistant:4
+ || ( >=x11-libs/qt-assistant-4.7.0:4[compat] <x11-libs/qt-assistant-4.7.0:4 )
root? ( >=sci-physics/root-5 )
!root? ( sci-libs/minuit )
wcs? ( sci-astronomy/wcslib )"
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-visualization/hippodraw: ChangeLog hippodraw-1.21.3-r3.ebuild
@ 2010-10-10 17:27 Justin Lecher (jlec)
0 siblings, 0 replies; 7+ messages in thread
From: Justin Lecher (jlec) @ 2010-10-10 17:27 UTC (permalink / raw
To: gentoo-commits
jlec 10/10/10 17:27:35
Modified: ChangeLog hippodraw-1.21.3-r3.ebuild
Log:
Fix DEP to || ( >=x11-libs/qt-assistant-4.7.0:4[compat] <x11-libs/qt-assistant-4.7.0:4 ); move to qt4-r2.eclass
(Portage version: 2.2_rc91/cvs/Linux x86_64)
Revision Changes Path
1.23 sci-visualization/hippodraw/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/hippodraw/ChangeLog?rev=1.23&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/hippodraw/ChangeLog?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/hippodraw/ChangeLog?r1=1.22&r2=1.23
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/ChangeLog,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ChangeLog 10 Oct 2010 17:09:34 -0000 1.22
+++ ChangeLog 10 Oct 2010 17:27:35 -0000 1.23
@@ -1,6 +1,10 @@
# ChangeLog for sci-visualization/hippodraw
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/ChangeLog,v 1.22 2010/10/10 17:09:34 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/ChangeLog,v 1.23 2010/10/10 17:27:35 jlec Exp $
+
+ 10 Oct 2010; Justin Lecher <jlec@gentoo.org> hippodraw-1.21.3-r3.ebuild:
+ Fix DEP to || ( >=x11-libs/qt-assistant-4.7.0:4[compat]
+ <x11-libs/qt-assistant-4.7.0:4 ); move to qt4-r2.eclass
10 Oct 2010; Justin Lecher <jlec@gentoo.org> hippodraw-1.21.3-r3.ebuild:
Fix DEP to || ( >=x11-libs/qt-assistant-4.7.0:4[compat]
1.8 sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild?r1=1.7&r2=1.8
Index: hippodraw-1.21.3-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- hippodraw-1.21.3-r3.ebuild 10 Oct 2010 17:09:34 -0000 1.7
+++ hippodraw-1.21.3-r3.ebuild 10 Oct 2010 17:27:35 -0000 1.8
@@ -1,35 +1,38 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild,v 1.7 2010/10/10 17:09:34 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild,v 1.8 2010/10/10 17:27:35 jlec Exp $
EAPI="3"
PYTHON_DEPEND="2"
PYTHON_USE_WITH="threads"
SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
-inherit autotools eutils multilib python qt4
+inherit autotools eutils multilib python qt4-r2
MY_PN=HippoDraw
DESCRIPTION="Highly interactive data analysis Qt environment for C++ and python"
HOMEPAGE="http://www.slac.stanford.edu/grp/ek/hippodraw/"
-SRC_URI="ftp://ftp.slac.stanford.edu/users/pfkeb/${PN}/${MY_PN}-${PV}.tar.gz
+SRC_URI="
+ ftp://ftp.slac.stanford.edu/users/pfkeb/${PN}/${MY_PN}-${PV}.tar.gz
mirror://gentoo/${P}-gentoo.tar.bz2"
+
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-
IUSE="doc examples +fits +numpy root wcs"
-CDEPEND="dev-libs/boost[python]
- virtual/latex-base
+CDEPEND="
+ dev-libs/boost[python]
media-libs/netpbm
- fits? ( sci-libs/cfitsio )
- numpy? ( dev-python/numpy )
+ virtual/latex-base
+ || ( >=x11-libs/qt-assistant-4.7.0:4[compat] <x11-libs/qt-assistant-4.7.0:4 )
x11-libs/qt-gui:4
x11-libs/qt-qt3support:4
- || ( >=x11-libs/qt-assistant-4.7.0:4[compat] <x11-libs/qt-assistant-4.7.0:4 )
+ fits? ( sci-libs/cfitsio )
+ numpy? ( dev-python/numpy )
root? ( >=sci-physics/root-5 )
!root? ( sci-libs/minuit )
wcs? ( sci-astronomy/wcslib )"
@@ -39,25 +42,27 @@
RDEPEND="${CDEPEND}
numpy? ( fits? ( dev-python/pyfits ) )"
-RESTRICT_PYTHON_ABIS="3.*"
-S=${WORKDIR}/${MY_PN}-${PV}
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+PATCHES=(
+ "${WORKDIR}"/${P}-gcc4.3.patch \
+ "${WORKDIR}"/${P}-gcc4.4.patch \
+ "${WORKDIR}"/${P}-gcc45.patch \
+ "${WORKDIR}"/${P}-numarray.patch \
+ "${WORKDIR}"/${P}-test-fix.patch \
+ "${WORKDIR}"/${P}-minuit2.patch \
+ "${WORKDIR}"/${P}-wcslib.patch \
+ "${WORKDIR}"/${P}-qt4.patch \
+ "${WORKDIR}"/${P}-autoconf-2.64.patch \
+ "${WORKDIR}"/${P}-automake-1.11.patch )
pkg_setup() {
python_pkg_setup
}
src_prepare() {
- epatch "${WORKDIR}"/${P}-gcc4.3.patch \
- "${WORKDIR}"/${P}-gcc4.4.patch \
- "${WORKDIR}"/${P}-gcc45.patch \
- "${WORKDIR}"/${P}-numarray.patch \
- "${WORKDIR}"/${P}-test-fix.patch \
- "${WORKDIR}"/${P}-minuit2.patch \
- "${WORKDIR}"/${P}-wcslib.patch \
- "${WORKDIR}"/${P}-qt4.patch \
- "${WORKDIR}"/${P}-autoconf-2.64.patch \
- "${WORKDIR}"/${P}-automake-1.11.patch
+ qt4-r2_src_prepare
echo "#!${EPREFIX}/bin/sh" > config/py-compile
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2010-10-10 18:04 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-21 19:08 [gentoo-commits] gentoo-x86 commit in sci-visualization/hippodraw: ChangeLog hippodraw-1.21.3-r3.ebuild Justin Lecher (jlec)
-- strict thread matches above, loose matches on Subject: below --
2010-05-29 16:43 Fabian Groffen (grobian)
2010-06-02 10:12 Kacper Kowalik (xarthisius)
2010-07-16 17:32 Kacper Kowalik (xarthisius)
2010-07-17 12:45 Kacper Kowalik (xarthisius)
2010-10-10 17:09 Justin Lecher (jlec)
2010-10-10 17:27 Justin Lecher (jlec)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox