From abaa75b10f899ada8dd05b23cc03205064394bc6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 22 Jan 2021 20:28:19 +0000 Subject: gentoo resync : 22.01.2021 --- dev-libs/ustr/Manifest | 7 -- 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 ----------------------- 7 files changed, 296 deletions(-) delete mode 100644 dev-libs/ustr/Manifest delete mode 100644 dev-libs/ustr/files/ustr-1.0.4-build-libs.patch delete mode 100644 dev-libs/ustr/files/ustr-1.0.4-gcc_5-check.patch delete mode 100644 dev-libs/ustr/files/ustr-1.0.4-inline-check.patch delete mode 100644 dev-libs/ustr/metadata.xml delete mode 100644 dev-libs/ustr/ustr-1.0.4-r8.ebuild delete mode 100644 dev-libs/ustr/ustr-1.0.4-r9.ebuild (limited to 'dev-libs/ustr') diff --git a/dev-libs/ustr/Manifest b/dev-libs/ustr/Manifest deleted file mode 100644 index 9c6a31c4e408..000000000000 --- a/dev-libs/ustr/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX ustr-1.0.4-build-libs.patch 2058 BLAKE2B 93162c8a35b892dd55a5334bbbfc718be959d597f969fdf1a712b49e490d04510268dad927ecdd2c9333eeb39c9091240887bb59b9b69a7e6e7887654c4676dc SHA512 122c38e4779526ae821341b10757454b28c35d59d99aee919d23f691fc06b019983467c5bdd0b8ca8d3e939e357e9bb588f61d4dd2ebb33235d720d637f20f86 -AUX ustr-1.0.4-gcc_5-check.patch 1087 BLAKE2B bd0414477fa789f5f6c3ef5292bd5b58f7fa8c396a739752c3fc5c4e8b456912273c5ab5fce6cc4a71830c003ac5c8e43d371177f2ed07abe3e614cff8bffb69 SHA512 b669a40929cf45cb83aa5c738cb58676cc9c08ee6c84dd7c79352c6aaa7aa36526a0878e98d78b45cfe3c7f62e9b014fe9eaf01fb1b4b460658cfcb1e77d7dab -AUX ustr-1.0.4-inline-check.patch 1098 BLAKE2B d51410975458329f1587f747d03cfec52e212e8b22e20f159db254007fb2b29b30c335e3912443797c1c03132e7d4dc584b6d66962cb8982e3782b326c9af46d SHA512 08559671006e20f8cfb10e85738e420529822ec916acca29ab14f3f0ab77805b102ae5a60779f09978e334c167550a62eb960853d5821e308c056b4fec93117e -DIST ustr-1.0.4.tar.bz2 233723 BLAKE2B 47fd489cadda1487eb131b9a21148d4b21ad46320f5177a0f3c2b2e156a5756918e269053363d47608661a47d8969b8c505192edea316edbd9fc17649d8dbc91 SHA512 b7df6ca3a9f25ee6f5c9ab4325732d348de27c5e02ebff36a7d5706f56b2df994df35bd652825a28e27bbde731c6a5933248d99c670d192b1952e7534eec1510 -EBUILD ustr-1.0.4-r8.ebuild 2028 BLAKE2B 6a6ca22ce593a1c804845b15a01da4c9a8d05434a3adf3af99c2cb55a5b6dd2938e2aacd1c6efe01d2988ed41d599a505e49f68981cc40cf4e1f862ae0b320e2 SHA512 34758bb22166a92f73e7e0324d5cd3d00927e1e540d3d062d07d77eb63d5b3c9101230de1a9b4f82e4ad1a4f7e05f5aae8b8b6f40939606aad8500640ff600f3 -EBUILD ustr-1.0.4-r9.ebuild 2039 BLAKE2B 1e24b6bd04be4535078479c7768b5c9434bed53d05f2711d0444a899262c53f35df90d5f155a5356e4461d570febc76e5cac244248327483c9679f0179997f89 SHA512 e58e53e73b4a8024a1531c19f13d919acf81d9714e60f7093a2b65c9ff1a857cabbe4ddd9c0854dc4d4e8acac7367630aa6082c1adb5573896c7c3f435849c9c -MISC metadata.xml 479 BLAKE2B 4d19665a6413f27085ed035e5cd7fef83bae1d56dd2368079ec3166dd2a7e324ec1970aae754cec809014b5248fdc58053aff6277f3ae804d6f1e3300370984f SHA512 bf3530e0e77ddeaf0c97d4290d0f0a6101ceebfc41bc6df8758ed47938f2c791359ff723964bb8159e76fac6fb6ca64f1dee18a2e7fe445bbf59571a71d5bd3b 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 79fe818c8edf..000000000000 --- 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 aaed1503030a..000000000000 --- 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 b38cf7829c9f..000000000000 --- 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 97b72ca3a65d..000000000000 --- a/dev-libs/ustr/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - sven.eden@prydeworx.com - Sven Eden - - - proxy-maint@gentoo.org - Proxy Maintainers - - - Install ustr-import developer program and source code for bundling. - - 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 8515c489b472..000000000000 --- 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 \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 184372af56b2..000000000000 --- 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 \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 -} -- cgit v1.2.3