New snapshot. Changed versioning

6 files changed, 65 insertions, 29 deletions

diff --git a/app-emacs/ddskk/Manifest b/app-emacs/ddskk/Manifest
index eff39146df56..ccbddf110ab0 100644
--- a/app-emacs/ddskk/Manifest
+++ b/app-emacs/ddskk/Manifest
@@ -1,8 +1,8 @@
-MD5 b220e2ec99c5166352e276e207b34a11 ChangeLog 1561
+MD5 7977aadf50e18b159bcd45240712af75 ChangeLog 1771
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 806f893ded3395b2164893b568e63cc7 ddskk-12.2.0.ebuild 1034
-MD5 12c828bf0bd0e4f0aa418e7d1b514ac2 ddskk-12.2.0_p20030810.ebuild 1075
-MD5 12c828bf0bd0e4f0aa418e7d1b514ac2 ddskk-12.2.0_p20031207.ebuild 1075
+MD5 87a6084fe0a77eb4e22f5ad386649dab ddskk-12.2.0.ebuild 1034
+MD5 74b91631f0835c11fd03e7cb4c4ae725 ddskk-12.2.0_p20030810.ebuild 1083
+MD5 0bee2dbb5e96d3dd39f5ba294e2c5ec9 ddskk-12.2.0_p20031207.ebuild 1083
 MD5 9f0765d97bdc7577ec845d54678eead9 files/50ddskk-gentoo.el 183
 MD5 68d1fef3c76c6d9544f5ef4ade130610 files/digest-ddskk-12.2.0_p20030810 66
 MD5 e4f6ddf1c5fb2962dc34c1afcaf352c4 files/digest-ddskk-12.2.0 65
diff --git a/app-emacs/ddskk/ddskk-12.2.0.ebuild b/app-emacs/ddskk/ddskk-12.2.0.ebuild
index 6cb8f3d9f2ad..a0bb5ec7919d 100644
--- a/app-emacs/ddskk/ddskk-12.2.0.ebuild
+++ b/app-emacs/ddskk/ddskk-12.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ddskk/ddskk-12.2.0.ebuild,v 1.2 2003/08/16 20:58:02 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ddskk/ddskk-12.2.0.ebuild,v 1.3 2003/12/08 22:56:54 usata Exp $
 
 inherit elisp
 
