commit:     e49dc5a0591d627ba8617a482451887bfc365168
Author:     Filip Kobierski <fkobi <AT> pm <DOT> me>
AuthorDate: Mon Jan 20 19:42:19 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb  9 07:43:31 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e49dc5a0

dev-libs/libcdio: add 2.2.0 with new upstream

- update SRC_URI
- fix LICENSE
- drop merged PATCHES
- drop LDD17 workaround
- simplify util_switch assignment
- sort myeconfargs
- fix DOCS & drop TODO from there

closing the second bug as it's obsolete

Closes: https://bugs.gentoo.org/601166
Closes: https://bugs.gentoo.org/881625
Signed-off-by: Filip Kobierski <fkobi <AT> pm.me>
Closes: https://github.com/gentoo/gentoo/pull/40233
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/libcdio/Manifest             |  1 +
 dev-libs/libcdio/libcdio-2.2.0.ebuild | 78 +++++++++++++++++++++++++++++++++++
 2 files changed, 79 insertions(+)

diff --git a/dev-libs/libcdio/Manifest b/dev-libs/libcdio/Manifest
index 5c2a9619040b..43e58cdec241 100644
--- a/dev-libs/libcdio/Manifest
+++ b/dev-libs/libcdio/Manifest
@@ -1 +1,2 @@
 DIST libcdio-2.1.0.tar.bz2 1759040 BLAKE2B 
4859fc545cf81246279b7b0434c02916e874681b40d00f8253fd7837941a34c5a717a81b1c3b1714153ad343e03c28668984f6fd5647662ec4e6759752326cb0
 SHA512 
c290821da55fd9ae366670a58857aa6efcebc9f25b7caea063cf12f9cbda84fe770c5f59f972227fda50517ca58c5f39c0137daa0f93179e3daa45303d8b610f
+DIST libcdio-2.2.0.tar.bz2 1729378 BLAKE2B 
fa5936138ea01e244fdf406b68bf0669f435a3d5ec94caae30e502d9a4ec87412fa4a33b1eb089000d1545105308f46df1a4e1e51862ea804c166c64e76c23b4
 SHA512 
815920ce381b70292751ca956b16e9b8a4e2b9327944e104e3e46d4df1457e49f9a772df527e8208e497941d2cc445361ffd42cd2ec3ff07526bc83711fc9501

diff --git a/dev-libs/libcdio/libcdio-2.2.0.ebuild 
b/dev-libs/libcdio/libcdio-2.2.0.ebuild
new file mode 100644
index 000000000000..a85d3c12940e
--- /dev/null
+++ b/dev-libs/libcdio/libcdio-2.2.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic libtool multilib-minimal
+
+DESCRIPTION="A library to encapsulate CD-ROM reading and control"
+HOMEPAGE="https://www.gnu.org/software/libcdio/";
+SRC_URI="https://github.com/libcdio/libcdio/releases/download/${PV}/${P}.tar.bz2";
+
+LICENSE="FDL-1.2+ GPL-2+ GPL-3+ LGPL-2.1+"
+SLOT="0/19" # subslot is based on SONAME
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+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}"
+BDEPEND="
+       sys-devel/gettext
+       virtual/pkgconfig
+       test? ( dev-lang/perl )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS.md README{,-libcdio}.md THANKS )
+
+MULTILIB_WRAPPED_HEADERS=(
+       /usr/include/cdio/cdio_config.h
+       /usr/include/cdio/version.h
+)
+
+PATCHES=(
+       "${FILESDIR}/${PN}-2.1.0-ncurses_pkgconfig.patch"
+)
+
+src_prepare() {
+       default
+
+       eautoreconf
+       elibtoolize # to prevent -L/usr/lib ending up in the linker line wrt 
#499510
+}
+
+multilib_src_configure() {
+       # -Werror=lto-type-mismatch
+       # https://bugs.gentoo.org/855701
+       # https://savannah.gnu.org/bugs/index.php?65458
+       filter-lto
+
+       local util_switch="--with"
+       if ! multilib_is_native_abi || use minimal ; then
+               util_switch="--without"
+       fi
+
+       local myeconfargs=(
+               --disable-maintainer-mode
+               --disable-cpp-progs
+               --disable-example-progs
+               --disable-vcd-info
+               $(use_enable cddb)
+               $(use_enable cxx)
+               $(use_enable static-libs static)
+               
${util_switch}-{cd-drive,cd-info,cdda-player,cd-read,iso-info,iso-read}
+       )
+       # Tests fail if ECONF_SOURCE is not relative
+       ECONF_SOURCE="../${P}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+       einstalldocs
+       find "${ED}" -name '*.la' -delete || die
+}

Reply via email to