[gentoo-commits] proj/sci:master commit in: sci-libs/libfac/

["Justin Lecher" <jlec@gentoo.org>]

commit:     b84c3c3808512739017cca345a750f03517242cc
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 12:54:42 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 12:54:42 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b84c3c38

Cleaned ebuild and add USE description to metadata.xml

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

---
 sci-libs/libfac/ChangeLog           |    6 +++++-
 sci-libs/libfac/libfac-3.1.0.ebuild |   29 ++++++++++++-----------------
 sci-libs/libfac/libfac-3.1.1.ebuild |   14 +++-----------
 sci-libs/libfac/metadata.xml        |   15 +++++++++------
 4 files changed, 29 insertions(+), 35 deletions(-)

diff --git a/sci-libs/libfac/ChangeLog b/sci-libs/libfac/ChangeLog
index bd7a01c..5ec780e 100644
--- a/sci-libs/libfac/ChangeLog
+++ b/sci-libs/libfac/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-libs/libfac
-# 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> libfac-3.1.0.ebuild,
+  libfac-3.1.1.ebuild, metadata.xml:
+  Cleaned ebuild and add USE description to metadata.xml
+
 *libfac-3.1.1 (07 Jul 2010)
 
   07 Jul 2010; Thomas Kahle <tom111@gmx.de> +libfac-3.1.1.ebuild:

diff --git a/sci-libs/libfac/libfac-3.1.0.ebuild b/sci-libs/libfac/libfac-3.1.0.ebuild
index e49d009..16a3ba3 100644
--- a/sci-libs/libfac/libfac-3.1.0.ebuild
+++ b/sci-libs/libfac/libfac-3.1.0.ebuild
@@ -1,36 +1,31 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=2
 
-inherit eutils
-DESCRIPTION="libfac is an extension of Singular-factory to finite fields"
+inherit eutils versionator
 
-HOMEPAGE="ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Libfac/"
+MY_PV=$(replace_all_version_separators '-')
 
-SRC_URI="ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Libfac/libfac-3-1-0.tar.gz"
+DESCRIPTION="libfac is an extension of Singular-factory to finite fields"
+HOMEPAGE="ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Libfac/"
+SRC_URI="ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Libfac/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-
 IUSE="singular"
 
-DEPEND="singular? ( sci-libs/factory[singular] )
-		!singular? ( sci-libs/factory[-singular] )"
-
+DEPEND=">=sci-libs/factory-${PV}[singular=]"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/libfac"
+S="${WORKDIR}/${PN}"
 
-src_compile() {
+RESTRICT="mirror"
+
+src_configure() {
 	econf --prefix="${D}/usr" \
-		$(use_with singular Singular) ||  die "econf failed"
+		$(use_with singular Singular)
 
-	emake all || die "make failed"
 }
-
-src_install() {
-	emake install || die "Install failed"
-}
\ No newline at end of file

diff --git a/sci-libs/libfac/libfac-3.1.1.ebuild b/sci-libs/libfac/libfac-3.1.1.ebuild
index eb44b9e..16a3ba3 100644
--- a/sci-libs/libfac/libfac-3.1.1.ebuild
+++ b/sci-libs/libfac/libfac-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -10,30 +10,22 @@ MY_PV=$(replace_all_version_separators '-')
 
 DESCRIPTION="libfac is an extension of Singular-factory to finite fields"
 HOMEPAGE="ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Libfac/"
-
 SRC_URI="ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Libfac/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-
 IUSE="singular"
 
 DEPEND=">=sci-libs/factory-${PV}[singular=]"
-
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}"
 
 RESTRICT="mirror"
 
-src_compile() {
+src_configure() {
 	econf --prefix="${D}/usr" \
-		$(use_with singular Singular) ||  die "econf failed"
+		$(use_with singular Singular)
 
-	emake all || die "make failed"
 }
-
-src_install() {
-	emake install || die "Install failed"
-}
\ No newline at end of file

diff --git a/sci-libs/libfac/metadata.xml b/sci-libs/libfac/metadata.xml
index 5530938..2808e85 100644
--- a/sci-libs/libfac/metadata.xml
+++ b/sci-libs/libfac/metadata.xml
@@ -1,12 +1,15 @@
 <?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">
+	<herd>sci</herd>
+	<maintainer>
+		<email>tom111@gmx.de</email>
+		<name>Thomas Kahle</name>
+	</maintainer>
+	<longdescription lang="en">
 libfac is an extension of Singular-factory to finite fields
 </longdescription>
+	<use>
+		<flag name="singular">Automatically generated description for singular</flag>
+	</use>
 </pkgmetadata>