We do not need the cppunit on runtime, just for tests.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)

3 files changed, 28 insertions, 24 deletions

diff --git a/dev-libs/librevenge/ChangeLog b/dev-libs/librevenge/ChangeLog
index 07c922f708fe..c2ffaf00892d 100644
--- a/dev-libs/librevenge/ChangeLog
+++ b/dev-libs/librevenge/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/librevenge
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/librevenge/ChangeLog,v 1.1 2014/08/15 13:02:53 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/librevenge/ChangeLog,v 1.2 2014/08/16 07:36:55 scarabeus Exp $
+
+  16 Aug 2014; Tomáš Chvátal <scarabeus@gentoo.org> librevenge-0.0.1.ebuild,
+  librevenge-9999.ebuild:
+  We do not need the cppunit on runtime, just for tests.
 
 *librevenge-9999 (15 Aug 2014)
 *librevenge-0.0.1 (15 Aug 2014)
diff --git a/dev-libs/librevenge/librevenge-0.0.1.ebuild b/dev-libs/librevenge/librevenge-0.0.1.ebuild
index a95e5a04dfb8..34300eb976e1 100644
--- a/dev-libs/librevenge/librevenge-0.0.1.ebuild
+++ b/dev-libs/librevenge/librevenge-0.0.1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/librevenge/librevenge-0.0.1.ebuild,v 1.1 2014/08/15 13:02:53 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/librevenge/librevenge-0.0.1.ebuild,v 1.2 2014/08/16 07:36:55 scarabeus Exp $
 
 EAPI="5"
 
-inherit eutils multilib multilib-minimal autotools-utils
+inherit eutils multilib-minimal
 
 DESCRIPTION="A helper library for REVerses ENGineered formats filters"
 HOMEPAGE="http://sf.net/p/libwpd/librevenge"
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.code.sf.net/p/libwpd/librevenge"
-	inherit git-r3
+	inherit git-r3 autotools
 	KEYWORDS=""
 else
 	SRC_URI="http://sf.net/projects/libwpd/files/${PN}/${P}/${P}.tar.xz"
@@ -19,30 +19,31 @@ fi
 
 LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
 SLOT="0"
-IUSE="doc"
+IUSE="doc test"
 
 RDEPEND="
-	dev-libs/boost
-	dev-util/cppunit
-	sys-libs/zlib
+	dev-libs/boost:=
+	sys-libs/zlib[${MULTILIB_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit[${MULTILIB_USEDEP}] )
 "
 
-[[ ${PV} == "9999" ]] && AUTOTOOLS_AUTORECONF=yes
+src_prepare() {
+	[[ ${PV} = 9999 ]] && eautoreconf
+}
 
-src_configure() {
-	myeconfargs=(
-		"--disable-static"
-		"--disable-werror"
-		"$(use_with doc docs)"
-		"--docdir=${EPREFIX}/usr/share/doc/${PF}"
-	)
-	autotools-utils_src_configure
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-static \
+		--disable-werror \
+		$(use_with doc docs) \
+		$(use_enable test tests) \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
 }
 
-src_install() {
-	autotools-utils_src_install
+multilib_src_install_all() {
 	prune_libtool_files --all
 }
diff --git a/dev-libs/librevenge/librevenge-9999.ebuild b/dev-libs/librevenge/librevenge-9999.ebuild
index 7d0cd00f3448..2e2ac1ad1670 100644
--- a/dev-libs/librevenge/librevenge-9999.ebuild
+++ b/dev-libs/librevenge/librevenge-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/librevenge/librevenge-9999.ebuild,v 1.1 2014/08/15 13:02:53 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/librevenge/librevenge-9999.ebuild,v 1.2 2014/08/16 07:36:55 scarabeus Exp $
 
 EAPI="5"
 
@@ -22,13 +22,12 @@ SLOT="0"
 IUSE="doc test"
 
 RDEPEND="
-	dev-libs/boost
-	dev-util/cppunit
-	sys-libs/zlib
+	dev-libs/boost:=
+	sys-libs/zlib[${MULTILIB_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
-	test? ( dev-util/cppunit )
+	test? ( dev-util/cppunit[${MULTILIB_USEDEP}] )
 "
 
 src_prepare() {