[gentoo-commits] gentoo-x86 commit in dev-util/pkgconfig: ChangeLog pkgconfig-9999.ebuild pkgconfig-0.28-r3.ebuild - gentoo-commits

From:	"Alexandre Rostovtsev (tetromino)" <tetromino@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] gentoo-x86 commit in dev-util/pkgconfig: ChangeLog pkgconfig-9999.ebuild pkgconfig-0.28-r3.ebuild
Date:	Sun, 31 May 2015 21:03:54
Message-Id:	`20150531210349.606A7A11@oystercatcher.gentoo.org`

1

tetromino    15/05/31 21:03:49

2

3

  Modified:             ChangeLog pkgconfig-9999.ebuild

4

                        pkgconfig-0.28-r3.ebuild

5

  Log:

6

  We cannot use autotools.eclass in pkgconfig, it creates a circular dependency (bug #550856, thanks to Fabian Groffen, Mike Gilbert).

7

8

  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x18E5B6F2D8D5EC8D)

9

10

Revision  Changes    Path

11

1.172                dev-util/pkgconfig/ChangeLog

12

13

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/ChangeLog?rev=1.172&view=markup

14

plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/ChangeLog?rev=1.172&content-type=text/plain

15

diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/ChangeLog?r1=1.171&r2=1.172

16

17

Index: ChangeLog

18

===================================================================

19

RCS file: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v

20

retrieving revision 1.171

21

retrieving revision 1.172

22

diff -u -r1.171 -r1.172

23

--- ChangeLog	27 May 2015 13:12:57 -0000	1.171

24

+++ ChangeLog	31 May 2015 21:03:49 -0000	1.172

25

@@ -1,6 +1,12 @@

26

 # ChangeLog for dev-util/pkgconfig

27

 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2

28

-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v 1.171 2015/05/27 13:12:57 tetromino Exp $

29

+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v 1.172 2015/05/31 21:03:49 tetromino Exp $

30

+

31

+  31 May 2015; Alexandre Rostovtsev <tetromino@g.o>

32

+  pkgconfig-0.28-r3.ebuild, pkgconfig-9999.ebuild,

33

+  files/pkgconfig-0.28-lfs.patch:

34

+  We cannot use autotools.eclass in pkgconfig, it creates a circular dependency

35

+  (bug #550856, thanks to Fabian Groffen, Mike Gilbert).

36

37

   27 May 2015; Alexandre Rostovtsev <tetromino@g.o>

38

   -pkgconfig-0.28-r1.ebuild:

1.17                 dev-util/pkgconfig/pkgconfig-9999.ebuild

43

44

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/pkgconfig-9999.ebuild?rev=1.17&view=markup

45

plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/pkgconfig-9999.ebuild?rev=1.17&content-type=text/plain

46

diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/pkgconfig-9999.ebuild?r1=1.16&r2=1.17

47

48

Index: pkgconfig-9999.ebuild

49

===================================================================

50

RCS file: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-9999.ebuild,v

51

retrieving revision 1.16

52

retrieving revision 1.17

53

diff -u -r1.16 -r1.17

54

--- pkgconfig-9999.ebuild	27 May 2015 06:32:02 -0000	1.16

55

+++ pkgconfig-9999.ebuild	31 May 2015 21:03:49 -0000	1.17

56

@@ -1,18 +1,18 @@

57

 # Copyright 1999-2015 Gentoo Foundation

58

 # Distributed under the terms of the GNU General Public License v2

59

-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-9999.ebuild,v 1.16 2015/05/27 06:32:02 tetromino Exp $

60

+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-9999.ebuild,v 1.17 2015/05/31 21:03:49 tetromino Exp $

61

62

 EAPI=5

63

64

-# 1.12 is only needed for tests due to some am__check_pre / LOG_DRIVER

65

-# weirdness with "/bin/bash /bin/sh" in arguments chain with >=1.13

66

-WANT_AUTOMAKE=1.12

67

-

68

+# Do not inherit autotools in non-live ebuild - causes circular dependency, bug #550856

69

 inherit eutils flag-o-matic libtool multilib multilib-minimal

70

71

 MY_P=pkg-config-${PV}

72

73

 if [[ ${PV} == *9999* ]]; then

74

+	# 1.12 is only needed for tests due to some am__check_pre / LOG_DRIVER

75

+	# weirdness with "/bin/bash /bin/sh" in arguments chain with >=1.13

76

+	WANT_AUTOMAKE=1.12

77

 	EGIT_REPO_URI="git://anongit.freedesktop.org/pkg-config"

78

 	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}

79

 	inherit autotools git-r3

1.3                  dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild

84

85

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild?rev=1.3&view=markup

86

plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild?rev=1.3&content-type=text/plain

87

diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild?r1=1.2&r2=1.3

88

89

Index: pkgconfig-0.28-r3.ebuild

90

===================================================================

91

