fixed emacs dependency with use emacs && inherit elisp

3 files changed, 35 insertions, 27 deletions

diff --git a/app-misc/magicpoint/ChangeLog b/app-misc/magicpoint/ChangeLog
index d1469547823d..59787da4e4e7 100644
--- a/app-misc/magicpoint/ChangeLog
+++ b/app-misc/magicpoint/ChangeLog
@@ -1,9 +1,13 @@
 # ChangeLog for app-misc/magicpoint
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/magicpoint/ChangeLog,v 1.8 2003/08/15 06:31:40 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/magicpoint/ChangeLog,v 1.9 2003/08/24 20:42:16 usata Exp $
 
 *magicpoint-1.10a (06 Aug 2003)
 
+  25 Aug 2003; Mamoru KOMACHI <usata@gentoo.org> magicpoint-1.10a.ebuild:
+  Fixed emacs dependency problem with inherit elisp.  Added ~alpha,
+  ~ppc and ~sparc keywords.  Changed ~x86 to x86.  Simplified conditionals.
+
   06 Aug 2003; Mamoru KOMACHI <usata@gentoo.org> magicpoint-1.10a.ebuild,
   files/50mgp-mode-gentoo.el, files/magicpoint-1.10a-gentoo.diff:
   Version bump.  Added cjk and emacs USE flags.  Upstream now supports
diff --git a/app-misc/magicpoint/Manifest b/app-misc/magicpoint/Manifest
index eaf6eb4ad3c6..54d7c142f6e3 100644
--- a/app-misc/magicpoint/Manifest
+++ b/app-misc/magicpoint/Manifest
@@ -1,6 +1,6 @@
-MD5 7d0be19c7a0fb7bf68da8c512ae7a509 ChangeLog 2248
+MD5 edf3e019d9436583c55d783da91eb439 ChangeLog 2467
 MD5 a2dce78a623afffaa6dcbb0601708b80 magicpoint-1.09a-r1.ebuild 1611
-MD5 f14a5b43327f9d008ef155dfdc460631 magicpoint-1.10a.ebuild 2316
+MD5 b1c83fc4d9b912f7446db2ebebcad107 magicpoint-1.10a.ebuild 2290
 MD5 67c776708a4de3107f171f72100bd27e files/digest-magicpoint-1.09a-r1 68
 MD5 63a502fcee80a92007cd49e113116b04 files/50mgp-mode-gentoo.el 167
 MD5 21ae8d72d1c351d19bc611f80ec31b63 files/magicpoint-1.10a-gentoo.diff 1668
diff --git a/app-misc/magicpoint/magicpoint-1.10a.ebuild b/app-misc/magicpoint/magicpoint-1.10a.ebuild
index 2447c71bb47f..5f1395ae01e0 100644
--- a/app-misc/magicpoint/magicpoint-1.10a.ebuild
+++ b/app-misc/magicpoint/magicpoint-1.10a.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/magicpoint/magicpoint-1.10a.ebuild,v 1.1 2003/08/06 02:11:54 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/magicpoint/magicpoint-1.10a.ebuild,v 1.2 2003/08/24 20:42:16 usata Exp $
 
-use emacs && inherit elisp
+inherit eutils
 
 IUSE="cjk emacs truetype gif nls imlib"
 
@@ -12,15 +12,15 @@ HOMEPAGE="http://www.mew.org/mgp/"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~alpha ~sparc ~ppc"
 
 DEPEND="virtual/x11
+	emacs? ( virtual/emacs )
 	gif? ( >=media-libs/libungif-4.0.1 )
 	imlib? ( media-libs/imlib )
 	cjk? ( truetype? ( >=media-libs/vflib-2.25.6-r1 )
 		: ( =media-libs/freetype-1* ) )
 	truetype? ( =media-libs/freetype-1* )"
-
 RDEPEND="${DEPEND}
 	nls? ( sys-devel/gettext )"
 
@@ -29,6 +29,7 @@ LICENSE="Sleepycat"
 KEYWORDS="~x86"
 
 S=${WORKDIR}/${P}
+SITELISP=/usr/share/emacs/site-lisp
 SITEFILE=50mgp-mode-gentoo.el
 
 src_unpack() {
@@ -42,31 +43,18 @@ src_compile() {
 	local myconf
 
 	if [ -n "`use cjk`" -a -n "`use truetype`" ] ; then
-		myconf="${myconf}
-			--enable-vflib
+		myconf="--enable-vflib
 			--with-vfontcap=/usr/share/VFlib/2.25.6/vfontcap.mgp"
 	else
-		myconf="${myconf} --disable-vflib"
-
-		if [ -n "`use cjk`" ] ; then
-			myconf="${myconf} --enable-freetype-charset16"
-		elif [ -n "`use truetype`" ] ; then
-			myconf="${myconf} --enable-freetype"
-		else
-			myconf="${myconf} --disable-freetype"
-		fi
+		myconf="--disable-vflib
+			`use_enable cjk freetype-charset16`
+			`use_enable truetype freetype`"
 	fi
 
-
-	if [ -n "`use nls`" ] ; then
-		myconf="${myconf} --enable-locale"
-	else
-		myconf="${myconf} --disable-locale"
-	fi
-	
 	econf \
 		`use_enable gif` \
 		`use_enable imlib` \
+		`use_enable nls locale` \
 		--disable-xft2 \
 		${myconf} || die
 
@@ -93,8 +81,8 @@ src_install() {
 	doexe contrib/{mgp2html.pl,mgp2latex.pl}
 
 	if [ -n "`use emacs`" ] ; then
-		elisp-site-file-install contrib/mgp-mode.el
-		elisp-site-file-install ${FILESDIR}/${SITEFILE}
+		insinto ${SITELISP}
+		doins contrib/mgp-mode.el ${FILESDIR}/${SITEFILE}
 	fi
 
 	insinto /usr/share/${PF}/sample
@@ -107,3 +95,19 @@ src_install() {
 
 	dodoc COPYRIGHT* FAQ README* RELNOTES SYNTAX TODO* USAGE*
 }
+
+pkg_postinst() {
+
+	if [ -n "`use emacs`" ] ; then
+		inherit elisp
+		elisp-site-regen
+	fi
+}
+
+pkg_postrm() {
+
+	if [ -n "`use emacs`" ] ; then
+		inherit elisp
+		elisp-site-regen
+	fi
+}