* [gentoo-commits] gentoo-x86 commit in media-libs/vigra: ChangeLog vigra-1.8.0-r1.ebuild
@ 2013-04-12 7:52 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 2+ messages in thread
From: Samuli Suominen (ssuominen) @ 2013-04-12 7:52 UTC (permalink / raw
To: gentoo-commits
ssuominen 13/04/12 07:52:53
Modified: ChangeLog
Added: vigra-1.8.0-r1.ebuild
Log:
Use python-single-r1.eclass instead of python.eclass. This ebuild should be converted to python-r1.eclass if upstream gets Python 3.x support working in the future. Use eutils.eclass instead of base.eclass for patching. Always pull in dev-lang/python:2.7 and correct shebang for /usr/bin/vigra-config wrt #465510, Comment #1 by Vicente Olivert Riera
(Portage version: 2.2.0_alpha172/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.58 media-libs/vigra/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/vigra/ChangeLog?rev=1.58&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/vigra/ChangeLog?rev=1.58&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/vigra/ChangeLog?r1=1.57&r2=1.58
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- ChangeLog 11 Apr 2013 17:35:21 -0000 1.57
+++ ChangeLog 12 Apr 2013 07:52:53 -0000 1.58
@@ -1,6 +1,15 @@
# ChangeLog for media-libs/vigra
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v 1.57 2013/04/11 17:35:21 vincent Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v 1.58 2013/04/12 07:52:53 ssuominen Exp $
+
+*vigra-1.8.0-r1 (12 Apr 2013)
+
+ 12 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> +vigra-1.8.0-r1.ebuild:
+ Use python-single-r1.eclass instead of python.eclass. This ebuild should be
+ converted to python-r1.eclass if upstream gets Python 3.x support working in
+ the future. Use eutils.eclass instead of base.eclass for patching. Always
+ pull in dev-lang/python:2.7 and correct shebang for /usr/bin/vigra-config wrt
+ #465510, Comment #1 by Vicente Olivert Riera
11 Apr 2013; Vicente Olivert Riera <vincent@gentoo.org> vigra-1.8.0.ebuild:
amd64, ppc, ppc64 and x86 stable, wrt bug #465510
1.1 media-libs/vigra/vigra-1.8.0-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/vigra/vigra-1.8.0-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/vigra/vigra-1.8.0-r1.ebuild?rev=1.1&content-type=text/plain
Index: vigra-1.8.0-r1.ebuild
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/vigra-1.8.0-r1.ebuild,v 1.1 2013/04/12 07:52:53 ssuominen Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="threads,xml"
# This ebuild could use python-r1 in the future when upstream gets Python 3.x
# support working
inherit cmake-utils eutils multilib python-single-r1
MY_P=${P}-src
DESCRIPTION="C++ computer vision library with emphasize on customizable algorithms and data structures"
HOMEPAGE="http://hci.iwr.uni-heidelberg.de/vigra/"
SRC_URI="http://hci.iwr.uni-heidelberg.de/vigra/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc +fftw +hdf5 +jpeg openexr +png +python test +tiff"
# Pull in dev-lang/python:2.7 for vigra-config which is always installed
RDEPEND="dev-lang/python:2.7
>=dev-libs/boost-1.52.0-r6[python?,${PYTHON_USEDEP}]
fftw? ( sci-libs/fftw:3.0 )
hdf5? ( sci-libs/hdf5 )
jpeg? ( virtual/jpeg )
openexr? ( media-libs/openexr:= )
png? ( media-libs/libpng:0= )
python? ( ${PYTHON_DEPS} )
tiff? ( media-libs/tiff:0= )"
DEPEND="${RDEPEND}
doc? (
app-doc/doxygen
python? ( >=dev-python/sphinx-1.1.3-r5[${PYTHON_USEDEP}] )
)
test? (
python? ( >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}] )
)"
REQUIRED_USE="doc? ( hdf5 fftw )
python? ( hdf5 )
test? ( hdf5 python fftw )"
CMAKE_IN_SOURCE_BUILD=1
DOCS=( README.txt )
pkg_setup() {
use python && python-single-r1_pkg_setup
}
src_prepare() {
epatch \
"${FILESDIR}"/${P}-automagicness.patch \
"${FILESDIR}"/${P}-numpy_doc.patch \
"${FILESDIR}"/${P}-gcc47.patch
# Don't build nor install API docs when not requested
use doc || { sed -i -e '/ADD_SUBDIRECTORY(docsrc)/d' CMakeLists.txt || die; }
# Don't use python_fix_shebang because we can't put this behind USE="python"
sed -i -e '/env/s:python:python2:' config/vigra-config.in || die
}
src_configure() {
local libdir=$(get_libdir)
# required for ddocdir
_check_build_dir init
# vigranumpy needs python and if enabled it ooms
# doc needs doxygen and python
# walgrind no use for us since we restrict test
# $(cmake-utils_use_with valgrind VALGRIND)
local mycmakeargs=(
-DDOCDIR="${CMAKE_BUILD_DIR}"/doc
-DLIBDIR_SUFFIX=${libdir/lib}
-DDOCINSTALL=share/doc/${PF}
-DWITH_VALGRIND=OFF
$(cmake-utils_use_with python VIGRANUMPY)
$(cmake-utils_use_with png)
$(cmake-utils_use_with jpeg)
$(cmake-utils_use_with openexr)
$(cmake-utils_use_with tiff)
$(cmake-utils_use_with fftw FFTW3)
$(cmake-utils_use_with hdf5)
$(cmake-utils_use_build test TESTING)
$(cmake-utils_use test CREATE_CTEST_TARGETS)
$(cmake-utils_use test AUTOBUILD_TESTS)
)
cmake-utils_src_configure
}
src_compile() {
cmake-utils_src_compile
use doc && cmake-utils_src_make doc
}
src_test() { :; } #390447
src_install() {
cmake-utils_src_install
use python && python_optimize
# drop useless cmake files from libdir
rm -rf "${ED}"/usr/$(get_libdir)/${PN}
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-libs/vigra: ChangeLog vigra-1.8.0-r1.ebuild
@ 2013-04-28 15:42 Andrey Grozin (grozin)
0 siblings, 0 replies; 2+ messages in thread
From: Andrey Grozin (grozin) @ 2013-04-28 15:42 UTC (permalink / raw
To: gentoo-commits
grozin 13/04/28 15:42:20
Modified: ChangeLog vigra-1.8.0-r1.ebuild
Log:
Upstream patch to fix #417667
(Portage version: 2.2.0_alpha173/cvs/Linux i686, signed Manifest commit with key 0x3AFFCE974D34BD8C!)
Revision Changes Path
1.60 media-libs/vigra/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/vigra/ChangeLog?rev=1.60&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/vigra/ChangeLog?rev=1.60&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/vigra/ChangeLog?r1=1.59&r2=1.60
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- ChangeLog 12 Apr 2013 08:14:47 -0000 1.59
+++ ChangeLog 28 Apr 2013 15:42:20 -0000 1.60
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/vigra
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v 1.59 2013/04/12 08:14:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v 1.60 2013/04/28 15:42:20 grozin Exp $
+
+ 28 Apr 2013; Andrey Grozin <grozin@gentoo.org> vigra-1.8.0-r1.ebuild,
+ +files/vigra-1.8.0-doxygen.patch:
+ Upstream patch to fix #417667
12 Apr 2013; Samuli Suominen <ssuominen@gentoo.org>
-files/1.7.1-automagicness.patch, -files/1.7.1-fix-nosetest.patch,
1.2 media-libs/vigra/vigra-1.8.0-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/vigra/vigra-1.8.0-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/vigra/vigra-1.8.0-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/vigra/vigra-1.8.0-r1.ebuild?r1=1.1&r2=1.2
Index: vigra-1.8.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/vigra/vigra-1.8.0-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vigra-1.8.0-r1.ebuild 12 Apr 2013 07:52:53 -0000 1.1
+++ vigra-1.8.0-r1.ebuild 28 Apr 2013 15:42:20 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/vigra-1.8.0-r1.ebuild,v 1.1 2013/04/12 07:52:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/vigra-1.8.0-r1.ebuild,v 1.2 2013/04/28 15:42:20 grozin Exp $
EAPI=5
@@ -56,7 +56,8 @@
epatch \
"${FILESDIR}"/${P}-automagicness.patch \
"${FILESDIR}"/${P}-numpy_doc.patch \
- "${FILESDIR}"/${P}-gcc47.patch
+ "${FILESDIR}"/${P}-gcc47.patch \
+ "${FILESDIR}"/${P}-doxygen.patch
# Don't build nor install API docs when not requested
use doc || { sed -i -e '/ADD_SUBDIRECTORY(docsrc)/d' CMakeLists.txt || die; }
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-04-28 15:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-12 7:52 [gentoo-commits] gentoo-x86 commit in media-libs/vigra: ChangeLog vigra-1.8.0-r1.ebuild Samuli Suominen (ssuominen)
-- strict thread matches above, loose matches on Subject: below --
2013-04-28 15:42 Andrey Grozin (grozin)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox