[gentoo-commits] repo/gentoo:master commit in: dev-libs/ustr/

[gentoo-commits] repo/gentoo:master commit in: dev-libs/ustr/

[Ian Delaney]

commit:     a6538bd29209681140f0e7d5f4844f2513287e5c
Author:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 15 06:25:37 2015 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> 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
 }

[gentoo-commits] repo/gentoo:master commit in: dev-libs/ustr/

[Mike Frysinger]

commit:     df0e7ecbea811f1c0274244b1e27efd97d463404
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 17 18:40:27 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Feb 17 18:42:26 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df0e7ecb

dev-libs/ustr: add arm64 love

 dev-libs/ustr/ustr-1.0.4-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/ustr/ustr-1.0.4-r8.ebuild b/dev-libs/ustr/ustr-1.0.4-r8.ebuild
index a540dad..784d946 100644
--- a/dev-libs/ustr/ustr-1.0.4-r8.ebuild
+++ b/dev-libs/ustr/ustr-1.0.4-r8.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
 IUSE="static-libs ustr-import"
 
 DOCS=(ChangeLog README README-DEVELOPERS AUTHORS NEWS TODO)

[gentoo-commits] repo/gentoo:master commit in: dev-libs/ustr/

[Mike Frysinger]

commit:     c2d28f8122e1b55523aa94e657d05ee1be89fcfb
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 17 18:21:04 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Feb 17 18:42:26 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2d28f81

dev-libs/ustr: add a configure stage for cross-compiling

The build system likes to compile & run programs to figure out host
features.  This fails when cross-compiling and such, so add a func
to do all with compile tests.

 dev-libs/ustr/ustr-1.0.4-r7.ebuild | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/dev-libs/ustr/ustr-1.0.4-r7.ebuild b/dev-libs/ustr/ustr-1.0.4-r7.ebuild
index eaf650b..0c7387c 100644
--- a/dev-libs/ustr/ustr-1.0.4-r7.ebuild
+++ b/dev-libs/ustr/ustr-1.0.4-r7.ebuild
@@ -41,6 +41,26 @@ _emake() {
 		"$@"
 }
 
+multilib_src_configure() {
+	# The included configure tests require execution.
+
+	# We require vsnprintf everywhere as it's in POSIX.
+	printf '#!/bin/sh\necho 0\n' > autoconf_vsnprintf
+	chmod a+rx autoconf_vsnprintf
+
+	# Always use stdint.h as it's in POSIX.
+	sed -i '/have_stdint_h=0/s:=0:=1:' Makefile || die
+
+	# Figure out the size of size_t.
+	printf '#include <sys/types.h>\nint main() { char buf[sizeof(size_t) - 8]; }\n' > sizet_test.c
+	 $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -c sizet_test.c 2>/dev/null
+	printf '#!/bin/sh\necho %s\n' $(( $? == 0 )) > autoconf_64b
+	chmod a+rx autoconf_64b
+
+	# Generate the config file now to avoid bad makefile deps.
+	_emake ustr-import
+}
+
 multilib_src_compile() {
 	_emake all-shared
 }

[gentoo-commits] repo/gentoo:master commit in: dev-libs/ustr/

[Mike Frysinger]

commit:     a18c23fc46121edde7c4314bdf6a49b67daf424e
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 17 18:13:16 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Feb 17 18:42:26 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a18c23fc

dev-libs/ustr: unify emake calls

Also fix $EPREFIX usage in more paths, and respect CPPFLAGS settings.

 dev-libs/ustr/ustr-1.0.4-r7.ebuild | 35 +++++++++++++----------------------
 1 file changed, 13 insertions(+), 22 deletions(-)

diff --git a/dev-libs/ustr/ustr-1.0.4-r7.ebuild b/dev-libs/ustr/ustr-1.0.4-r7.ebuild
index d898008..eaf650b 100644
--- a/dev-libs/ustr/ustr-1.0.4-r7.ebuild
+++ b/dev-libs/ustr/ustr-1.0.4-r7.ebuild
@@ -26,38 +26,29 @@ src_prepare() {
 	multilib_copy_sources
 }
 
