axs         15/04/14 15:10:59

  Modified:             ChangeLog
  Added:                snns-4.3-r2.ebuild
  Removed:              snns-4.3-r1.ebuild
  Log:
  Reworked the solution for the netperf collision, dropped the 'find all 
executable files' method of installing tools for 'emake install', added missing 
deps; resolves bug 546566
  
  (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 
2B6559ED)

Revision  Changes    Path
1.28                 sci-mathematics/snns/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/snns/ChangeLog?rev=1.28&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/snns/ChangeLog?rev=1.28&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/snns/ChangeLog?r1=1.27&r2=1.28

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/snns/ChangeLog,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ChangeLog   10 Apr 2015 20:09:40 -0000      1.27
+++ ChangeLog   14 Apr 2015 15:10:59 -0000      1.28
@@ -1,6 +1,14 @@
 # ChangeLog for sci-mathematics/snns
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/snns/ChangeLog,v 1.27 
2015/04/10 20:09:40 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/snns/ChangeLog,v 1.28 
2015/04/14 15:10:59 axs Exp $
+
+*snns-4.3-r2 (14 Apr 2015)
+
+  14 Apr 2015; Ian Stakenvicius (_AxS_) <[email protected]>
+  +files/4.3-snns-netperf.patch, +snns-4.3-r2.ebuild, -snns-4.3-r1.ebuild:
+  Reworked the solution for the netperf collision, dropped the 'find all
+  executable files' method of installing tools for 'emake install', added
+  missing deps; resolves bug 546566
 
   10 Apr 2015; Ian Stakenvicius (_AxS_) <[email protected]> snns-4.3-r1.ebuild:
   added REQUIRED_USE to properly support the python-optional distutils-r1



1.1                  sci-mathematics/snns/snns-4.3-r2.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/snns/snns-4.3-r2.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/snns/snns-4.3-r2.ebuild?rev=1.1&content-type=text/plain

Index: snns-4.3-r2.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/snns/snns-4.3-r2.ebuild,v 
1.1 2015/04/14 15:10:59 axs Exp $

EAPI=5
PYTHON_COMPAT=( python2_7 )
DISTUTILS_OPTIONAL=1
inherit distutils-r1 eutils

MY_P="SNNSv${PV}"
DESCRIPTION="Stuttgart Neural Network Simulator"
HOMEPAGE="http://sourceforge.net/projects/snns/";
SRC_URI="http://www.ra.cs.uni-tuebingen.de/downloads/SNNS/${MY_P}.tar.gz
        doc? ( 
http://www.ra.cs.uni-tuebingen.de/downloads/SNNS/SNNSv4.2.Manual.pdf )"

LICENSE="LGPL-2.1"
KEYWORDS="~amd64 ~ppc ~x86"
SLOT="0"
IUSE="X doc python"

RDEPEND="X? (
                x11-libs/libX11
                x11-libs/libXaw3d
                x11-libs/libXt
        )"
DEPEND="${RDEPEND}
        X? ( x11-proto/xproto )
        >=sys-devel/bison-1.2.2"

RDEPEND+=" python? ( ${PYTHON_DEPS} )"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

S="${WORKDIR}/${MY_P}"

src_prepare() {
        epatch "${FILESDIR}"/4.3-unstrip.patch
        epatch "${FILESDIR}"/4.3-bison-version.patch
        epatch "${FILESDIR}"/4.2-ldflags.patch
        epatch "${FILESDIR}"/4.3-snns-netperf.patch # bug 248322

        # change all references of Xaw to Xaw3d
        cd "${S}"/xgui/sources
        for file in *.c; do
                sed -e "s:X11/Xaw/:X11/Xaw3d/:g" -i "${file}"
        done

        # clean up the dirty dist sources and remove files that apparently
        # are not removed by any clean rules
        emake clean
        rm -Rf "${S}"/{tools,xgui}/bin \
                "${S}"/{Makefile.def,config.h} \
                "${S}"/configuration/config.{guess,log}

        epatch_user

        if use python; then
                pushd "${S}"/python > /dev/null || die
                distutils-r1_src_prepare
                popd > /dev/null || die
        fi
}

src_configure() {
        econf --enable-global \
                $(use_with X x)

        if use python; then
                pushd python > /dev/null || die
                distutils-r1_src_configure
                popd > /dev/null || die
        fi
}

src_compile() {
        local compileopts=( compile-kernel compile-tools )
        use X && compileopts+=( compile-xgui )

        # parallel make sometimes fails (phosphan)
        # so emake each phase separately (axs)
        for tgt in "${compileopts[@]}"; do
                emake ${tgt}
        done

        if use python; then
                pushd python > /dev/null || die
                distutils-r1_src_compile
                popd > /dev/null || die
        fi
}

src_install() {
        pushd "${S}"/tools/sources > /dev/null || die
        emake TOOLSBINDIR="${ED}"usr/bin install
        popd > /dev/null || die

        if use X; then
                newbin xgui/sources/xgui snns

                echo XGUILOADPATH=/usr/share/doc/${PF} > "${T}"/99snns
                doenvd "${T}"/99snns

                docompress -x /usr/share/doc/${PF}/{default.cfg,help.hdoc}
                insinto /usr/share/doc/${PF}
                doins default.cfg help.hdoc
        fi

        if use python; then
                pushd python > /dev/null || die
                distutils-r1_src_install
                insinto /usr/share/doc/${PF}/python-examples
                doins examples/*
                newdoc README README.python
                popd > /dev/null || die
        fi

        if use doc; then
                insinto /usr/share/doc/${PF}
                doins "${DISTDIR}"/${MY_P}.Manual.pdf
        fi

        insinto /usr/share/doc/${PF}/examples
        doins examples/*
        doman man/man*/*
}




Reply via email to