Version bump, bug 487712 wrt Martin Walch. Took back ebuild.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key F1989B07)

7 files changed, 253 insertions, 2 deletions

diff --git a/media-gfx/xfig/ChangeLog b/media-gfx/xfig/ChangeLog
index 412007044784..0dd8f7872091 100644
--- a/media-gfx/xfig/ChangeLog
+++ b/media-gfx/xfig/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/xfig
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/ChangeLog,v 1.89 2014/03/13 20:02:20 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/ChangeLog,v 1.90 2014/06/09 14:12:16 pva Exp $
+
+*xfig-3.2.5c (09 Jun 2014)
+
+  09 Jun 2014; Peter Volkov <pva@gentoo.org> +xfig-3.2.5c.ebuild,
+  +files/xfig-3.2.5c-XAW3D1_5E_notlocal.patch,
+  +files/xfig-3.2.5c-crash-on-exit.patch, +files/xfig-3.2.5c-darwin.patch,
+  +files/xfig-3.2.5c-spelling.patch, metadata.xml:
+  Version bump, bug 487712 wrt Martin Walch. Took back ebuild.
 
   13 Mar 2014; Christoph Junghans <ottxor@gentoo.org> xfig-3.2.5b-r3.ebuild:
   added ~x64-macos (tested by me)
diff --git a/media-gfx/xfig/files/xfig-3.2.5c-XAW3D1_5E_notlocal.patch b/media-gfx/xfig/files/xfig-3.2.5c-XAW3D1_5E_notlocal.patch
new file mode 100644
index 000000000000..8998b406467a
--- /dev/null
+++ b/media-gfx/xfig/files/xfig-3.2.5c-XAW3D1_5E_notlocal.patch
@@ -0,0 +1,70 @@
+From be8cf541743060921f629d5bfe990d985ecf1813 Mon Sep 17 00:00:00 2001
+From: Vladislav Zavjalov <slazav@altlinux.org>
+Origin: http://git.altlinux.org/people/slazav/packages/?p=xfig.git;a=patch;h=be8cf541743060921f629d5bfe990d985ecf1813
+Date: Wed, 29 May 2013 02:18:13 +0400
+Subject: [PATCH] Don't use local SimpleMenu.c with XAW3D1_5E
+Bug-Debian: http://bugs.debian.org/296703
+
+---
+ xfig/SmeCascade.h  |    5 +++++
+ xfig/SmeCascadeP.h |    5 +++++
+ xfig/w_menuentry.h |    4 ++++
+ xfig/w_util.c      |    2 ++
+ 4 files changed, 16 insertions(+), 0 deletions(-)
+
+--- a/SmeCascade.h
++++ b/SmeCascade.h
+@@ -27,7 +27,12 @@
+ #else

+ #include <X11/Xaw/Sme.h>

+ #endif

++

++#ifdef XAW3D1_5E

++#include <X11/Xaw3d/SmeBSB.h>

++#else

+ #include "SmeBSB.h"

++#endif

+ 

+ /****************************************************************

+  *

+--- a/SmeCascadeP.h
++++ b/SmeCascadeP.h
+@@ -32,8 +32,12 @@
+ #include <X11/Xaw/SmeP.h>

+ #endif

+ 

++#ifdef XAW3D1_5E

++#include <X11/Xaw3d/SmeBSBP.h>

++#else

+ #include "SmeBSBP.h"

+ #include "SmeCascade.h"

++#endif

+ 

+ /************************************************************

+  *

+--- a/w_menuentry.h
++++ b/w_menuentry.h
+@@ -30,7 +30,11 @@
+ #include <X11/Xaw/Sme.h>

+ #endif

+ 

++#ifdef XAW3D1_5E

++#include <X11/Xaw3d/SmeBSB.h>

++#else

+ #include "SmeBSB.h"

++#endif

+ 

+ /****************************************************************

+  *

+--- a/w_util.c
++++ b/w_util.c
+@@ -351,7 +351,9 @@
+  * (use -1 if no line desired)
+  */
+ 
++#ifndef XAW3D1_5E
+ #include "SmeCascade.h"
++#endif /* XAW3D1_5E */
+ 
+ #include "d_text.h"
+ #include "e_placelib.h"
diff --git a/media-gfx/xfig/files/xfig-3.2.5c-crash-on-exit.patch b/media-gfx/xfig/files/xfig-3.2.5c-crash-on-exit.patch
new file mode 100644
index 000000000000..80d20281ae93
--- /dev/null
+++ b/media-gfx/xfig/files/xfig-3.2.5c-crash-on-exit.patch
@@ -0,0 +1,19 @@
+commit 56f0caaae3cc3fdbf6eaa21fc419c951c53a156d
+Author: Peter Volkov <peter.volkov@gmail.com>
+Date:   Mon Jun 9 12:36:12 2014 +0400
+
+    Fix crash on exit (regression of xfig.3.2.5c)
+
+diff --git a/u_free.c b/u_free.c
+index 18d517a..4a5080f 100755
+--- a/u_free.c
++++ b/u_free.c
+@@ -270,8 +270,6 @@ void free_Fonts(void)
+       XUnloadFont(tool_d, nf->fid);
+       if (nf->fstruct != NULL)
+ 	  XFreeFont(tool_d, nf->fstruct); 
+-      if (nf->fset != NULL)
+-	  XFreeFontSet(tool_d, nf->fset); 
+       nf = nf->next;
+     } 
+   }
diff --git a/media-gfx/xfig/files/xfig-3.2.5c-darwin.patch b/media-gfx/xfig/files/xfig-3.2.5c-darwin.patch
new file mode 100644
index 000000000000..5d64c2a4deb5
--- /dev/null
+++ b/media-gfx/xfig/files/xfig-3.2.5c-darwin.patch
@@ -0,0 +1,26 @@
+diff --git a/fig.h b/fig.h
+index ca00aef..a3605b0 100644
+--- a/fig.h
++++ b/fig.h
+@@ -375,7 +375,7 @@ extern	double		drand48();
+ extern	long		random();

