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 57D091393F1 for ; Tue, 15 Sep 2015 06:28:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 94F2DE0852; Tue, 15 Sep 2015 06:28:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1D623E0852 for ; Tue, 15 Sep 2015 06:28:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9B460340A99 for ; Tue, 15 Sep 2015 06:28:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2D24018D for ; Tue, 15 Sep 2015 06:28:15 +0000 (UTC) From: "Ian Delaney" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Delaney" Message-ID: <1442298462.a6538bd29209681140f0e7d5f4844f2513287e5c.idella4@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/ustr/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/ustr/ustr-1.0.4-r6.ebuild dev-libs/ustr/ustr-1.0.4-r7.ebuild X-VCS-Directories: dev-libs/ustr/ X-VCS-Committer: idella4 X-VCS-Committer-Name: Ian Delaney X-VCS-Revision: a6538bd29209681140f0e7d5f4844f2513287e5c X-VCS-Branch: master Date: Tue, 15 Sep 2015 06:28:15 +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: 8b4cf749-84ce-4c7d-b3f3-d82d10a8db45 X-Archives-Hash: 0ca9c3e6f658474837b2a1c43f8fc368 commit: a6538bd29209681140f0e7d5f4844f2513287e5c Author: Ian Delaney gentoo org> AuthorDate: Tue Sep 15 06:25:37 2015 +0000 Commit: Ian Delaney gentoo org> CommitDate: Tue Sep 15 06:27:42 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6538bd2 dev-libs/ustr: revbump ustr-1.0.4-r7.ebuild made from base of ustr-1.0.4-r5.ebuild with changes from Bug #556452 correcting patch submitted by user which added changes to the stabled ustr-1.0.4-r5 as the base, removed the brokenustr-1.0.4-r6 ebuild, ack to Arfrever for reporting and providing support to make ustr-1.0.4-r7. Package-Manager: portage-2.2.20.1 .../{ustr-1.0.4-r6.ebuild => ustr-1.0.4-r7.ebuild} | 50 +++++++++++----------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/dev-libs/ustr/ustr-1.0.4-r6.ebuild b/dev-libs/ustr/ustr-1.0.4-r7.ebuild similarity index 56% rename from dev-libs/ustr/ustr-1.0.4-r6.ebuild rename to dev-libs/ustr/ustr-1.0.4-r7.ebuild index 249168b..d898008 100644 --- a/dev-libs/ustr/ustr-1.0.4-r6.ebuild +++ b/dev-libs/ustr/ustr-1.0.4-r7.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/ustr/ustr-1.0.4-r3.ebuild,v 1.4 2014/01/14 13:58:01 ago Exp $ +# $Id$ EAPI=5 -inherit multilib-build toolchain-funcs eutils +inherit toolchain-funcs multilib-minimal DESCRIPTION="Low-overhead managed string library for C" HOMEPAGE="http://www.and.org/ustr" @@ -13,49 +13,51 @@ SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2" LICENSE="|| ( BSD-2 MIT LGPL-2 )" SLOT="0" KEYWORDS="~amd64 ~arm ~mips ~x86" -IUSE="" -DEPEND="" -RDEPEND="" +DOCS=(ChangeLog README README-DEVELOPERS AUTHORS NEWS TODO) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/ustr-conf.h + /usr/include/ustr-conf-debug.h +) src_prepare() { epatch "${FILESDIR}/${P}-gcc_5-check.patch" multilib_copy_sources } -ustr_make() { - emake "$@" \ +multilib_src_compile() { + emake \ AR="$(tc-getAR)" \ CC="$(tc-getCC)" \ CFLAGS="${CFLAGS}" \ LDFLAGS="${LDFLAGS}" \ prefix="${EPREFIX}/usr" \ SHRDIR="/usr/share/${P}" \ - HIDE= || die + HIDE= \ + all-shared } -ustr_install() { - cd "${BUILD_DIR}" || die - - emake "$@" \ +multilib_src_install() { + emake \ DESTDIR="${D}" \ prefix="${EPREFIX}/usr" \ libdir="${EPREFIX}/usr/$(get_libdir)" \ mandir="/usr/share/man" \ SHRDIR="/usr/share/${P}" \ DOCSHRDIR="/usr/share/doc/${PF}" \ - HIDE= || die -} - -src_compile() { - multilib_foreach_abi ustr_make all-shared + HIDE= \ + install } multilib_src_test() { - multilib_foreach_abi ustr_make check -} - -src_install() { - multilib_foreach_abi ustr_install install-multilib-linux - dodoc ChangeLog README README-DEVELOPERS AUTHORS NEWS TODO + emake \ + AR="$(tc-getAR)" \ + CC="$(tc-getCC)" \ + CFLAGS="${CFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + prefix="${EPREFIX}/usr" \ + SHRDIR="/usr/share/${P}" \ + HIDE= \ + check }