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

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

[Justin Lecher]

commit:     601acc40f97b95f74dd9a5ec388c970dbfec96a2
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  2 21:24:52 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Mar  2 21:24:52 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=601acc40

sci-astronomy/stiff: cleanup to move in main tree

Package-Manager: portage-2.2.27

 sci-astronomy/stiff/files/stiff-configure.patch | 63 -------------------------
 sci-astronomy/stiff/stiff-2.4.0.ebuild          | 43 -----------------
 sci-astronomy/stiff/stiff-9999.ebuild           | 33 ++++++-------
 3 files changed, 15 insertions(+), 124 deletions(-)

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.4.0.ebuild b/sci-astronomy/stiff/stiff-2.4.0.ebuild
deleted file mode 100644
index 33c0767..0000000
--- a/sci-astronomy/stiff/stiff-2.4.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-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
-
-#AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils
-
-DESCRIPTION="Converts astronomical FITS images to the TIFF format"
-HOMEPAGE="http://astromatic.iap.fr/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() {
-	local myeconfargs=( $(use_enable threads) )
-	autotools-utils_src_configure
-}
-
-src_install () {
-	use doc && DOCS=( doc/. )
-	autotools-utils_src_install
-}

diff --git a/sci-astronomy/stiff/stiff-9999.ebuild b/sci-astronomy/stiff/stiff-9999.ebuild
index 33c0767..6c70b1f 100644
--- a/sci-astronomy/stiff/stiff-9999.ebuild
+++ b/sci-astronomy/stiff/stiff-9999.ebuild
@@ -1,23 +1,16 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+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
+inherit subversion
 
-#AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
+ESVN_REPO_URI="https://astromatic.net/pubsvn/software/${PN}/trunk"
+ESVN_OPTIONS="--trust-server-cert-failures=unknown-ca"
 
-inherit autotools-utils
+SRC_URI=""
+KEYWORDS=""
 
 DESCRIPTION="Converts astronomical FITS images to the TIFF format"
 HOMEPAGE="http://astromatic.iap.fr/software/stiff"
@@ -32,12 +25,16 @@ RDEPEND="
 	sys-libs/zlib:0="
 DEPEND="${RDEPEND}"
 
+src_prepare() {
+	default
+	subversion_src_prepare
+}
+
 src_configure() {
-	local myeconfargs=( $(use_enable threads) )
-	autotools-utils_src_configure
+	econf $(use_enable threads)
 }
 
 src_install () {
-	use doc && DOCS=( doc/. )
-	autotools-utils_src_install
+	default
+	use doc && dodoc doc/*
 }