[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:	Tue, 02 Apr 2019 03:57:07
Message-Id:	`1554177370.657e9db45d43c14c9f3e52fd0109afac64aa29e5.graaff@gentoo`

1

commit:     657e9db45d43c14c9f3e52fd0109afac64aa29e5

2

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

3

AuthorDate: Mon Apr  1 17:17:08 2019 +0000

4

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

5

CommitDate: Tue Apr  2 03:56:10 2019 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=657e9db4

7

8

www-apache/passenger: cleanup

9

10

Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>

11

Package-Manager: Portage-2.3.62, Repoman-2.3.11

12

13

 www-apache/passenger/Manifest               |   1 -

14

 www-apache/passenger/passenger-6.0.1.ebuild | 127 ----------------------------

15

 2 files changed, 128 deletions(-)

16

17

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

18

index 1daf04c7d44..e6e6c10572b 100644

19

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

20

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

21

@@ -1,3 +1,2 @@

22

 DIST passenger-5.3.7.tar.gz 7195477 BLAKE2B 43a2384574316f6c8472f326389e8c1feed769e78d66c20e63f6d2679b1ac1b20a9122612c98e3006520e6f24c5883addd93ef11e8f0385759ee0c9e9299b7ad SHA512 bbef4881e0e0c698b29b10ff8a7afbc001c31d14fb80ffa27ed6867a92ad23712319733e6162be1f7720ebda421630af2f258f8167fa73c7b5ea594bc8247158

23

-DIST passenger-6.0.1.tar.gz 7203144 BLAKE2B 1c59a4e7c6e82fc57f507653d8648cc8c21fae6ce8fb008b0839b60e6a076227f139300d7521eaff281ce2f935f20a730b3b34cb2cf3527a807f38e78219277d SHA512 d2fdd27367a2adc8e5486038c7bb9a504c13bc675ba9640123c1a091e6a891238c90c54a75938cd119d74f40c8d0b28257704c83ebefa024057c744ea845997d

24

 DIST passenger-6.0.2.tar.gz 7204982 BLAKE2B 056f85f88e49ca7dcfe37d1d1003beaa5325259a130b44aa60a319d36987c901b0a8a188998d38b68f3d396a71df0db8b8fc9562e58327b61a712dc39fb7ce1e SHA512 05a1c598588ad96864ef81ff8bc45535b3cb35c0f4840f16b93d39c0ece94378e806d967190a3d69b28b37d463624955bb45970459cf8febb258d8fd135e97f2

25

26

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

27

deleted file mode 100644

28

index e9d13ce882e..00000000000

29

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

30

+++ /dev/null

31

@@ -1,127 +0,0 @@

32

-# Copyright 1999-2019 Gentoo Authors

33

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

34

-

35

-EAPI=6

36

-USE_RUBY="ruby23 ruby24 ruby25 ruby26"

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

-	eapply "${FILESDIR}"/${PN}-5.1.11-gentoo.patch

77

-	eapply "${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

-	# Make sure apache support is not attempted with -apache2

109

-	if ! use apache2 ; then

110

-		sed -i -e '/fakeroot/ s/:apache2, //' build/packaging.rb || die

111

-	fi

112

-}

113

-

114

-all_ruby_compile() {

115

-	if use apache2 ; then

116

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

117

-		 APXS2="${APXS}" \

118

-		 HTTPD="${APACHE_BIN}" \

119

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

120

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

121

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

122

-	fi

123

-}

124

-

125

-each_ruby_compile() {

126

-	append-flags -fno-strict-aliasing

127

-

128

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

129

-	APXS2="${APXS}" \

130

-	HTTPD="${APACHE_BIN}" \

131

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

132

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

133

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

134

-}

135

-

136

-all_ruby_install() {

137

-	if use apache2 ; then

138

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

139

-		apache-module_src_install

140

-

141

-		# Patch in the correct libdir

142

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

143

-	fi

144

-

145

-	dodoc CHANGELOG README.md

146

-}

147

-

148

-each_ruby_install() {

149

-	DISTDIR="${D}" \

150

-	RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \

151

-	RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \

152

-	APXS2="${APXS}" \

153

-	HTTPD="${APACHE_BIN}" \

154

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

155

-	EXTRA_LDFLAGS="${LDFLAGS}" \

156

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

157

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

158

-}

