Removed building of xylib, closing bug #235289

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.23-gentoo-r9 x86_64

6 files changed, 55 insertions, 75 deletions

diff --git a/sci-visualization/fityk/ChangeLog b/sci-visualization/fityk/ChangeLog
index a144aa6ed79c..595430c37809 100644
--- a/sci-visualization/fityk/ChangeLog
+++ b/sci-visualization/fityk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-visualization/fityk
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/fityk/ChangeLog,v 1.3 2008/07/13 17:39:33 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/fityk/ChangeLog,v 1.4 2008/08/22 18:06:19 bicatali Exp $
+
+  22 Aug 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/fityk-0.8.4-as-needed.patch, +files/fityk-0.8.6-3rdparty.patch,
+  -fityk-0.8.4.ebuild, fityk-0.8.6.ebuild:
+  Removed building of xylib, closing bug #235289
 
   13 Jul 2008; Sébastien Fabbro <bicatali@gentoo.org> fityk-0.8.6.ebuild:
   Use internal boost headers for incompatibily between boost::spirit
diff --git a/sci-visualization/fityk/Manifest b/sci-visualization/fityk/Manifest
index 8e2c616c9de0..c68c12a6a953 100644
--- a/sci-visualization/fityk/Manifest
+++ b/sci-visualization/fityk/Manifest
@@ -1,17 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX fityk-0.8.4-as-needed.patch 494 RMD160 9fb33ab85d2bfe9160d1875901ba957b4acdcbad SHA1 45b9d25d99002c32adf89b6862d2be15ad7b41cc SHA256 eda913dac8e4af1efd80729da23117813f9f5a888b9a02c3a8a11777d3a7abc4
-DIST fityk-0.8.4.tar.bz2 1502130 RMD160 cc2c40f6b2348fa19de2d4b1fc9bcf2d74b190cb SHA1 a4412e4f0f632f45b8cea5feab673eb6408736d4 SHA256 4e2ebc403916123c3577244448819598b6f81bb8fc5710abf48593b55acbc91a
+AUX fityk-0.8.6-3rdparty.patch 1055 RMD160 5685ea6a60f6c9ea86b6173ed89afd9b1085ebe1 SHA1 ed33e919e09d18d9bbfb8a57a07b3aee1ff878e5 SHA256 933f46906a1ebf2b3094eb52d3a1357d436af8b882c4e6d571d0a7380eae5d58
 DIST fityk-0.8.6.tar.bz2 1410082 RMD160 c4e32c9c8146968443c5eadb48feeca737f03f92 SHA1 9d1063e015aa214c3cc37da15b87a63978733ca2 SHA256 a6143bba9f080c16eacbddf3d03fdac1f705c9605249d974ff892435dc1d99ec
-EBUILD fityk-0.8.4.ebuild 1274 RMD160 077e9e258811fbc4f0cb2d9e3b7c2ca6d0696ea0 SHA1 1586c9787c1c2fd66b507e692ff227523cb652bc SHA256 fe253dfc33b82f1e1b62feebfc86e7d7e651e8504c13cb6e0b8dcef9864e116a
-EBUILD fityk-0.8.6.ebuild 1237 RMD160 2a581358c0082803c6933f2db24857877ffc5329 SHA1 a4421d302547a8aaae26e19b648561e291f9bad1 SHA256 45b31318c5b030eaaf1e8b0075311313bcb4c1eca960aad6b857507efd308d13
-MISC ChangeLog 865 RMD160 0df109597e5c514b5ce815ed78c65eb86a24435c SHA1 7729d4f81e1416041e2255de4707f40eb11c86a3 SHA256 92189f75c2f035f0c146fffd0e8ca49c0025c3ee144a24ac72e352b3646efe2b
+EBUILD fityk-0.8.6.ebuild 1401 RMD160 1ac0362a0ffe3996bb919381ad7af9abbc16294a SHA1 aa6709a644621d6d3baf0d6ef1fa9c860ed3fec2 SHA256 7caf2bd31e304630e722459644e9cf45da328090b314b4f15ea703695d145848
+MISC ChangeLog 1086 RMD160 0dd1d4fddbfccbd036dc6f12663674979355b3c4 SHA1 e4bf8b3128c54749ab2b1ef053a149dc7afcf48a SHA256 a130701663f1560a08477536655fa19b79c17d5c661efc881dde7b238af00037
 MISC metadata.xml 1094 RMD160 051cca0088806156c3f4e786b9b4bd36541874a0 SHA1 6f394f9c92462dd283ca49be6f285232fd5e1ea6 SHA256 271840e4016f655cc85c7627b659b98837092381a4c1fcc873f195cb04c74d26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkh6Pm8ACgkQ1ycZbhPLE2AXLgCfUXACHYwyBlGkAHTB05MQB7aE
