* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ustr/files/, dev-libs/ustr/, profiles/
@ 2021-01-19 8:39 Michał Górny
0 siblings, 0 replies; only message in thread
From: Michał Górny @ 2021-01-19 8:39 UTC (permalink / raw
To: gentoo-commits
commit: 16766288ecd8207d62a79d39bc66fab5333ed0b0
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 19 08:36:17 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jan 19 08:39:07 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16766288
dev-libs/ustr: Remove last-rited pkg
Closes: https://bugs.gentoo.org/652192
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-libs/ustr/Manifest | 1 -
dev-libs/ustr/files/ustr-1.0.4-build-libs.patch | 49 -------------
dev-libs/ustr/files/ustr-1.0.4-gcc_5-check.patch | 28 --------
dev-libs/ustr/files/ustr-1.0.4-inline-check.patch | 27 -------
dev-libs/ustr/metadata.xml | 15 ----
dev-libs/ustr/ustr-1.0.4-r8.ebuild | 83 ---------------------
dev-libs/ustr/ustr-1.0.4-r9.ebuild | 87 -----------------------
profiles/package.mask | 5 --
8 files changed, 295 deletions(-)
diff --git a/dev-libs/ustr/Manifest b/dev-libs/ustr/Manifest
deleted file mode 100644
index b35cbd28771..00000000000
--- a/dev-libs/ustr/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ustr-1.0.4.tar.bz2 233723 BLAKE2B 47fd489cadda1487eb131b9a21148d4b21ad46320f5177a0f3c2b2e156a5756918e269053363d47608661a47d8969b8c505192edea316edbd9fc17649d8dbc91 SHA512 b7df6ca3a9f25ee6f5c9ab4325732d348de27c5e02ebff36a7d5706f56b2df994df35bd652825a28e27bbde731c6a5933248d99c670d192b1952e7534eec1510
diff --git a/dev-libs/ustr/files/ustr-1.0.4-build-libs.patch b/dev-libs/ustr/files/ustr-1.0.4-build-libs.patch
deleted file mode 100644
index 79fe818c8ed..00000000000
--- a/dev-libs/ustr/files/ustr-1.0.4-build-libs.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-make static lib build/install controllable so we can disable it by default
-
-punt the -debug lib variants ... if people want debug libs, they can rebuild
-the package using their desired build settings.
-
---- a/Makefile
-+++ b/Makefile
-@@ -291,8 +291,10 @@
- OPT_LIB_SHARED = libustr-$(VERS_BSO).so.$(VERS_ESO)
- OPT_LIB_STATIC = libustr.a
-
--LIB_SHARED = $(DBG_LIB_SHARED) $(OPT_LIB_SHARED)
--LIB_STATIC = $(DBG_LIB_STATIC) $(OPT_LIB_STATIC)
-+LIB_SHARED = $(OPT_LIB_SHARED)
-+ifeq ($(USE_STATIC),yes)
-+LIB_STATIC = $(OPT_LIB_STATIC)
-+endif
-
- DEPS_NONC_ALL = $(SRC_HDRS) $(SRC_SRCS_H)
- DEPS_C_ALL = $(SRC_HDRS)
-@@ -388,17 +390,14 @@
- install -d $(DESTDIR)$(bindir)
- install -d $(DESTDIR)$(libdir)/pkgconfig
- $(HIDE)echo Installing files
-+ifeq ($(USE_STATIC),yes)
- install -m 644 -t $(DESTDIR)$(libdir) $(LIB_STATIC)
-+endif
- install -m 755 -t $(DESTDIR)$(libdir) $(LIB_SHARED)
- -rm -f $(DESTDIR)$(libdir)/$(OPT_LIB_SHARED_NAME)
- ln -s $(OPT_LIB_SHARED) $(DESTDIR)$(libdir)/$(OPT_LIB_SHARED_NAME)
- -rm -f $(DESTDIR)$(libdir)/$(OPT_LIB_SHAREDEV)
- ln -s $(OPT_LIB_SHARED_NAME) $(DESTDIR)$(libdir)/$(OPT_LIB_SHAREDEV)
-- -rm -f $(DESTDIR)$(libdir)/$(DBG_LIB_SHARED_NAME)
-- ln -s $(DBG_LIB_SHARED) $(DESTDIR)$(libdir)/$(DBG_LIB_SHARED_NAME)
-- -rm -f $(DESTDIR)$(libdir)/$(DBG_LIB_SHAREDEV)
-- ln -s $(DBG_LIB_SHARED_NAME) $(DESTDIR)$(libdir)/$(DBG_LIB_SHAREDEV)
-- $(LDCONFIG) -n $(DESTDIR)$(libdir)
- install -pm 644 -t $(DESTDIR)$(includedir) $(SRC_HDRS)
- install -pm 644 -t $(DESTDIR)$(SHRDIR) $(SRC_SRCS)
- install -pm 644 -t $(DESTDIR)$(SHRDIR) $(XSRC_SRCS)
-@@ -406,7 +406,7 @@ endif
- install -pm 644 -t $(DESTDIR)$(mandir)/man1 $(MAN_PAGES_1)
- install -pm 644 -t $(DESTDIR)$(mandir)/man3 $(MAN_PAGES_3)
- install -m 755 -t $(DESTDIR)$(bindir) ustr-import
-- install -pm 644 -t $(DESTDIR)$(libdir)/pkgconfig ustr.pc ustr-debug.pc
-+ install -pm 644 -t $(DESTDIR)$(libdir)/pkgconfig ustr.pc
-
- ustr-import-multilib: ustr-import-multilib.in
- sed -e 's,@INCLUDEDIR@,$(includedir),g' -e 's,@MBINDIR@,$(MBINDIR),g' < $< > $@
diff --git a/dev-libs/ustr/files/ustr-1.0.4-gcc_5-check.patch b/dev-libs/ustr/files/ustr-1.0.4-gcc_5-check.patch
deleted file mode 100644
index aaed1503030..00000000000
--- a/dev-libs/ustr/files/ustr-1.0.4-gcc_5-check.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/ustr-conf.h.in 2007-10-22 08:00:55.000000000 +0200
-+++ b/ustr-conf.h.in 2015-09-10 12:24:34.998796842 +0200
-@@ -4,13 +4,24 @@
- /* this is the custom version for the library itself, for everyone else
- * ustr-import generates one depending on the options. */
-
-+/* If this is GCC with major version 5 and up, the default C standard
-+ * has changed from C89 to C99 so the old inline behaviour must be
-+ * restored:
-+ */
-+#if defined(__GNUC__) \
-+ && (__GNUC__ > 4) \
-+ && defined(__STDC_VERSION__) \
-+ && (__STDC_VERSION__ >= 199901L)
-+# define inline inline __attribute__ ((gnu_inline))
-+#endif /* GCC greater than major version 4 and not -std=c89 set */
-+
- /* The default is now to link against libc. */
- #ifndef USTR_CONF_INCLUDE_CODEONLY_HEADERS
- #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 0
- #endif
-
- /* We can't: if defined(__GLIBC__) && (!defined(_GNU_SOURCE) || !_GNU_SOURCE)
-- * because by the time we've included a libc header it's too late. */
-+ * because by the time we've included a libc header it's too late. */
- #ifndef _GNU_SOURCE
- #define _GNU_SOURCE 1
- #endif
diff --git a/dev-libs/ustr/files/ustr-1.0.4-inline-check.patch b/dev-libs/ustr/files/ustr-1.0.4-inline-check.patch
deleted file mode 100644
index b38cf7829c9..00000000000
--- a/dev-libs/ustr/files/ustr-1.0.4-inline-check.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/ustr-conf.h.in 2007-10-22 08:00:55.000000000 +0200
-+++ b/ustr-conf.h.in 2015-09-10 12:24:34.998796842 +0200
-@@ -4,13 +4,23 @@
- /* this is the custom version for the library itself, for everyone else
- * ustr-import generates one depending on the options. */
-
-+/* Ustr relies on GCC's traditional handling of inline functions, not
-+ * the version that was actually standardized in C99. GCC-compatible
-+ * compilers define __GNUC_STDC_INLINE__ when using the standard
-+ * behavior. When this is set we must restore the old inline behavior:
-+ */
-+#if defined(__GNUC__) \
-+ && defined(__GNUC_STDC_INLINE__)
-+# define inline inline __attribute__ ((gnu_inline))
-+#endif
-+
- /* The default is now to link against libc. */
- #ifndef USTR_CONF_INCLUDE_CODEONLY_HEADERS
- #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 0
- #endif
-
- /* We can't: if defined(__GLIBC__) && (!defined(_GNU_SOURCE) || !_GNU_SOURCE)
-- * because by the time we've included a libc header it's too late. */
-+ * because by the time we've included a libc header it's too late. */
- #ifndef _GNU_SOURCE
- #define _GNU_SOURCE 1
- #endif
diff --git a/dev-libs/ustr/metadata.xml b/dev-libs/ustr/metadata.xml
deleted file mode 100644
index 97b72ca3a65..00000000000
--- a/dev-libs/ustr/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <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>
-</pkgmetadata>
diff --git a/dev-libs/ustr/ustr-1.0.4-r8.ebuild b/dev-libs/ustr/ustr-1.0.4-r8.ebuild
deleted file mode 100644
index 8515c489b47..00000000000
--- a/dev-libs/ustr/ustr-1.0.4-r8.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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 ~arm64 ~mips x86"
-IUSE="ustr-import"
-
-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"
- epatch "${FILESDIR}/${PN}-1.0.4-build-libs.patch"
- multilib_copy_sources
-}
-
-_emake() {
- emake \
- USE_STATIC="no" \
- 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
-
- if ! use ustr-import ; then
- rm -r \
- "${ED}/usr/bin/ustr-import" \
- "${ED}/usr/share/man/man1/ustr-import.1" \
- "${ED}/usr/share/${P}" || die
- fi
-}
-
-multilib_src_test() {
- _emake check
-}
diff --git a/dev-libs/ustr/ustr-1.0.4-r9.ebuild b/dev-libs/ustr/ustr-1.0.4-r9.ebuild
deleted file mode 100644
index 184372af56b..00000000000
--- a/dev-libs/ustr/ustr-1.0.4-r9.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~arm64 ~mips ~x86"
-IUSE="ustr-import"
-
-DOCS=(ChangeLog README README-DEVELOPERS AUTHORS NEWS TODO)
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/ustr-conf.h
- /usr/include/ustr-conf-debug.h
-)
-
-PATCHES=(
- "${FILESDIR}/${P}-inline-check.patch"
- "${FILESDIR}/${PN}-1.0.4-build-libs.patch"
-)
-
-src_prepare() {
- default
- multilib_copy_sources
-}
-
-_emake() {
- emake \
- USE_STATIC="no" \
- 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
-
- if ! use ustr-import ; then
- rm -r \
- "${ED}/usr/bin/ustr-import" \
- "${ED}/usr/share/man/man1/ustr-import.1" \
- "${ED}/usr/share/${P}" || die
- fi
-}
-
-multilib_src_test() {
- _emake check
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index 08f8db56b54..f05d2c47d5d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -303,11 +303,6 @@ dev-db/aerospike-server-community
# Removal in 30 days. Bug #744217.
app-text/peg-markdown
-# Michał Górny <mgorny@gentoo.org> (2020-12-18)
-# Abandoned in 2008. No reverse dependencies left.
-# Removal in 30 days. Bug #652192.
-dev-libs/ustr
-
# Lars Wendler <polynomial-c@gentoo.org> (2020-12-09)
# Masked until most broken packages have been fixed (bug #732648)
>=sys-devel/autoconf-2.70
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-01-19 8:39 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-19 8:39 [gentoo-commits] repo/gentoo:master commit in: dev-libs/ustr/files/, dev-libs/ustr/, profiles/ Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox