summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMamoru Komachi <usata@gentoo.org>2003-11-10 16:55:08 +0000
committerMamoru Komachi <usata@gentoo.org>2003-11-10 16:55:08 +0000
commit2a74cfce3b08ab693368ff82cde0eac8038165ea (patch)
treed5bb359cc3fdaf38d0fa7d121070e389fe82efaa /media-libs/vflib
parentbumping to stable on x86 (diff)
downloadgentoo-2-2a74cfce3b08ab693368ff82cde0eac8038165ea.tar.gz
gentoo-2-2a74cfce3b08ab693368ff82cde0eac8038165ea.tar.bz2
gentoo-2-2a74cfce3b08ab693368ff82cde0eac8038165ea.zip
Added a patch to compile against gcc-3.3. Closing bug #33109
Diffstat (limited to 'media-libs/vflib')
-rw-r--r--media-libs/vflib/ChangeLog7
-rw-r--r--media-libs/vflib/Manifest9
-rw-r--r--media-libs/vflib/files/digest-vflib-2.25.61
-rw-r--r--media-libs/vflib/files/vflib-2.25.6-gcc3.diff12
-rw-r--r--media-libs/vflib/files/vflib-2.25.6-gentoo.diff29
-rw-r--r--media-libs/vflib/metadata.xml9
-rw-r--r--media-libs/vflib/vflib-2.25.6-r1.ebuild8
-rw-r--r--media-libs/vflib/vflib-2.25.6.ebuild47
8 files changed, 36 insertions, 86 deletions
diff --git a/media-libs/vflib/ChangeLog b/media-libs/vflib/ChangeLog
index c0994dd7643a..ddbc5c5288de 100644
--- a/media-libs/vflib/ChangeLog
+++ b/media-libs/vflib/ChangeLog
@@ -1,9 +1,14 @@
# ChangeLog for media-libs/vflib
# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vflib/ChangeLog,v 1.3 2003/08/13 13:38:50 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vflib/ChangeLog,v 1.4 2003/11/10 16:55:01 usata Exp $
*vflib-2.25.6-r1 (06 Aug 2003)
+ 11 Nov 2003; Mamoru KOMACHI <usata@gentoo.org> vflib-2.25.6-r1.ebuild,
+ files/vflib-2.25.6-gcc3.diff:
+ Applied a patch to compile against gcc-3.3. Marked as stable and
+ removed previous version. Closing bug #33109
+
13 Aug 2003; Mamoru KOMACHI <usata@gentoo.org> vflib-2.25.6-r1.ebuild:
Marked stable on x86
diff --git a/media-libs/vflib/Manifest b/media-libs/vflib/Manifest
index 73b1b64265e4..94be0e220a8e 100644
--- a/media-libs/vflib/Manifest
+++ b/media-libs/vflib/Manifest
@@ -1,7 +1,6 @@
-MD5 31bc9e60546d1da6eddb185688cccbcb vflib-2.25.6.ebuild 1088
-MD5 a47f2175484fb39ea2234cb5a916f1e0 ChangeLog 1064
-MD5 26cb253577873c71a0262ab1fed5b957 vflib-2.25.6-r1.ebuild 1095
-MD5 50efe8124f340f0676e03138de0119c3 files/vflib-2.25.6-gentoo.diff 838
-MD5 f2223bbd37edae5723444c23273e3e49 files/digest-vflib-2.25.6 65
+MD5 212b6ec56b7acb3a4cc0bb8ddd2f95ef metadata.xml 247
+MD5 98840397e3b76ec1b8bbc87f09c15a89 ChangeLog 1284
+MD5 0e447b043fbc2034f3e34f8d9a47dacb vflib-2.25.6-r1.ebuild 1205
MD5 f45ceea0958084403bc069d0526d68a0 files/vflib-2.25.6-r1-gentoo.diff 1807
MD5 f2223bbd37edae5723444c23273e3e49 files/digest-vflib-2.25.6-r1 65
+MD5 31e5573f72cb3bbdfbfbbbbb0211c55a files/vflib-2.25.6-gcc3.diff 370
diff --git a/media-libs/vflib/files/digest-vflib-2.25.6 b/media-libs/vflib/files/digest-vflib-2.25.6
deleted file mode 100644
index e818a0c460de..000000000000
--- a/media-libs/vflib/files/digest-vflib-2.25.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 64899702c94ce059069a5532098d5937 VFlib2-2.25.6.tar.gz 677784
diff --git a/media-libs/vflib/files/vflib-2.25.6-gcc3.diff b/media-libs/vflib/files/vflib-2.25.6-gcc3.diff
new file mode 100644
index 000000000000..61a13cc67f46
--- /dev/null
+++ b/media-libs/vflib/files/vflib-2.25.6-gcc3.diff
@@ -0,0 +1,12 @@
+diff -urN VFlib2-2.25.6.ORIG/tools/disol.c VFlib2-2.25.6/tools/disol.c
+--- VFlib2-2.25.6.ORIG/tools/disol.c 1998-07-16 13:59:10.000000000 +0900
++++ VFlib2-2.25.6/tools/disol.c 2003-11-10 20:56:24.000000000 +0900
+@@ -33,7 +33,7 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <varargs.h>
++#include <stdarg.h>
+ #include "../src/VF.h"
+
+ #define CommentLine printf
diff --git a/media-libs/vflib/files/vflib-2.25.6-gentoo.diff b/media-libs/vflib/files/vflib-2.25.6-gentoo.diff
deleted file mode 100644
index 5a299117e118..000000000000
--- a/media-libs/vflib/files/vflib-2.25.6-gentoo.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -urN VFlib2-2.25.6.ORIG/configure VFlib2-2.25.6/configure
---- VFlib2-2.25.6.ORIG/configure 2001-10-19 21:12:37.000000000 +0900
-+++ VFlib2-2.25.6/configure 2003-06-25 07:46:04.000000000 +0900
-@@ -1155,7 +1155,7 @@
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
-
-
--vflib2_version='2.25.2'
-+vflib2_version='2.25.6'
-
-
- CUR=24
---- VFlib2-2.25.6.ORIG/vfontcap 1999-07-21 18:17:04.000000000 +0900
-+++ VFlib2-2.25.6/vfontcap 2003-06-20 01:33:44.000000000 +0900
-@@ -33,9 +33,12 @@
- ####
-
- min:\
-- :fc=watanabe-mincho:
-+ :ft=freetype:\
-+ :ff=/usr/X11R6/lib/X11/fonts/truetype/kochi-mincho-subst.ttf:
- goth:\
-- :fc=watanabe-mincho:
-+ :ft=freetype:\
-+ :ff=/usr/X11R6/lib/X11/fonts/truetype/kochi-gothic-subst.ttf:
-+
- #min:\
- # :ft=freetype:\
- # :ff=/usr/local/share/fonts/DynaFont-Premium30/win95/futt/dfhsmw3.ttc:
diff --git a/media-libs/vflib/metadata.xml b/media-libs/vflib/metadata.xml
new file mode 100644
index 000000000000..cda4b8a7ba2f
--- /dev/null
+++ b/media-libs/vflib/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>cjk</herd>
+<maintainer>
+ <email>usata@gentoo.org</email>
+ <name>Mamoru KOMACHI</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-libs/vflib/vflib-2.25.6-r1.ebuild b/media-libs/vflib/vflib-2.25.6-r1.ebuild
index d527c8f68508..ff6691f84e7e 100644
--- a/media-libs/vflib/vflib-2.25.6-r1.ebuild
+++ b/media-libs/vflib/vflib-2.25.6-r1.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/media-libs/vflib/vflib-2.25.6-r1.ebuild,v 1.2 2003/08/13 13:38:50 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vflib/vflib-2.25.6-r1.ebuild,v 1.3 2003/11/10 16:55:01 usata Exp $
-inherit eutils
+inherit gcc eutils
IUSE=""
@@ -14,7 +14,7 @@ SRC_URI="ftp://TypeHack.aial.hiroshima-u.ac.jp/pub/TypeHack/${MY_PN}-${PV}.tar.g
LICENSE="LGPL-2 GPL-2"
SLOT="2"
-KEYWORDS="x86 ~alpha ~ppc ~sparc"
+KEYWORDS="x86 alpha ppc sparc"
DEPEND=">=media-libs/freetype-1.1
<media-libs/freetype-2
@@ -27,6 +27,8 @@ S=${WORKDIR}/${MY_PN}-${PV}
src_unpack () {
unpack ${A}
epatch ${FILESDIR}/${PF}-gentoo.diff
+ [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "3" ] \
+ && epatch ${FILESDIR}/${P}-gcc3.diff
}
src_compile () {
diff --git a/media-libs/vflib/vflib-2.25.6.ebuild b/media-libs/vflib/vflib-2.25.6.ebuild
deleted file mode 100644
index ce8a7e62ca15..000000000000
--- a/media-libs/vflib/vflib-2.25.6.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vflib/vflib-2.25.6.ebuild,v 1.3 2003/08/13 13:38:50 usata Exp $
-
-inherit eutils
-
-IUSE=""
-
-MY_PN="VFlib2"
-
-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_PN}-${PV}.tar.gz"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="2"
-KEYWORDS="x86 alpha ppc sparc"
-
-DEPEND=">=media-libs/freetype-1.1
- <media-libs/freetype-2
- virtual/x11"
-RDEPEND="${DEPEND}
- media-fonts/kochi-substitute"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_unpack () {
- unpack ${A}
- epatch ${FILESDIR}/${P}-gentoo.diff
-}
-
-src_compile () {
- econf --with-freetype \
- --with-freetype-includedir=/usr/include/freetype \
- --with-freetype-libdir=/usr/lib || die
-
- emake || die
-}
-
-src_install () {
- einstall runtimedir=${D}/usr/share/VFlib/${PV} || die
-
- dodir /usr/share/VFlib/${PV}
- cp -R jTeX ${D}/usr/share/VFlib/${PV}
-
- dodoc CHANGES COPYING* DISTRIB.txt INSTALL README*
-}