jer         15/04/22 17:09:08

  Modified:             ChangeLog
  Added:                hwloc-1.10.1-r1.ebuild hwloc-1.10.0-r2.ebuild
  Removed:              hwloc-1.10.1.ebuild hwloc-1.10.0-r1.ebuild
  Log:
  Revision bump.
  
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 
A792A613)

Revision  Changes    Path
1.52                 sys-apps/hwloc/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hwloc/ChangeLog?rev=1.52&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hwloc/ChangeLog?rev=1.52&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hwloc/ChangeLog?r1=1.51&r2=1.52

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/hwloc/ChangeLog,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- ChangeLog   22 Apr 2015 15:30:39 -0000      1.51
+++ ChangeLog   22 Apr 2015 17:09:08 -0000      1.52
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/hwloc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/ChangeLog,v 1.51 2015/04/22 
15:30:39 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/ChangeLog,v 1.52 2015/04/22 
17:09:08 jer Exp $
+
+*hwloc-1.10.1-r1 (22 Apr 2015)
+*hwloc-1.10.0-r2 (22 Apr 2015)
+
+  22 Apr 2015; Jeroen Roovers <[email protected]> -hwloc-1.10.0-r1.ebuild,
+  +hwloc-1.10.0-r2.ebuild, -hwloc-1.10.1.ebuild, +hwloc-1.10.1-r1.ebuild:
+  Revision bump.
 
   22 Apr 2015; Justin Bronder <[email protected]> hwloc-1.10.0-r1.ebuild,
   hwloc-1.10.1.ebuild,



1.1                  sys-apps/hwloc/hwloc-1.10.1-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hwloc/hwloc-1.10.1-r1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hwloc/hwloc-1.10.1-r1.ebuild?rev=1.1&content-type=text/plain

Index: hwloc-1.10.1-r1.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/hwloc-1.10.1-r1.ebuild,v 1.1 
2015/04/22 17:09:08 jer Exp $

EAPI=5

inherit flag-o-matic cuda autotools-multilib multilib versionator

MY_PV=v$(get_version_component_range 1-2)

DESCRIPTION="displays the hardware topology in convenient formats"
HOMEPAGE="http://www.open-mpi.org/projects/hwloc/";
SRC_URI="http://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2";

LICENSE="BSD"
SLOT="0/5"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd 
~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="cairo cuda debug gl +numa opencl +pci plugins svg static-libs xml X"

# TODO opencl only works with AMD so no virtual
# dev-util/nvidia-cuda-toolkit is always multilib

RDEPEND=">=sys-libs/ncurses-5.9-r3[${MULTILIB_USEDEP}]
        cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] )
        cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
        gl? ( media-video/nvidia-settings )
        opencl? ( x11-drivers/ati-drivers:* )
        pci? (
                >=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
                >=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
        )
        plugins? ( dev-libs/libltdl:0[${MULTILIB_USEDEP}] )
        numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )
        xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}
        >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"

DOCS=( AUTHORS NEWS README VERSION )

PATCHES=(
        "${FILESDIR}/${PN}-1.8.1-gl.patch"
        "${FILESDIR}/hwloc-gather-topology-fix-lstopo-path-after-install.patch"
)
AUTOTOOLS_AUTORECONF=1

src_prepare() {
        if use cuda ; then
                append-cflags -I/opt/cuda/include
                append-cppflags -I/opt/cuda/include
        fi
        autotools-utils_src_prepare
}

multilib_src_configure() {
        export HWLOC_PKG_CONFIG=$(tc-getPKG_CONFIG) #393467
        use cuda && local LDFLAGS="${LDFLAGS} -L/opt/cuda/$(get_libdir)"
        local myeconfargs=(
                --disable-silent-rules
                --docdir="${EPREFIX}"/usr/share/doc/${PF}
                $(use_enable cairo)
                $(use_enable cuda)
                $(use_enable debug)
                $(multilib_native_use_enable gl)
                $(multilib_native_use_enable opencl)
                $(use_enable pci)
                $(use_enable plugins)
                $(use_enable numa libnuma)
                $(use_enable xml libxml2)
                $(use_with X x)
        )
        autotools-utils_src_configure
}



1.1                  sys-apps/hwloc/hwloc-1.10.0-r2.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hwloc/hwloc-1.10.0-r2.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hwloc/hwloc-1.10.0-r2.ebuild?rev=1.1&content-type=text/plain

Index: hwloc-1.10.0-r2.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/hwloc-1.10.0-r2.ebuild,v 1.1 
2015/04/22 17:09:08 jer Exp $

EAPI=5

inherit flag-o-matic cuda autotools-utils multilib versionator

MY_PV=v$(get_version_component_range 1-2)

DESCRIPTION="displays the hardware topology in convenient formats"
HOMEPAGE="http://www.open-mpi.org/projects/hwloc/";
SRC_URI="http://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2";

LICENSE="BSD"
SLOT="0/5"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd 
~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="cairo cuda debug gl +numa opencl +pci plugins svg static-libs xml X"

# TODO opencl only works with AMD so no virtual

RDEPEND="sys-libs/ncurses
        cairo? ( x11-libs/cairo[X?,svg?] )
        cuda? ( dev-util/nvidia-cuda-toolkit )
        gl? ( media-video/nvidia-settings )
        opencl? ( x11-drivers/ati-drivers )
        pci? (
                sys-apps/pciutils
                x11-libs/libpciaccess
        )
        plugins? ( dev-libs/libltdl:0 )
        numa? ( sys-process/numactl )
        xml? ( dev-libs/libxml2 )"
DEPEND="${RDEPEND}
        virtual/pkgconfig"

DOCS=( AUTHORS NEWS README VERSION )

PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" )
AUTOTOOLS_AUTORECONF=1

src_prepare() {
        if use cuda ; then
                append-cflags -I/opt/cuda/include
                append-cppflags -I/opt/cuda/include
                append-ldflags -L/opt/cuda/$(get_libdir)
        fi
        autotools-utils_src_prepare
}

src_configure() {
        export HWLOC_PKG_CONFIG=$(tc-getPKG_CONFIG) #393467
        local myeconfargs=(
                --disable-silent-rules
                --docdir="${EPREFIX}"/usr/share/doc/${PF}
                $(use_enable cairo)
                $(use_enable cuda)
                $(use_enable debug)
                $(use_enable gl)
                $(use_enable opencl)
                $(use_enable pci)
                $(use_enable plugins)
                $(use_enable numa libnuma)
                $(use_enable xml libxml2)
                $(use_with X x)
        )
        autotools-utils_src_configure
}

src_install() {
        autotools-utils_src_install

        # Fixed by upstream, but it seems overkill to require an autoregen for 
what
        # is just a sed fix.
        # 
https://github.com/open-mpi/hwloc/commit/6d42748f8604f3c1d0ca6cf122e8776b3c153ac4?diff=unified
        sed -i 's|bindir/lstopo/|bindir/|' 
"${ED}"/usr/bin/hwloc-gather-topology || die
}




Reply via email to