Fix bug #133713, #173748, #175204. Remove old versions

(Portage version: 2.1.2.2)

8 files changed, 67 insertions, 79 deletions

diff --git a/www-servers/gorg/ChangeLog b/www-servers/gorg/ChangeLog
index 7257ed02e7c0..768c7389ed10 100644
--- a/www-servers/gorg/ChangeLog
+++ b/www-servers/gorg/ChangeLog
@@ -1,6 +1,12 @@
 # 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.12 2007/04/19 13:47:17 rbrown Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/gorg/ChangeLog,v 1.13 2007/04/23 17:15:36 rbrown Exp $
+
+*gorg-0.6.3-r1 (23 Apr 2007)
+
+  23 Apr 2007; Richard Brown <rbrown@gentoo.org> metadata.xml,
+  -gorg-0.6.ebuild, -gorg-0.6.1.ebuild, +gorg-0.6.3-r1.ebuild:
+  Fix bug #133713, #173748, #175204. Remove old versions
 
   19 Apr 2007; Richard Brown <rbrown@gentoo.org> gorg-0.6.3.ebuild:
   dev-db/mysql => virtual/mysql
diff --git a/www-servers/gorg/files/digest-gorg-0.6 b/www-servers/gorg/files/digest-gorg-0.6
deleted file mode 100644
index 5e653bf74c33..000000000000
--- a/www-servers/gorg/files/digest-gorg-0.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ba3fad912e6e0f60de36665d1c834373 gorg-0.6.tgz 55890
-RMD160 78c3d465060e5458fa1339b94635db8591edfa58 gorg-0.6.tgz 55890
-SHA256 2e6805c2914b1196bb91625984914f5d8d361c38b01b96f2cc08558dc7c07603 gorg-0.6.tgz 55890
diff --git a/www-servers/gorg/files/digest-gorg-0.6.1 b/www-servers/gorg/files/digest-gorg-0.6.1
deleted file mode 100644
index 7597b2764675..000000000000
--- a/www-servers/gorg/files/digest-gorg-0.6.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2ef4caf8822c063a47812ec5c2d1db5a gorg-0.6.1.tgz 56093
-RMD160 f6470314a0bf51620762c8a1043cd9a7efe1168f gorg-0.6.1.tgz 56093
-SHA256 ff6a3d1da5393db0a2c3ad48c70482d65464368d8754a8682a51fbad2f946b3b gorg-0.6.1.tgz 56093
diff --git a/www-servers/gorg/files/digest-gorg-0.6.3-r1 b/www-servers/gorg/files/digest-gorg-0.6.3-r1
new file mode 100644
index 000000000000..61af72a1b443
--- /dev/null
+++ b/www-servers/gorg/files/digest-gorg-0.6.3-r1
@@ -0,0 +1,3 @@
+MD5 e32c7e3b4604a483ec9cdc1af648be8f gorg-0.6.3.tgz 56384
+RMD160 dca61e17138763a2785893a83221533eb79ef1fa gorg-0.6.3.tgz 56384
+SHA256 3c4822b6d16a3fb04a772016589c68e6ad5bbcf240a3c621a7a7f8676d6303ce gorg-0.6.3.tgz 56384
diff --git a/www-servers/gorg/gorg-0.6.1.ebuild b/www-servers/gorg/gorg-0.6.1.ebuild
deleted file mode 100644
index 5fc2eef66a8c..000000000000
--- a/www-servers/gorg/gorg-0.6.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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.1.ebuild,v 1.3 2007/02/10 13:57:59 beandog 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"
-
-SLOT="0"
-USE_RUBY="ruby18"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND=">=dev-libs/libxml2-2.6.16
-		>=dev-libs/libxslt-1.1.12"
-RDEPEND="apache? ( net-www/apache )
-		 fastcgi? ( >=www-apache/mod_fcgid-1.05
-					>=dev-ruby/ruby-fcgi-0.8.5-r1 )
-		 mysql?	  (	>=virtual/mysql-4.0
-					>=dev-ruby/ruby-dbi-0.0.21
-					>=dev-ruby/mysql-ruby-2.5 )"
-
-src_install() {
-	ruby_src_install
-
-	# install doesn't seem to chmod these correctly, forcing it here
-	chmod +x ${D}/usr/lib/ruby/site_ruby/*/gorg/cgi-bin/*.cgi
-	chmod +x ${D}/usr/lib/ruby/site_ruby/*/gorg/fcgi-bin/*.fcgi
-
-	keepdir /etc/gorg
-	diropts -m0750 -o apache -g apache; dodir /var/cache/gorg
-	keepdir /var/cache/gorg
-	insinto etc/gorg ; doins ${S}/etc/gorg/*
-	dodoc Changelog
-}
diff --git a/www-servers/gorg/gorg-0.6.3-r1.ebuild b/www-servers/gorg/gorg-0.6.3-r1.ebuild
new file mode 100644
index 000000000000..1ec002453f3e
--- /dev/null
+++ b/www-servers/gorg/gorg-0.6.3-r1.ebuild
@@ -0,0 +1,56 @@
+# 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.1 2007/04/23 17:15:36 rbrown 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"
+
+EAPI="0"
+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}
+	apache? ( net-www/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() {
+	if use mysql && ! built_with_use dev-ruby/ruby-dbi mysql ; then
+		eerror "You must compile ruby-dbi with the mysql USE flag enabled"
+		die
+	fi
+	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
+}
diff --git a/www-servers/gorg/gorg-0.6.ebuild b/www-servers/gorg/gorg-0.6.ebuild
deleted file mode 100644
index c291eed7dfa2..000000000000
--- a/www-servers/gorg/gorg-0.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/gorg/gorg-0.6.ebuild,v 1.3 2006/11/23 20:41:51 vivo 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"
-
-SLOT="0"
-USE_RUBY="ruby18"
-LICENSE="GPL-2"
-KEYWORDS="~ppc ~x86"
-
-DEPEND=">=dev-libs/libxml2-2.6.16
-		>=dev-libs/libxslt-1.1.12"
-RDEPEND="apache? ( net-www/apache )
-		 fastcgi? ( >=www-apache/mod_fcgid-1.05
-					>=dev-ruby/ruby-fcgi-0.8.5-r1 )
-		 mysql?	  (	>=virtual/mysql-4.0
-					>=dev-ruby/ruby-dbi-0.0.21
-					>=dev-ruby/mysql-ruby-2.5 )"
-
-src_install() {
-	ruby_src_install
-	keepdir /etc/gorg
-	diropts -m0750 -o apache -g apache; dodir /var/cache/gorg
-	keepdir /var/cache/gorg
-	insinto etc/gorg ; doins ${S}/etc/gorg/*
-	dodoc Changelog
-}
diff --git a/www-servers/gorg/metadata.xml b/www-servers/gorg/metadata.xml
index 7946f95ca104..ef2bb339d568 100644
--- a/www-servers/gorg/metadata.xml
+++ b/www-servers/gorg/metadata.xml
@@ -15,7 +15,7 @@
 		Gorg was developed with http://www.gentoo.org in mind and it allows you
 		to serve your own local copy of http://www.gentoo.org. It can use either
 		a cgi or a fastcgi script with apache, or even use its own stand-alone
-		web server. Its name is short for Gentoo.org. 
+		web server. Its name is short for Gentoo.org.
 	</longdescription>
 </pkgmetadata>