6 files changed, 8 insertions, 119 deletions
diff --git a/app-emacs/ddskk/ChangeLog b/app-emacs/ddskk/ChangeLog
index e583fea88714..e1b475cc0b92 100644
--- a/app-emacs/ddskk/ChangeLog
+++ b/app-emacs/ddskk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emacs/ddskk
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ddskk/ChangeLog,v 1.21 2007/10/03 07:00:52 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ddskk/ChangeLog,v 1.22 2007/10/04 23:15:41 matsuu Exp $
+
+  04 Oct 2007; <matsuu@gentoo.org> -ddskk-12.2.1_pre20040822.ebuild,
+  -ddskk-12.2.1_pre20050522.ebuild, ddskk-13.1.ebuild:
+  Fixed dependency.
+  Removed old versions.
 
   03 Oct 2007; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Add Emacs team to metadata.xml, bug #194554.
diff --git a/app-emacs/ddskk/ddskk-12.2.1_pre20040822.ebuild b/app-emacs/ddskk/ddskk-12.2.1_pre20040822.ebuild
deleted file mode 100644
index e7fc26740d3e..000000000000
--- a/app-emacs/ddskk/ddskk-12.2.1_pre20040822.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ddskk/ddskk-12.2.1_pre20040822.ebuild,v 1.4 2007/10/03 00:41:01 matsuu Exp $
-
-inherit elisp
-
-IUSE=""
-
-MY_P="${PN}-${PV/*_pre/}"
-
-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"
-RDEPEND=">=app-emacs/apel-10.6
-	|| ( virtual/skkserv app-i18n/skk-jisyo )"
-
-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*
-	doinfo doc/skk.info*
-}
diff --git a/app-emacs/ddskk/ddskk-12.2.1_pre20050522.ebuild b/app-emacs/ddskk/ddskk-12.2.1_pre20050522.ebuild
deleted file mode 100644
index d2aa2102c65d..000000000000
--- a/app-emacs/ddskk/ddskk-12.2.1_pre20050522.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ddskk/ddskk-12.2.1_pre20050522.ebuild,v 1.4 2007/10/03 00:41:01 matsuu Exp $
-
-inherit elisp
-
-IUSE=""
-
-MY_P="${PN}-${PV/*_pre/}"
-
-DESCRIPTION="One 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="~alpha ~amd64 ~ppc ~sparc ~x86"
-SLOT="0"
-
-DEPEND=">=app-emacs/apel-10.6"
-RDEPEND="${RDEPEND}
-	|| ( virtual/skkserv app-i18n/skk-jisyo )"
-
-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() {
-
-	emake < /dev/null || die "emake failed"
-	emake info < /dev/null || die "emake info failed"
-	#cd nicola
-	#make < /dev/null || die
-	cd "${S}/tut-code"
-	elisp-compile *.el
-}
-
-src_install () {
-
-	elisp-install ${PN} *.el* nicola/*.el* tut-code/*.el*
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die "elisp-site-file-install failed"
-
-	insinto /usr/share/skk
-	doins etc/*SKK.tut* etc/skk.xpm
-
-	dodoc READMEs/* ChangeLog*
-	doinfo doc/skk.info*
-
-	#docinto nicola
-	#dodoc nicola/ChangeLog* nicola/README*
-	docinto tut-code
-	dodoc tut-code/README.tut
-}
diff --git a/app-emacs/ddskk/ddskk-13.1.ebuild b/app-emacs/ddskk/ddskk-13.1.ebuild
index d15cc65bafe0..c6e7784dbbb9 100644
--- a/app-emacs/ddskk/ddskk-13.1.ebuild
+++ b/app-emacs/ddskk/ddskk-13.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ddskk/ddskk-13.1.ebuild,v 1.1 2007/10/03 00:41:01 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ddskk/ddskk-13.1.ebuild,v 1.2 2007/10/04 23:15:41 matsuu Exp $
 
 inherit elisp
 
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 SLOT="0"
 
 DEPEND=">=app-emacs/apel-10.7"
-RDEPEND="${RDEPEND}
+RDEPEND="${DEPEND}
 	|| ( app-i18n/skk-jisyo virtual/skkserv )"
 
 SITEFILE=50ddskk-gentoo.el
diff --git a/app-emacs/ddskk/files/digest-ddskk-12.2.1_pre20040822 b/app-emacs/ddskk/files/digest-ddskk-12.2.1_pre20040822
deleted file mode 100644
index ebc3947d1456..000000000000
--- a/app-emacs/ddskk/files/digest-ddskk-12.2.1_pre20040822
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5c5f5fd0266e431dea15b8284e65d1e4 ddskk-20040822.tar.gz 680728
-RMD160 81a792107a81f4816723acec62785d816ed67594 ddskk-20040822.tar.gz 680728
-SHA256 919079cd2a43a5f624d80d78705edf18777dbf99dfee09e67dcedca7d23c7fa0 ddskk-20040822.tar.gz 680728
diff --git a/app-emacs/ddskk/files/digest-ddskk-12.2.1_pre20050522 b/app-emacs/ddskk/files/digest-ddskk-12.2.1_pre20050522
deleted file mode 100644
index 68ea1c7588dd..000000000000
--- a/app-emacs/ddskk/files/digest-ddskk-12.2.1_pre20050522
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7fbbe37134dc92fb9e6b36e6cd4ad332 ddskk-20050522.tar.gz 687468
-RMD160 29d370e028c841387105f59d46bbae8371824227 ddskk-20050522.tar.gz 687468
-SHA256 ceb36175d6d0a6f8994bc03abc91e1d500db9c544d0fa8164faadf30a9ff79ad ddskk-20050522.tar.gz 687468