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

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 249168bfae46320f489e85319a87a341a57e62e5..d89800819504db4135dc509ee0a7d867048fd3d9 100644 (file)
--- 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
 }