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

[Sebastien Fabbro]

commit:     0df5ec71914eb470768f63c1d206b30d7fd9dda3
Author:     Sebastien Fabbro <sfabbro <AT> uvic <DOT> ca>
AuthorDate: Mon Jul  9 23:33:51 2012 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon Jul  9 23:33:51 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0df5ec71

sci-astronomy/weightwatcher: live version, prefix keywording

---
 sci-astronomy/weightwatcher/ChangeLog              |   10 ++++-
 .../files/weightwatcher-1.8.10-configure.patch     |   41 ++++++++++++++++++++
 sci-astronomy/weightwatcher/metadata.xml           |    4 +-
 .../weightwatcher/weightwatcher-1.8.10.ebuild      |   21 ++++++----
 .../weightwatcher/weightwatcher-9999.ebuild        |   36 +++++++++++++++++
 5 files changed, 101 insertions(+), 11 deletions(-)

diff --git a/sci-astronomy/weightwatcher/ChangeLog b/sci-astronomy/weightwatcher/ChangeLog
index 7588f6b..7f7b9f5 100644
--- a/sci-astronomy/weightwatcher/ChangeLog
+++ b/sci-astronomy/weightwatcher/ChangeLog
@@ -1,7 +1,15 @@
 # ChangeLog for sci-astronomy/weightwatcher
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*weightwatcher-9999 (09 Jul 2012)
+
+  09 Jul 2012; Sébastien Fabbro <bicatali@g.o>
+  weightwatcher-1.8.10.ebuild, +files/weightwatcher-1.8.10-configure.patch,
+  +weightwatcher-9999.ebuild, metadata.xml:
+  Added live version, fixed for respecting flags, keyword amd64-linux,
+  x86-linux
+
   04 Aug 2011; Sébastien Fabbro <bicatali@g.o> metadata.xml:
   Switched herd to sci-astronomy
 

diff --git a/sci-astronomy/weightwatcher/files/weightwatcher-1.8.10-configure.patch b/sci-astronomy/weightwatcher/files/weightwatcher-1.8.10-configure.patch
new file mode 100644
index 0000000..c86a42b
--- /dev/null
+++ b/sci-astronomy/weightwatcher/files/weightwatcher-1.8.10-configure.patch
@@ -0,0 +1,41 @@
+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/metadata.xml b/sci-astronomy/weightwatcher/metadata.xml
index 4cb9619..f14b078 100644
--- a/sci-astronomy/weightwatcher/metadata.xml
+++ b/sci-astronomy/weightwatcher/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-astronomy</herd>
-	<longdescription lang="en">
+<herd>sci-astronomy</herd>
+<longdescription lang="en">
   WeightWatcher is a program that combines weight-maps, flag-maps and
   polygon data in order to produce control maps which can directly be
   used in astronomical image-processing packages like Drizzle,

diff --git a/sci-astronomy/weightwatcher/weightwatcher-1.8.10.ebuild b/sci-astronomy/weightwatcher/weightwatcher-1.8.10.ebuild
index c4a2770..e8b42de 100644
--- a/sci-astronomy/weightwatcher/weightwatcher-1.8.10.ebuild
+++ b/sci-astronomy/weightwatcher/weightwatcher-1.8.10.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=4
 
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="Combine weight maps and polygon for astronomical images weighting"
 HOMEPAGE="http://www.astromatic.net/software/weightwatcher/"
@@ -12,13 +12,18 @@ SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc threads"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-configure.patch
+	eautoreconf
+}
 
 src_install () {
 	default
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins doc/*.pdf
-	fi
+	use doc && dodoc doc/*.pdf
 }

diff --git a/sci-astronomy/weightwatcher/weightwatcher-9999.ebuild b/sci-astronomy/weightwatcher/weightwatcher-9999.ebuild
new file mode 100644
index 0000000..0d12ddd
--- /dev/null
+++ b/sci-astronomy/weightwatcher/weightwatcher-9999.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+if [[ ${PV} == "9999" ]] ; then
+	_SVN=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 ${_SVN} autotools
+
+DESCRIPTION="Combine weight maps and polygon for astronomical images weighting"
+HOMEPAGE="http://www.astromatic.net/software/weightwatcher/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	eautoreconf
+}
+
+src_install () {
+	default
+	use doc && dodoc doc/*
+}