Version bumped. Changed versioning. Thanks to Doug Goldstein <cardoe@cardoe.com>, closing bug #45456

7 files changed, 25 insertions, 31 deletions

diff --git a/app-emacs/php-mode/ChangeLog b/app-emacs/php-mode/ChangeLog
index e432263eaa9e..f306448e1407 100644
--- a/app-emacs/php-mode/ChangeLog
+++ b/app-emacs/php-mode/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emacs/php-mode
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/php-mode/ChangeLog,v 1.4 2003/10/06 15:42:24 mkennedy Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/php-mode/ChangeLog,v 1.5 2004/05/22 16:17:50 usata Exp $
+
+*php-mode-1.1.0 (23 May 2004)
+
+  23 May 2004; <usata@gentoo.org> php-mode-1.0.5.ebuild,
+  php-mode-1.1.0.ebuild, php-mode-102.ebuild, php-mode-105.ebuild:
+  Version bumped. Changed versioning. Thanks to Doug Goldstein
+  <cardoe@cardoe.com>, closing bug #45456
 
 *php-mode-105 (06 Oct 2003)
 
diff --git a/app-emacs/php-mode/Manifest b/app-emacs/php-mode/Manifest
index b40f61def123..1ea349caa686 100644
--- a/app-emacs/php-mode/Manifest
+++ b/app-emacs/php-mode/Manifest
@@ -1,7 +1,7 @@
+MD5 f361af1eff13298d277120fccc87487c php-mode-1.0.5.ebuild 732
+MD5 5b5acdb41aaedaf3a65e8c75c5d54fb1 php-mode-1.1.0.ebuild 718
 MD5 37e6f8684d829d402cf94766ad99308f ChangeLog 638
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
-MD5 990a00814abc5864af379647ff63b951 php-mode-102.ebuild 915
-MD5 5561b161cd9f2109fc163689328bd065 php-mode-105.ebuild 712
+MD5 30b3eae105af79bddfbc6ae38c640e43 files/digest-php-mode-1.0.5 63
+MD5 0ae948226e0c10ede68521422d574a84 files/digest-php-mode-1.1.0 62
 MD5 0761c3603c17ab6e347bca7eddd46f60 files/50php-mode-gentoo.el 112
-MD5 a97d5d118431d249d4297fcbc594481f files/digest-php-mode-102 64
-MD5 30b3eae105af79bddfbc6ae38c640e43 files/digest-php-mode-105 63
diff --git a/app-emacs/php-mode/files/digest-php-mode-105 b/app-emacs/php-mode/files/digest-php-mode-1.0.5
index b0056054d184..b0056054d184 100644
--- a/app-emacs/php-mode/files/digest-php-mode-105
+++ b/app-emacs/php-mode/files/digest-php-mode-1.0.5
diff --git a/app-emacs/php-mode/files/digest-php-mode-1.1.0 b/app-emacs/php-mode/files/digest-php-mode-1.1.0
new file mode 100644
index 000000000000..dbbcf8f2d436
--- /dev/null
+++ b/app-emacs/php-mode/files/digest-php-mode-1.1.0
@@ -0,0 +1 @@
+MD5 aad009f7cff4019aac9a466ec9b55aaf php-mode-1.1.0.tgz 12940
diff --git a/app-emacs/php-mode/files/digest-php-mode-102 b/app-emacs/php-mode/files/digest-php-mode-102
deleted file mode 100644
index 482703d7360a..000000000000
--- a/app-emacs/php-mode/files/digest-php-mode-102
+++ /dev/null
@@ -1 +0,0 @@
-MD5 84e9b7075c5f2475e998af4d63a12cd0 php-mode-102.tar.bz2 12592
diff --git a/app-emacs/php-mode/php-mode-102.ebuild b/app-emacs/php-mode/php-mode-1.0.5.ebuild
index c17d8b4cfc8b..90a0be4d6829 100644
--- a/app-emacs/php-mode/php-mode-102.ebuild
+++ b/app-emacs/php-mode/php-mode-1.0.5.ebuild
@@ -1,29 +1,25 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/php-mode/php-mode-102.ebuild,v 1.4 2003/09/06 22:01:25 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/php-mode/php-mode-1.0.5.ebuild,v 1.1 2004/05/22 16:17:50 usata Exp $
 
 inherit elisp
 
 IUSE=""
+MY_P="${P//./}"
 
-DESCRIPTION="Major mode for editing PHP code"
+DESCRIPTION="GNU Emacs major mode for editing PHP code"
 HOMEPAGE="http://php-mode.sourceforge.net"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="x86 ppc ~amd64"
 
 DEPEND="virtual/emacs"
 
-S="${WORKDIR}/${P}"
+S="${WORKDIR}/${MY_P}"
 
 SITEFILE=50php-mode-gentoo.el
 
-src_unpack() {
-	unpack ${A}
-	cd ${S} && mv ${P}.el ${PN}.el
-}
-
 src_compile() {
 	emacs --batch -f batch-byte-compile --no-site-file --no-init-file *.el
 }
@@ -32,12 +28,3 @@ src_install() {
 	elisp-install ${PN} *.el *.elc
 	elisp-site-file-install ${FILESDIR}/${SITEFILE}
 }
-
-pkg_postinst() {
-	elisp-site-regen
-	einfo "Please see ${SITELISP}/${PN}/php-mode.el for the complete documentation."
-}
-
-pkg_postrm() {
-	elisp-site-regen
-}
diff --git a/app-emacs/php-mode/php-mode-105.ebuild b/app-emacs/php-mode/php-mode-1.1.0.ebuild
index 3266b203070e..9a5174e02f6f 100644
--- a/app-emacs/php-mode/php-mode-105.ebuild
+++ b/app-emacs/php-mode/php-mode-1.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/php-mode/php-mode-105.ebuild,v 1.2 2004/03/04 05:07:04 jhuebel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/php-mode/php-mode-1.1.0.ebuild,v 1.1 2004/05/22 16:17:50 usata Exp $
 
 inherit elisp
 
@@ -8,14 +8,14 @@ IUSE=""
 
 DESCRIPTION="GNU Emacs major mode for editing PHP code"
 HOMEPAGE="http://php-mode.sourceforge.net"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/php-mode/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
 
 DEPEND="virtual/emacs"
 
-S="${WORKDIR}/${P}"
+S="${WORKDIR}"
 
 SITEFILE=50php-mode-gentoo.el