-multilib_src_compile() {
+_emake() {
 	emake \
 		AR="$(tc-getAR)" \
 		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
+		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}" \
 		prefix="${EPREFIX}/usr" \
-		SHRDIR="/usr/share/${P}" \
+		libdir="${EPREFIX}/usr/$(get_libdir)" \
+		mandir="${EPREFIX}/usr/share/man" \
+		SHRDIR="${EPREFIX}/usr/share/${P}" \
+		DOCSHRDIR="${EPREFIX}/usr/share/doc/${PF}" \
 		HIDE= \
-		all-shared
+		"$@"
+}
+
+multilib_src_compile() {
+	_emake all-shared
 }
 
 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= \
-		install
+	_emake DESTDIR="${D}" install
 }
 
 multilib_src_test() {
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		prefix="${EPREFIX}/usr" \
-		SHRDIR="/usr/share/${P}" \
-		HIDE= \
-		check
+	_emake check
 }

[gentoo-commits] repo/gentoo:master commit in: dev-libs/ustr/

[Agostino Sarubbo]

commit:     af515bdd463b0a5c983e3202a3852839c5d875c7
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 10 13:53:27 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Jun 10 13:53:27 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af515bdd

dev-libs/ustr: amd64 stable wrt bug #584758

Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-libs/ustr/ustr-1.0.4-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/ustr/ustr-1.0.4-r8.ebuild b/dev-libs/ustr/ustr-1.0.4-r8.ebuild
index 784d946..920b3d0 100644
--- a/dev-libs/ustr/ustr-1.0.4-r8.ebuild
+++ b/dev-libs/ustr/ustr-1.0.4-r8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( BSD-2 MIT LGPL-2 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ~x86"
 IUSE="static-libs ustr-import"
 
 DOCS=(ChangeLog README README-DEVELOPERS AUTHORS NEWS TODO)

[gentoo-commits] repo/gentoo:master commit in: dev-libs/ustr/

[Michał Górny]

commit:     0e050884ef6b7b3f707b237ff2576e4c56c441a9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 11 10:31:17 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb 11 10:34:17 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e050884

dev-libs/ustr: Remove useless maintainer <description/>

Remove useless/redundant maintainer <description/>. It does not benefit
bug wrangling, and only wastes developer's time on reading it. Few tips:

- assignee/CC is implied by ordering, there is no reason to repeat it,
- we know that maintainer is maintainer (la la la la la),
- most of adjectives for maintainer are of no value and/or are obvious.

 dev-libs/ustr/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev-libs/ustr/metadata.xml b/dev-libs/ustr/metadata.xml
index 524aa433671..b4a7d9f661c 100644
--- a/dev-libs/ustr/metadata.xml
+++ b/dev-libs/ustr/metadata.xml
@@ -4,7 +4,6 @@
 <maintainer type="person">
 	<email>Yamakuzure@gmx.net</email>
 	<name>Sven Eden</name>
-	<description>Maintainer. Assign bugs to him</description>
 </maintainer>
 <maintainer type="project">
 	<email>proxy-maint@gentoo.org</email>

[gentoo-commits] repo/gentoo:master commit in: dev-libs/ustr/

[Jonas Stein]

commit:     f46457ffc29617006755a8480107e845065e5e3f
Author:     Jonas Stein <jstein <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  2 10:24:35 2018 +0000
Commit:     Jonas Stein <jstein <AT> gentoo <DOT> org>
CommitDate: Mon Apr  2 10:25:00 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f46457ff

dev-libs/ustr: Fix HOMEPAGE redirect

Package-Manager: Portage-2.3.27, Repoman-2.3.9

 dev-libs/ustr/ustr-1.0.4-r5.ebuild | 4 ++--
 dev-libs/ustr/ustr-1.0.4-r7.ebuild | 4 ++--
 dev-libs/ustr/ustr-1.0.4-r8.ebuild | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dev-libs/ustr/ustr-1.0.4-r5.ebuild b/dev-libs/ustr/ustr-1.0.4-r5.ebuild
index 65f80d28750..dc3c5bb1983 100644
--- a/dev-libs/ustr/ustr-1.0.4-r5.ebuild
+++ b/dev-libs/ustr/ustr-1.0.4-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit toolchain-funcs multilib-minimal
 
 DESCRIPTION="Low-overhead managed string library for C"
-HOMEPAGE="http://www.and.org/ustr"
+HOMEPAGE="http://www.and.org/ustr/"
 SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( BSD-2 MIT LGPL-2 )"

diff --git a/dev-libs/ustr/ustr-1.0.4-r7.ebuild b/dev-libs/ustr/ustr-1.0.4-r7.ebuild
index 2219f889229..0d4f3ece9d8 100644
--- a/dev-libs/ustr/ustr-1.0.4-r7.ebuild
+++ b/dev-libs/ustr/ustr-1.0.4-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit toolchain-funcs multilib-minimal
 
 DESCRIPTION="Low-overhead managed string library for C"
-HOMEPAGE="http://www.and.org/ustr"
+HOMEPAGE="http://www.and.org/ustr/"
 SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( BSD-2 MIT LGPL-2 )"

diff --git a/dev-libs/ustr/ustr-1.0.4-r8.ebuild b/dev-libs/ustr/ustr-1.0.4-r8.ebuild
index 0a00eb5d697..6fb52670f3b 100644
--- a/dev-libs/ustr/ustr-1.0.4-r8.ebuild
+++ b/dev-libs/ustr/ustr-1.0.4-r8.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=5
 
 inherit toolchain-funcs multilib-minimal
 
 DESCRIPTION="Low-overhead managed string library for C"
-HOMEPAGE="http://www.and.org/ustr"
+HOMEPAGE="http://www.and.org/ustr/"
 SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( BSD-2 MIT LGPL-2 )"

[gentoo-commits] repo/gentoo:master commit in: dev-libs/ustr/

[Jonas Stein]

commit:     71c84386809001073561c17f49f884a248742558
Author:     Jonas Stein <jstein <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  2 10:08:16 2018 +0000
Commit:     Jonas Stein <jstein <AT> gentoo <DOT> org>
CommitDate: Mon Apr  2 10:24:59 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71c84386

dev-libs/ustr: unified contact mail

Use same string for mail in all packages now.

Package-Manager: Portage-2.3.27, Repoman-2.3.9

 dev-libs/ustr/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/ustr/metadata.xml b/dev-libs/ustr/metadata.xml
index b4a7d9f661c..36a48162dc5 100644
--- a/dev-libs/ustr/metadata.xml
+++ b/dev-libs/ustr/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="person">
-	<email>Yamakuzure@gmx.net</email>
+	<email>yamakuzure@gmx.net</email>
 	<name>Sven Eden</name>
 </maintainer>
 <maintainer type="project">

[gentoo-commits] repo/gentoo:master commit in: dev-libs/ustr/

[Jonas Stein]

commit:     90d1890857bab5bf7b3351aa3ceb3c562d5c64c8
Author:     Jonas Stein <jstein <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 24 17:38:17 2020 +0000
Commit:     Jonas Stein <jstein <AT> gentoo <DOT> org>
CommitDate: Mon Aug 24 17:45:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90d18908

dev-libs/ustr: Maintainer retired

Proxied maintainer retired due to inactivity.
Bug: https://bugs.gentoo.org/633138
Package-Manager: Portage-3.0.4, Repoman-2.3.23
Signed-off-by: Jonas Stein <jstein <AT> gentoo.org>

 dev-libs/ustr/metadata.xml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/dev-libs/ustr/metadata.xml b/dev-libs/ustr/metadata.xml
index 36a48162dc5..0fb02e2df52 100644
--- a/dev-libs/ustr/metadata.xml
+++ b/dev-libs/ustr/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>yamakuzure@gmx.net</email>
-	<name>Sven Eden</name>
-</maintainer>
-<maintainer type="project">
-	<email>proxy-maint@gentoo.org</email>
-	<name>Proxy Maintainers</name>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
 	<flag name="ustr-import">Install ustr-import developer program and source code for bundling.</flag>
 </use>

[gentoo-commits] repo/gentoo:master commit in: dev-libs/ustr/

[Aaron Bauman]

commit:     3acf9f2b38948a2c5a58ec38e99e639448e8f48d
Author:     Sven Eden <sven.eden <AT> prydeworx <DOT> com>
AuthorDate: Sat Nov  7 15:25:39 2020 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Nov 13 21:31:15 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3acf9f2b

dev-libs/ustr: Claim maintainership

Signed-off-by: Sven Eden <sven.eden <AT> prydeworx.com>
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 dev-libs/ustr/metadata.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/dev-libs/ustr/metadata.xml b/dev-libs/ustr/metadata.xml
index 0fb02e2df52..97b72ca3a65 100644
--- a/dev-libs/ustr/metadata.xml
+++ b/dev-libs/ustr/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sven.eden@prydeworx.com</email>
+		<name>Sven Eden</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 <use>
 	<flag name="ustr-import">Install ustr-import developer program and source code for bundling.</flag>
 </use>

[gentoo-commits] repo/gentoo:master commit in: dev-libs/ustr/

[Aaron Bauman]

commit:     d982d08fb09623387f69df96e8906dfab8d7933a
Author:     Sven Eden <sven.eden <AT> prydeworx <DOT> com>
AuthorDate: Sat Nov  7 15:27:24 2020 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Nov 13 21:31:16 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d982d08f

dev-libs/ustr: Drop obsolete ustr-1.0.4-r5.ebuild

Signed-off-by: Sven Eden <sven.eden <AT> prydeworx.com>
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 dev-libs/ustr/ustr-1.0.4-r5.ebuild | 65 --------------------------------------
 1 file changed, 65 deletions(-)

diff --git a/dev-libs/ustr/ustr-1.0.4-r5.ebuild b/dev-libs/ustr/ustr-1.0.4-r5.ebuild
deleted file mode 100644
index dc3c5bb1983..00000000000
--- a/dev-libs/ustr/ustr-1.0.4-r5.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs multilib-minimal
-
-DESCRIPTION="Low-overhead managed string library for C"
-HOMEPAGE="http://www.and.org/ustr/"
-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() {
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		prefix="${EPREFIX}/usr" \
-		SHRDIR="/usr/share/${P}" \
-		HIDE= \
-		all-shared
-}
-
-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= \
-		install
-}
-
-multilib_src_test() {
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		prefix="${EPREFIX}/usr" \
-		SHRDIR="/usr/share/${P}" \
-		HIDE= \
-		check
-}

