Removed apache and fastcgi messages. Displays a message during postinstall now. See bug #186107.

Package-Manager: portage-2.1.3.7

5 files changed, 50 insertions, 44 deletions

diff --git a/www-servers/gorg/ChangeLog b/www-servers/gorg/ChangeLog
index 3f9833a17019..57786722a244 100644
--- a/www-servers/gorg/ChangeLog
+++ b/www-servers/gorg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-servers/gorg
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/gorg/ChangeLog,v 1.15 2007/07/29 17:45:25 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/gorg/ChangeLog,v 1.16 2007/09/05 01:29:25 nichoj Exp $
+
+  05 Sep 2007; Joshua Nichols <nichoj@gentoo.org> gorg-0.5.ebuild,
+  gorg-0.6.3.ebuild, gorg-0.6.3-r1.ebuild:
+  Removed apache and fastcgi messages. Displays a message during postinstall
+  now. See bug #186107.
 
   29 Jul 2007; Christian Heim <phreak@gentoo.org> gorg-0.5.ebuild,
   gorg-0.6.3.ebuild, gorg-0.6.3-r1.ebuild:
diff --git a/www-servers/gorg/Manifest b/www-servers/gorg/Manifest
index 96b47baa4c30..d11f860b9c9e 100644
--- a/www-servers/gorg/Manifest
+++ b/www-servers/gorg/Manifest
@@ -1,24 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST gorg-0.5.tgz 43224 RMD160 7ea132ed64d0a505e4b09253b34cadfb29a21a9b SHA1 debe42a7f83c2ee255102978bb5e557c137291bb SHA256 e696e37f3ca004641837389e8dbac18e501dc74a4d4c4a9de72cb236c53107b8
 DIST gorg-0.6.3.tgz 56384 RMD160 dca61e17138763a2785893a83221533eb79ef1fa SHA1 33a306cec67fc208adf5843b272b8e674d1b57bc SHA256 3c4822b6d16a3fb04a772016589c68e6ad5bbcf240a3c621a7a7f8676d6303ce
