Fixing breakage w/ fdesign/Makefile.am and lib/Makefile.am (eleminating the remaining commented out lines, that make automake fail badly) thanks to Fabian Groffen and Bo Orsted Andresen <bo.andresen at zlin.dk> in #161857.

(Portage version: 2.1.2-r9)

3 files changed, 41 insertions, 8 deletions

diff --git a/x11-libs/xforms/ChangeLog b/x11-libs/xforms/ChangeLog
index 68d1c611a887..b3012eb227a3 100644
--- a/x11-libs/xforms/ChangeLog
+++ b/x11-libs/xforms/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/xforms
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xforms/ChangeLog,v 1.36 2006/11/22 17:44:14 masterdriverz Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xforms/ChangeLog,v 1.37 2007/02/18 16:24:14 phreak Exp $
+
+  18 Feb 2007; Christian Heim <phreak@gentoo.org>
+  +files/xforms-1.0.90-Makefile.am.patch, xforms-1.0.90-r1.ebuild:
+  Fixing breakage w/ fdesign/Makefile.am and lib/Makefile.am (eleminating the
+  remaining commented out lines, that make automake fail badly) thanks to
+  Fabian Groffen and Bo Orsted Andresen <bo.andresen at zlin.dk> in #161857.
 
   22 Nov 2006; Charlie Shepherd <masterdriverz@gentoo.org> ChangeLog:
   Add patch to build with --as-needed, thanks to Robert Marmorstein, bug 140179
diff --git a/x11-libs/xforms/files/xforms-1.0.90-Makefile.am.patch b/x11-libs/xforms/files/xforms-1.0.90-Makefile.am.patch
new file mode 100644
index 000000000000..06de35ac6642
--- /dev/null
+++ b/x11-libs/xforms/files/xforms-1.0.90-Makefile.am.patch
@@ -0,0 +1,23 @@
+Index: xforms-1.0.90/fdesign/Makefile.am
+===================================================================
+--- xforms-1.0.90.orig/fdesign/Makefile.am
++++ xforms-1.0.90/fdesign/Makefile.am
+@@ -54,7 +54,3 @@ fdesign_SOURCES = \
+ 	sp_twheel.c \
+ 	sp_xyplot.c \
+ 	xpm.h
+-
+-#	viewforms.c \
+-#	viewforms.h \
+-#	viewforms_main.c \
+Index: xforms-1.0.90/lib/Makefile.am
+===================================================================
+--- xforms-1.0.90.orig/lib/Makefile.am
++++ xforms-1.0.90/lib/Makefile.am
+@@ -118,6 +118,3 @@ libforms_la_SOURCES = \
+ 	xsupport.c \
+ 	xtext.c \
+ 	xyplot.c
+-
+-#	dirent_vms.h \
+-#	vms_readdir.c \
\ No newline at end of file
diff --git a/x11-libs/xforms/xforms-1.0.90-r1.ebuild b/x11-libs/xforms/xforms-1.0.90-r1.ebuild
index 14f2c015e455..cca7b7d77f44 100644
--- a/x11-libs/xforms/xforms-1.0.90-r1.ebuild
+++ b/x11-libs/xforms/xforms-1.0.90-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xforms/xforms-1.0.90-r1.ebuild,v 1.8 2006/11/22 17:44:14 masterdriverz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xforms/xforms-1.0.90-r1.ebuild,v 1.9 2007/02/18 16:24:14 phreak Exp $
 
 inherit autotools
 
@@ -28,14 +28,18 @@ DEPEND=" || (
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-as-needed.patch
-	eautoreconf || die 'eautoreconf failed'
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+	epatch "${FILESDIR}"/${P}-Makefile.am.patch
+
+	eautoreconf
 }
 
 src_compile () {
 	local myopts
-	if ! use opengl; then myopts="--disable-gl"; fi
+	use opengl || myopts="--disable-gl"
+
 	econf ${myopts} || die "econf failed"
 	emake || die "emake failed"
 }