RCS file: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild,v

92

retrieving revision 1.2

93

retrieving revision 1.3

94

diff -u -r1.2 -r1.3

95

--- pkgconfig-0.28-r3.ebuild	27 May 2015 06:32:02 -0000	1.2

96

+++ pkgconfig-0.28-r3.ebuild	31 May 2015 21:03:49 -0000	1.3

97

@@ -1,18 +1,18 @@

98

 # Copyright 1999-2015 Gentoo Foundation

99

 # Distributed under the terms of the GNU General Public License v2

100

-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild,v 1.2 2015/05/27 06:32:02 tetromino Exp $

101

+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild,v 1.3 2015/05/31 21:03:49 tetromino Exp $

102

103

 EAPI=5

104

105

-# 1.12 is only needed for tests due to some am__check_pre / LOG_DRIVER

106

-# weirdness with "/bin/bash /bin/sh" in arguments chain with >=1.13

107

-WANT_AUTOMAKE=1.12

108

-

109

-inherit autotools eutils flag-o-matic libtool multilib multilib-minimal

110

+# Do not inherit autotools in non-live ebuild - causes circular dependency, bug #550856

111

+inherit eutils flag-o-matic libtool multilib multilib-minimal

112

113

 MY_P=pkg-config-${PV}

114

115

 if [[ ${PV} == *9999* ]]; then

116

+	# 1.12 is only needed for tests due to some am__check_pre / LOG_DRIVER

117

+	# weirdness with "/bin/bash /bin/sh" in arguments chain with >=1.13

118

+	WANT_AUTOMAKE=1.12

119

 	EGIT_REPO_URI="git://anongit.freedesktop.org/pkg-config"

120

 	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}

121

 	inherit autotools git-r3

122

@@ -43,16 +43,18 @@

123

124

 	sed -i -e "s|^prefix=/usr\$|prefix=${EPREFIX}/usr|" check/simple.pc || die #434320

125

126

-	# Large file support, fixed in git; requires eautoreconf; bug #550508

127

+	# Large file support, fixed in upstream git; bug #550508

128

 	epatch "${FILESDIR}"/${P}-lfs.patch

129

+	# lfs patch touches config.h.in; need this hack to prevent autoreconf and automake

130

+	touch aclocal.m4 config.h.in Makefile.in

131

132

 	epatch_user

133

134

-	#if [[ ${PV} == *9999* ]]; then

135

+	if [[ ${PV} == *9999* ]]; then

136

 		eautoreconf

137

-	#else

138

-	#	elibtoolize # Required for FreeMiNT wrt #333429

139

-	#fi

140

+	else

141

+		elibtoolize # Required for FreeMiNT wrt #333429

142

+	fi

143

}

144

