Gentoo Archives: gentoo-commits

From: "Michal Gorny (mgorny)" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-cpp/gtest: gtest-1.7.0.ebuild ChangeLog
Date: Wed, 30 Apr 2014 14:36:29
Message-Id: 20140430143624.CEA6C2004B@flycatcher.gentoo.org
mgorny      14/04/30 14:36:24

  Modified:             gtest-1.7.0.ebuild ChangeLog
  Log:
  Simplify multilib code. Set proper flags for autotools-multilib.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

Revision  Changes    Path
1.2                  dev-cpp/gtest/gtest-1.7.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/gtest/gtest-1.7.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/gtest/gtest-1.7.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/gtest/gtest-1.7.0.ebuild?r1=1.1&r2=1.2

Index: gtest-1.7.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-cpp/gtest/gtest-1.7.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gtest-1.7.0.ebuild	6 Nov 2013 09:57:53 -0000	1.1
+++ gtest-1.7.0.ebuild	30 Apr 2014 14:36:24 -0000	1.2
@@ -1,9 +1,11 @@
-# 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-cpp/gtest/gtest-1.7.0.ebuild,v 1.1 2013/11/06 09:57:53 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/gtest-1.7.0.ebuild,v 1.2 2014/04/30 14:36:24 mgorny Exp $
 
 EAPI="5"
 
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
 # Python is required for tests and some build tasks.
 PYTHON_COMPAT=( python{2_6,2_7} )
 
@@ -26,37 +28,25 @@
 	"${FILESDIR}/configure-fix-pthread-linking.patch" #371647
 )
 
-AUTOTOOLS_AUTORECONF="1"
-
 src_prepare() {
 	sed -i -e "s|/tmp|${T}|g" test/gtest-filepath_test.cc || die
 	sed -i -r \
 		-e '/^install-(data|exec)-local:/s|^.*$|&\ndisabled-&|' \
 		Makefile.am || die
 	autotools-multilib_src_prepare
-
-	multilib_copy_sources
 }
 
-src_configure() {
-	multilib_parallel_foreach_abi gtest_src_configure
+multilib_src_install() {
+	default
+	multilib_is_native_abi && dobin scripts/gtest-config
 }
 
-src_install() {
-	autotools-multilib_src_install
-	multilib_for_best_abi gtest-config_install
+multilib_src_install_all() {
+	prune_libtool_files --all
+	einstalldocs
 
 	if use examples ; then
 		insinto /usr/share/doc/${PF}/examples
 		doins samples/*.{cc,h}
 	fi
 }
-
-gtest_src_configure() {
-	ECONF_SOURCE="${BUILD_DIR}"
-	autotools-utils_src_configure
-}
-
-gtest-config_install() {
-	dobin "${BUILD_DIR}/scripts/gtest-config"
-}



1.36                 dev-cpp/gtest/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/gtest/ChangeLog?rev=1.36&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/gtest/ChangeLog?rev=1.36&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/gtest/ChangeLog?r1=1.35&r2=1.36

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-cpp/gtest/ChangeLog,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ChangeLog	6 Nov 2013 09:57:53 -0000	1.35
+++ ChangeLog	30 Apr 2014 14:36:24 -0000	1.36
@@ -1,5 +1,8 @@
 # ChangeLog for dev-cpp/gtest
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/ChangeLog,v 1.35 2013/11/06 09:57:53 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/ChangeLog,v 1.36 2014/04/30 14:36:24 mgorny Exp $
+
+  30 Apr 2014; Michał Górny <mgorny@g.o> gtest-1.7.0.ebuild:
+  Simplify multilib code. Set proper flags for autotools-multilib.
 
 *gtest-1.7.0 (06 Nov 2013)