Modify build system to work without Emacs at compile time, bug #202796.

Package-Manager: portage-2.1.4_rc10

7 files changed, 77 insertions, 29 deletions

diff --git a/app-text/migemo/ChangeLog b/app-text/migemo/ChangeLog
index b4a2eace684b..7fe39bcec48a 100644
--- a/app-text/migemo/ChangeLog
+++ b/app-text/migemo/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/migemo
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/migemo/ChangeLog,v 1.18 2007/12/20 14:05:13 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/migemo/ChangeLog,v 1.19 2007/12/21 07:51:49 ulm Exp $
+
+*migemo-0.40-r3 (21 Dec 2007)
+
+  21 Dec 2007; Ulrich Mueller <ulm@gentoo.org> +files/51migemo-gentoo.el,
+  +files/migemo-0.40-without-emacs.patch, -migemo-0.40-r2.ebuild,
+  +migemo-0.40-r3.ebuild:
+  Modify build system to work without Emacs at compile time, bug #202796.
+  Don't enable adviced search functions as site default.
 
   20 Dec 2007; MATSUU Takuto <matsuu@gentoo.org> migemo-0.40-r2.ebuild:
   Fixed emacs dependency, bug #202796.
diff --git a/app-text/migemo/Manifest b/app-text/migemo/Manifest
index fe4cb7c86e2c..f76796f60953 100644
--- a/app-text/migemo/Manifest
+++ b/app-text/migemo/Manifest
@@ -1,20 +1,31 @@
-AUX 50migemo-gentoo.el 93 RMD160 52815834d2be65a30653e073f81e72757bf974e0 SHA1 a9cc41d26fd8b7eccc3de1d82eea2db46f153bc7 SHA256 6a9a4c1536287acf67b6b13c16fb91439756d9734a105068ecff07b66a564d63
-MD5 43439a958e467d8f249f2dabab88160c files/50migemo-gentoo.el 93
-RMD160 52815834d2be65a30653e073f81e72757bf974e0 files/50migemo-gentoo.el 93
-SHA256 6a9a4c1536287acf67b6b13c16fb91439756d9734a105068ecff07b66a564d63 files/50migemo-gentoo.el 93
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 50migemo-gentoo.el 94 RMD160 02b9bb0b46bd48cd2542e41286af19477ceb13f6 SHA1 9e4bf5b748852d7fd536456c4737062162a7424b SHA256 ade12ffbf5a3e84ff0587244104de57e548b9567e8503fe05f73ab56dde3f4f2
+MD5 a9581a3636874463010f81ac6724f0f7 files/50migemo-gentoo.el 94
+RMD160 02b9bb0b46bd48cd2542e41286af19477ceb13f6 files/50migemo-gentoo.el 94
+SHA256 ade12ffbf5a3e84ff0587244104de57e548b9567e8503fe05f73ab56dde3f4f2 files/50migemo-gentoo.el 94
+AUX 51migemo-gentoo.el 75 RMD160 7f34d426759743cd665d55cf720d04634fc33f05 SHA1 dfa3306709e4f7c4b7d0db0766634c3e0a7bfa1e SHA256 f4073829fe6d411881af8c61378e15c3cd465aa6cb14b5af950323e45968c5b3
+MD5 b837395c49917894acb2ad2454f2684d files/51migemo-gentoo.el 75
+RMD160 7f34d426759743cd665d55cf720d04634fc33f05 files/51migemo-gentoo.el 75
+SHA256 f4073829fe6d411881af8c61378e15c3cd465aa6cb14b5af950323e45968c5b3 files/51migemo-gentoo.el 75
+AUX migemo-0.40-without-emacs.patch 374 RMD160 2d60e165eb107a0015ea8a97070df0999a2e9ff3 SHA1 50d0adeb50316159c03f9d7603b0b4c59828b590 SHA256 013da8dd7f65754199f29619e7306504c72d8ce252b00952b0db3957c7ba1bc7
+MD5 fc9387748ed959c970593de1df5313cb files/migemo-0.40-without-emacs.patch 374
+RMD160 2d60e165eb107a0015ea8a97070df0999a2e9ff3 files/migemo-0.40-without-emacs.patch 374
+SHA256 013da8dd7f65754199f29619e7306504c72d8ce252b00952b0db3957c7ba1bc7 files/migemo-0.40-without-emacs.patch 374
 DIST migemo-0.40.tar.gz 1674941 RMD160 6663ac89abc89e4c568c44a71e8ae1f016920df0 SHA1 0c7f066c4c271a8e2556ea9d9cc850c650eaebc8 SHA256 89c2125e903edf6f6fe035137eceef79382fce43783e5da240fc4a34b0878934
 EBUILD migemo-0.40-r1.ebuild 932 RMD160 fa482b10b69496d867723543b64ee7a59aed4679 SHA1 3b42a1616343d07bf38d05d9cad16a7c5895141c SHA256 58ce92e67051f5a6ab3be006aab108eb1408f053d315436fa5694cc9f34950cd
 MD5 4038afa65eff04e30a90a54d95ba8d9a migemo-0.40-r1.ebuild 932
 RMD160 fa482b10b69496d867723543b64ee7a59aed4679 migemo-0.40-r1.ebuild 932
 SHA256 58ce92e67051f5a6ab3be006aab108eb1408f053d315436fa5694cc9f34950cd migemo-0.40-r1.ebuild 932