-EBUILD gorg-0.5.ebuild 851 RMD160 dd3242d751102060ef4aa21ce6d032ede2127914 SHA1 8ee9f33f5cf6bb472b9379ef653dbb741b70486c SHA256 dccc89542be3771c18af00933a3cdfb78b1e2174bd3d4a51295addca0d5f2a9a
-MD5 5004820a1a69961d6ff9ba5caf6a2301 gorg-0.5.ebuild 851
-RMD160 dd3242d751102060ef4aa21ce6d032ede2127914 gorg-0.5.ebuild 851
-SHA256 dccc89542be3771c18af00933a3cdfb78b1e2174bd3d4a51295addca0d5f2a9a gorg-0.5.ebuild 851
-EBUILD gorg-0.6.3-r1.ebuild 1600 RMD160 b4a8c36a0d8bfcf5d12ebc2f89db269774691391 SHA1 61af729c80b0925807d28da3a5a6a43fc45a67aa SHA256 adaf078c0ec58e4b8cbb9a0116226e60577cae11ef6d89e06beb26ea80a2470f
-MD5 1f7df5ff49cbc2ff61fdfc5f5ebc7c2c gorg-0.6.3-r1.ebuild 1600
-RMD160 b4a8c36a0d8bfcf5d12ebc2f89db269774691391 gorg-0.6.3-r1.ebuild 1600
-SHA256 adaf078c0ec58e4b8cbb9a0116226e60577cae11ef6d89e06beb26ea80a2470f gorg-0.6.3-r1.ebuild 1600
-EBUILD gorg-0.6.3.ebuild 1336 RMD160 59e0140d959bf5836c90afa04d0ef49ded49771f SHA1 81465ec57175dc26477e81f9d68962c02d600d15 SHA256 c505db9f37f2fd1d1e9a4e38161cede6d724c0d97a0e5520070bd6b04cc68a15
-MD5 8055ebb547b46393c70ea2eedbfd4ffe gorg-0.6.3.ebuild 1336
-RMD160 59e0140d959bf5836c90afa04d0ef49ded49771f gorg-0.6.3.ebuild 1336
-SHA256 c505db9f37f2fd1d1e9a4e38161cede6d724c0d97a0e5520070bd6b04cc68a15 gorg-0.6.3.ebuild 1336
-MISC ChangeLog 2049 RMD160 a27d2a1daa8d045fc48766f61771b0b4f89244bb SHA1 1b825d3f608e60c8d7953ba77b58ed81bdc2c5e1 SHA256 a74ec0abcdc93417b837a4f6a37b9cd5303926a403dfc0ca236dce66fdae1038
-MD5 cdf0a2647835b358b1360ff173586c39 ChangeLog 2049
-RMD160 a27d2a1daa8d045fc48766f61771b0b4f89244bb ChangeLog 2049
-SHA256 a74ec0abcdc93417b837a4f6a37b9cd5303926a403dfc0ca236dce66fdae1038 ChangeLog 2049
+EBUILD gorg-0.5.ebuild 915 RMD160 9aa981cb2f32cd1d2250d5a883a334beb6507222 SHA1 99d2b188745717d4488fac6e4176c736951b4a5a SHA256 6ac649768dd48756b47b982a39474c08d5ccc6fdd87c1a77a85c76c3e7fdaa68
+MD5 69ddfaafdcc43a0273e84e97b59fb2f1 gorg-0.5.ebuild 915
+RMD160 9aa981cb2f32cd1d2250d5a883a334beb6507222 gorg-0.5.ebuild 915
+SHA256 6ac649768dd48756b47b982a39474c08d5ccc6fdd87c1a77a85c76c3e7fdaa68 gorg-0.5.ebuild 915
+EBUILD gorg-0.6.3-r1.ebuild 1664 RMD160 b31911e22afb68af1122132b2805c22cd14b06af SHA1 f86f8d8badfc57c3dea49187d9a76e3b482b0155 SHA256 bf6998f0434eb268fc0a58224da5ed91533461370f347ddb21199bbbfc7928bd
+MD5 01fab59eaef7971b1cd5c5887ddd997e gorg-0.6.3-r1.ebuild 1664
+RMD160 b31911e22afb68af1122132b2805c22cd14b06af gorg-0.6.3-r1.ebuild 1664
+SHA256 bf6998f0434eb268fc0a58224da5ed91533461370f347ddb21199bbbfc7928bd gorg-0.6.3-r1.ebuild 1664
+EBUILD gorg-0.6.3.ebuild 1406 RMD160 e020f98334abd118f219a25fb2ceeaa7718c13f6 SHA1 5746753c044aed34afb6ee0d44e8876cb69db58e SHA256 2b13b9efe8e350c0064c77f4c80217935ab0d205627de53939b6bd3e2ae29bf0
+MD5 9e8af6fd2fc6fef4d001c5605defdd7e gorg-0.6.3.ebuild 1406
+RMD160 e020f98334abd118f219a25fb2ceeaa7718c13f6 gorg-0.6.3.ebuild 1406
+SHA256 2b13b9efe8e350c0064c77f4c80217935ab0d205627de53939b6bd3e2ae29bf0 gorg-0.6.3.ebuild 1406
+MISC ChangeLog 2261 RMD160 697ee9d7bcec4b75e410ca2a928c683fb0aa3a9a SHA1 836caf98f7f218c177c4ab3e85ddfe956d94d8e8 SHA256 24144d1afe93a4e6ccface829c83fe0d2e59d38cc9105665aae85e5d0bf72997
+MD5 e35e51871019ce6d4473b6b332a4408e ChangeLog 2261
+RMD160 697ee9d7bcec4b75e410ca2a928c683fb0aa3a9a ChangeLog 2261
+SHA256 24144d1afe93a4e6ccface829c83fe0d2e59d38cc9105665aae85e5d0bf72997 ChangeLog 2261
 MISC metadata.xml 735 RMD160 5c80479c7e11e05acaa9587cf9aac9e771f0c41c SHA1 e1c6375fb51f58caa6cea7045f2d85fad76d1a56 SHA256 163f4fb369219700e0c14a7620733af75e41e2394d6d7f6b14a22b41971877c0
 MD5 333cfa60e03f1883252202ea5f0aeea6 metadata.xml 735
 RMD160 5c80479c7e11e05acaa9587cf9aac9e771f0c41c metadata.xml 735
@@ -32,10 +29,3 @@ SHA256 0cd84257e9b473bdfd670fb28c20b3824dc14d70542ec3c8b592ef76d75bd8df files/di
 MD5 e177c6752b29fcf24692a6b73f827f02 files/digest-gorg-0.6.3-r1 220
 RMD160 0c563c490c9f94f4ec022fa6a39631c6155f8a81 files/digest-gorg-0.6.3-r1 220
 SHA256 0cd84257e9b473bdfd670fb28c20b3824dc14d70542ec3c8b592ef76d75bd8df files/digest-gorg-0.6.3-r1 220
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
-
-iD8DBQFGrNJByuNVb5qfaOYRAqmxAJ4laaSnAOgCT9MMcZ3mEnZU6asq8QCdEd25
-e+aDC+WrXsEDVLySha2/sAo=
-=JHqv
------END PGP SIGNATURE-----
diff --git a/www-servers/gorg/gorg-0.5.ebuild b/www-servers/gorg/gorg-0.5.ebuild
index 01c7d6dbb3c9..7e4e2cd2f08c 100644
--- a/www-servers/gorg/gorg-0.5.ebuild
+++ b/www-servers/gorg/gorg-0.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/gorg/gorg-0.5.ebuild,v 1.7 2007/07/29 17:45:25 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/gorg/gorg-0.5.ebuild,v 1.8 2007/09/05 01:29:25 nichoj Exp $
 
 inherit ruby
 
 DESCRIPTION="Back-end XSLT processor for an XML-based web site"
 HOMEPAGE="http://dev.gentoo.org/~neysx/gorg/gorg.html"
 SRC_URI="http://dev.gentoo.org/~neysx/gorg/${P}.tgz"
-IUSE="apache fastcgi"
+IUSE=""
 
 SLOT="0"
 USE_RUBY="ruby18"
