commit: 86a18e9318d6bf1b327077e65f5a808ec5b7937d Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Wed Aug 17 13:46:23 2022 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Wed Aug 17 16:21:06 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86a18e93
dev-libs/libcdio: Drop old versions Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> dev-libs/libcdio/Manifest | 1 - .../libcdio/files/libcdio-2.0.0-iso-ioleak.patch | 37 ----------- dev-libs/libcdio/libcdio-2.0.0-r1.ebuild | 76 ---------------------- 3 files changed, 114 deletions(-) diff --git a/dev-libs/libcdio/Manifest b/dev-libs/libcdio/Manifest index abf85af3b16a..5c2a9619040b 100644 --- a/dev-libs/libcdio/Manifest +++ b/dev-libs/libcdio/Manifest @@ -1,2 +1 @@ -DIST libcdio-2.0.0.tar.gz 2354813 BLAKE2B d3ebf9a20004cc8c75d1e6f97a2cea68f490517e34a4cf84f343d717e49cbb9cd612a3c6911894501f16373e3222e7fc6d175fd6d93d1c967cd21502716b22f8 SHA512 8f48cc71d28b427b16f48e50bcaf0aea171055c72a9aeee383ac4374eee1d3d288323814c3a3f308a9ba097aa815319429c1931072897985a3b02b814766fd4f DIST libcdio-2.1.0.tar.bz2 1759040 BLAKE2B 4859fc545cf81246279b7b0434c02916e874681b40d00f8253fd7837941a34c5a717a81b1c3b1714153ad343e03c28668984f6fd5647662ec4e6759752326cb0 SHA512 c290821da55fd9ae366670a58857aa6efcebc9f25b7caea063cf12f9cbda84fe770c5f59f972227fda50517ca58c5f39c0137daa0f93179e3daa45303d8b610f diff --git a/dev-libs/libcdio/files/libcdio-2.0.0-iso-ioleak.patch b/dev-libs/libcdio/files/libcdio-2.0.0-iso-ioleak.patch deleted file mode 100644 index 17732104c3d1..000000000000 --- a/dev-libs/libcdio/files/libcdio-2.0.0-iso-ioleak.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 8c0de2d3f0324ecf3fd135589589dcd783c15556 Mon Sep 17 00:00:00 2001 -From: rocky <[email protected]> -Date: Fri, 16 Feb 2018 09:14:17 -0500 -Subject: Fix small I/O leak when we can't read ISO file - -See Savannah bug #53170. Thanks to David Binderman. ---- - src/iso-read.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/iso-read.c b/src/iso-read.c -index 0541e27..8647485 100644 ---- a/src/iso-read.c -+++ b/src/iso-read.c -@@ -1,5 +1,6 @@ - /* -- Copyright (C) 2004-2006, 2008, 2012-2013, 2017 Rocky Bernstein <[email protected]> -+ Copyright (C) 2004-2006, 2008, 2012-2013, 2017-2018 Rocky Bernstein -+ <[email protected]> - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by -@@ -364,7 +365,10 @@ main(int argc, char *argv[]) - ret = read_iso_file (opts.iso9660_image, opts.file_name, - outfd, &bytes_written); - } -- if (ret != 0) return ret; -+ if (ret != 0) { -+ fclose (outfd); -+ return ret; -+ } - - fflush (outfd); - --- -cgit v1.0-41-gc330 - diff --git a/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild b/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild deleted file mode 100644 index 4144e54f2f0d..000000000000 --- a/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools libtool multilib-minimal toolchain-funcs - -DESCRIPTION="A library to encapsulate CD-ROM reading and control" -HOMEPAGE="https://www.gnu.org/software/libcdio/"; -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0/18" # subslot is based on SONAME -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" -IUSE="cddb +cxx minimal static-libs test" -RESTRICT="!test? ( test )" - -RDEPEND=" - !minimal? ( - >=sys-libs/ncurses-5.7-r7:0= - cddb? ( >=media-libs/libcddb-1.3.2 ) - ) - >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] -" -DEPEND="${RDEPEND} - sys-apps/sed - sys-devel/gettext - virtual/pkgconfig - test? ( dev-lang/perl ) -" - -DOCS=( AUTHORS ChangeLog NEWS README{,.libcdio} THANKS TODO ) - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/cdio/cdio_config.h - /usr/include/cdio/version.h -) - -PATCHES=( "${FILESDIR}/${P}-iso-ioleak.patch" ) - -src_prepare() { - default - - eautoreconf - - sed \ - -e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \ - -i configure || die - - elibtoolize # to prevent -L/usr/lib ending up in the linker line wrt 499510 -} - -multilib_src_configure() { - local util_switch - if ! multilib_is_native_abi || use minimal ; then - util_switch="--without" - else - util_switch="--with" - fi - - # Tests fail if ECONF_SOURCE is not relative - ECONF_SOURCE="../${P}" econf \ - --disable-maintainer-mode \ - $(use_enable cxx) \ - --disable-cpp-progs \ - --disable-example-progs \ - $(use_enable static-libs static) \ - $(use_enable cddb) \ - --disable-vcd-info \ - ${util_switch}-{cd-drive,cd-info,cdda-player,cd-read,iso-info,iso-read} -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -name '*.la' -delete || die -}
