Version bumped. Added m17n-lib USE flag.

5 files changed, 117 insertions, 18 deletions

diff --git a/app-office/magicpoint/ChangeLog b/app-office/magicpoint/ChangeLog
index 890b311f96e9..3cb844cfee27 100644
--- a/app-office/magicpoint/ChangeLog
+++ b/app-office/magicpoint/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/magicpoint
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/magicpoint/ChangeLog,v 1.7 2004/06/24 22:42:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/magicpoint/ChangeLog,v 1.8 2004/09/15 09:42:36 usata Exp $
+
+*magicpoint-1.11a (15 Sep 2004)
+
+  15 Sep 2004; Mamoru KOMACHI <usata@gentoo.org>
+  -files/magicpoint-1.10a-gentoo.diff, +files/magicpoint-1.11a-gentoo.diff,
+  +magicpoint-1.11a.ebuild:
+  Version bumped. Added m17n-lib USE flag.
 
   01 Jun 2004; Aron Griffis <agriffis@gentoo.org> magicpoint-1.10a-r1.ebuild:
   Fix use invocation
diff --git a/app-office/magicpoint/Manifest b/app-office/magicpoint/Manifest
index aba6b0a0e2ba..b63c09f9ab78 100644
--- a/app-office/magicpoint/Manifest
+++ b/app-office/magicpoint/Manifest
@@ -1,7 +1,9 @@
-MD5 8c9697b18abf0f50620a591058b2b068 magicpoint-1.10a-r1.ebuild 1956
 MD5 9352058adc5daa06faf9c95ba4b2852e ChangeLog 4033
+MD5 8c9697b18abf0f50620a591058b2b068 magicpoint-1.11a.ebuild 1956
+MD5 8c9697b18abf0f50620a591058b2b068 magicpoint-1.10a-r1.ebuild 1956
 MD5 4f629e05f82550ea37f2488b5d6fc7a9 metadata.xml 509
-MD5 21ae8d72d1c351d19bc611f80ec31b63 files/magicpoint-1.10a-gentoo.diff 1668
+MD5 63a502fcee80a92007cd49e113116b04 files/50mgp-mode-gentoo.el 167
+MD5 e1ffb107e58ea1bcfa6066df817b08a2 files/digest-magicpoint-1.11a 68
 MD5 6ac7b3bc9c394f597bf182a0509154fc files/digest-magicpoint-1.10a-r1 68
+MD5 21ae8d72d1c351d19bc611f80ec31b63 files/magicpoint-1.10a-gentoo.diff 1668
 MD5 3948d3f1ee43af2138ad361b1bcab87b files/magicpoint-1.10a-r1-gentoo.diff 1833
-MD5 63a502fcee80a92007cd49e113116b04 files/50mgp-mode-gentoo.el 167
diff --git a/app-office/magicpoint/files/digest-magicpoint-1.11a b/app-office/magicpoint/files/digest-magicpoint-1.11a
new file mode 100644
index 000000000000..052b3185ba97
--- /dev/null
+++ b/app-office/magicpoint/files/digest-magicpoint-1.11a
@@ -0,0 +1 @@
+MD5 9e55166a7793de371803b0c20f965971 magicpoint-1.11a.tar.gz 871606
diff --git a/app-office/magicpoint/files/magicpoint-1.10a-gentoo.diff b/app-office/magicpoint/files/magicpoint-1.11a-gentoo.diff
index 6dea916b490b..026a826dc031 100644
--- a/app-office/magicpoint/files/magicpoint-1.10a-gentoo.diff
+++ b/app-office/magicpoint/files/magicpoint-1.11a-gentoo.diff
@@ -1,15 +1,6 @@
 diff -urN magicpoint-1.10a.ORIG/mgp.h magicpoint-1.10a/mgp.h
 --- magicpoint-1.10a.ORIG/mgp.h	2003-06-06 16:18:25.000000000 +0900
-+++ magicpoint-1.10a/mgp.h	2003-08-06 09:19:53.000000000 +0900
-@@ -84,7 +84,7 @@
- #define VFONT	"minsl"
- 
- #ifndef VFCAP
--#define VFCAP	"/usr/local/lib/VFlib/vfontcap"
-+#define VFCAP	"/usr/share/VFlib/2.25.6/vfontcap"
- #endif
- 
- #endif /* end of VFLIB */
++++ magicpoint-1.10a/mgp.h	2003-09-02 04:24:56.000000000 +0900
 @@ -93,7 +93,7 @@
  #include "freetype.h"
  
@@ -30,7 +21,7 @@ diff -urN magicpoint-1.10a.ORIG/mgp.h magicpoint-1.10a/mgp.h
  #define MAXPAGE		512
 diff -urN magicpoint-1.10a.ORIG/sample/default.mgp magicpoint-1.10a/sample/default.mgp
 --- magicpoint-1.10a.ORIG/sample/default.mgp	2001-08-11 01:40:54.000000000 +0900
