Version bumped. Reflected URI change. Fix modular X dependencies (bug #153203). Added a patch to avoid build hang. Removed old ebuild.

Package-Manager: portage-2.1.1

6 files changed, 140 insertions, 9 deletions

diff --git a/media-libs/vflib/ChangeLog b/media-libs/vflib/ChangeLog
index 62be9e38dc90..9aad9fd72cc8 100644
--- a/media-libs/vflib/ChangeLog
+++ b/media-libs/vflib/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/vflib
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vflib/ChangeLog,v 1.6 2004/10/23 12:28:51 usata Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vflib/ChangeLog,v 1.7 2006/11/04 18:06:12 usata Exp $
+
+*vflib-3.6.14 (04 Nov 2006)
+
+  04 Nov 2006; Mamoru KOMACHI <usata@gentoo.org>
+  -files/vflib-2.25.6-gcc3.diff, -files/vflib-2.25.6-r1-gentoo.diff,
+  +files/vflib-3.6.14-install-info.diff, -vflib-2.25.6-r1.ebuild,
+  vflib-3.6.13.ebuild, +vflib-3.6.14.ebuild:
+  Version bumped. Reflected URI change. Fix modular X dependencies (bug
+  #153203). Added a patch to avoid build hang. Removed old ebuild.
 
 *vflib-3.6.13 (23 Oct 2004)
 
diff --git a/media-libs/vflib/files/digest-vflib-3.6.13 b/media-libs/vflib/files/digest-vflib-3.6.13
index bd3b67991488..d8cc26302686 100644
--- a/media-libs/vflib/files/digest-vflib-3.6.13
+++ b/media-libs/vflib/files/digest-vflib-3.6.13
@@ -1 +1,3 @@
 MD5 64aaa110c3e3d5474e0e7372269b5e8b VFlib3-3.6.13.tar.gz 3650496
+RMD160 80865e5620f7eebae4ab5829e0d5fe45d23fda7a VFlib3-3.6.13.tar.gz 3650496
+SHA256 36ac41148c6fce97757a1a346702c4ce902810155c771b750ba0db89fd74c872 VFlib3-3.6.13.tar.gz 3650496
diff --git a/media-libs/vflib/files/digest-vflib-3.6.14 b/media-libs/vflib/files/digest-vflib-3.6.14
new file mode 100644
index 000000000000..0dbc38443aee
--- /dev/null
+++ b/media-libs/vflib/files/digest-vflib-3.6.14
@@ -0,0 +1,3 @@
+MD5 f95090401d79ca987bfcd1f08d77454f VFlib3-3.6.14.tar.gz 3537330
+RMD160 d7d90814ccf9e53f049fb38a7d0912db30c33ba9 VFlib3-3.6.14.tar.gz 3537330
+SHA256 c6e7269eee185e2a5eda85a9ab1b545230778ca045565b55302fec69a671504e VFlib3-3.6.14.tar.gz 3537330
diff --git a/media-libs/vflib/files/vflib-3.6.14-install-info.diff b/media-libs/vflib/files/vflib-3.6.14-install-info.diff
new file mode 100644
index 000000000000..d5f8cc1f034b
--- /dev/null
+++ b/media-libs/vflib/files/vflib-3.6.14-install-info.diff
@@ -0,0 +1,27 @@
+--- doc/Makefile.in.orig	2005-07-21 15:36:11.000000000 +0900
++++ doc/Makefile.in	2006-11-05 02:44:15.000000000 +0900
+@@ -36,15 +36,15 @@
+ 	    ../recmkdir $(infodir); fi
+ 	@for f in `echo $(DOC_INFO)*`; do \
+ 	   ../$(INSTALL_DATA) $$f  $(infodir); done
+-	-@if [ X-`../X-whereisit install-info` != "X-" ] ; then \
+-	   install-info $(DOC_INFO) \
+-	     --info-dir=$(infodir) \
+-	     --section='Miscellaneous' \
+-	     --item="* VFlib 3.6: (VFlib-36.info).		A font library VFlib."; \
+-	 else \
+-	   echo "NOTICE: No 'install-info' program!"; \
+-	   echo "        Edit $(infodir)/dir file by yourself."; \
+-	 fi
++	#-@if [ X-`../X-whereisit install-info` != "X-" ] ; then \
++	#   install-info $(DOC_INFO) \
++	#     --info-dir=$(infodir) \
++	#     --section='Miscellaneous' \
++	#     --item="* VFlib 3.6: (VFlib-36.info).		A font library VFlib."; \
++	# else \
++	#   echo "NOTICE: No 'install-info' program!"; \
++	#   echo "        Edit $(infodir)/dir file by yourself."; \
++	# fi
+ 	@if [ ! -d $(runtimedir)/doc ] ; then \
+ 	    ../recmkdir $(runtimedir)/doc; fi
+ 	@for f in `echo *.texi *.dvi *.ps *.html`; do \
diff --git a/media-libs/vflib/vflib-3.6.13.ebuild b/media-libs/vflib/vflib-3.6.13.ebuild
index a7718c2bb1e3..97f8b74d9b74 100644
--- a/media-libs/vflib/vflib-3.6.13.ebuild
+++ b/media-libs/vflib/vflib-3.6.13.ebuild
@@ -1,23 +1,38 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vflib/vflib-3.6.13.ebuild,v 1.1 2004/10/23 12:28:51 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vflib/vflib-3.6.13.ebuild,v 1.2 2006/11/04 18:06:12 usata Exp $
 
 inherit libtool eutils
 
 MY_P="VFlib3-${PV}"
 
 DESCRIPTION="Japanese Vector Font library"
-HOMEPAGE="http://typehack.aial.hiroshima-u.ac.jp/VFlib/"
-SRC_URI="ftp://typehack.aial.hiroshima-u.ac.jp/pub/TypeHack/${MY_P}.tar.gz"
+HOMEPAGE="http://www-masu.ist.osaka-u.ac.jp/~kakugawa/VFlib/"
+SRC_URI="http://www-masu.ist.osaka-u.ac.jp/~kakugawa/download/TypeHack/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="3"
 KEYWORDS="~x86 ~sparc ~alpha ~ppc"
 IUSE=""
 
-DEPEND="=media-libs/freetype-1*
-	media-libs/t1lib
-	virtual/x11
+RDEPEND="|| (
+			(
+				x11-libs/libX11
+				x11-libs/libXau
+				x11-libs/libXdmcp
+				x11-libs/libXext
+			)
+			virtual/x11
+	)
+	=media-libs/freetype-1*
+	media-libs/t1lib"
+DEPEND="${RDEPEND}
+	|| (
+		(
+			x11-proto/xproto
+		)
+		virtual/x11
+	)
 	virtual/tetex"
 
 S=${WORKDIR}/${MY_P}
diff --git a/media-libs/vflib/vflib-3.6.14.ebuild b/media-libs/vflib/vflib-3.6.14.ebuild
new file mode 100644
index 000000000000..a9161ac970ef
--- /dev/null
+++ b/media-libs/vflib/vflib-3.6.14.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vflib/vflib-3.6.14.ebuild,v 1.1 2006/11/04 18:06:12 usata Exp $
+
+inherit libtool eutils
+
+MY_P="VFlib3-${PV}"
+
+DESCRIPTION="Japanese Vector Font library"
+HOMEPAGE="http://www-masu.ist.osaka-u.ac.jp/~kakugawa/VFlib/"
+SRC_URI="http://www-masu.ist.osaka-u.ac.jp/~kakugawa/download/TypeHack/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2 GPL-2"
+SLOT="3"
+KEYWORDS="~x86 ~sparc ~alpha ~ppc"
+IUSE=""
+
+RDEPEND="|| (
+			(
+				x11-libs/libX11
+				x11-libs/libXau
+				x11-libs/libXdmcp
+				x11-libs/libXext
+			)
+			virtual/x11
+	)
+	=media-libs/freetype-1*
+	media-libs/t1lib"
+DEPEND="${RDEPEND}
+	|| (
+		(
+			x11-proto/xproto
+		)
+		virtual/x11
+	)
+	virtual/tetex"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack () {
+	unpack ${A}
+	cd ${S}
+	epatch "${FILESDIR}/${P}-install-info.diff"
+}
+
+src_compile () {
+	elibtoolize
+	sed -i -e "s:<varargs.h>:<stdarg.h>:" src/vfldisol.c
+	if has_version '>=media-libs/t1lib-5' ; then
+		sed -i -e "s:T1_Get_no_fonts:T1_GetNoFonts:" src/drv_t1.c
+	fi
+
+	econf \
+		--with-kpathsea \
+		--with-kpathsea-include=/usr/include \
+		--with-kpathsea-libdir=/usr/lib \
+		--with-freetype \
+		--with-freetype-includedir=/usr/include/freetype \
+		--with-freetype-libdir=/usr/lib \
+		--with-t1lib \
+		--with-t1lib-includedir=/usr/include \
+		--with-t1lib-libdir=/usr/lib || die
+
+	emake -j1 \
+		CDEBUGFLAGS="${CFLAGS}" \
+		CXXDEBUGFLAGS="${CXXFLAGS}" || die
+}
+
+src_install () {
+	einstall \
+		runtimedir=${D}/usr/share/VFlib/${PV} \
+		runtimesitedir=${D}/usr/share/VFlib/site || die
+
+	dodoc CHANGES COPYING* DISTRIB.txt INSTALL README*
+}