[gentoo-commits] repo/gentoo:master commit in: dev-libs/ustr/

[Aaron Bauman]

commit:     9c229674248f9a492cf314c76e0d1b7809b21a8c
Author:     Sven Eden <sven.eden <AT> prydeworx <DOT> com>
AuthorDate: Sat Nov  7 15:27:57 2020 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Nov 13 21:31:16 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c229674

dev-libs/ustr: Drop obsolete ustr-1.0.4-r7.ebuild

Signed-off-by: Sven Eden <sven.eden <AT> prydeworx.com>
Closes: https://github.com/gentoo/gentoo/pull/18173
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 dev-libs/ustr/ustr-1.0.4-r7.ebuild | 73 --------------------------------------
 1 file changed, 73 deletions(-)

diff --git a/dev-libs/ustr/ustr-1.0.4-r7.ebuild b/dev-libs/ustr/ustr-1.0.4-r7.ebuild
deleted file mode 100644
index 0d4f3ece9d8..00000000000
--- a/dev-libs/ustr/ustr-1.0.4-r7.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs multilib-minimal
-
-DESCRIPTION="Low-overhead managed string library for C"
-HOMEPAGE="http://www.and.org/ustr/"
-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"
-
-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
-}
-
-_emake() {
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		prefix="${EPREFIX}/usr" \
-		libdir="${EPREFIX}/usr/$(get_libdir)" \
-		mandir="${EPREFIX}/usr/share/man" \
-		SHRDIR="${EPREFIX}/usr/share/${P}" \
-		DOCSHRDIR="${EPREFIX}/usr/share/doc/${PF}" \
-		HIDE= \
-		"$@"
-}
-
-multilib_src_configure() {
-	# The included configure tests require execution.
-
-	# We require vsnprintf everywhere as it's in POSIX.
-	printf '#!/bin/sh\necho 0\n' > autoconf_vsnprintf
-	chmod a+rx autoconf_vsnprintf
-
-	# Always use stdint.h as it's in POSIX.
-	sed -i '/have_stdint_h=0/s:=0:=1:' Makefile || die
-
-	# Figure out the size of size_t.
-	printf '#include <sys/types.h>\nint main() { char buf[sizeof(size_t) - 8]; }\n' > sizet_test.c
-	 $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -c sizet_test.c 2>/dev/null
-	printf '#!/bin/sh\necho %s\n' $(( $? == 0 )) > autoconf_64b
-	chmod a+rx autoconf_64b
-
-	# Generate the config file now to avoid bad makefile deps.
-	_emake ustr-import
-}
-
-multilib_src_compile() {
-	_emake all-shared
-}
-
-multilib_src_install() {
-	_emake DESTDIR="${D}" install
-}
-
-multilib_src_test() {
-	_emake check
-}