-EBUILD migemo-0.40-r2.ebuild 1148 RMD160 f556aee7d379b314e2105d4fca59f8bd2fd6d0d5 SHA1 edf9e34cdec83943465962d4616d35f0729e34a4 SHA256 8cc5caf56a117dc4350e3a18e7ab807a51344464d20466fcd6debd35b608ecae
-MD5 ec26ddfe8d084ca3bdf09533d11fd04d migemo-0.40-r2.ebuild 1148
-RMD160 f556aee7d379b314e2105d4fca59f8bd2fd6d0d5 migemo-0.40-r2.ebuild 1148
-SHA256 8cc5caf56a117dc4350e3a18e7ab807a51344464d20466fcd6debd35b608ecae migemo-0.40-r2.ebuild 1148
-MISC ChangeLog 2072 RMD160 9decb74a1cfd9be1842aec22422178b6b8a17a72 SHA1 3c523b01b717743773d252037f0fa23e3ff985ad SHA256 da390d9ec410cec83d46c232bd600d675c909b76cb93098f29c0cbec545ca6eb
-MD5 c1b06217ce8489c49d1b9b2547599bd6 ChangeLog 2072
-RMD160 9decb74a1cfd9be1842aec22422178b6b8a17a72 ChangeLog 2072
-SHA256 da390d9ec410cec83d46c232bd600d675c909b76cb93098f29c0cbec545ca6eb ChangeLog 2072
+EBUILD migemo-0.40-r3.ebuild 1458 RMD160 e8e9aeb10ee1edb9aa1aa852be4d1c1751500950 SHA1 ec99ef037ed50c3dd4ad4e204f82fe319b5c0e35 SHA256 d925aff7d3356dd16fbcb532ab3bfbc6ac1c0fcfb00dc09b1f29d4256a8a3a13
+MD5 24971f805b24c53074b03f7722373186 migemo-0.40-r3.ebuild 1458
+RMD160 e8e9aeb10ee1edb9aa1aa852be4d1c1751500950 migemo-0.40-r3.ebuild 1458
+SHA256 d925aff7d3356dd16fbcb532ab3bfbc6ac1c0fcfb00dc09b1f29d4256a8a3a13 migemo-0.40-r3.ebuild 1458
+MISC ChangeLog 2398 RMD160 b30511de43c1f3892e6bf7d2fe68cb0ea4b4034f SHA1 bffa2ed9a4667bc4dae6ce98c9461ba298f89a9f SHA256 f894591fb38f363f5d2721553a92557d6fca5d65da517737626a04393b549746
+MD5 1bf6a76027df632a77cccb976afcc123 ChangeLog 2398
+RMD160 b30511de43c1f3892e6bf7d2fe68cb0ea4b4034f ChangeLog 2398
+SHA256 f894591fb38f363f5d2721553a92557d6fca5d65da517737626a04393b549746 ChangeLog 2398
 MISC metadata.xml 266 RMD160 70bf7a7d26b1720b6e0933de1d79534db79b566b SHA1 7a054aa6cfb9a5fabe0520084dc96e35b53f0cda SHA256 350bf733b2a9dec69a1e9e126e82a05c6a7d2705b37049f9ba2bf5c1724295b0
 MD5 1d42b06bfb3e26653185a94eb94bae8a metadata.xml 266
 RMD160 70bf7a7d26b1720b6e0933de1d79534db79b566b metadata.xml 266
@@ -22,6 +33,13 @@ SHA256 350bf733b2a9dec69a1e9e126e82a05c6a7d2705b37049f9ba2bf5c1724295b0 metadata
 MD5 6a24be3c88ebdbf57f195a7fb2c63ad0 files/digest-migemo-0.40-r1 238
 RMD160 80c7621c1bf29f333afbf94a33a3f50dcc74c211 files/digest-migemo-0.40-r1 238
 SHA256 92f907df53aa9e1e9674b0708dbdabd786cf2c0234c69a875371efe5c7272dea files/digest-migemo-0.40-r1 238
