Added ~amd64. Fixed dependency. Added RESTRICT="test"

(Portage version: 2.1.6.4/cvs/Linux 2.6.28-gentoo x86_64)

3 files changed, 118 insertions, 2 deletions

diff --git a/x11-misc/xmbdfed/ChangeLog b/x11-misc/xmbdfed/ChangeLog
index 5282404ded1e..a9b1fc960e5d 100644
--- a/x11-misc/xmbdfed/ChangeLog
+++ b/x11-misc/xmbdfed/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/xmbdfed
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xmbdfed/ChangeLog,v 1.19 2008/12/15 22:54:27 pva Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xmbdfed/ChangeLog,v 1.20 2009/01/01 01:33:50 matsuu Exp $
+
+*xmbdfed-4.7_p1-r1 (01 Jan 2009)
+
+  01 Jan 2009; MATSUU Takuto <matsuu@gentoo.org>
+  +files/xmbdfed-4.7_p1-gentoo.patch, +xmbdfed-4.7_p1-r1.ebuild:
+  Added ~amd64. Fixed dependency. Added RESTRICT="test".
 
   15 Dec 2008; Peter Volkov <pva@gentoo.org> xmbdfed-4.7_p1.ebuild:
   Truetype support is not optional any more in this package thus removed
diff --git a/x11-misc/xmbdfed/files/xmbdfed-4.7_p1-gentoo.patch b/x11-misc/xmbdfed/files/xmbdfed-4.7_p1-gentoo.patch
new file mode 100644
index 000000000000..c338b1b27032
--- /dev/null
+++ b/x11-misc/xmbdfed/files/xmbdfed-4.7_p1-gentoo.patch
@@ -0,0 +1,64 @@
+diff -Naur xmbdfed-4.7.orig/Makefile xmbdfed-4.7/Makefile
+--- xmbdfed-4.7.orig/Makefile	2004-02-18 00:24:06.000000000 +0900
++++ xmbdfed-4.7/Makefile	2009-01-01 09:38:56.000000000 +0900
+@@ -23,7 +23,7 @@
+ # $Id: xmbdfed-4.7_p1-gentoo.patch,v 1.1 2009/01/01 01:33:50 matsuu Exp $
+ #
+ CC = gcc
+-CFLAGS = -g -Wall
++CFLAGS += -g -Wall
+ 
+ OTHER = README CHANGES COPYRIGHTS Makefile Imakefile.lesstif Project.tmpl \
+         xmbdfedrc xmbdfed.man
+@@ -46,9 +46,9 @@
+ # Uncomment these if you have the FreeType library and want to use it to
+ # import OpenType fonts.
+ #
+-#FTYPE_INCS = -I/usr/local/include
+-#FTYPE_LIBS = -L/usr/local/lib -lfreetype
+-#FTYPE_DEFS = -DHAVE_FREETYPE
++FTYPE_INCS = `freetype-config --cflags`
++FTYPE_LIBS = `freetype-config --libs`
++FTYPE_DEFS = -DHAVE_FREETYPE
+ 
+ #
+ # Uncomment these if you have the hbf.h and hbf.c files in the current
+@@ -64,7 +64,7 @@
+ # files with a ".gz" extension.  If you don't care about HBF fonts, just
+ # comment this line out.
+ #
+-HBFDEFS = -Dunix -DIN_MEMORY -DGUNZIP_CMD="\"/usr/local/bin/gunzip -c\""
++HBFDEFS = -Dunix -DIN_MEMORY -DGUNZIP_CMD="\"/bin/gunzip -c\""
+ 
+ #
+ # Set the defines used for all files except the HBF support.
+@@ -82,15 +82,15 @@
+ #
+ # Uncomment these for Solaris.
+ #
+-INCS = -I/usr/openwin/include -I/usr/dt/include $(FTYPE_INCS)
+-LIBS = -R/usr/openwin/lib -R/usr/dt/lib -L/usr/dt/lib -lXm \
+-       -L/usr/openwin/lib -lXmu -lXt -lXext -lX11 $(FTYPE_LIBS)
++#INCS = -I/usr/openwin/include -I/usr/dt/include $(FTYPE_INCS)
++#LIBS = -R/usr/openwin/lib -R/usr/dt/lib -L/usr/dt/lib -lXm \
++#       -L/usr/openwin/lib -lXmu -lXt -lXext -lX11 $(FTYPE_LIBS)
+ 
+ #
+ # Uncomment these for Linux.
+ #
+-#INCS = -I/usr/X11/include $(FTYPE_INCS)
+-#LIBS = -L/usr/X11/lib -lXm -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE $(FTYPE_LIBS)
++INCS = -I/usr/include $(FTYPE_INCS)
++LIBS = -L/usr/lib -lXm -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE $(FTYPE_LIBS)
+ 
+ #
+ # Uncomment these for HPUX.
+@@ -132,7 +132,7 @@
+ all: xmbdfed
+ 
+ xmbdfed: $(OBJS)
+-	$(PURIFY) $(CC) $(STATIC) $(CFLAGS) -o xmbdfed $(OBJS) $(LIBS)
++	$(PURIFY) $(CC) $(STATIC) $(CFLAGS) $(LDFLAGS) -o xmbdfed $(OBJS) $(LIBS)
+ 
+ hbf.o: hbf.c
+ 	$(CC) $(CFLAGS) $(DEFS) $(HBFDEFS) $(INCS) -c $< -o $@
diff --git a/x11-misc/xmbdfed/xmbdfed-4.7_p1-r1.ebuild b/x11-misc/xmbdfed/xmbdfed-4.7_p1-r1.ebuild
new file mode 100644
index 000000000000..d5c0e5396555
--- /dev/null
+++ b/x11-misc/xmbdfed/xmbdfed-4.7_p1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xmbdfed/xmbdfed-4.7_p1-r1.ebuild,v 1.1 2009/01/01 01:33:50 matsuu Exp $
+
+inherit eutils multilib toolchain-funcs
+
+MY_P="${P/_p*}"
+DESCRIPTION="BDF font editor for X"
+SRC_URI="http://clr.nmsu.edu/~mleisher/${MY_P}.tar.bz2
+	http://clr.nmsu.edu/~mleisher/${P/_p/-patch}"
+HOMEPAGE="http://clr.nmsu.edu/~mleisher/xmbdfed.html"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND=">=x11-libs/openmotif-2.3.0-r1
+	media-libs/freetype"
+RDEPEND="${DEPEND}
+	media-fonts/font-adobe-75dpi
+	media-fonts/font-alias
+	media-fonts/font-misc-misc"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${DISTDIR}/${P/_p/-patch}"
+	epatch "${FILESDIR}/${P}-gcc4.patch"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	sed -i -e "/^LIBS/s:/usr/lib:/usr/$(get_libdir):" Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	dobin xmbdfed || die
+	newman xmbdfed.man xmbdfed.1
+	dodoc CHANGES README xmbdfedrc
+}