[gentoo-commits] repo/gentoo:master commit in: dev-libs/ustr/

[Aaron Bauman]

commit:     586064fddf3896883ef78ccc55bd28d5d3fcd006
Author:     Sven Eden <sven.eden <AT> prydeworx <DOT> com>
AuthorDate: Sat Nov  7 15:23:45 2020 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Nov 13 21:31:15 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=586064fd

dev-libs/ustr-1.0.4-r9 : Update to EAPI 7

Signed-off-by: Sven Eden <sven.eden <AT> prydeworx.com>
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 dev-libs/ustr/ustr-1.0.4-r9.ebuild | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/dev-libs/ustr/ustr-1.0.4-r9.ebuild b/dev-libs/ustr/ustr-1.0.4-r9.ebuild
index 632e404652a..c3bbc52d9eb 100644
--- a/dev-libs/ustr/ustr-1.0.4-r9.ebuild
+++ b/dev-libs/ustr/ustr-1.0.4-r9.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit toolchain-funcs multilib-minimal
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( BSD-2 MIT LGPL-2 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
 IUSE="static-libs ustr-import"
 
 DOCS=(ChangeLog README README-DEVELOPERS AUTHORS NEWS TODO)
@@ -21,9 +21,13 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/ustr-conf-debug.h
 )
 
