[gentoo-commits] proj/sci:master commit in: sci-mathematics/normaliz/

[gentoo-commits] proj/sci:master commit in: sci-mathematics/normaliz/

[Justin Lecher]

commit:     94666d175548ff7902f5440ec3186a4db6ab32f5
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 16:14:47 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 16:14:47 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=94666d17

Cleaned ebuild, unused local USE-description

(Portage version: 2.2.0_alpha41/git/Linux x86_64, signed Manifest commit with key 70EB7916)

---
 sci-mathematics/normaliz/ChangeLog           |    6 +++++-
 sci-mathematics/normaliz/metadata.xml        |   16 ++++++----------
 sci-mathematics/normaliz/normaliz-2.2.ebuild |   13 +++++++------
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/sci-mathematics/normaliz/ChangeLog b/sci-mathematics/normaliz/ChangeLog
index feef2bf..4f18149 100644
--- a/sci-mathematics/normaliz/ChangeLog
+++ b/sci-mathematics/normaliz/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-mathematics/normaliz
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  25 Jun 2011; Justin Lecher <jlec@gentoo.org> normaliz-2.2.ebuild,
+  metadata.xml:
+  Cleaned ebuild, unused local USE-description
+
   03 Nov 2010; Thomas Kahle <tomka@gentoo.org> -normaliz-2.5.ebuild,
   -normaliz-2.5-r1.ebuild, -files/normaliz-2.5-makefile.patch:
   moved to main tree, 2.2 version stays for macaulay2

diff --git a/sci-mathematics/normaliz/metadata.xml b/sci-mathematics/normaliz/metadata.xml
index 2ec8c82..9ca68fe 100644
--- a/sci-mathematics/normaliz/metadata.xml
+++ b/sci-mathematics/normaliz/metadata.xml
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<maintainer>
-  <email>tom111@gmx.de</email>
-  <name>Thomas Kahle</name>
-</maintainer>
-<use>
-  <flag name="extras"> Install the java-gui and Macaulay2/Singular packages.</flag>
-  <flag name="optimization">Accept upstream's choices for -O option, i.e. -O3 almost everywhere.</flag>
-</use>
-<longdescription lang="en">
+	<herd>sci</herd>
+	<maintainer>
+		<email>tom111@gmx.de</email>
+		<name>Thomas Kahle</name>
+	</maintainer>
+	<longdescription lang="en">
 Normaliz is a (command line) tool for computations in affine monoids, vector configurations, lattice polytopes, and
 rational cones.
 </longdescription>

diff --git a/sci-mathematics/normaliz/normaliz-2.2.ebuild b/sci-mathematics/normaliz/normaliz-2.2.ebuild
index de4b90b..d8943d4 100644
--- a/sci-mathematics/normaliz/normaliz-2.2.ebuild
+++ b/sci-mathematics/normaliz/normaliz-2.2.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
+EAPI=4
 
 inherit eutils
 
-DESCRIPTION="Normaliz is a tool for computations in affine monoids and more"
+DESCRIPTION="Computations in affine monoids and more"
 HOMEPAGE="http://www.mathematik.uni-osnabrueck.de/normaliz/"
 SRC_URI="http://www.mathematik.uni-osnabrueck.de/normaliz/Normaliz2.2/Normaliz2.2Linux32.zip"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
@@ -17,15 +18,15 @@ IUSE="doc"
 DEPEND="dev-libs/gmp[-nocxx]"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/Normaliz2.2Linux/source"
+S="${WORKDIR}"/Normaliz2.2Linux/source
 
 src_prepare () {
 	sed -i "s/-O3/${CXXFLAGS}/" Makefile || die "sed on Makefile failed"
 }
 
 src_install() {
-	dobin norm32 norm64 normbig || die "install failed"
+	dobin norm32 norm64 normbig
 	if use doc; then
-		dodoc "../doc/Normaliz2.2Documentation.pdf" || die "install failed"
+		dodoc "../doc/Normaliz2.2Documentation.pdf"
 	fi
 }

[gentoo-commits] proj/sci:master commit in: sci-mathematics/normaliz/

[Thomas Kahle]

