[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcdio/, dev-libs/libcdio/files/

2019-04-18 Thread Lars Wendler 
commit: 297cc162bda9bc6dc4838e481c3ad1b6302d0a9c
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Apr 19 00:19:15 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Apr 19 00:30:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=297cc162

dev-libs/libcdio: Revbump to fix ncurses detection.

Package-Manager: Portage-2.3.63, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 .../files/libcdio-2.1.0-ncurses_pkgconfig.patch| 30 ++
 ...ibcdio-2.1.0.ebuild => libcdio-2.1.0-r1.ebuild} |  8 +++---
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/dev-libs/libcdio/files/libcdio-2.1.0-ncurses_pkgconfig.patch 
b/dev-libs/libcdio/files/libcdio-2.1.0-ncurses_pkgconfig.patch
new file mode 100644
index 000..b5ed62cc072
--- /dev/null
+++ b/dev-libs/libcdio/files/libcdio-2.1.0-ncurses_pkgconfig.patch
@@ -0,0 +1,30 @@
+From 04f7da2f190ddc636a5c268f2428f36517f92e25 Mon Sep 17 00:00:00 2001
+From: Lars Wendler 
+Date: Fri, 19 Apr 2019 02:24:04 +0200
+Subject: [PATCH] configure.ac: Search for pkg-config with its
+ PKG_PROG_PKG_CONFIG macro
+
+Otherwise the pkg-config command might not be found and thus some of the
+required packages (like ncurses) as well.
+
+Signed-off-by: Lars Wendler 
+---
+ configure.ac | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 5f9f9e78..711cb5df 100644
+--- a/configure.ac
 b/configure.ac
+@@ -27,6 +27,8 @@ AC_CANONICAL_HOST
+ AC_CONFIG_HEADERS(config.h)
+ AC_CONFIG_MACRO_DIR([m4])
+ 
++PKG_PROG_PKG_CONFIG
++
+ # Enable silent build rules by default (Automake v1.11 or later).
+ # Disable by either passing --disable-silent-rules to configure or passing 
V=1 to make
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])],
+-- 
+2.21.0
+

diff --git a/dev-libs/libcdio/libcdio-2.1.0.ebuild 
b/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild
similarity index 94%
rename from dev-libs/libcdio/libcdio-2.1.0.ebuild
rename to dev-libs/libcdio/libcdio-2.1.0-r1.ebuild
index 91ca3e370f2..a61b22b9d61 100644
--- a/dev-libs/libcdio/libcdio-2.1.0.ebuild
+++ b/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild
@@ -36,15 +36,15 @@ MULTILIB_WRAPPED_HEADERS=(
/usr/include/cdio/version.h
 )
 
+PATCHES=(
+   "${FILESDIR}/${PN}-2.1.0-ncurses_pkgconfig.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
 }

[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcdio/, dev-libs/libcdio/files/

2018-04-07 Thread Andreas Sturmlechner 
commit: 0bdae1a3845db5572b948a1f8a2cfb3d31b042ef
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Apr  7 20:14:58 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Apr  7 20:48:48 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bdae1a3

dev-libs/libcdio: Fix I/O leak w/ unreadable ISO file

DOCS to array, drop ltprune for find.

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 .../libcdio/files/libcdio-2.0.0-iso-ioleak.patch   | 37 +++
 dev-libs/libcdio/libcdio-2.0.0-r1.ebuild   | 75 ++
 2 files changed, 112 insertions(+)

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
new file mode 100644
index 000..17732104c3d
--- /dev/null
+++ b/dev-libs/libcdio/files/libcdio-2.0.0-iso-ioleak.patch
@@ -0,0 +1,37 @@
+From 8c0de2d3f0324ecf3fd135589589dcd783c15556 Mon Sep 17 00:00:00 2001
+From: rocky 
+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 

++  Copyright (C) 2004-2006, 2008, 2012-2013, 2017-2018 Rocky Bernstein
++  
+ 
+   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, _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
new file mode 100644
index 000..62bcbab5b55
--- /dev/null
+++ b/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools libtool multilib-minimal
+
+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 ~sh ~sparc 
~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="cddb +cxx minimal static-libs 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
+}