[gentoo-commits] repo/gentoo:master commit in: www-apache/passenger/ - gentoo-commits

From:	Hans de Graaff <graaff@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: www-apache/passenger/
Date:	Mon, 16 Oct 2017 14:25:23
Message-Id:	`1508163905.28da77e9e9b0cce6ab1ca91998054ff2b52b0a9c.graaff@gentoo`

1

commit:     28da77e9e9b0cce6ab1ca91998054ff2b52b0a9c

2

Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>

3

AuthorDate: Mon Oct 16 14:25:05 2017 +0000

4

Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>

5

CommitDate: Mon Oct 16 14:25:05 2017 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28da77e9

7

8

www-apache/passenger: cleanup

9

10

Package-Manager: Portage-2.3.8, Repoman-2.3.3

11

12

 www-apache/passenger/Manifest               |   1 -

13

 www-apache/passenger/passenger-5.1.7.ebuild | 122 ----------------------------

14

 2 files changed, 123 deletions(-)

15

16

diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest

17

index 2bdc8e18fa4..a617b93e41a 100644

18

--- a/www-apache/passenger/Manifest

19

+++ b/www-apache/passenger/Manifest

20

@@ -1,4 +1,3 @@

21

 DIST passenger-5.1.2.tar.gz 5646103 SHA256 7fb03a54650ef5e508895c9e45bc2d8151f6c4811ea6797e81f017fedddfdbab SHA512 88a77c749857a8538ea268f793d2708fa29b8891d2c3197577155f81cb66aa04919c25e713d4f00692051ad385eebaa94729cd30baa68edcf3d17c23bae0acdd WHIRLPOOL 8f115162e2a7c43af20cef1d689290c8a523cce10f617500eeb50ab6a226c203a404fc7ce53fd0e21e63276aa359c5d64b685318be36f79ce165ff598bac8766

22

 DIST passenger-5.1.6.tar.gz 5215694 SHA256 e897cc5f0ec6446bfdc226404dca4bd29f7418ae92010c389661b9f024a3cf24 SHA512 71d301d2501863951157f55df30ac89f6f9d98e79b554a5ca05ca9a306041ecd8cdc92056220cf6dc9ad02972a102bfc990e3b06f887d27496a8ecbd58e109fa WHIRLPOOL fe6872d0c11803fd0d8875002f37425edc54327709daaa56518ace0ef9f5046836592298ca80ce4929a29e6c0a0adcb237b57a19cd0d73ac096992e742e2a8b5

23

-DIST passenger-5.1.7.tar.gz 5218093 SHA256 2b40a00a3fdc90a6acf784319f60fd53549f036ffc99fcbb23a0658cb7e2b215 SHA512 f1f67f7912dd3d58ee46c32d1d0584eeb90e95fd5a36bddff62c28674560f1495926a867b20d12a3867d1e81f13c480ed596ba81f78f6241c511b12fcac1de4c WHIRLPOOL 12c1acee83255b19964f505c6238432971d7a80d7937fcfac75cd0645b8626d993365472ca7e622b21fc8144f37f1286e1b58fdfa71836bcd791467416013349

24

 DIST passenger-5.1.8.tar.gz 5234529 SHA256 fef10e4a34c3faa48306c21c0789ee4d4d56fc0e30205cc470a91b486b7a4a7d SHA512 5baf287e1f2a751409bba99671de2c41656033dc29132b2d964457405284105343fde4c2233c921d7e35794a47eedbf33e3840119a908741b1ed9e6fdc99ec2c WHIRLPOOL 6513b71aadddc9ec5ff4b4c617256a62f1c977b7d0f098982808851afc7703bd4ceed843cf309d07b239dbae97ed4beacaa2130a5dd325b17714df59f3b1f9ee

25

26

diff --git a/www-apache/passenger/passenger-5.1.7.ebuild b/www-apache/passenger/passenger-5.1.7.ebuild

27

deleted file mode 100644

28

index 3dc6b74b68b..00000000000

29

--- a/www-apache/passenger/passenger-5.1.7.ebuild

30

+++ /dev/null

31

@@ -1,122 +0,0 @@

32

-# Copyright 1999-2017 Gentoo Foundation

33

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

34

