Fix compile failure, bug #205045.

(Portage version: 2.1.4_rc14)

4 files changed, 19 insertions, 21 deletions

diff --git a/app-emacs/ddskk/ChangeLog b/app-emacs/ddskk/ChangeLog
index e1b475cc0b92..b876af6c86f3 100644
--- a/app-emacs/ddskk/ChangeLog
+++ b/app-emacs/ddskk/ChangeLog
@@ -1,6 +1,10 @@
 # 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.22 2007/10/04 23:15:41 matsuu Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ddskk/ChangeLog,v 1.23 2008/01/09 15:26:44 ulm Exp $
+
+  09 Jan 2008; Ulrich Mueller <ulm@gentoo.org> files/50ddskk-gentoo.el,
+  ddskk-13.1.ebuild:
+  Fix compile failure, bug #205045. Add missing load-path.
 
   04 Oct 2007; <matsuu@gentoo.org> -ddskk-12.2.1_pre20040822.ebuild,
   -ddskk-12.2.1_pre20050522.ebuild, ddskk-13.1.ebuild:
diff --git a/app-emacs/ddskk/ddskk-12.2.0-r1.ebuild b/app-emacs/ddskk/ddskk-12.2.0-r1.ebuild
index 0ade029fed21..33fcd519667b 100644
--- a/app-emacs/ddskk/ddskk-12.2.0-r1.ebuild
+++ b/app-emacs/ddskk/ddskk-12.2.0-r1.ebuild
@@ -1,20 +1,19 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ddskk/ddskk-12.2.0-r1.ebuild,v 1.6 2007/10/03 00:41:01 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ddskk/ddskk-12.2.0-r1.ebuild,v 1.7 2008/01/09 15:26:44 ulm Exp $
 
 inherit elisp
 
-IUSE=""
-
 MY_P=${PN}-${PV/_/}
 
 DESCRIPTION="SKK is one of Japanese input methods on Emacs"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
 HOMEPAGE="http://openlab.ring.gr.jp/skk/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="x86 alpha sparc ppc"
 SLOT="0"
+KEYWORDS="x86 alpha sparc ppc"
+IUSE=""
 
 DEPEND=">=sys-apps/sed-4
 	>=app-emacs/apel-10.6"
@@ -26,21 +25,18 @@ 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
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
 
 	insinto /usr/share/skk
 	doins etc/*SKK.tut* etc/skk.xpm
diff --git a/app-emacs/ddskk/ddskk-13.1.ebuild b/app-emacs/ddskk/ddskk-13.1.ebuild
index c6e7784dbbb9..5fbea38a52fa 100644
--- a/app-emacs/ddskk/ddskk-13.1.ebuild
+++ b/app-emacs/ddskk/ddskk-13.1.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.2 2007/10/04 23:15:41 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ddskk/ddskk-13.1.ebuild,v 1.3 2008/01/09 15:26:44 ulm Exp $
 
 inherit elisp
 
-IUSE=""
-
 DESCRIPTION="One Japanese input methods on Emacs"
-SRC_URI="http://openlab.ring.gr.jp/skk/maintrunk/${P}.tar.gz"
 HOMEPAGE="http://openlab.ring.gr.jp/skk/"
+SRC_URI="http://openlab.ring.gr.jp/skk/maintrunk/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE=""
 
 DEPEND=">=app-emacs/apel-10.7"
 RDEPEND="${DEPEND}
@@ -21,23 +20,21 @@ RDEPEND="${DEPEND}
 SITEFILE=50ddskk-gentoo.el
 
 src_unpack() {
-
 	unpack ${A}
 	find . -type f | xargs sed -i -e 's%/usr/local%/usr%g' || die
 }
 
 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"
+	EMACSFLAGS="${EMACSFLAGS} -L .. -L ."
 	elisp-compile *.el || die "elisp-compile failed"
 }
 
 src_install () {
-
 	elisp-install ${PN} *.el* nicola/*.el* tut-code/*.el* || die "elisp-install failed"
 	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die "elisp-site-file-install failed"
 
diff --git a/app-emacs/ddskk/files/50ddskk-gentoo.el b/app-emacs/ddskk/files/50ddskk-gentoo.el
index 05e209ac6ca3..5fcb35d32476 100644
--- a/app-emacs/ddskk/files/50ddskk-gentoo.el
+++ b/app-emacs/ddskk/files/50ddskk-gentoo.el
@@ -1,6 +1,7 @@
 
 ;;; ddskk site-lisp configuration
 
+(add-to-list 'load-path "@SITELISP@")
 (require 'skk-autoloads)
 (global-set-key "\C-x\C-j" 'skk-mode)
 (global-set-key "\C-xj" 'skk-auto-fill-mode)