Version bump, now do not compile examples. Restricted test as still buggy

(Portage version: 2.2_rc61/cvs/Linux x86_64)

6 files changed, 87 insertions, 93 deletions

diff --git a/sci-libs/gts/ChangeLog b/sci-libs/gts/ChangeLog
index 962b7223a24f..710d40fd5c65 100644
--- a/sci-libs/gts/ChangeLog
+++ b/sci-libs/gts/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/gts
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gts/ChangeLog,v 1.9 2008/10/04 10:33:09 markusle Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gts/ChangeLog,v 1.10 2010/01/15 07:14:10 bicatali Exp $
+
+*gts-20090909 (15 Jan 2010)
+
+  15 Jan 2010; Sébastien Fabbro <bicatali@gentoo.org> -gts-0.7.4.ebuild,
+  -gts-0.7.6.ebuild, +gts-20090909.ebuild,
+  +files/gts-20090909-examples.patch, metadata.xml:
+  Version bump, now do not compile examples. Restricted test as still buggy
 
 *gts-20081607 (03 Oct 2008)
 
diff --git a/sci-libs/gts/files/gts-20090909-examples.patch b/sci-libs/gts/files/gts-20090909-examples.patch
new file mode 100644
index 000000000000..22c3d188b20a
--- /dev/null
+++ b/sci-libs/gts/files/gts-20090909-examples.patch
@@ -0,0 +1,23 @@
+--- examples/Makefile.am.orig	2010-01-15 07:32:31.000000000 +0000
++++ examples/Makefile.am	2010-01-15 07:34:11.000000000 +0000
+@@ -8,17 +8,15 @@
+ EXTRA_PROGRAMS = happrox
+ 
+ happrox_LDADD = $(LDADD) -lnetpbm
+-
++happrox_CPPFLAGS = -I/usr/include/netpbm
+ if HAS_NETPBM
+ NETPBM_EXTRA = happrox
+ endif
+ 
+-bin_PROGRAMS = \
++check_PROGRAMS = \
+ 	transform \
+ 	delaunay \
+-	$(NETPBM_EXTRA)
+-
+-noinst_PROGRAMS = \
++	$(NETPBM_EXTRA) \
+ 	set \
+ 	volume \
+ 	cleanup \
diff --git a/sci-libs/gts/gts-0.7.4.ebuild b/sci-libs/gts/gts-0.7.4.ebuild
deleted file mode 100644
index 39d1ac66f593..000000000000
--- a/sci-libs/gts/gts-0.7.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gts/gts-0.7.4.ebuild,v 1.5 2008/04/22 08:21:31 bicatali Exp $
-
-DESCRIPTION="GNU Triangulated Surface Library"
-LICENSE="LGPL-2"
-HOMEPAGE="http://gts.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-libs/glib-2.4.0
-		sys-apps/gawk"
-DEPEND="${RDEPEND}
-		sys-devel/libtool
-		dev-util/pkgconfig"
-
-src_compile() {
-	econf || die "Configure failed"
-	emake || die "Make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Install failed"
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-
-	# install additional docs
-	if use doc; then
-		dohtml doc/html/*
-		docinto examples
-		dodoc examples/*
-	fi
-}
diff --git a/sci-libs/gts/gts-0.7.6.ebuild b/sci-libs/gts/gts-0.7.6.ebuild
deleted file mode 100644
index 705e8d33509a..000000000000
--- a/sci-libs/gts/gts-0.7.6.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gts/gts-0.7.6.ebuild,v 1.5 2008/04/22 08:21:31 bicatali Exp $
-
-inherit eutils
-
-DESCRIPTION="GNU Triangulated Surface Library"
-LICENSE="LGPL-2"
-HOMEPAGE="http://gts.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-libs/glib-2.4.0
-		sys-apps/gawk"
-DEPEND="${RDEPEND}
-		sys-devel/libtool
-		dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-include-fix.patch
-}
-
-src_compile() {
-	econf || die "Configure failed"
-	emake || die "Make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Install failed"
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-
-	# fix up examples
-	sed -e "s:/var/tmp/portage/gts-0.7.6/work/gts-0.7.6/:/usr/share/gts/:g" \
-		-e "s:../src/.libs/libgts.so:/usr/lib/libgts.so:g" \
-		-i examples/* || \
-		die "Failed to fix-up example scripts"
-
-	# install examples
-	insinto /usr/share/${PN}/examples
-	doins examples/* || die "Failed to install examples"
-
-	# install additional docs
-	if use doc; then
-		dohtml doc/html/*
-	fi
-}
diff --git a/sci-libs/gts/gts-20090909.ebuild b/sci-libs/gts/gts-20090909.ebuild
new file mode 100644
index 000000000000..dbd8ac8f6fb2
--- /dev/null
+++ b/sci-libs/gts/gts-20090909.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gts/gts-20090909.ebuild,v 1.1 2010/01/15 07:14:10 bicatali Exp $
+
+EAPI=2
+inherit eutils autotools
+
+DESCRIPTION="GNU Triangulated Surface Library"
+LICENSE="LGPL-2"
+HOMEPAGE="http://gts.sourceforge.net/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc examples test"
+
+RDEPEND=">=dev-libs/glib-2.4.0"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	test? ( media-libs/netpbm )"
+
+# tests are failing
+RESTRICT="test"
+
+S="${WORKDIR}"/${PN}-snapshot-090909
+
+src_prepare() {
+	chmod +x test/*/*.sh
+	epatch "${FILESDIR}"/${P}-examples.patch
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/*.c || die "Failed to install examples"
+	fi
+
+	# install additional docs
+	if use doc; then
+		dohtml doc/html/*
+	fi
+}
diff --git a/sci-libs/gts/metadata.xml b/sci-libs/gts/metadata.xml
index a3ced4f52edf..48923e1d890a 100644
--- a/sci-libs/gts/metadata.xml
+++ b/sci-libs/gts/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>markusle@gentoo.org</email>
-		<name>Markus Dittrich</name>
-	</maintainer>
-	<herd>sci</herd>
+<maintainer>
+  <email>markusle@gentoo.org</email>
+  <name>Markus Dittrich</name>
+</maintainer>
+<herd>sci</herd>
+<longdescription lang='en'>
+  Gerris Flow Solver is a software program for the solution of the partial
+  differential equations describing fluid flow.
+</longdescription>
 </pkgmetadata>