1	commit: 657e9db45d43c14c9f3e52fd0109afac64aa29e5
2	Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
3	AuthorDate: Mon Apr 1 17:17:08 2019 +0000
4	Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
5	CommitDate: Tue Apr 2 03:56:10 2019 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=657e9db4
7
8	www-apache/passenger: cleanup
9
10	Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
11	Package-Manager: Portage-2.3.62, Repoman-2.3.11
12
13	www-apache/passenger/Manifest \| 1 -
14	www-apache/passenger/passenger-6.0.1.ebuild \| 127 ----------------------------
15	2 files changed, 128 deletions(-)
16
17	diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
18	index 1daf04c7d44..e6e6c10572b 100644
19	--- a/www-apache/passenger/Manifest
20	+++ b/www-apache/passenger/Manifest
21	@@ -1,3 +1,2 @@
22	DIST passenger-5.3.7.tar.gz 7195477 BLAKE2B 43a2384574316f6c8472f326389e8c1feed769e78d66c20e63f6d2679b1ac1b20a9122612c98e3006520e6f24c5883addd93ef11e8f0385759ee0c9e9299b7ad SHA512 bbef4881e0e0c698b29b10ff8a7afbc001c31d14fb80ffa27ed6867a92ad23712319733e6162be1f7720ebda421630af2f258f8167fa73c7b5ea594bc8247158
23	-DIST passenger-6.0.1.tar.gz 7203144 BLAKE2B 1c59a4e7c6e82fc57f507653d8648cc8c21fae6ce8fb008b0839b60e6a076227f139300d7521eaff281ce2f935f20a730b3b34cb2cf3527a807f38e78219277d SHA512 d2fdd27367a2adc8e5486038c7bb9a504c13bc675ba9640123c1a091e6a891238c90c54a75938cd119d74f40c8d0b28257704c83ebefa024057c744ea845997d
24	DIST passenger-6.0.2.tar.gz 7204982 BLAKE2B 056f85f88e49ca7dcfe37d1d1003beaa5325259a130b44aa60a319d36987c901b0a8a188998d38b68f3d396a71df0db8b8fc9562e58327b61a712dc39fb7ce1e SHA512 05a1c598588ad96864ef81ff8bc45535b3cb35c0f4840f16b93d39c0ece94378e806d967190a3d69b28b37d463624955bb45970459cf8febb258d8fd135e97f2
25
26	diff --git a/www-apache/passenger/passenger-6.0.1.ebuild b/www-apache/passenger/passenger-6.0.1.ebuild
27	deleted file mode 100644
28	index e9d13ce882e..00000000000
29	--- a/www-apache/passenger/passenger-6.0.1.ebuild
30	+++ /dev/null
31	@@ -1,127 +0,0 @@
32	-# Copyright 1999-2019 Gentoo Authors
33	-# Distributed under the terms of the GNU General Public License v2
34	-
35	-EAPI=6
36	-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
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	- eapply "${FILESDIR}"/${PN}-5.1.11-gentoo.patch
77	- eapply "${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	- # Make sure apache support is not attempted with -apache2
109	- if ! use apache2 ; then
110	- sed -i -e '/fakeroot/ s/:apache2, //' build/packaging.rb \|\| die
111	- fi
112	-}
113	-
114	-all_ruby_compile() {
115	- if use apache2 ; then
116	- V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
117	- APXS2="${APXS}" \
118	- HTTPD="${APACHE_BIN}" \
119	- FS_LIBDIR='/usr/'$(get_libdir) \
120	- USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
121	- ruby -S rake apache2 \|\| die "rake failed"
122	- fi
123	-}
124	-
125	-each_ruby_compile() {
126	- append-flags -fno-strict-aliasing
127	-
128	- V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
129	- APXS2="${APXS}" \
130	- HTTPD="${APACHE_BIN}" \
131	- FS_LIBDIR='/usr/'$(get_libdir) \
132	- USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
133	- ${RUBY} -S rake native_support \|\| die "rake failed"
134	-}
135	-
136	-all_ruby_install() {
137	- if use apache2 ; then
138	- APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
139	- apache-module_src_install
140	-
141	- # Patch in the correct libdir
142	- sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" \|\| die
143	- fi
144	-
145	- dodoc CHANGELOG README.md
146	-}
147	-
148	-each_ruby_install() {
149	- DISTDIR="${D}" \
150	- RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
151	- RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
152	- APXS2="${APXS}" \
153	- HTTPD="${APACHE_BIN}" \
154	- FS_LIBDIR='/usr/'$(get_libdir) \
155	- EXTRA_LDFLAGS="${LDFLAGS}" \
156	- USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
157	- ${RUBY} -S rake fakeroot \|\| die "rake failed"
158	-}

Gentoo Archives: gentoo-commits