-

35

-EAPI=6

36

-USE_RUBY="ruby21 ruby22 ruby23 ruby24"

37

-

38

-inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs

39

-

40

-DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze"

41

-HOMEPAGE="https://www.phusionpassenger.com/"

42

-SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"

43

-

44

-LICENSE="GPL-2"

45

-SLOT="0"

46

-KEYWORDS="~amd64 ~x86"

47

-IUSE="apache2 debug"

48

-

49

-ruby_add_bdepend "dev-ruby/rake"

50

-

51

-ruby_add_rdepend "

52

-	>=dev-ruby/rack-1.0.0:*

53

-	>=dev-ruby/rake-0.8.1"

54

-

55

-# libev is bundled but with adapations that do not seem to be accepted

56

-# upstream, so we must use the bundled version :-(

57

-CDEPEND="

58

-	>=dev-libs/libuv-1.8.0

59

-	net-misc/curl[ssl]

60

-	apache2? ( www-servers/apache[apache2_modules_unixd(+)] )"

61

-

62

-RDEPEND="${RDEPEND} ${CDEPEND}"

63

-DEPEND="${DEPEND} ${CDEPEND}"

64

-

65

-APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}"

66

-APACHE2_MOD_DEFINE="PASSENGER"

67

-

68

-want_apache2

69

-

70

-pkg_setup() {

71

-	use debug && append-flags -DPASSENGER_DEBUG

72

-	depend.apache_pkg_setup

73

-}

74

-

75

