Block sci-chemistry/apbs[tools] or rename smooth to gts-smooth, dropp old

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

6 files changed, 28 insertions, 62 deletions

diff --git a/sci-libs/gts/ChangeLog b/sci-libs/gts/ChangeLog
index 79f569040b43..67ad4fe10835 100644
--- a/sci-libs/gts/ChangeLog
+++ b/sci-libs/gts/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/gts
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gts/ChangeLog,v 1.18 2011/07/20 16:59:45 pacho Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gts/ChangeLog,v 1.19 2012/01/04 17:35:17 jlec Exp $
+
+*gts-20100321-r3 (04 Jan 2012)
+
+  04 Jan 2012; Justin Lecher <jlec@gentoo.org> -gts-20081607.ebuild,
+  -gts-20090909.ebuild, gts-20100321-r1.ebuild, gts-20100321-r2.ebuild,
+  +gts-20100321-r3.ebuild, metadata.xml:
+  Block sci-chemistry/apbs[tools] or rename smooth to gts-smooth, dropp old
 
   20 Jul 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer due retirement, bug #105599
diff --git a/sci-libs/gts/gts-20081607.ebuild b/sci-libs/gts/gts-20081607.ebuild
deleted file mode 100644
index 737996a1e3da..000000000000
--- a/sci-libs/gts/gts-20081607.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gts/gts-20081607.ebuild,v 1.5 2011/06/21 15:18:09 jlec Exp $
-
-EAPI="1"
-
-inherit eutils fortran-2
-
-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"
-
-RDEPEND="
-	virtual/fortran
-
-	dev-libs/glib:2
-	sys-apps/gawk
-	media-libs/netpbm"
-DEPEND="${RDEPEND}
-		sys-devel/libtool
-		dev-util/pkgconfig"
-
-S="${WORKDIR}"/${PN}-snapshot-080704
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-0.7.6-include-fix.patch
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Install failed"
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-
-	# install examples
-	insinto /usr/share/${PN}/examples
-	doins examples/*.c || die "Failed to install examples"
-
-	# install additional docs
-	if use doc; then
-		dohtml doc/html/*
-	fi
-}
diff --git a/sci-libs/gts/gts-20100321-r1.ebuild b/sci-libs/gts/gts-20100321-r1.ebuild
index 19a006e8f854..70c77e92ddfb 100644
--- a/sci-libs/gts/gts-20100321-r1.ebuild
+++ b/sci-libs/gts/gts-20100321-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.4 2011/06/21 15:18:09 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gts/gts-20100321-r1.ebuild,v 1.5 2012/01/04 17:35:17 jlec Exp $
 
 EAPI=2
 inherit eutils fortran-2 autotools
@@ -19,6 +19,7 @@ RDEPEND="
 
 	dev-libs/glib:2
 	!dev-vcs/rcs
+	!sci-chemistry/apbs[tools]
 	!<=sci-chemistry/ccp4-apps-6.1.3-r2"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
diff --git a/sci-libs/gts/gts-20100321-r2.ebuild b/sci-libs/gts/gts-20100321-r2.ebuild
index a476213fa067..e78fd7c317ca 100644
--- a/sci-libs/gts/gts-20100321-r2.ebuild
+++ b/sci-libs/gts/gts-20100321-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.3 2011/06/21 15:18:09 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gts/gts-20100321-r2.ebuild,v 1.4 2012/01/04 17:35:17 jlec Exp $
 
 EAPI=2
 inherit eutils fortran-2 autotools
@@ -18,6 +18,7 @@ RDEPEND="
 	virtual/fortran
 
 	dev-libs/glib:2
+	!sci-chemistry/apbs[tools]
 	!<=sci-chemistry/ccp4-apps-6.1.3-r2"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
diff --git a/sci-libs/gts/gts-20090909.ebuild b/sci-libs/gts/gts-20100321-r3.ebuild
index 84636785f315..d66117296448 100644
--- a/sci-libs/gts/gts-20090909.ebuild
+++ b/sci-libs/gts/gts-20100321-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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-20090909.ebuild,v 1.4 2011/06/21 15:18:09 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gts/gts-20100321-r3.ebuild,v 1.1 2012/01/04 17:35:17 jlec Exp $
 
 EAPI=2
 inherit eutils fortran-2 autotools
@@ -16,7 +16,9 @@ IUSE="doc examples test"
 
 RDEPEND="
 	virtual/fortran
-	dev-libs/glib:2"
+
+	dev-libs/glib:2
+	!<=sci-chemistry/ccp4-apps-6.1.3-r2"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	test? ( media-libs/netpbm )"
@@ -24,7 +26,7 @@ DEPEND="${RDEPEND}
 # tests are failing
 RESTRICT="test"
 
-S="${WORKDIR}"/${PN}-snapshot-090909
+S="${WORKDIR}"/${PN}-snapshot-100321
 
 src_prepare() {
 	chmod +x test/*/*.sh
@@ -34,7 +36,10 @@ src_prepare() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+	mv "${D}"/usr/bin/{,gts-}split || die
+	mv "${D}"/usr/bin/{,gts-}merge || die
+	mv "${D}"/usr/bin/{,gts-}smooth || die
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die
 
 	if use examples; then
 		insinto /usr/share/doc/${PF}/examples
@@ -43,6 +48,6 @@ src_install() {
 
 	# install additional docs
 	if use doc; then
-		dohtml doc/html/*
+		dohtml doc/html/* || die
 	fi
 }
diff --git a/sci-libs/gts/metadata.xml b/sci-libs/gts/metadata.xml
index 14c7a6b771ae..f603fa10fc94 100644
--- a/sci-libs/gts/metadata.xml
+++ b/sci-libs/gts/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang='en'>
+	<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>