-+++ magicpoint-1.10a/sample/default.mgp	2003-08-06 09:22:42.000000000 +0900
++++ magicpoint-1.10a/sample/default.mgp	2003-09-02 04:24:56.000000000 +0900
 @@ -12,9 +12,9 @@
  %% into the "tfdir" directory above:
  %%	ftp://ftp.mew.org/pub/mgp/ttf-jp.tar.gz
@@ -38,9 +29,9 @@ diff -urN magicpoint-1.10a.ORIG/sample/default.mgp magicpoint-1.10a/sample/defau
 -%deffont "standard"   tfont "standard.ttf",   tmfont "kochi-mincho.ttf"
 -%deffont "thick"      tfont "thick.ttf",      tmfont "goth.ttf"
 -%deffont "typewriter" tfont "typewriter.ttf", tmfont "goth.ttf"
-+%deffont "standard"   tfont "times.ttf",   tmfont "kochi-mincho.ttf"
-+%deffont "thick"      tfont "ariel.ttf",   tmfont "kochi-gothic.ttf"
-+%deffont "typewriter" tfont "cour.ttf",    tmfont "kochi-gothic.ttf"
++%deffont "standard"	xfont "times"
++%deffont "thick"	xfont "arial-bold"
++%deffont "typewriter"	xfont "courier"
  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  %%
  %% Default settings per each line numbers.
diff --git a/app-office/magicpoint/magicpoint-1.11a.ebuild b/app-office/magicpoint/magicpoint-1.11a.ebuild
new file mode 100644
index 000000000000..61f21770cd3e
--- /dev/null
+++ b/app-office/magicpoint/magicpoint-1.11a.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/magicpoint/magicpoint-1.11a.ebuild,v 1.1 2004/09/15 09:42:36 usata Exp $
+
+inherit elisp-common eutils
+
+DESCRIPTION="an X11 based presentation tool"
+SRC_URI="ftp://ftp.mew.org/pub/MagicPoint/${P}.tar.gz"
+HOMEPAGE="http://www.mew.org/mgp/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~alpha ~sparc ~ppc ~amd64"
+IUSE="cjk nls m17n-lib emacs truetype gif imlib"
+
+DEPEND="virtual/x11
+	gif? ( >=media-libs/libungif-4.0.1 )
+	imlib? ( media-libs/imlib )
+	truetype? ( virtual/xft )
+	emacs? ( virtual/emacs )
+	m17n-lib? ( dev-libs/m17n-lib )"
+RDEPEND="${DEPEND}
+	nls? ( sys-devel/gettext )
+	truetype? ( cjk? ( media-fonts/kochi-substitute ) )"
+
+SITELISP=/usr/share/emacs/site-lisp
+SITEFILE=50mgp-mode-gentoo.el
+
+has_emacs() {
+	if has_version 'virtual/emacs' ; then
+		true
+	else
+		false
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PF}-gentoo.diff
+}
+
+src_compile() {
+	econf \
+		$(use_enable gif) \
+		$(use_enable imlib) \
+		$(use_enable nls locale) \
+		$(use_enable truetype xft2) \
+		$(use_with m17n-lib) \
+		--disable-vflib \
+		--disable-freetype || die
+
+	xmkmf || die
+	make Makefiles || die
+	make clean || die
+	make BINDIR=/usr/bin LIBDIR=/etc/X11 || die
+}
+
+src_install() {
+	make \
+		DESTDIR=${D} \
+		BINDIR=/usr/bin \
+		LIBDIR=/etc/X11 \
+		install || die
+
+	make \
+		DESTDIR=${D} \
+		DOCHTMLDIR=/usr/share/doc/${PF} \
+		MANPATH=/usr/share/man \
+		MANSUFFIX=1 \
+		install.man || die
+
+	exeinto /usr/bin
+	doexe contrib/{mgp2html.pl,mgp2latex.pl}
+
+	if use emacs ; then
+		insinto ${SITELISP}
+		doins contrib/mgp-mode.el ${FILESDIR}/${SITEFILE}
+	fi
+
+	insinto /usr/share/${PF}/sample
+	cd sample
+	doins README* cloud.jpg dad.* embed*.mgp gradation*.mgp \
+		mgp-old*.jpg mgp.mng mgp3.xbm mgprc-sample \
+		multilingual.mgp sample*.mgp sendmail6*.mgp \
+		tutorial*.mgp v6*.mgp v6header.* || die
+	cd -
+
+	dodoc COPYRIGHT* FAQ README* RELNOTES SYNTAX TODO* USAGE*
+}
+
+pkg_postinst() {
+	has_emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	has_emacs && elisp-site-regen
+}