[gentoo-commits] proj/gamerlay:master commit in: dev-libs/d0_blind_id/

["Nikoli" <nikoli@lavabit.com>]

commit:     2322095fd9f9e7469459d1f55ee615930fbf69b2
Author:     Nikoli <nikoli <AT> lavabit <DOT> com>
AuthorDate: Thu Sep  8 17:26:31 2011 +0000
Commit:     Nikoli <nikoli <AT> lavabit <DOT> com>
CommitDate: Thu Sep  8 17:26:31 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=2322095f

d0_blind_id: version bump, add USE tommath, cosmetics

(Portage version: 2.1.10.11/git/Linux x86_64, unsigned Manifest commit)

---
 dev-libs/d0_blind_id/ChangeLog                     |    6 +++
 ...blind_id-9999.ebuild => d0_blind_id-0.3.ebuild} |   41 ++++---------------
 dev-libs/d0_blind_id/d0_blind_id-9999.ebuild       |   37 +++++-------------
 dev-libs/d0_blind_id/metadata.xml                  |    3 +-
 4 files changed, 27 insertions(+), 60 deletions(-)

diff --git a/dev-libs/d0_blind_id/ChangeLog b/dev-libs/d0_blind_id/ChangeLog
index 2e31f25..45b9827 100644
--- a/dev-libs/d0_blind_id/ChangeLog
+++ b/dev-libs/d0_blind_id/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*d0_blind_id-0.3 (08 Sep 2011)
+
+  08 Sep 2011; Nikoli <nikoli@lavabit.com> +d0_blind_id-0.3.ebuild,
+  d0_blind_id-9999.ebuild, metadata.xml:
+  version bump, add USE tommath, cosmetics
+
   05 Jul 2011; Nikoli <nikoli@lavabit.com> d0_blind_id-9999.ebuild:
   migrate to git-2 and EAPI4
 

diff --git a/dev-libs/d0_blind_id/d0_blind_id-9999.ebuild b/dev-libs/d0_blind_id/d0_blind_id-0.3.ebuild
similarity index 51%
copy from dev-libs/d0_blind_id/d0_blind_id-9999.ebuild
copy to dev-libs/d0_blind_id/d0_blind_id-0.3.ebuild
index ca57d55..e9938d1 100644
--- a/dev-libs/d0_blind_id/d0_blind_id-9999.ebuild
+++ b/dev-libs/d0_blind_id/d0_blind_id-0.3.ebuild
@@ -4,59 +4,36 @@
 
 EAPI="4"
 
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-2"
-fi
-inherit autotools $SCM
-
 DESCRIPTION="Blind-ID library for user identification using RSA blind signatures"
 HOMEPAGE="http://git.xonotic.org/?p=xonotic/d0_blind_id.git;a=summary"
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	EGIT_REPO_URI="git://git.xonotic.org/xonotic/${PN}.git"
-else
-	SRC_URI="http://git.xonotic.org/?p=xonotic/${PN}.git;a=snapshot;h=xonotic-v${PV/_pre/preview};sf=zip -> ${P}.zip"
-fi
+SRC_URI="https://github.com/downloads/divVerent/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86"
-fi
-IUSE="crypt openssl static-libs"
+KEYWORDS="~amd64 ~x86"
+IUSE="crypt openssl static-libs tommath"
+REQUIRED_USE="openssl? ( !tommath )"
 
 RDEPEND="
-	!openssl? ( dev-libs/gmp )
+	openssl? ( !tommath? ( dev-libs/gmp ) )
 	openssl? ( dev-libs/openssl )
