mgorny      14/06/07 11:53:45

  Modified:             cppunit-9999.ebuild ChangeLog
  Added:                cppunit-1.13.2-r1.ebuild
  Log:
  Enable multilib support, as a test dependency of media-libs/taglib. Convert 
to git-r3.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
EFB4464E!)

Revision  Changes    Path
1.7                  dev-util/cppunit/cppunit-9999.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cppunit/cppunit-9999.ebuild?rev=1.7&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cppunit/cppunit-9999.ebuild?rev=1.7&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cppunit/cppunit-9999.ebuild?r1=1.6&r2=1.7

Index: cppunit-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/cppunit/cppunit-9999.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cppunit-9999.ebuild 15 Nov 2013 09:16:19 -0000      1.6
+++ cppunit-9999.ebuild 7 Jun 2014 11:53:44 -0000       1.7
@@ -1,12 +1,12 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cppunit/cppunit-9999.ebuild,v 1.6 
2013/11/15 09:16:19 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cppunit/cppunit-9999.ebuild,v 1.7 
2014/06/07 11:53:44 mgorny Exp $
 
 EAPI=5
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/libreoffice/cppunit"
-[[ ${PV} = 9999 ]] && inherit git-2 autotools
-inherit eutils flag-o-matic
+[[ ${PV} = 9999 ]] && inherit git-r3 autotools
+inherit eutils flag-o-matic multilib-minimal
 
 DESCRIPTION="C++ port of the famous JUnit framework for unit testing"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/cppunit";
@@ -29,6 +29,10 @@
 DOCS=( AUTHORS BUGS NEWS README THANKS TODO doc/FAQ )
 [[ ${PV} = 9999 ]] || DOCS+=( ChangeLog )
 
+MULTILIB_CHOST_TOOLS=(
+       /usr/bin/cppunit-config
+)
+
 src_prepare() {
        [[ ${PV} = 9999 ]] && eautoreconf
 }
@@ -37,18 +41,21 @@
        # Anything else than -O0 breaks on alpha
        use alpha && replace-flags "-O?" -O0
 
+       multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+       ECONF_SOURCE=${S} \
        econf \
                $(use_enable static-libs static) \
-               $(use_enable doc doxygen) \
-               $(use_enable doc dot) \
+               $(multilib_native_use_enable doc doxygen) \
+               $(multilib_native_use_enable doc dot) \
                --docdir="${EPREFIX}"/usr/share/doc/${PF} \
                --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
                --disable-silent-rules
 }
 
-src_install() {
-       default
-
+multilib_src_install_all() {
        prune_libtool_files --all
 
        if use examples ; then



1.92                 dev-util/cppunit/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cppunit/ChangeLog?rev=1.92&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cppunit/ChangeLog?rev=1.92&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cppunit/ChangeLog?r1=1.91&r2=1.92

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/cppunit/ChangeLog,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- ChangeLog   15 Nov 2013 09:16:19 -0000      1.91
+++ ChangeLog   7 Jun 2014 11:53:44 -0000       1.92
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/cppunit
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cppunit/ChangeLog,v 1.91 
2013/11/15 09:16:19 scarabeus Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cppunit/ChangeLog,v 1.92 
2014/06/07 11:53:44 mgorny Exp $
+
+*cppunit-1.13.2-r1 (07 Jun 2014)
+
+  07 Jun 2014; Michał Górny <[email protected]> +cppunit-1.13.2-r1.ebuild,
+  cppunit-9999.ebuild:
+  Enable multilib support, as a test dependency of media-libs/taglib. Convert 
to
+  git-r3.
 
 *cppunit-1.13.2 (15 Nov 2013)
 



1.1                  dev-util/cppunit/cppunit-1.13.2-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cppunit/cppunit-1.13.2-r1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cppunit/cppunit-1.13.2-r1.ebuild?rev=1.1&content-type=text/plain

Index: cppunit-1.13.2-r1.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-util/cppunit/cppunit-1.13.2-r1.ebuild,v 
1.1 2014/06/07 11:53:44 mgorny Exp $

EAPI=5

EGIT_REPO_URI="git://anongit.freedesktop.org/libreoffice/cppunit"
[[ ${PV} = 9999 ]] && inherit git-r3 autotools
inherit eutils flag-o-matic multilib-minimal

DESCRIPTION="C++ port of the famous JUnit framework for unit testing"
HOMEPAGE="http://www.freedesktop.org/wiki/Software/cppunit";
[[ ${PV} = 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${P}.tar.gz";

LICENSE="LGPL-2.1"
SLOT="0"
# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
[[ ${PV} = 9999 ]] || \
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 
~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos"
IUSE="doc examples static-libs"

RDEPEND=""
DEPEND="${RDEPEND}
        doc? (
                app-doc/doxygen[dot]
                media-gfx/graphviz
        )"

DOCS=( AUTHORS BUGS NEWS README THANKS TODO doc/FAQ )
[[ ${PV} = 9999 ]] || DOCS+=( ChangeLog )

MULTILIB_CHOST_TOOLS=(
        /usr/bin/cppunit-config
)

src_prepare() {
        [[ ${PV} = 9999 ]] && eautoreconf
}

src_configure() {
        # Anything else than -O0 breaks on alpha
        use alpha && replace-flags "-O?" -O0

        multilib-minimal_src_configure
}

multilib_src_configure() {
        ECONF_SOURCE=${S} \
        econf \
                $(use_enable static-libs static) \
                $(multilib_native_use_enable doc doxygen) \
                $(multilib_native_use_enable doc dot) \
                --docdir="${EPREFIX}"/usr/share/doc/${PF} \
                --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
                --disable-silent-rules
}

multilib_src_install_all() {
        prune_libtool_files --all

        if use examples ; then
                find examples -iname "*.o" -delete
                insinto /usr/share/${PN}
                doins -r examples
        fi
}




Reply via email to