[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/stiff/, sci-astronomy/stiff/files/

[Sebastien Fabbro]

commit:     e946244936157ce995d0194a62d30963ac0fedbe
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 24 18:55:42 2016 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Wed Feb 24 18:56:07 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9462449

sci-astronomy/stiff: Version bump

Package-Manager: portage-2.2.27

 sci-astronomy/stiff/Manifest                    |  2 +-
 sci-astronomy/stiff/files/stiff-configure.patch | 63 -------------------------
 sci-astronomy/stiff/stiff-2.1.3.ebuild          | 28 -----------
 sci-astronomy/stiff/stiff-2.4.0.ebuild          | 37 +++++++++++++++
 4 files changed, 38 insertions(+), 92 deletions(-)

diff --git a/sci-astronomy/stiff/Manifest b/sci-astronomy/stiff/Manifest
index 2239096..fd1d106 100644
--- a/sci-astronomy/stiff/Manifest
+++ b/sci-astronomy/stiff/Manifest
@@ -1 +1 @@
-DIST stiff-2.1.3.tar.gz 1043999 SHA256 64ad8aa64cb82c4d96cfa54335016260a6f264d9b7cdaf175a247476233e8aad SHA512 f5b9d4c1fb3db68d8422b357f0005e188259d021977dfa777ec999356e0f73d083cc9e04ffd16655582883d2b7dd38f7888006f086d12412ce13a9c5084a7359 WHIRLPOOL 97436148dadb5237a91d817b9040c5eb67857eea63a3f7728fa24588354861418c150a16b27385db973166e8bb86cf39fd273116c043b2b1a9c57bc78b5162a1
+DIST stiff-2.4.0.tar.gz 1074161 SHA256 f4e85146c17fe8dcf160d12dc6df08bbd9212bb8444162b2e6ebf03f7513a992 SHA512 c8a293a2d1771b21d8af1194f9a2f582eca1a363964e76b78319c9cc2407332ef5e31dc74c0d10b9d5c7b6ae18ebd35ee59c53ad31c5f3966fabcd03948cadf6 WHIRLPOOL aa3b0d4ee6e2fc7d1fd90d19c815985ddb520c3fe37da6ec7c631675f5277b1d75b72a776a64631beedc57b934899c86eebbdc0b7c54925eb153cff65146e805

diff --git a/sci-astronomy/stiff/files/stiff-configure.patch b/sci-astronomy/stiff/files/stiff-configure.patch
deleted file mode 100644
index 15b8d9a..0000000
--- a/sci-astronomy/stiff/files/stiff-configure.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- configure.ac.orig	2009-03-10 12:34:36.000000000 +0000
-+++ configure.ac	2009-07-28 17:26:22.000000000 +0100
-@@ -21,40 +21,14 @@
- 
- # Include macros
- #sinclude(acx_pthread.m4)
--sinclude(acx_prog_cc_optim.m4)
- 
- # Display pakage and version number
- AC_MSG_RESULT([*********** Configuring:  $PACKAGE $VERSION ($date) **********])
- 
--# Initialize the list of compilers to consider
--cclist="cc gcc"
--
--# Backup and reset the input CFLAGS and LDFLAGS
--mycflags="$CFLAGS"
--CFLAGS=""
--myldflags="$LDFLAGS"
--LDFLAGS=""
--
--# Provide special option for the Linux Intel C compiler
--AC_MSG_CHECKING([for Linux Intel C compiler mode])
--AC_ARG_ENABLE(icc,
--	[AC_HELP_STRING([--enable-icc],
--	[Enable special mode for compilation with the Intel compiler \
--(off by default)])],
--        use_icc="yes"
--        cclist="icc $cclist"
--	AC_MSG_RESULT([yes]),
--        use_icc="no"
--	AC_MSG_RESULT([no]))
--
--# Checks for programs.
--# GCC is chosen last because it is likely to yield less optimized code
--AC_PROG_CC([$cclist])
- # C Compiler: Check that it is ANSI C
- AM_PROG_CC_STDC
- # C Compiler: Check that it is POSIX-compliant
- AC_ISC_POSIX
--ACX_PROG_CC_OPTIM
- AC_PROG_AWK
- AC_PROG_INSTALL
- AC_PROG_RANLIB
-@@ -107,19 +81,9 @@
- 
- # Link with gprof option
- if test "$use_gprof" = "yes"; then
--  if test "$use_icc" = "yes"; then
--    CFLAGS="$CFLAGS -pq"
--  else
--    CFLAGS="$CFLAGS -pg"
--  fi
-   use_static="no"
- fi
- 
--# Static linking option
--if test "$use_static" = "yes"; then
--  LDFLAGS="-static -shared-libgcc $LDFLAGS"
--fi
--
- # Override automatic CFLAGS and LDFLAGS with those of user
- #if test -n "$mycflags"; then
- #CFLAGS="$mycflags"

diff --git a/sci-astronomy/stiff/stiff-2.1.3.ebuild b/sci-astronomy/stiff/stiff-2.1.3.ebuild
deleted file mode 100644
index 4aecbf3..0000000
--- a/sci-astronomy/stiff/stiff-2.1.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-DESCRIPTION="Converts astronomical FITS images to the TIFF format"
-HOMEPAGE="http://www.astromatic.net/software/stiff"
-SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz"
-
-LICENSE="CeCILL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc threads"
-
-RDEPEND="media-libs/tiff
-	virtual/jpeg
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf $(use_enable threads)
-}
-
-src_install () {
-	default
-	use doc && dodoc doc/*
-}

diff --git a/sci-astronomy/stiff/stiff-2.4.0.ebuild b/sci-astronomy/stiff/stiff-2.4.0.ebuild
new file mode 100644
index 0000000..195aa2f
--- /dev/null
+++ b/sci-astronomy/stiff/stiff-2.4.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit subversion
+	ESVN_REPO_URI="https://astromatic.net/pubsvn/software/${PN}/trunk"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Converts astronomical FITS images to the TIFF format"
+HOMEPAGE="http://www.astronomatic.net/software/stiff"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="doc threads"
+
+RDEPEND="
+	media-libs/tiff:0=
+	virtual/jpeg:0
+	sys-libs/zlib:0="
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	ECONF_SOURCE="${S}" econf $(use_enable threads)
+}
+
+src_install () {
+	default
+	use doc && dodoc doc/stiff.pdf
+}