+ extern	void		srandom(unsigned int);

+ 

+-#elif !defined(__osf__) && !defined(__CYGWIN__) && !defined(linux) && !defined(__FreeBSD__) && !defined(__GLIBC__)

++#elif !defined(__osf__) && !defined(__CYGWIN__) && !defined(linux) && !defined(__FreeBSD__) && !defined(__DARWIN__) && !defined(__GLIBC__)

+ extern	void		srandom(int);

+ 

+ #endif

+diff --git a/w_keyboard.c b/w_keyboard.c
+index 427d60c..03a3f76 100644
+--- a/w_keyboard.c
++++ b/w_keyboard.c
+@@ -41,7 +41,7 @@
+ #define REG_NOERROR 0
+ #endif
+ 
+-#if defined(__FreeBSD__) && !defined(REG_NOERROR)
++#if (defined(__FreeBSD__) || defined(__DARWIN__)) && !defined(REG_NOERROR)
+ #define REG_NOERROR 0
+ #endif
+ 
diff --git a/media-gfx/xfig/files/xfig-3.2.5c-spelling.patch b/media-gfx/xfig/files/xfig-3.2.5c-spelling.patch
new file mode 100644
index 000000000000..4af77e0e9b06
--- /dev/null
+++ b/media-gfx/xfig/files/xfig-3.2.5c-spelling.patch
@@ -0,0 +1,17 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 31_spelling.dpatch by Roland Rosenfeld <roland@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix spelling errors in binary.
+
+@DPATCH@
+diff -urNad xfig~/f_load.c xfig/f_load.c
+--- xfig~/f_load.c
++++ xfig/f_load.c
+@@ -373,5 +373,5 @@
+ 	/* Format error; relevant error message is already delivered */
+ 	;
+     else
+-	file_msg("File \"%s\" is not accessable; %s.", file, strerror(err));
++	file_msg("File \"%s\" is not accessible; %s.", file, strerror(err));
+ }
diff --git a/media-gfx/xfig/metadata.xml b/media-gfx/xfig/metadata.xml
index 91f4e72fb544..3eece155aa85 100644
--- a/media-gfx/xfig/metadata.xml
+++ b/media-gfx/xfig/metadata.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
+	<email>pva@gentoo.org</email>
+	<name>Peter Volkov</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/xfig/xfig-3.2.5c.ebuild b/media-gfx/xfig/xfig-3.2.5c.ebuild
new file mode 100644
index 000000000000..eba105aa17f6
--- /dev/null
+++ b/media-gfx/xfig/xfig-3.2.5c.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/xfig-3.2.5c.ebuild,v 1.1 2014/06/09 14:12:16 pva Exp $
+
+EAPI=5
+
+inherit eutils multilib
+
+MY_P=${PN}.${PV}
+
+DESCRIPTION="A menu-driven tool to draw and manipulate objects interactively in an X window."
+HOMEPAGE="http://www.xfig.org"
+SRC_URI="mirror://sourceforge/mcj/${MY_P}.full.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="nls"
+
+RDEPEND="x11-libs/libXaw
+		x11-libs/libXp
+		x11-libs/libXaw3d
+		nls? ( x11-libs/libXaw3d[unicode] )
+		x11-libs/libXi
+		x11-libs/libXt
+		virtual/jpeg
+		media-libs/libpng
+		media-fonts/font-misc-misc
+		media-fonts/urw-fonts
+		>=media-gfx/transfig-3.2.5-r1
+		media-libs/netpbm"
+DEPEND="${RDEPEND}
+		x11-misc/imake
+		x11-proto/xproto
+		x11-proto/inputproto"
+
+S=${WORKDIR}/${MY_P}
+
+sed_Imakefile() {
+	# see Imakefile for details
+	vars2subs=( BINDIR="${EPREFIX}"/usr/bin
+		PNGINC=-I"${EPREFIX}"/usr/include
+		JPEGLIBDIR="${EPREFIX}"/usr/$(get_libdir)
+		JPEGINC=-I"${EPREFIX}"/usr/include
+		XPMLIBDIR="${EPREFIX}"/usr/$(get_libdir)
+		XPMINC=-I"${EPREFIX}"/usr/include/X11
+		USEINLINE=-DUSE_INLINE
+		XFIGLIBDIR="${EPREFIX}"/usr/share/xfig
+		XFIGDOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+		MANDIR="${EPREFIX}/usr/share/man/man\$\(MANSUFFIX\)"
+		"CC=$(tc-getCC)" )
+
+	for variable in "${vars2subs[@]}" ; do
+		varname=${variable%%=*}
+		varval=${variable##*=}
+		sed -i \
+			-e "s:^\(XCOMM\)*[[:space:]]*${varname}[[:space:]]*=.*$:${varname} = ${varval}:" \
+			"$@" || die
+	done
+	if use nls; then
+		# XAW_INTERNATIONALIZATION fixes #405475 (comment 17) and #426780 by Markus Peloquin
+		sed -i \
+			-e "s:^\(XCOMM\)*[[:space:]]*\(#define I18N\).*$:\2:" \
+			-e "s:^\(XCOMM\)*[[:space:]]*\(XAW_INTERN = -DXAW_INTERNATIONALIZATION\).*$:\2:" \
+			"$@" || die
+	fi
+	sed -i -e "s:^\(XCOMM\)*[[:space:]]*\(#define XAW3D1_5E\).*$:\2:" "$@" || die
+}
+
+src_prepare() {
+	# Permissions are really crazy here
+	chmod -R go+rX . || die
+	find . -type f -exec chmod a-x '{}' \; || die
+	epatch "${FILESDIR}/${PN}-3.2.5c-spelling.patch"
+	epatch "${FILESDIR}/${PN}-3.2.5b-papersize_b1.patch"
+	epatch "${FILESDIR}/${PN}-3.2.5b-pdfimport_mediabox.patch"
+	epatch "${FILESDIR}/${PN}-3.2.5b-network_images.patch"
+	epatch "${FILESDIR}/${PN}-3.2.5b-app-defaults.patch"
+	epatch "${FILESDIR}/${PN}-3.2.5b-urwfonts.patch"
+	epatch "${FILESDIR}/${PN}-3.2.5b-mkstemp.patch" #264575
+	epatch "${FILESDIR}/${PN}-3.2.5c-darwin.patch"
+	epatch "${FILESDIR}/${PN}-3.2.5b-solaris.patch"
+	epatch "${FILESDIR}/${PN}-3.2.5c-XAW3D1_5E_notlocal.patch"
+	epatch "${FILESDIR}/${PN}-3.2.5c-crash-on-exit.patch"
+
+	sed_Imakefile Imakefile
+	sed -e "s:/usr/lib/X11/xfig:${EPREFIX}/usr/share/doc/${PF}:" \
+		-i Doc/xfig.man || die
+}
+
+src_compile() {
+	local EXTCFLAGS=${CFLAGS}
+	xmkmf || die
+	[[ ${CHOST} == *-solaris* ]] && EXTCFLAGS="${EXTCFLAGS} -D_POSIX_SOURCE"
+	emake CC="$(tc-getCC)" LOCAL_LDFLAGS="${LDFLAGS}" CDEBUGFLAGS="${EXTCFLAGS}" \
+		USRLIBDIR="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install install.libs install.man
+
+	dodoc README FIGAPPS CHANGES LATEX.AND.XFIG
+
+	doicon xfig.png
+	make_desktop_entry xfig Xfig xfig
+}
+
+pkg_postinst() {
+	einfo "Don't forget to update xserver's font path for media-fonts/urw-fonts."
+}