dev-libs/ustr: Sync ebuild with upstream
Previously we were carrying a patch for https://bugs.gentoo.org/732026
which has been accepted into upstream. This also bumps the EAPI to 7.
BUG=none
TEST=sudo emerge dev-libs/ustr
Disallow-Recycled-Builds: test-failures
Change-Id: I93eeb9b08ddd83c8ea7da420a05582b43de6a687
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/portage-stable/+/2558137
Commit-Queue: Fergus Dall <sidereal@google.com>
Commit-Queue: Jorge Lucangeli Obes <jorgelo@chromium.org>
Tested-by: Fergus Dall <sidereal@google.com>
Auto-Submit: Fergus Dall <sidereal@google.com>
Reviewed-by: Jorge Lucangeli Obes <jorgelo@chromium.org>
diff --git a/dev-libs/ustr/files/ustr-1.0.4-gcc_5-check.patch b/dev-libs/ustr/files/ustr-1.0.4-inline-check.patch
similarity index 100%
rename from dev-libs/ustr/files/ustr-1.0.4-gcc_5-check.patch
rename to dev-libs/ustr/files/ustr-1.0.4-inline-check.patch
diff --git a/dev-libs/ustr/metadata.xml b/dev-libs/ustr/metadata.xml
index 0fb02e2..97b72ca 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>
diff --git a/dev-libs/ustr/ustr-1.0.4-r8.ebuild b/dev-libs/ustr/ustr-1.0.4-r9.ebuild
similarity index 89%
rename from dev-libs/ustr/ustr-1.0.4-r8.ebuild
rename to dev-libs/ustr/ustr-1.0.4-r9.ebuild
index c906a86..5123a56 100644
--- a/dev-libs/ustr/ustr-1.0.4-r8.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
@@ -12,7 +12,7 @@
LICENSE="|| ( BSD-2 MIT LGPL-2 )"
SLOT="0"
KEYWORDS="*"
-IUSE="static-libs ustr-import"
+IUSE="ustr-import"
DOCS=(ChangeLog README README-DEVELOPERS AUTHORS NEWS TODO)
@@ -21,15 +21,19 @@
/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}-gcc_5-check.patch"
- epatch "${FILESDIR}/${PN}-1.0.4-build-libs.patch"
+ default
multilib_copy_sources
}
_emake() {
emake \
- USE_STATIC=$(usex static-libs) \
+ USE_STATIC="no" \
AR="$(tc-getAR)" \
CC="$(tc-getCC)" \
CFLAGS="${CFLAGS} ${CPPFLAGS}" \