145

 multilib_src_configure() {

1	tetromino 15/05/31 21:03:49
2
3	Modified: ChangeLog pkgconfig-9999.ebuild
4	pkgconfig-0.28-r3.ebuild
5	Log:
6	We cannot use autotools.eclass in pkgconfig, it creates a circular dependency (bug #550856, thanks to Fabian Groffen, Mike Gilbert).
7
8	(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x18E5B6F2D8D5EC8D)
9
10	Revision Changes Path
11	1.172 dev-util/pkgconfig/ChangeLog
12
13	file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/ChangeLog?rev=1.172&view=markup
14	plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/ChangeLog?rev=1.172&content-type=text/plain
15	diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/ChangeLog?r1=1.171&r2=1.172
16
17	Index: ChangeLog
18	===================================================================
19	RCS file: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v
20	retrieving revision 1.171
21	retrieving revision 1.172
22	diff -u -r1.171 -r1.172
23	--- ChangeLog 27 May 2015 13:12:57 -0000 1.171
24	+++ ChangeLog 31 May 2015 21:03:49 -0000 1.172
25	@@ -1,6 +1,12 @@
26	# ChangeLog for dev-util/pkgconfig
27	# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
28	-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v 1.171 2015/05/27 13:12:57 tetromino Exp $
29	+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v 1.172 2015/05/31 21:03:49 tetromino Exp $
30	+
31	+ 31 May 2015; Alexandre Rostovtsev <tetromino@g.o>
32	+ pkgconfig-0.28-r3.ebuild, pkgconfig-9999.ebuild,
33	+ files/pkgconfig-0.28-lfs.patch:
34	+ We cannot use autotools.eclass in pkgconfig, it creates a circular dependency
35	+ (bug #550856, thanks to Fabian Groffen, Mike Gilbert).
36
37	27 May 2015; Alexandre Rostovtsev <tetromino@g.o>
38	-pkgconfig-0.28-r1.ebuild:
39
40
41
42	1.17 dev-util/pkgconfig/pkgconfig-9999.ebuild
43
44	file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/pkgconfig-9999.ebuild?rev=1.17&view=markup
45	plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/pkgconfig-9999.ebuild?rev=1.17&content-type=text/plain
46	diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/pkgconfig-9999.ebuild?r1=1.16&r2=1.17
47
48	Index: pkgconfig-9999.ebuild
49	===================================================================
50	RCS file: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-9999.ebuild,v
51	retrieving revision 1.16
52	retrieving revision 1.17
53	diff -u -r1.16 -r1.17
54	--- pkgconfig-9999.ebuild 27 May 2015 06:32:02 -0000 1.16
55	+++ pkgconfig-9999.ebuild 31 May 2015 21:03:49 -0000 1.17
56	@@ -1,18 +1,18 @@
57	# Copyright 1999-2015 Gentoo Foundation
58	# Distributed under the terms of the GNU General Public License v2
59	-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-9999.ebuild,v 1.16 2015/05/27 06:32:02 tetromino Exp $
60	+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-9999.ebuild,v 1.17 2015/05/31 21:03:49 tetromino Exp $
61
62	EAPI=5
63
64	-# 1.12 is only needed for tests due to some am__check_pre / LOG_DRIVER
65	-# weirdness with "/bin/bash /bin/sh" in arguments chain with >=1.13
66	-WANT_AUTOMAKE=1.12
67	-
68	+# Do not inherit autotools in non-live ebuild - causes circular dependency, bug #550856
69	inherit eutils flag-o-matic libtool multilib multilib-minimal
70
71	MY_P=pkg-config-${PV}
72
73	if [[ ${PV} == 9999 ]]; then
74	+ # 1.12 is only needed for tests due to some am__check_pre / LOG_DRIVER
75	+ # weirdness with "/bin/bash /bin/sh" in arguments chain with >=1.13
76	+ WANT_AUTOMAKE=1.12
77	EGIT_REPO_URI="git://anongit.freedesktop.org/pkg-config"
78	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
79	inherit autotools git-r3
80
81
82
83	1.3 dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild
84
85	file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild?rev=1.3&view=markup
86	plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild?rev=1.3&content-type=text/plain
87	diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild?r1=1.2&r2=1.3
88
89	Index: pkgconfig-0.28-r3.ebuild
90	===================================================================
91	RCS file: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild,v
92	retrieving revision 1.2
93	retrieving revision 1.3
94	diff -u -r1.2 -r1.3
95	--- pkgconfig-0.28-r3.ebuild 27 May 2015 06:32:02 -0000 1.2
96	+++ pkgconfig-0.28-r3.ebuild 31 May 2015 21:03:49 -0000 1.3
97	@@ -1,18 +1,18 @@
98	# Copyright 1999-2015 Gentoo Foundation
99	# Distributed under the terms of the GNU General Public License v2
100	-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild,v 1.2 2015/05/27 06:32:02 tetromino Exp $
101	+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild,v 1.3 2015/05/31 21:03:49 tetromino Exp $
102
103	EAPI=5
104
105	-# 1.12 is only needed for tests due to some am__check_pre / LOG_DRIVER
106	-# weirdness with "/bin/bash /bin/sh" in arguments chain with >=1.13
107	-WANT_AUTOMAKE=1.12
108	-
109	-inherit autotools eutils flag-o-matic libtool multilib multilib-minimal
110	+# Do not inherit autotools in non-live ebuild - causes circular dependency, bug #550856
111	+inherit eutils flag-o-matic libtool multilib multilib-minimal
112
113	MY_P=pkg-config-${PV}
114
115	if [[ ${PV} == 9999 ]]; then
116	+ # 1.12 is only needed for tests due to some am__check_pre / LOG_DRIVER
117	+ # weirdness with "/bin/bash /bin/sh" in arguments chain with >=1.13
118	+ WANT_AUTOMAKE=1.12
119	EGIT_REPO_URI="git://anongit.freedesktop.org/pkg-config"
120	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
121	inherit autotools git-r3
122	@@ -43,16 +43,18 @@
123
124	sed -i -e "s\|^prefix=/usr\$\|prefix=${EPREFIX}/usr\|" check/simple.pc \|\| die #434320
125
126	- # Large file support, fixed in git; requires eautoreconf; bug #550508
127	+ # Large file support, fixed in upstream git; bug #550508
128	epatch "${FILESDIR}"/${P}-lfs.patch
129	+ # lfs patch touches config.h.in; need this hack to prevent autoreconf and automake
130	+ touch aclocal.m4 config.h.in Makefile.in
131
132	epatch_user
133
134	- #if [[ ${PV} == 9999 ]]; then
135	+ if [[ ${PV} == 9999 ]]; then
136	eautoreconf
137	- #else
138	- # elibtoolize # Required for FreeMiNT wrt #333429
139	- #fi
140	+ else
141	+ elibtoolize # Required for FreeMiNT wrt #333429
142	+ fi
143	}
144
145	multilib_src_configure() {

Gentoo Archives: gentoo-commits