Version bumped. Sources are taken from Debian. This closes bug #57098

5 files changed, 52 insertions, 3 deletions

diff --git a/app-emacs/apache-mode/ChangeLog b/app-emacs/apache-mode/ChangeLog
index f0d47e8b6e95..d179a94ba90a 100644
--- a/app-emacs/apache-mode/ChangeLog
+++ b/app-emacs/apache-mode/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/apache-mode
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/apache-mode/ChangeLog,v 1.4 2004/06/24 22:05:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/apache-mode/ChangeLog,v 1.5 2004/07/17 18:33:21 usata Exp $
+
+*apache-mode-1.1 (18 Jul 2004)
+
+  18 Jul 2004; Mamoru KOMACHI <usata@gentoo.org>
+  files/50apache-mode-gentoo.el, +apache-mode-1.1.ebuild:
+  Version bumped. Sources are taken from Debian. This closes bug #57098
 
 *apache-mode-1.0 (04 Nov 2002)
 
diff --git a/app-emacs/apache-mode/Manifest b/app-emacs/apache-mode/Manifest
index 2c474148f3a5..1f629c7cf093 100644
--- a/app-emacs/apache-mode/Manifest
+++ b/app-emacs/apache-mode/Manifest
@@ -1,5 +1,7 @@
 MD5 0786d00b8a6b1e0a8a27f26eba5d5a07 apache-mode-1.0.ebuild 865
-MD5 ee7507d7b7a4b5d39978c298fa670d07 ChangeLog 422
+MD5 947d62901f7c85065f84dbdf4e8341ae ChangeLog 631
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
+MD5 1dd0b4f1ff6e7ca1acd80f0b2a3d8c30 apache-mode-1.1.ebuild 858
 MD5 5dbfa409fe0601da457e0abb5008f924 files/digest-apache-mode-1.0 66
-MD5 894ee486fae51c96d2bfe1c2ca594aa7 files/50apache-mode-gentoo.el 403
+MD5 36f8fd593bb185bfa2f31f1945414214 files/50apache-mode-gentoo.el 551
+MD5 ff6967ad8da55344ed3ef5f670f819c5 files/digest-apache-mode-1.1 64
diff --git a/app-emacs/apache-mode/apache-mode-1.1.ebuild b/app-emacs/apache-mode/apache-mode-1.1.ebuild
new file mode 100644
index 000000000000..0d397ed6f729
--- /dev/null
+++ b/app-emacs/apache-mode/apache-mode-1.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/apache-mode/apache-mode-1.1.ebuild,v 1.1 2004/07/17 18:33:21 usata Exp $
+
+inherit elisp
+
+IUSE=""
+
+DESCRIPTION="Major mode for editing Apache configuration files"
+HOMEPAGE="http://www.keelhaul.demon.co.uk/linux/#apachemode"
+SRC_URI="mirror://gentoo/${P}.el.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+DEPEND="virtual/emacs"
+
+SITEFILE=50apache-mode-gentoo.el
+S="${WORKDIR}"
+
+src_compile() {
+	mv ${P}.el apache-mode.el
+	elisp-compile *.el || die
+}
+
+src_install() {
+	elisp-install ${PN} *.el *.elc
+	elisp-site-file-install ${FILESDIR}/${SITEFILE}
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	einfo "Please see ${SITELISP}/${PN}/apache-mode.el for the complete documentation."
+}
+
+pkg_postrm() {
+	elisp-site-regen
+}
diff --git a/app-emacs/apache-mode/files/50apache-mode-gentoo.el b/app-emacs/apache-mode/files/50apache-mode-gentoo.el
index 463f57751b41..bad6ed7480a1 100644
--- a/app-emacs/apache-mode/files/50apache-mode-gentoo.el
+++ b/app-emacs/apache-mode/files/50apache-mode-gentoo.el
@@ -8,3 +8,5 @@
 (add-to-list 'auto-mode-alist '("httpd\\.conf$"  . apache-mode))
 (add-to-list 'auto-mode-alist '("srm\\.conf$"    . apache-mode))
 (add-to-list 'auto-mode-alist '("access\\.conf$" . apache-mode))
+(add-to-list 'auto-mode-alist '("apache[12]\?\\.conf$" . apache-mode))
+(add-to-list 'auto-mode-alist '("commonapache[12]\?\\.conf$" . apache-mode))
diff --git a/app-emacs/apache-mode/files/digest-apache-mode-1.1 b/app-emacs/apache-mode/files/digest-apache-mode-1.1
new file mode 100644
index 000000000000..b330688b6fd6
--- /dev/null
+++ b/app-emacs/apache-mode/files/digest-apache-mode-1.1
@@ -0,0 +1 @@
+MD5 f8613e7ed35c61eccc6dc8c4d0aa5872 apache-mode-1.1.el.gz 3468