@@ -16,9 +16,6 @@ KEYWORDS="~amd64 ppc x86"
 
 DEPEND=">=dev-libs/libxml2-2.6.16
 		>=dev-libs/libxslt-1.1.12"
-RDEPEND="apache? ( www-servers/apache )
-		 fastcgi? ( >=www-apache/mod_fcgid-1.05
-					>=dev-ruby/ruby-fcgi-0.8.5-r1 )"
 
 src_install() {
 	ruby_src_install
@@ -27,3 +24,10 @@ src_install() {
 	insinto etc/gorg ; doins ${S}/etc/gorg/*
 	dodoc Changelog
 }
+
+pkg_postinst() {
+	elog "To use with apache, do:"
+	elog "\t emerge www-servers/apache"
+	elog "To use with fastcgi, do:"
+	elog "\t emerge >=www-apache/mod_fcgid-1.05 >=dev-ruby/ruby-fcgi-0.8.5-r1"
+}
diff --git a/www-servers/gorg/gorg-0.6.3-r1.ebuild b/www-servers/gorg/gorg-0.6.3-r1.ebuild
index 3b253d063192..57bec62ae7a5 100644
--- a/www-servers/gorg/gorg-0.6.3-r1.ebuild
+++ b/www-servers/gorg/gorg-0.6.3-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/gorg/gorg-0.6.3-r1.ebuild,v 1.3 2007/07/29 17:45:25 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/gorg/gorg-0.6.3-r1.ebuild,v 1.4 2007/09/05 01:29:25 nichoj Exp $
 
 inherit ruby eutils
 
 DESCRIPTION="Back-end XSLT processor for an XML-based web site"
 HOMEPAGE="http://gentoo.neysx.org/mystuff/gorg/gorg.xml"
 SRC_URI="http://gentoo.neysx.org/mystuff/gorg/${P}.tgz"
-IUSE="apache fastcgi mysql"
+IUSE="mysql"
 
 SLOT="0"
 USE_RUBY="ruby18"
@@ -18,10 +18,6 @@ DEPEND="virtual/ruby
 	>=dev-libs/libxml2-2.6.16
 	>=dev-libs/libxslt-1.1.12"
 RDEPEND="${DEPEND}
-	apache? ( www-servers/apache )
-	fastcgi? ( >=dev-ruby/ruby-fcgi-0.8.5-r1
-		apache? ( >=www-apache/mod_fcgid-1.05 )
-	)
 	mysql? ( >=dev-ruby/ruby-dbi-0.0.21 >=dev-ruby/mysql-ruby-2.5 )"
 
 pkg_setup() {
@@ -53,3 +49,10 @@ src_install() {
 
 	dodoc Changelog README
 }
+
+pkg_postinst() {
+	elog "To use with apache, do:"
+	elog "\t emerge www-servers/apache"
+	elog "To use with fastcgi, do:"
+	elog "\t emerge >=www-apache/mod_fcgid-1.05 >=dev-ruby/ruby-fcgi-0.8.5-r1"
+}
diff --git a/www-servers/gorg/gorg-0.6.3.ebuild b/www-servers/gorg/gorg-0.6.3.ebuild
index 9208d649bc58..52a487326a17 100644
--- a/www-servers/gorg/gorg-0.6.3.ebuild
+++ b/www-servers/gorg/gorg-0.6.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/gorg/gorg-0.6.3.ebuild,v 1.3 2007/07/29 17:45:25 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/gorg/gorg-0.6.3.ebuild,v 1.4 2007/09/05 01:29:25 nichoj Exp $
 
 inherit ruby
 
 DESCRIPTION="Back-end XSLT processor for an XML-based web site"
 HOMEPAGE="http://gentoo.neysx.org/mystuff/gorg/gorg.xml"
 SRC_URI="http://gentoo.neysx.org/mystuff/gorg/${P}.tgz"
-IUSE="apache fastcgi mysql"
+IUSE="mysql"
 
 SLOT="0"
 USE_RUBY="ruby18"
@@ -16,10 +16,7 @@ KEYWORDS="~ppc ~x86"
 
 DEPEND=">=dev-libs/libxml2-2.6.16
 		>=dev-libs/libxslt-1.1.12"
-RDEPEND="apache? ( www-servers/apache )
-		 fastcgi? ( >=www-apache/mod_fcgid-1.05
-					>=dev-ruby/ruby-fcgi-0.8.5-r1 )
-		 mysql?	  (	>=virtual/mysql-4
+RDEPEND="mysql?	  (	>=virtual/mysql-4
 					>=dev-ruby/ruby-dbi-0.0.21
 					>=dev-ruby/mysql-ruby-2.5 )"
 
@@ -39,3 +36,10 @@ src_install() {
 	insinto etc/gorg ; doins ${S}/etc/gorg/*
 	dodoc Changelog
 }
+
+pkg_postinst() {
+	elog "To use with apache, do:"
+	elog "\t emerge www-servers/apache"
+	elog "To use with fastcgi, do:"
+	elog "\t emerge >=www-apache/mod_fcgid-1.05 >=dev-ruby/ruby-fcgi-0.8.5-r1"
+}