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

[Justin Lecher]

commit:     33e2880062c955f15004ae318b292be488ee6fed
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 21 17:09:23 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Mar 22 09:44:41 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=33e28800

sci-astronomy/weightwatcher: Add new version linked to live one

Package-Manager: portage-2.2.8-prefix

---
 sci-astronomy/weightwatcher/ChangeLog              |  7 ++++
 .../files/weightwatcher-1.8.10-configure.patch     | 41 ----------------------
 .../weightwatcher/weightwatcher-1.12.ebuild        |  1 +
 .../weightwatcher/weightwatcher-9999.ebuild        |  6 ++--
 4 files changed, 11 insertions(+), 44 deletions(-)

diff --git a/sci-astronomy/weightwatcher/ChangeLog b/sci-astronomy/weightwatcher/ChangeLog
index 22ba374..84c950b 100644
--- a/sci-astronomy/weightwatcher/ChangeLog
+++ b/sci-astronomy/weightwatcher/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*weightwatcher-1.12 (21 Mar 2014)
+
+  21 Mar 2014; Sébastien Fabbro <bicatali@g.o>
+  +weightwatcher-1.12.ebuild, -files/weightwatcher-1.8.10-configure.patch,
+  weightwatcher-9999.ebuild:
+  sci-astronomy/weightwatcher: Add new version linked to live one
+
   27 Feb 2014; Sébastien Fabbro <bicatali@g.o> -Manifest,
   -weightwatcher-1.8.10.ebuild, weightwatcher-9999.ebuild:
   sci-astronomy/weightwatcher: EAPI-5, autotools-utils

diff --git a/sci-astronomy/weightwatcher/files/weightwatcher-1.8.10-configure.patch b/sci-astronomy/weightwatcher/files/weightwatcher-1.8.10-configure.patch
deleted file mode 100644
index c86a42b..0000000
--- a/sci-astronomy/weightwatcher/files/weightwatcher-1.8.10-configure.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -Nur weightwatcher-1.8.10.orig/configure.ac weightwatcher-1.8.10/configure.ac
---- weightwatcher-1.8.10.orig/configure.ac	2012-07-09 16:26:31.554196307 -0700
-+++ weightwatcher-1.8.10/configure.ac	2012-07-09 16:27:30.044509170 -0700
-@@ -20,36 +20,15 @@
- AC_SUBST(DATE3, "$date3")
- 
- # Include macros
--sinclude(acx_prog_cc_optim.m4)
- sinclude(acx_urbi_resolve_dir.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])
-+AC_PROG_CC
- # C Compiler: Check that it is ANSI C
- AM_PROG_CC_STDC
- # C Compiler: Check that it is POSIX-compliant

diff --git a/sci-astronomy/weightwatcher/weightwatcher-1.12.ebuild b/sci-astronomy/weightwatcher/weightwatcher-1.12.ebuild
new file mode 120000
index 0000000..fedc2e1
--- /dev/null
+++ b/sci-astronomy/weightwatcher/weightwatcher-1.12.ebuild
@@ -0,0 +1 @@
+weightwatcher-9999.ebuild
\ No newline at end of file

diff --git a/sci-astronomy/weightwatcher/weightwatcher-9999.ebuild b/sci-astronomy/weightwatcher/weightwatcher-9999.ebuild
index 71aa61c..5fce0b0 100644
--- a/sci-astronomy/weightwatcher/weightwatcher-9999.ebuild
+++ b/sci-astronomy/weightwatcher/weightwatcher-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 
 if [[ ${PV} == "9999" ]] ; then
-	_SVN=subversion
+	inherit subversion
 	ESVN_REPO_URI="https://astromatic.net/pubsvn/software/${PN}/trunk"
 	SRC_URI=""
 	KEYWORDS=""
@@ -14,10 +14,10 @@ else
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
-AUTOTOOLS_AUTORECONF=1
+#AUTOTOOLS_AUTORECONF=1
 AUTOTOOLS_IN_SOURCE_BUILD=1
 
-inherit ${_SVN} autotools-utils
+inherit autotools-utils
 
 DESCRIPTION="Combine weight maps and polygon for astronomical images weighting"
 HOMEPAGE="http://www.astromatic.net/software/weightwatcher/"