Add apache2 and fastcgi USE flags and clean up the ebuild.

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.27-gentoo-r7 x86_64

3 files changed, 73 insertions, 3 deletions

diff --git a/www-servers/gorg/ChangeLog b/www-servers/gorg/ChangeLog
index 57786722a244..3db0998a6513 100644
--- a/www-servers/gorg/ChangeLog
+++ b/www-servers/gorg/ChangeLog
@@ -1,6 +1,14 @@
 # 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.16 2007/09/05 01:29:25 nichoj Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/gorg/ChangeLog,v 1.17 2008/12/30 12:43:24 graaff Exp $
+
+*gorg-0.6.3-r2 (30 Dec 2008)
+
+  30 Dec 2008; Hans de Graaff <graaff@gentoo.org> +gorg-0.6.3-r2.ebuild:
+  Add apache2 and fastcgi USE flags as requested in #251177 and how we handle
+  this for other similar packages. Move to EAPI=2 so that we can handle the
+  mysql USE flag dependency on ruby-dbi better. Don't depend directly on
+  underlying dependencies of ruby-dbi and ruby-fcgi. Fix variable quoting.
 
   05 Sep 2007; Joshua Nichols <nichoj@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 da033b2c37d5..e03bb193da7e 100644
--- a/www-servers/gorg/Manifest
+++ b/www-servers/gorg/Manifest
@@ -1,7 +1,18 @@
+-----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 915 RMD160 9aa981cb2f32cd1d2250d5a883a334beb6507222 SHA1 99d2b188745717d4488fac6e4176c736951b4a5a SHA256 6ac649768dd48756b47b982a39474c08d5ccc6fdd87c1a77a85c76c3e7fdaa68
 EBUILD gorg-0.6.3-r1.ebuild 1664 RMD160 b31911e22afb68af1122132b2805c22cd14b06af SHA1 f86f8d8badfc57c3dea49187d9a76e3b482b0155 SHA256 bf6998f0434eb268fc0a58224da5ed91533461370f347ddb21199bbbfc7928bd
+EBUILD gorg-0.6.3-r2.ebuild 1408 RMD160 e098895dc140363a2dbaa3ab3fb024c77197eeaa SHA1 e1d21bf08f23aafd629d3869135aff70f282c109 SHA256 57737eb5f83c6ac062b2c1a16e8c3e3866b1a900df91928e4478ff79ad52e788
 EBUILD gorg-0.6.3.ebuild 1406 RMD160 e020f98334abd118f219a25fb2ceeaa7718c13f6 SHA1 5746753c044aed34afb6ee0d44e8876cb69db58e SHA256 2b13b9efe8e350c0064c77f4c80217935ab0d205627de53939b6bd3e2ae29bf0
-MISC ChangeLog 2261 RMD160 697ee9d7bcec4b75e410ca2a928c683fb0aa3a9a SHA1 836caf98f7f218c177c4ab3e85ddfe956d94d8e8 SHA256 24144d1afe93a4e6ccface829c83fe0d2e59d38cc9105665aae85e5d0bf72997
+MISC ChangeLog 2667 RMD160 75d878359b08e731930845f35ec907287e6aebb4 SHA1 c4a4771fe1004594b43f5e207636eb771cb1a2df SHA256 f3a8b0017b70803b69d14e5ef51c62763bad0dc327b3393d1eb613707a818ef9
 MISC metadata.xml 735 RMD160 5c80479c7e11e05acaa9587cf9aac9e771f0c41c SHA1 e1c6375fb51f58caa6cea7045f2d85fad76d1a56 SHA256 163f4fb369219700e0c14a7620733af75e41e2394d6d7f6b14a22b41971877c0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAklaF3IACgkQqj4ysMWt/vuuZwCcDje7ZESJieipJjEB4yBSHJha
+k98AoOrpaZvpyDUctn/mb1Ruz28D6fMn
+=hGLP
+-----END PGP SIGNATURE-----
diff --git a/www-servers/gorg/gorg-0.6.3-r2.ebuild b/www-servers/gorg/gorg-0.6.3-r2.ebuild
new file mode 100644
index 000000000000..10a78a5711af
--- /dev/null
+++ b/www-servers/gorg/gorg-0.6.3-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2008 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-r2.ebuild,v 1.1 2008/12/30 12:43:24 graaff Exp $
+
+EAPI=2
+
+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="apache2 fastcgi mysql"
+
+SLOT="0"
+USE_RUBY="ruby18"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="virtual/ruby
+	>=dev-libs/libxml2-2.6.16
+	>=dev-libs/libxslt-1.1.12"
+RDEPEND="${DEPEND}
+	mysql? ( >=dev-ruby/ruby-dbi-0.0.21[mysql] )
+	apache2? ( www-servers/apache )
+	fastcgi? ( >=dev-ruby/ruby-fcgi-0.8.5-r1 )"
+
+pkg_setup() {
+	enewgroup gorg
+	enewuser  gorg -1 -1 -1 gorg
+}
+
+src_compile() {
+	# Fix listen issue w/ webrick
+	sed -i -e 's/WEBrick::HTTPServer.new(/WEBrick::HTTPServer.new( :BindAddress=>"127.0.0.1",/' lib/gorg/www.rb
+
+	ruby_src_compile
+}
+
+src_install() {
+	ruby_einstall
+
+	# install doesn't seem to chmod these correctly, forcing it here
+	SITE_LIB_DIR=`$RUBY -r rbconfig -e 'puts Config::CONFIG["sitelibdir"]'`
+	chmod +x "${D}"/${SITE_LIB_DIR}/gorg/cgi-bin/*.cgi
+	chmod +x "${D}"/${SITE_LIB_DIR}/gorg/fcgi-bin/*.fcgi
+
+	keepdir /etc/gorg; insinto /etc/gorg ; doins etc/gorg/*
+	diropts -m0770 -o gorg -g gorg; keepdir /var/cache/gorg
+
+	dodoc Changelog README
+}