My attempt at an apache-modules complaint ebuild

(Portage version: 2.0.51.19)

7 files changed, 67 insertions, 13 deletions

diff --git a/dev-ruby/mod_ruby/ChangeLog b/dev-ruby/mod_ruby/ChangeLog
index 4dc99edf1fae..2f7a1bf38ac5 100644
--- a/dev-ruby/mod_ruby/ChangeLog
+++ b/dev-ruby/mod_ruby/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/mod_ruby
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mod_ruby/ChangeLog,v 1.7 2004/12/16 09:49:22 corsair Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mod_ruby/ChangeLog,v 1.8 2005/03/23 16:39:06 caleb Exp $
+
+*mod_ruby-1.2.4-r1 (23 Mar 2005)
+
+  23 Mar 2005; Caleb Tennis <caleb@gentoo.org> +mod_ruby-1.2.4-r1.ebuild:
+  New attempt at a apache-modules compliant ebuild
 
   16 Dec 2004; Markus Rothe <corsair@gentoo.org> mod_ruby-1.2.4.ebuild:
   Stable on ppc64
diff --git a/dev-ruby/mod_ruby/Manifest b/dev-ruby/mod_ruby/Manifest
index 3f4fa7a6ddc4..1cda81f098af 100644
--- a/dev-ruby/mod_ruby/Manifest
+++ b/dev-ruby/mod_ruby/Manifest
@@ -1,10 +1,12 @@
-MD5 76a166231ed89fe239fe49d3f7855631 ChangeLog 3810
-MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
-MD5 3d286deb21898104cd1cf8a83321b662 mod_ruby-1.0.7.ebuild 927
 MD5 7767b6aef677eb56995397fb051cae9d mod_ruby-1.2.2.ebuild 1960
 MD5 7f4a1512393ef7e98ad72c9ae28117a0 mod_ruby-1.2.4.ebuild 1959
-MD5 9212f9bc81514ddee76f6c4251ca71c3 files/20_mod_ruby.conf 1286
+MD5 3d286deb21898104cd1cf8a83321b662 mod_ruby-1.0.7.ebuild 927
+MD5 6b2a91f6bdbd50294cce00741fadd4c3 mod_ruby-1.2.4-r1.ebuild 1040
+MD5 76a166231ed89fe239fe49d3f7855631 ChangeLog 3810
+MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
+MD5 1c959dc0f47469dfabd1a9c0aad3898c files/digest-mod_ruby-1.2.4-r1 66
+MD5 70674a49abbe9321ac65cf4932c0ad23 files/mod_ruby.conf 846
 MD5 fa5123111f5278201525d49f658b4a3b files/digest-mod_ruby-1.0.7 65
 MD5 094ecc3f9ad4a6698c2ef4ee0c8139cc files/digest-mod_ruby-1.2.2 65
 MD5 1c959dc0f47469dfabd1a9c0aad3898c files/digest-mod_ruby-1.2.4 66
-MD5 70674a49abbe9321ac65cf4932c0ad23 files/mod_ruby.conf 846
+MD5 9212f9bc81514ddee76f6c4251ca71c3 files/20_mod_ruby.conf 1286
diff --git a/dev-ruby/mod_ruby/files/digest-mod_ruby-1.2.4-r1 b/dev-ruby/mod_ruby/files/digest-mod_ruby-1.2.4-r1
new file mode 100644
index 000000000000..235102d8b969
--- /dev/null
+++ b/dev-ruby/mod_ruby/files/digest-mod_ruby-1.2.4-r1
@@ -0,0 +1 @@
+MD5 2b803c021297517eecb3dc6cf77b9534 mod_ruby-1.2.4.tar.gz 107797
diff --git a/dev-ruby/mod_ruby/mod_ruby-1.0.7.ebuild b/dev-ruby/mod_ruby/mod_ruby-1.0.7.ebuild
index b5688a4ea9f1..86ca68b2a50d 100644
--- a/dev-ruby/mod_ruby/mod_ruby-1.0.7.ebuild
+++ b/dev-ruby/mod_ruby/mod_ruby-1.0.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mod_ruby/mod_ruby-1.0.7.ebuild,v 1.1 2004/09/21 18:12:39 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mod_ruby/mod_ruby-1.0.7.ebuild,v 1.2 2005/03/23 16:39:06 caleb Exp $
 
 DESCRIPTION="An Apache2 DSO providing an embedded Ruby interpreter"
 HOMEPAGE="http://www.modruby.net/"
