new snapshot and removed stale one, see http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2003-0539

9 files changed, 71 insertions, 83 deletions

diff --git a/app-emacs/ddskk/Manifest b/app-emacs/ddskk/Manifest
index 47fadbd93c8f..d893c7438348 100644
--- a/app-emacs/ddskk/Manifest
+++ b/app-emacs/ddskk/Manifest
@@ -1,7 +1,7 @@
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 5a49565eb29cdecea0e1090ae0a847e5 ddskk-20030810.ebuild 1310
-MD5 b20cbcd2672deaf46197e5200de9281e ChangeLog 1045
-MD5 60fe10e1e64e48ebe869818e436685f6 ddskk-12.2.0.ebuild 1231
+MD5 5d02ea290d57228f1da6f1782ba6db9c ddskk-20030810.ebuild 1312
+MD5 b220e2ec99c5166352e276e207b34a11 ChangeLog 1561
+MD5 48f32ffc60c430e1c6f4b192ba599e87 ddskk-12.2.0.ebuild 1231
 MD5 e4f6ddf1c5fb2962dc34c1afcaf352c4 files/digest-ddskk-12.2.0 65
 MD5 68d1fef3c76c6d9544f5ef4ade130610 files/digest-ddskk-20030810 66
 MD5 9f0765d97bdc7577ec845d54678eead9 files/50ddskk-gentoo.el 183
diff --git a/app-emacs/ddskk/ddskk-12.2.0.ebuild b/app-emacs/ddskk/ddskk-12.2.0.ebuild
index 20fe3c223f12..6cb8f3d9f2ad 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.1 2003/08/03 18:06:42 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ddskk/ddskk-12.2.0.ebuild,v 1.2 2003/08/16 20:58:02 usata Exp $
 
 inherit elisp
 
@@ -13,24 +13,23 @@ SRC_URI="http://openlab.ring.gr.jp/skk/maintrunk/${MY_P}.tar.bz2"
 HOMEPAGE="http://openlab.ring.gr.jp/skk/"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~alpha ~sparc ~ppc"
+KEYWORDS="x86 alpha sparc ppc"
 SLOT="0"
 
 DEPEND=">=sys-apps/sed-4
-	app-emacs/apel
+	>=app-emacs/apel-10.6
 	virtual/emacs"
 RDEPEND="virtual/emacs
-	app-emacs/apel
+	>=app-emacs/apel-10.6
 	virtual/skkserv"
 
-SITEFILE=50ddskkserv-gentoo.el
+SITEFILE=50ddskk-gentoo.el
 
 S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 
 	unpack ${A}
-	cp ${FILESDIR}/${SITEFILE} ${SITEFILE/serv/}
 	find . -type f | xargs sed -i -e 's%/usr/local%/usr%g'
 }
 