+	tommath? ( dev-libs/libtommath )
 "
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 "
+DOCS=( d0_blind_id.txt )
 
 pkg_setup() {
 	use crypt || ewarn "You will have no encryption, only authentication."
 	use openssl && ewarn "OpenSSL is for Mac OS X users only, GMP is faster."
-}
-
-src_prepare() {
-	if [ "${PV#9999}" = "${PV}" ] ; then
-		mv d0_blind_id-xonotic-v0.1.0preview-* ${P} || die
-		cd "${S}"
-	fi
-
-	eautoreconf
+	use tommath && ewarn "You enabled libtommath, GMP is faster."
 }
 
 src_configure() {
 	econf \
 		$(use_enable crypt rijndael) \
 		$(use_with openssl) \
+		$(use_with tommath) \
 		$(use_enable static-libs static)
 }
-
-src_install() {
-	default
-
-	dodoc d0_blind_id.txt
-}

diff --git a/dev-libs/d0_blind_id/d0_blind_id-9999.ebuild b/dev-libs/d0_blind_id/d0_blind_id-9999.ebuild
index ca57d55..fbb9d41 100644
--- a/dev-libs/d0_blind_id/d0_blind_id-9999.ebuild
+++ b/dev-libs/d0_blind_id/d0_blind_id-9999.ebuild
@@ -4,47 +4,35 @@
 
 EAPI="4"
 
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-2"
-fi
-inherit autotools $SCM
+inherit autotools git-2
 
 DESCRIPTION="Blind-ID library for user identification using RSA blind signatures"
 HOMEPAGE="http://git.xonotic.org/?p=xonotic/d0_blind_id.git;a=summary"
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	EGIT_REPO_URI="git://git.xonotic.org/xonotic/${PN}.git"
-else
-	SRC_URI="http://git.xonotic.org/?p=xonotic/${PN}.git;a=snapshot;h=xonotic-v${PV/_pre/preview};sf=zip -> ${P}.zip"
-fi
+EGIT_REPO_URI="git://git.xonotic.org/xonotic/${PN}.git"
 
 LICENSE="BSD"
 SLOT="0"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86"
-fi
-IUSE="crypt openssl static-libs"
+KEYWORDS=""
+IUSE="crypt openssl static-libs tommath"
+REQUIRED_USE="openssl? ( !tommath )"
 
 RDEPEND="
-	!openssl? ( dev-libs/gmp )
+	openssl? ( !tommath? ( dev-libs/gmp ) )
 	openssl? ( dev-libs/openssl )
+	tommath? ( dev-libs/libtommath )
 "
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 "
+DOCS=( d0_blind_id.txt )
 
 pkg_setup() {
 	use crypt || ewarn "You will have no encryption, only authentication."
 	use openssl && ewarn "OpenSSL is for Mac OS X users only, GMP is faster."
+	use tommath && ewarn "You enabled libtommath, GMP is faster."
 }
 
 src_prepare() {
-	if [ "${PV#9999}" = "${PV}" ] ; then
-		mv d0_blind_id-xonotic-v0.1.0preview-* ${P} || die
-		cd "${S}"
-	fi
-
 	eautoreconf
 }
 
@@ -52,11 +40,6 @@ src_configure() {
 	econf \
 		$(use_enable crypt rijndael) \
 		$(use_with openssl) \
+		$(use_with tommath) \
 		$(use_enable static-libs static)
 }
-
-src_install() {
-	default
-
-	dodoc d0_blind_id.txt
-}

diff --git a/dev-libs/d0_blind_id/metadata.xml b/dev-libs/d0_blind_id/metadata.xml
index 95596f0..9196edc 100644
--- a/dev-libs/d0_blind_id/metadata.xml
+++ b/dev-libs/d0_blind_id/metadata.xml
@@ -7,6 +7,7 @@
 		<name>Nikoli</name>
 	</maintainer>
 	<use>
-        	<flag name='openssl'>Use OpenSSL instead of GMP (beware of the OpenSSL license), for Mac OS X users only, GMP is faster.</flag>
+		<flag name='openssl'>Use OpenSSL instead of GMP (beware of the OpenSSL license), for Mac OS X users only, GMP is faster.</flag>
+		<flag name='tommath'>Use libtommath instead of GMP (slow, but WTFPL)</flag>
 	</use>
 </pkgmetadata>