Fixed DEPEND for modular X. Patch for gcc4.

(Portage version: 2.1_pre3-r1)

7 files changed, 40 insertions, 67 deletions

diff --git a/x11-misc/xmbdfed/ChangeLog b/x11-misc/xmbdfed/ChangeLog
index b008f0f67df9..380f975f6bb4 100644
--- a/x11-misc/xmbdfed/ChangeLog
+++ b/x11-misc/xmbdfed/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/xmbdfed
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xmbdfed/ChangeLog,v 1.15 2005/10/01 08:52:09 nelchael Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xmbdfed/ChangeLog,v 1.16 2006/01/21 17:55:49 nelchael Exp $
+
+  21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/xmbdfed-4.7_p1-gcc4.patch, -xmbdfed-4.5.ebuild,
+  xmbdfed-4.7_p1.ebuild:
+  Fixed DEPEND for modular X. Patch for gcc4.
 
   01 Oct 2005; Krzysiek Pawlik <nelchael@gentoo.org> xmbdfed-4.7_p1.ebuild:
   Use motif-config, drop /usr/X11R6 paths, that fixes bug 104854.
diff --git a/x11-misc/xmbdfed/Manifest b/x11-misc/xmbdfed/Manifest
index 211439cfa67a..52d554ee5232 100644
--- a/x11-misc/xmbdfed/Manifest
+++ b/x11-misc/xmbdfed/Manifest
@@ -1,6 +1,5 @@
-MD5 3240560dc342ba15df849c2c332095d4 xmbdfed-4.5.ebuild 1458
-MD5 ab12a1f3674fe99f90bd21bc8ae11920 xmbdfed-4.7_p1.ebuild 1322
 MD5 2cb6be316e1b0bc4ae74a596ddacfd6b ChangeLog 1973
+MD5 eecc06fe77a7c9a2d32fcfca6e6f7b4c files/digest-xmbdfed-4.7_p1 124
+MD5 1a4e7c5cb2bcbb41fda2fb230fd3d352 files/xmbdfed-4.7_p1-gcc4.patch 784
 MD5 b1f688ff3e6c85c5e4d8e5ef35807192 metadata.xml 186
-MD5 b44b0fb9e8281e2652b43bf0c6db7e72 files/digest-xmbdfed-4.7_p1 124
-MD5 fda2a635d6d99c2ff0c699725fd7d301 files/digest-xmbdfed-4.5 133
+MD5 110ab6ebcf437623275404bee21574c3 xmbdfed-4.7_p1.ebuild 1347
diff --git a/x11-misc/xmbdfed/files/digest-xmbdfed-4.5 b/x11-misc/xmbdfed/files/digest-xmbdfed-4.5
deleted file mode 100644
index 301c9130051e..000000000000
--- a/x11-misc/xmbdfed/files/digest-xmbdfed-4.5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 8420d39931a0674784f3fd0c0f1f9d6a xmbdfed-4.5.tar.gz 282055
-MD5 28ca1bddba99f45fbfc6e5e7e2b0d780 xmbdfed-4.5-gentoo.diff.bz2 1830
diff --git a/x11-misc/xmbdfed/files/digest-xmbdfed-4.7_p1 b/x11-misc/xmbdfed/files/digest-xmbdfed-4.7_p1
index 900397a039a8..b181e94ee3f0 100644
--- a/x11-misc/xmbdfed/files/digest-xmbdfed-4.7_p1
+++ b/x11-misc/xmbdfed/files/digest-xmbdfed-4.7_p1
@@ -1,2 +1,2 @@
-MD5 27872bb7473e5d64d9a24281ae6ad3d9 xmbdfed-4.7.tar.bz2 208877
 MD5 f18ea8561330db825bd7edcb61b0758a xmbdfed-4.7-patch1 549
