[gentoo-commits] repo/gentoo:master commit in: dev-lang/lua/ - gentoo-commits

From:	Fabian Groffen <grobian@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: dev-lang/lua/
Date:	Mon, 04 Jan 2016 20:31:37
Message-Id:	`1451939445.8403a23f55f68430c75bd3d988a3f6f2d9edbc17.grobian@gentoo`

1

commit:     8403a23f55f68430c75bd3d988a3f6f2d9edbc17

2

Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>

3

AuthorDate: Mon Jan  4 20:30:45 2016 +0000

4

Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>

5

CommitDate: Mon Jan  4 20:30:45 2016 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8403a23f

7

8

dev-lang/lua: import Prefix changes

9

10

Package-Manager: portage-2.2.26

11

12

 dev-lang/lua/lua-5.1.4-r8.ebuild   | 12 +++++++++---

13

 dev-lang/lua/lua-5.1.5-r100.ebuild |  8 +++++++-

14

 dev-lang/lua/lua-5.1.5-r3.ebuild   |  8 +++++++-

15

 dev-lang/lua/lua-5.2.3-r1.ebuild   |  8 +++++++-

16

 4 files changed, 30 insertions(+), 6 deletions(-)

17

18

diff --git a/dev-lang/lua/lua-5.1.4-r8.ebuild b/dev-lang/lua/lua-5.1.4-r8.ebuild

19

index b2f0b68..3a4bbf1 100644

20

--- a/dev-lang/lua/lua-5.1.4-r8.ebuild

21

+++ b/dev-lang/lua/lua-5.1.4-r8.ebuild

22

@@ -12,7 +12,7 @@ SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"

23

24

 LICENSE="MIT"

25

 SLOT="0"

26

-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"

27

+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~ppc-aix ~x64-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"

28

 IUSE="+deprecated emacs readline static"

29

30

 RDEPEND="readline? ( sys-libs/readline )"

31