@@ -43,7 +42,7 @@ src_compile() {
 src_install () {
 
 	elisp-install ${PN} *.el *.elc
-	elisp-site-file-install ${WORKDIR}/${SITEFILE/serv/} || die
+	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
diff --git a/app-emacs/ddskk/ddskk-20020901.ebuild b/app-emacs/ddskk/ddskk-20020901.ebuild
deleted file mode 100644
index 8079a91f074e..000000000000
--- a/app-emacs/ddskk/ddskk-20020901.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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-20020901.ebuild,v 1.2 2003/02/13 07:04:28 vapier Exp $
-
-inherit elisp
-
-IUSE=""
-
-DESCRIPTION="SKK is one of Japanese input methods on Emacs"
-SRC_URI="http://openlab.ring.gr.jp/skk/maintrunk/${PN}${PV}.tar.gz"
-HOMEPAGE="http://openlab.ring.gr.jp/skk/"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-SLOT="0"
-
-S=${WORKDIR}/${PN}${PV}
-
-DEPEND="app-emacs/apel
-	virtual/emacs
-	app-i18n/skk-jisyo"
-
-SITEFILE=50ddskk-gentoo.el
-
-src_compile() {
-	patch -p1 < ${FILESDIR}/${PN}-gentoo.patch || die
-	emake
-	emake info
-}
-
-src_install () {
-	elisp-install ${PN} *.el *.elc
-	elisp-site-file-install ${FILESDIR}/${SITEFILE}
-
-	dodir /usr/share/skk
-	insinto /usr/share/skk
-	doins etc/SKK.tut etc/SKK.tut.E etc/NICOLA-SKK.tut etc/skk.xpm
-
-	dodoc READMEs/*
-
-	doinfo doc/skk.info*
-}
-
-
-pkg_postinst() {
-	elisp-site-regen
-}
-
-pkg_postrm() {
-	elisp-site-regen
-}
-
-
diff --git a/app-emacs/ddskk/ddskk-20030810.ebuild b/app-emacs/ddskk/ddskk-20030810.ebuild
new file mode 100644
index 000000000000..64f229300f9b
--- /dev/null
+++ b/app-emacs/ddskk/ddskk-20030810.ebuild
@@ -0,0 +1,61 @@
+# 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 $
+
+inherit elisp
+
+IUSE=""
+
+#MY_P=${PN}-${PV/_/}
+
+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"
+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}/${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.tut.E etc/NICOLA-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/files/50ddskk-gentoo.el b/app-emacs/ddskk/files/50ddskk-gentoo.el
index 98cd4966bda9..c97ab020f18d 100644
--- a/app-emacs/ddskk/files/50ddskk-gentoo.el
+++ b/app-emacs/ddskk/files/50ddskk-gentoo.el
@@ -5,4 +5,3 @@
 (global-set-key "\C-x\C-j" 'skk-mode)
 (global-set-key "\C-xj" 'skk-auto-fill-mode)
 (global-set-key "\C-xt" 'skk-tutorial)
-(setq skk-large-jisyo "/usr/share/skk/SKK-JISYO.L")
diff --git a/app-emacs/ddskk/files/50ddskkserv-gentoo.el b/app-emacs/ddskk/files/50ddskkserv-gentoo.el
deleted file mode 100644
index c97ab020f18d..000000000000
--- a/app-emacs/ddskk/files/50ddskkserv-gentoo.el
+++ /dev/null
@@ -1,7 +0,0 @@
-
-;;; ddskk site-lisp configuration
-
-(require 'skk-autoloads)
-(global-set-key "\C-x\C-j" 'skk-mode)
-(global-set-key "\C-xj" 'skk-auto-fill-mode)
-(global-set-key "\C-xt" 'skk-tutorial)
diff --git a/app-emacs/ddskk/files/ddskk-gentoo.patch b/app-emacs/ddskk/files/ddskk-gentoo.patch
deleted file mode 100644
index fcaa80561bd7..000000000000
--- a/app-emacs/ddskk/files/ddskk-gentoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naru ddskk20020901.org/skk-vars.el ddskk20020901/skk-vars.el
---- ddskk20020901.org/skk-vars.el	2002-07-27 15:24:50.000000000 +0900
-+++ ddskk20020901/skk-vars.el	2002-09-07 03:44:51.000000000 +0900
-@@ -2103,7 +2103,7 @@
-   (cond ((eq skk-emacs-type 'xemacs)
- 	 (locate-data-file "SKK.tut"))
- 	(t
--	 "/usr/local/share/skk/SKK.tut"))
-+	 "/usr/share/skk/SKK.tut"))
-   "*SKK $B%A%e!<%H%j%"%k$N%U%!%$%kL>!#(B
- The English version is SKK.tut.E."
-   :type 'file
diff --git a/app-emacs/ddskk/files/digest-ddskk-20020901 b/app-emacs/ddskk/files/digest-ddskk-20020901
deleted file mode 100644
index 5677b311c818..000000000000
--- a/app-emacs/ddskk/files/digest-ddskk-20020901
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d304b8c1740078ad9f88b5cd7a0d2374 ddskk20020901.tar.gz 604957
diff --git a/app-emacs/ddskk/files/digest-ddskk-20030810 b/app-emacs/ddskk/files/digest-ddskk-20030810
new file mode 100644
index 000000000000..247420e24796
--- /dev/null
+++ b/app-emacs/ddskk/files/digest-ddskk-20030810
@@ -0,0 +1 @@
+MD5 41ab444eaffa952e152740d622f61781 ddskk-20030810.tar.gz 669539