diff --git a/dev-ruby/mod_ruby/mod_ruby-1.2.2.ebuild b/dev-ruby/mod_ruby/mod_ruby-1.2.2.ebuild
index dffd29fedcff..8c014b353a02 100644
--- a/dev-ruby/mod_ruby/mod_ruby-1.2.2.ebuild
+++ b/dev-ruby/mod_ruby/mod_ruby-1.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mod_ruby/mod_ruby-1.2.2.ebuild,v 1.4 2004/11/01 20:21:23 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mod_ruby/mod_ruby-1.2.2.ebuild,v 1.5 2005/03/23 16:39:06 caleb Exp $
 
 DESCRIPTION="Embeds the Ruby interpreter into Apache"
 HOMEPAGE="http://modruby.net/"
diff --git a/dev-ruby/mod_ruby/mod_ruby-1.2.4-r1.ebuild b/dev-ruby/mod_ruby/mod_ruby-1.2.4-r1.ebuild
new file mode 100644
index 000000000000..a68439b49dfd
--- /dev/null
+++ b/dev-ruby/mod_ruby/mod_ruby-1.2.4-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mod_ruby/mod_ruby-1.2.4-r1.ebuild,v 1.1 2005/03/23 16:39:06 caleb Exp $
+
+inherit apache-module
+
+DESCRIPTION="Embeds the Ruby interpreter into Apache"
+HOMEPAGE="http://modruby.net/"
+SRC_URI="http://modruby.net/archive/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~sparc ~x86 ~ppc ~amd64 ~ppc64"
+IUSE="doc"
+
+DEPEND="virtual/ruby
+	doc? ( dev-ruby/rdtool )"
+
+APACHE1_MOD_CONF="/mod_ruby"
+APACHE2_MOD_CONF="20_mod_ruby"
+APACHE1_MOD_DEFINE="RUBY"
+APACHE2_MOD_DEFINE="RUBY"
+APACHE1_MOD_FILE="$S/mod_ruby.so"
+APACHE2_MOD_FILE="$S/mod_ruby.so"
+DOCFILES="ChangeLog COPYING README.* doc/*.html doc/*.css"
+
+need_apache
+
+src_compile() {
+	if [ "${APACHE_VERSION}" == "2"]; then
+		APXS=${APXS2}
+		APACHE_BASEDIR=${APACHE2_BASEDIR}
+	else
+		APXS=${APXS1}
+		APACHE_BASEDIR=${APACHE1_BASEDIR}
+	fi
+
+	./configure.rb --with-apxs=${APXS}
+
+#	sed -i -e "s:\(^APACHE_LIBEXECDIR = \$(DESTDIR)${APACHE_BASEDIR}\)/modules:\1-extramodules:" Makefile
+	emake || die
+
+	if use doc; then
+		cd doc
+		emake
+	fi
+}
diff --git a/dev-ruby/mod_ruby/mod_ruby-1.2.4.ebuild b/dev-ruby/mod_ruby/mod_ruby-1.2.4.ebuild
index 9c8124290c15..82f71b54ffba 100644
--- a/dev-ruby/mod_ruby/mod_ruby-1.2.4.ebuild
+++ b/dev-ruby/mod_ruby/mod_ruby-1.2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mod_ruby/mod_ruby-1.2.4.ebuild,v 1.4 2004/12/16 09:49:22 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mod_ruby/mod_ruby-1.2.4.ebuild,v 1.5 2005/03/23 16:39:06 caleb Exp $
 
 DESCRIPTION="Embeds the Ruby interpreter into Apache"
 HOMEPAGE="http://modruby.net/"