summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2012-04-27 10:50:11 +0000
committerHans de Graaff <graaff@gentoo.org>2012-04-27 10:50:11 +0000
commit87b0e5eed83304842c8a68fff391667df6ca9ea3 (patch)
tree6a400cfeeabab440cab5264a7c14451f549760f9 /www-apache
parentInitial commit, ebuild by idella4 (diff)
downloadhistorical-87b0e5eed83304842c8a68fff391667df6ca9ea3.tar.gz
historical-87b0e5eed83304842c8a68fff391667df6ca9ea3.tar.bz2
historical-87b0e5eed83304842c8a68fff391667df6ca9ea3.zip
Fix automagic use of asciidoc with USE=-doc, bug 413469.
Package-Manager: portage-2.1.10.49/cvs/Linux x86_64
Diffstat (limited to 'www-apache')
-rw-r--r--www-apache/passenger/ChangeLog5
-rw-r--r--www-apache/passenger/Manifest16
-rw-r--r--www-apache/passenger/passenger-3.0.12.ebuild5
3 files changed, 14 insertions, 12 deletions
diff --git a/www-apache/passenger/ChangeLog b/www-apache/passenger/ChangeLog
index e1f164e15545..265119930a20 100644
--- a/www-apache/passenger/ChangeLog
+++ b/www-apache/passenger/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for www-apache/passenger
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.45 2012/04/19 11:51:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.46 2012/04/27 10:50:11 graaff Exp $
+
+ 27 Apr 2012; Hans de Graaff <graaff@gentoo.org> passenger-3.0.12.ebuild:
+ Fix automagic use of asciidoc with USE=-doc, bug 413469.
19 Apr 2012; Agostino Sarubbo <ago@gentoo.org> passenger-3.0.7.ebuild:
Stable for amd64, wrt bug #410409
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 6462c0b0f656..6bf50540444f 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -1,5 +1,5 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
AUX 2.2.15-gentoo-multilib-strict.patch 1278 RMD160 bf8c07afd51c60c744b0b362a52236b1c22c6d29 SHA1 5d9fb5b88379b5e634285c739606beebc620ee87 SHA256 dced348f25d2bb41dff59f51c1dd7a8b6771c81dd699a54170e3627bef12ddea
AUX 2.2.4-gentoo.patch 1617 RMD160 bb019e88f04a8f04c9c0dfa6ef1d3f908fc5ffcc SHA1 b4bc124dcd2c537f65a39b9879ac35a0ec310d34 SHA256 d90394f0742131f32dc42a9619305b2712bed3967b78d56480447500d190b8ea
@@ -16,18 +16,14 @@ EBUILD passenger-2.2.15-r1.ebuild 1372 RMD160 7b31bf101d0914063e790a710f4945f3ae
EBUILD passenger-2.2.15.ebuild 1310 RMD160 de65bb9d8c9de2565db681ec0366d6e36189142d SHA1 f3271497fd03e28efbf56640fc7127004fa9e937 SHA256 adfb99efd637dd1f9f6b7d87c751f86de68048349cb602b6a137aecb7794f016
EBUILD passenger-3.0.11-r1.ebuild 2872 RMD160 cbbb51f2405df605883227b35d65123cd17e03c4 SHA1 ed2856e473134a1fb26a2dfc56d7570c1c3e9935 SHA256 1db2fad17a04f52757c0ba8a418d963218cb761393369e21b8fce1b1b525fd55
EBUILD passenger-3.0.11.ebuild 2712 RMD160 c251ba9c502a222dbc016c07fd96ab511393171b SHA1 02e9e6ed4fd834a005cc674a86dcc4a4ad6b2e0e SHA256 4a7ed2e1587ee6e8fa976ba1edc2e5601b869501f8f3f6e3476bafd8a48ae040
-EBUILD passenger-3.0.12.ebuild 2867 RMD160 8ca027f96fbfb7c03107420ef4ae1b6ec4dc96de SHA1 4052efd7240bab734fceeedce22a6db9a04e2ec0 SHA256 51cfe4a374226a0eebd85aeb1c401b12937a7b209f2d9dcc5707223138028432
+EBUILD passenger-3.0.12.ebuild 2991 RMD160 fc6a3b2ad419307acae9e272deb409fb4f2406a4 SHA1 dfe0a674570c043545f614df292ee31be507d35c SHA256 5e212e54b2b6a7be42e8f538b7d3d51ec9a5a11def02d3f48b708ff23afb8a71
EBUILD passenger-3.0.7.ebuild 2501 RMD160 b983de3f56f2abbf67a229bc45ae5f7039608754 SHA1 b301274ac69e9ead15210ec36955a12d11d47470 SHA256 03afc80351b450eeaaac454377b2baf3eb6044ad390b27c0e12575432b511678
-MISC ChangeLog 7666 RMD160 4678d3de7df57557ce26472ea6b8c8a127ec79c5 SHA1 cb318a316cf50418ed09b9ff7d150f5089a618c8 SHA256 974d26c9089ed8392caa38e670541c15e21e92251a1dca5362df9b94f930b0f1
+MISC ChangeLog 7804 RMD160 c52fdd9c7b44711cf8e1019a7e8589d2bab06513 SHA1 3a9fdc583d2e8a49c3f69148b78874ad2c1f175c SHA256 8302e242d4862bfa5a6e941b222bdc526f93e4ff7d94092e7a172b1351618822
MISC metadata.xml 256 RMD160 a31638f3b155f4658c0d27de49cd4a68173cf51e SHA1 4856e7084307052aa2e2b014cd7ce4e2bc28ac52 SHA256 683b0a0169c586b4bdacfaba92b87c0679f145a99c115da39c4438f164f76ca5
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQEcBAEBCgAGBQJPj/xFAAoJEOTDgjZ80txdUTUH/i//Q4T73rtK7YHYelXM857b
-YwCte3hqpLmCRLoRFtsSSerzS8f9VzlvhLJPye5hylyOBRT2ZOlx9USA4gzooa/f
-6zWUodB7cb55T7Q23BsqRQLPwMGXH3ifRXGNPqXg3TmcwYraptnKdrNIMqNvoggY
-vHrZc2NMJRdGtremfUYiDK1RFhBX/ieSLY6a0hP3mB6wspu/3BcEflZGNxGWJsQS
-ClfNBTdInTkTx72x2lOKT6snqdyJVVdkMCsyCTv7eqb6Dm/nPI/B4SbiV2XYBdXR
-gd0JbdfVomyIYjeXo/fBl+HewkhwFZ2L4Iyh5sGg8fy7u++AJLrbxeUOzqCZu2k=
-=hDxU
+iF4EAREIAAYFAk+aee4ACgkQiIP6VqMIqNfqHAD/bG79ktQKs5hZr9SWjp72aD77
+Roo4V0HDTwEZv1j5JsEA/2hfKHYplCyQ7scXsiZERuAaBtwZZ3VA3teCWFbpNv/b
+=n0QX
-----END PGP SIGNATURE-----
diff --git a/www-apache/passenger/passenger-3.0.12.ebuild b/www-apache/passenger/passenger-3.0.12.ebuild
index e6c37c808c69..12fc6d06f232 100644
--- a/www-apache/passenger/passenger-3.0.12.ebuild
+++ b/www-apache/passenger/passenger-3.0.12.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/passenger-3.0.12.ebuild,v 1.1 2012/04/14 06:10:22 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/passenger-3.0.12.ebuild,v 1.2 2012/04/27 10:50:11 graaff Exp $
EAPI=4
USE_RUBY="ruby18 ruby19"
@@ -61,6 +61,9 @@ all_ruby_prepare() {
# Make sure we use the system-provided version.
rm -rf ext/libev || die "Unable to remove vendored libev."
+
+ # fix automagic use of asciidoc, bug 413469
+ sed -i -e '/fakeroot/ s/+ Packaging::ASCII_DOCS//' build/packaging.rb || die
}
each_ruby_compile() {