[gentoo-commits] proj/emacs:master commit in: dev-libs/clens/, dev-libs/clens/files/

[gentoo-commits] proj/emacs:master commit in: dev-libs/clens/, dev-libs/clens/files/

[Ulrich Müller]

commit:     86513ec20d2003ee6603b8020ddcf453e98c31a4
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  4 09:13:39 2013 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Oct  4 09:13:39 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=86513ec2

Add longdescription. Remove arc4random USE flag, these functions are redundant with libbsd.

Package-Manager: portage-2.2.7

---
 dev-libs/clens/ChangeLog                             |  5 +++++
 dev-libs/clens/clens-0.7.0.ebuild                    | 14 ++++----------
 dev-libs/clens/files/clens-0.7.0-no-arc4random.patch | 15 +++++++++++++++
 dev-libs/clens/metadata.xml                          | 12 ++++++++----
 4 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/dev-libs/clens/ChangeLog b/dev-libs/clens/ChangeLog
index 9ec0425..88fb604 100644
--- a/dev-libs/clens/ChangeLog
+++ b/dev-libs/clens/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Oct 2013; Ulrich Müller <ulm@gentoo.org> clens-0.7.0.ebuild,
+  +files/clens-0.7.0-no-arc4random.patch, metadata.xml:
+  Add longdescription. Remove arc4random USE flag, these functions are
+  redundant with libbsd.
+
   03 Oct 2013; Ulrich Müller <ulm@gentoo.org> clens-0.7.0.ebuild:
   Fix install location.
 

diff --git a/dev-libs/clens/clens-0.7.0.ebuild b/dev-libs/clens/clens-0.7.0.ebuild
index 2056c97..3823cbe 100644
--- a/dev-libs/clens/clens-0.7.0.ebuild
+++ b/dev-libs/clens/clens-0.7.0.ebuild
@@ -4,30 +4,24 @@
 
 EAPI=5
 
-inherit multilib toolchain-funcs
+inherit eutils multilib toolchain-funcs
 
-DESCRIPTION="Convenience library to aid in porting code from OpenBSD"
+DESCRIPTION="Convenience library to aid in porting OpenBSD code to other OSes"
 HOMEPAGE="https://opensource.conformal.com/wiki/clens"
 SRC_URI="https://opensource.conformal.com/snapshots/${PN}/${P}.tar.gz"
 
 LICENSE="ISC BSD BSD-4"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="arc4random"
-
-DEPEND="arc4random? ( dev-libs/libbsd )"
-RDEPEND="${DEPEND}"
 
 src_prepare() {
-	if ! use arc4random; then
-		sed -i -e "s/arc4random[^.]*\.c//" GNUmakefile || die
-	fi
+	epatch "${FILESDIR}"/${P}-no-arc4random.patch
 	tc-export CC AR
 }
 
 src_install() {
 	emake DESTDIR="${ED}" \
-		INCDIR="/usr/include" \
+		LOCALBASE="/usr" \
 		LIBDIR="/usr/$(get_libdir)" \
 		install
 }

diff --git a/dev-libs/clens/files/clens-0.7.0-no-arc4random.patch b/dev-libs/clens/files/clens-0.7.0-no-arc4random.patch
new file mode 100644
index 0000000..e2e650c
--- /dev/null
+++ b/dev-libs/clens/files/clens-0.7.0-no-arc4random.patch
@@ -0,0 +1,15 @@
+Disable arc4random_buf and arc4random_uniform. These functions would
+need libbsd as dependency for the arc4random function, but they are
+already included in newer versions of that library.
+
+--- clens-0.7.0-orig/include/clens/clens.h
++++ clens-0.7.0/include/clens/clens.h
+@@ -73,8 +73,6 @@
+ #include <stdlib.h>
+ #define NO_UTIL_H
+ 
+-#define NEED_ARC4RANDOM_BUF
+-#define NEED_ARC4RANDOM_UNIFORM
+ #define NEED_STRNVIS
+ #define NEED_STRNUNVIS
+ #define NEED_STRLCAT

diff --git a/dev-libs/clens/metadata.xml b/dev-libs/clens/metadata.xml
index 1e9a010..11fd848 100644
--- a/dev-libs/clens/metadata.xml
+++ b/dev-libs/clens/metadata.xml
@@ -2,8 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>emacs</herd>
-<use>
-  <flag name='arc4random'>Support ARC4 random number generator functions
-    (needs <pkg>dev-libs/libbsd</pkg>)</flag>
-</use>
+<longdescription>
+  clens is a convenience library to aid in porting code from OpenBSD
+  to different operating systems. Operating systems traditionally have
+  different enough APIs that porting code is painful and can litter
+  pretty code with ugly #ifdef goo. In order to keep code readable and
+  drastically reduce the number of #ifdefs needed, clens brings other
+  APIs or missing functions into specific OS "focus".
+</longdescription>
 </pkgmetadata>