Fix compile failure, bug #205045.

Package-Manager: portage-2.1.4_rc14

5 files changed, 45 insertions, 37 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/Manifest b/app-emacs/ddskk/Manifest
index e3c55343984f..583def047508 100644
--- a/app-emacs/ddskk/Manifest
+++ b/app-emacs/ddskk/Manifest
@@ -1,21 +1,24 @@
-AUX 50ddskk-gentoo.el 236 RMD160 9846d0fa7cb1c8420a33ae4034a0c27493b6b28f SHA1 ebcf51c23c796c40a9ec1acb1ff71d919413e4cb SHA256 128fefd2fab5aebbdd501b334f549d492fd78c7f8c5918beb93b5b5241d07c32
-MD5 c81def5ec2d142f2a0d8827bc9e212b9 files/50ddskk-gentoo.el 236
-RMD160 9846d0fa7cb1c8420a33ae4034a0c27493b6b28f files/50ddskk-gentoo.el 236
-SHA256 128fefd2fab5aebbdd501b334f549d492fd78c7f8c5918beb93b5b5241d07c32 files/50ddskk-gentoo.el 236
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 50ddskk-gentoo.el 274 RMD160 7d9d038b0e227fe402ff9735f1e0ea503deca78f SHA1 490ad941bfb56d7c409973b7f09054382a0943b4 SHA256 b4688d56c332d24f82605ca55bede3a7c7d2ff2135f28a188b726f55c02d4953
+MD5 f82ef87c3c7235a87870b16a4a351d32 files/50ddskk-gentoo.el 274
+RMD160 7d9d038b0e227fe402ff9735f1e0ea503deca78f files/50ddskk-gentoo.el 274
+SHA256 b4688d56c332d24f82605ca55bede3a7c7d2ff2135f28a188b726f55c02d4953 files/50ddskk-gentoo.el 274
 DIST ddskk-12.2.0.tar.bz2 528129 RMD160 e04baa986fb6627a0c30e049bea72d1acfada6a0 SHA1 a2f11883911e815ea37e7af1715c6e7763663c1b SHA256 1c1eeb7077c9014d08636d4b9ba28a2169e4e09b05fbea01d7831ea79c2b6b1f
 DIST ddskk-13.1.tar.gz 720490 RMD160 4555fc4dac47167e308b505dd4ec43dd2a518f6f SHA1 196e2953cfaaf548ab40d29e130e9030327b4598 SHA256 d2b1bcf7f4e6b41afb126bbde4e119a16cd4f5507ae984154250dd8a19801582