@@ -45,15 +45,7 @@ src_install () {
 	elisp-site-file-install ${FILESDIR}/${SITEFILE} || die
 
 	insinto /usr/share/skk
-	doins etc/SKK.tut etc/SKK.tut.E etc/NICOLA-SKK.tut etc/skk.xpm
+	doins etc/*SKK.tut* etc/skk.xpm
 
 	dodoc READMEs/* ChangeLog*
-
-	# prohibit gzipping info files
-	make SKK_INFODIR=${D}/usr/share/info install-info < /dev/null || die
-}
-
-prepall () {
-
-	einfo "SKK info files should not be gzipped"
 }
diff --git a/app-emacs/ddskk/ddskk-20030810.ebuild b/app-emacs/ddskk/ddskk-12.2.0_p20030810.ebuild
index 64f229300f9b..5ed08ccb769a 100644
--- a/app-emacs/ddskk/ddskk-20030810.ebuild
+++ b/app-emacs/ddskk/ddskk-12.2.0_p20030810.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ddskk/ddskk-20030810.ebuild,v 1.1 2003/08/16 20:58:02 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ddskk/ddskk-12.2.0_p20030810.ebuild,v 1.1 2003/12/08 22:56:54 usata Exp $
 
 inherit elisp
 
 IUSE=""
 
-#MY_P=${PN}-${PV/_/}
+MY_P="${PN}-${PV/*_p/}"
 
 DESCRIPTION="SKK is one of Japanese input methods on Emacs"
-SRC_URI="http://openlab.ring.gr.jp/skk/maintrunk/${P}.tar.gz
-	mirror://gentoo/${P}.tar.gz
-	http://dev.gentoo.org/~usata/distfiles/${P}.tar.gz"
+SRC_URI="http://openlab.ring.gr.jp/skk/maintrunk/${MY_P}.tar.gz
+	mirror://gentoo/${MY_P}.tar.gz"
 HOMEPAGE="http://openlab.ring.gr.jp/skk/"
 
 LICENSE="GPL-2"
@@ -27,7 +26,7 @@ RDEPEND="virtual/emacs
 
 SITEFILE=50ddskk-gentoo.el
 
-S=${WORKDIR}/${P}
+S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 
@@ -47,15 +46,7 @@ src_install () {
 	elisp-site-file-install ${FILESDIR}/${SITEFILE} || die
 
 	insinto /usr/share/skk
-	doins etc/SKK.tut etc/SKK.tut.E etc/NICOLA-SKK.tut etc/skk.xpm
+	doins etc/*SKK.tut* etc/skk.xpm
 
 	dodoc READMEs/* ChangeLog*
-
-	# prohibit gzipping info files
-	make SKK_INFODIR=${D}/usr/share/info install-info < /dev/null || die
-}
-
-prepall () {
-
-	einfo "SKK info files should not be gzipped"
 }
diff --git a/app-emacs/ddskk/ddskk-12.2.0_p20031207.ebuild b/app-emacs/ddskk/ddskk-12.2.0_p20031207.ebuild
new file mode 100644
index 000000000000..76db4e83bd5a
--- /dev/null
+++ b/app-emacs/ddskk/ddskk-12.2.0_p20031207.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ddskk/ddskk-12.2.0_p20031207.ebuild,v 1.1 2003/12/08 22:56:54 usata Exp $
+
+inherit elisp
+
+IUSE=""
+
+MY_P="${PN}-${PV/*_p/}"
+
+DESCRIPTION="SKK is one of Japanese input methods on Emacs"
+SRC_URI="http://openlab.ring.gr.jp/skk/maintrunk/${MY_P}.tar.gz
+	mirror://gentoo/${MY_P}.tar.gz"
+HOMEPAGE="http://openlab.ring.gr.jp/skk/"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~alpha ~sparc ~ppc"
+SLOT="0"
+
+DEPEND=">=sys-apps/sed-4
+	>=app-emacs/apel-10.6
+	virtual/emacs"
+RDEPEND="virtual/emacs
+	>=app-emacs/apel-10.6
+	virtual/skkserv"
+
+SITEFILE=50ddskk-gentoo.el
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+
+	unpack ${A}
+	find . -type f | xargs sed -i -e 's%/usr/local%/usr%g'
+}
+
+src_compile() {
+
+	make < /dev/null || die
+	make info < /dev/null || die
+}
+
+src_install () {
+
+	elisp-install ${PN} *.el *.elc
+	elisp-site-file-install ${FILESDIR}/${SITEFILE} || die
+
+	insinto /usr/share/skk
+	doins etc/*SKK.tut* etc/skk.xpm
+
+	dodoc READMEs/* ChangeLog*
+}
diff --git a/app-emacs/ddskk/files/digest-ddskk-20030810 b/app-emacs/ddskk/files/digest-ddskk-12.2.0_p20030810
index 247420e24796..247420e24796 100644
--- a/app-emacs/ddskk/files/digest-ddskk-20030810
+++ b/app-emacs/ddskk/files/digest-ddskk-12.2.0_p20030810
diff --git a/app-emacs/ddskk/files/digest-ddskk-12.2.0_p20031207 b/app-emacs/ddskk/files/digest-ddskk-12.2.0_p20031207
new file mode 100644
index 000000000000..45d4af691db6
--- /dev/null
+++ b/app-emacs/ddskk/files/digest-ddskk-12.2.0_p20031207
@@ -0,0 +1 @@
+MD5 2b9b8ff872772e4769971299b9fe201b ddskk-20031207.tar.gz 669535