-MD5 6a24be3c88ebdbf57f195a7fb2c63ad0 files/digest-migemo-0.40-r2 238
-RMD160 80c7621c1bf29f333afbf94a33a3f50dcc74c211 files/digest-migemo-0.40-r2 238
-SHA256 92f907df53aa9e1e9674b0708dbdabd786cf2c0234c69a875371efe5c7272dea files/digest-migemo-0.40-r2 238
+MD5 6a24be3c88ebdbf57f195a7fb2c63ad0 files/digest-migemo-0.40-r3 238
+RMD160 80c7621c1bf29f333afbf94a33a3f50dcc74c211 files/digest-migemo-0.40-r3 238
+SHA256 92f907df53aa9e1e9674b0708dbdabd786cf2c0234c69a875371efe5c7272dea files/digest-migemo-0.40-r3 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFHa3C1Oeoy/oIi7uwRAl9hAJ9DR9qIc1v/wiy+bNizKspRB91kOACdG/t0
+29ojOi++maHydyxgWwq4ihw=
+=aOdy
+-----END PGP SIGNATURE-----
diff --git a/app-text/migemo/files/50migemo-gentoo.el b/app-text/migemo/files/50migemo-gentoo.el
index e9a2a3e5ad09..f79828742aa2 100644
--- a/app-text/migemo/files/50migemo-gentoo.el
+++ b/app-text/migemo/files/50migemo-gentoo.el
@@ -1,3 +1,4 @@
+
 ;;; migemo site-lisp configuration
 
 (add-to-list 'load-path "@SITELISP@")
diff --git a/app-text/migemo/files/51migemo-gentoo.el b/app-text/migemo/files/51migemo-gentoo.el
new file mode 100644
index 000000000000..da2f321ae302
--- /dev/null
+++ b/app-text/migemo/files/51migemo-gentoo.el
@@ -0,0 +1,4 @@
+
+;;; migemo site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-text/migemo/files/digest-migemo-0.40-r2 b/app-text/migemo/files/digest-migemo-0.40-r3
index d11751137bea..d11751137bea 100644
--- a/app-text/migemo/files/digest-migemo-0.40-r2
+++ b/app-text/migemo/files/digest-migemo-0.40-r3
diff --git a/app-text/migemo/files/migemo-0.40-without-emacs.patch b/app-text/migemo/files/migemo-0.40-without-emacs.patch
new file mode 100644
index 000000000000..39e965c62307
--- /dev/null
+++ b/app-text/migemo/files/migemo-0.40-without-emacs.patch
@@ -0,0 +1,11 @@
+--- migemo-0.40-orig/configure	2003-05-28 14:19:38.000000000 +0200
++++ migemo-0.40/configure	2007-12-21 07:38:21.000000000 +0100
+@@ -825,7 +825,7 @@
+   withval="$with_emacs"
+   case "${withval}" in
+        yes)	EMACS= ;;
+-       no)	{ echo "configure: error: emacs is not available" 1>&2; exit 1; } ;;
++       no)	EMACS=no ;;
+        *)	EMACS=${withval} ;;
+      esac
+ else
diff --git a/app-text/migemo/migemo-0.40-r2.ebuild b/app-text/migemo/migemo-0.40-r3.ebuild
index 351ab67d5817..18ff79017936 100644
--- a/app-text/migemo/migemo-0.40-r2.ebuild
+++ b/app-text/migemo/migemo-0.40-r3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/migemo/migemo-0.40-r2.ebuild,v 1.2 2007/12/20 14:05:13 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/migemo/migemo-0.40-r3.ebuild,v 1.1 2007/12/21 07:51:49 ulm Exp $
 
-inherit elisp-common
+inherit elisp-common eutils
 
 DESCRIPTION="Migemo is Japanese Incremental Search Tool"
 HOMEPAGE="http://0xcc.net/migemo/"
@@ -13,31 +13,32 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="emacs"
 
-RDEPEND="virtual/ruby
+DEPEND="virtual/ruby
 	dev-ruby/ruby-romkan
 	dev-ruby/ruby-bsearch
 	app-dicts/migemo-dict
-	emacs? ( virtual/emacs )"
+	emacs? ( virtual/emacs
+		app-emacs/apel )"
+RDEPEND="${DEPEND}"
 
-DEPEND="${RDEPEND}
-	virtual/emacs
-	app-emacs/apel"
-
-SITEFILE=50${PN}-gentoo.el
+SITEFILE=51${PN}-gentoo.el
 
 src_unpack() {
 	unpack ${A}
-	cp /usr/share/migemo/migemo-dict "${S}"
+	cd "${S}"
+	cp /usr/share/migemo/migemo-dict .
+	epatch "${FILESDIR}/${P}-without-emacs.patch"
 }
 
 src_compile() {
-	econf || die
+	econf $(use_with emacs) --with-lispdir=${SITELISP}/${PN} || die
 	# emake b0rks
 	emake -j1 || die
 }
 
 src_install() {
-	emake -j1 DESTDIR="${D}" install || die
+	emake -j1 DESTDIR="${D}" \
+		$(useq emacs || echo "lispdir=") install || die
 
 	rm "${D}"/usr/share/migemo/migemo-dict
 
@@ -48,7 +49,12 @@ src_install() {
 }
 
 pkg_postinst() {
-	use emacs && elisp-site-regen
+	if use emacs ; then
+		elisp-site-regen
+		elog "Migemo adviced search is no longer enabled as a site default."
+		elog "Add the following line to your ~/.emacs file to enable it:"
+		elog "  (require 'migemo)"
+	fi
 }
 
 pkg_postrm() {