-EBUILD ddskk-12.2.0-r1.ebuild 1023 RMD160 0cdc544395530e861529df86204ea26df0c04e5e SHA1 17ffaf4152f5368d9c267e61d0d7e0053e6a0d86 SHA256 1d6f04ff2b3b1eac4973c1368e7bdd4cda172f99699c8dc7bb8b4d6756f175da
-MD5 8dc6c91c4b3f0df6e89a2c4f75f8f19f ddskk-12.2.0-r1.ebuild 1023
-RMD160 0cdc544395530e861529df86204ea26df0c04e5e ddskk-12.2.0-r1.ebuild 1023
-SHA256 1d6f04ff2b3b1eac4973c1368e7bdd4cda172f99699c8dc7bb8b4d6756f175da ddskk-12.2.0-r1.ebuild 1023
-EBUILD ddskk-13.1.ebuild 1310 RMD160 03d69f1b3bb626f41373b37ae9560629db22ce6c SHA1 7275d42e4711231edfeda4558409f0c9a2c8808b SHA256 cc1f0f696e60ddffee3d7c39d0723ea502b0222868bb6b192a35806213964bb4
-MD5 035ef5a071cdc118fb9806161e16c701 ddskk-13.1.ebuild 1310
-RMD160 03d69f1b3bb626f41373b37ae9560629db22ce6c ddskk-13.1.ebuild 1310
-SHA256 cc1f0f696e60ddffee3d7c39d0723ea502b0222868bb6b192a35806213964bb4 ddskk-13.1.ebuild 1310
-MISC ChangeLog 3955 RMD160 0d1c0b09ec70d837c4edaa3f01c6bd804eab0cc2 SHA1 658e0a85ce9574da456caa31c53ec4e6f34d7a92 SHA256 0c7a587d5a0a5046e2284c063ddb749edf8a70990fa69220b60c9a2f726629f1
-MD5 6f7cbf78b14bf03a8647b94947e7a595 ChangeLog 3955
-RMD160 0d1c0b09ec70d837c4edaa3f01c6bd804eab0cc2 ChangeLog 3955
-SHA256 0c7a587d5a0a5046e2284c063ddb749edf8a70990fa69220b60c9a2f726629f1 ChangeLog 3955
+EBUILD ddskk-12.2.0-r1.ebuild 1018 RMD160 2232344a736b38dbd4bea9bb06e1d8e8f2b397bc SHA1 ee268b1154495aef5bce59fd6b63bf927db732a4 SHA256 7a5359dbf1fbe1b0c4b6a6ccdc4d7ece78319a55e1578e8303b39ead3bd2e4c2
+MD5 d0f38881994708186666203dbb56101f ddskk-12.2.0-r1.ebuild 1018
+RMD160 2232344a736b38dbd4bea9bb06e1d8e8f2b397bc ddskk-12.2.0-r1.ebuild 1018
+SHA256 7a5359dbf1fbe1b0c4b6a6ccdc4d7ece78319a55e1578e8303b39ead3bd2e4c2 ddskk-12.2.0-r1.ebuild 1018
+EBUILD ddskk-13.1.ebuild 1342 RMD160 a89ece1d0ed9d63c2e8a33f915fcbc630aaff8d5 SHA1 9110830bb1f3358779074a23cd159c7048087564 SHA256 34e24c10c474cfe0b7ecfd7f3109b7325b7e4d50aa4ce9ba1522f4d28780efdf
+MD5 76bf577a7f4305f576b1077b6527306a ddskk-13.1.ebuild 1342
+RMD160 a89ece1d0ed9d63c2e8a33f915fcbc630aaff8d5 ddskk-13.1.ebuild 1342
+SHA256 34e24c10c474cfe0b7ecfd7f3109b7325b7e4d50aa4ce9ba1522f4d28780efdf ddskk-13.1.ebuild 1342
+MISC ChangeLog 4105 RMD160 56a9fd346845930e6ea4a68eb6c52ab42ddf261c SHA1 182d7a88e6b486523e1da18572d86d450270cbfb SHA256 5b8073043320e70b3f566afab27141cd031294db1a96fa3f09e89abae4bafbab
+MD5 1a355d95ee407dad7c66f77465cc737c ChangeLog 4105
+RMD160 56a9fd346845930e6ea4a68eb6c52ab42ddf261c ChangeLog 4105
+SHA256 5b8073043320e70b3f566afab27141cd031294db1a96fa3f09e89abae4bafbab ChangeLog 4105
 MISC metadata.xml 175 RMD160 90dbed03cd58aa1cbbafd61390c70cc27e40ac61 SHA1 4cdeb5b89880b5c128a8494b635f41fa761f91ab SHA256 4c1d27d60d55175d9ce0f5edc82678cadd5e6c791936127379066dddb8986c84
 MD5 b5fdfdb443a94c51bb339c56188361e9 metadata.xml 175
 RMD160 90dbed03cd58aa1cbbafd61390c70cc27e40ac61 metadata.xml 175
@@ -26,3 +29,10 @@ SHA256 d6e3b9a696575adbb858b76a47c6f563de9438f280f8971092041a69d30b09ad files/di
 MD5 1e6780d4fc4c9056ea30045f0e0b18d6 files/digest-ddskk-13.1 232
 RMD160 47bed479af7210211a5d1765ade651ccd0f30484 files/digest-ddskk-13.1 232
 SHA256 ab8f76ae70f447a9b208be180623cad9c445ac4488f92078786f2e53c9f22e84 files/digest-ddskk-13.1 232
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.8 (GNU/Linux)
+
+iEYEARECAAYFAkeE58oACgkQOeoy/oIi7uyilwCfQ9EYmC5nY6UAvmI8WqRoBj2/
+1AgAoLTfRh09O/pm5jZELw1k53SzmxeU
+=aEo5
+-----END PGP SIGNATURE-----
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)