From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 642DF1381F3 for ; Fri, 4 Oct 2013 09:14:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F4023E0995; Fri, 4 Oct 2013 09:14:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 77019E0995 for ; Fri, 4 Oct 2013 09:14:55 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6B27433EEC5 for ; Fri, 4 Oct 2013 09:14:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 059EEE5308 for ; Fri, 4 Oct 2013 09:14:52 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1380878019.86513ec20d2003ee6603b8020ddcf453e98c31a4.ulm@gentoo> Subject: [gentoo-commits] proj/emacs:master commit in: dev-libs/clens/, dev-libs/clens/files/ X-VCS-Repository: proj/emacs X-VCS-Files: dev-libs/clens/ChangeLog dev-libs/clens/clens-0.7.0.ebuild dev-libs/clens/files/clens-0.7.0-no-arc4random.patch dev-libs/clens/metadata.xml X-VCS-Directories: dev-libs/clens/ dev-libs/clens/files/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 86513ec20d2003ee6603b8020ddcf453e98c31a4 X-VCS-Branch: master Date: Fri, 4 Oct 2013 09:14:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 84bbb129-801f-4bce-baa7-e07ba1864858 X-Archives-Hash: 65cb4427f99cabf244652a9b1288cd81 commit: 86513ec20d2003ee6603b8020ddcf453e98c31a4 Author: Ulrich Müller gentoo org> AuthorDate: Fri Oct 4 09:13:39 2013 +0000 Commit: Ulrich Müller gentoo 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 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 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 + #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 @@ emacs - - Support ARC4 random number generator functions - (needs dev-libs/libbsd) - + + 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". +