commit:     48ec02d770f6a24a7a49ae5e8a1aad3c41d2215c
Author:     Thomas Kahle <tomka <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  8 11:01:00 2011 +0000
Commit:     Thomas Kahle <tom111 <AT> gmx <DOT> de>
CommitDate: Fri Jul  8 11:01:00 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=48ec02d7

Removing long old version of normaliz

---
 sci-mathematics/normaliz/ChangeLog           |   36 --------------------------
 sci-mathematics/normaliz/metadata.xml        |   13 ---------
 sci-mathematics/normaliz/normaliz-2.2.ebuild |   32 -----------------------
 3 files changed, 0 insertions(+), 81 deletions(-)

diff --git a/sci-mathematics/normaliz/ChangeLog b/sci-mathematics/normaliz/ChangeLog
deleted file mode 100644
index 4f18149..0000000
--- a/sci-mathematics/normaliz/ChangeLog
+++ /dev/null
@@ -1,36 +0,0 @@
-# ChangeLog for sci-mathematics/normaliz
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  25 Jun 2011; Justin Lecher <jlec@gentoo.org> normaliz-2.2.ebuild,
-  metadata.xml:
-  Cleaned ebuild, unused local USE-description
-
-  03 Nov 2010; Thomas Kahle <tomka@gentoo.org> -normaliz-2.5.ebuild,
-  -normaliz-2.5-r1.ebuild, -files/normaliz-2.5-makefile.patch:
-  moved to main tree, 2.2 version stays for macaulay2
-
-*normaliz-2.5-r1 (20 Oct 2010)
-
-  20 Oct 2010; Thomas Kahle <tomka@gentoo.org> +normaliz-2.5-r1.ebuild:
-  QA, non-working gui removed.
-
-*normaliz-2.5 (05 Sep 2010)
-
-  05 Sep 2010; Thomas Kahle <tom111@gmx.de> +normaliz-2.5.ebuild,
-  metadata.xml:
-  Bump to 2.5
-
-  14 Aug 2010; Christopher Schwan <cschwan@students.uni-mainz.de>
-  normaliz-2.2.ebuild:
-  Fixed SRC_URI - url has moved because upstream has released 2.5
-
-  04 Mar 2010; Thomas Kahle <tom111@gmx.de> normaliz-2.2.ebuild:
-  QA/ebuild improvements
-
-  4 Sep 2009; Thomas Kahle <tom111@gmx.de> +normaliz-2.2.ebuild
-  +metadata.xml +ChangeLog
-
-  Intial import (Bug #283676)
-
-

diff --git a/sci-mathematics/normaliz/metadata.xml b/sci-mathematics/normaliz/metadata.xml
deleted file mode 100644
index 9ca68fe..0000000
--- a/sci-mathematics/normaliz/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>sci</herd>
-	<maintainer>
-		<email>tom111@gmx.de</email>
-		<name>Thomas Kahle</name>
-	</maintainer>
-	<longdescription lang="en">
-Normaliz is a (command line) tool for computations in affine monoids, vector configurations, lattice polytopes, and
-rational cones.
-</longdescription>
-</pkgmetadata>

diff --git a/sci-mathematics/normaliz/normaliz-2.2.ebuild b/sci-mathematics/normaliz/normaliz-2.2.ebuild
deleted file mode 100644
index d8943d4..0000000
--- a/sci-mathematics/normaliz/normaliz-2.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="Computations in affine monoids and more"
-HOMEPAGE="http://www.mathematik.uni-osnabrueck.de/normaliz/"
-SRC_URI="http://www.mathematik.uni-osnabrueck.de/normaliz/Normaliz2.2/Normaliz2.2Linux32.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="doc"
-
-DEPEND="dev-libs/gmp[-nocxx]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/Normaliz2.2Linux/source
-
-src_prepare () {
-	sed -i "s/-O3/${CXXFLAGS}/" Makefile || die "sed on Makefile failed"
-}
-
-src_install() {
-	dobin norm32 norm64 normbig
-	if use doc; then
-		dodoc "../doc/Normaliz2.2Documentation.pdf"
-	fi
-}