From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 494BE15812D for ; Tue, 07 Jan 2025 05:20:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 787E6E05AC; Tue, 07 Jan 2025 05:20:36 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 61217E0636 for ; Tue, 07 Jan 2025 05:20:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 839C5340C57 for ; Tue, 07 Jan 2025 05:20:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A66521D29 for ; Tue, 07 Jan 2025 05:20:33 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1736227130.1cadec7738558a8297ef441886014756e0028426.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/iniparser/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/iniparser/iniparser-4.1-r1.ebuild dev-libs/iniparser/iniparser-4.1-r2.ebuild X-VCS-Directories: dev-libs/iniparser/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 1cadec7738558a8297ef441886014756e0028426 X-VCS-Branch: master Date: Tue, 07 Jan 2025 05:20:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 225a7021-aa0d-4d8c-a266-8f61866607b1 X-Archives-Hash: 1392e2ac1a6db16272d85061aa877acd commit: 1cadec7738558a8297ef441886014756e0028426 Author: Ionen Wolkens gentoo org> AuthorDate: Tue Jan 7 02:44:15 2025 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Tue Jan 7 05:18:50 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cadec77 dev-libs/iniparser: unslot iniparser-4.1 Unslot straight-to-stable to avoid headaches, only has a handful of minor revdeps so not really critical. Would've been simpler to drop 4.1 and just do 4.2.x but can let that one go through normal stabilization (changes build system). Bug: https://bugs.gentoo.org/933610 Signed-off-by: Ionen Wolkens gentoo.org> dev-libs/iniparser/iniparser-4.1-r1.ebuild | 75 ------------------------------ dev-libs/iniparser/iniparser-4.1-r2.ebuild | 58 +++++++++++++++++++++++ 2 files changed, 58 insertions(+), 75 deletions(-) diff --git a/dev-libs/iniparser/iniparser-4.1-r1.ebuild b/dev-libs/iniparser/iniparser-4.1-r1.ebuild deleted file mode 100644 index c47f61626075..000000000000 --- a/dev-libs/iniparser/iniparser-4.1-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs flag-o-matic - -DESCRIPTION="A free stand-alone ini file parsing library" -HOMEPAGE="https://github.com/ndevilla/iniparser" -SRC_URI="https://github.com/ndevilla/iniparser/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="4" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="doc examples" - -BDEPEND="doc? ( app-text/doxygen )" - -PATCHES=( - "${FILESDIR}"/${P}-CVE-null-getstring.patch # upstream, bug #907928 -) - -_newlib_so_with_symlinks() { - local source="${1}" base="${2}" current="${3}" revision="${4}" age="${5}" - - newlib.so ${source} ${base}.so.${current}.${revision}.${age} - local i - for i in ".${current}" '' ; do - dosym ${base}.so.${current}.${revision}.${age} /usr/$(get_libdir)/${base}.so${i} - done -} - -src_prepare() { - default - rm -r html || die -} - -src_configure() { - append-lfs-flags -} - -_emake() { - emake CC="$(tc-getCC)" AR="$(tc-getAR)" V=1 \ - SO_TARGET=lib${PN}${SLOT}.so.1 \ - ADDITIONAL_CFLAGS= \ - "$@" -} - -src_compile() { - _emake -} - -src_test() { - _emake -C test -} - -src_install() { - _newlib_so_with_symlinks lib${PN}${SLOT}.so.1 lib${PN}${SLOT} 1 0 0 - - insinto /usr/include/${PN}${SLOT} - doins src/*.h - - if use doc; then - emake -C doc - HTML_DOCS=( html/. ) - fi - - if use examples; then - docinto examples - dodoc -r example/. - docompress -x /usr/share/doc/${PF}/examples - fi - - einstalldocs -} diff --git a/dev-libs/iniparser/iniparser-4.1-r2.ebuild b/dev-libs/iniparser/iniparser-4.1-r2.ebuild new file mode 100644 index 000000000000..d48fac06d4e7 --- /dev/null +++ b/dev-libs/iniparser/iniparser-4.1-r2.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs flag-o-matic + +DESCRIPTION="Free stand-alone ini file parsing library" +HOMEPAGE="https://github.com/ndevilla/iniparser/" +SRC_URI=" + https://github.com/ndevilla/iniparser/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz +" + +LICENSE="MIT" +SLOT="0/1" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="doc examples" + +BDEPEND="doc? ( app-text/doxygen )" + +PATCHES=( + "${FILESDIR}"/${P}-CVE-null-getstring.patch +) + +src_prepare() { + default + + rm -r html || die +} + +src_compile() { + append-lfs-flags + tc-export AR CC + + emake V=1 ADDITIONAL_CFLAGS= + use doc && emake -C doc +} + +src_test() { + emake V=1 -C test +} + +src_install() { + dolib.so lib${PN}.so.1 + dosym -r /usr/$(get_libdir)/lib${PN}.so{.1,} + + doheader src/*.h + + if use examples; then + docinto examples + dodoc -r example/. + docompress -x /usr/share/doc/${PF}/examples + fi + + use doc && local HTML_DOCS=( html/. ) + einstalldocs +}