@@ -26,6 +26,12 @@ src_prepare() {

32

 	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch

33

 	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch

34

35

+	# use glibtool on Darwin (versus Apple libtool)

36

+	if [[ ${CHOST} == *-darwin* ]] ; then

37

+		sed -i -e '/LIBTOOL = /s:libtool:glibtool:' \

38

+			Makefile src/Makefile || die

39

+	fi

40

+

41

 	EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch

42

43

 	# correct lua versioning

44

@@ -54,9 +60,9 @@ src_prepare() {

45

46

 	# We want packages to find our things...

47

 	sed -i \

48

-		-e 's:/usr/local:/usr:' \

49

+		-e "s:/usr/local:${EPREFIX}/usr:" \

50

 		-e "s:/\<lib\>:/$(get_libdir):g" \

51

-		etc/lua.pc

52

+		etc/lua.pc src/luaconf.h

53

}

54

55

 # no need for a configure phase

56

57

diff --git a/dev-lang/lua/lua-5.1.5-r100.ebuild b/dev-lang/lua/lua-5.1.5-r100.ebuild

58

index a02c3a3..88cc870 100644

59

--- a/dev-lang/lua/lua-5.1.5-r100.ebuild

60

+++ b/dev-lang/lua/lua-5.1.5-r100.ebuild

61

@@ -12,7 +12,7 @@ SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"

62

63

 LICENSE="MIT"

64

 SLOT="5.1"

65

-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"

66

+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux ~ppc-aix ~x64-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"

67

 IUSE="+deprecated emacs readline static"

68

69

 RDEPEND="readline? ( >=sys-libs/readline-6.2_p5-r1[${MULTILIB_USEDEP}] )

70

@@ -34,6 +34,12 @@ src_prepare() {

71

 	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r2.patch

72

 	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch

73

74

+	# use glibtool on Darwin (versus Apple libtool)

75

+	if [[ ${CHOST} == *-darwin* ]] ; then

76

+		sed -i -e '/LIBTOOL = /s:libtool:glibtool:' \

77

+			Makefile src/Makefile || die

78

+	fi

79

+

80

 	#EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch

81

82

 	# correct lua versioning

83

84

diff --git a/dev-lang/lua/lua-5.1.5-r3.ebuild b/dev-lang/lua/lua-5.1.5-r3.ebuild

85

index 49edd5e..ab76592 100644

86

--- a/dev-lang/lua/lua-5.1.5-r3.ebuild

87

+++ b/dev-lang/lua/lua-5.1.5-r3.ebuild

88

@@ -12,7 +12,7 @@ SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"

89

90

 LICENSE="MIT"

91

 SLOT="0"

92

-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"

93

+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux ~ppc-aix ~x64-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"

94

 IUSE="+deprecated emacs readline static"

95

96

 RDEPEND="readline? ( >=sys-libs/readline-6.2_p5-r1[${MULTILIB_USEDEP}] )"

97

@@ -30,6 +30,12 @@ src_prepare() {

98

 	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch

99

 	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch

100

101

+	# use glibtool on Darwin (versus Apple libtool)

102

+	if [[ ${CHOST} == *-darwin* ]] ; then

103

+		sed -i -e '/LIBTOOL = /s:libtool:glibtool:' \

104

+			Makefile src/Makefile || die

105

+	fi

106

+

107

 	#EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch

108

109

 	# correct lua versioning

110

111

diff --git a/dev-lang/lua/lua-5.2.3-r1.ebuild b/dev-lang/lua/lua-5.2.3-r1.ebuild

112

index 01c8f60..16d253d 100644

113

--- a/dev-lang/lua/lua-5.2.3-r1.ebuild

114

+++ b/dev-lang/lua/lua-5.2.3-r1.ebuild

115

@@ -12,7 +12,7 @@ SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"

116

117

 LICENSE="MIT"

118

 SLOT="5.2"

119

-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"

120

+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux ~ppc-aix ~x64-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"

121

 IUSE="+deprecated emacs readline static"

122

123

 RDEPEND="readline? ( sys-libs/readline )

124

@@ -31,6 +31,12 @@ src_prepare() {

125

126

 	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch

127

128

+	# use glibtool on Darwin (versus Apple libtool)

129

+	if [[ ${CHOST} == *-darwin* ]] ; then

130

+		sed -i -e '/LIBTOOL = /s:/libtool:/glibtool:' \

131

+			Makefile src/Makefile || die

132

+	fi

133

+

134

 	[ -d "${FILESDIR}/${PV}" ] && \

135

 		EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch

1	commit: 8403a23f55f68430c75bd3d988a3f6f2d9edbc17
2	Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3	AuthorDate: Mon Jan 4 20:30:45 2016 +0000
4	Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5	CommitDate: Mon Jan 4 20:30:45 2016 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8403a23f
7
8	dev-lang/lua: import Prefix changes
9
10	Package-Manager: portage-2.2.26
11
12	dev-lang/lua/lua-5.1.4-r8.ebuild \| 12 +++++++++---
13	dev-lang/lua/lua-5.1.5-r100.ebuild \| 8 +++++++-
14	dev-lang/lua/lua-5.1.5-r3.ebuild \| 8 +++++++-
15	dev-lang/lua/lua-5.2.3-r1.ebuild \| 8 +++++++-
16	4 files changed, 30 insertions(+), 6 deletions(-)
17
18	diff --git a/dev-lang/lua/lua-5.1.4-r8.ebuild b/dev-lang/lua/lua-5.1.4-r8.ebuild
19	index b2f0b68..3a4bbf1 100644
20	--- a/dev-lang/lua/lua-5.1.4-r8.ebuild
21	+++ b/dev-lang/lua/lua-5.1.4-r8.ebuild
22	@@ -12,7 +12,7 @@ SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
23
24	LICENSE="MIT"
25	SLOT="0"
26	-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
27	+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~ppc-aix ~x64-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
28	IUSE="+deprecated emacs readline static"
29
30	RDEPEND="readline? ( sys-libs/readline )"
31	@@ -26,6 +26,12 @@ src_prepare() {
32	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch
33	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch
34
35	+ # use glibtool on Darwin (versus Apple libtool)
36	+ if [[ ${CHOST} == -darwin ]] ; then
37	+ sed -i -e '/LIBTOOL = /s:libtool:glibtool:' \
38	+ Makefile src/Makefile \|\| die
39	+ fi
40	+
41	EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
42
43	# correct lua versioning
44	@@ -54,9 +60,9 @@ src_prepare() {
45
46	# We want packages to find our things...
47	sed -i \
48	- -e 's:/usr/local:/usr:' \
49	+ -e "s:/usr/local:${EPREFIX}/usr:" \
50	-e "s:/\<lib\>:/$(get_libdir):g" \
51	- etc/lua.pc
52	+ etc/lua.pc src/luaconf.h
53	}
54
55	# no need for a configure phase
56
57	diff --git a/dev-lang/lua/lua-5.1.5-r100.ebuild b/dev-lang/lua/lua-5.1.5-r100.ebuild
58	index a02c3a3..88cc870 100644
59	--- a/dev-lang/lua/lua-5.1.5-r100.ebuild
60	+++ b/dev-lang/lua/lua-5.1.5-r100.ebuild
61	@@ -12,7 +12,7 @@ SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
62
63	LICENSE="MIT"
64	SLOT="5.1"
65	-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
66	+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux ~ppc-aix ~x64-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
67	IUSE="+deprecated emacs readline static"
68
69	RDEPEND="readline? ( >=sys-libs/readline-6.2_p5-r1[${MULTILIB_USEDEP}] )
70	@@ -34,6 +34,12 @@ src_prepare() {
71	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r2.patch
72	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch
73
74	+ # use glibtool on Darwin (versus Apple libtool)
75	+ if [[ ${CHOST} == -darwin ]] ; then
76	+ sed -i -e '/LIBTOOL = /s:libtool:glibtool:' \
77	+ Makefile src/Makefile \|\| die
78	+ fi
79	+
80	#EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
81
82	# correct lua versioning
83
84	diff --git a/dev-lang/lua/lua-5.1.5-r3.ebuild b/dev-lang/lua/lua-5.1.5-r3.ebuild
85	index 49edd5e..ab76592 100644
86	--- a/dev-lang/lua/lua-5.1.5-r3.ebuild
87	+++ b/dev-lang/lua/lua-5.1.5-r3.ebuild
88	@@ -12,7 +12,7 @@ SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
89
90	LICENSE="MIT"
91	SLOT="0"
92	-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
93	+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux ~ppc-aix ~x64-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
94	IUSE="+deprecated emacs readline static"
95
96	RDEPEND="readline? ( >=sys-libs/readline-6.2_p5-r1[${MULTILIB_USEDEP}] )"
97	@@ -30,6 +30,12 @@ src_prepare() {
98	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch
99	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch
100
101	+ # use glibtool on Darwin (versus Apple libtool)
102	+ if [[ ${CHOST} == -darwin ]] ; then
103	+ sed -i -e '/LIBTOOL = /s:libtool:glibtool:' \
104	+ Makefile src/Makefile \|\| die
105	+ fi
106	+
107	#EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
108
109	# correct lua versioning
110
111	diff --git a/dev-lang/lua/lua-5.2.3-r1.ebuild b/dev-lang/lua/lua-5.2.3-r1.ebuild
112	index 01c8f60..16d253d 100644
113	--- a/dev-lang/lua/lua-5.2.3-r1.ebuild
114	+++ b/dev-lang/lua/lua-5.2.3-r1.ebuild
115	@@ -12,7 +12,7 @@ SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
116
117	LICENSE="MIT"
118	SLOT="5.2"
119	-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
120	+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux ~ppc-aix ~x64-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
121	IUSE="+deprecated emacs readline static"
122
123	RDEPEND="readline? ( sys-libs/readline )
124	@@ -31,6 +31,12 @@ src_prepare() {
125
126	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch
127
128	+ # use glibtool on Darwin (versus Apple libtool)
129	+ if [[ ${CHOST} == -darwin ]] ; then
130	+ sed -i -e '/LIBTOOL = /s:/libtool:/glibtool:' \
131	+ Makefile src/Makefile \|\| die
132	+ fi
133	+
134	[ -d "${FILESDIR}/${PV}" ] && \
135	EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch

Gentoo Archives: gentoo-commits