-all_ruby_prepare() {

76

-	epatch "${FILESDIR}"/${PN}-5.0.20-gentoo.patch

77

-	epatch "${FILESDIR}"/${PN}-5.1.1-isnan.patch

78

-

79

-	# Change these with sed instead of a patch so that we can easily use

80

-	# the toolchain-funcs methods.

81

-	sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \

82

-		-e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \

83

-		-e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die

84

-

85

-	# Avoid fixed debugging CFLAGs.

86

-	sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die

87

-

88

-	# Use sed here so that we can dynamically set the documentation directory.

89

-	sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \

90

-		-e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \

91

-		src/ruby_supportlib/phusion_passenger.rb || die

92

-	sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die

93

-

94

-	# Don't install a tool that won't work in our setup.

95

-	sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die

96

-	rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."

97

-

98

-	# Make sure we use the system-provided version where possible

99

-	rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code."

100

-

101

-	# Avoid building documentation to avoid a dependency on mizuho.

102

-	#sed -i -e 's/, :doc//' build/packaging.rb || die

103

-	touch doc/*.html || die

104

-

105

-	# Fix hard-coded use of AR

106

-	sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb || die

107

-}

108

-

109

-all_ruby_compile() {

110

-	if use apache2 ; then

111

-		V=1 EXTRA_LDFLAGS="${LDFLAGS}" \

112

-		 APXS2="${APXS}" \

113

-		 HTTPD="${APACHE_BIN}" \

114

-		 FS_LIBDIR='/usr/'$(get_libdir) \

115

-		 USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \

116

-		 ruby -S rake apache2 || die "rake failed"

117

-	fi

118

-}

119

-

120

-each_ruby_compile() {

121

-	append-flags -fno-strict-aliasing

122

-

123

-	V=1 EXTRA_LDFLAGS="${LDFLAGS}" \

124

-	APXS2="${APXS}" \

125

-	HTTPD="${APACHE_BIN}" \

126

-	FS_LIBDIR='/usr/'$(get_libdir) \

127

-	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \

128

-	${RUBY} -S rake native_support || die "rake failed"

129

-}

130

-

131

-all_ruby_install() {

132

-	if use apache2 ; then

133

-		APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"

134

-		apache-module_src_install

135

-

136

-		# Patch in the correct libdir

137

-		sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die

138

-	fi

139

-

140

-	dodoc CHANGELOG README.md

141

-}

142

-

143

-each_ruby_install() {

144

-	DISTDIR="${D}" \

145

-	RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \

146

-	RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \

147

-	APXS2="${APXS}" \

148

-	HTTPD="${APACHE_BIN}" \

149

-	FS_LIBDIR='/usr/'$(get_libdir) \

150

-	EXTRA_LDFLAGS="${LDFLAGS}" \

151

-	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \

152

-	${RUBY} -S rake fakeroot || die "rake failed"

153

-}

1	commit: 28da77e9e9b0cce6ab1ca91998054ff2b52b0a9c
2	Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
3	AuthorDate: Mon Oct 16 14:25:05 2017 +0000
4	Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
5	CommitDate: Mon Oct 16 14:25:05 2017 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28da77e9
7
8	www-apache/passenger: cleanup
9
10	Package-Manager: Portage-2.3.8, Repoman-2.3.3
11
12	www-apache/passenger/Manifest \| 1 -
13	www-apache/passenger/passenger-5.1.7.ebuild \| 122 ----------------------------
14	2 files changed, 123 deletions(-)
15
16	diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
17	index 2bdc8e18fa4..a617b93e41a 100644
18	--- a/www-apache/passenger/Manifest
19	+++ b/www-apache/passenger/Manifest
20	@@ -1,4 +1,3 @@
21	DIST passenger-5.1.2.tar.gz 5646103 SHA256 7fb03a54650ef5e508895c9e45bc2d8151f6c4811ea6797e81f017fedddfdbab SHA512 88a77c749857a8538ea268f793d2708fa29b8891d2c3197577155f81cb66aa04919c25e713d4f00692051ad385eebaa94729cd30baa68edcf3d17c23bae0acdd WHIRLPOOL 8f115162e2a7c43af20cef1d689290c8a523cce10f617500eeb50ab6a226c203a404fc7ce53fd0e21e63276aa359c5d64b685318be36f79ce165ff598bac8766
22	DIST passenger-5.1.6.tar.gz 5215694 SHA256 e897cc5f0ec6446bfdc226404dca4bd29f7418ae92010c389661b9f024a3cf24 SHA512 71d301d2501863951157f55df30ac89f6f9d98e79b554a5ca05ca9a306041ecd8cdc92056220cf6dc9ad02972a102bfc990e3b06f887d27496a8ecbd58e109fa WHIRLPOOL fe6872d0c11803fd0d8875002f37425edc54327709daaa56518ace0ef9f5046836592298ca80ce4929a29e6c0a0adcb237b57a19cd0d73ac096992e742e2a8b5
23	-DIST passenger-5.1.7.tar.gz 5218093 SHA256 2b40a00a3fdc90a6acf784319f60fd53549f036ffc99fcbb23a0658cb7e2b215 SHA512 f1f67f7912dd3d58ee46c32d1d0584eeb90e95fd5a36bddff62c28674560f1495926a867b20d12a3867d1e81f13c480ed596ba81f78f6241c511b12fcac1de4c WHIRLPOOL 12c1acee83255b19964f505c6238432971d7a80d7937fcfac75cd0645b8626d993365472ca7e622b21fc8144f37f1286e1b58fdfa71836bcd791467416013349
24	DIST passenger-5.1.8.tar.gz 5234529 SHA256 fef10e4a34c3faa48306c21c0789ee4d4d56fc0e30205cc470a91b486b7a4a7d SHA512 5baf287e1f2a751409bba99671de2c41656033dc29132b2d964457405284105343fde4c2233c921d7e35794a47eedbf33e3840119a908741b1ed9e6fdc99ec2c WHIRLPOOL 6513b71aadddc9ec5ff4b4c617256a62f1c977b7d0f098982808851afc7703bd4ceed843cf309d07b239dbae97ed4beacaa2130a5dd325b17714df59f3b1f9ee
25
26	diff --git a/www-apache/passenger/passenger-5.1.7.ebuild b/www-apache/passenger/passenger-5.1.7.ebuild
27	deleted file mode 100644
28	index 3dc6b74b68b..00000000000
29	--- a/www-apache/passenger/passenger-5.1.7.ebuild
30	+++ /dev/null
31	@@ -1,122 +0,0 @@
32	-# Copyright 1999-2017 Gentoo Foundation
33	-# Distributed under the terms of the GNU General Public License v2
34	-
35	-EAPI=6
36	-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
37	-
38	-inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
39	-
40	-DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze"
41	-HOMEPAGE="https://www.phusionpassenger.com/"
42	-SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
43	-
44	-LICENSE="GPL-2"
45	-SLOT="0"
46	-KEYWORDS="~amd64 ~x86"
47	-IUSE="apache2 debug"
48	-
49	-ruby_add_bdepend "dev-ruby/rake"
50	-
51	-ruby_add_rdepend "
52	- >=dev-ruby/rack-1.0.0:*
53	- >=dev-ruby/rake-0.8.1"
54	-
55	-# libev is bundled but with adapations that do not seem to be accepted
56	-# upstream, so we must use the bundled version :-(
57	-CDEPEND="
58	- >=dev-libs/libuv-1.8.0
59	- net-misc/curl[ssl]
60	- apache2? ( www-servers/apache[apache2_modules_unixd(+)] )"
61	-
62	-RDEPEND="${RDEPEND} ${CDEPEND}"
63	-DEPEND="${DEPEND} ${CDEPEND}"
64	-
65	-APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}"
66	-APACHE2_MOD_DEFINE="PASSENGER"
67	-
68	-want_apache2
69	-
70	-pkg_setup() {
71	- use debug && append-flags -DPASSENGER_DEBUG
72	- depend.apache_pkg_setup
73	-}
74	-
75	-all_ruby_prepare() {
76	- epatch "${FILESDIR}"/${PN}-5.0.20-gentoo.patch
77	- epatch "${FILESDIR}"/${PN}-5.1.1-isnan.patch
78	-
79	- # Change these with sed instead of a patch so that we can easily use
80	- # the toolchain-funcs methods.
81	- sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \
82	- -e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \
83	- -e 's/PlatformInfo.debugging_cflags//' build/basics.rb \|\| die
84	-
85	- # Avoid fixed debugging CFLAGs.
86	- sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb \|\| die
87	-
88	- # Use sed here so that we can dynamically set the documentation directory.
89	- sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \
90	- -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
91	- src/ruby_supportlib/phusion_passenger.rb \|\| die
92	- sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h \|\| die
93	-
94	- # Don't install a tool that won't work in our setup.
95	- sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb \|\| die
96	- rm -f bin/passenger-install-apache2-module \|\| die "Unable to remove unneeded install script."
97	-
98	- # Make sure we use the system-provided version where possible
99	- rm -rf src/cxx_supportlib/vendor-copy/libuv \|\| die "Unable to remove vendored code."
100	-
101	- # Avoid building documentation to avoid a dependency on mizuho.
102	- #sed -i -e 's/, :doc//' build/packaging.rb \|\| die
103	- touch doc/*.html \|\| die
104	-
105	- # Fix hard-coded use of AR
106	- sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb \|\| die
107	-}
108	-
109	-all_ruby_compile() {
110	- if use apache2 ; then
111	- V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
112	- APXS2="${APXS}" \
113	- HTTPD="${APACHE_BIN}" \
114	- FS_LIBDIR='/usr/'$(get_libdir) \
115	- USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
116	- ruby -S rake apache2 \|\| die "rake failed"
117	- fi
118	-}
119	-
120	-each_ruby_compile() {
121	- append-flags -fno-strict-aliasing
122	-
123	- V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
124	- APXS2="${APXS}" \
125	- HTTPD="${APACHE_BIN}" \
126	- FS_LIBDIR='/usr/'$(get_libdir) \
127	- USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
128	- ${RUBY} -S rake native_support \|\| die "rake failed"
129	-}
130	-
131	-all_ruby_install() {
132	- if use apache2 ; then
133	- APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
134	- apache-module_src_install
135	-
136	- # Patch in the correct libdir
137	- sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" \|\| die
138	- fi
139	-
140	- dodoc CHANGELOG README.md
141	-}
142	-
143	-each_ruby_install() {
144	- DISTDIR="${D}" \
145	- RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
146	- RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
147	- APXS2="${APXS}" \
148	- HTTPD="${APACHE_BIN}" \
149	- FS_LIBDIR='/usr/'$(get_libdir) \
150	- EXTRA_LDFLAGS="${LDFLAGS}" \
151	- USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
152	- ${RUBY} -S rake fakeroot \|\| die "rake failed"
153	-}

Gentoo Archives: gentoo-commits