-IUcAoJCswmeF6Ippc4rZN/ex9imzCgeh
-=zkav
+iEYEARECAAYFAkivACUACgkQ1ycZbhPLE2DmBQCdFhzOcJWJ7VLKFYLkbvgi8D2d
+hUwAnRGobYmLcTO4YQk/Ua1QkL0LXfVz
+=/e6y
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/fityk/files/fityk-0.8.4-as-needed.patch b/sci-visualization/fityk/files/fityk-0.8.4-as-needed.patch
deleted file mode 100644
index 6deb72994b03..000000000000
--- a/sci-visualization/fityk/files/fityk-0.8.4-as-needed.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/Makefile.in.orig	2008-02-15 11:46:35.000000000 +0000
-+++ src/Makefile.in	2008-02-15 11:48:16.000000000 +0000
-@@ -265,6 +265,7 @@
- lib_LTLIBRARIES = libfityk.la 
- libfityk_la_LDFLAGS = @LIBRARY_VERSION_FLAG@
- libfityk_la_CPPFLAGS = @CPPFLAGS_3RDPARTY@ 
-+libfityk_la_LIBADD = @XYLIB_LDADD@
- libfityk_la_SOURCES = logic.cpp view.cpp cmd3.cpp cmd2.cpp cmd.cpp common.cpp \
- 		 var.cpp mgr.cpp func.cpp bfunc.cpp calc.cpp ast.cpp \
- 		 data.cpp datatrans.cpp datatrans2.cpp datatrans3.cpp \
diff --git a/sci-visualization/fityk/files/fityk-0.8.6-3rdparty.patch b/sci-visualization/fityk/files/fityk-0.8.6-3rdparty.patch
new file mode 100644
index 000000000000..ad3c7b44be85
--- /dev/null
+++ b/sci-visualization/fityk/files/fityk-0.8.6-3rdparty.patch
@@ -0,0 +1,33 @@
+--- configure.ac.orig	2008-08-22 18:36:17.981774040 +0100
++++ configure.ac	2008-08-22 18:40:08.566914339 +0100
+@@ -119,9 +119,11 @@
+ if test "$enable_3rdparty" = "yes"; then
+ 	CPPFLAGS_3RDPARTY="-I\$(top_srcdir)/3rdparty -I\$(top_srcdir)/3rdparty/xylib" 
+ 	XYLIB_LDADD="\$(top_builddir)/3rdparty/xylib/xylib/libxy.la"
++	DIR_3RDPARTY=3rdparty
+ else
+ 	CPPFLAGS_3RDPARTY=
+         XYLIB_LDADD="-lxy"
++	DIR_3RDPARTY=
+ fi
+ 
+ 
+@@ -185,6 +187,7 @@
+ AC_SUBST(PYBINDINGDIR)
+ AC_SUBST(CPPFLAGS_3RDPARTY)
+ AC_SUBST(XYLIB_LDADD)
++AC_SUBST(DIR_3RDPARTY)
+ AC_SUBST(LIBRARY_VERSION_FLAG)
+ 
+ # check for erf and erfc function
+--- Makefile.am.orig	2008-08-22 18:36:50.883649011 +0100
++++ Makefile.am	2008-08-22 18:38:42.550012515 +0100
+@@ -3,7 +3,7 @@
+ ACLOCAL_AMFLAGS = -I config
+ EXTRA_DIST = fityk.spec fityk.iss fityk.url fityk.svg macosx/
+ AUTOMAKE_OPTIONS = dist-bzip2 
+-SUBDIRS = @DOC@ 3rdparty src samples config @PYBINDINGDIR@
++SUBDIRS = @DOC@ @DIR_3RDPARTY@ src samples config @PYBINDINGDIR@
+ 
+ icondir = $(datadir)/pixmaps
+ desktopdir = $(datadir)/applications
diff --git a/sci-visualization/fityk/fityk-0.8.4.ebuild b/sci-visualization/fityk/fityk-0.8.4.ebuild
deleted file mode 100644
index d4d56295d4d1..000000000000
--- a/sci-visualization/fityk/fityk-0.8.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/fityk/fityk-0.8.4.ebuild,v 1.1 2008/02/28 12:09:01 bicatali Exp $
-
-EAPI="1"
-WX_GTK_VER="2.8"
-
-inherit eutils wxwidgets
-
-DESCRIPTION="General-purpose nonlinear curve fitting and data analysis"
-HOMEPAGE="http://www.unipress.waw.pl/fityk/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples gnuplot python readline wxwindows"
-
-CDEPEND="readline? ( sys-libs/readline )
-	python? ( virtual/python )
-	wxwindows? ( x11-libs/wxGTK:2.8 )"
-
-DEPEND="${CDEPEND}
-	dev-libs/boost
-	python? ( dev-lang/swig )"
-
-RDEPEND="${CDEPEND}
-	gnuplot? ( sci-visualization/gnuplot )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-}
-
-src_compile() {
-	econf  \
-		--disable-3rdparty \
-		$(use_enable python) \
-		$(use_enable wxwindows GUI) \
-		$(use_with doc) \
-		$(use_with readline) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc NEWS README TODO || die
-	rm -f samples/Makefile*
-	insinto /usr/share/doc/${PF}
-	use examples && doins -r samples
-}
diff --git a/sci-visualization/fityk/fityk-0.8.6.ebuild b/sci-visualization/fityk/fityk-0.8.6.ebuild
index fbafa99ea41c..377a7ddd3d80 100644
--- a/sci-visualization/fityk/fityk-0.8.6.ebuild
+++ b/sci-visualization/fityk/fityk-0.8.6.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/fityk/fityk-0.8.6.ebuild,v 1.2 2008/07/13 17:39:33 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/fityk/fityk-0.8.6.ebuild,v 1.3 2008/08/22 18:06:19 bicatali Exp $
 
 EAPI="1"
 WX_GTK_VER="2.8"
 
-inherit wxwidgets flag-o-matic
+inherit eutils autotools wxwidgets flag-o-matic
 
 DESCRIPTION="General-purpose nonlinear curve fitting and data analysis"
 HOMEPAGE="http://www.unipress.waw.pl/fityk/"
@@ -28,6 +28,14 @@ DEPEND="${CDEPEND}"
 RDEPEND="${CDEPEND}
 	gnuplot? ( sci-visualization/gnuplot )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# avoid building xylib when 3rdparty is disabled
+	epatch "${FILESDIR}"/${P}-3rdparty.patch
+	eautoreconf
+}
+
 src_compile() {
 	# temporary, see above
 	append-cppflags -I../3rdparty