Removed executalbe permission and fixed location of misc files which are installed into XFIGLIBDIR, bug #221243 thank Volkmar Glauche for report. Cleaned old ebuild.

Package-Manager: portage-2.1.4.4

6 files changed, 89 insertions, 117 deletions

diff --git a/media-gfx/xfig/ChangeLog b/media-gfx/xfig/ChangeLog
index a6cb0022e7e5..dffb5d9eeb6d 100644
--- a/media-gfx/xfig/ChangeLog
+++ b/media-gfx/xfig/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-gfx/xfig
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/ChangeLog,v 1.50 2007/07/22 07:28:32 pva Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/ChangeLog,v 1.51 2008/05/11 12:09:54 pva Exp $
+
+*xfig-3.2.5-r2 (11 May 2008)
+
+  11 May 2008; Peter Volkov <pva@gentoo.org> -files/xfig-3.2.4-gcc4.patch,
+  -files/xfig-3.2.4-xaw3d.diff, -xfig-3.2.4-r3.ebuild,
+  +xfig-3.2.5-r2.ebuild:
+  Removed executalbe permission and fixed location of misc files which are
+  installed into XFIGLIBDIR, bug #221243 thank Volkmar Glauche for report.
+  Cleaned old ebuild.
 
   22 Jul 2007; <pva@gentoo.org> xfig-3.2.4-r3.ebuild, xfig-3.2.5-r1.ebuild:
   Removed virtual/x11 dependency.
diff --git a/media-gfx/xfig/Manifest b/media-gfx/xfig/Manifest
index 76fe212f8b50..8719193967bd 100644
--- a/media-gfx/xfig/Manifest
+++ b/media-gfx/xfig/Manifest
@@ -1,10 +1,5 @@
-AUX xfig-3.2.4-gcc4.patch 930 RMD160 3ebcb885236fa30fa03f48993afe87bf506bc597 SHA1 3a15b00a42952ff9a8bcaf78f23589a9ac611ac1 SHA256 7d2cb16c5e5d6cf446034b11c37de15ab0ec748a7ab8546cd28241679561265e
-AUX xfig-3.2.4-xaw3d.diff 465 RMD160 6deba42780b5566e3b7ec54cab52dd5e9f2b1da9 SHA1 e0293bdd1e6c5c8ace2c177520034624d9eb9bc3 SHA256 3480ef92e96101ce7e3b61a3054ec8db674755564ae1707385fed669b4975d31
-DIST shape-patch.3.2.4-shape-1.1.tar.gz 49201 RMD160 0d8738fd8b3d04e334580355a5a8c312f6b957d2 SHA1 420e1592d5ab3aa13bbe0830e9da4cfe23f277ae SHA256 150dfc36ae2448f998b55eb8145d50d1d4efeaf952d8c6341ed98afef9cd82f0
-DIST xfig-3.2.4-gentoo.diff.bz2 1001 RMD160 2f54a944be8039e4d51b1109acf70e41d67abf3d SHA1 85b59c6f7efc65ef87f012f161768dfdb75c4f59 SHA256 5197554a9778e8ef2ede5d1dee5629ca56c8a36e5d8bd3f195f2a4506243f659
-DIST xfig.3.2.4.full.tar.gz 5163150 RMD160 3cae7c8d3f2a89ef54fd4a4693e84fa7a9bacf44 SHA1 723bf10355a92c079be08cd7be18b75baaccfbdc SHA256 11612391c49ae9b17692c1775e3479e5c67dd788e31436b7197ea46d610d2d84
 DIST xfig.3.2.5.full.tar.gz 5794801 RMD160 0d5ada9e4b7f1dbd8dab8a09fd5946ec0211904c SHA1 ce09d1a74dbddf0bc6b20fe9c558db584fbfed17 SHA256 62e43d5ef483acdb74d0b6dcdf5f8a12e545201048db33ffb5d573d74ae72c9a
-EBUILD xfig-3.2.4-r3.ebuild 1556 RMD160 8d3a01fda2b8e9a565765759ca8e9d36587e2298 SHA1 48acfa8fb41dd54610e9c1d2d80e99bb2dbf3ece SHA256 27e41299a1d67598fa8e1ed179dd617b53a47df053955b5cac4cf7aa1bdd3928
 EBUILD xfig-3.2.5-r1.ebuild 1824 RMD160 99cb3f85e7a11d91152519cf77bb9128c874303d SHA1 e123b855a20aefd3adc97aea55c2a7401a955142 SHA256 1213c789c16fdd8389e75d4367a0a80d260d1c287ac4e860481921fade6bfa5c