+PATCHES=(
+	"${FILESDIR}/${P}-inline-check.patch"
+	"${FILESDIR}/${PN}-1.0.4-build-libs.patch"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}/${P}-inline-check.patch"
-	epatch "${FILESDIR}/${PN}-1.0.4-build-libs.patch"
+	default
 	multilib_copy_sources
 }
 

[gentoo-commits] repo/gentoo:master commit in: dev-libs/ustr/

[Aaron Bauman]

commit:     17ee13c5d051f816b564a7c1bbacb6d30c73562b
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 13 22:02:38 2020 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Nov 13 22:05:17 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17ee13c5

dev-libs/ustr: drop static-libs per QA

Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 dev-libs/ustr/ustr-1.0.4-r8.ebuild | 4 ++--
 dev-libs/ustr/ustr-1.0.4-r9.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-libs/ustr/ustr-1.0.4-r8.ebuild b/dev-libs/ustr/ustr-1.0.4-r8.ebuild
index 6fb52670f3b..e625d492455 100644
--- a/dev-libs/ustr/ustr-1.0.4-r8.ebuild
+++ b/dev-libs/ustr/ustr-1.0.4-r8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"
 LICENSE="|| ( BSD-2 MIT LGPL-2 )"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
-IUSE="static-libs ustr-import"
+IUSE="ustr-import"
 
 DOCS=(ChangeLog README README-DEVELOPERS AUTHORS NEWS TODO)
 
@@ -29,7 +29,7 @@ src_prepare() {
 
 _emake() {
 	emake \
-		USE_STATIC=$(usex static-libs) \
+		USE_STATIC="no" \
 		AR="$(tc-getAR)" \
 		CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS} ${CPPFLAGS}" \

diff --git a/dev-libs/ustr/ustr-1.0.4-r9.ebuild b/dev-libs/ustr/ustr-1.0.4-r9.ebuild
index c3bbc52d9eb..184372af56b 100644
--- a/dev-libs/ustr/ustr-1.0.4-r9.ebuild
+++ b/dev-libs/ustr/ustr-1.0.4-r9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"
 LICENSE="|| ( BSD-2 MIT LGPL-2 )"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-IUSE="static-libs ustr-import"
+IUSE="ustr-import"
 
 DOCS=(ChangeLog README README-DEVELOPERS AUTHORS NEWS TODO)
 
@@ -33,7 +33,7 @@ src_prepare() {
 
 _emake() {
 	emake \
-		USE_STATIC=$(usex static-libs) \
+		USE_STATIC="no" \
 		AR="$(tc-getAR)" \
 		CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS} ${CPPFLAGS}" \