Version bump and switch to autotools-utils, bug #387215 thanks Eckard Brauer

(Portage version: 2.1.10.41/cvs/Linux x86_64)

7 files changed, 89 insertions, 156 deletions

diff --git a/sci-libs/gts/ChangeLog b/sci-libs/gts/ChangeLog
index b9e92c1dd3c7..83129fe07461 100644
--- a/sci-libs/gts/ChangeLog
+++ b/sci-libs/gts/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-libs/gts
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gts/ChangeLog,v 1.20 2012/01/05 18:58:00 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gts/ChangeLog,v 1.21 2012/01/20 19:17:11 bicatali Exp $
+
+*gts-20111025 (20 Jan 2012)
+
+  20 Jan 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/gts-0.7.6-include-fix.patch, -files/gts-20090909-examples.patch,
+  -gts-20100321-r1.ebuild, -gts-20100321-r2.ebuild, +gts-20111025.ebuild,
+  +files/gts-20111025-autotools.patch:
+  Version bump and switch to autotools-utils, bug #387215 thanks Eckard Brauer
 
   05 Jan 2012; Justin Lecher <jlec@gentoo.org> gts-20100321-r1.ebuild,
   gts-20100321-r2.ebuild, gts-20100321-r3.ebuild:
diff --git a/sci-libs/gts/files/gts-0.7.6-include-fix.patch b/sci-libs/gts/files/gts-0.7.6-include-fix.patch
deleted file mode 100644
index eec61fafcc4f..000000000000
--- a/sci-libs/gts/files/gts-0.7.6-include-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur gts-0.7.6/examples/Makefile.in gts-0.7.6.new/examples/Makefile.in
---- gts-0.7.6/examples/Makefile.in	2006-03-09 19:31:05.000000000 -0500
-+++ gts-0.7.6.new/examples/Makefile.in	2008-02-20 09:08:47.000000000 -0500
-@@ -139,7 +139,7 @@
- volume_OBJECTS = volume.$(OBJEXT)
- volume_LDADD = $(LDADD)
- volume_DEPENDENCIES = $(top_builddir)/src/libgts.la
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I/usr/include/netpbm
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cartesian.Po \
-diff -Naur gts-0.7.6/src/Makefile.in gts-0.7.6.new/src/Makefile.in
---- gts-0.7.6/src/Makefile.in	2006-03-09 19:31:05.000000000 -0500
-+++ gts-0.7.6.new/src/Makefile.in	2008-02-20 09:08:17.000000000 -0500
-@@ -354,7 +354,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- libgts.la: $(libgts_la_OBJECTS) $(libgts_la_DEPENDENCIES) 
--	$(LINK) -rpath $(libdir) $(libgts_la_LDFLAGS) $(libgts_la_OBJECTS) $(libgts_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(libdir) $(libgts_la_LDFLAGS) $(libgts_la_OBJECTS) $(libgts_la_LIBADD) $(LIBS) -lm
- install-binSCRIPTS: $(bin_SCRIPTS)
- 	@$(NORMAL_INSTALL)
- 	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
diff --git a/sci-libs/gts/files/gts-20090909-examples.patch b/sci-libs/gts/files/gts-20090909-examples.patch
deleted file mode 100644
index 22c3d188b20a..000000000000
--- a/sci-libs/gts/files/gts-20090909-examples.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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/files/gts-20111025-autotools.patch b/sci-libs/gts/files/gts-20111025-autotools.patch
new file mode 100644
index 000000000000..9f0148b07b35
--- /dev/null
+++ b/sci-libs/gts/files/gts-20111025-autotools.patch
@@ -0,0 +1,28 @@
+--- examples/Makefile.am.orig
++++ examples/Makefile.am
+@@ -16,9 +18,7 @@ endif
+ bin_PROGRAMS = \
+ 	transform \
+ 	delaunay \
+-	$(NETPBM_EXTRA)
+-
+-noinst_PROGRAMS = \
++	$(NETPBM_EXTRA) \
+ 	set \
+ 	volume \
+ 	cleanup \
+--- src/Makefile.am.orig	2012-01-20 18:00:55.000000000 +0000
++++ src/Makefile.am	2012-01-20 18:07:32.000000000 +0000
+@@ -66,10 +66,10 @@
+ 	$(COMPILE) -c $(srcdir)/predicates.c
+ 
+ predicates_init: predicates_init.c rounding.h
+-	$(COMPILE) $(srcdir)/predicates_init.c -o $(srcdir)/predicates_init
++	$(COMPILE) $(srcdir)/predicates_init.c -o $(top_builddir)/src/predicates_init
+ 
+ predicates_init.h: predicates_init
+-	./predicates_init >  $(srcdir)/predicates_init.h
++	$(top_builddir)/src/predicates_init >  $(srcdir)/predicates_init.h
+ 
+ CLEANFILES = $(BUILT_SOURCES)
+ 
diff --git a/sci-libs/gts/gts-20100321-r1.ebuild b/sci-libs/gts/gts-20100321-r1.ebuild
deleted file mode 100644
index 468e0af8feb2..000000000000
--- a/sci-libs/gts/gts-20100321-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gts/gts-20100321-r1.ebuild,v 1.6 2012/01/05 18:58:00 jlec Exp $
-
-EAPI=2
-
-inherit eutils fortran-2 autotools
-
-DESCRIPTION="GNU Triangulated Surface Library"
-HOMEPAGE="http://gts.sourceforge.net/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc examples test"
-
-RDEPEND="
-	virtual/fortran
-
-	dev-libs/glib:2
-	!dev-vcs/rcs
-	!<=sci-chemistry/apbs-1.3-r1[tools]
-	!<=sci-chemistry/ccp4-apps-6.1.3-r2"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	test? ( media-libs/netpbm )"
-
-# tests are failing
-RESTRICT="test"
-
-S="${WORKDIR}"/${PN}-snapshot-100321
-
-src_prepare() {
-	chmod +x test/*/*.sh
-	epatch "${FILESDIR}"/${P}-examples.patch
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	mv "${D}"/usr/bin/{,gts-}split || die
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die
-
-	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/* || die
-	fi
-}
diff --git a/sci-libs/gts/gts-20100321-r2.ebuild b/sci-libs/gts/gts-20100321-r2.ebuild
deleted file mode 100644
index 54bd6719f307..000000000000
--- a/sci-libs/gts/gts-20100321-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gts/gts-20100321-r2.ebuild,v 1.5 2012/01/05 18:58:00 jlec Exp $
-
-EAPI=2
-
-inherit eutils fortran-2 autotools
-
-DESCRIPTION="GNU Triangulated Surface Library"
-HOMEPAGE="http://gts.sourceforge.net/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc examples test"
-
-RDEPEND="
-	virtual/fortran
-
-	dev-libs/glib:2
-	!<=sci-chemistry/apbs-1.3-r1[tools]
-	!<=sci-chemistry/ccp4-apps-6.1.3-r2"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	test? ( media-libs/netpbm )"
-
-# tests are failing
-RESTRICT="test"
-
-S="${WORKDIR}"/${PN}-snapshot-100321
-
-src_prepare() {
-	chmod +x test/*/*.sh
-	epatch "${FILESDIR}"/${P}-examples.patch
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	mv "${D}"/usr/bin/{,gts-}split || die
-	mv "${D}"/usr/bin/{,gts-}merge || die
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die
-
-	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/* || die
-	fi
-}
diff --git a/sci-libs/gts/gts-20111025.ebuild b/sci-libs/gts/gts-20111025.ebuild
new file mode 100644
index 000000000000..18c4d5de8bb5
--- /dev/null
+++ b/sci-libs/gts/gts-20111025.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gts/gts-20111025.ebuild,v 1.1 2012/01/20 19:17:11 bicatali Exp $
+
+EAPI=4
+AUTOTOOLS_AUTORECONF=yes
+inherit fortran-2 autotools-utils
+
+DESCRIPTION="GNU Triangulated Surface Library"
+LICENSE="LGPL-2"
+HOMEPAGE="http://gts.sourceforge.net/"
+SRC_URI="http://dev.gentoo.org/~bicatali/distfiles/${P}.tar.gz"
+# wget http://gts.sf.net/gts-snapshot.tar.gz and upload
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc examples static-libs test"
+
+RDEPEND="virtual/fortran
+	dev-libs/glib:2
+	!<=sci-chemistry/ccp4-apps-6.1.3-r2"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	test? ( media-libs/netpbm )"
+
+# buggy
+RESTRICT=test
+
+PATCHES=( "${FILESDIR}"/${P}-autotools.patch )
+S="${WORKDIR}"/${P/-20/-snapshot-}
+
+src_test() {
+	chmod +x test/*/*.sh
+	cd ${AUTOTOOLS_BUILD_DIR}/test/boolean
+	ln -s "${S}"/test/boolean/{tests,surfaces} .
+	autotools-utils_src_test
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	# rename to avoid collisions
+	mv "${ED}"/usr/bin/{,gts-}split || die
+	mv "${ED}"/usr/bin/{,gts-}merge || die
+
+	use doc && dohtml doc/html/*
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/*.c
+	fi
+}