-MISC ChangeLog 6694 RMD160 f197fb314553d7c572b728d8bff2436470b39111 SHA1 38ca203b3f583e8fd962d2d82e37880d6edebdfe SHA256 d6cf83cafe51830bd3398a3f027bed5723685d9f5bbe62c0cbe34ac3bff6dda9
+EBUILD xfig-3.2.5-r2.ebuild 1870 RMD160 419884ee07dadf5afa21044f56652a941f60c80c SHA1 3e3368d9dcf510a2cf79457748bbf98f1d3507d7 SHA256 4995f09178341f7776663ac9e3141e93830f8aeb81bba66a8dc56c7529d43e27
+MISC ChangeLog 7052 RMD160 1aa14e064fab69be638fd39dae12240390bc110b SHA1 40be70eb6f1f3ad629cec2c61a9c5d96808ed143 SHA256 70512b87267374f5807a698a111764758e7a7cd1af04df5e0272019722419413
 MISC metadata.xml 250 RMD160 f27bc8272125f15d03c2bfc87e961842bdb303ae SHA1 c4991bbfca89085d81f56ed53f8b0c827a35a4f1 SHA256 68999dde540491efec63a8f47366dbc2d5f2c9f2c1211709d92366a56b6cd27d
diff --git a/media-gfx/xfig/files/xfig-3.2.4-gcc4.patch b/media-gfx/xfig/files/xfig-3.2.4-gcc4.patch
deleted file mode 100644
index b5ab193bda94..000000000000
--- a/media-gfx/xfig/files/xfig-3.2.4-gcc4.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ru xfig.3.2.4/u_fonts.h xfig.3.2.4.new/u_fonts.h
---- xfig.3.2.4/u_fonts.h	2002-03-27 01:18:23.000000000 +0100
-+++ xfig.3.2.4.new/u_fonts.h	2005-12-03 15:21:02.054250392 +0100
-@@ -30,12 +30,6 @@
- /* font number for the "nil" font (when user wants tiny text) */
- #define NILL_FONT NUM_FONTS
- 
--extern int		psfontnum();
--extern int		latexfontnum();
--extern struct _xfstruct	x_fontinfo[], x_backup_fontinfo[];
--extern struct _fstruct	ps_fontinfo[];
--extern struct _fstruct	latex_fontinfo[];
--
- /* element of linked list for each font
-    The head of list is for the different font NAMES,
-    and the elements of this list are for each different
-@@ -61,5 +55,11 @@
- 				 * sizes */
- };
- 
-+extern int		psfontnum();
-+extern int		latexfontnum();
-+extern struct _xfstruct	x_fontinfo[], x_backup_fontinfo[];
-+extern struct _fstruct	ps_fontinfo[];
-+extern struct _fstruct	latex_fontinfo[];
-+
- int		x_fontnum();
- #endif /* U_FONTS_H */
diff --git a/media-gfx/xfig/files/xfig-3.2.4-xaw3d.diff b/media-gfx/xfig/files/xfig-3.2.4-xaw3d.diff
deleted file mode 100644
index 2365562e7da6..000000000000
--- a/media-gfx/xfig/files/xfig-3.2.4-xaw3d.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- xfig.3.2.4.orig/Imakefile   2003-02-23 14:04:25.000000000 +0100
-+++ xfig.3.2.4/Imakefile        2003-02-23 14:12:31.000000000 +0100
-@@ -105,10 +105,10 @@
- XCOMM Then be sure to change the XAW3DINC to point to the directory where your
- XCOMM 3D Athena widget headers are located
- 
--XCOMM #define XAW3D
-+#define XAW3D
- 
- #ifdef XAW3D
--XAW3DINC = -I/usr/include/X11/Xaw3d
-+XAW3DINC = -I/usr/X11R6/include/X11/Xaw3d
- DUSEXAW3D = -DXAW3D
- XAWLIB = -lXaw3d
- #endif
-
-
diff --git a/media-gfx/xfig/xfig-3.2.4-r3.ebuild b/media-gfx/xfig/xfig-3.2.4-r3.ebuild
deleted file mode 100644
index 08b82b8077f8..000000000000
--- a/media-gfx/xfig/xfig-3.2.4-r3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/xfig-3.2.4-r3.ebuild,v 1.10 2007/07/22 07:28:32 pva Exp $
-
-inherit eutils multilib
-
-MY_P=${PN}.${PV}
-S=${WORKDIR}/${MY_P}
-SHAPE_P=shape-patch.${PV}-shape-1.1
-
-DESCRIPTION="A menu-driven tool to draw and manipulate objects interactively in an X window."
-HOMEPAGE="http://www.xfig.org"
-SRC_URI="http://www.xfig.org/xfigdist/${MY_P}.full.tar.gz
-	http://www.ctan.org/tex-archive/graphics/transfig-shapepatch/${SHAPE_P}.tar.gz
-	mirror://gentoo/${P}-gentoo.diff.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXaw
-		x11-libs/libXp
-		x11-libs/Xaw3d
-		media-libs/jpeg
-		media-libs/libpng
-		media-gfx/transfig
-		media-libs/netpbm"
-DEPEND="${RDEPEND}
-		x11-misc/imake
-		app-text/rman
-		x11-proto/xproto
-		x11-proto/inputproto
-		x11-libs/libXi"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${WORKDIR}/${P}-gentoo.diff
-	epatch ${FILESDIR}/${P}-xaw3d.diff
-	epatch ../${SHAPE_P}/${PN}.${SHAPE_P#*.}.patch	# bug #20877
-	epatch ${FILESDIR}/${P}-gcc4.patch
-}
-
-src_compile() {
-	xmkmf || die
-	emake BINDIR=/usr/bin XFIGLIBDIR=/usr/$(get_libdir)/xfig || die
-}
-
-src_install() {
-
-	emake -j1 \
-		DESTDIR=${D} \
-		BINDIR=/usr/bin \
-		XFIGLIBDIR=/usr/$(get_libdir)/xfig \
-		MANDIR=/usr/share/man/man1 \
-		MANSUFFIX=1 \
-		install install.all || die
-
-	insinto /usr/share/doc/${P}
-	doins README FIGAPPS CHANGES LATEX.AND.XFIG
-	doins ../${SHAPE_P}/shapepatch.README
-}
diff --git a/media-gfx/xfig/xfig-3.2.5-r2.ebuild b/media-gfx/xfig/xfig-3.2.5-r2.ebuild
new file mode 100644
index 000000000000..7cb028800aaa
--- /dev/null
+++ b/media-gfx/xfig/xfig-3.2.5-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/xfig-3.2.5-r2.ebuild,v 1.1 2008/05/11 12:09:54 pva Exp $
+
+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="http://www.xfig.org/software/xfig/3.2.5/${MY_P}.full.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+		x11-libs/libXp
+		x11-libs/Xaw3d
+		media-libs/jpeg
+		media-libs/libpng
+		>=media-gfx/transfig-3.2.5-r1
+		media-libs/netpbm"
+DEPEND="${RDEPEND}
+		x11-misc/imake
+		app-text/rman
+		x11-proto/xproto
+		x11-proto/inputproto
+		x11-libs/libXi"
+
+S="${WORKDIR}"/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# We do not have nescape. Let's use firefox instead...
+	sed -i "s+netscape+firefox+g" Fig.ad
+	find "${S}" -type f -exec chmod -x \{\} \;
+}
+
+sed_Imakefile() {
+	# see Imakefile for details
+	vars2subs="BINDIR=/usr/bin
+		PNGINC=-I/usr/include
+		JPEGLIBDIR=/usr/$(get_libdir)
+		JPEGINC=-I/usr/include
+		XPMLIBDIR=/usr/$(get_libdir)
+		XPMINC=-I/usr/include/X11
+		USEINLINE=-DUSE_INLINE
+		XFIGLIBDIR=/usr/share/xfig
+		XFIGDOCDIR=/usr/share/doc/${P}
+		MANDIR=/usr/share/man/man\$\(MANSUFFIX\)
+		CC=$(tc-getCC)"
+
+	for variable in ${vars2subs} ; do
+		varname=${variable%%=*}
+		varval=${variable##*=}
+		sed -i "s:^\(XCOMM\)*[[:space:]]*${varname}[[:space:]]*=.*$:${varname} = ${varval}:" "$@"
+	done
+}
+
+src_compile() {
+	sed_Imakefile Imakefile
+
+	xmkmf || die
+	emake CC="$(tc-getCC)" LOCAL_LDFLAGS="${LDFLAGS}" CDEBUGFLAGS="${CFLAGS}" \
+	USRLIBDIR=/usr/$(get_libdir) || die
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install.all || die
+
+	insinto /usr/share/doc/${P}
+	doins README FIGAPPS CHANGES LATEX.AND.XFIG
+}