From: "Andrew Savchenko" <bircoph@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
Date: Tue, 15 May 2012 08:49:03 +0000 (UTC) [thread overview]
Message-ID: <1337071677.ee103db4bd9fcb17d2d8631487cf33107297d5b8.bircoph@gentoo> (raw)
commit: ee103db4bd9fcb17d2d8631487cf33107297d5b8
Author: Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Tue May 15 08:47:57 2012 +0000
Commit: Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Tue May 15 08:47:57 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ee103db4
sci-physics/root: version bump
---
sci-physics/root/ChangeLog | 12 ++
.../root/files/root-5.26.00e-libpng15.patch | 33 -----
.../files/root-5.26.00g-explicit-functions.patch | 12 --
.../root/files/root-5.28.00b-nobyte-compile.patch | 138 --------------------
.../files/root-5.28.00h-explicit-functions.patch | 12 --
.../root/{root-9999.ebuild => root-5.32.03.ebuild} | 14 +-
sci-physics/root/root-9999.ebuild | 3 +-
7 files changed, 19 insertions(+), 205 deletions(-)
diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 6d49d5c..bd33ae5 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,18 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
+*root-5.32.03 (15 May 2012)
+
+ 15 May 2012; Andrew Savchenko <bircoph@gmail.com>
+ -files/root-5.26.00e-libpng15.patch,
+ -files/root-5.26.00g-explicit-functions.patch,
+ -files/root-5.28.00b-nobyte-compile.patch,
+ -files/root-5.28.00h-explicit-functions.patch, +root-5.32.03.ebuild,
+ root-9999.ebuild:
+ Bump ebuild, use live ebuild as a template.
+ Switch to virtual/pkgconfig. Remove extra KEYWORDS from live
+ ebuild.
+
03 Apr 2012; Justin Lecher <jlec@gentoo.org> -root-5.26.00g.ebuild,
-root-5.28.00h-r1.ebuild, -root-5.32.02-r1.ebuild:
Drop in tree version
diff --git a/sci-physics/root/files/root-5.26.00e-libpng15.patch b/sci-physics/root/files/root-5.26.00e-libpng15.patch
deleted file mode 100644
index 91ed9c4..0000000
--- a/sci-physics/root/files/root-5.26.00e-libpng15.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-This patch is a copy from media-libs/libafterimage.
-
---- graf2d/asimage/src/libAfterImage/export.c
-+++ graf2d/asimage/src/libAfterImage/export.c
-@@ -496,7 +496,7 @@
- png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL );
- if ( png_ptr != NULL )
- if( (info_ptr = png_create_info_struct(png_ptr)) != NULL )
-- if( setjmp(png_ptr->jmpbuf) )
-+ if( setjmp(png_jmpbuf(png_ptr)) )
- {
- png_destroy_info_struct(png_ptr, (png_infopp) &info_ptr);
- info_ptr = NULL ;
---- graf2d/asimage/src/libAfterImage/import.c
-+++ graf2d/asimage/src/libAfterImage/import.c
-@@ -1251,7 +1251,7 @@
- * the normal method of doing things with libpng). REQUIRED unless you
- * set up your own error handlers in the png_create_read_struct() earlier.
- */
-- if ( !setjmp (png_ptr->jmpbuf))
-+ if ( !setjmp (png_jmpbuf(png_ptr)))
- {
- ASFlagType rgb_flags = ASStorage_RLEDiffCompress|ASStorage_32Bit ;
-
-@@ -1468,7 +1468,7 @@
-
- static void asim_png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
- {
-- ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_ptr->io_ptr;
-+ ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_get_io_ptr(png_ptr);
- memcpy(data, buf->buffer, length);
- buf->buffer += length;
- }
diff --git a/sci-physics/root/files/root-5.26.00g-explicit-functions.patch b/sci-physics/root/files/root-5.26.00g-explicit-functions.patch
deleted file mode 100644
index 16a7206..0000000
--- a/sci-physics/root/files/root-5.26.00g-explicit-functions.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- root/io/io/Module.mk.orig 2011-09-29 13:49:50.000000000 +0400
-+++ root/io/io/Module.mk 2012-03-09 02:57:20.518370595 +0400
-@@ -66,9 +66,4 @@
- distclean:: distclean-$(MODNAME)
-
- ##### extra rules ######
--#ifeq ($(GCC_VERS_FULL),gcc-4.4.0)
--ifeq ($(GCC_VERS),gcc-4.4)
--ifneq ($(filter -O%,$(OPT)),)
- $(IODIRS)/TStreamerInfoReadBuffer.o: CXXFLAGS += -DR__EXPLICIT_FUNCTION_INSTANTIATION
--endif
--endif
diff --git a/sci-physics/root/files/root-5.28.00b-nobyte-compile.patch b/sci-physics/root/files/root-5.28.00b-nobyte-compile.patch
deleted file mode 100644
index 7029bf1..0000000
--- a/sci-physics/root/files/root-5.28.00b-nobyte-compile.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff -Naur root.orig/Makefile root/Makefile
---- root.orig/Makefile 2010-12-17 22:48:40.577775091 +0300
-+++ root/Makefile 2010-12-17 22:49:27.902497903 +0300
-@@ -1148,10 +1148,7 @@
- if test "x$(RFLX_GRFLXPY)" != "x"; then \
- rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPY); \
- fi; \
-- if test "x$(RFLX_GRFLXPYC)" != "x"; then \
-- rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPYC); \
-- fi; \
-- if test "x$(RFLX_GRFLXPY)$(RFLX_GRFLXPYC)" != "x"; then \
-+ if test "x$(RFLX_GRFLXPY)" != "x"; then \
- dir=$(RFLX_GRFLXDD:lib/=); \
- while test "x$${dir}" != "x" && \
- test -d $(DESTDIR)$(LIBDIR)/$${dir} && \
-diff -Naur root.orig/bindings/pyroot/Module.mk root/bindings/pyroot/Module.mk
---- root.orig/bindings/pyroot/Module.mk 2010-12-17 22:48:39.941179413 +0300
-+++ root/bindings/pyroot/Module.mk 2010-12-17 22:49:27.899164943 +0300
-@@ -48,8 +48,6 @@
- ROOTPY := $(subst $(MODDIR),$(LPATH),$(ROOTPYS))
- $(LPATH)/%.py: $(MODDIR)/%.py; cp $< $@
- endif
--ROOTPYC := $(ROOTPY:.py=.pyc)
--ROOTPYO := $(ROOTPY:.py=.pyo)
-
- # used in the main Makefile
- ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH))
-@@ -68,10 +66,8 @@
- include/%.h: $(PYROOTDIRI)/%.h
- cp $< $@
-
--%.pyc: %.py; python -c 'import py_compile; py_compile.compile( "$<" )'
--%.pyo: %.py; python -O -c 'import py_compile; py_compile.compile( "$<" )'
-
--$(PYROOTLIB): $(PYROOTO) $(PYROOTDO) $(ROOTPY) $(ROOTPYC) $(ROOTPYO) \
-+$(PYROOTLIB): $(PYROOTO) $(PYROOTDO) $(ROOTPY) \
- $(ROOTLIBSDEP) $(PYTHONLIBDEP)
- @$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
- "$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \
-@@ -113,7 +109,7 @@
-
- distclean-$(MODNAME): clean-$(MODNAME)
- @rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \
-- $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \
-+ $(ROOTPY) $(PYROOTMAP) \
- $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64)
-
- distclean:: distclean-$(MODNAME)
-diff -Naur root.orig/build/package/debian/rules root/build/package/debian/rules
---- root.orig/build/package/debian/rules 2010-12-17 22:48:40.197817461 +0300
-+++ root/build/package/debian/rules 2010-12-17 22:49:27.902497903 +0300
-@@ -623,10 +623,6 @@
- -X$(SYSCONFDIR)/root/system.rootauthrc \
- -X$(SYSCONFDIR)/root/system.rootdaemonrc \
- -X$(PREFIX)/lib/root/$(SOVERS)/libAfterImage.a \
-- -X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyc \
-- -X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyo \
-- -X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyc \
-- -X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyo
- # $(foreach i, \
- # $(wildcard $(DTMP)/$(PREFIX)/lib/root/lib*.so.$(SOVERS)), \
- # -X$(i:$(DTMP)/%=%) )
-diff -Naur root.orig/cint/cintex/Module.mk root/cint/cintex/Module.mk
---- root.orig/cint/cintex/Module.mk 2010-12-17 22:48:40.057833071 +0300
-+++ root/cint/cintex/Module.mk 2010-12-17 22:49:27.902497903 +0300
-@@ -31,10 +31,6 @@
- CINTEXPY := $(subst $(MODDIR)/python,$(LPATH),$(CINTEXPYS))
- $(LPATH)/%.py: $(MODDIR)/python/%.py; cp $< $@
- endif
--ifneq ($(BUILDPYTHON),no)
--CINTEXPYC := $(CINTEXPY:.py=.pyc)
--CINTEXPYO := $(CINTEXPY:.py=.pyo)
--endif
-
- # used in the main Makefile
- ALLHDRS += $(patsubst $(MODDIRI)/Cintex/%.h,include/Cintex/%.h,$(CINTEXH))
-@@ -86,8 +82,6 @@
- fi)
- cp $< $@
-
--%.pyc: %.py; python -c 'import py_compile; py_compile.compile( "$<" )'
--%.pyo: %.py; python -O -c 'import py_compile; py_compile.compile( "$<" )'
-
- $(CINTEXLIB): $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \
- $(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP)
-diff -Naur root.orig/cint/reflex/Module.mk root/cint/reflex/Module.mk
---- root.orig/cint/reflex/Module.mk 2010-12-17 22:48:40.037835301 +0300
-+++ root/cint/reflex/Module.mk 2010-12-17 22:51:36.871451359 +0300
-@@ -48,9 +48,6 @@
- RFLX_GRFLXS := $(wildcard $(RFLX_GRFLXSD)/*.py)
- RFLX_GRFLXPY := $(patsubst $(RFLX_GRFLXSD)/%.py,$(RFLX_GRFLXDD)/%.py,$(RFLX_GRFLXS))
- RFLX_GRFLXPY += $(RFLX_GCCXMLPATHPY)
--ifneq ($(BUILDPYTHON),no)
--RFLX_GRFLXPYC := $(subst .py,.pyc,$(RFLX_GRFLXPY))
--endif
-
- RFLX_LIBDIR = $(LIBDIR)
-
-@@ -92,7 +89,7 @@
-
- ALLEXECS += $(RFLX_GENMAPX)
-
--POSTBIN += $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
-+POSTBIN += $(RFLX_GRFLXPY)
-
- ##### local rules #####
- .PHONY: all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \
-@@ -122,8 +119,6 @@
- mkdir -p lib/python/genreflex; fi )
- cp $< $@
-
--$(RFLX_GRFLXDD)/%.pyc: $(RFLX_GRFLXDD)/%.py
-- @python -c 'import py_compile; py_compile.compile( "$<" )'
-
- $(RFLX_GENMAPO) : CXXFLAGS += -I$(REFLEXDIRS)/genmap
-
-@@ -149,7 +144,7 @@
- $(RLIBMAP) -o $@ -l $(REFLEXDICTLIB) \
- -d $(REFLEXDICTLIBDEPM) -c $(REFLEXL)
-
--all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
-+all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPY)
-
- clean-genreflex:
- @rm -rf lib/python/genreflex
-diff -Naur root.orig/cint/reflex/python/CMakeLists.txt root/cint/reflex/python/CMakeLists.txt
---- root.orig/cint/reflex/python/CMakeLists.txt 2010-12-17 22:48:40.037835301 +0300
-+++ root/cint/reflex/python/CMakeLists.txt 2010-12-17 22:49:27.902497903 +0300
-@@ -15,7 +15,7 @@
- ##################### sources ####################
-
- FILE(GLOB_RECURSE GENREFLEX_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} genreflex/*.py)
--SET(GENREFLEX_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/genreflex/genreflex.pyc PARENT_SCOPE)
-+SET(GENREFLEX_SCRIPT PARENT_SCOPE)
-
- ##################### gccxmlpath ####################
-
-
diff --git a/sci-physics/root/files/root-5.28.00h-explicit-functions.patch b/sci-physics/root/files/root-5.28.00h-explicit-functions.patch
deleted file mode 100644
index 918b696..0000000
--- a/sci-physics/root/files/root-5.28.00h-explicit-functions.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- root/io/io/Module.mk.orig 2011-11-24 20:12:56.000000000 +0400
-+++ root/io/io/Module.mk 2012-03-09 03:45:42.850549826 +0400
-@@ -67,9 +67,4 @@
- distclean:: distclean-$(MODNAME)
-
- ##### extra rules ######
--#ifeq ($(GCC_VERS_FULL),gcc-4.4.0)
--ifeq ($(GCC_VERS),gcc-4.4)
--ifneq ($(filter -O%,$(OPT)),)
- $(call stripsrc,$(IODIRS)/TStreamerInfoReadBuffer.o): CXXFLAGS += -DR__EXPLICIT_FUNCTION_INSTANTIATION
--endif
--endif
diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-5.32.03.ebuild
similarity index 96%
copy from sci-physics/root/root-9999.ebuild
copy to sci-physics/root/root-5.32.03.ebuild
index 6b3c224..8366d86 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-5.32.03.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.32.01.ebuild,v 1.1 2012/03/02 05:34:01 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.32.02-r1.ebuild,v 1.3 2012/05/04 07:55:34 jdhore Exp $
EAPI=4
PYTHON_DEPEND="python? 2"
@@ -33,9 +33,8 @@ SRC_URI="${SRC_URI}
SLOT="0"
LICENSE="LGPL-2.1"
-KEYWORDS=""
IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
- llvm +math mpi mysql odbc +opengl openmp oracle postgres prefix
+ +math mpi mysql odbc +opengl openmp oracle postgres prefix
pythia6 pythia8 python qt4 +reflex ruby ssl xft xinetd xml xrootd"
CDEPEND="
@@ -78,7 +77,6 @@ CDEPEND="
graphviz? ( media-gfx/graphviz )
kerberos? ( virtual/krb5 )
ldap? ( net-nds/openldap )
- llvm? ( =sys-devel/clang-9999 =sys-devel/llvm-9999 )
math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
mysql? ( virtual/mysql )
odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
@@ -94,7 +92,7 @@ CDEPEND="
xrootd? ( net-libs/xrootd )"
DEPEND="${CDEPEND}
- dev-util/pkgconfig"
+ virtual/pkgconfig"
RDEPEND="
virtual/fortran
@@ -142,7 +140,8 @@ src_prepare() {
"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \
- "${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch
+ "${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch \
+ "${FILESDIR}"/${PN}-${PATCH_PV2}-explicit-functions.patch
# make sure we use system libs and headers
rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
@@ -191,7 +190,6 @@ src_configure() {
--with-f77=$(tc-getFC) \
--with-ld=$(tc-getCXX) \
--with-afs-shared=yes \
- --with-llvm-config="${EPREFIX}"/usr/bin/llvm-config \
--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
--disable-builtin-afterimage \
--disable-builtin-freetype \
@@ -200,6 +198,7 @@ src_configure() {
--disable-builtin-pcre \
--disable-builtin-zlib \
--disable-builtin-lzma \
+ --disable-cling \
--enable-astiff \
--enable-exceptions \
--enable-explicitlink \
@@ -221,7 +220,6 @@ src_configure() {
$(use_enable graphviz gviz) \
$(use_enable kerberos krb5) \
$(use_enable ldap) \
- $(use_enable llvm cling) \
$(use_enable math gsl-shared) \
$(use_enable math genvector) \
$(use_enable math mathmore) \
diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 6b3c224..1b9f8e8 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -33,7 +33,6 @@ SRC_URI="${SRC_URI}
SLOT="0"
LICENSE="LGPL-2.1"
-KEYWORDS=""
IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
llvm +math mpi mysql odbc +opengl openmp oracle postgres prefix
pythia6 pythia8 python qt4 +reflex ruby ssl xft xinetd xml xrootd"
@@ -94,7 +93,7 @@ CDEPEND="
xrootd? ( net-libs/xrootd )"
DEPEND="${CDEPEND}
- dev-util/pkgconfig"
+ virtual/pkgconfig"
RDEPEND="
virtual/fortran
next reply other threads:[~2012-05-15 8:49 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-15 8:49 Andrew Savchenko [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-07-06 14:06 [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/ Justin Bronder
2015-10-01 6:06 Justin Lecher
2015-07-18 13:49 Andrew Savchenko
2015-04-12 13:55 Andrew Savchenko
2015-04-08 2:24 Andrew Savchenko
2015-03-02 7:13 Andrew Savchenko
2014-07-06 12:53 Andrew Savchenko
2014-07-02 22:37 Andrew Savchenko
2014-07-02 16:32 Andrew Savchenko
2014-07-02 13:35 Andrew Savchenko
2013-12-10 15:05 Andrew Savchenko
2013-12-05 17:08 Andrew Savchenko
2013-11-09 5:04 Andrew Savchenko
2013-10-16 4:49 Nicolas Bock
2013-10-15 14:17 Andrew Savchenko
2013-02-23 12:45 Andrew Savchenko
2013-01-21 22:32 Andrew Savchenko
2012-10-28 22:46 Andrew Savchenko
2012-10-25 16:37 Andrew Savchenko
2012-10-19 21:32 Andrew Savchenko
2012-07-23 21:11 Andrew Savchenko
2012-07-22 8:03 Andrew Savchenko
2012-07-21 17:12 Andrew Savchenko
2012-07-01 6:59 Andrew Savchenko
2012-06-20 9:18 Andrew Savchenko
2012-06-19 20:20 Andrew Savchenko
2012-06-19 20:20 Andrew Savchenko
2012-05-29 23:01 Andrew Savchenko
2012-03-21 23:46 Andrew Savchenko
2012-03-09 1:11 Andrew Savchenko
2012-03-01 14:37 Andrew Savchenko
2012-02-27 18:11 Andrew Savchenko
2012-02-13 17:43 Sebastien Fabbro
2012-01-20 9:14 Andrew Savchenko
2011-12-04 0:50 Andrew Savchenko
2011-12-04 0:29 Andrew Savchenko
2011-10-21 12:36 Andrew Savchenko
2011-10-07 19:43 Andrew Savchenko
2011-08-02 21:49 Andrew Savchenko
2011-03-16 21:16 Sebastien Fabbro
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1337071677.ee103db4bd9fcb17d2d8631487cf33107297d5b8.bircoph@gentoo \
--to=bircoph@gmail.com \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox