1 |
mgorny 14/04/30 14:36:24 |
2 |
|
3 |
Modified: gtest-1.7.0.ebuild ChangeLog |
4 |
Log: |
5 |
Simplify multilib code. Set proper flags for autotools-multilib. |
6 |
|
7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) |
8 |
|
9 |
Revision Changes Path |
10 |
1.2 dev-cpp/gtest/gtest-1.7.0.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/gtest/gtest-1.7.0.ebuild?rev=1.2&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/gtest/gtest-1.7.0.ebuild?rev=1.2&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/gtest/gtest-1.7.0.ebuild?r1=1.1&r2=1.2 |
15 |
|
16 |
Index: gtest-1.7.0.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/dev-cpp/gtest/gtest-1.7.0.ebuild,v |
19 |
retrieving revision 1.1 |
20 |
retrieving revision 1.2 |
21 |
diff -u -r1.1 -r1.2 |
22 |
--- gtest-1.7.0.ebuild 6 Nov 2013 09:57:53 -0000 1.1 |
23 |
+++ gtest-1.7.0.ebuild 30 Apr 2014 14:36:24 -0000 1.2 |
24 |
@@ -1,9 +1,11 @@ |
25 |
-# Copyright 1999-2013 Gentoo Foundation |
26 |
+# Copyright 1999-2014 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/gtest-1.7.0.ebuild,v 1.1 2013/11/06 09:57:53 tomka Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/gtest-1.7.0.ebuild,v 1.2 2014/04/30 14:36:24 mgorny Exp $ |
30 |
|
31 |
EAPI="5" |
32 |
|
33 |
+AUTOTOOLS_AUTORECONF=1 |
34 |
+AUTOTOOLS_IN_SOURCE_BUILD=1 |
35 |
# Python is required for tests and some build tasks. |
36 |
PYTHON_COMPAT=( python{2_6,2_7} ) |
37 |
|
38 |
@@ -26,37 +28,25 @@ |
39 |
"${FILESDIR}/configure-fix-pthread-linking.patch" #371647 |
40 |
) |
41 |
|
42 |
-AUTOTOOLS_AUTORECONF="1" |
43 |
- |
44 |
src_prepare() { |
45 |
sed -i -e "s|/tmp|${T}|g" test/gtest-filepath_test.cc || die |
46 |
sed -i -r \ |
47 |
-e '/^install-(data|exec)-local:/s|^.*$|&\ndisabled-&|' \ |
48 |
Makefile.am || die |
49 |
autotools-multilib_src_prepare |
50 |
- |
51 |
- multilib_copy_sources |
52 |
} |
53 |
|
54 |
-src_configure() { |
55 |
- multilib_parallel_foreach_abi gtest_src_configure |
56 |
+multilib_src_install() { |
57 |
+ default |
58 |
+ multilib_is_native_abi && dobin scripts/gtest-config |
59 |
} |
60 |
|
61 |
-src_install() { |
62 |
- autotools-multilib_src_install |
63 |
- multilib_for_best_abi gtest-config_install |
64 |
+multilib_src_install_all() { |
65 |
+ prune_libtool_files --all |
66 |
+ einstalldocs |
67 |
|
68 |
if use examples ; then |
69 |
insinto /usr/share/doc/${PF}/examples |
70 |
doins samples/*.{cc,h} |
71 |
fi |
72 |
} |
73 |
- |
74 |
-gtest_src_configure() { |
75 |
- ECONF_SOURCE="${BUILD_DIR}" |
76 |
- autotools-utils_src_configure |
77 |
-} |
78 |
- |
79 |
-gtest-config_install() { |
80 |
- dobin "${BUILD_DIR}/scripts/gtest-config" |
81 |
-} |
82 |
|
83 |
|
84 |
|
85 |
1.36 dev-cpp/gtest/ChangeLog |
86 |
|
87 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/gtest/ChangeLog?rev=1.36&view=markup |
88 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/gtest/ChangeLog?rev=1.36&content-type=text/plain |
89 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/gtest/ChangeLog?r1=1.35&r2=1.36 |
90 |
|
91 |
Index: ChangeLog |
92 |
=================================================================== |
93 |
RCS file: /var/cvsroot/gentoo-x86/dev-cpp/gtest/ChangeLog,v |
94 |
retrieving revision 1.35 |
95 |
retrieving revision 1.36 |
96 |
diff -u -r1.35 -r1.36 |
97 |
--- ChangeLog 6 Nov 2013 09:57:53 -0000 1.35 |
98 |
+++ ChangeLog 30 Apr 2014 14:36:24 -0000 1.36 |
99 |
@@ -1,5 +1,8 @@ |
100 |
# ChangeLog for dev-cpp/gtest |
101 |
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/ChangeLog,v 1.35 2013/11/06 09:57:53 tomka Exp $ |
102 |
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/ChangeLog,v 1.36 2014/04/30 14:36:24 mgorny Exp $ |
103 |
+ |
104 |
+ 30 Apr 2014; Michał Górny <mgorny@g.o> gtest-1.7.0.ebuild: |
105 |
+ Simplify multilib code. Set proper flags for autotools-multilib. |
106 |
|
107 |
*gtest-1.7.0 (06 Nov 2013) |