Fixing breakage w/ fdesign/Makefile.am and lib/Makefile.am (eleminating the remaining...

Package-Manager: portage-2.1.2-r9

diff --git a/x11-libs/xforms/ChangeLog b/x11-libs/xforms/ChangeLog
index 68d1c611a887d8a2ee5e13d6ca6a5bc5a25652fa..b3012eb227a36c752e88d5ad582acf2f5f4161a8 100644 (file)
--- 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/Manifest b/x11-libs/xforms/Manifest
index 8e4cfb623d883ce108839c81a0feb8071e6a5e91..b436f5ffa915cf16eedee0e9e3581166ff8fab6a 100644 (file)
--- a/x11-libs/xforms/Manifest
+++ b/x11-libs/xforms/Manifest
@@ -1,16 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX xforms-1.0.90-Makefile.am.patch 624 RMD160 510de6efecaf6869d4ccadb73a62ac918569c17e SHA1 2d5b5a198c70b4e2db3cc202b74d6be3bf4751c9 SHA256 cb662693000b50317c93b323e013eb14120cbbbaddca826b6b427af4167c3f10
+MD5 1b5db3a39557b7655b42610acc9ec18a files/xforms-1.0.90-Makefile.am.patch 624
+RMD160 510de6efecaf6869d4ccadb73a62ac918569c17e files/xforms-1.0.90-Makefile.am.patch 624
+SHA256 cb662693000b50317c93b323e013eb14120cbbbaddca826b6b427af4167c3f10 files/xforms-1.0.90-Makefile.am.patch 624
 AUX xforms-1.0.90-as-needed.patch 385 RMD160 d9ae84e4d606517d5d7117cd131657a8b935e411 SHA1 a0dadb93154d7a2125730e078b743c94ee1b9cf9 SHA256 4a29747c95550ec1dcf94ac657cc878434a6dca3f28c608692a4483fa4579d8a
 MD5 94734ab491bc0551335b85adf59c3e08 files/xforms-1.0.90-as-needed.patch 385
 RMD160 d9ae84e4d606517d5d7117cd131657a8b935e411 files/xforms-1.0.90-as-needed.patch 385
 SHA256 4a29747c95550ec1dcf94ac657cc878434a6dca3f28c608692a4483fa4579d8a files/xforms-1.0.90-as-needed.patch 385
 DIST xforms-1.0.90.tar.gz 992072 RMD160 f709bea1e2c3a867092e7cc4c7c5c1c60055b6e3 SHA1 7ef0655d1ba481a09af643455ec11afdcc28ce8a SHA256 e505cd9cdaef160575f9132b1a5fef3d0675bf801a901075ad17a8daca31a49a
-EBUILD xforms-1.0.90-r1.ebuild 1054 RMD160 ae1ad312d41279c3c6beaf9880d2e33f64d6faf6 SHA1 26cfd23a44b9744763322792b5a6cb2fe97a1f20 SHA256 ab7b7563dc8b3b8db73702d428d11aa16ac782dd6d07b5e23874c843285e7a5e
-MD5 8675feee9b9a5786d00ad73e720cadd3 xforms-1.0.90-r1.ebuild 1054
-RMD160 ae1ad312d41279c3c6beaf9880d2e33f64d6faf6 xforms-1.0.90-r1.ebuild 1054
-SHA256 ab7b7563dc8b3b8db73702d428d11aa16ac782dd6d07b5e23874c843285e7a5e xforms-1.0.90-r1.ebuild 1054
-MISC ChangeLog 5198 RMD160 48a73337d5f103af551b4cc5e1c6816a62ee337c SHA1 acfe11cabc94dcf2d11fe8b25d63965056705c94 SHA256 08c817ae5b003dcdd8f966cbf7a88fead75a6ed94303a5126d01bbb44c15acb5
-MD5 4d4247340df366740bac72729d47e39f ChangeLog 5198
-RMD160 48a73337d5f103af551b4cc5e1c6816a62ee337c ChangeLog 5198
-SHA256 08c817ae5b003dcdd8f966cbf7a88fead75a6ed94303a5126d01bbb44c15acb5 ChangeLog 5198
+EBUILD xforms-1.0.90-r1.ebuild 1059 RMD160 a15c3c1dee6e8f05ee4d69705be17d783729190d SHA1 1de78e1dcf177e9bd34a123d874fa934439fdbd1 SHA256 d4f752081944fd0deb44669ef06bc209ebabe229e7b53daf83ae56c161c9bf89
+MD5 3939a318861e604399670e5c67d85f60 xforms-1.0.90-r1.ebuild 1059
+RMD160 a15c3c1dee6e8f05ee4d69705be17d783729190d xforms-1.0.90-r1.ebuild 1059
+SHA256 d4f752081944fd0deb44669ef06bc209ebabe229e7b53daf83ae56c161c9bf89 xforms-1.0.90-r1.ebuild 1059
+MISC ChangeLog 5538 RMD160 42c40da8f03a0de164098c06bb453c1a0028aad3 SHA1 73102a1e8568c393cc91cb0851c3d3326cfb98b5 SHA256 17c776a5fbae36d5bf2a823dc7f9af241ec67c78623b88db0d55a92c9fa9f71d
+MD5 6a042b8d988880fec58df6463632bec0 ChangeLog 5538
+RMD160 42c40da8f03a0de164098c06bb453c1a0028aad3 ChangeLog 5538
+SHA256 17c776a5fbae36d5bf2a823dc7f9af241ec67c78623b88db0d55a92c9fa9f71d ChangeLog 5538
 MISC metadata.xml 232 RMD160 854b06094287201d0b98f2b21d36054db25d81cd SHA1 cc4f98e9ee0102aea687d71cf3af924cf156edbb SHA256 21382e863647add08888c924279a4b931b2b90ccd0cf5e526ee74a3d5e1fd0df
 MD5 8e53a4e000887f6bb029ca30c434e207 metadata.xml 232
 RMD160 854b06094287201d0b98f2b21d36054db25d81cd metadata.xml 232
@@ -18,3 +25,10 @@ SHA256 21382e863647add08888c924279a4b931b2b90ccd0cf5e526ee74a3d5e1fd0df metadata
 MD5 afcf2f517884a0625701fae2e6701627 files/digest-xforms-1.0.90-r1 241
 RMD160 d9b4b9fb2918440d012ebaf5bf7d8936ce58b176 files/digest-xforms-1.0.90-r1 241
 SHA256 19253961331922517f0e211774b7e3c79f5d772ebe12640eb78daad4a1d72557 files/digest-xforms-1.0.90-r1 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF2H21yuNVb5qfaOYRAvopAJwOgc9MBpDgBj6/dB+buXAuDOaPzQCeLq30
+wyrFTUC6KBX9JoUHo/zpTKw=
+=fMz1
+-----END PGP SIGNATURE-----

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 (file)
index 0000000..06de35a
--- /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 14f2c015e455c53c0b9ef154196ff28d2da88746..cca7b7d77f44c4eb3bb7c2d7222b882d739fd4ea 100644 (file)
--- 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"
 }