+MD5 27872bb7473e5d64d9a24281ae6ad3d9 xmbdfed-4.7.tar.bz2 208877
diff --git a/x11-misc/xmbdfed/files/xmbdfed-4.7_p1-gcc4.patch b/x11-misc/xmbdfed/files/xmbdfed-4.7_p1-gcc4.patch
new file mode 100644
index 000000000000..5cdeb19a55e6
--- /dev/null
+++ b/x11-misc/xmbdfed/files/xmbdfed-4.7_p1-gcc4.patch
@@ -0,0 +1,25 @@
+diff --exclude='*.o' -Nru xmbdfed-4.7.vanilla/setup.c xmbdfed-4.7/setup.c
+--- xmbdfed-4.7.vanilla/setup.c	2006-01-21 18:46:10.000000000 +0100
++++ xmbdfed-4.7/setup.c	2006-01-21 18:50:05.000000000 +0100
+@@ -27,6 +27,8 @@
+ #endif
+ #endif
+ 
++#define ___gentoo_gcc4
++
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
+diff --exclude='*.o' -Nru xmbdfed-4.7.vanilla/xmbdfed.h xmbdfed-4.7/xmbdfed.h
+--- xmbdfed-4.7.vanilla/xmbdfed.h	2006-01-21 18:46:10.000000000 +0100
++++ xmbdfed-4.7/xmbdfed.h	2006-01-21 18:52:10.000000000 +0100
+@@ -280,7 +280,9 @@
+ extern XtAppContext app;
+ extern Boolean yes_no_answer;
+ extern Boolean yes_no_done;
++#ifndef ___gentoo_gcc4
+ extern unsigned long active_editor;
++#endif
+ extern String app_name;
+ extern String app_class;
+ extern char title[];
diff --git a/x11-misc/xmbdfed/xmbdfed-4.5.ebuild b/x11-misc/xmbdfed/xmbdfed-4.5.ebuild
deleted file mode 100644
index 036f0ad6d30a..000000000000
--- a/x11-misc/xmbdfed/xmbdfed-4.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xmbdfed/xmbdfed-4.5.ebuild,v 1.9 2004/06/24 22:42:06 agriffis Exp $
-
-inherit eutils
-
-DESCRIPTION="BDF font editor for X"
-SRC_URI="http://clr.nmsu.edu/~mleisher/${P}.tar.gz
-	mirror://gentoo/${P}-gentoo.diff.bz2"
-HOMEPAGE="http://clr.nmsu.edu/~mleisher/xmbdfed.html"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="x86"
-IUSE="truetype"
-
-DEPEND="virtual/x11
-	>=x11-libs/openmotif-2.1.30
-	truetype? ( =media-libs/freetype-1.3* )"
-
-# The xmbdfed-4.5-gentoo.diff includes patch 1 for version 4.5.  The
-# author hasn't distributed a new numbered release yet, so I've
-# blended the patch in with a small include file fix needed for the
-# Gentoo install of freetype.
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${WORKDIR}/${P}-gentoo.diff
-}
-
-src_compile() {
-	# There's no ./configure in xmbdfed, so perform the make by manually
-	# specifying the correct options for Gentoo.
-
-	local flags=""
-	local incs="-I/usr/X11R6/include"
-	local libs="-L/usr/X11R6/lib -lXm -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE"
-
-	if use truetype ; then
-		flags="FTYPE_DEFS=\"-DHAVE_FREETYPE\""
-		incs="${incs} -I/usr/include/freetype"
-		libs="${libs} -lttf"
-	fi
-
-	make CFLAGS="${CFLAGS}" ${flags} \
-		INCS="${incs}" \
-		LIBS="${libs}"
-}
-
-src_install() {
-	dobin xmbdfed
-	newman xmbdfed.man xmbdfed.1
-	dodoc CHANGES COPYRIGHTS INSTALL README xmbdfedrc
-}
diff --git a/x11-misc/xmbdfed/xmbdfed-4.7_p1.ebuild b/x11-misc/xmbdfed/xmbdfed-4.7_p1.ebuild
index 882d604bfd8f..f3356be8739b 100644
--- a/x11-misc/xmbdfed/xmbdfed-4.7_p1.ebuild
+++ b/x11-misc/xmbdfed/xmbdfed-4.7_p1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 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.ebuild,v 1.6 2005/10/01 08:52:09 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xmbdfed/xmbdfed-4.7_p1.ebuild,v 1.7 2006/01/21 17:55:49 nelchael Exp $
 
 inherit eutils
 MY_P=${P/_p*}
@@ -15,8 +15,7 @@ LICENSE="as-is"
 KEYWORDS="x86 ppc"
 IUSE="truetype"
 
-DEPEND="virtual/x11
-	>=x11-libs/openmotif-2.1.30
+DEPEND=">=x11-libs/openmotif-2.1.30
 	truetype? ( media-libs/freetype )"
 
 S=${WORKDIR}/${MY_P}
@@ -25,6 +24,7 @@ src_unpack() {
 	unpack ${MY_P}.tar.bz2
 	cd ${S}
 	epatch ${DISTDIR}/${P/_p/-patch}
+	epatch "${FILESDIR}/${P}-gcc4.patch"
 }
 
 src_compile() {